zjj
2024-04-01 fb405f122670d390ea31d5f7694155cbe36722a4
#立库转平库
1个文件已修改
48 ■■■■ 已修改文件
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -61,30 +61,6 @@
    public ReturnT<Exception> start(WrkMast wrkMast) {
        try {
            if (!Cools.isEmpty(wrkMast.getBarcode())) {
                Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode());
                // erp关联订单处理
                List<WaitPakin> waitPakins = waitPakinService.selectList(wrapper);
                for (WaitPakin waitPakin : waitPakins) {
                    if (!Cools.isEmpty(waitPakin.getMemo())) {
                        if (waitPakin.getMemo().equals("原材料")) {
                            if (!erpService.incrementPakIn(waitPakin.getSupplier(), waitPakin.getMatnr(), waitPakin.getAnfme())) {
                                exceptionHandle("更新ERP原材料入库数据[matnr={0}]失败", waitPakin.getMatnr());
                            }
                        } else if (waitPakin.getMemo().equals("成品")) {
                            if (!erpService.incrementCPakIn(waitPakin.getSupplier(), waitPakin.getMatnr(), waitPakin.getAnfme())) {
                                exceptionHandle("更新ERP成品入库数据[matnr={0}]失败", waitPakin.getMatnr());
                            }
                        }
                    }
                }
                // 保存入库通知档历史档
                waitPakinLogService.save(wrkMast.getBarcode());
                // 删除入库通知档
                waitPakinService.delete(wrapper);
            }
            if (!Cools.isEmpty(wrkMast.getPdcType()) && wrkMast.getPdcType().equals("Y")){
                List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
@@ -139,6 +115,30 @@
                    }
                }
            }
            if (!Cools.isEmpty(wrkMast.getBarcode())) {
                Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode());
                // erp关联订单处理
                List<WaitPakin> waitPakins = waitPakinService.selectList(wrapper);
                for (WaitPakin waitPakin : waitPakins) {
                    if (!Cools.isEmpty(waitPakin.getMemo())) {
                        if (waitPakin.getMemo().equals("原材料")) {
                            if (!erpService.incrementPakIn(waitPakin.getSupplier(), waitPakin.getMatnr(), waitPakin.getAnfme())) {
                                exceptionHandle("更新ERP原材料入库数据[matnr={0}]失败", waitPakin.getMatnr());
                            }
                        } else if (waitPakin.getMemo().equals("成品")) {
                            if (!erpService.incrementCPakIn(waitPakin.getSupplier(), waitPakin.getMatnr(), waitPakin.getAnfme())) {
                                exceptionHandle("更新ERP成品入库数据[matnr={0}]失败", waitPakin.getMatnr());
                            }
                        }
                    }
                }
                // 保存入库通知档历史档
                waitPakinLogService.save(wrkMast.getBarcode());
                // 删除入库通知档
                waitPakinService.delete(wrapper);
            }
            // erp关联出库订单处理
            if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 53) {
                EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();