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..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.setModifyDatetime(TimeTool.getNowTime(true)); + bean.setSystemSyncDatetime(MesPcnExtConstWords.EMPTY); } } 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; } 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..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 @@ -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()); @@ -352,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); @@ -371,6 +379,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 +401,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 +505,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 +524,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 +539,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);