diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerPartService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerPartService.java index 18dea4b..2d8d9a5 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerPartService.java +++ b/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 impl List 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 impl List customerPartList = baseRDao.findByHqlTopWhere(erpPartNoPackBean, 1); if (!CollectionUtils.isEmpty(customerPartList)) { MesCustomerPart mesCustomerPart = customerPartList.get(0); - return mesCustomerPart.getCustPartNo(); + return mesCustomerPart.getErpPartNo(); } return ""; } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartShippingGroupDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartShippingGroupDetailService.java index b012f8a..45b87e6 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartShippingGroupDetailService.java +++ b/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 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; }