From a4a612bd9c205166b56e3ad19b2ad5f875a37fc0 Mon Sep 17 00:00:00 2001 From: jun Date: Thu, 5 Sep 2024 21:36:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=82=B9=E6=A3=80=E5=8D=95=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E6=A0=87=E8=AF=86=E6=9C=AA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java | 2 +- .../serviceimpl/busi/MesSpotCheckOrderService.java | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java index b3cfd26..4650bc2 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java @@ -116,6 +116,6 @@ public class PcnRepositoryAspect { private void updateBeanSync(BaseBean bean) { bean.setSystemSyncStatus(CommonEnumUtil.FALSE); - //bean.setModifyDatetime(TimeTool.getNowTime(true)); + bean.setSystemSyncDatetime(""); } } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java index 00a0b6b..eeaaa4a 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java @@ -285,6 +285,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { } } model.getOrderPartList().forEach(k -> { + k.setSystemSyncStatus(CommonEnumUtil.FALSE); + k.setSystemSyncDatetime(""); ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName()); }); spotCheckOrderPartRepository.saveAll(model.getOrderPartList()); @@ -300,6 +302,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { orderResult = MesExtEnumUtil.SPOT_CHECK_ORDER_RESULT_TYPE.NOK.getValue(); } result.setSpotCheckTime(TimeTool.getNowTime(true)); + result.setSystemSyncStatus(CommonEnumUtil.FALSE); + result.setSystemSyncDatetime(""); ConvertBean.serviceModelUpdate(result, AuthUtil.getSessionUser().getUserName()); } @@ -307,6 +311,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { spotCheckOrder.setSpotCheckOrderResult(orderResult); spotCheckOrder.setSpotCheckTime(TimeTool.getNowTime(true)); + spotCheckOrder.setSystemSyncStatus(CommonEnumUtil.FALSE); + spotCheckOrder.setSystemSyncDatetime(""); spotCheckOrder.setSpotCheckUser(AuthUtil.getSessionUser().getUserName()); spotCheckOrder.setStatus(MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.COMPLETE.getValue()); ConvertBean.serviceModelUpdate(spotCheckOrder, AuthUtil.getSessionUser().getUserName()); @@ -371,6 +377,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { result.setSpotCheckRealValue(""); result.setIsTolerance(0); result.setSpotCheckTime(""); + result.setSystemSyncStatus(CommonEnumUtil.FALSE); + result.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(result, AuthUtil.getSessionUser().getUserName()); orderResultNewList.add(result); }); @@ -391,6 +399,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { BeanUtils.copyProperties(k, spotCheckOrderPart, "id"); spotCheckOrderPart.setSpotCheckOrderId(finalOrderTemp.getId()); spotCheckOrderPart.setSn(""); + spotCheckOrderPart.setSystemSyncStatus(CommonEnumUtil.FALSE); + spotCheckOrderPart.setSystemSyncDatetime(""); // ConvertBean.serviceModelInitialize(spotCheckOrderPart, "LML"); ConvertBean.serviceModelInitialize(spotCheckOrderPart, AuthUtil.getSessionUser().getUserName()); spotCheckOrderPartList.add(spotCheckOrderPart); @@ -493,6 +503,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { BeanUtils.copyProperties(equipmentSpotCheck, bean, "id"); // bean.setSpotCheckOrderNo("SPOT_CHECK_ORDER_NO_0003"); bean.setSpotCheckOrderNo(orderNo); + bean.setSystemSyncStatus(CommonEnumUtil.FALSE); + bean.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(bean, AuthUtil.getSessionUser().getUserName()); bean = spotCheckOrderRepository.insert(bean); @@ -510,6 +522,7 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { result.setTaskItemName(k.getSpotCheckItemName()); result.setSpotCheckStandardValue(k.getStandardValue()); result.setSystemSyncStatus(CommonEnumUtil.FALSE); + result.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(result, AuthUtil.getSessionUser().getUserName()); // ConvertBean.serviceModelInitialize(result, "LML"); spotCheckOrderResults.add(result); @@ -524,6 +537,7 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { spotCheckOrderPart.setSpotCheckOrderId(finalBean.getId()); BeanUtils.copyProperties(k, spotCheckOrderPart, "id"); spotCheckOrderPart.setSystemSyncStatus(CommonEnumUtil.FALSE); + spotCheckOrderPart.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(spotCheckOrderPart, AuthUtil.getSessionUser().getUserName()); // ConvertBean.serviceModelInitialize(spotCheckOrderPart, "LML"); spotCheckOrderPartList.add(spotCheckOrderPart); From 58811fff06bac72145afeb57c0fc2b276b4c4992 Mon Sep 17 00:00:00 2001 From: gsz Date: Fri, 6 Sep 2024 09:25:37 +0800 Subject: [PATCH 2/4] =?UTF-8?q?42984=20=E5=88=9D=E6=A3=80=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=92=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=97=B6=E9=97=B4=E4=B8=8D=E8=83=BD=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/busi/MesInputDefectRecordService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java index 50997d2..a8572bf 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java @@ -618,7 +618,12 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService partInspection.setWorkCenterCode(model.getWorkCenterCode()); partInspection.setShiftCode(model.getShiftCode()); partInspection.setSourceType(model.getSourceType()); - ConvertBean.serviceModelInitialize(partInspection, AuthUtil.getSessionUser().getUserName()); +// ConvertBean.serviceModelInitialize(partInspection, AuthUtil.getSessionUser().getUserName()); + //42984 初检创建时修改人和修改时间不能赋值 + partInspection.setCreateDatetime(TimeTool.getNowTime(true)); + partInspection.setCreateUser(AuthUtil.getSessionUser().getUserName()); + partInspection.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + partInspection.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); return partInspection; } From 3a5e4d844e70453bd60cda4d4d7ccb2001c41fa1 Mon Sep 17 00:00:00 2001 From: jun Date: Fri, 6 Sep 2024 10:10:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E7=94=9F=E6=88=90=E5=8D=95=E6=8D=AE=EF=BC=8C=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=A0=87=E8=AF=86=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java index eeaaa4a..1e88a4e 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java @@ -358,6 +358,8 @@ public class MesSpotCheckOrderService implements IMesSpotCheckOrderService { spotCheckOrderTemp.setSpotCheckOrderResult(0); spotCheckOrderTemp.setSpotCheckTime(""); spotCheckOrderTemp.setSpotCheckUser(""); + spotCheckOrderTemp.setSystemSyncStatus(CommonEnumUtil.FALSE); + spotCheckOrderTemp.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(spotCheckOrderTemp, AuthUtil.getSessionUser().getUserName()); spotCheckOrderTemp = spotCheckOrderRepository.insert(spotCheckOrderTemp); From 878953206670aa9c7aa5f543151cd7167c24dbe2 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 6 Sep 2024 10:27:19 +0800 Subject: [PATCH 4/4] PcnRepositoryAspect --- .../i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java index 4650bc2..c07e827 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java @@ -1,6 +1,6 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.aspect; -import cn.estsh.i3plus.platform.common.tool.TimeTool; +import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import lombok.extern.slf4j.Slf4j; @@ -116,6 +116,6 @@ public class PcnRepositoryAspect { private void updateBeanSync(BaseBean bean) { bean.setSystemSyncStatus(CommonEnumUtil.FALSE); - bean.setSystemSyncDatetime(""); + bean.setSystemSyncDatetime(MesPcnExtConstWords.EMPTY); } }