From 8761faceb64b70b813d60f0fc1738d8110d98987 Mon Sep 17 00:00:00 2001 From: yxw Date: Thu, 23 Nov 2023 01:24:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=BA=E8=83=BD=E7=9B=91=E6=8E=A7=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/ShiftProdCenterRecordService.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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); }