关闭与erp的对接

zhang

3 天以前 63676447b730800bc7ba3df060bf867713db98f4

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

@@ -441,6 +441,14 @@
            return R.error("单据编号已存在");
        }
        Date now = new Date();
        if (param.getDocType() == 33) {
            for (OrderDetl orderDetl : param.getOrderDetlList()) {
                if (orderDetl.getMatnr().startsWith("401") || orderDetl.getMatnr().startsWith("402")) {
                    param.setOrderNo("DC" + param.getOrderNo());
                    break;
                }
            }
        }
        order = new Order(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                param.getOrderNo(),    // 订单编号
@@ -558,9 +566,15 @@
            }
        }
        if (param.getDocType().intValue() == 32) {
            String ono = "DB";
            for (OrderDetl orderDetl : param.getOrderDetlList()) {
                if (orderDetl.getMatnr().startsWith("401") || orderDetl.getMatnr().startsWith("402")) {
                    ono = "DC";
                }
            }
            order = new Order(
                    String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                    "DB" + param.getOrderNo(),    // 订单编号
                    ono + param.getOrderNo(),    // 订单编号
                    DateUtils.convert(now),    // 单据日期
                    33L,    // 单据类型
                    null,    // 项目编号
@@ -1188,7 +1202,12 @@
            }
            // 生成调拨单
            if (docType.getDocId().intValue() == 32) {
                String dbUuid = "DB" + odNo;
                String dbUuid;
                if (!Cools.isEmpty(matnr) && (matnr.startsWith("401") || matnr.startsWith("402"))) {
                    dbUuid = "DC" + odNo;
                } else {
                    dbUuid = "DB" + odNo;
                }
                Order order2 = orderService.selectByNo(dbUuid);
                if (null == order2) {
                    order2 = new Order(
@@ -1455,7 +1474,12 @@
                odNo += "_O";
            }
            if (docName.contains("调拨单")) {
                if (!Cools.isEmpty(matnr) && (matnr.startsWith("401") || matnr.startsWith("402"))) {
                    odNo = "DC" + odNo;
                } else {
                odNo = "DB" + odNo;
                }
                //odNo = "DB" + odNo;
            } else if (docName.contains("加工单")) {
                odNo = "JG" + odNo;
            } else {