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

yusijie

2024-03-12 abf59bc386d65013b4782eb0b3af463457dbe968

 WebAPI/Controllers/XSGL/Kf_ICStockBackBillController.cs

@@ -513,13 +513,13 @@
                    }
                    //==================================================================================      

                    oCN.BeginTran();
                    //增加关联
                    oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellBack_Check " + HInterID + ",'" + CurUserName + "'");
                    //oCN.BeginTran();
                    ////增加关联
                    //oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellBack_Check " + HInterID + ",'" + CurUserName + "'");
                    //审核提交
                    if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_SellOutBackBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        oCN.Commit();
                        //oCN.Commit();
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核成功";
@@ -528,7 +528,7 @@
                    }
                    else
                    {
                        oCN.RollBack();
                        //oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "审核失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
@@ -561,12 +561,12 @@
                    //===========================================================   

                    //反审核提交AbandonCheck
                    oCN.BeginTran();
                    //删除关联
                    oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellBack_UnCheck " + HInterID + ",'" + CurUserName + "'");
                    //oCN.BeginTran();
                    ////删除关联
                    //oCN.RunProc("exec h_p_Xs_UpDateRelation_SeOrderToSellBack_UnCheck " + HInterID + ",'" + CurUserName + "'");
                    if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_SellOutBackBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                    {
                        oCN.Commit();
                        //oCN.Commit();
                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "反审核成功";
@@ -575,7 +575,7 @@
                    }
                    else
                    {
                        oCN.RollBack();
                        //oCN.RollBack();
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "反审核失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
@@ -587,7 +587,7 @@
            }
            catch (Exception e)
            {
                oCN.RollBack();
                //oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "审核失败或者反审核失败！" + e.ToString();