同步切面不修改修改时间,且工单修改时间用毫秒格式

tags/yfai-pcn-ext-v1.4
微笑着面对明天 9 months ago
parent 048f3d3ca3
commit 78c8b3665e

@ -79,8 +79,8 @@ public class PcnRepositoryAspect {
Method method = ((MethodSignature)joinPoint.getSignature()).getMethod(); Method method = ((MethodSignature)joinPoint.getSignature()).getMethod();
if (args.length == 4) { if (args.length == 4) {
if (args[2].getClass().isArray()) { if (args[2].getClass().isArray()) {
method.invoke(joinPoint.getTarget(), args[0], args[1], new String[]{"modifyDatetime", "systemSyncStatus"}, method.invoke(joinPoint.getTarget(), args[0], args[1], new String[]{ "systemSyncStatus"},
new Object[]{TimeTool.getNowTime(true), CommonEnumUtil.FALSE}); new Object[]{CommonEnumUtil.FALSE});
} else { } else {
method.invoke(joinPoint.getTarget(), args[0], args[1], "systemSyncStatus", CommonEnumUtil.FALSE); 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"}, method.invoke(joinPoint.getTarget(), args[0], new String[]{"systemSyncStatus"},
new Object[]{ CommonEnumUtil.FALSE}); new Object[]{ CommonEnumUtil.FALSE});
} else { } 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]); method.invoke(joinPoint.getTarget(), "systemSyncStatus", CommonEnumUtil.FALSE, args[2]);
} }
} }
@ -116,6 +116,6 @@ public class PcnRepositoryAspect {
private void updateBeanSync(BaseBean bean) { private void updateBeanSync(BaseBean bean) {
bean.setSystemSyncStatus(CommonEnumUtil.FALSE); bean.setSystemSyncStatus(CommonEnumUtil.FALSE);
bean.setModifyDatetime(TimeTool.getNowTime(true)); //bean.setModifyDatetime(TimeTool.getNowTime(true));
} }
} }

@ -600,6 +600,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
} }
LOGGER.info("工单报工后数量【{}】", oldMesWorkOrder.getReportedQty()); LOGGER.info("工单报工后数量【{}】", oldMesWorkOrder.getReportedQty());
ConvertBean.serviceModelUpdate(oldMesWorkOrder, userName); ConvertBean.serviceModelUpdate(oldMesWorkOrder, userName);
oldMesWorkOrder.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date()));
workOrderExtService.update(oldMesWorkOrder); workOrderExtService.update(oldMesWorkOrder);
//保存数据 //保存数据

@ -27,10 +27,8 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import java.util.ArrayList; import java.text.SimpleDateFormat;
import java.util.List; import java.util.*;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -193,6 +191,7 @@ public class MesWorkOrderSaveStepService extends BaseStepService {
//如果数量都没有修改,不操作数据库 //如果数量都没有修改,不操作数据库
if (!propertyNameList.isEmpty()) { if (!propertyNameList.isEmpty()) {
ConvertBean.serviceModelUpdate(workOrder, reqBean.getUserInfo()); ConvertBean.serviceModelUpdate(workOrder, reqBean.getUserInfo());
workOrder.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date()));
workOrderExtService.update(workOrder); workOrderExtService.update(workOrder);
/* propertyNameList.add("modifyUser"); /* propertyNameList.add("modifyUser");
propertyValueList.add(reqBean.getUserInfo()); propertyValueList.add(reqBean.getUserInfo());

Loading…
Cancel
Save