From f38f94f9a14619d6877eb101058d1405d27b3bd0 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期五, 30 七月 2021 08:35:58 +0800
Subject: [PATCH] 合并

---
 WebAPI/Web References/WebS/ClsGy_Warehouse_Model.datasource            |    2 
 WebAPI/Web References/WebS/WebService1.wsdl                            |  619 ++++---
 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user            |  136 
 WebAPI/Web References/WebS/ClsCLD_Warehouse_Model.datasource           |    2 
 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs                    |  285 +++
 WebAPI/Web References/WebS/ClsGy_Supplier_Model.datasource             |    2 
 WebAPI/Service/LuBaoSevice.cs                                          |   21 
 WebAPI/Controllers/BaseSet/Gy_SourceController.cs                      |    4 
 WebAPI/Web References/WebS/ClsCLD_Employee_Model.datasource            |    2 
 WebAPI/Web References/WebS/ClsGy_StockPlace_Model.datasource           |    2 
 WebAPI/Web References/WebS/Reference.cs                                | 1646 ++++++++++++----------
 WebAPI/Web References/WebS/ClsGy_BadReason_Model.datasource            |    2 
 WebAPI/Web References/WebS/ClsGy_Source_Model.datasource               |    2 
 WebAPI/Web References/WebS/ClsCLD_Department_Model.datasource          |    2 
 WebAPI/Web References/WebS/ClsGy_Department_Model.datasource           |    2 
 WebAPI/Web References/WebS/ClsKf_ICStockBill_WMS.datasource            |    2 
 WebAPI/Controllers/品质管理/首件检验单/QC_FirstPieceCheckBillController.cs      |   87 
 WebAPI/Models/ClsGy_Material_Model.cs                                  |   44 
 WebAPI/Web References/WebS/ClsCLD_Customer_Model.datasource            |    2 
 WebAPI/Web References/WebS/ClsGy_Customer_Model.datasource             |    2 
 WebAPI/Web References/WebS/ClsCLD_StockPlace_Model.datasource          |    2 
 WebAPI/Web References/WebS/ClsCLD_Supplier_Model.datasource            |    2 
 WebAPI/Web References/WebS/ClsGy_Group_Model.datasource                |    2 
 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs                 |    4 
 WebAPI/Web References/WebS/ClsGy_Employee_Model.datasource             |    2 
 WebAPI/Controllers/WebAPIController.cs                                 |  100 +
 WebAPI/DLL/DAL.dll                                                     |    0 
 WebAPI/Web References/WebS/ClsGy_Item30JiTai_Model.datasource          |    2 
 WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs               |  232 +-
 WebAPI/Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource |    2 
 /dev/null                                                              |  424 -----
 WebAPI/ListModels.cs                                                   |   13 
 WebAPI/Models/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs                       |   12 
 WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs                          |   23 
 WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs              |    2 
 WebAPI/DLL/ClsSc_ICMOReportBill.cs                                     |    7 
 WebAPI/WebAPI.csproj                                                   |    6 
 WebAPI/Models/ClsSc_ICMOReportBillMain.cs                              |    1 
 WebAPI/Controllers/品质管理/工序检验单/QC_ProcessCheckBillController.cs         |  454 ++++++
 WebAPI/DLL/ClsGy_Material_Ctl.cs                                       |  135 +
 40 files changed, 2,585 insertions(+), 1,706 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 04b5522..9d103f0 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -7,6 +7,8 @@
 using System.Data.SqlClient;
 using System.Web.Http;
 using WebAPI.Models;
+using WebAPI.Service;
+
 namespace WebAPI.Controllers
 {
     public class Gy_MaterialController : ApiController
@@ -66,6 +68,289 @@
             }
         }
 
