双单位

zhangchao

2024-11-15 7c1af4c63e66754f0868c1a501f4895f9cbc9213

 src/main/java/com/zy/asrs/controller/OrderController.java

@@ -337,7 +337,7 @@
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
        List<Long> docIds = new ArrayList<>();
        for (DocType pakin : pakins) {
            if (pakin.getDocId() == 36) {
            if (pakin.getDocId() == 17) {
                docIds.add(pakin.getDocId());
            }
        }
@@ -426,26 +426,29 @@
                    throw new CoolException("保存订单明细档失败");
                }
                // 流水 -- 新增订单明细
                FlowLog flowLog = new FlowLog();
                flowLog.setFid(String.valueOf(flowId));
                flowLog.setOpType(2L);
                flowLog.setOrderNo(param.getOrderNo());
                flowLog.setThreeCode(orderDetl.getThreeCode().trim());
                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().trim());
//                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);
                if (!Cools.isEmpty(orderDetl.getThreeCode())){
                    orderDetl.setThreeCode(orderDetl.getThreeCode().trim());
                }
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setSource(param.getDocType().intValue());
@@ -459,24 +462,24 @@
                    throw new CoolException("保存订单明细档失败");
                }
//                // 流水 -- 新增订单明细
                FlowLog flowLog = new FlowLog();
                flowLog.setFid(String.valueOf(flowId));
                flowLog.setOpType(1L);
                flowLog.setOrderNo(param.getOrderNo());
                flowLog.setThreeCode(orderDetl.getThreeCode().trim());
                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().trim());
//                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) {
@@ -530,6 +533,9 @@
                    }
                } else {
                    dbList.add(dto);
                    if (!Cools.isEmpty(orderDetl.getThreeCode())){
                        orderDetl.setThreeCode(orderDetl.getThreeCode().trim());
                    }
                    orderDetl.setOrderId(order.getId());
                    orderDetl.setOrderNo(order.getOrderNo());
                    orderDetl.setSource(33);
@@ -600,6 +606,9 @@
                        }
                    } else {
                        dbList.add(dto);
                        if (!Cools.isEmpty(orderDetl.getThreeCode())){
                            orderDetl.setThreeCode(orderDetl.getThreeCode().trim());
                        }
                        orderDetl.setOrderId(order.getId());
                        orderDetl.setOrderNo(order.getOrderNo());
                        orderDetl.setSource(35);
@@ -613,24 +622,24 @@
                            throw new CoolException("生成半成品调拨单明细档失败");
                        }
//                        // 流水 -- 新增订单明细
                        FlowLog flowLog = new FlowLog();
                        flowLog.setFid(String.valueOf(flowId));
                        flowLog.setOpType(1L);
                        flowLog.setOrderNo(param.getOrderNo());
                        flowLog.setThreeCode(orderDetl.getThreeCode().trim());
                        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().trim());
//                        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("同步半成品调拨单流水记录失败");
//                        }

                    }

@@ -681,24 +690,24 @@
                    throw new CoolException("保存订单明细档失败");
                }
//                // 流水 -- 新增订单明细
                FlowLog flowLog = new FlowLog();
                flowLog.setFid(String.valueOf(flowId));
                flowLog.setOpType(2L);
                flowLog.setOrderNo(param.getOrderNo());
                flowLog.setThreeCode(orderDetl.getThreeCode().trim());
                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().trim());
//                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>()
@@ -711,6 +720,9 @@
                    }
                }
                list.add(dto);
                if (!Cools.isEmpty(orderDetl.getThreeCode())){
                    orderDetl.setThreeCode(orderDetl.getThreeCode().trim());
                }
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setSource(docType);
@@ -724,24 +736,24 @@
                    throw new CoolException("保存订单明细档失败");
                }
                // 流水 -- 新增订单明细
                FlowLog flowLog = new FlowLog();
                flowLog.setFid(String.valueOf(flowId));
                flowLog.setOpType(2L);
                flowLog.setOrderNo(param.getOrderNo());
                flowLog.setThreeCode(orderDetl.getThreeCode().trim());
                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().trim());
//                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("订单修改成功");
@@ -1133,7 +1145,7 @@
                        throw new CoolException("生成单据主档失败，请重新导入！");
                    }
                }else {
                    order2.setSettle(order.getSettle() == 1L ? 1L : 2L );
                    order2.setSettle(order2.getSettle() == 1L ? 1L : 2L );
                    orderService.updateById(order2);
                }

@@ -1211,7 +1223,7 @@
                            throw new CoolException("生成单据主档失败，请重新导入！");
                        }
                    }else {
                        order3.setSettle(order.getSettle() == 1L ? 1L : 2L );
                        order3.setSettle(order3.getSettle() == 1L ? 1L : 2L );
                        orderService.updateById(order3);
                    }