From d350136e80016d9559f608710de65e827936771d Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期三, 30 十月 2024 15:35:07 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/controller/AgvMobileController.java | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java index 33a4f1e..e1f9782 100644 --- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java +++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java @@ -568,32 +568,32 @@ // 鏇存柊璁㈠崟 OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode())); -// FlowLog flowLog = new FlowLog(); -// flowLog.setFid(String.valueOf(flowId)); -// flowLog.setSpare2(wrkMast.getWrkNo().toString()); -// flowLog.setLocNo(wrkMast.getSourceLocNo()); -// flowLog.setSpare1(barcode); -// flowLog.setOpType(5L); -// flowLog.setOrderNo(orderDetl.getOrderNo()); -// flowLog.setThreeCode(orderDetl.getThreeCode()); -// flowLog.setMatnr(agvLocDetl.getMatnr()); -// flowLog.setMaktx(agvLocDetl.getMaktx()); -// flowLog.setOrderPrevious(orderDetl.getAnfme()); -// flowLog.setOrderCurrent(orderDetl.getAnfme()); -// flowLog.setOrderChanged(0.0); -// -// flowLog.setQtyPrevious(orderDetl.getQty()); -// flowLog.setQtyCurrent(orderDetl.getQty() + agvLocDetl.getAnfme()); -// flowLog.setQtyChanged(agvLocDetl.getAnfme()); -// -// flowLog.setLocPrevious(agvLocDetl.getAnfme()); -// flowLog.setLocCurrent(0.0d); -// flowLog.setLocChanged(agvLocDetl.getAnfme()); -// flowLog.setUserId(getUserId()); -// flowLog.setAppeTime(now); -// if (!flowLogService.insert(flowLog)) { -// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触"); -// } + FlowLog flowLog = new FlowLog(); + flowLog.setFid(String.valueOf(flowId)); + flowLog.setSpare2(wrkMast.getWrkNo().toString()); + flowLog.setLocNo(wrkMast.getSourceLocNo()); + flowLog.setSpare1(barcode); + flowLog.setOpType(5L); + flowLog.setOrderNo(orderDetl.getOrderNo()); + flowLog.setThreeCode(orderDetl.getThreeCode()); + flowLog.setMatnr(agvLocDetl.getMatnr()); + flowLog.setMaktx(agvLocDetl.getMaktx()); + flowLog.setOrderPrevious(orderDetl.getAnfme()); + flowLog.setOrderCurrent(orderDetl.getAnfme()); + flowLog.setOrderChanged(0.0); + + flowLog.setQtyPrevious(orderDetl.getQty()); + flowLog.setQtyCurrent(orderDetl.getQty() + agvLocDetl.getAnfme()); + flowLog.setQtyChanged(agvLocDetl.getAnfme()); + + flowLog.setLocPrevious(agvLocDetl.getAnfme()); + flowLog.setLocCurrent(0.0d); + flowLog.setLocChanged(agvLocDetl.getAnfme()); + flowLog.setUserId(getUserId()); + flowLog.setAppeTime(now); + if (!flowLogService.insert(flowLog)) { + throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触"); + } orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme()); if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){ throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠$悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr()); -- Gitblit v1.9.1