+        /// <summary>
+        /// 鐗╂枡璁剧疆鑾峰彇淇℃伅
+        /// </summary>
+        /// <returns></returns>
+        [Route("Gy_Material/GetGy_MaterialDetail")]
+        [HttpGet]
+        public ApiResult<DataSet> GetGy_MaterialDetail(string HID)
+        {
+            var model = LuBaoSevice.GetGy_MaterialBillDetail(HID);
+            return model;
+        }
+        /// <summary>
+        /// 淇濆瓨鐗╂枡
+        /// </summary>
+        /// <param name="msg"></param>
+        /// <returns></returns>
+        [Route("Gy_Material/SaveGy_MaterialList")]
+        [HttpPost]
+        public object SaveGy_MaterialList([FromBody] JObject msg)
+        {
+            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();
+            Int64 HItemID = 0;
+            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+            //鑾峰彇鏈�澶D鍊艰祴鍊�
+            DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_Material ", "Gy_Material");
+            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"]);
+                maxid += 1;
+                HItemID = maxid;
+            }
+            ListModels oListModels = new ListModels();
+            try
+            {
+                DLL.ClsGy_Material_Ctl oBill = new DLL.ClsGy_Material_Ctl();
+                List<Models.ClsGy_Material_Model> lsmain = new List<Models.ClsGy_Material_Model>();
+                msg1 = msg1.Replace("\\", "");
+                msg1 = msg1.Replace("\n", "");  //\n
+                lsmain = oListModels.getObjectByJson_Gy_Material(msg1);
+                foreach (ClsGy_Material_Model oItem in lsmain)
+                {
+                    if (oItem.HNumber.Trim() == "")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒";
+                        objJsonResult.data = 1;
+                        return objJsonResult;
+                    }
+                    if (oItem.HName.Trim() == "")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒";
+                        objJsonResult.data = 1;
+                        return objJsonResult;
+                    }
+                    if (oItem.HMaterTypeID == 0)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "淇濆瓨澶辫触锛佺墿鏂欏睘鎬т笉鑳戒负绌猴紒";
+                        objJsonResult.data = 1;
+                        return objJsonResult;
+                    }
+                    if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()))
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+                        objJsonResult.data = 1;
+                        return objJsonResult;
+                    }
+                    //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+                    ds = oCN.RunProcReturn("select * from  Gy_Material where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_Material");
+                    if (oItem.HNumber.Trim() == "")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷负绌猴紒";
+                        objJsonResult.data = 1;
+                        return objJsonResult;
+                    }
+                    //鏂板鏃跺垽鏂�
+                    if (oItem.HItemID == 0)
+                    {
+                        if (ds == null || ds.Tables[0].Rows.Count == 0)
+                        {
+
+                        }
+                        else
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+                            objJsonResult.data = 1;
+                            return objJsonResult;
+                        }
+                        //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+                        string sParent;
+                        sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+                        if (sParent.Trim() == "")
+                        {
+                            oBill.oModel.HParentID = 0;
+                        }
+                        else
+                        {
+                            if (oBill.HavParentCode(sParent.Trim(), HItemID))
+                            {
+                                oBill.oModel.HParentID = oBill.oModel.HItemID;
+                            }
+                            else
+                            {
+                                objJsonResult.code = "0";
+                                objJsonResult.count = 0;
+                                objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+                                objJsonResult.data = 1;
+                                return objJsonResult;
+                            }
+                        }
+                    }
+                    else//缂栬緫鏃跺垽鏂�
+                    {
+                        //妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
+                        string sParent;
+                        sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
+                        if (sParent.Trim() == "")
+                        {
+                            oBill.oModel.HParentID = 0;
+                        }
+                        else
+                        {
+                            if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
+                            {
+                                oBill.oModel.HParentID = oBill.oModel.HItemID;
+                            }
+                            else
+                            {
+                                objJsonResult.code = "0";
+                                objJsonResult.count = 0;
+                                objJsonResult.Message = "淇濆瓨澶辫触锛佷笂绾т唬鐮佷笉瀛樺湪鎴栬绂佺敤锛�";
+                                objJsonResult.data = 1;
+                                return objJsonResult;
+                            }
+                        }
+                    }
+                    //寰楀埌鐭唬鐮�
+                    string sShortNumber;
+                    sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
+                    if (sShortNumber.Trim() == "")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠g爜涓虹┖锛�";
+                        objJsonResult.data = 1;
+                        return objJsonResult;
+                    }
+                  
+                    oItem.HShortNumber = sShortNumber;//鐭唬鐮�
+                    oItem.HEndFlag = true;//鏈骇鏍囧織
+                    oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
+                    oBill.oModel = oItem;
+                }
+
+                //淇濆瓨
+                //淇濆瓨瀹屾瘯鍚庡鐞�
+                bool bResult;
+                if (oBill.oModel.HItemID == 0)
+                {
+                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+                    bResult = oBill.AddNew();
+                }
+                else
+                {
+                    bResult = oBill.ModifyByID(oBill.oModel.HItemID);
+                }
+                if (bResult)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+                    //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+                    objJsonResult.data = 1;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+                    objJsonResult.data = 1;
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+                objJsonResult.data = 1;
+                return objJsonResult;
+            }
+        }
+
+
+
+        /// <summary>
+        /// 鐗╂枡璁剧疆鍒犻櫎鍔熻兘
+        /// </summary>
+        /// <returns></returns>
+        [Route("Gy_Material/Delete")]
+        [HttpGet]
+        public object DeltetGy_Material(string HItemID)
+        {
+            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;
+                //}
+
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                if (string.IsNullOrWhiteSpace(HItemID))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HItemID涓虹┖锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                oCN.BeginTran();//寮�濮嬩簨鍔�
+                ds = oCN.RunProcReturn("select * from Gy_Material where HItemID=" + HItemID, "Gy_Material");
+                if (ds == null || ds.Tables[0].Rows.Count == 0)
+                {
+                    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_Material set HStopflag=1 where HItemID=" + HItemID);
+                oCN.Commit();//鎻愪氦浜嬪姟
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "* 鏁版嵁鍒犻櫎鎴愬姛锛�";
+                objJsonResult.data = null;
+                return objJsonResult; ;
+
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
 
         /// <summary>
         /// 杩斿洖妯″叿鍒楄〃
diff --git a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
index c61d537..a4ee1b4 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
@@ -34,11 +34,11 @@
             {
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_IF_SourceList where 绂佺敤鏍囪='' ", "h_v_IF_SourceList");
+                    ds = oCN.RunProcReturn("select * from h_v_IF_SourceList where 1=1 ", "h_v_IF_SourceList");
                 }
                 else
                 {
-                    string sql1 = "select * from h_v_IF_SourceList where 绂佺敤鏍囪='' ";
+                    string sql1 = "select * from h_v_IF_SourceList where 1=1 ";
                     string sql = sql1 + sWhere;
                     ds = oCN.RunProcReturn(sql, "h_v_IF_SourceList");
                 }
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index bcc10ba..727a50f 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -390,9 +390,9 @@
         ///鍙傛暟锛歴tring sql銆�
         ///杩斿洖鍊硷細object銆�
         /// </summary>
-        [Route("Cj_StationOutBill/list")]
+        [Route("Cj_StationOutBill/get_Display")]
         [HttpGet]
-        public object list(string sWhere)
+        public object get_Display(string sWhere)
         {
             try
             {
diff --git a/WebAPI/Controllers/SCGL/QC_ProcessCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_ProcessCheckBillController.cs
deleted file mode 100644
index 41e27fa..0000000
--- a/WebAPI/Controllers/SCGL/QC_ProcessCheckBillController.cs
+++ /dev/null
@@ -1,424 +0,0 @@
-锘縰sing Newtonsoft.Json.Linq;
-using Pub_Class;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Web.Http;
-using WebAPI.Models;
-
-namespace WebAPI.Controllers
-{
-    //宸ュ簭妫�楠屽崟Controller
-    public class QC_ProcessCheckBillController : ApiController
-    {
-        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-
-        private json objJsonResult = new json();
-        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
-        DataSet ds;
-        SQLHelper.ClsCN oCN1 = new SQLHelper.ClsCN();
-        DataSet ds1;
-
-
-
-        /// <summary>
-        /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
-        ///鍙傛暟锛歴tring sql銆�
-        ///杩斿洖鍊硷細object銆�
-        /// </summary>
-        [Route("QC_ProcessCheckBill/AddBill")]
-        [HttpPost]
-        public object AddBill([FromBody] JObject sMainSub)
-        {
-            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 = "鏂板鍗曟嵁鎴愬姛锛�";
-            return objJsonResult;
-        }
-
-        public json AddBillMain(string msg1)
-        {
-            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
-            string msg2 = sArray[0].ToString();
-            try
-            {
-                msg2 = "[" + msg2.ToString() + "]";
-                List<QC_ProcessCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<QC_ProcessCheckBillMain>>(msg2);
-                string BillType = "7507";
-                long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
-                string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
-                DateTime HDate = mainList[0].HDate;//鏃ユ湡
-                int HYear = 2021;
-                double HPeriod = 1;
-                long HBillStatus = mainList[0].HBillStatus;
-                long HCheckItemNowID = mainList[0].HCheckItemNowID;
-                long HCkeckItemNextID = mainList[0].HCheckItemNextID;
-                long HCheckFlowID = mainList[0].HCheckFlowID;
-                string HRemark = mainList[0].HRemark;//澶囨敞
-                string HBacker = mainList[0].HBacker;
-                DateTime HBackDate = mainList[0].HBackDate;
-                string HBackRemark = mainList[0].HBackRemark;
-                string HChecker = mainList[0].HChecker;
-                DateTime HCheckDate = mainList[0].HCheckDate;
-                string HMaker = mainList[0].HMaker;
-                DateTime HMakeDate = mainList[0].HMakeDate;
-                string HUpDater = mainList[0].HUpDater;
-                DateTime HUpDateDate = mainList[0].HUpDateDate;
-                string HCloseMan = mainList[0].HCloseMan;
-                DateTime HCloseDate = mainList[0].HCloseDate;
-                string HCloseType = mainList[0].HCloseType;
-                string HDeleteMan = mainList[0].HDeleteMan;
-                DateTime HDeleteDate = mainList[0].HDeleteDate;
-                string HMainSourceBillType = mainList[0].HMainSourceBillType;
-                long HMainSourceInterID = mainList[0].HMainSourceInterID;
-                long HMainSourceEntryID = mainList[0].HMainSourceEntryID;
-                string HMainSourceBillNo = mainList[0].HMainSourceBillNo;
-                double HPrintQty = mainList[0].HPrintQty;
-                long HICMOInterID = mainList[0].HICMOInterID;
-                string HICMOBillNo = mainList[0].HICMOBillNo;
-                long HProExchInterID = mainList[0].HProcExchInterID;
-                long HProExchEntryID = mainList[0].HProcExchEntryID;
-                string HProExchBillNo = mainList[0].HProcExchBillNo;
-                long HMaterID = mainList[0].HMaterID;
-                long HProcID = mainList[0].HProcID;
-                long HSourceID = mainList[0].HSourceID;
-                long HEmpID = mainList[0].HEmpID;
-                double HInStockQty = mainList[0].HInStockQty;
-                double HCheckQty = mainList[0].HCheckQty;
-                double HRightQty = mainList[0].HRightQty;
-                double HBadQty = mainList[0].HBadQty;
-                long HFirstCheckEmp = mainList[0].HFirstCheckEmp;
-                string HCheckerResult = mainList[0].HCheckerResult;
-                string HBarcode = mainList[0].HBarcode;
-                string HLBatchNo = mainList[0].HLBatchNo;
-                long HCusID = mainList[0].HCusID;
-                string HSortBillNo = mainList[0].HSortBillNo;
-                string HConTrctBatchNo = mainList[0].HContrctBatchNo;
-                long HProdAreaID = mainList[0].HProdAreaID;
-                long HProdTypeID = mainList[0].HProdTypeID;
-                string HProdStoveNo = mainList[0].HProdStoveNo;
-                long HRecipeID = mainList[0].HRecipeID;
-                double HDiameter1 = mainList[0].HDiameter1;
-                double HDiameter2 = mainList[0].HDiameter2;
-                long HRoutingInterID = mainList[0].HRoutingInterID;
-                long HPackTypeID = mainList[0].HPackTypeID;
-                long HDrawingDireID = mainList[0].HDrawingDireID;
-
-                //涓昏〃
-                oCN.RunProc("Insert Into QC_ProcessCheckBillMain " +
-                "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
-                ",HYear,HPeriod,HRemark" +
-                ",HICMOInterID,HICMOBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" +
-                ",HMaterID,HProcID,HSourceID,HEmpID,HInStockQty" +
-                ",HCheckQty,HRightQty,HBadQty,HFirstCheckEmp,HCheckerResult" +
-                ",HBarCode,HLBatchNo,HCusID,HSortBillNo,HContrctBatchNo" +
-                ",HProdAreaID,HProdTypeID,HProdStoveNo,HRecipeID,HDiameter1" +
-                ",HDiameter2,HRoutingInterID,HDrawingDireID,HPackTypeID" +
-                ") " +
-                " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HBillStatus + "','" + HDate + "','" + HMaker + "','" + HDate + "'" +
-                "," + HYear + "," + HPeriod + ",'" + HRemark + "'" + 
-                "," + HICMOInterID + "," + HICMOBillNo + "," + HProExchInterID + "," + HProExchEntryID + ",'" + HProExchBillNo + "'" +
-                "," + HMaterID + "," + HProcID + "," + HSourceID + "," + HEmpID + "," + HInStockQty +
-                "," + HCheckQty + "," + HRightQty + "," + HBadQty + "," + HFirstCheckEmp + ",'" + HCheckerResult + "'" +
-                ",'" + HBarcode + "','" + HLBatchNo + "'," + HCusID + ",'" + HSortBillNo + "','" + HConTrctBatchNo + "'" +
-                "," + HProdAreaID + "," + HProdTypeID + ",'" + HProdStoveNo + "'," + HRecipeID + ",'" + HDiameter1 + "'" +
-                "," + HDiameter2 + "," + HRoutingInterID + "," + HDrawingDireID + "," + HPackTypeID + 
-                ") ");
-
-
-                //瀛愯〃
-                oCN.RunProc("Insert into QC_ProcessCheckBillSub " +
-                      " (HInterID,HBillNo_bak,HEntryID,HCloseMan" +
-                      ",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
-                      ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
-                      ",HQCCheckClassID,HQCCheckItemID,HQCStd,HQCRelValue,HResult" +
-                      ",HProcCheckEmp,HProcCheckTime" +
-                      ") " +
-                " values('" + HInterID + "','',0,'" + HCloseMan + "'" +
-                ",'','','',0 " +
-                ",0,'','',0,0" +
-                ",0,0,'','',''"+
-                ",0,''" +
-                ") ");
-                if (objJsonResult.code == "0")
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = objJsonResult.Message;
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-               
-                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;
-            }
-        }
-
-
-        /// <summary>
-        /// 宸ュ簭妫�楠屽崟鍒楄〃淇敼鎸夐挳鏂规硶
-        ///鍙傛暟锛歴tring sql銆�
-        ///杩斿洖鍊硷細object銆�
-        /// </summary>
-        [Route("QC_ProcessCheckBill/xg")]
-        [HttpGet]
-        public object xg(long HInterID)
-        {
-            try
-            {
-                ds = oCN.RunProcReturn("select HInterID,HBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" +
-                    ",HMaterID,HProcID,HSourceID,HEmpID,HInStockQty" +
-                    ",HCheckQty,HRightQty,HBadQty,HFirstCheckEmp,HCheckerResult" +
-                    ",HBarCode,HLBatchNo,HCusID,HSortBillNo,HContrctBatchNo" +
-                    ",HProdAreaID,HProdTypeID,HProdStoveNo,HRecipeID,HDiameter1" +
-                    ",HDiameter2,HRoutingInterID,HDrawingDireID,HPackTypeID from QC_ProcessCheckBillMain where HInterID=" + HInterID, "QC_ProcessCheckBillMain");
-
-                objJsonResult.code = "1";
-                objJsonResult.count = 1;
-                objJsonResult.Message = "";
-                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;
-            }
-        }
-
-        /// <summary>
-        /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
-        ///鍙傛暟锛歴tring sql銆�
-        ///杩斿洖鍊硷細object銆�
-        /// </summary>
-        [Route("QC_ProcessCheckBill/AddBill1")]
-        [HttpPost]
-        public object AddBill1([FromBody] JObject oMain)
-        {
-            var _value = oMain["oMain"].ToString();
-            string msg1 = _value.ToString();
-            try
-            {
-                DAL.ClsQC_ProcessCheckBill oProcess = new DAL.ClsQC_ProcessCheckBill();
-
-                msg1 = "[" + msg1.ToString() + "]";
-                List<QC_ProcessCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<QC_ProcessCheckBillMain>>(msg1);
-                string BillType = "7507";
-                long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
-                string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
-                DateTime HDate = mainList[0].HDate;//鏃ユ湡
-                int HYear = 2021;
-                double HPeriod = 1;
-                long HBillStatus = mainList[0].HBillStatus;
-                long HCheckItemNowID = mainList[0].HCheckItemNowID;
-                long HCkeckItemNextID = mainList[0].HCheckItemNextID;
-                long HCheckFlowID = mainList[0].HCheckFlowID;
-                string HRemark = mainList[0].HRemark;//澶囨敞
-                string HBacker = mainList[0].HBacker;
-                DateTime HBackDate = mainList[0].HBackDate;
-                string HBackRemark = mainList[0].HBackRemark;
-                string HChecker = mainList[0].HChecker;
-                DateTime HCheckDate = mainList[0].HCheckDate;
-                string HMaker = mainList[0].HMaker;
-                DateTime HMakeDate = mainList[0].HMakeDate;
-                string HUpDater = mainList[0].HUpDater;
-                DateTime HUpDateDate = mainList[0].HUpDateDate;
-                string HCloseMan = mainList[0].HCloseMan;
-                DateTime HCloseDate = mainList[0].HCloseDate;
-                string HCloseType = mainList[0].HCloseType;
-                string HDeleteMan = mainList[0].HDeleteMan;
-                DateTime HDeleteDate = mainList[0].HDeleteDate;
-                string HMainSourceBillType = mainList[0].HMainSourceBillType;
-                long HMainSourceInterID = mainList[0].HMainSourceInterID;
-                long HMainSourceEntryID = mainList[0].HMainSourceEntryID;
-                string HMainSourceBillNo = mainList[0].HMainSourceBillNo;
-                double HPrintQty = mainList[0].HPrintQty;
-                long HICMOInterID = mainList[0].HICMOInterID;
-                string HICMOBillNo = mainList[0].HICMOBillNo;
-                long HProExchInterID = mainList[0].HProcExchInterID;
-                long HProExchEntryID = mainList[0].HProcExchEntryID;
-                string HProExchBillNo = mainList[0].HProcExchBillNo;
-                long HMaterID = mainList[0].HMaterID;
-                long HProcID = mainList[0].HProcID;
-                long HSourceID = mainList[0].HSourceID;
-                long HEmpID = mainList[0].HEmpID;
-                double HInStockQty = mainList[0].HInStockQty;
-                double HCheckQty = mainList[0].HCheckQty;
-                double HRightQty = mainList[0].HRightQty;
-                double HBadQty = mainList[0].HBadQty;
-                long HFirstCheckEmp = mainList[0].HFirstCheckEmp;
-                string HCheckerResult = mainList[0].HCheckerResult;
-                string HBarcode = mainList[0].HBarcode;
-                string HLBatchNo = mainList[0].HLBatchNo;
-                long HCusID = mainList[0].HCusID;
-                string HSortBillNo = mainList[0].HSortBillNo;
-                string HConTrctBatchNo = mainList[0].HContrctBatchNo;
-                long HProdAreaID = mainList[0].HProdAreaID;
-                long HProdTypeID = mainList[0].HProdTypeID;
-                string HProdStoveNo = mainList[0].HProdStoveNo;
-                long HRecipeID = mainList[0].HRecipeID;
-                double HDiameter1 = mainList[0].HDiameter1;
-                double HDiameter2 = mainList[0].HDiameter2;
-                long HRoutingInterID = mainList[0].HRoutingInterID;
-                long HPackTypeID = mainList[0].HPackTypeID;
-                long HDrawingDireID = mainList[0].HDrawingDireID;
-
-               
-
-                //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
-                oCN.BeginTran();
-                //涓昏〃
-                oCN.RunProc("Update QC_ProcessCheckBillMain set " +
-                    "HMaterID=" + HMaterID +
-                    ",HSourceID=" + HSourceID +
-                    ",HEmpID=" + HEmpID +
-                    ",HInStockQty=" + HInStockQty +
-                    ",HCheckQty=" + HCheckQty +
-                    ",HRightQty=" + HRightQty +
-                    ",HBadQty=" + HBadQty +
-                    ",HCusID=" + HCusID +
-                    ",HRemark= '" + HRemark + "' Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
-                //淇敼瀛愰」鐩唬鐮�
-                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
-                //灏嗕笂绾� 涓洪潪鏈骇
-                //oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
-                //
-                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.Message;
-                objJsonResult.data = null;
-                return objJsonResult;
-            }
-        }
-
-
-        /// <summary>
-        /// 宸ュ簭妫�楠屽崟鍒楄〃鍒犻櫎鎸夐挳
-        ///鍙傛暟锛歴tring sql銆�
-        ///杩斿洖鍊硷細object銆�
-        /// </summary>
-        [Route("QC_ProcessCheckBill/Delete_Json")]
-        [HttpGet]
-        public object Delete_Json(long HItemID)
-        {
-            DAL.ClsQC_ProcessCheckBill  BillOld = new DAL.ClsQC_ProcessCheckBill();
-            try
-            {
-                if (BillOld.DeleteBill(HItemID, ref ClsPub.sExeReturnInfo) != true)
-                {
-                    objJsonResult.code = "1";
-                    objJsonResult.count = 1;
-                    objJsonResult.Message = "鍒犻櫎鎴愬姛";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                objJsonResult.code = "1";
-                objJsonResult.count = 1;
-                objJsonResult.Message = "鍒犻櫎鎴愬姛";
-                objJsonResult.data = null;
-                return objJsonResult;
-
-            }
-            catch (Exception e)
-            {
-                objJsonResult.code = "0";
-                objJsonResult.count = 0;
-                objJsonResult.Message = "Exception锛�" + e.ToString();
-                objJsonResult.data = null;
-                return objJsonResult;
-            }
-        }
-
-
-        /// <summary>
-        /// 杩斿洖宸ュ簭妫�楠屽崟鍒楄〃
-        ///鍙傛暟锛歴tring sql銆�
-        ///杩斿洖鍊硷細object銆�
-        /// </summary>
-        [Route("QC_ProcessCheckBill/GetProcessCheckBillList")]
-        [HttpGet]
-        public object GetProcessCheckBillList(string sWhere)
-        {
-            try
-            {
-                if (sWhere == null || sWhere.Equals(""))
-                {
-                    ds = oCN.RunProcReturn("select * from h_v_QC_ProcessCheckBillList " + sWhere, "h_v_QC_ProcessCheckBillList");
-                }
-                else
-                {
-                    string sql1 = "select * from h_v_QC_ProcessCheckBillList where 1 = 1 ";
-                    string sql = sql1 + sWhere;
-                    ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBillList");
-                }
-                if (ds == null || ds.Tables[0].Rows.Count == 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "false锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                else
-                {
-                    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;
-            }
-        }
-
-        //
-    }
-}
\ No newline at end of file
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index cc01042..bb63d15 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -390,6 +390,40 @@
         }
         #endregion
 
+        #region  鎶ュ伐骞冲彴楠岃瘉鍗曟嵁鐘舵��
+        [Route("Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus")]
+        [HttpGet]
+        public object GetMESBeginWorkBillStaus(string sWhere)
+        {
+            try
+            {
+                ds = new SQLHelper.ClsCN().RunProcReturn("select * from Sc_ICMOBillStatus_Tmp" + sWhere, "Sc_ICMOBillStatus_Tmp");
+                if (ds.Tables[0].Rows.Count > 0)
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "宸ュ崟鏆傛湭澶勭悊,鍙互鎿嶄綔锛�";
+                    objJsonResult.data = null;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "宸ュ崟宸插鐞�,涓嶅厑璁告搷浣滐紒";
+                    objJsonResult.data = null;
+                }
+
+            }
+            catch (Exception ex)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = ex.Message;
+                objJsonResult.data = null;
+            }
+            return objJsonResult;
+        }
+        #endregion
 
         #region  鎶ュ伐骞冲彴鎶ユ鐢宠鍒楄〃(浜ч噺姹囨姤鍒楄〃)
         [Route("Sc_MESBeginWorkBill/GetMESProductReportBillList")]
@@ -418,7 +452,7 @@
 
         public static DataSet Sc_GetMESProductReportBillList(string sWhere)
         {
-            string sql = string.Format(@"select a.HBillNo,a.HDate,a.HBillType,a.HMaterID,m.HNumber HMaterCode,m.HName HMaterName,m.HModel HMaterSpec 
+            string sql = string.Format(@"select a.HInterID, a.HBillNo,a.HDate,a.HBillType,a.HMaterID,m.HNumber HMaterCode,m.HName HMaterName,m.HModel HMaterSpec 
                                    ,a.HSourceID,s.HNumber HSourceCode,s.HName HSourceName,a.HGroupID,g.HNumber HGroupCode,g.HName HGroupName
                                    ,a.HWorkManID,e.HName HWorkManName,a.HMaker,a.HMakeDate, a.HReportType  
                                    ,a.HQty,a.HICMOBillNo,a.HICMOInterID,a.HICMOEntryID 
@@ -427,105 +461,48 @@
                                    left join Gy_Material m on a.HMaterID=m.hitemid
                                    left join Gy_Source s on a.HSourceID=s.HItemID
                                    left join Gy_Group g on a.HGroupID=g.HItemID
-                                   left join Gy_Employee e on a.HWorkManID=e.HItemID " + sWhere + "");
+                                   left join Gy_Employee e on a.HWorkManID=e.HItemID " + sWhere + " and HRelationInterID='0'");
             return new SQLHelper.ClsCN().RunProcReturn(sql, "Sc_ICMOBillWorkQtyStatus_Tmp");
         }
         #endregion
-
-        #region 鎶ュ伐骞冲彴鎶ユ鐢宠淇濆瓨
-        [Route("Sc_MESBeginWorkBill/SaveGetMESProductReportBillList")]
+        
+        #region 鎶ュ伐骞冲彴浜ч噺姹囬獙璇佹眹鎶ユ暟閲忔槸鍚﹁秴鍑鸿鍒掓暟閲忚緫
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="msg"></param>
+        /// <returns></returns>
+        [Route("Sc_MESBeginWorkBill/GetMESOverStepQty")]
         [HttpGet]
-        public object SaveGetMESProductReportBillList([FromBody] JObject msg)
+        public object GetMESOverStepQty(string sWhere)
         {
-            var _value = msg["msg"].ToString();
-            string msg1 = _value.ToString();
-            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
-            string msg2 = sArray[0].ToString();
-
-            string UserName = "";
-
-            ListModels oListModels = new ListModels();
             try
             {
-                DLL.ClsSc_ICMOReportBill oBill = new DLL.ClsSc_ICMOReportBill();
-                List<Models.ClsSc_ICMOReportBillMain> lsmain = new List<Models.ClsSc_ICMOReportBillMain>();
-                msg2 = msg2.Replace("\\", "");
-                msg2 = msg2.Replace("\n", "");  //\n
-                lsmain = oListModels.getObjectByJson_Gy_ICMOReportBillMain(msg2);
-                foreach (Models.ClsSc_ICMOReportBillMain oItem in lsmain)
+                ds = new SQLHelper.ClsCN().RunProcReturn("select isnull(sum(HQty),0) HQty,isnull(sum(HBadQty),0) HBadQty,isnull(sum(HWasterQty),0) HWasterQty   from Sc_ICMOBillWorkQtyStatus_Tmp" + sWhere, "Sc_ICMOBillWorkQtyStatus_Tmp");
+                if (ds.Tables[0].Rows.Count > 0)
                 {
-
-                    //oItem.HMaker = "";
-                    UserName = oItem.HMaker;  //鍒跺崟浜�
-                    oItem.HBillType = "3711";
-                    oItem.HBillSubType = "3711";
-                    oItem.HBillStatus = 1;   //鍗曟嵁鐘舵�侊紙1鏈锛�2瀹℃牳閫氳繃锛�3鍏抽棴锛�4浣滃簾锛�5瀹℃牳閫�鍥�,6瀹℃牳涓�,7宸查槄锛�8宸插洖澶嶏紝9缁撴锛�10楠岃瘉,11涓嬭揪锛�12寮�宸�,13鐢宠瀹℃壒,15鐢宠妫�楠岋紝16 鍒ゅ畾鍚堟牸锛�17鍒ゅ畾涓嶅悎鏍硷級     
-                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
-                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
-                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
-                    {
-                        objJsonResult.code = "0";
-                        objJsonResult.count = 0;
-                        objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
-                        objJsonResult.data = 1;
-                        return objJsonResult;
-                    }
-                    oBill.omodel = oItem;
-                }
-                //瀛愯〃浣撴暟鎹�
-
-                List<Models.ClsSc_ICMOReportBillSub> ls = new List<Models.ClsSc_ICMOReportBillSub>();
-                ls = oListModels.getObjectByJson_Gy_ICMOReportBillSub(msg2);
-                int i = 0;
-                foreach (Models.ClsSc_ICMOReportBillSub oItemSub in ls)
-                {
-
-                    i++;
-                    oItemSub.HEntryID = i;
-
-                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
-                    oItemSub.HCloseType = false;   //鍏抽棴绫诲瀷
-                    oBill.DetailColl.Add(oItemSub);
-
-                }
-                //淇濆瓨
-                //淇濆瓨瀹屾瘯鍚庡鐞�
-                bool bResult;
-                if (oBill.omodel.HInterID == 0)
-                {
-                    // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
-                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
-                }
-                else
-                {
-                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
-                }
-                if (bResult)
-                {
-                    objJsonResult.code = "0";
+                    objJsonResult.code = "1";
                     objJsonResult.count = 1;
-                    objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
-                    //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
-                    objJsonResult.data = 1;
-                    return objJsonResult;
+                    objJsonResult.Message = "宸叉湁浜ч噺姹囨姤鏁版嵁杩斿洖锛�";
+                    objJsonResult.data = ds;
                 }
                 else
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
-                    objJsonResult.data = 1;
-                    return objJsonResult;
+                    objJsonResult.Message = "鏃犱骇閲忔眹鎶ユ暟鎹紒";
+                    objJsonResult.data = null;
                 }
+
             }
-            catch (Exception e)
+            catch (Exception ex)
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
-                objJsonResult.data = 1;
-                return objJsonResult;
+                objJsonResult.Message = ex.Message;
+                objJsonResult.data = null;
             }
+            return objJsonResult;
         }
         #endregion
 
@@ -612,41 +589,110 @@
         }
         #endregion
 
-
-        #region  鎶ュ伐骞冲彴楠岃瘉鍗曟嵁鐘舵��
-        [Route("Sc_MESBeginWorkBill/GetMESBeginWorkBillStaus")]
+        #region 鎶ュ伐骞冲彴浜ч噺姹囨姤鍒犻櫎
+        [Route("Sc_MESBeginWorkBill/DeltetMESProductReportBill")]
         [HttpGet]
-        public object GetMESBeginWorkBillStaus(string sWhere)
+        public object DeleteGetLineBindBillList(string HInterID)
         {
             try
             {
-                ds=new SQLHelper.ClsCN().RunProcReturn("select * from Sc_ICMOBillStatus_Tmp" + sWhere, "Sc_ICMOBillStatus_Tmp");
-                if (ds.Tables[0].Rows.Count > 0)
+                oCN.BeginTran();
+                //鏇存柊鍒囨崲鐘舵�佸��
+                string sql = string.Format(@"delete Sc_ICMOBillWorkQtyStatus_Tmp  where HInterID='" + HInterID + "'");
+                oCN.RunProc(sql);
+                oCN.Commit();
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鍒犻櫎璧勬簮鎴愬姛锛�";
+                objJsonResult.data = ds;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = e.Message.ToString();
+                objJsonResult.data = null;
+
+            }
+            return objJsonResult;
+        }
+        #endregion
+
+        #region 鎶ュ伐骞冲彴鎶ユ鐢宠淇濆瓨
+        [Route("Sc_MESBeginWorkBill/SaveGetMESProductReportBillList")]
+        [HttpGet]
+        public object SaveGetMESProductReportBillList(string ScMaxWork,string HSourceBillType, string workcode,int HSourceID,int HICMOInterID,int HICMOEntryID,string HMaker)
+        {   
+            ListModels oListModels = new ListModels();
+            try
+            {
+                string sHSourceType = HSourceBillType;
+                string  BillType = "3711";  //鍗曟嵁绫诲瀷 (鐢熶骇姹囨姤鍗�)
+                //寰楀埌mainid
+                 long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+                oCN.BeginTran();
+                //鏍规嵁鍗曞彿銆佽祫婧怚D銆佽鍗曚富ID銆佽鍗曞瓙ID銆佸埗鍗曚汉杩囨护浜ч噺姹囨姤鎶ユ鐢宠鎻愪氦鏁版嵁
+                string sql = string.Format(@"update Sc_ICMOBillWorkQtyStatus_Tmp set 
+                                 HICMOReportInterID ='"+HInterID+"', HICMOReportBillNo='"+ ScMaxWork + "' from Sc_ICMOBillWorkQtyStatus_Tmp a where a.HICMOBillNo='" + workcode+ "' and a.HSourceID='" + HSourceID + "' and  HICMOInterID='" + HICMOInterID+ "' and a.HICMOEntryID='"+ HICMOEntryID + "' and a.HMaker='"+HMaker+"'  and HRelationInterID='0'");
+                oCN.RunProc(sql);
+                oCN.Commit();
+                //鏍规嵁鐢熶骇璁㈠崟鍙锋煡璇㈢敓浜ц鍗曡〃锛屾嬁鍒扮粍缁囥�佽溅闂�
+                DataSet ds0 = oCN.RunProcReturn("select HPRDORGID,HDeptID from Sc_ICMOBillMain where HBillNo='"+ workcode + "'", "Sc_ICMOBillMain");
+
+                //鏌ヨ浜ч噺姹囨姤涓存椂琛�
+                ds = oCN.RunProcReturn("select top 1 * from  Sc_ICMOBillWorkQtyStatus_Tmp where HICMOReportInterID='" + HInterID + "' and HICMOReportBillNo='" + ScMaxWork + "'", "Sc_ICMOBillWorkQtyStatus_Tmp");
+                if (ds.Tables[0].Rows.Count <= 0) 
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "褰撳墠鍗曟嵁鏃犱骇閲忔眹鎶ヨ褰曪紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+               
+                WebS.ClsSc_ICMOReportBillMain model = new WebS.ClsSc_ICMOReportBillMain();
+                model.HInterID = HInterID;
+                model.HBillNo = ScMaxWork;
+                //model.HYear= DBUtility.ClsPub.isLong(DateTime.Now.Year);
+                //model.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+                model.HDate = DateTime.Now;
+                model.HRemark = "";
+                model.HMaker = HMaker;
+                model.HEmpID = 0;
+                model.HGroupID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HGroupID"]);
+                model.HDeptID= DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HDeptID"]);
+                model.HPRDORGID = DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HPRDORGID"]);
+                WebS.WebService1 oWebs = new WebS.WebService1();
+                bool flag=oWebs.set_SaveICMOProductReportBill_Layui(model, sHSourceType, ref DBUtility.ClsPub.sErrInfo);
+                if (flag)
                 {
                     objJsonResult.code = "1";
                     objJsonResult.count = 1;
-                    objJsonResult.Message = "宸ュ崟鏆傛湭澶勭悊,鍙互鎿嶄綔锛�";
-                    objJsonResult.data = null;
+                    objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+                    objJsonResult.data = 1;
                 }
                 else 
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "宸ュ崟宸插鐞�,涓嶅厑璁告搷浣滐紒";
+                    objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sErrInfo;
                     objJsonResult.data = null;
                 }
-
             }
-            catch (Exception ex)
+            catch (Exception e)
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = ex.Message;
-                objJsonResult.data = null;
+                objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+                objJsonResult.data = 1;
+               
             }
             return objJsonResult;
         }
         #endregion
+   
 
     }
 }
diff --git a/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs b/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs
index bf583a6..8ac3bfc 100644
--- a/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_QualityReportBillController.cs
@@ -263,7 +263,7 @@
                     oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
                     oItemSub.HCloseType = false;   //鍏抽棴绫诲瀷
                     //oItemSub.HRemark = "";         //澶囨敞
-                    oItemSub.HSourceInterID = 0;     // 婧愬崟涓诲唴鐮�
+                    oItemSub.HSourceInterID =0;     // 婧愬崟涓诲唴鐮�
                     oItemSub.HSourceEntryID = 0;   //婧愬崟瀛愬唴鐮�
                     //oItemSub.HSourceBillNo = "";  //婧愬崟鍗曞彿
                     //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 2116092..73bf700 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -713,14 +713,8 @@
         /// <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);
@@ -1987,6 +1981,98 @@
         }
 
         /// <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>
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
new file mode 100644
index 0000000..457d2d0
--- /dev/null
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
@@ -0,0 +1,454 @@
+锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+    //宸ュ簭妫�楠屽崟Controller
+    //鏁版嵁搴撲富琛≦C_ProcessCheckBillMain
+    //鏁版嵁搴撳瓙琛≦C_ProcessCheckBillSub
+    public class QC_ProcessCheckBillController : ApiController
+    {
+        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+        private json objJsonResult = new json();
+        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+        DataSet ds;
+
+        #region 宸ュ簭妫�楠屽崟淇濆瓨
+        /// <summary>
+        /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("QC_ProcessCheckBill/set_SaveBill")]
+        [HttpPost]
+        public object set_SaveBill([FromBody] JObject sMainSub)
+        {
+            var _value = sMainSub["sMainSub"].ToString();
+            string msg1 = _value.ToString();
+            //淇濆瓨鍗曟嵁
+            return objJsonResult = AddBillMain(msg1);
+        }
+
+        public json AddBillMain(string msg1)
+        {
+            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            string msg2 = sArray[0].ToString();
+            string msg3 = sArray[1].ToString();
+            string OperationType = sArray[2].ToString().Trim();
+            bool bResult;
+            try
+            {
+                msg2 = "[" + msg2.ToString() + "]";
+                List<Model.ClsQC_ProcessCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_ProcessCheckBillMain>>(msg2);
+                DAL.ClsQC_ProcessCheckBill BillNew = new DAL.ClsQC_ProcessCheckBill();
+                //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+                string s = "";
+                int sYear = 0;
+                int sPeriod = 0; 
+                DateTime HDate = mainList[0].HDate;//鏃ユ湡
+                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = s;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                BillNew.omodel.HYear = sYear;
+                BillNew.omodel.HPeriod = sPeriod;
+                //鍥哄畾璧嬪��=================================
+                BillNew.omodel.HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+                BillNew.omodel.HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+                BillNew.omodel.HDate = HDate;
+                BillNew.omodel.HRemark = mainList[0].HRemark;//澶囨敞
+                BillNew.omodel.HMaker = mainList[0].HMaker;
+                BillNew.omodel.HSourceID = ClsPub.isLong(mainList[0].HSourceID);
+                BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
+                BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);
+                BillNew.omodel.HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
+                BillNew.omodel.HProcExchInterID = ClsPub.isLong(mainList[0].HProcExchInterID);
+                BillNew.omodel.HProcExchEntryID = ClsPub.isLong(mainList[0].HProcExchEntryID);
+                BillNew.omodel.HProcExchBillNo = ClsPub.isStrNull(mainList[0].HProcExchBillNo);
+                BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
+                BillNew.omodel.HFirstCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
+                BillNew.omodel.HCheckerResult = ClsPub.isStrNull(mainList[0].HCheckerResult);
+                BillNew.omodel.HMainSourceInterID = ClsPub.isLong(mainList[0].HMainSourceInterID);
+                BillNew.omodel.HMainSourceEntryID = ClsPub.isLong(mainList[0].HMainSourceEntryID);
+                BillNew.omodel.HMainSourceBillNo = ClsPub.isStrNull(mainList[0].HMainSourceBillNo);
+                BillNew.omodel.HMainSourceBillType = ClsPub.isStrNull(mainList[0].HMainSourceBillType);
+                BillNew.omodel.HBillStatus = 1;
+                BillNew.omodel.HProcID = ClsPub.isLong(mainList[0].HProcID);
+                List<Model.ClsQC_ProcessCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_ProcessCheckBillSub>>(msg3);
+                BillNew.DetailColl = new List<Model.ClsQC_ProcessCheckBillSub>();
+                for (int i = 0; i < subList.ToArray().Length; i++)
+                {
+                    if (i >= 0)//HQty
+                    {
+                        Model.ClsQC_ProcessCheckBillSub oSub = new Model.ClsQC_ProcessCheckBillSub();
+                        oSub.HEntryID = i+1;
+                        oSub.HRemark = ClsPub.isStrNull(subList[i].HRemark);
+                        oSub.HSourceInterID = ClsPub.isLong(subList[i].HSourceInterID);
+                        oSub.HSourceEntryID = ClsPub.isLong(subList[i].HSourceEntryID);
+                        oSub.HSourceBillType = ClsPub.isStrNull(subList[i].HSourceBillType); 
+                        oSub.HSourceBillNo = ClsPub.isStrNull(subList[i].HSourceBillNo);
+                        oSub.HRelationQty = DBUtility.ClsPub.isDoule(subList[i].HRelationQty);
+                        oSub.HRelationMoney = DBUtility.ClsPub.isDoule(subList[i].HRelationMoney);
+                        oSub.HCloseMan = DBUtility.ClsPub.isStrNull(subList[i].HCloseMan);
+                        oSub.HCloseType = DBUtility.ClsPub.isBool(subList[i].HCloseType);
+                        oSub.HQCCheckItemID = DBUtility.ClsPub.isLong(subList[i].HQCCheckItemID);
+                        oSub.HQCStd = DBUtility.ClsPub.isStrNull(subList[i].HQCStd);
+                        oSub.HResult = DBUtility.ClsPub.isStrNull(subList[i].HResult);
+                        oSub.HQCRelValue = DBUtility.ClsPub.isStrNull(subList[i].HQCRelValue);
+                        oSub.HProcCheckTime = HDate;
+                        oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(mainList[0].HBillNo); 
+                        oSub.HProcCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
+
+                        BillNew.DetailColl.Add(oSub);
+                    }
+                    else
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鏃犳槑缁嗚淇℃伅!";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                //淇濆瓨瀹屾瘯鍚庡鐞�
+                if (OperationType.Equals("1") || OperationType.Equals("2"))
+                {
+                    bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+                }
+                else
+                {
+                    bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
+                }
+                //鎻愮ず
+                if (bResult == true)
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    //objJsonResult.Message = "鍗曟嵁瀛樼洏瀹屾瘯!鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+                    objJsonResult.Message = ClsPub.sExeReturnInfo+"鍗曟嵁鍙�:" + mainList[0].HBillNo.Trim();
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+                    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
+
+
+        #region 宸ュ簭妫�楠屽崟鏍规嵁婧愬崟绫诲瀷鑾峰彇淇℃伅-婧愬崟涓虹敓浜х姸鎬佷复鏃惰〃锛�3722锛�
+        /// <summary>
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("QC_ProcessCheckBill/get_ICMOBillStatus_Tmp")]
+        [HttpGet]
+        public object get_ICMOBillStatus_Tmp(int HInterID, int HEntryID, string HBillType)
+        {
+            try
+            {
+                if (HInterID == 0 || HBillType.Equals(""))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍙傛暟涓嶅叏锛岃幏鍙栨簮鍗曚俊鎭け璐ワ紒HInterID锛�" + HInterID + "锛汬EntryID锛�" + HEntryID + "锛汬BillType锛�" + HBillType + "锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    ds = oCN.RunProcReturn("exec h_p_QC_GetInfoByICMOStatusBill " + HInterID + "," + HEntryID + "," + HBillType, "h_p_QC_GetInfoByICMOStatusBill");
+                }
+                if (ds == null || ds.Tables[0].Rows.Count == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "1";
+                    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 宸ュ簭妫�楠屽崟Old
+        /// <summary>
+        /// 宸ュ簭妫�楠屽崟鍒楄〃淇敼鎸夐挳鏂规硶
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("QC_ProcessCheckBill/xg")]
+        [HttpGet]
+        public object xg(long HInterID)
+        {
+            try
+            {
+                ds = oCN.RunProcReturn("select HInterID,HBillNo,HProcExchInterID,HProcExchEntryID,HProcExchBillNo" +
+                    ",HMaterID,HProcID,HSourceID,HEmpID,HInStockQty" +
+                    ",HCheckQty,HRightQty,HBadQty,HFirstCheckEmp,HCheckerResult" +
+                    ",HBarCode,HLBatchNo,HCusID,HSortBillNo,HContrctBatchNo" +
+                    ",HProdAreaID,HProdTypeID,HProdStoveNo,HRecipeID,HDiameter1" +
+                    ",HDiameter2,HRoutingInterID,HDrawingDireID,HPackTypeID from QC_ProcessCheckBillMain where HInterID=" + HInterID, "QC_ProcessCheckBillMain");
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "";
+                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;
+            }
+        }
+
+        /// <summary>
+        /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("QC_ProcessCheckBill/AddBill1")]
+        [HttpPost]
+        public object AddBill1([FromBody] JObject oMain)
+        {
+            var _value = oMain["oMain"].ToString();
+            string msg1 = _value.ToString();
+            try
+            {
+                DAL.ClsQC_ProcessCheckBill oProcess = new DAL.ClsQC_ProcessCheckBill();
+
+                msg1 = "[" + msg1.ToString() + "]";
+                List<QC_ProcessCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<QC_ProcessCheckBillMain>>(msg1);
+                string BillType = "7507";
+                long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+                string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+                DateTime HDate = mainList[0].HDate;//鏃ユ湡
+                int HYear = 2021;
+                double HPeriod = 1;
+                long HBillStatus = mainList[0].HBillStatus;
+                long HCheckItemNowID = mainList[0].HCheckItemNowID;
+                long HCkeckItemNextID = mainList[0].HCheckItemNextID;
+                long HCheckFlowID = mainList[0].HCheckFlowID;
+                string HRemark = mainList[0].HRemark;//澶囨敞
+                string HBacker = mainList[0].HBacker;
+                DateTime HBackDate = mainList[0].HBackDate;
+                string HBackRemark = mainList[0].HBackRemark;
+                string HChecker = mainList[0].HChecker;
+                DateTime HCheckDate = mainList[0].HCheckDate;
+                string HMaker = mainList[0].HMaker;
+                DateTime HMakeDate = mainList[0].HMakeDate;
+                string HUpDater = mainList[0].HUpDater;
+                DateTime HUpDateDate = mainList[0].HUpDateDate;
+                string HCloseMan = mainList[0].HCloseMan;
+                DateTime HCloseDate = mainList[0].HCloseDate;
+                string HCloseType = mainList[0].HCloseType;
+                string HDeleteMan = mainList[0].HDeleteMan;
+                DateTime HDeleteDate = mainList[0].HDeleteDate;
+                string HMainSourceBillType = mainList[0].HMainSourceBillType;
+                long HMainSourceInterID = mainList[0].HMainSourceInterID;
+                long HMainSourceEntryID = mainList[0].HMainSourceEntryID;
+                string HMainSourceBillNo = mainList[0].HMainSourceBillNo;
+                double HPrintQty = mainList[0].HPrintQty;
+                long HICMOInterID = mainList[0].HICMOInterID;
+                string HICMOBillNo = mainList[0].HICMOBillNo;
+                long HProExchInterID = mainList[0].HProcExchInterID;
+                long HProExchEntryID = mainList[0].HProcExchEntryID;
+                string HProExchBillNo = mainList[0].HProcExchBillNo;
+                long HMaterID = mainList[0].HMaterID;
+                long HProcID = mainList[0].HProcID;
+                long HSourceID = mainList[0].HSourceID;
+                long HEmpID = mainList[0].HEmpID;
+                double HInStockQty = mainList[0].HInStockQty;
+                double HCheckQty = mainList[0].HCheckQty;
+                double HRightQty = mainList[0].HRightQty;
+                double HBadQty = mainList[0].HBadQty;
+                long HFirstCheckEmp = mainList[0].HFirstCheckEmp;
+                string HCheckerResult = mainList[0].HCheckerResult;
+                string HBarcode = mainList[0].HBarcode;
+                string HLBatchNo = mainList[0].HLBatchNo;
+                long HCusID = mainList[0].HCusID;
+                string HSortBillNo = mainList[0].HSortBillNo;
+                string HConTrctBatchNo = mainList[0].HContrctBatchNo;
+                long HProdAreaID = mainList[0].HProdAreaID;
+                long HProdTypeID = mainList[0].HProdTypeID;
+                string HProdStoveNo = mainList[0].HProdStoveNo;
+                long HRecipeID = mainList[0].HRecipeID;
+                double HDiameter1 = mainList[0].HDiameter1;
+                double HDiameter2 = mainList[0].HDiameter2;
+                long HRoutingInterID = mainList[0].HRoutingInterID;
+                long HPackTypeID = mainList[0].HPackTypeID;
+                long HDrawingDireID = mainList[0].HDrawingDireID;
+
+
+
+                //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+                oCN.BeginTran();
+                //涓昏〃
+                oCN.RunProc("Update QC_ProcessCheckBillMain set " +
+                    "HMaterID=" + HMaterID +
+                    ",HSourceID=" + HSourceID +
+                    ",HEmpID=" + HEmpID +
+                    ",HInStockQty=" + HInStockQty +
+                    ",HCheckQty=" + HCheckQty +
+                    ",HRightQty=" + HRightQty +
+                    ",HBadQty=" + HBadQty +
+                    ",HCusID=" + HCusID +
+                    ",HRemark= '" + HRemark + "' Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+                //淇敼瀛愰」鐩唬鐮�
+                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+                //灏嗕笂绾� 涓洪潪鏈骇
+                //oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+                //
+                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.Message;
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+
+        /// <summary>
+        /// 宸ュ簭妫�楠屽崟鍒楄〃鍒犻櫎鎸夐挳
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("QC_ProcessCheckBill/Delete_Json")]
+        [HttpGet]
+        public object Delete_Json(long HItemID)
+        {
+            DAL.ClsQC_ProcessCheckBill BillOld = new DAL.ClsQC_ProcessCheckBill();
+            try
+            {
+                if (BillOld.DeleteBill(HItemID, ref ClsPub.sExeReturnInfo) != true)
+                {
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍒犻櫎鎴愬姛";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鍒犻櫎鎴愬姛";
+                objJsonResult.data = null;
+                return objJsonResult;
+
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+
+        /// <summary>
+        /// 杩斿洖宸ュ簭妫�楠屽崟鍒楄〃
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("QC_ProcessCheckBill/GetProcessCheckBillList")]
+        [HttpGet]
+        public object GetProcessCheckBillList(string sWhere)
+        {
+            try
+            {
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    ds = oCN.RunProcReturn("select * from h_v_QC_ProcessCheckBillList " + sWhere, "h_v_QC_ProcessCheckBillList");
+                }
+                else
+                {
+                    string sql1 = "select * from h_v_QC_ProcessCheckBillList where 1 = 1 ";
+                    string sql = sql1 + sWhere;
+                    ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBillList");
+                }
+                if (ds == null || ds.Tables[0].Rows.Count == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "false锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    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
+        //
+    }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\346\243\200\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
similarity index 78%
rename from "WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\346\243\200\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
rename to "WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
index f26c014..d99c43b 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\346\243\200\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
@@ -10,7 +10,9 @@
 
 namespace WebAPI.Controllers
 {
-    //棣栨妫�楠屽崟Controller
+    //棣栦欢妫�楠屽崟Controller
+    //鏁版嵁搴撲富琛≦C_FirstPieceCheckBillMain
+    //鏁版嵁搴撳瓙琛≦C_FirstPieceCheckBillSub
     public class QC_FirstPieceCheckBillController : ApiController
     {
         public DBUtility.ClsPub.Enum_BillStatus BillStatus;
@@ -18,6 +20,7 @@
         SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
         DataSet ds;
 
+        #region 棣栦欢妫�楠屽崟淇濆瓨
         /// <summary>
         /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
         ///鍙傛暟锛歴tring sql銆�
@@ -78,7 +81,11 @@
                 BillNew.omodel.HMaterID = ClsPub.isLong(mainList[0].HMaterID);
                 BillNew.omodel.HFirstCheckEmp = ClsPub.isLong(mainList[0].HFirstCheckEmp);
                 BillNew.omodel.HLastResult = ClsPub.isBool(mainList[0].HLastResult);
-
+                BillNew.omodel.HMainSourceInterID = ClsPub.isLong(mainList[0].HMainSourceInterID);
+                BillNew.omodel.HMainSourceEntryID = ClsPub.isLong(mainList[0].HMainSourceEntryID);
+                BillNew.omodel.HMainSourceBillNo = ClsPub.isStrNull(mainList[0].HMainSourceBillNo);
+                BillNew.omodel.HMainSourceBillType = ClsPub.isStrNull(mainList[0].HMainSourceBillType);
+                BillNew.omodel.HBillStatus = 1;
                 List<Model.ClsQC_FirstPieceCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillSub>>(msg3);
                 BillNew.DetailColl = new List<Model.ClsQC_FirstPieceCheckBillSub>();
                 for (int i = 0; i < subList.ToArray().Length; i++)
@@ -105,6 +112,7 @@
                         oSub.HMax = DBUtility.ClsPub.isStrNull(subList[i].HMax);
                         oSub.HMin = DBUtility.ClsPub.isStrNull(subList[i].HMin);
                         oSub.HAvg = DBUtility.ClsPub.isStrNull(subList[i].HAvg);
+                        oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(mainList[0].HBillNo);
                         BillNew.DetailColl.Add(oSub);
                     }
                     else
@@ -153,32 +161,36 @@
                 return objJsonResult;
             }
         }
+        #endregion
 
+        #region 棣栦欢妫�楠屽崟鏍规嵁婧愬崟绫诲瀷鑾峰彇淇℃伅-婧愬崟涓虹敓浜х姸鎬佷复鏃惰〃锛�3722锛�
         /// <summary>
-        /// 杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚
+        ///鍙傛暟锛歴tring sql銆�
+        ///杩斿洖鍊硷細object銆�
         /// </summary>
-        /// <param name="hmainid">鐢熶骇浠诲姟鍗旾D</param>
-        /// <returns>object</returns>
-        [Route("Sc_ProcessExchangeBill/GetICMOBillList")]
+        [Route("QC_FirstPieceCheckBill/get_ICMOBillStatus_Tmp")]
         [HttpGet]
-        public object GetICMOBillList(int hmainid,int OrganizationID)
+        public object get_ICMOBillStatus_Tmp(int HInterID,int HEntryID,string HBillType)
         {
             try
             {
-                if (hmainid == 0)
+                if (HInterID == 0 || HBillType.Equals(""))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "鐢熶骇浠诲姟鍗旾D涓�0锛�";
+                    objJsonResult.Message = "鍙傛暟涓嶅叏锛岃幏鍙栨簮鍗曚俊鎭け璐ワ紒HInterID锛�"+ HInterID+ "锛汬EntryID锛�"+ HEntryID + "锛汬BillType锛�"+ HBillType+"锛�";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-                ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillListDetail where hmainid=" + hmainid, "h_v_Sc_ICMOBillListDetail");
+                else
+                {
+                    ds = oCN.RunProcReturn("exec h_p_QC_GetInfoByICMOStatusBill " + HInterID + "," + HEntryID + "," + HBillType, "h_p_QC_GetInfoByICMOStatusBill");
+                }
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
-                    objJsonResult.Message = "姝ょ敓浜т换鍔″崟鏃犳槑缁嗚锛�";
+                    objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
@@ -186,7 +198,7 @@
                 {
                     objJsonResult.code = "1";
                     objJsonResult.count = 1;
-                    objJsonResult.Message = "Sucess锛�";
+                    objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
                     objJsonResult.data = ds.Tables[0];
                     return objJsonResult;
                 }
@@ -195,59 +207,12 @@
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
-                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
                 objJsonResult.data = null;
                 return objJsonResult;
             }
         }
-
-        /// <summary>
-        /// 杩斿洖鐢熶骇浠诲姟鍗曟槑缁嗚
-        /// </summary>
-        /// <param name="hmainid">鐢熶骇浠诲姟鍗旾D</param>
-        /// <returns>object</returns>
-        [Route("Sc_ProcessExchangeBill/GetICMOBillDetail")]
-        [HttpGet]
-        public object GetICMOBillDetail(int hmainid, int OrganizationID)
-        {
-            try
-            {
-                if (hmainid == 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "鐢熶骇浠诲姟鍗旾D涓�0锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                ds = oCN.RunProcReturn("select * from h_v_S_Sc_ICMOBillList where hmainid=" + hmainid, "h_v_S_Sc_ICMOBillList");
-                if (ds == null || ds.Tables[0].Rows.Count == 0)
-                {
-                    objJsonResult.code = "0";
-                    objJsonResult.count = 0;
-                    objJsonResult.Message = "姝ょ敓浜т换鍔″崟鏃犳槑缁嗚锛�";
-                    objJsonResult.data = null;
-                    return objJsonResult;
-                }
-                else
-                {
-                    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
         //
     }
 }
\ No newline at end of file
diff --git a/WebAPI/DLL/ClsGy_Material_Ctl.cs b/WebAPI/DLL/ClsGy_Material_Ctl.cs
new file mode 100644
index 0000000..687305e
--- /dev/null
+++ b/WebAPI/DLL/ClsGy_Material_Ctl.cs
@@ -0,0 +1,135 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+    public class ClsGy_Material_Ctl : DBUtility.ClsGy_Base_Ctl
+    {
+        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+        //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+        public string HOldNumber;
+        public Models.ClsGy_Material_Model oModel = new Models.ClsGy_Material_Model();
+        //鏂板
+        public override bool AddNew()
+        {
+            try
+            {
+                oCn.BeginTran();
+                oCn.RunProc("Insert into Gy_Material (" +
+                    "HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+                    ",HLevel,HEndFlag,HStopflag,HRemark" +
+                    ",HModel,HUnitID,HMaterClsID,HMaterTypeID,HUnitGroupID" +
+                    ",HWhID,HRoutingID,HBomID,HSecUnitID,HSecUnitRate" +
+                    ",HHighStock,HLowStock,HSafeStock,HOrderPrice,HSalePrice" +
+                    ",HKeepDays,HPlanPrice,HstdPrice,HQtyMin,HQtyMax" +
+                    ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty) " +
+                    " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
+                    ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
+                    ",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() +
+                    ", " + oModel.HWhID.ToString() + "," + oModel.HRoutingID.ToString() + "," + oModel.HBomID.ToString() + "," + oModel.HSecUnitID.ToString() + "," + oModel.HSecUnitRate.ToString() +
+                    ", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" +
+                    ", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() +
+                    ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+                //淇敼涓婄骇涓洪潪鏈骇浠g爜
+                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+                oCn.Commit();
+                return true;
+            }
+            catch (Exception e)
+            {
+                oCn.RollBack();
+                throw (e);
+            }
+        }
+
+        //淇敼
+        public override bool ModifyByID(Int64 sItemID)
+        {
+            try
+            {
+                oCn.BeginTran();
+                oCn.RunProc("Update " + MvarItemKey + " set " +
+                    " HNumber='" + oModel.HNumber + "'" +
+                    ",HName='" + oModel.HName + "'" +
+                    ",HShortNumber='" + oModel.HShortNumber + "'" +
+                    ",HParentID=" + oModel.HParentID.ToString() +
+                    ",HLevel=" + oModel.HLevel.ToString() +
+                    ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
+                    ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+                    ",HRemark= '" + oModel.HRemark + "'" +
+                    ",HHelpCode='" + oModel.HHelpCode + "'" +
+                    ",HModel='" + oModel.HModel + "'" +
+                    ",HUnitID=" + oModel.HUnitID.ToString() +
+                    ",HMaterClsID=" + oModel.HMaterClsID.ToString() +
+                    ",HMaterTypeID=" + oModel.HMaterTypeID.ToString() +
+                    ",HUnitGroupID=" + oModel.HUnitGroupID.ToString() +
+                    ",HWhID=" + oModel.HWhID.ToString() +
+                    ",HRoutingID=" + oModel.HRoutingID.ToString() +
+                    ",HBomID=" + oModel.HBomID.ToString() +
+                    ",HSecUnitID=" + oModel.HSecUnitID.ToString() +
+                    ",HSecUnitRate=" + oModel.HSecUnitRate.ToString() +
+                    ",HHighStock=" + oModel.HHighStock.ToString() +
+                    ",HLowStock=" + oModel.HLowStock.ToString() +
+                    ",HSafeStock=" + oModel.HSafeStock.ToString() +
+                    ",HOrderPrice=" + oModel.HOrderPrice.ToString() +
+                    ",HSalePrice=" + oModel.HSalePrice.ToString() +
+                    ",HKeepDays=" + oModel.HKeepDays.ToString() +
+                    ",HPlanPrice=" + oModel.HPlanPrice.ToString() +
+                    ",HstdPrice=" + oModel.HstdPrice.ToString() +
+                    ",HQtyMin=" + oModel.HQtyMin.ToString() +
+                    ",HQtyMax=" + oModel.HQtyMax.ToString() +
+                    ",HVersion='" + oModel.HVersion + "'" +
+                    ",HEngName='" + oModel.HEngName + "'" +
+                    ",HEngModel='" + oModel.HEngModel + "'" +
+                    ",HSubjoin='" + oModel.HSubjoin + "'" +
+                    ",HSubjoin2='" + oModel.HSubjoin2 + "'" +
+                    ",HColor='" + oModel.HColor + "'" +
+                    ",HSPGroupID=" + oModel.HSPGroupID.ToString() +
+                    ",HSPID=" + oModel.HSPID.ToString() +
+                    ",HMinPickQty=" + oModel.HMinPickQty.ToString() +
+                    ",HPropertyTypeID=" + oModel.HPropertyTypeID.ToString() + "Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+                //淇敼瀛愰」鐩唬鐮�
+                oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+                //灏嗕笂绾� 涓洪潪鏈骇
+                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+                //
+                oCn.Commit();
+                return true;
+            }
+            catch (Exception e)
+            {
+                oCn.RollBack();
+                throw (e);
+            }
+        }
+        //鏍规嵁浠g爜鍒ゆ柇淇℃伅
+        public override bool HavParentCode(string sCode, Int64 sItemID)
+        {
+            DataSet DS;
+            try
+            {
+                DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
+                if (DS.Tables[0].Rows.Count == 0)
+                    return false;
+                else
+                {
+                    oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+                    return true;
+                }
+            }
+            catch (Exception e)
+            {
+                throw (e);
+            }
+        }
+        //鏋勯�犲嚱鏁�
+        public ClsGy_Material_Ctl()
+        {
+            MvarItemKey = "Gy_Material";
+            MvarReportTitle = "鐗╂枡璁剧疆";
+            oModel = new Models.ClsGy_Material_Model();
+        }
+    }
+}
diff --git a/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs b/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
index b0d1ae8..1194bb9 100644
--- a/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
+++ b/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
@@ -77,18 +77,25 @@
                 //若MAINDI重复则重新获取
                 oCn.BeginTran();
                 //主表
+
                 oCn.RunProc("Insert Into Sc_ICMOBillWorkQtyStatus_Tmp   " +
-                "(HInterID,HBillType,HSourceID,HReportType,HPieceQty" +
-                ",HQty,HBarCode,HAddr,HMaker,HMakeDate" +
-                ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSplitNO,HSourceBillType" +
-                ",HRelationInterID,HRelationEntryID,HRelationBillNo,HReportEntryID" +
-                ") " +
+               "(HInterID,HBillType,HSourceID,HReportType,HPieceQty" +
+               ",HMaterID,HGroupID,HWorkManID,HWorkReportDate,HDate" +
+               ",HBillSubType,HBillNo,HICMOInterID,HICMOEntryID,HICMOBillNo" +
+               ",HQty,HBadQty,HWasterQty,HBarCode,HAddr,HMaker,HMakeDate" +
+               ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSplitNO,HSourceBillType" +
+               ",HRelationInterID,HRelationEntryID,HRelationBillNo,HReportEntryID" +
+               ") " +
                 " values(" + omodel.HInterID.ToString() + ",'" + BillType + "'," + omodel.HSourceID.ToString() + "," + omodel.HReportType.ToString() + "," + omodel.HPieceQty.ToString() +
-                "," + omodel.HQty.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.GetServerDate(-1) + "'" +
+                "," + omodel.HMaterID.ToString() + ",'" + omodel.HGroupID + "','" + omodel.HWorkManID + "','" + omodel.HWorkReportDate + "','" + omodel.HDate + "'" +
+                ",'" + omodel.HBillSubType.ToString() + "','" + omodel.HBillNo + "','" + omodel.HICMOInterID + "','" + omodel.HICMOEntryID + "','" + omodel.HICMOBillNo + "'" +
+                "," + omodel.HQty.ToString() + "," + omodel.HBadQty.ToString() + "," + omodel.HWasterQty.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HMaker+ "','" + omodel.HMakeDate + "'" +
                 "," + omodel.HSourceInterID.ToString() + "," + omodel.HSourceEntryID.ToString() + ",'" + omodel.HSourceBillNo + "','" + omodel.HSplitNO + "','" + omodel.HSourceBillType + "'" +
                 "," + omodel.HRelationInterID.ToString() + "," + omodel.HRelationEntryID.ToString() + ",'" + omodel.HRelationBillNo + "'," + omodel.HReportEntryID.ToString() + 
                 ") ");
-                 
+
+                //根据源单主内码 设置 生产状态表 完工状态(设置本单对应得源单 为完工状态)
+                oCn.RunProcReturn("exec h_p_JIT_MESICMOReport_Status @HInterId=" + omodel.HInterID + ",@flag='完工'", "h_p_JIT_MESBeginWorkBill_BeginWork");
                 sReturn = "新增单据成功!";
                 oCn.Commit();
                 return true;
@@ -123,7 +130,7 @@
                 omodel.HBarCode = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBarCode"]);
                 omodel.HAddr = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HAddr"]);
                 omodel.HMaker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaker"]);
-                omodel.HMakeDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HMakeDate"]);
+                omodel.HMakeDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMakeDate"]);
                 omodel.HSourceInterID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HSourceInterID"]);
                 omodel.HSourceEntryID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HSourceEntryID"]);
                 omodel.HSourceBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSourceBillNo"]);
diff --git a/WebAPI/DLL/ClsSc_ICMOReportBill.cs b/WebAPI/DLL/ClsSc_ICMOReportBill.cs
index d42b486..45c7003 100644
--- a/WebAPI/DLL/ClsSc_ICMOReportBill.cs
+++ b/WebAPI/DLL/ClsSc_ICMOReportBill.cs
@@ -51,6 +51,11 @@
                 ",HUpDater='" + omodel.HMaker + "'" +
                 ",HUpDateDate=getdate()" +
                 //========================================
+                ",HMainSourceBillNo='" + omodel.HMainSourceBillNo + "'" +
+                ",HMainSourceInterID=" + omodel.HMainSourceInterID.ToString() +
+                ",HMainSourceEntryID=" + omodel.HMainSourceEntryID.ToString() +
+                ",HMainSourceBillType=" + omodel.HMainSourceBillType.ToString() +
+
                 ",HDeptID=" + omodel.HDeptID.ToString() +
                 ",HDeptNumber='" + omodel.HDeptNumber +"'"+
                 ",HEmpID=" + omodel.HEmpID.ToString() +
@@ -150,10 +155,12 @@
                 "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" + 
                 ",HYear,HPeriod,HRemark,HEmpID,HEmpNumber" +
                 ",HGroupID,HDeptID,HDeptNumber" +
+                ",HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType" +
                 ") " +
                 " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker+ "',getdate()" +
                 "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HEmpID.ToString() + "','" + omodel.HEmpNumber +
                 "','" + omodel.HGroupID.ToString() + "'," + omodel.HDeptID.ToString() + ",'" + omodel.HDeptNumber + "'"+
+                "','" + omodel.HMainSourceBillNo.ToString() + "'," + omodel.HMainSourceInterID.ToString() + ",'" + omodel.HMainSourceEntryID + "','" + omodel.HMainSourceBillType + "'" +
                 ") ");
                 //鎻掑叆瀛愯〃
                 foreach (Models.ClsSc_ICMOReportBillSub oSub in DetailColl)
diff --git a/WebAPI/DLL/DAL.dll b/WebAPI/DLL/DAL.dll
index a22039b..0fbcb5f 100644
--- a/WebAPI/DLL/DAL.dll
+++ b/WebAPI/DLL/DAL.dll
Binary files differ
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 69a413a..17d63b3 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -668,6 +668,19 @@
             return list;
         }
 
+
+        /// <summary>
+        /// 澶勭悊鏂板鐗╂枡琛ㄧ殑json
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Models.ClsGy_Material_Model> getObjectByJson_Gy_Material(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Models.ClsGy_Material_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_Material_Model>>(jsonString);
+            return list;
+        }
+
         /// <summary>
         /// 澶勭悊鏂板璁惧缁翠慨涓昏〃鐨刯son
         /// </summary>
diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs
new file mode 100644
index 0000000..889a61a
--- /dev/null
+++ b/WebAPI/Models/ClsGy_Material_Model.cs
@@ -0,0 +1,44 @@
+锘縰sing DBUtility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+    public class ClsGy_Material_Model : ClsGy_Base_Model
+    {
+        public long HMaterClsID;
+        public string HPicNo;
+        public long HErpclsID;
+        public string HColor;
+        public string HSubjoin2;
+        public string HSubjoin;
+        public long HSPID;
+        public long HSPGroupID;
+        public long HPropertyTypeID;
+        public string HEngModel;
+        public string HEngName;
+        public string HVersion;
+        public double HQtyMax;
+        public double HQtyMin;
+        public double HMinPickQty;
+        public string HBarCode;
+        public double HstdPrice;
+        public double HKeepDays;
+        public double HSalePrice;
+        public double HOrderPrice;
+        public double HSafeStock;
+        public double HLowStock;
+        public double HHighStock;
+        public double HSecUnitRate;
+        public long HSecUnitID;
+        public long HBomID;
+        public long HRoutingID;
+        public long HWhID;
+        public long HUnitGroupID;
+        public long HMaterTypeID;
+        public double HPlanPrice;
+
+    }
+}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs b/WebAPI/Models/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
index 9fe2f36..3126a6b 100644
--- a/WebAPI/Models/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
+++ b/WebAPI/Models/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
@@ -16,19 +16,19 @@
         public string HBillNo;       //单据号
         public string HRemark;       //备注
         public string HBacker;      //退回人
-        public DateTime HBackDate;   //退回时间
+        public string HBackDate;   //退回时间
         public string HBackRemark;   //退回原因
         public string HChecker;      //审核人
-        public DateTime HCheckDate;   //审核日期
+        public string HCheckDate;   //审核日期
         public string HMaker;   //制单人
-        public DateTime HMakeDate; //制单日期
+        public string HMakeDate; //制单日期
         public string HUpDater;//修改人
-        public DateTime HUpDateDate; //修改日期
+        public string HUpDateDate; //修改日期
         public string HCloseMan; //关闭人
-        public DateTime HCloseDate;//关闭日期
+        public string HCloseDate;//关闭日期
         public bool HCloseType;   //关闭类型
         public string HDeleteMan;// 作废人
-        public DateTime HDeleteDate; //作废日期
+        public string HDeleteDate; //作废日期
         public string HSplitNO;//派工单
         public int HICMOInterID; //生产订单主ID
         public int HICMOEntryID;//生产订单子ID
diff --git a/WebAPI/Models/ClsSc_ICMOReportBillMain.cs b/WebAPI/Models/ClsSc_ICMOReportBillMain.cs
index 306ef40..f1740fe 100644
--- a/WebAPI/Models/ClsSc_ICMOReportBillMain.cs
+++ b/WebAPI/Models/ClsSc_ICMOReportBillMain.cs
@@ -14,6 +14,5 @@
         public string HCheckType;
         public Int64 HPrintQty;
         public string HWorkShift;
-        
     }
 }
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index ece88c4..392512c 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,11 +5,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
-    <History>True|2021-07-13T08:17:25.8407435Z;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
+    <History>True|2021-07-26T03:18:46.0856966Z;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
   </PropertyGroup>
   <ItemGroup>
     <File Include="apiapp.json">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="bin/Antlr3.Runtime.dll">
       <publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,19 +18,19 @@
       <publishTime>02/22/2013 08:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>07/02/2021 08:47:34</publishTime>
+      <publishTime>07/21/2021 19:55:31</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
       <publishTime>07/22/2016 14:52:40</publishTime>
     </File>
     <File Include="bin/DBUtility.dll">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
       <publishTime>09/20/2018 19:23:20</publishTime>
@@ -48,22 +48,22 @@
       <publishTime>07/25/2012 11:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>07/20/2021 15:52:27</publishTime>
+      <publishTime>07/21/2021 09:18:44</publishTime>
     </File>
     <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
-      <publishTime>07/05/2021 15:15:53</publishTime>
+      <publishTime>07/12/2021 18:14:19</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>08/03/2014 20:33:56</publishTime>
     </File>
     <File Include="bin/Pub_Class.dll">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="bin/Swashbuckle.Core.dll">
       <publishTime>02/15/2015 17:57:08</publishTime>
@@ -129,7 +129,7 @@
       <publishTime>11/28/2018 13:01:00</publishTime>
     </File>
     <File Include="bin/System.Web.Http.WebHost.dll">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="bin/System.Web.Mvc.dll">
       <publishTime>01/28/2015 04:02:18</publishTime>
@@ -162,10 +162,10 @@
       <publishTime>11/24/2014 11:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>07/20/2021 15:58:17</publishTime>
+      <publishTime>07/26/2021 11:18:41</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>07/20/2021 15:58:17</publishTime>
+      <publishTime>07/26/2021 11:18:41</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>07/17/2013 17:03:52</publishTime>
@@ -177,166 +177,166 @@
       <publishTime>11/29/2018 13:26:30</publishTime>
     </File>
     <File Include="Content/bootstrap.css">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="Content/bootstrap.min.css">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="Content/Site.css">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="DLL/BLL.dll">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="DLL/DAL.dll">
-      <publishTime>07/02/2021 08:47:34</publishTime>
+      <publishTime>07/21/2021 19:55:31</publishTime>
     </File>
     <File Include="DLL/DBUtility.dll">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="DLL/Model.dll">
-      <publishTime>07/20/2021 15:52:27</publishTime>
+      <publishTime>07/21/2021 09:18:44</publishTime>
     </File>
     <File Include="DLL/Newtonsoft.Json.Net35.dll">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="DLL/Pub_Class.dll">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="DLL/Pub_Control.dll">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="DLL/SQLHelper.dll">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.eot">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.svg">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.ttf">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="fonts/glyphicons-halflings-regular.woff">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="Global.asax">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="Index.html">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:15</publishTime>
     </File>
     <File Include="packages.config">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.js">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="Views/Scripts/bootstrap.min.js">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.js">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.js">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="Views/Scripts/jquery-1.10.2.min.map">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.js">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.min.js">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="Views/Scripts/modernizr-2.6.2.js">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="Views/Shared/Error.cshtml">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="Views/Shared/_Layout.cshtml">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="Views/web.config">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="Views/_ViewStart.cshtml">
-      <publishTime>05/10/2021 09:27:02</publishTime>
+      <publishTime>05/25/2021 14:18:16</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
-      <publishTime>07/14/2021 15:45:17</publishTime>
+      <publishTime>07/21/2021 21:02:11</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
-      <publishTime>07/14/2021 15:45:17</publishTime>
+      <publishTime>07/21/2021 21:02:10</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
-      <publishTime>07/14/2021 15:45:18</publishTime>
+      <publishTime>07/21/2021 21:02:11</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
-      <publishTime>07/14/2021 15:45:17</publishTime>
+      <publishTime>07/21/2021 21:02:11</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
-      <publishTime>07/14/2021 15:45:18</publishTime>
+      <publishTime>07/21/2021 21:02:11</publishTime>
     </File>
     <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
-      <publishTime>07/14/2021 15:45:17</publishTime>
+      <publishTime>07/21/2021 21:02:10</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
-      <publishTime>07/14/2021 15:45:18</publishTime>
+      <publishTime>07/21/2021 21:02:11</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
-      <publishTime>07/14/2021 15:45:19</publishTime>
+      <publishTime>07/21/2021 21:02:12</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
-      <publishTime>07/14/2021 15:45:18</publishTime>
+      <publishTime>07/21/2021 21:02:12</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
-      <publishTime>07/14/2021 15:45:18</publishTime>
+      <publishTime>07/21/2021 21:02:11</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
-      <publishTime>07/14/2021 15:45:18</publishTime>
+      <publishTime>07/21/2021 21:02:12</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
-      <publishTime>07/14/2021 15:45:18</publishTime>
+      <publishTime>07/21/2021 21:02:11</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
-      <publishTime>07/14/2021 15:45:18</publishTime>
+      <publishTime>07/21/2021 21:02:11</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
-      <publishTime>07/14/2021 15:45:18</publishTime>
+      <publishTime>07/21/2021 21:02:12</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
-      <publishTime>07/14/2021 15:45:18</publishTime>
+      <publishTime>07/21/2021 21:02:12</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
-      <publishTime>07/14/2021 15:45:18</publishTime>
+      <publishTime>07/21/2021 21:02:12</publishTime>
     </File>
     <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
-      <publishTime>07/14/2021 15:45:18</publishTime>
+      <publishTime>07/21/2021 21:02:11</publishTime>
     </File>
     <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
-      <publishTime>07/14/2021 15:45:18</publishTime>
+      <publishTime>07/21/2021 21:02:12</publishTime>
     </File>
     <File Include="Web References/WebS/Reference.map">
-      <publishTime>07/14/2021 15:45:15</publishTime>
+      <publishTime>07/21/2021 21:02:08</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>07/20/2021 15:58:22</publishTime>
+      <publishTime>07/26/2021 11:18:45</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebAPI/Service/LuBaoSevice.cs b/WebAPI/Service/LuBaoSevice.cs
index 0a1eea8..a9a261b 100644
--- a/WebAPI/Service/LuBaoSevice.cs
+++ b/WebAPI/Service/LuBaoSevice.cs
@@ -277,5 +277,26 @@
             return dataSet;
         }
 
+
+        /// <summary>
+        /// 鐗╂枡璁剧疆鏍规嵁id鑾峰彇淇℃伅
+        /// </summary>
+        public static ApiResult<DataSet> GetGy_MaterialBillDetail(string HID)
+        {
+            if (string.IsNullOrEmpty(HID))
+                return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+            var dataSet = Gy_MaterialDb(HID);
+            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+                return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄦ鐗╂枡鏁版嵁" };
+            return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+        }
+
+        public static DataSet Gy_MaterialDb(string HID)
+        {
+            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+            var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Edit_Gy_MaterialList  where HItemID= " + HID + " ", "h_v_Edit_Gy_MaterialList");
+            return dataSet;
+        }
+
     }
 }
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/ClsCLD_Customer_Model.datasource b/WebAPI/Web References/WebS/ClsCLD_Customer_Model.datasource
index 0ac5eab..c3a7f15 100644
--- a/WebAPI/Web References/WebS/ClsCLD_Customer_Model.datasource
+++ b/WebAPI/Web References/WebS/ClsCLD_Customer_Model.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ClsCLD_Customer_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WebAPI.WebS.ClsCLD_Customer_Model</TypeInfo>
+   <TypeInfo>WebAPI.WebS.ClsCLD_Customer_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/ClsCLD_Department_Model.datasource b/WebAPI/Web References/WebS/ClsCLD_Department_Model.datasource
index 20d7c97..54d21aa 100644
--- a/WebAPI/Web References/WebS/ClsCLD_Department_Model.datasource
+++ b/WebAPI/Web References/WebS/ClsCLD_Department_Model.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ClsCLD_Department_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WebAPI.WebS.ClsCLD_Department_Model</TypeInfo>
+   <TypeInfo>WebAPI.WebS.ClsCLD_Department_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/ClsCLD_Employee_Model.datasource b/WebAPI/Web References/WebS/ClsCLD_Employee_Model.datasource
index bcf30be..79dbc35 100644
--- a/WebAPI/Web References/WebS/ClsCLD_Employee_Model.datasource
+++ b/WebAPI/Web References/WebS/ClsCLD_Employee_Model.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ClsCLD_Employee_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WebAPI.WebS.ClsCLD_Employee_Model</TypeInfo>
+   <TypeInfo>WebAPI.WebS.ClsCLD_Employee_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/ClsCLD_StockPlace_Model.datasource b/WebAPI/Web References/WebS/ClsCLD_StockPlace_Model.datasource
index 15715f3..81893f1 100644
--- a/WebAPI/Web References/WebS/ClsCLD_StockPlace_Model.datasource
+++ b/WebAPI/Web References/WebS/ClsCLD_StockPlace_Model.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ClsCLD_StockPlace_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WebAPI.WebS.ClsCLD_StockPlace_Model</TypeInfo>
+   <TypeInfo>WebAPI.WebS.ClsCLD_StockPlace_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/ClsCLD_Supplier_Model.datasource b/WebAPI/Web References/WebS/ClsCLD_Supplier_Model.datasource
index f6a67f7..4af1952 100644
--- a/WebAPI/Web References/WebS/ClsCLD_Supplier_Model.datasource
+++ b/WebAPI/Web References/WebS/ClsCLD_Supplier_Model.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ClsCLD_Supplier_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WebAPI.WebS.ClsCLD_Supplier_Model</TypeInfo>
+   <TypeInfo>WebAPI.WebS.ClsCLD_Supplier_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/ClsCLD_Warehouse_Model.datasource b/WebAPI/Web References/WebS/ClsCLD_Warehouse_Model.datasource
index e4eb02c..035ec02 100644
--- a/WebAPI/Web References/WebS/ClsCLD_Warehouse_Model.datasource
+++ b/WebAPI/Web References/WebS/ClsCLD_Warehouse_Model.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ClsCLD_Warehouse_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WebAPI.WebS.ClsCLD_Warehouse_Model</TypeInfo>
+   <TypeInfo>WebAPI.WebS.ClsCLD_Warehouse_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/ClsGy_BadReason_Model.datasource b/WebAPI/Web References/WebS/ClsGy_BadReason_Model.datasource
index d17bca5..0a48bd3 100644
--- a/WebAPI/Web References/WebS/ClsGy_BadReason_Model.datasource
+++ b/WebAPI/Web References/WebS/ClsGy_BadReason_Model.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ClsGy_BadReason_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WebAPI.WebS.ClsGy_BadReason_Model</TypeInfo>
+   <TypeInfo>WebAPI.WebS.ClsGy_BadReason_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource b/WebAPI/Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource
index a0515eb..f4c293f 100644
--- a/WebAPI/Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource
+++ b/WebAPI/Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ClsGy_BarCodeBill_WMS_Model_View" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WebAPI.WebS.ClsGy_BarCodeBill_WMS_Model_View</TypeInfo>
+   <TypeInfo>WebAPI.WebS.ClsGy_BarCodeBill_WMS_Model_View, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/ClsGy_Customer_Model.datasource b/WebAPI/Web References/WebS/ClsGy_Customer_Model.datasource
index a2ca611..7e6f2ac 100644
--- a/WebAPI/Web References/WebS/ClsGy_Customer_Model.datasource
+++ b/WebAPI/Web References/WebS/ClsGy_Customer_Model.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ClsGy_Customer_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WebAPI.WebS.ClsGy_Customer_Model</TypeInfo>
+   <TypeInfo>WebAPI.WebS.ClsGy_Customer_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/ClsGy_Department_Model.datasource b/WebAPI/Web References/WebS/ClsGy_Department_Model.datasource
index b501ab8..5468695 100644
--- a/WebAPI/Web References/WebS/ClsGy_Department_Model.datasource
+++ b/WebAPI/Web References/WebS/ClsGy_Department_Model.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ClsGy_Department_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WebAPI.WebS.ClsGy_Department_Model</TypeInfo>
+   <TypeInfo>WebAPI.WebS.ClsGy_Department_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/ClsGy_Employee_Model.datasource b/WebAPI/Web References/WebS/ClsGy_Employee_Model.datasource
index 420e004..921aa30 100644
--- a/WebAPI/Web References/WebS/ClsGy_Employee_Model.datasource
+++ b/WebAPI/Web References/WebS/ClsGy_Employee_Model.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ClsGy_Employee_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WebAPI.WebS.ClsGy_Employee_Model</TypeInfo>
+   <TypeInfo>WebAPI.WebS.ClsGy_Employee_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/ClsGy_Group_Model.datasource b/WebAPI/Web References/WebS/ClsGy_Group_Model.datasource
index 77ce667..edaca4e 100644
--- a/WebAPI/Web References/WebS/ClsGy_Group_Model.datasource
+++ b/WebAPI/Web References/WebS/ClsGy_Group_Model.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ClsGy_Group_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WebAPI.WebS.ClsGy_Group_Model</TypeInfo>
+   <TypeInfo>WebAPI.WebS.ClsGy_Group_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/ClsGy_Item30JiTai_Model.datasource b/WebAPI/Web References/WebS/ClsGy_Item30JiTai_Model.datasource
index 7a6e083..437bbc0 100644
--- a/WebAPI/Web References/WebS/ClsGy_Item30JiTai_Model.datasource
+++ b/WebAPI/Web References/WebS/ClsGy_Item30JiTai_Model.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ClsGy_Item30JiTai_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WebAPI.WebS.ClsGy_Item30JiTai_Model</TypeInfo>
+   <TypeInfo>WebAPI.WebS.ClsGy_Item30JiTai_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/ClsGy_Source_Model.datasource b/WebAPI/Web References/WebS/ClsGy_Source_Model.datasource
index b99dbfa..fff71fe 100644
--- a/WebAPI/Web References/WebS/ClsGy_Source_Model.datasource
+++ b/WebAPI/Web References/WebS/ClsGy_Source_Model.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ClsGy_Source_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WebAPI.WebS.ClsGy_Source_Model</TypeInfo>
+   <TypeInfo>WebAPI.WebS.ClsGy_Source_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/ClsGy_StockPlace_Model.datasource b/WebAPI/Web References/WebS/ClsGy_StockPlace_Model.datasource
index 9251235..b6bd6f5 100644
--- a/WebAPI/Web References/WebS/ClsGy_StockPlace_Model.datasource
+++ b/WebAPI/Web References/WebS/ClsGy_StockPlace_Model.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ClsGy_StockPlace_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WebAPI.WebS.ClsGy_StockPlace_Model</TypeInfo>
+   <TypeInfo>WebAPI.WebS.ClsGy_StockPlace_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/ClsGy_Supplier_Model.datasource b/WebAPI/Web References/WebS/ClsGy_Supplier_Model.datasource
index e6012e0..fdcd6f6 100644
--- a/WebAPI/Web References/WebS/ClsGy_Supplier_Model.datasource
+++ b/WebAPI/Web References/WebS/ClsGy_Supplier_Model.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ClsGy_Supplier_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WebAPI.WebS.ClsGy_Supplier_Model</TypeInfo>
+   <TypeInfo>WebAPI.WebS.ClsGy_Supplier_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/ClsGy_Warehouse_Model.datasource b/WebAPI/Web References/WebS/ClsGy_Warehouse_Model.datasource
index aa331a8..116df0f 100644
--- a/WebAPI/Web References/WebS/ClsGy_Warehouse_Model.datasource
+++ b/WebAPI/Web References/WebS/ClsGy_Warehouse_Model.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ClsGy_Warehouse_Model" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WebAPI.WebS.ClsGy_Warehouse_Model</TypeInfo>
+   <TypeInfo>WebAPI.WebS.ClsGy_Warehouse_Model, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/ClsKf_ICStockBill_WMS.datasource b/WebAPI/Web References/WebS/ClsKf_ICStockBill_WMS.datasource
index 4710704..97becb4 100644
--- a/WebAPI/Web References/WebS/ClsKf_ICStockBill_WMS.datasource
+++ b/WebAPI/Web References/WebS/ClsKf_ICStockBill_WMS.datasource
@@ -6,5 +6,5 @@
     cause the file to be unrecognizable by the program.
 -->
 <GenericObjectDataSource DisplayName="ClsKf_ICStockBill_WMS" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>WebAPI.WebS.ClsKf_ICStockBill_WMS</TypeInfo>
