From 78c8b3665eda254488c6ac9844e3516fe5d29637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?= =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com> Date: Fri, 9 Aug 2024 15:42:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=87=E9=9D=A2=E4=B8=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=EF=BC=8C?= =?UTF-8?q?=E4=B8=94=E5=B7=A5=E5=8D=95=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=94=A8=E6=AF=AB=E7=A7=92=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java | 8 ++++---- .../mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java | 1 + .../apiservice/serviceimpl/step/MesWorkOrderSaveStepService.java | 7 +++---- 3 files changed, 8 insertions(+), 8 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 0d31be9..b3cfd26 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 @@ -79,8 +79,8 @@ public class PcnRepositoryAspect { Method method = ((MethodSignature)joinPoint.getSignature()).getMethod(); if (args.length == 4) { if (args[2].getClass().isArray()) { - method.invoke(joinPoint.getTarget(), args[0], args[1], new String[]{"modifyDatetime", "systemSyncStatus"}, - new Object[]{TimeTool.getNowTime(true), CommonEnumUtil.FALSE}); + method.invoke(joinPoint.getTarget(), args[0], args[1], new String[]{ "systemSyncStatus"}, + new Object[]{CommonEnumUtil.FALSE}); } else { method.invoke(joinPoint.getTarget(), args[0], args[1], "systemSyncStatus", CommonEnumUtil.FALSE); } @@ -104,7 +104,7 @@ public class PcnRepositoryAspect { method.invoke(joinPoint.getTarget(), args[0], new String[]{"systemSyncStatus"}, new Object[]{ CommonEnumUtil.FALSE}); } else { - method.invoke(joinPoint.getTarget(), TimeTool.getNowTime(true), args[2]); + // method.invoke(joinPoint.getTarget(), TimeTool.getNowTime(true), args[2]); method.invoke(joinPoint.getTarget(), "systemSyncStatus", CommonEnumUtil.FALSE, args[2]); } } @@ -116,6 +116,6 @@ public class PcnRepositoryAspect { private void updateBeanSync(BaseBean bean) { bean.setSystemSyncStatus(CommonEnumUtil.FALSE); - bean.setModifyDatetime(TimeTool.getNowTime(true)); + //bean.setModifyDatetime(TimeTool.getNowTime(true)); } } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java index 50abc28..008ac8d 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java @@ -600,6 +600,7 @@ public class MesWorkOrderService implements IMesWorkOrderService { } LOGGER.info("工单报工后数量【{}】", oldMesWorkOrder.getReportedQty()); ConvertBean.serviceModelUpdate(oldMesWorkOrder, userName); + oldMesWorkOrder.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date())); workOrderExtService.update(oldMesWorkOrder); //保存数据 diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderSaveStepService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderSaveStepService.java index b6c4da4..275304d 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderSaveStepService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesWorkOrderSaveStepService.java @@ -27,10 +27,8 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import javax.persistence.EntityManager; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.stream.Collectors; /** @@ -193,6 +191,7 @@ public class MesWorkOrderSaveStepService extends BaseStepService { //如果数量都没有修改,不操作数据库 if (!propertyNameList.isEmpty()) { ConvertBean.serviceModelUpdate(workOrder, reqBean.getUserInfo()); + workOrder.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date())); workOrderExtService.update(workOrder); /* propertyNameList.add("modifyUser"); propertyValueList.add(reqBean.getUserInfo());