#

18516761980

2021-09-24 0df8f305406412a1229bf412a574cb026ac802cf

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

@@ -113,6 +113,7 @@
                "and isb.FBillNo= ''{2}''";
        sql = MessageFormat.format(sql, increment, Fnumber, FBillNo);
        if (erpSqlServer.update(sql) > 0) {
//            log.error("更新ERP中间表成功===>>[FBillNo:{},Fnumber:{},increment:{}]",FBillNo,Fnumber,increment);
            List<InStockBillEntry> inStockBillEntries = getInStockBillEntry(FBillNo);
            boolean complete = true;
            // 比较单笔资料物料是否全部完成
@@ -137,6 +138,7 @@
            }
            return true;
        } else {
            log.error("更新ERP中间表失败===>>[FBillNo:{},Fnumber:{},increment:{}]",FBillNo,Fnumber,increment);
            return false;
        }
    }
@@ -298,30 +300,37 @@
    public boolean incrementCPakOut(Integer FInterID, String Fnumber, Double increment, String FBillNo) {
        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);
        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);
            List<OutStockBillEntry> select = erpSqlServer.select(sql, OutStockBillEntry.class);
            OutStockBillEntry outStockBillEntry = select.get(0);
            boolean complete = false;
            if (outStockBillEntry.getFQty().compareTo(BigDecimal.ZERO) == 1) {
                if (outStockBillEntry.getFAuxCommitQty().compareTo(outStockBillEntry.getFQty()) > -1) {
                    complete = true;
        try {
            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);
                List<OutStockBillEntry> select = erpSqlServer.select(sql, OutStockBillEntry.class);
                OutStockBillEntry outStockBillEntry = select.get(0);
                boolean complete = false;
                if (outStockBillEntry.getFQty().compareTo(BigDecimal.ZERO) == 1) {
                    if (outStockBillEntry.getFAuxCommitQty().compareTo(outStockBillEntry.getFQty()) > -1) {
                        complete = true;
                    }
                } else {
                    if (outStockBillEntry.getFAuxCommitQty().compareTo(outStockBillEntry.getFAuxQty()) > -1) {
                        complete = true;
                    }
                }
                if (complete) {
                    if (!completeCPakOut(FBillNo)) {
                        log.error("{}出库单标记完成失败", FBillNo);
                    }
                }
                return true;
            } else {
                if (outStockBillEntry.getFAuxCommitQty().compareTo(outStockBillEntry.getFAuxQty()) > -1) {
                    complete = true;
                }
                return false;
            }
            if (complete) {
                if (!completeCPakOut(FBillNo)) {
                    log.error("{}出库单标记完成失败", FBillNo);
                }
            }
            return true;
        } else {
        }catch (Exception e){
            e.printStackTrace();
            log.error("incrementCPakOut----" + sql);
            return false;
        }

    }

    /* 成品出库单标记完成 */