+   <TypeInfo>WebAPI.WebS.ClsKf_ICStockBill_WMS, Web References.WebS.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
 </GenericObjectDataSource>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/Reference.cs b/WebAPI/Web References/WebS/Reference.cs
index 68e53c6..7803c20 100644
--- a/WebAPI/Web References/WebS/Reference.cs
+++ b/WebAPI/Web References/WebS/Reference.cs
@@ -35,6 +35,12 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsGy_BarCodeBill_WMS_Model))]
     public partial class WebService1 : System.Web.Services.Protocols.SoapHttpClientProtocol {
         
+        private System.Threading.SendOrPostCallback get_ServerFileListForNBWMSOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback get_ServerFileListForNBLMESOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback get_ServerFileOperationCompleted;
+        
         private System.Threading.SendOrPostCallback get_ServerFileForWMSOperationCompleted;
         
         private System.Threading.SendOrPostCallback get_ORGANIZATIONSOperationCompleted;
@@ -177,6 +183,8 @@
         
         private System.Threading.SendOrPostCallback Set_BPrintQtyBarCodeOperationCompleted;
         
+        private System.Threading.SendOrPostCallback set_SaveProductInBill_MulSource_CLDOperationCompleted;
+        
         private System.Threading.SendOrPostCallback set_CheckProductInBill_CLDOperationCompleted;
         
         private System.Threading.SendOrPostCallback set_SaveProductInBackBillOperationCompleted;
@@ -309,11 +317,7 @@
         
         private System.Threading.SendOrPostCallback get_ServerFileListForWMSOperationCompleted;
         
-        private System.Threading.SendOrPostCallback get_ServerFileListForNBWMSOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback get_ServerFileListForNBLMESOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback get_ServerFileOperationCompleted;
+        private System.Threading.SendOrPostCallback set_SaveSellOutBill_CLDOperationCompleted;
         
         private System.Threading.SendOrPostCallback set_SaveStationInBillOperationCompleted;
         
@@ -425,8 +429,6 @@
         
         private System.Threading.SendOrPostCallback set_SavePOStockInBill_CLDOperationCompleted;
         
-        private System.Threading.SendOrPostCallback set_SaveProductInBill_MulSource_CLDOperationCompleted;
-        
         private System.Threading.SendOrPostCallback set_DelPonderationBillMain_Temp_InterIDAndSourceOperationCompleted;
         
         private System.Threading.SendOrPostCallback set_DelPonderationBillMain_Temp_SourceInterIDOperationCompleted;
@@ -501,6 +503,10 @@
         
         private System.Threading.SendOrPostCallback set_SaveICMOReportBill_CLD_LayuiOperationCompleted;
         
+        private System.Threading.SendOrPostCallback set_SaveICMOProductReportBill_LayuiOperationCompleted;
+        
+        private System.Threading.SendOrPostCallback set_SaveICMOProductReportBill_CLD_LayuiOperationCompleted;
+        
         private System.Threading.SendOrPostCallback set_SaveMoveBill_CLDOperationCompleted;
         
         private System.Threading.SendOrPostCallback set_SaveMoveStockBillOperationCompleted;
@@ -550,8 +556,6 @@
         private System.Threading.SendOrPostCallback set_SaveSellOutBill_NewOperationCompleted;
         
         private System.Threading.SendOrPostCallback set_SaveSellOutBill_CLD_NewOperationCompleted;
-        
-        private System.Threading.SendOrPostCallback set_SaveSellOutBill_CLDOperationCompleted;
         
         private System.Threading.SendOrPostCallback Check_ICMOReportBillOperationCompleted;
         
@@ -932,6 +936,15 @@
         }
         
         /// <remarks/>
