自动化立体仓库 - WMS系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
#
whycq
2024-10-30 45dd167e12e11af8dc7929ff1475623c80fc3578 
 src/main/java/com/zy/asrs/controller/OrderController.java


@@ -426,24 +426,24 @@


                    throw new CoolException("保存订单明细档失败");


                }


                // 流水 -- 新增订单明细


                FlowLog flowLog = new FlowLog();


                flowLog.setFid(String.valueOf(flowId));


                flowLog.setOpType(2L);


                flowLog.setOrderNo(param.getOrderNo());


                flowLog.setThreeCode(orderDetl.getThreeCode());


                flowLog.setMatnr(orderDetl.getMatnr());


                flowLog.setMaktx(orderDetl.getMaktx());


                flowLog.setOrderPrevious(anfme);


                flowLog.setOrderCurrent(anfme + orderDetl.getAnfme());


                flowLog.setOrderChanged(orderDetl.getAnfme());


                flowLog.setQtyPrevious(orderDetl.getQty());


                flowLog.setQtyCurrent(orderDetl.getQty());


                flowLog.setQtyChanged(0.0D);


                flowLog.setUserId(getUserId());


                flowLog.setAppeTime(now);


                if (!flowLogService.insert(flowLog)) {


                    throw new CoolException("同步半成品调拨单流水记录失败");


                }


//                FlowLog flowLog = new FlowLog();


//                flowLog.setFid(String.valueOf(flowId));


//                flowLog.setOpType(2L);


//                flowLog.setOrderNo(param.getOrderNo());


//                flowLog.setThreeCode(orderDetl.getThreeCode());


//                flowLog.setMatnr(orderDetl.getMatnr());


//                flowLog.setMaktx(orderDetl.getMaktx());


//                flowLog.setOrderPrevious(anfme);


//                flowLog.setOrderCurrent(anfme + orderDetl.getAnfme());


//                flowLog.setOrderChanged(orderDetl.getAnfme());


//                flowLog.setQtyPrevious(orderDetl.getQty());


//                flowLog.setQtyCurrent(orderDetl.getQty());


//                flowLog.setQtyChanged(0.0D);


//                flowLog.setUserId(getUserId());


//                flowLog.setAppeTime(now);


//                if (!flowLogService.insert(flowLog)) {


//                    throw new CoolException("同步半成品调拨单流水记录失败");


