#

luxiaotao1123

2022-12-13 65d4a072e6a382b9583cae85d5c6e59685c2c1c5

 src/main/java/com/zy/common/service/erp/task/ErpScheduler.java

@@ -56,12 +56,12 @@
        Date now = new Date();
        if (!Cools.isEmpty(goods)) {
            for (Goods good : goods) {
                Mat mat = matService.selectByMatnr(good.getBarCode());
                Mat mat = matService.selectByMatnr(good.getMaterialNO());
                if (mat == null) {
                    mat = new Mat();
                    mat.setTagId(top.getId());
                    mat.setMatnr(good.getBarCode());
                    mat.setMaktx(good.getMaterialNO());
                    mat.setMatnr(good.getMaterialNO());
//                    mat.setMaktx(good.getBarCode());
                    mat.setSpecs(good.getProdSpec());
                    mat.setModel(good.getBatch());
                    mat.setWeight(good.getNWT());
@@ -128,7 +128,7 @@
                        voucher.getLoc(),    // 业务员
                        voucher.getTotalCount(),    // 结算天数  ********************
                        null,    // 邮费支付类型
                        null,    // 邮费
                        voucher.getExpectedWeight(),    // 邮费
                        null,    // 付款时间
                        null,    // 发货时间
                        null,    // 物流名称
@@ -144,30 +144,61 @@
                if (!orderService.insert(order)) {
                    throw new CoolException(order.getOrderNo() + "生成单据主档失败，请联系管理员");
                }
                for (VoucherDetail detail : dto.getDetails()) {

                    Mat mat = matService.selectByMatnr(detail.getBarcode());
                    if (mat == null) {
                        throw new CoolException(detail.getBarcode() + "单据号不存在");
                    }

                    OrderDetl orderDetl = new OrderDetl();
                    orderDetl.sync(mat);
//                    orderDetl.setBatch(detlDto.getBatch());
                    orderDetl.setAnfme(1.0D);
                    orderDetl.setOrderId(order.getId());
                    orderDetl.setOrderNo(order.getOrderNo());
                    orderDetl.setCreateBy(9527L);
                    orderDetl.setCreateTime(now);
                    orderDetl.setUpdateBy(9527L);
                    orderDetl.setUpdateTime(now);
                    orderDetl.setStatus(1);
                    orderDetl.setQty(0.0D);
                    if (!orderDetlService.insert(orderDetl)) {
                        throw new CoolException(order.getOrderNo() + "生成单据明细失败，请联系管理员");
                    }
                Mat mat = matService.selectByMatnr(voucher.getMaterialNO());
                if (mat == null) {
                    throw new CoolException(voucher.getMaterialNO() + "物料号不存在");
                }

                OrderDetl orderDetl = new OrderDetl();
                orderDetl.sync(mat);
                StringBuilder sb = new StringBuilder();
                if (!Cools.isEmpty(dto.getDetails())) {
                    for (VoucherDetail detail : dto.getDetails()) {
                        sb.append(detail.getBarcode()).append(",");
                    }
                    orderDetl.setBatch(sb.toString());
                }
                orderDetl.setAnfme(voucher.getExpectedWeight());
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setCreateBy(9527L);
                orderDetl.setCreateTime(now);
                orderDetl.setUpdateBy(9527L);
                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                if (!orderDetlService.insert(orderDetl)) {
                    throw new CoolException(order.getOrderNo() + "生成单据明细失败，请联系管理员");
                }

//                else {
//                    for (VoucherDetail detail : dto.getDetails()) {
//
//                        Mat mat = matService.selectByMatnr(voucher.getMaterialNO());
//                        if (mat == null) {
//                            throw new CoolException(voucher.getMaterialNO() + "物料号不存在");
//                        }
//
//                        OrderDetl orderDetl = new OrderDetl();
//                        orderDetl.sync(mat);
////                    orderDetl.setBatch(detlDto.getBatch());
//                        orderDetl.setAnfme(1.0D);
//                        orderDetl.setOrderId(order.getId());
//                        orderDetl.setOrderNo(order.getOrderNo());
//                        orderDetl.setCreateBy(9527L);
//                        orderDetl.setCreateTime(now);
//                        orderDetl.setUpdateBy(9527L);
//                        orderDetl.setUpdateTime(now);
//                        orderDetl.setStatus(1);
//                        orderDetl.setQty(0.0D);
//                        if (!orderDetlService.insert(orderDetl)) {
//                            throw new CoolException(order.getOrderNo() + "生成单据明细失败，请联系管理员");
//                        }
//                    }
//                }

                // erp 同步
                int state = 1;
                if (!erpService.updateStateForVoucher(voucher.getVoucherID(), state)) {