#

luxiaotao1123

2022-12-16 2c5cd00985bb587710c67a4f642b6413c2590141

 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());
@@ -76,12 +76,11 @@

                    if (!matService.insert(mat)) {
                        throw new CoolException(good.getBarCode() + "商品同步失败");
                    } else {
                        int state = 1;
                        if (!erpService.updateStateForGoods(good.getBarCode(), state)) {
                            throw new CoolException(good.getBarCode() + "商品修改State为"+state+"失败");
                        }
                    }
                }
                int state = 1;
                if (!erpService.updateStateForGoods(good.getBarCode(), state)) {
                    throw new CoolException(good.getBarCode() + "商品修改State为"+state+"失败");
                }
            }
        }
@@ -144,17 +143,44 @@
                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() + "单据号不存在");
                Mat mat = matService.selectByMatnr(voucher.getMaterialNO());
                if (mat == null) {
                    throw new CoolException(voucher.getMaterialNO() + "物料号不存在");
                }

                // 繳庫單
                if (docType.getPakin() == 1) {
                    for (VoucherDetail detail : dto.getDetails()) {
                        OrderDetl orderDetl = new OrderDetl();
                        orderDetl.sync(mat);

                        orderDetl.setBatch(detail.getBarcode());
                        orderDetl.setAnfme(mat.getWeight());

                        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 {
                    OrderDetl orderDetl = new OrderDetl();
                    orderDetl.sync(mat);
//                    orderDetl.setBatch(detlDto.getBatch());
                    orderDetl.setAnfme(1.0D);
                    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);