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 3c1cee8..6885a2d 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 shiftProdCenterRecordList = getShiftProdCenterRecordList( centerRecordModel.getOrganizeCode(), workTime, centerRecordModel.getWorkCenterCode(), shiftDb.getShiftCode()); - MesShiftProdCenterRecord startOrEndShiftRecord = new MesShiftProdCenterRecord(); + MesShiftProdCenterRecord startOrEndShiftRecord = null; if (CollectionUtils.isEmpty(shiftProdCenterRecordList)) { @@ -283,6 +283,11 @@ public class ShiftProdCenterRecordService implements IShiftProdCenterRecordServi } } + if (startOrEndShiftRecord == null) { + startOrEndShiftRecord = new MesShiftProdCenterRecord(); + ConvertBean.serviceModelInitialize(startOrEndShiftRecord, centerRecordModel.getModifyUser()); + } + startOrEndShiftRecord.setWorkCenterCode(centerRecordModel.getWorkCenterCode()); startOrEndShiftRecord.setStartTime(centerRecordModel.getStartTime()); startOrEndShiftRecord.setShiftCode(shiftDb.getShiftCode()); @@ -295,8 +300,9 @@ public class ShiftProdCenterRecordService implements IShiftProdCenterRecordServi startOrEndShiftRecord.setQuitWorkNum(centerRecordModel.getQuitWorkNum()); startOrEndShiftRecord.setWorkerQty(centerRecordModel.getWorkerQty()); startOrEndShiftRecord.setProdType(MesPcnExtEnumUtil.SHIFT_PROD_TYPE.START_OR_END_SHIFT_TIME.getValue()); + startOrEndShiftRecord.setOrganizeCode(centerRecordModel.getOrganizeCode()); - shiftProdCenterRecordRepository.insert(startOrEndShiftRecord); + shiftProdCenterRecordRepository.save(startOrEndShiftRecord); }