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

zrg

2024-07-16 ace57897fc40d465114820fcf1c3c87f9bf42f42

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

 Model/Model.csproj

@@ -468,6 +468,7 @@
    <Compile Include="基础资料\基础资料\ClsGy_BarCodeCheckType_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_Item30JiTai_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_User_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_UnitConvertRate_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsGy_Work_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsXt_FastICSchemeMain_Model.cs" />
    <Compile Include="基础资料\基础资料\ClsXt_FastICSchemeSub_Model.cs" />

 Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsGy_UnitConvertRate_Model.cs

New file
@@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace Model
{
    public class ClsGy_UnitConvertRate_Model : DBUtility.ClsGy_Base_Model
    {
        public string HBILLNO;              // varchar(30)
        public Int64 HMATERID;              // int --物料
        public Int64 HCURRENTUNITID;        // int --当前单位
        public Int64 HDESTUNITID;           // int --目标单位
        public string HCONVERTTYPE;         // varchar(20) --类型
        public double HCONVERTNUMERATOR;    // dec(23, 10) --分子
        public double HCONVERTDENOMINATOR;  // dec(23, 10) --分母
        public string HFORBIDSTATUS;        // varchar(10) --״̬
    }
}

 WarM/ÌõÂë´òÓ¡/Kf_WeighToBarCode.cs

@@ -14,9 +14,6 @@
using System.IO.Ports;
using System.Linq;

using System.IO.Ports;
using System.Linq;

namespace WarM
{
    public partial class Kf_WeighToBarCode : Form
@@ -54,13 +51,6 @@
        public DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();


        private static string repeatData = string.Empty;
        private SerialPort ComDevice = null;
        private int HGetWeight = 0;
        private string Message = "";
        private int timeIndex = 0;

