四期

zhangc

2025-03-19 7e0d9bcc6d822f3ca959823e45d574d54366689d

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -251,7 +251,7 @@
                if (order.getSettle() == 4L) {
                    // 修改订单状态 4.完成 ===>> 6.已上报
                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
                        throw new CoolException("服务器内部错误，请联系管理员");
                        throw new CoolException("订单状态修改(4-6)失败");
                    }
                }
            }
@@ -270,7 +270,7 @@
                }
                // 修改订单状态 4.完成 ===>> 6.已上报
                if (!orderService.updateSettle(order.getId(), 6L, null)) {
                    throw new CoolException("服务器内部错误，请联系管理员");
                    throw new CoolException("订单状态修改(4-6)失败");
                }
            }
        }
@@ -460,7 +460,7 @@
                if (order.getSettle() == 4L) {
                    // 修改订单状态 4.完成 ===>> 6.已上报
                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
                        throw new CoolException("服务器内部错误，请联系管理员");
                        throw new CoolException("订单状态修改(4-6)失败");
                    }
                }
            }
@@ -479,7 +479,7 @@
                }
                // 修改订单状态 4.完成 ===>> 6.已上报
                if (!orderService.updateSettle(order.getId(), 6L, null)) {
                    throw new CoolException("服务器内部错误，请联系管理员");
                    throw new CoolException("订单状态修改(4-6)失败");
                }
            }
        }
@@ -516,7 +516,7 @@
                null    // 备注
        );
        if (!packService.insert(pack)) {
            throw new CoolException("服务器内部错误，请联系管理员");
            throw new CoolException("打包失败");
        }

        Mat mat = matService.selectByMatnr(analyse.getMatnr());
@@ -552,7 +552,7 @@
                            null    // 备注
                    );
                    if (tagMapper.insert(priTag) == 0) {
                        throw new CoolException("服务器内部错误，请联系管理员");
                        throw new CoolException("分类添加失败");
                    }
                }
                // 二级分类
@@ -581,7 +581,7 @@
                            null    // 备注
                    );
                    if (tagMapper.insert(secTag) == 0) {
                        throw new CoolException("服务器内部错误，请联系管理员");
                        throw new CoolException("分类添加失败");
                    }
                }
                tagId = secTag.getId();
@@ -597,7 +597,7 @@
            mat.setCreateTime(now);
            mat.setUpdateTime(now);
            if (!matService.insert(mat)) {
                throw new CoolException("服务器内部错误，请联系管理员");
                throw new CoolException("物料添加失败");
            } else {
                log.info("打包上线添加新物料[物料号：{}]", mat.getMatnr());
            }
@@ -854,6 +854,12 @@
            throw new CoolException("单据参数为空或者单据详情为空，无法生成单据信息");
        }

        if ("银座生产退料申请单".equalsIgnoreCase(docName)) {
            if (Cools.isEmpty(param.getBackOrderNo())){
                throw new CoolException("退料单的退料编号backOrderNo不能为空");
            }
        }

        Order orderOld = null;

        if (!Cools.isEmpty(orderService.selectByNo(param.getCPOID()))) {
@@ -992,6 +998,7 @@
        order.setCreateTime(now);
        order.setUpdateBy(9999L);
        order.setUpdateTime(now);
        order.setSalesman(param.getBackOrderNo());
        order.setUpstreamcode(param.getUpstreamcode());
        //订单状态
        order.setSettle(1L);
@@ -1026,9 +1033,10 @@
        od.setAnfme(odParam.getIQuantity());
        //销售订单号
        od.setThreeCode(odParam.getCDefine22());
        od.setDevNo(odParam.getDevNo());
        //自由项
        if (!Cools.isEmpty(odParam.getBatch()) || !Cools.isEmpty(odParam.getBFree1())) {
            od.setBatch((Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch()) + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
            od.setBrand((Cools.isEmpty(odParam.getBatch()) ? "" : odParam.getBatch()) + "__" + (Cools.isEmpty(odParam.getBFree1()) ? "" : odParam.getBFree1()));
        }
        od.setWeight(odParam.getINum());
        od.setVolume(odParam.getIinvexchrate());