From 9161c1b4d569f6cf9a2e2fd6189c126e8be47887 Mon Sep 17 00:00:00 2001 From: jun Date: Thu, 6 Jun 2024 19:38:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E5=8A=9F=E8=83=BD=E6=BC=94?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/ext/mes/api/base/IMesWorkOrderService.java | 2 ++ .../controller/base/MesWorkOrderController.java | 2 +- .../serviceimpl/base/MesWorkOrderService.java | 17 ++++++++++++++--- 3 files changed, 17 insertions(+), 4 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 c50b811..3243b9f 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 @@ -15,6 +15,8 @@ public interface IMesWorkOrderService extends IBaseMesService { void doProductReportExt(MesWorkOrder mesWorkOrder); + void deleteUnSortOrder(String userName,String organizeCode); + List sumMesWorkOrderQtyToSap(String organizeCode); List queryMesWorkOrderProcessToSap(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 62e4b37..0db6a80 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 @@ -48,7 +48,7 @@ public class MesWorkOrderController extends BaseMesController { String organizeCode = AuthUtil.getOrganize().getOrganizeCode(); //非排序工单导入前删除 if (MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue() == type) { - + mesWorkOrderService.deleteUnSortOrder(userName,organizeCode); } // 导入数据初始化 for (MesWorkOrder bean : beanList) { 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 b3c7a61..fe05155 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 @@ -629,7 +629,7 @@ public class MesWorkOrderService extends BaseMesService implements } //成品移库 if(isMove){ - MesMove move = createMove(mesPartSap, mesProdRuleSortCfg.getSrcErpLocation(), mesProdRuleSortCfg.getDestErpLocation(), mesWorkOrder.getOrganizeCode(), 1d); + MesMove move = createMove(mesPartSap, mesProdRuleSortCfg.getSrcErpLocation(), mesProdRuleSortCfg.getDestErpLocation(), mesWorkOrder.getOrganizeCode(), 1d,sn); move.setMatnr(mesWorkOrder.getPartNo()); mesMoveList.add(move); } @@ -661,6 +661,16 @@ public class MesWorkOrderService extends BaseMesService implements } } + @Override + public void deleteUnSortOrder(String userName, String organizeCode) { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode); + 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); + } + private void customerSupplyMove(MesWorkOrder mesWorkOrder, MesProductVersion mesProductVersion, List mesBoms, List resultList, List mesProductOffLineList, List mesMoveList) { boolean isItemMove; boolean isItemReport; @@ -702,7 +712,7 @@ public class MesWorkOrderService extends BaseMesService implements if(mesPartSapMap.containsKey(mesBom.getItemPartNo())){ mesPartSap = mesPartSapMap.get(mesBom.getItemPartNo()).iterator().next(); } - MesMove move = createMove(mesPartSap, moveRule.getErpSrcLocateNo(), moveRule.getErpDestLocateNo(), mesBom.getOrganizeCode(), mesBom.getItemQty()); + MesMove move = createMove(mesPartSap, moveRule.getErpSrcLocateNo(), moveRule.getErpDestLocateNo(), mesBom.getOrganizeCode(), mesBom.getItemQty(),sn); move.setMatnr(mesBom.getItemPartNo()); mesMoveList.add(move); } @@ -815,7 +825,7 @@ public class MesWorkOrderService extends BaseMesService implements return mesWorkOrderRDao.findByHqlWhere(packBean); } - private MesMove createMove(MesPartSap mesPart , String source, String target, String org,double qty) { + private MesMove createMove(MesPartSap mesPart , String source, String target, String org,double qty,String sn) { MesMove move = new MesMove(); if(!Objects.isNull(mesPart)){ move.setMeins(mesPart.getUnit()); @@ -826,6 +836,7 @@ public class MesWorkOrderService extends BaseMesService implements move.setUmlgo(target); move.setMenge(qty); move.setPostDate(TimeTool.getToday()); + move.setProductSn(sn); move.setPostTime(TimeTool.getTimeShortWithColon()); ConvertBean.serviceModelInitialize(move, AuthUtil.getSessionUser().getUserName()); return move;