From 0507e31ae14c28cf6fb78dcff445f2033d78b85b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LML=E4=B8=B6?= <mingliang.li@estsh.com>
Date: Sat, 11 May 2024 11:05:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/apiservice/serviceimpl/base/MesDefectAlarmConfigService.java  | 2 +-
 .../apiservice/serviceimpl/base/MesLoadingVehiclesOrderService.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectAlarmConfigService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectAlarmConfigService.java
index b923e96..15311b9 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectAlarmConfigService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesDefectAlarmConfigService.java
@@ -26,7 +26,7 @@ public class MesDefectAlarmConfigService extends BaseMesService<MesDefectAlarmCo
 
     protected void setPackQueryBean(MesDefectAlarmConfig bean, DdlPackBean packBean) {
         DdlPreparedPack.getStringEqualPack(bean.getDefectCode(), "defectCode", packBean);
-        DdlPreparedPack.getNumEqualPack(bean.getTotalTriggerCount(), "totalTriggerCount", packBean);
+//        DdlPreparedPack.getNumEqualPack(bean.getTotalTriggerCount(), "totalTriggerCount", packBean);
         DdlPreparedPack.getStringLikerPack(bean.getDefectLocationCode(), "defectLocationCode", packBean);
         DdlPreparedPack.getStringEqualPack(bean.getPartTypeCode(), "partTypeCode", packBean);
     }
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingVehiclesOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingVehiclesOrderService.java
index 405c737..d9659a3 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingVehiclesOrderService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingVehiclesOrderService.java
@@ -109,9 +109,9 @@ public class MesLoadingVehiclesOrderService extends BaseMesService<MesLoadingVeh
 
         orderManagementList.forEach(k -> k.setLoadingOrderNo(finalBean.getLoadingOrderNo()));
 
-        String customerCode = bean.getShippingOrderNoList().get(0).getCustomerCode();
+        String customerCode = bean.getShippingOrderNoList().get(0).getCustCode();
         String customerName = bean.getShippingOrderNoList().get(0).getCustomerName();
-        String customerOrganizeCode = bean.getShippingOrderNoList().get(0).getCustomerOrganizeCode();
+        String customerOrganizeCode = bean.getShippingOrderNoList().get(0).getCustPlantCode();
         String customerOrganizeName = bean.getShippingOrderNoList().get(0).getCustomerOrganizeName();
         bean.setSeq(bean.getLoadingOrderNo());
         bean.setStatus(MesExtEnumUtil.LOADING_ORDER_STATUS.CREATE.getValue());