基础主数据bug

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

@@ -29,7 +29,7 @@ public class MesCustomerCarModelService extends BaseMesService<MesCustomerCarMod
     protected void setPackQueryBean(MesCustomerCarModel bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringLikerPack(bean.getCarModelCode(), "carModelCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getCustOrganizeCode(), "custOrganizeCode", packBean);
-        DdlPreparedPack.getStringLikerPack(bean.getCustomerCode(), "customerCode", packBean);
+        DdlPreparedPack.getStringLikerPack(bean.getCustCode(), "customerCode", packBean);
     }
 
     protected void onInsertBean(MesCustomerCarModel item) {
@@ -38,14 +38,14 @@ public class MesCustomerCarModelService extends BaseMesService<MesCustomerCarMod
 
         DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getCarModelCode(), "carModelCode", roadPackBean);
-        DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCustCode(), "customerCode", roadPackBean);
 
         boolean flg = baseRDao.isExitByHql(roadPackBean);
         if (flg) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("客户代码【%s】下车型【%s】已经存在，请检查数据", item.getOrganizeCode(),item.getCustomerCode())
+                    .setErrorDetail("客户代码【%s】下车型【%s】已经存在，请检查数据", item.getOrganizeCode(),item.getCustCode())
                     .build();
         }
 
@@ -57,14 +57,14 @@ public class MesCustomerCarModelService extends BaseMesService<MesCustomerCarMod
 
         DdlPackBean roadPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(item.getCarModelCode(), "carModelCode", roadPackBean);
-        DdlPreparedPack.getStringEqualPack(item.getCustomerCode(), "customerCode", roadPackBean);
+        DdlPreparedPack.getStringEqualPack(item.getCustCode(), "customerCode", roadPackBean);
         DdlPreparedPack.getNumNOEqualPack(item.getId(), "id", roadPackBean);
         boolean flg = baseRDao.isExitByHql(roadPackBean);
         if (flg) {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("客户代码【%s】下车型【%s】已经存在，请检查数据", item.getOrganizeCode(),item.getCustomerCode())
+                    .setErrorDetail("客户代码【%s】下车型【%s】已经存在，请检查数据", item.getOrganizeCode(),item.getCustCode())
                     .build();
         }
     }

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

@@ -18,8 +18,13 @@ public class MesPartProdGroupDetailService extends BaseMesService<MesPartProdGro
 
 
 
-    protected void setPackQueryBean(MesPartProdGroup bean, DdlPackBean packBean) {
+    protected void setPackQueryBean(MesPartProdGroupDetail bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getPartProdGroupCode(), "partProdGroupCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCustomerPartNo(), "workCellCode", packBean);
+
+
     }
 
 

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.ext.mes.api.base.IMesPartPtrDetailService;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesCustomerPart;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartProdGroup;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartPtr;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartPtrDetail;
 import lombok.extern.slf4j.Slf4j;
@@ -13,5 +14,7 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class MesPartPtrDetailService extends BaseMesService<MesPartPtrDetail> implements IMesPartPtrDetailService {
 
-
+    protected void setPackQueryBean(MesPartPtrDetail bean, DdlPackBean packBean) {
+        DdlPreparedPack.getNumEqualPack(bean.getPtrId(), "ptrId", packBean);
+    }
 }