1

luxiaotao1123

2021-09-24 d0a5c06aa6f6eb85966bf944b72fd7998161e189

1

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

@@ -86,22 +86,13 @@
                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,6 @@
//                exceptionHandle("删除工作明细档[workNo={0}]失败", wrkMast.getWrkNo());
            }
        } catch (Exception e) {
//            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setContent(e);
        }

 src/main/java/com/zy/common/service/erp/ErpService.java

@@ -301,11 +301,9 @@
        String sql = "update OutStockbillEntry set FAuxCommitQty = (FAuxCommitQty + {0,number,#}) where 1=1 and Fnumber = ''{1}'' and FInterID = {2,number,#}";
        sql = MessageFormat.format(sql, increment, Fnumber, FInterID);
        try {
            log.info("step 1 ====> {}" , sql);
            if (erpSqlServer.update(sql) > 0) {
                sql = "select * from OutStockbillEntry where 1=1 and Fnumber = ''{0}'' and FInterID = {1,number,#}";
                sql = MessageFormat.format(sql, Fnumber, FInterID);
                log.info("step 2 ====> {}" , sql);
                List<OutStockBillEntry> select = erpSqlServer.select(sql, OutStockBillEntry.class);
                OutStockBillEntry outStockBillEntry = select.get(0);
                boolean complete = false;
@@ -339,7 +337,6 @@
    private boolean completeCPakOut(String FBillNo){
        String sql = "update OutStockbill set Fflag_finish = 1 where FBillNo = ''{0}''";
        sql = MessageFormat.format(sql, FBillNo);
        log.info("step 3 ====> {}" , sql);
        return erpSqlServer.update(sql) > 0;
    }