//                }


            } else {


                list.add(dto);


                orderDetl.setOrderId(order.getId());


@@ -458,25 +458,25 @@


                if (!orderDetlService.insert(orderDetl)) {


                    throw new CoolException("保存订单明细档失败");


                }


                // 流水 -- 新增订单明细


                FlowLog flowLog = new FlowLog();


                flowLog.setFid(String.valueOf(flowId));


                flowLog.setOpType(1L);


                flowLog.setOrderNo(param.getOrderNo());


                flowLog.setThreeCode(orderDetl.getThreeCode());


                flowLog.setMatnr(orderDetl.getMatnr());


                flowLog.setMaktx(orderDetl.getMaktx());


                flowLog.setOrderPrevious(0.0D);


                flowLog.setOrderCurrent(orderDetl.getAnfme());


                flowLog.setOrderChanged(orderDetl.getAnfme());


                flowLog.setQtyPrevious(0.0D);


                flowLog.setQtyCurrent(0.0D);


                flowLog.setQtyChanged(0.0D);


                flowLog.setUserId(getUserId());


                flowLog.setAppeTime(now);


                if (!flowLogService.insert(flowLog)) {


                    throw new CoolException("同步半成品调拨单流水记录失败");


                }


//                // 流水 -- 新增订单明细


//                FlowLog flowLog = new FlowLog();


//                flowLog.setFid(String.valueOf(flowId));


//                flowLog.setOpType(1L);


//                flowLog.setOrderNo(param.getOrderNo());


//                flowLog.setThreeCode(orderDetl.getThreeCode());


//                flowLog.setMatnr(orderDetl.getMatnr());


//                flowLog.setMaktx(orderDetl.getMaktx());


//                flowLog.setOrderPrevious(0.0D);


//                flowLog.setOrderCurrent(orderDetl.getAnfme());


//                flowLog.setOrderChanged(orderDetl.getAnfme());


//                flowLog.setQtyPrevious(0.0D);


//                flowLog.setQtyCurrent(0.0D);


//                flowLog.setQtyChanged(0.0D);


//                flowLog.setUserId(getUserId());


//                flowLog.setAppeTime(now);


//                if (!flowLogService.insert(flowLog)) {


//                    throw new CoolException("同步半成品调拨单流水记录失败");


//                }


            }


        }


        if (param.getDocType().intValue() == 32) {


@@ -612,25 +612,25 @@


                        if (!orderDetlService.insert(orderDetl)) {


                            throw new CoolException("生成半成品调拨单明细档失败");


                        }


                        // 流水 -- 新增订单明细


                        FlowLog flowLog = new FlowLog();


                        flowLog.setFid(String.valueOf(flowId));


                        flowLog.setOpType(1L);


                        flowLog.setOrderNo(param.getOrderNo());


                        flowLog.setThreeCode(orderDetl.getThreeCode());


                        flowLog.setMatnr(orderDetl.getMatnr());


                        flowLog.setMaktx(orderDetl.getMaktx());


                        flowLog.setOrderPrevious(0.0D);


                        flowLog.setOrderCurrent(orderDetl.getAnfme());


                        flowLog.setOrderChanged(orderDetl.getAnfme());


                        flowLog.setQtyPrevious(0.0D);


                        flowLog.setQtyCurrent(0.0D);


                        flowLog.setQtyChanged(0.0D);


                        flowLog.setUserId(getUserId());


                        flowLog.setAppeTime(now);


                        if (!flowLogService.insert(flowLog)) {


                            throw new CoolException("同步半成品调拨单流水记录失败");


                        }


//                        // 流水 -- 新增订单明细


//                        FlowLog flowLog = new FlowLog();


//                        flowLog.setFid(String.valueOf(flowId));


//                        flowLog.setOpType(1L);


//                        flowLog.setOrderNo(param.getOrderNo());


//                        flowLog.setThreeCode(orderDetl.getThreeCode());


//                        flowLog.setMatnr(orderDetl.getMatnr());


//                        flowLog.setMaktx(orderDetl.getMaktx());


//                        flowLog.setOrderPrevious(0.0D);


//                        flowLog.setOrderCurrent(orderDetl.getAnfme());


//                        flowLog.setOrderChanged(orderDetl.getAnfme());


//                        flowLog.setQtyPrevious(0.0D);


//                        flowLog.setQtyCurrent(0.0D);


//                        flowLog.setQtyChanged(0.0D);


//                        flowLog.setUserId(getUserId());


//                        flowLog.setAppeTime(now);


//                        if (!flowLogService.insert(flowLog)) {


//                            throw new CoolException("同步半成品调拨单流水记录失败");


//                        }




                    }




@@ -680,25 +680,25 @@


                if (!orderDetlService.updateById(item)) {


                    throw new CoolException("保存订单明细档失败");


                }


                // 流水 -- 新增订单明细


                FlowLog flowLog = new FlowLog();


                flowLog.setFid(String.valueOf(flowId));


                flowLog.setOpType(2L);


                flowLog.setOrderNo(param.getOrderNo());


                flowLog.setThreeCode(orderDetl.getThreeCode());


                flowLog.setMatnr(orderDetl.getMatnr());


                flowLog.setMaktx(orderDetl.getMaktx());


                flowLog.setOrderPrevious(anfme);


                flowLog.setOrderCurrent(anfme + orderDetl.getAnfme());


                flowLog.setOrderChanged(orderDetl.getAnfme());


                flowLog.setQtyPrevious(orderDetl.getQty());


                flowLog.setQtyCurrent(orderDetl.getQty());


                flowLog.setQtyChanged(0.0D);


                flowLog.setUserId(getUserId());


                flowLog.setAppeTime(now);


                if (!flowLogService.insert(flowLog)) {


                    throw new CoolException("同步半成品调拨单流水记录失败");


                }


//                // 流水 -- 新增订单明细


//                FlowLog flowLog = new FlowLog();


//                flowLog.setFid(String.valueOf(flowId));


//                flowLog.setOpType(2L);


//                flowLog.setOrderNo(param.getOrderNo());


