From 6d7e2c40d021ca14f8453052f78994940d47e47e Mon Sep 17 00:00:00 2001 From: jun Date: Mon, 24 Jun 2024 17:40:20 +0800 Subject: [PATCH] fix #bug 41559 fix #bug 41577 --- .../cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java | 2 +- .../mes/apiservice/controller/base/MesWorkOrderController.java | 4 ++-- .../ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java index f59b7cc..fde6927 100644 --- a/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java +++ b/modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesWorkOrderService.java @@ -24,7 +24,7 @@ public interface IMesWorkOrderService extends IBaseMesService { void doProductReportExt(MesWorkOrder mesWorkOrder); @ApiOperation("非排序工单导入前删除") - void deleteUnSortOrder(String userName, String organizeCode, List partNoList); + void deleteUnSortOrder(String organizeCode, List partNoList); @ApiOperation("汇总工单给SAP") List sumMesWorkOrderQtyToSap(String organizeCode); diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java index f20e677..0199738 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderController.java @@ -53,7 +53,7 @@ public class MesWorkOrderController extends BaseMesController { if(CollectionUtils.isEmpty(beanList)){ MesException.throwMesBusiException("导入数据不存在"); } - String userName = AuthUtil.getSessionUser().getUserName(); + String userName = AuthUtil.getSessionUser().getUserName(); String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); //非排序工单导入前删除 if (MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue() == type) { @@ -61,7 +61,7 @@ public class MesWorkOrderController extends BaseMesController { if(CollectionUtils.isEmpty(partNoList)){ MesException.throwMesBusiException("导入物料信息数据无效"); } - mesWorkOrderService.deleteUnSortOrder(userName,organizeCode,partNoList); + mesWorkOrderService.deleteUnSortOrder(organizeCode,partNoList); } List mesWorkOrderList = new ArrayList<>(); // 导入数据初始化 diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java index 63fcfe7..13ea435 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java @@ -109,6 +109,10 @@ public class MesWorkOrderService extends BaseMesService implements baseRDao.insert(copyMesWorkOrder); workOrderLogService.saveMesWorkOrderLog(copyMesWorkOrder); return bean; + }else if (bean.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue()){ + //生产工单-非排序手工插单，关闭该零件当天之前日期非排序工单 + List partNoList = Collections.singletonList(bean.getPartNo()); + this.deleteUnSortOrder(bean.getOrganizeCode(),partNoList); } else if (bean.getWorkOrderType() == MesExtEnumUtil.ORDER_TYPE.BTO.getValue()) { Long produceSeq = 0L; if (null != result && result.getProduceSeq() != null) { @@ -910,14 +914,14 @@ public class MesWorkOrderService extends BaseMesService implements } @Override - public void deleteUnSortOrder(String userName, String organizeCode, List partNoList) { + public void deleteUnSortOrder(String organizeCode, List partNoList) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getInPackList(partNoList, "partNo", ddlPackBean); DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue(), "workOrderType", ddlPackBean); DdlPreparedPack.getStringSmallerNotEqualPack(TimeTool.getToday(), "planStartTime", ddlPackBean); DdlPreparedPack.getNumberSmallerPack(MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue(), "workOrderStatus", ddlPackBean); baseRDao.updateByProperties(new String[]{"modifyUser", "modifyDatetime", "workOrderStatus"}, - new Object[]{userName, TimeTool.getNowTime(true), MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue()}, ddlPackBean); + new Object[]{"CLOSE_JOB", TimeTool.getNowTime(true), MesExtEnumUtil.ORDER_STATUS.CLOSE.getValue()}, ddlPackBean); }