1

duhe

2023-07-24 4e9ec8d46bc8edb7cda3f6633f4bdd6b9bbc0085

1

 WarM/±¨±í·ÖÎö/Kf_BarCodeOutInReport.cs

@@ -35,6 +35,8 @@
            dtpHEDate.Value = DateTime.Today;
            //加载单据类型信息
            Sub_AddBillTypeList();
            //加载组织信息
            Sub_AddOrdList();
        }

        //加载单据类型信息
@@ -54,6 +56,25 @@
                cmbBillType.Items.Add(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HBillTypeName"]));
            }
            cmbBillType.Text = "全部";
        }
        //加载组织信息
        private void Sub_AddOrdList()
        {
            DataSet ds;
            DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
            ds = oClsGy_ORGANIZATIONS_View.GetList();
            if (ds == null || ds.Tables[0].Rows.Count == 0)
            {
                MessageBox.Show("获取组织失败");
                return;
            }
            cmbHOrgID.Items.Clear();
            cmbHOrgID.Items.Add("全部");
            for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
            {
                cmbHOrgID.Items.Add(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HName"]));
            }
            cmbHOrgID.Text = "全部";
        }

        //设置报表名称
@@ -184,6 +205,7 @@
            sDlgWhere = sDlgWhere + ",'" + txtHSPName.Text + "'";
            sDlgWhere = sDlgWhere + ",'" + txtHSourceBillNo.Text + "'";
            sDlgWhere = sDlgWhere + ",'" + txtHMaker.Text + "'";
            sDlgWhere = sDlgWhere + ",'" + cmbHOrgID.Text + "'";
            if (sDlgWhere.Trim().Length > 0)
            {
                sDlgWhere = sDlgWhere.Substring(1, sDlgWhere.Length - 1);

 WarM/±¨±í·ÖÎö/Kf_BarCodeOutInReport.designer.cs

@@ -53,6 +53,7 @@
            this.grdMain = new System.Windows.Forms.DataGridView();
            this.groupBox1 = new System.Windows.Forms.GroupBox();
            this.txtHSourceBillNo = new System.Windows.Forms.TextBox();
            this.txtHMaker = new System.Windows.Forms.TextBox();
            this.txtHBillNo = new System.Windows.Forms.TextBox();
            this.dtpHBDate = new System.Windows.Forms.DateTimePicker();
            this.cmbBillType = new System.Windows.Forms.ComboBox();
@@ -63,6 +64,7 @@
            this.txtHSPName = new System.Windows.Forms.TextBox();
            this.txtHWHName = new System.Windows.Forms.TextBox();
            this.label9 = new System.Windows.Forms.Label();
            this.label11 = new System.Windows.Forms.Label();
            this.label8 = new System.Windows.Forms.Label();
            this.label7 = new System.Windows.Forms.Label();
            this.label10 = new System.Windows.Forms.Label();
@@ -72,8 +74,8 @@
            this.label6 = new System.Windows.Forms.Label();
            this.label2 = new System.Windows.Forms.Label();
            this.label3 = new System.Windows.Forms.Label();
            this.label11 = new System.Windows.Forms.Label();
            this.txtHMaker = new System.Windows.Forms.TextBox();
            this.cmbHOrgID = new System.Windows.Forms.ComboBox();
            this.label12 = new System.Windows.Forms.Label();
            this.Tool.SuspendLayout();
            this.pPic.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
@@ -315,6 +317,8 @@
            // groupBox1
            // 
            this.groupBox1.BackColor = System.Drawing.Color.Lavender;
            this.groupBox1.Controls.Add(this.cmbHOrgID);
            this.groupBox1.Controls.Add(this.label12);
            this.groupBox1.Controls.Add(this.txtHSourceBillNo);
            this.groupBox1.Controls.Add(this.txtHMaker);
            this.groupBox1.Controls.Add(this.txtHBillNo);
@@ -350,6 +354,13 @@
            this.txtHSourceBillNo.Name = "txtHSourceBillNo";
            this.txtHSourceBillNo.Size = new System.Drawing.Size(122, 21);
            this.txtHSourceBillNo.TabIndex = 69;
            // 
            // txtHMaker
            // 
            this.txtHMaker.Location = new System.Drawing.Point(804, 40);
            this.txtHMaker.Name = "txtHMaker";
            this.txtHMaker.Size = new System.Drawing.Size(122, 21);
            this.txtHMaker.TabIndex = 67;
            // 
            // txtHBillNo
            // 
@@ -430,6 +441,16 @@
            this.label9.Size = new System.Drawing.Size(65, 12);
            this.label9.TabIndex = 68;
            this.label9.Text = "源单单号：";
            // 
            // label11
            // 
            this.label11.AutoSize = true;
            this.label11.BackColor = System.Drawing.Color.Transparent;
            this.label11.Location = new System.Drawing.Point(752, 44);
            this.label11.Name = "label11";
            this.label11.Size = new System.Drawing.Size(53, 12);
            this.label11.TabIndex = 66;
            this.label11.Text = "制单人：";
            // 
            // label8
            // 
@@ -521,22 +542,24 @@
            this.label3.TabIndex = 56;
            this.label3.Text = "仓 ä½ï¼š";
            // 
            // label11
            // cmbHOrgID
            // 
            this.label11.AutoSize = true;
            this.label11.BackColor = System.Drawing.Color.Transparent;
            this.label11.Location = new System.Drawing.Point(752, 44);
            this.label11.Name = "label11";
            this.label11.Size = new System.Drawing.Size(53, 12);
            this.label11.TabIndex = 66;
            this.label11.Text = "制单人：";
            this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbHOrgID.FormattingEnabled = true;
            this.cmbHOrgID.Location = new System.Drawing.Point(993, 40);
            this.cmbHOrgID.Name = "cmbHOrgID";
            this.cmbHOrgID.Size = new System.Drawing.Size(122, 20);
            this.cmbHOrgID.TabIndex = 87;
            // 
            // txtHMaker
            // label12
            // 
            this.txtHMaker.Location = new System.Drawing.Point(804, 40);
            this.txtHMaker.Name = "txtHMaker";
            this.txtHMaker.Size = new System.Drawing.Size(122, 21);
            this.txtHMaker.TabIndex = 67;
            this.label12.AutoSize = true;
            this.label12.ForeColor = System.Drawing.Color.Black;
            this.label12.Location = new System.Drawing.Point(931, 44);
            this.label12.Name = "label12";
            this.label12.Size = new System.Drawing.Size(65, 12);
            this.label12.TabIndex = 86;
            this.label12.Text = "组    ç»‡ï¼š";
            // 
            // Kf_BarCodeOutInReport
            // 
@@ -610,5 +633,7 @@
        private System.Windows.Forms.ToolStripButton dc;
        public System.Windows.Forms.TextBox txtHMaker;
        private System.Windows.Forms.Label label11;
        private System.Windows.Forms.ComboBox cmbHOrgID;
        private System.Windows.Forms.Label label12;
    }
}

 WebAPI/Controllers/MateOutController.cs

