From 97aaa4e5bd1e6eb81aad33ea18f9c6d882bc5039 Mon Sep 17 00:00:00 2001
From: yxw <xinwang.yi@estsh.com>
Date: Fri, 24 Nov 2023 14:17:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=81=9C=E5=BC=80=E6=9C=BA=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pcn/apiservice/serviceimpl/base/BomTakeEffectService.java  |  4 ++++
 .../serviceimpl/base/ShiftProdCenterRecordService.java         | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/BomTakeEffectService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/BomTakeEffectService.java
index 7535cd8..e857a3b 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/BomTakeEffectService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/BomTakeEffectService.java
@@ -114,6 +114,8 @@ public class BomTakeEffectService implements IBomTakeEffectService {
 
         BaseResultBean bomEffectResultBean = doWmsBomEffect(organizeCode, partNo);
 
+        log.info("BOM生效 --- bomTakeEffectModel: {} --- bomEffectResultBean: {}", bomTakeEffectModel, bomEffectResultBean);
+
         if (null != bomEffectResultBean && bomEffectResultBean.success) {
 
             log.info("BOM生效 --- doEffect --- WMS-BOM生效成功!");
@@ -136,6 +138,7 @@ public class BomTakeEffectService implements IBomTakeEffectService {
     }
 
     private void deleteOldBom(List<MesBom> bomListByDb) {
+        if (CollectionUtils.isEmpty(bomListByDb)) return;
         bomRepository.deleteAll(bomListByDb);
     }
 
@@ -151,6 +154,7 @@ public class BomTakeEffectService implements IBomTakeEffectService {
 
         updateBomPendingPartByPartByPartNo(bomTakeEffectModel.getPartNo(), bomTakeEffectModel.getOrganizeCode(), bomTakeEffectModel.getUserInfo());
 
+        log.info("BOM生效 --- updateBomPendingPartByPartByPartNo --- 成功!");
     }
 
     private List<String> getItemPartNoList(List<MesBom> bomListByDb) {
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/ShiftProdCenterRecordService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/ShiftProdCenterRecordService.java
index 6885a2d..e72f524 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/ShiftProdCenterRecordService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/ShiftProdCenterRecordService.java
@@ -230,7 +230,7 @@ public class ShiftProdCenterRecordService implements IShiftProdCenterRecordServi
         List<MesShiftProdCenterRecord> shiftProdCenterRecordList = getShiftProdCenterRecordList(
                 centerRecordModel.getOrganizeCode(), workTime, centerRecordModel.getWorkCenterCode(), shiftDb.getShiftCode());
 
-        MesShiftProdCenterRecord startOrEndShiftRecord = null;
+        MesShiftProdCenterRecord startOrEndShiftRecord = new MesShiftProdCenterRecord();
 
         if (CollectionUtils.isEmpty(shiftProdCenterRecordList)) {
 
@@ -283,10 +283,10 @@ public class ShiftProdCenterRecordService implements IShiftProdCenterRecordServi
             }
         }
 
-        if (startOrEndShiftRecord == null) {
-            startOrEndShiftRecord = new MesShiftProdCenterRecord();
-            ConvertBean.serviceModelInitialize(startOrEndShiftRecord, centerRecordModel.getModifyUser());
-        }
+        //if (startOrEndShiftRecord == null) {
+        //    startOrEndShiftRecord = new MesShiftProdCenterRecord();
+        //    ConvertBean.serviceModelInitialize(startOrEndShiftRecord, centerRecordModel.getModifyUser());
+        //}
 
         startOrEndShiftRecord.setWorkCenterCode(centerRecordModel.getWorkCenterCode());
         startOrEndShiftRecord.setStartTime(centerRecordModel.getStartTime());