From b5995a148f7a9e66b7042313487b1d76e07e0845 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 28 六月 2022 08:44:38 +0800
Subject: [PATCH] 新增了采购看板、缺料看板、车间看板

---
 WebAPI/Controllers/WebAPIController.cs | 1784 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 1,717 insertions(+), 67 deletions(-)

diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 6998c6c..1594131 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1,6 +1,8 @@
 锘縰sing DAL;
 using DBUtility;
 using Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
 using SQLHelper;
 using System;
@@ -23,7 +25,9 @@
         public DataSet ds = new DataSet();
         private json objjson = new json();
         private json objJsonResult = new json();
-      //  private POInStockBillServices oclscg_poinstockbillmain = new POInStockBillServices();
+        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+        //public static string sUrl = "http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx";
+        //  private POInStockBillServices oclscg_poinstockbillmain = new POInStockBillServices();
         /// <summary>
         /// 閫佽揣鍗曡〃澶翠俊鎭�
         /// </summary>
@@ -75,15 +79,65 @@
                 return objjson;
             }
         }
+
+
+
+        //[Route("Web/Get_MaxBillNoAndID")]
+        //[HttpGet]
+        //public object Get_MaxBillNoAndID(string HBillType)
+        //{
+        //    try
+        //    {
+        //        string HBillNo = "";
+        //        Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
+        //        HInterID = DBUtility.ClsPub.CreateBillID(HBillType, ref DBUtility.ClsPub.sExeReturnInfo);
+        //        HBillNo = DBUtility.ClsPub.CreateBillCode(HBillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+        //        //----------鍒涘缓铏氳〃------------------------
+        //        DataTable dt_Main = new DataTable("Json");
+        //        dt_Main.Columns.Add("HBillNo", typeof(string));
+        //        dt_Main.Columns.Add("HInterID", typeof(int));
+        //        //---------鍒涘缓鏂拌------------------------
+        //        DataRow dr_main = dt_Main.NewRow();//鍒涘缓鏂拌 
+        //        dt_Main.Rows.Add(dr_main);//灏嗘柊琛屽姞鍏ュ埌琛ㄤ腑
+        //        dr_main["HBillNo"] = DBUtility.ClsPub.isStrNull(HBillNo);
+        //        dr_main["HInterID"] = DBUtility.ClsPub.isLong(HInterID);
+
+        //        if (HBillNo == null || HInterID == 0)
+        //        {
+        //            objjson.code = "0";
+        //            objjson.count = 0;
+        //            objjson.Message = "鑾峰彇澶辫触";
+        //            objjson.data = null;
+        //            return objjson;
+        //        }
+        //        else
+        //        {
+        //            objjson.code = "0";
+        //            objjson.count = 1;
+        //            objjson.Message = "鑾峰彇鎴愬姛";
+        //            objjson.data = dt_Main;
+        //            return objjson;
+        //        }
+        //    }
+        //    catch (Exception e)
+        //    {
+        //        objjson.code = "0";
+        //        objjson.count = 0;
+        //        objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+        //        objjson.data = null;
+        //        return objjson;
+        //    }
+        //}
         /// <summary>
         /// 鐧诲綍
         /// </summary>
         /// <param name="UserName">鐢ㄦ埛鍚�</param>
         /// <param name="PassWord">瀵嗙爜</param>
+        /// <param name="PassWord">缁勭粐</param>
         /// <returns></returns>
         [Route("Web/GetUser")]
         [HttpGet]
-        public object GetUser(string UserName, string PassWord)
+        public object GetUser(string UserName, string PassWord, string HOrgName)
         {
             try
             {
@@ -99,21 +153,31 @@
                     objjson.data = null;
                     return objjson;
                 }
-                else
-                {
-                    objjson.code = "0";
-                    objjson.count = 1;
-                    objjson.Message = "鐧诲綍鎴愬姛锛�";
-                    objjson.data = ds.Tables[0];
-                    return objjson;
-                }
+                string sql = string.Format(@" select a.* from Gy_UserByOrgRelation a
+                                              where a.HUserID = '{0}' and a.HOrgID = '{1}'", UserName, HOrgName);
+                DataSet _ds = oCnLoc.RunProcReturn(sql, "h_p_Xt_UserRelationOrg_Check");
+                //if (_ds == null || _ds.Tables[0].Rows.Count == 0)
+                //{
+                //    objjson.code = "0";
+                //    objjson.count = 0;
+                //    objjson.Message = "鐢ㄦ埛" + UserName + "娌℃湁璇ョ粍缁囨潈闄�";
+                //    objjson.data = null;
+                //    return objjson;
+                //}
+
+                objjson.code = "0";
+                objjson.count = 1;
+                objjson.Message = "鐧诲綍鎴愬姛锛�";
+                objjson.data = ds.Tables[0];
+                return objjson;
+
             }
-            catch (Exception)
+            catch (Exception e)
             {
 
                 objjson.code = "0";
                 objjson.count = 0;
-                objjson.Message = "鐧诲綍寮傚父锛�";
+                objjson.Message = "鐧诲綍寮傚父锛�"+e.Message;
                 objjson.data = null;
                 return objjson; ;
             }
@@ -170,6 +234,45 @@
                 objjson.data = null;
                 return objjson; ;
             }
