#

luxiaotao1123

2021-03-23 d7d00984c029fcc9e340244d2fa974a6d8b3b9e0

 src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java

@@ -12,6 +12,7 @@
import zy.cloud.wms.common.model.OrderStoDto;
import zy.cloud.wms.common.service.MainService;
import zy.cloud.wms.common.service.asrs.AsrsService;
import zy.cloud.wms.common.service.erp.ErpService;
import zy.cloud.wms.common.utils.VersionUtils;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.entity.param.*;
@@ -46,6 +47,8 @@
    private MatService matService;
    @Autowired
    private AsrsService asrsService;
    @Autowired
    private ErpService erpService;

    @Override
    @Transactional
@@ -59,6 +62,7 @@
            return R.error("物料不存在");
        }
        Date now = new Date();
        String docNum = String.valueOf(snowflakeIdWorker.nextId());
        for (Comb comb : combs) {
            // 改变组托档状态
            comb.setIoStatus(4);
@@ -77,6 +81,8 @@
                locDetl.setZpallet(param.getZpallet());
                locDetl.setAnfme(comb.getAnfme());
                VersionUtils.setLocDetl(locDetl, comb);
                locDetl.setDocId(param.getDocType().longValue());
                locDetl.setDocNum(docNum);
                locDetl.setStatus(1);
                locDetl.setCreateBy(userId);
                locDetl.setCreateTime(now);
@@ -94,6 +100,12 @@
            }

        }

        // 上报给erp
        if (!erpService.uploadBill(combs, param.getDocType(), docNum)) {
            throw new CoolException("无法上报至erp");
        }

        return R.ok();
    }

@@ -352,17 +364,17 @@
            }
        }
        if (asrs) {
            if (asrsService.stockTransfer(params)) {
                for (StockTransferParam param : params) {
                    // 修改销售订单待出数量
                    if (!custOrderService.updateQty(number, param.getMatnr(), param.getAnfme())) {
                        throw new CoolException("修改销售订单待出数量失败");
                    }
                }
                return R.ok("库存调拨成功");
            } else {
                return R.error("立库调拨失败，请联系管理员");
            }
//            if (asrsService.stockTransfer(params)) {
//                for (StockTransferParam param : params) {
//                    // 修改销售订单待出数量
//                    if (!custOrderService.updateQty(number, param.getMatnr(), param.getAnfme())) {
//                        throw new CoolException("修改销售订单待出数量失败");
//                    }
//                }
//                return R.ok("库存调拨成功");
//            } else {
//                return R.error("立库调拨失败，请联系管理员");
//            }
        }
        return R.error("暂不缺货，不需要立库调拨");
    }