From 116cc57e1ee8e56cab8c50d3524b9e92f349eb68 Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 12 Jun 2024 21:08:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=85=B3=E7=8F=AD=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=85=B3=E7=8F=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/apiservice/controller/busi/MesProdShiftRecordController.java | 1 + .../pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProdShiftRecordController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProdShiftRecordController.java index 0551d34..5d2d63c 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProdShiftRecordController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProdShiftRecordController.java @@ -87,6 +87,7 @@ public class MesProdShiftRecordController { ValidatorBean.checkNotNull(item.getOrganizeCode(), "工厂号不能为空"); ValidatorBean.checkNotNull(item.getWorkCenterCode(), "workCenterCode不能为空" ); ValidatorBean.checkNotNull(item.getShiftGroup(), "shiftGroup不能为空"); + ValidatorBean.checkNotNull(item.getShiftCode(), "shiftCode不能为空"); mesProdShiftRecordService.saveMesProdShiftRecord(item, AuthUtil.getOrganizeCode()); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java index bdf7588..41be8d6 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesProdShiftRecordServiceImpl.java @@ -78,7 +78,7 @@ public class MesProdShiftRecordServiceImpl implements IMesProdShiftRecordService DdlPackBean packBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(item.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(item.getShiftGroup(), "shiftGroup", packBean); -// DdlPreparedPack.getStringEqualPack(item.getShiftCode(), "shiftCode", packBean); + DdlPreparedPack.getStringEqualPack(item.getShiftCode(), "shiftCode", packBean); MesProdShiftRecord mesProdShiftRecord = mesProdShiftRecordRDao.getByProperty(packBean); if (StringUtil.isEmpty(mesProdShiftRecord)) {