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

Merge remote-tracking branch 'origin/dev' into dev-wuhan

Browse Source
tags/yfai-mes-ext-v2.3
yxw 8 months ago
parent e7a64270a0 3a65eda073
commit 6ae5dfb605
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/aspect/MesRepositoryAspect.java
Unescape Escape View File

@ -125,6 +125,6 @@ public class MesRepositoryAspect {
private void updateBeanSync(BaseBean bean) {
bean.setSystemSyncStatus(CommonEnumUtil.FALSE);
bean.setModifyDatetime(TimeTool.getNowTime(true));
bean.setSystemSyncDatetime("");
}
}

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

@ -139,6 +139,8 @@ public class MesSpotCheckOrderService extends BaseMesService<MesSpotCheckOrder>
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<MesSpotCheckOrder>
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<MesSpotCheckOrder>
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<MesSpotCheckOrder>
//软删点检单明细
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<MesSpotCheckOrder>
//软删点检单零件号及条码
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<MesSpotCheckOrder>
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<MesSpotCheckOrder>
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<MesSpotCheckOrder>
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<MesSpotCheckOrder>
List<MesSpotCheckOrderResult> 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<MesSpotCheckOrder>
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>
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<MesSpotCheckOrder>
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<MesSpotCheckOrder>
result.setTaskItemName(k.getSpotCheckItemName());
result.setSpotCheckStandardValue(k.getStandardValue());
result.setSystemSyncStatus(CommonEnumUtil.FALSE);
result.setSystemSyncDatetime("");
ConvertBean.serviceModelInitialize(result, userName);
spotCheckOrderResults.add(result);
});

Write Preview
Loading…
Cancel
Save