#

whycq

2024-10-30 d350136e80016d9559f608710de65e827936771d

 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());