+        public event get_ServerFileListForNBWMSCompletedEventHandler get_ServerFileListForNBWMSCompleted;
+        
+        /// <remarks/>
+        public event get_ServerFileListForNBLMESCompletedEventHandler get_ServerFileListForNBLMESCompleted;
+        
+        /// <remarks/>
+        public event get_ServerFileCompletedEventHandler get_ServerFileCompleted;
+        
+        /// <remarks/>
         public event get_ServerFileForWMSCompletedEventHandler get_ServerFileForWMSCompleted;
         
         /// <remarks/>
@@ -1145,6 +1158,9 @@
         public event Set_BPrintQtyBarCodeCompletedEventHandler Set_BPrintQtyBarCodeCompleted;
         
         /// <remarks/>
+        public event set_SaveProductInBill_MulSource_CLDCompletedEventHandler set_SaveProductInBill_MulSource_CLDCompleted;
+        
+        /// <remarks/>
         public event set_CheckProductInBill_CLDCompletedEventHandler set_CheckProductInBill_CLDCompleted;
         
         /// <remarks/>
@@ -1343,13 +1359,7 @@
         public event get_ServerFileListForWMSCompletedEventHandler get_ServerFileListForWMSCompleted;
         
         /// <remarks/>
-        public event get_ServerFileListForNBWMSCompletedEventHandler get_ServerFileListForNBWMSCompleted;
-        
-        /// <remarks/>
-        public event get_ServerFileListForNBLMESCompletedEventHandler get_ServerFileListForNBLMESCompleted;
-        
-        /// <remarks/>
-        public event get_ServerFileCompletedEventHandler get_ServerFileCompleted;
+        public event set_SaveSellOutBill_CLDCompletedEventHandler set_SaveSellOutBill_CLDCompleted;
         
         /// <remarks/>
         public event set_SaveStationInBillCompletedEventHandler set_SaveStationInBillCompleted;
