From 2d8687ef674bca8f6afae4403c1187d750fa1bfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?=
 =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com>
Date: Mon, 20 May 2024 20:03:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=B8=BB=E6=95=B0=E6=8D=AEbu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/base/MesCustomerCarModelService.java           | 10 +++++-----
 .../serviceimpl/base/MesPartProdGroupDetailService.java        |  7 ++++++-
 .../apiservice/serviceimpl/base/MesPartPtrDetailService.java   |  5 ++++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelService.java
index 9defb5e..5736ece 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesCustomerCarModelService.java
+++ b/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();
         }
     }
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartProdGroupDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartProdGroupDetailService.java
index d3a17f8..2f9e408 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartProdGroupDetailService.java
+++ b/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);
+
+
     }
 
 
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPtrDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPtrDetailService.java
index 9e996a9..f5754d2 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPartPtrDetailService.java
+++ b/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);
+    }
 }