        #region  //固定代码

@@ -191,228 +181,6 @@
            DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
            DBUtility.Xt_BaseBillFun.DefaultGridView(grdSub, this.Name + "grdSub");
        }


        //打开串口
        private void button3_Click(object sender, EventArgs e)
        {
            OpenCom();
        }
        public void OpenCom()
        {
            //初始化串口
            ComDevice = new SerialPort();
            ComDevice.DataReceived += new SerialDataReceivedEventHandler(Com_DataReceived);//绑定事件
            string[] PortNames = SerialPort.GetPortNames();


            if (!ComDevice.IsOpen)
            {

                try
                {
                    ComDevice.PortName = txtPortName.Text;
                    ComDevice.BaudRate = int.Parse(txtBaudRate.Text);
                    switch (cmbParity.SelectedItem.ToString())
                    {
                        case "0":
                            ComDevice.Parity = Parity.None;
                            break;
                        case "1":
                            ComDevice.Parity = Parity.Odd;
                            break;
                        case "2":
                            ComDevice.Parity = Parity.Even;
                            break;
                        case "3":
                            ComDevice.Parity = Parity.Mark;
                            break;
                        case "4":
                            ComDevice.Parity = Parity.Space;
                            break;
                        default:
                            break;
                    }

                    ComDevice.DataBits = int.Parse(txtDataBits.Text);
                    switch (cmbStopBits.SelectedItem.ToString())
                    {
                        case "0":
                            ComDevice.StopBits = StopBits.None;
                            break;
                        case "1":
                            ComDevice.StopBits = StopBits.One;
                            break;
                        case "2":
                            ComDevice.StopBits = StopBits.Two;
                            break;
                        case "1.5":
                            ComDevice.StopBits = StopBits.OnePointFive;
                            break;
                        default:
                            break;
                    }

                    ComDevice.Open();

                    //lblComStatus.Text = "串口状态：开启";
                    timer3.Enabled = true;
                }
                catch (Exception ex)
                {
                    MessageBox.Show("打开串口失败！" + ex.Message, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
                    return;
                }
            }
            else
            {

            }
        }

        //关闭串口
        private void button2_Click(object sender, EventArgs e)
        {
            CloseCom();
        }
        public void CloseCom()
        {
            if (!ComDevice.IsOpen)
            {

            }
            else
            {
                try
                {
                    timer3.Enabled = false;
                    Thread.Sleep(100);
                    ComDevice.Close();
                    //   valueCounts = new Dictionary<string, int>();
                    // lblComStatus.Text = "串口状态：关闭";

                }
                catch (Exception ex)
                {
                    MessageBox.Show(ex.Message, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
                    return;
                }
            }
        }

        //发送数据
        public bool SendData(byte[] data)
        {
            if (ComDevice.IsOpen)
            {
                try
                {
                    ComDevice.Write(data, 0, data.Length);//发送数据 
                    return true;
                }
                catch (Exception ex)
                {
                    MessageBox.Show(ex.Message, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
                }
                finally
                {

                }
            }
            else
            {
                MessageBox.Show("串口未打开", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
            }
            return false;
        }

        //接收数据
        private void Com_DataReceived(object sender, SerialDataReceivedEventArgs e)
        {
            //if (!ComDevice.IsOpen)
            //    {
            //        return;
            //    }
            //    Thread.Sleep(100);
            if (HGetWeight == 1)
            {
                byte[] ReDatas = new byte[ComDevice.BytesToRead];
                ComDevice.Read(ReDatas, 0, ReDatas.Length);//读取数据
                this.AddData(ReDatas);//输出数据
            }
        }

        //处理接收到的数据
        public void AddData(byte[] data)
        {
            //Thread.Sleep(100);
            StringBuilder sb = new StringBuilder();
            sb.Append(Encoding.ASCII.GetString(data));

            var str = sb.ToString();
            str = str.Replace("w", "").Replace("n", "").Replace("kg\r\n", ";");


            if (str != repeatData)
            {
                repeatData = str;
                string[] strArray = str.Split(';');

                for (int i = 0; i < strArray.Length; i++)
                {
                    if (double.TryParse(strArray[i], out double ret))//判断是否是数字
                    {

                        Message += double.Parse(strArray[i]) + ";";

                        //UpdateLabel(ret.ToString());
                    }
                }
            }
        }

        //获取数组中出现频率最高的数据
        private string getMostStr(string message)
        {
            string[] strArray = message.Split(';');
            // ä½¿ç”¨LINQ查询出现次数最多的元素
            var maxElement = strArray.GroupBy(x => x)
                                  .OrderByDescending(g => g.Count())
                                  .First()
                                  .Key;


            return maxElement;
        }

        //依据线程，将数据写入界面组件
        private void UpdateLabel(string text)
        {
            if (txtHWeightQyt.InvokeRequired)
            {
                // åœ¨UI线程上调用 UpdateLabel
                txtHWeightQyt.Invoke(new Action<string>(UpdateLabel), text);
            }
            else
            {
                // ç›´æŽ¥æ›´æ–° txtHWeightQyt.Text
                txtHWeightQyt.Text = text;
            }
        }

        //获取数据按钮，启动计时器
        private void button4_Click(object sender, EventArgs e)
        {
            HGetWeight = 1;
            timer2.Enabled = true;
        }

        //计时器事件
        private void timer2_Tick(object sender, EventArgs e)
        {

        }


        #endregion

@@ -1272,12 +1040,6 @@
                this.txtHRemark.Tag = oBadReason.oModel.HItemID.ToString();
            }
        }







        #endregion


 WarM/ÌõÂë´òÓ¡/Kf_WeighToBarCode.designer.cs

@@ -650,7 +650,6 @@
            this.txtHWeightQyt.Name = "txtHWeightQyt";
            this.txtHWeightQyt.Size = new System.Drawing.Size(190, 28);
            this.txtHWeightQyt.TabIndex = 149;
            this.txtHWeightQyt.TextChanged += new System.EventHandler(this.txtHWeightQyt_TextChanged);
            // 
            // label7
            // 

 WebAPI/Controllers/MateOutController.cs

@@ -2776,6 +2776,162 @@
            }
        }
        #endregion

        #region  æ»žç•™æ—¶é—´æŠ¥è¡¨
        [Route("MaterOutEntryReport/Sc_RetentionTimeReport")]
        [HttpGet]
        public object Sc_RetentionTimeReport(string HBeginDate,string HEndDate,string sWhere, string user)
        {
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Sc_RetentionTimeReport", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sql = "exec h_p_Sc_RetentionTimeReport '" + HBeginDate + "','" + HEndDate + "','" + sWhere + "'";

                ds = oCN.RunProcReturn(sql, "h_p_Sc_RetentionTimeReport");

                DataTable dt = ds.Tables[0];

                //获取列名
                List<object> columnNameList = new List<object>();
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.list = columnNameList;
                objJsonResult.data = ds.Tables;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region  é”€å”®ä»·æ ¼å¯¹æ¯”报表
        [Route("MaterOutEntryReport/Sc_CompareOrderToSelloutReport")]
        [HttpGet]
        public object Sc_CompareOrderToSelloutReport(string HBeginDate, string HEndDate, string sWhere, string user)
        {
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Sc_CompareOrderToSelloutReport", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sql = "exec h_p_Sc_CompareOrderToSelloutReport '" + HBeginDate + "','" + HEndDate + "','" + sWhere + "'";

                ds = oCN.RunProcReturn(sql, "h_p_Sc_CompareOrderToSelloutReport");

                DataTable dt = ds.Tables[0];

                //获取列名
                List<object> columnNameList = new List<object>();
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.list = columnNameList;
                objJsonResult.data = ds.Tables;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region é”€å”®æŽ’名报表
        [Route("MaterOutEntryReport/Xs_SellOutMoneyRangeReport")]
        [HttpGet]
        public object Xs_SellOutMoneyRangeReport(string sWhere, string user)
        {
            try
            {
                if (!DBUtility.ClsPub.Security_Log("Xs_SellOutMoneyRangeReport", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                List<object> columnNameList = new List<object>();

                if (sWhere == null || sWhere.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "请选择有效年份";
                    return objJsonResult;
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_Xs_SellOutMoneyRangeReport '" + sWhere + "'", "h_p_Xs_SellOutMoneyRangeReport");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #endregion

    }

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_UnitConvertRateController.cs

New file
@@ -0,0 +1,307 @@
using DBUtility;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
using WebAPI.Models;

namespace WebAPI.Controllers
{
    public class Gy_UnitConvertRateController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
        const string ModCaption = "单位换算";
        public const string ModRightName = "Gy_UnitConvertRate";
        public const string ModRightNameDelete = ModRightName + "_Delete";  //删除
        public DataSet ds = new DataSet();
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();


        #region å•ä½æ¢ç®—列表
        /// <summary>
        /// èŽ·å–单位换算列表信息
        /// </summary>
        /// <returns></returns>
        [Route("Gy_UnitConvertRateController/GetGy_UnitConvertRateList_Json")]
        [HttpGet]
        public object GetGy_UnitConvertRateList_Json(string sWhere, string HMaker, string OperationType)
        {
            try
            {
                //判断权限  1为直接列表模块打开  2为从其他模块跳转打开列表
                if (OperationType == "1")
                {
                    //判断权限
                    if (!DBUtility.ClsPub.Security_Log(ModRightName, 1, false, HMaker))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "您没有该模块权限,请与管理员联系！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }

                //返回列表信息
                ds = oCn.RunProcReturn("select * from h_v_Gy_UnitConvertRateList where " + sWhere + " order by HItemID desc", "h_v_Gy_UnitConvertRateList");
                List<object> columnNameList = new List<object>();
                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //获取到DataColumn列对象的列名
                }
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "成功！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "查询列表信息失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å•ä½æ¢ç®—删除
        /// <summary>
        /// åˆ é™¤å•ä½æ¢ç®—
        /// </summary>
        /// <returns></returns>
        [Route("Gy_UnitConvertRateController/GetGy_UnitConvertRate_Delete_Json")]
        [HttpGet]
        public object GetGy_UnitConvertRate_Delete_Json(Int64 HItemID, string HMaker)
        {
            try
            {
                //判断权限
                if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, HMaker))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "您没有该模块删除功能权限,请与管理员联系！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCn.BeginTran();
                //判断存在性
                ds = oCn.RunProcReturn("select HNumber,HName from Gy_UnitConvertRate with(nolock) where HItemID= " + HItemID.ToString(), "Gy_UnitConvertRate");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    oCn.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未查询到该单位换算，请刷新数据后重新选择！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    oCn.RunProc("Delete from Gy_UnitConvertRate where HItemID= " + HItemID.ToString(), ref DBUtility.ClsPub.sExeReturnInfo);
                    //写入日志
                    DBUtility.ClsPub.Add_Log("", "删除单位换算，代码：" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HNumber"]) + ",名称：" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HName"]), HMaker);
                    oCn.Commit();
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除单位换算成功！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                oCn.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除单位换算失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å•ä½æ¢ç®—批量同步
        /// <summary>
        /// ä»Žé‡‘蝶云批量同步单位换算至本地表
        /// </summary>
        [Route("Gy_UnitConvertRateController/GetGy_UnitConvertRate_BatchSync_Json")]
        [HttpGet]
        public object GetGy_UnitConvertRate_BatchSync_Json()
        {
            try
            {
                //获取系统参数
                string sErrMsg = "";
                if (oSystemParameter.ShowBill(ref sErrMsg) == true)
                {
                    //系统参数是否为私有云模式,N为公有云模式，Y为私有云模式
                    //私有云模式，通过调用存储过程进行同步
                    if (oSystemParameter.omodel.WMS_CloudMode.ToUpper() == "Y")
                    {
                        ds = oCn.RunProcReturn("exec h_p_IFCLD_ERPDataToLocal_UnitConvertRate", "h_p_IFCLD_ERPDataToLocal_UnitConvertRate");
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "单位换算批量同步成功！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //公有云模式，通过调用WEBAPI方式进行同步
                    else if (oSystemParameter.omodel.WMS_CloudMode.ToUpper() == "N")
                    {
                        //判断金蝶云是否登录成功
                        var loginRet = InvokeHelper.Login();
                        var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                        //判断是否登录成功
                        if (isSuccess <= 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "批量同步失败，金蝶云登入不成功，请确认C盘配置文件所设置金蝶云对应网址、账套、登录用户、登录密码是否正确！";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }

                        var json = new
                        {
                            FormId = "BD_UNITCONVERTRATE",
                            FieldKeys = "FUNITCONVERTRATEID,FBILLNO,FMATERIALID,FUSEORGID,FCREATEORGID,FFORBIDSTATUS" +
                            ",FCURRENTUNITID,FDESTUNITID,FCONVERTTYPE,FCONVERTNUMERATOR,FCONVERTDENOMINATOR" +
                            ",FCREATORID,FCREATEDATE,FMODIFIERID,FMODIFYDATE,FAPPROVERID,FAPPROVEDATE,FFORBIDDERID,FFORBIDDATE",
                            FilterString = "",
                            OrderString = "",
                            TopRowCount = 0,
                            StartRow = 0,
                            Limit = 0
                        };
                        //查看 èŽ·å–数据                    
                        var _result = InvokeHelper.Query("BD_UNITCONVERTRATE", JsonConvert.SerializeObject(json));

                        //反序列化
                        _result = _result.Replace("\"", "");
                        _result = _result.Replace("\n", "");
                        _result = _result.Replace(",[", "");
                        _result = _result.Replace("[", "");
                        string[] rows = _result.Split(new string[] { "]" }, StringSplitOptions.RemoveEmptyEntries); //以"]"分隔每一行并移除空行
                        string[,] arr = new string[rows.Length, rows[0].Split(',').Length]; //根据行和列数创建二维数组
                        for (int i = 0; i < rows.Length; i++) //遍历每一行
                        {
                            string[] cols = rows[i].Split(','); //以逗号分隔每一列
                            for (int j = 0; j < cols.Length; j++) //遍历每一列
                            {
                                arr[i, j] = cols[j]; //存入二维数组
                            }
                        }
                        //清空单位换算表数据
                        oCn.RunProc("Delete from Gy_UnitConvertRate", ref DBUtility.ClsPub.sExeReturnInfo);

                        //输出二维数组
                        for (int i = 0; i < arr.GetLength(0); i++)
                        {
                            var subData = new
                            {
                                HItemID = DBUtility.ClsPub.isLong(arr[i, 0]),
                                HNumber = "",
                                HName = "",
                                HShortNumber = "",
                                HParentID = 0,
                                HLevel = 1,
                                HEndFlag = 1,
                                HStopflag = arr[i, 5].ToString() == "B" ? 1 : 0,
                                HRemark = "CLD-ERP导入",
                                HUseFlag = "已使用",
                                HUSEORGID = DBUtility.ClsPub.isLong(arr[i, 3]),
                                HCREATEORGID = DBUtility.ClsPub.isLong(arr[i, 4]),
                                HBILLNO = DBUtility.ClsPub.isStrNull(arr[i, 1]),
                                HMATERID = DBUtility.ClsPub.isLong(arr[i, 2]),
                                HCURRENTUNITID = DBUtility.ClsPub.isLong(arr[i, 6]),
                                HDESTUNITID = DBUtility.ClsPub.isLong(arr[i, 7]),
                                HCONVERTTYPE = DBUtility.ClsPub.isStrNull(arr[i, 8]),
                                HCONVERTNUMERATOR = DBUtility.ClsPub.isDoule(arr[i, 9]),
                                HCONVERTDENOMINATOR = DBUtility.ClsPub.isDoule(arr[i, 10]),
                                HFORBIDSTATUS = DBUtility.ClsPub.isStrNull(arr[i, 5]),
                                HUnitID = DBUtility.ClsPub.isLong(arr[i, 2] == "0" ? arr[i, 6] : "-1"),
                                HMakeEmp = DBUtility.ClsPub.isStrNull(arr[i, 11]),
                                HMakeTime = DBUtility.ClsPub.isDate(arr[i, 12]),
                                HCheckEmp = DBUtility.ClsPub.isStrNull(arr[i, 15]),
                                HCheckTime = DBUtility.ClsPub.isDate(arr[i, 16]),
                                HModifyEmp = DBUtility.ClsPub.isStrNull(arr[i, 13]),
                                HModifyTime = DBUtility.ClsPub.isDate(arr[i, 14]),
                                HStopEmp = DBUtility.ClsPub.isStrNull(arr[i, 17]),
                                HStopTime = DBUtility.ClsPub.isDate(arr[i, 18]),
                            };

                            //写入单位换算表数据
                            oCn.RunProc("set identity_insert Gy_UnitConvertRate on", ref DBUtility.ClsPub.sExeReturnInfo);
                            string sql = $@"Insert into Gy_UnitConvertRate 
                                    (HItemID,HNumber,HName,HShortNumber,HParentID,HLevel
                                    ,HEndFlag,HStopflag,HRemark,HUseFlag,HUSEORGID,HCREATEORGID
                                    ,HBILLNO,HMATERID,HCURRENTUNITID,HDESTUNITID,HCONVERTTYPE,HCONVERTNUMERATOR
                                    ,HCONVERTDENOMINATOR,HFORBIDSTATUS,HUnitID
                                    ,HMakeEmp,HMakeTime
                                    ,HCheckEmp,HCheckTime
                                    ,HModifyEmp,HModifyTime
                                    ,HStopEmp,HStopTime)
                                    Values({subData.HItemID},'{subData.HNumber}','{subData.HName}','{subData.HShortNumber}',{subData.HParentID},{subData.HLevel}
                                    ,{subData.HEndFlag},{subData.HStopflag},'{subData.HRemark}','{subData.HUseFlag}',{subData.HUSEORGID},{subData.HCREATEORGID}
                                    ,'{subData.HBILLNO}',{subData.HMATERID},{subData.HCURRENTUNITID},{subData.HDESTUNITID},{subData.HCONVERTTYPE},{subData.HCONVERTNUMERATOR}
                                    ,{subData.HCONVERTDENOMINATOR},'{subData.HFORBIDSTATUS}',{subData.HUnitID}
                                    ,'{subData.HMakeEmp}',case when '{subData.HMakeTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HMakeTime}' end
                                    ,'{subData.HCheckEmp}',case when '{subData.HCheckTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HCheckTime}' end
                                    ,'{subData.HModifyEmp}',case when '{subData.HModifyTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HModifyTime}' end
                                    ,'{subData.HStopEmp}',case when '{subData.HStopTime}' = '1900/1/1 0:00:00' then NULL else '{subData.HStopTime}' end)";
                            oCn.RunProc(sql.Replace("\r\n", ""));
                            oCn.RunProc("set identity_insert Gy_UnitConvertRate off", ref DBUtility.ClsPub.sExeReturnInfo);
                        }
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "单位换算批量同步成功！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "不支持批量同步功能！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "获取系统参数失败！ " + sErrMsg;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "单位换算批量同步失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion

    }
}

 WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs

@@ -7443,6 +7443,65 @@
        #endregion

        #region å®¢æˆ·æ¡ç æ‰«æè®°å½•å•
        #region å®¢æˆ·æ¡ç æ‰«æè®°å½•å• åˆ¤æ–­å•æ®å·æ˜¯å¦ä¸ºç¼“存列表中的单据号，是 åˆ™æˆåŠŸå¹¶è¿”回数据，否 åˆ™åˆ¤æ–­å¤±è´¥ã€‚
        [Route("WEBSController/Gy_getCusBarCodeBill_judgeHBillNoIsInTempList")]
        [HttpGet]
        public object Gy_getCusBarCodeBill_judgeHBillNoIsInTempList(Int64 HInterID, string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
        {
            try
            {
                //判断修改后的单据号，与原内码，是否存在对应已经上传的单据信息
                string sql = "select * from Gy_getCusBarCodeBillMain " +
                    "where HInterID = " + HInterID + " " +
                    "and HBillNo = '" + HBillNo + "' " +
                    "and HBillType = '" + HBillType + "' " +
                    "and HMaker = '" + HMaker + "' " +
                    "and HOrgID = " + HStockOrgID;
                DataSet ds = oCn.RunProcReturn(sql, "Gy_getCusBarCodeBillMain");
                if(ds!=null && ds.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "修改失败！原因：修改单据号与内码对应的单据已经提交！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //判断修改后的单据号，与原内码，是否存在对应已经上传的单据信息
                string sql1 = "select top(1)* from Gy_getCusBarCodeBill_Temp " +
                    "where HBillNo = '" + HBillNo + "' " +
                    "and HBillType = '" + HBillType + "' " +
                    "and HMaker = '" + HMaker + "' " +
                    "and HOrgID = " + HStockOrgID;
                DataSet ds1 = oCn.RunProcReturn(sql1, "Gy_getCusBarCodeBill_Temp");
                if (ds1 != null && ds1.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "成功";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "成功";
                    objJsonResult.data = ds1.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "修改失败！原因：" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å®¢æˆ·æ¡ç æ‰«æè®°å½•å• æ‰«ææ¡ç 
        /// <summary>
        /// ç”Ÿäº§ç»„托单模块 æ‰«ææ‰˜æ¡ç 
@@ -8056,12 +8115,12 @@

                if (sWhere == null || sWhere == "")
                {
                    sql = "select top(1000)* from h_v_Gy_getCusBarCodeBillList_Query order by åˆ¶å•æ—¥æœŸ desc";
                    sql = "select * from h_v_Gy_getCusBarCodeBillList_Query order by åˆ¶å•æ—¥æœŸ desc";
                    ds = oCn.RunProcReturn(sql, "h_v_Gy_getCusBarCodeBillList_Query");
                }
                else
                {
                    sql = "select top(1000)* from h_v_Gy_getCusBarCodeBillList_Query where 1=1 " + sWhere + " order by åˆ¶å•æ—¥æœŸ desc";
                    sql = "select * from h_v_Gy_getCusBarCodeBillList_Query where 1=1 " + sWhere + " order by åˆ¶å•æ—¥æœŸ desc";
                    ds = oCn.RunProcReturn(sql, "h_v_Gy_getCusBarCodeBillList_Query");
                }

@@ -8101,6 +8160,497 @@
            }
        }
        #endregion

        #region å®¢æˆ·æ¡ç æ‰«æè®°å½•å• ç»´æŠ¤åˆ—表-条码列表

        /// <summary>
        /// è¿”回组托列表信息
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/Gy_getCusBarCodeBill_rushedBarCodeList_CodeList")]
        [HttpGet]
        public object Gy_getCusBarCodeBill_rushedBarCodeList_CodeList(long HInterID, string HBillNo, string HBillType, long HOrgID)
        {
            try
            {
                string sql = "select * from Gy_getCusBarCodeBill_Temp where HBillNo = '" + HBillNo + "' and HBillType = '" + HBillType + "' and HOrgID = " + HOrgID + " Order by HDate desc";
                ds = oCn.RunProcReturn(sql, "Gy_getCusBarCodeBill_Temp");
                if (ds == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    List<object> columnNameList = new List<object>();
                    //添加列名
                    foreach (DataColumn col in ds.Tables[0].Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        columnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //获取到DataColumn列对象的列名
                    }
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "获取列表信息失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion
        #endregion

        #region æ‰«ç éªŒè¯å•
        #region æ‰«ç éªŒè¯å• æ‰«ç ç‰©æ–™æ¡ç 
        [Route("WEBSController/Gy_BarCodeConfirmBill_rushBarCode")]
        [HttpGet]
        public object Gy_BarCodeConfirmBill_rushBarCode(Int64 HInterID, string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID, string HBarCode)
        {
            DataSet ds;
            try
            {
                string sql = "exec h_p_Gy_BarCodeConfirmBill_rushBarCode " + HInterID + ",'" + HBillNo + "','" + HBillType + "','" + HMaker + "'," + HStockOrgID + ",'" + HBarCode + "'";
                ds = oCn.RunProcReturn(sql, "h_p_Gy_BarCodeConfirmBill_rushBarCode");
                if(ds==null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "扫描条码失败！原因：扫码条码错误，请寻找IT人员！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "扫描条码失败！原因：" + ds.Tables[0].Rows[0]["HRemark"].ToString();
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "成功";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "扫描条码失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region æ‰«ç éªŒè¯å• è¿”回扫描条码列表信息
        [Route("WEBSController/Gy_BarCodeConfirmBill_rushedBarCodeList")]
        [HttpGet]
        public object Gy_BarCodeConfirmBill_rushedBarCodeList(long HInterID, string HBillNo, string HBillType, long HOrgID)
        {
            try
            {
                string sql = "select * from h_v_Gy_BarCodeConfirmBillTempList_singleBill " +
                    "where HInterID = " + HInterID + " and å•æ®å· = '" + HBillNo + "' and HBillType = '" + HBillType + "' and HOrgID = " + HOrgID + " Order by æ‰«ç æ—¶é—´ desc";
                ds = oCn.RunProcReturn(sql, "h_v_Gy_BarCodeConfirmBillTempList_singleBill");
                if (ds == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    List<object> columnNameList = new List<object>();
                    //添加列名
                    foreach (DataColumn col in ds.Tables[0].Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        columnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //获取到DataColumn列对象的列名
                    }
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "获取列表信息失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion

        #region æ‰«ç éªŒè¯å• åˆ é™¤æ‰«ç è®°å½•

        /// <summary>
        /// åˆ é™¤æ˜Žç»†è¡¨ä½“选中行记录
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/Gy_BarCodeConfirmBill_DeleteRushedBarCodeList")]
        [HttpGet]
        public object Gy_BarCodeConfirmBill_DeleteRushedBarCodeList(Int64 HInterID, string HBillNo, string HBillType, string HBarCode, string HMaker, Int64 HStockOrgID)
        {
            try
            {
                string sql = "delete from Gy_BarCodeConfirmBillTempList " +
                    "where HInterID = " + HInterID + "" +
                    " and HBillNo = '" + HBillNo + "'" +
                    " and HBillType = '" + HBillType + "'" +
                    " and HStockOrgID = " + HStockOrgID + "" +
                    " and HBarCode = '" + HBarCode + "'";
                oCn.RunProc(sql);

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功！";  //成功！
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion

        #region æ‰«ç éªŒè¯å• è¿”回缓存列表信息
        [Route("WEBSController/Gy_BarCodeConfirmBill_TempList")]
        [HttpGet]
        public object Gy_BarCodeConfirmBill_TempList(string HBillType, string HMaker, long HStockOrgID)
        {
            DataSet ds;
            try
            {
                string sql = "exec h_p_Gy_BarCodeConfirmBill_TempList '" + HBillType + "','" + HMaker + "'," + HStockOrgID;
                ds = oCn.RunProcReturn(sql, "h_p_Gy_BarCodeConfirmBill_TempList");
                if (ds == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据缓存记录查询失败！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    List<object> columnNameList = new List<object>();
                    //添加列名
                    foreach (DataColumn col in ds.Tables[0].Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        columnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //获取到DataColumn列对象的列名
                    }
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取缓存信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "获取缓存列表信息失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion

        #region æ‰«ç éªŒè¯å• åˆ é™¤ç¼“存记录

        /// <summary>
        /// åˆ é™¤æ˜Žç»†è¡¨ä½“选中行记录
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/Gy_BarCodeConfirmBill_DeleteTempListNote")]
        [HttpGet]
        public object Gy_BarCodeConfirmBill_DeleteTempListNote(Int64 HInterID, string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
        {
            DataSet ds;
            try
            {
                //删除前控制============================================================================================================================
                string sql_beforeDeleteTempListNote = "exec h_p_Gy_BarCodeConfirmBill_beforeDeleteTempListNote " + HInterID + ",'" + HBillNo + "','" + HBillType + "'," + HStockOrgID + ",'" + HMaker + "'";
                ds = oCn.RunProcReturn(sql_beforeDeleteTempListNote, "h_p_Gy_BarCodeConfirmBill_beforeDeleteTempListNote");

                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "删除失败！原因：删除前控制失败，请寻找网络管理人员";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "删除失败！原因：" + ds.Tables[0].Rows[0]["HRemark"].ToString();
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //=============================================================================================================================================

                //开启事务
                oCn.BeginTran();

                string sql = "delete from Gy_BarCodeConfirmBillTempList where " +
                    " HInterID = " + HInterID + "" +
                    " and HBillNo = '" + HBillNo + "'" +
                    " and HBillType = '" + HBillType + "'" +
                    " and HStockOrgID = " + HStockOrgID + "";
                oCn.RunProc(sql);

                //删除后控制============================================================================================================================
                string sql_afterDeleteTempListNote = "exec h_p_Gy_BarCodeConfirmBill_afterDeleteTempListNote " + HInterID + ",'" + HBillNo + "','" + HBillType + "'," + HStockOrgID + ",'" + HMaker + "'";
                ds = oCn.RunProcReturn(sql_afterDeleteTempListNote, "h_p_Gy_BarCodeConfirmBill_afterDeleteTempListNote");

                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "删除失败！原因：删除后控制失败，请寻找网络管理人员";
                    objJsonResult.data = null;

                    oCn.RollBack();
                    return objJsonResult;
                }
                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "删除失败！原因：" + ds.Tables[0].Rows[0]["HRemark"].ToString();
                    objJsonResult.data = null;

                    oCn.RollBack();
                    return objJsonResult;
                }
                //=============================================================================================================================================

                oCn.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功！";  //成功！
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCn.RollBack();

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region æ‰«ç éªŒè¯å• ç»´æŠ¤åˆ—表

        /// <summary>
        /// è¿”回组托缓存列表信息
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/Gy_BarCodeConfirmBillList")]
        [HttpGet]
        public object Gy_BarCodeConfirmBillList(string sWhere, string user)
        {
            DataSet ds;
            try
            {
                string sql = "";

                if (sWhere == null || sWhere == "")
                {
                    sql = "select * from h_v_Gy_BarCodeConfirmBillList_Query order by æ—¥æœŸ desc";
                    ds = oCn.RunProcReturn(sql, "h_v_Gy_BarCodeConfirmBillList_Query");
                }
                else
                {
                    sql = "select * from h_v_Gy_BarCodeConfirmBillList_Query where 1=1 " + sWhere + " order by æ—¥æœŸ desc";
                    ds = oCn.RunProcReturn(sql, "h_v_Gy_BarCodeConfirmBillList_Query");
                }

                if (ds == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询失败！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    List<object> columnNameList = new List<object>();
                    //添加列名
                    foreach (DataColumn col in ds.Tables[0].Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        columnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //获取到DataColumn列对象的列名
                    }
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "查询成功！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "查询失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region æ‰«ç éªŒè¯å• ç»´æŠ¤åˆ—表-条码列表-扫码列表

        /// <summary>
        /// è¿”回组托列表信息
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/Gy_BarCodeConfirmBill_rushedBarCodeList_CodeList")]
        [HttpGet]
        public object Gy_BarCodeConfirmBill_rushedBarCodeList_CodeList(long HSourceInterID, string HSourceEntryID, string HSourceBillType, long HOrgID)
        {
            try
            {
                string sql = "select * from Gy_BarCodeConfirmBillTempList where HSourceInterID = " + HSourceInterID + " and HSourceEntryID = " + HSourceEntryID + " and HSourceBillType = '" + HSourceBillType + "' and HStockOrgID = " + HOrgID + " Order by HMakeDate desc";
                ds = oCn.RunProcReturn(sql, "Gy_BarCodeConfirmBillTempList");
                if (ds == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    List<object> columnNameList = new List<object>();
                    //添加列名
                    foreach (DataColumn col in ds.Tables[0].Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        columnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //获取到DataColumn列对象的列名
                    }
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "获取列表信息失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion

        #region æ‰«ç éªŒè¯å• ç»´æŠ¤åˆ—表-条码列表-未扫码列表

        /// <summary>
        /// è¿”回组托列表信息
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/Gy_BarCodeConfirmBill_rushedBarCodeList_waitCodeList")]
        [HttpGet]
        public object Gy_BarCodeConfirmBill_rushedBarCodeList_waitCodeList(long HSourceInterID, string HSourceEntryID, string HSourceBillType, long HOrgID)
        {
            try
            {
                string sql = "exec h_p_Gy_BarCodeConfirmBill_waitRushBarCodeList " + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillType + "'," + HOrgID;
                ds = oCn.RunProcReturn(sql, "h_p_Gy_BarCodeConfirmBill_waitRushBarCodeList");
                if (ds == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    List<object> columnNameList = new List<object>();
                    //添加列名
                    foreach (DataColumn col in ds.Tables[0].Columns)
                    {
                        Type dataType = col.DataType;
                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                        columnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //获取到DataColumn列对象的列名
                    }
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "获取列表信息失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        #endregion
        #endregion
    }
}

 WebAPI/InvokeHelper.cs

@@ -16,9 +16,17 @@
        /// </summary>
        public static string Login()
        {
            var dbId = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DbId");
            var useName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "UserName");
            var pwd = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "PassWord");
            //从C盘配置文件获取 CLOUD网址、账套信息、登录用户、登录密码
            Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo);
            var useName = Pub_Class.ClsPub.sCLOUDUseName;
            var pwd = Pub_Class.ClsPub.sCLOUDPsd;
            var dbId = Pub_Class.ClsPub.sCLOUDAcc;
            CloudUrl = Pub_Class.ClsPub.sCLOUDUrl;

            //原从Config/kdapi.config模块中获取    20240712屏蔽
            //var dbId = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "DbId");
            //var useName = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "UserName");
            //var pwd = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "PassWord");
            HttpClient httpClient = new HttpClient();
            httpClient.Url = string.Concat(CloudUrl, "Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc");

@@ -215,6 +223,9 @@
            return httpClient.SyncRequest();
        }

        /// <summary>
        /// å•æ®æŸ¥è¯¢
        /// </summary>
        public static string Query(string formId, string content)
        {
            HttpClient httpClient = new HttpClient();

 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml

@@ -10,7 +10,7 @@
    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
    <LastUsedPlatform>x86</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>G:\issWeb\网站发布\API</PublishUrl>
    <PublishUrl>D:\网站发布\智云MESWMS\API</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <SiteUrlToLaunchAfterPublish />
  </PropertyGroup>

 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -9,7 +9,10 @@
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>04/15/2024 12:55:47</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="bin/Aliyun.Credentials.dll">
      <publishTime>12/05/2022 15:40:12</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.dll">
      <publishTime>02/22/2013 16:43:40</publishTime>
@@ -81,7 +84,7 @@
      <publishTime>08/25/2021 10:28:25</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>04/15/2024 12:55:44</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
      <publishTime>09/20/2018 19:23:20</publishTime>
@@ -115,7 +118,7 @@
      <publishTime>07/12/2024 08:46:30</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>04/15/2024 12:55:45</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>09/07/2014 18:39:38</publishTime>
@@ -214,8 +217,14 @@
    <File Include="bin/System.Net.Http.dll">
      <publishTime>09/26/2012 03:16:08</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Extensions.dll">
      <publishTime>02/20/2015 04:10:46</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Formatting.dll">
      <publishTime>11/28/2018 21:00:36</publishTime>
    </File>
    <File Include="bin/System.Net.Http.Primitives.dll">
      <publishTime>02/20/2015 04:10:46</publishTime>
    </File>
    <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
      <publishTime>09/19/2018 03:38:10</publishTime>
@@ -251,7 +260,7 @@
      <publishTime>11/28/2018 21:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>04/15/2024 12:55:45</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 12:02:18</publishTime>
@@ -306,58 +315,58 @@
      <publishTime>11/29/2018 21:26:30</publishTime>
    </File>
    <File Include="Config/kdapi.config">
      <publishTime>04/15/2024 12:55:43</publishTime>
      <publishTime>04/06/2023 15:57:01</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>04/15/2024 12:55:43</publishTime>
      <publishTime>04/06/2023 15:57:01</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>04/15/2024 12:55:43</publishTime>
      <publishTime>04/06/2023 15:57:01</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>04/15/2024 12:55:43</publishTime>
      <publishTime>04/06/2023 15:57:01</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>04/15/2024 12:55:44</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>04/15/2024 12:55:44</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>04/15/2024 12:55:44</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>04/15/2024 12:55:44</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>04/15/2024 12:55:44</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>04/15/2024 12:55:44</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>04/15/2024 12:55:45</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>04/15/2024 12:55:45</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>04/15/2024 12:55:45</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>04/15/2024 12:55:47</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>04/15/2024 12:55:47</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>04/15/2024 12:55:47</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>04/15/2024 12:55:47</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>04/15/2024 12:55:45</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="grpc_csharp_ext.x64.dll">
      <publishTime>03/22/2022 13:17:22</publishTime>
@@ -366,7 +375,7 @@
      <publishTime>03/22/2022 13:17:22</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>04/15/2024 12:55:45</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="libgrpc_csharp_ext.x64.dylib">
      <publishTime>03/19/2022 07:38:44</publishTime>
@@ -375,121 +384,121 @@
      <publishTime>03/19/2022 07:38:42</publishTime>
    </File>
    <File Include="libman.json">
      <publishTime>04/15/2024 12:55:47</publishTime>
      <publishTime>07/12/2023 08:14:21</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>04/15/2024 12:55:45</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>06/25/2024 12:46:38</publishTime>
      <publishTime>06/25/2024 13:29:13</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>04/15/2024 12:55:46</publishTime>
      <publishTime>04/06/2023 15:57:02</publishTime>
    </File>
    <File Include="Web References/WebS/Reference.cs">
      <publishTime>12/20/2021 13:19:56</publishTime>
    </File>
    <File Include="Web References/WebS/Reference.map">
      <publishTime>04/29/2024 08:30:03</publishTime>
      <publishTime>05/06/2024 13:47:57</publishTime>
    </File>
    <File Include="Web References/WebS/WebService1.disco">
      <publishTime>12/20/2021 13:19:56</publishTime>

 WebAPI/Web.config

@@ -22,7 +22,7 @@
        <!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
        <!--<add key="FileIP" value="http://localhost:8080/" />-->
        <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
        <!--<add key="sUrl" value="http://192.168.0.81/WEBS-WMS/WebService1.asmx"/>   é¢œå°å¼æœº-->
        <add key="sUrl" value="http://192.168.0.81/WEBS-WMS/WebService1.asmx"/> <!--颜台式机-->
        <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> å¤å®-->
        <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
        <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    åšæ—¥ç§‘技-->
@@ -35,7 +35,7 @@
        <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> -->    <!--测试服务器-->
        <!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/>    æœ¬åœ°-->
        <!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>-->    <!--陈雯静本地配置-->
        <add key="surl" value="http://localhost/webs-web/webservice1.asmx"/>    <!--翁涛涛本地配置-->
        <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx"/>-->    <!--翁涛涛本地配置-->
        <!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>九菱-->
        <!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--斯莫尔-->
        

 WebAPI/WebAPI.csproj

@@ -573,6 +573,7 @@
    <Compile Include="Controllers\基础资料\基础资料\Gy_TaxRateBillController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Gy_WorkController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Gy_WorkStationBillController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Gy_UnitConvertRateController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Xt_CheckFlowBillController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Xt_CheckFlowProgressBillController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Xt_CheckItemBillController.cs" />