@@ -1517,9 +1527,6 @@
         public event set_SavePOStockInBill_CLDCompletedEventHandler set_SavePOStockInBill_CLDCompleted;
         
         /// <remarks/>
-        public event set_SaveProductInBill_MulSource_CLDCompletedEventHandler set_SaveProductInBill_MulSource_CLDCompleted;
-        
-        /// <remarks/>
         public event set_DelPonderationBillMain_Temp_InterIDAndSourceCompletedEventHandler set_DelPonderationBillMain_Temp_InterIDAndSourceCompleted;
         
         /// <remarks/>
@@ -1631,6 +1638,12 @@
         public event set_SaveICMOReportBill_CLD_LayuiCompletedEventHandler set_SaveICMOReportBill_CLD_LayuiCompleted;
         
         /// <remarks/>
+        public event set_SaveICMOProductReportBill_LayuiCompletedEventHandler set_SaveICMOProductReportBill_LayuiCompleted;
+        
+        /// <remarks/>
+        public event set_SaveICMOProductReportBill_CLD_LayuiCompletedEventHandler set_SaveICMOProductReportBill_CLD_LayuiCompleted;
+        
+        /// <remarks/>
         public event set_SaveMoveBill_CLDCompletedEventHandler set_SaveMoveBill_CLDCompleted;
         
         /// <remarks/>
@@ -1704,9 +1717,6 @@
         
         /// <remarks/>
         public event set_SaveSellOutBill_CLD_NewCompletedEventHandler set_SaveSellOutBill_CLD_NewCompleted;
-        
-        /// <remarks/>
-        public event set_SaveSellOutBill_CLDCompletedEventHandler set_SaveSellOutBill_CLDCompleted;
         
         /// <remarks/>
         public event Check_ICMOReportBillCompletedEventHandler Check_ICMOReportBillCompleted;
