From 0974adbd05816272a39fc4fc9c5b4efd3f5bbddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LML=E4=B8=B6?= <mingliang.li@estsh.com>
Date: Sat, 20 Apr 2024 10:07:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/MesShippingOrderManagementService.java      | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java
index 5cc2556..8174084 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesShippingOrderManagementService.java
@@ -32,6 +32,14 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
     @Autowired
     private MesPartShippingGroupDetailService shippingGroupDetailService;
 
+
+    protected void setPackQueryBean(MesShippingOrderManagement bean, DdlPackBean packBean) {
+        DdlPreparedPack.getStringEqualPack(bean.getShippingGroupNo(), "shippingGroupNo", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCustomerCode(), "customerCode", packBean);
+        DdlPreparedPack.getStringEqualPack(bean.getCustomerOrganizeCode(), "customerOrganizeCode", packBean);
+        DdlPreparedPack.timeBuilder(bean.getReleaseTimeStart(), bean.getReleaseTimeEnd(), "releaseTime", packBean, false);
+    }
+
     @Override
     public MesShippingOrderManagement insert(MesShippingOrderManagement bean) {
         //插入前构造数据
@@ -58,8 +66,8 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
 
             detail.setShippingOrderNo(finalBean.getShippingOrderNo());
             detail.setOrganizeCode(k.getOrganizeCode());
-//            ConvertBean.serviceModelInitialize(detail, "LML");
-            ConvertBean.serviceModelInitialize(detail, AuthUtil.getSessionUser().getUserName());
+            ConvertBean.serviceModelInitialize(detail, "LML");
+//            ConvertBean.serviceModelInitialize(detail, AuthUtil.getSessionUser().getUserName());
             BeanUtils.copyProperties(k, detail, "id");
             detailInsertList.add(detail);
         });
@@ -110,8 +118,8 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
                 MesShippingOrderManagementDetail detail = new MesShippingOrderManagementDetail();
 
                 detail.setOrganizeCode(k.getOrganizeCode());
-//                ConvertBean.serviceModelInitialize(detail, "LML");
-                ConvertBean.serviceModelInitialize(detail, AuthUtil.getSessionUser().getUserName());
+                ConvertBean.serviceModelInitialize(detail, "LML");
+//                ConvertBean.serviceModelInitialize(detail, AuthUtil.getSessionUser().getUserName());
                 BeanUtils.copyProperties(k, detail, "id");
                 detailInsertList.add(detail);
             });
@@ -122,8 +130,8 @@ public class MesShippingOrderManagementService extends BaseMesService<MesShippin
         }
 
         onModifyBean();
-//        ConvertBean.serviceModelUpdate(bean, "LML");
-        ConvertBean.serviceModelUpdate(bean, AuthUtil.getSessionUser().getUserName());
+        ConvertBean.serviceModelUpdate(bean, "LML");
+//        ConvertBean.serviceModelUpdate(bean, AuthUtil.getSessionUser().getUserName());
         baseRDao.update(bean);
         return originBean;
     }