#

18516761980

2021-09-29 15c8f00ab3a1e3d2d96b56bae0ec11efedd60231

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

@@ -79,29 +79,20 @@
            }

            // erp关联出库订单处理
            if (wrkMast.getIoType() == 101) {
            if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 53) {
                EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
                // 获取工作档内物料清单
                List<WrkDetl> wrkDetls = wrkDetlService.selectList(wrapper.eq("wrk_no", wrkMast.getWrkNo()).and().isNotNull("supplier"));
                for (WrkDetl wrkDetl: wrkDetls) {
                    if (!Cools.isEmpty(wrkDetl)) {
                        Integer FInterI = outStockService.queryOutStockFInterID(wrkDetl.getSupplier()); // 获取出库单主表主键
                        log.info("incrementCPakOut---" + wrkMast.getWrkNo() + "----FInterI" + FInterI);
                        if (!Cools.isEmpty(FInterI)) {
                            if (!erpService.incrementCPakOut(FInterI, wrkDetl.getMatnr(),  wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
                                log.error("erpService.incrementCPakOut");
                                exceptionHandle("[xtyasrs_dual]更新ERP成品出库数据[matnr={0}]失败", wrkDetl.getMatnr());
                            }
//                            if (!outStockService.incrementCPakOut(FInterI, wrkDetl.getMatnr(),  wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
//                                exceptionHandle("[xtyasrs]更新ERP成品出库数据[matnr={0}]失败", wrkDetl.getMatnr());
//                            }
                        }
                        if (wrkDetl.getMemo().equals("原材料")) {
                            // 待实现


                        } else if (wrkDetl.getMemo().equals("成品")) {

                            if (!outStockService.incrementCPakOut(FInterI, wrkDetl.getMatnr(),  wrkDetl.getAnfme(), wrkDetl.getSupplier())) {
                                exceptionHandle("[xtyasrs]更新ERP成品出库数据[matnr={0}]失败", wrkDetl.getMatnr());
                            }
                        }
                    }
                }
@@ -124,7 +115,7 @@
//                exceptionHandle("删除工作明细档[workNo={0}]失败", wrkMast.getWrkNo());
            }
        } catch (Exception e) {
//            e.printStackTrace();
            log.error("fail", e);
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setContent(e);
        }