From 3a65eda0735b6c7a5de9b80e604d27d388eba0c9 Mon Sep 17 00:00:00 2001 From: jun Date: Thu, 5 Sep 2024 21:36:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E6=A3=80=E5=8D=95=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=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 --- .../mes/apiservice/aspect/MesRepositoryAspect.java | 2 +- .../serviceimpl/busi/MesSpotCheckOrderService.java | 26 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/aspect/MesRepositoryAspect.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/aspect/MesRepositoryAspect.java index 8985545..4ae6482 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/aspect/MesRepositoryAspect.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/aspect/MesRepositoryAspect.java @@ -125,6 +125,6 @@ public class MesRepositoryAspect { private void updateBeanSync(BaseBean bean) { bean.setSystemSyncStatus(CommonEnumUtil.FALSE); - bean.setModifyDatetime(TimeTool.getNowTime(true)); + bean.setSystemSyncDatetime(""); } } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java index da4b873..a67a8d5 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java @@ -139,6 +139,8 @@ public class MesSpotCheckOrderService extends BaseMesService BeanUtils.copyProperties(equipmentSpotCheck, bean, "id"); bean.setSpotCheckOrderNo(orderNo); + bean.setSystemSyncStatus(CommonEnumUtil.FALSE); + bean.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(bean, AuthUtil.getSessionUser().getUserName()); bean = baseRDao.insert(bean); @@ -155,6 +157,8 @@ public class MesSpotCheckOrderService extends BaseMesService result.setSpotCheckItemId(k.getId()); 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); @@ -168,6 +172,8 @@ public class MesSpotCheckOrderService extends BaseMesService MesSpotCheckOrderPart spotCheckOrderPart = new MesSpotCheckOrderPart(); 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); @@ -209,6 +215,8 @@ public class MesSpotCheckOrderService extends BaseMesService //软删点检单明细 oldOrderResultList.forEach(k -> { + k.setSystemSyncStatus(CommonEnumUtil.FALSE); + k.setSystemSyncDatetime(""); k.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName()); }); @@ -222,6 +230,8 @@ public class MesSpotCheckOrderService extends BaseMesService //软删点检单零件号及条码 oldOrderPartList.forEach(k -> { k.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + k.setSystemSyncStatus(CommonEnumUtil.FALSE); + k.setSystemSyncDatetime(""); ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName()); }); spotCheckOrderPartRepository.saveAll(oldOrderPartList); @@ -276,6 +286,8 @@ public class MesSpotCheckOrderService extends BaseMesService MesSpotCheckOrderResult result = new MesSpotCheckOrderResult(); BeanUtils.copyProperties(k, result, "id"); result.setPid(finalBean.getId()); + result.setSystemSyncStatus(CommonEnumUtil.FALSE); + result.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(result, AuthUtil.getSessionUser().getUserName()); spotCheckOrderResults.add(result); }); @@ -287,6 +299,8 @@ public class MesSpotCheckOrderService extends BaseMesService MesSpotCheckOrderPart spotCheckOrderPart = new MesSpotCheckOrderPart(); spotCheckOrderPart.setSpotCheckOrderId(finalBean.getId()); BeanUtils.copyProperties(k, spotCheckOrderPart, "id"); + spotCheckOrderPart.setSystemSyncStatus(CommonEnumUtil.FALSE); + spotCheckOrderPart.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(spotCheckOrderPart, AuthUtil.getSessionUser().getUserName()); spotCheckOrderPartList.add(spotCheckOrderPart); }); @@ -295,6 +309,8 @@ public class MesSpotCheckOrderService extends BaseMesService spotCheckOrderResultService.insertBatch(spotCheckOrderResults); + bean.setSystemSyncStatus(CommonEnumUtil.FALSE); + bean.setSystemSyncDatetime(""); ConvertBean.serviceModelUpdate(bean, AuthUtil.getSessionUser().getUserName()); baseRDao.update(bean); return originBean; @@ -323,6 +339,8 @@ public class MesSpotCheckOrderService extends BaseMesService List detailList = spotCheckOrderResultRepository.findByHqlWhere(packBean); detailList.forEach(k -> { k.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + k.setSystemSyncStatus(CommonEnumUtil.FALSE); + k.setSystemSyncDatetime(""); ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName()); }); spotCheckOrderResultRepository.saveAll(detailList); @@ -336,6 +354,8 @@ public class MesSpotCheckOrderService extends BaseMesService if (CollectionUtils.isEmpty(oldOrderPartList)) { oldOrderPartList.forEach(k -> { k.setIsDeleted(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + k.setSystemSyncStatus(CommonEnumUtil.FALSE); + k.setSystemSyncDatetime(""); ConvertBean.serviceModelUpdate(k, AuthUtil.getSessionUser().getUserName()); }); spotCheckOrderPartRepository.saveAll(oldOrderPartList); @@ -439,12 +459,16 @@ public class MesSpotCheckOrderService extends BaseMesService mesSpotCheckOrder.setStatus(MesExtEnumUtil.SPOT_CHECK_ORDER_STATUS.CREATE.getValue()); mesSpotCheckOrder.setSpotCheckId(spotCheck.getId()); mesSpotCheckOrder.setSpotCheckOrderNo(orderNo); + mesSpotCheckOrder.setSystemSyncStatus(CommonEnumUtil.FALSE); + mesSpotCheckOrder.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(mesSpotCheckOrder, userName); mesSpotCheckOrder = baseRDao.insert(mesSpotCheckOrder); //保存单据明细 saveMesSpotCheckOrderDetails(userName, detailMap, spotCheck.getId(), mesSpotCheckOrder); //保存单据零件 saveMesEquipmentSpotCheckPartList(userName, checkPartListMap, spotCheck.getId(), mesSpotCheckOrder.getId()); + spotCheck.setSystemSyncStatus(CommonEnumUtil.FALSE); + spotCheck.setSystemSyncDatetime(""); ConvertBean.serviceModelUpdate(spotCheck, userName); baseRDao.update(spotCheck); count++; @@ -523,6 +547,7 @@ public class MesSpotCheckOrderService extends BaseMesService spotCheckOrderPart.setSpotCheckOrderId(spotCheckOrderId); BeanUtils.copyProperties(k, spotCheckOrderPart, "id"); spotCheckOrderPart.setSystemSyncStatus(CommonEnumUtil.FALSE); + spotCheckOrderPart.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(spotCheckOrderPart, userName); spotCheckOrderPartList.add(spotCheckOrderPart); }); @@ -543,6 +568,7 @@ public class MesSpotCheckOrderService extends BaseMesService result.setTaskItemName(k.getSpotCheckItemName()); result.setSpotCheckStandardValue(k.getStandardValue()); result.setSystemSyncStatus(CommonEnumUtil.FALSE); + result.setSystemSyncDatetime(""); ConvertBean.serviceModelInitialize(result, userName); spotCheckOrderResults.add(result); });