From 53a6f02212ee503e37456f8bc9a6d084bc50e6a8 Mon Sep 17 00:00:00 2001
From: yanyang <rainieyanic@outlook.com>
Date: Tue, 7 Mar 2023 20:20:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E8=A3=85=E7=AE=B1=E6=A8=A1?=
 =?UTF-8?q?=E7=BB=84=E5=88=A4=E7=A9=BA=20=E6=97=B6=E9=97=B4=E5=80=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChangePackagingBoxHistoryServiceBizImpl.java  |  2 +-
 .../service/impl/PrintModelServiceBizImpl.java    |  2 +-
 .../impl/WoPackagingBoxServiceBizImpl.java        | 15 +++++++++------
 .../WoPackagingBoxSubstrateServiceBizImpl.java    | 12 +++++++++---
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/ChangePackagingBoxHistoryServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/ChangePackagingBoxHistoryServiceBizImpl.java
index 00b147a..a732963 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/ChangePackagingBoxHistoryServiceBizImpl.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/ChangePackagingBoxHistoryServiceBizImpl.java
@@ -58,7 +58,7 @@ public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl<Cha
     @Override
     public PageData<ChangePackagingBoxHistoryDTO> page (Map<String, Object> params){
         IPage<ChangePackagingBoxHistory> page = baseDao.selectPage(
-            getPage(params, ChangePackagingBoxHistory.CREATE_TIME, true),
+            getPage(params, ChangePackagingBoxHistory.CREATE_TIME, false),
             getWrapper(params)
         );
         return getPageData(page, ChangePackagingBoxHistoryDTO.class);
diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java
index 9144c7d..b431b97 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java
@@ -58,7 +58,7 @@ public class PrintModelServiceBizImpl extends CrudServiceImpl<PrintModelMapper,
     @Override
     public PageData<PrintModelDTO> page (Map<String, Object> params){
         IPage<PrintModel> page = baseDao.selectPage(
-                getPage(params, PrintModel.ID, true),
+                getPage(params, PrintModel.CREATE_TIME, false),
                 getWrapper(params)
         );
         return getPageData(page, PrintModelDTO.class);
diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
index 2c35380..b8f2bd9 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
@@ -176,12 +176,15 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
         //新增模组
         List<WoPackagingBoxSubstrate> substrateList = dto.getSubstrateList();
         for(WoPackagingBoxSubstrate substrate : substrateList){
-            substrate.setPackagingBoxId(box.getBoxNo());
-            substrate.setPowerLevel(box.getPowerLevel());
-            substrate.setSapMaterial(box.getSapMaterial());
-            substrate.setLineBody(box.getLineBody());
-            BaseSupportUtils.setCommonField(substrate);
-            woPackagingBoxSubstrateServiceBiz.insert(substrate);
+            //判断模组id是否非空
+            if(!StringUtils.isBlank(substrate.getWoSubstrateId())) {
+                substrate.setPackagingBoxId(box.getBoxNo());
+                substrate.setPowerLevel(box.getPowerLevel());
+                substrate.setSapMaterial(box.getSapMaterial());
+                substrate.setLineBody(box.getLineBody());
+                BaseSupportUtils.setCommonField(substrate);
+                woPackagingBoxSubstrateServiceBiz.insert(substrate);
+            }
         }
         return IdVo.builder().id(box.getId()).build();
     }
diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java
index 2295eb7..ec79d1c 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java
@@ -194,9 +194,15 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
     @Transactional(rollbackFor = Exception.class)
     public void updateSubstrateManual(ChangePackingBoxDTO[] dtos) {
         for(ChangePackingBoxDTO dto : dtos) {
-            WoPackagingBoxSubstrate entity = ConvertUtils.sourceToTarget(dto, WoPackagingBoxSubstrate.class);
-            BaseSupportUtils.setUpdateCommonField(entity);
-            updateById(entity);
+            //判断模组id是否非空
+            if(StringUtils.isBlank(dto.getWoSubstrateId())) {
+                deleteById(dto.getId());
+            }
+            else {
+                WoPackagingBoxSubstrate entity = ConvertUtils.sourceToTarget(dto, WoPackagingBoxSubstrate.class);
+                BaseSupportUtils.setUpdateCommonField(entity);
+                updateById(entity);
+            }
         }
     }