From 0b5b7e4fe9860779dba6ce0a6cc10435ac13c87d Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期四, 07 十一月 2024 08:41:18 +0800 Subject: [PATCH] #优化 --- src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java index 81c4791..ca66f9c 100644 --- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java @@ -84,6 +84,10 @@ private DocTypeService docTypeService; @Autowired private AgvWaitPakinService agvWaitPakinService; + @Autowired + private AgvLocDetlService agvLocDetlService; + @Autowired + private FlowLogService flowLogService; @Override @Transactional @@ -966,6 +970,7 @@ adjDetl.setLocNo(locDetl.getLocNo()); adjDetl.setMatnr(locDetl.getMatnr()); adjDetl.setBatch(locDetl.getBatch()); + adjDetl.setMaktx(locDetl.getMaktx()); adjDetl.setOriQty(locDetl.getAnfme()); adjDetl.setAdjQty(adjust.getCount()); adjDetl.setModiTime(now); @@ -995,6 +1000,7 @@ adjDetl.setLocNo(locDetl.getLocNo()); adjDetl.setMatnr(locDetl.getMatnr()); adjDetl.setBatch(locDetl.getBatch()); + adjDetl.setMaktx(locDetl.getMaktx()); adjDetl.setOriQty(locDetl.getAnfme()); adjDetl.setAdjQty(0.0D); adjDetl.setModiTime(now); @@ -1028,6 +1034,7 @@ adjDetl.setLocNo(locMast.getLocNo()); adjDetl.setMatnr(adjust.getMatnr()); adjDetl.setBatch(adjust.getBatch()); + adjDetl.setMaktx(locDetl.getMaktx()); adjDetl.setOriQty(0.0D); adjDetl.setAdjQty(adjust.getCount()); adjDetl.setModiTime(now); @@ -1119,10 +1126,12 @@ throw new CoolException("褰撳墠宸ヤ綔鐘舵�佹棤娉曞彇娑�"); } // 璁㈠崟鍏宠仈 + long flowId = snowflakeIdWorker.nextId(); List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()); for (WrkDetl wrkDetl : wrkDetls) { if (!Cools.isEmpty(wrkDetl.getOrderNo())) { if (!BaseController.isJSON(wrkDetl.getOrderNo())) { + if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme(),wrkDetl.getThreeCode(),wrkDetl.getDeadTime())) { throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触"); } @@ -1150,6 +1159,7 @@ } } } + } // 鍙栨秷鎿嶄綔浜哄憳璁板綍 wrkMast.setManuType("鎵嬪姩鍙栨秷"); -- Gitblit v1.9.1