停开机记录报错

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) {

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());