@@ -15,6 +15,8 @@
using WebAPI;
using WebAPI.Code;
using WebAPI.Models;
using static WebAPI.Controllers.基础资料.基础资料.Gy_DutyBillController;

namespace WebAPI.Controllers
{
    public class MateOutController : ApiController
@@ -1461,8 +1463,6 @@
        }
        #endregion



        #region æŸ“厂汇总报表

        #region æŸ“厂汇总报表
@@ -1698,6 +1698,313 @@
        }
        #endregion

        #region  ç”Ÿäº§å…¥åº“报表
        [Route("MaterOutEntryReport/sc_ICOMRKReport")]
        [HttpGet]
        public object sc_ICOMRKReport(string sWhere)
        {
            try
            {
                string sql = "select * from  h_v_sc_ICOMRKReport where 1=1  " + sWhere + " order by æ—¥æœŸ ";

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

                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 = dt;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region  ç”Ÿäº§æ—¥è®°æŠ¥è¡¨
        public class DayRkReport { 
        public string HBeginDate { get; set; }
        public string HEndDate { get; set; }
        public string HMaterNumber { get; set; }
        public string HCustomerName { get; set; }
        public string HProductName { get; set; }
        }
        [Route("MaterOutEntryReport/SC_DayRkReport")]
        [HttpGet]
        public object SC_DayRkReport(string sWhere,int num)
        {
            try
            {
               DayRkReport DayRkReportList = JsonConvert.DeserializeObject<DayRkReport>(sWhere);
              
                string sql = $"exec h_p_Gy_DayRkReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" +
                    $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}'";
                ds = oCN.RunProcReturn(sql, "h_p_Gy_DayRkReport");

                DataTable dt = null;
                if (num == 1)
                {
                    dt = ds.Tables[0];
                }
                else if (num == 2)
                {
                    dt = ds.Tables[1];
                }

                //获取列名
                List<object> columnNameList = new List<object>();
                if (num == 1)
                {
                    //添加列名
                    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列对象的列名
                    }
                }
                else if (num == 2)
                {
                    //添加列名
                    foreach (DataColumn col in ds.Tables[1].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 = dt;
                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/Gy_SourceList")]
        [HttpGet]
        public object Gy_SourceList(string HOrgid)
        {
            try
            {
                string sql1 = string.Format("select hitemid,hnumber,hname from Gy_Source where HUSEORGID="+ HOrgid + " order by hnumber");

                ds = oCN.RunProcReturn(sql1, "Gy_Source");

                List<TreeModel> treeModels = new List<TreeModel>();
                TreeModel first = new TreeModel();
                first.id = "0";
                first.title = "产线设置";
                treeModels.Add(first);

                foreach (DataRow row in ds.Tables[0].Rows)
                {
                    var strLen = row["hitemid"].ToString().Split('.');
                    if (strLen.Length == 1)
                    {
                        TreeModel tree = new TreeModel();
                        tree.id = row["hitemid"].ToString();
                        tree.title = row["hname"].ToString();
                        treeModels[0].children.Add(tree);
                    }
                }
                digui(ds.Tables[0], treeModels[0].children, 2);

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(treeModels);
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        /// <summary>
        /// é€’归函数
        /// </summary>
        public void digui(DataTable dt, List<TreeModel> tree, int num)
        {
            for (int m = 0; m < tree.Count; m++)
            {
                tree[m].children = new List<TreeModel>();
                for (int i = 0; i < dt.Rows.Count; i++)//第一次循环，得到所有根节点的子集
                {
                    var strLen = dt.Rows[i]["hnumber"].ToString().Split('.');
                    if (strLen.Length == num && dt.Rows[i]["hnumber"].ToString().Contains(tree[m].id + "."))
                    {
                        TreeModel tbjson = new TreeModel();
                        tbjson.id = dt.Rows[i]["hitemid"].ToString();
                        tbjson.title = dt.Rows[i]["hname"].ToString();
                        tree[m].children.Add(tbjson);
                    }
                }
                var strLens = tree[m].id.Split('.');
                for (int i = 0; i < tree[m].children.Count; i++)
                {
                    digui(dt, tree[m].children, strLens.Length + 2);//再次用子集去循环，拿出子集的子集
                }
            }

        }
        #endregion

        #region  å·¥åŽ‚日历查询
        [Route("MaterOutEntryReport/Sc_ShopCalendar")]
        [HttpGet]
        public object Sc_ShopCalendar(string sWhere)
        {
            try
            {
                string sql1 = string.Format("select * from h_v_Gy_PlanShiftsList where 1=1 " + sWhere);

                ds = oCN.RunProcReturn(sql1, "h_v_Gy_PlanShiftsList");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                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_ShopCalendarSave")]
        [HttpPost]
        public object Sc_ShopCalendarSave([FromBody] JObject sMainSub)
        {
            try
            {
                var _value = sMainSub["sMainSub"].ToString();
                string msg1 = _value.ToString();
                oCN.BeginTran();
                //保存主表
                objJsonResult = AddBillMain(msg1);
                if (objJsonResult.code == "0")
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = objJsonResult.Message;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "单据保存成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }

        public json AddBillMain(string msg1)
        {
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string hdate = sArray[0].ToString();
            string hvalue = sArray[1].ToString();
            string TagId = sArray[2].ToString();
            string user = sArray[3].ToString();

            try
            {
                if (!DBUtility.ClsPub.Security_Log("Gy_PlanShifts_Edit", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("select * from Gy_PlanShifts where HDate='" + hdate + "'", "Gy_PlanShifts");
                string sql = "";
                if (ds.Tables[0].Rows.Count > 0)
                {
                    sql = $"update Gy_PlanShifts set HOverTimes='" + hvalue + "' where  HDate ='" + hdate + "' and HSourceID=" + TagId;
                }
                else
                {
                    sql = $"insert into Gy_PlanShifts(HDate,HSourceID,HShiftsID,HOverTimes,HClassCount," +
                      "HRemark,HUseFlag)values" +
                      $"('{hdate}','{TagId}',0,'{hvalue}','1'" +
                      $",'','未检测')";
                }

               

                oCN.RunProc(sql);

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = null;
                objJsonResult.data = null;
                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/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormBillController.cs

@@ -42,7 +42,8 @@
                omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);

                ds = oCN.RunProcReturn($"exec h_p_JIT_Sc_WorkBillSortBill_Query '{omdelMian.HPlanBeginDate}',{(omdelMian.HProdORGID == null ? 0 : omdelMian.HProdORGID)},'{omdelMian.HSeOrderBillNo}'" +
                    $",'{omdelMian.HPlanEndDate.AddDays(1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}',{omdelMian.HWorkShopID}", "h_p_JIT_Sc_WorkBillSortBill_Query");
                    $",'{omdelMian.HPlanEndDate.AddDays(1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}',{omdelMian.HWorkShopID}" +
                    $",'{omdelMian.HMastersDate}','{omdelMian.sWheres}'", "h_p_JIT_Sc_WorkBillSortBill_Query");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -286,6 +287,7 @@
                        {
                            SumCount += 1;
                            ////保存子表
                          
                            objJsonResult = AddBillSub(HInterID == 0 ? list[i]["hmainid"].ToString() : HInterID.ToString()
                                , HBillNo == "" ? list[i]["单据号"].ToString() : HBillNo
                                 , DateTime.Parse(DateTime.Now.AddDays(j).ToString("yyyy-MM-dd").ToString())

 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormImportController.cs

@@ -295,10 +295,11 @@
                }

              
                int TrueCount = 0, SumCount = 0;
                

                for (int i = 0; i < list.Count; i++)
                {
                    int TrueCount = 0, SumCount = 0;
                    long HInterID = 0;
                    var HBillNo = "";
                    if (list[i]["单据号"].ToString() == "" && list[i]["hmainid"].ToString() == "")
@@ -326,8 +327,10 @@
                        var HMainSourceEntryID = list[i]["ICMOBillHEntryID"].ToString();
                        var HSeOrderBillNo = list[i]["HSeOrderBillNo"].ToString();

                        ds = oCN.RunProcReturn($"select * from  Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
                          $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}", "Sc_WorkBillSortBillMain");
                        string sql = $"select * from  Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
                          $" and HMainSourceEntryID={HMainSourceEntryID} and HICMOBillNo='{HICMOBillNo}' and HICMOEntrySEQ={HICMOEntrySEQ} and HSourceID={HSourceID}";
                        LogService.Write("sql:" + sql);
                        ds = oCN.RunProcReturn(sql, "Sc_WorkBillSortBillMain");
                        if (ds.Tables[0].Rows.Count > 0)
                        {
                            objJsonResult.code = "0";
@@ -358,6 +361,8 @@

                    for (int j = 0; j < SumDay; j++)
                    {
                        LogService.Write("1:" + list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString());
                        LogService.Write("2:" + DateTime.Now.AddDays(j).ToString("yyyy-MM-dd"));
                        //主表子表都有数据
                        if (list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString() != "")
                        {
@@ -379,16 +384,17 @@
                            objJsonResult = AddBillSub(HInterID.ToString(), HBillNo, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0);
                        }
                    }
                    if (TrueCount != SumCount)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = objJsonResult.Message;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }

                if (TrueCount != SumCount)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = objJsonResult.Message;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
               

                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -410,7 +416,6 @@
        {
            //获取表格数据
            ds = oCN.RunProcReturn($"select * from  h_v_JIT_Sc_WorkBillSortBillList where å•æ®å·='{HBillNo}'", "h_v_JIT_Sc_WorkBillSortBillList");

            int count = 0;
            if (ds.Tables[0].Rows.Count > 0)
            {

 WebAPI/Controllers/Sc_ProcessMangementController.cs

@@ -1075,7 +1075,7 @@
                    FentityModel.Add("FSrcInterId", item["HSourceInterID"].ToString());//  
                    FentityModel.Add("FBasePrdRealQty", item["数量"].ToString());//
                    FentityModel.Add("FIsFinished", "false");//
                    FentityModel.Add("FStockStatusId", new JObject() { ["FNumber"] = "KCZT08_SYS" }); //
                    FentityModel.Add("FStockStatusId", new JObject() { ["FNumber"] = "KCZT001" }); //
                    FentityModel.Add("FSrcEntrySeq", item["HSourceSeQ"].ToString());//  æºå•åˆ†å½•è¡Œå·
                    FentityModel.Add("FMOMAINENTRYID", item["HMOEntryID"].ToString());//
                    FentityModel.Add("FKeeperTypeId", "BD_KeeperOrg");

 WebAPI/Controllers/²Ö´æ¹ÜÀí/ÌõÂëÉú³É/Sc_BarCodeController.cs

@@ -156,6 +156,7 @@
        [HttpGet]
        public object ReportFromBillList(int page, int limit, string sWhere,string HSouceBillType,string HOrgID)
        {
            oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo);
            List<object> columnNameList = new List<object>();
            try
            {
@@ -191,8 +192,16 @@
                        break;
                    case "收料通知单":
                        tabname = "h_v_IF_POInStockBillList_Source";
                        count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by å•æ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
                        sql = string.Format(@"select * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        if (oSystemParameter.omodel.WMS_CampanyName == "瑞与祺")
                        {
                            count = new SQLHelper.ClsCN().RunProcReturn("select top 1000 * from h_v_IF_POInStockBillList_Source " + sWhere + " order by å•æ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
                            sql = string.Format(@"select * from(select  top 1000 row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        }
                        else
                        {
                            count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by å•æ®å· desc,hsubid", tabname).Tables[0].Rows.Count;
                            sql = string.Format(@"select * from(select row_number() over (order by å•æ®å· desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ")   as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
                        }
                        break;
                    case "委外订单":
                        tabname = "h_v_IF_EntrustOrderBillList_Source";
@@ -465,6 +474,7 @@

        public object HSourceOrderList1(DataTable dt, HSouceOrderList ordrlist, string HBarCodeType,string HSourceBillType)
        {
            oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo);
            for (int i = 0; i < dt.Rows.Count; i++)
            {
                ordrlist.HQty = dt.Rows[i]["未生成条码数量"].ToString();
@@ -491,9 +501,12 @@

                if(HSourceBillType == "收料通知单")
                {
                    ordrlist.HFurnaceNO = dt.Rows[i]["炉号"].ToString();
                    ordrlist.HCoilNO = dt.Rows[i]["钢卷捆包号"].ToString();
                    ordrlist.HheatNO = dt.Rows[i]["热处理"].ToString();
                    if (oSystemParameter.omodel.WMS_CampanyName != "瑞与祺")
                    {
                        ordrlist.HFurnaceNO = dt.Rows[i]["炉号"].ToString();
                        ordrlist.HCoilNO = dt.Rows[i]["钢卷捆包号"].ToString();
                        ordrlist.HheatNO = dt.Rows[i]["热处理"].ToString();
                    }
                }

                if (HBarCodeType == "仪器外购件条码容器规则")

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

@@ -2735,5 +2735,97 @@
        #endregion






        #region æŠ¥è¡¨æ•°æ®èŽ·å–方法

        #region æ¡ç å‡ºå…¥åº“记录报表

        #region èŽ·å–单据类型信息
        /// <summary>
        /// èŽ·å–单据类型信息
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/GetBarCodeReport_BillType_Json")]
        [HttpGet]
        public object GetBarCodeReport_BillType_Json()
        {
            try
            {
                ds = oCn.RunProcReturn("exec h_p_WMS_BarCodeReport_BillType ", "h_p_WMS_BarCodeReport_BillType");
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "成功！";
                objJsonResult.data = ds.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>
        /// èŽ·å–条码出入库记录
        /// </summary>
        /// <returns></returns>
        [Route("WEBSController/GetKf_BarCodeOutInReport_Json")]
        [HttpGet]
        public object GetKf_BarCodeOutInReport_Json(string sWhere)
        {
            try
            {
                ds = oCn.RunProcReturn("exec h_p_Kf_BarCodeOutInReport_New " + sWhere, "h_p_Kf_BarCodeOutInReport_New");
                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


        #endregion


    }
}

 WebAPI/Controllers/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillController.cs

@@ -1146,13 +1146,13 @@
        #region ç”Ÿäº§ä»»åŠ¡å•èŽ·å–车间
        [Route("Sc_ICMOBill/GetHDeptList")]
        [HttpGet]
        public object GetHDeptList()
        public object GetHDeptList(string HOrgID)
        {
            try
            {
                DataSet oDs = new DataSet();
                //==========
                oDs = oCN.RunProcReturn("select HItemID,HName from Gy_Department", "Gy_Department");
                oDs = oCN.RunProcReturn("select HItemID,HName from Gy_Department where HUSEORGID="+ HOrgID, "Gy_Department");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取成功！";

 WebAPI/Models/Sc_WorkBillSortBillMain.cs

@@ -67,5 +67,7 @@
        public string HICMOEntryID_Sec { get; set; }
        public string HOrderType { get; set; }
        public string HMonthPlanFlag { get; set; }
        public string HMastersDate { get; set; }
        public string sWheres { get; set; }
    }
}