Merge remote-tracking branch 'origin/uat-temp-wj-custpartservice_four' into test

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

@@ -138,7 +138,7 @@ public class MesCustomerPartService extends BaseMesService<MesCustomerPart> impl
         List<MesCustomerPart> customerPartList = baseRDao.findByHqlTopWhere(erpPartNoPackBean, 1);
         if (!CollectionUtils.isEmpty(customerPartList)) {
             MesCustomerPart mesCustomerPart = customerPartList.get(0);
-            return mesCustomerPart.getCustPartNo();
+            return mesCustomerPart.getErpPartNo();
         }
         return "";
     }
@@ -164,7 +164,7 @@ public class MesCustomerPartService extends BaseMesService<MesCustomerPart> impl
         List<MesCustomerPart> customerPartList = baseRDao.findByHqlTopWhere(erpPartNoPackBean, 1);
         if (!CollectionUtils.isEmpty(customerPartList)) {
             MesCustomerPart mesCustomerPart = customerPartList.get(0);
-            return mesCustomerPart.getCustPartNo();
+            return mesCustomerPart.getErpPartNo();
         }
         return "";
     }

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

@@ -33,23 +33,23 @@ public class MesPartShippingGroupDetailService extends BaseMesService<MesPartShi
 
     private boolean check(String organizeCode,String custPartNo,String shippingGroupCode){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getStringEqualPack(shippingGroupCode,"partProdGroupCode", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(shippingGroupCode, "shippingGroupCode", ddlPackBean);
         List<MesPartShippingGroup> shippingGroupList = shippingGroupRao.findByHqlTopWhere(ddlPackBean, 1);
         if (shippingGroupList == null || shippingGroupList.isEmpty()) {
             return false;
         }
         String custCode = shippingGroupList.get(0).getCustCode();
         DdlPackBean ddlPackBean1 = DdlPackBean.getDdlPackBean(organizeCode);
-        DdlPreparedPack.getStringEqualPack(custCode,"custCode",ddlPackBean1);
-        DdlPreparedPack.getStringEqualPack(custPartNo,"custPartNo",ddlPackBean1);
+        DdlPreparedPack.getStringEqualPack(custCode, "custCode", ddlPackBean1);
+        DdlPreparedPack.getStringEqualPack(custPartNo, "custPartNo", ddlPackBean1);
 
         int count = mesCustPartInvoicedRao.findByHqlWhereCount(ddlPackBean1);
         if (count > 0) {
             return true;
         }else {
             DdlPackBean custPackBean = DdlPackBean.getDdlPackBean(organizeCode);
-            DdlPreparedPack.getStringEqualPack(custCode,"custCode",custPackBean);
-            DdlPreparedPack.getStringEqualPack(custPartNo,"custPartNo",custPackBean);
+            DdlPreparedPack.getStringEqualPack(custCode, "custCode", custPackBean);
+            DdlPreparedPack.getStringEqualPack(custPartNo, "custPartNo", custPackBean);
             int count1 = customerPartRao.findByHqlWhereCount(custPackBean);
             return count1 > 0;
         }