Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yangle

2024-08-05 a999db77f1ce6f22e1369dff6df919104d9a956e

 DBUtility/ÒµÎñµ¥¾Ý/ClsXt_BaseBill.cs

@@ -251,6 +251,21 @@
                        //反审核更新 åŠæ—¶åº“存表 å‡å°‘库存 1204 1202 1203 1247 1244 1251 1210
                        ds = oCn.RunProcReturn("exec h_KF_UPDateICinventory  '" + lngBillKey.ToString() + "','" + HBillType + "','2'", "h_KF_UPDateICinventory");
                    }
                    //=========================审核反审核后负库存控制  
                    DataSet ds2 = oCn.RunProcReturn("Exec h_p_KF_ICinventoryStockCtrl '" + lngBillKey.ToString() + "', '" + HBillType + "'", "h_p_KF_ICinventoryStockCtrl");
                    if (ds2 == null)
                    {
                        sReturn = "库存更新后控制判断失败！";
                        oCn.RollBack();
                        return false;
                    }
                    if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        sReturn = "库存更新失败！" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
                        oCn.RollBack();
                        return false;
                    }
                    //============================
                }

                sReturn = "";
@@ -317,7 +332,26 @@
                        //反审核更新 åŠæ—¶åº“存表 å¢žåŠ åº“å­˜ 1201 1202 1203 1247 1244 1251 1210
                        //反审核更新 åŠæ—¶åº“存表 å‡å°‘库存 1205 1250 1206 1245 1239 
                        ds = oCn.RunProcReturn("exec h_KF_UPDateICinventory  '" + lngBillKey.ToString() + "','" + HBillType + "','2'", "h_KF_UPDateICinventory");
                    }else if (HBillType == "1207")
                    {
                        //更新及时库存表   å¢žåŠ è°ƒå…¥åº“å­˜,减少调出库存
                        ds = oCn.RunProcReturn("exec h_KF_UPDateICinventory_Move  '" + lngBillKey.ToString() + "','" + HBillType + "','2'", "h_KF_UPDateICinventory_Move");
                    }
                    //=========================审核反审核后负库存控制  
                    DataSet ds2 = oCn.RunProcReturn("Exec h_p_KF_ICinventoryStockCtrl '" + lngBillKey.ToString() + "', '" + HBillType + "'", "h_p_KF_ICinventoryStockCtrl");
                    if (ds2 == null)
                    {
                        sReturn = "库存更新失败后控制判断失败！";
                        oCn.RollBack();
                        return false;
                    }
                    if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        sReturn = "库存更新失败！" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
                        oCn.RollBack();
                        return false;
                    }
                    //============================
                }
                //写入日志
                string WorkList = "反审核单据，单据号：" + HBillNo;
@@ -429,6 +463,21 @@
                        //审核更新 åŠæ—¶åº“存表 å‡å°‘库存 1204 
                        ds = oCn.RunProcReturn("exec h_KF_UPDateICinventory  '" + lngBillKey.ToString() + "','" + HBillType + "','1'", "h_KF_UPDateICinventory");
                    }
                    //=========================审核反审核后负库存控制  
                    DataSet ds2 = oCn.RunProcReturn("Exec h_p_KF_ICinventoryStockCtrl '" + lngBillKey.ToString() + "', '" + HBillType + "'", "h_p_KF_ICinventoryStockCtrl");
                    if (ds2 == null)
                    {
                        sReturn = "库存更新后控制判断失败！";
                        oCn.RollBack();
                        return false;
                    }
                    if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        sReturn = "库存更新失败！" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
                        oCn.RollBack();
                        return false;
                    }
                    //============================
                }
                sReturn = "";
                return true;
@@ -499,7 +548,27 @@
                        //审核更新 åŠæ—¶åº“存表 å¢žåŠ åº“å­˜ 1201 1202 1203 1247 1244 1251 1210
                        //审核更新 åŠæ—¶åº“存表 å‡å°‘库存 1204 1250 1206 1245 1239 
                        ds = oCn.RunProcReturn("exec h_KF_UPDateICinventory  '" + lngBillKey.ToString() + "','" + HBillType + "','1'", "h_KF_UPDateICinventory");
                    }  
                    }//直接调拨单审核更新
                    else if (HBillType == "1207")
                    {
                        //更新及时库存表   å‡å°‘调入库存,增加调出库存
                        ds = oCn.RunProcReturn("exec h_KF_UPDateICinventory_Move  '" + lngBillKey.ToString() + "','" + HBillType + "','1'", "h_KF_UPDateICinventory_Move");
                    }
                    //=========================审核反审核后负库存控制  
                    DataSet ds2 = oCn.RunProcReturn("Exec h_p_KF_ICinventoryStockCtrl '" + lngBillKey.ToString() + "', '" + HBillType +"'", "h_p_KF_ICinventoryStockCtrl");
                    if (ds2 == null)
                    {
                        sReturn = "库存更新后控制判断失败！";
                        oCn.RollBack();
                        return false;
                    }
                    if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        sReturn = "库存更新失败！" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
                        oCn.RollBack();
                        return false;
                    }
                    //============================
                }
                //写入日志
                string WorkList = "审核单据，单据号：" + HBillNo;