合并

yangle

2025-04-02 cee055eb7cdecf5d995cc65d379494e471bde9c8

 WebAPI/Controllers/CGGL/Cg_PORequestBillController.cs

@@ -63,7 +63,7 @@
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                objJsonResult.list = columnNameList;//将columnNameList赋值给objJsonResult的list属性
                return objJsonResult;
            }
            catch (Exception e)
@@ -167,7 +167,15 @@
                string HCloseMan = mainList2[0].HCloseMan == null ? "''" : mainList2[0].HCloseMan;
                string HCloseDate = mainList2[0].HCloseDate == null ? "''" : mainList2[0].HCloseDate;


                //进行 会计期间 结账 的判断和控制
                string s = "";
                int sYear = 0;
                int sPeriod = 0;
                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
                {
                    objJsonResult.Message = s;
                    return objJsonResult;
                }


                ds = oCN.RunProcReturn("select * from h_v_Cg_PORequestBillList where hmainid=" + HInterID + " and 单据号='" + HBillNo + "'", "h_v_Cg_PORequestBillList");
@@ -426,6 +434,17 @@
        {
            try
            {
                //进行 会计期间 结账 的判断和控制
                string s = "";
                int sYear = 0;
                int sPeriod = 0;
                DateTime HDate = DateTime.Now;
                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
                {
                    objJsonResult.Message = s;
                    return objJsonResult;
                }

                oCN.BeginTran();
                oCN.RunProc("Delete From Cg_PORequestBillMain where HInterID = " + HInterID);
                oCN.RunProc("Delete From Cg_PORequestBillSub where HInterID = " + HInterID);
@@ -559,6 +578,18 @@
                    HBillNo = ds.Tables[0].Rows[0]["HBillNo"].ToString();
                }
                BillOld.MvarItemKey = "Cg_PORequestBillMain";

                //进行 会计期间 结账 的判断和控制
                string s = "";
                int sYear = 0;
                int sPeriod = 0;
                DateTime HDate = DateTime.Now;
                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
                {
                    objJsonResult.Message = s;
                    return objJsonResult;
                }

                oCN.BeginTran();//开始事务

                //Type 1 审核  2  反审核
@@ -584,7 +615,7 @@
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                  
                    if (!BillOld.CheckBill(int.Parse(HInterID), HBillNo, "h_p_Cg_PORequestBill_AfterCheckCtrl", user, ref ClsPub.sExeReturnInfo))
                    {
                        objJsonResult.code = "0";
@@ -617,6 +648,7 @@
                        return objJsonResult;
                    }

                    
                    if (BillOld.AbandonCheck(int.Parse(HInterID), HBillNo, "h_p_Cg_PORequestBill_AfterUnCheckCtrl", user, ref ClsPub.sExeReturnInfo))
                    {
                        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();