修正

yxj

2025-04-24 ebb5a4cabce43b6eff66a1f46f9adecb337ed820

 WebAPI/Controllers/Kf_ICStockBillMainController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -24,6 +25,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();  //定义声明变量 ，把通过 new List<object>()创建的 实例，赋值给变量
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Kf_ICStockBill_Query", 1, false, user))
                {
@@ -43,13 +45,19 @@
                    string sql = "select * from h_v_IF_Kf_ICStockBillMain where 1 = 1 " + sWhere + " order by hmainid desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_Kf_ICStockBillMain");
                }

                foreach (DataColumn col in ds.Tables[0].Columns)//遍历ds中第一个表（Tables[0]）的所有列（Columns）每次循环中，col变量会持有当前列的引用
                {
                    Type dataType = col.DataType; //获取当前数据类型传入 自定义变量datadataType
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //字符串拼接         // 将列名和数据类型信息拼接成一个JSON格式的字符串
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }
                //if (ds.Tables[0].Rows.Count != 0 || ds != null)
                //{
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
                //}
                //else
@@ -148,9 +156,35 @@
                        else
                        {
                            string HCheckDate = DateTime.Now.Date.ToString();
                            oCN.BeginTran();
                            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");

                            //=========================审核反审核后负库存控制  
                            DataSet ds2 = oCN.RunProcReturn("Exec h_p_KF_ICinventoryStockCtrl '" + oBill.omodel.HInterID + "', '" + oBill.omodel.HBillType + "'", "h_p_KF_ICinventoryStockCtrl");
                            if (ds2 == null)
                            {
                                oCN.RollBack();
                                objJsonResult.code = "0";
                                objJsonResult.count = 1;
                                objJsonResult.Message = "审核失败!原因:" + "库存更新后控制判断失败";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                            if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                            {
                                oCN.RollBack();
                                string sReturn = "库存更新失败！" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
                                objJsonResult.code = "0";
                                objJsonResult.count = 1;
                                objJsonResult.Message = "审核失败!原因:" + sReturn;
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                            //============================

                            oCN.Commit();
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "审核成功！";
@@ -171,9 +205,35 @@
                        else
                        {
                            string HCheckDate = DateTime.Now.Date.ToString();
                            oCN.BeginTran();
                            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");

                            //=========================审核反审核后负库存控制  
                            DataSet ds2 = oCN.RunProcReturn("Exec h_p_KF_ICinventoryStockCtrl '" + oBill.omodel.HInterID + "', '" + oBill.omodel.HBillType + "'", "h_p_KF_ICinventoryStockCtrl");
                            if (ds2 == null)
                            {
                                oCN.RollBack();
                                objJsonResult.code = "0";
                                objJsonResult.count = 1;
                                objJsonResult.Message = "审核失败!原因:" + "库存更新后控制判断失败";
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                            if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
                            {
                                oCN.RollBack();
                                string sReturn = "库存更新失败！" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
                                objJsonResult.code = "0";
                                objJsonResult.count = 1;
                                objJsonResult.Message = "审核失败!原因:" + sReturn;
                                objJsonResult.data = null;
                                return objJsonResult;
                            }
                            //============================

                            oCN.Commit();
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "反审核成功！";