武汉cockpit发运防错按照散件方式写入

modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesMoveRuleService.java

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.ext.mes.api.base;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesMoveRule;
+import io.swagger.annotations.ApiOperation;
 
 import java.util.List;
 
@@ -13,5 +14,6 @@ import java.util.List;
  **/
 public interface IMesMoveRuleService extends IBaseMesService<MesMoveRule> {
 
-    List<MesMoveRule> findMesMoveRuleByPartProdGroupCode(String code,String organizeCode);
+    @ApiOperation("根据组代码加code查询移库规则信息")
+    List<MesMoveRule> findMesMoveRuleByPartProdGroupCode(String code,String organizeCode,Integer groupType);
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesMoveRuleServiceImpl.java

@@ -25,6 +25,7 @@ public class MesMoveRuleServiceImpl extends BaseMesService<MesMoveRule> implemen
 
     @Override
     protected void setPackQueryBean(MesMoveRule bean, DdlPackBean packBean) {
+        DdlPreparedPack.getNumEqualPack(bean.getGroupType(), "groupType", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getCode(), "code", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getSrcType(), "srcType", packBean);
     }
@@ -35,6 +36,7 @@ public class MesMoveRuleServiceImpl extends BaseMesService<MesMoveRule> implemen
         checkNotNull(item);
 
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(item.getGroupType(), "groupType", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(item.getCode(), "code", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(item.getSrcType(), "srcType", ddlPackBean);
 
@@ -50,6 +52,7 @@ public class MesMoveRuleServiceImpl extends BaseMesService<MesMoveRule> implemen
         checkNotNull(item);
 
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
+        DdlPreparedPack.getNumEqualPack(item.getGroupType(), "groupType", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(item.getCode(), "code", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(item.getSrcType(), "srcType", ddlPackBean);
         DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", ddlPackBean);
@@ -60,8 +63,9 @@ public class MesMoveRuleServiceImpl extends BaseMesService<MesMoveRule> implemen
     }
 
     @Override
-    public List<MesMoveRule> findMesMoveRuleByPartProdGroupCode(String code, String organizeCode) {
+    public List<MesMoveRule> findMesMoveRuleByPartProdGroupCode(String code, String organizeCode,Integer groupType) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
+        DdlPreparedPack.getNumEqualPack(groupType, "groupType", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(code, "code", ddlPackBean);
         List<MesMoveRule> moveRules = baseRDao.findByHqlWhere(ddlPackBean);
         if (CollectionUtils.isEmpty(moveRules)) {
@@ -76,5 +80,6 @@ public class MesMoveRuleServiceImpl extends BaseMesService<MesMoveRule> implemen
         ValidatorBean.checkNotNull(item.getErpDestLocateNo(), "ERP目的库位不能为空");
         ValidatorBean.checkNotNull(item.getSrcType(), "来源类型不能为空");
         ValidatorBean.checkNotNull(item.getReportType(), "汇报类型不能为空");
+        ValidatorBean.checkNotNull(item.getGroupType(), "组类型不能为空");
     }
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java

@@ -1463,7 +1463,7 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
         MesMoveRule moveRule;
         MesPart itemPart;
         //查询零件生产组的移库规则
-        List<MesMoveRule> moveRules = mesMoveRuleService.findMesMoveRuleByPartProdGroupCode(mesWorkOrder.getPartProdGroupCode(), mesWorkOrder.getOrganizeCode());
+        List<MesMoveRule> moveRules = mesMoveRuleService.findMesMoveRuleByPartProdGroupCode(mesWorkOrder.getPartProdGroupCode(), mesWorkOrder.getOrganizeCode(), MesExtEnumUtil.MOVE_RULE_GROUP_TYPE.MOVE_RULE_GROUP_TYPE_20.getValue());
         Map<String, List<MesMoveRule>> mesMoveRuleMap = moveRules.stream().filter(t -> Objects.nonNull(t.getSrcType())).collect(Collectors.groupingBy(MesMoveRule::getSrcType));
         List<String> itemPartNoList = mesBoms.stream().map(MesBom::getItemPartNo).collect(Collectors.toList());
         //子物料SAP下发信息