合并分支

chenhaozhe

2026-03-27 9d4fdc8ef43bfcafdb4a0f3e0e3d59cef1812b15

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÁìÁÏ·¢»õ/Kf_MateOutBillController.cs

@@ -19,11 +19,11 @@
        public DataSet ds = new DataSet();
        public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
        public DLL.ClsKf_MateOutBill BillNew0 = new DLL.ClsKf_MateOutBill();   //模具报废入库对应单据类
        public DLL.ClsKf_MateOutBill BillOld0 = new DLL.ClsKf_MateOutBill();   //模具报废入库对应单据类
        public DLL.ClsKf_MateOutBill BillNew0 = new DLL.ClsKf_MateOutBill();   //生产领料单对应单据类
        public DLL.ClsKf_MateOutBill BillOld0 = new DLL.ClsKf_MateOutBill();   //生产领料单对应单据类

        #region ç”Ÿäº§é¢†æ–™å•åˆ—表
       

        [Route("Kf_MateOutBill/GetMateOutBillList")]
        [HttpGet]
        public object GetMateOutBillList(string sWhere,string user)
@@ -1547,32 +1547,32 @@
                select hmainid HInterID, å•æ®å· HBillNO from h_v_IF_MateOutBillList_Search where hmainid = {mainList[0].HInterID}
                ", "h_v_IF_MateOutBillList_Search");

                // if (ds1.Tables[0].Rows.Count > 0 && ds1.Tables[0].Rows[0]["HInterID"] != null) { 
                //     if(string.Equals(ds1.Tables[0].Rows[0]["HBillNo"].ToString(), mainList[0].HBillNo, StringComparison.OrdinalIgnoreCase)){
                //         string sql = string.Empty;
                //         sql = $"delete Kf_ICStockBillMain where HinterID = {mainList[0].HInterID}";
                //         oCn.RunProc(sql);
                //         sql = $"delete Kf_ICStockBillSub where HinterID = {mainList[0].HInterID}";
                //         oCn.RunProc(sql);
                //     }
                //     else
                //     {
                //         // é‡æ–°ç”³è¯·HInterID
                //         var HInterID_Exch =  DBUtility.ClsPub.CreateBillID("1204", ref DBUtility.ClsPub.sExeReturnInfo);
                //         mainList[0].HInterID = HInterID_Exch;
                // 
                //         foreach(var oSub in subList)
                //         {
                //             oSub.HInterID = HInterID_Exch;
                //         }
                // 
                //     }
                // }
                string sql = string.Empty;
                sql = $"delete Kf_ICStockBillMain where HinterID = {mainList[0].HInterID}";
                oCn.RunProc(sql);
                sql = $"delete Kf_ICStockBillSub where HinterID = {mainList[0].HInterID}";
                oCn.RunProc(sql);
                if (ds1.Tables[0].Rows.Count > 0 && ds1.Tables[0].Rows[0]["HInterID"] != null) { 
                    if(string.Equals(ds1.Tables[0].Rows[0]["HBillNo"].ToString(), mainList[0].HBillNo, StringComparison.OrdinalIgnoreCase)){
                        string sql = string.Empty;
                        sql = $"delete Kf_ICStockBillMain where HinterID = {mainList[0].HInterID}";
                        oCn.RunProc(sql);
                        sql = $"delete Kf_ICStockBillSub where HinterID = {mainList[0].HInterID}";
                        oCn.RunProc(sql);
                    }
                    else
                    {
                        // é‡æ–°ç”³è¯·HInterID
                        var HInterID_Exch =  DBUtility.ClsPub.CreateBillID("1204", ref DBUtility.ClsPub.sExeReturnInfo);
                        mainList[0].HInterID = HInterID_Exch;
                
                        foreach(var oSub in subList)
                        {
                            oSub.HInterID = HInterID_Exch;
                        }
                
                    }
                }
                // string sql = string.Empty;
                // sql = $"delete Kf_ICStockBillMain where HinterID = {mainList[0].HInterID}";
                // oCn.RunProc(sql);
                // sql = $"delete Kf_ICStockBillSub where HinterID = {mainList[0].HInterID}";
                // oCn.RunProc(sql);
                // ä¸»è¡¨
                oCn.RunProc($@"Insert Into Kf_ICStockBillMain 
                (