cl
2 天以前 b47369fbc73269f0661ba169c6387e04fb037e87
src/main/java/com/zy/common/service/erp/ErpService.java
@@ -140,8 +140,9 @@
     * @return
     */
    public List<OutStockBill> syncOutStock() {
        return erpSqlServer.select("SELECT * FROM  xtyasrs_dual.dbo.OutStockBill where Fflag_rw=0", OutStockBill.class);
//        return erpSqlServer.select("SELECT * FROM  xtyasrs_dual.dbo.OutStockBill where Fflag_rw=0", OutStockBill.class);
        List<OutStockBill> list = erpSqlServer.select("SELECT * FROM  xtyasrs_dual.dbo.OutStockBill where Fflag_rw=0", OutStockBill.class);
        log.info("outStock同步来源:ERP库xtyasrs_dual未读出库单数={}", list != null ? list.size() : 0);
        return list;
    }
    /**
@@ -165,9 +166,10 @@
     * @return
     */
    public List<OutStockBillEntry> syncOutStockDetail(Integer FInterID) {
//        String sql = "SELECT * FROM  xtyasrs_dual.dbo.OutStockBillEntry where FSourceBillNo!='' and FAuxCommitQty=0 and FInterID=" + FInterID;
        String sql = "SELECT * FROM  xtyasrs_dual.dbo.OutStockBillEntry where FAuxCommitQty=0 and FInterID=" + FInterID;
        return erpSqlServer.select(sql, OutStockBillEntry.class);
        List<OutStockBillEntry> list = erpSqlServer.select(sql, OutStockBillEntry.class);
        log.info("outStock同步来源:ERP出库明细 FInterID={}, 条数={}", FInterID, list != null ? list.size() : 0);
        return list;
    }
    /**
@@ -452,13 +454,20 @@
                    }
                }
                if (complete) {
                    sql = "select * from OutStockbillEntry where 1=1 and FInterID = {1,number,#} and FAuxCommitQty != FQty";
                    sql = "select * from OutStockbillEntry where 1=1 and FInterID = {1,number,#}";
                    sql = MessageFormat.format(sql, Fnumber, FInterID);
                    List<OutStockBillEntry> select1 = erpSqlServer.select(sql, OutStockBillEntry.class);
                    if(select1.size()<1){
                    boolean flag = true;
                    for(OutStockBillEntry outStockBillEntry1 : select1){
                        if (outStockBillEntry1.getFAuxCommitQty().compareTo(outStockBillEntry1.getFQty()) == -1) {
                            flag = false;
                        }
                    }
                    if(flag){
                        if (!completeCPakOut(FBillNo) ) {
                            log.error("{}出库单标记完成失败", FBillNo);
                        }
                        int updateCount = jdbcTemplate.update("update OutStockbill set Fflag_finish=1 where FBillNo='" + FBillNo + "'");
                        if(updateCount<=0){