@@ -2217,6 +2227,92 @@
         
         /// <remarks/>
         public event GetSc_ICMOReportBillListCompletedEventHandler GetSc_ICMOReportBillListCompleted;
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_ServerFileListForNBWMS", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public System.Data.DataSet get_ServerFileListForNBWMS() {
+            object[] results = this.Invoke("get_ServerFileListForNBWMS", new object[0]);
+            return ((System.Data.DataSet)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void get_ServerFileListForNBWMSAsync() {
+            this.get_ServerFileListForNBWMSAsync(null);
+        }
+        
+        /// <remarks/>
+        public void get_ServerFileListForNBWMSAsync(object userState) {
+            if ((this.get_ServerFileListForNBWMSOperationCompleted == null)) {
+                this.get_ServerFileListForNBWMSOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_ServerFileListForNBWMSOperationCompleted);
+            }
+            this.InvokeAsync("get_ServerFileListForNBWMS", new object[0], this.get_ServerFileListForNBWMSOperationCompleted, userState);
+        }
+        
+        private void Onget_ServerFileListForNBWMSOperationCompleted(object arg) {
+            if ((this.get_ServerFileListForNBWMSCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.get_ServerFileListForNBWMSCompleted(this, new get_ServerFileListForNBWMSCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_ServerFileListForNBLMES", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public System.Data.DataSet get_ServerFileListForNBLMES() {
+            object[] results = this.Invoke("get_ServerFileListForNBLMES", new object[0]);
+            return ((System.Data.DataSet)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void get_ServerFileListForNBLMESAsync() {
+            this.get_ServerFileListForNBLMESAsync(null);
+        }
+        
+        /// <remarks/>
+        public void get_ServerFileListForNBLMESAsync(object userState) {
+            if ((this.get_ServerFileListForNBLMESOperationCompleted == null)) {
+                this.get_ServerFileListForNBLMESOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_ServerFileListForNBLMESOperationCompleted);
+            }
+            this.InvokeAsync("get_ServerFileListForNBLMES", new object[0], this.get_ServerFileListForNBLMESOperationCompleted, userState);
+        }
+        
+        private void Onget_ServerFileListForNBLMESOperationCompleted(object arg) {
+            if ((this.get_ServerFileListForNBLMESCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.get_ServerFileListForNBLMESCompleted(this, new get_ServerFileListForNBLMESCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_ServerFile", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public bool get_ServerFile(string sSQL, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] ref byte[] FileItem) {
+            object[] results = this.Invoke("get_ServerFile", new object[] {
+                        sSQL,
+                        FileItem});
+            FileItem = ((byte[])(results[1]));
+            return ((bool)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void get_ServerFileAsync(string sSQL, byte[] FileItem) {
+            this.get_ServerFileAsync(sSQL, FileItem, null);
+        }
+        
+        /// <remarks/>
+        public void get_ServerFileAsync(string sSQL, byte[] FileItem, object userState) {
+            if ((this.get_ServerFileOperationCompleted == null)) {
+                this.get_ServerFileOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_ServerFileOperationCompleted);
+            }
+            this.InvokeAsync("get_ServerFile", new object[] {
+                        sSQL,
+                        FileItem}, this.get_ServerFileOperationCompleted, userState);
+        }
+        
+        private void Onget_ServerFileOperationCompleted(object arg) {
+            if ((this.get_ServerFileCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.get_ServerFileCompleted(this, new get_ServerFileCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
         
         /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_ServerFileForWMS", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
@@ -5402,6 +5498,41 @@
         }
         
         /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveProductInBill_MulSource_CLD", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public bool set_SaveProductInBill_MulSource_CLD(ClsKf_ProductInBillMain oMain, ref string sHBillNo, ref string sErrMsg) {
+            object[] results = this.Invoke("set_SaveProductInBill_MulSource_CLD", new object[] {
+                        oMain,
+                        sHBillNo,
+                        sErrMsg});
+            sHBillNo = ((string)(results[1]));
+            sErrMsg = ((string)(results[2]));
+            return ((bool)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void set_SaveProductInBill_MulSource_CLDAsync(ClsKf_ProductInBillMain oMain, string sHBillNo, string sErrMsg) {
+            this.set_SaveProductInBill_MulSource_CLDAsync(oMain, sHBillNo, sErrMsg, null);
+        }
+        
+        /// <remarks/>
+        public void set_SaveProductInBill_MulSource_CLDAsync(ClsKf_ProductInBillMain oMain, string sHBillNo, string sErrMsg, object userState) {
+            if ((this.set_SaveProductInBill_MulSource_CLDOperationCompleted == null)) {
+                this.set_SaveProductInBill_MulSource_CLDOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveProductInBill_MulSource_CLDOperationCompleted);
+            }
+            this.InvokeAsync("set_SaveProductInBill_MulSource_CLD", new object[] {
+                        oMain,
+                        sHBillNo,
+                        sErrMsg}, this.set_SaveProductInBill_MulSource_CLDOperationCompleted, userState);
+        }
+        
+        private void Onset_SaveProductInBill_MulSource_CLDOperationCompleted(object arg) {
+            if ((this.set_SaveProductInBill_MulSource_CLDCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.set_SaveProductInBill_MulSource_CLDCompleted(this, new set_SaveProductInBill_MulSource_CLDCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_CheckProductInBill_CLD", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
         public bool set_CheckProductInBill_CLD(ClsKf_ProductInBillMain_CLD oMain, string sHSourceType, ref string sErrMsg) {
             object[] results = this.Invoke("set_CheckProductInBill_CLD", new object[] {
@@ -7666,88 +7797,38 @@
         }
         
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_ServerFileListForNBWMS", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public System.Data.DataSet get_ServerFileListForNBWMS() {
-            object[] results = this.Invoke("get_ServerFileListForNBWMS", new object[0]);
-            return ((System.Data.DataSet)(results[0]));
-        }
-        
-        /// <remarks/>
-        public void get_ServerFileListForNBWMSAsync() {
-            this.get_ServerFileListForNBWMSAsync(null);
-        }
-        
-        /// <remarks/>
-        public void get_ServerFileListForNBWMSAsync(object userState) {
-            if ((this.get_ServerFileListForNBWMSOperationCompleted == null)) {
-                this.get_ServerFileListForNBWMSOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_ServerFileListForNBWMSOperationCompleted);
-            }
-            this.InvokeAsync("get_ServerFileListForNBWMS", new object[0], this.get_ServerFileListForNBWMSOperationCompleted, userState);
-        }
-        
-        private void Onget_ServerFileListForNBWMSOperationCompleted(object arg) {
-            if ((this.get_ServerFileListForNBWMSCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.get_ServerFileListForNBWMSCompleted(this, new get_ServerFileListForNBWMSCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_ServerFileListForNBLMES", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public System.Data.DataSet get_ServerFileListForNBLMES() {
-            object[] results = this.Invoke("get_ServerFileListForNBLMES", new object[0]);
-            return ((System.Data.DataSet)(results[0]));
-        }
-        
-        /// <remarks/>
-        public void get_ServerFileListForNBLMESAsync() {
-            this.get_ServerFileListForNBLMESAsync(null);
-        }
-        
-        /// <remarks/>
-        public void get_ServerFileListForNBLMESAsync(object userState) {
-            if ((this.get_ServerFileListForNBLMESOperationCompleted == null)) {
-                this.get_ServerFileListForNBLMESOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_ServerFileListForNBLMESOperationCompleted);
-            }
-            this.InvokeAsync("get_ServerFileListForNBLMES", new object[0], this.get_ServerFileListForNBLMESOperationCompleted, userState);
-        }
-        
-        private void Onget_ServerFileListForNBLMESOperationCompleted(object arg) {
-            if ((this.get_ServerFileListForNBLMESCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.get_ServerFileListForNBLMESCompleted(this, new get_ServerFileListForNBLMESCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_ServerFile", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public bool get_ServerFile(string sSQL, [System.Xml.Serialization.XmlElementAttribute(DataType="base64Binary")] ref byte[] FileItem) {
-            object[] results = this.Invoke("get_ServerFile", new object[] {
-                        sSQL,
-                        FileItem});
-            FileItem = ((byte[])(results[1]));
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveSellOutBill_CLD", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public bool set_SaveSellOutBill_CLD(ClsKf_SellOutBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg) {
+            object[] results = this.Invoke("set_SaveSellOutBill_CLD", new object[] {
+                        oMain,
+                        sHSourceType,
+                        oSystemParameterMain,
+                        sErrMsg});
+            sErrMsg = ((string)(results[1]));
             return ((bool)(results[0]));
         }
         
         /// <remarks/>
-        public void get_ServerFileAsync(string sSQL, byte[] FileItem) {
-            this.get_ServerFileAsync(sSQL, FileItem, null);
+        public void set_SaveSellOutBill_CLDAsync(ClsKf_SellOutBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg) {
+            this.set_SaveSellOutBill_CLDAsync(oMain, sHSourceType, oSystemParameterMain, sErrMsg, null);
         }
         
         /// <remarks/>
-        public void get_ServerFileAsync(string sSQL, byte[] FileItem, object userState) {
-            if ((this.get_ServerFileOperationCompleted == null)) {
-                this.get_ServerFileOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_ServerFileOperationCompleted);
+        public void set_SaveSellOutBill_CLDAsync(ClsKf_SellOutBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg, object userState) {
+            if ((this.set_SaveSellOutBill_CLDOperationCompleted == null)) {
+                this.set_SaveSellOutBill_CLDOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveSellOutBill_CLDOperationCompleted);
             }
-            this.InvokeAsync("get_ServerFile", new object[] {
-                        sSQL,
-                        FileItem}, this.get_ServerFileOperationCompleted, userState);
+            this.InvokeAsync("set_SaveSellOutBill_CLD", new object[] {
+                        oMain,
+                        sHSourceType,
+                        oSystemParameterMain,
+                        sErrMsg}, this.set_SaveSellOutBill_CLDOperationCompleted, userState);
         }
         
-        private void Onget_ServerFileOperationCompleted(object arg) {
-            if ((this.get_ServerFileCompleted != null)) {
+        private void Onset_SaveSellOutBill_CLDOperationCompleted(object arg) {
+            if ((this.set_SaveSellOutBill_CLDCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.get_ServerFileCompleted(this, new get_ServerFileCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+                this.set_SaveSellOutBill_CLDCompleted(this, new set_SaveSellOutBill_CLDCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
         
@@ -9605,41 +9686,6 @@
         }
         
         /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveProductInBill_MulSource_CLD", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public bool set_SaveProductInBill_MulSource_CLD(ClsKf_ProductInBillMain oMain, ref string sHBillNo, ref string sErrMsg) {
-            object[] results = this.Invoke("set_SaveProductInBill_MulSource_CLD", new object[] {
-                        oMain,
-                        sHBillNo,
-                        sErrMsg});
-            sHBillNo = ((string)(results[1]));
-            sErrMsg = ((string)(results[2]));
-            return ((bool)(results[0]));
-        }
-        
-        /// <remarks/>
-        public void set_SaveProductInBill_MulSource_CLDAsync(ClsKf_ProductInBillMain oMain, string sHBillNo, string sErrMsg) {
-            this.set_SaveProductInBill_MulSource_CLDAsync(oMain, sHBillNo, sErrMsg, null);
-        }
-        
-        /// <remarks/>
-        public void set_SaveProductInBill_MulSource_CLDAsync(ClsKf_ProductInBillMain oMain, string sHBillNo, string sErrMsg, object userState) {
-            if ((this.set_SaveProductInBill_MulSource_CLDOperationCompleted == null)) {
-                this.set_SaveProductInBill_MulSource_CLDOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveProductInBill_MulSource_CLDOperationCompleted);
-            }
-            this.InvokeAsync("set_SaveProductInBill_MulSource_CLD", new object[] {
-                        oMain,
-                        sHBillNo,
-                        sErrMsg}, this.set_SaveProductInBill_MulSource_CLDOperationCompleted, userState);
-        }
-        
-        private void Onset_SaveProductInBill_MulSource_CLDOperationCompleted(object arg) {
-            if ((this.set_SaveProductInBill_MulSource_CLDCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.set_SaveProductInBill_MulSource_CLDCompleted(this, new set_SaveProductInBill_MulSource_CLDCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_DelPonderationBillMain_Temp_InterIDAndSource", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
         public bool set_DelPonderationBillMain_Temp_InterIDAndSource(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType, ref string sErrMsg) {
             object[] results = this.Invoke("set_DelPonderationBillMain_Temp_InterIDAndSource", new object[] {
@@ -10911,6 +10957,76 @@
         }
         
         /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveICMOProductReportBill_Layui", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public bool set_SaveICMOProductReportBill_Layui(ClsSc_ICMOReportBillMain oMain, string sHSourceType, ref string sErrMsg) {
+            object[] results = this.Invoke("set_SaveICMOProductReportBill_Layui", new object[] {
+                        oMain,
+                        sHSourceType,
+                        sErrMsg});
+            sErrMsg = ((string)(results[1]));
+            return ((bool)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void set_SaveICMOProductReportBill_LayuiAsync(ClsSc_ICMOReportBillMain oMain, string sHSourceType, string sErrMsg) {
+            this.set_SaveICMOProductReportBill_LayuiAsync(oMain, sHSourceType, sErrMsg, null);
+        }
+        
+        /// <remarks/>
+        public void set_SaveICMOProductReportBill_LayuiAsync(ClsSc_ICMOReportBillMain oMain, string sHSourceType, string sErrMsg, object userState) {
+            if ((this.set_SaveICMOProductReportBill_LayuiOperationCompleted == null)) {
+                this.set_SaveICMOProductReportBill_LayuiOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveICMOProductReportBill_LayuiOperationCompleted);
+            }
+            this.InvokeAsync("set_SaveICMOProductReportBill_Layui", new object[] {
+                        oMain,
+                        sHSourceType,
+                        sErrMsg}, this.set_SaveICMOProductReportBill_LayuiOperationCompleted, userState);
+        }
+        
+        private void Onset_SaveICMOProductReportBill_LayuiOperationCompleted(object arg) {
+            if ((this.set_SaveICMOProductReportBill_LayuiCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.set_SaveICMOProductReportBill_LayuiCompleted(this, new set_SaveICMOProductReportBill_LayuiCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
+        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveICMOProductReportBill_CLD_Layui", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+        public bool set_SaveICMOProductReportBill_CLD_Layui(ClsSc_ICMOReportBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg) {
+            object[] results = this.Invoke("set_SaveICMOProductReportBill_CLD_Layui", new object[] {
+                        oMain,
+                        sHSourceType,
+                        oSystemParameterMain,
+                        sErrMsg});
+            sErrMsg = ((string)(results[1]));
+            return ((bool)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void set_SaveICMOProductReportBill_CLD_LayuiAsync(ClsSc_ICMOReportBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg) {
+            this.set_SaveICMOProductReportBill_CLD_LayuiAsync(oMain, sHSourceType, oSystemParameterMain, sErrMsg, null);
+        }
+        
+        /// <remarks/>
+        public void set_SaveICMOProductReportBill_CLD_LayuiAsync(ClsSc_ICMOReportBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg, object userState) {
+            if ((this.set_SaveICMOProductReportBill_CLD_LayuiOperationCompleted == null)) {
+                this.set_SaveICMOProductReportBill_CLD_LayuiOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveICMOProductReportBill_CLD_LayuiOperationCompleted);
+            }
+            this.InvokeAsync("set_SaveICMOProductReportBill_CLD_Layui", new object[] {
+                        oMain,
+                        sHSourceType,
+                        oSystemParameterMain,
+                        sErrMsg}, this.set_SaveICMOProductReportBill_CLD_LayuiOperationCompleted, userState);
+        }
+        
+        private void Onset_SaveICMOProductReportBill_CLD_LayuiOperationCompleted(object arg) {
+            if ((this.set_SaveICMOProductReportBill_CLD_LayuiCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.set_SaveICMOProductReportBill_CLD_LayuiCompleted(this, new set_SaveICMOProductReportBill_CLD_LayuiCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveMoveBill_CLD", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
         public bool set_SaveMoveBill_CLD(ClsKf_MoveStockBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg) {
             object[] results = this.Invoke("set_SaveMoveBill_CLD", new object[] {
@@ -11748,42 +11864,6 @@
             if ((this.set_SaveSellOutBill_CLD_NewCompleted != null)) {
                 System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
                 this.set_SaveSellOutBill_CLD_NewCompleted(this, new set_SaveSellOutBill_CLD_NewCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
-            }
-        }
-        
-        /// <remarks/>
-        [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveSellOutBill_CLD", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public bool set_SaveSellOutBill_CLD(ClsKf_SellOutBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg) {
-            object[] results = this.Invoke("set_SaveSellOutBill_CLD", new object[] {
-                        oMain,
-                        sHSourceType,
-                        oSystemParameterMain,
-                        sErrMsg});
-            sErrMsg = ((string)(results[1]));
-            return ((bool)(results[0]));
-        }
-        
-        /// <remarks/>
-        public void set_SaveSellOutBill_CLDAsync(ClsKf_SellOutBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg) {
-            this.set_SaveSellOutBill_CLDAsync(oMain, sHSourceType, oSystemParameterMain, sErrMsg, null);
-        }
-        
-        /// <remarks/>
-        public void set_SaveSellOutBill_CLDAsync(ClsKf_SellOutBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg, object userState) {
-            if ((this.set_SaveSellOutBill_CLDOperationCompleted == null)) {
-                this.set_SaveSellOutBill_CLDOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveSellOutBill_CLDOperationCompleted);
-            }
-            this.InvokeAsync("set_SaveSellOutBill_CLD", new object[] {
-                        oMain,
-                        sHSourceType,
-                        oSystemParameterMain,
-                        sErrMsg}, this.set_SaveSellOutBill_CLDOperationCompleted, userState);
-        }
-        
-        private void Onset_SaveSellOutBill_CLDOperationCompleted(object arg) {
-            if ((this.set_SaveSellOutBill_CLDCompleted != null)) {
-                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
-                this.set_SaveSellOutBill_CLDCompleted(this, new set_SaveSellOutBill_CLDCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
             }
         }
         
@@ -29281,7 +29361,6 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_PackUnionBillMain))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_PackDoubleBillMain))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_PackSplitBillMain))]
-    [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_SellOutBillMain))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_MoveStockStepInBillMain))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_MoveStockStepOutBillMain))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_MoveStockBillMain))]
@@ -29298,6 +29377,7 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_StdWorkQtyBillMain))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_MESBeginWorkBillMain))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsSc_StationInBillMain))]
+    [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_SellOutBillMain))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsQC_NoPassProdCheckBillMain))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsCg_POInStockBillMain_K3))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsCg_POInStockBillMain))]
@@ -29305,9 +29385,9 @@
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_EntrustInBillMain_K3))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_EntrustInBillMain))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_ProductInBillMain_K3))]
-    [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_ProductInBillMain))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_ICStockBillMain))]
     [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_ProductInBillMain_CLD))]
+    [System.Xml.Serialization.XmlIncludeAttribute(typeof(ClsKf_ProductInBillMain))]
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
     [System.SerializableAttribute()]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
