From e8de99d38f75100501e36208f2f50aad351cc6b1 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 10 Mar 2025 10:54:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=91=E8=BF=90=E7=BB=84?= =?UTF-8?q?=E6=98=8E=E7=BB=86=20=E6=96=B0=E5=A2=9E=20=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=89=A9=E6=96=99=E5=8F=B7=20=E5=9B=9E?= =?UTF-8?q?=E8=BD=A6=E6=97=A0=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=B8=B4?= =?UTF-8?q?=E6=97=B6=E5=A4=84=E7=90=86(=E7=83=AD=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E4=BA=91=E6=AD=A3=E5=BC=8F)=20=E6=9C=80=E7=BB=88=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/base/MesCustomerPartService.java | 4 ++-- .../serviceimpl/base/MesPartShippingGroupDetailService.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) 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; }