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

zrg

2024-05-31 80291fc67fa8164444c155398c2607d9e8156623

 WebAPI/Controllers/Kf_ICStockBillMainController.cs

@@ -102,6 +102,18 @@
                    return objJsonResult;
                }

                //进行 会计期间 结账 的判断和控制
                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;
                }


                DLL.ClsKf_SellOutBackBill oBill = new DLL.ClsKf_SellOutBackBill();
                if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
                {
@@ -122,7 +134,7 @@
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    
                    if (IsAudit == 1)
                    {
                        if (oBill.omodel.HBillStatus == 2)
@@ -137,6 +149,8 @@
                        {
                            string HCheckDate = DateTime.Now.Date.ToString();
                            oCN.RunProc(" Update Kf_ICStockBillMain set HChecker='" + CurUserName + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HBillType='1247' and HInterID=" + HInterID);
                            //审核更新 及时库存表 增加库存
                            ds = oCN.RunProcReturn("exec h_KF_UPDateICinventory  '" + oBill.omodel.HInterID + "','" + oBill.omodel.HBillType + "','1'", "h_KF_UPDateICinventory");
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "审核成功！";
@@ -158,6 +172,8 @@
                        {
                            string HCheckDate = DateTime.Now.Date.ToString();
                            oCN.RunProc(" Update Kf_ICStockBillMain set HChecker=' ',HCheckDate=null,HBillStatus=1 Where HBillType='1247' and HInterID=" + HInterID);
                            //审核更新 及时库存表 减少库存
                            ds = oCN.RunProcReturn("exec h_KF_UPDateICinventory  '" + oBill.omodel.HInterID + "','" + oBill.omodel.HBillType + "','2'", "h_KF_UPDateICinventory");
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "反审核成功！";