1

zhang

6 天以前 cbaed669c30a98f350857ba2d60c8ef7de012955

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -37,6 +37,8 @@
    private OrderDetlService orderDetlService;
    @Autowired
    private WorkService workService;
    @Autowired
    private OrderDetlReportService orderDetlReportService;

//    private static final Map<Integer,Integer> sourceSite = new HashMap<>();
//    static {
@@ -55,7 +57,7 @@
            return doOut(wrkMast);
        } else if (wrkMast.getWrkSts() == 108) {
            return doOut2_5(wrkMast);
        } else if (wrkMast.getWrkSts() == 109) {
        } else if (wrkMast.getWrkSts() == 106) {
            return doOut2_5(wrkMast);
        }
        return SUCCESS;
@@ -129,6 +131,11 @@
                                return FAIL.setMsg("全板入库 ===>> 添加库存明细失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                            }
                        }
                        if (!Cools.isEmpty(wrkDetl.getOrderNo())){
                            OrderDetlReport orderDetlReport = new OrderDetlReport();
                            orderDetlReport.sync(wrkDetl);
                            orderDetlReportService.insert(orderDetlReport);
                        }

                        // 更新订单完成数量
                        OrderDetl orderDetl = orderDetlService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
@@ -175,9 +182,9 @@
                    }
                    for (WrkDetl wrkDetl : wrkDetls53) {

                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getSku());
                        if (null != locDetl) {
                            if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
                            if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getSku())) {
//                                exceptionHandle("拣料入库 ===>> 修改库存明细数量失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                return FAIL.setMsg("拣料入库 ===>> 修改库存明细数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");