jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'dev' into dev-wuhan

Browse Source
tags/yfai-pcn-ext-v2.3
王杰 8 months ago
parent 2a6bcfc4dc 8789532066
commit 3cf7ef6096
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File

4
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/aspect/PcnRepositoryAspect.java
Unescape Escape View File

@ -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);
}
}

7
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesInputDefectRecordService.java
Unescape Escape View File

@ -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;
}

16
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSpotCheckOrderService.java
Unescape Escape View File

@ -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);

Write Preview
Loading…
Cancel
Save