+        }
+
+
+
+        //鎾ら攢缂撳瓨鍒楄〃璁板綍
+        [Route("Web/Rescind_Json")]
+        [HttpGet]
+        public object Rescind_Json(long sHInterID, string sBillNo, string sBillType)
+        {
+            string sErrMsg = string.Empty;
+            try
+            {
+                if (webserver.RescindBillList(sHInterID, sBillNo, sBillType, ref sErrMsg))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍒犻櫎澶辫触锛�"; 
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
+            catch (Exception)
+            {
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
         }
 
 
@@ -291,6 +394,159 @@
         }
 
 
+
+        //鏍规嵁鎷栨潯鐮佽繑鍥炴潯鐮佹。妗堣〃鍞竴鐮佷俊鎭�
+        [Route("GroupOrder/GetBillEntry_TmpListGroupOrder")]
+        [HttpGet]
+        public object GetBillEntry_TmpListGroupOrder(string HBarCode)
+        {
+            try
+            {
+                ds = webserver.GetBarCode(HBarCode);
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+                }
+                else
+                {
+                    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;
+            }
+        }
+
+
+
+        //鏍规嵁缃戞牸閫変腑璁板綍鍘讳慨鏀规潯鐮佹。妗堛�佺粍鎵樺崟瀛愯〃璁板綍骞堕噸鏂扮敓鎴愮粍鎵樺崟sum琛�
+        [Route("GroupOrderBill/Edit")]
+        [HttpGet]
+        public object Edit(string HBarCode1, Int64 HQty)
+        {
+
+            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+            try
+            {
+                oCN.RunProc("update Gy_BarCodeBill set HQty = " + HQty.ToString() + " where HBarCode = '" + HBarCode1 + "'");
+                oCN.RunProc("update Sc_PackUnionBillSub set HQty = " + HQty.ToString() + " where HBarCode = '" + HBarCode1 + "'");
+                DataSet ds = oCN.RunProcReturn("exec h_p_DisPlayBarCode '" + HBarCode1 + "'", "h_p_DisPlayBarCode");
+
+                long HInterIDTTM = 0;
+                long HInterID = 0;
+                string HBarCode_Pack = "";
+                string HBarCode = "";
+                string HUser = "";
+                HInterIDTTM = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HInterID_TTM"]);
+                HBarCode_Pack = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBarCode_Pack"]);
+                HUser = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HMaker"]);
+                HInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HInterID"]);
+                oCN.RunProc("exec  h_p_WMS_PackUnionBill_SumSubBill  " + HInterIDTTM.ToString() + ",'" + HBarCode_Pack + "','3783','" + HUser + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 SUM琛紝SUM鏉$爜妗f
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "淇敼鎴愬姛锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            //DataSet DS1 = webserver.GetBarCode(HBarCode);                                                                                                                                                                            //HSPID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSPID"]);
+
+            //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+            //if (DS1 == null || DS1.Tables[0].Rows.Count <= 0)
+            //    {
+            //        objjson.code = "0";
+            //        objjson.count = 0;
+            //        objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+            //        objjson.data = null;
+            //        return objjson;
+            //    }
+            //    else
+            //    {
+            //        objjson.code = "0";
+            //        objjson.count = 1;
+            //        objjson.Message = "鑾峰彇鎴愬姛!";
+            //        objjson.data = DS1.Tables[0];
+            //        return objjson;
+            //    }
+            //}
+            catch (Exception ex)
+            {
+
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
+        //鏍规嵁缃戞牸閫変腑璁板綍鐨勫敮涓�鐮�  鍘诲垹闄ゆ潯鐮佹。妗�  缁勬墭鍗曞瓙琛�   缁勬墭鍗晄um琛ㄧ殑鍞竴鐮佹暟鎹�
+        [Route("GroupOrderBill/Delete")]
+        [HttpGet]
+        public object Delete(string HBarCode1)
+        {
+
+            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+            try
+            {
+                oCN.RunProc("delete from  Gy_BarCodeBill  where HBarCode = '" + HBarCode1 + "'");
+                oCN.RunProc("delete from Sc_PackUnionBillSub  where HBarCode = '" + HBarCode1 + "'");
+                oCN.RunProc("delete from Sc_PackUnionBillSub_Sum  where HBarCode = '" + HBarCode1 + "'");                                                                               //HSPID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSPID"]);
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+            //if (DS1 == null || DS1.Tables[0].Rows.Count <= 0)
+            //    {
+            //        objjson.code = "0";
+            //        objjson.count = 0;
+            //        objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+            //        objjson.data = null;
+            //        return objjson;
+            //    }
+            //    else
+            //    {
+            //        objjson.code = "0";
+            //        objjson.count = 1;
+            //        objjson.Message = "鑾峰彇鎴愬姛!";
+            //        objjson.data = DS1.Tables[0];
+            //        return objjson;
+            //    }
+            //}
+            catch (Exception ex)
+            {
+
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鍒犻櫎澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
+
         //鏍规嵁榛戠偣/鐧界偣杩斿洖涓嶈壇浠g爜銆佷笉鑹唴鐮�
         [Route("Web/GetHWBDot")]
         [HttpGet]
@@ -370,11 +626,58 @@
             //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
             if (Warehouse != "")
             {
-                sWhere = sWhere + " and ( HNumber like '%" + Warehouse + "%' or HName like '%" + Warehouse + "%' ) ";
+                sWhere = sWhere + " and ( HNumber like '%" + Warehouse + "%' or HName like '%" + Warehouse + "%'  or HUSEORGID like '%" + Warehouse + "%' ) ";
             }
             try
             {
                 ds = webserver.GetWarehouseList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
+        /// <summary>
+        /// 鑾峰彇浠撳簱鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetWarehouseList_Json_New")]
+        [HttpGet]
+        public object GetWarehouseList_Json_New(string Warehouse, Int64 HOrgID)
+        {
+            sWhere = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID =" + HOrgID + "";
+            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+            if (Warehouse != "")
+            {
+                sWhere = sWhere + " and ( HNumber like '%" + Warehouse + "%' or HName like '%" + Warehouse + "%'  or HUSEORGID like '%" + Warehouse + "%' ) ";
+            }
+
+            try
+            {
+                WebS.WebService1 oWeb = new WebS.WebService1();
+                ds = oWeb.GetWarehouseList(sWhere, ref DBUtility.ClsPub.sErrInfo);
                 if (ds == null || ds.Tables[0].Rows.Count <= 0)
                 {
                     objjson.code = "0";
@@ -468,6 +771,72 @@
             }
         }
 
+
+        /// <summary>
+        /// 鑾峰彇浠撲綅鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetStockPlaceList_Json_NEW")]
+        [HttpGet]
+        public object GetStockPlaceList_Json_NEW(string StockPlace, Int64 HWhID,Int64 HOrgID)
+        {
+            WebS.WebService1 oWeb = new WebS.WebService1();
+            sWhere = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID = " + HOrgID + "";
+            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+            if (HWhID == 0)
+            {
+                if (StockPlace != "")
+                {
+                    sWhere = " Where HStopFlag=0  and ( HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%' ) ";
+                }
+                else
+                {
+                    sWhere = " Where HStopFlag=0 ";
+                }
+            }
+            else
+            {
+                if (StockPlace != "")
+                {
+                    sWhere = " Where HStopFlag=0 and HWHID=" + HWhID.ToString() + " and HWHID=" + HWhID.ToString() + " and ( HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%' ) ";
+                }
+                else
+                {
+                    sWhere = " Where HStopFlag=0 and HWHID=" + HWhID.ToString();
+                }
+            }
+            try
+            {
+                //ds = webserver.GetStockPlaceList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+                ds = oWeb.GetStockPlaceList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
         /// <summary>
         /// /鎵弿浠撲綅浜岀淮鐮佸甫鍑轰粨搴撲粨浣�
         /// </summary>
@@ -512,23 +881,26 @@
             }
         }
 
+
         /// <summary>
         /// 鑾峰彇渚涘簲鍟嗗垪琛�
         /// </summary>
         /// <returns></returns>
         [Route("Web/GetSupplierList_Json")]
         [HttpGet]
-        public object GetSupplierList_Json(string Supplier)
+        public object GetSupplierList_Json(string Supplier, Int64 HOrgID)
         {
-            sWhere = " Where HStopFlag=0  and HEndFlag=1";
+            sWhere = " Where HStopFlag=0  and HEndFlag=1 and HUSEORGID =" + HOrgID + "";
             //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
             if (Supplier != "")
             {
-                sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' ) ";
+                sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' or HUSEORGID like '%" + Supplier + "%' ) ";
             }
             try
             {
-                ds = webserver.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+                WebS.WebService1 oWeb = new WebS.WebService1();
+                ds = oWeb.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+                //ds = webserver.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
                 if (ds == null || ds.Tables[0].Rows.Count <= 0)
                 {
                     objjson.code = "0";
@@ -706,20 +1078,61 @@
             }
         }
 
+
+        /// <summary>
+        /// 鑾峰彇缁勭粐鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetOrganizationList_Json")]
+        [HttpGet]
+        public object GetOrganizationList_Json()
+        {
+            WebS.WebService1 oWebs1 = new WebS.WebService1();
+            //sWhere = " Where HStopFlag=0  and HEndFlag=1";
+            ////sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+            //if (Organization != "")
+            //{
+            //    sWhere = sWhere + " and ( HNumber like '%" + Organization + "%' or HName like '%" + Organization + "%' ) ";
+            //}
+            try
+            {
+                ds = oWebs1.get_ORGANIZATIONSList();
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
         /// <summary>
         /// 鑾峰彇鐗╂枡鍒楄〃
         /// </summary>
         /// <returns></returns>
         [Route("Web/GetMaterialList_Json")]
         [HttpGet]
-        public object GetMaterialList_Json(string Material)
+        public object GetMaterialList_Json(string sWhere)
         {
-            sWhere = " Where HStopFlag=0  and HEndFlag=1";
-            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
-            if (Material != "")
-            {
-                sWhere = sWhere + " and ( HNumber like '%" + Material + "%' or HName like '%" + Material + "%' ) ";
-            }
             try
             {
                 ds = webserver.GetMaterialList(sWhere, ref DBUtility.ClsPub.sErrInfo);
@@ -870,7 +1283,7 @@
             //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
             if (sWhere != "")
             {
-                sWhere = sWhere + " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
+                sWhere = " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
             }
             try
             {
@@ -934,6 +1347,61 @@
                 return objjson; ;
             }
         }
+
+        #region 浜х嚎涓績鍒楄〃鏌ヨ
+        [Route("Web/Gy_LineCenter_Json")]
+        [HttpGet]
+        public object Gy_LineCenter_Json(string BadReason)
+        {
+            if (BadReason != "")
+            {
+                sWhere = sWhere + " and ( HNumber like '%" + BadReason + "%' or HName like '%" + BadReason + "%' ) ";
+            }
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                if (sWhere == null || sWhere.Equals(""))
+
+                {
+                    ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName  from Gy_LineCenter where HStopflag=0 Order by HItemID ", "Gy_LineCenter");
+                }
+                else
+                {
+                    string sql1 = "Select HItemID,HNumber ,HName  from Gy_LineCenter where HStopflag=0 and HEndFlag=1 ";
+                    string sql = sql1 + sWhere;
+                    ds = oCN.RunProcReturn(sql, "Gy_LineCenter");
+                    sWhere = "";
+                }
+
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
+        #endregion
 
         #region 涓嶈壇鍘熷洜璁剧疆鍒楄〃/淇濆瓨/缂栬緫/鍒犻櫎鏂规硶
         /// <summary>
@@ -1008,18 +1476,29 @@
         {
             DataSet ds;
             var _value = msg["msg"].ToString();
-            string msg1 = _value.ToString();
-            //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
-            //string msg2 = sArray[0].ToString();
-            //string msg3 = sArray[1].ToString();
+            string msg3 = _value.ToString();
+            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            string msg1 = sArray[0].ToString();
+            string msg2 = sArray[1].ToString();
+
+            //鏌ョ湅鏉冮檺
+            if (!DBUtility.ClsPub.Security_Log("Gy_BadReason_Edit", 1, false, msg2))
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
             Int64 HItemID = 0;
             SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
             //鑾峰彇鏈�澶D鍊艰祴鍊�
             DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_BadReason ", "Gy_BadReason");
-            if (Maxds!=null||Maxds.Tables[0].Rows.Count > 0)
+            if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
             {
                 //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
-                var maxid=Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
+                var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
                 maxid += 1;
                 HItemID = maxid;
             }
@@ -1049,7 +1528,7 @@
                         objJsonResult.data = 1;
                         return objJsonResult;
                     }
-                    if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()) )
+                    if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()))
                     {
                         objJsonResult.code = "0";
                         objJsonResult.count = 0;
@@ -1058,9 +1537,9 @@
                         return objJsonResult;
                     }
                     //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
-                    
-                    ds = oCN.RunProcReturn("select * from  Gy_BadReason where HStopflag=0 and HNumber='" + oItem.HNumber.Trim()+"'", "Gy_BadReason");
-                    if ( oItem.HNumber.Trim()=="" )
+
+                    ds = oCN.RunProcReturn("select * from  Gy_BadReason where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_BadReason");
+                    if (oItem.HNumber.Trim() == "")
                     {
                         objJsonResult.code = "0";
                         objJsonResult.count = 0;
@@ -1069,7 +1548,7 @@
                         return objJsonResult;
                     }
                     //鏂板鏃跺垽鏂�
-                    if (oItem.HItemID==0)
+                    if (oItem.HItemID == 0)
                     {
                         if (ds == null || ds.Tables[0].Rows.Count == 0)
                         {
@@ -1144,11 +1623,11 @@
                     }
                     oItem.HShortNumber = sShortNumber;//鐭唬鐮�
                     oItem.HEndFlag = true;//鏈骇鏍囧織
-                    oItem.HLevel= DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
+                    oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
 
                     oBill.oModel = oItem;
                 }
-         
+
                 //淇濆瓨
                 //淇濆瓨瀹屾瘯鍚庡鐞�
                 bool bResult;
@@ -1207,21 +1686,21 @@
         /// <returns></returns>
         [Route("DeltetGy_BadReason")]
         [HttpGet]
-        public object DeltetGy_BadReason(string HItemID)
+        public object DeltetGy_BadReason(string HItemID,string user)
         {
             DataSet ds;
             //string ModRightNameCheck = "Sc_ProcessReport_check";
             try
             {
                 //鍒犻櫎鏉冮檺
-                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
-                //{
-                //    objJsonResult.code = "0";
-                //    objJsonResult.count = 0;
-                //    objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
-                //    objJsonResult.data = null;
-                //    return objJsonResult;
-                //}
+                if (!DBUtility.ClsPub.Security_Log("Gy_BadReason_Delete", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
 
                 SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                 if (string.IsNullOrWhiteSpace(HItemID))
@@ -1234,7 +1713,7 @@
                 }
                 oCN.BeginTran();//寮�濮嬩簨鍔�
                 ds = oCN.RunProcReturn("select * from Gy_BadReason where HItemID=" + HItemID, "Gy_BadReason");
-                if (ds == null || ds.Tables[0].Rows.Count == 0 )
+                if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
@@ -1242,22 +1721,22 @@
                     objJsonResult.data = null;
                     return objJsonResult; ;
                 }
-                var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
-                if (HStopflag)
-                {
-                    oCN.RollBack();//鍥炴粴浜嬪姟
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
+                //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
+                //if (HStopflag)
+                //{
+                //    oCN.RollBack();//鍥炴粴浜嬪姟
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
 
-                oCN.RunProc("update Gy_BadReason set HStopflag=1 where HItemID=" + HItemID);
+                oCN.RunProc("delete Gy_BadReason where HItemID=" + HItemID);
                 oCN.Commit();//鎻愪氦浜嬪姟
                 objJsonResult.code = "0";
                 objJsonResult.count = 1;
-                objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
+                objJsonResult.Message = "鏁版嵁鍒犻櫎鎴愬姛锛�";
                 objJsonResult.data = null;
                 return objJsonResult; ;
 
@@ -1273,6 +1752,67 @@
         }
 
         #endregion
+
+        /// <summary>
+        /// 鎶ュ簾鍘熷洜
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetScrapReasonList_Json")]
+        [HttpGet]
+        public object GetScrapReasonList_Json(string BadReason)
+        {
+            //sWhere = " Where HStopFlag=0  and HEndFlag=1";
+            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+            if (BadReason != "" && BadReason != null)
+            {
+                sWhere = sWhere + " and ( HNumber like '%" + BadReason + "%' or HName like '%" + BadReason + "%' ) ";
+            }
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                if (sWhere == null || sWhere.Equals(""))
+
+                {
+                    ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName  from Gy_ScrapReason where HStopflag=0 Order by HItemID ", "Gy_ScrapReason");
+                }
+                else
+                {
+                    string sql1 = "Select HItemID,HNumber ,HName  from Gy_ScrapReason where HStopflag=0 and HEndFlag=1 ";
+                    string sql = sql1 + sWhere;
+                    ds = oCN.RunProcReturn(sql, "Gy_ScrapReason");
+                }
+
+                //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
         /// <summary>
         /// 鑾峰彇宸ュ簭璁″垝鍗曞垪琛�
         /// </summary>
@@ -1548,7 +2088,7 @@
         }
 
         /// <summary>
-        /// 鑾峰彇鏍哥畻鏂瑰紡鍒楄〃
+        /// 鑾峰彇鏍哥畻鏂瑰紡缁勫垪琛�
         /// </summary>
         /// <returns></returns>
         [Route("Web/GetClassTimePrjGroupList_Json")]
@@ -1603,6 +2143,155 @@
                 objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
                 objjson.data = null;
                 return objjson;
+            }
+        }
+
+        [Route("Web/GetClassTimePrjGroupBillList_Json")]
+        [HttpGet]
+        public object GetClassTimePrjGroupBillList_Json(string sWhere,string user)
+        {
+            if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user))
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                string sql = "Select a.HItemID ,HNumber 鏍哥畻鏂瑰紡缁勪唬鐮�,HName 鏍哥畻鏂瑰紡缁勫悕绉�,HDeptID,b.閮ㄩ棬鍚嶇О 閮ㄩ棬 from Gy_ClassTimePrjGroup a left join h_v_Gy_Department b on a.HDeptID=b.HItemID";
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
+                }
+                else
+                {
+                    sql = sql + sWhere;
+                    ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
+                }
+
+                //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);
+
+
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+        #region 鍒犻櫎鏍哥畻鏂瑰紡缁�
+        /// <summary>
+        /// 鏍哥畻鏂瑰紡鍒楄〃鍒犻櫎鎸夐挳
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Web/DeleteClassTimePrjGroupBillList")]
+        [HttpGet]
+        public object DeleteClassTimePrjGroupBillList(long HItemID, string User)
+        {
+            try
+            {
+                if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj_Delete", 1, false, User))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                oCN.BeginTran();
+                string sql = "delete from Gy_ClassTimePrjGroup where HItemID =" + HItemID;
+                oCN.RunProc(sql);
+                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 = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+        /// <summary>
+        /// 淇濆瓨鑾峰彇鏍哥畻鏂瑰紡缁�
+        /// </summary>
+        /// <param name="msg"></param>
+        /// <returns></returns>
+        [Route("Web/SaveGetClassTimePrjGroupList")]
+        [HttpGet]
+        public object SaveGetClassTimePrjGroupList(string HNumber,string HName,string HDeptID,string refSav,string user,string HItem)
+        {
+           
+            try
+            {
+                int HItemID = int.Parse(HItem);
+                //缂栬緫鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log_second("Gy_ClassTimePrj", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                string sql="";
+                if (refSav== "Add")
+                {
+                  sql = "Insert Into Gy_ClassTimePrjGroup   " +
+                "(HNumber,HName,HStopflag,HRemark,HShortNumber,HParentID,HLevel" +
+                ",HEndFlag,HHelpCode,HDeptID,HGroupID,HUseFlag" +
+                ") " +
+                " values('" + HNumber + "','" + HName + "','','',0,0,0,0,''," + HDeptID + ",0,'鏈娇鐢�'" + ") ";
+                }
+                else
+                {
+                    sql = "UpDate Gy_ClassTimePrjGroup set HNumber='" + HNumber + "',HName='" + HName + "',HDeptID=" + HDeptID+ " where HItemID="+ HItemID;
+                }
+                oCN.RunProc(sql);
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "淇濆瓨鎴愬姛";
+                objJsonResult.data = 1;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+                objJsonResult.data = 1;
+                return objJsonResult;
             }
         }
 
@@ -1666,29 +2355,81 @@
         }
 
         /// <summary>
+        /// 鑾峰彇鐐规椤圭洰鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetCheckItemList_Json")]
+        [HttpGet]
+        public object GetCheckItemList_Json(string CheckItem)
+        {
+            DataSet ds;
+            try
+            {
+                sWhere = " Where HStopFlag=0  and HEndFlag=1";
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
+                if (CheckItem != "" && CheckItem != null)
+                {
+                    sWhere = sWhere + " and ( HNumber like '%" + CheckItem + "%' or HName like '%" + CheckItem + "%' ) ";
+                    ds = oCN.RunProcReturn("Select HItemID,HNumber,HName  from Gy_DotCheck " + sWhere + " Order by HItemID ", "Gy_DotCheck");
+                }
+                else
+                {
+                    ds = oCN.RunProcReturn("Select HItemID,HNumber,HName  from Gy_DotCheck " + sWhere + " Order by HItemID ", "Gy_DotCheck");
+                }
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+
+
+
+        }
+        /// <summary>
         /// 鑾峰彇鐢熶骇浠诲姟鍗曞垪琛�
         /// </summary>
         /// <returns></returns>
         [Route("Web/GetSc_ICMOBillListView")]
         [HttpGet]
-        public object GetSc_ICMOBillListView(string ICMOBill,int OrganizationID)
+        public object GetSc_ICMOBillListView(string ICMOBill, int OrganizationID)
         {
             if (ICMOBill != "")
             {
-                sWhere = "where 1=1 and 鐢熶骇璁㈠崟鍙� like '%" + ICMOBill + "%' and HSTOCKINORGID=" + OrganizationID;
+                sWhere = " where 1=1 and 鍗曟嵁鍙� like '%" + ICMOBill + "%' ";
             }
             try
             {
                 SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where HSTOCKINORGID=" + OrganizationID, "h_v_S_Sc_ICMOBillList");
+                    ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillList where 1=1 and isnull(瀹℃牳浜�,'')<>'' and isnull(鍏抽棴浜�,'')='' and isnull(琛屽叧闂汉,'')=''  order by 鍗曟嵁鍙� desc,hsubid ", "h_v_IF_ICMOBillList");
                 }
                 else
                 {
-                    string sql1 = "select * from h_v_S_Sc_ICMOBillList ";
-                    string sql = sql1 + sWhere;
-                    ds = oCN.RunProcReturn(sql, "h_v_S_Sc_ICMOBillList");
+                    string sql = "select * from h_v_IF_ICMOBillList " + sWhere + " and isnull(瀹℃牳浜�,'')<>'' and isnull(鍏抽棴浜�,'')='' and isnull(琛屽叧闂汉,'')=''  order by 鍗曟嵁鍙� desc,hsubid ";
+                    ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillList");
                 }
                 if (ds == null || ds.Tables[0].Rows.Count <= 0)
                 {
@@ -1717,6 +2458,915 @@
                 return objjson;
             }
         }
+        /// <summary>
+        /// 鑾峰彇鐢熶骇浠诲姟鍗曞垪琛�
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetSc_ICMOBillListView2")]
+        [HttpGet]
+        public object GetSc_ICMOBillListView2(int page, int limit, string ICMOBill, int OrganizationID)
+        {
+            try
+            {
+                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+                int count = 0;
+                int pageNum = page;
+                int pageSize = limit;
+                string sWhere = "";
+                if (ICMOBill == null || ICMOBill.Equals(""))
+                {
+                    sWhere = " where 1=1";
+                }
+                else
+                {
+                    sWhere = " where 1=1 and 鍗曟嵁鍙� like '%" + ICMOBill + "%'";
+                }
+
+                DataSet ds0 = oCn.RunProcReturn("select count(*) CountNum from h_v_Sc_ICMOBillList " + sWhere + "", "h_v_Sc_ICMOBillList");
+                count = int.Parse(ds0.Tables[0].Rows[0]["CountNum"].ToString());
+                //string sql = string.Format(@"select top " + pageSize + " hmainid,鏃ユ湡,鍗曟嵁鍙�,绠卞彿鏉″舰鐮�,鍑�閲�,姣涢噸,鐨噸,鐢熶骇缁勭粐,閮ㄩ棬,鎿嶄綔鍛�,瀹㈡埛鏍囩鍙�,鐗╂枡浠g爜,鐗╂枡鍚嶇О,璁¢噺鍗曚綅浠g爜,璁¢噺鍗曚綅鍚嶇О,鏁伴噺,鍒跺崟浜�,鍒跺崟鏃ユ湡 from(select row_number() over (order by hmainid desc) as RowNumber,hmainid,鏃ユ湡,鍗曟嵁鍙�,绠卞彿鏉″舰鐮�,鍑�閲�,姣涢噸,鐨噸,鐢熶骇缁勭粐,閮ㄩ棬,鎿嶄綔鍛�,瀹㈡埛鏍囩鍙�,鐗╂枡浠g爜,鐗╂枡鍚嶇О,璁¢噺鍗曚綅浠g爜,璁¢噺鍗曚綅鍚嶇О,鏁伴噺,鍒跺崟浜�,鍒跺崟鏃ユ湡 from h_v_PackUnionBillList " + sWhere + ")   as A where RowNumber >" + pageSize + " *(" + pageNum + "-1)");
+                string sql = string.Format(@"select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(瀹℃牳浜�,'')<>''  order by hmainid   offset ((" + pageNum + "-1)*" + pageSize + ") rows fetch next " + pageSize + " rows only");
+                ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_ICMOBillList");
+                string aa = ds.Tables[0].Columns[0].ToString();
+
+                if (ds.Tables[0].Rows.Count > 0)
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = count;
+                    objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+                    objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" }));  //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏆傛棤璁板綍锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
+            catch (Exception ex)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
+            //if (ICMOBill != "")
+            //{
+            //    sWhere = " where 1=1 and 鍗曟嵁鍙� like '%" + ICMOBill + "%' ";
+            //}
+            //try
+            //{
+            //    SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+            //    if (sWhere == null || sWhere.Equals(""))
+            //    {
+            //        ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillList where 1=1 and isnull(瀹℃牳浜�,'')<>'' order by 鍗曟嵁鍙� desc,hsubid ", "h_v_Sc_ICMOBillList");
+            //    }
+            //    else
+            //    {
+            //        string sql = "select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(瀹℃牳浜�,'')<>'' order by 鍗曟嵁鍙� desc,hsubid ";
+            //        ds = oCN.RunProcReturn(sql, "h_v_Sc_ICMOBillList");
+            //    }
+            //    if (ds == null || ds.Tables[0].Rows.Count <= 0)
+            //    {
+            //        objjson.code = "0";
+            //        objjson.count = 0;
+            //        objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+            //        objjson.data = null;
+            //        return objjson;
+            //    }
+            //    else
+            //    {
+            //        objjson.code = "0";
+            //        objjson.count = 1;
+            //        objjson.Message = "鑾峰彇鎴愬姛!";
+            //        objjson.data = ds.Tables[0];
+            //        return objjson;
+            //    }
+            //}
+            //catch (Exception ex)
+            //{
+
+            //    objjson.code = "0";
+            //    objjson.count = 0;
+            //    objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+            //    objjson.data = null;
+            //    return objjson;
+            //}
+        }
+
+        /// <summary>
+        /// 鑾峰彇宸ュ簭娴佽浆鍗″垪琛�
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetSc_ProcessExchangeBillListView")]
+        [HttpGet]
+        public object GetSc_ProcessExchangeBillListView(string ICMOBill, int OrganizationID)
+        {
+            if (ICMOBill != "")
+            {
+                sWhere = " where 1=1 and 鍗曟嵁鍙� like '%" + ICMOBill + "%' ";
+            }
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList where 1=1 order by 鍗曟嵁鍙� desc,hsubid ", "h_v_Sc_ProcessExchangeBillList");
+                }
+                else
+                {
+                    string sql = "select * from h_v_Sc_ProcessExchangeBillList " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid ";
+                    ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessExchangeBillList");
+                }
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
+        /// <summary>
+        /// 鑾峰彇妫�楠岄」鐩垪琛�
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetGy_QCCheckItem")]
+        [HttpGet]
+        public object GetGy_QCCheckItem(string CheckItem, int OrganizationID)
+        {
+            if (CheckItem != "")
+            {
+                sWhere = " and ( HNumber like '%" + CheckItem + "%' or HName like '%" + CheckItem + "%' ) ";
+            }
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    ds = oCN.RunProcReturn("Select HItemID,HNumber 浠g爜,HName 鍚嶇О ,HQCCheckClassID 妫�楠岄」鐩被鍒� from Gy_QCCheckItem where HStopflag=0 Order by HItemID  ", "Gy_QCCheckItem");
+                }
+                else
+                {
+                    string sql = "Select HItemID,HNumber 浠g爜,HName 鍚嶇О ,HQCCheckClassID 妫�楠岄」鐩被鍒� from Gy_QCCheckItem where HStopflag=0 " + sWhere + "Order by HItemID ";
+                    ds = oCN.RunProcReturn(sql, "Gy_QCCheckItem");
+                }
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
+        /// <summary>
+        /// 鑾峰彇妫�楠屾柟妗堝垪琛�
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetGy_QCCheckProject")]
+        [HttpGet]
+        public object GetGy_QCCheckProject(string CheckProject, int OrganizationID)
+        {
+            if (CheckProject != "")
+            {
+                sWhere = " and ( HBillNo like '%" + CheckProject + "%' or HName like '%" + CheckProject + "%' ) ";
+            }
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                string sql = "Select HinterID HItemID,HBillNo 妫�楠屾柟妗堜唬鐮�,HName 鏂规鍚嶇О from Gy_QCCheckProjectMain where 1 = 1 " + sWhere + "Order by HinterID ";
+                ds = oCN.RunProcReturn(sql, "Gy_QCCheckProjectMain");
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "1";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁妫�楠屾柟妗堜富鍐呯爜鑾峰彇妫�楠岄」鐩�
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetCheckItemByCheckProjectID")]
+        [HttpGet]
+        public object GetCheckItemByCheckProjectID(int CheckProjectID)
+        {
+            if (CheckProjectID <= 0)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "妫�楠屾柟妗堟湭閫夋嫨";
+                objjson.data = null;
+                return objjson;
+            }
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                string sql = "select c.HItemID HQCCheckItemID,c.HName 妫�楠岄」鐩�,b.HQCStd,b.HQCUnit HUnit from Gy_QCCheckProjectMain a left join Gy_QCCheckProjectSub b on a.HInterID = b.HInterID left join Gy_QCCheckItem c on b.HQCCheckItemID = c.HItemID where a.HInterID = " + CheckProjectID;
+                ds = oCN.RunProcReturn(sql, "Gy_QCCheckProjectMain");
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "1";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁鍣ㄥ叿涓诲唴鐮佽幏鍙栧櫒鍏蜂繚鍏绘楠岄」鐩�
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetMaintainItemtemByMouldProjectID")]
+        [HttpGet]
+        public object GetMaintainItemtemByMouldProjectID(int MouldProjectID)
+        {
+            
+            if (MouldProjectID <= 0)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "浜у搧鍣ㄥ叿鏈�夋嫨";
+                objjson.data = null;
+                return objjson;
+            }
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                List<object> list = new List<object>();
+                DataSet ds2;
+                DataSet ds1;
+                string sql1 = string.Format(@"select t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
+                                                from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID 
+                                                left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
+                                                left join Gy_Employee e on e.HItemID=t.HManagerID
+                                                where a.HInterID=(select HMouldMaintainRuleInterID from Gy_MouldFileMain where HInterID=" + MouldProjectID + ") ");
+
+                string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, m.HModel HMaterSpec,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark from Sc_MouldMaintainRuleBillMain a  
+												left join Sc_MouldMaintainRuleBillSub b on a.HInterID=b.HInterID 
+                                                left join h_v_IF_Material m on b.HMaterID=m.HItemID
+												left join h_v_IF_Unit u on b.HUnitID=u.HItemID
+                                                where a.HInterID=(select HMouldMaintainRuleInterID from Gy_MouldFileMain  where HInterID=" + MouldProjectID + ") ");
+                ds1 = oCN.RunProcReturn(sql1, "Sc_MouldMaintainRuleBillMain");//淇濆吇
+                ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//閰嶄欢
+                list.Add(ds1.Tables[0]);
+                list.Add(ds2.Tables[0]);
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+                objJsonResult.list = list;
+                return objJsonResult;
+            }
+            catch (Exception ex)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+        /// <summary>
+        /// 鏍规嵁鍣ㄥ叿涓诲唴鐮佽幏鍙栧櫒鍏蜂繚鍏绘楠岄」鐩�
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetMouldMaintainItemtemByMaintainRuleID")]
+        [HttpGet]
+        public object GetMouldMaintainItemtemByMaintainRuleID(int MouldMaintainRuleID)
+        {
+
+            if (MouldMaintainRuleID <= 0)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鍣ㄥ叿淇濆吇瑙勭▼鏈�夋嫨";
+                objjson.data = null;
+                return objjson;
+            }
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                List<object> list = new List<object>();
+                DataSet ds2;
+                DataSet ds1;
+                string sql1 = string.Format(@"select t.HMaintainItemID ,m.HNumber HMaintainItemNumber,t.HMaintainItem,t.HMaintainPart,t.HClaim,t.HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
+                                                from Sc_MouldMaintainRuleBillMain a left join Sc_MouldMaintainRuleBillSub_Item t on a.HInterID=t.HInterID 
+                                                left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
+                                                left join Gy_Employee e on e.HItemID=t.HManagerID
+                                                where a.HInterID=" + MouldMaintainRuleID);
+
+                string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName, m.HModel HMaterSpec,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HQtyMust,b.HRemark from Sc_MouldMaintainRuleBillMain a  
+												left join Sc_MouldMaintainRuleBillSub b on a.HInterID=b.HInterID 
+                                                left join h_v_IF_Material m on b.HMaterID=m.HItemID
+												left join h_v_IF_Unit u on b.HUnitID=u.HItemID
+                                                where a.HInterID=" + MouldMaintainRuleID);
+                ds1 = oCN.RunProcReturn(sql1, "Sc_MouldMaintainRuleBillMain");//淇濆吇
+                ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//閰嶄欢
+                list.Add(ds1.Tables[0]);
+                list.Add(ds2.Tables[0]);
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+                objJsonResult.list = list;
+                return objJsonResult;
+            }
+            catch (Exception ex)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
+
+        /// <summary>
+        /// 鍣ㄥ叿鐐规瑙勭▼鍗曞垪琛�
+        /// </summary>
+        /// <returns></returns>
+        [Route("Sc_MouldDotCheckRuleInter/GetMouldDotCheckRuleInterList")]
+        [HttpGet]
+        public object GetMouldDotCheckRuleInterList(string sWhere)
+        {
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList ");
+                ds = oCN.RunProcReturn(sql+sWhere, "h_v_Sc_MouldDotCheckRuleBillList");
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "1";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
+         /// <summary>
+        /// 鏍规嵁璁惧鏄剧ず璁惧淇濆吇瑙勭▼椤圭洰
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetMaintainItemtemByEquipProjectID")]
+        [HttpGet]
+        public object GetMaintainItemtemByEquipProjectID(int EquipProjectID)
+        {
+            if (EquipProjectID <= 0)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "浜у搧鍣ㄥ叿鏈�夋嫨";
+                objjson.data = null;
+                return objjson;
+            }
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                List<object> list = new List<object>();
+                DataSet ds2;
+                DataSet ds1;
+                string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
+                                                from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID 
+                                                left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
+                                                left join Gy_Employee e on e.HItemID=t.HManagerID
+                                                where a.HInterID=(select HEquipMaintainRuleInterID from Gy_EquipFileBillMain where HInterID=" + EquipProjectID + ") ");
+                string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a  
+												left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID 
+                                                left join h_v_IF_Material m on b.HMaterID=m.HItemID
+												left join h_v_IF_Unit u on b.HUnitID=u.HItemID
+                                                where a.HInterID=(select HEquipMaintainRuleInterID from Gy_EquipFileBillMain  where HInterID=" + EquipProjectID + ") ");
+
+                ds1 = oCN.RunProcReturn(sql1, "Sb_EquipMaintainRuleBillMain");//淇濆吇
+                ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//閰嶄欢
+                list.Add(ds1.Tables[0]);
+                list.Add(ds2.Tables[0]);
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+                objJsonResult.list = list;
+                return objJsonResult;
+            }
+            catch (Exception ex)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+        /// <summary>
+        /// 鏍规嵁璁惧淇濆吇瑙勭▼鏄剧ず璁惧淇濆吇瑙勭▼椤圭洰
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetMaintainItemtemByMaintainRuleID")]
+        [HttpGet]
+        public object GetMaintainItemtemByMaintainRuleID(int EquipProjectID)
+        {
+            if (EquipProjectID <= 0)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "璁惧淇濆吇瑙勭▼鏈�夋嫨";
+                objjson.data = null;
+                return objjson;
+            }
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                List<object> list = new List<object>();
+                DataSet ds2;
+                DataSet ds1;
+                string sql1 = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
+                                                from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID 
+                                                left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
+                                                left join Gy_Employee e on e.HItemID=t.HManagerID
+                                                where a.HInterID=" + EquipProjectID );
+                string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a  
+												left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID 
+                                                left join h_v_IF_Material m on b.HMaterID=m.HItemID
+												left join h_v_IF_Unit u on b.HUnitID=u.HItemID
+                                                where a.HInterID=" + EquipProjectID);
+
+                ds1 = oCN.RunProcReturn(sql1, "Sb_EquipMaintainRuleBillMain");//淇濆吇
+                ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//閰嶄欢
+                list.Add(ds1.Tables[0]);
+                list.Add(ds2.Tables[0]);
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+                objJsonResult.list = list;
+                return objJsonResult;
+            }
+            catch (Exception ex)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
+
+        /// <summary>
+        /// 鏍规嵁璁惧鏄剧ず璁惧鐐规绋嬮」鐩�
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetDotCheckRuleItemByEquipProjectID")]
+        [HttpGet]
+        public object GetDotCheckRuleItemByEquipProjectID(int EquipProjectID)
+        {
+            if (EquipProjectID <= 0)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "浜у搧鍣ㄥ叿鏈�夋嫨";
+                objjson.data = null;
+                return objjson;
+            }
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                string sql = string.Format(@"select b.HDotCheckItemID HDotCheckItemID,c.HNumber HDotCheckCode,b.HDotCheckItem,b.HDotCheckPart,b.HClaim,
+                                    b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark from Sb_EquipDotCheckRuleBillMain  a 
+									left join Sb_EquipDotCheckRuleBillSub b on a.HInterID=b.HInterID 
+                                    left join Gy_QCCheckItem c on c.HItemID=b.HDotCheckItemID
+                                     left join Gy_Employee e on e.HItemID=b.HManagerID
+                                    where a.HInterID=(select HEquipDotCheckRuleInterID from Gy_EquipFileBillMain where HInterID=" + EquipProjectID + ") ");
+                ds = oCN.RunProcReturn(sql, "Sb_EquipDotCheckRuleBillMain");
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "1";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+        /// <summary>
+        /// 鏍规嵁璁惧鐐规瑙勭▼鏄剧ず璁惧鐐规绋嬮」鐩�
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetDotCheckRuleItemByDotCheckRuleID")]
+        [HttpGet]
+        public object GetDotCheckRuleItemByDotCheckRuleID(int HDotCheckRuleInterID)
+        {
+            if (HDotCheckRuleInterID <= 0)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "璁惧鐐规瑙勭▼鏈�夋嫨";
+                objjson.data = null;
+                return objjson;
+            }
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                string sql = string.Format(@"select b.HDotCheckItemID HDotCheckItemID,c.HNumber HDotCheckCode,b.HDotCheckItem,b.HDotCheckPart,b.HClaim,
+                                    b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark from Sb_EquipDotCheckRuleBillMain  a 
+									left join Sb_EquipDotCheckRuleBillSub b on a.HInterID=b.HInterID 
+                                    left join Gy_QCCheckItem c on c.HItemID=b.HDotCheckItemID
+                                     left join Gy_Employee e on e.HItemID=b.HManagerID
+                                    where a.HInterID=" + HDotCheckRuleInterID);
+                ds = oCN.RunProcReturn(sql, "Sb_EquipDotCheckRuleBillMain");
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "1";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+        
+        
+        /// <summary>
+        /// 鑾峰彇缁翠慨椤圭洰鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetRepairList_Json")]
+        [HttpGet]
+        public object GetRepairList_Json(string Repair)
+        {
+            if (Repair != "")
+            {
+                sWhere = " and ( HNumber like '%" + Repair + "%' or HName like '%" + Repair + "%' ) ";
+            }
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName  from Gy_Repair where HStopflag=0 Order by HItemID ", "Gy_Repair");
+                }
+                else
+                {
+                    string sql1 = "Select HItemID,HNumber ,HName  from Gy_Repair where HStopflag=0  ";
+                    string sql = sql1 + sWhere;
+                    ds = oCN.RunProcReturn(sql, "Gy_Repair");
+                }
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
+        /// <summary>
+        /// 鑾峰彇鎵爜璇︽儏鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/GetWMSBarCodeDetailsList")]
+        [HttpGet]
+        public object GetWMSBarCodeDetailsList(int HInterID, string HBillType)
+        {
+            try
+            {
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+                ds = oCN.RunProcReturn("Select * from h_v_KF_PonderationBillMain_Temp_Sum where HInterID=" + HInterID + " and HBillType='" + HBillType + "' Order by HItemID ", "h_v_KF_PonderationBillMain_Temp_Sum");
+                //ds = oCN.RunProcReturn("Select top 10 * from h_v_KF_PonderationBillMain_Temp_Sum Order by HInterID ", "h_v_KF_PonderationBillMain_Temp_Sum");
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objjson.code = "0";
+                    objjson.count = 0;
+                    objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+                    objjson.data = null;
+                    return objjson;
+                }
+                else
+                {
+                    objjson.code = "0";
+                    objjson.count = 1;
+                    objjson.Message = "鑾峰彇鎴愬姛!";
+                    objjson.data = ds.Tables[0];
+                    return objjson;
+                }
+            }
+            catch (Exception ex)
+            {
+                objjson.code = "0";
+                objjson.count = 0;
+                objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+                objjson.data = null;
+                return objjson;
+            }
+        }
+
+
+        /// <summary>
+        /// 鏍规嵁ID鍒犻櫎缂撳瓨琛ㄤ腑鎵爜璁板綍
+        /// </summary>
+        /// <param name="sHitemID">缂撳瓨琛↖D</param>
+        /// <returns>object</returns>
+        [Route("Web/DelCacheList")]
+        [HttpGet]
+        public object DelCacheList(long sHitemID)
+        {
+            try
+            {
+                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+                oCn.RunProc("Delete from KF_PonderationBillMain_Temp where HitemID = " + sHitemID);
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+                objJsonResult.data = e.ToString();
+                return objJsonResult;
+            }
+        }
+
+
+        #region [鏌ヨ鑿滃崟鍒楄〃]
+        [Route("Web/MenuList")]
+        [HttpGet]
+        public object MenuList()
+        {
+            try
+            {
+                List<Menu> mu = new List<Menu>();
+                SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+                ds = oCn.RunProcReturn("Select * from Gy_Menu Order by HItemID ", "Gy_Menu");
+                //List<Menu> mu1 = ds.Tables[0].AsEnumerable().Select(t => new Menu()).ToList();
+                //List<Menu> users = ModelConvertHelper<Menu>.ConvertToModel(ds.Tables[0]);
+                //var dd = ToHierarchy.ToHierarchyList(users);
+                //string json = JsonConvert.SerializeObject(dd);
+                for (int i = 0; i < ds.Tables[0].Rows.Count; i++)   //杩欓噷鏄惊鐜墍鏈�
+                {
+                    if (ds.Tables[0].Rows[i]["HPartentID"].ToString() == "0" || ds.Tables[0].Rows[i]["HitemID"].ToString() == ds.Tables[0].Rows[i]["HPartentID"].ToString())  //鍒ゆ柇鏄惁鏈�澶栧眰鏍硅妭鐐�
+                    {
+                        Menu tbj = new Menu();
+                        tbj.HitemID = ds.Tables[0].Rows[i]["HitemID"].ToString();
+                        tbj.HNumber = ds.Tables[0].Rows[i]["HNumber"].ToString();
+                        tbj.HName = ds.Tables[0].Rows[i]["HName"].ToString();
+                        tbj.HPartentID = ds.Tables[0].Rows[i]["HPartentID"].ToString();
+                        tbj.HLevel = int.Parse(ds.Tables[0].Rows[i]["HLevel"].ToString());
+                        tbj.Hurl = ds.Tables[0].Rows[i]["Hurl"].ToString();
+                        mu.Add(tbj);
+                    }
+                }
+                ToHierarchy.digui(ds.Tables[0], mu);
+
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鏌ヨ鎴愬姛锛�";
+                objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(mu);
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏌ヨ澶辫触锛�";
+                objJsonResult.data = e.ToString();
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+
+        ///// <summary>
+        ///// 浜у搧鍏ュ簱缂撳瓨鍒楄〃鍒锋柊淇℃伅
+        ///// </summary>
+        ///// <returns></returns>
+        //[Route("Web/chanpinruk")]
+        //[HttpGet]
+        //public object chanpinruk(string HBillType, string sHMaker, Int64 HOrgID)
+        //{
+        //    try
+        //    {
+        //        ds = webserver.GetKf_PonderationBillMain_TempList_New(HBillType, sHMaker, HOrgID);
+        //        if (ds == null || ds.Tables[0].Rows.Count <= 0)
+        //        {
+        //            objJsonResult.code = "0";
+        //            objJsonResult.count = 0;
+        //            objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+        //            objJsonResult.data = null;
+        //            return objJsonResult;
+        //            //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+        //        }
+        //        else
+        //        {
+        //            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;
+        //    }
+        //}
+
+
+        /// <summary>
+        /// 浜у搧鍏ュ簱缂撳瓨鍒楄〃鍒锋柊淇℃伅
+        /// </summary>
+        /// <returns></returns>
+        [Route("Web/chanpinruk")]
+        [HttpGet]
+        public object chanpinruk(string HBillType, string sHMaker, Int64 HOrgID)
+        {
+            WebS.WebService1 oWebs = new WebS.WebService1();
+            try
+            {
+                ds = oWebs.GetKf_PonderationBillMain_TempList_New (HBillType, sHMaker, HOrgID);
+                if (ds == null || ds.Tables[0].Rows.Count <= 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
+                }
+                else
+                {
+                    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;
+            }
+        }
+
 
 
     }

--
Gitblit v1.9.1