Browse Source

20211213

master
ruanqi 4 years ago
parent
commit
218c6564ea
  1. 45
      src/main/java/com/gaotao/modules/base/controller/BaseController.java
  2. 34
      src/main/java/com/gaotao/modules/base/dao/BaseMapper.java
  3. 22
      src/main/java/com/gaotao/modules/base/service/BaseService.java
  4. 36
      src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java
  5. 17
      src/main/resources/mapper/base/BaseMapper.xml

45
src/main/java/com/gaotao/modules/base/controller/BaseController.java

@ -1399,4 +1399,49 @@ public class BaseController {
}
return responseData;
}
/**
* @Description 切换工艺路线状态
* @Title changeRoutingStatus
* @param inData
* @author rq
* @date 2022/1/19 14:53
* @return Object
* @throw
*/
@PostMapping("/changeRoutingStatus")
@ResponseBody
public Object changeRoutingStatus(@RequestBody RoutingHeaderData inData){
ResponseData responseData = new ResponseData();
try {
responseData = baseService.changeRoutingStatus(inData);
} catch (Exception e) {
responseData.setMsg(e.getMessage());
responseData.setCode("500");
}
return responseData;
}
/**
* @Description 检查是否可以同步工艺路线
* @Title checkRoutingAndOrder
* @param inData
* @author rq
* @date 2022/1/19 14:53
* @return Object
* @throw
*/
@PostMapping("/checkRoutingAndOrder")
@ResponseBody
public Object checkRoutingAndOrder(@RequestBody RoutingHeaderData inData){
ResponseData responseData = new ResponseData();
try {
responseData = baseService.checkRoutingAndOrder(inData);
} catch (Exception e) {
responseData.setMsg(e.getMessage());
responseData.setCode("500");
}
return responseData;
}
}

34
src/main/java/com/gaotao/modules/base/dao/BaseMapper.java

@ -1054,4 +1054,38 @@ public interface BaseMapper {
* @throw
*/
void deleteRoutingTool(RoutingToolData inData);
/**
* @Description 切换工艺路线状态
* @Title changeRoutingStatus
* @param inData
* @author rq
* @date 2022/1/19 14:55
* @return
* @throw
*/
void changeRoutingStatus(RoutingHeaderData inData);
/**
* @Description 检查是否可以同步工艺路线
* @Title checkRoutingStatus
* @param inData
* @author rq
* @date 2022/1/19 16:46
* @return RoutingHeaderData
* @throw
*/
RoutingHeaderData checkRoutingStatus(RoutingHeaderData inData);
/**
* @Description TODO
* @Title ShopOrderRoutingNumber
* @param inData
* @author rq
* @date 2022/1/19 17:17
* @return int
* @throw
*/
int shopOrderRoutingNumber(RoutingHeaderData inData);
}

22
src/main/java/com/gaotao/modules/base/service/BaseService.java

@ -668,4 +668,26 @@ public interface BaseService {
* @throw
*/
ResponseData deleteRoutingTool(RoutingToolData inData);
/**
* @Description 切换工艺路线状态
* @Title changeRoutingStatus
* @param inData
* @author rq
* @date 2022/1/19 14:55
* @return ResponseData
* @throw
*/
ResponseData changeRoutingStatus(RoutingHeaderData inData);
/**
* @Description 检查公寓路线
* @Title checkRoutingAndRouting
* @param inData
* @author rq
* @date 2022/1/19 16:31
* @return ResponseData
* @throw
*/
ResponseData checkRoutingAndOrder(RoutingHeaderData inData);
}

36
src/main/java/com/gaotao/modules/base/service/Impl/BaseServiceImpl.java

@ -1372,4 +1372,40 @@ public class BaseServiceImpl implements BaseService {
return responseData;
}
@Override
public ResponseData changeRoutingStatus(RoutingHeaderData inData){
ResponseData responseData = new ResponseData();
baseMapper.changeRoutingStatus(inData);
responseData.setCode("200");
responseData.setSuccess(true);
responseData.setMsg("操作成功!");
return responseData;
}
@Override
public ResponseData checkRoutingAndOrder(RoutingHeaderData inData){
ResponseData responseData = new ResponseData();
RoutingHeaderData checkStatus=baseMapper.checkRoutingStatus(inData);
if(checkStatus==null){
responseData.setMsg("该产品的工艺路线版本已被删除,请刷新数据!");
responseData.setCode("500");
return responseData;
}
if(!"投产".equals(checkStatus.getStatus())){
responseData.setMsg("该产品的工艺路线版本尚未投产!");
responseData.setCode("500");
return responseData;
}
int number=baseMapper.shopOrderRoutingNumber(inData);
if (number==0){
responseData.setMsg("没有订单需要同步!");
responseData.setCode("500");
return responseData;
}
responseData.setObj(number);
responseData.setCode("200");
responseData.setSuccess(true);
responseData.setMsg("操作成功!");
return responseData;
}
}

17
src/main/resources/mapper/base/BaseMapper.xml

@ -775,4 +775,21 @@ dbo.Get_Part_DescSpec(site,WX_PartNo) as wxSpec,dbo.Get_WorkCenter_Type(Site,Wor
<delete id="deleteRoutingTool" parameterType="com.gaotao.modules.base.entity.RoutingToolData">
delete from RoutingTool WHERE Site=#{site} and PartNo=#{partNo} and ToolID=#{toolID} and RevNo=#{revNo} and ItemNo=#{itemNo}
</delete>
<update id="changeRoutingStatus" parameterType="com.gaotao.modules.base.entity.RoutingHeaderData">
update RoutingHeader SET status=#{status} where Site=#{site} and PartNo=#{partNo} and RevNo=#{revNo}
</update>
<select id="checkRoutingStatus" resultType="com.gaotao.modules.base.entity.RoutingHeaderData">
Select top 1 Status from RoutingHeader
where Site=#{site} and PartNo=#{partNo} and RevNo=#{revNo}
</select>
<select id="shopOrderRoutingNumber" resultType="int">
Select count(1) as SL from ShopOrder as T
where Site=#{site} and PartNo=#{partNo}
and (Status='已计划' or Status='已下达')
and Not exists(Select 1 from SOScheduledRouting as D Where T.Site=D.Site and T.OrderNo=D.OrderNo)
and T.OrderType!='P'
</select>
</mapper>
Loading…
Cancel
Save