字段变更

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

@@ -13,5 +13,5 @@ import java.util.List;
  **/
 public interface IMesMoveRuleService extends IBaseMesService<MesMoveRule> {
 
-    List<MesMoveRule> findMesMoveRuleByPartProdGroupCode(String partProdGroupCode,String organizeCode);
+    List<MesMoveRule> findMesMoveRuleByPartProdGroupCode(String code,String organizeCode);
 }

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

@@ -25,7 +25,7 @@ public class MesMoveRuleImpl extends BaseMesService<MesMoveRule> implements IMes
 
     @Override
     protected void setPackQueryBean(MesMoveRule bean, DdlPackBean packBean) {
-        DdlPreparedPack.getStringEqualPack(bean.getPartProdGroupCode(), "partProdGroupCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCode(), "code", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getSrcType(), "srcType", packBean);
     }
 
@@ -35,11 +35,11 @@ public class MesMoveRuleImpl extends BaseMesService<MesMoveRule> implements IMes
         checkNotNull(item);
 
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(item.getPartProdGroupCode(), "partProdGroupCode", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCode(), "code", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(item.getSrcType(), "srcType", ddlPackBean);
 
         if (baseRDao.isExitByHql(ddlPackBean)) {
-            MesException.throwMesBusiException("零件生产组代码【%s】来源类型【%s】数据已存在", item.getPartProdGroupCode(), item.getSrcType());
+            MesException.throwMesBusiException("代码【%s】来源类型【%s】数据已存在", item.getCode(), item.getSrcType());
         }
 
     }
@@ -50,28 +50,28 @@ public class MesMoveRuleImpl extends BaseMesService<MesMoveRule> implements IMes
         checkNotNull(item);
 
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
-        DdlPreparedPack.getStringEqualPack(item.getPartProdGroupCode(), "partProdGroupCode", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCode(), "code", ddlPackBean);
         DdlPreparedPack.getStringEqualPack(item.getSrcType(), "srcType", ddlPackBean);
         DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", ddlPackBean);
 
         if (baseRDao.isExitByHql(ddlPackBean)) {
-            MesException.throwMesBusiException("零件生产组代码【%s】来源类型【%s】数据已存在", item.getPartProdGroupCode(), item.getSrcType());
+            MesException.throwMesBusiException("代码【%s】来源类型【%s】数据已存在", item.getCode(), item.getSrcType());
         }
     }
 
     @Override
-    public List<MesMoveRule> findMesMoveRuleByPartProdGroupCode(String partProdGroupCode, String organizeCode) {
+    public List<MesMoveRule> findMesMoveRuleByPartProdGroupCode(String code, String organizeCode) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getStringEqualPack(partProdGroupCode, "partProdGroupCode", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(code, "code", ddlPackBean);
         List<MesMoveRule> moveRules = baseRDao.findByHqlWhere(ddlPackBean);
         if (CollectionUtils.isEmpty(moveRules)) {
-            MesException.throwMesBusiException("零件生产组代码【%s】移库规则数据不存在", partProdGroupCode);
+            MesException.throwMesBusiException("代码【%s】移库规则数据不存在", code);
         }
         return moveRules;
     }
 
     private void checkNotNull(MesMoveRule item) {
-        ValidatorBean.checkNotNull(item.getPartProdGroupCode(), "零件生产组代码不能为空");
+        ValidatorBean.checkNotNull(item.getCode(), "代码不能为空");
         ValidatorBean.checkNotNull(item.getErpSrcLocateNo(), "ERP来源库位不能为空");
         ValidatorBean.checkNotNull(item.getErpDestLocateNo(), "ERP目的库位不能为空");
         ValidatorBean.checkNotNull(item.getSrcType(), "来源类型不能为空");