@@ -30128,279 +30208,6 @@
             }
             set {
                 this.hUnitIDField = value;
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
-    public partial class ClsKf_SellOutBillMain : ClsXt_BaseBillMain {
-        
-        private long hSupIDField;
-        
-        private long hWHIDField;
-        
-        private long hSCWHIDField;
-        
-        private long hEmpIDField;
-        
-        private long hManagerIDField;
-        
-        private long hSecManagerIDField;
-        
-        private long hKeeperIDField;
-        
-        private long hDeptIDField;
-        
-        private string hExplanationField;
-        
-        private string hInnerBillNoField;
-        
-        private bool hRedBlueFlagField;
-        
-        private long hSellSIDField;
-        
-        private long hCurIDField;
-        
-        private long hConveyTypeIDField;
-        
-        private long hConveyCompIDField;
-        
-        private double hConveyMoneyField;
-        
-        private string hSeOrderBillNoField;
-        
-        private bool hDFflagField;
-        
-        private string hLinkManField;
-        
-        private string hLinkPhoneField;
-        
-        private long hSTOCKORGIDField;
-        
-        private long hOWNERIDField;
-        
-        /// <remarks/>
-        public long HSupID {
-            get {
-                return this.hSupIDField;
-            }
-            set {
-                this.hSupIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HWHID {
-            get {
-                return this.hWHIDField;
-            }
-            set {
-                this.hWHIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HSCWHID {
-            get {
-                return this.hSCWHIDField;
-            }
-            set {
-                this.hSCWHIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HEmpID {
-            get {
-                return this.hEmpIDField;
-            }
-            set {
-                this.hEmpIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HManagerID {
-            get {
-                return this.hManagerIDField;
-            }
-            set {
-                this.hManagerIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HSecManagerID {
-            get {
-                return this.hSecManagerIDField;
-            }
-            set {
-                this.hSecManagerIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HKeeperID {
-            get {
-                return this.hKeeperIDField;
-            }
-            set {
-                this.hKeeperIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HDeptID {
-            get {
-                return this.hDeptIDField;
-            }
-            set {
-                this.hDeptIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string HExplanation {
-            get {
-                return this.hExplanationField;
-            }
-            set {
-                this.hExplanationField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string HInnerBillNo {
-            get {
-                return this.hInnerBillNoField;
-            }
-            set {
-                this.hInnerBillNoField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public bool HRedBlueFlag {
-            get {
-                return this.hRedBlueFlagField;
-            }
-            set {
-                this.hRedBlueFlagField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HSellSID {
-            get {
-                return this.hSellSIDField;
-            }
-            set {
-                this.hSellSIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HCurID {
-            get {
-                return this.hCurIDField;
-            }
-            set {
-                this.hCurIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HConveyTypeID {
-            get {
-                return this.hConveyTypeIDField;
-            }
-            set {
-                this.hConveyTypeIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HConveyCompID {
-            get {
-                return this.hConveyCompIDField;
-            }
-            set {
-                this.hConveyCompIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public double HConveyMoney {
-            get {
-                return this.hConveyMoneyField;
-            }
-            set {
-                this.hConveyMoneyField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string HSeOrderBillNo {
-            get {
-                return this.hSeOrderBillNoField;
-            }
-            set {
-                this.hSeOrderBillNoField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public bool HDFflag {
-            get {
-                return this.hDFflagField;
-            }
-            set {
-                this.hDFflagField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string HLinkMan {
-            get {
-                return this.hLinkManField;
-            }
-            set {
-                this.hLinkManField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string HLinkPhone {
-            get {
-                return this.hLinkPhoneField;
-            }
-            set {
-                this.hLinkPhoneField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HSTOCKORGID {
-            get {
-                return this.hSTOCKORGIDField;
-            }
-            set {
-                this.hSTOCKORGIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HOWNERID {
-            get {
-                return this.hOWNERIDField;
-            }
-            set {
-                this.hOWNERIDField = value;
             }
         }
     }
@@ -33531,6 +33338,279 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
+    public partial class ClsKf_SellOutBillMain : ClsXt_BaseBillMain {
+        
+        private long hSupIDField;
+        
+        private long hWHIDField;
+        
+        private long hSCWHIDField;
+        
+        private long hEmpIDField;
+        
+        private long hManagerIDField;
+        
+        private long hSecManagerIDField;
+        
+        private long hKeeperIDField;
+        
+        private long hDeptIDField;
+        
+        private string hExplanationField;
+        
+        private string hInnerBillNoField;
+        
+        private bool hRedBlueFlagField;
+        
+        private long hSellSIDField;
+        
+        private long hCurIDField;
+        
+        private long hConveyTypeIDField;
+        
+        private long hConveyCompIDField;
+        
+        private double hConveyMoneyField;
+        
+        private string hSeOrderBillNoField;
+        
+        private bool hDFflagField;
+        
+        private string hLinkManField;
+        
+        private string hLinkPhoneField;
+        
+        private long hSTOCKORGIDField;
+        
+        private long hOWNERIDField;
+        
+        /// <remarks/>
+        public long HSupID {
+            get {
+                return this.hSupIDField;
+            }
+            set {
+                this.hSupIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HWHID {
+            get {
+                return this.hWHIDField;
+            }
+            set {
+                this.hWHIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HSCWHID {
+            get {
+                return this.hSCWHIDField;
+            }
+            set {
+                this.hSCWHIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HEmpID {
+            get {
+                return this.hEmpIDField;
+            }
+            set {
+                this.hEmpIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HManagerID {
+            get {
+                return this.hManagerIDField;
+            }
+            set {
+                this.hManagerIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HSecManagerID {
+            get {
+                return this.hSecManagerIDField;
+            }
+            set {
+                this.hSecManagerIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HKeeperID {
+            get {
+                return this.hKeeperIDField;
+            }
+            set {
+                this.hKeeperIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HDeptID {
+            get {
+                return this.hDeptIDField;
+            }
+            set {
+                this.hDeptIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string HExplanation {
+            get {
+                return this.hExplanationField;
+            }
+            set {
+                this.hExplanationField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string HInnerBillNo {
+            get {
+                return this.hInnerBillNoField;
+            }
+            set {
+                this.hInnerBillNoField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public bool HRedBlueFlag {
+            get {
+                return this.hRedBlueFlagField;
+            }
+            set {
+                this.hRedBlueFlagField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HSellSID {
+            get {
+                return this.hSellSIDField;
+            }
+            set {
+                this.hSellSIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HCurID {
+            get {
+                return this.hCurIDField;
+            }
+            set {
+                this.hCurIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HConveyTypeID {
+            get {
+                return this.hConveyTypeIDField;
+            }
+            set {
+                this.hConveyTypeIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HConveyCompID {
+            get {
+                return this.hConveyCompIDField;
+            }
+            set {
+                this.hConveyCompIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public double HConveyMoney {
+            get {
+                return this.hConveyMoneyField;
+            }
+            set {
+                this.hConveyMoneyField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string HSeOrderBillNo {
+            get {
+                return this.hSeOrderBillNoField;
+            }
+            set {
+                this.hSeOrderBillNoField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public bool HDFflag {
+            get {
+                return this.hDFflagField;
+            }
+            set {
+                this.hDFflagField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string HLinkMan {
+            get {
+                return this.hLinkManField;
+            }
+            set {
+                this.hLinkManField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string HLinkPhone {
+            get {
+                return this.hLinkPhoneField;
+            }
+            set {
+                this.hLinkPhoneField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HSTOCKORGID {
+            get {
+                return this.hSTOCKORGIDField;
+            }
+            set {
+                this.hSTOCKORGIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HOWNERID {
+            get {
+                return this.hOWNERIDField;
+            }
+            set {
+                this.hOWNERIDField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
     public partial class ClsQC_NoPassProdCheckBillMain : ClsXt_BaseBillMain {
         
         private long hPrintQtyField;
@@ -34794,183 +34874,6 @@
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
     [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
-    public partial class ClsKf_ProductInBillMain : ClsXt_BaseBillMain {
-        
-        private string hDateForWebField;
-        
-        private long hSupIDField;
-        
-        private long hWHIDField;
-        
-        private long hSCWHIDField;
-        
-        private long hEmpIDField;
-        
-        private long hManagerIDField;
-        
-        private long hSecManagerIDField;
-        
-        private long hKeeperIDField;
-        
-        private long hDeptIDField;
-        
-        private string hExplanationField;
-        
-        private string hInnerBillNoField;
-        
-        private bool hRedBlueFlagField;
-        
-        private long hSTOCKORGIDField;
-        
-        private long hOWNERIDField;
-        
-        /// <remarks/>
-        public string HDateForWeb {
-            get {
-                return this.hDateForWebField;
-            }
-            set {
-                this.hDateForWebField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HSupID {
-            get {
-                return this.hSupIDField;
-            }
-            set {
-                this.hSupIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HWHID {
-            get {
-                return this.hWHIDField;
-            }
-            set {
-                this.hWHIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HSCWHID {
-            get {
-                return this.hSCWHIDField;
-            }
-            set {
-                this.hSCWHIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HEmpID {
-            get {
-                return this.hEmpIDField;
-            }
-            set {
-                this.hEmpIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HManagerID {
-            get {
-                return this.hManagerIDField;
-            }
-            set {
-                this.hManagerIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HSecManagerID {
-            get {
-                return this.hSecManagerIDField;
-            }
-            set {
-                this.hSecManagerIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HKeeperID {
-            get {
-                return this.hKeeperIDField;
-            }
-            set {
-                this.hKeeperIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HDeptID {
-            get {
-                return this.hDeptIDField;
-            }
-            set {
-                this.hDeptIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string HExplanation {
-            get {
-                return this.hExplanationField;
-            }
-            set {
-                this.hExplanationField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public string HInnerBillNo {
-            get {
-                return this.hInnerBillNoField;
-            }
-            set {
-                this.hInnerBillNoField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public bool HRedBlueFlag {
-            get {
-                return this.hRedBlueFlagField;
-            }
-            set {
-                this.hRedBlueFlagField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HSTOCKORGID {
-            get {
-                return this.hSTOCKORGIDField;
-            }
-            set {
-                this.hSTOCKORGIDField = value;
-            }
-        }
-        
-        /// <remarks/>
-        public long HOWNERID {
-            get {
-                return this.hOWNERIDField;
-            }
-            set {
-                this.hOWNERIDField = value;
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
-    [System.SerializableAttribute()]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
     public partial class ClsKf_ICStockBillMain : ClsXt_BaseBillMain {
         
         private long hSupIDField;
@@ -35627,6 +35530,183 @@
             }
             set {
                 this.hORGANIZATIONSNOField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.4084.0")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://tempuri.org/")]
+    public partial class ClsKf_ProductInBillMain : ClsXt_BaseBillMain {
+        
+        private string hDateForWebField;
+        
+        private long hSupIDField;
+        
+        private long hWHIDField;
+        
+        private long hSCWHIDField;
+        
+        private long hEmpIDField;
+        
+        private long hManagerIDField;
+        
+        private long hSecManagerIDField;
+        
+        private long hKeeperIDField;
+        
+        private long hDeptIDField;
+        
+        private string hExplanationField;
+        
+        private string hInnerBillNoField;
+        
+        private bool hRedBlueFlagField;
+        
+        private long hSTOCKORGIDField;
+        
+        private long hOWNERIDField;
+        
+        /// <remarks/>
+        public string HDateForWeb {
+            get {
+                return this.hDateForWebField;
+            }
+            set {
+                this.hDateForWebField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HSupID {
+            get {
+                return this.hSupIDField;
+            }
+            set {
+                this.hSupIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HWHID {
+            get {
+                return this.hWHIDField;
+            }
+            set {
+                this.hWHIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HSCWHID {
+            get {
+                return this.hSCWHIDField;
+            }
+            set {
+                this.hSCWHIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HEmpID {
+            get {
+                return this.hEmpIDField;
+            }
+            set {
+                this.hEmpIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HManagerID {
+            get {
+                return this.hManagerIDField;
+            }
+            set {
+                this.hManagerIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HSecManagerID {
+            get {
+                return this.hSecManagerIDField;
+            }
+            set {
+                this.hSecManagerIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HKeeperID {
+            get {
+                return this.hKeeperIDField;
+            }
+            set {
+                this.hKeeperIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HDeptID {
+            get {
+                return this.hDeptIDField;
+            }
+            set {
+                this.hDeptIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string HExplanation {
+            get {
+                return this.hExplanationField;
+            }
+            set {
+                this.hExplanationField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public string HInnerBillNo {
+            get {
+                return this.hInnerBillNoField;
+            }
+            set {
+                this.hInnerBillNoField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public bool HRedBlueFlag {
+            get {
+                return this.hRedBlueFlagField;
+            }
+            set {
+                this.hRedBlueFlagField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HSTOCKORGID {
+            get {
+                return this.hSTOCKORGIDField;
+            }
+            set {
+                this.hSTOCKORGIDField = value;
+            }
+        }
+        
+        /// <remarks/>
+        public long HOWNERID {
+            get {
+                return this.hOWNERIDField;
+            }
+            set {
+                this.hOWNERIDField = value;
             }
         }
     }
@@ -36996,6 +37076,92 @@
             }
             set {
                 this.hOWNERIDField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    public delegate void get_ServerFileListForNBWMSCompletedEventHandler(object sender, get_ServerFileListForNBWMSCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class get_ServerFileListForNBWMSCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal get_ServerFileListForNBWMSCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public System.Data.DataSet Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((System.Data.DataSet)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    public delegate void get_ServerFileListForNBLMESCompletedEventHandler(object sender, get_ServerFileListForNBLMESCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class get_ServerFileListForNBLMESCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal get_ServerFileListForNBLMESCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public System.Data.DataSet Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((System.Data.DataSet)(this.results[0]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    public delegate void get_ServerFileCompletedEventHandler(object sender, get_ServerFileCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class get_ServerFileCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal get_ServerFileCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public bool Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((bool)(this.results[0]));
+            }
+        }
+        
+        /// <remarks/>
+        public byte[] FileItem {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((byte[])(this.results[1]));
             }
         }
     }
@@ -39632,6 +39798,48 @@
     
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    public delegate void set_SaveProductInBill_MulSource_CLDCompletedEventHandler(object sender, set_SaveProductInBill_MulSource_CLDCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class set_SaveProductInBill_MulSource_CLDCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal set_SaveProductInBill_MulSource_CLDCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public bool Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((bool)(this.results[0]));
+            }
+        }
+        
+        /// <remarks/>
+        public string sHBillNo {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((string)(this.results[1]));
+            }
+        }
+        
+        /// <remarks/>
+        public string sErrMsg {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((string)(this.results[2]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
     public delegate void set_CheckProductInBill_CLDCompletedEventHandler(object sender, set_CheckProductInBill_CLDCompletedEventArgs e);
     
     /// <remarks/>
@@ -41860,69 +42068,17 @@
     
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
-    public delegate void get_ServerFileListForNBWMSCompletedEventHandler(object sender, get_ServerFileListForNBWMSCompletedEventArgs e);
+    public delegate void set_SaveSellOutBill_CLDCompletedEventHandler(object sender, set_SaveSellOutBill_CLDCompletedEventArgs e);
     
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class get_ServerFileListForNBWMSCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+    public partial class set_SaveSellOutBill_CLDCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
         
         private object[] results;
         
-        internal get_ServerFileListForNBWMSCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public System.Data.DataSet Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((System.Data.DataSet)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
-    public delegate void get_ServerFileListForNBLMESCompletedEventHandler(object sender, get_ServerFileListForNBLMESCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class get_ServerFileListForNBLMESCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal get_ServerFileListForNBLMESCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public System.Data.DataSet Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((System.Data.DataSet)(this.results[0]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
-    public delegate void get_ServerFileCompletedEventHandler(object sender, get_ServerFileCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class get_ServerFileCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal get_ServerFileCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+        internal set_SaveSellOutBill_CLDCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
                 base(exception, cancelled, userState) {
             this.results = results;
         }
@@ -41936,10 +42092,10 @@
         }
         
         /// <remarks/>
-        public byte[] FileItem {
+        public string sErrMsg {
             get {
                 this.RaiseExceptionIfNecessary();
-                return ((byte[])(this.results[1]));
+                return ((string)(this.results[1]));
             }
         }
     }
@@ -43776,48 +43932,6 @@
     
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
-    public delegate void set_SaveProductInBill_MulSource_CLDCompletedEventHandler(object sender, set_SaveProductInBill_MulSource_CLDCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class set_SaveProductInBill_MulSource_CLDCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal set_SaveProductInBill_MulSource_CLDCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public bool Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((bool)(this.results[0]));
-            }
-        }
-        
-        /// <remarks/>
-        public string sHBillNo {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((string)(this.results[1]));
-            }
-        }
-        
-        /// <remarks/>
-        public string sErrMsg {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((string)(this.results[2]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
     public delegate void set_DelPonderationBillMain_Temp_InterIDAndSourceCompletedEventHandler(object sender, set_DelPonderationBillMain_Temp_InterIDAndSourceCompletedEventArgs e);
     
     /// <remarks/>
@@ -44908,6 +45022,74 @@
     
     /// <remarks/>
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    public delegate void set_SaveICMOProductReportBill_LayuiCompletedEventHandler(object sender, set_SaveICMOProductReportBill_LayuiCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class set_SaveICMOProductReportBill_LayuiCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal set_SaveICMOProductReportBill_LayuiCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public bool Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((bool)(this.results[0]));
+            }
+        }
+        
+        /// <remarks/>
+        public string sErrMsg {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((string)(this.results[1]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    public delegate void set_SaveICMOProductReportBill_CLD_LayuiCompletedEventHandler(object sender, set_SaveICMOProductReportBill_CLD_LayuiCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class set_SaveICMOProductReportBill_CLD_LayuiCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal set_SaveICMOProductReportBill_CLD_LayuiCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public bool Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((bool)(this.results[0]));
+            }
+        }
+        
+        /// <remarks/>
+        public string sErrMsg {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((string)(this.results[1]));
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
     public delegate void set_SaveMoveBill_CLDCompletedEventHandler(object sender, set_SaveMoveBill_CLDCompletedEventArgs e);
     
     /// <remarks/>
@@ -45711,40 +45893,6 @@
         private object[] results;
         
         internal set_SaveSellOutBill_CLD_NewCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
-                base(exception, cancelled, userState) {
-            this.results = results;
-        }
-        
-        /// <remarks/>
-        public bool Result {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((bool)(this.results[0]));
-            }
-        }
-        
-        /// <remarks/>
-        public string sErrMsg {
-            get {
-                this.RaiseExceptionIfNecessary();
-                return ((string)(this.results[1]));
-            }
-        }
-    }
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
-    public delegate void set_SaveSellOutBill_CLDCompletedEventHandler(object sender, set_SaveSellOutBill_CLDCompletedEventArgs e);
-    
-    /// <remarks/>
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.ComponentModel.DesignerCategoryAttribute("code")]
-    public partial class set_SaveSellOutBill_CLDCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
-        
-        private object[] results;
-        
-        internal set_SaveSellOutBill_CLDCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
                 base(exception, cancelled, userState) {
             this.results = results;
         }
diff --git a/WebAPI/Web References/WebS/WebService1.wsdl b/WebAPI/Web References/WebS/WebService1.wsdl
index b2e26e2..35e1726 100644
--- a/WebAPI/Web References/WebS/WebService1.wsdl
+++ b/WebAPI/Web References/WebS/WebService1.wsdl
@@ -2,6 +2,56 @@
 <wsdl:definitions xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="http://tempuri.org/" xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:types>
     <s:schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/">
+      <s:element name="get_ServerFileListForNBWMS">
+        <s:complexType />
+      </s:element>
+      <s:element name="get_ServerFileListForNBWMSResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="get_ServerFileListForNBWMSResult">
+              <s:complexType>
+                <s:sequence>
+                  <s:element ref="s:schema" />
+                  <s:any />
+                </s:sequence>
+              </s:complexType>
+            </s:element>
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="get_ServerFileListForNBLMES">
+        <s:complexType />
+      </s:element>
+      <s:element name="get_ServerFileListForNBLMESResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="get_ServerFileListForNBLMESResult">
+              <s:complexType>
+                <s:sequence>
+                  <s:element ref="s:schema" />
+                  <s:any />
+                </s:sequence>
+              </s:complexType>
+            </s:element>
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="get_ServerFile">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="sSQL" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="FileItem" type="s:base64Binary" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="get_ServerFileResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="1" maxOccurs="1" name="get_ServerFileResult" type="s:boolean" />
+            <s:element minOccurs="0" maxOccurs="1" name="FileItem" type="s:base64Binary" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
       <s:element name="get_ServerFileForWMS">
         <s:complexType>
           <s:sequence>
@@ -1791,32 +1841,33 @@
           </s:sequence>
         </s:complexType>
       </s:element>
-      <s:element name="set_CheckProductInBill_CLD">
+      <s:element name="set_SaveProductInBill_MulSource_CLD">
         <s:complexType>
           <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_ProductInBillMain_CLD" />
-            <s:element minOccurs="0" maxOccurs="1" name="sHSourceType" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_ProductInBillMain" />
+            <s:element minOccurs="0" maxOccurs="1" name="sHBillNo" type="s:string" />
             <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
           </s:sequence>
         </s:complexType>
       </s:element>
-      <s:complexType name="ClsKf_ProductInBillMain_CLD">
+      <s:complexType name="ClsKf_ProductInBillMain">
         <s:complexContent mixed="false">
           <s:extension base="tns:ClsXt_BaseBillMain">
             <s:sequence>
-              <s:element minOccurs="1" maxOccurs="1" name="FDCStockID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="FDeptID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="FFManagerID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="FSManagerID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="FSelTranType" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HGroupID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
+              <s:element minOccurs="0" maxOccurs="1" name="HDateForWeb" type="s:string" />
+              <s:element minOccurs="1" maxOccurs="1" name="HSupID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HWHID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HSCWHID" type="s:long" />
               <s:element minOccurs="1" maxOccurs="1" name="HEmpID" type="s:long" />
               <s:element minOccurs="1" maxOccurs="1" name="HManagerID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HSecManagerID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HKeeperID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HDeptID" type="s:long" />
               <s:element minOccurs="0" maxOccurs="1" name="HExplanation" type="s:string" />
               <s:element minOccurs="0" maxOccurs="1" name="HInnerBillNo" type="s:string" />
-              <s:element minOccurs="1" maxOccurs="1" name="HORGANIZATIONSID" type="s:long" />
-              <s:element minOccurs="0" maxOccurs="1" name="HORGANIZATIONSNO" type="s:string" />
+              <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
+              <s:element minOccurs="1" maxOccurs="1" name="HSTOCKORGID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
             </s:sequence>
           </s:extension>
         </s:complexContent>
@@ -1856,6 +1907,45 @@
           <s:element minOccurs="1" maxOccurs="1" name="HMainSourceInterID" type="s:long" />
           <s:element minOccurs="1" maxOccurs="1" name="HMainSourceEntryID" type="s:long" />
         </s:sequence>
+      </s:complexType>
+      <s:element name="set_SaveProductInBill_MulSource_CLDResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="1" maxOccurs="1" name="set_SaveProductInBill_MulSource_CLDResult" type="s:boolean" />
+            <s:element minOccurs="0" maxOccurs="1" name="sHBillNo" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="set_CheckProductInBill_CLD">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_ProductInBillMain_CLD" />
+            <s:element minOccurs="0" maxOccurs="1" name="sHSourceType" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="ClsKf_ProductInBillMain_CLD">
+        <s:complexContent mixed="false">
+          <s:extension base="tns:ClsXt_BaseBillMain">
+            <s:sequence>
+              <s:element minOccurs="1" maxOccurs="1" name="FDCStockID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="FDeptID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="FFManagerID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="FSManagerID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="FSelTranType" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HGroupID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
+              <s:element minOccurs="1" maxOccurs="1" name="HEmpID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HManagerID" type="s:long" />
+              <s:element minOccurs="0" maxOccurs="1" name="HExplanation" type="s:string" />
+              <s:element minOccurs="0" maxOccurs="1" name="HInnerBillNo" type="s:string" />
+              <s:element minOccurs="1" maxOccurs="1" name="HORGANIZATIONSID" type="s:long" />
+              <s:element minOccurs="0" maxOccurs="1" name="HORGANIZATIONSNO" type="s:string" />
+            </s:sequence>
+          </s:extension>
+        </s:complexContent>
       </s:complexType>
       <s:element name="set_CheckProductInBill_CLDResponse">
         <s:complexType>
@@ -1956,28 +2046,6 @@
           </s:sequence>
         </s:complexType>
       </s:element>
-      <s:complexType name="ClsKf_ProductInBillMain">
-        <s:complexContent mixed="false">
-          <s:extension base="tns:ClsXt_BaseBillMain">
-            <s:sequence>
-              <s:element minOccurs="0" maxOccurs="1" name="HDateForWeb" type="s:string" />
-              <s:element minOccurs="1" maxOccurs="1" name="HSupID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HWHID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HSCWHID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HEmpID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HManagerID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HSecManagerID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HKeeperID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HDeptID" type="s:long" />
-              <s:element minOccurs="0" maxOccurs="1" name="HExplanation" type="s:string" />
-              <s:element minOccurs="0" maxOccurs="1" name="HInnerBillNo" type="s:string" />
-              <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
-              <s:element minOccurs="1" maxOccurs="1" name="HSTOCKORGID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
-            </s:sequence>
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
       <s:element name="set_SaveProductInBillResponse">
         <s:complexType>
           <s:sequence>
@@ -3384,53 +3452,51 @@
           </s:sequence>
         </s:complexType>
       </s:element>
-      <s:element name="get_ServerFileListForNBWMS">
-        <s:complexType />
-      </s:element>
-      <s:element name="get_ServerFileListForNBWMSResponse">
+      <s:element name="set_SaveSellOutBill_CLD">
         <s:complexType>
           <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="get_ServerFileListForNBWMSResult">
-              <s:complexType>
-                <s:sequence>
-                  <s:element ref="s:schema" />
-                  <s:any />
-                </s:sequence>
-              </s:complexType>
-            </s:element>
+            <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_SellOutBillMain" />
+            <s:element minOccurs="0" maxOccurs="1" name="sHSourceType" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="oSystemParameterMain" type="tns:ClsXt_SystemParameterMain" />
+            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
           </s:sequence>
         </s:complexType>
       </s:element>
-      <s:element name="get_ServerFileListForNBLMES">
-        <s:complexType />
-      </s:element>
-      <s:element name="get_ServerFileListForNBLMESResponse">
+      <s:complexType name="ClsKf_SellOutBillMain">
+        <s:complexContent mixed="false">
+          <s:extension base="tns:ClsXt_BaseBillMain">
+            <s:sequence>
+              <s:element minOccurs="1" maxOccurs="1" name="HSupID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HWHID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HSCWHID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HEmpID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HManagerID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HSecManagerID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HKeeperID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HDeptID" type="s:long" />
+              <s:element minOccurs="0" maxOccurs="1" name="HExplanation" type="s:string" />
+              <s:element minOccurs="0" maxOccurs="1" name="HInnerBillNo" type="s:string" />
+              <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
+              <s:element minOccurs="1" maxOccurs="1" name="HSellSID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HCurID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HConveyTypeID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HConveyCompID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HConveyMoney" type="s:double" />
+              <s:element minOccurs="0" maxOccurs="1" name="HSeOrderBillNo" type="s:string" />
+              <s:element minOccurs="1" maxOccurs="1" name="HDFflag" type="s:boolean" />
+              <s:element minOccurs="0" maxOccurs="1" name="HLinkMan" type="s:string" />
+              <s:element minOccurs="0" maxOccurs="1" name="HLinkPhone" type="s:string" />
+              <s:element minOccurs="1" maxOccurs="1" name="HSTOCKORGID" type="s:long" />
+              <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
+            </s:sequence>
+          </s:extension>
+        </s:complexContent>
+      </s:complexType>
+      <s:element name="set_SaveSellOutBill_CLDResponse">
         <s:complexType>
           <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="get_ServerFileListForNBLMESResult">
-              <s:complexType>
-                <s:sequence>
-                  <s:element ref="s:schema" />
-                  <s:any />
-                </s:sequence>
-              </s:complexType>
-            </s:element>
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="get_ServerFile">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="sSQL" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="FileItem" type="s:base64Binary" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="get_ServerFileResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="get_ServerFileResult" type="s:boolean" />
-            <s:element minOccurs="0" maxOccurs="1" name="FileItem" type="s:base64Binary" />
+            <s:element minOccurs="1" maxOccurs="1" name="set_SaveSellOutBill_CLDResult" type="s:boolean" />
+            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
           </s:sequence>
         </s:complexType>
       </s:element>
@@ -4778,24 +4844,6 @@
           </s:sequence>
         </s:complexType>
       </s:element>
-      <s:element name="set_SaveProductInBill_MulSource_CLD">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_ProductInBillMain" />
-            <s:element minOccurs="0" maxOccurs="1" name="sHBillNo" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="set_SaveProductInBill_MulSource_CLDResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="set_SaveProductInBill_MulSource_CLDResult" type="s:boolean" />
-            <s:element minOccurs="0" maxOccurs="1" name="sHBillNo" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
       <s:element name="set_DelPonderationBillMain_Temp_InterIDAndSource">
         <s:complexType>
           <s:sequence>
@@ -5675,6 +5723,41 @@
           </s:sequence>
         </s:complexType>
       </s:element>
+      <s:element name="set_SaveICMOProductReportBill_Layui">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsSc_ICMOReportBillMain" />
+            <s:element minOccurs="0" maxOccurs="1" name="sHSourceType" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="set_SaveICMOProductReportBill_LayuiResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="1" maxOccurs="1" name="set_SaveICMOProductReportBill_LayuiResult" type="s:boolean" />
+            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="set_SaveICMOProductReportBill_CLD_Layui">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsSc_ICMOReportBillMain" />
+            <s:element minOccurs="0" maxOccurs="1" name="sHSourceType" type="s:string" />
+            <s:element minOccurs="0" maxOccurs="1" name="oSystemParameterMain" type="tns:ClsXt_SystemParameterMain" />
+            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="set_SaveICMOProductReportBill_CLD_LayuiResponse">
+        <s:complexType>
+          <s:sequence>
+            <s:element minOccurs="1" maxOccurs="1" name="set_SaveICMOProductReportBill_CLD_LayuiResult" type="s:boolean" />
+            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
+          </s:sequence>
+        </s:complexType>
+      </s:element>
       <s:element name="set_SaveMoveBill_CLD">
         <s:complexType>
           <s:sequence>
@@ -6240,36 +6323,6 @@
           </s:sequence>
         </s:complexType>
       </s:element>
-      <s:complexType name="ClsKf_SellOutBillMain">
-        <s:complexContent mixed="false">
-          <s:extension base="tns:ClsXt_BaseBillMain">
-            <s:sequence>
-              <s:element minOccurs="1" maxOccurs="1" name="HSupID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HWHID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HSCWHID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HEmpID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HManagerID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HSecManagerID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HKeeperID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HDeptID" type="s:long" />
-              <s:element minOccurs="0" maxOccurs="1" name="HExplanation" type="s:string" />
-              <s:element minOccurs="0" maxOccurs="1" name="HInnerBillNo" type="s:string" />
-              <s:element minOccurs="1" maxOccurs="1" name="HRedBlueFlag" type="s:boolean" />
-              <s:element minOccurs="1" maxOccurs="1" name="HSellSID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HCurID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HConveyTypeID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HConveyCompID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HConveyMoney" type="s:double" />
-              <s:element minOccurs="0" maxOccurs="1" name="HSeOrderBillNo" type="s:string" />
-              <s:element minOccurs="1" maxOccurs="1" name="HDFflag" type="s:boolean" />
-              <s:element minOccurs="0" maxOccurs="1" name="HLinkMan" type="s:string" />
-              <s:element minOccurs="0" maxOccurs="1" name="HLinkPhone" type="s:string" />
-              <s:element minOccurs="1" maxOccurs="1" name="HSTOCKORGID" type="s:long" />
-              <s:element minOccurs="1" maxOccurs="1" name="HOWNERID" type="s:long" />
-            </s:sequence>
-          </s:extension>
-        </s:complexContent>
-      </s:complexType>
       <s:element name="set_SaveSellOutBillResponse">
         <s:complexType>
           <s:sequence>
@@ -6363,24 +6416,6 @@
         <s:complexType>
           <s:sequence>
             <s:element minOccurs="1" maxOccurs="1" name="set_SaveSellOutBill_CLD_NewResult" type="s:boolean" />
-            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="set_SaveSellOutBill_CLD">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsKf_SellOutBillMain" />
-            <s:element minOccurs="0" maxOccurs="1" name="sHSourceType" type="s:string" />
-            <s:element minOccurs="0" maxOccurs="1" name="oSystemParameterMain" type="tns:ClsXt_SystemParameterMain" />
-            <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
-          </s:sequence>
-        </s:complexType>
-      </s:element>
-      <s:element name="set_SaveSellOutBill_CLDResponse">
-        <s:complexType>
-          <s:sequence>
-            <s:element minOccurs="1" maxOccurs="1" name="set_SaveSellOutBill_CLDResult" type="s:boolean" />
             <s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
           </s:sequence>
         </s:complexType>
@@ -10425,6 +10460,24 @@
       </s:element>
     </s:schema>
   </wsdl:types>
+  <wsdl:message name="get_ServerFileListForNBWMSSoapIn">
+    <wsdl:part name="parameters" element="tns:get_ServerFileListForNBWMS" />
+  </wsdl:message>
+  <wsdl:message name="get_ServerFileListForNBWMSSoapOut">
+    <wsdl:part name="parameters" element="tns:get_ServerFileListForNBWMSResponse" />
+  </wsdl:message>
+  <wsdl:message name="get_ServerFileListForNBLMESSoapIn">
+    <wsdl:part name="parameters" element="tns:get_ServerFileListForNBLMES" />
+  </wsdl:message>
+  <wsdl:message name="get_ServerFileListForNBLMESSoapOut">
+    <wsdl:part name="parameters" element="tns:get_ServerFileListForNBLMESResponse" />
+  </wsdl:message>
+  <wsdl:message name="get_ServerFileSoapIn">
+    <wsdl:part name="parameters" element="tns:get_ServerFile" />
+  </wsdl:message>
+  <wsdl:message name="get_ServerFileSoapOut">
+    <wsdl:part name="parameters" element="tns:get_ServerFileResponse" />
+  </wsdl:message>
   <wsdl:message name="get_ServerFileForWMSSoapIn">
     <wsdl:part name="parameters" element="tns:get_ServerFileForWMS" />
   </wsdl:message>
@@ -10851,6 +10904,12 @@
   <wsdl:message name="Set_BPrintQtyBarCodeSoapOut">
     <wsdl:part name="parameters" element="tns:Set_BPrintQtyBarCodeResponse" />
   </wsdl:message>
+  <wsdl:message name="set_SaveProductInBill_MulSource_CLDSoapIn">
+    <wsdl:part name="parameters" element="tns:set_SaveProductInBill_MulSource_CLD" />
+  </wsdl:message>
+  <wsdl:message name="set_SaveProductInBill_MulSource_CLDSoapOut">
+    <wsdl:part name="parameters" element="tns:set_SaveProductInBill_MulSource_CLDResponse" />
+  </wsdl:message>
   <wsdl:message name="set_CheckProductInBill_CLDSoapIn">
     <wsdl:part name="parameters" element="tns:set_CheckProductInBill_CLD" />
   </wsdl:message>
@@ -11247,23 +11306,11 @@
   <wsdl:message name="get_ServerFileListForWMSSoapOut">
     <wsdl:part name="parameters" element="tns:get_ServerFileListForWMSResponse" />
   </wsdl:message>
-  <wsdl:message name="get_ServerFileListForNBWMSSoapIn">
-    <wsdl:part name="parameters" element="tns:get_ServerFileListForNBWMS" />
+  <wsdl:message name="set_SaveSellOutBill_CLDSoapIn">
+    <wsdl:part name="parameters" element="tns:set_SaveSellOutBill_CLD" />
   </wsdl:message>
-  <wsdl:message name="get_ServerFileListForNBWMSSoapOut">
-    <wsdl:part name="parameters" element="tns:get_ServerFileListForNBWMSResponse" />
-  </wsdl:message>
-  <wsdl:message name="get_ServerFileListForNBLMESSoapIn">
-    <wsdl:part name="parameters" element="tns:get_ServerFileListForNBLMES" />
-  </wsdl:message>
-  <wsdl:message name="get_ServerFileListForNBLMESSoapOut">
-    <wsdl:part name="parameters" element="tns:get_ServerFileListForNBLMESResponse" />
-  </wsdl:message>
-  <wsdl:message name="get_ServerFileSoapIn">
-    <wsdl:part name="parameters" element="tns:get_ServerFile" />
-  </wsdl:message>
-  <wsdl:message name="get_ServerFileSoapOut">
-    <wsdl:part name="parameters" element="tns:get_ServerFileResponse" />
+  <wsdl:message name="set_SaveSellOutBill_CLDSoapOut">
+    <wsdl:part name="parameters" element="tns:set_SaveSellOutBill_CLDResponse" />
   </wsdl:message>
   <wsdl:message name="set_SaveStationInBillSoapIn">
     <wsdl:part name="parameters" element="tns:set_SaveStationInBill" />
@@ -11595,12 +11642,6 @@
   <wsdl:message name="set_SavePOStockInBill_CLDSoapOut">
     <wsdl:part name="parameters" element="tns:set_SavePOStockInBill_CLDResponse" />
   </wsdl:message>
-  <wsdl:message name="set_SaveProductInBill_MulSource_CLDSoapIn">
-    <wsdl:part name="parameters" element="tns:set_SaveProductInBill_MulSource_CLD" />
-  </wsdl:message>
-  <wsdl:message name="set_SaveProductInBill_MulSource_CLDSoapOut">
-    <wsdl:part name="parameters" element="tns:set_SaveProductInBill_MulSource_CLDResponse" />
-  </wsdl:message>
   <wsdl:message name="set_DelPonderationBillMain_Temp_InterIDAndSourceSoapIn">
     <wsdl:part name="parameters" element="tns:set_DelPonderationBillMain_Temp_InterIDAndSource" />
   </wsdl:message>
@@ -11823,6 +11864,18 @@
   <wsdl:message name="set_SaveICMOReportBill_CLD_LayuiSoapOut">
     <wsdl:part name="parameters" element="tns:set_SaveICMOReportBill_CLD_LayuiResponse" />
   </wsdl:message>
+  <wsdl:message name="set_SaveICMOProductReportBill_LayuiSoapIn">
+    <wsdl:part name="parameters" element="tns:set_SaveICMOProductReportBill_Layui" />
+  </wsdl:message>
+  <wsdl:message name="set_SaveICMOProductReportBill_LayuiSoapOut">
+    <wsdl:part name="parameters" element="tns:set_SaveICMOProductReportBill_LayuiResponse" />
+  </wsdl:message>
+  <wsdl:message name="set_SaveICMOProductReportBill_CLD_LayuiSoapIn">
+    <wsdl:part name="parameters" element="tns:set_SaveICMOProductReportBill_CLD_Layui" />
+  </wsdl:message>
+  <wsdl:message name="set_SaveICMOProductReportBill_CLD_LayuiSoapOut">
+    <wsdl:part name="parameters" element="tns:set_SaveICMOProductReportBill_CLD_LayuiResponse" />
+  </wsdl:message>
   <wsdl:message name="set_SaveMoveBill_CLDSoapIn">
     <wsdl:part name="parameters" element="tns:set_SaveMoveBill_CLD" />
   </wsdl:message>
@@ -11972,12 +12025,6 @@
   </wsdl:message>
   <wsdl:message name="set_SaveSellOutBill_CLD_NewSoapOut">
     <wsdl:part name="parameters" element="tns:set_SaveSellOutBill_CLD_NewResponse" />
-  </wsdl:message>
-  <wsdl:message name="set_SaveSellOutBill_CLDSoapIn">
-    <wsdl:part name="parameters" element="tns:set_SaveSellOutBill_CLD" />
-  </wsdl:message>
-  <wsdl:message name="set_SaveSellOutBill_CLDSoapOut">
-    <wsdl:part name="parameters" element="tns:set_SaveSellOutBill_CLDResponse" />
   </wsdl:message>
   <wsdl:message name="Check_ICMOReportBillSoapIn">
     <wsdl:part name="parameters" element="tns:Check_ICMOReportBill" />
@@ -13000,6 +13047,18 @@
     <wsdl:part name="parameters" element="tns:GetSc_ICMOReportBillListResponse" />
   </wsdl:message>
   <wsdl:portType name="WebService1Soap">
+    <wsdl:operation name="get_ServerFileListForNBWMS">
+      <wsdl:input message="tns:get_ServerFileListForNBWMSSoapIn" />
+      <wsdl:output message="tns:get_ServerFileListForNBWMSSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="get_ServerFileListForNBLMES">
+      <wsdl:input message="tns:get_ServerFileListForNBLMESSoapIn" />
+      <wsdl:output message="tns:get_ServerFileListForNBLMESSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="get_ServerFile">
+      <wsdl:input message="tns:get_ServerFileSoapIn" />
+      <wsdl:output message="tns:get_ServerFileSoapOut" />
+    </wsdl:operation>
     <wsdl:operation name="get_ServerFileForWMS">
       <wsdl:input message="tns:get_ServerFileForWMSSoapIn" />
       <wsdl:output message="tns:get_ServerFileForWMSSoapOut" />
@@ -13284,6 +13343,10 @@
       <wsdl:input message="tns:Set_BPrintQtyBarCodeSoapIn" />
       <wsdl:output message="tns:Set_BPrintQtyBarCodeSoapOut" />
     </wsdl:operation>
+    <wsdl:operation name="set_SaveProductInBill_MulSource_CLD">
+      <wsdl:input message="tns:set_SaveProductInBill_MulSource_CLDSoapIn" />
+      <wsdl:output message="tns:set_SaveProductInBill_MulSource_CLDSoapOut" />
+    </wsdl:operation>
     <wsdl:operation name="set_CheckProductInBill_CLD">
       <wsdl:input message="tns:set_CheckProductInBill_CLDSoapIn" />
       <wsdl:output message="tns:set_CheckProductInBill_CLDSoapOut" />
@@ -13548,17 +13611,9 @@
       <wsdl:input message="tns:get_ServerFileListForWMSSoapIn" />
       <wsdl:output message="tns:get_ServerFileListForWMSSoapOut" />
     </wsdl:operation>
-    <wsdl:operation name="get_ServerFileListForNBWMS">
-      <wsdl:input message="tns:get_ServerFileListForNBWMSSoapIn" />
-      <wsdl:output message="tns:get_ServerFileListForNBWMSSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="get_ServerFileListForNBLMES">
-      <wsdl:input message="tns:get_ServerFileListForNBLMESSoapIn" />
-      <wsdl:output message="tns:get_ServerFileListForNBLMESSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="get_ServerFile">
-      <wsdl:input message="tns:get_ServerFileSoapIn" />
-      <wsdl:output message="tns:get_ServerFileSoapOut" />
+    <wsdl:operation name="set_SaveSellOutBill_CLD">
+      <wsdl:input message="tns:set_SaveSellOutBill_CLDSoapIn" />
+      <wsdl:output message="tns:set_SaveSellOutBill_CLDSoapOut" />
     </wsdl:operation>
     <wsdl:operation name="set_SaveStationInBill">
       <wsdl:input message="tns:set_SaveStationInBillSoapIn" />
@@ -13780,10 +13835,6 @@
       <wsdl:input message="tns:set_SavePOStockInBill_CLDSoapIn" />
       <wsdl:output message="tns:set_SavePOStockInBill_CLDSoapOut" />
     </wsdl:operation>
-    <wsdl:operation name="set_SaveProductInBill_MulSource_CLD">
-      <wsdl:input message="tns:set_SaveProductInBill_MulSource_CLDSoapIn" />
-      <wsdl:output message="tns:set_SaveProductInBill_MulSource_CLDSoapOut" />
-    </wsdl:operation>
     <wsdl:operation name="set_DelPonderationBillMain_Temp_InterIDAndSource">
       <wsdl:input message="tns:set_DelPonderationBillMain_Temp_InterIDAndSourceSoapIn" />
       <wsdl:output message="tns:set_DelPonderationBillMain_Temp_InterIDAndSourceSoapOut" />
@@ -13932,6 +13983,14 @@
       <wsdl:input message="tns:set_SaveICMOReportBill_CLD_LayuiSoapIn" />
       <wsdl:output message="tns:set_SaveICMOReportBill_CLD_LayuiSoapOut" />
     </wsdl:operation>
+    <wsdl:operation name="set_SaveICMOProductReportBill_Layui">
+      <wsdl:input message="tns:set_SaveICMOProductReportBill_LayuiSoapIn" />
+      <wsdl:output message="tns:set_SaveICMOProductReportBill_LayuiSoapOut" />
+    </wsdl:operation>
+    <wsdl:operation name="set_SaveICMOProductReportBill_CLD_Layui">
+      <wsdl:input message="tns:set_SaveICMOProductReportBill_CLD_LayuiSoapIn" />
+      <wsdl:output message="tns:set_SaveICMOProductReportBill_CLD_LayuiSoapOut" />
+    </wsdl:operation>
     <wsdl:operation name="set_SaveMoveBill_CLD">
       <wsdl:input message="tns:set_SaveMoveBill_CLDSoapIn" />
       <wsdl:output message="tns:set_SaveMoveBill_CLDSoapOut" />
@@ -14031,10 +14090,6 @@
     <wsdl:operation name="set_SaveSellOutBill_CLD_New">
       <wsdl:input message="tns:set_SaveSellOutBill_CLD_NewSoapIn" />
       <wsdl:output message="tns:set_SaveSellOutBill_CLD_NewSoapOut" />
-    </wsdl:operation>
-    <wsdl:operation name="set_SaveSellOutBill_CLD">
-      <wsdl:input message="tns:set_SaveSellOutBill_CLDSoapIn" />
-      <wsdl:output message="tns:set_SaveSellOutBill_CLDSoapOut" />
     </wsdl:operation>
     <wsdl:operation name="Check_ICMOReportBill">
       <wsdl:input message="tns:Check_ICMOReportBillSoapIn" />
@@ -14719,6 +14774,33 @@
   </wsdl:portType>
   <wsdl:binding name="WebService1Soap" type="tns:WebService1Soap">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
+    <wsdl:operation name="get_ServerFileListForNBWMS">
+      <soap:operation soapAction="http://tempuri.org/get_ServerFileListForNBWMS" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="get_ServerFileListForNBLMES">
+      <soap:operation soapAction="http://tempuri.org/get_ServerFileListForNBLMES" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="get_ServerFile">
+      <soap:operation soapAction="http://tempuri.org/get_ServerFile" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
     <wsdl:operation name="get_ServerFileForWMS">
       <soap:operation soapAction="http://tempuri.org/get_ServerFileForWMS" style="document" />
       <wsdl:input>
@@ -15358,6 +15440,15 @@
         <soap:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="set_SaveProductInBill_MulSource_CLD">
+      <soap:operation soapAction="http://tempuri.org/set_SaveProductInBill_MulSource_CLD" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
     <wsdl:operation name="set_CheckProductInBill_CLD">
       <soap:operation soapAction="http://tempuri.org/set_CheckProductInBill_CLD" style="document" />
       <wsdl:input>
@@ -15952,26 +16043,8 @@
         <soap:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
-    <wsdl:operation name="get_ServerFileListForNBWMS">
-      <soap:operation soapAction="http://tempuri.org/get_ServerFileListForNBWMS" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="get_ServerFileListForNBLMES">
-      <soap:operation soapAction="http://tempuri.org/get_ServerFileListForNBLMES" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="get_ServerFile">
-      <soap:operation soapAction="http://tempuri.org/get_ServerFile" style="document" />
+    <wsdl:operation name="set_SaveSellOutBill_CLD">
+      <soap:operation soapAction="http://tempuri.org/set_SaveSellOutBill_CLD" style="document" />
       <wsdl:input>
         <soap:body use="literal" />
       </wsdl:input>
@@ -16474,15 +16547,6 @@
         <soap:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
-    <wsdl:operation name="set_SaveProductInBill_MulSource_CLD">
-      <soap:operation soapAction="http://tempuri.org/set_SaveProductInBill_MulSource_CLD" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
     <wsdl:operation name="set_DelPonderationBillMain_Temp_InterIDAndSource">
       <soap:operation soapAction="http://tempuri.org/set_DelPonderationBillMain_Temp_InterIDAndSource" style="document" />
       <wsdl:input>
@@ -16816,6 +16880,24 @@
         <soap:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="set_SaveICMOProductReportBill_Layui">
+      <soap:operation soapAction="http://tempuri.org/set_SaveICMOProductReportBill_Layui" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="set_SaveICMOProductReportBill_CLD_Layui">
+      <soap:operation soapAction="http://tempuri.org/set_SaveICMOProductReportBill_CLD_Layui" style="document" />
+      <wsdl:input>
+        <soap:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
     <wsdl:operation name="set_SaveMoveBill_CLD">
       <soap:operation soapAction="http://tempuri.org/set_SaveMoveBill_CLD" style="document" />
       <wsdl:input>
@@ -17034,15 +17116,6 @@
     </wsdl:operation>
     <wsdl:operation name="set_SaveSellOutBill_CLD_New">
       <soap:operation soapAction="http://tempuri.org/set_SaveSellOutBill_CLD_New" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="set_SaveSellOutBill_CLD">
-      <soap:operation soapAction="http://tempuri.org/set_SaveSellOutBill_CLD" style="document" />
       <wsdl:input>
         <soap:body use="literal" />
       </wsdl:input>
@@ -18583,6 +18656,33 @@
   </wsdl:binding>
   <wsdl:binding name="WebService1Soap12" type="tns:WebService1Soap">
     <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
+    <wsdl:operation name="get_ServerFileListForNBWMS">
+      <soap12:operation soapAction="http://tempuri.org/get_ServerFileListForNBWMS" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="get_ServerFileListForNBLMES">
+      <soap12:operation soapAction="http://tempuri.org/get_ServerFileListForNBLMES" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="get_ServerFile">
+      <soap12:operation soapAction="http://tempuri.org/get_ServerFile" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
     <wsdl:operation name="get_ServerFileForWMS">
       <soap12:operation soapAction="http://tempuri.org/get_ServerFileForWMS" style="document" />
       <wsdl:input>
@@ -19222,6 +19322,15 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="set_SaveProductInBill_MulSource_CLD">
+      <soap12:operation soapAction="http://tempuri.org/set_SaveProductInBill_MulSource_CLD" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
     <wsdl:operation name="set_CheckProductInBill_CLD">
       <soap12:operation soapAction="http://tempuri.org/set_CheckProductInBill_CLD" style="document" />
       <wsdl:input>
@@ -19816,26 +19925,8 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
-    <wsdl:operation name="get_ServerFileListForNBWMS">
-      <soap12:operation soapAction="http://tempuri.org/get_ServerFileListForNBWMS" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="get_ServerFileListForNBLMES">
-      <soap12:operation soapAction="http://tempuri.org/get_ServerFileListForNBLMES" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="get_ServerFile">
-      <soap12:operation soapAction="http://tempuri.org/get_ServerFile" style="document" />
+    <wsdl:operation name="set_SaveSellOutBill_CLD">
+      <soap12:operation soapAction="http://tempuri.org/set_SaveSellOutBill_CLD" style="document" />
       <wsdl:input>
         <soap12:body use="literal" />
       </wsdl:input>
@@ -20338,15 +20429,6 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
-    <wsdl:operation name="set_SaveProductInBill_MulSource_CLD">
-      <soap12:operation soapAction="http://tempuri.org/set_SaveProductInBill_MulSource_CLD" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
     <wsdl:operation name="set_DelPonderationBillMain_Temp_InterIDAndSource">
       <soap12:operation soapAction="http://tempuri.org/set_DelPonderationBillMain_Temp_InterIDAndSource" style="document" />
       <wsdl:input>
@@ -20680,6 +20762,24 @@
         <soap12:body use="literal" />
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="set_SaveICMOProductReportBill_Layui">
+      <soap12:operation soapAction="http://tempuri.org/set_SaveICMOProductReportBill_Layui" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
+    <wsdl:operation name="set_SaveICMOProductReportBill_CLD_Layui">
+      <soap12:operation soapAction="http://tempuri.org/set_SaveICMOProductReportBill_CLD_Layui" style="document" />
+      <wsdl:input>
+        <soap12:body use="literal" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap12:body use="literal" />
+      </wsdl:output>
+    </wsdl:operation>
     <wsdl:operation name="set_SaveMoveBill_CLD">
       <soap12:operation soapAction="http://tempuri.org/set_SaveMoveBill_CLD" style="document" />
       <wsdl:input>
@@ -20898,15 +20998,6 @@
     </wsdl:operation>
     <wsdl:operation name="set_SaveSellOutBill_CLD_New">
       <soap12:operation soapAction="http://tempuri.org/set_SaveSellOutBill_CLD_New" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="set_SaveSellOutBill_CLD">
-      <soap12:operation soapAction="http://tempuri.org/set_SaveSellOutBill_CLD" style="document" />
       <wsdl:input>
         <soap12:body use="literal" />
       </wsdl:input>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index aa59e78..68265bd 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -374,7 +374,6 @@
     <Compile Include="Controllers\SCGL\Sc_MESBeginWorkBillController.cs" />
     <Compile Include="Controllers\SCGL\QC_LastPieceCheckBillController.cs" />
     <Compile Include="Controllers\SCGL\QC_OutCompCheckBillController.cs" />
-    <Compile Include="Controllers\SCGL\QC_ProcessCheckBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_QualityReportBillController.cs" />
     <Compile Include="Controllers\Sc_MouldOtherInBillController.cs" />
     <Compile Include="Controllers\Sc_ProcessMangementController.cs" />
@@ -388,11 +387,13 @@
     <Compile Include="Controllers\XSGL\Xs_SeOutStockBackBillController.cs" />
     <Compile Include="Controllers\XSGL\Xs_SeOutStockBillController.cs" />
     <Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
-    <Compile Include="Controllers\鍝佽川绠$悊\棣栨妫�楠屽崟\QC_FirstPieceCheckBillController.cs" />
+    <Compile Include="Controllers\鍝佽川绠$悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillController.cs" />
+    <Compile Include="Controllers\鍝佽川绠$悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillController.cs" />
     <Compile Include="Dapper\SqlHelper.cs" />
     <Compile Include="Dapper\SqlPools.cs" />
     <Compile Include="DbUntil\DataFormatUntil.cs" />
     <Compile Include="DLL\ClsGy_BadReason_Ctl.cs" />
+    <Compile Include="DLL\ClsGy_Material_Ctl.cs" />
     <Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" />
     <Compile Include="DLL\ClsQC_PatrolProcCheckBill.cs" />
     <Compile Include="DLL\ClsSb_EquipConkBookBill.cs" />
@@ -421,6 +422,7 @@
     <Compile Include="Models\ApiConfig.cs" />
     <Compile Include="Models\ApiResult.cs" />
     <Compile Include="Models\CheckItem.cs" />
+    <Compile Include="Models\ClsGy_Material_Model.cs" />
     <Compile Include="Models\ClsSb_EquipDotCheckBillMain.cs" />
     <Compile Include="Models\ClsSb_EquipDotCheckBillSub.cs" />
     <Compile Include="Models\ClsSb_EquipMaintainBillMain.cs" />

--
Gitblit v1.9.1