//                flowLog.setThreeCode(orderDetl.getThreeCode());


//                flowLog.setMatnr(orderDetl.getMatnr());


//                flowLog.setMaktx(orderDetl.getMaktx());


//                flowLog.setOrderPrevious(anfme);


//                flowLog.setOrderCurrent(anfme + orderDetl.getAnfme());


//                flowLog.setOrderChanged(orderDetl.getAnfme());


//                flowLog.setQtyPrevious(orderDetl.getQty());


//                flowLog.setQtyCurrent(orderDetl.getQty());


//                flowLog.setQtyChanged(0.0D);


//                flowLog.setUserId(getUserId());


//                flowLog.setAppeTime(now);


//                if (!flowLogService.insert(flowLog)) {


//                    throw new CoolException("同步半成品调拨单流水记录失败");


//                }


            } else {


                if (docType == 35 && orderDetl.getProcessSts() == 1) {


                    List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>()


@@ -724,24 +724,24 @@


                    throw new CoolException("保存订单明细档失败");


                }


                // 流水 -- 新增订单明细


                FlowLog flowLog = new FlowLog();


                flowLog.setFid(String.valueOf(flowId));


                flowLog.setOpType(2L);


                flowLog.setOrderNo(param.getOrderNo());


                flowLog.setThreeCode(orderDetl.getThreeCode());


                flowLog.setMatnr(orderDetl.getMatnr());


                flowLog.setMaktx(orderDetl.getMaktx());


                flowLog.setOrderPrevious(0.0D);


                flowLog.setOrderCurrent(orderDetl.getAnfme());


                flowLog.setOrderChanged(orderDetl.getAnfme());


                flowLog.setQtyPrevious(orderDetl.getQty());


                flowLog.setQtyCurrent(orderDetl.getQty());


                flowLog.setQtyChanged(0.0D);


                flowLog.setUserId(getUserId());


                flowLog.setAppeTime(now);


                if (!flowLogService.insert(flowLog)) {


                    throw new CoolException("同步半成品调拨单流水记录失败");


                }


//                FlowLog flowLog = new FlowLog();


//                flowLog.setFid(String.valueOf(flowId));


//                flowLog.setOpType(2L);


//                flowLog.setOrderNo(param.getOrderNo());


//                flowLog.setThreeCode(orderDetl.getThreeCode());


//                flowLog.setMatnr(orderDetl.getMatnr());


//                flowLog.setMaktx(orderDetl.getMaktx());


//                flowLog.setOrderPrevious(0.0D);


//                flowLog.setOrderCurrent(orderDetl.getAnfme());


//                flowLog.setOrderChanged(orderDetl.getAnfme());


//                flowLog.setQtyPrevious(orderDetl.getQty());


//                flowLog.setQtyCurrent(orderDetl.getQty());


//                flowLog.setQtyChanged(0.0D);


//                flowLog.setUserId(getUserId());


//                flowLog.setAppeTime(now);


//                if (!flowLogService.insert(flowLog)) {


//                    throw new CoolException("同步半成品调拨单流水记录失败");


//                }


            }


        }


        return R.ok("订单修改成功");


@@ -956,15 +956,15 @@


            Integer proSts = 0;


            Row row = sheet.getRow(i);


            //单据类型


            String docName =  dataFormatter.formatCellValue(row.getCell(0));


            String docName =  dataFormatter.formatCellValue(row.getCell(0)).trim();


            //单据编号


            String uuid = dataFormatter.formatCellValue(row.getCell(1));


            String uuid = dataFormatter.formatCellValue(row.getCell(1)).trim();


            //物料号


            String matnr = dataFormatter.formatCellValue(row.getCell(2));


            String matnr = dataFormatter.formatCellValue(row.getCell(2)).trim();


            //销售单号


            String csocode = dataFormatter.formatCellValue(row.getCell(3));


            String csocode = dataFormatter.formatCellValue(row.getCell(3)).trim();


            //自由项


            String isocode = dataFormatter.formatCellValue(row.getCell(4));


            String isocode = dataFormatter.formatCellValue(row.getCell(4)).trim();


            // 数量


            if(Cools.isEmpty(dataFormatter.formatCellValue(row.getCell(5)))){


                continue;