From ac59880eecc91d254fd02c3e1f1b7b230ec68ecc Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 23 四月 2024 09:57:48 +0800
Subject: [PATCH] 1

---
 Model/信息平台/ClsOA_AndengFlowRuleBillMain.cs                   |   16 
 WebAPI/Controllers/基础资料/工资基础资料/Gy_WorkTypeController.cs      |    2 
 DAL/仓库管理/ClsKf_MoveStockBill.cs                              |   10 
 DAL/应付管理/ClsYF_PayMentBill.cs                                |   10 
 WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs    |   62 
 Model/应收管理/ClsYS_ReceiveBackBillSub.cs                       |   14 
 Model/销售管理/ClsXs_SeOutStockBackBillMain.cs                   |    1 
 WebAPI/Controllers/仓存管理/领料发货/Kf_StepFoldOutBillController.cs |   82 
 WebAPI/Controllers/基础资料/基础资料/Gy_DutyBillController.cs        |    5 
 WebAPI/DLL/ClsGy_ProjectClass_Ctl.cs                         |  102 
 WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs         |  484 ++
 Model/销售管理/ClsXs_SeOrderBillSub.cs                           |    1 
 WebAPI/Models/Supplier.cs                                    |    1 
 Model/仓库管理/ClsKf_SellOutBillMain.cs                          |    4 
 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs     |   21 
 WebAPI/Controllers/WebAPIController.cs                       |  602 +++
 Model/应收管理/ClsYS_ReceiveBillSub.cs                           |   14 
 DAL/信息平台/ClsOA_AndengFlowRuleBill.cs                         |  312 +
 WebAPI/Controllers/仓存管理/验收入库/Kf_ProductInBillController.cs   |  621 +++
 Model/基础资料/基础资料/ClsGy_Supplier_Model.cs                      |    1 
 WebAPI/ListModels.cs                                         |   48 
 DAL/DAL.csproj                                               |    1 
 WebAPI/Controllers/工资管理/Pay_SingleBalBillController.cs       |  251 +
 DAL/基础资料/公用基础资料/ClsGy_Supplier_Ctl.cs                        |    7 
 WebAPI/Models/基础资料/Gy_Duty.cs                                |    1 
 Model/销售管理/ClsXs_SeOrderBillMain.cs                          |    6 
 WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs       |    8 
 WebAPI/WebAPI.csproj                                         |    2 
 LMES/ClsShowMod.cs                                           |    7 
 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user  |   36 
 DAL/仓库管理/ClsKf_SellOutBillForLayUI.cs                        |    8 
 Model/基础资料/基础资料/ClsGy_ProjectClass_Model.cs                  |   14 
 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs          |  184 
 DAL/工资管理/ClsPay_SingleBalBill.cs                             |  180 
 Model/Model.csproj                                           |    4 
 WebAPI/DLL/ClsGy_TaskClass_Ctl.cs                            |  102 
 Model/应收管理/ClsYS_ReceiveBackBillMain.cs                      |   18 
 WebAPI/Service/LuBaoSevice.cs                                |   40 
 Model/应收管理/ClsYS_ReceiveBillMain.cs                          |   16 
 WebAPI/Controllers/BaseSet/Gy_SupplierController.cs          |   19 
 WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs  |  880 ++++
 WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New.cs           | 4211 ++++++++++++++++++++++
 DAL/销售管理/ClsXs_SeOutStockBackBillForLayUI.cs                 |    5 
 Model/销售管理/ClsXs_SeOutStockBillMain.cs                       |    1 
 WebAPI/Web.config                                            |    4 
 DAL/销售管理/ClsXs_SeOrderBill.cs                                |   17 
 WebAPI/Controllers/项目管理/工程项目/PM_ProjectBillController.cs     |   39 
 WarM/WarM.csproj                                             |   11 
 WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs  | 1677 ++++++++
 WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs    |   58 
 WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New.resx         |  763 ++++
 Model/信息平台/ClsOA_AndengFlowRuleBillSub.cs                    |   14 
 WebAPI/Controllers/仓存管理/验收入库/Kf_StepFoldinBillController.cs  |   90 
 Model/基础资料/基础资料/ClsGy_TaskClass_Model.cs                     |   14 
 Model/工资管理/ClsPay_SingleBalBillSub.cs                        |    1 
 Model/仓库管理/ClsKf_MoveStockBillMain.cs                        |    3 
 WebAPI/Controllers/ReportPlatFormController.cs               |    4 
 WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs        |  196 +
 Model/应付管理/ClsYF_PayMentBillMain.cs                          |    3 
 59 files changed, 11,045 insertions(+), 263 deletions(-)

diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index ed1f279..b641838 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -98,6 +98,7 @@
     <Compile Include="浠撳簱绠$悊\鏉$爜绠$悊\ClsKF_BarCodeStatusChangeBill.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackCheckBill.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackHandleBill.cs" />
+    <Compile Include="淇℃伅骞冲彴\ClsOA_AndengFlowRuleBill.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackSignBill.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackReceiveBill.cs" />
     <Compile Include="鍩虹璧勬枡\InterFace鍩虹璧勬枡\ClsIF_ORGANIZATIONS_View.cs" />
diff --git "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockBill.cs" "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockBill.cs"
index 99e8b1a..026cf4f 100644
--- "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockBill.cs"
+++ "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockBill.cs"
@@ -81,6 +81,8 @@
                 ",HLinkPhone='" + omodel.HLinkPhone + "'" +
                 ",HExplanation='" + omodel.HExplanation + "'" +
                 ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+                ",HInvoiceBillNo='" + omodel.HInvoiceBillNo + "'" +
+                ",HProjectID='" + omodel.HProjectID + "'" +
                 ",HRedBlueFlag=" + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
                 " where HInterID=" + lngBillKey.ToString());
                 //鍒犻櫎鍏宠仈
@@ -138,6 +140,8 @@
                 }
                 //============================
 
+                //鐩存帴璋冩嫧鍗� 淇敼 鍥炲~ 璋冩嫧鐢宠鍗� 鍏宠仈鏁伴噺
+                oCn.RunProc("exec h_p_Kf_UpDateRelation_MoveStockRequestToPOStockIn_Add " + omodel.HInterID.ToString());
 
                 sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
                 oCn.Commit();
@@ -192,14 +196,14 @@
                 ",HSupID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
                 ",HKeeperID,HDeptID,HExplanation,HInnerBillNo,HRedBlueFlag" +
                 ",HAddress,HLinkMan,HLinkPhone" +
-                ",HConveyCompID,HConveyTypeID,HConveyMoney" +
+                ",HConveyCompID,HConveyTypeID,HConveyMoney,HInvoiceBillNo,HProjectID" +
                 ") " +
                 " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                 ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                 ", " + omodel.HSupID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HSecManagerID.ToString() +
                 ", " + omodel.HKeeperID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) +
                 ",'" + omodel.HAddress + "','" + omodel.HLinkMan + "','" + omodel.HLinkPhone + "'" +
-                "," + omodel.HConveyCompID.ToString() + "," + omodel.HConveyTypeID.ToString() + "," + omodel.HConveyMoney.ToString() +
+                "," + omodel.HConveyCompID.ToString() + "," + omodel.HConveyTypeID.ToString() + "," + omodel.HConveyMoney.ToString() + ",'" + omodel.HInvoiceBillNo + "'," + omodel.HProjectID.ToString() +
                 ") ");
                 //鎻掑叆瀛愯〃
                 foreach (Model.ClsKf_MoveStockBillSub oSub in DetailColl)
@@ -252,6 +256,8 @@
                 }
                 //============================
 
+                //鐩存帴璋冩嫧鍗� 淇敼 鍥炲~ 璋冩嫧鐢宠鍗� 鍏宠仈鏁伴噺
+                oCn.RunProc("exec h_p_Kf_UpDateRelation_MoveStockRequestToPOStockIn_Add " + omodel.HInterID.ToString());
 
                 sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
                 oCn.Commit();
diff --git "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs" "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs"
index 1c94b1c..942808f 100644
--- "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs"
+++ "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillForLayUI.cs"
@@ -187,6 +187,9 @@
                     ",HInnerBillNo = '" + omodel.HInnerBillNo + "'" +
                     ",HCarriage = " + omodel.HCarriage + "" +
                     ",HCheckStatusMan = '" + omodel.HCheckStatusMan + "'" +
+                    ",HProjectID = '" + omodel.HProjectID.ToString() + "'" +
+                     ",HGroupID = '" + omodel.HGroupID.ToString() + "'" +
+                    ",HPriceType = '" + omodel.HPriceType + "'" +
                     " where HInterID = " + lngBillKey;
                //鏇存柊涓昏〃
                oCn.RunProc(mainSql);
@@ -364,7 +367,7 @@
                     ",HDeptID,HManagerID,HEmpID,HSupID,HSecManagerID,HKeeperID,HWHID,HSCWHID,HCurID,HExRate,HSellSID,HLinkMan,HLinkPhone" +
                     ",HSeOrderBillNo" +
                     ",HConveyCompID,HConveyTypeID,HConveyMoney" +
-                    ",HExplanation,HInnerBillNo,HRedBlueFlag,HCarriage,HCheckStatusMan" +
+                    ",HExplanation,HInnerBillNo,HRedBlueFlag,HCarriage,HCheckStatusMan,HProjectID,HGroupID,HPriceType" +
                     ") " +
                     "values(" +
                     "" + omodel.HInterID.ToString() + "" +
@@ -414,6 +417,9 @@
                     "," + DBUtility.ClsPub.BoolToString(omodel.HRedBlueFlag) + "" +
                     "," + omodel.HCarriage + "" +
                     ",'" + omodel.HCheckStatusMan + "'" +
+                    ",'" + omodel.HProjectID.ToString() + "'" +
+                    ",'" + omodel.HGroupID.ToString() + "'" +
+                    ",'" + omodel.HPriceType + "'" +
                     ") ";
 
                 oCn.RunProc(mainSql);
diff --git "a/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_AndengFlowRuleBill.cs" "b/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_AndengFlowRuleBill.cs"
new file mode 100644
index 0000000..184973a
--- /dev/null
+++ "b/DAL/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_AndengFlowRuleBill.cs"
@@ -0,0 +1,312 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+    public  class ClsOA_AndengFlowRuleBill:DBUtility.ClsXt_BaseBill
+    {
+        public Model.ClsOA_AndengFlowRuleBillMain omodel = new Model.ClsOA_AndengFlowRuleBillMain();
+        public List<Model.ClsOA_AndengFlowRuleBillSub> DetailColl = new List<Model.ClsOA_AndengFlowRuleBillSub>();
+        
+
+        public ClsOA_AndengFlowRuleBill()
+        {
+            base.MvarItemKeySub = "OA_AndengFlowRuleBillSub";
+            base.MvarItemKeySub2 = "";
+            base.MvarItemKeySub3 = "";
+            base.MvarItemKeySub4 = "";
+            base.MvarItemKey= "OA_AndengFlowRuleBillMain";
+            base.MvarReportTitle = "瀹夌伅閫愮骇鍛煎惛瑙勫垯";
+            base.BillType = "4530";
+            base.HBillSubType = "4530";
+
+        }
+
+        #region 鍥哄畾浠g爜
+
+        ~ClsOA_AndengFlowRuleBill()
+        {
+            DetailColl = null;
+        }
+       
+        #endregion   鑷畾涔夋柟娉�
+        //淇敼鍗曟嵁
+        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+        {
+            try
+            {
+                //淇濆瓨鍓嶆帶鍒�=========================================
+                string HBillNote = "";
+                DataSet ds = oCn.RunProcReturn("Exec h_p_OA_AndengFlowRuleBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_OA_AndengFlowRuleBill_BeforeSaveCtrl");
+                if (ds == null)
+                {
+                    sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+                    return false;
+                }
+                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+                {
+                    sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+                    return false;
+                }
+                //=========================================================
+
+
+                oCn.BeginTran();
+                //鏇存柊涓昏〃
+                oCn.RunProc("UpDate OA_AndengFlowRuleBillMain set  " +
+                " HBillNo='" + omodel.HBillNo + "'" +  //鍥哄畾璧嬪��===============
+                ",HDate='" + omodel.HDate + "'" +
+                ",HYear='" + omodel.HYear.ToString() + "'" +
+                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+                ",HRemark='" + omodel.HRemark + "'" +
+                ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+                ",HUpDateDate=getdate()" +
+                //========================================
+                ",HDeptID='" + omodel.HDeptID.ToString() + "'" +
+                ",HReceiveDeptID='" + omodel.HReceiveDeptID.ToString() + "'" +
+                 ",HErrMsgBackTypeID='" + omodel.HErrMsgBackTypeID.ToString() +
+                 "',HOrgID='" + omodel.HOrgID.ToString() +
+                "' where HInterID=" + lngBillKey.ToString());
+                //鍒犻櫎鍏宠仈
+                DeleteRelation(ref sReturn, lngBillKey);
+                //鍒犻櫎瀛愯〃
+                DeleteBillSub(lngBillKey);
+                //鎻掑叆瀛愯〃
+                omodel.HInterID = lngBillKey;
+                foreach (Model.ClsOA_AndengFlowRuleBillSub oSub in DetailColl)
+                {
+                    oCn.RunProc("Insert into OA_AndengFlowRuleBillSub " +
+                       " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+                       ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+                       ",HSNO,HDutyID,HTimes,HReceiveType" +
+
+                       ") values("
+                       + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+                       "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+                       ",'" + oSub.HSNO.ToString() + "','" + oSub.HDutyID.ToString() + "','" + oSub.HTimes.ToString() + "','" + oSub.HReceiveType.ToString() +
+                       "') ");
+                }
+
+                //=========================淇濆瓨鍚庢帶鍒�  
+                DataSet ds2 = oCn.RunProcReturn("Exec h_p_OA_AndengFlowRuleBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_OA_AndengFlowRuleBill_AfterSaveCtrl");
+                if (ds2 == null)
+                {
+                    sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+                    oCn.RollBack();
+                    return false;
+                }
+                if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+                {
+                    sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+                    oCn.RollBack();
+                    return false;
+                }
+                //============================
+
+                sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+                oCn.Commit();
+                return true;
+            }
+            catch (Exception e)
+            {
+                sReturn = e.Message;
+                oCn.RollBack();
+                throw (e);
+            }
+        }
+        //鏂板鍗曟嵁
+        public override bool AddBill(ref string sReturn)
+        {
+            try
+            {
+
+                //淇濆瓨鍓嶆帶鍒�=========================================
+                string HBillNote = "";
+                DataSet ds = oCn.RunProcReturn("Exec h_p_OA_AndengFlowRuleBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_OA_AndengFlowRuleBill_BeforeSaveCtrl");
+                if (ds == null)
+                {
+                    sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+                    return false;
+                }
+                if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+                {
+                    sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+                    return false;
+                }
+                //=========================================================
+
+                oCn.BeginTran();
+
+                string sql = "";
+
+                sql = "Insert Into OA_AndengFlowRuleBillMain" +
+                "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HYear,HPeriod,HRemark,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType," +
+                "HDeptID,HReceiveDeptID,HErrMsgBackTypeID,HOrgID) " +
+                " values(" +
+                "'" + this.BillType + 
+                "','" + this.HBillSubType + 
+                "'," + omodel.HInterID.ToString() + 
+                ",'" + omodel.HBillNo + 
+                "','" + omodel.HDate + 
+                "'," + omodel.HYear + 
+                "," + omodel.HPeriod + 
+                ",'" + omodel.HRemark + 
+                "','" + omodel.HMaker + 
+                "',getdate()" +
+                ",'" + omodel.HMainSourceInterID +
+                "','" + omodel.HMainSourceEntryID +
+                "','" + omodel.HMainSourceBillNo +
+                "','" + omodel.HMainSourceBillType +
+              
+                "','" + omodel.HDeptID.ToString() +
+                "','" + omodel.HReceiveDeptID.ToString() +
+                "','" + omodel.HErrMsgBackTypeID.ToString() + 
+                "','" + omodel.HOrgID.ToString() +
+                "') ";
+                //涓昏〃
+                oCn.RunProc(sql);
+
+                //鎻掑叆瀛愯〃
+                foreach (Model.ClsOA_AndengFlowRuleBillSub oSub in DetailColl)
+                {
+                    oCn.RunProc("Insert into OA_AndengFlowRuleBillSub " +
+                      " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+                      ",HSNO,HDutyID,HTimes,HReceiveType" +
+
+                      ") values("
+                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+                      ",'" + oSub.HSNO.ToString() + "','" + oSub.HDutyID.ToString() + "','" + oSub.HTimes.ToString() + "','" + oSub.HReceiveType.ToString() +
+                      "') ");
+                }
+
+                //=========================淇濆瓨鍚庢帶鍒�  
+                DataSet ds2 = oCn.RunProcReturn("Exec h_p_OA_AndengFlowRuleBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_OA_AndengFlowRuleBill_AfterSaveCtrl");
+                if (ds2 == null)
+                {
+                    sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+                    oCn.RollBack();
+                    return false;
+                }
+                if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+                {
+                    sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+                    oCn.RollBack();
+                    return false;
+                }
+                //============================
+
+                sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+                oCn.Commit();
+                return true;
+            }
+            catch (Exception e)
+            {
+                sReturn = e.Message;
+                oCn.RollBack();
+                throw (e);
+            }
+        }
+        //鏄剧ず鍗曟嵁
+        public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+        {
+            try
+            {
+                //鏌ヨ涓昏〃
+                DataSet Ds ;
+                Ds = oCn.RunProcReturn("Select * from OA_AndengFlowRuleBillMain Where HInterID=" + lngBillKey.ToString(), "OA_AndengFlowRuleBillMain");
+                if(Ds.Tables[0].Rows.Count==0)
+                {
+                    sReturn = "鍗曟嵁鏈壘鍒帮紒";
+                    return false;
+                }
+                //鍥哄畾璧嬪��===========================================
+                omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+                omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+                omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+                omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+                omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+                omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+                omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+                omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+                omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+                omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+                omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+                omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+                omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+                omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+                omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+                omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+                omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+                omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+                omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+                omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+                omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+                omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+                omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+                omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+                omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+                //========================================================                
+                //omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);                
+                //omodel.HContext = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HContext"]);                
+                //omodel.HDescription = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDescription"]);
+                //omodel.HSendMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSendMan"]);
+                //omodel.HReceiveMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HReceiveMan"]);
+                //omodel.HCopyMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCopyMan"]);
+                //omodel.HLevel = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HLevel"]);
+                //omodel.HReTransmitMan = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HReTransmitMan"]);
+                //omodel.HBillTypeName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillTypeName"]);
+                //omodel.HPlanBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPlanBillNo"]);
+                //omodel.HMaterName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterName"]);
+                //omodel.HMaterModel = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterModel"]);
+                //omodel.HSendType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSendType"]);
+                //omodel.HHasten = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HHasten"]);
+                //omodel.HQty = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HQty"]);   
+                //
+                
+                //寰幆
+                DataSet DsSub ;
+                DsSub = oCn.RunProcReturn("Select * from OA_AndengFlowRuleBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "OA_AndengFlowRuleBillSub");
+                DetailColl.Clear();//娓呯┖
+                for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+                {
+                    Model.ClsOA_AndengFlowRuleBillSub oSub = new Model.ClsOA_AndengFlowRuleBillSub();
+                    // 鍥哄畾璧嬪��===============================================
+                    oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+                    oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+                    oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+                    oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+                    oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+                    oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+                    oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+                    oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]); 
+                    oSub.HCloseMan =  DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+                    oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+                    oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+                    oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+                    //===================================================
+                    //oSub.HDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HDate"]);
+                    //oSub.HSendStatus = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSendStatus"]);
+                    //oSub.HSendMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSendMan"]);
+                    //oSub.HDescription = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HDescription"]);
+
+                    DetailColl.Add(oSub);
+                }
+              
+                sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+                return true;
+            }
+            catch (Exception e)
+            {
+                sReturn = e.Message;
+                throw (e);
+            }
+        }
+       
+        
+    }
+
+}
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Supplier_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Supplier_Ctl.cs"
index c8d83c2..566752e 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Supplier_Ctl.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Supplier_Ctl.cs"
@@ -24,13 +24,13 @@
                     ",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
                     ",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
                     ",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
-                    ",HEnglishAddress,HCurID,HSSID,HAreaID) " +
+                    ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass) " +
                     " 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.HShortName + "','" + oModel.HAddress + "','" + oModel.HLinkMan + "','" + oModel.HLinkPhone + "','" + oModel.HMobilePhone + "'" +
                     ",'" + oModel.HFax + "','" + oModel.HPostalCode + "','" + oModel.HEmail + "','" + oModel.HBank + "','" + oModel.HBankAccount + "'" +
                     ",'" + oModel.HTaxNum + "'," + oModel.HTaxRate.ToString() + ",'" + oModel.HCountry + "','" + oModel.HCorMan + "','" + oModel.HEnglishName + "'" +
-                    ",'" + oModel.HEnglishAddress + "'," + oModel.HCurID.ToString() + "," + oModel.HSSID.ToString() + "," + oModel.HAreaID.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+                    ",'" + oModel.HEnglishAddress + "'," + oModel.HCurID.ToString() + "," + oModel.HSSID.ToString() + "," + oModel.HAreaID.ToString() + ",'" + oModel.HMaterClass+ "')", ref DBUtility.ClsPub.sExeReturnInfo);
                 //淇敼涓婄骇涓洪潪鏈骇浠g爜
                 oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                 oCn.Commit();
@@ -77,7 +77,8 @@
                     ",HEnglishAddress='" + oModel.HEnglishAddress + "'" +
                     ",HCurID=" + oModel.HCurID.ToString() +
                     ",HSSID=" + oModel.HSSID.ToString() +
-                    ",HAreaID=" + oModel.HAreaID.ToString() + "Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+                    ",HMaterClass='"+oModel.HMaterClass+
+                    "',HAreaID=" + oModel.HAreaID.ToString() + "Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                 //淇敼瀛愰」鐩唬鐮�
                 oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                 //灏嗕笂绾� 涓洪潪鏈骇
diff --git "a/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_SingleBalBill.cs" "b/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_SingleBalBill.cs"
index ac73af0..da19e6a 100644
--- "a/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_SingleBalBill.cs"
+++ "b/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_SingleBalBill.cs"
@@ -29,15 +29,75 @@
         {
             DetailColl = null;
         }
-       
+
         #endregion   鑷畾涔夋柟娉�
+
+        //淇濆瓨鍓嶆帶鍒�
+        public bool BeforeSave(Int64 HInterID, string HBillNo, Int64 OperationType, ref string sReturn)
+        {
+            try
+            {
+                DataSet Ds = oCn.RunProcReturn("Exec h_p_Pay_SingleBalBill_BeforeSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + OperationType.ToString(), "h_p_Pay_SingleBalBill_BeforeSaveCtrl");
+                if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+                {
+                    sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+                    return false;
+                }
+                else
+                {
+                    if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 1)
+                    {
+                        sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+                        return false;
+                    }
+                }
+                return true;
+            }
+            catch (Exception e)
+            {
+                throw (e);
+            }
+        }
+
+        //淇濆瓨鍚庢帶鍒�
+        public bool AfterSave(Int64 HInterID, string HBillNo, Int64 OperationType, ref string sReturn)
+        {
+            try
+            {
+                DataSet Ds = oCn.RunProcReturn("Exec h_p_Pay_SingleBalBill_AfterSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + OperationType.ToString(), "h_p_Pay_SingleBalBill_AfterSaveCtrl");
+                if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+                {
+                    sReturn = "淇濆瓨鍚庡垽鏂け璐ワ紒";
+                    return false;
+                }
+                else
+                {
+                    if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 1)
+                    {
+                        sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+                        return false;
+                    }
+                }
+                return true;
+            }
+            catch (Exception e)
+            {
+                throw (e);
+            }
+        }
+
         //淇敼鍗曟嵁
         public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
         {
             try
             {
-                //
                 oCn.BeginTran();
+                //淇濆瓨鍓嶆帶鍒�
+                if (!BeforeSave(lngBillKey, omodel.HBillNo, 2, ref sReturn))
+                {
+                    oCn.RollBack();
+                    return false;
+                }
                 //鏇存柊涓昏〃
                 oCn.RunProc("UpDate Pay_SingleBalBillMain set  " +
                 " HBillNo='" + omodel.HBillNo + "'" +  //鍥哄畾璧嬪��===============
@@ -48,12 +108,13 @@
                 ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
                 ",HUpDateDate=getdate()" +
                 //========================================
-                ",HGroupID=" + omodel.HGroupID.ToString() +
                 ",HDeptID=" + omodel.HDeptID.ToString() +
+                ",HGroupID=" + omodel.HGroupID.ToString() +
                 ",HEmpID=" + omodel.HEmpID.ToString() +
-                ",HPayType=" + omodel.HPayType.ToString() +
+                ",HPayType='" + omodel.HPayType + "'" +
                 ",HExplanation='" + omodel.HExplanation + "'" +
                 ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+                ",HStockOrgID=" + omodel.HSTOCKORGID.ToString() +
                 " where HInterID=" + lngBillKey.ToString());
                 //鍒犻櫎鍏宠仈
                 DeleteRelation(ref sReturn, lngBillKey);
@@ -64,37 +125,30 @@
                 foreach (Model.ClsPay_SingleBalBillSub oSub in DetailColl)
                 {
                     oCn.RunProc("Insert into Pay_SingleBalBillSub " +
-                      " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
-                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
-                      ",HMaterID,HProcID,HEmpID,HSourceID,HTimes,HQty,HPrice,HSqty" +
-                      ",HMoney,HICMOInterID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
+                      " (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
+                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+                      ",HMaterID,HProcID,HSourceID,HEmpID,HTimes,HQty" +
+                      ",HPrice,HPackQty,HPackPrice,HPackMoney,HPackMaterID,HPriceRate" +
+                      ",HSubsidyID,HSubsidyTotal,HDeuctID,HDeuctTotal,HSubsidyQty,HSubsidyMoney,HMoney" +
+                      ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
                       ",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo" +
-                      ",HPriceRate,HSubsidyTotal,HDeuctTotal,HSubsidyID,HDeuctID" +
-                      ",HPackQty,HPackPrice,HPackMoney,HPackMaterID,HSubsidyQty,HSubsidyMoney" +
                       ") values("
-                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
-                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
-                      "," + oSub.HMaterID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HEmpID.ToString() + "," + oSub.HSourceID.ToString()
-                      + "," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HSqty.ToString() +
-                      "," + oSub.HMoney.ToString() + "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" +
+                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
+                      "," + oSub.HMaterID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HSourceID.ToString() + "," + oSub.HEmpID.ToString() + "," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() +
+                      "," + oSub.HPrice.ToString() + "," + oSub.HPackQty.ToString() + "," + oSub.HPackPrice.ToString() + "," + oSub.HPackMoney.ToString() + "," + oSub.HPackMaterID.ToString() + "," + oSub.HPriceRate.ToString() +
+                      "," + oSub.HSubsidyID.ToString() + "," + oSub.HSubsidyTotal.ToString() + "," + oSub.HDeuctID.ToString() + "," + oSub.HDeuctTotal.ToString() + "," + oSub.HSubsidyQty.ToString() + "," + oSub.HSubsidyMoney.ToString() + "," + oSub.HMoney.ToString() +
+                      "," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" +
                       "," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'" +
-                      "," + oSub.HPriceRate.ToString() + "," + oSub.HSubsidyTotal.ToString() + "," + oSub.HDeuctTotal.ToString() + "," + oSub.HSubsidyID.ToString() + "," + oSub.HDeuctID.ToString() +
-                      "," + oSub.HPackQty.ToString() + "," + oSub.HPackPrice.ToString() + "," + oSub.HPackMoney.ToString() + "," + oSub.HPackMaterID.ToString() + "," + oSub.HSubsidyQty.ToString() + "," + oSub.HSubsidyMoney.ToString() +
                       ") ");
                 }
-                //
-                //foreach (Model.ClsPay_SingleBalBillSub oSub in DetailColl)
-                //{
-                //    Ds = oCn.RunProcReturn("exec h_p_Pay_SingleBalBill_Qty " + oSub.HICMOInterID, "");
-                //    if (Ds.Tables[0].Rows.Count == 0)
-                //        return;
-                //    if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y")
-                //    {
-                //        sReturn = "姹囨姤鏁伴噺瓒呰繃璁″垝鏁伴噺锛佷笉鍏佽淇濆瓨";
-                //        return false;
-                //    }
-                //}
-                sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+                //淇濆瓨鍚庢帶鍒�
+                if (!AfterSave(lngBillKey, omodel.HBillNo, 2, ref sReturn))
+                {
+                    oCn.RollBack();
+                    return false;
+                }
+                sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 淇敼鎴愬姛锛�";
                 oCn.Commit();
                 return true;
             }
@@ -114,52 +168,54 @@
                 omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                 //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
                 oCn.BeginTran();
+                //淇濆瓨鍓嶆帶鍒�
+                if (!BeforeSave(omodel.HInterID, omodel.HBillNo, 1, ref sReturn))
+                {
+                    oCn.RollBack();
+                    return false;
+                }
                 //涓昏〃
                 oCn.RunProc("Insert Into Pay_SingleBalBillMain   " +
                 "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
-                ",HYear,HPeriod,HRemark,HMaker,HMakeDate,HSaveFlag" +
-                ",HGroupID,HDeptID,HEmpID,HPayType,HExplanation,HInnerBillNo" +
+                ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+                ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
+                ",HDeptID,HGroupID,HEmpID,HPayType,HExplanation" +
+                ",HSaveFlag,HInnerBillNo,HStockOrgID" +
                 ") " +
-                " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
-                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()," + Convert.ToString(omodel.HSaveFlag ? 1 : 0) + 
-                ", " + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HPayType.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
+                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate.ToShortDateString() + "'" +
+                ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+                ", " + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'" +
+                ", " + omodel.HDeptID.ToString() + "," + omodel.HGroupID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HPayType.ToString() + ",'" + omodel.HExplanation + "'" +
+                ", " + Convert.ToString(omodel.HSaveFlag ? 1 : 0) + ",'" + omodel.HInnerBillNo + "'," + omodel.HSTOCKORGID.ToString() +
                 ") ");
                 //鎻掑叆瀛愯〃
                 foreach (Model.ClsPay_SingleBalBillSub oSub in DetailColl)
                 {
                     oCn.RunProc("Insert into Pay_SingleBalBillSub " +
-                      " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
-                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
-                      ",HMaterID,HProcID,HEmpID,HSourceID,HTimes,HQty,HPrice,HSqty" +
-                      ",HMoney,HICMOInterID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
+                      " (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
+                      ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+                      ",HMaterID,HProcID,HSourceID,HEmpID,HTimes,HQty" +
+                      ",HPrice,HPackQty,HPackPrice,HPackMoney,HPackMaterID,HPriceRate" +
+                      ",HSubsidyID,HSubsidyTotal,HDeuctID,HDeuctTotal,HSubsidyQty,HSubsidyMoney,HMoney" +
+                      ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
                       ",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo" +
-                      ",HPriceRate,HSubsidyTotal,HDeuctTotal,HSubsidyID,HDeuctID" +
-                      ",HPackQty,HPackPrice,HPackMoney,HPackMaterID,HSubsidyQty,HSubsidyMoney" +
                       ") values("
-                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate.ToShortDateString() + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
-                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
-                      "," + oSub.HMaterID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HEmpID.ToString() + "," + oSub.HSourceID.ToString()
-                      + "," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HSqty.ToString() +
-                      "," + oSub.HMoney.ToString() + "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" +
+                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
+                      "," + oSub.HMaterID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HSourceID.ToString() + "," + oSub.HEmpID.ToString() + "," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() +
+                      "," + oSub.HPrice.ToString() + "," + oSub.HPackQty.ToString() + "," + oSub.HPackPrice.ToString() + "," + oSub.HPackMoney.ToString() + "," + oSub.HPackMaterID.ToString() + "," + oSub.HPriceRate.ToString() +
+                      "," + oSub.HSubsidyID.ToString() + "," + oSub.HSubsidyTotal.ToString() + "," + oSub.HDeuctID.ToString() + "," + oSub.HDeuctTotal.ToString() + "," + oSub.HSubsidyQty.ToString() + "," + oSub.HSubsidyMoney.ToString() + "," + oSub.HMoney.ToString() +
+                      "," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" +
                       "," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'" +
-                      "," + oSub.HPriceRate.ToString() + "," + oSub.HSubsidyTotal.ToString() + "," + oSub.HDeuctTotal.ToString() + "," + oSub.HSubsidyID.ToString() + "," + oSub.HDeuctID.ToString() +
-                      "," + oSub.HPackQty.ToString() + "," + oSub.HPackPrice.ToString() + "," + oSub.HPackMoney.ToString() + "," + oSub.HPackMaterID.ToString() + "," + oSub.HSubsidyQty.ToString() + "," + oSub.HSubsidyMoney.ToString() +
                       ") ");
                 }
-                //
-                //foreach (Model.ClsPay_SingleBalBillSub oSub in DetailColl)
-                //{
-                //    Ds = oCn.RunProcReturn("exec h_p_Pay_SingleBalBill_Qty " + oSub.HICMOInterID, "");
-                //    if (Ds.Tables[0].Rows.Count == 0)
-                //        return;
-                //    if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y")
-                //    {
-                //        sReturn = "姹囨姤鏁伴噺瓒呰繃璁″垝鏁伴噺锛佷笉鍏佽淇濆瓨";
-                //        return false;
-                //    }
-                //}
-                //
-                sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+                //淇濆瓨鍚庢帶鍒�
+                if (!AfterSave(omodel.HInterID, omodel.HBillNo, 1, ref sReturn))
+                {
+                    oCn.RollBack();
+                    return false;
+                }
+                sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 鏂板鎴愬姛锛�";
                 oCn.Commit();
                 return true;
             }
diff --git "a/DAL/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBill.cs" "b/DAL/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBill.cs"
index 4712b94..da7ebac 100644
--- "a/DAL/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBill.cs"
+++ "b/DAL/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBill.cs"
@@ -68,7 +68,9 @@
                 ",HCheckMoneyFor=" + omodel.HCheckMoneyFor.ToString() +
                 ",HRemainMoney=" + omodel.HRemainMoney.ToString() +
                 ",HCheckStatus=" + omodel.HCheckStatus.ToString() +
-
+                ",HInvoiceBillNo='" + omodel.HInvoiceBillNo + "'" +
+                ",HBigMoney='" + omodel.HBigMoney + "'" +
+                 ",HReason='" + omodel.HReason + "'" +
 
                 ",HSSNum='" + omodel.HSSNum + "'" +
                 ",HRelSumMoney=" + omodel.HRelSumMoney.ToString() +
@@ -142,15 +144,15 @@
                 ",HAccDate,HSupID,HAccSupID,HSSID,HCurID,HExRate" +
                 ",HDeptID,HEmpID,HOrgID,HSumMoney,HBankID,HBankNo,HExplanation" +
                 ",HSSNum,HDiscountRate,HRelSumMoney,HSumMoneyBB,HRelSumMoneyBB" +
-                ",HInnerBillNo,HCheckMoney,HCheckMoneyFor,HRemainMoney,HCheckStatus" +
+                ",HInnerBillNo,HCheckMoney,HCheckMoneyFor,HRemainMoney,HCheckStatus,HInvoiceBillNo,HBigMoney,HReason" +
                 ") " +
                 " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                 ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                 ",'" + omodel.HAccDate + "'," + omodel.HSupID.ToString() + "," + omodel.HAccSupID.ToString() + "," + omodel.HSSID.ToString() + "," + omodel.HCurID.ToString() + "," + omodel.HExRate.ToString() +
                 ", " + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + "," + omodel.HOrgID + "," + omodel.HSumMoney.ToString() + "," + omodel.HBankID.ToString() + ",'" + omodel.HBankNo + "','" + omodel.HExplanation +"'"+
                 ",'" + omodel.HSSNum + "'," + omodel.HDiscountRate.ToString() + "," + omodel.HRelSumMoney.ToString() + "," + omodel.HSumMoneyBB.ToString() + "," + omodel.HRelSumMoneyBB.ToString() + 
-                ",'" + omodel.HInnerBillNo + "'," + omodel.HCheckMoney.ToString() + "," + omodel.HCheckMoneyFor.ToString() + "," + omodel.HRemainMoney.ToString() + "," + omodel.HCheckStatus.ToString() + 
-                ") ");
+                ",'" + omodel.HInnerBillNo + "'," + omodel.HCheckMoney.ToString() + "," + omodel.HCheckMoneyFor.ToString() + "," + omodel.HRemainMoney.ToString() + "," + omodel.HCheckStatus.ToString() + ",'" + omodel.HInvoiceBillNo + "','" + omodel.HBigMoney + "','" + omodel.HReason +
+                "') ");
                 //鎻掑叆瀛愯〃
                 foreach (Model.ClsYF_PayMentBillSub oSub in DetailColl)
                 {
diff --git "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBill.cs" "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBill.cs"
index 58b5d82..185066c 100644
--- "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBill.cs"
+++ "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBill.cs"
@@ -103,6 +103,8 @@
                 ",HPayCusID=" + omodel.HPayCusID +
                 ",HExplanation='" + omodel.HExplanation + "'" +
                 ",HLinkMan='" + omodel.HLinkMan + "'" +
+                ",HWHID='" + omodel.HWHID + "'" +
+                ",HProjectID='" + omodel.HProjectID + "'" +
                 ",HLinkPhone='" + omodel.HLinkPhone + "'" +
                 " where HInterID=" + lngBillKey.ToString();
 
@@ -132,7 +134,7 @@
                     string subSql = "Insert into Xs_SeOrderBillSub" +
                         "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationQty_SellOutCheck,HRelationMoney_SellOutCheck,HRelationQty_ICMO,HRelationQty_SellBack,HRelationQty_SellBackCheck,HRelationMoney,HMaterID,HUnitID,HQty,HPrice,HTaxPrice,HMoney" +
                         ",HDiscountRate,HRelTaxPrice,HTaxRate,HTaxMoney,HlineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark,HOrderLevID" +
-                        ",HCusMaterNumber,HCusModel,HCusMaterName,HisStockGoods) " +
+                        ",HCusMaterNumber,HCusModel,HCusMaterName,HisStockGoods,HWHID) " +
                         "values(" +
                         "" + omodel.HInterID +
                         "," + oSub.HEntryID +
@@ -168,7 +170,8 @@
                         "','" + oSub.HCusModel +
                         "','" + oSub.HCusMaterName +
                         "'," + (oSub.HisStockGoods?1:0) +
-                        ")";
+                         ",'" + oSub.HWhID +
+                        "')";
                     oCn.RunProc(subSql);
                 }
 
@@ -278,7 +281,7 @@
                 string mainSql = "Insert Into Xs_SeOrderBillMain" +
                     "(HYear,HPeriod,HBillType,HBillSubType,HBillStatus,HExplanation" +
                     ",HInterID,HBillNo,HDate,HInnerBillNo,HAddress,HDeptID,HCusID,HEmpID,HCurID,HExRate,HEarnestRate,HManagerID,HSellSID,HSSID,HSSDate,HPayCusID,HRemark,HOrgID,HMaker,HMakeDate,HLinkMan,HLinkPhone" +
-                    ",HERPInterID,HERPBillType,HSALEORGID,HSALEGROUPID,HRECEIVEID,HSETTLEID,HCHARGEID,HHEADLOCID,HRECCONTACTID,HCORRESPONDORGID,HBUSINESSTYPE) " +
+                    ",HERPInterID,HERPBillType,HSALEORGID,HSALEGROUPID,HRECEIVEID,HSETTLEID,HCHARGEID,HHEADLOCID,HRECCONTACTID,HCORRESPONDORGID,HBUSINESSTYPE,HProjectID,HWHID) " +
                     "values(" +
                     "" + omodel.HYear +
                     "," + omodel.HPeriod +
@@ -322,6 +325,9 @@
                     "," + omodel.HRECCONTACTID +
                     "," + omodel.HCORRESPONDORGID +
                     ",'" + omodel.HBUSINESSTYPE +
+
+                    "','" + omodel.HProjectID +
+                    "','" + omodel.HWHID +
                     "')";
                     
                 oCn.RunProc(mainSql);
@@ -344,7 +350,7 @@
                     string subSql = "Insert into Xs_SeOrderBillSub" +
                         "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationQty_SellOutCheck,HRelationMoney_SellOutCheck,HRelationQty_ICMO,HRelationQty_SellBack,HRelationQty_SellBackCheck,HRelationMoney,HMaterID,HUnitID,HQty,HPrice,HTaxPrice,HMoney" +
                         ",HDiscountRate,HRelTaxPrice,HTaxRate,HTaxMoney,HlineTotal,HlineTotalBB,HDate,HOutStockQty,HInvoiceQty,HRemark,HOrderLevID" +
-                        ",HCusMaterNumber,HCusModel,HCusMaterName,HisStockGoods) " +
+                        ",HCusMaterNumber,HCusModel,HCusMaterName,HisStockGoods,HWHID) " +
                         "values(" +
                         "" + omodel.HInterID +
                         "," + oSub.HEntryID +
@@ -380,7 +386,8 @@
                         "','" + oSub.HCusModel +
                         "','" + oSub.HCusMaterName +
                         "'," + (oSub.HisStockGoods?1:0) +
-                        ")";
+                        ",'" + oSub.HWhID +
+                        "')";
                     oCn.RunProc(subSql);
                 }
 
diff --git "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBackBillForLayUI.cs" "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBackBillForLayUI.cs"
index 938e7cd..69e5a8a 100644
--- "a/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBackBillForLayUI.cs"
+++ "b/DAL/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBackBillForLayUI.cs"
@@ -89,6 +89,7 @@
                 ",HAddress='" + omodel.HAddress + "'" +
                 ",HExplanation='" + omodel.HExplanation + "'" +
                 ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+                ",HProjectID='" + omodel.HProjectID + "'" +
                 " where HInterID=" + lngBillKey.ToString());
                 //鍒犻櫎鍏宠仈
                 //DeleteRelation(ref sReturn, lngBillKey);
@@ -164,12 +165,12 @@
                 "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
                 ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
                 ",HAddress,HSSID,HCusID,HWHID,HCurID,HExRate" +
-                ",HEmpID,HManagerID,HDeptID,HExplanation,HInnerBillNo" +
+                ",HEmpID,HManagerID,HDeptID,HExplanation,HInnerBillNo,HProjectID" +
                 ") " +
                 " values('" + this.BillType + "','"  + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                 ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HMaker + "',getdate()" +
                 ",'" + omodel.HAddress + "'," + omodel.HSSID.ToString() + "," + omodel.HCusID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HCurID.ToString() + "," + omodel.HExRate.ToString() +
-                ", " + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'"+
+                ", " + omodel.HEmpID.ToString() + "," + omodel.HManagerID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','"+omodel.HProjectID.ToString()+"'"+
                 ") ");
                 //鎻掑叆瀛愯〃
                 foreach (Model.ClsXs_SeOutStockBackBillSub oSub in DetailColl)
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 37a9d43..f1c1f30 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -4004,6 +4004,13 @@
                         oKf_AGVRequestBill_FastList.Show();
                         oMainForm.AddTabPage(oKf_AGVRequestBill_FastList);
                         break;
+                    case "gy_barcodebill_automaticallybyplc":
+                        //权限
+                        Gy_BarCodeBill_automaticallyByPLC_New oGy_BarCodeBill_automaticallyByPLC = new Gy_BarCodeBill_automaticallyByPLC_New();
+                        oGy_BarCodeBill_automaticallyByPLC.MdiParent = oMain;
+                        oGy_BarCodeBill_automaticallyByPLC.Show();
+                        oMainForm.AddTabPage(oGy_BarCodeBill_automaticallyByPLC);
+                        break;
                     default:
                         break;
                 }
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 0617fae..feb8ba4 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -291,10 +291,12 @@
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackCheckBillMain.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackHandleBillMain.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackCheckBillSub.cs" />
+    <Compile Include="淇℃伅骞冲彴\ClsOA_AndengFlowRuleBillMain.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackSignBill.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackReceiveBillMain.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackBillMain.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackHandleBillSub.cs" />
+    <Compile Include="淇℃伅骞冲彴\ClsOA_AndengFlowRuleBillSub.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackSignBillSub.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackReceiveBillSub.cs" />
     <Compile Include="淇℃伅骞冲彴\ClsOA_ErrMsgBackBillSub.cs" />
@@ -360,6 +362,8 @@
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CardAddress_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_CardType_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_ErrMsgBackType_Model.cs" />
+    <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TaskClass_Model.cs" />
+    <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_ProjectClass_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_StockCheckItem_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_InspectInstruMent_Model.cs" />
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_InspectBasis_Model.cs" />
diff --git "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockBillMain.cs" "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockBillMain.cs"
index 91159fd..0f35268 100644
--- "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockBillMain.cs"
+++ "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_MoveStockBillMain.cs"
@@ -30,5 +30,8 @@
         public Int64 HGroupID;
         public int HStockInOrgID;       //     int     		//调入组织ID
         public int HStockOutOrgID;      //     int     		//调出组织ID
+
+        public string HInvoiceBillNo;        //   发票编号
+        public Int64 HProjectID;        //-项目
     }
 }
diff --git "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillMain.cs" "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillMain.cs"
index b6a1213..aa1a698 100644
--- "a/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillMain.cs"
+++ "b/Model/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_SellOutBillMain.cs"
@@ -32,6 +32,10 @@
         public string HCheckStatusMan; //核销人
         public double HExRate;          //汇率
 
+        public Int64 HProjectID;    //工程项目
+        public Int64 HGroupID;  //班组
+        public string HPriceType;   //varchar(20) --单价类型(成本价,结算价)
+
         public Int64 HOrgID;        //组织
     }
 }
diff --git "a/Model/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_AndengFlowRuleBillMain.cs" "b/Model/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_AndengFlowRuleBillMain.cs"
new file mode 100644
index 0000000..25bf58e
--- /dev/null
+++ "b/Model/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_AndengFlowRuleBillMain.cs"
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+    public class ClsOA_AndengFlowRuleBillMain : DBUtility.ClsXt_BaseBillMain
+    {
+        public int HDeptID ;       // 发送部门(Gy_Department)  
+        public int HReceiveDeptID;      // 接收部门(Gy_Department)  
+        public int HErrMsgBackTypeID; // 异常类型(Gy_ErrMsgBackType)  
+        public int HOrgID;        
+     
+  
+    }
+}
diff --git "a/Model/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_AndengFlowRuleBillSub.cs" "b/Model/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_AndengFlowRuleBillSub.cs"
new file mode 100644
index 0000000..f5c8498
--- /dev/null
+++ "b/Model/\344\277\241\346\201\257\345\271\263\345\217\260/ClsOA_AndengFlowRuleBillSub.cs"
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+    public class ClsOA_AndengFlowRuleBillSub : DBUtility.ClsXt_BaseBillSub
+    {
+        public int HSNO;    //-流程次序
+        public int HDutyID; //职务(Gy_Duty)
+        public int HTimes;  //触发时间点(分钟)
+        public string  HReceiveType;    //接收模式(短信,消息,同时接收)
+    }
+}
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_ProjectClass_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_ProjectClass_Model.cs"
new file mode 100644
index 0000000..7f154f9
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_ProjectClass_Model.cs"
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+    public class ClsGy_ProjectClass_Model : DBUtility.ClsGy_Base_Model
+    {
+        public DateTime HMakeTime;
+        public int HUSEORGID;
+        public string HMakeEmp;
+        public DateTime HModifyTime;
+    }
+}
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Supplier_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Supplier_Model.cs"
index 5b39938..646ed6b 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Supplier_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Supplier_Model.cs"
@@ -27,5 +27,6 @@
         public Int64 HSSID;//               int      '结算方式(Gy_SettleStyle)  
         public Int64 HAreaID;//        int      '地区(Gy_AreaSet)
         public string HBarCode;
+        public string HMaterClass;  //varchar(20)  供货材料类别
     }
 }
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_TaskClass_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_TaskClass_Model.cs"
new file mode 100644
index 0000000..3d53c58
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_TaskClass_Model.cs"
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+    public class ClsGy_TaskClass_Model : DBUtility.ClsGy_Base_Model
+    {
+        public DateTime HMakeTime;
+        public int HUSEORGID;
+        public string HMakeEmp;
+        public DateTime HModifyTime;
+    }
+}
diff --git "a/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_SingleBalBillSub.cs" "b/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_SingleBalBillSub.cs"
index 52a0201..46a60cc 100644
--- "a/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_SingleBalBillSub.cs"
+++ "b/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_SingleBalBillSub.cs"
@@ -21,6 +21,7 @@
 
         public double HMoney;//		decimal(18,8)		--金额 
         public Int64 HICMOInterID;//	int		--生产任务单ID
+        public Int64 HICMOEntryID;//	int		--生产任务单子ID
         public string HICMOBillNo;//	varchar(50)		--生产任务单号
         public Int64 HProcReportInterID;//        int      --工序汇报单ID
         public Int64 HProcReportEntryID;//	int	--工序汇报单子ID
diff --git "a/Model/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBillMain.cs" "b/Model/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBillMain.cs"
index 6e3bb45..a55a41b 100644
--- "a/Model/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBillMain.cs"
+++ "b/Model/\345\272\224\344\273\230\347\256\241\347\220\206/ClsYF_PayMentBillMain.cs"
@@ -30,5 +30,8 @@
         public Single HRelSumMoney;//	dec(18,8)		//折扣后金额(可编辑)		--addnew
         public Single HSumMoneyBB;//  dec(18,8) 			//表头金额本位币(可编辑)	--addnew
         public Single HRelSumMoneyBB;//	dec(18,8)		//折扣后金额本位币(可编辑)	--
+        public string HInvoiceBillNo;//	varchar(100)      --发票编号
+        public string HBigMoney;//	varchar(100) --大写金额
+        public string HReason;//	varchar(400) --付款事由
     }
 }
diff --git "a/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBillMain.cs" "b/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBillMain.cs"
index 10c511c..905d55a 100644
--- "a/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBillMain.cs"
+++ "b/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBillMain.cs"
@@ -12,7 +12,7 @@
         public Int64 HAccCusID;//   int  //结算单位(gy_supplier)
         public Int64 HSSID;//    int   //结算方式
         public Int64 HCurID;//   int   //币别
-        public Single HExRate;//    money //汇率(选币别带出)
+        public double HExRate;//    money //汇率(选币别带出)
         public Int64 HDeptID;//  int  //部门
         public Int64 HEmpID;//   int	 //业务员
         public double HSumMoney;//  dec(18,8) //单据金额
@@ -20,15 +20,15 @@
         public string HBankNo;//   varchar(100)  //帐号(选银行带出)
         public string HExplanation;//   varchar(200)     --摘要
         public string HInnerBillNo;// varchar(100)      --内部单据号
-        public Single HCheckMoney;//	money	核销金额(界面不显示)		new
-        public Single HCheckMoneyFor;//	money		核销金额本位币(界面不显示)		new
-        public Single HRemainMoney;//	money		剩余核销金额(界面不显示)		new
-        public Int64 HCheckStatus;//	int     (0未核销,1部分核销,2已核销)(界面不显示)  new未核销,1部分核销,2已核销)  new	界面上不需要显示据号
+        public double HCheckMoney;//	money	核销金额(界面不显示)		new
+        public double HCheckMoneyFor;//	money		核销金额本位币(界面不显示)		new
+        public double HRemainMoney;//	money		剩余核销金额(界面不显示)		new
+        public double HCheckStatus;//	int     (0未核销,1部分核销,2已核销)(界面不显示)  new未核销,1部分核销,2已核销)  new	界面上不需要显示据号
         public string HSSNum;//	varchar(500)				--结算号
-        public Single HDiscountRate;//	money			--整单折扣(可编辑)		--addnew
-        public Single HRelSumMoney;//	dec(18,8)		//折扣后金额(可编辑)		--addnew
-        public Single HSumMoneyBB;//  dec(18,8) 			//表头金额本位币(可编辑)	--addnew
-        public Single HRelSumMoneyBB;//	dec(18,8)		//折扣后金额本位币(可编辑)	--
+        public double HDiscountRate;//	money			--整单折扣(可编辑)		--addnew
+        public double HRelSumMoney;//	dec(18,8)		//折扣后金额(可编辑)		--addnew
+        public double HSumMoneyBB;//  dec(18,8) 			//表头金额本位币(可编辑)	--addnew
+        public double HRelSumMoneyBB;//	dec(18,8)		//折扣后金额本位币(可编辑)	--
 
         public Int64 HManagerID;    //int       销售主管
         public Int64 HOrgID;        //int       组织
diff --git "a/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBillSub.cs" "b/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBillSub.cs"
index 6565dfe..5e5d991 100644
--- "a/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBillSub.cs"
+++ "b/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBackBillSub.cs"
@@ -29,13 +29,13 @@
         public Int64 HReceiveBillInterID;        //	int		--内码					--addnew
         public Int64 HReceiveBillEntryID;        //	int		--内码					--addnew
         public string HSourceDate;//	dateime   		源单日期				--addnew
-        public Single HSourceMoney;//	dec(18,8) 	源单金额				--addnew
-        public Single HSourceMoneyBB;//	dec(18,8) 	源单金额本位币				--addnew
-        public Single HReadyCheckMoney;// 	dec(18,8) 	已核销金额			--addnew
-        public Single HUnCheckMoney;//	dec(18,8) 	未核销金额				--addnew
-        public Single HCheckMoney;//	dec(18,8)	//本次核销金额				--addnew
-        public Single HCheckMoneyBB;//	dec(18,8)	//本次核销金额(不可编辑)		--addnew
-        public Single HInovceExRate;//		money	//当期汇率				--addnew
+        public double HSourceMoney;//	dec(18,8) 	源单金额				--addnew
+        public double HSourceMoneyBB;//	dec(18,8) 	源单金额本位币				--addnew
+        public double HReadyCheckMoney;// 	dec(18,8) 	已核销金额			--addnew
+        public double HUnCheckMoney;//	dec(18,8) 	未核销金额				--addnew
+        public double HCheckMoney;//	dec(18,8)	//本次核销金额				--addnew
+        public double HCheckMoneyBB;//	dec(18,8)	//本次核销金额(不可编辑)		--addnew
+        public double HInovceExRate;//		money	//当期汇率				--addnew
         public string HSourceRemark;//	varchar(500)	--源单备注				--addnew
     }
 }
diff --git "a/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBillMain.cs" "b/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBillMain.cs"
index 9dd1624..bb3c105 100644
--- "a/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBillMain.cs"
+++ "b/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBillMain.cs"
@@ -12,7 +12,7 @@
         public Int64 HAccCusID;//   int  //结算单位(gy_supplier)
         public Int64 HSSID;//    int   //结算方式
         public Int64 HCurID;//   int   //币别
-        public Single HExRate;//    money //汇率(选币别带出)
+        public double HExRate;//    money //汇率(选币别带出)
         public Int64 HDeptID;//  int  //部门
         public Int64 HEmpID;//   int	 //业务员
         public double HSumMoney;//  dec(18,8) //单据金额
@@ -20,15 +20,15 @@
         public string HBankNo;//   varchar(100)  //帐号(选银行带出)
         public string HExplanation;//   varchar(200)     --摘要
         public string HInnerBillNo;// varchar(100)      --内部单据号
-        public Single HCheckMoney;//	money	核销金额(界面不显示)		new
-        public Single HCheckMoneyFor;//	money		核销金额本位币(界面不显示)		new
-        public Single HRemainMoney;//	money		剩余核销金额(界面不显示)		new
+        public double HCheckMoney;//	money	核销金额(界面不显示)		new
+        public double HCheckMoneyFor;//	money		核销金额本位币(界面不显示)		new
+        public double HRemainMoney;//	money		剩余核销金额(界面不显示)		new
         public Int64 HCheckStatus;//	int     (0未核销,1部分核销,2已核销)(界面不显示)  new未核销,1部分核销,2已核销)  new	界面上不需要显示据号
         public string HSSNum;//	varchar(500)				--结算号
-        public Single HDiscountRate;//	money			--整单折扣(可编辑)		--addnew
-        public Single HRelSumMoney;//	dec(18,8)		//折扣后金额(可编辑)		--addnew
-        public Single HSumMoneyBB;//  dec(18,8) 			//表头金额本位币(可编辑)	--addnew
-        public Single HRelSumMoneyBB;//	dec(18,8)		//折扣后金额本位币(可编辑)	--
+        public double HDiscountRate;//	money			--整单折扣(可编辑)		--addnew
+        public double HRelSumMoney;//	dec(18,8)		//折扣后金额(可编辑)		--addnew
+        public double HSumMoneyBB;//  dec(18,8) 			//表头金额本位币(可编辑)	--addnew
+        public double HRelSumMoneyBB;//	dec(18,8)		//折扣后金额本位币(可编辑)	--
 
         public Int64 HManagerID;    //int   销售主管
         public Int64 HOrgID;        //int   组织
diff --git "a/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBillSub.cs" "b/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBillSub.cs"
index f19bd8c..22eaee5 100644
--- "a/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBillSub.cs"
+++ "b/Model/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBillSub.cs"
@@ -29,13 +29,13 @@
         public Int64 HReceiveBillInterID;        //	int		--内码					--addnew
         public Int64 HReceiveBillEntryID;        //	int		--内码					--addnew
         public string HSourceDate;//	dateime   		源单日期				--addnew
-        public Single HSourceMoney;//	dec(18,8) 	源单金额				--addnew
-        public Single HSourceMoneyBB;//	dec(18,8) 	源单金额本位币				--addnew
-        public Single HReadyCheckMoney;// 	dec(18,8) 	已核销金额			--addnew
-        public Single HUnCheckMoney;//	dec(18,8) 	未核销金额				--addnew
-        public Single HCheckMoney;//	dec(18,8)	//本次核销金额				--addnew
-        public Single HCheckMoneyBB;//	dec(18,8)	//本次核销金额(不可编辑)		--addnew
-        public Single HInovceExRate;//		money	//当期汇率				--addnew
+        public double HSourceMoney;//	dec(18,8) 	源单金额				--addnew
+        public double HSourceMoneyBB;//	dec(18,8) 	源单金额本位币				--addnew
+        public double HReadyCheckMoney;// 	dec(18,8) 	已核销金额			--addnew
+        public double HUnCheckMoney;//	dec(18,8) 	未核销金额				--addnew
+        public double HCheckMoney;//	dec(18,8)	//本次核销金额				--addnew
+        public double HCheckMoneyBB;//	dec(18,8)	//本次核销金额(不可编辑)		--addnew
+        public double HInovceExRate;//		money	//当期汇率				--addnew
         public string HSourceRemark;//	varchar(500)	--源单备注				--addnew
     }
 }
diff --git "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillMain.cs" "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillMain.cs"
index 441374c..660bd3d 100644
--- "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillMain.cs"
+++ "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillMain.cs"
@@ -61,7 +61,9 @@
         public Int64 HCORRESPONDORGID;
         public string HBUSINESSTYPE;
 
-        
-        
+        public int HProjectID;  //int --工程项目
+        public int HWHID;   //int --仓库  
+
+
     }
 }
diff --git "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillSub.cs" "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillSub.cs"
index a475050..85ecdbc 100644
--- "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillSub.cs"
+++ "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOrderBillSub.cs"
@@ -27,6 +27,7 @@
         public string HCusModel; //客户规格型号
         public string HCusMaterName;  //客户物料名称
 
+
         public Int64 HInterID;
         public Int64 HEntryID;
 
diff --git "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBackBillMain.cs" "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBackBillMain.cs"
index 4a49240..0ab09eb 100644
--- "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBackBillMain.cs"
+++ "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBackBillMain.cs"
@@ -17,5 +17,6 @@
         public Int64 HWHID;//   
         public string HExplanation;//  varchar(200)     		--摘要 
         public string HInnerBillNo;//  varchar(50)     		--内部单据号
+        public Int64 HProjectID;    //工程项目
     }
 }
diff --git "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBillMain.cs" "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBillMain.cs"
index e9e7461..2a5870e 100644
--- "a/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBillMain.cs"
+++ "b/Model/\351\224\200\345\224\256\347\256\241\347\220\206/ClsXs_SeOutStockBillMain.cs"
@@ -15,6 +15,7 @@
         public Int64 HCurID;//    int      			--币别 (Gy_Currency)
         public Single HExRate;//    money      			--汇率  (选择完币别带出)
         public Int64 HWHID;//  仓库
+        public Int64 HProjectID;        //   g工程项目
         public string HExplanation;//  varchar(200)     		--摘要 
         public string HInnerBillNo;//  varchar(50)     		--内部单据号
         public Int64 HConveyTypeID;//	运输方式
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index a474da8..20edc61 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -94,6 +94,7 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
@@ -693,6 +694,12 @@
     <Compile Include="鏉$爜鎵撳嵃\Frm_Split.Designer.cs">
       <DependentUpon>Frm_Split.cs</DependentUpon>
     </Compile>
+    <Compile Include="鏉$爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鏉$爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New.designer.cs">
+      <DependentUpon>Gy_BarCodeBill_automaticallyByPLC_New.cs</DependentUpon>
+    </Compile>
     <Compile Include="鏉$爜鎵撳嵃\Kf_AGVRequestBill_FastList.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1138,6 +1145,10 @@
     <EmbeddedResource Include="鏉$爜鎵撳嵃\Frm_Split.resx">
       <DependentUpon>Frm_Split.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="鏉$爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New.resx">
+      <DependentUpon>Gy_BarCodeBill_automaticallyByPLC_New.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="鏉$爜鎵撳嵃\Kf_AGVRequestBill_FastList.resx">
       <DependentUpon>Kf_AGVRequestBill_FastList.cs</DependentUpon>
       <SubType>Designer</SubType>
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
new file mode 100644
index 0000000..b8c688c
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
@@ -0,0 +1,4211 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using gregn6Lib;
+using Pub_Class;
+using System.Threading;
+using System.Net.Sockets;
+using System.Net;
+using System.Drawing.Printing;
+using System.IO;
+using System.Management;
+
+namespace WarM
+{
+    public partial class Gy_BarCodeBill_automaticallyByPLC_New : Form
+    {
+        public Gy_BarCodeBill_automaticallyByPLC_New()
+        {
+            InitializeComponent();
+        }
+        //瀹氫箟
+        public const Int16 HTagCol = 0;
+        public const Int16 HSnoCol = 1;
+        public const Int16 HMainIDCol = 2;
+        public const Int16 HSubIDCol = 3;
+        public const Int16 HBillNoCol = 4;
+        public const Int16 HBillTypeCol = 5;
+        public const Int16 HMaterIDCol = 6;
+        public const Int16 HMaterNumberCol = 7;
+        public const Int16 HMaterNameCol = 8;
+        public const Int16 HPinfanCol = 9;//
+        public const Int16 HMaterModelCol = 10;//
+        public const Int16 HModelCol = 11;
+        public const Int16 HAuxPropIDCol = 12;
+        public const Int16 HAuxPropNumberCol = 13;
+        public const Int16 HAuxPropNameCol = 14;
+        public const Int16 HUnitIDCol = 15;
+        public const Int16 HUnitNumberCol = 16;
+        public const Int16 HUnitNameCol = 17;
+        public const Int16 HBarCodeTypeCol = 18;
+        public const Int16 HBatchManagerCol = 19;
+        public const Int16 HBatchNoCol = 20;
+        public const Int16 HGiveAwayFlagCol = 21;
+        public const Int16 HQtyCol = 22;
+        public const Int16 HMinQtyCol = 23;
+        public const Int16 HBQtyCol = 24;
+        public const Int16 HPackQtyCol = 25;
+        public const Int16 HProduceDateCol = 26;
+        public const Int16 HExpiryDateCol = 27;
+        public const Int16 HDeptIDCol = 28;
+        public const Int16 HDeptNumberCol = 29;
+        public const Int16 HDeptNameCol = 30;
+        public const Int16 HSourceIDCol = 31;
+        public const Int16 HSourceNumberCol = 32;
+        public const Int16 HSourceNameCol = 33;
+        public const Int16 HDateCol = 34;
+        public const Int16 HEndDateCol = 35;
+        public const Int16 HSupIDCol = 36;
+        public const Int16 HSupNumberCol = 37;
+        public const Int16 HSupNameCol = 38;
+        public const Int16 HCusIDCol = 39;
+        public const Int16 HCusNumberCol = 40;
+        public const Int16 HCusNameCol = 41;
+        public const Int16 HCusTypeCol = 42;
+        public const Int16 HSourceInterIDCol = 43;
+        public const Int16 HSourceEntryIDCol = 44;
+        public const Int16 HSourceBillNoCol = 45;
+        public const Int16 HSourceBillTypeCol = 46;
+        public const Int16 HInstructIDCol = 47;
+        public const Int16 HInstructNoCol = 48;
+        public const Int16 HSeOrderBillIDCol = 49;
+        public const Int16 HSeOrderBillNoCol = 50;
+        public const Int16 HSeOrderSEQCol = 51;
+        public const Int16 HWhIDCol = 52;
+        public const Int16 HWhNumberCol = 53;
+        public const Int16 HWhNameCol = 54;
+        public const Int16 HSPIDCol = 55;
+        public const Int16 HSPNumberCol = 56;
+        public const Int16 HSPNameCol = 57;
+        public const Int16 HinitQtyCol = 58;
+        public const Int16 HRemarkCol = 59;
+        public const Int16 HPinfanBarCodeCol = 60;
+        public const Int16 HMTONoCol = 61;
+        public const Int16 HShowDateCol = 62;
+        public const Int16 HInnerBillNoCol = 63;
+        public const Int16 HMakerCol = 64;
+        public const Int16 HISKFPERIODCol = 65;
+        public const Int16 HEXPUNITCol = 66;
+        public const Int16 HEXPPERIODCol = 67;
+
+        public Int16 HSelectCol = 0;
+        public Int16 HSno2Col = 1;
+        public Int16 HTMCol = 2;
+        public Int16 HBarCodeType2Col = 3;
+        public Int16 HMaterID2Col = 4;
+        public Int16 HMaterNumber2Col = 5;
+        public Int16 HMaterName2Col = 6;
+        public Int16 HPinfan2Col = 7;
+        public Int16 HMaterModel2Col = 8;
+        public Int16 HModel2Col = 9;
+        public Int16 HAuxPropID2Col = 10;
+        public Int16 HAuxPropNumber2Col = 11;
+        public Int16 HAuxPropName2Col = 12;
+        public Int16 HBatchNo2Col = 13;
+        public Int16 HGiveAwayFlag2Col = 14;
+        public Int16 HUnitID2Col = 15;
+        public Int16 HUnitNumber2Col = 16;
+        public Int16 HUnitName2Col = 17;
+        public Int16 HQty2Col = 18;
+        public Int16 HWeiCol = 19;
+        public Int16 HPrintCol = 20;
+        public Int16 HDeptID2Col = 21;
+        public Int16 HDeptNumber2Col = 22;
+        public Int16 HDeptName2Col = 23;
+        public Int16 HSourceID2Col = 24;
+        public Int16 HSourceNumber2Col = 25;
+        public Int16 HSourceName2Col = 26;
+        public Int16 HDate2Col = 27;
+        public Int16 HEndDate2Col = 28;
+        public Int16 HBarcodeNoCol = 29;
+        public Int16 HBarcodeQtysCol = 30;
+        public Int16 HSupID2Col = 31;
+        public Int16 HSupNumber2Col = 32;
+        public Int16 HSupName2Col = 33;
+        public Int16 HCusID2Col = 34;
+        public Int16 HCusNumber2Col = 35;
+        public Int16 HCusName2Col = 36;
+        public Int16 HCusType2Col = 37;
+        public Int16 HSourceInterID2Col = 38;
+        public Int16 HSourceEntryID2Col = 39;
+        public Int16 HSourceBillNo2Col = 40;
+        public Int16 HSourceBillType2Col = 41;
+        public Int16 HInstructID2Col = 42;
+        public Int16 HInstructNo2Col = 43;
+        public Int16 HSeOrderBillID2Col = 44;
+        public Int16 HSeOrderBillNo2Col = 45;
+        public Int16 HSeOrderSEQ2Col = 46;
+        public Int16 HWhID2Col = 47;
+        public Int16 HWhNumber2Col = 48;
+        public Int16 HWhName2Col = 49;
+        public Int16 HSPID2Col = 50;
+        public Int16 HSPNumber2Col = 51;
+        public Int16 HSPName2Col = 52;
+        public Int16 HRemark2Col = 53;
+        public Int16 HPinfanBarCode2Col = 54;
+        public Int16 HMTONo2Col = 55;
+        public Int16 HShowDate2Col = 56;
+        public Int16 HInnerBillNo2Col = 57;
+        public Int16 HMaker2Col = 58;
+        public Int16 HEntryID2Col = 59;
+        public Int16 HProduceDate2Col = 60;
+        public Int16 HExpiryDate2Col = 61;
+        public Int16 HISKFPERIOD2Col = 62;
+        public Int16 HEXPUNIT2Col = 63;
+        public Int16 HEXPPERIOD2Col = 64;
+        //
+        public string ModName = "85";
+        public string ModCaption = "鏉$爜鐢熸垚";
+        public const string ModRightName = "Gy_BarCodeBill";
+        public const string ModRightNameSourceQty = ModRightName + "_SourceQty"; //瓒呮簮鍗曟暟閲忔帶鍒�
+        public bool BillChange;   //
+
+        public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+        public DBUtility.ClsXt_BaseBill BaseBill;
+        //public WarM.WMSWeb.WebService1 oWeb = new WarM.WMSWeb.WebService1();
+        public Int64 KeyID;
+        public bool grdStatus;
+        //public DAL.ClsGy_BarCodeBill BillNew =new  DAL.ClsGy_BarCodeBill();
+        //public DAL.ClsGy_BarCodeBill BillOld = new DAL.ClsGy_BarCodeBill();
+        public DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
+        ClsGridViewSum oSumGrid = new ClsGridViewSum();
+        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+        public int selectRow = 0;
+        public int selectRow2 = 0;
+        public Int64 HInterID = 0;      //鍐呯爜
+        public Int64 HOrgID = -1;
+        public string HOrgNumber = "";
+        public string ERPMode = ""; //ERP妯″紡锛圵ISE銆丆LOUD锛�
+        public string CampanyName = ""; //瀹㈡埛瀹氬埗鍖栧悕绉�
+        public string SourceQtyCtl = ""; //瓒呮簮鍗曟暟閲忔帶鍒�
+        public long PrintQty = 0;               //鍏佽鏉$爜鎵撳嵃娆℃暟
+        public string PrintQtyCtl = "";         //鏉$爜鎵撳嵃娆℃暟鎺у埗
+        public string UpdatePrintQtyCtl = "";   //鏉$爜鎵撳嵃娆℃暟鏇存柊
+                                                //-------------------------------------------------------------------------
+
+        //
+        //Socket閫氳
+        Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+
+        #region 鍥哄畾浠g爜
+
+        //娓呯┖鐣岄潰
+        public void Sub_ClearBill()
+        {
+            ////琛ㄤ綋娓呯┖
+            //grdMain.Rows.Clear();
+            //grdSub.Rows.Clear();
+            cmbHBarCodeType.Items.Clear();
+            cmbSourceBillType.Items.Clear();
+
+            //鏍规嵁绯荤粺鍙傛暟鑾峰彇瀵瑰簲鐨勬潯鐮佺被鍨嬶紙澶忓疂鐢靛櫒銆佸崥鏃�   浠ュ悗浣跨敤鏉$爜瑙勫垯琛級
+            ClsXt_SystemParameter oClsXt_SystemParameter = new ClsXt_SystemParameter();
+            string sCapName = oClsXt_SystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
+            if (sCapName == "澶忓疂鐢靛櫒")
+            {
+                cmbHBarCodeType.Items.Add("鍐呴攢鏈烘潯鐮�");
+                cmbHBarCodeType.Items.Add("澶栭攢鏈烘潯鐮�");
+                cmbHBarCodeType.Items.Add("鍗婃垚鍝佹潯鐮�");
+            }
+            else if (sCapName == "鍗氭棩绉戞妧")
+            {
+                cmbHBarCodeType.Items.Add("浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�");
+                cmbHBarCodeType.Items.Add("浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�");
+                cmbHBarCodeType.Items.Add("浠櫒鎴愬搧鏉$爜瑙勫垯");
+                cmbHBarCodeType.Items.Add("璇曞墏鎴愬搧鏉$爜瑙勫垯");
+            }
+            else if (sCapName == "涓帶")
+            {
+                cmbHBarCodeType.Items.Add("鍞竴鏉$爜");
+            }
+            else
+            {
+                //
+                cmbHBarCodeType.Items.Add("鍞竴鏉$爜");
+                cmbHBarCodeType.Items.Add("鍝佺鏉$爜");
+                cmbHBarCodeType.Items.Add("鎵规鏉$爜");
+                //cmbHBarCodeType.Items.Add("鎵樼洏鏉$爜");
+            }
+
+            //婧愬崟绫诲瀷
+            if (sCapName == "涓帶")
+            {
+                cmbSourceBillType.Items.Add("鐢熶骇姹囨姤鍗�");
+                cmbSourceBillType.Items.Add("鏀舵枡閫氱煡鍗�");
+            }
+            else
+            {
+                cmbSourceBillType.Items.Add("鐢熶骇璁㈠崟");
+                cmbSourceBillType.Items.Add("鐢熶骇姹囨姤鍗�");
+                cmbSourceBillType.Items.Add("閲囪喘璁㈠崟");
+                cmbSourceBillType.Items.Add("鏀舵枡閫氱煡鍗�");
+                cmbSourceBillType.Items.Add("濮斿璁㈠崟");
+                cmbSourceBillType.Items.Add("宸ュ簭姹囨姤鍗�");
+                cmbSourceBillType.Items.Add("宸ュ簭娴佽浆鍗�");
+                cmbSourceBillType.Items.Add("閫�璐ч�氱煡鍗�");
+                cmbSourceBillType.Items.Add("鍏朵粬鍏ュ簱鍗�");
+                cmbSourceBillType.Items.Add("鐩存帴璋冩嫧鍗�");
+                cmbSourceBillType.Items.Add("閲囪喘閫�鏂欏崟");
+                cmbSourceBillType.Items.Add("鐢熶骇閫�鏂欏崟");
+                cmbSourceBillType.Items.Add("缁勮鎷嗗嵏鍗�");
+            }
+            //
+            DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
+            //缁勭粐涓嬫媺鍒楄〃
+            DataSet Ds1 = oCn.RunProcReturn("select * from Xt_ORGANIZATIONS with(nolock) where HItemID=" + ClsPub.HOrgID, "Xt_ORGANIZATIONS", ref DBUtility.ClsPub.sExeReturnInfo);
+            if (Ds1.Tables[0].Rows.Count != 0)
+            {
+                cmbHOrgID.Text = DBUtility.ClsPub.isStrNull(Ds1.Tables[0].Rows[0]["HName"]);
+            }
+
+            //鎵撳嵃鏈轰笅鎷夊垪琛�
+            PrintDocument fPrintDocument = new PrintDocument();
+            string defaultPrinter = fPrintDocument.PrinterSettings.PrinterName;
+            comboBox_PrinterParams.Items.Clear();
+            for (int i = 0; i < PrinterSettings.InstalledPrinters.Count; i++)
+            {
+                string tmp = PrinterSettings.InstalledPrinters[i];
+                if (tmp == defaultPrinter)
+                {
+                    tmp = tmp + "(榛樿)";
+                }
+                comboBox_PrinterParams.Items.Add(tmp);
+            }
+
+
+            //浜х嚎涓嬫媺鍒楄〃
+            DataSet DsSource = oCn.RunProcReturn("select * from Gy_Source where HUSEORGID =" + ClsPub.HOrgID, "Gy_Source");
+            if (DsSource != null)
+            {
+                comboBox_SourceNameParams.Items.Clear();
+                for (int i = 0; i < DsSource.Tables[0].Rows.Count; i++)
+                {
+                    comboBox_SourceNameParams.Items.Add(DsSource.Tables[0].Rows[i]["HName"]);
+                }
+            }
+
+
+            //璇诲彇閰嶇疆鏂囦欢璁剧疆閰嶇疆
+            readParams();
+            //璁剧疆宸ュ崟淇℃伅
+            textBox_SourceName.Text = comboBox_SourceNameParams.Text;
+
+            txtHMaker.Text = ClsPub.CurUserName;
+            txtHMakeDate.Text = "";
+            txtHChecker.Text = "";
+            txtHCheckDate.Text = "";
+            txtHCloseMan.Text = "";
+            txtHCloseDate.Text = "";
+            txtHDeleteMan.Text = "";
+            txtHDeleteDate.Text = "";
+            txtHUpDater.Text = "";
+            txtHUpDateDate.Text = "";
+            initGrid();
+            grdList.DataSource = null;
+            grdBillBarCodeList.DataSource = null;
+
+            tabControl1.SelectedIndex = 3;
+        }
+
+        //淇濆瓨鍒楀
+        private void bclk_Click(object sender, EventArgs e)
+        {
+            DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+            DBUtility.Xt_BaseBillFun.SaveGrid(grdSub, this.Name + "grdSub");
+            DBUtility.Xt_BaseBillFun.SaveGrid(grdList, this.Name + "grdList");
+        }
+
+        //榛樿鍒楀
+        private void mrlk_Click(object sender, EventArgs e)
+        {
+            DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+            DBUtility.Xt_BaseBillFun.DefaultGridView(grdSub, this.Name + "grdSub");
+            DBUtility.Xt_BaseBillFun.DefaultGridView(grdList, this.Name + "grdList");
+        }
+
+        //澧炶鎸夐挳  
+        private void AddRow_Click(object sender, EventArgs e)
+        {
+            DBUtility.Xt_BaseBillFun.AddRow(oSumGrid);
+        }
+
+        //鍒犺鎸夌航  
+        private void DelRow_Click(object sender, EventArgs e)
+        {
+            DBUtility.Xt_BaseBillFun.DelRow(oSumGrid);
+        }
+
+        //淇濆瓨鎸夐挳
+        private void bc_Click(object sender, EventArgs e)
+        {
+            this.Sub_SaveBill();
+            Display();
+
+            Display4();
+        }
+
+        //閲嶇疆鎸夌航
+        private void cz_Click(object sender, EventArgs e)
+        {
+            if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew || BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
+            {
+                if (MessageBox.Show("纭畾瑕佹竻绌哄綋鍓嶇晫闈俊鎭紝閲嶇疆鐣岄潰锛�", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
+                {
+                    this.Sub_AddBill();
+                }
+            }
+            grdMain.Columns[HBillNoCol].ReadOnly = false;
+            tabControl1.SelectedIndex = 3;
+        }
+
+        //鏂板鍗曟嵁
+        private void Sub_AddBill()
+        {
+            this.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+            this.Sub_OperStatus();//璁剧疆TOOLBAR
+            this.Sub_ClearBill();//娓呯┖鐣岄潰
+        }
+
+        //閫�鍑烘寜閽�
+        private void tc_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        //绂诲紑鍗曞厓鏍�
+        private void grdMain_LeaveCell(object sender, EventArgs e)
+        {
+            oSumGrid.LeaveCell();
+        }
+
+        //缃戞牸鍗曞厓鏍煎彉鍖栦簨浠�
+        private void grdMain_RowColChange(object sender, EventArgs e)
+        {
+            if (!grdStatus)
+            {
+                return;
+            }
+            DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+            //
+            //if (oSumGrid.Changelock)
+            //    return;
+            //if(oSumGrid.EditStatus)
+            //{
+            if (!CheckGridRow(oSumGrid.OldCell.Row))
+                return;
+            //}
+        }
+
+        private void Gy_BarCodeBill_Paint(object sender, PaintEventArgs e)//鐢荤嚎
+        {
+            Graphics g = this.panel2.CreateGraphics();
+            Pen p = new Pen(Color.Gray);
+            p.Width = 1;
+            g.DrawLine(p, new Point(txtHMaker.Left, txtHMaker.Top + txtHMaker.Height), new Point(txtHMaker.Left + txtHMaker.Width, txtHMaker.Top + txtHMaker.Height));
+            g.DrawLine(p, new Point(txtHMakeDate.Left, txtHMakeDate.Top + txtHMakeDate.Height), new Point(txtHMakeDate.Left + txtHMakeDate.Width, txtHMakeDate.Top + txtHMakeDate.Height));
+            //
+            g.DrawLine(p, new Point(txtHChecker.Left, txtHChecker.Top + txtHChecker.Height), new Point(txtHChecker.Left + txtHChecker.Width, txtHChecker.Top + txtHChecker.Height));
+            g.DrawLine(p, new Point(txtHCheckDate.Left, txtHCheckDate.Top + txtHCheckDate.Height), new Point(txtHCheckDate.Left + txtHCheckDate.Width, txtHCheckDate.Top + txtHCheckDate.Height));
+            //
+            g.DrawLine(p, new Point(txtHCloseMan.Left, txtHCloseMan.Top + txtHCloseMan.Height), new Point(txtHCloseMan.Left + txtHCloseMan.Width, txtHCloseMan.Top + txtHCloseMan.Height));
+            g.DrawLine(p, new Point(txtHCloseDate.Left, txtHCloseDate.Top + txtHCloseDate.Height), new Point(txtHCloseDate.Left + txtHCloseDate.Width, txtHCloseDate.Top + txtHCloseDate.Height));
+            //
+            g.DrawLine(p, new Point(this.txtHDeleteMan.Left, txtHDeleteMan.Top + txtHDeleteMan.Height), new Point(txtHDeleteMan.Left + txtHDeleteMan.Width, txtHDeleteMan.Top + txtHDeleteMan.Height));
+            g.DrawLine(p, new Point(txtHDeleteDate.Left, txtHDeleteDate.Top + txtHDeleteDate.Height), new Point(txtHDeleteDate.Left + txtHDeleteDate.Width, txtHDeleteDate.Top + txtHDeleteDate.Height));
+            //
+            g.DrawLine(p, new Point(this.txtHUpDater.Left, txtHUpDater.Top + txtHUpDater.Height), new Point(txtHUpDater.Left + txtHUpDater.Width, txtHUpDater.Top + txtHUpDater.Height));
+            g.DrawLine(p, new Point(txtHUpDateDate.Left, txtHUpDateDate.Top + txtHUpDateDate.Height), new Point(txtHUpDateDate.Left + txtHUpDateDate.Width, txtHUpDateDate.Top + txtHUpDateDate.Height));
+            //鎺т欢浣嶇疆璁剧疆
+
+        }
+
+        //鎺т欢浣嶇疆
+        private void Sub_ControlLocation()
+        {
+            //gbUp.Width = P1.Width - 20;
+            //gbUp.Left = 10;
+            //gbUp.Height = P1.Height - 35;
+            //gbUp.Top = 30;
+        }
+
+        //绐椾綋鍔犺浇
+        private void Gy_BarCodeBill_Load(object sender, EventArgs e)
+        {
+            //鎵撳嵃鍒濆鍖�   
+            oSumGrid.NoCol = HSnoCol;
+            oSumGrid.ogrdMain = grdMain;
+            oSumGrid.oGridsum = grdSum;
+            this.Text = ModCaption;
+            this.lblCaption.Text = ModCaption;
+            //鍔犺浇缁勭粐淇℃伅
+            Sub_AddOrdList();
+            //鍔犺浇宸ュ巶浠g爜淇℃伅
+            Sub_AddWorksNumberList();
+        }
+
+        //鍔犺浇缁勭粐淇℃伅
+        private void Sub_AddOrdList()
+        {
+            DataSet ds;
+            DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+            ds = oClsGy_ORGANIZATIONS_View.GetList();
+            if (ds == null || ds.Tables[0].Rows.Count == 0)
+            {
+                MessageBox.Show("鑾峰彇缁勭粐澶辫触");
+                return;
+            }
+            cmbHOrgID.Items.Clear();
+            for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+            {
+                cmbHOrgID.Items.Add(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HName"]));
+            }
+        }
+
+        //鍔犺浇宸ュ巶浠g爜淇℃伅
+        private void Sub_AddWorksNumberList()
+        {
+            //鑾峰彇绯荤粺鍙傛暟
+            ClsXt_SystemParameter oSystemParameter = new ClsXt_SystemParameter();
+            if (oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo) == false)
+            {
+                MessageBox.Show("鑾峰彇绯荤粺鍙傛暟澶辫触锛佸師鍥�:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
+                return;
+            }
+            else
+            {
+                ERPMode = oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode;
+                CampanyName = oSystemParameter.omodel.WMS_CampanyName;
+                SourceQtyCtl = oSystemParameter.omodel.BarCode_SourceQtyCtl;
+                PrintQty = oSystemParameter.omodel.BarCode_PrintQty;
+                PrintQtyCtl = oSystemParameter.omodel.BarCode_PrintQtyCtl;
+                UpdatePrintQtyCtl = oSystemParameter.omodel.BarCode_UpdatePrintQtyCtl;
+            }
+            //绯荤粺鍙傛暟锛屾湁婧愬崟鐢熸垚鏉$爜锛岀敓鎴愭潯鐮佹暟閲忓彲鍚﹁秴婧愬崟鏁伴噺鎺у埗锛圢涓轰笉鍙秴婧愬崟鏁伴噺锛�
+            if (SourceQtyCtl == "N")
+            {
+                //绯荤粺鍙傛暟涓轰笉鍙秴婧愬崟鏁伴噺鏃讹紝鍐嶆鍒ゆ柇鐢ㄦ埛鏉冮檺鏄惁鍙秴婧愬崟鏁伴噺
+                //鍒ゆ柇鏉冮檺
+                if (ClsPub.Security_Log(ModRightNameSourceQty, 3, false, ClsPub.CurUserName))
+                {
+                    SourceQtyCtl = "Y";
+                }
+            }
+
+            cmbHWorksNumber.Items.Clear();
+            if (CampanyName == "椋為緳") //绯荤粺鍙傛暟  瀹㈡埛瀹氬埗鍖栧悕绉�
+            {
+                cmbHWorksNumber.Items.Add("ZL");
+                cmbHWorksNumber.Items.Add("ST");
+                cmbHWorksNumber.Items.Add("SQ");
+                cmbHWorksNumber.Items.Add("MQ");
+            }
+            else
+            {
+                cmbHWorksNumber.Items.Add("");
+            }
+        }
+
+        //绐椾綋灏哄鍙樺寲鏃�
+        private void Gy_BarCodeBill_Resize(object sender, EventArgs e)
+        {
+            //Sub_ControlLocation();
+        }
+
+        //鏍规嵁缂栬緫鐘舵�� 璁剧疆 鎺т欢鏄惁鍏佽褰曞叆    
+        private void Sub_LrtextStatus(bool TextEnabled)
+        {
+            if (TextEnabled == true)
+            {
+                //鎺т欢鍏ㄩ儴鏈夋晥
+                gbUp.Enabled = true;
+                grdMain.BackColor = ClsPub.EditColor;
+            }
+            else
+            {   //鎺т欢鍏ㄩ儴鏃犳晥
+                gbUp.Enabled = false;
+                grdMain.BackColor = ClsPub.ViewColor;
+            }
+        }
+
+        //timer
+        private void timer1_Tick(object sender, EventArgs e)
+        {
+            timer1.Enabled = false;
+            Sub_ControlLocation();
+            if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_View)
+            {
+                //this.Sub_ShowBill();
+            }
+            else
+            {
+                this.Sub_AddBill();
+            }
+            DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+        }
+
+        //绐椾綋鍗歌浇
+        private void Gy_BarCodeBill_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+            DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+        }
+
+        //TOOLBAR鐘舵��  鎸夐挳鏄惁鐏板害
+        public void Sub_OperStatus()
+        {
+            switch (BillStatus)
+            {
+                case DBUtility.ClsPub.Enum_BillStatus.BillStatus_View:
+                    //娴忚鐘舵��
+                    yl.Enabled = true;
+                    AddRow.Enabled = false;
+                    DelRow.Enabled = false;
+                    bc.Enabled = false;
+                    cz.Enabled = false;
+                    tc.Enabled = true;
+                    //鏈鏍�
+                    if (txtHChecker.Text.Trim() == "")
+                    {
+                        //鏈鏍�
+                        pic1.Visible = false;
+                        pic1.Image = null;
+                        //
+                    }
+                    else if (txtHCloseMan.Text.Trim() == "" && txtHChecker.Text.Trim() != "")//瀹℃牳鏈叧闂�
+                    {
+                        //
+                        pic1.Visible = true;
+                        pic1.Image = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/Pic/Checked.jpg");
+                        //
+                    }
+                    else//宸插叧闂�
+                    {
+                        //
+                        pic1.Visible = true;
+                        pic1.Image = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/Pic/Closed.jpg");
+                        //
+                    }
+                    if (txtHDeleteMan.Text.Trim() == "")
+                    {
+                    }
+                    else //宸蹭綔搴�
+                    {
+                        AddRow.Enabled = false;
+                        DelRow.Enabled = false;
+                        bc.Enabled = false;
+                        cz.Enabled = false;
+                        //
+                        pic1.Visible = true;
+                        pic1.Image = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/Pic/Deleted.jpg");
+                        //
+                    }
+                    Sub_LrtextStatus(false);
+                    grdStatus = false;
+                    break;
+                case DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew:
+                    //鏂板鐘舵��
+                    yl.Enabled = true;
+                    AddRow.Enabled = true;
+                    DelRow.Enabled = true;
+                    bc.Enabled = true;
+                    cz.Enabled = true;
+                    tc.Enabled = true;
+                    Sub_LrtextStatus(true);
+                    grdStatus = true;
+                    //鏈鏍�
+                    pic1.Visible = false;
+                    pic1.Image = null;
+                    //
+                    break;
+                case DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify:
+                    //淇敼鐘舵��
+                    yl.Enabled = true;
+                    AddRow.Enabled = true;
+                    DelRow.Enabled = true;
+                    bc.Enabled = true;
+                    cz.Enabled = true;
+                    tc.Enabled = true;
+                    Sub_LrtextStatus(true);
+                    grdStatus = true;
+                    //鏈鏍�
+                    pic1.Visible = false;
+                    pic1.Image = null;
+                    //
+                    break;
+            }
+
+        }
+
+        #endregion 
+
+        #region  璇诲啓绫�
+
+        //鍗曟嵁瀹屾暣鎬у垽鏂�          鏈畬鎴�
+        private bool Sub_AllowSave()
+        {
+            //鏄庣粏琛ㄦ槸鍚︿负闆惰
+            bool b = false;
+            for (int i = 0; i < grdMain.RowCount; i++)
+            {
+                if (!IsNullRow(i))
+                {
+                    b = true;
+                    break;
+                }
+            }
+            if (b == false)
+            {
+                MessageBox.Show("鏄庣粏琛屼笉瀛樺湪锛�", "鎻愮ず");
+                return false;
+            }
+
+            string sHRemark = "";
+            for (int j = 0; j < grdMain.Rows.Count; j++)
+            {
+                long HSno = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value);                  // 搴忓彿
+                string HBarCodeType = cmbHBarCodeType.Text;                                                  // 鏉$爜绫诲瀷
+                string HSourceBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value); // 婧愬崟鍗曞彿
+                long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);          // 鐗╂枡鍐呯爜
+                string HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);     // 鎵瑰彿
+                long HAuxPropID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value);      // 杈呭姪灞炴�D
+                double HSourceQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HinitQtyCol].Value);     // 婧愬崟鏁伴噺
+                double HQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value);               // 鏁伴噺
+                double HMinQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);          // 鏈�灏忓寘瑁呮暟
+
+                if (HMaterID != 0)
+                {
+                    DataSet oDsCheck = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_AddCheck " + HSno.ToString() + ",'" + HBarCodeType + "','" + HSourceBillNo + "'," + HMaterID.ToString() + ",'" + HBatchNo + "'," + HAuxPropID.ToString() + "," + HSourceQty.ToString() + "," + HQty.ToString() + "," + HMinQty.ToString() + "," + HOrgID.ToString() + ",'" + SourceQtyCtl + "'", "h_p_Gy_BarCodeBill_AddCheck");
+                    //
+                    if (oDsCheck == null && oDsCheck.Tables[0].Rows.Count == 0)
+                    {
+                        MessageBox.Show("鏉$爜鐢熸垚瀹屾暣鎬у垽鏂敊璇紒");
+                        return false;
+                    }
+                    else if (DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0][0]) == "1")
+                    {
+                        sHRemark = sHRemark + DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HRemark"]);
+                    }
+                    else if (DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HExpiryDateCol].Value) == "")
+                    {
+                        if (DBUtility.ClsPub.isBool(oDsCheck.Tables[0].Rows[0]["HISKFPERIOD"]))
+                        {
+                            DateTime HProduceDate;  //鐢熶骇鏃ユ湡
+                            string HEXPUNIT;        //淇濊川鏈熷崟浣�
+                            int HEXPPERIOD;         //淇濊川鏈�
+
+                            HProduceDate = dtpHDate.Value;
+                            HEXPUNIT = DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HEXPUNIT"]);
+                            HEXPPERIOD = DBUtility.ClsPub.isInt(oDsCheck.Tables[0].Rows[0]["HEXPPERIOD"]);
+
+                            grdMain.Rows[j].Cells[HISKFPERIODCol].Value = 1;
+                            grdMain.Rows[j].Cells[HEXPUNITCol].Value = HEXPUNIT;
+                            grdMain.Rows[j].Cells[HEXPPERIODCol].Value = HEXPPERIOD.ToString();
+                            grdMain.Rows[j].Cells[HProduceDateCol].Value = HProduceDate.ToShortDateString();
+
+                            if (HEXPUNIT == "Y")
+                            {
+                                grdMain.Rows[j].Cells[HExpiryDateCol].Value = HProduceDate.AddYears(HEXPPERIOD).ToShortDateString();
+                            }
+                            else if (HEXPUNIT == "M")
+                            {
+                                grdMain.Rows[j].Cells[HExpiryDateCol].Value = HProduceDate.AddMonths(HEXPPERIOD).ToShortDateString();
+                            }
+                            else
+                            {
+                                grdMain.Rows[j].Cells[HExpiryDateCol].Value = HProduceDate.AddDays(HEXPPERIOD).ToShortDateString();
+                            }
+                        }
+                        else
+                        {
+                            grdMain.Rows[j].Cells[HISKFPERIODCol].Value = 0;
+                            grdMain.Rows[j].Cells[HEXPUNITCol].Value = "";
+                            grdMain.Rows[j].Cells[HEXPPERIODCol].Value = 0;
+                            grdMain.Rows[j].Cells[HProduceDateCol].Value = "";
+                            grdMain.Rows[j].Cells[HExpiryDateCol].Value = "";
+                        }
+                    }
+                }
+            }
+            if (sHRemark != "")
+            {
+                MessageBox.Show(sHRemark);
+                return false;
+            }
+            return true;
+        }
+
+        //淇濆瓨鍗曟嵁
+        private bool Sub_SaveBill()
+        {
+            //鑾峰彇鍐呯爜
+            HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+            ////鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+            //if (BaseBill.IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
+            //{
+            //    HInterID = DBUtility.ClsPub.CreateBillID(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+            //}
+            // 
+            DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+            HOrgNumber = "";
+            if (oClsGy_ORGANIZATIONS_View.GetInfoByName(cmbHOrgID.Text))
+            {
+                HOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID;
+                HOrgNumber = DBUtility.ClsPub.isStrNull(oClsGy_ORGANIZATIONS_View.omodel.HNumber);
+            }
+            if (HOrgID == -1)
+            {
+                MessageBox.Show("閫夋嫨缁勭粐鏈夐敊璇紒");
+                return false;
+            }
+            lblCaption.Focus();
+            if (!Sub_AllowSave())//鍗曟嵁瀹屾暣鎬у垽鏂�
+            {
+                return false;
+            }
+            //bc.Enabled = false;
+            if (cmbHBarCodeType.Text == "浠櫒鎴愬搧鏉$爜瑙勫垯")
+            {
+                SaveBarCode_bori(); //鐗╂枡缂栫爜+搴忓垪鍙�+鐢熶骇鏃ユ湡
+            }
+            else
+            {
+                SaveBarCode();
+            }
+            return true;
+        }
+
+        //鐢熸垚鏉$爜
+        private void SaveBarCode()
+        {
+            grdSub.Rows.Clear();
+            int LSHlen = 6;             //娴佹按鍙烽暱搴�
+            int SumLen = 10;            //鎬婚暱搴�
+            string TM = "";             //鏉$爜
+            string HNumber = "";        //鐗╂枡鍐呯爜
+            string HMaterNumber = "";   //鐗╂枡浠g爜
+            double HSumQty = 0;         //浜у搧鏁伴噺
+            double HMinQty = 0;         //鏈�灏忓寘瑁呮暟
+            Int64 HBQty = 0;              //绠辨暟
+            double HQty = 0;            //鏁伴噺
+            string WeiShu = "";         //灏炬暟
+            Int64 LSH = 0;                //娴佹按鍙�
+            string LSH2 = "";           //娴佹按鍙疯浆鎹㈡垚瀛楃
+            string sDate = "";          //鏃ユ湡
+            string sYear = "";          //骞�
+            string sPeriod = "";        //鏈�
+            string sDay = "";           //鏃�
+            string HBatchNo = "";       //鎵规
+            string HYasuoji = "";       //鍘嬬缉鏈�
+            string HModelName = "";       //鏈哄瀷
+            string HICMOBillNo = "";       //婧愬崟鍙�
+            string HBarCodeBatchNo = "";       //鏉$爜鎵规鍙�
+            string HBarCodeDate = "";         //鏉$爜鏃ユ湡
+            int k = 0;
+            Int64 n = 0;                  //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
+            string sTMNumber = "";      //鏉$爜鑷畾涔夊墠缂�
+            string sSourceBillNo = "";       //婧愬崟鍙�
+            string sSourceEntryID = "";       //琛屽彿锛堟簮鍗曞瓙ID锛�
+            DataSet Ds;
+            //Ds = oCn.RunProcReturn("exec GetLSH '" + ClsPub.GetServerDate(0) + "'", "GetLSH");
+            //LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+            for (int j = 0; j < grdMain.Rows.Count; j++)
+            {
+                if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
+                {
+                    HNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterIDCol].Value);
+                    HMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNumberCol].Value);
+                    HBatchNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
+                    //鏃ユ湡鑾峰彇鏂瑰紡
+                    sDate = dtpHDate.Value.ToShortDateString();
+                    //
+                    if (cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�" || cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�") //鍗曟嵁鏃ユ湡(鏀舵枡閫氱煡鍗�)
+                    {
+                        sDate = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HDateCol].Value);
+                    }
+                    else if (cmbHBarCodeType.Text == "璇曞墏鎴愬搧鏉$爜瑙勫垯")// 澶辨晥鏃ユ湡锛堢敓浜ц鍗曪級
+                    {
+                        sDate = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HEndDateCol].Value);
+                    }
+                    else if (CampanyName == "澶忓疂鐢靛櫒")// 鏃ユ湡锛氱敓浜ц鍗� 鏉$爜鏃ユ湡
+                    {
+                        sDate = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HDateCol].Value);
+                    }
+                    HYasuoji = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HPinfanCol].Value); //鍘嬬缉鏈轰唬鐮侊紙澶忓疂鐢靛櫒锛�
+                    HModelName = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusTypeCol].Value); //鏈哄瀷锛堝瀹濈數鍣級
+                    HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HSourceBillNoCol].Value); //鐢熶骇璁㈠崟鍙凤紙澶忓疂鐢靛櫒锛�
+                    HBarCodeBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HPinfanBarCodeCol].Value); //鏉$爜鎵规鍙凤紙澶忓疂鐢靛櫒锛�
+                    HBarCodeDate = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HSupNumberCol].Value); //鏉$爜鏃ユ湡锛堝瀹濈數鍣級
+                    //
+                    sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+                    sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+                    sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+                    sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+                    sDay = sDay.Substring(sDay.Length - 2, 2);
+                    //==================================
+                    if (cmbHBarCodeType.Text == "鍞竴鏉$爜")
+                    {
+                        if (CampanyName == "鍗撳姏") //绯荤粺鍙傛暟  瀹㈡埛瀹氬埗鍖栧悕绉�
+                        {
+                            //鏉$爜鍓嶇紑 = 鐗╂枡浠g爜 + 骞� + 鏈� + 鏃�
+                            sTMNumber = HNumber + sYear + sPeriod + sDay;
+                            Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
+                            //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+                            LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+                        }
+                        else if (CampanyName == "椋為緳")
+                        {
+                            string HWorksNumber = "";
+                            HWorksNumber = cmbHWorksNumber.Text;
+                            if (HWorksNumber == "")
+                            {
+                                MessageBox.Show("宸ュ巶浠g爜涓嶈兘涓虹┖锛�");
+                                return;
+                            }
+                            //鏉$爜鍓嶇紑 = 宸ュ巶浠g爜 + 鐗╂枡鍐呯爜 + 鏃ユ湡
+                            sTMNumber = HWorksNumber + HNumber + sYear + sPeriod + sDay;
+                            Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
+                            //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+                            LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+                        }
+                        else if (CampanyName == "涓帶")
+                        {
+                            sSourceBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value);
+                            sSourceEntryID = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HSubIDCol].Value);
+                            if (sSourceBillNo == "")
+                            {
+                                //鏉$爜鍓嶇紑 = 缁勭粐浠g爜 + 鐗╂枡浠g爜 + 骞� + 鏈� + 鏃�
+                                sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay;
+                                Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
+                                LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+                            }
+                            else
+                            {
+                                //鏉$爜 = 婧愬崟鍗曞彿 + 鐗╂枡ID + 琛屽彿
+                                sTMNumber = sSourceBillNo + HNumber + sSourceEntryID;
+                            }
+                        }
+                        else  //閫氱敤鏂规硶
+                        {
+                            //鏉$爜鍓嶇紑 = 缁勭粐浠g爜 + 鐗╂枡浠g爜 + 骞� + 鏈� + 鏃�
+                            sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay;
+                            Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
+                            //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+                            LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+                        }
+                    }
+                    else if (cmbHBarCodeType.Text == "鍝佺鏉$爜")
+                    {
+                        if (CampanyName == "浜斾簯") //绯荤粺鍙傛暟  瀹㈡埛瀹氬埗鍖栧悕绉�
+                        {
+                            TM = HNumber + ";" + DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMTONoCol].Value);
+                        }
+                        else
+                        {
+                            TM = HOrgNumber + HNumber;
+                        }
+                    }
+                    else if (cmbHBarCodeType.Text == "鎵规鏉$爜")
+                    {
+                        TM = HOrgNumber + HNumber + HBatchNo;
+                    }//鍗氭棩鐗规畩澶勭悊
+                    else if (cmbHBarCodeType.Text == "搴忓垪鐮�")
+                    {
+                        //鏉$爜瑙勫垯锛� GX+鐗╂枡鍐呯爜+骞村勾鏈堟湀鏃ユ棩+5浣嶆祦姘村彿
+                        LSHlen = 5;
+                        //鏉$爜鍓嶇紑 = GX+鐗╂枡鍐呯爜+骞村勾鏈堟湀鏃ユ棩
+                        sTMNumber = "GX" + HNumber + sYear + sPeriod + sDay;
+                        Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
+                        LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+                    }
+                    else if (cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�" || cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
+                    {
+                        //鐗╂枡缂栫爜+鍗曟嵁鏃ユ湡锛圷YMMDD锛�+娴佹按4浣� 
+                        sTMNumber = HMaterNumber + sYear + sPeriod + sDay;
+                        Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
+                                                                                                                    //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+                        LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+                        LSHlen = 4;
+                    }
+                    else if (cmbHBarCodeType.Text == "浠櫒鎴愬搧鏉$爜瑙勫垯") //鍙﹀澶勭悊浜�
+                    {
+                        //鐗╂枡缂栫爜+搴忓垪鍙�+鐢熶骇鏃ユ湡
+                        //sTMNumber = HMaterNumber + sYear + sPeriod + sDay;
+                        //Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
+                        //                                                                                            //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+                        //LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+                    }
+                    else if (cmbHBarCodeType.Text == "璇曞墏鎴愬搧鏉$爜瑙勫垯")
+                    {
+                        //鐗╂枡缂栫爜+鐢熶骇鎵瑰彿+娴佹按鍙�6浣�-
+                        sTMNumber = HMaterNumber + HBatchNo;
+                        Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
+                                                                                                                    //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+                        LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+                        LSHlen = 6;
+                    }
+                    else if (cmbHBarCodeType.Text == "鍐呴攢鏈烘潯鐮�")
+                    {
+                        //鍒堕�犳湰閮�1浣嶏紙榛樿1锛�+鏈哄瀷浠g爜5浣嶏紙锛�+骞�2浣�+鏈�1浣嶏紙A銆丅銆丆浠f浛10鏈堜唤锛�
+                        //+鏃�2浣�+鏉$爜鎵规鐮�2浣�+鍘嬬缉鏈轰唬鐮�1浣�+00+娴佹按鍙�4浣�+鏍¢獙鐮侊紙榛樿0锛�
+                        sTMNumber = "1" + HModelName + HBarCodeDate + HBarCodeBatchNo + HYasuoji + "00";
+                        Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
+                                                                                                                    //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+                        LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+                        LSHlen = 4;
+                        if (sTMNumber.Length != 16 && sTMNumber.Length != 15)
+                        {
+                            MessageBox.Show("鏉$爜闀垮害涓嶅15鎴�16浣嶏紝鏄惁鏁版嵁涓嶅叏锛佸埗閫犳湰閮�1浣�:[0] + 鏈哄瀷浠g爜5浣�:[" + HModelName + "] + 骞存湀鏃�4鎴�5浣�:[" + HBarCodeDate + "] + 鎵规鍙�2浣�:[" + HBarCodeBatchNo + "]+ 鍘嬬缉鏈�1浣�:[" + HYasuoji + "]+00 ; ");
+                            return;
+                        }
+                    }
+                    else if (cmbHBarCodeType.Text == "澶栭攢鏈烘潯鐮�")
+                    {
+                        //鐗╂枡浠g爜11浣�+骞�2浣�+鏈�1浣嶏紙A銆丅銆丆浠f浛10鏈堜唤锛�+鏃�2浣�+鎵规2浣�+娴佹按鍙�4浣�
+                        //sTMNumber = HMaterNumber.Replace(Convert.ToChar("."),Convert.ToChar("")) + HBarCodeDate + HBarCodeBatchNo;
+                        sTMNumber = HMaterNumber.Replace(".", "") + HBarCodeDate + HBarCodeBatchNo;
+                        Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
+                                                                                                                    //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+                        LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+                        LSHlen = 4;
+                        if (sTMNumber.Length != 18 && sTMNumber.Length != 17)
+                        {
+                            MessageBox.Show("鏉$爜闀垮害涓嶅17鎴�18浣嶏紝鏄惁鏁版嵁涓嶅叏锛佺墿鏂欎唬鐮�11浣�:[" + HMaterNumber.Replace(".", "") + "]+骞存湀鏃�4鎴�5浣�:[" + HBarCodeDate + "]+鎵规鍙�2浣�:[" + HBarCodeBatchNo + "];");
+                            return;
+                        }
+                    }
+                    else if (cmbHBarCodeType.Text == "鍗婃垚鍝佹潯鐮�")
+                    {
+                        //鐢熶骇璁㈠崟鍙�+4浣嶆祦姘村彿
+                        sTMNumber = HICMOBillNo;
+                        Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
+                                                                                                                    //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+                        LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+                        LSHlen = 5;
+                    }
+                    //else if (cmbHBarCodeType.Text == "鎵樼洏鏉$爜")
+                    //{
+                    //    TM = HOrgNumber + HNumber + LSH2;
+                    //}
+                    else
+                    {
+                        MessageBox.Show("閿欒鐨勬潯鐮佺被鍨嬶紝涓嶈兘鐢熸垚鏉$爜锛�");
+                        return;
+                    }
+
+                    Int64 HBQty2 = 0;              //绠辨暟
+                    HBQty2 = ClsPub.isLong(grdMain.Rows[j].Cells[HBQtyCol].Value);
+                    HBQty = HBQty + ClsPub.isLong(grdMain.Rows[j].Cells[HBQtyCol].Value);
+                    HMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);
+                    HSumQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value);
+                    n = 0;
+                    int nn = 0;
+                    for (int i = k; i < HBQty; i++)
+                    {
+                        if (HSumQty - HMinQty > 0)
+                        {
+                            WeiShu = "";
+                            HSumQty = HSumQty - HMinQty;
+                        }
+                        else
+                        {
+                            if (HSumQty == HMinQty)
+                            {
+                                WeiShu = "";
+                            }
+                            else
+                            {
+                                WeiShu = "灏炬暟";
+                            }
+                            HMinQty = HSumQty;
+                        }
+                        //
+                        LSH = LSH + 1;
+                        LSH2 = LSH.ToString();
+                        while (LSH2.Length < LSHlen)  //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
+                        {
+                            LSH2 = "0" + LSH2;
+                        }
+                        if (cmbHBarCodeType.Text == "鍞竴鏉$爜")
+                        {
+                            if (CampanyName == "涓帶")
+                            {
+                                if (sSourceBillNo == "")
+                                {
+                                    //鏉$爜缂栧彿 = 鏉$爜鍓嶇紑 + 娴佹按鍙�
+                                    TM = sTMNumber + LSH2;
+                                }
+                                else
+                                {
+                                    if (HBQty2 > 1)
+                                    {
+                                        MessageBox.Show("鐢熶骇姹囨姤鍗曘�佹敹鏂欓�氱煡鍗曠敓鎴愭潯鐮佹椂锛岀鏁颁笉鑳藉ぇ浜�1锛�");
+                                        bc.Enabled = true;
+                                        return;
+                                    }
+                                    //鏉$爜缂栧彿 = 鏉$爜鍓嶇紑
+                                    TM = sTMNumber;
+                                }
+                            }
+                            else
+                            {
+                                //鏉$爜缂栧彿 = 鏉$爜鍓嶇紑 + 娴佹按鍙�
+                                TM = sTMNumber + LSH2;
+                            }
+                        }
+                        else if (cmbHBarCodeType.Text == "搴忓垪鐮�")
+                        {
+                            //鏉$爜缂栧彿 = 鏉$爜鍓嶇紑 + 娴佹按鍙�
+                            TM = sTMNumber + LSH2;
+                        }
+                        else if (cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�" || cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�" || cmbHBarCodeType.Text == "璇曞墏鎴愬搧鏉$爜瑙勫垯"
+                            || cmbHBarCodeType.Text == "鍗婃垚鍝佹潯鐮�" || cmbHBarCodeType.Text == "澶栭攢鏈烘潯鐮�")
+                        {
+                            TM = sTMNumber + LSH2;
+
+                        }
+                        else if (cmbHBarCodeType.Text == "鍐呴攢鏈烘潯鐮�")
+                        {
+                            TM = sTMNumber + LSH2 + "0";
+                        }
+                        //
+                        if (i + 1 > grdSub.Rows.Count)
+                        {
+                            grdSub.RowCount = grdSub.RowCount + 1;
+                        }
+                        grdSub.Rows[i].Cells[HSno2Col].Value = ClsPub.isStrNull(i + 1);
+                        if (TM.Trim() == "")
+                        {
+                            MessageBox.Show("鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉$爜锛�");
+                            return;
+                        }
+                        grdSub.Rows[i].Cells[HTMCol].Value = TM;
+                        grdSub.Rows[i].Cells[HEntryID2Col].Value = j + 1;
+                        grdSub.Rows[i].Cells[HMaterID2Col].Value = grdMain.Rows[j].Cells[HMaterIDCol].Value;
+                        grdSub.Rows[i].Cells[HMaterNumber2Col].Value = grdMain.Rows[j].Cells[HMaterNumberCol].Value;
+                        grdSub.Rows[i].Cells[HMaterName2Col].Value = grdMain.Rows[j].Cells[HMaterNameCol].Value;
+                        grdSub.Rows[i].Cells[HMaterModel2Col].Value = grdMain.Rows[j].Cells[HMaterModelCol].Value;
+                        grdSub.Rows[i].Cells[HPinfan2Col].Value = grdMain.Rows[j].Cells[HPinfanCol].Value;
+                        grdSub.Rows[i].Cells[HPinfanBarCode2Col].Value = grdMain.Rows[j].Cells[HPinfanBarCodeCol].Value;
+
+                        grdSub.Rows[i].Cells[HAuxPropID2Col].Value = grdMain.Rows[j].Cells[HAuxPropIDCol].Value;
+                        grdSub.Rows[i].Cells[HAuxPropNumber2Col].Value = grdMain.Rows[j].Cells[HAuxPropNumberCol].Value;
+                        grdSub.Rows[i].Cells[HAuxPropName2Col].Value = grdMain.Rows[j].Cells[HAuxPropNameCol].Value;
+
+                        grdSub.Rows[i].Cells[HUnitID2Col].Value = grdMain.Rows[j].Cells[HUnitIDCol].Value;
+                        grdSub.Rows[i].Cells[HUnitNumber2Col].Value = grdMain.Rows[j].Cells[HUnitNumberCol].Value;
+                        grdSub.Rows[i].Cells[HUnitName2Col].Value = grdMain.Rows[j].Cells[HUnitNameCol].Value;
+
+                        grdSub.Rows[i].Cells[HQty2Col].Value = HMinQty;
+                        grdSub.Rows[i].Cells[HBatchNo2Col].Value = grdMain.Rows[j].Cells[HBatchNoCol].Value;
+                        grdSub.Rows[i].Cells[HSourceInterID2Col].Value = grdMain.Rows[j].Cells[HMainIDCol].Value;
+                        grdSub.Rows[i].Cells[HSourceEntryID2Col].Value = grdMain.Rows[j].Cells[HSubIDCol].Value;
+                        grdSub.Rows[i].Cells[HSourceBillNo2Col].Value = grdMain.Rows[j].Cells[HBillNoCol].Value;
+                        grdSub.Rows[i].Cells[HSourceBillType2Col].Value = grdMain.Rows[j].Cells[HBillTypeCol].Value;
+                        grdSub.Rows[i].Cells[HPrintCol].Value = "0";
+                        grdSub.Rows[i].Cells[HWeiCol].Value = WeiShu;
+                        grdSub.Rows[i].Cells[HBarcodeNoCol].Value = n + 1;
+                        grdSub.Rows[i].Cells[HBarcodeQtysCol].Value = grdMain.Rows[j].Cells[HBQtyCol].Value;
+                        grdSub.Rows[i].Cells[HSupID2Col].Value = grdMain.Rows[j].Cells[HSupIDCol].Value;
+                        grdSub.Rows[i].Cells[HSupNumber2Col].Value = grdMain.Rows[j].Cells[HSupNumberCol].Value;
+                        grdSub.Rows[i].Cells[HSupName2Col].Value = grdMain.Rows[j].Cells[HSupNameCol].Value;
+                        grdSub.Rows[i].Cells[HDeptID2Col].Value = grdMain.Rows[j].Cells[HDeptIDCol].Value;
+                        grdSub.Rows[i].Cells[HDeptNumber2Col].Value = grdMain.Rows[j].Cells[HDeptNumberCol].Value;
+                        grdSub.Rows[i].Cells[HDeptName2Col].Value = grdMain.Rows[j].Cells[HDeptNameCol].Value;
+                        grdSub.Rows[i].Cells[HRemark2Col].Value = grdMain.Rows[j].Cells[HRemarkCol].Value;
+                        grdSub.Rows[i].Cells[HDate2Col].Value = grdMain.Rows[j].Cells[HDateCol].Value;
+                        grdSub.Rows[i].Cells[HShowDate2Col].Value = grdMain.Rows[j].Cells[HShowDateCol].Value;
+                        grdSub.Rows[i].Cells[HWhID2Col].Value = grdMain.Rows[j].Cells[HWhIDCol].Value;
+                        grdSub.Rows[i].Cells[HWhNumber2Col].Value = grdMain.Rows[j].Cells[HWhNumberCol].Value;
+                        grdSub.Rows[i].Cells[HWhName2Col].Value = grdMain.Rows[j].Cells[HWhNameCol].Value;
+                        grdSub.Rows[i].Cells[HSPID2Col].Value = grdMain.Rows[j].Cells[HSPIDCol].Value;
+                        grdSub.Rows[i].Cells[HSPNumber2Col].Value = grdMain.Rows[j].Cells[HSPNumberCol].Value;
+                        grdSub.Rows[i].Cells[HSPName2Col].Value = grdMain.Rows[j].Cells[HSPNameCol].Value;
+                        grdSub.Rows[i].Cells[HMTONo2Col].Value = grdMain.Rows[j].Cells[HMTONoCol].Value;
+                        grdSub.Rows[i].Cells[HCusID2Col].Value = grdMain.Rows[j].Cells[HCusIDCol].Value;
+                        grdSub.Rows[i].Cells[HCusNumber2Col].Value = grdMain.Rows[j].Cells[HCusNumberCol].Value;
+                        grdSub.Rows[i].Cells[HCusName2Col].Value = grdMain.Rows[j].Cells[HCusNameCol].Value;
+                        grdSub.Rows[i].Cells[HCusType2Col].Value = grdMain.Rows[j].Cells[HCusTypeCol].Value;
+                        grdSub.Rows[i].Cells[HSourceID2Col].Value = grdMain.Rows[j].Cells[HSourceIDCol].Value;
+                        grdSub.Rows[i].Cells[HSourceNumber2Col].Value = grdMain.Rows[j].Cells[HSourceNumberCol].Value;
+                        grdSub.Rows[i].Cells[HSourceName2Col].Value = grdMain.Rows[j].Cells[HSourceNameCol].Value;
+                        grdSub.Rows[i].Cells[HEndDate2Col].Value = grdMain.Rows[j].Cells[HEndDateCol].Value;
+                        grdSub.Rows[i].Cells[HSeOrderBillNo2Col].Value = grdMain.Rows[j].Cells[HSeOrderBillNoCol].Value;
+                        grdSub.Rows[i].Cells[HSeOrderSEQ2Col].Value = grdMain.Rows[j].Cells[HSeOrderSEQCol].Value;
+                        grdSub.Rows[i].Cells[HInnerBillNo2Col].Value = grdMain.Rows[j].Cells[HInnerBillNoCol].Value;
+                        grdSub.Rows[i].Cells[HMaker2Col].Value = grdMain.Rows[j].Cells[HMakerCol].Value;
+                        grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value = grdMain.Rows[j].Cells[HGiveAwayFlagCol].Value;
+                        grdSub.Rows[i].Cells[HProduceDate2Col].Value = grdMain.Rows[j].Cells[HProduceDateCol].Value;
+                        grdSub.Rows[i].Cells[HExpiryDate2Col].Value = grdMain.Rows[j].Cells[HExpiryDateCol].Value;
+                        grdSub.Rows[i].Cells[HISKFPERIOD2Col].Value = grdMain.Rows[j].Cells[HISKFPERIODCol].Value;
+                        grdSub.Rows[i].Cells[HEXPUNIT2Col].Value = grdMain.Rows[j].Cells[HEXPUNITCol].Value;
+                        grdSub.Rows[i].Cells[HEXPPERIOD2Col].Value = grdMain.Rows[j].Cells[HEXPPERIODCol].Value;
+                        //缃戞牸鎵撳嬀
+                        //鏄惁璧犲搧
+                        DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+                        oCell.ThreeState = false;
+                        oCell.Value = grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value;
+                        oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+                        grdSub.Rows[i].Cells[HGiveAwayFlag2Col] = oCell;
+                        //鏄惁鍚敤淇濊川鏈�
+                        DataGridViewCheckBoxCell oCell2 = new DataGridViewCheckBoxCell();
+                        oCell2.ThreeState = false;
+                        oCell2.Value = grdSub.Rows[i].Cells[HISKFPERIOD2Col].Value;
+                        oCell2.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+                        grdSub.Rows[i].Cells[HISKFPERIOD2Col] = oCell2;
+                        k = k + 1;
+                        n = n + 1;
+                        //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+                        nn = nn + 1;
+                    }
+                    //鍚庡彴鎵归噺鎵ц璇彞
+                    oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "'," + nn.ToString() + " ");
+                }
+            }
+            string HWei = "";      //灏炬暟
+            string HBarCode = "";
+            string HBarCodeType = "";
+            Int64 HMaterID = 0;
+            Int64 HAuxPropID = 0;
+            Int64 HUnitID = 0;
+            double HQty2 = 0;
+            string HBatchNo2 = "";
+            Int64 HSupID = 0;
+            Int64 HGroupID = 0;
+            int HPrintQty = 0;
+            Int64 HSourceInterID = 0;
+            Int64 HSourceEntryID = 0;
+            string HSourceBillNo = "";
+            string HSourceBillType = "";
+            Int64 HBarcodeNo = 0;       //鎵樺彿
+            Int64 HBarcodeQtys = 0;     //鎬绘墭鏁�
+            Int64 HDeptID = 0;
+            Int64 HWhID = 0;
+            Int64 HSPID = 0;
+            string HRemark = "";
+            string HMaterName = "";
+            string HMaterModel = "";
+            string HPinfan = "";
+            string HMTONo = "";
+            Int64 HCusID = 0;
+            string HCusType = "";
+            DateTime HEndDate;
+            string HWorkLineName = "";
+            string HSeOrderBillNo = "";
+            Int64 HSeOrderSEQ = 0;
+            string HInnerBillNo = "";
+            bool HGiveAwayFlag = false;
+            Int64 HEntryID = 0;
+            string HProduceDate;
+            string HExpiryDate;
+            bool HISKFPERIOD = false;
+            string HEXPUNIT = "";
+            double HEXPPERIOD = 0;
+            try
+            {
+                oCn.BeginTran();
+                for (int i = 0; i < grdSub.Rows.Count; i++)
+                {
+                    if (ClsPub.isLong(grdSub.Rows[i].Cells[HMaterID2Col].Value) != 0)
+                    {
+                        HWei = ClsPub.isStrNull(grdSub.Rows[i].Cells[HWeiCol].Value);
+                        HBarCode = ClsPub.isStrNull(grdSub.Rows[i].Cells[HTMCol].Value);
+                        //
+                        HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
+                        if (CampanyName == "鍗氭棩绉戞妧" || CampanyName == "澶忓疂鐢靛櫒")
+                        {
+                            HBarCodeType = "鍞竴鏉$爜";
+                        }
+                        //
+                        HMaterID = ClsPub.isLong(grdSub.Rows[i].Cells[HMaterID2Col].Value);
+                        HEntryID = ClsPub.isLong(grdSub.Rows[i].Cells[HEntryID2Col].Value);
+                        HAuxPropID = ClsPub.isLong(grdSub.Rows[i].Cells[HAuxPropID2Col].Value);
+                        HUnitID = ClsPub.isLong(grdSub.Rows[i].Cells[HUnitID2Col].Value);
+                        HQty2 = ClsPub.isDoule(grdSub.Rows[i].Cells[HQty2Col].Value);
+                        HBatchNo2 = ClsPub.isStrNull(grdSub.Rows[i].Cells[HBatchNo2Col].Value);
+                        HSourceInterID = ClsPub.isLong(grdSub.Rows[i].Cells[HSourceInterID2Col].Value);
+                        HSourceEntryID = ClsPub.isLong(grdSub.Rows[i].Cells[HSourceEntryID2Col].Value);
+                        HSourceBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSourceBillNo2Col].Value);
+                        HSourceBillType = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSourceBillType2Col].Value);
+                        HBarcodeQtys = ClsPub.isLong(grdSub.Rows[i].Cells[HBarcodeQtysCol].Value);
+                        HBarcodeNo = ClsPub.isLong(grdSub.Rows[i].Cells[HBarcodeNoCol].Value);
+                        HSupID = ClsPub.isLong(grdSub.Rows[i].Cells[HSupID2Col].Value);
+                        HDeptID = ClsPub.isLong(grdSub.Rows[i].Cells[HDeptID2Col].Value);
+                        HWhID = ClsPub.isLong(grdSub.Rows[i].Cells[HWhID2Col].Value);
+                        HSPID = ClsPub.isLong(grdSub.Rows[i].Cells[HSPID2Col].Value);
+                        HRemark = ClsPub.isStrNull(grdSub.Rows[i].Cells[HRemark2Col].Value);
+                        HMaterName = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterName2Col].Value);
+                        HMaterModel = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterModel2Col].Value);
+                        HPinfan = ClsPub.isStrNull(grdSub.Rows[i].Cells[HPinfan2Col].Value);
+                        HMTONo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMTONo2Col].Value);
+                        HCusID = ClsPub.isLong(grdSub.Rows[i].Cells[HCusID2Col].Value);
+                        HCusType = ClsPub.isStrNull(grdSub.Rows[i].Cells[HCusType2Col].Value);
+                        HEndDate = ClsPub.isDate(grdSub.Rows[i].Cells[HEndDate2Col].Value);
+                        HWorkLineName = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSourceName2Col].Value);
+                        HSeOrderBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSeOrderBillNo2Col].Value);
+                        HSeOrderSEQ = ClsPub.isLong(grdSub.Rows[i].Cells[HSeOrderSEQ2Col].Value);
+                        HInnerBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HInnerBillNo2Col].Value);
+                        HGiveAwayFlag = ClsPub.isBool(grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value);
+                        if (ClsPub.isDate(grdSub.Rows[i].Cells[HProduceDate2Col].Value) < Convert.ToDateTime("1950-01-01"))
+                        {
+                            HProduceDate = "";
+                        }
+                        else
+                        {
+                            HProduceDate = ClsPub.isStrNull(grdSub.Rows[i].Cells[HProduceDate2Col].Value);
+                        }
+                        if (ClsPub.isDate(grdSub.Rows[i].Cells[HExpiryDate2Col].Value) < Convert.ToDateTime("1950-01-01"))
+                        {
+                            HExpiryDate = "";
+                        }
+                        else
+                        {
+                            HExpiryDate = ClsPub.isStrNull(grdSub.Rows[i].Cells[HExpiryDate2Col].Value);
+                        }
+                        HISKFPERIOD = ClsPub.isBool(grdSub.Rows[i].Cells[HISKFPERIOD2Col].Value);
+                        HEXPUNIT = ClsPub.isStrNull(grdSub.Rows[i].Cells[HEXPUNIT2Col].Value);
+                        HEXPPERIOD = ClsPub.isDoule(grdSub.Rows[i].Cells[HEXPPERIOD2Col].Value);
+
+                        if (radioButton_HIsUsingBatchNo.Checked)
+                        {
+                            HBatchNo2 = getBatchNo();
+                        }
+
+
+                        oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+                                    ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
+                                    ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
+                                    ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
+                                    ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
+                                    ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
+                                    ",HProduceDate,HExpiryDate " +
+                                    ",HISKFPERIOD,HEXPUNIT,HEXPPERIOD " +
+                                    ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+                                    ") values ("
+                                    + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
+                                    + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
+                                    + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
+                                    + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+                                    + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
+                                    + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString()
+                                    + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + "," + HSeOrderSEQ.ToString() + "," + HSourceEntryID.ToString()
+                                    + ", " + (HProduceDate == "" ? "NULL" : "'" + HProduceDate + "'") + "," + (HExpiryDate == "" ? "NULL" : "'" + HExpiryDate + "'")
+                                    + ", " + DBUtility.ClsPub.BoolToString(HISKFPERIOD) + ",'" + HEXPUNIT + "'," + HEXPPERIOD.ToString()
+                                    + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
+
+
+                        //HNumber = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterID2Col].Value);
+                        //if (cmbHBarCodeType.Text == "鍞竴鏉$爜")
+                        //{
+                        //    if (CampanyName == "鍗撳姏") //绯荤粺鍙傛暟  瀹㈡埛瀹氬埗鍖栧悕绉�
+                        //    {
+                        //        //鏉$爜鍓嶇紑 = 鐗╂枡浠g爜 + 骞� + 鏈� + 鏃�
+                        //        sTMNumber = HNumber + sYear + sPeriod + sDay; 
+                        //    }
+                        //    else if (CampanyName == "椋為緳")
+                        //    {
+                        //        string HWorksNumber = "";
+                        //        HWorksNumber = cmbHWorksNumber.Text;
+                        //        if (HWorksNumber == "")
+                        //        {
+                        //            MessageBox.Show("宸ュ巶浠g爜涓嶈兘涓虹┖锛�");
+                        //            return;
+                        //        }
+                        //        //鏉$爜鍓嶇紑 = 宸ュ巶浠g爜 + 鐗╂枡鍐呯爜 + 鏃ユ湡
+                        //        sTMNumber = HWorksNumber + HNumber + sYear + sPeriod + sDay; 
+                        //    }
+                        //    else  //閫氱敤鏂规硶
+                        //    {
+                        //        //鏉$爜鍓嶇紑 = 缁勭粐浠g爜 + 鐗╂枡浠g爜 + 骞� + 鏈� + 鏃�
+                        //        sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay; 
+                        //    }
+                        //}
+                        //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+                    }
+                }
+                //澧炲姞 鏉$爜瓒呰繃鏈敓鎴愬姛鑳芥帶鍒�
+
+                //
+                oCn.Commit();
+                //MessageBox.Show("鏉$爜鐢熸垚瀹屾瘯锛�");
+                //grdSub.RowCount = 0;
+                tabControl1.SelectedIndex = 3;
+            }
+            catch (Exception e)
+            {
+                oCn.RollBack();
+                MessageBox.Show("鏉$爜鐢熸垚澶辫触锛�" + e.Message);
+                grdSub.RowCount = 0;
+            }
+        }
+
+        private string getBatchNo()
+        {
+            string HBatchNo = "";
+
+            if (radioButton_HIsUsingBatchNo.Checked)
+            {
+                //鏃ユ湡鑾峰彇鏂瑰紡
+                string sDate = dtpHDate.Value.ToShortDateString();                                                                                   //
+                string sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+                string sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+                sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+                string sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+                sDay = sDay.Substring(sDay.Length - 2, 2);
+
+                string HDate = "20" + sYear + "-" + sPeriod + "-" + sDay;
+
+                //鑾峰彇娴佹按鍙凤細鍥涗綅锛岃鐗╂枡褰撳ぉ鐢熸垚鐨勬潯鐮佹暟
+                string LIU = "";
+                int LEN = 4;
+                DataSet ds;
+                string sql = "select * from h_v_IF_BarCodeBillList Where HMaterID = " + grdMain.Rows[0].Cells[HMaterIDCol].Value + " and HSTOCKORGID = " + HOrgID + " and CONVERT(varchar(100),鏉$爜鏃ユ湡, 23) = '" + HDate + "' order by 鎵瑰彿 desc";
+                ds = oCn.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
+                if (ds != null)
+                {
+                    long count = ClsPub.isLong(ds.Tables[0].Rows[0]["鎵瑰彿"].ToString().Replace(sYear + sPeriod + sDay, ""));
+
+                    LIU += count + 1;
+                    while (LIU.Length < LEN)  //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
+                    {
+                        LIU = "0" + LIU;
+                    }
+                }
+                else
+                {
+                    return "";
+                }
+
+                //鎷兼帴鎵瑰彿
+                HBatchNo = sYear + sPeriod + sDay + LIU;
+            }
+
+
+            return HBatchNo;
+        }
+
+        //鐢熸垚鏉$爜 鍗氭棩 
+        //鐗╂枡缂栫爜+搴忓垪鍙�+鐢熶骇鏃ユ湡
+        private void SaveBarCode_bori()
+        {
+            grdSub.Rows.Clear();
+            int LSHlen = 6;             //娴佹按鍙烽暱搴�
+            int SumLen = 10;            //鎬婚暱搴�
+            string TM = "";             //鏉$爜
+            string HNumber = "";        //鐗╂枡鍐呯爜
+            string HMaterNumber = "";   //鐗╂枡浠g爜
+            double HSumQty = 0;         //浜у搧鏁伴噺
+            double HMinQty = 0;         //鏈�灏忓寘瑁呮暟
+            Int64 HBQty = 0;              //绠辨暟
+            double HQty = 0;            //鏁伴噺
+            string WeiShu = "";         //灏炬暟
+            //int LSH = 0;                //娴佹按鍙�
+            string LSH2 = "";           //娴佹按鍙疯浆鎹㈡垚瀛楃
+            string sDate = "";          //鏃ユ湡
+            string sYear = "";          //骞�
+            string sPeriod = "";        //鏈�
+            string sDay = "";           //鏃�
+            string HBatchNo = "";       //鎵规
+            int k = 0;
+            int n = 0;                  //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
+            string sTMNumber = "";      //鏉$爜鑷畾涔夊墠缂�
+            DataSet Ds;
+            //Ds = oCn.RunProcReturn("exec GetLSH '" + ClsPub.GetServerDate(0) + "'", "GetLSH");
+            //LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+            for (int j = 0; j < grdMain.Rows.Count; j++)
+            {
+                if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
+                {
+                    HNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterIDCol].Value);
+                    HMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNumberCol].Value);
+                    HBatchNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
+                    //鏃ユ湡鑾峰彇鏂瑰紡
+                    sDate = dtpHDate.Value.ToShortDateString();
+                    //
+                    if (cmbHBarCodeType.Text == "璇曞墏鎴愬搧鏉$爜瑙勫垯")// 澶辨晥鏃ユ湡锛堢敓浜ц鍗曪級
+                    {
+                        sDate = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HEndDateCol].Value);
+                    }
+                    //
+                    sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+                    sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+                    sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+                    sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+                    sDay = sDay.Substring(sDay.Length - 2, 2);
+                    //==================================
+                    //if (cmbHBarCodeType.Text == "璇曞墏鎴愬搧鏉$爜瑙勫垯")
+                    //{ 
+                    //    //鏉$爜鍓嶇紑 = 缁勭粐浠g爜 + 鐗╂枡浠g爜 + 骞� + 鏈� + 鏃�
+                    //sTMNumber = HMaterNumber + HNumber + sYear + sPeriod + sDay;
+                    //    Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿
+                    //    //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+                    //    LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]); 
+                    //}
+                    //else
+                    //{
+                    //    MessageBox.Show("閿欒鐨勬潯鐮佺被鍨嬶紝涓嶈兘鐢熸垚鏉$爜锛�");
+                    //    return;
+                    //}
+
+                    HBQty = HBQty + ClsPub.isLong(grdMain.Rows[j].Cells[HBQtyCol].Value);
+                    HMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);
+                    HSumQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value);
+                    n = 0;
+                    //浠庨噾铦跺簭鍒楀彿琛ㄨ幏鍙栧簭鍒楀彿
+                    DataSet DSet = oCn.RunProcReturn("exec h_p_CLD_GetBarCodeSno  " + ClsPub.isStrNull(grdMain.Rows[j].Cells[HMainIDCol].Value) + "," + ClsPub.isStrNull(grdMain.Rows[j].Cells[HSubIDCol].Value) + "  ", "h_p_CLD_GetBarCodeSno", ref DBUtility.ClsPub.sExeReturnInfo);
+                    //鐢熸垚棣栬鏍囬
+                    if (DSet == null)
+                    {
+                        MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,閲戣澏浜戝簭鍒楀彿涓嶅瓨鍦紒" + DBUtility.ClsPub.sExeReturnInfo);
+                        continue;
+                    }
+                    //
+
+                    for (int i = k; i < DSet.Tables[0].Rows.Count; i++)
+                    //for (int i = k; i < HBQty; i++)
+                    {
+                        if (HSumQty - HMinQty > 0)
+                        {
+                            WeiShu = "";
+                            HSumQty = HSumQty - HMinQty;
+                        }
+                        else
+                        {
+                            if (HSumQty == HMinQty)
+                            {
+                                WeiShu = "";
+                            }
+                            else
+                            {
+                                WeiShu = "灏炬暟";
+                            }
+                            HMinQty = HSumQty;
+                        }
+                        //
+                        //LSH = LSH + 1;
+                        LSH2 = DBUtility.ClsPub.isStrNull(DSet.Tables[0].Rows[n]["SHNO"]);
+                        //while (LSH2.Length < LSHlen)  //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
+                        //{
+                        //    LSH2 = "0" + LSH2;
+                        //}
+                        //if (cmbHBarCodeType.Text == "鍞竴鏉$爜")
+                        //{
+                        //鏉$爜缂栧彿 = 鏉$爜鍓嶇紑 + 娴佹按鍙�
+                        //T/*M*/ = HMaterNumber + LSH2 + sYear + sPeriod + sDay;
+                        TM = LSH2 + sYear + sPeriod + sDay;
+                        //}
+
+                        if (i + 1 > grdSub.Rows.Count)
+                        {
+                            grdSub.RowCount = grdSub.RowCount + 1;
+                        }
+                        grdSub.Rows[i].Cells[HSno2Col].Value = ClsPub.isStrNull(i + 1);
+                        if (TM.Trim() == "")
+                        {
+                            MessageBox.Show("鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉$爜锛�");
+                            return;
+                        }
+                        grdSub.Rows[i].Cells[HTMCol].Value = TM;
+                        grdSub.Rows[i].Cells[HMaterID2Col].Value = grdMain.Rows[j].Cells[HMaterIDCol].Value;
+                        grdSub.Rows[i].Cells[HMaterNumber2Col].Value = grdMain.Rows[j].Cells[HMaterNumberCol].Value;
+                        grdSub.Rows[i].Cells[HMaterName2Col].Value = grdMain.Rows[j].Cells[HMaterNameCol].Value;
+                        grdSub.Rows[i].Cells[HMaterModel2Col].Value = grdMain.Rows[j].Cells[HMaterModelCol].Value;
+                        grdSub.Rows[i].Cells[HPinfan2Col].Value = grdMain.Rows[j].Cells[HPinfanCol].Value;
+                        grdSub.Rows[i].Cells[HPinfanBarCode2Col].Value = grdMain.Rows[j].Cells[HPinfanBarCodeCol].Value;
+
+                        grdSub.Rows[i].Cells[HAuxPropID2Col].Value = grdMain.Rows[j].Cells[HAuxPropIDCol].Value;
+                        grdSub.Rows[i].Cells[HAuxPropNumber2Col].Value = grdMain.Rows[j].Cells[HAuxPropNumberCol].Value;
+                        grdSub.Rows[i].Cells[HAuxPropName2Col].Value = grdMain.Rows[j].Cells[HAuxPropNameCol].Value;
+
+                        grdSub.Rows[i].Cells[HUnitID2Col].Value = grdMain.Rows[j].Cells[HUnitIDCol].Value;
+                        grdSub.Rows[i].Cells[HUnitNumber2Col].Value = grdMain.Rows[j].Cells[HUnitNumberCol].Value;
+                        grdSub.Rows[i].Cells[HUnitName2Col].Value = grdMain.Rows[j].Cells[HUnitNameCol].Value;
+
+                        grdSub.Rows[i].Cells[HQty2Col].Value = HMinQty;
+                        grdSub.Rows[i].Cells[HBatchNo2Col].Value = grdMain.Rows[j].Cells[HBatchNoCol].Value;
+                        grdSub.Rows[i].Cells[HSourceInterID2Col].Value = grdMain.Rows[j].Cells[HMainIDCol].Value;
+                        grdSub.Rows[i].Cells[HSourceEntryID2Col].Value = grdMain.Rows[j].Cells[HSubIDCol].Value;
+                        grdSub.Rows[i].Cells[HSourceBillNo2Col].Value = grdMain.Rows[j].Cells[HBillNoCol].Value;
+                        grdSub.Rows[i].Cells[HSourceBillType2Col].Value = grdMain.Rows[j].Cells[HBillTypeCol].Value;
+                        grdSub.Rows[i].Cells[HPrintCol].Value = "0";
+                        grdSub.Rows[i].Cells[HWeiCol].Value = WeiShu;
+                        grdSub.Rows[i].Cells[HBarcodeNoCol].Value = n + 1;
+                        grdSub.Rows[i].Cells[HBarcodeQtysCol].Value = grdMain.Rows[j].Cells[HBQtyCol].Value;
+                        grdSub.Rows[i].Cells[HSupID2Col].Value = grdMain.Rows[j].Cells[HSupIDCol].Value;
+                        grdSub.Rows[i].Cells[HSupNumber2Col].Value = grdMain.Rows[j].Cells[HSupNumberCol].Value;
+                        grdSub.Rows[i].Cells[HSupName2Col].Value = grdMain.Rows[j].Cells[HSupNameCol].Value;
+                        grdSub.Rows[i].Cells[HDeptID2Col].Value = grdMain.Rows[j].Cells[HDeptIDCol].Value;
+                        grdSub.Rows[i].Cells[HDeptNumber2Col].Value = grdMain.Rows[j].Cells[HDeptNumberCol].Value;
+                        grdSub.Rows[i].Cells[HDeptName2Col].Value = grdMain.Rows[j].Cells[HDeptNameCol].Value;
+                        grdSub.Rows[i].Cells[HRemark2Col].Value = grdMain.Rows[j].Cells[HRemarkCol].Value;
+                        grdSub.Rows[i].Cells[HDate2Col].Value = grdMain.Rows[j].Cells[HDateCol].Value;
+                        grdSub.Rows[i].Cells[HShowDate2Col].Value = grdMain.Rows[j].Cells[HShowDateCol].Value;
+                        grdSub.Rows[i].Cells[HWhID2Col].Value = grdMain.Rows[j].Cells[HWhIDCol].Value;
+                        grdSub.Rows[i].Cells[HWhNumber2Col].Value = grdMain.Rows[j].Cells[HWhNumberCol].Value;
+                        grdSub.Rows[i].Cells[HWhName2Col].Value = grdMain.Rows[j].Cells[HWhNameCol].Value;
+                        grdSub.Rows[i].Cells[HSPID2Col].Value = grdMain.Rows[j].Cells[HSPIDCol].Value;
+                        grdSub.Rows[i].Cells[HSPNumber2Col].Value = grdMain.Rows[j].Cells[HSPNumberCol].Value;
+                        grdSub.Rows[i].Cells[HSPName2Col].Value = grdMain.Rows[j].Cells[HSPNameCol].Value;
+                        grdSub.Rows[i].Cells[HMTONo2Col].Value = grdMain.Rows[j].Cells[HMTONoCol].Value;
+                        grdSub.Rows[i].Cells[HCusID2Col].Value = grdMain.Rows[j].Cells[HCusIDCol].Value;
+                        grdSub.Rows[i].Cells[HCusNumber2Col].Value = grdMain.Rows[j].Cells[HCusNumberCol].Value;
+                        grdSub.Rows[i].Cells[HCusName2Col].Value = grdMain.Rows[j].Cells[HCusNameCol].Value;
+                        grdSub.Rows[i].Cells[HCusType2Col].Value = grdMain.Rows[j].Cells[HCusTypeCol].Value;
+                        grdSub.Rows[i].Cells[HSourceID2Col].Value = grdMain.Rows[j].Cells[HSourceIDCol].Value;
+                        grdSub.Rows[i].Cells[HSourceNumber2Col].Value = grdMain.Rows[j].Cells[HSourceNumberCol].Value;
+                        grdSub.Rows[i].Cells[HSourceName2Col].Value = grdMain.Rows[j].Cells[HSourceNameCol].Value;
+                        grdSub.Rows[i].Cells[HEndDate2Col].Value = grdMain.Rows[j].Cells[HEndDateCol].Value;
+                        grdSub.Rows[i].Cells[HSeOrderBillNo2Col].Value = grdMain.Rows[j].Cells[HSeOrderBillNoCol].Value;
+                        grdSub.Rows[i].Cells[HInnerBillNo2Col].Value = grdMain.Rows[j].Cells[HInnerBillNoCol].Value;
+                        grdSub.Rows[i].Cells[HMaker2Col].Value = grdMain.Rows[j].Cells[HMakerCol].Value;
+                        grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value = grdMain.Rows[j].Cells[HGiveAwayFlagCol].Value;
+                        //缃戞牸鎵撳嬀
+                        DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+                        oCell.ThreeState = false;
+                        oCell.Value = grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value;
+                        oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+                        grdSub.Rows[i].Cells[HGiveAwayFlag2Col] = oCell;
+                        k = k + 1;
+                        n = n + 1;
+                        //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+                    }
+                }
+            }
+            string HWei = "";      //灏炬暟
+            string HBarCode = "";
+            string HBarCodeType = "";
+            Int64 HMaterID = 0;
+            Int64 HAuxPropID = 0;
+            Int64 HUnitID = 0;
+            double HQty2 = 0;
+            string HBatchNo2 = "";
+            Int64 HSupID = 0;
+            Int64 HGroupID = 0;
+            int HPrintQty = 0;
+            Int64 HSourceInterID = 0;
+            Int64 HSourceEntryID = 0;
+            string HSourceBillNo = "";
+            string HSourceBillType = "";
+            Int64 HBarcodeNo = 0;       //鎵樺彿
+            Int64 HBarcodeQtys = 0;     //鎬绘墭鏁�
+            Int64 HDeptID = 0;
+            Int64 HWhID = 0;
+            Int64 HSPID = 0;
+            string HRemark = "";
+            string HMaterName = "";
+            string HMaterModel = "";
+            string HPinfan = "";
+            string HMTONo = "";
+            Int64 HCusID = 0;
+            string HCusType = "";
+            DateTime HEndDate;
+            string HWorkLineName = "";
+            string HSeOrderBillNo = "";
+            string HInnerBillNo = "";
+            bool HGiveAwayFlag = false;
+            try
+            {
+                oCn.BeginTran();
+                for (int i = 0; i < grdSub.Rows.Count; i++)
+                {
+                    if (ClsPub.isLong(grdSub.Rows[i].Cells[HMaterID2Col].Value) != 0)
+                    {
+                        HWei = ClsPub.isStrNull(grdSub.Rows[i].Cells[HWeiCol].Value);
+                        HBarCode = ClsPub.isStrNull(grdSub.Rows[i].Cells[HTMCol].Value);
+                        //
+                        HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
+                        if (CampanyName == "鍗氭棩绉戞妧" || CampanyName == "澶忓疂鐢靛櫒")
+                        {
+                            HBarCodeType = "鍞竴鏉$爜";
+                        }
+                        //
+                        HMaterID = ClsPub.isLong(grdSub.Rows[i].Cells[HMaterID2Col].Value);
+                        HAuxPropID = ClsPub.isLong(grdSub.Rows[i].Cells[HAuxPropID2Col].Value);
+                        HUnitID = ClsPub.isLong(grdSub.Rows[i].Cells[HUnitID2Col].Value);
+                        HQty2 = ClsPub.isDoule(grdSub.Rows[i].Cells[HQty2Col].Value);
+                        HBatchNo2 = ClsPub.isStrNull(grdSub.Rows[i].Cells[HBatchNo2Col].Value);
+                        HSourceInterID = ClsPub.isLong(grdSub.Rows[i].Cells[HSourceInterID2Col].Value);
+                        HSourceEntryID = ClsPub.isLong(grdSub.Rows[i].Cells[HSourceEntryID2Col].Value);
+                        HSourceBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSourceBillNo2Col].Value);
+                        HSourceBillType = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSourceBillType2Col].Value);
+                        HBarcodeQtys = ClsPub.isLong(grdSub.Rows[i].Cells[HBarcodeQtysCol].Value);
+                        HBarcodeNo = ClsPub.isLong(grdSub.Rows[i].Cells[HBarcodeNoCol].Value);
+                        HSupID = ClsPub.isLong(grdSub.Rows[i].Cells[HSupID2Col].Value);
+                        HDeptID = ClsPub.isLong(grdSub.Rows[i].Cells[HDeptID2Col].Value);
+                        HWhID = ClsPub.isLong(grdSub.Rows[i].Cells[HWhID2Col].Value);
+                        HSPID = ClsPub.isLong(grdSub.Rows[i].Cells[HSPID2Col].Value);
+                        HRemark = ClsPub.isStrNull(grdSub.Rows[i].Cells[HRemark2Col].Value);
+                        HMaterName = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterName2Col].Value);
+                        HMaterModel = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterModel2Col].Value);
+                        HPinfan = ClsPub.isStrNull(grdSub.Rows[i].Cells[HPinfan2Col].Value);
+                        HMTONo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMTONo2Col].Value);
+                        HCusID = ClsPub.isLong(grdSub.Rows[i].Cells[HCusID2Col].Value);
+                        HCusType = ClsPub.isStrNull(grdSub.Rows[i].Cells[HCusType2Col].Value);
+                        HEndDate = ClsPub.isDate(grdSub.Rows[i].Cells[HEndDate2Col].Value);
+                        HWorkLineName = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSourceName2Col].Value);
+                        HSeOrderBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSeOrderBillNo2Col].Value);
+                        HInnerBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HInnerBillNo2Col].Value);
+                        HGiveAwayFlag = ClsPub.isBool(grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value);
+
+                        oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+                                    ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
+                                    ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
+                                    ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
+                                    ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID " +
+                                    ",HGiveAwayFlag " +
+                                    ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
+                                    ") values ("
+                                    + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
+                                    + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
+                                    + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
+                                    + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+                                    + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
+                                    + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString()
+                                    + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
+                                    + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
+
+
+                        //HNumber = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterID2Col].Value);
+                        //if (cmbHBarCodeType.Text == "鍞竴鏉$爜")
+                        //{
+                        //    if (CampanyName == "鍗撳姏") //绯荤粺鍙傛暟  瀹㈡埛瀹氬埗鍖栧悕绉�
+                        //    {
+                        //        //鏉$爜鍓嶇紑 = 鐗╂枡浠g爜 + 骞� + 鏈� + 鏃�
+                        //        sTMNumber = HNumber + sYear + sPeriod + sDay; 
+                        //    }
+                        //    else if (CampanyName == "椋為緳")
+                        //    {
+                        //        string HWorksNumber = "";
+                        //        HWorksNumber = cmbHWorksNumber.Text;
+                        //        if (HWorksNumber == "")
+                        //        {
+                        //            MessageBox.Show("宸ュ巶浠g爜涓嶈兘涓虹┖锛�");
+                        //            return;
+                        //        }
+                        //        //鏉$爜鍓嶇紑 = 宸ュ巶浠g爜 + 鐗╂枡鍐呯爜 + 鏃ユ湡
+                        //        sTMNumber = HWorksNumber + HNumber + sYear + sPeriod + sDay; 
+                        //    }
+                        //    else  //閫氱敤鏂规硶
+                        //    {
+                        //        //鏉$爜鍓嶇紑 = 缁勭粐浠g爜 + 鐗╂枡浠g爜 + 骞� + 鏈� + 鏃�
+                        //        sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay; 
+                        //    }
+                        //}
+                        //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+                    }
+                }
+                //澧炲姞 鏉$爜瓒呰繃鏈敓鎴愬姛鑳芥帶鍒�
+
+                //
+                oCn.Commit();
+                MessageBox.Show("鏉$爜鐢熸垚瀹屾瘯锛�");
+                //grdSub.RowCount = 0;
+                tabControl1.SelectedIndex = 3;
+            }
+            catch (Exception e)
+            {
+                oCn.RollBack();
+                MessageBox.Show("鏉$爜鐢熸垚澶辫触锛�" + e.Message);
+                grdSub.RowCount = 0;
+            }
+        }
+
+        #endregion 
+
+
+        #region 绐椾綋澶勭悊鏂规硶
+        //鍒濆鍖朑RID
+        private void initGrid()
+        {
+            //
+            grdMain.RowCount = 0;
+            grdSub.RowCount = 0;
+            grdMain.ColumnCount = 68;                       //鎬诲垪鏁�
+            DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
+            grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
+            grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
+            grdMain.Columns[HSubIDCol].HeaderText = "婧愬崟瀛怚D";
+            grdMain.Columns[HBillNoCol].HeaderText = "婧愬崟鍗曞彿";
+            grdMain.Columns[HBillTypeCol].HeaderText = "鍗曟嵁绫诲瀷";
+            grdMain.Columns[HMaterIDCol].HeaderText = "鐗╂枡ID";
+            grdMain.Columns[HMaterNumberCol].HeaderText = "鐗╂枡浠g爜";
+            grdMain.Columns[HMaterNameCol].HeaderText = "鐗╂枡鍚嶇О";
+            grdMain.Columns[HMaterModelCol].HeaderText = "瑙勬牸鍨嬪彿";
+            grdMain.Columns[HModelCol].HeaderText = "鑷畾涔夎鏍�";
+            grdMain.Columns[HPinfanCol].HeaderText = "鍝佺暘";
+            grdMain.Columns[HPinfanBarCodeCol].HeaderText = "HPinfanBarCode";
+            grdMain.Columns[HAuxPropIDCol].HeaderText = "杈呭姪灞炴�D";
+            grdMain.Columns[HAuxPropNumberCol].HeaderText = "杈呭姪灞炴�т唬鐮�";
+            grdMain.Columns[HAuxPropNameCol].HeaderText = "杈呭姪灞炴�у悕绉�";
+            grdMain.Columns[HUnitIDCol].HeaderText = "璁¢噺鍗曚綅ID";
+            grdMain.Columns[HUnitNumberCol].HeaderText = "璁¢噺鍗曚綅浠g爜";
+            grdMain.Columns[HUnitNameCol].HeaderText = "璁¢噺鍗曚綅鍚嶇О";
+            grdMain.Columns[HBarCodeTypeCol].HeaderText = "鏉$爜绫诲瀷";
+            grdMain.Columns[HBatchManagerCol].HeaderText = "鏄惁鍚敤鎵规";
+            grdMain.Columns[HBatchNoCol].HeaderText = "鎵瑰彿";
+            grdMain.Columns[HGiveAwayFlagCol].HeaderText = "鏄惁璧犲搧";
+            grdMain.Columns[HQtyCol].HeaderText = "鏁伴噺";
+            grdMain.Columns[HMinQtyCol].HeaderText = "鏈�灏忓寘瑁呮暟";
+            grdMain.Columns[HPackQtyCol].HeaderText = "澶栫鏁�";
+            grdMain.Columns[HBQtyCol].HeaderText = "绠辨暟";
+            grdMain.Columns[HSupIDCol].HeaderText = "渚涘簲鍟咺D";
+            grdMain.Columns[HSupNumberCol].HeaderText = "渚涘簲鍟嗕唬鐮�";
+            grdMain.Columns[HSupNameCol].HeaderText = "渚涘簲鍟�";
+            grdMain.Columns[HDeptIDCol].HeaderText = "杞﹂棿ID";
+            grdMain.Columns[HDeptNumberCol].HeaderText = "杞﹂棿浠g爜";
+            grdMain.Columns[HDeptNameCol].HeaderText = "杞﹂棿";
+            grdMain.Columns[HWhIDCol].HeaderText = "浠撳簱ID";
+            grdMain.Columns[HWhNumberCol].HeaderText = "浠撳簱浠g爜";
+            grdMain.Columns[HWhNameCol].HeaderText = "浠撳簱";
+            grdMain.Columns[HSPIDCol].HeaderText = "浠撲綅ID";
+            grdMain.Columns[HSPNumberCol].HeaderText = "浠撲綅浠g爜";
+            grdMain.Columns[HSPNameCol].HeaderText = "浠撲綅";
+            grdMain.Columns[HInstructNoCol].HeaderText = "鎸囦护鍗曞彿";
+            grdMain.Columns[HSeOrderBillNoCol].HeaderText = "閿�鍞鍗曞彿";
+            grdMain.Columns[HSeOrderSEQCol].HeaderText = "閿�鍞鍗曡鍙�";
+            grdMain.Columns[HDateCol].HeaderText = "杩涙枡鏃ユ湡";
+            grdMain.Columns[HRemarkCol].HeaderText = "澶囨敞";
+            grdMain.Columns[HMTONoCol].HeaderText = "璁″垝璺熻釜鍙�";
+            grdMain.Columns[HCusIDCol].HeaderText = "瀹㈡埛ID";
+            grdMain.Columns[HCusNumberCol].HeaderText = "瀹㈡埛浠g爜";
+            grdMain.Columns[HCusNameCol].HeaderText = "瀹㈡埛";
+            grdMain.Columns[HCusTypeCol].HeaderText = "瀹㈡埛鍨嬪彿";
+            grdMain.Columns[HEndDateCol].HeaderText = "璁″垝瀹屽伐鏃ユ湡";
+            grdMain.Columns[HSourceIDCol].HeaderText = "鐢熶骇绾縄D";
+            grdMain.Columns[HSourceNumberCol].HeaderText = "鐢熶骇绾夸唬鐮�";
+            grdMain.Columns[HSourceNameCol].HeaderText = "鐢熶骇绾�";
+            grdMain.Columns[HShowDateCol].HeaderText = "鏃ユ湡";
+            grdMain.Columns[HInnerBillNoCol].HeaderText = "鍐呴儴閲囪喘璁㈠崟鍙�";
+            grdMain.Columns[HMakerCol].HeaderText = "鍒跺崟浜�";
+            grdMain.Columns[HProduceDateCol].HeaderText = "鐢熶骇鏃ユ湡";
+            grdMain.Columns[HExpiryDateCol].HeaderText = "鏈夋晥鏈熻嚦";
+            grdMain.Columns[HISKFPERIODCol].HeaderText = "鏄惁鍚敤淇濊川鏈�";
+            grdMain.Columns[HEXPUNITCol].HeaderText = "淇濊川鏈熷崟浣�";
+            grdMain.Columns[HEXPPERIODCol].HeaderText = "淇濊川鏈�";
+            ////
+            //鏍煎紡鍖� 
+            grdMain.Columns[HTagCol].Visible = false;                           //闅愯棌鍒�
+            grdMain.Columns[HMainIDCol].Visible = false;
+            grdMain.Columns[HSubIDCol].Visible = false;
+            grdMain.Columns[HBillTypeCol].Visible = false;
+            grdMain.Columns[HMaterIDCol].Visible = false;
+            grdMain.Columns[HModelCol].Visible = false;
+            //grdMain.Columns[HBatchNoCol].Visible = false;
+            grdMain.Columns[HAuxPropIDCol].Visible = false;
+            //grdMain.Columns[HAuxPropNumberCol].Visible = false;
+            //grdMain.Columns[HAuxPropNameCol].Visible = false;
+            grdMain.Columns[HUnitIDCol].Visible = false;
+            grdMain.Columns[HinitQtyCol].Visible = false;
+            grdMain.Columns[HSupIDCol].Visible = false;
+            grdMain.Columns[HSupNumberCol].Visible = false;
+            grdMain.Columns[HSupNameCol].Visible = false;
+            grdMain.Columns[HDeptIDCol].Visible = false;
+            grdMain.Columns[HDeptNumberCol].Visible = false;
+            grdMain.Columns[HDeptNameCol].Visible = false;
+            grdMain.Columns[HWhIDCol].Visible = false;
+            grdMain.Columns[HWhNumberCol].Visible = false;
+            grdMain.Columns[HWhNameCol].Visible = false;
+            grdMain.Columns[HSPIDCol].Visible = false;
+            grdMain.Columns[HSPNumberCol].Visible = false;
+            grdMain.Columns[HSPNameCol].Visible = false;
+            grdMain.Columns[HSourceInterIDCol].Visible = false;
+            grdMain.Columns[HSourceEntryIDCol].Visible = false;
+            grdMain.Columns[HSourceBillNoCol].Visible = false;
+            grdMain.Columns[HSourceBillTypeCol].Visible = false;
+            grdMain.Columns[HInstructIDCol].Visible = false;
+            grdMain.Columns[HInstructNoCol].Visible = false;
+            grdMain.Columns[HSeOrderBillIDCol].Visible = false;
+            //grdMain.Columns[HSeOrderBillNoCol].Visible = false;
+            grdMain.Columns[HBarCodeTypeCol].Visible = false;
+            grdMain.Columns[HBatchManagerCol].Visible = false;
+            //grdMain.Columns[HDateCol].Visible = false;
+            grdMain.Columns[HPinfanCol].Visible = false;
+            grdMain.Columns[HPinfanBarCodeCol].Visible = false;
+            grdMain.Columns[HCusIDCol].Visible = false;
+            //grdMain.Columns[HCusNumberCol].Visible = false;
+            //grdMain.Columns[HCusNameCol].Visible = false;
+            grdMain.Columns[HCusTypeCol].Visible = false;
+            grdMain.Columns[HEndDateCol].Visible = false;
+            grdMain.Columns[HSourceIDCol].Visible = false;
+            grdMain.Columns[HSourceNumberCol].Visible = false;
+            grdMain.Columns[HSourceNameCol].Visible = false;
+            //grdMain.Columns[HProduceDateCol].Visible = false;
+            //grdMain.Columns[HExpiryDateCol].Visible = false;
+            grdMain.Columns[HISKFPERIODCol].Visible = false;
+            grdMain.Columns[HEXPUNITCol].Visible = false;
+            grdMain.Columns[HEXPPERIODCol].Visible = false;
+
+            //璁剧疆鍙紪杈戝垪
+            string sAllowCol = HQtyCol.ToString() +
+                                "," + HMinQtyCol.ToString() +
+                                "," + HMaterNumberCol.ToString() +
+                                "," + HAuxPropNumberCol.ToString() +
+                                "," + HUnitNumberCol.ToString() +
+                                "," + HSeOrderBillNoCol.ToString() +
+                                "," + HBatchNoCol.ToString() +
+                                "," + HCusNumberCol.ToString() +
+                                "," + HPackQtyCol.ToString() +
+                                "," + HRemarkCol.ToString();
+            //璁剧疆鍚堣鍒�
+            string sTotalCol = HQtyCol.ToString();
+
+            //璁剧疆鐗规畩鍒�
+            for (int i = 0; i < grdMain.Rows.Count; i++)
+            {
+                //缃戞牸鎵撳嬀
+                DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+                oCell.ThreeState = false;
+                oCell.Value = 0;
+                oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+                grdMain.Rows[i].Cells[HGiveAwayFlagCol] = oCell;
+            }
+            //
+
+            DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid);
+            //----------------------------
+
+            grdSub.ColumnCount = 65;                       //鎬诲垪鏁�
+            DBUtility.Xt_BaseBillFun.initGridFst(grdSub, this.Name);
+            grdSub.Columns[HSelectCol].HeaderText = "閫夋嫨";
+            grdSub.Columns[HTMCol].HeaderText = "鏉$爜缂栧彿";
+            grdSub.Columns[HBarCodeType2Col].HeaderText = "鏉$爜绫诲瀷";
+            grdSub.Columns[HSno2Col].HeaderText = "搴忓彿";
+            grdSub.Columns[HMaterID2Col].HeaderText = "鐗╂枡ID";
+            grdSub.Columns[HMaterNumber2Col].HeaderText = "鐗╂枡浠g爜";
+            grdSub.Columns[HMaterName2Col].HeaderText = "鐗╂枡鍚嶇О";
+            grdSub.Columns[HMaterModel2Col].HeaderText = "瑙勬牸鍨嬪彿";
+            grdSub.Columns[HModel2Col].HeaderText = "鑷畾涔夎鏍�";
+            grdSub.Columns[HAuxPropID2Col].HeaderText = "杈呭姪灞炴�D";
+            grdSub.Columns[HAuxPropNumber2Col].HeaderText = "杈呭姪灞炴�т唬鐮�";
+            grdSub.Columns[HAuxPropName2Col].HeaderText = "杈呭姪灞炴��";
+            grdSub.Columns[HPinfan2Col].HeaderText = "鍝佺暘";
+            grdSub.Columns[HPinfanBarCode2Col].HeaderText = "HPinfanBarCode";
+            grdSub.Columns[HBatchNo2Col].HeaderText = "鎵瑰彿";
+            grdSub.Columns[HGiveAwayFlag2Col].HeaderText = "鏄惁璧犲搧";
+            grdSub.Columns[HUnitID2Col].HeaderText = "璁¢噺鍗曚綅ID";
+            grdSub.Columns[HUnitNumber2Col].HeaderText = "璁¢噺鍗曚綅浠g爜";
+            grdSub.Columns[HUnitName2Col].HeaderText = "璁¢噺鍗曚綅";
+            grdSub.Columns[HQty2Col].HeaderText = "鏁伴噺";
+            grdSub.Columns[HWeiCol].HeaderText = "灏炬暟";
+            grdSub.Columns[HPrintCol].HeaderText = "鎵撳嵃娆℃暟";
+            grdSub.Columns[HSourceInterID2Col].HeaderText = "婧愬崟涓籌D";
+            grdSub.Columns[HSourceEntryID2Col].HeaderText = "婧愬崟瀛怚D";
+            grdSub.Columns[HSourceBillNo2Col].HeaderText = "婧愬崟鍗曞彿";
+            grdSub.Columns[HSourceBillType2Col].HeaderText = "婧愬崟绫诲瀷";
+            grdSub.Columns[HSeOrderBillNo2Col].HeaderText = "閿�鍞鍗曞彿";
+            grdSub.Columns[HSeOrderSEQ2Col].HeaderText = "閿�鍞鍗曡鍙�";
+            grdSub.Columns[HBarcodeNoCol].HeaderText = "鎵樺彿";
+            grdSub.Columns[HBarcodeQtysCol].HeaderText = "鎬绘墭鏁�";
+            grdSub.Columns[HSupID2Col].HeaderText = "渚涘簲鍟咺D";
+            grdSub.Columns[HSupNumber2Col].HeaderText = "渚涘簲鍟嗕唬鐮�";
+            grdSub.Columns[HSupName2Col].HeaderText = "渚涘簲鍟�";
+            grdSub.Columns[HDeptID2Col].HeaderText = "杞﹂棿ID";
+            grdSub.Columns[HDeptNumber2Col].HeaderText = "杞﹂棿浠g爜";
+            grdSub.Columns[HDeptName2Col].HeaderText = "杞﹂棿";
+            grdSub.Columns[HWhID2Col].HeaderText = "浠撳簱ID";
+            grdSub.Columns[HWhNumber2Col].HeaderText = "浠撳簱浠g爜";
+            grdSub.Columns[HWhName2Col].HeaderText = "浠撳簱";
+            grdSub.Columns[HSPID2Col].HeaderText = "浠撲綅ID";
+            grdSub.Columns[HSPNumber2Col].HeaderText = "浠撲綅浠g爜";
+            grdSub.Columns[HSPName2Col].HeaderText = "浠撲綅";
+            grdSub.Columns[HInstructNo2Col].HeaderText = "鎸囦护鍗曞彿";
+            grdSub.Columns[HDate2Col].HeaderText = "杩涙枡鏃ユ湡";
+            grdSub.Columns[HRemark2Col].HeaderText = "澶囨敞";
+            grdSub.Columns[HMTONo2Col].HeaderText = "璁″垝璺熻釜鍙�";
+            grdSub.Columns[HCusID2Col].HeaderText = "瀹㈡埛ID";
+            grdSub.Columns[HCusNumber2Col].HeaderText = "瀹㈡埛浠g爜";
+            grdSub.Columns[HCusName2Col].HeaderText = "瀹㈡埛";
+            grdSub.Columns[HCusType2Col].HeaderText = "瀹㈡埛鍨嬪彿";
+            grdSub.Columns[HEndDate2Col].HeaderText = "璁″垝瀹屽伐鏃ユ湡";
+            grdSub.Columns[HSourceID2Col].HeaderText = "鐢熶骇绾縄D";
+            grdSub.Columns[HSourceNumber2Col].HeaderText = "鐢熶骇绾夸唬鐮�";
+            grdSub.Columns[HSourceName2Col].HeaderText = "鐢熶骇绾�";
+            grdSub.Columns[HShowDate2Col].HeaderText = "鏃ユ湡";
+            grdSub.Columns[HInnerBillNo2Col].HeaderText = "鍐呴儴閲囪喘璁㈠崟鍙�";
+            grdSub.Columns[HMaker2Col].HeaderText = "鍒跺崟浜�";
+            grdSub.Columns[HEntryID2Col].HeaderText = "琛屽彿";
+            grdSub.Columns[HProduceDate2Col].HeaderText = "鐢熶骇鏃ユ湡";
+            grdSub.Columns[HExpiryDate2Col].HeaderText = "鏈夋晥鏈熻嚦";
+            grdSub.Columns[HISKFPERIOD2Col].HeaderText = "鏄惁鍚敤淇濊川鏈�";
+            grdSub.Columns[HEXPUNIT2Col].HeaderText = "淇濊川鏈熷崟浣�";
+            grdSub.Columns[HEXPPERIOD2Col].HeaderText = "淇濊川鏈�";
+            //鏍煎紡鍖� 
+            grdSub.Columns[HMaterID2Col].Visible = false;
+            grdSub.Columns[HModel2Col].Visible = false;
+            grdSub.Columns[HAuxPropID2Col].Visible = false;
+            //grdSub.Columns[HAuxPropNumber2Col].Visible = false;
+            //grdSub.Columns[HAuxPropName2Col].Visible = false;
+            grdSub.Columns[HUnitID2Col].Visible = false;
+            grdSub.Columns[HPrintCol].Visible = false;
+            grdSub.Columns[HSourceInterID2Col].Visible = false;
+            grdSub.Columns[HSourceEntryID2Col].Visible = false;
+            grdSub.Columns[HSourceBillType2Col].Visible = false;
+            grdSub.Columns[HDeptID2Col].Visible = false;
+            grdSub.Columns[HDeptNumber2Col].Visible = false;
+            grdSub.Columns[HDeptName2Col].Visible = false;
+            //grdSub.Columns[HDate2Col].Visible = false;
+            grdSub.Columns[HBarCodeType2Col].Visible = false;
+            //grdSub.Columns[HBatchNo2Col].Visible = false;
+            grdSub.Columns[HWeiCol].Visible = false;
+            grdSub.Columns[HBarcodeNoCol].Visible = false;
+            grdSub.Columns[HBarcodeQtysCol].Visible = false;
+            grdSub.Columns[HSupID2Col].Visible = false;
+            grdSub.Columns[HSupNumber2Col].Visible = false;
+            grdSub.Columns[HSupName2Col].Visible = false;
+            grdSub.Columns[HWhID2Col].Visible = false;
+            grdSub.Columns[HWhNumber2Col].Visible = false;
+            grdSub.Columns[HWhName2Col].Visible = false;
+            grdSub.Columns[HSPID2Col].Visible = false;
+            grdSub.Columns[HSPNumber2Col].Visible = false;
+            grdSub.Columns[HSPName2Col].Visible = false;
+            grdSub.Columns[HInstructID2Col].Visible = false;
+            grdSub.Columns[HInstructNo2Col].Visible = false;
+            grdSub.Columns[HSeOrderBillID2Col].Visible = false;
+            //grdSub.Columns[HSeOrderBillNo2Col].Visible = false;
+            grdSub.Columns[HPinfan2Col].Visible = false;
+            grdSub.Columns[HPinfanBarCode2Col].Visible = false;
+            grdSub.Columns[HCusID2Col].Visible = false;
+            //grdSub.Columns[HCusNumber2Col].Visible = false;
+            //grdSub.Columns[HCusName2Col].Visible = false;
+            grdSub.Columns[HCusType2Col].Visible = false;
+            grdSub.Columns[HEndDate2Col].Visible = false;
+            grdSub.Columns[HSourceID2Col].Visible = false;
+            grdSub.Columns[HSourceNumber2Col].Visible = false;
+            grdSub.Columns[HSourceName2Col].Visible = false;
+
+            //璁剧疆鐗规畩鍒�
+            for (int i = 0; i < grdSub.Rows.Count; i++)
+            {
+                //缃戞牸鎵撳嬀
+                //鏄惁璧犲搧
+                DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+                oCell.ThreeState = false;
+                oCell.Value = 0;
+                oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+                grdSub.Rows[i].Cells[HGiveAwayFlag2Col] = oCell;
+                //鏄惁鍚敤淇濊川鏈�
+                DataGridViewCheckBoxCell oCell2 = new DataGridViewCheckBoxCell();
+                oCell2.ThreeState = false;
+                oCell2.Value = 0;
+                oCell2.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+                grdSub.Rows[i].Cells[HISKFPERIOD2Col] = oCell2;
+            }
+
+            DBUtility.Xt_BaseBillFun.GetGrid(grdMain, this.Name);
+            DBUtility.Xt_BaseBillFun.GetGrid(grdSub, this.Name + "grdSub");
+            grdSub.SelectionMode = DataGridViewSelectionMode.FullRowSelect;                     //閫夎妯″紡
+
+            ////
+            DBUtility.Xt_BaseBillFun.initGridList(grdList, this.Name + "grdList");
+            DBUtility.Xt_BaseBillFun.initGridList(grdBillBarCodeList, this.Name + "grdBillBarCodeList");
+            ////
+        }
+
+        //鍏紡閲嶇畻
+        private void RowCount(int sRow, int sTag)
+        {
+            if (sTag == 0)
+            {
+                //绠辨暟鍒�=鏁伴噺/鏈�灏忓寘瑁呮暟
+                double sMoney = 0;
+                if (ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value) == 0)
+                {
+                    sMoney = 0;
+                }
+                else
+                {
+                    sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
+                }
+                sMoney = Math.Ceiling(sMoney);
+                grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
+            }
+            else
+            {
+
+            }
+            //if (ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) > ClsPub.isDoule(grdMain.Rows[sRow].Cells[HinitQtyCol].Value)
+            //    && ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HBillNoCol].Value) != "")
+            //{
+            //    MessageBox.Show("鎵�杈撳叆鐨勪骇鍝佹�绘暟閲忓ぇ浜庡墿浣欏彲鐢熸垚鏁伴噺" + ClsPub.isDoule(grdMain.Rows[sRow].Cells[HinitQtyCol].Value) + "锛岃閲嶆柊杈撳叆锛�");
+            //    grdMain.Rows[sRow].Cells[HQtyCol].Value = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HinitQtyCol].Value);
+            //    return;
+            //}
+        }
+
+        //鏍稿閫夋嫨鐨勫唴瀹�
+        public bool CheckGridCell(Cell oCell)
+        {
+            int Row;
+            int Col;
+            Row = oCell.Row;
+            Col = oCell.Col;
+            //if (ClsPub.isStrNull(grdMain.get_TextMatrix(Row, HTagCol)) != "*")
+            //{
+            //    return true;
+            //}
+            //grdMain.Redraw = VSFlex7.RedrawSettings.flexRDNone;
+            //鍒ゆ柇閫変腑鍒�
+            if (Col == HMaterNumberCol)  //鐗╂枡浠g爜鍒�
+            {
+                //ClsGy_MaterialHlp oMate = new ClsGy_MaterialHlp();
+                //if (oMate.GetInfoByID(ClsPub.isLong(grdMain.Rows[Row].Cells[HMaterIDCol].Value)))
+                //{
+                //    grdMain.Rows[Row].Cells[HMaterIDCol].Value = oMate.HItemID.ToString();
+                //    grdMain.Rows[Row].Cells[HMaterNumberCol].Value = oMate.HNumber;
+                //    grdMain.Rows[Row].Cells[HMaterNameCol].Value = oMate.HName;
+                //    //grdMain.Rows[Row].Cells[HMaterModelCol].Value = oMate.HModel;
+                //}
+                //else
+                //{
+                //    grdMain.Rows[Row].Cells[HMaterIDCol].Value = "";
+                //    grdMain.Rows[Row].Cells[HMaterNumberCol].Value = "";
+                //    grdMain.Rows[Row].Cells[HMaterNameCol].Value = "";
+                //    //grdMain.Rows[Row].Cells[HMaterModelCol].Value = "";
+                return false;
+                //}
+            }
+            else if (Col == HUnitIDCol)  //鍗曚綅ID鍒�
+            {
+                //ClsGy_UnitHlp oUn = new ClsGy_UnitHlp();
+                //if (oUn.GetInfoByID(ClsPub.isLong(grdMain.Rows[Row].Cells[HUnitIDCol])))
+                //{
+                //    grdMain.Rows[Row].Cells[HUnitIDCol].Value = oUn.HItemID.ToString();
+                //    grdMain.Rows[Row].Cells[HUnitNameCol].Value = oUn.HName;
+                //}
+                //else
+                //{
+                //    grdMain.Rows[Row].Cells[HUnitIDCol].Value = "";
+                //    grdMain.Rows[Row].Cells[HUnitNameCol].Value = "";
+                return false;
+                //}
+            }
+            else //鍏朵粬鍒�
+            {
+            }
+            // 
+            //
+            grdMain.Rows[Row].Cells[HTagCol].Value = "*";
+            oSumGrid.EditStatus = false;
+            return true;
+        }
+        //鏄惁鏄┖琛�
+        private bool IsNullRow(int Row)
+        {
+            return DBUtility.Xt_BaseBillFun.IsNullRow(Row, HMaterIDCol, grdMain);
+        }
+        //'鍒ゆ柇缃戞牸琛岀殑褰曞叆鏄惁姝g‘
+        private bool CheckGridRow(int Row)
+        {
+            Cell oCell = new Cell();
+            int c = 0;
+            //if (ClsPub.isStrNull(grdMain.get_TextMatrix(Row, HTagCol)) != "*")
+            //{
+            //    return true;
+            //}
+            //
+            for (c = 0; c < grdMain.ColumnCount; c++)
+            {
+                oCell.Row = Row;
+                oCell.Col = c;
+                //if (!CheckGridCell(oCell))
+                //    return false;
+
+            }
+            return true;
+        }
+        //甯姪鍑芥暟
+        private void Sub_GridKey(int sKeyCode, int sRow, int sCol, DataGridViewTextBoxEditingControl oEdit)
+        {
+            DataSet oDs = new DataSet();
+            DataSet oDs2 = new DataSet();
+            long sHMaterID = 0;
+            long sHAuxPropID = 0;
+            long sHOrgID = -1;
+            string sWhere = "";
+
+            DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+            if (oClsGy_ORGANIZATIONS_View.GetInfoByName(cmbHOrgID.Text))
+            {
+                sHOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID;
+            }
+            if (sHOrgID == -1)
+            {
+                MessageBox.Show("閫夋嫨缁勭粐鏈夐敊璇紒");
+                return;
+            }
+            DAL.ClsIF_Material_View oMater = new DAL.ClsIF_Material_View();//鐗╂枡
+            DAL.ClsIF_Unit_View oUnit = new DAL.ClsIF_Unit_View();//璁¢噺鍗曚綅
+            DAL.ClsIF_Property_View oProperty = new DAL.ClsIF_Property_View();//杈呭姪灞炴��
+            if (!grdStatus)
+            {
+                return;
+            }
+            //if (oSumGrid.FindAllowEditCol(sCol))
+            //{
+            oSumGrid.EditStatus = true;
+            //}
+            //else
+            //{
+            //    return;
+            //}
+            switch (sKeyCode)
+            {
+                case 118:          //F7
+                    {
+                        switch (sCol)
+                        {
+                            case HMaterNumberCol:
+                                oMater.WherePart = "";
+                                sWhere = " and HUSEORGID = " + sHOrgID;
+                                if (oMater.RefreshViewForBig(sWhere))
+                                {
+                                    if (oMater.GetInfoByID(oMater.oModel.HItemID))
+                                    {
+                                        grdMain.Rows[sRow].Cells[HMaterIDCol].Value = oMater.omodel.HItemID.ToString();
+                                        grdMain.Rows[sRow].Cells[HMaterNumberCol].Value = oMater.omodel.HNumber;
+                                        grdMain.Rows[sRow].Cells[HMaterNameCol].Value = oMater.omodel.HName;
+                                        grdMain.Rows[sRow].Cells[HMaterModelCol].Value = oMater.omodel.HModel;
+                                        grdMain.Rows[sRow].Cells[HMinQtyCol].Value = oMater.omodel.HQtyMin;
+                                        grdMain.Rows[sRow].Cells[HDateCol].Value = dtpHDate.Value.ToShortDateString();
+                                        grdMain.Rows[sRow].Cells[HShowDateCol].Value = dtpHDate.Value.ToShortDateString();
+                                        grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+                                        grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+                                        grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
+                                        if (oUnit.GetInfoByID(oMater.omodel.HUnitID))
+                                        {
+                                            grdMain.Rows[sRow].Cells[HUnitIDCol].Value = oUnit.omodel.HItemID.ToString();
+                                            grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = oUnit.omodel.HNumber;
+                                            grdMain.Rows[sRow].Cells[HUnitNameCol].Value = oUnit.omodel.HName;
+                                        }
+                                        else
+                                        {
+                                            grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
+                                            grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
+                                            grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
+                                        }
+                                        if (CampanyName == "涓帶")
+                                        {
+                                            grdMain.Rows[sRow].Cells[HQtyCol].Value = oMater.omodel.HQtyMin;
+                                            grdMain.Rows[sRow].Cells[HBQtyCol].Value = 1;
+                                        }
+                                        oEdit.Text = oMater.omodel.HNumber;
+                                    }
+                                    else
+                                    {
+                                        grdMain.Rows[sRow].Cells[HMaterIDCol].Value = 0;
+                                        grdMain.Rows[sRow].Cells[HMaterNumberCol].Value = "";
+                                        grdMain.Rows[sRow].Cells[HMaterNameCol].Value = "";
+                                        grdMain.Rows[sRow].Cells[HMaterModelCol].Value = "";
+                                        grdMain.Rows[sRow].Cells[HMinQtyCol].Value = 0;
+                                        grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
+                                        grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
+                                        grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
+                                        grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+                                        grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+                                        grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
+                                    }
+                                }
+                                else
+                                {
+                                    grdMain.Rows[sRow].Cells[HMaterIDCol].Value = 0;
+                                    grdMain.Rows[sRow].Cells[HMaterNumberCol].Value = "";
+                                    grdMain.Rows[sRow].Cells[HMaterNameCol].Value = "";
+                                    grdMain.Rows[sRow].Cells[HMaterModelCol].Value = "";
+                                    grdMain.Rows[sRow].Cells[HMinQtyCol].Value = 0;
+                                    grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
+                                    grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
+                                    grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
+                                    grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+                                    grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+                                    grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
+                                }
+                                break;
+
+                            case HUnitNumberCol:
+                                oUnit.WherePart = "";
+                                if (oUnit.RefreshView())
+                                {
+                                    grdMain.Rows[sRow].Cells[HUnitIDCol].Value = oUnit.oModel.HItemID.ToString();
+                                    grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = oUnit.oModel.HNumber;
+                                    grdMain.Rows[sRow].Cells[HUnitNameCol].Value = oUnit.oModel.HName;
+                                    EditingControl.Text = oUnit.oModel.HNumber;
+                                }
+                                else
+                                {
+                                    grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
+                                    grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
+                                    grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
+                                }
+                                break;
+
+                            case HDeptNumberCol:
+                                BLL.ClsBaseSelect_InterFace.SetGridByDept(grdMain, sRow, HDeptIDCol, HDeptNumberCol, HDeptNameCol);
+                                oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HDeptNumberCol].Value);
+                                break;
+
+                            case HCusNumberCol:
+                                BLL.ClsBaseSelect_InterFace.SetGridByCus(grdMain, sRow, HCusIDCol, HCusNumberCol, HCusNameCol);
+                                oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HCusNumberCol].Value);
+                                break;
+
+                            case HDateCol:
+                                BLL.ClsPub_BLL.Sub_SelectDate(grdMain, sRow, HDateCol);
+                                oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HDateCol].Value);
+                                break;
+
+                            case HAuxPropNumberCol:
+                                oProperty.WherePart = "";
+                                if (ERPMode == "CLOUD")
+                                {
+                                    sWhere = " and HMaterNumber = '" + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[HMaterNumberCol].Value) + "'";
+                                }
+                                else
+                                {
+                                    sWhere = "";
+                                }
+                                if (oProperty.RefreshView(sWhere))
+                                {
+                                    grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = oProperty.oModel.HItemID.ToString();
+                                    grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = oProperty.oModel.HNumber;
+                                    grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = oProperty.oModel.HName;
+                                    oEdit.Text = oProperty.oModel.HNumber;
+                                }
+                                else
+                                {
+                                    grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+                                    grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+                                    grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
+                                }
+                                break;
+
+
+                            default:
+                                break;
+                        }
+                        bc.Enabled = true;
+                        break;
+                    }
+                case 117:  //F6
+                    {
+                        switch (sCol)
+                        {
+
+
+                            default:
+                                break;
+                        }
+                        break;
+                    }
+                default:
+                    break;
+            }
+        }
+
+        //閫夊師鍗�
+        private void cmdSourceBillNo_Click(object sender, EventArgs e)
+        {
+            DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+            if (oClsGy_ORGANIZATIONS_View.GetInfoByName(cmbHOrgID.Text))
+            {
+                HOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID;
+            }
+            if (HOrgID == -1)
+            {
+                MessageBox.Show("閫夋嫨缁勭粐鏈夐敊璇紒");
+                return;
+            }
+
+            if (cmbSourceBillType.Text.Trim() == "鐢熶骇璁㈠崟")
+            {
+                string sWhere = "";
+                //绯荤粺鍙傛暟锛岀敓鎴愭潯鐮佹暟閲忓彲鍚﹁秴婧愬崟鏁伴噺鎺у埗锛圢涓轰笉鍙秴婧愬崟鏁伴噺锛�
+                if (SourceQtyCtl == "N")
+                {
+                    sWhere = " and HOrgID =" + HOrgID.ToString() + " and 浠诲姟鏁伴噺>0";
+                }
+                else
+                {
+                    sWhere = " and HOrgID =" + HOrgID.ToString();
+                }
+
+                DAL.Cls_S_IFCLD_ICMOList oIFCLD_ICMOList = new DAL.Cls_S_IFCLD_ICMOList();
+                if (oIFCLD_ICMOList.Refresh(sWhere))  //閫夋嫨鍘熷崟
+                {
+                    FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
+                }
+            }
+            else if (cmbSourceBillType.Text.Trim() == "鐢熶骇姹囨姤鍗�")
+            {
+                string sWhere = " and HOrgID =" + HOrgID.ToString();
+                DAL.Cls_S_IF_ICMOReportBillList oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList();
+                if (oIF_ICMOReportBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
+                {
+                    FillSelectData(oIF_ICMOReportBillList.oBillSelectColl);
+                }
+            }
+            else if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�")
+            {
+                string sWhere = " and HOrgID =" + HOrgID.ToString();
+                DAL.Cls_S_IF_POInStockBillList oIF_POInStockBillList = new DAL.Cls_S_IF_POInStockBillList();
+                if (oIF_POInStockBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
+                {
+                    FillSelectData(oIF_POInStockBillList.oBillSelectColl);
+                }
+            }
+            else if (cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟")
+            {
+                string sWhere = " and HOrgID =" + HOrgID.ToString();
+                DAL.Cls_S_IF_POOrderBillList oIF_POOrderBillList = new DAL.Cls_S_IF_POOrderBillList();
+                if (oIF_POOrderBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
+                {
+                    FillSelectData(oIF_POOrderBillList.oBillSelectColl);
+                }
+            }
+            else if (cmbSourceBillType.Text.Trim() == "濮斿璁㈠崟")
+            {
+                string sWhere = " and HOrgID =" + HOrgID.ToString();
+                DAL.Cls_S_IF_EntrustOrderBillList oIF_EntrustOrderBillList = new DAL.Cls_S_IF_EntrustOrderBillList();
+                if (oIF_EntrustOrderBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
+                {
+                    FillSelectData(oIF_EntrustOrderBillList.oBillSelectColl);
+                }
+            }
+            else if (cmbSourceBillType.Text.Trim() == "閲囪喘鍏ュ簱鍗�")
+            {
+                string sWhere = "";
+                DAL.Cls_S_IF_POStockInBillList oIF_POStockInBillList = new DAL.Cls_S_IF_POStockInBillList();
+                if (oIF_POStockInBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
+                {
+                    FillSelectData(oIF_POStockInBillList.oBillSelectColl);
+                }
+            }
+            else if (cmbSourceBillType.Text.Trim() == "鍊掔鍗�")
+            {
+                string sWhere = "";
+                DAL.Cls_S_IF_ChangeBoxBillList oIF_ChangeBoxBillList = new DAL.Cls_S_IF_ChangeBoxBillList();
+                if (oIF_ChangeBoxBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
+                {
+                    FillSelectData(oIF_ChangeBoxBillList.oBillSelectColl);
+                }
+            }
+            else if (cmbSourceBillType.Text.Trim() == "閫�璐ч�氱煡鍗�")
+            {
+                string sWhere = "";
+                DAL.Cls_S_IF_SeOutStockBackBillList oIF_SeOutStockBackBillList = new DAL.Cls_S_IF_SeOutStockBackBillList();
+                if (oIF_SeOutStockBackBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
+                {
+                    FillSelectData(oIF_SeOutStockBackBillList.oBillSelectColl);
+                }
+            }
+            else if (cmbSourceBillType.Text.Trim() == "鍏朵粬鍏ュ簱鍗�")
+            {
+                string sWhere = " and HOrgID =" + HOrgID.ToString();
+                DAL.Cls_S_IF_OtherInBillList oIF_OtherInBillList = new DAL.Cls_S_IF_OtherInBillList();
+                if (oIF_OtherInBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
+                {
+                    FillSelectData(oIF_OtherInBillList.oBillSelectColl);
+                }
+            }
+            else if (cmbSourceBillType.Text.Trim() == "鐩存帴璋冩嫧鍗�")
+            {
+                string sWhere = " and HOrgID =" + HOrgID.ToString();
+                DAL.Cls_S_IF_MoveStockBillList oIF_MoveStockBillList = new DAL.Cls_S_IF_MoveStockBillList();
+                if (oIF_MoveStockBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
+                {
+                    FillSelectData(oIF_MoveStockBillList.oBillSelectColl);
+                }
+            }
+            else if (cmbSourceBillType.Text.Trim() == "閲囪喘閫�鏂欏崟")
+            {
+                string sWhere = " and HOrgID =" + HOrgID.ToString();
+                DAL.Cls_S_IF_POStockInBackBillList oIF_POStockInBackBillList = new DAL.Cls_S_IF_POStockInBackBillList();
+                if (oIF_POStockInBackBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
+                {
+                    FillSelectData(oIF_POStockInBackBillList.oBillSelectColl);
+                }
+            }
+            else if (cmbSourceBillType.Text.Trim() == "鐢熶骇閫�鏂欏崟")
+            {
+                string sWhere = " and HOrgID =" + HOrgID.ToString();
+                DAL.Cls_S_IF_MateOutBackBillList oIF_MateOutBackBillList = new DAL.Cls_S_IF_MateOutBackBillList();
+                if (oIF_MateOutBackBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
+                {
+                    FillSelectData(oIF_MateOutBackBillList.oBillSelectColl);
+                }
+            }
+            else if (cmbSourceBillType.Text.Trim() == "缁勮鎷嗗嵏鍗�")
+            {
+                string sWhere = " and HOrgID =" + HOrgID.ToString();
+                DAL.Cls_S_IF_PackageDismantleBillList oIF_PackageDismantleBillList = new DAL.Cls_S_IF_PackageDismantleBillList();
+                if (oIF_PackageDismantleBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
+                {
+                    FillSelectData(oIF_PackageDismantleBillList.oBillSelectColl);
+                }
+            }
+            else if (cmbSourceBillType.Text.Trim() == "宸ュ簭娴佽浆鍗�")
+            {
+                string sWhere = " and HOrgID =" + HOrgID.ToString();
+                DAL.Cls_S_IF_ProcessExchangeBillList oIF_ProcessExchangeBillList = new DAL.Cls_S_IF_ProcessExchangeBillList();
+                if (oIF_ProcessExchangeBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
+                {
+                    FillSelectData(oIF_ProcessExchangeBillList.oBillSelectColl);
+                }
+            }
+            else if (cmbSourceBillType.Text.Trim() == "宸ュ簭姹囨姤鍗�")
+            {
+                string sWhere = " and HOrgID =" + HOrgID.ToString();
+                DAL.Cls_S_IF_ProcessReportBillList oIF_ProcessReportBillList = new DAL.Cls_S_IF_ProcessReportBillList();
+                if (oIF_ProcessReportBillList.Refresh(sWhere))  //閫夋嫨鍘熷崟
+                {
+                    FillSelectData(oIF_ProcessReportBillList.oBillSelectColl);
+                }
+            }
+            else
+            {
+
+            }
+
+            //閫夋嫨婧愬崟鍚庯紝鍔犺浇璇ユ簮鍗曡褰曠墿鏂欏湪褰撳墠鏃ユ湡鐨勬潯鐮佸垪琛�
+            Display4();
+        }
+        //
+        private void FillSelectData(List<DBUtility.BillSelect> oList)
+        {
+            if (oList.Count != 1)
+            {
+                MessageBox.Show("璇烽�夋嫨涓�鏉℃暟鎹�!");
+                return;
+            }
+
+
+            DataSet Ds;
+            oSumGrid.Changelock = true;
+            initGrid();
+            int i = -1;
+            foreach (DBUtility.BillSelect oSelectRow in oList)
+            {
+                i = i + 1;
+                //鐢熶骇璁㈠崟
+                if (oSelectRow.BillType == "3710")
+                {
+                    grdMain.Rows.Add();
+                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
+                    //寰楀埌淇℃伅
+                    Ds = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_ICMOBillList " + oSelectRow.BillMainID.ToString() + "," + oSelectRow.BillSubID.ToString() + ",'" + SourceQtyCtl + "'", "h_p_Gy_BarCodeBill_ICMOBillList");
+                    //Ds = oCn.RunProcReturn("select * from h_v_IFCLD_ICMOList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IFCLD_ICMOList");
+                    //鍐欏叆淇℃伅
+                    Sub_WriteInForm(Ds.Tables[0], i);
+                }
+                //鐢熶骇姹囨姤鍗�
+                if (oSelectRow.BillType == "3711")
+                {
+                    grdMain.Rows.Add();
+                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
+                    //寰楀埌淇℃伅
+                    Ds = oCn.RunProcReturn("select * from h_v_IF_ICMOReportList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ICMOReportList");
+                    //鍐欏叆淇℃伅
+                    Sub_WriteInForm1(Ds.Tables[0], i);
+                }
+                //鏀舵枡閫氱煡鍗�
+                if (oSelectRow.BillType == "1103")
+                {
+                    grdMain.Rows.Add();
+                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
+                    //寰楀埌淇℃伅
+                    Ds = oCn.RunProcReturn("select * from h_v_IF_POInStockList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POInStockList");
+                    //鍐欏叆淇℃伅
+                    Sub_WriteInForm1(Ds.Tables[0], i);
+                }
+                //閲囪喘璁㈠崟
+                if (oSelectRow.BillType == "1102")
+                {
+                    grdMain.Rows.Add();
+                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
+                    //寰楀埌淇℃伅
+                    Ds = oCn.RunProcReturn("select * from h_v_IF_POOrderList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POOrderList");
+                    //鍐欏叆淇℃伅
+                    Sub_WriteInForm1(Ds.Tables[0], i);
+                }
+                //濮斿璁㈠崟
+                if (oSelectRow.BillType == "1601")
+                {
+                    grdMain.Rows.Add();
+                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
+                    //寰楀埌淇℃伅
+                    Ds = oCn.RunProcReturn("select * from h_v_IF_EntrustOrderList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_EntrustOrderList");
+                    //鍐欏叆淇℃伅
+                    Sub_WriteInForm1(Ds.Tables[0], i);
+                }
+                //閲囪喘鍏ュ簱鍗�
+                if (oSelectRow.BillType == "1201")
+                {
+                    grdMain.Rows.Add();
+                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
+                    //寰楀埌淇℃伅
+                    Ds = oCn.RunProcReturn("select * from h_v_IF_POStockInBillList_Source where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POStockInBillList_Source");
+                    //鍐欏叆淇℃伅
+                    Sub_WriteInForm1(Ds.Tables[0], i);
+                }
+                //鍊掔鍗�
+                if (oSelectRow.BillType == "1240")
+                {
+                    grdMain.Rows.Add();
+                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
+                    //寰楀埌淇℃伅
+                    Ds = oCn.RunProcReturn("select * from h_v_IF_ChangeBoxList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ChangeBoxList");
+                    //鍐欏叆淇℃伅
+                    Sub_WriteInForm3(Ds.Tables[0], i);
+                }
+                //閫�璐ч�氱煡鍗�
+                if (oSelectRow.BillType == "1403")
+                {
+                    grdMain.Rows.Add();
+                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
+                    //寰楀埌淇℃伅
+                    Ds = oCn.RunProcReturn("select * from h_v_IF_SeOutStockBackList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_SeOutStockBackList");
+                    //鍐欏叆淇℃伅
+                    Sub_WriteInForm1(Ds.Tables[0], i);
+                }
+                //鍏朵粬鍏ュ簱鍗�
+                if (oSelectRow.BillType == "1203")
+                {
+                    grdMain.Rows.Add();
+                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
+                    //寰楀埌淇℃伅
+                    Ds = oCn.RunProcReturn("select * from h_v_IF_OtherInList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_OtherInList");
+                    //鍐欏叆淇℃伅
+                    Sub_WriteInForm1(Ds.Tables[0], i);
+                }
+                //鐩存帴璋冩嫧鍗�
+                if (oSelectRow.BillType == "1207")
+                {
+                    grdMain.Rows.Add();
+                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
+                    //寰楀埌淇℃伅
+                    Ds = oCn.RunProcReturn("select * from h_v_IF_MoveStockList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_MoveStockList");
+                    //鍐欏叆淇℃伅
+                    Sub_WriteInForm1(Ds.Tables[0], i);
+                }
+                //閲囪喘閫�鏂欏崟
+                if (oSelectRow.BillType == "1239")
+                {
+                    grdMain.Rows.Add();
+                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
+                    //寰楀埌淇℃伅
+                    Ds = oCn.RunProcReturn("select * from h_v_IF_POStockInBackList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POStockInBackList");
+                    //鍐欏叆淇℃伅
+                    Sub_WriteInForm1(Ds.Tables[0], i);
+                }
+                //鐢熶骇閫�鏂欏崟
+                if (oSelectRow.BillType == "1244")
+                {
+                    grdMain.Rows.Add();
+                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
+                    //寰楀埌淇℃伅
+                    Ds = oCn.RunProcReturn("select * from h_v_IF_MateOutBackList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_MateOutBackList");
+                    //鍐欏叆淇℃伅
+                    Sub_WriteInForm1(Ds.Tables[0], i);
+                }
+                //缁勮鎷嗗嵏鍗�
+                if (oSelectRow.BillType == "1255")
+                {
+                    grdMain.Rows.Add();
+                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
+                    //寰楀埌淇℃伅
+                    Ds = oCn.RunProcReturn("select * from h_v_IF_PackageDismantleList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_PackageDismantleList");
+                    //鍐欏叆淇℃伅
+                    Sub_WriteInForm1(Ds.Tables[0], i);
+                }
+                //宸ュ簭娴佽浆鍗�
+                if (oSelectRow.BillType == "3772")
+                {
+                    grdMain.Rows.Add();
+                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
+                    //寰楀埌淇℃伅
+                    Ds = oCn.RunProcReturn("select * from h_v_IF_ProcessExchangeList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ProcessExchangeList");
+                    //鍐欏叆淇℃伅
+                    Sub_WriteInForm1(Ds.Tables[0], i);
+                }
+                //宸ュ簭姹囨姤鍗�
+                if (oSelectRow.BillType == "3714")
+                {
+                    grdMain.Rows.Add();
+                    grdMain.Rows[i].Cells[HTagCol].Value = "*";
+                    //寰楀埌淇℃伅
+                    Ds = oCn.RunProcReturn("select * from h_v_IF_ProcessReportList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ProcessReportList");
+                    //鍐欏叆淇℃伅
+                    Sub_WriteInForm1(Ds.Tables[0], i);
+                }
+                //鍗虫椂搴撳瓨
+                if (oSelectRow.BillType == "JSKC")
+                {
+                    grdMain.Rows.Add();
+                    Application.DoEvents();
+                    //寰楀埌淇℃伅
+                    Ds = oCn.RunProcReturn("select * from h_v_KF_ICInventoryList_IF where hmaterid=" + oSelectRow.BillMainID + " and hwhid=" + oSelectRow.BillSubID + " and hspid=" + oSelectRow.SPID + " and HAuxPropID=" + oSelectRow.HAuxPropID + " and 鎵规='" + oSelectRow.BatchNo + "' and 璁″垝璺熻釜鍙�='" + oSelectRow.BillNo + "' and 鐢熶骇鏃ユ湡='" + oSelectRow.HProduceDate + "' and 鏈夋晥鏈熻嚦='" + oSelectRow.HExpiryDate + "'", "h_v_KF_ICInventoryList_IF");
+                    //鍐欏叆淇℃伅
+                    Sub_WriteInForm2(Ds.Tables[0], i);
+                }
+            }
+            //
+            oSumGrid.Changelock = false;
+            DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+
+            if (grdMain.Rows.Count > 0)
+            {
+                //鏍规嵁婧愬崟璁剧疆琛ㄥご
+                textBox_HMaterNumber.Text = grdMain.Rows[0].Cells[HMaterNumberCol].Value.ToString();
+                textBox_HMaterName.Text = grdMain.Rows[0].Cells[HMaterNameCol].Value.ToString();
+                textBox_HMaterModel.Text = grdMain.Rows[0].Cells[HMaterModelCol].Value.ToString();
+                long HMaterID = ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value.ToString());
+                Ds = oCn.RunProcReturn("select * from Gy_Material where HItemID = " + HMaterID + " and HUSEORGID =" + HOrgID, "Gy_Material");
+                if (Ds != null && Ds.Tables[0].Rows.Count > 0)
+                {
+                    string HBatchManager = Ds.Tables[0].Rows[0]["HBatchManager"].ToString();
+                    if (HBatchManager == "False")
+                    {
+                        radioButton_HIsUsingBatchNo.Checked = false;
+                    }
+                    else
+                    {
+                        radioButton_HIsUsingBatchNo.Checked = true;
+                    }
+                }
+                //璁剧疆鎵瑰彿
+                if (radioButton_HIsUsingBatchNo.Checked)
+                {
+                    grdMain.Rows[0].Cells[HBatchNoCol].Value = getBatchNo();
+                }
+            }
+        }
+        //鏍规嵁TABLE鍐欏叆鐣岄潰(鐢熶骇浠诲姟鍗�) 
+        private void Sub_WriteInForm(DataTable oTable, int i)
+        {
+            ////鍔犺浇琛ㄥご
+            //this.txtHDeptID.Tag = oTable.Rows[0]["HDeptID"].ToString();
+            //this.txtHDeptID.Text = oTable.Rows[0]["閮ㄩ棬鍚嶇О"].ToString();
+            ////鍔犺浇琛ㄤ綋
+            grdMain.Rows[i].Cells[HTagCol].Value = "*";
+            grdMain.Rows[i].Cells[HQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+            grdMain.Rows[i].Cells[HinitQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+            //
+            grdMain.Rows[i].Cells[HMainIDCol].Value = oTable.Rows[0]["hmainid"].ToString();
+            grdMain.Rows[i].Cells[HSubIDCol].Value = oTable.Rows[0]["hsubid"].ToString();
+            grdMain.Rows[i].Cells[HBillNoCol].Value = oTable.Rows[0]["鍗曟嵁鍙�"].ToString();
+            grdMain.Rows[i].Cells[HSourceBillNoCol].Value = oTable.Rows[0]["鍗曟嵁鍙�"].ToString();
+            grdMain.Rows[i].Cells[HBillTypeCol].Value = oTable.Rows[0]["HBillType"].ToString();
+            grdMain.Rows[i].Cells[HDateCol].Value = oTable.Rows[0]["鏃ユ湡"].ToString(); //鍗氭棩 鏀舵枡鍗曟嵁鏃ユ湡
+            grdMain.Rows[i].Cells[HShowDateCol].Value = dtpHDate.Value.ToShortDateString();
+            grdMain.Rows[i].Cells[HSupIDCol].Value = oTable.Rows[0]["hsupid"].ToString();
+            grdMain.Rows[i].Cells[HSupNumberCol].Value = oTable.Rows[0]["渚涘簲鍟嗕唬鐮�"].ToString();
+            grdMain.Rows[i].Cells[HSupNameCol].Value = oTable.Rows[0]["渚涘簲鍟�"].ToString();
+            grdMain.Rows[i].Cells[HDeptIDCol].Value = oTable.Rows[0]["HDeptID"].ToString();
+            grdMain.Rows[i].Cells[HDeptNumberCol].Value = oTable.Rows[0]["閮ㄩ棬浠g爜"].ToString();
+            grdMain.Rows[i].Cells[HDeptNameCol].Value = oTable.Rows[0]["閮ㄩ棬"].ToString();
+            grdMain.Rows[i].Cells[HMaterIDCol].Value = oTable.Rows[0]["HMaterID"].ToString();
+            grdMain.Rows[i].Cells[HMaterNumberCol].Value = oTable.Rows[0]["鐗╂枡浠g爜"].ToString();
+            grdMain.Rows[i].Cells[HMaterNameCol].Value = oTable.Rows[0]["鐗╂枡鍚嶇О"].ToString();
+            grdMain.Rows[i].Cells[HMaterModelCol].Value = oTable.Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+            //grdMain.Rows[i].Cells[HBatchManagerCol].Value = oTable.Rows[0]["鏄惁鍚敤鎵规"].ToString();
+            grdMain.Rows[i].Cells[HBatchNoCol].Value = oTable.Rows[0]["鎵规"].ToString();
+            grdMain.Rows[i].Cells[HUnitIDCol].Value = oTable.Rows[0]["HUnitID"].ToString();
+            grdMain.Rows[i].Cells[HUnitNumberCol].Value = oTable.Rows[0]["璁¢噺鍗曚綅浠g爜"].ToString();
+            grdMain.Rows[i].Cells[HUnitNameCol].Value = oTable.Rows[0]["璁¢噺鍗曚綅"].ToString();
+            grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["澶囨敞"].ToString();
+            grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["璁″垝璺熻釜鍙�"].ToString();
+            grdMain.Rows[i].Cells[HCusIDCol].Value = oTable.Rows[0]["HCusID"].ToString();
+            grdMain.Rows[i].Cells[HCusNumberCol].Value = oTable.Rows[0]["瀹㈡埛浠g爜"].ToString();
+            grdMain.Rows[i].Cells[HCusNameCol].Value = oTable.Rows[0]["瀹㈡埛"].ToString();
+            grdMain.Rows[i].Cells[HCusTypeCol].Value = oTable.Rows[0]["瀹㈡埛鍨嬪彿"].ToString();
+            grdMain.Rows[i].Cells[HPinfanBarCodeCol].Value = oTable.Rows[0]["HPinfanBarCode"].ToString();
+            grdMain.Rows[i].Cells[HPinfanCol].Value = oTable.Rows[0]["HPinfan"].ToString();
+            //grdMain.Rows[i].Cells[HSourceIDCol].Value = oTable.Rows[0]["HSourceID"].ToString();
+            //grdMain.Rows[i].Cells[HSourceNumberCol].Value = oTable.Rows[0]["鐢熶骇绾夸唬鐮�"].ToString();
+            grdMain.Rows[i].Cells[HSourceNameCol].Value = oTable.Rows[0]["鐢熶骇绾�"].ToString();
+            grdMain.Rows[i].Cells[HEndDateCol].Value = oTable.Rows[0]["璁″垝瀹屽伐鏃ユ湡"].ToString();//鍗氭棩 鐢熶骇璁㈠崟 澶辨晥鏃ユ湡
+            if (cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
+            {
+                grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+            }
+            else if (cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�"
+                || cmbHBarCodeType.Text == "浠櫒鎴愬搧鏉$爜瑙勫垯"
+                || cmbHBarCodeType.Text == "璇曞墏鎴愬搧鏉$爜瑙勫垯")
+            {
+                grdMain.Rows[i].Cells[HMinQtyCol].Value = "1";
+            }
+            else
+            {
+                grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+            }
+            grdMain.Rows[i].Cells[HProduceDateCol].Value = oTable.Rows[0]["HProduceDate"].ToString();
+            grdMain.Rows[i].Cells[HExpiryDateCol].Value = oTable.Rows[0]["HExpiryDate"].ToString();
+            grdMain.Rows[i].Cells[HISKFPERIODCol].Value = oTable.Rows[0]["HISKFPERIOD"].ToString();
+            grdMain.Rows[i].Cells[HEXPUNITCol].Value = oTable.Rows[0]["HEXPUNIT"].ToString();
+            grdMain.Rows[i].Cells[HEXPPERIODCol].Value = oTable.Rows[0]["HEXPPERIOD"].ToString();
+
+
+            //鑷姩鐢熸垚-璁剧疆鏁伴噺銆佹渶灏忓寘瑁呮暟銆佺鏁颁负1
+            grdMain.Rows[i].Cells[HQtyCol].Value = 1;
+            grdMain.Rows[i].Cells[HMinQtyCol].Value = 1;
+            grdMain.Rows[i].Cells[HBQtyCol].Value = 1;
+
+
+
+
+            //--
+            //璁剧疆鍙紪杈戝垪
+            string sAllowCol = HQtyCol.ToString() +
+                                "," + HMinQtyCol.ToString() +
+                                "," + HAuxPropNumberCol.ToString() +
+                                "," + HBatchNoCol.ToString() +
+                                "," + HPackQtyCol.ToString() +
+                                "," + HRemarkCol.ToString();
+            grdMain.Columns[HBillNoCol].ReadOnly = true;
+            //璁剧疆鍚堣鍒�
+            string sTotalCol = HQtyCol.ToString();
+            //
+            DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid);
+            tabControl1.SelectedIndex = 3;
+            bc.Enabled = true;
+            //
+            RowCount(i, 0);
+        }
+
+        //鏍规嵁TABLE鍐欏叆鐣岄潰
+        private void Sub_WriteInForm1(DataTable oTable, int i)
+        {
+            ////鍔犺浇琛ㄥご
+            //this.txtHDeptID.Tag = oTable.Rows[0]["HDeptID"].ToString();
+            //this.txtHDeptID.Text = oTable.Rows[0]["閮ㄩ棬鍚嶇О"].ToString();
+            ////鍔犺浇琛ㄤ綋
+            grdMain.Rows[i].Cells[HTagCol].Value = "*";
+            grdMain.Rows[i].Cells[HQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+            grdMain.Rows[i].Cells[HinitQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+            //
+            grdMain.Rows[i].Cells[HMainIDCol].Value = oTable.Rows[0]["hmainid"].ToString();
+            grdMain.Rows[i].Cells[HSubIDCol].Value = oTable.Rows[0]["hsubid"].ToString();
+            grdMain.Rows[i].Cells[HBillNoCol].Value = oTable.Rows[0]["鍗曟嵁鍙�"].ToString();
+            grdMain.Rows[i].Cells[HBillTypeCol].Value = oTable.Rows[0]["HBillType"].ToString();
+            grdMain.Rows[i].Cells[HDateCol].Value = oTable.Rows[0]["鏃ユ湡"].ToString(); //鍗氭棩 鍗曟嵁鏃ユ湡
+            grdMain.Rows[i].Cells[HShowDateCol].Value = dtpHDate.Value.ToShortDateString();
+            grdMain.Rows[i].Cells[HDeptIDCol].Value = oTable.Rows[0]["HDeptID"].ToString();
+            grdMain.Rows[i].Cells[HDeptNumberCol].Value = oTable.Rows[0]["閮ㄩ棬浠g爜"].ToString();
+            grdMain.Rows[i].Cells[HDeptNameCol].Value = oTable.Rows[0]["閮ㄩ棬"].ToString();
+            grdMain.Rows[i].Cells[HMaterIDCol].Value = oTable.Rows[0]["HMaterID"].ToString();
+            grdMain.Rows[i].Cells[HMaterNumberCol].Value = oTable.Rows[0]["鐗╂枡浠g爜"].ToString();
+            grdMain.Rows[i].Cells[HMaterNameCol].Value = oTable.Rows[0]["鐗╂枡鍚嶇О"].ToString();
+            grdMain.Rows[i].Cells[HMaterModelCol].Value = oTable.Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+            //grdMain.Rows[i].Cells[HBatchManagerCol].Value = oTable.Rows[0]["鏄惁鍚敤鎵规"].ToString();
+            grdMain.Rows[i].Cells[HBatchNoCol].Value = oTable.Rows[0]["鎵规"].ToString();
+            grdMain.Rows[i].Cells[HUnitIDCol].Value = oTable.Rows[0]["HUnitID"].ToString();
+            grdMain.Rows[i].Cells[HUnitNumberCol].Value = oTable.Rows[0]["璁¢噺鍗曚綅浠g爜"].ToString();
+            grdMain.Rows[i].Cells[HUnitNameCol].Value = oTable.Rows[0]["璁¢噺鍗曚綅"].ToString();
+            grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["澶囨敞"].ToString();
+            grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["璁″垝璺熻釜鍙�"].ToString();
+            grdMain.Rows[i].Cells[HProduceDateCol].Value = oTable.Rows[0]["鐢熶骇鏃ユ湡"].ToString();
+            grdMain.Rows[i].Cells[HExpiryDateCol].Value = oTable.Rows[0]["鏈夋晥鏈熻嚦"].ToString();
+            grdMain.Rows[i].Cells[HISKFPERIODCol].Value = oTable.Rows[0]["HISKFPERIOD"].ToString();
+            grdMain.Rows[i].Cells[HEXPUNITCol].Value = oTable.Rows[0]["HEXPUNIT"].ToString();
+            grdMain.Rows[i].Cells[HEXPPERIODCol].Value = oTable.Rows[0]["HEXPPERIOD"].ToString();
+            if (cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
+            {
+                grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+            }
+            else if (cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�")
+            {
+                grdMain.Rows[i].Cells[HMinQtyCol].Value = "1";
+            }
+            else
+            {
+                if (CampanyName == "涓帶")
+                {
+                    grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+                }
+                else
+                {
+                    grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+                }
+            }
+            grdMain.Rows[i].Cells[HMakerCol].Value = ClsPub.CurUserName;
+            if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�" || cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟"
+                || cmbSourceBillType.Text.Trim() == "濮斿璁㈠崟" || cmbSourceBillType.Text.Trim() == "閲囪喘鍏ュ簱鍗�")
+            {
+                grdMain.Rows[i].Cells[HInnerBillNoCol].Value = oTable.Rows[0]["鍐呴儴閲囪喘璁㈠崟鍙�"].ToString();
+                grdMain.Rows[i].Cells[HSupIDCol].Value = oTable.Rows[0]["hsupid"].ToString();
+                grdMain.Rows[i].Cells[HSupNumberCol].Value = oTable.Rows[0]["渚涘簲鍟嗕唬鐮�"].ToString();
+                grdMain.Rows[i].Cells[HSupNameCol].Value = oTable.Rows[0]["渚涘簲鍟�"].ToString();
+                if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�")
+                {
+                    if (oTable.Rows[0]["鏄惁璧犲搧"].ToString() == "鏄�")
+                    {
+                        grdMain.Rows[i].Cells[HGiveAwayFlagCol].Value = 1;
+                    }
+                    else
+                    {
+                        grdMain.Rows[i].Cells[HGiveAwayFlagCol].Value = 0;
+                    }
+                    grdMain.Rows[i].Cells[HSeOrderBillNoCol].Value = oTable.Rows[0]["閿�鍞鍗曞彿"].ToString();
+                    grdMain.Rows[i].Cells[HSeOrderSEQCol].Value = oTable.Rows[0]["閿�鍞鍗曡鍙�"].ToString();
+                }
+
+            }
+            if (cmbSourceBillType.Text.Trim() == "閫�璐ч�氱煡鍗�")
+            {
+                grdMain.Rows[i].Cells[HCusIDCol].Value = oTable.Rows[0]["HCusID"].ToString();
+                grdMain.Rows[i].Cells[HCusNumberCol].Value = oTable.Rows[0]["瀹㈡埛浠g爜"].ToString();
+                grdMain.Rows[i].Cells[HCusNameCol].Value = oTable.Rows[0]["瀹㈡埛"].ToString();
+            }
+            if (cmbSourceBillType.Text.Trim() == "鍏朵粬鍏ュ簱鍗�")
+            {
+                grdMain.Rows[i].Cells[HWhIDCol].Value = oTable.Rows[0]["HWhID"].ToString();
+                grdMain.Rows[i].Cells[HWhNumberCol].Value = oTable.Rows[0]["浠撳簱浠g爜"].ToString();
+                grdMain.Rows[i].Cells[HWhNameCol].Value = oTable.Rows[0]["浠撳簱"].ToString();
+                grdMain.Rows[i].Cells[HSPIDCol].Value = oTable.Rows[0]["HSPID"].ToString();
+                grdMain.Rows[i].Cells[HSPNumberCol].Value = oTable.Rows[0]["浠撲綅浠g爜"].ToString();
+                grdMain.Rows[i].Cells[HSPNameCol].Value = oTable.Rows[0]["浠撲綅"].ToString();
+            }
+
+            //鑷姩鐢熸垚-璁剧疆鏁伴噺銆佹渶灏忓寘瑁呮暟銆佺鏁颁负1
+            grdMain.Rows[i].Cells[HQtyCol].Value = 1;
+            grdMain.Rows[i].Cells[HMinQtyCol].Value = 1;
+            grdMain.Rows[i].Cells[HBQtyCol].Value = 1;
+
+
+            //--
+            //璁剧疆鍙紪杈戝垪
+            string sAllowCol = HQtyCol.ToString() +
+                                "," + HMinQtyCol.ToString() +
+                                "," + HAuxPropNumberCol.ToString() +
+                                "," + HBatchNoCol.ToString() +
+                                "," + HRemarkCol.ToString();
+            grdMain.Columns[HBillNoCol].ReadOnly = true;
+            //璁剧疆鍚堣鍒�
+            string sTotalCol = HQtyCol.ToString();
+            //
+            DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid);
+            tabControl1.SelectedIndex = 3;
+            bc.Enabled = true;
+            //
+            RowCount(i, 0);
+        }
+
+        //鏍规嵁TABLE鍐欏叆鐣岄潰锛圞3鍗虫椂搴撳瓨锛�
+        private void Sub_WriteInForm2(DataTable oTable, int i)
+        {
+            ////鍔犺浇琛ㄥご
+            //this.txtHDeptID.Tag = oTable.Rows[0]["HDeptID"].ToString();
+            //this.txtHDeptID.Text = oTable.Rows[0]["閮ㄩ棬鍚嶇О"].ToString();
+            ////鍔犺浇琛ㄤ綋
+            grdMain.Rows[i].Cells[HTagCol].Value = "*";
+            grdMain.Rows[i].Cells[HQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏁伴噺"]);
+            grdMain.Rows[i].Cells[HinitQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏁伴噺"]);
+            //
+            //grdMain.Rows[i].Cells[HMainIDCol].Value = oTable.Rows[0]["hmainid"].ToString();
+            //grdMain.Rows[i].Cells[HBillNoCol].Value = oTable.Rows[0]["浠诲姟鍗曞彿"].ToString();
+            //grdMain.Rows[i].Cells[HBillTypeCol].Value = oTable.Rows[0]["HBillType"].ToString();
+            grdMain.Rows[i].Cells[HMaterIDCol].Value = oTable.Rows[0]["HMaterID"].ToString();
+            grdMain.Rows[i].Cells[HMaterNumberCol].Value = oTable.Rows[0]["鐗╂枡浠g爜"].ToString();
+            grdMain.Rows[i].Cells[HMaterNameCol].Value = oTable.Rows[0]["鐗╂枡鍚嶇О"].ToString();
+            grdMain.Rows[i].Cells[HMaterModelCol].Value = oTable.Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+            grdMain.Rows[i].Cells[HAuxPropIDCol].Value = oTable.Rows[0]["HAuxPropID"].ToString();
+            grdMain.Rows[i].Cells[HAuxPropNumberCol].Value = oTable.Rows[0]["杈呭姪灞炴�т唬鐮�"].ToString();
+            grdMain.Rows[i].Cells[HAuxPropNameCol].Value = oTable.Rows[0]["杈呭姪灞炴�у悕绉�"].ToString();
+            grdMain.Rows[i].Cells[HBatchNoCol].Value = oTable.Rows[0]["鎵规"].ToString();
+            grdMain.Rows[i].Cells[HUnitIDCol].Value = oTable.Rows[0]["HUnitID"].ToString();
+            grdMain.Rows[i].Cells[HUnitNumberCol].Value = oTable.Rows[0]["璁¢噺鍗曚綅浠g爜"].ToString();
+            grdMain.Rows[i].Cells[HUnitNameCol].Value = oTable.Rows[0]["璁¢噺鍗曚綅"].ToString();
+            grdMain.Rows[i].Cells[HSupIDCol].Value = oTable.Rows[0]["HSupplyID"].ToString();
+            grdMain.Rows[i].Cells[HSupNumberCol].Value = oTable.Rows[0]["渚涘簲鍟嗕唬鐮�"].ToString();
+            grdMain.Rows[i].Cells[HSupNameCol].Value = oTable.Rows[0]["渚涘簲鍟�"].ToString();
+            grdMain.Rows[i].Cells[HWhIDCol].Value = oTable.Rows[0]["HWhID"].ToString();
+            grdMain.Rows[i].Cells[HWhNumberCol].Value = oTable.Rows[0]["浠撳簱浠g爜"].ToString();
+            grdMain.Rows[i].Cells[HWhNameCol].Value = oTable.Rows[0]["浠撳簱"].ToString();
+            grdMain.Rows[i].Cells[HSPIDCol].Value = oTable.Rows[0]["HSPID"].ToString();
+            grdMain.Rows[i].Cells[HSPNumberCol].Value = oTable.Rows[0]["浠撲綅浠g爜"].ToString();
+            grdMain.Rows[i].Cells[HSPNameCol].Value = oTable.Rows[0]["浠撲綅"].ToString();
+            grdMain.Rows[i].Cells[HDateCol].Value = ClsPub.GetServerDate(0);
+            grdMain.Rows[i].Cells[HShowDateCol].Value = dtpHDate.Value.ToShortDateString();
+            grdMain.Rows[i].Cells[HRemarkCol].Value = "鎸夊簱瀛樼敓鎴�";
+            grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["璁″垝璺熻釜鍙�"].ToString();
+            grdMain.Rows[i].Cells[HProduceDateCol].Value = oTable.Rows[0]["鐢熶骇鏃ユ湡"].ToString();
+            grdMain.Rows[i].Cells[HExpiryDateCol].Value = oTable.Rows[0]["鏈夋晥鏈熻嚦"].ToString();
+            grdMain.Rows[i].Cells[HISKFPERIODCol].Value = oTable.Rows[0]["HISKFPERIOD"].ToString();
+            grdMain.Rows[i].Cells[HEXPUNITCol].Value = oTable.Rows[0]["HEXPUNIT"].ToString();
+            grdMain.Rows[i].Cells[HEXPPERIODCol].Value = oTable.Rows[0]["HEXPPERIOD"].ToString();
+            if (CampanyName == "涓帶")
+            {
+                grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏁伴噺"]);
+            }
+
+            //鑷姩鐢熸垚-璁剧疆鏁伴噺銆佹渶灏忓寘瑁呮暟銆佺鏁颁负1
+            grdMain.Rows[i].Cells[HQtyCol].Value = 1;
+            grdMain.Rows[i].Cells[HMinQtyCol].Value = 1;
+            grdMain.Rows[i].Cells[HBQtyCol].Value = 1;
+
+
+            //--
+            //璁剧疆鍙紪杈戝垪
+            string sAllowCol = HQtyCol.ToString() +
+                                "," + HRemarkCol.ToString() +
+                                "," + HMinQtyCol.ToString();
+            grdMain.Columns[HBillNoCol].ReadOnly = true;
+            //璁剧疆鍚堣鍒�
+            string sTotalCol = HQtyCol.ToString();
+            //
+            DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid);
+            tabControl1.SelectedIndex = 3;
+            bc.Enabled = true;
+            //
+            RowCount(i, 0);
+        }
+
+        //鏍规嵁TABLE鍐欏叆鐣岄潰锛堝�掔鍗曪級
+        private void Sub_WriteInForm3(DataTable oTable, int i)
+        {
+            ////鍔犺浇琛ㄥご
+            //this.txtHDeptID.Tag = oTable.Rows[0]["HDeptID"].ToString();
+            //this.txtHDeptID.Text = oTable.Rows[0]["閮ㄩ棬鍚嶇О"].ToString();
+            ////鍔犺浇琛ㄤ綋
+            grdMain.Rows[i].Cells[HTagCol].Value = "*";
+            grdMain.Rows[i].Cells[HQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鍙敓鎴愭潯鐮佹暟閲�"]);
+            grdMain.Rows[i].Cells[HinitQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鍙敓鎴愭潯鐮佹暟閲�"]);
+            //
+            grdMain.Rows[i].Cells[HMainIDCol].Value = oTable.Rows[0]["hmainid"].ToString();
+            grdMain.Rows[i].Cells[HSubIDCol].Value = oTable.Rows[0]["hsubid"].ToString();
+            grdMain.Rows[i].Cells[HBillNoCol].Value = oTable.Rows[0]["鍗曟嵁鍙�"].ToString();
+            grdMain.Rows[i].Cells[HBillTypeCol].Value = oTable.Rows[0]["HBillType"].ToString();
+            grdMain.Rows[i].Cells[HDateCol].Value = oTable.Rows[0]["鏃ユ湡"].ToString();
+            grdMain.Rows[i].Cells[HShowDateCol].Value = dtpHDate.Value.ToShortDateString();
+            grdMain.Rows[i].Cells[HDeptIDCol].Value = oTable.Rows[0]["HDeptID"].ToString();
+            grdMain.Rows[i].Cells[HDeptNumberCol].Value = oTable.Rows[0]["閮ㄩ棬浠g爜"].ToString();
+            grdMain.Rows[i].Cells[HDeptNameCol].Value = oTable.Rows[0]["閮ㄩ棬"].ToString();
+            grdMain.Rows[i].Cells[HMaterIDCol].Value = oTable.Rows[0]["HMaterID"].ToString();
+            grdMain.Rows[i].Cells[HMaterNumberCol].Value = oTable.Rows[0]["鐗╂枡浠g爜"].ToString();
+            grdMain.Rows[i].Cells[HMaterNameCol].Value = oTable.Rows[0]["鐗╂枡鍚嶇О"].ToString();
+            grdMain.Rows[i].Cells[HMaterModelCol].Value = oTable.Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+            grdMain.Rows[i].Cells[HPinfanCol].Value = oTable.Rows[0]["鍝佺暘"].ToString();
+            grdMain.Rows[i].Cells[HPinfanBarCodeCol].Value = oTable.Rows[0]["HPinfanBarCode"].ToString();
+            grdMain.Rows[i].Cells[HAuxPropIDCol].Value = oTable.Rows[0]["HAuxPropID"].ToString();
+            grdMain.Rows[i].Cells[HAuxPropNumberCol].Value = oTable.Rows[0]["杈呭姪灞炴�т唬鐮�"].ToString();
+            grdMain.Rows[i].Cells[HAuxPropNameCol].Value = oTable.Rows[0]["杈呭姪灞炴�у悕绉�"].ToString();
+            grdMain.Rows[i].Cells[HBatchNoCol].Value = oTable.Rows[0]["鎵瑰彿"].ToString();
+            grdMain.Rows[i].Cells[HUnitIDCol].Value = oTable.Rows[0]["HUnitID"].ToString();
+            grdMain.Rows[i].Cells[HUnitNumberCol].Value = oTable.Rows[0]["璁¢噺鍗曚綅浠g爜"].ToString();
+            grdMain.Rows[i].Cells[HUnitNameCol].Value = oTable.Rows[0]["璁¢噺鍗曚綅"].ToString();
+            grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["澶囨敞"].ToString();
+            //鑾峰彇鏈�鏂版渶灏忓寘瑁呮暟
+            DataSet oDs = new DataSet();
+            oDs = oCn.RunProcReturn("exec h_p_Gy_StdPack " + oTable.Rows[0]["HMaterID"].ToString() + "," + oTable.Rows[0]["HAuxPropID"].ToString(), "h_p_Gy_StdPack");
+            //
+            if (oDs != null && oDs.Tables[0].Rows.Count > 0)
+            {
+                grdMain.Rows[i].Cells[HMinQtyCol].Value = DBUtility.ClsPub.isSingle(oDs.Tables[0].Rows[0]["HMinPack"]);
+            }
+
+            //鑷姩鐢熸垚-璁剧疆鏁伴噺銆佹渶灏忓寘瑁呮暟銆佺鏁颁负1
+            grdMain.Rows[i].Cells[HQtyCol].Value = 1;
+            grdMain.Rows[i].Cells[HMinQtyCol].Value = 1;
+            grdMain.Rows[i].Cells[HBQtyCol].Value = 1;
+
+
+            //--
+            //璁剧疆鍙紪杈戝垪
+            string sAllowCol = HQtyCol.ToString() +
+                                "," + HRemarkCol.ToString() +
+                                "," + HMaterNameCol.ToString() +
+                                "," + HMaterModelCol.ToString() +
+                                "," + HPinfanCol.ToString() +
+                                "," + HMinQtyCol.ToString();
+            grdMain.Columns[HBillNoCol].ReadOnly = true;
+            //璁剧疆鍚堣鍒�
+            string sTotalCol = HQtyCol.ToString();
+            //
+            DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid);
+            tabControl1.SelectedIndex = 3;
+            bc.Enabled = true;
+            //
+            RowCount(i, 0);
+        }
+
+        //缃戞牸缂栬緫鍓嶅垽鏂�
+        private void grdMain_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
+        {
+            int i = grdMain.CurrentCell.ColumnIndex;
+            if (DBUtility.Xt_BaseBillFun.AllowEdit(grdStatus, oSumGrid, i))
+            {
+                e.Cancel = true;
+            }
+        }
+
+        //缃戞牸缂栬緫鍚庡鐞�
+        private void grdMain_CellEndEdit(object sender, DataGridViewCellEventArgs e)
+        {
+            DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+            if (e.ColumnIndex == HMinQtyCol)
+            {
+                RowCount(e.RowIndex, 0);  //
+            }
+            else if (e.ColumnIndex == HQtyCol)
+            {
+                RowCount(e.RowIndex, 0);  //
+            }
+            //
+            if (this.EditingControl != null)      //閲婃斁浜嬩欢
+            {
+                EditingControl.KeyDown -= new KeyEventHandler(this.EditingControl_KeyDown);
+                this.EditingControl = null;
+            }
+        }
+        DataGridViewTextBoxEditingControl EditingControl;
+
+        private void grdMain_CellLeave(object sender, DataGridViewCellEventArgs e)
+        {
+            //
+            if (!grdStatus)
+            {
+                return;
+            }
+            DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+            //
+            //if (oSumGrid.Changelock)
+            //    return;
+            //if(oSumGrid.EditStatus)
+            //{
+            if (!CheckGridRow(oSumGrid.OldCell.Row))
+                return;
+            //}
+        }
+
+        private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
+        {
+            DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+        }
+
+        private void grdMain_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e)
+        {
+            if (grdMain.CurrentCell != null)
+            {
+                if (e.Control is DataGridViewTextBoxEditingControl)
+                {
+                    this.EditingControl = (DataGridViewTextBoxEditingControl)e.Control;
+                    //澧炲姞濮旀墭澶勭悊 
+                    this.EditingControl.KeyDown += new KeyEventHandler(this.EditingControl_KeyDown);
+                }
+            }
+        }
+        private void EditingControl_KeyDown(object sender, KeyEventArgs e)
+        {
+            //涓氬姟澶勭悊 
+            Sub_GridKey(e.KeyValue, grdMain.CurrentRow.Index, grdMain.CurrentCell.ColumnIndex, EditingControl);
+        }
+        private void grdMain_RowHeadersWidthChanged(object sender, EventArgs e)
+        {
+            DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+        }
+
+        private void grdMain_Scroll(object sender, ScrollEventArgs e)
+        {
+            DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+            oSumGrid.DisplayCurRow();
+        }
+
+        #endregion
+
+
+        #region  //鎵撳嵃璁剧疆
+
+        GridppReport Report;
+        int CurRows = 0;
+        string sBarCodeItemID = ""; //鏉$爜鑷鍒�
+
+        //棰勮
+        private void yl_Click(object sender, EventArgs e)
+        {
+            //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉$爜
+            if (DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value) == "")
+            {
+                MessageBox.Show("鏉$爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉$爜鍚庡啀棰勮锛�");
+                return;
+            }
+
+            //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+            if (ReportPrintBegin())
+            {
+                return;
+            }
+
+            //閫夋嫨鎵撳嵃妯℃澘
+            BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+            oFrm.sBillName = ModName;
+            oFrm.sBillModel = ModCaption;
+            oFrm.ShowDialog();
+            if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+            {
+                Sub_SetReport(oFrm.sOpenTmp);
+                Report.PrintPreview(false);
+                Thread.Sleep(1000);
+            }
+        }
+
+        //鎵撳嵃
+        private void dy_Click(object sender, EventArgs e)
+        {
+            //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉$爜
+            if (DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value) == "")
+            {
+                MessageBox.Show("鏉$爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉$爜鍚庡啀鎵撳嵃锛�");
+                return;
+            }
+
+            //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+            if (ReportPrintBegin())
+            {
+                return;
+            }
+
+            //閫夋嫨鎵撳嵃妯℃澘
+            BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+            oFrm.sBillName = ModName;
+            oFrm.sBillModel = ModCaption;
+            oFrm.ShowDialog();
+            if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+            {
+                //寰幆閫変腑琛�
+                Sub_SetReport(oFrm.sOpenTmp);
+                Report.Print(true);
+                Thread.Sleep(1000);
+            }
+        }
+
+        ////鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+        //private bool ReportPrintBegin()
+        //{
+        //    string sRelQty = "";
+
+        //    if (oBar.Set_BPrintQty(DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value), ref sRelQty))
+        //    {
+        //        MessageBox.Show("鏉$爜宸茬粡鎵撳嵃杩囷紝涓嶅彲閲嶅鎵撳嵃锛�");
+        //        return true;
+        //    }
+        //    else
+        //    {
+        //        return false;
+        //    }
+        //}
+
+        //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟
+        private bool ReportPrintBegin()
+        {
+            string sHRemark = "";
+            if (PrintQtyCtl == "Y")
+            {
+                if (oBar.Set_CheckPrintQty_SD(HInterID, PrintQty, ref sHRemark))
+                {
+                    MessageBox.Show(sHRemark);
+                    return true;
+                }
+                return false;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        private void Sub_SetReport(string sOpenTmp)
+        {
+            //鍒ゆ柇琛屾暟
+            for (int i = 0; i < grdList.Rows.Count; i++)
+            {
+                grdList.Rows[i].Cells[0].Value = "*";
+            }
+            //
+            Report = new GridppReport();
+            Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf");  //here .
+            Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+            Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+            Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
+        }
+
+        //濉叆鍗曟嵁琛ㄥご淇℃伅
+        private void ReportBeforePostRecord()// 
+        {
+            try
+            {
+                //Report.FieldByName("鐗╂枡浠g爜").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HMaterNumber2Col].Value);
+                //Report.FieldByName("鐗╂枡鍚嶇О").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HMaterName2Col].Value);
+                //Report.FieldByName("瑙勬牸鍨嬪彿").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HMaterModel2Col].Value);
+                ////Report.FieldByName("鑷畾涔夎鏍�").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HModel2Col].Value);
+                //Report.FieldByName("鏉$爜缂栧彿").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HTMCol].Value);
+                //Report.FieldByName("鏁伴噺").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HQty2Col].Value);
+                //Report.FieldByName("婧愬崟鍗曞彿").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HSourceBillNoCol].Value);
+                //Report.FieldByName("閿�鍞鍗曞彿").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HSeOrderBillNo2Col].Value);
+                //Report.FieldByName("鐢熶骇杞﹂棿").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HDeptName2Col].Value);
+                //Report.FieldByName("澶囨敞").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HRemark2Col].Value);
+            }
+            catch (Exception e)
+            {
+                MessageBox.Show("鎵撳嵃澶辫触!琛ㄥご锛�" + e.Message);
+            }
+        }
+
+        //濉叆鍗曟嵁琛ㄤ綋淇℃伅
+        private void ReportFetchRecordByDataTable()
+        {
+            try
+            {
+                DataTable ds = new DataTable();
+                BLL.Utility.FillRecordToReport_Sel(Report, grdList, ds, Fun_GetCol("閫夋嫨"));
+            }
+            catch (Exception e)
+            {
+                MessageBox.Show("鎵撳嵃澶辫触!琛ㄤ綋锛�" + e.Message);
+            }
+        }
+
+        ////鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+        //private void ReportPrintEnd()
+        //{
+        //    try
+        //    {
+        //        oCn.RunProc("update Gy_BarCodeBill set HPrintQty=isnull(HPrintQty,0)+1 where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+        //    }
+        //    catch (Exception e)
+        //    {
+        //        MessageBox.Show("鎵撳嵃澶辫触!鎵撳嵃缁撴潫 锛�" + e.Message);
+        //    }
+        //}
+
+        //鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+        private void ReportPrintEnd()
+        {
+            if (UpdatePrintQtyCtl == "Y")
+            {
+                oBar.Set_UpdatePrintQty_SD(HInterID);
+            }
+        }
+
+        //璇曟墦鍗�
+        private void sdy_Click(object sender, EventArgs e)
+        {
+            //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉$爜
+            if (DBUtility.ClsPub.isStrNull(grdSub.Rows[0].Cells[HTMCol].Value) == "")
+            {
+                MessageBox.Show("鏉$爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉$爜鍚庡啀棰勮锛�");
+                return;
+            }
+
+            //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+            if (ReportPrintBegin_SDY())
+            {
+                return;
+            }
+
+            //閫夋嫨鎵撳嵃妯℃澘
+            BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+            oFrm.sBillName = ModName;
+            oFrm.sBillModel = ModCaption;
+            oFrm.ShowDialog();
+            if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+            {
+                Sub_SetReportView(oFrm.sOpenTmp);
+                Report.PrintPreview(false);
+                Thread.Sleep(1000);
+            }
+        }
+
+        //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟
+        private bool ReportPrintBegin_SDY()
+        {
+            string sHRemark = "";
+            sBarCodeItemID = "";
+            for (int i = 0; i < grdList.SelectedRows.Count; i++)
+            {
+                sBarCodeItemID = sBarCodeItemID + "," + DBUtility.ClsPub.isLong(grdList.Rows[grdList.SelectedRows[i].Index].Cells[Fun_GetCol("HItemID")].Value).ToString();
+            }
+            sBarCodeItemID = sBarCodeItemID.Remove(0, 1);
+
+            if (PrintQtyCtl == "Y")
+            {
+                if (oBar.Set_CheckPrintQty(sBarCodeItemID, PrintQty, ref sHRemark))
+                {
+                    MessageBox.Show(sHRemark);
+                    return true;
+                }
+                return false;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        private void Sub_SetReportView(string sOpenTmp)
+        {
+            //鍒ゆ柇琛屾暟
+            for (int i = 0; i < grdList.Rows.Count; i++)
+            {
+                grdList.Rows[i].Cells[0].Value = "";
+            }
+            for (int i = 0; i < grdList.SelectedRows.Count; i++)
+            {
+                grdList.Rows[grdList.SelectedRows[i].Index].Cells[0].Value = "*";
+            }
+            //
+            Report = new GridppReport();
+            Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf");  //here .
+            Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+            Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+            Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd_SDY);
+        }
+
+        //鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+        private void ReportPrintEnd_SDY()
+        {
+            if (UpdatePrintQtyCtl == "Y")
+            {
+                oBar.Set_UpdatePrintQty(sBarCodeItemID);
+            }
+        }
+
+        private Int32 Fun_GetCol(string sCol)
+        {
+            return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdList);
+        }
+
+
+        #endregion
+
+
+        private void grdSub_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
+        {
+            int i = grdSub.CurrentCell.ColumnIndex;
+            if (DBUtility.Xt_BaseBillFun.AllowEdit(grdStatus, oSumGrid, i))
+            {
+                e.Cancel = true;
+            }
+        }
+
+        private void grdSub_CellEndEdit(object sender, DataGridViewCellEventArgs e)
+        {
+            DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+            RowCount(e.RowIndex, 0);  //璁$畻 閲戦 鍗曚环
+            //
+            if (this.EditingControl != null)      //閲婃斁浜嬩欢
+            {
+                EditingControl.KeyDown -= new KeyEventHandler(this.EditingControl_KeyDown);
+                this.EditingControl = null;
+            }
+        }
+
+        //鎸夊簱瀛樼敓鎴愭潯鐮�
+        private void kc_Click(object sender, EventArgs e)
+        {
+            long sHOrgID = -1;
+            string sWhere = "";
+
+            DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+            if (oClsGy_ORGANIZATIONS_View.GetInfoByName(cmbHOrgID.Text))
+            {
+                sHOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID;
+            }
+            if (sHOrgID == -1)
+            {
+                MessageBox.Show("閫夋嫨缁勭粐鏈夐敊璇紒");
+                return;
+            }
+            sWhere = " and HOrgID =" + sHOrgID.ToString();
+            BLL.Cls_S_KF_ICInventoryList_IF oadd = new BLL.Cls_S_KF_ICInventoryList_IF();
+            if (oadd.Refresh(sWhere))  //閫夋嫨鍘熷崟
+            //if (oadd.Refresh(" and HErpClsID in (1,2,3) "))  //閫夋嫨鍘熷崟
+            {
+                FillSelectData(oadd.oBillSelectColl);
+            }
+        }
+
+
+        //鑾峰彇鏈湀鐨勭鍑犲懆
+        private static int getWeekNumInMonth(DateTime daytime)
+        {
+            int dayInMonth = daytime.Day;
+            //鏈湀绗竴澶�
+            DateTime firstDay = daytime.AddDays(1 - daytime.Day);
+            //鏈湀绗竴澶╂槸鍛ㄥ嚑
+            int weekday = (int)firstDay.DayOfWeek == 0 ? 7 : (int)firstDay.DayOfWeek;
+            //鏈湀绗竴鍛ㄦ湁鍑犲ぉ
+            int firstWeekEndDay = 7 - (weekday - 1);
+            //褰撳墠鏃ユ湡鍜岀涓�鍛ㄤ箣宸�
+            int diffday = dayInMonth - firstWeekEndDay;
+            diffday = diffday > 0 ? diffday : 1;
+            //褰撳墠鏄鍑犲懆,濡傛灉鏁撮櫎7灏卞噺涓�澶�
+            int WeekNumInMonth = ((diffday % 7) == 0
+             ? (diffday / 7 - 1)
+             : (diffday / 7)) + 1 + (dayInMonth > firstWeekEndDay ? 1 : 0);
+            return WeekNumInMonth;
+        }
+
+        //鍚屾鍩虹璧勬枡淇℃伅
+        private void tb_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                oCn.RunProc("exec h_p_IF_ERPDataToLocal", ref DBUtility.ClsPub.sExeReturnInfo);
+                MessageBox.Show("鍚屾鍩虹璧勬枡鎴愬姛锛�");
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("鍚屾鍩虹璧勬枡澶辫触锛�" + ex);
+            }
+        }
+        public Frm_Split oDlg = new Frm_Split();
+        private void spRow_Click(object sender, EventArgs e)
+        {
+            //DBUtility.Xt_BaseBillFun.AddRow(oSumGrid);
+            oDlg.ShowDialog();
+            if (oDlg.IsOk == 1)
+            {
+                grdMainData_CF(DBUtility.ClsPub.isInt(oDlg.txtHQ.Text));
+            }
+        }
+
+
+        private void grdMainData_CF(int HQty)
+        {
+            double hq = 0;
+            int Qty = HQty - 1;
+            int row = grdMain.CurrentCell.RowIndex;
+            grdMain.Rows.Insert(row + 1, Qty);
+            hq = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[HQtyCol].Value) / HQty;
+            grdMain.Rows[row].Cells[HQtyCol].Value = hq;
+            for (int i = 0; i < Qty; i++)
+            {
+                int r = i + 1;
+                grdMain.Rows[row + r].Cells[HMaterIDCol].Value = grdMain.Rows[row].Cells[HMaterIDCol].Value;
+                grdMain.Rows[row + r].Cells[HMaterNumberCol].Value = grdMain.Rows[row].Cells[HMaterNumberCol].Value;
+                grdMain.Rows[row + r].Cells[HMaterNameCol].Value = grdMain.Rows[row].Cells[HMaterNameCol].Value;
+                grdMain.Rows[row + r].Cells[HMaterModelCol].Value = grdMain.Rows[row].Cells[HMaterModelCol].Value;
+                grdMain.Rows[row + r].Cells[HUnitIDCol].Value = grdMain.Rows[row].Cells[HUnitIDCol].Value;
+                grdMain.Rows[row + r].Cells[HUnitNameCol].Value = grdMain.Rows[row].Cells[HUnitNameCol].Value;
+                grdMain.Rows[row + r].Cells[HSourceIDCol].Value = grdMain.Rows[row].Cells[HSourceIDCol].Value;
+                grdMain.Rows[row + r].Cells[HSourceNumberCol].Value = grdMain.Rows[row].Cells[HSourceNumberCol].Value;
+                grdMain.Rows[row + r].Cells[HSourceNameCol].Value = grdMain.Rows[row].Cells[HSourceNameCol].Value;
+                grdMain.Rows[row + r].Cells[HQtyCol].Value = DBUtility.ClsPub.isDoule(hq, 4);
+                grdMain.Rows[row + r].Cells[HinitQtyCol].Value = DBUtility.ClsPub.isDoule(hq, 4);
+                grdMain.Rows[row + r].Cells[HMinQtyCol].Value = 0;
+
+                grdMain.Rows[row + r].Cells[HTagCol].Value = grdMain.Rows[row].Cells[HTagCol].Value;
+                grdMain.Rows[row + r].Cells[HMainIDCol].Value = grdMain.Rows[row].Cells[HMainIDCol].Value;
+                grdMain.Rows[row + r].Cells[HSubIDCol].Value = grdMain.Rows[row].Cells[HSubIDCol].Value;
+                grdMain.Rows[row + r].Cells[HBillNoCol].Value = grdMain.Rows[row].Cells[HBillNoCol].Value;
+                grdMain.Rows[row + r].Cells[HBillTypeCol].Value = grdMain.Rows[row].Cells[HBillTypeCol].Value;
+                grdMain.Rows[row + r].Cells[HDateCol].Value = grdMain.Rows[row].Cells[HDateCol].Value;
+                grdMain.Rows[row + r].Cells[HShowDateCol].Value = grdMain.Rows[row].Cells[HShowDateCol].Value;
+                grdMain.Rows[row + r].Cells[HEndDateCol].Value = grdMain.Rows[row].Cells[HEndDateCol].Value;
+                grdMain.Rows[row + r].Cells[HSupIDCol].Value = grdMain.Rows[row].Cells[HSupIDCol].Value;
+                grdMain.Rows[row + r].Cells[HSupNumberCol].Value = grdMain.Rows[row].Cells[HSupNumberCol].Value;
+                grdMain.Rows[row + r].Cells[HSupNameCol].Value = grdMain.Rows[row].Cells[HSupNameCol].Value;
+                grdMain.Rows[row + r].Cells[HDeptIDCol].Value = grdMain.Rows[row].Cells[HDeptIDCol].Value;
+                grdMain.Rows[row + r].Cells[HDeptNumberCol].Value = grdMain.Rows[row].Cells[HDeptNumberCol].Value;
+                grdMain.Rows[row + r].Cells[HDeptNameCol].Value = grdMain.Rows[row].Cells[HDeptNameCol].Value;
+                grdMain.Rows[row + r].Cells[HBatchNoCol].Value = grdMain.Rows[row].Cells[HBatchNoCol].Value;
+                grdMain.Rows[row + r].Cells[HAuxPropIDCol].Value = grdMain.Rows[row].Cells[HAuxPropIDCol].Value;
+                grdMain.Rows[row + r].Cells[HAuxPropNumberCol].Value = grdMain.Rows[row].Cells[HAuxPropNumberCol].Value;
+                grdMain.Rows[row + r].Cells[HAuxPropNameCol].Value = grdMain.Rows[row].Cells[HAuxPropNameCol].Value;
+                grdMain.Rows[row + r].Cells[HRemarkCol].Value = grdMain.Rows[row].Cells[HRemarkCol].Value;
+                grdMain.Rows[row + r].Cells[HMTONoCol].Value = grdMain.Rows[row].Cells[HMTONoCol].Value;
+                grdMain.Rows[row + r].Cells[HInnerBillNoCol].Value = grdMain.Rows[row].Cells[HInnerBillNoCol].Value;
+                grdMain.Rows[row + r].Cells[HMakerCol].Value = grdMain.Rows[row].Cells[HMakerCol].Value;
+                //缃戞牸鎵撳嬀
+                DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+                oCell.ThreeState = false;
+                oCell.Value = grdMain.Rows[row].Cells[HGiveAwayFlagCol].Value;
+                oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+                grdMain.Rows[row + r].Cells[HGiveAwayFlagCol] = oCell;
+
+            }
+            DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+        }
+
+        private void grdSub_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+
+        }
+
+        private void Display()
+        {
+            //璁剧疆妗f鍒楄〃閫夐」鍗¤〃鏍兼暟鎹�
+            DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+            //鐢熸垚棣栬鏍囬
+            if (DSet == null)
+            {
+                MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,鏉$爜涓嶅瓨鍦紒" + DBUtility.ClsPub.sExeReturnInfo);
+                return;
+            }
+            //
+            grdList.DataSource = DSet.Tables[0].DefaultView;
+            //鍐荤粨
+            int FrCol = 0;
+            string s = "鏄�";
+            DBUtility.Xt_BaseBillFun.DisplayGrid(grdList, this.Name + "grdList", s, FrCol);
+            //鐢荤嚎
+            //GraphLine();
+        }
+
+        // //璁剧疆宸ュ崟鏉$爜閫夐」鍗¤〃鏍兼暟鎹�
+        private void Display4()
+        {
+            if (grdMain.Rows.Count > 0)
+            {
+                //鏃ユ湡鑾峰彇鏂瑰紡
+                string sDate = dtpHDate.Value.ToShortDateString();                                                                                     //
+                string sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+                string sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+                sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+                string sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+                sDay = sDay.Substring(sDay.Length - 2, 2);
+
+                sDate = "20" + sYear + "-" + sPeriod + "-" + sDay;
+
+                //璁剧疆宸ュ崟鏉$爜閫夐」鍗¤〃鏍兼暟鎹�
+                string sql = "select * from h_v_IF_BarCodeBillList Where 婧愬崟鍗曞彿 = '" + grdMain.Rows[0].Cells[HBillNoCol].Value + "' and HMaterID = " + grdMain.Rows[0].Cells[HMaterIDCol].Value + " and HSTOCKORGID = " + HOrgID + " and CONVERT(varchar(100),鏉$爜鏃ユ湡, 23) = '" + sDate + "' order by 鏉$爜缂栧彿";
+                DataSet DSet1 = oCn.RunProcReturn(sql, "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+                //鐢熸垚棣栬鏍囬
+                if (DSet1 == null)
+                {
+                    return;
+                }
+                //
+                grdBillBarCodeList.DataSource = DSet1.Tables[0].DefaultView;
+                //鍐荤粨
+                int FrCol = 0;
+                string s = "鏄�";
+                DBUtility.Xt_BaseBillFun.DisplayGrid(grdBillBarCodeList, this.Name + "grdBillBarCodeList", s, FrCol);
+                //鐢荤嚎
+                //GraphLine();
+                // 
+            }
+        }
+
+        //鍏宠仈鎸夐挳
+        private void gl_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                long HInterID = DBUtility.ClsPub.isLong(grdList.Rows[0].Cells[Fun_GetCol("HInterID")].Value);
+                string HBarCode = DBUtility.ClsPub.isStrNull(grdList.Rows[0].Cells[Fun_GetCol("鏉$爜缂栧彿")].Value);
+                string HBarCodeType = DBUtility.ClsPub.isStrNull(grdList.Rows[0].Cells[Fun_GetCol("鏉$爜绫诲瀷")].Value);
+                string HSourceBillType = DBUtility.ClsPub.isStrNull(grdList.Rows[0].Cells[Fun_GetCol("HSourceBillType")].Value);
+
+                DataSet oDs = oCn.RunProcReturn("exec h_p_WMS_BarCodeToICStockBillSub_Insert " + HInterID.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "','" + HSourceBillType + "'", "h_p_WMS_BarCodeToICStockBillSub_Insert");
+                //
+                if (oDs == null && oDs.Tables[0].Rows.Count == 0)
+                {
+                    MessageBox.Show("鍏宠仈鑷姩鐢熸垚鏉$爜鍑哄叆搴撹褰曞け璐ワ紒");
+                }
+                else
+                {
+                    MessageBox.Show(DBUtility.ClsPub.isStrNull(oDs.Tables[0].Rows[0]["HRemark"]));
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("鍏宠仈鑷姩鐢熸垚鏉$爜鍑哄叆搴撹褰曞け璐�22锛�" + ex);
+            }
+        }
+
+        //鎵规鎸夐挳
+        private void BatchNo_Click(object sender, EventArgs e)
+        {
+            lblCaption.Focus();
+            bool b = false;
+            for (int i = 0; i < grdMain.RowCount; i++)
+            {
+                long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value);          // 鐗╂枡鍐呯爜
+                string HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HBatchNoCol].Value);     // 鎵瑰彿
+
+                if (HMaterID != 0)
+                {
+                    DataSet oDs = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_GetBatchNo " + HMaterID.ToString() + ",'" + HBatchNo + "','" + dtpHDate.Value.ToShortDateString() + "','" + CampanyName + "'", "h_p_Gy_BarCodeBill_GetBatchNo");
+                    //
+                    if (oDs == null && oDs.Tables[0].Rows.Count == 0)
+                    {
+                        MessageBox.Show("鐢熸垚鎵规澶辫触锛�");
+                        return;
+                    }
+                    else if (DBUtility.ClsPub.isStrNull(oDs.Tables[0].Rows[0][0]) == "1")
+                    {
+                        grdMain.Rows[i].Cells[HBatchNoCol].Value = DBUtility.ClsPub.isStrNull(oDs.Tables[0].Rows[0]["HBatchNo"]);
+                        b = true;
+                    }
+                }
+            }
+            //鏄庣粏琛ㄦ槸鍚︿负闆惰
+            if (b == false)
+            {
+                MessageBox.Show("娌℃湁闇�瑕佺敓鎴愭壒娆$殑鏄庣粏琛岋紒", "鎻愮ず");
+                return;
+            }
+        }
+
+        private void txtHSourceBillNo_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            if (e.KeyChar == (char)Keys.Return)//鍥炶溅甯﹀嚭婧愬崟淇℃伅
+            {
+                long sHOrgID = -1;
+                DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+                if (oClsGy_ORGANIZATIONS_View.GetInfoByName(cmbHOrgID.Text))
+                {
+                    sHOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID;
+                }
+
+                if (txtHSourceBillNo.Text.Length < 4)
+                {
+                    MessageBox.Show("璇疯緭鍏�4浣嶄互涓婃暟鎹紒");
+                    return;
+                }
+                //鏍规嵁婧愬崟绫诲瀷 鍜屾簮鍗曞彿 鑾峰彇淇℃伅
+                if (cmbSourceBillType.Text.Trim() == "鐢熶骇璁㈠崟")
+                {
+                    DAL.Cls_S_IFCLD_ICMOList oIFCLD_ICMOList = new DAL.Cls_S_IFCLD_ICMOList();
+                    //绯荤粺鍙傛暟锛岀敓鎴愭潯鐮佹暟閲忓彲鍚﹁秴婧愬崟鏁伴噺鎺у埗锛圢涓轰笉鍙秴婧愬崟鏁伴噺锛�
+                    if (SourceQtyCtl == "N")
+                    {
+                        if (oIFCLD_ICMOList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + sHOrgID.ToString() + " and 浠诲姟鏁伴噺>0"))  //閫夋嫨鍘熷崟
+                        {
+                            FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
+                            txtHSourceBillNo.Text = "";
+                        }
+                        else
+                        {
+                            MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝g‘锛�");
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        if (oIFCLD_ICMOList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + sHOrgID.ToString()))  //閫夋嫨鍘熷崟
+                        {
+                            FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
+                            txtHSourceBillNo.Text = "";
+                        }
+                        else
+                        {
+                            MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝g‘锛�");
+                            return;
+                        }
+                    }
+                }
+                else if (cmbSourceBillType.Text.Trim() == "鐢熶骇姹囨姤鍗�")
+                {
+                    DAL.Cls_S_IF_ICMOReportBillList oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList();
+                    if (oIF_ICMOReportBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' "))  //閫夋嫨鍘熷崟
+                    {
+                        FillSelectData(oIF_ICMOReportBillList.oBillSelectColl);
+                        txtHSourceBillNo.Text = "";
+                    }
+                    else
+                    {
+                        MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝g‘锛�");
+                        return;
+                    }
+                }
+                else if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�")
+                {
+                    DAL.Cls_S_IF_POInStockBillList oIF_POInStockBillList = new DAL.Cls_S_IF_POInStockBillList();
+                    if (oIF_POInStockBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' "))  //閫夋嫨鍘熷崟
+                    {
+                        FillSelectData(oIF_POInStockBillList.oBillSelectColl);
+                        txtHSourceBillNo.Text = "";
+                    }
+                    else
+                    {
+                        MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝g‘锛�");
+                        return;
+                    }
+                }
+                else if (cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟")
+                {
+                    DAL.Cls_S_IF_POOrderBillList oIF_POOrderBillList = new DAL.Cls_S_IF_POOrderBillList();
+                    if (oIF_POOrderBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' "))  //閫夋嫨鍘熷崟
+                    {
+                        FillSelectData(oIF_POOrderBillList.oBillSelectColl);
+                        txtHSourceBillNo.Text = "";
+                    }
+                    else
+                    {
+                        MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝g‘锛�");
+                        return;
+                    }
+                }
+                else if (cmbSourceBillType.Text.Trim() == "濮斿璁㈠崟")
+                {
+                    DAL.Cls_S_IF_EntrustOrderBillList oIF_EntrustOrderBillList = new DAL.Cls_S_IF_EntrustOrderBillList();
+                    if (oIF_EntrustOrderBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' "))  //閫夋嫨鍘熷崟
+                    {
+                        FillSelectData(oIF_EntrustOrderBillList.oBillSelectColl);
+                        txtHSourceBillNo.Text = "";
+                    }
+                    else
+                    {
+                        MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝g‘锛�");
+                        return;
+                    }
+                }
+                else
+                {
+                    MessageBox.Show("鎵�閫夋簮鍗曠被鍨嬶紝涓嶆敮鎸佹鍔熻兘锛�");
+                    return;
+                }
+
+            }
+        }
+
+
+        //鐢熸垚澶栫鐮�
+        private void wxm_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                Int64 iInterID = 0;
+                Int64 dPackQty = 0; //澶栫鏁伴噺
+                Int64 dPackLeftQty = 0; //澶栫鍓╀綑鏁伴噺
+                Int64 dLabelQty = 0; //灏忕鏁伴噺
+                Int64 dQty = 0; //鎬绘暟閲�
+                Int64 dEntryID = 0; //琛屽彿
+                string sPackBarCode = ""; //澶栫鐮�
+                string sBarCode = ""; //鍞竴鐮�
+                Int64 LSH = 0;
+                DataSet Ds;
+                string sYear = DateTime.Today.Year.ToString().Substring(2, 2);
+                string sPeriod = "0" + DateTime.Today.Month.ToString();
+                sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+                string sDay = "0" + DateTime.Today.Day.ToString();
+                sDay = sDay.Substring(sDay.Length - 2, 2);
+                //
+                string sPackStr = "ZXM" + sYear + sPeriod + sDay; //澶栫鐮� 鍓嶇紑
+
+                //蹇呴』鏉$爜鐢熸垚鎸夐挳鏄伆搴︽墠鍙互鐢熸垚绠辨潯鐮�
+                if (bc.Enabled != false)
+                {
+                    MessageBox.Show("璇峰厛鐢熸垚鏉″舰鐮侊紝鍐嶇敓鎴愮鏉$爜");
+                    return;
+                }
+                //-------------------鏍规嵁HINTERID鐢熸垚绠辨潯鐮�
+                //鐢熸垚鍓嶅垽鏂紝寰幆鐗╂枡缃戞牸锛屽垽鏂� 鏄惁璁剧疆浜嗗悎鐞嗙殑 澶栫鏁伴噺銆� 澶栫鏁伴噺 蹇呴』鏄� 鏈�灏忓寘瑁呮暟鐨� 鍊嶆暟 骞跺繀椤诲ぇ浜�0鍜屽ぇ浜庣瓑浜庢渶灏忓寘瑁呮暟閲忋��
+                for (int i = 0; i < grdMain.Rows.Count; i++)
+                {
+                    if (DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0)
+                    {
+                        if (DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPackQtyCol].Value) <= 0)
+                        {
+                            MessageBox.Show("璇峰綍鍏ュ悎鐞嗙殑澶栫鏁伴噺锛岀" + Convert.ToString(i + 1) + "琛�");
+                            return;
+                        }
+                        if (DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPackQtyCol].Value)
+                            % DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HMinQtyCol].Value) != 0
+                            || DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPackQtyCol].Value)
+                            < DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HMinQtyCol].Value))
+                        {
+                            MessageBox.Show("澶栫鏁伴噺蹇呴』鏄渶灏忓寘瑁呮暟鐨勫�嶆暟锛屼笖澶т簬绛変簬鏈�灏忓寘瑁呮暟锛岀" + Convert.ToString(i + 1) + "琛�");
+                            return;
+                        }
+                    }
+                }
+                //oCn.BeginTran();
+                //浠�0琛岃繘琛屽惊鐜� 鐗╂枡缃戞牸锛岃幏鍙栧绠辨暟閲�
+                for (int i = 0; i < grdMain.Rows.Count; i++)
+                {
+                    if (DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0)
+                    {
+                        //鑾峰彇鎬绘暟閲忋�佸绠辨暟閲� 
+                        dPackQty = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPackQtyCol].Value);
+                        dQty = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HQtyCol].Value);
+                        dEntryID = i + 1;
+                        dPackLeftQty = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPackQtyCol].Value);
+                        //鐢熸垚涓�涓绠辩爜
+                        Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿                                                                                          //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+                        LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]) + 1;
+                        sPackBarCode = sPackStr + LSH.ToString();
+                        oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
+                        //瀛愬惊鐜� 鏉$爜缃戞牸
+                        for (int j = 0; j < grdSub.Rows.Count; j++)
+                        {
+                            if (dEntryID == DBUtility.ClsPub.isLong(grdSub.Rows[j].Cells[HEntryID2Col].Value))
+                            {
+                                if (dQty <= 0)
+                                {
+                                    continue;
+                                }
+                                if (dPackLeftQty > 0) //褰撳墿浣欏绠辨暟閲忓皬浜庣瓑浜�0鏃讹紝閲嶆柊鐢熸垚澶栫鐮�
+                                {
+                                }
+                                else
+                                {
+                                    //鐢熸垚涓�涓绠辩爜
+                                    Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo");    //鑾峰彇鏈�澶ф祦姘村彿                                                                                          //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+                                    LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]) + 1;
+                                    sPackBarCode = sPackStr + LSH.ToString();
+                                    oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
+                                    dPackLeftQty = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPackQtyCol].Value);
+                                }
+                                sBarCode = DBUtility.ClsPub.isStrNull(grdSub.Rows[j].Cells[HTMCol].Value); // 鏉$爜
+                                dLabelQty = DBUtility.ClsPub.isLong(grdSub.Rows[j].Cells[HQty2Col].Value); // 灏忕鏁伴噺
+                                oCn.RunProc("update Gy_BarCodebill set HInnerBillNo= '" + sPackBarCode + "' Where HbarCode='" + sBarCode + "'");
+                                dPackLeftQty = dPackLeftQty - dLabelQty;
+                                dQty = dQty - dLabelQty;
+                                if (dPackLeftQty <= 0)//褰撶鍓╀綑鏁伴噺灏忎簬绛変簬0鏃� 鎵ц 缁勬墭鍗�
+                                {
+                                    //鑾峰彇缁勬墭鍗曞唴鐮�
+                                    iInterID = DBUtility.ClsPub.CreateBillID("3783", ref DBUtility.ClsPub.sExeReturnInfo); ;//寰楀埌鏂板崟鍙�; 
+                                                                                                                            //鏍规嵁澶栫鐮� 鍐欏叆 缁勬墭鍗曚富琛紝缁勬墭鍗曞瓙琛紝SUM锛屽绠辩爜妗f锛孲UM妗f
+                                    oCn.RunProc("exec  h_p_WMS_PackUnionBill_AddNew  '" + sPackBarCode + "'," + iInterID.ToString() + ",'" + DBUtility.ClsPub.CurUserName + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 涓昏〃锛屽瓙琛� 锛岀鏉$爜妗f 
+                                    oCn.RunProc("exec  h_p_WMS_PackUnionBill_SumSubBill  " + iInterID.ToString() + ",'" + sPackBarCode + "','3783','" + DBUtility.ClsPub.CurUserName + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 SUM琛紝SUM鏉$爜妗f
+                                }
+                            }
+                            else
+                            {
+                                continue;
+                            }
+                        }
+                    }
+                }
+                wxm.Enabled = false;
+                //oCn.Commit();
+                MessageBox.Show("鐢熸垚绠辩爜瀹屾瘯锛�");
+                //鍒锋柊鏁版嵁
+                Display();
+            }
+            catch (Exception e1)
+            {
+                //oCn.RollBack();
+                MessageBox.Show("鐢熸垚绠辩爜澶辫触锛�" + e1.Message);
+            }
+        }
+
+        private void cmbSourceBillType_TextChanged(object sender, EventArgs e)
+        {
+            if (cmbSourceBillType.Text == "宸ュ簭娴佽浆鍗�")
+            {
+                cmbHBarCodeType.Items.Clear();
+                cmbHBarCodeType.Items.Add("搴忓垪鐮�");
+                this.cmbHBarCodeType.SelectedIndex = 0;
+            }
+            else
+            {
+                if (CampanyName == "澶忓疂鐢靛櫒")
+                {
+                    cmbHBarCodeType.Items.Clear();
+                    cmbHBarCodeType.Items.Add("鍐呴攢鏈烘潯鐮�");
+                    cmbHBarCodeType.Items.Add("澶栭攢鏈烘潯鐮�");
+                    cmbHBarCodeType.Items.Add("鍗婃垚鍝佹潯鐮�");
+                    this.cmbHBarCodeType.SelectedIndex = 0;
+                }
+                else if (CampanyName == "鍗氭棩绉戞妧")
+                {
+                    cmbHBarCodeType.Items.Clear();
+                    cmbHBarCodeType.Items.Add("浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�");
+                    cmbHBarCodeType.Items.Add("浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�");
+                    cmbHBarCodeType.Items.Add("浠櫒鎴愬搧鏉$爜瑙勫垯");
+                    cmbHBarCodeType.Items.Add("璇曞墏鎴愬搧鏉$爜瑙勫垯");
+                    this.cmbHBarCodeType.SelectedIndex = 0;
+                }
+                else if (CampanyName == "涓帶")
+                {
+                    cmbHBarCodeType.Items.Clear();
+                    cmbHBarCodeType.Items.Add("鍞竴鏉$爜");
+                    this.cmbHBarCodeType.SelectedIndex = 0;
+                }
+                else
+                {
+                    cmbHBarCodeType.Items.Clear();
+                    cmbHBarCodeType.Items.Add("鍞竴鏉$爜");
+                    cmbHBarCodeType.Items.Add("鍝佺鏉$爜");
+                    cmbHBarCodeType.Items.Add("鎵规鏉$爜");
+                    this.cmbHBarCodeType.SelectedIndex = 0;
+                }
+            }
+        }
+
+        private void cmdSourceBillNo_Click_1(object sender, EventArgs e)
+        {
+            cmdSourceBillNo_Click(sender, e);
+        }
+
+        private void button_startListen_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (grdMain.Rows.Count == 0 || grdMain.Rows[0].Cells[HMaterIDCol].Value == null || grdMain.Rows[0].Cells[HMaterIDCol].Value.ToString() == "" || grdMain.Rows[0].Cells[HMaterIDCol].Value.ToString() == "0")
+                {
+                    MessageBox.Show("璇烽�夋嫨婧愬崟锛�");
+                    return;
+                }
+
+                if (textBox_IPParams.Text == "")
+                {
+                    MessageBox.Show("璇疯缃甀P鍦板潃锛�");
+                    return;
+                }
+                if (textBox_PortParams.Text == "")
+                {
+                    MessageBox.Show("璇疯缃鍙e彿锛�");
+                    return;
+                }
+
+                if (comboBox_PrinterParams.Text == "")
+                {
+                    MessageBox.Show("璇烽�夋嫨鎵撳嵃鏈猴紒");
+                    return;
+                }
+
+                if (textBox_PrintModelParams.Text == "")
+                {
+                    MessageBox.Show("璇疯缃墦鍗版ā鏉匡紒");
+                    return;
+                }
+
+                if (!judgePrinterIsConnected())
+                {
+                    MessageBox.Show("鎵撳嵃鏈哄浜庣绾跨姸鎬侊紝璇锋鏌ワ紒");
+                    return;
+                }
+
+                socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+                IPAddress iPAddress = IPAddress.Parse(textBox_IPParams.Text);
+                IPEndPoint point = new IPEndPoint(iPAddress, Convert.ToInt32(textBox_PortParams.Text));
+                socket.Connect(point);
+
+                Thread thread = new Thread(ReceiveMess);
+                thread.Start();
+                MessageBox.Show("杩炴帴鎴愬姛锛�");
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+            }
+        }
+
+        //socket閫氳锛氬鎴风鎺ユ敹淇℃伅
+        private void ReceiveMess()
+        {
+            try
+            {
+                while (true)
+                {
+                    byte[] buffer = new byte[1024 * 1024 * 5];
+                    int length = socket.Receive(buffer);
+                    if (length == 0)
+                    {
+                        break;
+                    }
+                    else
+                    {
+                        string RMess = Encoding.UTF8.GetString(buffer, 0, length);
+                        long produceQty = ClsPub.isLong(RMess);
+
+                        for (int i = 0; i < produceQty; i++)
+                        {
+                            //鐢熸垚鏉$爜
+                            this.Sub_SaveBill();
+
+                            //鑾峰彇闇�瑕佹墦鍗扮殑鏁版嵁
+                            Display();
+
+                            //璁剧疆鎵撳嵃妯℃澘锛屾墦鍗�
+                            grdList.Rows[0].Cells[0].Value = "*";
+                            Report = new GridppReport();
+                            Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + textBox_PrintModelParams.Text + ".grf");  //here .
+                            Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+                            Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+                            Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
+                            if (comboBox_PrinterParams.Text != "")
+                            {
+                                Report.Printer.PrinterName = comboBox_PrinterParams.Text;
+                            }
+                            Report.Print(false);
+                        }
+
+                        //閲嶆柊鍔犺浇璇ョ墿鏂欏綋澶╃敓鎴愮殑鏉$爜
+                        Display4();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("鎺ュ彛寮傚父锛屽凡鍏抽棴杩炴帴锛�" + ex.Message);
+                socket.Close();
+            }
+        }
+
+        private void button_stopListen_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (socket.Connected)
+                {
+                    socket.Close();
+                }
+                else
+                {
+                    MessageBox.Show("褰撳墠灏氭湭杩炴帴");
+                }
+
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message);
+            }
+        }
+
+        private void button_resetParams_Click(object sender, EventArgs e)
+        {
+            //comboBox_SourceNameParams.Items.Clear();
+            //comboBox_PrinterParams.Items.Clear();
+
+            //DBUtility.Xt_BaseBillFun.Sub_ClearBill(groupBox_ParamsInfo);
+        }
+
+        //鍐欏叆閰嶇疆鍙傛暟
+        private void saveParams()
+        {
+            //鍒ゆ柇鏂囦欢鏄惁瀛樺湪   
+            if (!File.Exists(Application.StartupPath + "//Gy_BarCodeBill_automaticallyByPLC.txt"))
+            {
+                FileStream fs1 = new FileStream(Application.StartupPath + "//Gy_BarCodeBill_automaticallyByPLC.txt", FileMode.Create, FileAccess.Write);//鍒涘缓鍐欏叆鏂囦欢    
+                StreamWriter sw = new StreamWriter(fs1);
+                sw.WriteLine(textBox_IPParams.Text);//寮�濮嬪啓鍏ュ��   
+                sw.WriteLine(textBox_PortParams.Text);
+
+                sw.WriteLine(comboBox_SourceNameParams.Text);
+
+                sw.WriteLine(comboBox_PrinterParams.Text);
+                sw.WriteLine(textBox_PrintModelParams.Text);
+                sw.Close();
+                fs1.Close();
+            }
+            else
+            {
+                FileStream fs1 = new FileStream(Application.StartupPath + "//Gy_BarCodeBill_automaticallyByPLC.txt", FileMode.Create, FileAccess.Write);//鍒涘缓鍐欏叆鏂囦欢    
+                StreamWriter sw = new StreamWriter(fs1);
+                sw.WriteLine(textBox_IPParams.Text);//寮�濮嬪啓鍏ュ��   
+                sw.WriteLine(textBox_PortParams.Text);
+
+                sw.WriteLine(comboBox_SourceNameParams.Text);
+
+                sw.WriteLine(comboBox_PrinterParams.Text);
+                sw.WriteLine(textBox_PrintModelParams.Text);
+                sw.Close();
+                fs1.Close();
+            }
+
+            MessageBox.Show("淇濆瓨鎴愬姛锛�");
+        }
+
+        private void readParams()
+        {
+            if (File.Exists(Application.StartupPath + "//Gy_BarCodeBill_automaticallyByPLC.txt"))
+            {
+                //璇诲彇鏂囦欢鍊煎苟鏄剧ず鍒扮獥浣�    
+                FileStream fs = new FileStream(Application.StartupPath + "//Gy_BarCodeBill_automaticallyByPLC.txt", FileMode.Open, FileAccess.ReadWrite);
+                StreamReader sr = new StreamReader(fs);
+                string line = sr.ReadLine();
+                int curLine = 0;
+                while (line != null)
+                {
+                    if (++curLine == 1)
+                    {
+                        textBox_IPParams.Text = line;
+                    }
+                    else if (curLine == 2)
+                    {
+                        textBox_PortParams.Text = line;
+                    }
+                    else if (curLine == 3)
+                    {
+                        for (int i = 0; i < comboBox_SourceNameParams.Items.Count; i++)
+                        {
+                            if (comboBox_SourceNameParams.Items[i].ToString() == line)
+                            {
+                                comboBox_SourceNameParams.Text = line;
+                            }
+                        }
+
+                        if (comboBox_SourceNameParams.Text == "")
+                        {
+                            comboBox_SourceNameParams.Items.Add(line);
+                            comboBox_SourceNameParams.Text = line;
+                        }
+                    }
+                    else if (curLine == 4)
+                    {
+                        for (int i = 0; i < comboBox_PrinterParams.Items.Count; i++)
+                        {
+                            if (comboBox_PrinterParams.Items[i].ToString() == line)
+                            {
+                                comboBox_PrinterParams.Text = line;
+                            }
+                        }
+                    }
+                    else if (curLine == 5)
+                    {
+                        textBox_PrintModelParams.Text = line;
+                    }
+                    else
+                    {
+
+                    }
+                    line = sr.ReadLine();
+                }
+                sr.Close();
+                fs.Close();
+            }        
+        }
+
+        private void button_saveParams_Click(object sender, EventArgs e)
+        {
+            saveParams();
+        }
+
+        //鍒ゆ柇鎵撳嵃鏈烘槸鍚﹀彲鐢�
+        private bool judgePrinterIsConnected()
+        {
+            //鑾峰彇鐢佃剳杩炴帴鐨勬墦鍗版満鍒楄〃
+            ManagementObjectSearcher searcher = new
+            ManagementObjectSearcher("SELECT * FROM Win32_Printer");
+
+            //鍖归厤璁剧疆鐨勬墦鍗版満锛屽苟鍒ゆ柇鏄惁鍙敤
+            string printerName = "";
+            foreach (ManagementObject printer in searcher.Get())
+            {
+                printerName = printer["Name"].ToString().ToLower();
+                if (printerName.Equals(comboBox_PrinterParams.Text.ToLower()))
+                {
+                    string HPrinterName = printer.Properties["Name"].Value.ToString();                      //鑾峰彇鎵撳嵃鏈哄悕绉�
+                    string HPrinterPort = printer.Properties["PortName"].Value.ToString();                  //鑾峰彇鎵撳嵃鏈虹鍙e彿
+                    string HPrinterDefault =  printer.Properties["Default"].Value.ToString();               //鑾峰彇鎵撳嵃鏈烘槸鍚︽槸榛樿鎵撳嵃鏈�
+                    string HPrinterWorkStatus = printer.Properties["PrinterStatus"].Value.ToString();       //鑾峰彇鎵撳嵃鏈哄伐浣滅姸鎬�(1:鍏朵粬锛�2:鏈煡锛�3:绌洪棽锛�4:鎵撳嵃锛�5:棰勭儹锛�6:鍋滄鎵撳嵃锛�7:鑴辨満)
+                    string HIsOffOnline = printer.Properties["WorkOffline"].Value.ToString();               //鑾峰彇鎵撳嵃鏈烘槸鍚︾绾�
+
+
+                    string isConnected = printer["WorkOffline"].ToString().ToLower();
+
+                    if (isConnected.Equals("true"))
+                    {
+                        return false;
+                    }
+                    else
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+    }
+}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs"
new file mode 100644
index 0000000..f65d20c
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs"
@@ -0,0 +1,1677 @@
+锘縩amespace WarM
+{
+    partial class Gy_BarCodeBill_automaticallyByPLC_New
+    {
+        /// <summary>
+        /// 蹇呴渶鐨勮璁″櫒鍙橀噺銆�
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// 娓呯悊鎵�鏈夋鍦ㄤ娇鐢ㄧ殑璧勬簮銆�
+        /// </summary>
+        /// <param name="disposing">濡傛灉搴旈噴鏀炬墭绠¤祫婧愶紝涓� true锛涘惁鍒欎负 false銆�</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows 绐椾綋璁捐鍣ㄧ敓鎴愮殑浠g爜
+
+        /// <summary>
+        /// 璁捐鍣ㄦ敮鎸佹墍闇�鐨勬柟娉� - 涓嶈
+        /// 浣跨敤浠g爜缂栬緫鍣ㄤ慨鏀规鏂规硶鐨勫唴瀹广��
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_BarCodeBill_automaticallyByPLC_New));
+            this.Tool = new System.Windows.Forms.ToolStrip();
+            this.dy = new System.Windows.Forms.ToolStripButton();
+            this.sdy = new System.Windows.Forms.ToolStripButton();
+            this.yl = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+            this.AddRow = new System.Windows.Forms.ToolStripButton();
+            this.spRow = new System.Windows.Forms.ToolStripButton();
+            this.bc = new System.Windows.Forms.ToolStripButton();
+            this.DelRow = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+            this.wxm = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+            this.cz = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+            this.kc = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
+            this.mrlk = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
+            this.bclk = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
+            this.tb = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+            this.gl = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+            this.BatchNo = new System.Windows.Forms.ToolStripButton();
+            this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+            this.tc = new System.Windows.Forms.ToolStripButton();
+            this.lblCaption = new System.Windows.Forms.Label();
+            this.P1 = new System.Windows.Forms.Panel();
+            this.tabControl_MainInfo = new System.Windows.Forms.TabControl();
+            this.tabPage_BillInfo = new System.Windows.Forms.TabPage();
+            this.gbUp = new System.Windows.Forms.GroupBox();
+            this.cmdSourceBillNo = new System.Windows.Forms.Button();
+            this.cmbHWorksNumber = new System.Windows.Forms.ComboBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.cmbHOrgID = new System.Windows.Forms.ComboBox();
+            this.radioButton_HIsUsingBatchNo = new System.Windows.Forms.RadioButton();
+            this.label_SourceName = new System.Windows.Forms.Label();
+            this.button_stopListen = new System.Windows.Forms.Button();
+            this.textBox_SourceName = new System.Windows.Forms.TextBox();
+            this.dtpHDate = new System.Windows.Forms.DateTimePicker();
+            this.label_HMaterNumber = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.textBox_HMaterNumber = new System.Windows.Forms.TextBox();
+            this.button_startListen = new System.Windows.Forms.Button();
+            this.label_HMaterName = new System.Windows.Forms.Label();
+            this.cmbHBarCodeType = new System.Windows.Forms.ComboBox();
+            this.textBox_HMaterName = new System.Windows.Forms.TextBox();
+            this.label_HMaterModel = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.textBox_HMaterModel = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label_HPlanQty = new System.Windows.Forms.Label();
+            this.textBox_HQty = new System.Windows.Forms.TextBox();
+            this.textBox_HPlanQty = new System.Windows.Forms.TextBox();
+            this.label10 = new System.Windows.Forms.Label();
+            this.txtHSourceBillNo = new System.Windows.Forms.TextBox();
+            this.cmbSourceBillType = new System.Windows.Forms.ComboBox();
+            this.label14 = new System.Windows.Forms.Label();
+            this.label_HQty = new System.Windows.Forms.Label();
+            this.tabPage_ParamsInfo = new System.Windows.Forms.TabPage();
+            this.groupBox_ParamsInfo = new System.Windows.Forms.GroupBox();
+            this.button_resetParams = new System.Windows.Forms.Button();
+            this.button_saveParams = new System.Windows.Forms.Button();
+            this.textBox_PrintModelParams = new System.Windows.Forms.TextBox();
+            this.label_PrintModelParams = new System.Windows.Forms.Label();
+            this.comboBox_PrinterParams = new System.Windows.Forms.ComboBox();
+            this.label_PrinterParams = new System.Windows.Forms.Label();
+            this.comboBox_SourceNameParams = new System.Windows.Forms.ComboBox();
+            this.label_SourceNameParams = new System.Windows.Forms.Label();
+            this.textBox_PortParams = new System.Windows.Forms.TextBox();
+            this.label_PortParams = new System.Windows.Forms.Label();
+            this.textBox_IPParams = new System.Windows.Forms.TextBox();
+            this.label_IPParams = new System.Windows.Forms.Label();
+            this.pic1 = new System.Windows.Forms.PictureBox();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.txtHDeleteDate = new System.Windows.Forms.Label();
+            this.label25 = new System.Windows.Forms.Label();
+            this.txtHDeleteMan = new System.Windows.Forms.Label();
+            this.label27 = new System.Windows.Forms.Label();
+            this.txtHUpDateDate = new System.Windows.Forms.Label();
+            this.label23 = new System.Windows.Forms.Label();
+            this.txtHUpDater = new System.Windows.Forms.Label();
+            this.label21 = new System.Windows.Forms.Label();
+            this.txtHCloseDate = new System.Windows.Forms.Label();
+            this.label19 = new System.Windows.Forms.Label();
+            this.txtHCloseMan = new System.Windows.Forms.Label();
+            this.label17 = new System.Windows.Forms.Label();
+            this.txtHCheckDate = new System.Windows.Forms.Label();
+            this.label15 = new System.Windows.Forms.Label();
+            this.txtHChecker = new System.Windows.Forms.Label();
+            this.label13 = new System.Windows.Forms.Label();
+            this.txtHMakeDate = new System.Windows.Forms.Label();
+            this.label11 = new System.Windows.Forms.Label();
+            this.txtHMaker = new System.Windows.Forms.Label();
+            this.label8 = new System.Windows.Forms.Label();
+            this.timer1 = new System.Windows.Forms.Timer(this.components);
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.grdSum = new System.Windows.Forms.DataGridView();
+            this.grdPrint = new System.Windows.Forms.DataGridView();
+            this.tabPage3 = new System.Windows.Forms.TabPage();
+            this.grdList = new System.Windows.Forms.DataGridView();
+            this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.grdSub = new System.Windows.Forms.DataGridView();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.grdMain = new System.Windows.Forms.DataGridView();
+            this.tabControl1 = new System.Windows.Forms.TabControl();
+            this.tabPage4 = new System.Windows.Forms.TabPage();
+            this.grdBillBarCodeList = new System.Windows.Forms.DataGridView();
+            this.pageSetupDialog1 = new System.Windows.Forms.PageSetupDialog();
+            this.printDialog1 = new System.Windows.Forms.PrintDialog();
+            this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog();
+            this.printDocument1 = new System.Drawing.Printing.PrintDocument();
+            this.Tool.SuspendLayout();
+            this.P1.SuspendLayout();
+            this.tabControl_MainInfo.SuspendLayout();
+            this.tabPage_BillInfo.SuspendLayout();
+            this.gbUp.SuspendLayout();
+            this.tabPage_ParamsInfo.SuspendLayout();
+            this.groupBox_ParamsInfo.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
+            this.panel2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
+            this.tabPage3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.grdList)).BeginInit();
+            this.tabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.grdSub)).BeginInit();
+            this.tabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
+            this.tabControl1.SuspendLayout();
+            this.tabPage4.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.grdBillBarCodeList)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // Tool
+            // 
+            this.Tool.AutoSize = false;
+            this.Tool.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("Tool.BackgroundImage")));
+            this.Tool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
+            this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.dy,
+            this.sdy,
+            this.yl,
+            this.toolStripSeparator2,
+            this.AddRow,
+            this.spRow,
+            this.bc,
+            this.DelRow,
+            this.toolStripSeparator4,
+            this.toolStripSeparator8,
+            this.wxm,
+            this.toolStripSeparator9,
+            this.cz,
+            this.toolStripSeparator5,
+            this.kc,
+            this.toolStripSeparator1,
+            this.toolStripSeparator12,
+            this.mrlk,
+            this.toolStripSeparator11,
+            this.bclk,
+            this.toolStripSeparator10,
+            this.tb,
+            this.toolStripSeparator6,
+            this.gl,
+            this.toolStripSeparator7,
+            this.BatchNo,
+            this.toolStripSeparator3,
+            this.tc});
+            this.Tool.Location = new System.Drawing.Point(0, 0);
+            this.Tool.Name = "Tool";
+            this.Tool.Padding = new System.Windows.Forms.Padding(0);
+            this.Tool.Size = new System.Drawing.Size(1526, 75);
+            this.Tool.Stretch = true;
+            this.Tool.TabIndex = 17;
+            this.Tool.Text = "toolStrip1";
+            // 
+            // dy
+            // 
+            this.dy.AutoSize = false;
+            this.dy.Image = ((System.Drawing.Image)(resources.GetObject("dy.Image")));
+            this.dy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.dy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.dy.ImageTransparentColor = System.Drawing.Color.White;
+            this.dy.Name = "dy";
+            this.dy.Size = new System.Drawing.Size(35, 47);
+            this.dy.Text = "鎵撳嵃";
+            this.dy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.dy.Visible = false;
+            this.dy.Click += new System.EventHandler(this.dy_Click);
+            // 
+            // sdy
+            // 
+            this.sdy.AutoSize = false;
+            this.sdy.Image = ((System.Drawing.Image)(resources.GetObject("sdy.Image")));
+            this.sdy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.sdy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.sdy.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.sdy.Name = "sdy";
+            this.sdy.Size = new System.Drawing.Size(35, 47);
+            this.sdy.Text = "娴忚";
+            this.sdy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.sdy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.sdy.Visible = false;
+            this.sdy.Click += new System.EventHandler(this.sdy_Click);
+            // 
+            // yl
+            // 
+            this.yl.AutoSize = false;
+            this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image")));
+            this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.yl.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.yl.Name = "yl";
+            this.yl.Size = new System.Drawing.Size(35, 47);
+            this.yl.Text = "棰勮";
+            this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.yl.Visible = false;
+            this.yl.Click += new System.EventHandler(this.yl_Click);
+            // 
+            // toolStripSeparator2
+            // 
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
+            this.toolStripSeparator2.Size = new System.Drawing.Size(6, 75);
+            // 
+            // AddRow
+            // 
+            this.AddRow.AutoSize = false;
+            this.AddRow.Image = ((System.Drawing.Image)(resources.GetObject("AddRow.Image")));
+            this.AddRow.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.AddRow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.AddRow.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.AddRow.Name = "AddRow";
+            this.AddRow.Size = new System.Drawing.Size(35, 47);
+            this.AddRow.Text = "澧炶";
+            this.AddRow.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.AddRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.AddRow.Visible = false;
+            this.AddRow.Click += new System.EventHandler(this.AddRow_Click);
+            // 
+            // spRow
+            // 
+            this.spRow.AutoSize = false;
+            this.spRow.Image = ((System.Drawing.Image)(resources.GetObject("spRow.Image")));
+            this.spRow.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.spRow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.spRow.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.spRow.Name = "spRow";
+            this.spRow.Size = new System.Drawing.Size(35, 47);
+            this.spRow.Text = "鎷嗚";
+            this.spRow.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.spRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.spRow.Visible = false;
+            this.spRow.Click += new System.EventHandler(this.spRow_Click);
+            // 
+            // bc
+            // 
+            this.bc.AutoSize = false;
+            this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
+            this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.bc.Name = "bc";
+            this.bc.Size = new System.Drawing.Size(35, 47);
+            this.bc.Text = "鐢熸垚";
+            this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.bc.Click += new System.EventHandler(this.bc_Click);
+            // 
+            // DelRow
+            // 
+            this.DelRow.AutoSize = false;
+            this.DelRow.Image = ((System.Drawing.Image)(resources.GetObject("DelRow.Image")));
+            this.DelRow.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.DelRow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.DelRow.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.DelRow.Name = "DelRow";
+            this.DelRow.Size = new System.Drawing.Size(35, 47);
+            this.DelRow.Text = "鍒犺";
+            this.DelRow.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.DelRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.DelRow.Visible = false;
+            this.DelRow.Click += new System.EventHandler(this.DelRow_Click);
+            // 
+            // toolStripSeparator4
+            // 
+            this.toolStripSeparator4.Name = "toolStripSeparator4";
+            this.toolStripSeparator4.Size = new System.Drawing.Size(6, 75);
+            this.toolStripSeparator4.Visible = false;
+            // 
+            // toolStripSeparator8
+            // 
+            this.toolStripSeparator8.Name = "toolStripSeparator8";
+            this.toolStripSeparator8.Size = new System.Drawing.Size(6, 75);
+            this.toolStripSeparator8.Visible = false;
+            // 
+            // wxm
+            // 
+            this.wxm.AutoSize = false;
+            this.wxm.Image = ((System.Drawing.Image)(resources.GetObject("wxm.Image")));
+            this.wxm.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.wxm.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.wxm.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.wxm.Name = "wxm";
+            this.wxm.Size = new System.Drawing.Size(50, 47);
+            this.wxm.Text = "澶栫鐮�";
+            this.wxm.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.wxm.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.wxm.Visible = false;
+            this.wxm.Click += new System.EventHandler(this.wxm_Click);
+            // 
+            // toolStripSeparator9
+            // 
+            this.toolStripSeparator9.Name = "toolStripSeparator9";
+            this.toolStripSeparator9.Size = new System.Drawing.Size(6, 75);
+            // 
+            // cz
+            // 
+            this.cz.AutoSize = false;
+            this.cz.Image = ((System.Drawing.Image)(resources.GetObject("cz.Image")));
+            this.cz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.cz.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.cz.Name = "cz";
+            this.cz.Size = new System.Drawing.Size(35, 47);
+            this.cz.Text = "閲嶇疆";
+            this.cz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.cz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.cz.Visible = false;
+            this.cz.Click += new System.EventHandler(this.cz_Click);
+            // 
+            // toolStripSeparator5
+            // 
+            this.toolStripSeparator5.Name = "toolStripSeparator5";
+            this.toolStripSeparator5.Size = new System.Drawing.Size(6, 75);
+            // 
+            // kc
+            // 
+            this.kc.AutoSize = false;
+            this.kc.Image = ((System.Drawing.Image)(resources.GetObject("kc.Image")));
+            this.kc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.kc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.kc.ImageTransparentColor = System.Drawing.Color.White;
+            this.kc.Name = "kc";
+            this.kc.Size = new System.Drawing.Size(35, 47);
+            this.kc.Text = "搴撳瓨";
+            this.kc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.kc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.kc.Visible = false;
+            this.kc.Click += new System.EventHandler(this.kc_Click);
+            // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 75);
+            // 
+            // toolStripSeparator12
+            // 
+            this.toolStripSeparator12.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.toolStripSeparator12.Name = "toolStripSeparator12";
+            this.toolStripSeparator12.Size = new System.Drawing.Size(6, 75);
+            // 
+            // mrlk
+            // 
+            this.mrlk.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.mrlk.Image = ((System.Drawing.Image)(resources.GetObject("mrlk.Image")));
+            this.mrlk.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
+            this.mrlk.Name = "mrlk";
+            this.mrlk.Size = new System.Drawing.Size(86, 70);
+            this.mrlk.Text = "榛樿鍒楀";
+            this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.mrlk.Click += new System.EventHandler(this.mrlk_Click);
+            // 
+            // toolStripSeparator11
+            // 
+            this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.toolStripSeparator11.Name = "toolStripSeparator11";
+            this.toolStripSeparator11.Size = new System.Drawing.Size(6, 75);
+            // 
+            // bclk
+            // 
+            this.bclk.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.bclk.Image = ((System.Drawing.Image)(resources.GetObject("bclk.Image")));
+            this.bclk.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.bclk.ImageTransparentColor = System.Drawing.Color.White;
+            this.bclk.Name = "bclk";
+            this.bclk.Size = new System.Drawing.Size(86, 70);
+            this.bclk.Text = "淇濆瓨鍒楀";
+            this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.bclk.Click += new System.EventHandler(this.bclk_Click);
+            // 
+            // toolStripSeparator10
+            // 
+            this.toolStripSeparator10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+            this.toolStripSeparator10.Name = "toolStripSeparator10";
+            this.toolStripSeparator10.Size = new System.Drawing.Size(6, 75);
+            // 
+            // tb
+            // 
+            this.tb.AutoSize = false;
+            this.tb.Image = ((System.Drawing.Image)(resources.GetObject("tb.Image")));
+            this.tb.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.tb.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tb.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.tb.Name = "tb";
+            this.tb.Size = new System.Drawing.Size(80, 47);
+            this.tb.Text = "鍚屾璧勬枡";
+            this.tb.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.tb.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.tb.ToolTipText = "鍚屾鍩虹璧勬枡";
+            this.tb.Visible = false;
+            this.tb.Click += new System.EventHandler(this.tb_Click);
+            // 
+            // toolStripSeparator6
+            // 
+            this.toolStripSeparator6.Name = "toolStripSeparator6";
+            this.toolStripSeparator6.Size = new System.Drawing.Size(6, 75);
+            // 
+            // gl
+            // 
+            this.gl.AutoSize = false;
+            this.gl.Image = ((System.Drawing.Image)(resources.GetObject("gl.Image")));
+            this.gl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.gl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.gl.ImageTransparentColor = System.Drawing.Color.White;
+            this.gl.Name = "gl";
+            this.gl.Size = new System.Drawing.Size(35, 47);
+            this.gl.Text = "鍏宠仈";
+            this.gl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.gl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.gl.Visible = false;
+            this.gl.Click += new System.EventHandler(this.gl_Click);
+            // 
+            // toolStripSeparator7
+            // 
+            this.toolStripSeparator7.Name = "toolStripSeparator7";
+            this.toolStripSeparator7.Size = new System.Drawing.Size(6, 75);
+            // 
+            // BatchNo
+            // 
+            this.BatchNo.AutoSize = false;
+            this.BatchNo.Image = ((System.Drawing.Image)(resources.GetObject("BatchNo.Image")));
+            this.BatchNo.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.BatchNo.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.BatchNo.ImageTransparentColor = System.Drawing.Color.White;
+            this.BatchNo.Name = "BatchNo";
+            this.BatchNo.Size = new System.Drawing.Size(36, 47);
+            this.BatchNo.Text = "鎵规";
+            this.BatchNo.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.BatchNo.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.BatchNo.Visible = false;
+            this.BatchNo.Click += new System.EventHandler(this.BatchNo_Click);
+            // 
+            // toolStripSeparator3
+            // 
+            this.toolStripSeparator3.Name = "toolStripSeparator3";
+            this.toolStripSeparator3.Size = new System.Drawing.Size(6, 75);
+            // 
+            // tc
+            // 
+            this.tc.AutoSize = false;
+            this.tc.Image = ((System.Drawing.Image)(resources.GetObject("tc.Image")));
+            this.tc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.tc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+            this.tc.ImageTransparentColor = System.Drawing.Color.White;
+            this.tc.Name = "tc";
+            this.tc.Size = new System.Drawing.Size(35, 47);
+            this.tc.Text = "閫�鍑�";
+            this.tc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+            this.tc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+            this.tc.Click += new System.EventHandler(this.tc_Click);
+            // 
+            // lblCaption
+            // 
+            this.lblCaption.AutoSize = true;
+            this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lblCaption.Location = new System.Drawing.Point(752, 18);
+            this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblCaption.Name = "lblCaption";
+            this.lblCaption.Size = new System.Drawing.Size(133, 29);
+            this.lblCaption.TabIndex = 18;
+            this.lblCaption.Text = "鍗曟嵁缂栬緫";
+            this.lblCaption.Visible = false;
+            // 
+            // P1
+            // 
+            this.P1.BackColor = System.Drawing.Color.Lavender;
+            this.P1.Controls.Add(this.tabControl_MainInfo);
+            this.P1.Controls.Add(this.pic1);
+            this.P1.Controls.Add(this.lblCaption);
+            this.P1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.P1.Location = new System.Drawing.Point(62, 75);
+            this.P1.Margin = new System.Windows.Forms.Padding(4);
+            this.P1.Name = "P1";
+            this.P1.Size = new System.Drawing.Size(1406, 358);
+            this.P1.TabIndex = 31;
+            // 
+            // tabControl_MainInfo
+            // 
+            this.tabControl_MainInfo.Controls.Add(this.tabPage_BillInfo);
+            this.tabControl_MainInfo.Controls.Add(this.tabPage_ParamsInfo);
+            this.tabControl_MainInfo.Location = new System.Drawing.Point(3, 4);
+            this.tabControl_MainInfo.Name = "tabControl_MainInfo";
+            this.tabControl_MainInfo.SelectedIndex = 0;
+            this.tabControl_MainInfo.Size = new System.Drawing.Size(1395, 346);
+            this.tabControl_MainInfo.TabIndex = 38;
+            // 
+            // tabPage_BillInfo
+            // 
+            this.tabPage_BillInfo.BackColor = System.Drawing.Color.Lavender;
+            this.tabPage_BillInfo.Controls.Add(this.gbUp);
+            this.tabPage_BillInfo.Location = new System.Drawing.Point(4, 28);
+            this.tabPage_BillInfo.Name = "tabPage_BillInfo";
+            this.tabPage_BillInfo.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage_BillInfo.Size = new System.Drawing.Size(1387, 314);
+            this.tabPage_BillInfo.TabIndex = 0;
+            this.tabPage_BillInfo.Text = "宸ュ崟淇℃伅";
+            // 
+            // gbUp
+            // 
+            this.gbUp.BackColor = System.Drawing.Color.Transparent;
+            this.gbUp.Controls.Add(this.cmdSourceBillNo);
+            this.gbUp.Controls.Add(this.cmbHWorksNumber);
+            this.gbUp.Controls.Add(this.label4);
+            this.gbUp.Controls.Add(this.cmbHOrgID);
+            this.gbUp.Controls.Add(this.radioButton_HIsUsingBatchNo);
+            this.gbUp.Controls.Add(this.label_SourceName);
+            this.gbUp.Controls.Add(this.button_stopListen);
+            this.gbUp.Controls.Add(this.textBox_SourceName);
+            this.gbUp.Controls.Add(this.dtpHDate);
+            this.gbUp.Controls.Add(this.label_HMaterNumber);
+            this.gbUp.Controls.Add(this.label2);
+            this.gbUp.Controls.Add(this.textBox_HMaterNumber);
+            this.gbUp.Controls.Add(this.button_startListen);
+            this.gbUp.Controls.Add(this.label_HMaterName);
+            this.gbUp.Controls.Add(this.cmbHBarCodeType);
+            this.gbUp.Controls.Add(this.textBox_HMaterName);
+            this.gbUp.Controls.Add(this.label_HMaterModel);
+            this.gbUp.Controls.Add(this.label1);
+            this.gbUp.Controls.Add(this.textBox_HMaterModel);
+            this.gbUp.Controls.Add(this.label3);
+            this.gbUp.Controls.Add(this.label_HPlanQty);
+            this.gbUp.Controls.Add(this.textBox_HQty);
+            this.gbUp.Controls.Add(this.textBox_HPlanQty);
+            this.gbUp.Controls.Add(this.label10);
+            this.gbUp.Controls.Add(this.txtHSourceBillNo);
+            this.gbUp.Controls.Add(this.cmbSourceBillType);
+            this.gbUp.Controls.Add(this.label14);
+            this.gbUp.Controls.Add(this.label_HQty);
+            this.gbUp.Location = new System.Drawing.Point(4, 4);
+            this.gbUp.Margin = new System.Windows.Forms.Padding(4);
+            this.gbUp.Name = "gbUp";
+            this.gbUp.Padding = new System.Windows.Forms.Padding(4);
+            this.gbUp.Size = new System.Drawing.Size(1379, 310);
+            this.gbUp.TabIndex = 33;
+            this.gbUp.TabStop = false;
+            // 
+            // cmdSourceBillNo
+            // 
+            this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
+            this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+            this.cmdSourceBillNo.Location = new System.Drawing.Point(1214, 11);
+            this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
+            this.cmdSourceBillNo.Name = "cmdSourceBillNo";
+            this.cmdSourceBillNo.Size = new System.Drawing.Size(33, 33);
+            this.cmdSourceBillNo.TabIndex = 99;
+            this.cmdSourceBillNo.UseVisualStyleBackColor = true;
+            this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click_1);
+            // 
+            // cmbHWorksNumber
+            // 
+            this.cmbHWorksNumber.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbHWorksNumber.FormattingEnabled = true;
+            this.cmbHWorksNumber.Location = new System.Drawing.Point(973, 250);
+            this.cmbHWorksNumber.Margin = new System.Windows.Forms.Padding(4);
+            this.cmbHWorksNumber.Name = "cmbHWorksNumber";
+            this.cmbHWorksNumber.Size = new System.Drawing.Size(280, 26);
+            this.cmbHWorksNumber.TabIndex = 98;
+            this.cmbHWorksNumber.Visible = false;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.ForeColor = System.Drawing.Color.Black;
+            this.label4.Location = new System.Drawing.Point(872, 256);
+            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(80, 18);
+            this.label4.TabIndex = 97;
+            this.label4.Text = "宸ュ巶浠g爜";
+            this.label4.Visible = false;
+            // 
+            // cmbHOrgID
+            // 
+            this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbHOrgID.FormattingEnabled = true;
+            this.cmbHOrgID.Location = new System.Drawing.Point(121, 21);
+            this.cmbHOrgID.Margin = new System.Windows.Forms.Padding(4);
+            this.cmbHOrgID.Name = "cmbHOrgID";
+            this.cmbHOrgID.Size = new System.Drawing.Size(280, 26);
+            this.cmbHOrgID.TabIndex = 85;
+            // 
+            // radioButton_HIsUsingBatchNo
+            // 
+            this.radioButton_HIsUsingBatchNo.AutoSize = true;
+            this.radioButton_HIsUsingBatchNo.Location = new System.Drawing.Point(874, 190);
+            this.radioButton_HIsUsingBatchNo.Name = "radioButton_HIsUsingBatchNo";
+            this.radioButton_HIsUsingBatchNo.Size = new System.Drawing.Size(141, 22);
+            this.radioButton_HIsUsingBatchNo.TabIndex = 98;
+            this.radioButton_HIsUsingBatchNo.TabStop = true;
+            this.radioButton_HIsUsingBatchNo.Text = "鏄惁鍚敤鎵规";
+            this.radioButton_HIsUsingBatchNo.UseVisualStyleBackColor = true;
+            // 
+            // label_SourceName
+            // 
+            this.label_SourceName.AutoSize = true;
+            this.label_SourceName.Location = new System.Drawing.Point(20, 84);
+            this.label_SourceName.Name = "label_SourceName";
+            this.label_SourceName.Size = new System.Drawing.Size(80, 18);
+            this.label_SourceName.TabIndex = 0;
+            this.label_SourceName.Text = "浜�    绾�";
+            // 
+            // button_stopListen
+            // 
+            this.button_stopListen.Location = new System.Drawing.Point(404, 250);
+            this.button_stopListen.Name = "button_stopListen";
+            this.button_stopListen.Size = new System.Drawing.Size(151, 35);
+            this.button_stopListen.TabIndex = 97;
+            this.button_stopListen.Text = "鍋滄鐩戝惉";
+            this.button_stopListen.UseVisualStyleBackColor = true;
+            this.button_stopListen.Click += new System.EventHandler(this.button_stopListen_Click);
+            // 
+            // textBox_SourceName
+            // 
+            this.textBox_SourceName.BackColor = System.Drawing.SystemColors.ScrollBar;
+            this.textBox_SourceName.Enabled = false;
+            this.textBox_SourceName.Location = new System.Drawing.Point(122, 81);
+            this.textBox_SourceName.Name = "textBox_SourceName";
+            this.textBox_SourceName.Size = new System.Drawing.Size(280, 28);
+            this.textBox_SourceName.TabIndex = 43;
+            // 
+            // dtpHDate
+            // 
+            this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+            this.dtpHDate.Location = new System.Drawing.Point(967, 74);
+            this.dtpHDate.Name = "dtpHDate";
+            this.dtpHDate.Size = new System.Drawing.Size(280, 28);
+            this.dtpHDate.TabIndex = 96;
+            // 
+            // label_HMaterNumber
+            // 
+            this.label_HMaterNumber.AutoSize = true;
+            this.label_HMaterNumber.Location = new System.Drawing.Point(19, 140);
+            this.label_HMaterNumber.Name = "label_HMaterNumber";
+            this.label_HMaterNumber.Size = new System.Drawing.Size(80, 18);
+            this.label_HMaterNumber.TabIndex = 86;
+            this.label_HMaterNumber.Text = "鐗╂枡浠g爜";
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(867, 80);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(80, 18);
+            this.label2.TabIndex = 95;
+            this.label2.Text = "鏃�    鏈�";
+            // 
+            // textBox_HMaterNumber
+            // 
+            this.textBox_HMaterNumber.BackColor = System.Drawing.SystemColors.ScrollBar;
+            this.textBox_HMaterNumber.Enabled = false;
+            this.textBox_HMaterNumber.Location = new System.Drawing.Point(121, 137);
+            this.textBox_HMaterNumber.Name = "textBox_HMaterNumber";
+            this.textBox_HMaterNumber.Size = new System.Drawing.Size(280, 28);
+            this.textBox_HMaterNumber.TabIndex = 87;
+            // 
+            // button_startListen
+            // 
+            this.button_startListen.Location = new System.Drawing.Point(214, 250);
+            this.button_startListen.Name = "button_startListen";
+            this.button_startListen.Size = new System.Drawing.Size(133, 35);
+            this.button_startListen.TabIndex = 96;
+            this.button_startListen.Text = "寮�濮嬬洃鍚�";
+            this.button_startListen.UseVisualStyleBackColor = true;
+            this.button_startListen.Click += new System.EventHandler(this.button_startListen_Click);
+            // 
+            // label_HMaterName
+            // 
+            this.label_HMaterName.AutoSize = true;
+            this.label_HMaterName.Location = new System.Drawing.Point(445, 140);
+            this.label_HMaterName.Name = "label_HMaterName";
+            this.label_HMaterName.Size = new System.Drawing.Size(80, 18);
+            this.label_HMaterName.TabIndex = 88;
+            this.label_HMaterName.Text = "鐗╂枡鍚嶇О";
+            // 
+            // cmbHBarCodeType
+            // 
+            this.cmbHBarCodeType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbHBarCodeType.FormattingEnabled = true;
+            this.cmbHBarCodeType.Location = new System.Drawing.Point(550, 80);
+            this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(4);
+            this.cmbHBarCodeType.Name = "cmbHBarCodeType";
+            this.cmbHBarCodeType.Size = new System.Drawing.Size(280, 26);
+            this.cmbHBarCodeType.TabIndex = 81;
+            // 
+            // textBox_HMaterName
+            // 
+            this.textBox_HMaterName.BackColor = System.Drawing.SystemColors.ScrollBar;
+            this.textBox_HMaterName.Enabled = false;
+            this.textBox_HMaterName.Location = new System.Drawing.Point(550, 135);
+            this.textBox_HMaterName.Name = "textBox_HMaterName";
+            this.textBox_HMaterName.Size = new System.Drawing.Size(280, 28);
+            this.textBox_HMaterName.TabIndex = 89;
+            // 
+            // label_HMaterModel
+            // 
+            this.label_HMaterModel.AutoSize = true;
+            this.label_HMaterModel.Location = new System.Drawing.Point(871, 140);
+            this.label_HMaterModel.Name = "label_HMaterModel";
+            this.label_HMaterModel.Size = new System.Drawing.Size(80, 18);
+            this.label_HMaterModel.TabIndex = 90;
+            this.label_HMaterModel.Text = "瑙勬牸鍨嬪彿";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.ForeColor = System.Drawing.Color.Black;
+            this.label1.Location = new System.Drawing.Point(450, 86);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(80, 18);
+            this.label1.TabIndex = 80;
+            this.label1.Text = "鏉$爜绫诲瀷";
+            // 
+            // textBox_HMaterModel
+            // 
+            this.textBox_HMaterModel.BackColor = System.Drawing.SystemColors.ScrollBar;
+            this.textBox_HMaterModel.Enabled = false;
+            this.textBox_HMaterModel.Location = new System.Drawing.Point(973, 137);
+            this.textBox_HMaterModel.Name = "textBox_HMaterModel";
+            this.textBox_HMaterModel.Size = new System.Drawing.Size(280, 28);
+            this.textBox_HMaterModel.TabIndex = 91;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.ForeColor = System.Drawing.Color.Black;
+            this.label3.Location = new System.Drawing.Point(21, 27);
+            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(80, 18);
+            this.label3.TabIndex = 84;
+            this.label3.Text = "缁�    缁�";
+            // 
+            // label_HPlanQty
+            // 
+            this.label_HPlanQty.AutoSize = true;
+            this.label_HPlanQty.Location = new System.Drawing.Point(19, 192);
+            this.label_HPlanQty.Name = "label_HPlanQty";
+            this.label_HPlanQty.Size = new System.Drawing.Size(80, 18);
+            this.label_HPlanQty.TabIndex = 92;
+            this.label_HPlanQty.Text = "璁″垝鏁伴噺";
+            this.label_HPlanQty.Visible = false;
+            // 
+            // textBox_HQty
+            // 
+            this.textBox_HQty.BackColor = System.Drawing.SystemColors.ScrollBar;
+            this.textBox_HQty.Enabled = false;
+            this.textBox_HQty.Location = new System.Drawing.Point(550, 189);
+            this.textBox_HQty.Name = "textBox_HQty";
+            this.textBox_HQty.Size = new System.Drawing.Size(280, 28);
+            this.textBox_HQty.TabIndex = 95;
+            this.textBox_HQty.Visible = false;
+            this.textBox_HQty.WordWrap = false;
+            // 
+            // textBox_HPlanQty
+            // 
+            this.textBox_HPlanQty.BackColor = System.Drawing.SystemColors.ScrollBar;
+            this.textBox_HPlanQty.Enabled = false;
+            this.textBox_HPlanQty.Location = new System.Drawing.Point(121, 189);
+            this.textBox_HPlanQty.Name = "textBox_HPlanQty";
+            this.textBox_HPlanQty.Size = new System.Drawing.Size(280, 28);
+            this.textBox_HPlanQty.TabIndex = 93;
+            this.textBox_HPlanQty.Visible = false;
+            // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.ForeColor = System.Drawing.Color.Black;
+            this.label10.Location = new System.Drawing.Point(450, 25);
+            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(80, 18);
+            this.label10.TabIndex = 35;
+            this.label10.Text = "婧愬崟绫诲瀷";
+            // 
+            // txtHSourceBillNo
+            // 
+            this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.txtHSourceBillNo.Location = new System.Drawing.Point(967, 15);
+            this.txtHSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
+            this.txtHSourceBillNo.Name = "txtHSourceBillNo";
+            this.txtHSourceBillNo.Size = new System.Drawing.Size(247, 28);
+            this.txtHSourceBillNo.TabIndex = 41;
+            this.txtHSourceBillNo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHSourceBillNo_KeyPress);
+            // 
+            // cmbSourceBillType
+            // 
+            this.cmbSourceBillType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbSourceBillType.FormattingEnabled = true;
+            this.cmbSourceBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.cmbSourceBillType.Location = new System.Drawing.Point(550, 19);
+            this.cmbSourceBillType.Margin = new System.Windows.Forms.Padding(4);
+            this.cmbSourceBillType.Name = "cmbSourceBillType";
+            this.cmbSourceBillType.Size = new System.Drawing.Size(280, 26);
+            this.cmbSourceBillType.TabIndex = 36;
+            this.cmbSourceBillType.TextChanged += new System.EventHandler(this.cmbSourceBillType_TextChanged);
+            // 
+            // label14
+            // 
+            this.label14.AutoSize = true;
+            this.label14.ForeColor = System.Drawing.Color.Black;
+            this.label14.Location = new System.Drawing.Point(866, 21);
+            this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label14.Name = "label14";
+            this.label14.Size = new System.Drawing.Size(80, 18);
+            this.label14.TabIndex = 40;
+            this.label14.Text = "閫� 鍗� 鍙�";
+            // 
+            // label_HQty
+            // 
+            this.label_HQty.AutoSize = true;
+            this.label_HQty.Location = new System.Drawing.Point(445, 194);
+            this.label_HQty.Name = "label_HQty";
+            this.label_HQty.Size = new System.Drawing.Size(80, 18);
+            this.label_HQty.TabIndex = 94;
+            this.label_HQty.Text = "鐢熸垚鏁伴噺";
+            this.label_HQty.Visible = false;
+            // 
+            // tabPage_ParamsInfo
+            // 
+            this.tabPage_ParamsInfo.BackColor = System.Drawing.Color.Lavender;
+            this.tabPage_ParamsInfo.Controls.Add(this.groupBox_ParamsInfo);
+            this.tabPage_ParamsInfo.Location = new System.Drawing.Point(4, 28);
+            this.tabPage_ParamsInfo.Name = "tabPage_ParamsInfo";
+            this.tabPage_ParamsInfo.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage_ParamsInfo.Size = new System.Drawing.Size(1387, 314);
+            this.tabPage_ParamsInfo.TabIndex = 1;
+            this.tabPage_ParamsInfo.Text = "閰嶇疆淇℃伅";
+            // 
+            // groupBox_ParamsInfo
+            // 
+            this.groupBox_ParamsInfo.Controls.Add(this.button_resetParams);
+            this.groupBox_ParamsInfo.Controls.Add(this.button_saveParams);
+            this.groupBox_ParamsInfo.Controls.Add(this.textBox_PrintModelParams);
+            this.groupBox_ParamsInfo.Controls.Add(this.label_PrintModelParams);
+            this.groupBox_ParamsInfo.Controls.Add(this.comboBox_PrinterParams);
+            this.groupBox_ParamsInfo.Controls.Add(this.label_PrinterParams);
+            this.groupBox_ParamsInfo.Controls.Add(this.comboBox_SourceNameParams);
+            this.groupBox_ParamsInfo.Controls.Add(this.label_SourceNameParams);
+            this.groupBox_ParamsInfo.Controls.Add(this.textBox_PortParams);
+            this.groupBox_ParamsInfo.Controls.Add(this.label_PortParams);
+            this.groupBox_ParamsInfo.Controls.Add(this.textBox_IPParams);
+            this.groupBox_ParamsInfo.Controls.Add(this.label_IPParams);
+            this.groupBox_ParamsInfo.Location = new System.Drawing.Point(6, 6);
+            this.groupBox_ParamsInfo.Name = "groupBox_ParamsInfo";
+            this.groupBox_ParamsInfo.Size = new System.Drawing.Size(1287, 320);
+            this.groupBox_ParamsInfo.TabIndex = 0;
+            this.groupBox_ParamsInfo.TabStop = false;
+            // 
+            // button_resetParams
+            // 
+            this.button_resetParams.Location = new System.Drawing.Point(590, 173);
+            this.button_resetParams.Name = "button_resetParams";
+            this.button_resetParams.Size = new System.Drawing.Size(89, 40);
+            this.button_resetParams.TabIndex = 105;
+            this.button_resetParams.Text = "閲�  缃�";
+            this.button_resetParams.UseVisualStyleBackColor = true;
+            this.button_resetParams.Click += new System.EventHandler(this.button_resetParams_Click);
+            // 
+            // button_saveParams
+            // 
+            this.button_saveParams.Location = new System.Drawing.Point(377, 173);
+            this.button_saveParams.Name = "button_saveParams";
+            this.button_saveParams.Size = new System.Drawing.Size(89, 40);
+            this.button_saveParams.TabIndex = 104;
+            this.button_saveParams.Text = "淇�  瀛�";
+            this.button_saveParams.UseVisualStyleBackColor = true;
+            this.button_saveParams.Click += new System.EventHandler(this.button_saveParams_Click);
+            // 
+            // textBox_PrintModelParams
+            // 
+            this.textBox_PrintModelParams.BackColor = System.Drawing.SystemColors.Window;
+            this.textBox_PrintModelParams.Location = new System.Drawing.Point(554, 78);
+            this.textBox_PrintModelParams.Name = "textBox_PrintModelParams";
+            this.textBox_PrintModelParams.Size = new System.Drawing.Size(280, 28);
+            this.textBox_PrintModelParams.TabIndex = 103;
+            // 
+            // label_PrintModelParams
+            // 
+            this.label_PrintModelParams.AutoSize = true;
+            this.label_PrintModelParams.Location = new System.Drawing.Point(452, 81);
+            this.label_PrintModelParams.Name = "label_PrintModelParams";
+            this.label_PrintModelParams.Size = new System.Drawing.Size(80, 18);
+            this.label_PrintModelParams.TabIndex = 102;
+            this.label_PrintModelParams.Text = "鎵撳嵃妯℃澘";
+            // 
+            // comboBox_PrinterParams
+            // 
+            this.comboBox_PrinterParams.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox_PrinterParams.FormattingEnabled = true;
+            this.comboBox_PrinterParams.Location = new System.Drawing.Point(113, 78);
+            this.comboBox_PrinterParams.Margin = new System.Windows.Forms.Padding(4);
+            this.comboBox_PrinterParams.Name = "comboBox_PrinterParams";
+            this.comboBox_PrinterParams.Size = new System.Drawing.Size(280, 26);
+            this.comboBox_PrinterParams.TabIndex = 101;
+            // 
+            // label_PrinterParams
+            // 
+            this.label_PrinterParams.AutoSize = true;
+            this.label_PrinterParams.ForeColor = System.Drawing.Color.Black;
+            this.label_PrinterParams.Location = new System.Drawing.Point(13, 84);
+            this.label_PrinterParams.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label_PrinterParams.Name = "label_PrinterParams";
+            this.label_PrinterParams.Size = new System.Drawing.Size(80, 18);
+            this.label_PrinterParams.TabIndex = 100;
+            this.label_PrinterParams.Text = "鎵� 鍗� 鏈�";
+            // 
+            // comboBox_SourceNameParams
+            // 
+            this.comboBox_SourceNameParams.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBox_SourceNameParams.FormattingEnabled = true;
+            this.comboBox_SourceNameParams.Location = new System.Drawing.Point(973, 31);
+            this.comboBox_SourceNameParams.Margin = new System.Windows.Forms.Padding(4);
+            this.comboBox_SourceNameParams.Name = "comboBox_SourceNameParams";
+            this.comboBox_SourceNameParams.Size = new System.Drawing.Size(280, 26);
+            this.comboBox_SourceNameParams.TabIndex = 99;
+            // 
+            // label_SourceNameParams
+            // 
+            this.label_SourceNameParams.AutoSize = true;
+            this.label_SourceNameParams.ForeColor = System.Drawing.Color.Black;
+            this.label_SourceNameParams.Location = new System.Drawing.Point(873, 37);
+            this.label_SourceNameParams.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label_SourceNameParams.Name = "label_SourceNameParams";
+            this.label_SourceNameParams.Size = new System.Drawing.Size(80, 18);
+            this.label_SourceNameParams.TabIndex = 98;
+            this.label_SourceNameParams.Text = "浜�    绾�";
+            // 
+            // textBox_PortParams
+            // 
+            this.textBox_PortParams.BackColor = System.Drawing.SystemColors.Window;
+            this.textBox_PortParams.Location = new System.Drawing.Point(558, 31);
+            this.textBox_PortParams.Name = "textBox_PortParams";
+            this.textBox_PortParams.Size = new System.Drawing.Size(280, 28);
+            this.textBox_PortParams.TabIndex = 97;
+            // 
+            // label_PortParams
+            // 
+            this.label_PortParams.AutoSize = true;
+            this.label_PortParams.Location = new System.Drawing.Point(456, 34);
+            this.label_PortParams.Name = "label_PortParams";
+            this.label_PortParams.Size = new System.Drawing.Size(80, 18);
+            this.label_PortParams.TabIndex = 96;
+            this.label_PortParams.Text = "绔�    鍙�";
+            // 
+            // textBox_IPParams
+            // 
+            this.textBox_IPParams.BackColor = System.Drawing.SystemColors.Window;
+            this.textBox_IPParams.Location = new System.Drawing.Point(113, 28);
+            this.textBox_IPParams.Name = "textBox_IPParams";
+            this.textBox_IPParams.Size = new System.Drawing.Size(280, 28);
+            this.textBox_IPParams.TabIndex = 95;
+            // 
+            // label_IPParams
+            // 
+            this.label_IPParams.AutoSize = true;
+            this.label_IPParams.Location = new System.Drawing.Point(11, 31);
+            this.label_IPParams.Name = "label_IPParams";
+            this.label_IPParams.Size = new System.Drawing.Size(71, 18);
+            this.label_IPParams.TabIndex = 94;
+            this.label_IPParams.Text = "     IP";
+            // 
+            // pic1
+            // 
+            this.pic1.Location = new System.Drawing.Point(470, 4);
+            this.pic1.Margin = new System.Windows.Forms.Padding(4);
+            this.pic1.Name = "pic1";
+            this.pic1.Size = new System.Drawing.Size(117, 62);
+            this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pic1.TabIndex = 36;
+            this.pic1.TabStop = false;
+            this.pic1.Visible = false;
+            // 
+            // panel2
+            // 
+            this.panel2.BackColor = System.Drawing.Color.Lavender;
+            this.panel2.Controls.Add(this.txtHDeleteDate);
+            this.panel2.Controls.Add(this.label25);
+            this.panel2.Controls.Add(this.txtHDeleteMan);
+            this.panel2.Controls.Add(this.label27);
+            this.panel2.Controls.Add(this.txtHUpDateDate);
+            this.panel2.Controls.Add(this.label23);
+            this.panel2.Controls.Add(this.txtHUpDater);
+            this.panel2.Controls.Add(this.label21);
+            this.panel2.Controls.Add(this.txtHCloseDate);
+            this.panel2.Controls.Add(this.label19);
+            this.panel2.Controls.Add(this.txtHCloseMan);
+            this.panel2.Controls.Add(this.label17);
+            this.panel2.Controls.Add(this.txtHCheckDate);
+            this.panel2.Controls.Add(this.label15);
+            this.panel2.Controls.Add(this.txtHChecker);
+            this.panel2.Controls.Add(this.label13);
+            this.panel2.Controls.Add(this.txtHMakeDate);
+            this.panel2.Controls.Add(this.label11);
+            this.panel2.Controls.Add(this.txtHMaker);
+            this.panel2.Controls.Add(this.label8);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panel2.Location = new System.Drawing.Point(62, 758);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(1406, 140);
+            this.panel2.TabIndex = 32;
+            // 
+            // txtHDeleteDate
+            // 
+            this.txtHDeleteDate.BackColor = System.Drawing.Color.Transparent;
+            this.txtHDeleteDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.txtHDeleteDate.Location = new System.Drawing.Point(1088, 70);
+            this.txtHDeleteDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.txtHDeleteDate.Name = "txtHDeleteDate";
+            this.txtHDeleteDate.Size = new System.Drawing.Size(147, 22);
+            this.txtHDeleteDate.TabIndex = 19;
+            // 
+            // label25
+            // 
+            this.label25.AutoSize = true;
+            this.label25.BackColor = System.Drawing.Color.Transparent;
+            this.label25.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.label25.Location = new System.Drawing.Point(999, 75);
+            this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label25.Name = "label25";
+            this.label25.Size = new System.Drawing.Size(80, 18);
+            this.label25.TabIndex = 18;
+            this.label25.Text = "浣滃簾鏃ユ湡";
+            // 
+            // txtHDeleteMan
+            // 
+            this.txtHDeleteMan.BackColor = System.Drawing.Color.Transparent;
+            this.txtHDeleteMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.txtHDeleteMan.Location = new System.Drawing.Point(1088, 18);
+            this.txtHDeleteMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.txtHDeleteMan.Name = "txtHDeleteMan";
+            this.txtHDeleteMan.Size = new System.Drawing.Size(147, 22);
+            this.txtHDeleteMan.TabIndex = 17;
+            // 
+            // label27
+            // 
+            this.label27.AutoSize = true;
+            this.label27.BackColor = System.Drawing.Color.Transparent;
+            this.label27.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.label27.Location = new System.Drawing.Point(999, 18);
+            this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label27.Name = "label27";
+            this.label27.Size = new System.Drawing.Size(62, 18);
+            this.label27.TabIndex = 16;
+            this.label27.Text = "浣滃簾浜�";
+            // 
+            // txtHUpDateDate
+            // 
+            this.txtHUpDateDate.BackColor = System.Drawing.Color.Transparent;
+            this.txtHUpDateDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.txtHUpDateDate.Location = new System.Drawing.Point(843, 70);
+            this.txtHUpDateDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.txtHUpDateDate.Name = "txtHUpDateDate";
+            this.txtHUpDateDate.Size = new System.Drawing.Size(147, 22);
+            this.txtHUpDateDate.TabIndex = 15;
+            // 
+            // label23
+            // 
+            this.label23.AutoSize = true;
+            this.label23.BackColor = System.Drawing.Color.Transparent;
+            this.label23.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.label23.Location = new System.Drawing.Point(754, 70);
+            this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label23.Name = "label23";
+            this.label23.Size = new System.Drawing.Size(80, 18);
+            this.label23.TabIndex = 14;
+            this.label23.Text = "淇敼鏃ユ湡";
+            // 
+            // txtHUpDater
+            // 
+            this.txtHUpDater.BackColor = System.Drawing.Color.Transparent;
+            this.txtHUpDater.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.txtHUpDater.Location = new System.Drawing.Point(843, 18);
+            this.txtHUpDater.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.txtHUpDater.Name = "txtHUpDater";
+            this.txtHUpDater.Size = new System.Drawing.Size(147, 22);
+            this.txtHUpDater.TabIndex = 13;
+            // 
+            // label21
+            // 
+            this.label21.AutoSize = true;
+            this.label21.BackColor = System.Drawing.Color.Transparent;
+            this.label21.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.label21.Location = new System.Drawing.Point(754, 18);
+            this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label21.Name = "label21";
+            this.label21.Size = new System.Drawing.Size(62, 18);
+            this.label21.TabIndex = 12;
+            this.label21.Text = "淇敼浜�";
+            // 
+            // txtHCloseDate
+            // 
+            this.txtHCloseDate.BackColor = System.Drawing.Color.Transparent;
+            this.txtHCloseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.txtHCloseDate.Location = new System.Drawing.Point(596, 70);
+            this.txtHCloseDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.txtHCloseDate.Name = "txtHCloseDate";
+            this.txtHCloseDate.Size = new System.Drawing.Size(147, 22);
+            this.txtHCloseDate.TabIndex = 11;
+            // 
+            // label19
+            // 
+            this.label19.AutoSize = true;
+            this.label19.BackColor = System.Drawing.Color.Transparent;
+            this.label19.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.label19.Location = new System.Drawing.Point(507, 75);
+            this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label19.Name = "label19";
+            this.label19.Size = new System.Drawing.Size(80, 18);
+            this.label19.TabIndex = 10;
+            this.label19.Text = "鍏抽棴鏃ユ湡";
+            // 
+            // txtHCloseMan
+            // 
+            this.txtHCloseMan.BackColor = System.Drawing.Color.Transparent;
+            this.txtHCloseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.txtHCloseMan.Location = new System.Drawing.Point(594, 20);
+            this.txtHCloseMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.txtHCloseMan.Name = "txtHCloseMan";
+            this.txtHCloseMan.Size = new System.Drawing.Size(147, 22);
+            this.txtHCloseMan.TabIndex = 9;
+            // 
+            // label17
+            // 
+            this.label17.AutoSize = true;
+            this.label17.BackColor = System.Drawing.Color.Transparent;
+            this.label17.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.label17.Location = new System.Drawing.Point(507, 24);
+            this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label17.Name = "label17";
+            this.label17.Size = new System.Drawing.Size(62, 18);
+            this.label17.TabIndex = 8;
+            this.label17.Text = "鍏抽棴浜�";
+            // 
+            // txtHCheckDate
+            // 
+            this.txtHCheckDate.BackColor = System.Drawing.Color.Transparent;
+            this.txtHCheckDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.txtHCheckDate.Location = new System.Drawing.Point(351, 70);
+            this.txtHCheckDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.txtHCheckDate.Name = "txtHCheckDate";
+            this.txtHCheckDate.Size = new System.Drawing.Size(147, 22);
+            this.txtHCheckDate.TabIndex = 7;
+            // 
+            // label15
+            // 
+            this.label15.AutoSize = true;
+            this.label15.BackColor = System.Drawing.Color.Transparent;
+            this.label15.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.label15.Location = new System.Drawing.Point(262, 75);
+            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label15.Name = "label15";
+            this.label15.Size = new System.Drawing.Size(80, 18);
+            this.label15.TabIndex = 6;
+            this.label15.Text = "瀹℃牳鏃ユ湡";
+            // 
+            // txtHChecker
+            // 
+            this.txtHChecker.BackColor = System.Drawing.Color.Transparent;
+            this.txtHChecker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.txtHChecker.Location = new System.Drawing.Point(351, 20);
+            this.txtHChecker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.txtHChecker.Name = "txtHChecker";
+            this.txtHChecker.Size = new System.Drawing.Size(147, 22);
+            this.txtHChecker.TabIndex = 5;
+            // 
+            // label13
+            // 
+            this.label13.AutoSize = true;
+            this.label13.BackColor = System.Drawing.Color.Transparent;
+            this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.label13.Location = new System.Drawing.Point(262, 24);
+            this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label13.Name = "label13";
+            this.label13.Size = new System.Drawing.Size(62, 18);
+            this.label13.TabIndex = 4;
+            this.label13.Text = "瀹℃牳浜�";
+            // 
+            // txtHMakeDate
+            // 
+            this.txtHMakeDate.BackColor = System.Drawing.Color.Transparent;
+            this.txtHMakeDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.txtHMakeDate.Location = new System.Drawing.Point(106, 70);
+            this.txtHMakeDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.txtHMakeDate.Name = "txtHMakeDate";
+            this.txtHMakeDate.Size = new System.Drawing.Size(147, 22);
+            this.txtHMakeDate.TabIndex = 3;
+            // 
+            // label11
+            // 
+            this.label11.AutoSize = true;
+            this.label11.BackColor = System.Drawing.Color.Transparent;
+            this.label11.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.label11.Location = new System.Drawing.Point(18, 75);
+            this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label11.Name = "label11";
+            this.label11.Size = new System.Drawing.Size(80, 18);
+            this.label11.TabIndex = 2;
+            this.label11.Text = "鍒跺崟鏃ユ湡";
+            // 
+            // txtHMaker
+            // 
+            this.txtHMaker.BackColor = System.Drawing.Color.Transparent;
+            this.txtHMaker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.txtHMaker.Location = new System.Drawing.Point(106, 20);
+            this.txtHMaker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.txtHMaker.Name = "txtHMaker";
+            this.txtHMaker.Size = new System.Drawing.Size(147, 22);
+            this.txtHMaker.TabIndex = 1;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.BackColor = System.Drawing.Color.Transparent;
+            this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+            this.label8.Location = new System.Drawing.Point(18, 24);
+            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(62, 18);
+            this.label8.TabIndex = 0;
+            this.label8.Text = "鍒跺崟浜�";
+            // 
+            // timer1
+            // 
+            this.timer1.Enabled = true;
+            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+            // 
+            // panel1
+            // 
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
+            this.panel1.Location = new System.Drawing.Point(0, 75);
+            this.panel1.Margin = new System.Windows.Forms.Padding(4);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(62, 823);
+            this.panel1.TabIndex = 33;
+            // 
+            // panel3
+            // 
+            this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
+            this.panel3.Location = new System.Drawing.Point(1468, 75);
+            this.panel3.Margin = new System.Windows.Forms.Padding(4);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(58, 823);
+            this.panel3.TabIndex = 34;
+            // 
+            // grdSum
+            // 
+            this.grdSum.AllowUserToAddRows = false;
+            this.grdSum.AllowUserToDeleteRows = false;
+            this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
+            this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.grdSum.Location = new System.Drawing.Point(62, 730);
+            this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+            this.grdSum.Name = "grdSum";
+            this.grdSum.ReadOnly = true;
+            this.grdSum.RowHeadersWidth = 51;
+            this.grdSum.RowTemplate.Height = 23;
+            this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
+            this.grdSum.Size = new System.Drawing.Size(1406, 28);
+            this.grdSum.TabIndex = 45;
+            // 
+            // grdPrint
+            // 
+            this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.grdPrint.Location = new System.Drawing.Point(1214, 814);
+            this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
+            this.grdPrint.Name = "grdPrint";
+            this.grdPrint.RowHeadersWidth = 51;
+            this.grdPrint.RowTemplate.Height = 23;
+            this.grdPrint.Size = new System.Drawing.Size(38, 36);
+            this.grdPrint.TabIndex = 46;
+            this.grdPrint.Visible = false;
+            // 
+            // tabPage3
+            // 
+            this.tabPage3.Controls.Add(this.grdList);
+            this.tabPage3.Location = new System.Drawing.Point(4, 5);
+            this.tabPage3.Margin = new System.Windows.Forms.Padding(4);
+            this.tabPage3.Name = "tabPage3";
+            this.tabPage3.Size = new System.Drawing.Size(1398, 288);
+            this.tabPage3.TabIndex = 2;
+            this.tabPage3.Text = "妗f鍒楄〃";
+            this.tabPage3.UseVisualStyleBackColor = true;
+            // 
+            // grdList
+            // 
+            this.grdList.AllowUserToAddRows = false;
+            this.grdList.AllowUserToDeleteRows = false;
+            this.grdList.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+            this.grdList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.grdList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.grdList.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.grdList.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.grdList.Location = new System.Drawing.Point(0, 0);
+            this.grdList.Margin = new System.Windows.Forms.Padding(4);
+            this.grdList.Name = "grdList";
+            this.grdList.ReadOnly = true;
+            this.grdList.RowHeadersWidth = 30;
+            this.grdList.RowTemplate.Height = 23;
+            this.grdList.Size = new System.Drawing.Size(1398, 288);
+            this.grdList.TabIndex = 46;
+            // 
+            // tabPage2
+            // 
+            this.tabPage2.Controls.Add(this.grdSub);
+            this.tabPage2.Location = new System.Drawing.Point(4, 5);
+            this.tabPage2.Margin = new System.Windows.Forms.Padding(4);
+            this.tabPage2.Name = "tabPage2";
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(4);
+            this.tabPage2.Size = new System.Drawing.Size(1398, 288);
+            this.tabPage2.TabIndex = 1;
+            this.tabPage2.Text = "鏉$爜淇℃伅";
+            this.tabPage2.UseVisualStyleBackColor = true;
+            // 
+            // grdSub
+            // 
+            this.grdSub.AllowUserToAddRows = false;
+            this.grdSub.AllowUserToDeleteRows = false;
+            this.grdSub.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+            this.grdSub.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.grdSub.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.grdSub.Location = new System.Drawing.Point(4, 4);
+            this.grdSub.Margin = new System.Windows.Forms.Padding(4);
+            this.grdSub.Name = "grdSub";
+            this.grdSub.ReadOnly = true;
+            this.grdSub.RowHeadersWidth = 30;
+            this.grdSub.RowTemplate.Height = 23;
+            this.grdSub.Size = new System.Drawing.Size(1390, 280);
+            this.grdSub.TabIndex = 45;
+            this.grdSub.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdSub_CellBeginEdit);
+            this.grdSub.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSub_CellContentClick);
+            this.grdSub.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdSub_CellEndEdit);
+            // 
+            // tabPage1
+            // 
+            this.tabPage1.Controls.Add(this.grdMain);
+            this.tabPage1.Location = new System.Drawing.Point(4, 5);
+            this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
+            this.tabPage1.Name = "tabPage1";
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
+            this.tabPage1.Size = new System.Drawing.Size(1398, 288);
+            this.tabPage1.TabIndex = 0;
+            this.tabPage1.Text = "鐗╂枡淇℃伅";
+            this.tabPage1.UseVisualStyleBackColor = true;
+            // 
+            // grdMain
+            // 
+            this.grdMain.AllowUserToAddRows = false;
+            this.grdMain.AllowUserToDeleteRows = false;
+            this.grdMain.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+            this.grdMain.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.grdMain.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.grdMain.Location = new System.Drawing.Point(4, 4);
+            this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+            this.grdMain.Name = "grdMain";
+            this.grdMain.ReadOnly = true;
+            this.grdMain.RowHeadersWidth = 30;
+            this.grdMain.RowTemplate.Height = 23;
+            this.grdMain.Size = new System.Drawing.Size(1390, 280);
+            this.grdMain.TabIndex = 44;
+            this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
+            this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
+            this.grdMain.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellEndEdit);
+            this.grdMain.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellLeave);
+            this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+            this.grdMain.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.grdMain_EditingControlShowing);
+            this.grdMain.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Scroll);
+            // 
+            // tabControl1
+            // 
+            this.tabControl1.Controls.Add(this.tabPage1);
+            this.tabControl1.Controls.Add(this.tabPage2);
+            this.tabControl1.Controls.Add(this.tabPage3);
+            this.tabControl1.Controls.Add(this.tabPage4);
+            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tabControl1.ItemSize = new System.Drawing.Size(0, 1);
+            this.tabControl1.Location = new System.Drawing.Point(62, 433);
+            this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
+            this.tabControl1.Name = "tabControl1";
+            this.tabControl1.SelectedIndex = 0;
+            this.tabControl1.Size = new System.Drawing.Size(1406, 297);
+            this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
+            this.tabControl1.TabIndex = 47;
+            this.tabControl1.TabStop = false;
+            // 
+            // tabPage4
+            // 
+            this.tabPage4.Controls.Add(this.grdBillBarCodeList);
+            this.tabPage4.Location = new System.Drawing.Point(4, 5);
+            this.tabPage4.Name = "tabPage4";
+            this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage4.Size = new System.Drawing.Size(1398, 288);
+            this.tabPage4.TabIndex = 3;
+            this.tabPage4.Text = "宸ュ崟鏉$爜";
+            this.tabPage4.UseVisualStyleBackColor = true;
+            // 
+            // grdBillBarCodeList
+            // 
+            this.grdBillBarCodeList.AllowUserToAddRows = false;
+            this.grdBillBarCodeList.AllowUserToDeleteRows = false;
+            this.grdBillBarCodeList.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+            this.grdBillBarCodeList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.grdBillBarCodeList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.grdBillBarCodeList.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.grdBillBarCodeList.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+            this.grdBillBarCodeList.Location = new System.Drawing.Point(3, 3);
+            this.grdBillBarCodeList.Margin = new System.Windows.Forms.Padding(4);
+            this.grdBillBarCodeList.Name = "grdBillBarCodeList";
+            this.grdBillBarCodeList.ReadOnly = true;
+            this.grdBillBarCodeList.RowHeadersWidth = 30;
+            this.grdBillBarCodeList.RowTemplate.Height = 23;
+            this.grdBillBarCodeList.Size = new System.Drawing.Size(1392, 282);
+            this.grdBillBarCodeList.TabIndex = 47;
+            // 
+            // pageSetupDialog1
+            // 
+            this.pageSetupDialog1.Document = this.printDocument1;
+            // 
+            // printDialog1
+            // 
+            this.printDialog1.Document = this.printDocument1;
+            this.printDialog1.UseEXDialog = true;
+            // 
+            // printPreviewDialog1
+            // 
+            this.printPreviewDialog1.AutoScrollMargin = new System.Drawing.Size(0, 0);
+            this.printPreviewDialog1.AutoScrollMinSize = new System.Drawing.Size(0, 0);
+            this.printPreviewDialog1.ClientSize = new System.Drawing.Size(400, 300);
+            this.printPreviewDialog1.Document = this.printDocument1;
+            this.printPreviewDialog1.Enabled = true;
+            this.printPreviewDialog1.Icon = ((System.Drawing.Icon)(resources.GetObject("printPreviewDialog1.Icon")));
+            this.printPreviewDialog1.Name = "printPreviewDialog1";
+            this.printPreviewDialog1.Visible = false;
+            // 
+            // Gy_BarCodeBill_automaticallyByPLC_New
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.Lavender;
+            this.ClientSize = new System.Drawing.Size(1526, 898);
+            this.Controls.Add(this.tabControl1);
+            this.Controls.Add(this.grdSum);
+            this.Controls.Add(this.panel2);
+            this.Controls.Add(this.P1);
+            this.Controls.Add(this.panel1);
+            this.Controls.Add(this.panel3);
+            this.Controls.Add(this.Tool);
+            this.Controls.Add(this.grdPrint);
+            this.ForeColor = System.Drawing.Color.Black;
+            this.KeyPreview = true;
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "Gy_BarCodeBill_automaticallyByPLC_New";
+            this.Text = "鍗曟嵁缂栬緫";
+            this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Gy_BarCodeBill_FormClosing);
+            this.Load += new System.EventHandler(this.Gy_BarCodeBill_Load);
+            this.Paint += new System.Windows.Forms.PaintEventHandler(this.Gy_BarCodeBill_Paint);
+            this.Resize += new System.EventHandler(this.Gy_BarCodeBill_Resize);
+            this.Tool.ResumeLayout(false);
+            this.Tool.PerformLayout();
+            this.P1.ResumeLayout(false);
+            this.P1.PerformLayout();
+            this.tabControl_MainInfo.ResumeLayout(false);
+            this.tabPage_BillInfo.ResumeLayout(false);
+            this.gbUp.ResumeLayout(false);
+            this.gbUp.PerformLayout();
+            this.tabPage_ParamsInfo.ResumeLayout(false);
+            this.groupBox_ParamsInfo.ResumeLayout(false);
+            this.groupBox_ParamsInfo.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pic1)).EndInit();
+            this.panel2.ResumeLayout(false);
+            this.panel2.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).EndInit();
+            this.tabPage3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.grdList)).EndInit();
+            this.tabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.grdSub)).EndInit();
+            this.tabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
+            this.tabControl1.ResumeLayout(false);
+            this.tabPage4.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.grdBillBarCodeList)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.ToolStrip Tool;
+        private System.Windows.Forms.ToolStripButton yl;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+        private System.Windows.Forms.ToolStripButton bc;
+        private System.Windows.Forms.ToolStripButton cz;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+        private System.Windows.Forms.Label lblCaption;
+        private System.Windows.Forms.Panel P1;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Label txtHMaker;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Label txtHUpDateDate;
+        private System.Windows.Forms.Label label23;
+        private System.Windows.Forms.Label txtHUpDater;
+        private System.Windows.Forms.Label label21;
+        private System.Windows.Forms.Label txtHCloseDate;
+        private System.Windows.Forms.Label label19;
+        private System.Windows.Forms.Label txtHCloseMan;
+        private System.Windows.Forms.Label label17;
+        private System.Windows.Forms.Label txtHCheckDate;
+        private System.Windows.Forms.Label label15;
+        private System.Windows.Forms.Label txtHChecker;
+        private System.Windows.Forms.Label label13;
+        private System.Windows.Forms.Label txtHMakeDate;
+        private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.Label txtHDeleteDate;
+        private System.Windows.Forms.Label label25;
+        private System.Windows.Forms.Label txtHDeleteMan;
+        private System.Windows.Forms.Label label27;
+        private System.Windows.Forms.Timer timer1;
+        private System.Windows.Forms.ToolStripButton AddRow;
+        private System.Windows.Forms.ToolStripButton DelRow;
+        private System.Windows.Forms.GroupBox gbUp;
+        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.ComboBox cmbSourceBillType;
+        private System.Windows.Forms.TextBox txtHSourceBillNo;
+        private System.Windows.Forms.Label label14;
+        private System.Windows.Forms.ToolStripButton tc;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
+        private System.Windows.Forms.ToolStripButton mrlk;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
+        private System.Windows.Forms.ToolStripButton bclk;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;
+        private System.Windows.Forms.PictureBox pic1;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Panel panel3;
+        private System.Windows.Forms.DataGridView grdSum;
+        private System.Windows.Forms.DataGridView grdPrint;
+        private System.Windows.Forms.ComboBox cmbHBarCodeType;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.ToolStripButton dy;
+        private System.Windows.Forms.ToolStripButton kc;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+        private System.Windows.Forms.ComboBox cmbHOrgID;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.ToolStripButton tb;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+        private System.Windows.Forms.ComboBox cmbHWorksNumber;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.DateTimePicker dtpHDate;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.ToolStripButton spRow;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
+        private System.Windows.Forms.ToolStripButton gl;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+        private System.Windows.Forms.ToolStripButton BatchNo;
+        private System.Windows.Forms.ToolStripButton sdy;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
+        private System.Windows.Forms.ToolStripButton wxm;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
+        private System.Windows.Forms.TabPage tabPage3;
+        private System.Windows.Forms.TabPage tabPage2;
+        private System.Windows.Forms.DataGridView grdSub;
+        private System.Windows.Forms.TabPage tabPage1;
+        private System.Windows.Forms.TabControl tabControl1;
+        private System.Windows.Forms.DataGridView grdList;
+        private System.Windows.Forms.DataGridView grdMain;
+        private System.Windows.Forms.TabPage tabPage4;
+        private System.Windows.Forms.DataGridView grdBillBarCodeList;
+        private System.Windows.Forms.TabControl tabControl_MainInfo;
+        private System.Windows.Forms.TabPage tabPage_BillInfo;
+        private System.Windows.Forms.RadioButton radioButton_HIsUsingBatchNo;
+        private System.Windows.Forms.Button button_stopListen;
+        private System.Windows.Forms.Button button_startListen;
+        private System.Windows.Forms.TextBox textBox_HQty;
+        private System.Windows.Forms.Label label_HQty;
+        private System.Windows.Forms.TextBox textBox_HPlanQty;
+        private System.Windows.Forms.Label label_HPlanQty;
+        private System.Windows.Forms.TextBox textBox_HMaterModel;
+        private System.Windows.Forms.Label label_HMaterModel;
+        private System.Windows.Forms.TextBox textBox_HMaterName;
+        private System.Windows.Forms.Label label_HMaterName;
+        private System.Windows.Forms.TextBox textBox_HMaterNumber;
+        private System.Windows.Forms.Label label_HMaterNumber;
+        private System.Windows.Forms.TextBox textBox_SourceName;
+        private System.Windows.Forms.Label label_SourceName;
+        private System.Windows.Forms.TabPage tabPage_ParamsInfo;
+        private System.Windows.Forms.GroupBox groupBox_ParamsInfo;
+        private System.Windows.Forms.Button button_resetParams;
+        private System.Windows.Forms.Button button_saveParams;
+        private System.Windows.Forms.TextBox textBox_PrintModelParams;
+        private System.Windows.Forms.Label label_PrintModelParams;
+        private System.Windows.Forms.ComboBox comboBox_PrinterParams;
+        private System.Windows.Forms.Label label_PrinterParams;
+        private System.Windows.Forms.ComboBox comboBox_SourceNameParams;
+        private System.Windows.Forms.Label label_SourceNameParams;
+        private System.Windows.Forms.TextBox textBox_PortParams;
+        private System.Windows.Forms.Label label_PortParams;
+        private System.Windows.Forms.TextBox textBox_IPParams;
+        private System.Windows.Forms.Label label_IPParams;
+        private System.Windows.Forms.Button cmdSourceBillNo;
+        private System.Windows.Forms.PageSetupDialog pageSetupDialog1;
+        private System.Drawing.Printing.PrintDocument printDocument1;
+        private System.Windows.Forms.PrintDialog printDialog1;
+        private System.Windows.Forms.PrintPreviewDialog printPreviewDialog1;
+    }
+}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.resx"
new file mode 100644
index 0000000..076cb68
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.resx"
@@ -0,0 +1,763 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        /9j/4AAQSkZJRgABAQEASABIAAD/4QSARXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
+        AAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAUAAAAcgEyAAIAAAAUAAAAhodpAAQAAAAB
+        AAAAmgAAAMYASAAAAAEAAABIAAAAAQAAQWRvYmUgUGhvdG9zaG9wIDcuMAAyMDA0OjEwOjE0IDE1OjUw
+        OjUwAAADoAEAAwAAAAH//wAAoAIABAAAAAEAAAQAoAMABAAAAAEAAABoAAAAAAAAAAYBAwADAAAAAQAG
+        AAABGgAFAAAAAQAAARQBGwAFAAAAAQAAARwBKAADAAAAAQACAAACAQAEAAAAAQAAASQCAgAEAAAAAQAA
+        A1QAAAAAAAAASAAAAAEAAABIAAAAAf/Y/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4d
+        GhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIy
+        MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgABgCgAwEhAAIRAQMR
+        Af/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAE
+        EQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElK
+        U1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrC
+        w8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAAB
+        AgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkj
+        M1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5
+        eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm
+        5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A9P8A+EAsf+fy4o/4QCy/5/Liuv6z/dOf2HmH/CAWX/P5
+        cUf8IBZf8/lz+lH1n+6HsPMP+EAsv+fy5/Oj/hALL/n8uKPrP90PYeYf8IBZf8/lxR/wgFl/z+XFH1n+
+        6HsPMP8AhALL/n8uKP8AhX9j/wA/lxR9Z/uh7B9w/wCFf2P/AD+XFH/CAWP/AD+XFH1n+6HsH3D/AIQC
+        x/5/Lij/AIQCy/5/Lij6z/dD2HmH/CAWX/P5cUf8K/sf+fy4o+tf3Q9h5h/wgFj/AM/lxR/wgFl/z+XF
+        H1r+6HsPMP8AhALL/n8uKP8AhALL/n8uKPrX90PYeZ//2f/bAEMAAgEBAgEBAgICAgICAgIDBQMDAwMD
+        BgQEAwUHBgcHBwYHBwgJCwkICAoIBwcKDQoKCwwMDAwHCQ4PDQwOCwwMDP/bAEMBAgICAwMDBgMDBgwI
+        BwgMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDP/AABEIACoE
+        AAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUE
+        BAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4
+        OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmq
+        srO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEB
+        AQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIy
+        gQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZn
+        aGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV
+        1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APWB+2p4nH/MN0Qf9w20/wDjNL/w2t4o
+        P/MP0X/wW2n/AMZri/8AhDh6Uf8ACHD0r9f/ALPp/wAp+cfXJ9zsj+2p4oOQdO0U/wDcMtP/AIzR/wAN
+        peJ++m6KP+4Zaf8AxmuN/wCEOH93FH/CHD0prL4fyh9cn/Mdl/w2j4m/6B2if+Cy0/8AjNH/AA2n4mXr
+        puiEf9g20/8AjNcb/wAIcPSj/hDh/dNL+z6f8qBYyf8AMdkf21fEv/QN0T/wW2n/AMZo/wCG1fEv/QN0
+        T/wW2f8A8ZrjP+ENH9yl/wCEOA6KRR9Qp/yj+uz/AJmdl/w2r4l/6Buif+C2z/8AjNH/AA2r4l/6Buif
+        +C2z/wDjNcb/AMIcP7po/wCEOH900/7Ph/KL65P+Y7Mftq+JMf8AIO0Uf9w20/8AjNB/bU8S5407RD/3
+        DbT/AOM1xZ8HqOq0f8Iiv900v7Pp/wAofXZ/zHZf8NqeJe+m6L/4LbT/AOM0q/to+Je+naKP+4baf/Ga
+        4z/hEV/umgeEAeimj+z4fyh9cn/Mdn/w2n4l/wCgdon/AILbT/4zR/w2n4l/6B2if+C20/8AjNcb/wAI
+        cP7po/4Q4f3TR/Z8P5UH1yf8x2P/AA2p4l/6Bui/+C20/wDjNH/DaniX/oG6L/4LbT/4zXHf8IcP7ppP
+        +ENH9yj+z4fyh9cn/MdmP21vEo66do3/AILbT/4zSj9tbxKemm6MT/2DbT/4zXF/8IcB/Cfyo/4RAf3T
+        +VCy+n/KH1uf8x2g/bT8SnrpmiD/ALhtp/8AGaD+2n4lH/MN0QY/6htn/wDGa4z/AIQ9f7rflSHwcp/h
+        P5U/7Pp/yjWMqfzM7Q/tp+Juo0zRP/BZZ/8AxmlX9tLxNj/kHaIP+4bZ/wDxmuK/4Q8eh/Kj/hDx6H8q
+        X9n0/wCUFjJ92ds37aPiY8HTtEx/2DbP/wCM0L+2l4lLZOnaJ/4LbP8A+M1xP/CHj0P5UDweOPlb8qP7
+        Pp/yieMn3Z2zftp+JP8AoG6Kf+4bZ/8Axmm/8Nq+Jf8AoF6L/wCC20/+M1xf/CID+435Uf8ACID+435U
+        f2fT/lD65PuztP8AhtXxJ/0DdG/8Ftp/8Zo/4bU8Rj/mG6MP+4Zaf/Ga4v8A4RH0Q4+lH/CI/wCyw+go
+        /s+n/Kg+tz7s7MftqeJP+gfop/7htp/8ZoP7aviUDjT9D/HTLT/4zXGDwgfRvypR4NY9FYj3WhZfT/lH
+        9cn3Oy/4bU8Tf9A7Q/8AwWWn/wAZo/4bU8Tf9A7Q/wDwWWn/AMZrjv8AhDW/uH/vmk/4Q4/3f0oWX0/5
+        QWNn/Mzsv+G1fEv/AED9Fx7abaf/ABmj/htbxN/0D9F/8Ftn/wDGa40+Dj/dP5Un/CHH+6fyp/2fT/lF
+        9bn3Oy/4bV8Tf9A7Rf8AwW2f/wAZpf8AhtXxP/0DtF/8Ftn/APGa4z/hDx/dP5Uf8IgP7p/Kl/Z9P+Uf
+        1yp3Oz/4bU8S/wDQP0b/AMFtn/8AGaP+G1vE3bTtFx/2DbP/AOM1xn/CID+6fypR4OB/hIoWX0/5RfW5
+        92dkf21fEx66fog/7hln/wDGaP8AhtbxP/0D9E/8Ftp/8Zrjf+EOHpS/8Id/s/pQsvp/yoFjJ/zHY/8A
+        Da3if/oH6J/4LbT/AOM0f8NqeJv+gfon/gttP/jNcePBuf4QPwo/4Qz2H5Uf2fT/AJR/XZ/zHXn9tXxL
+        307RSf8AsG2n/wAZpR+2r4k/6B2ig/8AYNtP/jNcefBn+zTf+EOHpQsvp/yh9cqfzHZn9tPxKOPsGi/+
+        C20/+M0H9tLxKQSLDRCR2/s20/8AjNcZ/wAIcPSl/wCEOH90flR/Z9P+UX1up/Mzsf8AhtTxN/0DtD/8
+        Flp/8Zo/4bU8S99O0Q/TTbT/AOM1x3/CHj+6Pypf+ENH90/lQsvp/wAoLGVP5mdgf21PEo/5h2i/+C20
+        /wDjNJ/w2r4m3Z/s7RT9NMtP/jNcefBo/un8qP8AhDB/dYfhR/Z9P+UPrlT+Y7H/AIbW8S9Dp2igf9gy
+        0/8AjNJ/w2r4l/6B2i/+Cyz/APjNcd/whwzjaRR/whw9KP7Ph/KCxlTudl/w2r4l/wCgdon/AILbT/4z
+        R/w2p4l/6B2if+C20/8AjNcb/wAIcPSl/wCEPH90flQsvp/ygsXU7nZf8Nq+JT007Rh/3DbT/wCM0f8A
+        Danic9NP0U5/6hlp/wDGa43/AIQ8f3R+VJ/who67Cc0LL6f8o/rlT+Y7M/tp+Jz00/RT/wBwy0H/ALRp
+        P+G0/E//AED9F/8ABZaf/Ga43/hDf9g0f8Ib/sGn/Z9P+VAsbP8AmZ2X/DaXif8A6B+in/uGWn/xmlH7
+        anicDjTtE/8ABXaf/Ga43/hDP9k0f8IZ/sml/Z8P5UL67P8AmOw/4bS8T/8AQO0X/wAFlp/8Zpf+G0/E
+        46afon/grtP/AIzXHf8ACGf7Jo/4Qz/ZNP6hD+VB9dqfzHY/8NpeJ/8AoG6L/wCCu0/+M0v/AA2p4n/6
+        B+if+Cy0/wDjNcb/AMIZ/smj/hDP9k0ll9P+VB9dn/Mdl/w2l4nzn+ztEP8A3C7T/wCM0f8ADaXiftp2
+        iH/uF2n/AMZrjP8AhDf9g0f8Ib/sGhZfT/lQfXJ/zHZf8NpeJiMf2douf+wZaf8Axmj/AIbT8T/9A7Rf
+        /BZaf/Ga43/hDf8AYNH/AAhv+waay+H8qD65P+Y7H/htHxP/ANA3RP8AwW2n/wAZp3/DafifnOnaL/4L
+        bT/4zXF/8IkP7h/KlHhEHqhA+lDy+n/Kh/XKnc7P/htTxP207Rf/AAWWn/xmlP7anicgf6Boo/7hlp/8
+        ZrjP+EQX0P8A3zSf8Iev90n8KX9n0/5RfXKnc7P/AIbU8Tgc6fo2D/1DLT/4zSL+2n4l/wCfDRR/3C7T
+        /wCM1xv/AAh6/wB1vypf+ENX0P5Uf2fT/lQ/rlTuzsv+G1fEo/5cNF/8Flnj/wBE0p/bV8Sn/lw0XH/Y
+        Ms//AIzXGf8ACGr6H8qT/hDl9Dj6Uf2fT/lQvrdTuzs/+G0PEv8A0D9EI99MtP8A4zQf20PEwGRp2iE/
+        9g20/wDjNcYfB6+hP4Uf8Iev91vyo/s+n/Kg+uVO7Oy/4bU8T/8AQO0X/wAFtp/8Zo/4bT8T/wDQO0X/
+        AMFtp/8AGa43/hER/dP5Uf8ACIjsp/Kj+z6f8ofXKnc7L/htLxP1Om6L/wCC20/+M0n/AA2p4l76foo/
+        7h1p/wDGa43/AIREf3Dz7Uf8IgP7jflT/s+n/KCxlTuzs/8AhtTxKemn6If+4dZ//GaP+G0vEv8A0DtE
+        /wDBdaf/ABmuMHg8H+Aij/hEB/dP5Uv7Pp/yoPrdTudn/wANq+Jv+gdov/gttP8A4zR/w2p4m76fohH/
+        AGDbT/4zXGf8IgP7p/Kj/hEB/dP5U1l9P+UFjKnc7P8A4bW8Tf8AQO0X/wAFtp/8ZoH7aviYf8w7RR/3
+        DbT/AOM1xn/CID+6fypR4OB/hIpf2dT/AJUNYyp/Mzsx+2n4mPA07RMf9g20/wDjNB/bU8S9Dp+iZ/7B
+        tn/8ZrjP+EOHpR/whw9KP7Pp/wAqB4yf8zOy/wCG1vE//QP0T/wWWf8A8ZpT+2r4m76foo/7hln/APGa
+        4z/hDQOi0f8ACHD+6aP7Pp9IoHjJ/wAzOzP7afiY9dP0Xj/qGWf/AMZpB+2n4m3f8g/RM/8AYNtP/jNc
+        aPBoPUYpf+ENHoKP7Ph/KhLGT/mOw/4bS8T5407RP/Bbaf8AxmlP7aXifHOn6Jj/ALBtp/8AGa43/hDh
+        6Uf8IcPSj+z6f8qH9bqd2dl/w2n4m/6B2i49f7MtP/jNH/DafiXp/Z+iY/7Blp/8Zrjf+EOHpR/whw9K
+        f9n0/wCUPrlTudl/w2l4l/6B+if+Cy0/+M0f8NpeJP8AoH6J/wCCy0/+M1xv/CHD0o/4Q4elH1Cn/KH1
+        up3Z2Y/bV8Sr00/RP/BZaf8Axml/4bX8TdrDRef+oZaf/Ga4v/hDh6Uf8IcPShZfT/lD63U7s7P/AIbV
+        8Tf9A/RP/BZaf/GaD+2r4mPA0/RSf+wbaf8AxmuM/wCEOHpR/wAIcPSj+z6f8ofW6ndnZf8ADanif/oH
+        aL/4LbT/AOM0f8NqeKP+gdon/gstP/jNcb/whw9KP+EOHpS/s+n/ACoFi6ndnZD9tPxOM507RB/3DbT/
+        AOM07/htTxMB/wAg7Rf/AAW2n/xmuLPg4dlo/wCEOHofyoeAp/yoPrlTudn/AMNp+Jcc6foo/wC4baf/
+        ABmg/to+JT107Rv/AAW2n/xmuMHg0Htj8KP+ENHpn8KFl9P+VCWMqfzHZ/8ADaHiT/oH6L/4LbT/AOM0
+        f8NpeJRnGnaKf+4Zaf8AxmuN/wCENX0P5Un/AAhw/un8qP7Pp/yoPrlT+Y7M/tqeJv8AoHaKf+4Zaf8A
+        xmk/4bU8T/8AQN0b/wAFtp/8Zrjf+EOH90/lSjwaPQCj+z6f8qGsZPuzsh+2n4mI507Rh/3DbT/4zTv+
+        G0fEpOf7P0Uf9wy0P/tGuL/4Q0ego/4Q0ego/s+n/Kg+t1O7Oz/4bT8Sj/mHaN/4LLQf+0aQ/to+Je2n
+        aKf+4Zaf/Ga4z/hDh6Uf8IcPSj+z6f8AKg+uVO7OzP7afiftp2ikf9gy0/8AjNJ/w2p4mHXTtFH/AHDL
+        T/4zXG/8IcPSg+DgP4SaP7Pp/wAqD65Puzsv+G1vEY66foo/7hlp/wDGaP8AhtbxIeP7P0Xn/qG2n/xm
+        uM/4RAf3T+VH/CID+6fyprL6f8oLGVO7OyP7a3iQH/kH6N/4LLT/AOM0f8Nq+Jf+gdov/gss/wD4zXG/
+        8IgP7p/Kl/4RAf3f0pfUKf8AKH1yfdnY/wDDa3iUZP8AZ+ijH/UMs/8A4zSf8Nq+Jf8AoHaN/wCC20/+
+        M1x//CID+7+lH/CID+7+lNYCn/KCxk+7PVv+FeX/APz4T/mv+NH/AAr6+/58J/zX/Gv1p/4QTQ/+gLpH
+        /gJH/hR/wgmh/wDQF0j/AMBI/wDCvDfGlD/ny/8AwJf5Hp/6sVf+fi+5/wCZ+S3/AAr6+/58J/zX/Gj/
+        AIV9ff8APhP+a/41+tP/AAgmh/8AQF0j/wABI/8ACj/hBND/AOgLpH/gJH/hS/10of8APl/+BL/IP9WK
+        v/P1fc/8z8lv+FfX3/PhP+a/40h+Hl9jmwn/ADX/ABr9av8AhBND/wCgLpH/AICR/wCFH/CCaH/0BdI/
+        8BI/8KFxpQ/58v8A8CX+Qf6sVf8An6vuf+Z+So+HV8RkWE/5r/jS/wDCvL5ePsE/5r/jX60/8IJof/QF
+        0j/wEj/wo/4QTQ/+gLpH/gJH/hT/ANdKH/Pl/wDgS/yF/qxV/wCfq+5/5n5Lf8K+vv8Anwn/ADX/ABo/
+        4V9ff8+E/wCa/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hS/wBdKH/Pl/ev8g/1Yq/8
+        /V9z/wAz8lv+FfX3/PhP+a/40f8ACvr7/nwn/Nf8a/Wn/hBND/6Aukf+Akf+FH/CCaH/ANAXSP8AwEj/
+        AMKP9dKH/Pl/ev8AIP8AVir/AM/V9z/zPyW/4V9ff8+E/wCa/wCNH/Cvr7/nwn/Nf8a/Wn/hBND/AOgL
+        pH/gJH/hR/wgmh/9AXSP/ASP/Cj/AF0of8+X96/yD/Vir/z9X3P/ADPyW/4V9ff8+E/5r/jR/wAK+vv+
+        fCf81/xr9af+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/10of8+X96/wAg/wBWKv8Az9X3P/M/
+        JUfDy/IOdPnP4r/jR/wru+/6B9x/47/jX61f8IJof/QF0j/wEj/wo/4QTQ/+gLpH/gJH/hQuNKH/AD5f
+        3r/IP9WKv/P1fc/8z8lR8O77tp9x+a/40v8Awru//wCfC4/Nf8a/Wn/hBND/AOgLpH/gJH/hR/wgmh/9
+        AXSP/ASP/Cn/AK6UP+fL/wDAl/kP/Vir/wA/V9z/AMz8lv8AhXd//wA+FwfxX/Gk/wCFd33/AD43H/fS
+        /wCNfrV/wgmh/wDQF0j/AMBI/wDCj/hBND/6Aukf+Akf+FH+ulD/AJ8v/wACX+Qv9WKv/P1fc/8AM/JX
+        /hXd9/z43H/fS/40f8K6viP+PCc/iv8AjX61f8IJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ
+        /wCfL/8AAl/kH+rFX/n6vuf+Z+Sv/Cur7/oHz/mv+NA+HeoDgWEwH1X/ABr9av8AhBND/wCgLpH/AICR
+        /wCFH/CCaH/0BdI/8BI/8KP9dKH/AD5f/gS/yGuGKv8Az9X3P/M/Jb/hXd//AM+M3/jv+NH/AAry/wD+
+        fCf81/xr9af+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/10of8+X/4Ev8AIP8AVmr/AM/V9z/z
+        PyWPw6vyedPn/Nf8aT/hXd8Dxp8+f+AnP61+tX/CCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66
+        UP8Any//AAJf5D/1Zq/8/V9z/wAz8lf+Fe3/APz4T8f7v+NH/Cvb/wD58J//AB3/ABr9av8AhBND/wCg
+        LpH/AICR/wCFH/CCaH/0BdI/8BI/8KFxpQ/58v8A8CX+Qv8AVmr/AM/V9z/zPyV/4V7f/wDPhP8A+O/4
+        0v8Awr+//wCgfN/47/jX60/8IJof/QF0j/wEj/wo/wCEE0P/AKAukf8AgJH/AIUf66UP+fL/APAl/kH+
+        rFX/AJ+L7n/mfkt/wr+//wCgfN/47/jR/wAK/v8A/oHzf+O/41+tP/CCaH/0BdI/8BI/8KP+EE0P/oC6
+        R/4CR/4Uf66UP+fL/wDAl/kH+rFX/n4vuf8Amfkt/wAK/v8A/oHzf+O/40f8K/v/APoHzf8Ajv8AjX60
+        /wDCCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66UP8Any//AAJf5B/qxV/5+L7n/mfkt/wr+/8A
+        +gfN/wCO/wCNH/Cv7/8A58Jh/wB8/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hS/wBd
+        KH/Pl/8AgS/yD/Vir/z9X3P/ADPyW/4V9fn/AJcZh/3yf60n/Cu9QPIsrgf98/41+tX/AAgmh/8AQF0j
+        /wABI/8ACj/hBND/AOgLpH/gJH/hTXGlD/ny/wDwJf5CXDFX/n6vuf8Amfkr/wAK71D/AJ8Z/wDx3/Gk
+        /wCFd3//AD4T/wDjv+NfrX/wgmh/9AXSP/ASP/Cj/hBND/6Aukf+Akf+FH+ulD/ny/8AwJf5D/1Yq/8A
+        P1fc/wDM/JQfDq/6/YJ8f8B/xpf+Fe32P+QfN+a/41+tX/CCaH/0BdI/8BI/8KP+EE0P/oC6R/4CR/4U
+        f66UP+fL/wDAl/kL/Vir/wA/V9z/AMz8lv8AhXt/n/jwnz/wH/Gj/hXl/wD8+E/5r/jX60/8IJof/QF0
+        j/wEj/wo/wCEE0P/AKAukf8AgJH/AIUf66UP+fL/APAl/kH+rFX/AJ+r7n/mfkt/wry//wCfCf8ANf8A
+        Gj/hXl//AM+E/wCa/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/k
+        H+rFX/n6vuf+Z+S3/CvL/wD58J/zX/Gj/hXl/wD8+E/5r/jX60/8IJof/QF0j/wEj/wo/wCEE0P/AKAu
+        kf8AgJH/AIUf66UP+fL/APAl/kH+rFX/AJ+r7n/mfkt/wry//wCfCf8ANf8AGj/hXl//AM+E/wCa/wCN
+        frT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/kH+rFX/n6vuf+Z+S3/CvL
+        /wD58J/zX/Gj/hXd9/0D5/8Ax3/Gv1p/4QTQ/wDoC6R/4CR/4Uf8IJof/QF0j/wEj/wo/wBdKH/Pl/8A
+        gS/yD/Vir/z9X3P/ADPyW/4V3ff9A+f/AMd/xpP+FfX/AEFhOMe6/wCNfrV/wgmh/wDQF0j/AMBI/wDC
+        j/hBND/6Aukf+Akf+FC40of8+X/4Ev8AIf8AqxV/5+L7n/mfkr/wr2//AOfGb81/xo/4V7f/APPjN+a/
+        41+tX/CCaH/0BdI/8BI/8KP+EE0P/oC6R/4CR/4Uf660P+fL+9f5B/qxV/5+L7n/AJn5K/8ACvb/AP58
+        ZvzX/Gj/AIV7f/8APjN+a/41+tX/AAgmh/8AQF0j/wABI/8ACj/hBND/AOgLpH/gJH/hR/rrQ/58v71/
+        kH+rFX/n4vuf+Z+Sv/Cvb/8A58ZvzX/Gj/hXt/8A8+M35r/jX61f8IJof/QF0j/wEj/wo/4QTQ/+gLpH
+        /gJH/hR/rrQ/58v71/kH+rFX/n4vuf8Amfkr/wAK9v8A/nxm/Nf8aP8AhXt//wA+M35r/jX61f8ACCaH
+        /wBAXSP/AAEj/wAKP+EE0P8A6Aukf+Akf+FH+utD/ny/vX+Qf6sVf+fi+5/5n5K/8K9v/wDnxm/Nf8aP
+        +Fe3/wDz4zfmv+NfrV/wgmh/9AXSP/ASP/Cj/hBND/6Aukf+Akf+FH+utD/ny/vX+Qf6sVf+fi+5/wCZ
+        +Sv/AAr2/wD+fGb81/xo/wCFe3//AD4zfmv+NfrV/wAIJof/AEBdI/8AASP/AAo/4QTQ/wDoC6R/4CR/
+        4Uf660P+fL+9f5B/qxV/5+L7n/mfkt/wr+//AOgfN/47/jSH4f3/AE+wTf8Ajv8AjX61f8IJof8A0BdI
+        /wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/kH+rFX/n4vuf+Z+Sv/Cvb/wD58ZvzX/Gj/hXt
+        /wD8+M35r/jX61f8IJof/QF0j/wEj/wo/wCEE0P/AKAukf8AgJH/AIULjSh/z5f3r/IP9WKv/Pxfc/8A
+        M/JX/hXt/wD8+M35r/jR/wAK9v8A/nxm/Nf8a/Wr/hBND/6Aukf+Akf+FH/CCaH/ANAXSP8AwEj/AMKP
+        9daH/Pl/ev8AIP8AVir/AM/F9z/zPyV/4V7f/wDPjN+a/wCNH/Cvb/8A58ZvzX/Gv1q/4QTQ/wDoC6R/
+        4CR/4Uf8IJof/QF0j/wEj/wo/wBdaH/Pl/ev8g/1Yq/8/F9z/wAz8lf+Fe3/APz4zfmv+NH/AAr2/wD+
+        fGb81/xr9av+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/11of8+X96/wAg/wBWKv8Az8X3P/M/
+        JX/hXt//AM+M35r/AI07/hXt/wD8+Ev/AI7/AI1+tH/CCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4
+        Uf66UP8Any/vX+Qf6sVf+fi+5/5n5L/8K81DnNjNj/gP+NN/4V9ff8+E5/Ff8a/Wn/hBND/6Auk/+Acf
+        +FH/AAgmh/8AQF0n/wAA4/8ACk+NKH/Pl/8AgS/yF/qxV/5+L7n/AJn5Lf8ACv77/nwn/Nf8aD8Pr/8A
+        58Jx/wB8/wCNfrV/wguh/wDQF0j/AMA4/wDCj/hBdD/6Aukf+Acf+FH+ulD/AJ8v/wACX+QLhir/AM/F
+        9z/zPyW/4V5f/wDPjP8A+O/40n/Cvr//AJ8Zv/Hf8a/Wr/hBdD/6Aukf+Acf+FH/AAguh/8AQF0j/wAA
+        4/8ACj/XSh/z5f8A4Ev8g/1Yq/8AP1fd/wAE/JX/AIV9f/8APjN/47/jR/wr6/8A+fGb/wAd/wAa/Wr/
+        AIQXQ/8AoC6R/wCAcf8AhR/wguh/9AXSP/AOP/Cj/XSh/wA+X/4Ev8g/1Yq/8/V93/BPyV/4V9f/APPj
+        N/47/jR/wr6//wCfGb/x3/Gv1q/4QXQ/+gLpH/gHH/hR/wAILof/AEBdI/8AAOP/AAo/10of8+X/AOBL
+        /IP9WKv/AD9X3f8ABPyVPw71Dp9huB/3yP60f8K8vxx9inP4r/jX61f8ILof/QF0j/wDj/wo/wCEF0P/
+        AKAukf8AgHH/AIUf660P+fL/APAl/kC4Yq/8/V9z/wAz8lf+Fe34/wCXGf8A8d/xpP8AhX1//wA+M/8A
+        47/jX61/8ILof/QF0j/wDj/wpP8AhBND/wCgLpP/AIBx/wCFNca0P+fL+9f5AuGKv/Pxfc/8z8lv+Ff3
+        /wDz4T/+O/40f8K9v/8Anxm/Nf8AGv1q/wCEE0P/AKAukf8AgJH/AIUf8IJof/QF0j/wEj/woXGlD/ny
+        /vX+Q/8AVir/AM/F9z/zPyV/4V7f/wDPjN+a/wCNH/Cvb/8A58ZvzX/Gv1q/4QTQ/wDoC6R/4CR/4Uf8
+        IJof/QF0j/wEj/wo/wBdaH/Pl/ev8g/1Yq/8/F9z/wAz8lf+Fe3/APz4zfmv+NH/AAr2/wD+fGb81/xr
+        9av+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/11of8+X96/wAg/wBWKv8Az8X3P/M/JX/hXt//
+        AM+M35r/AI0f8K9v/wDnxm/Nf8a/Wr/hBND/AOgLpH/gJH/hR/wgmh/9AXSP/ASP/Cj/AF1of8+X96/y
+        D/Vir/z8X3P/ADPyV/4V7f8A/PjN+a/40f8ACvb/AP58ZvzX/Gv1q/4QTQ/+gLpH/gJH/hR/wgmh/wDQ
+        F0j/AMBI/wDCj/XWh/z5f3r/ACD/AFYq/wDPxfc/8z8lf+Fe3/8Az4zfmv8AjR/wr2//AOfGb81/xr9a
+        v+EE0P8A6Aukf+Akf+FH/CCaH/0BdI/8BI/8KP8AXWh/z5f3r/IP9WKv/Pxfc/8AM/JX/hXmof8APhN+
+        a/40v/Cvb/vYT5/4D/jX60/8IJof/QF0j/wEj/wo/wCEE0P/AKAukf8AgJH/AIUf66UP+fL/APAl/kH+
+        rFX/AJ+L7n/mfkt/wr2//wCfCf8A8d/xo/4V7f8A/PhP/wCO/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4
+        QTQ/+gLpH/gJH/hR/rrR/wCfL/8AAl/kL/Vir/z9X3P/ADPyW/4V5f8A/PhP/wCO/wCNH/Cvr7/nwn/N
+        f8a/Wn/hBND/AOgLpH/gJH/hR/wgmh/9AXSP/ASP/Cj/AF0of8+X/wCBL/IP9WKv/P1fc/8AM/Jb/hX1
+        9/z4T/mv+NH/AAr2/wCMWE+Pqv8AjX60/wDCCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66UP8A
+        ny//AAJf5B/qxV/5+L7n/mfkt/wry/8A+fCf81/xo/4V5f8A/PhP+a/41+tP/CCaH/0BdI/8BI/8KP8A
+        hBND/wCgLpH/AICR/wCFH+ulD/ny/wDwJf5B/qxV/wCfq+5/5n5Lf8K8v/8Anwn/ADX/ABo/4V5qBGDY
+        T/mv+NfrT/wgmh/9AXSP/ASP/Cj/AIQTQ/8AoC6R/wCAkf8AhR/rpQ/58v8A8CX+Qf6sVf8An6vuf+Z+
+        Sv8Awrq+/wCgfOD9V/xpR8O78dNPn/Nf8a/Wn/hBND/6Aukf+Akf+FH/AAgmh/8AQF0j/wABI/8ACl/r
+        pQ/58v8A8CX+Q/8AVir/AM/F9z/zPyW/4V5fnpYTj8V/xo/4V3f/APPjN/47/jX60/8ACCaH/wBAXSP/
+        AAEj/wAKP+EE0P8A6Aukf+Akf+FP/XSh/wA+X/4Ev8g/1Yq/8/F9z/zPyW/4V3f/APPjN/47/jR/wru/
+        /wCfGb/x3/Gv1p/4QTQ/+gLpH/gJH/hR/wAIJof/AEBdI/8AASP/AAo/10of8+X/AOBL/IP9Wav/AD8X
+        3P8AzPyW/wCFd3//AD4zf+O/40f8K7v/APnxm/8AHf8AGv1p/wCEE0P/AKAukf8AgJH/AIUf8IJof/QF
+        0j/wEj/wo/10of8APl/+BL/IP9Wav/Pxfc/8zUwfQ/lRg+h/KvyDHxY8VZP/ABU3iD/wYzf/ABVH/C2f
+        FX/QzeIP/BjN/wDFV8N9W8z7C5+vmD6H8qMH0P5V+Qf/AAtnxV/0M3iD/wAGM3/xVH/C2fFX/QzeIP8A
+        wYzf/FUnh/MHI/XzB9D+VGD6H8q/IP8A4Wz4q/6GbxB/4MZv/iqR/i14rGMeJvEIx/1EZv8A4qj6v5i5
+        j9fcH0P5UYPofyr8gP8Ahbniv/oZ/EP/AIMZv/iqP+FteK/+hm8Q/wDgxm/+Kpew8w5z9f8AB9D+VGD6
+        H8q/ID/hbXiv/oZvEP8A4MZv/iqP+FteK/8AoZvEP/gxm/8AiqPYeYKR+v8Ag+h/KjB9D+VfkB/wtrxX
+        /wBDN4h/8GM3/wAVR/wtrxX/ANDN4h/8GM3/AMVR7DzBSP1/wfQ/lRg+h/KvyA/4W14r/wChm8Q/+DGb
+        /wCKo/4W14r/AOhm8Q/+DGb/AOKo9h5gpH6/4PofyowfQ/lX5Af8La8V/wDQzeIf/BjN/wDFUf8AC2vF
+        f/QzeIf/AAYzf/FUew8wUj9f8H0P5UYPofyr8gP+FteK/wDoZvEP/gxm/wDiqP8AhbXiv/oZvEP/AIMZ
+        v/iqPYeYKR+v+D6H8qMH0P5V+QH/AAtrxX/0M3iH/wAGM3/xVH/C2vFf/QzeIf8AwYzf/FUew8wUj9f8
+        H0P5UYPofyr8gP8Ahbfiv/oZvEP/AIMZv/iqP+FteK/+hm8Q/wDgxm/+Ko9h5gpH6/4PofyowfQ/lX5A
+        f8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1/wAH0P5UYPofyr8gP+FteK/+hm8Q
+        /wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P5V+QH/C2vFf/AEM3iH/wYzf/ABVH
+        /C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/AKGbxD/4MZv/AIqj/hbXiv8A6Gbx
+        D/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/AMVR/wALa8V/9DN4h/8ABjN/8VR7
+        DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/+hm8Q/8Agxm/+Ko9h5gpH6/4Pofy
+        owfQ/lX5Af8AC2vFf/QzeIf/AAYzf/FUf8La8V/9DN4h/wDBjN/8VR7DzBSP1/wfQ/lRg+h/KvyA/wCF
+        teK/+hm8Q/8Agxm/+Ko/4W14r/6GbxD/AODGb/4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/0M3iH/AMGM
+        3/xVH/C2vFf/AEM3iH/wYzf/ABVHsPMFI/X/AAfQ/lRg+h/KvyA/4W14r/6GbxD/AODGb/4qj/hbXiv/
+        AKGbxD/4MZv/AIqj2HmCkfr/AIPofyowfQ/lX5Af8La8V/8AQzeIf/BjN/8AFUf8La8V/wDQzeIf/BjN
+        /wDFUew8wUj9f8H0P5UYPofyr8gP+FteK/8AoZvEP/gxm/8AiqP+FteK/wDoZvEP/gxm/wDiqPYeYKR+
+        v+D6H8qMH0P5V+QH/C2vFf8A0M3iH/wYzf8AxVH/AAtrxX/0M3iH/wAGM3/xVHsPMFI/X/B9D+VGD6H8
+        q/ID/hbXiv8A6GbxD/4MZv8A4qj/AIW14r/6GbxD/wCDGb/4qj2HmCkfr/g+h/KjB9D+VfkB/wALa8V/
+        9DN4h/8ABjN/8VR/wtrxX/0M3iH/AMGM3/xVHsPMFI/X/B9D+VGD6H8q/ID/AIW14r/6GbxD/wCDGb/4
+        qj/hbXiv/oZvEP8A4MZv/iqPYeYKR+v+D6H8qMH0P5V+QH/C2vFf/QzeIf8AwYzf/FUf8La8V/8AQzeI
+        f/BjN/8AFUew8wUj9f8AB9D+VGD6H8q/ID/hbXiv/oZvEP8A4MZv/iqP+FteK/8AoZvEP/gxm/8AiqPY
+        eYKR+v8Ag+h/KjB9D+VfkB/wtrxX/wBDN4h/8GM3/wAVR/wtrxX/ANDN4h/8GM3/AMVR7DzBSP1/wfQ/
+        lRg+h/KvyA/4W14r/wChm8Q/+DGb/wCKo/4W14r/AOhm8Q/+DGb/AOKo9h5gpH6/4PofyowfQ/lX5Af8
+        La8V/wDQzeIf/BjN/wDFUf8AC2vFf/QzeIf/AAYzf/FUew8wUj9f8H0P5UYPofyr8gP+FteK/wDoZvEP
+        /gxm/wDiqP8AhbXiv/oZvEP/AIMZv/iqPYeYKR+v+D6H8qMH0P5V+QH/AAtvxX/0M3iH/wAGM3/xVH/C
+        2vFf/QzeIf8AwYzf/FUew8wUj9f8H0P5UYPofyr8gP8AhbXiv/oZvEP/AIMZv/iqP+FteK/+hm8Q/wDg
+        xm/+Ko9h5gpH6/4PofyowfQ/lX5Af8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1
+        /wAH0P5UYPofyr8gP+FteK/+hm8Q/wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P
+        5V+QH/C2vFf/AEM3iH/wYzf/ABVH/C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/
+        AKGbxD/4MZv/AIqj/hbXiv8A6GbxD/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/
+        AMVR/wALa8V/9DN4h/8ABjN/8VR7DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/
+        +hm8Q/8Agxm/+Ko9h5gpH6/4PofyowfQ/lX5Af8AC2/Ff/Qz+If/AAYzf/FUf8La8V/9DN4h/wDBjN/8
+        VR7DzBSP1/wfQ/lRg+h/KvyA/wCFteK/+hm8Q/8Agxm/+Ko/4W14r/6GbxD/AODGb/4qj2HmCkfr/g+h
+        /KjB9D+VfkB/wtrxX/0M3iH/AMGM3/xVH/C2vFf/AEM3iH/wYzf/ABVHsPMFI/X/AAfQ/lRg+h/KvyA/
+        4W14r/6GbxD/AODGb/4qj/hbXiv/AKGbxD/4MZv/AIqj2HmCkfr/AIPofyowfQ/lX5Af8La8V/8AQzeI
+        f/BjN/8AFUf8La8V/wDQzeIf/BjN/wDFUew8wUj9f8H0P5UYPofyr8gP+Ft+K/8AoZvEP/gxm/8AiqP+
+        Ft+Kz18T+If/AAYzf/FUew8wUj9f8H0P5UYPofyr8gP+FteK/wDoZvEP/gxm/wDiqP8AhbXiv/oZvEP/
+        AIMZv/iqPYeYKR+v+D6H8qMH0P5V+QH/AAtrxX/0M3iH/wAGM3/xVH/C2vFf/QzeIf8AwYzf/FUew8wU
+        j9f8H0P5UYPofyr8gP8AhbXiv/oZvEP/AIMZv/iqP+FteK/+hm8Q/wDgxm/+Ko9h5gpH6/4PofyowfQ/
+        lX5Af8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1/wAH0P5UYPofyr8gP+FteK/+
+        hm8Q/wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P5V+QH/C2vFf/AEM3iH/wYzf/
+        ABVH/C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/AKGbxD/4MZv/AIqj/hbXiv8A
+        6GbxD/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/AMVR/wALa8V/9DN4h/8ABjN/
+        8VR7DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/+hm8Q/8Agxm/+Ko9h5gpH6/4
+        PofyowfQ/lX5Af8AC2vFf/QzeIf/AAYzf/FUf8Lb8Vjp4n8Q/wDgxm/+Ko9h5gpH6/4PofyowfQ/lX5A
+        f8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1/wAH0P5UYPofyr8gP+FteK/+hm8Q
+        /wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P5V+QH/C2/Ff/AEM/iH/wYzf/ABVH
+        /C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/AKGbxD/4MZv/AIqj/hbXiv8A6Gbx
+        D/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/AMVR/wALa8V/9DN4h/8ABjN/8VR7
+        DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/+hm8Q/8Agxm/+Ko9h5i5/I/X/B9D
+        +VGD6H8q/ID/AIW14r/6GbxD/wCDGb/4qj/hbXiv/oZvEP8A4MZv/iqPYeY1M//Z
+</value>
+  </data>
+  <data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+        jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
+        grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
+        FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
+        u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="sdy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+        UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
+        V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
+        9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
+        f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
+        NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
+        BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
+        AABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+        UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
+        V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
+        9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
+        f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
+        NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
+        BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
+        AABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+        9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
+        W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
+        mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
+        jP+Ny1r/F00v+5/akQW3DWQzSDNWF6CHwcbdGzAwSAPMZhjAagByLIDwiuXLwRhmK4YBZ8+cIRqD1CMD
+        sAGkYmRAYXb+/x8A86/iJXr/E3YAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="spRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+        9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
+        W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
+        mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
+        jP+Ny1r/F00v+5/akQW3DWQzSDNWF6CHwcbdGzAwSAPMZhjAagByLIDwiuXLwRhmK4YBZ8+cIRqD1CMD
+        sAGkYmRAYXb+/x8A86/iJXr/E3YAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+        /gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
+        mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
+        ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
+        rTWjutBHQN0+oOxgCbE4NuIJW2tGJc4jgNvvgUu9LLzYhHRuQ96Yp1vvdWwjt2UR0mVA6vdf4h1+hSv9
+        BDxfh1R+huS/ghR0Hnd+Bxu+QKrdcEwkmY2dAAwQ8DScGe8sSRUbqj0Y+c5zR+QUwOOQFbz2EtKyij+/
+        rTc/69tFKLjzH+DyM9O2wq3MiXSsux8JGGSx+YcFKHpNQBD+b8Dc/C78Pw2E/3L9RwGPAhYg654LeY4l
+        ZA+x2DiH9CaPeZygaQEBBrU5sJxCNJo6BOgSHi4wrz8TdbF8GJefBUn0IRYBQktAmKtZXeExsoPouoF0
+        eosbh3u/3ot3QQKafJAHsxZAlVUxCinthlx3QkreHrqY1+oS+maP5Rs8L6Xvj2MPx8IASe80O9sAAAAA
+        SUVORK5CYII=
+</value>
+  </data>
+  <data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
+        G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
+        5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
+        EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
+        E8pc2+4AAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="wxm.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+        /gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
+        mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
+        ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
+        rTWjutBHQN0+oOxgCbE4NuIJW2tGJc4jgNvvgUu9LLzYhHRuQ96Yp1vvdWwjt2UR0mVA6vdf4h1+hSv9
+        BDxfh1R+huS/ghR0Hnd+Bxu+QKrdcEwkmY2dAAwQ8DScGe8sSRUbqj0Y+c5zR+QUwOOQFbz2EtKyij+/
+        rTc/69tFKLjzH+DyM9O2wq3MiXSsux8JGGSx+YcFKHpNQBD+b8Dc/C78Pw2E/3L9RwGPAhYg654LeY4l
+        ZA+x2DiH9CaPeZygaQEBBrU5sJxCNJo6BOgSHi4wrz8TdbF8GJefBUn0IRYBQktAmKtZXeExsoPouoF0
+        eosbh3u/3ot3QQKafJAHsxZAlVUxCinthlx3QkreHrqY1+oS+maP5Rs8L6Xvj2MPx8IASe80O9sAAAAA
+        SUVORK5CYII=
+</value>
+  </data>
+  <data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+        wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
+        mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
+        OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="kc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
+        2wOLaKet2NlEsFtIiohgJR6xEdQ0Gojwu/9k59xdL1z84Ye73Z1vZmfWpLJVgeMD02l//K8IACy+l2N8
+        vl1h8XyO14cTzO0RnsaHEgxbEhBDer0B6CzLkOc5CPp6d4B6DXixgwYgSUIIA+/qWjZWy1vJTBD/+/1T
+        8dwDfNCvNTgEDIc3YkIW9Vl0hcfrfdxf7GE62tkMkLu70gnQClJPRrvbAdIesILZZUcF4RXastMTBVBt
+        TeQkqqpyB0pZj3rgKogAFCE0s2owVh8oS45rDdlYQSge1IdUuE/jOGIP0Qqm2sRUCtBMAnErIWTmxthZ
+        QTiNNkgzhVRF0TzRyOxNCAn2tldaiV/+nwgRkMiYHwIr6UXY3sHBAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+        oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
+        znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
+        vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
+        AG0RaJ0Gqp8A+0ICGBIZLkZLifXv8Xb3YnVlRdrdb23gtAHHjpdj5hAVRVdv+vBlaVkes+6pPVzhieHn
+        YQKiwHtHpSFp6+rB4sIn+Y37R+3hB5kNec2SSKV5isvebuiZj8YPxoKxYrSMAR90RyWc2AZqgp/lKSzB
+        Jc91xJI6nEoUdCECchrRJlZl4YA7XgJL+Yl7BszjauvEu9QCZoUk8UFHMq3jW+6HLJS1p+1hniZXO6pq
+        63Hk5Bkr/Fy9SHvC4+FXhuTa7V6s/dopydbOriXA7Ll/YN7nHrNSENeXMDA4aq0WvP0V2IpLSQFOpuaQ
+        mF+WPSm4Iv7CxmaXNBbWPwUtDpLhZ8/HwyU9ZolvjjkaUH3qrBUuV9WeBkv4mufh42clHWYaz7vwG72U
+        TLZQdeFnAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+        /QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
+        77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
+        aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
+        JWylHvVeGGCm+hBQnNlCNIatWNxW6lGv9B0D3PsIXOrnQts2pGsX0mOdLX3WuYsbjT8gvTyNmsOPeJ+n
+        cOUtAa2bkEdfIbkdkLyuk8rtZGAGUuGCYzxBb/QUYJCAlpAp73+jnIEKN979pNcRPgPQEDSA7HZI4xpW
+        /pgvP+vdRzCwx/Y1AKeP3uZVtjIr0rJKPhMwxMX6RQO41U1AAL45YP77Pny/Ugitc//HAc/8BpD1wIkc
+        xxKuDnOxdh7pbc45rKBuAX4aNexfTiISYQNlALqFpwv068/EcbF0BJdfBEj0IhoGgktAKAisrXIO7yGy
+        mUI6vcPGYe/XePA+QECdF/Jk1gB0ZJWNQgpfQ273QQpeHSmf96oCquiN0R1eF1IPP+AAgRmsjnCqFmoA
+        AAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="tb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
+        EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
+        cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
+        6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
+        ArrI3Rmmkq3NDWRK40o13XiAxYXPsltBkAb7YbIRN6HoyVyEDyt51rhSV67dRTL5EcqgxV5yn91GQvI4
+        1BjFViHBEeCNI98qqGu+ibnEB7h8UaiqWaiLlo3Jpd9w8J15BC6ZzVdWQX3LbfSPPBUPjY4jqJ2cXxDg
+        YENE4LkdoMi/mF3AOlvhwonSM+JjJeUYHhkT+EBDzAbLsYr7ZabRbM08p6sg5bjf/hVm6Xi2eOirVv8H
+        x2foKkhcgFcV/4YnQhFkOnDJvF+Bd74D2zEp2YO/pJZtefqFO/Dy9Xu8iCQQin1CgEHSXoHLocSs+LQh
+        Gc4yw6w676yRL37ccRpHS87hfqUZPnKqzCzRmhoz0EYzznCWmQvOWvwCAklSiLgvRB8AAAAASUVORK5C
+        YII=
+</value>
+  </data>
+  <data name="gl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+        taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
+        NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
+        Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
+        yioKMfc5Zc4IkhUMCAOXVgvY4OQsNeJJBYl/qKYM8/ZtQr9QCwlZtFf0j3lI+PiUIQmoaHvg/RJ7mMzX
+        KlDtv6NXUIBjeJoG3mNfiMbNlFXdXGy/MplZAGB1QeqxPtcUHV4lbUkxg7K2PK4XOW7+N3PYBiaoeI5+
+        4uXDINdWu1hhM0evc5SEx7c4nt4TRL51rvEAXLT+MR+fGn8m67YPUXH/IuH+NUbkNZnVB0C5opD8m3Me
+        QndfXpGHXECnlRF/ZILJ09zWhaqGJlTVG+R6ZW0jeAgNadjZ29f72iz36Cpj3yFNGCz1c9N0AAAAAElF
+        TkSuQmCC
+</value>
+  </data>
+  <data name="BatchNo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+        BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
+        CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
+        tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
+        cx82d1+EpURiHmu8817neYkEHQH+BEtZSfYHLCWSdTgI3vBtcjUXOHiVAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+        bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+        rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+        wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="cmdSourceBillNo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+        /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+        /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+        /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+        AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+        gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+        wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+        FIYcEAA7
+</value>
+  </data>
+  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>93, 17</value>
+  </metadata>
+  <metadata name="pageSetupDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>212, 17</value>
+  </metadata>
+  <metadata name="printDocument1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>610, 17</value>
+  </metadata>
+  <metadata name="printDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>438, 17</value>
+  </metadata>
+  <metadata name="printPreviewDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>817, 17</value>
+  </metadata>
+  <data name="printPreviewDialog1.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAYAICAQAAAAAADoAgAAZgAAABAQEAAAAAAAKAEAAE4DAAAgIAAAAQAIAKgIAAB2BAAAEBAAAAEA
+        CABoBQAAHg0AACAgAAABACAAqBAAAIYSAAAQEAAAAQAgAGgEAAAuIwAAKAAAACAAAABAAAAAAQAEAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA
+        /wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIoiI
+        iIiIiIiIiIiIiIiIiIiCIigiIiIozMzMzMzMyCIogiIoIiIiKM7m5ubm5sgiKIIiKCIiIijObm5ubm7I
+        IiiCIigiIiIozubm5ubmyCIogiIoIiIiKM5ubm5ubsgiKIIiKCIiIijO5ubm5ubIIiiIiIiIiIiIzm5u
+        bm5uyCIogRERERERGM7u7u7u7sgiKIHZWVlZWRjMzMzMzMzIIiiB1ZWVlZUYiIiIiIiIiIiIgdlZWVlZ
+        GDMzMzMzMzMzOIHVlZWVlRg/uLi4uLi4uDiB2VlZWVkYP7uLi4uLi4s4gdWVlZWVGD+4uLi4uLi4OIHZ
+        WVlZWRg/u4uLi4uLiziB1ZWVlZUYP7i4uLi4uLg4gdlZWVlZGD+7i4uLi4uLOIHVlZWVlRg/uLi4uLi4
+        uDiB3d3d3d0YP7uLi4uLi4s4gRERERERGD+4uLi4uLi4OIiIiIiIiIg/u4uLi4uLiziCIiIiIiIoP7i4
+        uLi4uLg4giIiIiIiKD+7i4uLi4uLOIIiIiIiIig/uLi4uLi4uDiCIiIiIiIoP7u7u7u7u7s4giIiIiIi
+        KD//////////OIIiIiIiIigzMzMzMzMzMziIiIiIiIiIiIiIiIiIiIiIIiIiIiIiIiIiIiIiIiIiIv//
+        ////////AAAAAHv4AA57+AAOe/gADnv4AA57+AAOe/gADgAAAA4AAAAOAAAADgAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/4AAB/+AAAf/gAAH/4AAB/+AAAf/gAAAAA
+        AAD/////KAAAABAAAAAgAAAAAQAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACA
+        gACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAiIiIiIiIiIoiI
+        iIiIiIiIgigijMzMyCiCKCKM5mbIKIiIiIzu7sgogRERjMzMyCiB2ZGIiIiIiIHZkYMzMzM4gdmRg/u7
+        uziB3dGD+7u7OIEREYP7u7s4iIiIg/u7uziCIiKD+7u7OIIiIoP///84giIigzMzMziIiIiIiIiIiP//
+        KCIAACjObALm5mwCIigAAoiIAAKIzgAAbm4AACIoAAAREQAAGM4AAO7uAAAiKHwAWVl8ABjMfADMzAAA
+        IigoAAAAIAAAAEAAAAABAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAA
+        AACAAIAAgIAAAICAgADA3MAA8MqmAKo/KgD/PyoAAF8qAFVfKgCqXyoA/18qAAB/KgBVfyoAqn8qAP9/
+        KgAAnyoAVZ8qAKqfKgD/nyoAAL8qAFW/KgCqvyoA/78qAADfKgBV3yoAqt8qAP/fKgAA/yoAVf8qAKr/
+        KgD//yoAAABVAFUAVQCqAFUA/wBVAAAfVQBVH1UAqh9VAP8fVQAAP1UAVT9VAKo/VQD/P1UAAF9VAFVf
+        VQCqX1UA/19VAAB/VQBVf1UAqn9VAP9/VQAAn1UAVZ9VAKqfVQD/n1UAAL9VAFW/VQCqv1UA/79VAADf
+        VQBV31UAqt9VAP/fVQAA/1UAVf9VAKr/VQD//1UAAAB/AFUAfwCqAH8A/wB/AAAffwBVH38Aqh9/AP8f
+        fwAAP38AVT9/AKo/fwD/P38AAF9/AFVffwCqX38A/19/AAB/fwBVf38Aqn9/AP9/fwAAn38AVZ9/AKqf
+        fwD/n38AAL9/AFW/fwCqv38A/79/AADffwBV338Aqt9/AP/ffwAA/38AVf9/AKr/fwD//38AAACqAFUA
+        qgCqAKoA/wCqAAAfqgBVH6oAqh+qAP8fqgAAP6oAVT+qAKo/qgD/P6oAAF+qAFVfqgCqX6oA/1+qAAB/
+        qgBVf6oAqn+qAP9/qgAAn6oAVZ+qAKqfqgD/n6oAAL+qAFW/qgCqv6oA/7+qAADfqgBV36oAqt+qAP/f
+        qgAA/6oAVf+qAKr/qgD//6oAAADUAFUA1ACqANQA/wDUAAAf1ABVH9QAqh/UAP8f1AAAP9QAVT/UAKo/
+        1AD/P9QAAF/UAFVf1ACqX9QA/1/UAAB/1ABVf9QAqn/UAP9/1AAAn9QAVZ/UAKqf1AD/n9QAAL/UAFW/
+        1ACqv9QA/7/UAADf1ABV39QAqt/UAP/f1AAA/9QAVf/UAKr/1AD//9QAVQD/AKoA/wAAH/8AVR//AKof
+        /wD/H/8AAD//AFU//wCqP/8A/z//AABf/wBVX/8Aql//AP9f/wAAf/8AVX//AKp//wD/f/8AAJ//AFWf
+        /wCqn/8A/5//AAC//wBVv/8Aqr//AP+//wAA3/8AVd//AKrf/wD/3/8AVf//AKr//wD/zMwA/8z/AP//
+        MwD//2YA//+ZAP//zAAAfwAAVX8AAKp/AAD/fwAAAJ8AAFWfAACqnwAA/58AAAC/AABVvwAAqr8AAP+/
+        AAAA3wAAVd8AAKrfAAD/3wAAVf8AAKr/AAAAACoAVQAqAKoAKgD/ACoAAB8qAFUfKgCqHyoA/x8qAAA/
+        KgBVPyoA8Pv/AKSgoACAgIAAAAD/AAD/AAAA//8A/wAAAAAAAAD//wAA////AP39/f39/f39/f39/f39
+        /f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39
+        /f39/f39/f39/f39/f39/f39/f39/f39qoYIqoYIhqoIqgiqCaoIqgiqhqqGhoYIhoYIqv39/f0I/f39
+        /ar9/f39/YY2Ng4yDg4ODgoOCgoKCgqG/f39/Yb9/f39CP39/f39qjY7Ozs3Nzc3NjMSMjIOCqr9/f39
+        qv39/f2G/f39/f0IN19fOzs3Nzc3NjcODg4KCP39/f0I/f39/ar9/f39/ao6X19fXzs7Ozc3NzY3NgqG
+        /f39/Yb9/f39CP39/f39hl9jY19jX187Ozs7Nzc3Dqr9/f39qv39/f2G/f39/f0IOodjh19jX19fXztf
+        OzcOCP39/f0ICAmqCAiqCKoICapfCYdjh2ODY19fXzs7Ow6q/f39/QhITEwoSCUoKSQoqmMJCYcJCWNj
+        Y2NfY19fNgj9/f39qkyZmZmYmJRwlCmqX19fXl9fX186WzY3Njc2gv39/f0JcJ2dmZmZlJmUJAmqCaoJ
+        hggIqggICKoIqggI/f39/YZwnp2dnZmZmJVMqnx8fHx8fFR8VHhUVFRUVKr9/f39CHChoZ2dnZ2ZmUwJ
+        fKSkxqSkxqSkpKSkpKBUCP39/f2qcKLDoqGdnZ2ZTKp8ysakxqSkxqSkxqSkpFSq/f39/QiUpqbDoqHE
+        nZ1Mq3ykqMakyqSkxqSkpKSkVAj9/f39hpTIyKbHoqGhoXAIfMrLpMqkxqSkxqTGpKRUqv39/f0IlMym
+        yKbIpcShcAh8y6jKpMqkxsqkpKSkxlQI/f39/aqUzMzMyKbIpqJwqnzLy8qpxsqkpMakxqSkeAj9/f39
+        CJSUlJSUlJSUlJQJgMupy8qpysqkyqSkxqRUqv39/f2GCKoIqgiqCKoIhgigrcvPqcuoy8qkxsqkxnyG
+        /f39/ar9/f39/f39/f39qnzPz6nLy8uoyqnKpKTKVAj9/f39CP39/f39/f39/f0IfNDPz8+py8upyqjG
+        yqR8hv39/f2G/f39/f39/f39/Qik0K7P0M+ty8vLy6jKpXyq/f39/ar9/f39/f39/f39CHzQ09Ctz8/P
+        qcupy6jKeAj9/f39CP39/f39/f39/f2qoNPQ0NPQ0M/Qz8vLy6l8CP39/f2G/f39/f39/f39/QmkfKR8
+        oHx8fHx8fHx8fHyG/f39/aoIqgiqCKoIqgiqCKoIqgiqCKoIqgiqCKoIqgj9/f39/f39/f39/f39/f39
+        /f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f3/////////////
+        ///AAAAD3vgAA974AAPe+AAD3vgAA974AAPe+AADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA
+        AAPAAAADwAAAA8AAAAPAAAADwAAAA9/4AAPf+AAD3/gAA9/4AAPf+AAD3/gAA8AAAAP//////////ygA
+        AAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAA
+        gACAgAAAgICAAMDcwADwyqYAqj8qAP8/KgAAXyoAVV8qAKpfKgD/XyoAAH8qAFV/KgCqfyoA/38qAACf
+        KgBVnyoAqp8qAP+fKgAAvyoAVb8qAKq/KgD/vyoAAN8qAFXfKgCq3yoA/98qAAD/KgBV/yoAqv8qAP//
+        KgAAAFUAVQBVAKoAVQD/AFUAAB9VAFUfVQCqH1UA/x9VAAA/VQBVP1UAqj9VAP8/VQAAX1UAVV9VAKpf
+        VQD/X1UAAH9VAFV/VQCqf1UA/39VAACfVQBVn1UAqp9VAP+fVQAAv1UAVb9VAKq/VQD/v1UAAN9VAFXf
+        VQCq31UA/99VAAD/VQBV/1UAqv9VAP//VQAAAH8AVQB/AKoAfwD/AH8AAB9/AFUffwCqH38A/x9/AAA/
+        fwBVP38Aqj9/AP8/fwAAX38AVV9/AKpffwD/X38AAH9/AFV/fwCqf38A/39/AACffwBVn38Aqp9/AP+f
+        fwAAv38AVb9/AKq/fwD/v38AAN9/AFXffwCq338A/99/AAD/fwBV/38Aqv9/AP//fwAAAKoAVQCqAKoA
+        qgD/AKoAAB+qAFUfqgCqH6oA/x+qAAA/qgBVP6oAqj+qAP8/qgAAX6oAVV+qAKpfqgD/X6oAAH+qAFV/
+        qgCqf6oA/3+qAACfqgBVn6oAqp+qAP+fqgAAv6oAVb+qAKq/qgD/v6oAAN+qAFXfqgCq36oA/9+qAAD/
+        qgBV/6oAqv+qAP//qgAAANQAVQDUAKoA1AD/ANQAAB/UAFUf1ACqH9QA/x/UAAA/1ABVP9QAqj/UAP8/
+        1AAAX9QAVV/UAKpf1AD/X9QAAH/UAFV/1ACqf9QA/3/UAACf1ABVn9QAqp/UAP+f1AAAv9QAVb/UAKq/
+        1AD/v9QAAN/UAFXf1ACq39QA/9/UAAD/1ABV/9QAqv/UAP//1ABVAP8AqgD/AAAf/wBVH/8Aqh//AP8f
+        /wAAP/8AVT//AKo//wD/P/8AAF//AFVf/wCqX/8A/1//AAB//wBVf/8Aqn//AP9//wAAn/8AVZ//AKqf
+        /wD/n/8AAL//AFW//wCqv/8A/7//AADf/wBV3/8Aqt//AP/f/wBV//8Aqv//AP/MzAD/zP8A//8zAP//
+        ZgD//5kA///MAAB/AABVfwAAqn8AAP9/AAAAnwAAVZ8AAKqfAAD/nwAAAL8AAFW/AACqvwAA/78AAADf
+        AABV3wAAqt8AAP/fAABV/wAAqv8AAAAAKgBVACoAqgAqAP8AKgAAHyoAVR8qAKofKgD/HyoAAD8qAFU/
+        KgDw+/8ApKCgAICAgAAAAP8AAP8AAAD//wD/AAAAAAAAAP//AAD///8A/f39/f39/f39/f39/f39/f0I
+        hgiqCKoICKoICKaGCP39qv39hv2GNg4ODjII/ar9/Yb9/ar9qjdjXzsOCP2G/f0IhquGCAleCWNfNob9
+        qv39qkxMTEgIX19fX18I/Qj9/QhwnZlMqoYIqggIqgiG/f2qcKadcAl8fFQDVFQDqv39CHDMpnCqfMvL
+        ysrKVAj9/QiUlHBwCYDPy8/LylSG/f2GqoYIqgig0M/Py8t8qv39CP39/f2GpNDQ0M/PfAn9/ar9/f39
+        qqT20NDQ0Hyq/f2G/f39/QmkpKSloKR8CP39CKoIhgiqCIYIqgiGCKr9/f39/f39/f39/f39/f39/f//
+        hv2AAf0ItAX9/bQFX2OABWNfgAU7O4ABNzeAAf39gAGq/YAB/YaAAf39vAE6h7wBX2O8AV9fgAE7N///
+        /f0oAAAAIAAAAEAAAAABACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAADCv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/
+        wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/
+        wf/Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/wAAAAAAAAAAAAAAAAAA
+        AAAAAAAAwr/B/7Z3Sf+zckT/rm0//6toO/+nYjb/pF4y/6BZLv+dVCr/mlEn/5dNI/+VSiH/kkce/5FE
+        HP+RRBz/kUUb/8K/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/wAAAAAAAAAAAAAAAAAAAADCv8H/AAAAAAAA
+        AAAAAAAAAAAAAAAAAADCv8H/v4JS//+aZv//lWD/+5Bc//WLV//uh1P/54FO/997S//Wdkb/zXBD/8Vr
+        QP+9Zj3/tGI5/65dN/+RRRz/wr/B/wAAAAAAAAAAAAAAAAAAAADCv8H/AAAAAAAAAAAAAAAAAAAAAMK/
+        wf8AAAAAAAAAAAAAAAAAAAAAAAAAAMK/wf/GjFv//6Rz//+fbf//m2f//5Zh//yRXf/3jVj/8IhV/+mD
+        UP/hfUz/2HhI/9ByRP/HbED/v2c9/5VJIf/Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf8AAAAAAAAAAAAA
+        AAAAAAAAwr/B/wAAAAAAAAAAAAAAAAAAAAAAAAAAwr/B/86WZP//r4L//6p7//+mdf//oW7//5xo//+X
+        Yv/9kl7/+I5a//KJVf/rhFH/4n5N/9t4SP/Sc0X/mlEm/8K/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/wAA
+        AAAAAAAAAAAAAAAAAADCv8H/AAAAAAAAAAAAAAAAAAAAAAAAAADCv8H/1J9s//+4kf//tIv//6+E//+r
+        ff//p3f//6Jw//+eav//mWT//pRf//qQWv/0i1b/7IVS/+V/Tv+gWC7/wr/B/wAAAAAAAAAAAAAAAAAA
+        AADCv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf8AAAAAAAAAAAAAAAAAAAAAAAAAAMK/wf/apnP//7+d//+7
+        mP//uJL//7WM//+whv//rH///6d4//+jcf//n2v//5ll//+VYP/6kVv/9YxY/6diN//Cv8H/AAAAAAAA
+        AAAAAAAAAAAAAMK/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/96t
+        eP//wqL//8Gi//+/nv//vJn//7mT//+2jv//sYj//66A//+pev//pHP//6Bt//+bZ///l2L/r20//8K/
+        wf8AAAAAAAAAAAAAAAAAAAAAwr/B/xYXev8XF3b/GBVx/xkUbf8ZFGr/GhNm/xoSY/8bEV//HBFd/xwQ
+        W//Cv8H/4K96///Cov//wqL//8Ki///Cov//wJ///72b//+6lf//t4///7KJ//+ugv//qnv//6V0//+h
+        bv+3d0n/wr/B/wAAAAAAAAAAAAAAAAAAAADCv8H/FRqE/0dN1v8/RNL/Nz3Q/y40zv8nLcz/ISfK/xwh
+        yf8WHMf/GxJh/8K/wf/gr3r/4K96/+Cvev/gr3r/3614/9yqdf/apnL/16Nw/9Sea//Rmmj/zZZk/8qR
+        X//GjFz/w4dW/7+CUv/Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf8SHZD/WF3a/05U1/9FS9X/PUPS/zU7
+        0P8uM83/JyzL/yAmyf8aFGn/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/
+        wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/xAfnP9obt7/YGTc/1Zb
+        2f9NU9f/RUrU/ztB0v80OdD/LDHO/xgWcv/Cv8H/Dn+n/w18pP8MeqH/DHie/wt1m/8Kc5j/CXGV/wlv
+        k/8JbJD/CGqN/wdpi/8HZ4j/BmWH/wZkhf8GYoP/wr/B/wAAAAAAAAAAAAAAAAAAAADCv8H/DiKp/3l+
+        4/9vdeH/Zmze/11i2/9UWtn/S1HW/0NI1P86P9H/Fhh9/8K/wf8Ogar/Barp/wGo6P8Apef/AKPm/wCi
+        5P8An+L/AJ7h/wCd3/8AnN7/AJnc/wCY2/8AmNn/AJbX/wZjhP/Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/
+        wf8MJbX/iI7n/4CF5v93fOP/bnPg/2Vr3f9bYdv/UljY/0lP1v8UGoj/wr/B/w+Erf8Lrur/Bqvq/wOo
+        6f8Apuf/AKTm/wCi5f8AoOT/AJ/i/wCd4f8AnN//AJrd/wCZ2/8AmNr/BmWH/8K/wf8AAAAAAAAAAAAA
+        AAAAAAAAwr/B/wkowP+WnOz/jpTq/4aL6P9+hOX/dXri/2xx4P9jaN3/WV/b/xEek//Cv8H/EIaw/xay
+        7P8Or+z/Cavr/wWq6v8Bp+j/AKbn/wCj5f8AoeT/AJ/j/wCe4f8AnOD/AJve/wCa3f8HZ4n/wr/B/wAA
+        AAAAAAAAAAAAAAAAAADCv8H/CCrK/6Ko7/+coe7/lZrr/42T6f+Fiub/fIHl/3N54v9rcN//ECGg/8K/
+        wf8QiLP/I7nu/xq07f8Ssez/C63r/war6v8Cqen/AKbo/wCk5v8AouX/AKHk/wCf4f8AneH/AJzf/who
+        i//Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf8GLNP/q7Hy/6as8P+hpu//mp/u/5OY6/+LkOj/g4nm/3qA
+        5P8NI6z/wr/B/xCKtv8xvvD/J7rv/x627f8Vsuz/Dq/s/wmr6/8Equn/Aafo/wCl5/8Ao+X/AKHk/wCf
+        4v8AnuH/CGqO/8K/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/wUu2/+vtPP/r7Tz/6qv8v+mq/D/oKXv/5me
+        7f+Sl+v/io/p/wsmt//Cv8H/Eo24/0HF8f82wfD/LLzv/yK47v8atO3/EbHs/wut6/8Gq+r/A6np/wCm
+        6P8Apeb/AKLl/wCh5P8IbJD/wr/B/wAAAAAAAAAAAAAAAAAAAADCv8H/BC/h/wQv3/8FL9z/BS3Z/wYt
+        1v8GLNL/ByvP/wgqy/8IKcb/CSnC/8K/wf8Sjrv/Uszy/0fH8f87w/H/Mb7v/ye67/8et+7/FbPt/w6v
+        6/8IrOv/BKnp/wGo6P8Apef/AKPl/wluk//Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf/Cv8H/wr/B/8K/
+        wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/xKRvf9j0/P/WM/z/0zK8f9BxfH/N8Hw/yy8
+        7/8iuO7/GbTt/xGx7P8Lruv/Bqrq/wOo6f8Apuf/CnGV/8K/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/wAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADCv8H/E5LA/3Ta8/9q1fP/XtHz/1LM
+        8v9Hx/H/O8Pw/zG+7/8nu+//Hrbt/xay7f8Or+v/CKzq/wSq6f8Kc5j/wr/B/wAAAAAAAAAAAAAAAAAA
+        AADCv8H/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMK/wf8UlMH/hOD1/3rc
+        9f9v2PP/ZNTy/1jO8v9NyvH/Qsbx/zbB8P8svO//I7ju/xm07f8SsOz/C67r/wt2m//Cv8H/AAAAAAAA
+        AAAAAAAAAAAAAMK/wf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwr/B/xSW
+        w/+T5vb/iuL1/3/e9P912vT/adbz/13R8/9SzPL/R8jx/zzD8P8xvvD/J7rv/x627v8Vsuz/C3ie/8K/
+        wf8AAAAAAAAAAAAAAAAAAAAAwr/B/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AADCv8H/FJbG/57r9/+X6Pb/juT1/4Th9f963fX/b9j0/2PT8/9Yz/L/TMrx/0HF8f83wO//LLzv/yK4
+        7v8MeqH/wr/B/wAAAAAAAAAAAAAAAAAAAADCv8H/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAMK/wf8VmMf/qO/3/6Lt9/+b6vb/kub2/4rj9f9/3vX/dNrz/2rV8/9d0fP/Uszy/0fI
+        8f88w/D/Mr7v/w19pP/Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAwr/B/xWZyP8UmMf/FZfF/xSVw/8TlML/E5K//xOQvf8Sjrv/EYy4/xGK
+        tv8QiLL/D4Ww/w+Erf8Pgar/Dn+n/8K/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/8K/wf/Cv8H/wr/B/8K/
+        wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/
+        wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//
+        /////////////8AAAAPe+AAD3vgAA974AAPe+AAD3vgAA974AAPAAAADwAAAA8AAAAPAAAADwAAAA8AA
+        AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAAD3/gAA9/4AAPf+AAD3/gAA9/4AAPf+AADwAAAA///
+        ////////KAAAABAAAAAgAAAAAQAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwMDA/8DA
+        wP/AwMD/wMDA/8DAwP/AwMD/wMDA/8DAwP/AwMD/wMDA/8DAwP/AwMD/wMDA/8DAwP8AAAAAAAAAAMDA
+        wP8AAAAAAAAAAMDAwP8AAAAAwMDA/8F2R/+9bj//umc6/7diNf+3YjX/wMDA/wAAAADAwMD/AAAAAAAA
+        AADAwMD/AAAAAAAAAADAwMD/AAAAAMDAwP/RkmD//7aP//+ldP/8kl3/vW0//8DAwP8AAAAAwMDA/wAA
+        AAAAAAAAwMDA/8DAwP/AwMD/wMDA/8DAwP/AwMD/3ap2///Cov//to7//6V0/8uJWP/AwMD/AAAAAMDA
+        wP8AAAAAAAAAAMDAwP8THI7/FBqF/xYYfP8XFnP/wMDA/+Cvev/gr3r/4K96/92qdv/ao3D/wMDA/wAA
+        AADAwMD/AAAAAAAAAADAwMD/ECCd/2Fn3P8zOc//FRmC/8DAwP/AwMD/wMDA/8DAwP/AwMD/wMDA/8DA
+        wP/AwMD/wMDA/wAAAAAAAAAAwMDA/w0krP+Pler/YWbd/xIcj//AwMD/DHmf/wpzmP8Ib5L/B2uO/wdq
+        jf8Gao3/B2qN/8DAwP8AAAAAAAAAAMDAwP8KJrv/r7Tz/5CU6v8PIJ//wMDA/w+Dq/87y/z/Kcb8/xrD
+        /P8QwPv/EMD7/wdqjf/AwMD/AAAAAAAAAADAwMD/CCrI/woowP8LJrf/DSSu/8DAwP8Sjbj/Zdb9/0/Q
+        /P88y/v/Kcf7/xrC+/8IbZD/wMDA/wAAAAAAAAAAwMDA/8DAwP/AwMD/wMDA/8DAwP/AwMD/FpfG/43h
+        /f962/3/Zdb8/0/Q/P87zPz/CXSZ/8DAwP8AAAAAAAAAAMDAwP8AAAAAAAAAAAAAAAAAAAAAwMDA/xif
+        z/+u6f7/n+X9/47h/f953P3/ZNb9/w19pP/AwMD/AAAAAAAAAADAwMD/AAAAAAAAAAAAAAAAAAAAAMDA
+        wP8apNX/uez+/7ns/v+u6f7/oOX9/43h/f8Rh7H/wMDA/wAAAAAAAAAAwMDA/wAAAAAAAAAAAAAAAAAA
+        AADAwMD/GqTV/xqk1f8apNX/GaHR/xecy/8WmMb/FJK+/8DAwP8AAAAAAAAAAMDAwP/AwMD/wMDA/8DA
+        wP/AwMD/wMDA/8DAwP/AwMD/wMDA/8DAwP/AwMD/wMDA/8DAwP/AwMD/AAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wAAgAEAALQF
+        wf+0BQAAgAUAAIAFAACAAQAAgAHB/4ABAACAAQAAgAEAALwBAAC8AQAAvAHB/4ABbP///5H/
+</value>
+  </data>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>62</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
index 5ab6de0..9556978 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -5599,5 +5599,489 @@
         }
         #endregion
 
+        #region  椤圭洰绫诲埆  鏌ヨ,瀹℃牳锛屽弽瀹℃牳锛岀鐢紝鍙嶇鐢�
+        /// <summary> 
+        /// 椤圭洰绫诲埆  鏌ヨ
+        /// </summary>
+        /// <param name="sWhere"></param>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        [Route("Gy_BadReason/Gy_ProjectClassList")]
+        [HttpGet]
+        public object Gy_ProjectClassList(string sWhere, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_ProjectClass_Query", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                string sql1 = "select * from  h_v_Gy_ProjectClass where 1 = 1";
+                string sql = sql1 + sWhere + " order by 椤圭洰绫诲埆浠g爜 ";
+                ds = oCN.RunProcReturn(sql, "h_v_Gy_ProjectClass");
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        /// <summary>
+        /// 椤圭洰绫诲埆 瀹℃牳銆佸弽瀹℃牳
+        /// </summary>
+        /// <param name="HInterID">鍗曟嵁ID</param>
+        /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+        /// <param name="CurUserName">瀹℃牳浜�</param>
+        /// <returns></returns>
+        [Route("Gy_BadReason/AuditGy_ProjectClass")]
+        [HttpGet]
+        public object AuditGy_ProjectClass(int HInterID, int IsAudit, string CurUserName)
+        {
+            try
+            {
+                //瀹℃牳鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log_second("Gy_ProjectClass_Check", 1, false, CurUserName))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                var ds = oCN.RunProcReturn("select * from Gy_ProjectClass where HItemID=" + HInterID, "Gy_ProjectClass");
+                if (ds.Tables[0].Rows.Count > 0)
+                {
+                    if (IsAudit == 0)  //瀹℃牳鍒ゆ柇
+                    {
+                        if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                    if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+                    {
+                        if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                oCN.BeginTran();
+
+                if (IsAudit == 0)  //瀹℃牳鍒ゆ柇
+                {
+                    oCN.RunProc("update Gy_ProjectClass set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);
+
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "瀹℃牳鎴愬姛";
+                    objJsonResult.data = null;
+                }
+                if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+                {
+                    oCN.RunProc("update Gy_ProjectClass set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
+
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+                    objJsonResult.data = null;
+                }
+                oCN.Commit();
+
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                oCN.RollBack();
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+
+
+        /// <summary>
+        /// 椤圭洰绫诲埆 绂佺敤銆佸弽绂佺敤
+        /// </summary>
+        /// <param name="HInterID">鍗曟嵁ID</param>
+        /// <param name="IsStop">绂佺敤(0),鍙嶇鐢�(1)</param>
+        /// <param name="CurUserName">瀹℃牳浜�</param>
+        /// <returns></returns>
+        [Route("Gy_BadReason/StopGy_ProjectClass")]
+        [HttpGet]
+        public object StopGy_ProjectClass(int HInterID, int IsStop, string CurUserName)
+        {
+            try
+            {
+                //瀹℃牳鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log_second("Gy_ProjectClass_Close", 1, false, CurUserName))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "绂佺敤澶辫触锛佹棤鏉冮檺锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                var ds = oCN.RunProcReturn("select * from Gy_ProjectClass where HItemID=" + HInterID, "Gy_SupType");
+                if (ds.Tables[0].Rows.Count > 0)
+                {
+                    if (IsStop == 0)  //绂佺敤鍒ゆ柇
+                    {
+                        if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘鍐嶆绂佺敤锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                    if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+                    {
+                        if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鏈鐢�!涓嶉渶瑕佸弽绂佺敤!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                oCN.BeginTran();
+
+                if (IsStop == 0)  //绂佺敤鍒ゆ柇
+                {
+                    oCN.RunProc("update Gy_ProjectClass set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);
+
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "绂佺敤鎴愬姛";
+                    objJsonResult.data = null;
+                }
+                if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+                {
+                    oCN.RunProc("update Gy_ProjectClass set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);
+
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍙嶇鐢ㄦ垚鍔�";
+                    objJsonResult.data = null;
+                }
+                oCN.Commit();
+
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                oCN.RollBack();
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "绂佺敤澶辫触鎴栬�呭弽绂佺敤澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region  浠诲姟绫诲埆  鏌ヨ,瀹℃牳锛屽弽瀹℃牳锛岀鐢紝鍙嶇鐢�
+        /// <summary> 
+        /// 浠诲姟绫诲埆  鏌ヨ
+        /// </summary>
+        /// <param name="sWhere"></param>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        [Route("Gy_BadReason/Gy_TaskClassList")]
+        [HttpGet]
+        public object Gy_TaskClassList(string sWhere, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_TaskClass_Query", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                string sql1 = "select * from  h_v_Gy_TaskClass where 1 = 1";
+                string sql = sql1 + sWhere + " order by 浠诲姟绫诲埆浠g爜 ";
+                ds = oCN.RunProcReturn(sql, "h_v_Gy_TaskClass");
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        /// <summary>
+        /// 浠诲姟绫诲埆 瀹℃牳銆佸弽瀹℃牳
+        /// </summary>
+        /// <param name="HInterID">鍗曟嵁ID</param>
+        /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+        /// <param name="CurUserName">瀹℃牳浜�</param>
+        /// <returns></returns>
+        [Route("Gy_BadReason/AuditGy_TaskClass")]
+        [HttpGet]
+        public object AuditGy_TaskClass(int HInterID, int IsAudit, string CurUserName)
+        {
+            try
+            {
+                //瀹℃牳鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log_second("Gy_TaskClass_Check", 1, false, CurUserName))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                var ds = oCN.RunProcReturn("select * from Gy_TaskClass where HItemID=" + HInterID, "Gy_TaskClass");
+                if (ds.Tables[0].Rows.Count > 0)
+                {
+                    if (IsAudit == 0)  //瀹℃牳鍒ゆ柇
+                    {
+                        if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                    if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+                    {
+                        if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                oCN.BeginTran();
+
+                if (IsAudit == 0)  //瀹℃牳鍒ゆ柇
+                {
+                    oCN.RunProc("update Gy_TaskClass set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);
+
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "瀹℃牳鎴愬姛";
+                    objJsonResult.data = null;
+                }
+                if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+                {
+                    oCN.RunProc("update Gy_TaskClass set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
+
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+                    objJsonResult.data = null;
+                }
+                oCN.Commit();
+
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                oCN.RollBack();
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+
+
+        /// <summary>
+        /// 浠诲姟绫诲埆 绂佺敤銆佸弽绂佺敤
+        /// </summary>
+        /// <param name="HInterID">鍗曟嵁ID</param>
+        /// <param name="IsStop">绂佺敤(0),鍙嶇鐢�(1)</param>
+        /// <param name="CurUserName">瀹℃牳浜�</param>
+        /// <returns></returns>
+        [Route("Gy_BadReason/StopGy_TaskClass")]
+        [HttpGet]
+        public object StopGy_TaskClass(int HInterID, int IsStop, string CurUserName)
+        {
+            try
+            {
+                //瀹℃牳鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log_second("Gy_TaskClass_Close", 1, false, CurUserName))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "绂佺敤澶辫触锛佹棤鏉冮檺锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                var ds = oCN.RunProcReturn("select * from Gy_TaskClass where HItemID=" + HInterID, "Gy_SupType");
+                if (ds.Tables[0].Rows.Count > 0)
+                {
+                    if (IsStop == 0)  //绂佺敤鍒ゆ柇
+                    {
+                        if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘鍐嶆绂佺敤锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                    if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+                    {
+                        if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鏈鐢�!涓嶉渶瑕佸弽绂佺敤!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                oCN.BeginTran();
+
+                if (IsStop == 0)  //绂佺敤鍒ゆ柇
+                {
+                    oCN.RunProc("update Gy_TaskClass set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);
+
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "绂佺敤鎴愬姛";
+                    objJsonResult.data = null;
+                }
+                if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+                {
+                    oCN.RunProc("update Gy_TaskClass set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);
+
+                    objJsonResult.code = "1";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍙嶇鐢ㄦ垚鍔�";
+                    objJsonResult.data = null;
+                }
+                oCN.Commit();
+
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                oCN.RollBack();
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "绂佺敤澶辫触鎴栬�呭弽绂佺敤澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
     }
 }
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index aa06451..0e08d65 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -7,6 +7,8 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
+using System.IO;
+using System.Web;
 using System.Web.Http;
 using System.Windows.Forms;
 using WebAPI.Models;
@@ -23,7 +25,7 @@
         private json objJsonResult = new json();
         SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
         DataSet ds;
-
+        string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];
 
 
         ////妫�娴� 褰撳墠閫変腑琛岀殑 椤圭洰鐘舵��
@@ -1942,5 +1944,185 @@
             public string msg { get; set; }   //鏈骇鏍囧織
 
         }
+        #region  鐗╂枡鏂囦欢涓婁紶澶勭悊
+        [Route("Gy_Mater/UploadFile")]
+        [HttpPost]
+        public object UploadFile()
+        {
+
+            string HNumber = HttpContext.Current.Request.Params["HNumber"];  //鐗╂枡浠g爜
+            string HRemark = HttpContext.Current.Request.Params["HRemark"];  //澶囨敞
+            string HUserName = HttpContext.Current.Request.Params["HUserName"];  //鍒涘缓浜�
+            HttpPostedFile files = HttpContext.Current.Request.Files["file"];
+            string path = HttpContext.Current.Server.MapPath("~/../Files/Material/" + HNumber);
+            //string path = @"D:\\Files\Material\\"+ HBillNo;
+            dynamic dyResult = UpLoadFile(files, path, HNumber, HRemark, HUserName);
+            if (dyResult != null && dyResult.result == 1)
+            {
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "涓婁紶鎴愬姛锛�";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            else
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = dyResult.returnval;
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
+        }
+
+        public dynamic UpLoadFile(HttpPostedFile files, string path, string HNumber, string HRemark, string HUserName)
+        {
+            dynamic Result_Ob = new { result = 1, returnval = "涓婁紶鎴愬姛锛�" };
+            string filePath = Path.GetFullPath(files.FileName);//鏂囦欢涓婁紶璺緞
+            string fileExtension = Path.GetExtension(files.FileName);// 鏂囦欢鎵╁睍鍚�
+            string filename = files.FileName;//鏂囦欢鍚�
+            string fileSavePath = path;// 涓婁紶淇濆瓨璺緞
+            int filesize = files.ContentLength;//鑾峰彇涓婁紶鏂囦欢鐨勫ぇ灏忓崟浣嶄负瀛楄妭byte
+            int Maxsize = 40000 * 1024;//瀹氫箟涓婁紶鏂囦欢鐨勬渶澶х┖闂村ぇ灏忎负40M
+            try
+            {
+                if (files == null || files.ContentLength <= 0)
+                {
+                    Result_Ob = new { result = 0, returnval = "鏂囦欢涓嶈兘涓虹┖!" };
+                    return Result_Ob;
+                }
+                if (filesize >= Maxsize)
+                {
+                    Result_Ob = new { result = 0, returnval = "涓婁紶鏂囦欢瓒呰繃40M锛屼笉鑳戒笂浼狅紒" };
+                    return Result_Ob;
+                }
+
+                string fileurl = Path.Combine(fileSavePath, filename);
+                if (Directory.Exists(fileurl) == true)  //濡傛灉瀛樺湪閲嶅悕鏂囦欢灏辨彁绀�  
+                {
+                    Result_Ob = new { result = 0, returnval = "瀛樺湪鍚屽悕鏂囦欢锛�" };
+                    return Result_Ob;
+                }
+                //鍒犻櫎鏁版嵁琛ㄦ暟鎹�
+                ds = oCN.RunProcReturn("delete from MES_AccessoriesList where HSourceBillNo ='" + HNumber + "' and HFileName='" + filename + "'", "MES_AccessoriesList");
+                if (Directory.Exists(path))
+                {
+                    File.Delete(fileurl);      //鍒犻櫎鎸囧畾鏂囦欢
+                    files.SaveAs(fileurl);
+                    string StrPath = "/files/Material/" + HNumber + "/" + filename;
+                    if (File.Exists(fileurl))
+                    {
+                        //杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
+                        //鍐欏叆鏁版嵁琛�
+                        oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
+                                    ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
+                                    ",HFileClsID,HSourceBillNo" +
+                                   ") values('"
+                                    + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+                                    ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
+                                    "','" + 0 + "','" + HNumber +
+                                   "') ");
+                    }
+                    else
+                    {
+                        Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+                    }
+                }
+                else
+                {
+                    Directory.CreateDirectory(fileSavePath); //娣诲姞鏂囦欢澶�
+                    files.SaveAs(fileurl);
+                    string StrPath = "/files/Material/" + HNumber + "/" + filename;
+                    if (File.Exists(fileurl))
+                    {
+                        //杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
+                        //鍐欏叆鏁版嵁琛�
+                        oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
+                                    ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
+                                    ",HFileClsID,HSourceBillNo" +
+                                   ") values('"
+                                    + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+                                    ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
+                                    "','" + 0 + "','" + HNumber +
+                                   "') ");
+                    }
+                    else
+                    {
+                        Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+                    }
+                }
+
+            }
+            catch (Exception e)
+            {
+                Result_Ob = new { result = 0, returnval = e.Message };
+            }
+            return Result_Ob;
+        }
+
+        /// <summary>
+        /// 鏍规嵁鍗曟嵁鍙锋煡鎵句笂浼犳枃浠跺垪琛�
+        /// </summary>
+        /// <param name="sWhere"></param>
+        /// <returns></returns>
+        [Route("Gy_Mater/Filelist")]
+        [HttpGet]
+        public object Filelist(string HNumber)
+        {
+            var url = fileip + "/files/Material/" + HNumber + "/";
+            //@"C:\\files\\"
+            try
+            {
+                ds = oCN.RunProcReturn("select *,'" + url + "'+CAST(HFileName as varchar(200))as url  from MES_AccessoriesList where HSourceBillNo='" + HNumber + "'", "MES_AccessoriesList");
+                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;
+            }
+        }
+
+        /// <summary>
+        /// 鏍规嵁ID,鍗曟嵁鍙�,鏂囦欢鍚� 鍒犻櫎鏂囦欢
+        /// </summary>
+        /// <param name="sWhere"></param>
+        /// <returns></returns>
+        [Route("Gy_Mater/DeleteFilelist")]
+        [HttpGet]
+        public object DeleteFilelist(string HItemID, string HSourceBillNo, string HFileName)
+        {
+            try
+            {
+
+                oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);
+                string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/Material/" + HSourceBillNo), HFileName);
+                File.Delete(fileurl);      //鍒犻櫎鎸囧畾鏂囦欢
+                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;
+            }
+        }
+        #endregion
+
     }
 }
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index 638225a..54effae 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -125,7 +125,7 @@
                                             ,s.HMobilePhone 鎵嬫満,s.HFax 浼犵湡,s.HPostalCode 閭紪,s.HEmail 鐢靛瓙閭欢,s.HCorMan 娉曚汉浠h〃,s.HBank 寮�鎴烽摱琛�,s.HBankAccount 閾惰璐﹀彿,
                                            s.HTaxNum 绋庡姟鐧昏鍙�,s.HEnglishName 鑻辨枃鍚嶇О,s.HEngLishAddress 鑻辨枃鍦板潃,s.HCountry 鍥藉,s.HStopflag 绂佺敤鏍囧織
                                            ,s.HRemark 澶囨敞,s.HAreaID 鍦板尯ID,a.HName 鍦板尯鍚嶇О,s.HTaxRate 澧炲�肩◣鐜�,s.HCurID 榛樿璐у竵ID,r.HName 榛樿璐у竵,
-                                           s.HSSID 缁撶畻鏂瑰紡ID,e.HName 缁撶畻鏂瑰紡 from Gy_Supplier s
+                                           s.HSSID 缁撶畻鏂瑰紡ID,e.HName 缁撶畻鏂瑰紡,s.HMaterClass 渚涜揣鏉愭枡绫诲埆  from Gy_Supplier s
                                            left join Gy_AreaSet a on s.HAreaID=a.HItemID
                                            left join Gy_Currency r on s.HCurID=r.HItemID 
                                            left  join Gy_SettleStyle e on s.HSSID=e.HItemID
@@ -206,7 +206,7 @@
                 long HCreateOrgID = list[0].HCreateOrgID;
                 long HUseOrgID = list[0].HUseOrgID;
                 string HRemark = list[0].HRemark;
-
+                string HMaterClass = list[0].HMaterClass;
 
                 if (!DBUtility.ClsPub.AllowNumber(HNumber))
                 {
@@ -228,14 +228,14 @@
                     ",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
                     ",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
                     ",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
-                    ",HEnglishAddress,HCurID,HSSID,HAreaID) " +
+                    ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass) " +
                 " values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID + "'" +
                 "," + HLevel + ",1,'" + HStopflag + "','" + HRemark + "'" +
                 ",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
                 ",'" + HFax + "','" + HPostalCode + "','" + HEmail + "','" + HBank + "','" + HBankAccount + "'" +
                 ",'" + HTaxNum + "','" + HTaxRate + "','" + HCountry + "','" + HCorMan + "','" + HEnglishName + "'" +
-                ",'" + HEnglishAddress + "'," + HCurID + "," + HSSID + "," + HAreaID + 
-              ") ");
+                ",'" + HEnglishAddress + "'," + HCurID + "," + HSSID + "," + HAreaID +" ,'" + HMaterClass + 
+              "') ");
                 //淇敼涓婄骇涓洪潪鏈骇浠g爜
                 oCN.RunProc("Update Gy_Supplier set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                 oCN.Commit();
@@ -280,13 +280,13 @@
                      ",HShortName,HAddress,HLinkMan,HLinkPhone,HMobilePhone" +
                      ",HFax,HPostalCode,HEmail,HBank,HBankAccount" +
                      ",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
-                     ",HEnglishAddress,HCurID,HSSID,HAreaID) " +
+                     ",HEnglishAddress,HCurID,HSSID,HAreaID,HMaterClass) " +
                  " values('" + lsmain[0].HItemID + "','" + lsmain[0].HNumber + "','" + lsmain[0].HName + "','" + lsmain[0].HHelpCode + "','" + lsmain[0].HShortNumber + "','" + lsmain[0].HParentID + "'" +
                  "," + lsmain[0].HLevel + ",0,'" + lsmain[0].HStopflag + "','" + lsmain[0].HRemark + "'" +
                  ",'" + lsmain[0].HShortName + "','" + lsmain[0].HAddress + "','" + lsmain[0].HLinkMan + "','" + lsmain[0].HLinkPhone + "','" + lsmain[0].HMobilePhone + "'" +
                  ",'" + lsmain[0].HFax + "','" + lsmain[0].HPostalCode + "','" + lsmain[0].HEmail + "','" + lsmain[0].HBank + "','" + lsmain[0].HBankAccount + "'" +
                  ",'" + lsmain[0].HTaxNum + "','" + lsmain[0].HTaxRate + "','" + lsmain[0].HCountry + "','" + lsmain[0].HCorMan + "','" + lsmain[0].HEnglishName + "'" +
-                 ",'" + lsmain[0].HEnglishAddress + "'," + lsmain[0].HCurID + "," + lsmain[0].HSSID + "," + lsmain[0].HAreaID +
+                 ",'" + lsmain[0].HEnglishAddress + "'," + lsmain[0].HCurID + "," + lsmain[0].HSSID + "," + lsmain[0].HAreaID +","+lsmain[0].HMaterClass+
                   ") ");
                 //淇敼涓婄骇涓洪潪鏈骇浠g爜
                 sql = "set identity_insert Gy_Supplier off";
@@ -369,7 +369,7 @@
                 long HCreateOrgID = list[0].HCreateOrgID;
                 long HUseOrgID = list[0].HUseOrgID;
                 string HRemark = list[0].HRemark;
-
+                string HMaterClass = list[0].HMaterClass;
 
                 //鍒ゆ柇鏉冮檺
                 if (!ClsPub.Security_Log(msg5, 1, false, msg4))
@@ -421,7 +421,8 @@
                    ",HEnglishAddress='" + HEnglishAddress + "'" +
                    ",HCurID=" + HCurID.ToString() +
                    ",HSSID=" + HSSID.ToString() +
-                   ",HAreaID=" + HAreaID.ToString() + "Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+                   ",HMaterClass='" + HMaterClass +
+                   "',HAreaID=" + HAreaID.ToString() + "Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
 
 
                 //淇敼瀛愰」鐩唬鐮�
diff --git a/WebAPI/Controllers/ReportPlatFormController.cs b/WebAPI/Controllers/ReportPlatFormController.cs
index 2a1c600..5a410a8 100644
--- a/WebAPI/Controllers/ReportPlatFormController.cs
+++ b/WebAPI/Controllers/ReportPlatFormController.cs
@@ -161,13 +161,13 @@
         #region 鎶ュ伐骞冲彴鍒犻櫎璧勬簮鍒楄〃
         [Route("ReportPlatForm/DeleteGetLineBindBillList")]
         [HttpGet]
-        public object DeleteGetLineBindBillList(string HSourceID)
+        public object DeleteGetLineBindBillList(string HSourceID,string user)
         {
             try
             {
                 oCN.BeginTran();
                 //鏇存柊鍒囨崲鐘舵�佸��
-                string sql = string.Format(@"delete Gy_SourceRelationSet  where HSourceID='" + HSourceID + "'");
+                string sql = string.Format(@"delete Gy_SourceRelationSet  where HSourceID='" + HSourceID + "' and HUserName = '" + user + "'");
                 oCN.RunProc(sql);
                 oCN.Commit();
                 objJsonResult.code = "1";
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index e765a51..6346119 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -1,4 +1,5 @@
 锘縰sing DBUtility;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
@@ -731,5 +732,200 @@
 
         }
         #endregion
+
+        #region 璁惧杩愯鐘舵�佹姤琛�
+
+        [Route("SB_EquipRunningStatus/Report")]
+        [HttpGet]
+        public object Report(string sWhere, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //if (!DBUtility.ClsPub.Security_Log("Gy_EquipFileList", 1, false, user))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    ds = oCN.RunProcReturn("select * from h_v_Sb_EquipRunningStatusReport " + sWhere + " order by 鎵�灞炴棩鏈� desc", "h_v_Sb_EquipRunningStatusReport");
+                }
+                else
+                {
+                    string sql1 = "select * from h_v_Sb_EquipRunningStatusReport where 1 = 1 ";
+                    string sql = sql1 + sWhere + " order by 鎵�灞炴棩鏈� desc";
+                    ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipRunningStatusReport");
+                }
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+
+                //if (ds.Tables[0].Rows.Count != 0 && ds != null)
+                //{
+                   
+                //}
+                //else
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    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;
+            }
+        }
+        #endregion
+
+        #region 璁惧杩愯鐘舵�佹姤琛� 鏍戠姸鍥� 閮ㄩ棬鍒嗙被鏌ヨ
+        public class TreeModel_Report
+        {
+            public string id { get; set; }
+            public string title { get; set; }
+            public string type { get; set; }
+            public List<TreeModel_Report> children = new List<TreeModel_Report>();
+        }
+        [Route("SB_EquipRunningStatus/ReportTreeGetList")]
+        [HttpGet]
+        public object ReportTreeGetList(string sWhere, string user)
+        {
+            try
+            {
+
+                ds = oCN.RunProcReturn("select HItemID,HNumber,HName  from Gy_Department", "Gy_Department");
+
+                List<TreeModel_Report> treeModels = new List<TreeModel_Report>();
+                TreeModel_Report first = new TreeModel_Report();
+
+                DataSet Ds;
+                string HCampanyName = "";
+                Ds = oCN.RunProcReturn("select HValue from Xt_SystemParameter where HCaption = '瀹㈡埛鍚嶇О'", "Xt_SystemParameter");
+                if (Ds.Tables[0].Rows.Count != 0 && Ds != null)
+                {
+                    HCampanyName = Ds.Tables[0].Rows[0]["HValue"].ToString();
+                }
+               
+                first.id = "0";
+                first.title = HCampanyName;
+                treeModels.Add(first);
+
+                foreach (DataRow row in ds.Tables[0].Rows)
+                {
+                    var strLen = row["hitemid"].ToString().Split('.');
+                    if (strLen.Length == 1)
+                    {
+                        TreeModel_Report tree = new TreeModel_Report();
+                        tree.id = row["HItemID"].ToString();
+                        tree.title = row["HName"].ToString();
+                        tree.type = "Department";
+                        treeModels[0].children.Add(tree);
+                    }
+                }                
+                getWorkCenter_Level2(ds.Tables[0], treeModels[0].children);
+
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(treeModels);
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        /// <summary>
+        /// 绗簩绾у伐浣滀腑蹇�
+        /// </summary>
+        public void getWorkCenter_Level2(DataTable dt, List<TreeModel_Report> tree)
+        {
+            for (int i = 0;i < dt.Rows.Count;i++)
+            {
+                var HDeptID = dt.Rows[i]["HItemID"].ToString();
+                ds = oCN.RunProcReturn("select distinct HItemID,HNumber,HName from Gy_WorkCenter where HDeptID = " + HDeptID, "Gy_WorkCenter");
+                if (ds.Tables[0].Rows.Count != 0 && ds != null)
+                {
+                    for (int j = 0; j < ds.Tables[0].Rows.Count; j++)
+                    {
+                        TreeModel_Report tbjson = new TreeModel_Report();
+                        tbjson.id = ds.Tables[0].Rows[j]["HItemID"].ToString();
+                        tbjson.title = ds.Tables[0].Rows[j]["HName"].ToString();
+                        tbjson.type = "WorkCenter";
+                        tree[i].children.Add(tbjson);
+                    }
+                }
+                //digui_Report(ds.Tables[0], tree[i].children, 2);
+            }
+            
+        }
+
+        /// <summary>
+        /// 閫掑綊鍑芥暟
+        /// </summary>
+        public void digui_Report(DataTable dt, List<TreeModel_Report> tree, int num)
+        {
+            for (int m = 0; m < tree.Count; m++)
+            {
+                tree[m].children = new List<TreeModel_Report>();
+                for (int i = 0; i < dt.Rows.Count; i++)//绗竴娆″惊鐜紝寰楀埌鎵�鏈夋牴鑺傜偣鐨勫瓙闆�
+                {
+                    var HWorkCenterNumber = dt.Rows[i]["HNumber"].ToString();
+                    DataSet Ds;
+                    Ds = oCN.RunProcReturn("select distinct HItemID,HNumber,HName from Gy_WorkCenter where HNumber like '" + HWorkCenterNumber + "%'", "Gy_WorkCenter");
+
+                    if (Ds.Tables[0].Rows.Count != 0 && Ds != null)
+                    {
+                        for (int j = 0;j < Ds.Tables[0].Rows.Count;j++)
+                        {
+                            var strLen = Ds.Tables[0].Rows[j]["HNumber"].ToString().Split('.');
+                            if (strLen.Length == num && Ds.Tables[0].Rows[j]["HNumber"].ToString().Contains(tree[m].id + "."))
+                            {
+                                TreeModel_Report tbjson = new TreeModel_Report();
+                                tbjson.id = Ds.Tables[0].Rows[j]["HItemID"].ToString();
+                                tbjson.title = Ds.Tables[0].Rows[j]["HName"].ToString();
+                                tbjson.type = "WorkCenter";
+                                tree[m].children.Add(tbjson);
+                            }
+                        }                        
+                    }                   
+                }
+                var strLens = tree[m].id.Split('.');
+                for (int i = 0; i < tree[m].children.Count; i++)
+                {
+                    digui_Report(dt, tree[m].children, strLens.Length + 2);//鍐嶆鐢ㄥ瓙闆嗗幓寰幆锛屾嬁鍑哄瓙闆嗙殑瀛愰泦
+                }
+            }
+
+        }
+        #endregion
+       
     }
 }
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
index 3160d31..1910c73 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs
@@ -411,13 +411,8 @@
         #endregion
 
 
-
-
-
         #endregion
 
-
-        #region 璁惧鐐规璁板綍鍗昉DA
 
         #region 鏍规嵁璁惧鏉$爜鏌ユ壘璁惧妗f淇℃伅PDA
         [Route("Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown")]
@@ -752,7 +747,62 @@
         }
         #endregion
 
-        #endregion
+        #region 璁惧鐐规閫炬湡棰勮鎶ヨ〃
 
+        [Route("Sb_EquipDotCheckWarning/Report")]
+        [HttpGet]
+        public object Report(string HYear,string HMonth,string HEquipTypeID, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //if (!DBUtility.ClsPub.Security_Log("Gy_EquipFileList", 1, false, user))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+                if (HYear == null || HYear.Equals("") || HMonth == null || HMonth.Equals(""))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "璇烽�夋嫨鏈夋晥骞翠唤锛屾湀浠�";
+                    objJsonResult.data = "";
+                    objJsonResult.list = columnNameList;
+                    return objJsonResult;
+                }
+                else
+                {
+                    string sql = "exec h_p_Sb_EquipDotCheckWarningReport " + HYear + "," + HMonth + "," + HEquipTypeID;
+                    ds = oCN.RunProcReturn(sql, "h_p_Sb_EquipDotCheckWarningReport");
+                }
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
index 49598c4..de5046d 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
@@ -941,5 +941,63 @@
         #endregion
 
         #endregion
+
+        #region 璁惧淇濆吇閫炬湡棰勮鎶ヨ〃
+
+        [Route("Sb_EquipMaintainWarning/Report")]
+        [HttpGet]
+        public object Report(string HYear, string HEquipTypeID, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+                //if (!DBUtility.ClsPub.Security_Log("Gy_EquipFileList", 1, false, user))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+                if (HYear == null || HYear.Equals(""))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "璇烽�夋嫨鏈夋晥骞翠唤";
+                    objJsonResult.data = "";
+                    objJsonResult.list = columnNameList;
+                    return objJsonResult;
+                }
+                else
+                {
+                    string sql = "exec h_p_Sb_EquipMaintainWarningReport " + HYear + "," + HEquipTypeID;
+                    ds = oCN.RunProcReturn(sql, "h_p_Sb_EquipMaintainWarningReport");
+                }
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 351bd0e..b4524fb 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -28,6 +28,9 @@
         public DLL.ClsOA_ErrMsgBackBill BillNew = new DLL.ClsOA_ErrMsgBackBill();   //瀵瑰簲鍗曟嵁绫�
         public DLL.ClsOA_ErrMsgBackBill BillOld = new DLL.ClsOA_ErrMsgBackBill();   //瀵瑰簲鍗曟嵁绫�
 
+        public DAL.ClsOA_AndengFlowRuleBill BillOld1 = new DAL.ClsOA_AndengFlowRuleBill();   //瀵瑰簲鍗曟嵁绫�  瀹夌伅閫愮骇鍛煎彨瑙勫垯
+        public DAL.ClsOA_AndengFlowRuleBill BillNew1 = new DAL.ClsOA_AndengFlowRuleBill();   //瀵瑰簲鍗曟嵁绫�  瀹夌伅閫愮骇鍛煎彨瑙勫垯
+
 
         #region 鎶ュ伐骞冲彴寮傚父鍙嶉鍗曚繚瀛�/缂栬緫
         /// <summary>
@@ -4548,5 +4551,882 @@
         #endregion
 
         #endregion
+
+        #region  瀹夌伅閫愮骇鍛煎彨瑙勫垯
+
+        #region 瀹夌伅閫愮骇鍛煎彨瑙勫垯 鏂板/缂栬緫      
+        [Route("Sc_MESTransFerWorkBill/SaveOA_AndengFlowRuleBill")]
+        [HttpPost]
+        public object SaveOA_AndengFlowRuleBill([FromBody] JObject msg)
+        {
+            var _value = msg["msg"].ToString();
+            string msg1 = _value.ToString();
+            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            string msg2 = sArray[0].ToString();
+            string msg3 = sArray[1].ToString(); //瀛愯〃
+            string refSav = sArray[2].ToString();//鎿嶄綔鏂瑰紡鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
+            string msg4 = sArray[3].ToString();//鐢ㄦ埛鍚�
+
+            DBUtility.ClsPub.CurUserName = msg4;
+
+            string UserName = "";
+            string s = "";
+            ListModels oListModels = new ListModels();
+            try
+            {
+                //缂栬緫鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log_second("OA_AndengFlowRuleBillMain_Edit", 1, false, msg4))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                // OA_AndengFlowRuleBill
+                DAL.ClsOA_AndengFlowRuleBill oBill = new DAL.ClsOA_AndengFlowRuleBill();
+                List<Model.ClsOA_AndengFlowRuleBillMain> lsmain = new List<Model.ClsOA_AndengFlowRuleBillMain>();
+                msg2 = msg2.Replace("\\", "");
+                msg2 = msg2.Replace("\n", "");  //\n
+                lsmain = oListModels.getObjectByJson_OA_AndengFlowRuleBill(msg2);
+                foreach (Model.ClsOA_AndengFlowRuleBillMain oItem in lsmain)
+                {
+                    if (refSav == "Add")
+                    {
+                        //鍗曟嵁鍙锋槸鍚﹂噸澶�
+                        if (BillNew1.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld1.omodel.HInterID))
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+                            objJsonResult.data = 1;
+                            return objJsonResult;
+                        }
+                    }
+                    if (refSav == "Update")
+                    {
+                        if (BillOld1.ShowBill(oItem.HInterID, ref s) == false)
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+                            objJsonResult.data = 1;
+                            return objJsonResult;
+                        }
+                        //鍒ゆ柇鏄惁鍙紪杈�
+                        if (BillOld1.omodel.HChecker != "" && oBill.omodel.HChecker != null)
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+                            objJsonResult.data = 1;
+                            return objJsonResult;
+                        }
+                        if (BillOld1.omodel.HBillStatus > 1)
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+                            objJsonResult.data = 1;
+                            return objJsonResult;
+                        }
+                        if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(oBill, ref s))
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+                            objJsonResult.data = 1;
+                            return objJsonResult;
+                        }
+                    }
+                    UserName = oItem.HMaker;  //鍒跺崟浜�
+                    oItem.HBillType = "4533";
+                    oItem.HBillSubType = "4533";
+
+                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+                    oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+                    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;
+                }
+                // 琛ㄤ綋鏁版嵁
+                //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+                msg3 = msg3.Substring(1, msg3.Length - 2);
+                msg3 = msg3.Replace("\\", "");
+                msg3 = msg3.Replace("\n", "");  //\n
+                List<Model.ClsOA_AndengFlowRuleBillSub> ls = new List<Model.ClsOA_AndengFlowRuleBillSub>();
+                ls = oListModels.getObjectByJson_OA_AndengFlowRuleBillSub(msg3);
+                int i = 0;
+                foreach (Model.ClsOA_AndengFlowRuleBillSub oItemSub in ls)
+                {
+                    i++;
+                    oItemSub.HEntryID = i;
+
+
+                    oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+                    oItemSub.HCloseType = false;   //鍏抽棴绫诲瀷
+
+                    oBill.DetailColl.Add(oItemSub);
+
+                }
+                //淇濆瓨
+                //淇濆瓨瀹屾瘯鍚庡鐞�
+                bool bResult;
+                if (refSav == "Add")
+                {
+
+                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+                }
+                else if (refSav == "Update")
+                {
+                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+                }
+                else
+                {
+                    bResult = false;
+                }
+                if (bResult)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+                    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;
+            }
+        }
+        #endregion
+
+        #region 瀹夌伅閫愮骇鍛煎彨瑙勫垯 缂栬緫鍥炴樉鍒楄〃
+
+        [Route("Sc_MESTransFerWorkBill/Edit_OA_AndengFlowRuleBill")]
+        [HttpGet]
+        public object Edit_OA_AndengFlowRuleBill(string HID)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+
+                string sql = "select * from h_v_OA_AndengFlowRuleBillMainList where hmainid='" + HID + "'";
+                ds = oCN.RunProcReturn(sql, "h_v_OA_AndengFlowRuleBillMainList");
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception ex)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + ex.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 瀹夌伅閫愮骇鍛煎彨瑙勫垯鍒楄〃
+
+        [Route("Sc_MESTransFerWorkBill/Get_OA_AndengFlowRuleBillList")]
+        [HttpGet]
+        public object Get_OA_AndengFlowRuleBillList(string sWhere, string user)
+        {
+            try
+            {
+                List<object> columnNameList = new List<object>();
+
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("OA_AndengFlowRuleBillMain_Query", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                if (sWhere == null || sWhere.Equals(""))
+                {
+                    string sql = "select * from h_v_OA_AndengFlowRuleBillMainList order by 鍗曟嵁鍙� desc";
+                    ds = oCN.RunProcReturn(sql, "h_v_OA_AndengFlowRuleBillMainList");
+                }
+                else
+                {
+                    string sql1 = "select * from h_v_OA_AndengFlowRuleBillMainList where 1 = 1 ";
+                    string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+                    ds = oCN.RunProcReturn(sql, "h_v_OA_AndengFlowRuleBillMainList");
+                }
+
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception ex)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + ex.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 瀹夌伅閫愮骇鍛煎彨瑙勫垯 鍒犻櫎
+        /// <summary>
+        ///鍙傛暟锛歴tring HInterID銆�
+        ///杩斿洖鍊硷細object銆�
+        /// </summary>
+        [Route("Sc_MESTransFerWorkBill/DeleteOA_AndengFlowRuleBill")]
+        [HttpGet]
+        public object DeleteOA_AndengFlowRuleBill(string HInterID, string user)
+        {
+            try
+            {
+                string s = "";
+                DAL.ClsOA_AndengFlowRuleBill BillOld = new DAL.ClsOA_AndengFlowRuleBill();
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("OA_AndengFlowRuleBillMain_Drop", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                if (HInterID == null || HInterID.Equals(""))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                if (BillOld.ShowBill(long.Parse(HInterID), ref s) == false)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+                    objJsonResult.data = 1;
+                    return objJsonResult;
+                }
+                //鍒ゆ柇鏄惁鍙垹闄�
+                if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽鍒犻櫎锛�";
+                    objJsonResult.data = 1;
+                    return objJsonResult;
+                }
+                //鍒犻櫎鍓嶆帶鍒�=========================================      
+                string sql1 = "exec h_p_OA_AndengFlowRuleBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
+                ds = oCN.RunProcReturn(sql1, "h_p_OA_AndengFlowRuleBill_BeforeDelCtrl");
+                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                //==================================================================================  
+
+
+
+                oCN.BeginTran();
+
+                oCN.RunProc("delete from OA_AndengFlowRuleBillMain where HInterID = " + HInterID);
+                oCN.RunProc("delete from OA_AndengFlowRuleBillSub where HInterID= " + HInterID);
+
+                //鍒犻櫎鍚庢帶鍒�==================================================================================      
+                string sql2 = "exec h_p_OA_AndengFlowRuleBill_AfterDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
+                ds = oCN.RunProcReturn(sql2, "h_p_OA_AndengFlowRuleBill_AfterDelCtrl");
+                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+                {
+                    s = "鍒犻櫎鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴";
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + s;
+                    objJsonResult.data = null;
+                    oCN.RollBack();
+                    return objJsonResult;
+                }
+                if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+                {
+                    s = ds.Tables[0].Rows[0]["HRemark"].ToString();
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + s;
+                    objJsonResult.data = null;
+                    oCN.RollBack();
+                    return objJsonResult;
+                }
+                //==============================================================================================
+
+                oCN.Commit();
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鍒犻櫎鎴愬姛";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                oCN.RollBack();
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "Exception锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 瀹夌伅閫愮骇鍛煎彨瑙勫垯 瀹℃牳/鍙嶅鏍�
+        /// <summary>
+        /// </summary>
+        /// <param name="HInterID">鍗曟嵁ID</param>
+        /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+        /// <param name="CurUserName">瀹℃牳浜�</param>
+        /// <returns></returns>
+        [Route("Sc_MESTransFerWorkBill/AuditOA_AndengFlowRuleBill")]
+        [HttpGet]
+        public object AuditOA_AndengFlowRuleBill(int HInterID, int IsAudit, string CurUserName)
+        {
+            string ModRightNameCheck = "OA_AndengFlowRuleBillMain_Check";
+            DBUtility.ClsPub.CurUserName = CurUserName;
+            try
+            {
+                //瀹℃牳鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                //HInterID鏁版嵁鍒ゆ柇
+                if (HInterID <= 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HInterID灏忎簬0锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+
+                Int64 lngBillKey = 0;
+                lngBillKey = DBUtility.ClsPub.isLong(HInterID);                                         //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+                DAL.ClsOA_AndengFlowRuleBill oBill = new DAL.ClsOA_AndengFlowRuleBill();               //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+                //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+                if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))                    //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+                {
+                    if (oBill.omodel.HCloseMan.Trim() != "")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    if (oBill.omodel.HDeleteMan.Trim() != "")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    if (IsAudit == 0)  //瀹℃牳鍒ゆ柇
+                    {
+                        if (oBill.omodel.HChecker.Trim() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                    if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+                    {
+                        if (oBill.omodel.HChecker.Trim() == "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+
+                //杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
+                if (IsAudit == 0) //瀹℃牳鎻愪氦
+                {
+                    oCN.BeginTran();
+
+                    //璁板綍杩斿洖淇℃伅
+                    string msg = "";
+
+
+                    //瀹℃牳鍓嶆帶鍒�=========================================      
+                    string sql1 = "exec h_p_OA_AndengFlowRuleBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+                    ds = oCN.RunProcReturn(sql1, "h_p_OA_AndengFlowRuleBill_BeforeCheckCtrl");
+                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴";
+                        objJsonResult.data = null;
+                        oCN.RollBack();
+                        return objJsonResult;
+                    }
+
+                    if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+                        objJsonResult.data = null;
+                        oCN.RollBack();
+                        return objJsonResult;
+                    }
+                    //==================================================================================      
+
+                    //瀹℃牳鎻愪氦
+                    if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_OA_AndengFlowRuleBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+                    {
+                        oCN.Commit();
+
+                        objJsonResult.code = "1";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "瀹℃牳鎴愬姛锛�" + msg;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        oCN.RollBack();
+
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                if (IsAudit == 1) //鍙嶅鏍告彁浜�
+                {
+
+                    //鍙嶅鏍稿墠鎺у埗=========================================        
+                    string sql1 = "exec h_p_OA_AndengFlowRuleBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+                    ds = oCN.RunProcReturn(sql1, "h_p_OA_AndengFlowRuleBill_BeforeUnCheckCtrl");
+                    if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+
+                    }
+                    if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    //===========================================================          
+
+                    //鍙嶅鏍告彁浜bandonCheck
+                    if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_OA_AndengFlowRuleBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+                    {
+                        objJsonResult.code = "1";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                oCN.RollBack();
+
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 瀹夌伅閫愮骇鍛煎彨瑙勫垯 鍏抽棴/鍙嶅叧闂�
+        /// <summary>
+        /// </summary>
+        /// <param name="HInterID">鍗曟嵁ID</param>
+        /// <param name="IsAudit">鍏抽棴(0),鍙嶅叧闂�(1)</param>
+        /// <param name="CurUserName">鍏抽棴浜�</param>
+        /// <returns></returns>
+        [Route("Sc_MESTransFerWorkBill/CloseOA_AndengFlowRuleBill")]
+        [HttpGet]
+        public object CloseOA_AndengFlowRuleBill(int HInterID, int IsAudit, string CurUserName)
+        {
+            string ModRightNameCheck = "OA_AndengFlowRuleBillMain_Close";
+            DBUtility.ClsPub.CurUserName = CurUserName;
+            try
+            {
+                //妫�鏌ユ潈闄�
+                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍏抽棴澶辫触锛佹棤鏉冮檺锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                //HInterID鏁版嵁鍒ゆ柇
+                if (HInterID <= 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HInterID灏忎簬0锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+
+                Int64 lngBillKey = 0;
+                lngBillKey = DBUtility.ClsPub.isLong(HInterID);                                         //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+                DAL.ClsOA_AndengFlowRuleBill oBill = new DAL.ClsOA_AndengFlowRuleBill();             //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+                //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+                if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))                    //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+                {
+                    if (oBill.omodel.HDeleteMan.Trim() != "")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴锛�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    if (oBill.omodel.HChecker.Trim() == "")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴锛�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    if (IsAudit == 0)  //鍏抽棴鍒ゆ柇
+                    {
+                        if (oBill.omodel.HCloseMan.Trim() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                    if (IsAudit == 1) //鍙嶅叧闂垽鏂�
+                    {
+                        if (oBill.omodel.HCloseMan.Trim() == "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸弽鍏抽棴锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+
+                //杩涜闇�瑕佽繘琛岀殑鍏抽棴/鍙嶅叧闂搷浣�
+                if (IsAudit == 0) //鍏抽棴鎻愪氦
+                {
+                    //鍏抽棴鎻愪氦
+                    if (oBill.CloseBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+                    {
+                        objJsonResult.code = "1";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "鍏抽棴鎴愬姛";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                if (IsAudit == 1) //鍙嶅叧闂彁浜�
+                {
+                    //鍙嶅叧闂彁浜�
+                    if (oBill.CancelClose(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+                    {
+                        objJsonResult.code = "1";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "鍙嶅叧闂垚鍔�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鍏抽棴澶辫触鎴栬�呭弽鍏抽棴澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 瀹夌伅閫愮骇鍛煎彨瑙勫垯  浣滃簾/鍙嶄綔搴�
+        /// <summary>
+        /// </summary>
+        /// <param name="HInterID">鍗曟嵁ID</param>
+        /// <param name="IsAudit">浣滃簾(0),鍙嶄綔搴�(1)</param>
+        /// <param name="CurUserName">浣滃簾浜�</param>
+        /// <returns></returns>
+        [Route("Sc_MESTransFerWorkBill/DeleteOA_AndengFlowRuleBill")]
+        [HttpGet]
+        public object DeleteOA_AndengFlowRuleBill(int HInterID, int IsAudit, string CurUserName)
+        {
+            string ModRightNameCheck = "OA_AndengFlowRuleBillMain_Drop";
+            DBUtility.ClsPub.CurUserName = CurUserName;
+            try
+            {
+                //妫�鏌ユ潈闄�
+                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "浣滃簾澶辫触锛佹棤鏉冮檺锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                //HInterID鏁版嵁鍒ゆ柇
+                if (HInterID <= 0)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HInterID灏忎簬0锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+
+                Int64 lngBillKey = 0;
+                lngBillKey = DBUtility.ClsPub.isLong(HInterID);                                         //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+                DAL.ClsOA_AndengFlowRuleBill oBill = new DAL.ClsOA_AndengFlowRuleBill();              //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+                //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+                if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))                    //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+                {
+                    if (oBill.omodel.HChecker.Trim() != "")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾锛�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    if (IsAudit == 0)  //浣滃簾鍒ゆ柇
+                    {
+                        if (oBill.omodel.HDeleteMan.Trim() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶄綔搴燂紒";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                    if (IsAudit == 1) //鍙嶄綔搴熷垽鏂�
+                    {
+                        if (oBill.omodel.HDeleteMan.Trim() == "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸弽浣滃簾锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+
+                //杩涜闇�瑕佽繘琛岀殑浣滃簾/鍙嶄綔搴熸搷浣�
+                if (IsAudit == 0) //浣滃簾鎻愪氦
+                {
+                    //浣滃簾鎻愪氦
+                    if (oBill.Cancelltion(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+                    {
+                        objJsonResult.code = "1";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "浣滃簾鎴愬姛";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                if (IsAudit == 1) //鍙嶅叧闂彁浜�
+                {
+                    //鍙嶅叧闂彁浜�
+                    if (oBill.AbandonCancelltion(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+                    {
+                        objJsonResult.code = "1";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "鍙嶄綔搴熸垚鍔�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "浣滃簾澶辫触鎴栬�呭弽浣滃簾澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index f1872c1..205b36f 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -1013,8 +1013,8 @@
 
                     oItemSub.HCloseType = false;   //鍏抽棴绫诲瀷
 
-                    oItemSub.HSourceInterID = 0;     // 婧愬崟涓诲唴鐮�
-                    oItemSub.HSourceEntryID = 0;   //婧愬崟瀛愬唴鐮�
+                    //oItemSub.HSourceInterID = 0;     // 婧愬崟涓诲唴鐮�
+                    //oItemSub.HSourceEntryID = 0;   //婧愬崟瀛愬唴鐮�
 
 
                     oBill.DetailColl.Add(oItemSub);
@@ -1065,7 +1065,7 @@
         }
         #endregion
 
-        #region 鍏朵粬鍏ュ簱鍗� 缂栬緫椤甸潰鍒濆鍖�
+        #region 鐩存帴璋冩嫧鍗� 缂栬緫椤甸潰鍒濆鍖�
         [Route("Kf_MoveStockBill/Kf_MoveStockBillEdit")]
         [HttpGet]
         public object Kf_MoveStockBillEdit(long HInterID)
@@ -1105,7 +1105,7 @@
         }
         #endregion
 
-        #region 鍏跺畠鍏ュ簱鍗曞鏍�/鍙嶅鏍稿姛鑳�
+        #region 鐩存帴璋冩嫧鍗� 瀹℃牳/鍙嶅鏍稿姛鑳�
         [Route("Kf_MoveStockBill/CheckKf_MoveStockBill")]
         [HttpGet]
         public object CheckKf_MoveStockBill(string HInterID, int Type, string user)
@@ -1303,7 +1303,7 @@
         }
         #endregion
 
-        #region 鍏跺畠鍏ュ簱鍗曞叧闂�/鍙嶅叧闂姛鑳�
+        #region 鐩存帴璋冩嫧鍗� 鍏抽棴/鍙嶅叧闂姛鑳�
         [Route("Kf_MoveStockBill/CloseKf_MoveStockBill")]
         [HttpGet]
         public object CloseKf_MoveStockBill(string HInterID, int Type, string user)
@@ -1409,7 +1409,7 @@
         }
         #endregion
 
-        #region 鍏朵粬鍏ュ簱鍗� 浣滃簾/鍙嶄綔搴熷姛鑳�
+        #region 鐩存帴璋冩嫧鍗� 浣滃簾/鍙嶄綔搴熷姛鑳�
         [Route("Kf_MoveStockBill/DropKf_MoveStockBill")]
         [HttpGet]
         public object DropKf_MoveStockBill(string HInterID, int Type, string user)
@@ -1539,8 +1539,7 @@
         }
         #endregion
 
-
-        #region 璋冩嫧鍗曞垪琛�
+        #region 鐩存帴璋冩嫧鍗曞垪琛�
         /// <summary>
         /// 璋冩嫧鍗曞垪琛�
         /// </summary>
@@ -1589,7 +1588,7 @@
         }
         #endregion
 
-        #region 璋冩嫧鍗�  鍒犻櫎
+        #region 鐩存帴璋冩嫧鍗�  鍒犻櫎
         [Route("Kf_MoveStockBill/DelteteGetMoveStockBill")]
         [HttpGet]
         public object DelteteGetMoveStockBill(string HInterID, string user)
@@ -1632,6 +1631,10 @@
                 //==================================================================================  
 
                 oCN.BeginTran();
+
+                //鍒嗗竷寮忚皟鍏ュ崟鏂板鍥炲~鍒嗗竷寮忚皟鍑哄崟鍏宠仈鏁伴噺
+                oCN.RunProc("exec h_p_Kf_UpDateRelation_MoveStockRequestToPOStockIn_Del " + HInterID);
+
                 oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
                 oCN.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID);
 
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 47dc70b..fdb9109 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -8861,6 +8861,608 @@
         }
         #endregion
 
+        #region  椤圭洰绫诲埆  璁剧疆鍒楄〃/淇濆瓨/缂栬緫/鍒犻櫎鏂规硶
+        /// <summary>
+        ///  椤圭洰绫诲埆 淇濆瓨
+        /// </summary>
+        /// <param name="msg"></param>
+        /// <returns></returns>
+        [Route("SaveGy_ProjectClassList")]
+        [HttpPost]
+        public object SaveGy_ProjectClassList([FromBody] JObject msg)
+        {
+            DataSet ds;
+            var _value = msg["msg"].ToString();
+            string msg3 = _value.ToString();
+            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            string msg1 = sArray[0].ToString();
+            string msg2 = sArray[1].ToString();
+
+            //鏌ョ湅鏉冮檺
+            if (!DBUtility.ClsPub.Security_Log("Gy_ProjectClass_Edit", 1, false, msg2))
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
+            Int64 HItemID = 0;
+            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+            //鑾峰彇鏈�澶D鍊艰祴鍊�
+            DataSet Maxds = oCN.RunProcReturn("select isNull(MAX(HItemID),0) HItemID from Gy_ProjectClass ", "Gy_ProjectClass");
+            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
+            {
+
+                WebAPI.DLL.ClsGy_ProjectClass_Ctl oBill = new WebAPI.DLL.ClsGy_ProjectClass_Ctl();
+                List<Model.ClsGy_ProjectClass_Model> lsmain = new List<Model.ClsGy_ProjectClass_Model>();
+                msg1 = msg1.Replace("\\", "");
+                msg1 = msg1.Replace("\n", "");
+                lsmain = oListModels.getObjectByJson_Gy_ProjectClass(msg1);
+                foreach (Model.ClsGy_ProjectClass_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 (!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_ProjectClass where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_ProjectClass");
+                    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()); //绛夌骇
+                    oItem.HMakeEmp = msg2; //鍒涘缓浜�
+
+                    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("GetGy_ProjectClassDetail")]
+        [HttpGet]
+        public ApiResult<DataSet> GetGy_ProjectClassDetail(string HID)
+        {
+            var model = LuBaoSevice.GetGy_ProjectClassDetail(HID);
+            return model;
+        }
+
+        /// <summary>
+        /// 椤圭洰绫诲埆 鍒犻櫎鍔熻兘
+        /// </summary>
+        /// <returns></returns>
+        [Route("DeltetGy_ProjectClass")]
+        [HttpGet]
+        public object DeltetGy_ProjectClass(string HItemID, string user)
+        {
+            DataSet ds;
+            //string ModRightNameCheck = "Sc_ProcessReport_check";
+            try
+            {
+                //鍒犻櫎鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_ProjectClass_Drop", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                if (string.IsNullOrWhiteSpace(HItemID))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HItemID涓虹┖锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                oCN.BeginTran();//寮�濮嬩簨鍔�
+
+                ds = oCN.RunProcReturn("select * from Gy_ProjectClass where HItemID=" + HItemID, "Gy_ProjectClass");
+                if (ds.Tables[0].Rows.Count > 0)
+                {
+                    if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜鍒犻櫎锛�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘杩涜鍒犻櫎锛�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+
+                oCN.RunProc("delete Gy_ProjectClass 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;
+            }
+        }
+        #endregion
+
+        #region  浠诲姟绫诲埆  璁剧疆鍒楄〃/淇濆瓨/缂栬緫/鍒犻櫎鏂规硶
+        /// <summary>
+        ///  浠诲姟绫诲埆 淇濆瓨
+        /// </summary>
+        /// <param name="msg"></param>
+        /// <returns></returns>
+        [Route("SaveGy_TaskClassList")]
+        [HttpPost]
+        public object SaveGy_TaskClassList([FromBody] JObject msg)
+        {
+            DataSet ds;
+            var _value = msg["msg"].ToString();
+            string msg3 = _value.ToString();
+            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            string msg1 = sArray[0].ToString();
+            string msg2 = sArray[1].ToString();
+
+            //鏌ョ湅鏉冮檺
+            if (!DBUtility.ClsPub.Security_Log("Gy_TaskClass_Edit", 1, false, msg2))
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
+            Int64 HItemID = 0;
+            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+            //鑾峰彇鏈�澶D鍊艰祴鍊�
+            DataSet Maxds = oCN.RunProcReturn("select isNull(MAX(HItemID),0) HItemID from Gy_TaskClass ", "Gy_TaskClass");
+            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
+            {
+
+                WebAPI.DLL.ClsGy_TaskClass_Ctl oBill = new WebAPI.DLL.ClsGy_TaskClass_Ctl();
+                List<Model.ClsGy_TaskClass_Model> lsmain = new List<Model.ClsGy_TaskClass_Model>();
+                msg1 = msg1.Replace("\\", "");
+                msg1 = msg1.Replace("\n", "");
+                lsmain = oListModels.getObjectByJson_Gy_TaskClass(msg1);
+                foreach (Model.ClsGy_TaskClass_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 (!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_TaskClass where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_TaskClass");
+                    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()); //绛夌骇
+                    oItem.HMakeEmp = msg2; //鍒涘缓浜�
+
+                    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("GetGy_TaskClassDetail")]
+        [HttpGet]
+        public ApiResult<DataSet> GetGy_TaskClassDetail(string HID)
+        {
+            var model = LuBaoSevice.GetGy_TaskClassDetail(HID);
+            return model;
+        }
+
+        /// <summary>
+        /// 浠诲姟绫诲埆 鍒犻櫎鍔熻兘
+        /// </summary>
+        /// <returns></returns>
+        [Route("DeltetGy_TaskClass")]
+        [HttpGet]
+        public object DeltetGy_TaskClass(string HItemID, string user)
+        {
+            DataSet ds;
+            //string ModRightNameCheck = "Sc_ProcessReport_check";
+            try
+            {
+                //鍒犻櫎鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_TaskClass_Drop", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+                if (string.IsNullOrWhiteSpace(HItemID))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "HItemID涓虹┖锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                oCN.BeginTran();//寮�濮嬩簨鍔�
+
+                ds = oCN.RunProcReturn("select * from Gy_TaskClass where HItemID=" + HItemID, "Gy_TaskClass");
+                if (ds.Tables[0].Rows.Count > 0)
+                {
+                    if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜鍒犻櫎锛�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘杩涜鍒犻櫎锛�";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+
+                oCN.RunProc("delete Gy_TaskClass 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;
+            }
+        }
+        #endregion
+
         /// <summary>
         /// 鐢ㄥ叧鑱斿伐搴忚幏鍙栦俊鎭�
         /// </summary>
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
index 92ff4de..b9f0333 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
@@ -287,7 +287,7 @@
                 long HConveyCompID = mainList[0].HConveyCompID;//杩愯緭鍏徃
                 long HConveyMoney = (long)mainList[0].HConveyMoney;//杩愯垂
                 long HDFflag = Convert.ToInt32(mainList[0].HDFflag); //鏄惁鍨粯
-
+                long HProjectID = mainList[0].HProjectID;//宸ョ▼椤圭洰
 
                 string HBillType = mainList[0].HBillType;
                 string HBillSubType = mainList[0].HBillSubType;
@@ -348,14 +348,14 @@
 	                    ,HAddress,HSSID,HCurID,HWHID,HExRate,HEmpID,HExplanation,HInnerBillNo,HSeOrderBillNo_M
 	                    ,HConveyTypeID,HConveyCompID,HConveyMoney,HLinkMan,HLinkPhone 
                         ,HSALEORGID,HDELIVERYORGID,HOWNERID,HOWNERTYPEID
-	                    ,HChecker,HCheckDate,HCloseMan,HCloseDate,HERPInterID,HERPBillType,HDFflag)
+	                    ,HChecker,HCheckDate,HCloseMan,HCloseDate,HERPInterID,HERPBillType,HDFflag,HProjectID)
                         values(" + HInterID + "," + DateTime.Now.Year + "," + DateTime.Now.Month + ",'" + 1402 + "','" +
                     1402 + "','" + HDate + "','" + HBillNo + "'," + HBillStatus + "," + HCusID +
                     "," + HManagerID + "," + HDeptID + ",'" + HRemark + "','" + HMaker + "','" + HMakeDate +
                     "','" + HAddress + "'," + HSSID + "," + HCurID + "," + HWHID + "," + HExRate + "," + HEmpID + ",'" +
                     HExplanation + "','" + HInnerBillNo + "','" + HSeOrderBillNo_M + "','" + HConveyTypeID + "','" + HConveyCompID + "','" + HConveyMoney + "','" + HLinkMan + "','" + HLinkPhone + "'," + HSALEORGID + "," + HDELIVERYORGID + "," + HOWNERID + ",'"
                     + HOWNERTYPEID + "','" + HChecker + "','" + HCheckDate + "','" + HCloseMan + "','" + HCloseDate + "'," + HERPInterID +
-                    ",'" + HERPBillType + "'," + HDFflag + ")";
+                    ",'" + HERPBillType + "'," + HDFflag + ",'"+ HProjectID + "')";
 
                     oCN.RunProc(sql);
 
@@ -366,7 +366,7 @@
                                 "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
                                  ",HCusID='" + HCusID + "', HCurID='" + HCurID + "', HWHID = '" + HWHID
                                  + "',HExRate='" + HExRate + "',HEmpID='" + HEmpID + "',HSeOrderBillNo_M='" + HSeOrderBillNo_M + "',HManagerID='" + HManagerID + "',HDeptID='" + HDeptID + "',HOWNERID='" + HOWNERID
-                                 + "',HAddress='" + HAddress + "' where HInterID=" + HInterID;
+                                 + "',HAddress='" + HAddress + "',HProjectID='"+ HProjectID + "' where HInterID=" + HInterID;
                     oCN.RunProc(sql);
 
                     //鍒犻櫎瀛愯〃
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StepFoldOutBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StepFoldOutBillController.cs"
index e71f4bc..c9bffe1 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StepFoldOutBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StepFoldOutBillController.cs"
@@ -251,7 +251,7 @@
 	                    ,HDeleteMan,HCloseMan
 	                    ,HRemark,HExplanation,HInnerBillNo,HCurID)
                         values(" + HInterID + ",'" + HBillNo + "','" + HDate + "','" + 1250 + "','" +
-                    HBillSubType + "'," + HBillStatus + "," + DateTime.Now.Year + "," + DateTime.Now.Month + "," + HSupID +
+                    1250 + "'," + HBillStatus + "," + DateTime.Now.Year + "," + DateTime.Now.Month + "," + HSupID +
                     "," + HWHID + "," + HSCWHID + "," + HEmpID + "," + HManagerID + "," + HSecManagerID +
                     "," + HKeeperID + "," + HDeptID + ",'" + HMaker + "','" + HMakeDate + "','" + HChecker + "','" + HUpDater + "','" + HDeleteMan + "','" + HCloseMan + "','"
                     + HRemark + "','" + HExplanation + "','" + HInnerBillNo + "'," + HCurID + "" + ")");
@@ -259,7 +259,9 @@
                 else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                 { //淇敼
                     String sql="update Kf_ICStockBillMain   set " +
-                                "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" + " where HInterID=" + "HInterID";
+                                    "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
+                                 ",HSupID=" + HSupID + ",HWHID=" + HWHID + ",HSCWHID=" + HSCWHID + ", HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HSecManagerID = " + HSecManagerID
+                                 + ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + "  where HInterID=" + HInterID;
 
                     oCn.RunProc(sql);
                     //鍒犻櫎瀛愯〃
@@ -719,25 +721,89 @@
                 //Type 1 浣滃簾  2  鍙嶄綔搴�
                 if (Type == 1)
                 {
-                    if (!BillOld.Cancelltion(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+                    DataSet ds;
+                    string sql = "select * from Kf_ICStockBillMain where HinterID = " + HInterID;
+                    ds = oCn.RunProcReturn(sql, "Kf_ICStockBillMain");
+                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                     {
                         objJsonResult.code = "0";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
+                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+                    {
+                        if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶉渶瑕佸啀浣滃簾!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        //浣滃簾鍗曟嵁
+                        if (!BillOld.Cancelltion(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 1;
+                            objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                    
                 }
                 else
                 {
-                    if (!BillOld.AbandonCancelltion(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+                    DataSet ds;
+                    string sql = "select * from Kf_ICStockBillMain where HinterID = " + HInterID;
+                    ds = oCn.RunProcReturn(sql, "Kf_ICStockBillMain");
+                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                     {
                         objJsonResult.code = "0";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
+                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+                    {
+                        if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶉渶瑕佸啀浣滃簾!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        //浣滃簾鍗曟嵁
+                        if (!BillOld.AbandonCancelltion(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 1;
+                            objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }   
+                    }
+                    
                 }
 
                 oCn.Commit();//鎻愪氦浜嬪姟
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_ProductInBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_ProductInBillController.cs"
index e9d1972..a866df1 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_ProductInBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_ProductInBillController.cs"
@@ -12,18 +12,541 @@
 
 namespace WebAPI.Controllers
 {
-    //鐢熶骇鍏ュ簱鍗旵ontroller
     public class Kf_ProductInBillController : ApiController
     {
-        //鑾峰彇绯荤粺鍙傛暟
-        Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
-
         public DBUtility.ClsPub.Enum_BillStatus BillStatus;
-        public DAL.ClsKf_ProductInBill BillOld = new DAL.ClsKf_ProductInBill();
+        public const string ModName = "1202";                   //鍗曟嵁绫诲瀷
+        public const string ModCaption = "鐢熶骇鍏ュ簱鍗�";          //鍗曟嵁鍚嶇О
+        public const string ModRightName = "Kf_ProductInBill";
+        public const string ModRightNameList = ModRightName + "List";       //鍒楄〃
+        public const string ModRightNameEdit = ModRightName + "_Edit";      //缂栬緫
+        public const string ModRightNameCheck = ModRightName + "_Check";    //瀹℃牳
+        public const string ModRightNameClose = ModRightName + "_Close";    //鍏抽棴
+        public const string ModRightNameDelete = ModRightName + "_Delete";  //浣滃簾
+        public const string ModRightNameDrop = ModRightName + "_Drop";      //鍒犻櫎
+        public const string ModRightNameMoney = ModRightName + "_Money";    //閲戦
+        public const string ModRightNameQty = ModRightName + "_Qty";        //鏁伴噺
+        public DataSet ds = new DataSet();
         private json objJsonResult = new json();
-        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
-        DataSet ds;
+        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+        public DAL.ClsKf_ProductInBill oBill = new DAL.ClsKf_ProductInBill();
+        public DAL.ClsKf_ProductInBill BillOld = new DAL.ClsKf_ProductInBill();
 
+
+        #region 鐢熶骇鍏ュ簱鍗曞垪琛�
+        /// <summary>
+        /// 鑾峰彇鐢熶骇鍏ュ簱鍗曞垪琛ㄤ俊鎭�
+        /// </summary>
+        /// <returns></returns>
+        [Route("Kf_ProductInBillController/GetKf_ProductInBillList_Json")]
+        [HttpGet]
+        public object GetKf_ProductInBillList_Json(string sWhere, string HMaker, string OperationType, string ViewName)
+        {
+            try
+            {
+                //鍒ゆ柇鏉冮檺
+                if (OperationType == "1")
+                {
+                    //鍒ゆ柇鏉冮檺
+                    if (!DBUtility.ClsPub.Security_Log(ModRightNameList, 3, false, HMaker))
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠$悊鍛樿仈绯伙紒";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+
+                //杩斿洖鍒楄〃淇℃伅
+                ds = oCn.RunProcReturn("select * from " + ViewName + " where 1=1 " + sWhere + " order by hmainid desc", ViewName);
+                List<object> columnNameList = new List<object>();
+                //娣诲姞鍒楀悕
+                foreach (DataColumn col in ds.Tables[0].Columns)
+                {
+                    Type dataType = col.DataType;
+                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕
+                }
+                objJsonResult.code = "0";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "鎴愬姛锛�";
+                objJsonResult.data = ds.Tables[0];
+                objJsonResult.list = columnNameList;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏌ヨ鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鐢熶骇鍏ュ簱鍗� 鍒犻櫎
+        /// <summary>
+        /// 鍒犻櫎鐢熶骇鍏ュ簱鍗�
+        /// </summary>
+        /// <returns></returns>
+        [Route("Kf_ProductInBillController/GetKf_ProductInBill_Delete_Json")]
+        [HttpGet]
+        public object GetKf_ProductInBill_Delete_Json(Int64 HInterID, string HMaker)
+        {
+            try
+            {
+                //鍒ゆ柇鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log(ModRightNameDrop, 3, false, HMaker))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍒犻櫎鍔熻兘鏉冮檺,璇蜂笌绠$悊鍛樿仈绯伙紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                //鍒ゆ柇瀛樺湪鎬�
+                if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+                {
+                    //鍒犻櫎鍓嶆帶鍒�
+                    DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Kf_ProductInBill_BeforeDelCtrl " + HInterID.ToString() + ",'" + HMaker + "'", "h_p_Kf_ProductInBill_BeforeDelCtrl");
+                    if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍒犻櫎鍓嶅垽鏂け璐ワ紒";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍒犻櫎澶辫触锛�" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                    //鍒犻櫎鍗曟嵁锛堝寘鍚垹闄ゅ悗鎺у埗銆佸啓鍏ユ棩蹇楋級
+                    if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_ProductInBill_AfterDelCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    else
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 1;
+                        objJsonResult.Message = "鍒犻櫎鐢熶骇鍏ュ簱鍗曟垚鍔燂紒";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏈煡璇㈠埌璇ョ敓浜у叆搴撳崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鍒犻櫎鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鐢熶骇鍏ュ簱鍗� 瀹℃牳/鍙嶅鏍�
+        /// <summary>
+        /// 瀹℃牳/鍙嶅鏍哥敓浜у叆搴撳崟
+        /// </summary>
+        /// <param name="HInterID">鍗曟嵁ID</param>
+        /// <param name="Type">瀹℃牳(1),鍙嶅鏍�(2)</param>
+        /// <param name="HMaker">瀹℃牳浜�</param>
+        /// <returns></returns>
+        [Route("Kf_ProductInBillController/GetKf_ProductInBill_Check_Json")]
+        [HttpGet]
+        public object GetKf_ProductInBill_Check_Json(Int64 HInterID, int Type, string HMaker)
+        {
+            try
+            {
+                //鍒ゆ柇鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 3, false, HMaker))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡瀹℃牳/鍙嶅鏍稿姛鑳芥潈闄�,璇蜂笌绠$悊鍛樿仈绯伙紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                //鍒ゆ柇瀛樺湪鎬�
+                if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+                {
+                    //Type 1 瀹℃牳  2  鍙嶅鏍�
+                    if (Type == 1)
+                    {
+                        if (oBill.omodel.HChecker.Trim() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸插鏍革紝涓嶈兘鍐嶆瀹℃牳锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        if (oBill.omodel.HCloseMan.Trim() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸插叧闂紝涓嶈兘鍐嶆瀹℃牳锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        if (oBill.omodel.HDeleteMan.Trim() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸蹭綔搴燂紝涓嶈兘鍐嶆瀹℃牳锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        //瀹℃牳鍓嶆帶鍒�
+                        DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Kf_ProductInBill_BeforeCheckCtrl " + HInterID.ToString() + ",'" + HMaker + "'", "h_p_Kf_ProductInBill_BeforeCheckCtrl");
+                        if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "瀹℃牳鍓嶅垽鏂け璐ワ紒";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        else
+                        {
+                            if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+                            {
+                                objJsonResult.code = "0";
+                                objJsonResult.count = 0;
+                                objJsonResult.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+                                objJsonResult.data = null;
+                                return objJsonResult;
+                            }
+                        }
+                        //瀹℃牳鍗曟嵁
+                        if (!oBill.CheckBill(HInterID, oBill.omodel.HBillNo, "h_p_Kf_ProductInBill_AfterCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        else
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 1;
+                            objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 瀹℃牳鎴愬姛锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult; ;
+                        }
+                    }
+                    else
+                    {
+                        if (oBill.omodel.HChecker.Trim() == "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鏈鏍革紝涓嶉渶瑕佸弽瀹℃牳锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        //鍙嶅鏍稿墠鎺у埗
+                        DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Kf_ProductInBill_BeforeUnCheckCtrl " + HInterID.ToString() + ",'" + HMaker + "'", "h_p_Kf_ProductInBill_BeforeUnCheckCtrl");
+                        if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍙嶅鏍稿墠鍒ゆ柇澶辫触锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        else
+                        {
+                            if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+                            {
+                                objJsonResult.code = "0";
+                                objJsonResult.count = 0;
+                                objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+                                objJsonResult.data = null;
+                                return objJsonResult;
+                            }
+                        }
+
+                        //鍙嶅鏍稿崟鎹�
+                        if (!oBill.AbandonCheck(HInterID, oBill.omodel.HBillNo, "h_p_Kf_ProductInBill_AfterUnCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        else
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 1;
+                            objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶅鏍告垚鍔燂紒";
+                            objJsonResult.data = null;
+                            return objJsonResult; ;
+                        }
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏈煡璇㈠埌璇ョ敓浜у叆搴撳崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鐢熶骇鍏ュ簱鍗� 鍏抽棴/鍙嶅叧闂�
+        /// <summary>
+        /// 鍏抽棴/鍙嶅叧闂敓浜у叆搴撳崟
+        /// </summary>
+        /// <param name="HInterID">鍗曟嵁ID</param>
+        /// <param name="Type">鍏抽棴(1),鍙嶅叧闂�(2)</param>
+        /// <param name="HMaker">鍏抽棴浜�</param>
+        /// <returns></returns>
+        [Route("Kf_ProductInBillController/GetKf_ProductInBill_Close_Json")]
+        [HttpGet]
+        public object GetKf_ProductInBill_Close_Json(Int64 HInterID, int Type, string HMaker)
+        {
+            try
+            {
+                //鍒ゆ柇鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log(ModRightNameClose, 3, false, HMaker))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍏抽棴/鍙嶅叧闂姛鑳芥潈闄�,璇蜂笌绠$悊鍛樿仈绯伙紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                //鍒ゆ柇瀛樺湪鎬�
+                if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+                {
+                    //Type 1 鍏抽棴  2  鍙嶅叧闂�
+                    if (Type == 1)
+                    {
+                        if (oBill.omodel.HCloseMan.Trim() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸插叧闂紝涓嶈兘鍐嶆鍏抽棴锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        //鍏抽棴鍗曟嵁
+                        if (!oBill.CloseBill(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        else
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 1;
+                            objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍏抽棴鎴愬姛锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult; ;
+                        }
+                    }
+                    else
+                    {
+                        if (oBill.omodel.HCloseMan.Trim() == "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鏈叧闂紝涓嶉渶瑕佸弽鍏抽棴锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        //鍙嶅叧闂崟鎹�
+                        if (!oBill.CancelClose(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        else
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 1;
+                            objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶅叧闂垚鍔燂紒";
+                            objJsonResult.data = null;
+                            return objJsonResult; ;
+                        }
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏈煡璇㈠埌璇ョ敓浜у叆搴撳崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鍏抽棴鎴栧弽鍏抽棴鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 鐢熶骇鍏ュ簱鍗� 浣滃簾/鍙嶄綔搴�
+        /// <summary>
+        /// 浣滃簾/鍙嶄綔搴熺敓浜у叆搴撳崟
+        /// </summary>
+        /// <param name="HInterID">鍗曟嵁ID</param>
+        /// <param name="Type">浣滃簾(1),鍙嶄綔搴�(2)</param>
+        /// <param name="HMaker">浣滃簾浜�</param>
+        /// <returns></returns>
+        [Route("Kf_ProductInBillController/GetKf_ProductInBill_Cancelltion_Json")]
+        [HttpGet]
+        public object GetKf_ProductInBill_Cancelltion_Json(Int64 HInterID, int Type, string HMaker)
+        {
+            try
+            {
+                //鍒ゆ柇鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 3, false, HMaker))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡浣滃簾/鍙嶄綔搴熷姛鑳芥潈闄�,璇蜂笌绠$悊鍛樿仈绯伙紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
+                //鍒ゆ柇瀛樺湪鎬�
+                if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+                {
+                    //Type 1 浣滃簾  2  鍙嶄綔搴�
+                    if (Type == 1)
+                    {
+                        if (oBill.omodel.HDeleteMan.Trim() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸蹭綔搴燂紝涓嶈兘鍐嶆浣滃簾锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        //浣滃簾鍗曟嵁
+                        if (!oBill.Cancelltion(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        else
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 1;
+                            objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 浣滃簾鎴愬姛锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult; ;
+                        }
+                    }
+                    else
+                    {
+                        if (oBill.omodel.HDeleteMan.Trim() == "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁鏈綔搴燂紝涓嶉渶瑕佸弽浣滃簾锛�";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        //鍙嶄綔搴熷崟鎹�
+                        if (!oBill.AbandonCancelltion(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        else
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 1;
+                            objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶄綔搴熸垚鍔燂紒";
+                            objJsonResult.data = null;
+                            return objJsonResult; ;
+                        }
+                    }
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏈煡璇㈠埌璇ョ敓浜у叆搴撳崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "浣滃簾鎴栧弽浣滃簾鐢熶骇鍏ュ簱鍗曞け璐ワ紒" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+
+
+
+        //---------------------------------------------------------------------------------------------鏃ф柟娉�20240422鍓�
 
         #region 鐢熶骇鍏ュ簱鍗� 鏌ユ壘璁板綍鍔熻兘
         /// <summary>
@@ -38,7 +561,7 @@
             try
             {
 
-                ds = oCN.RunProcReturn("select * from h_v_IF_ProductInBillList where hmainid=" + HInterID, "h_v_IF_ProductInBillList");
+                ds = oCn.RunProcReturn("select * from h_v_IF_ProductInBillList where hmainid=" + HInterID, "h_v_IF_ProductInBillList");
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
                 {
                     objJsonResult.code = "0";
@@ -91,12 +614,12 @@
 
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_IF_ProductInBillList where 1=1  order by hmainid desc", "h_v_IF_ProductInBillList");
+                    ds = oCn.RunProcReturn("select * from h_v_IF_ProductInBillList where 1=1  order by hmainid desc", "h_v_IF_ProductInBillList");
                 }
                 else
                 {
                     string sql = "select * from h_v_IF_ProductInBillList where 1 = 1 " + sWhere + " order by hmainid desc";
-                    ds = oCN.RunProcReturn(sql, "h_v_IF_ProductInBillList");
+                    ds = oCn.RunProcReturn(sql, "h_v_IF_ProductInBillList");
                 }
 
 
@@ -133,7 +656,7 @@
                 string HBillNo = "";
                 //鍒犻櫎鍓嶆帶鍒�=========================================      
                 string sql1 = "exec h_p_Kf_ProductInBill_BeforeDelCtrl " + HInterID + ",'" + HBillNo + "','" + user + "'";
-                ds = oCN.RunProcReturn(sql1, "h_p_Kf_ProductInBill_BeforeDelCtrl");
+                ds = oCn.RunProcReturn(sql1, "h_p_Kf_ProductInBill_BeforeDelCtrl");
                 if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                 {
                     objJsonResult.code = "0";
@@ -154,14 +677,14 @@
                 //==================================================================================      
 
                 string sReturn = "";
-                oCN.BeginTran();
-                oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
-                oCN.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID);
-                oCN.Commit();
+                oCn.BeginTran();
+                oCn.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
+                oCn.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID);
+                oCn.Commit();
 
                 //鍒犻櫎鍚庢帶鍒�==================================================================================      
                 string sql2 = "exec h_p_Kf_ProductInBill_AfterDelCtrl " + HInterID + ",'" + HBillNo + "','" + user + "'";
-                ds = oCN.RunProcReturn(sql2, "h_p_Kf_ProductInBill_AfterDelCtrl");
+                ds = oCn.RunProcReturn(sql2, "h_p_Kf_ProductInBill_AfterDelCtrl");
                 if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                 {
                     sReturn = "鍒犻櫎鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴";
@@ -169,7 +692,7 @@
                     objJsonResult.count = 1;
                     objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + sReturn;
                     objJsonResult.data = null;
-                    oCN.RollBack();
+                    oCn.RollBack();
                     return objJsonResult;
                 }
                 if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
@@ -179,7 +702,7 @@
                     objJsonResult.count = 1;
                     objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + sReturn;
                     objJsonResult.data = null;
-                    oCN.RollBack();
+                    oCn.RollBack();
                     return objJsonResult;
                 }
                 //==============================================================================================
@@ -192,7 +715,7 @@
             }
             catch (Exception e)
             {
-                oCN.RollBack();
+                oCn.RollBack();
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
                 objJsonResult.Message = "Exception锛�" + e.ToString();
@@ -211,19 +734,19 @@
             {
                 var _value = sMainSub["sMainSub"].ToString();
                 string msg1 = _value.ToString();
-                oCN.BeginTran();
+                oCn.BeginTran();
                 //淇濆瓨涓昏〃
                 objJsonResult = AddBillMain(msg1);
                 if (objJsonResult.code == "0")
                 {
-                    oCN.RollBack();
+                    oCn.RollBack();
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
                     objJsonResult.Message = objJsonResult.Message;
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-                oCN.Commit();
+                oCn.Commit();
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
                 objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
@@ -233,7 +756,7 @@
             }
             catch (Exception e)
             {
-                oCN.RollBack();
+                oCn.RollBack();
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
                 objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
@@ -304,12 +827,12 @@
                 string HSUPPLYADDRESS = mainList2[0].HSUPPLYADDRESS == null ? "''" : mainList2[0].HSUPPLYADDRESS;
                 long HPROVIDERCONTACTID = mainList2[0].HPROVIDERCONTACTID == null ? 0 : mainList2[0].HPROVIDERCONTACTID;
 
-                ds = oCN.RunProcReturn("select * from h_v_IF_ProductInBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_ProductInBillList");
+                ds = oCn.RunProcReturn("select * from h_v_IF_ProductInBillList where hmainid=" + HInterID + " and 鍗曟嵁鍙�='" + HBillNo + "'", "h_v_IF_ProductInBillList");
                 if ((OperationType == 1 || OperationType == 2 || OperationType == 4) && ds.Tables[0].Rows.Count == 0)//鏂板
                 {
 
                     //淇濆瓨鍓嶆帶鍒�=========================================
-                    ds = oCN.RunProcReturn("exec h_p_Kf_ProductInBill_BeforeSaveCtrl " + HInterID, "h_p_Kf_ProductInBill_BeforeSaveCtrl");
+                    ds = oCn.RunProcReturn("exec h_p_Kf_ProductInBill_BeforeSaveCtrl " + HInterID, "h_p_Kf_ProductInBill_BeforeSaveCtrl");
 
                     if (ds == null || ds.Tables[0].Rows.Count == 0)
                     {
@@ -337,7 +860,7 @@
                     "," + HManagerID + "," + HEmpID + "," + HDeptID + "," + HSecManagerID + "," + HKeeperID + ",'" + HRemark + "','" + HMaker +
                     "',getdate()" + "," + HCurID + "," + HExRate + "," + HWHID + ",'" + HInnerBillNo + "','" + HExplanation + "')";
 
-                    oCN.RunProc(sql);
+                    oCn.RunProc(sql);
 
                 }
                 else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
@@ -348,20 +871,20 @@
                                  + ",HExRate=" + HExRate + ",HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HDeptID=" + HDeptID
                                  + ",HInnerBillNo='" + HInnerBillNo + "' where HInterID=" + HInterID;
 
-                    oCN.RunProc(sql);
+                    oCn.RunProc(sql);
 
                     
                     //鍒犻櫎瀛愯〃
-                    oCN.RunProc("delete from Kf_ICStockBillSub where HInterID='" + HInterID + "'");
+                    oCn.RunProc("delete from Kf_ICStockBillSub where HInterID='" + HInterID + "'");
                 }
                 //淇濆瓨瀛愯〃
                 objJsonResult = AddBillSub(msg3, HInterID, OperationType, user);
 
                 //鐢熶骇鍏ュ簱鍗曟柊澧炲洖濉敓浜ц鍗曞叧鑱旀暟閲�
-                oCN.RunProc("exec h_p_Kf_UpDateRelation_ProductInToICMO_Add " + HInterID);
+                oCn.RunProc("exec h_p_Kf_UpDateRelation_ProductInToICMO_Add " + HInterID);
 
                 //鐢熶骇鍏ュ簱鍗曟柊澧炲洖濉敓浜ф眹鎶ュ崟鍏宠仈鏁伴噺
-                oCN.RunProc("exec h_p_Kf_UpDateRelation_ProductInToICMOReport_Add " + HInterID);
+                oCn.RunProc("exec h_p_Kf_UpDateRelation_ProductInToICMOReport_Add " + HInterID);
 
                 if (objJsonResult.code == "0")
                 {
@@ -445,7 +968,7 @@
 
                 DataSet Cs;
                 Int64 NewHEntryID = 1;
-                Cs = oCN.RunProcReturn("select MAX(HEntryID)HEntryID from Kf_ICStockBillSub", "Kf_ICStockBillSub");
+                Cs = oCn.RunProcReturn("select MAX(HEntryID)HEntryID from Kf_ICStockBillSub", "Kf_ICStockBillSub");
                 if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
                 {
                     NewHEntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString());
@@ -453,7 +976,7 @@
                 }
                
 
-                oCN.RunProc($@"Insert into Kf_ICStockBillSub 
+                oCn.RunProc($@"Insert into Kf_ICStockBillSub 
                 (HInterID,HEntryID,HMaterID,HUnitID,HQtyMust,HQty,HPrice
 	            ,HMoney,HWHID,HSPID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HPOOrderInterID
                 ,HPOOrderEntryID,HPOORderBillNo,HSecUnitID,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo,HRelationQty,HSecUnitRate,HPropertyID) 
@@ -463,7 +986,7 @@
 
             }
             //淇濆瓨鍚庢帶鍒�=========================================              
-            ds = oCN.RunProcReturn("exec h_p_Kf_ProductInBill_AfterSaveCtrl " + HInterID, "h_p_Kf_ProductInBill_AfterSaveCtrl");
+            ds = oCn.RunProcReturn("exec h_p_Kf_ProductInBill_AfterSaveCtrl " + HInterID, "h_p_Kf_ProductInBill_AfterSaveCtrl");
 
             if (ds == null || ds.Tables[0].Rows.Count == 0)
             {
@@ -496,14 +1019,14 @@
         [HttpGet]
         public ApiResult<DataTable> getMaterialByMaterID(Int64 HMaterID)
         {
-            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
 
             string sql = "select a.HItemID HMaterID,a.HNumber HMaterNumber,a.HName HMaterName,a.HMaterRuleType,a.HModel HMaterModel,a.HUnitID, b.HNumber HUnitNumber, b.HName HUnitName" +
                 " from Gy_Material AS a " +
                 " LEFT OUTER JOIN Gy_Unit AS b on a.HUnitID = b.HItemID " +
                 " where a.HItemID =" + HMaterID;
 
-            var dataSet = oCN.RunProcReturn(sql, "Gy_Material");
+            var dataSet = oCn.RunProcReturn(sql, "Gy_Material");
 
 
             if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
@@ -541,7 +1064,7 @@
 
                 ClsPub.CurUserName = user;
                 BillOld.MvarItemKey = "Kf_ICStockBillMain";
-                oCN.BeginTran();//寮�濮嬩簨鍔�
+                oCn.BeginTran();//寮�濮嬩簨鍔�
 
                 //Type 1 瀹℃牳  2  鍙嶅鏍�
                 if (Type == 1)
@@ -549,7 +1072,7 @@
                     //鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀹℃牳
                     DataSet ds;
                     string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
-                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+                    ds = oCn.RunProcReturn(sql, BillOld.MvarItemKey);
                     if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                     {
                         if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
@@ -576,7 +1099,7 @@
                     //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅鏍�
                     DataSet ds;
                     string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
-                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+                    ds = oCn.RunProcReturn(sql, BillOld.MvarItemKey);
                     if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                     {
                         if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
@@ -612,7 +1135,7 @@
                     }
                 }
 
-                oCN.Commit();//鎻愪氦浜嬪姟
+                oCn.Commit();//鎻愪氦浜嬪姟
 
                 objJsonResult.code = "0";
                 objJsonResult.count = 1;
@@ -729,7 +1252,7 @@
 
                     //瀹℃牳鍓嶆帶鍒�=========================================      
                     string sql1 = "exec h_p_Kf_ProductInBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
-                    ds = oCN.RunProcReturn(sql1, "h_p_Kf_ProductInBill_BeforeCheckCtrl");
+                    ds = oCn.RunProcReturn(sql1, "h_p_Kf_ProductInBill_BeforeCheckCtrl");
                     if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                     {
                         objJsonResult.code = "0";
@@ -770,7 +1293,7 @@
                 if (IsAudit == 1) //鍙嶅鏍告彁浜�
                 {
                     //鍙嶅鏍稿墠鎺у埗=========================================
-                    DataSet ds = oCN.RunProcReturn("Exec h_p_Kf_ProductInBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'", "h_p_Kf_ProductInBill_BeforeUnCheckCtrl");
+                    DataSet ds = oCn.RunProcReturn("Exec h_p_Kf_ProductInBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'", "h_p_Kf_ProductInBill_BeforeUnCheckCtrl");
                     if (ds == null)
                     {
                         objJsonResult.code = "0";
@@ -848,7 +1371,7 @@
 
                 ClsPub.CurUserName = user;
                 BillOld.MvarItemKey = "Kf_ICStockBillMain";
-                oCN.BeginTran();//寮�濮嬩簨鍔�
+                oCn.BeginTran();//寮�濮嬩簨鍔�
 
                 //Type 1 鍏抽棴  2  鍙嶅叧闂�
                 if (Type == 1)
@@ -856,7 +1379,7 @@
                     //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍏抽棴
                     DataSet ds;
                     string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
-                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+                    ds = oCn.RunProcReturn(sql, BillOld.MvarItemKey);
                     if (ds == null || ds.Tables[0].Rows.Count == 0)
                     {
                         objJsonResult.code = "0";
@@ -908,7 +1431,7 @@
                     //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅叧闂�
                     DataSet ds;
                     string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
-                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+                    ds = oCn.RunProcReturn(sql, BillOld.MvarItemKey);
                     if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                     {
                         if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
@@ -947,7 +1470,7 @@
                     }
                 }
 
-                oCN.Commit();//鎻愪氦浜嬪姟
+                oCn.Commit();//鎻愪氦浜嬪姟
 
                 objJsonResult.code = "0";
                 objJsonResult.count = 1;
@@ -995,7 +1518,7 @@
 
                 ClsPub.CurUserName = user;
                 BillOld.MvarItemKey = "Kf_ICStockBillMain";
-                oCN.BeginTran();//寮�濮嬩簨鍔�
+                oCn.BeginTran();//寮�濮嬩簨鍔�
 
                 //Type 1 浣滃簾  2  鍙嶄綔搴�
                 if (Type == 1)
@@ -1003,7 +1526,7 @@
                     //鍒ゆ柇鍗曟嵁鏄惁宸茬粡浣滃簾
                     DataSet ds;
                     string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
-                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+                    ds = oCn.RunProcReturn(sql, BillOld.MvarItemKey);
                     if (ds == null || ds.Tables[0].Rows.Count == 0)
                     {
                         objJsonResult.code = "0";
@@ -1046,7 +1569,7 @@
                     //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶄綔搴�
                     DataSet ds;
                     string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
-                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+                    ds = oCn.RunProcReturn(sql, BillOld.MvarItemKey);
                     if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                     {
                         if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
@@ -1077,7 +1600,7 @@
                     }
                 }
 
-                oCN.Commit();//鎻愪氦浜嬪姟
+                oCn.Commit();//鎻愪氦浜嬪姟
 
                 objJsonResult.code = "0";
                 objJsonResult.count = 1;
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs"
index e8c9713..2b72194 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\252\214\346\224\266\345\205\245\345\272\223/Kf_StepFoldinBillController.cs"
@@ -255,7 +255,7 @@
 	                    ,HDeleteMan,HCloseMan
 	                    ,HRemark,HExplanation,HInnerBillNo,HCurID)
                         values(" + HInterID + ",'" + HBillNo + "','" + HDate + "','" + 1251 + "','" +
-                    HBillSubType + "'," + HBillStatus + "," + DateTime.Now.Year + "," + DateTime.Now.Month + "," + HSupID +
+                    1251 + "'," + HBillStatus + "," + DateTime.Now.Year + "," + DateTime.Now.Month + "," + HSupID +
                     "," + HWHID + "," + HSCWHID + "," + HEmpID + "," + HManagerID + "," + HSecManagerID +
                     "," + HKeeperID + "," + HDeptID + ",'" + HMaker + "','" + HMakeDate + "','" + HChecker + "','" + HUpDater + "','" + HDeleteMan + "','" + HCloseMan + "','"
                     + HRemark + "','" + HExplanation + "','" + HInnerBillNo + "'," + HCurID + "" + ")");
@@ -263,7 +263,9 @@
                 else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)
                 { //淇敼
                     String sql = "update Kf_ICStockBillMain   set " +
-                                "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" + " where HInterID=" + "HInterID";
+                               "HRemark='" + HRemark + "', HUpDater='" + HMaker + "', HUpDateDate=getdate()" +
+                                 ",HSupID=" + HSupID + ",HWHID=" + HWHID + ",HSCWHID=" + HSCWHID + ", HEmpID=" + HEmpID + ",HManagerID=" + HManagerID + ",HSecManagerID = " + HSecManagerID
+                                 + ",HKeeperID=" + HKeeperID + ",HDeptID=" + HDeptID + "  where HInterID=" + HInterID;
 
                     oCN.RunProc(sql);
                     //鍒犻櫎瀛愯〃
@@ -271,6 +273,9 @@
                 }
                 //淇濆瓨瀛愯〃
                 objJsonResult = AddBillSub(msg3, HInterID, OperationType);
+
+                //鍒嗗竷寮忚皟鍏ュ崟鏂板鍥炲~鍒嗗竷寮忚皟鍑哄崟鍏宠仈鏁伴噺
+                oCN.RunProc("exec h_p_Kf_UpDateRelation_ICStockToPOStockIn_Add " + HInterID);
 
                 if (objJsonResult.code == "0")
                 {
@@ -374,8 +379,13 @@
             try
             {
                 oCN.BeginTran();
+
+                //鍒嗗竷寮忚皟鍏ュ崟鏂板鍥炲~鍒嗗竷寮忚皟鍑哄崟鍏宠仈鏁伴噺
+                oCN.RunProc("exec h_p_Kf_UpDateRelation_ICStockToPOStockIn_Del " + HInterID);
+
                 oCN.RunProc("Delete From Kf_ICStockBillMain where HInterID = " + HInterID);
                 oCN.RunProc("Delete From Kf_ICStockBillSub where HInterID = " + HInterID);
+
                 oCN.Commit();
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
@@ -724,25 +734,89 @@
                 //Type 1 浣滃簾  2  鍙嶄綔搴�
                 if (Type == 1)
                 {
-                    if (!BillOld.Cancelltion(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+                    DataSet ds;
+                    string sql = "select * from Kf_ICStockBillMain where HinterID = " + HInterID;
+                    ds = oCN.RunProcReturn(sql, "Kf_ICStockBillMain");
+                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                     {
                         objJsonResult.code = "0";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
+                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+                    {
+                        if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶉渶瑕佸啀浣滃簾!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        //浣滃簾鍗曟嵁
+                        if (!BillOld.Cancelltion(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 1;
+                            objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                    
                 }
                 else
                 {
-                    if (!BillOld.AbandonCancelltion(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+                    DataSet ds;
+                    string sql = "select * from Kf_ICStockBillMain where HinterID = " + HInterID;
+                    ds = oCN.RunProcReturn(sql, "Kf_ICStockBillMain");
+                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                     {
                         objJsonResult.code = "0";
-                        objJsonResult.count = 1;
-                        objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
                         objJsonResult.data = null;
                         return objJsonResult;
                     }
+                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+                    {
+                        if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 0;
+                            objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶉渶瑕佸啀浣滃簾!";
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                        //浣滃簾鍗曟嵁
+                        if (!BillOld.AbandonCancelltion(int.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+                        {
+                            objJsonResult.code = "0";
+                            objJsonResult.count = 1;
+                            objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+                            objJsonResult.data = null;
+                            return objJsonResult;
+                        }
+                    }
+                    
                 }
 
                 oCN.Commit();//鎻愪氦浜嬪姟
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DutyBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DutyBillController.cs"
index 1fe868f..b86ec39 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DutyBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DutyBillController.cs"
@@ -226,9 +226,9 @@
                     //淇濆瓨瀹屾瘯鍚庡鐞�
                     oCN.RunProc("Insert into Gy_Duty " +
                        " (HNumber,HName,HHelpCode,HShortNumber,HParentID,HUserGroupID" +
-                       ",HLevel,HEndFlag,HStopflag,HRemark) " +
+                       ",HLevel,HEndFlag,HStopflag,HRemark,HUserCode) " +
                        " Values('" + Duty.HNumber + "','" + Duty.HName + "','" + Duty.HHelpCode + "','" + Duty.HShortNumber + "'," + Duty.HParentID.ToString() + "," + Duty.HUserGroupID.ToString() +
-                       "," + Duty.HLevel.ToString() + "," + Duty.HEndFlag + "," + Convert.ToString(Duty.HStopflag ? 1 : 0) + ",'" + Duty.HRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+                       "," + Duty.HLevel.ToString() + "," + Duty.HEndFlag + "," + Convert.ToString(Duty.HStopflag ? 1 : 0) + ",'" + Duty.HRemark + "','" + Duty.HUserCode + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                 }
                 else
                 {
@@ -242,6 +242,7 @@
                         ",HUserGroupID=" + Duty.HUserGroupID.ToString() +
                         ",HEndflag=" + Duty.HEndFlag +
                         ",HStopflag=" + Convert.ToString(Duty.HStopflag ? 1 : 0) +
+                        ",HUserCode="+Duty.HUserCode+
                         ",HRemark= '" + Duty.HRemark + "' Where HItemID=" + Duty.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                 }
 
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeController.cs"
index 16684c7..ff98ed7 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkTypeController.cs"
@@ -40,7 +40,7 @@
         {
             try
             {
-                //鍒ゆ柇鏉冮檺
+                //鍒ゆ柇鏉冮檺  1涓虹洿鎺ュ垪琛ㄦā鍧楁墦寮�  2涓轰粠鍏朵粬妯″潡璺宠浆鎵撳紑鍒楄〃
                 if (OperationType == "1")
                 {
                     //鍒ゆ柇鏉冮檺
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs"
index bdb05bd..fafa6d8 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_SingleBalBillController.cs"
@@ -592,7 +592,231 @@
         }
         #endregion
 
+        #region 宸ヨ祫缁撶畻鍗�(涓汉)妯″潡   浠庡垪琛ㄩ�変腑鎵撳紑鍗曟嵁锛岃繑鍥炲崟鎹俊鎭椂璋冪敤
+        /// <summary>
+        /// 宸ヨ祫缁撶畻鍗�(涓汉)缂栬緫鏃讹紝鏍规嵁鍗曟嵁ID鑾峰彇鍗曟嵁淇℃伅
+        /// </summary>
+        /// <returns></returns>
+        [Route("Pay_SingleBalBillController/GetPay_SingleBalBill_Json")]
+        [HttpGet]
+        public object GetPay_SingleBalBill_Json(Int64 HInterID, string HMaker)
+        {
+            try
+            {
+                //鍒ゆ柇鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 3, false, HMaker))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡缂栬緫鏉冮檺,璇蜂笌绠$悊鍛樿仈绯伙紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
 
+                //杩斿洖鍒楄〃淇℃伅
+                ds = oCn.RunProcReturn("exec h_p_Pay_SingleBalBill_EditInit " + HInterID, "h_p_Pay_SingleBalBill_EditInit");
+                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 = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = "鎴愬姛锛�";
+                    objJsonResult.data = ds.Tables[0];
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "杩斿洖宸ヨ祫缁撶畻鍗�(涓汉)淇℃伅澶辫触锛�" + e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+        #region 宸ヨ祫缁撶畻鍗�(涓汉)淇濆瓨
+        /// <summary>
+        /// 宸ヨ祫缁撶畻鍗�(涓汉)淇濆瓨
+        /// </summary>
+        [Route("Pay_SingleBalBillController/GetPay_SingleBalBill_Save_Json")]
+        [HttpPost]
+        public object GetPay_SingleBalBill_Save_Json([FromBody] JObject sMainSub)
+        {
+            var _value = sMainSub["sMainSub"].ToString();
+            string msg1 = _value.ToString();
+            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            string sMainStr = sArray[0].ToString();         //涓昏〃鏁版嵁
+            string sSubStr = sArray[1].ToString();          //瀛愯〃鏁版嵁
+            string OperationType = sArray[2].ToString();    //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
+            string HMaker = sArray[3].ToString();           //鍒跺崟浜�
+            try
+            {
+                //鍒ゆ柇鏉冮檺
+                if (OperationType == "1")
+                {
+                    BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+                    //鍒ゆ柇鏂板鏉冮檺
+                    if (!DBUtility.ClsPub.Security_Log(ModRightName, 1, false, HMaker))
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏂板鏉冮檺,璇蜂笌绠$悊鍛樿仈绯伙紒";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                else
+                {
+                    BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify;
+                    //鍒ゆ柇缂栬緫鏉冮檺
+                    if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, false, HMaker))
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡缂栬緫鏉冮檺,璇蜂笌绠$悊鍛樿仈绯伙紒";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                }
+                //琛ㄥご璧嬪��
+                sMainStr = sMainStr.Replace("\\", "");
+                sMainStr = sMainStr.Replace("\n", "");
+                sMainStr = "[" + sMainStr.ToString() + "]";
+                List<Model.ClsPay_SingleBalBillMain> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_SingleBalBillMain>>(sMainStr);
+                foreach (Model.ClsPay_SingleBalBillMain oItem in lsmain)
+                {
+                    //鍗曟嵁鍙锋槸鍚﹂噸澶�
+                    if (oBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, oItem.HInterID))
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+                    //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+                    string s = "";
+                    int sYear = 0;
+                    int sPeriod = 0;
+                    if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod_Pay(oItem.HDate, ref sYear, ref sPeriod, ref s) == false)
+                    {
+                        objJsonResult.code = "0";
+                        objJsonResult.count = 0;
+                        objJsonResult.Message = s;
+                        objJsonResult.data = null;
+                        return objJsonResult;
+                    }
+
+                    oItem.HYear = sYear;
+                    oItem.HPeriod = sPeriod;
+                    DBUtility.ClsPub.CurUserName = oItem.HMaker;
+                    oBill.omodel = oItem;
+                }
+                //琛ㄤ綋璧嬪��
+                //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+                sSubStr = sSubStr.Substring(1, sSubStr.Length - 2);
+                sSubStr = sSubStr.Replace("\\", "");
+                sSubStr = sSubStr.Replace("\n", "");
+                sSubStr = "[" + sSubStr.ToString() + "]";
+                List<Model.ClsPay_SingleBalBillSub> ls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_SingleBalBillSub>>(sSubStr);
+                int i = 0;
+                foreach (Model.ClsPay_SingleBalBillSub oItemSub in ls)
+                {
+                    i++;
+                    oItemSub.HEntryID = i;
+                    oBill.DetailColl.Add(oItemSub);
+                }
+
+                //淇濆瓨
+                bool bResult;
+                if (OperationType == "1")   //鏂板淇濆瓨
+                {
+                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+                }
+                else                        //缂栬緫淇濆瓨
+                {
+                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+                }
+
+                if (bResult)
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 1;
+                    objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;  //鎴愬姛锛�
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+                else
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.Message;
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+
+        #endregion
+
+        #region 鏍规嵁鐗╂枡ID銆佸伐搴廔D銆佽祫婧怚D鑾峰彇宸ヤ环
+        [Route("Pay_SingleBalBill/get_HPrice_BaseMaterHProcHSource")]
+        [HttpGet]
+        public object get_HPrice_BaseMaterHProcHSource(Int64 HMaterID, Int64 HProcID, Int64 HSourceID)
+        {
+            try
+            {
+                DAL.ClsGy_ProcPrice_Ctl oProcPrice = new DAL.ClsGy_ProcPrice_Ctl();
+                double HPrice = oProcPrice.LoadProcPrice(HMaterID, HProcID, HSourceID, true);
+
+                objJsonResult.code = "1";
+                objJsonResult.count = 1;
+                objJsonResult.Message = "Sucess锛�";
+                objJsonResult.data = HPrice;
+                return objJsonResult;
+            }
+            catch (Exception e)
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = e.ToString();
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+        }
+        #endregion
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        //---------------------------------------------------------------------------------------------鏃ф柟娉�
 
         #region 宸ヨ祫缁撶畻鍗曚釜浜�-鏌ヨ
         /// <summary>
@@ -1375,33 +1599,6 @@
                     objJsonResult.data = null;
                     return objJsonResult;
                 }
-            }
-        }
-        #endregion
-
-        #region 鏍规嵁鐗╂枡ID銆佸伐搴廔D銆佽祫婧怚D鑾峰彇宸ヤ环
-        [Route("Pay_SingleBalBill/get_HPrice_BaseMaterHProcHSource")]
-        [HttpGet]
-        public object get_HPrice_BaseMaterHProcHSource(Int64 HMaterID, Int64 HProcID, Int64 HSourceID)
-        {
-            try
-            {
-                DAL.ClsGy_ProcPrice_Ctl oProcPrice = new DAL.ClsGy_ProcPrice_Ctl();
-                double HPrice = oProcPrice.LoadProcPrice(HMaterID, HProcID, HSourceID, true);
-
-                objJsonResult.code = "1";
-                objJsonResult.count = 1;
-                objJsonResult.Message = "Sucess锛�";
-                objJsonResult.data = HPrice;
-                return objJsonResult;
-            }
-            catch(Exception e)
-            {
-                objJsonResult.code = "0";
-                objJsonResult.count = 0;
-                objJsonResult.Message = e.ToString();
-                objJsonResult.data = null;
-                return objJsonResult;
             }
         }
         #endregion
diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs"
index bceb379..82f7912 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs"
@@ -81,6 +81,14 @@
             public int HConWorkDays;
             public int HDepDays;
             public double HLastMoney;
+            public int HProjectClassID;
+            public string HBuildComp;
+            public string HBuildAddress;
+            public string HWorkNo;
+            public string HReDate;
+            public string HPicNo;
+            public string HWorkTask;
+            public string HProjectNote;
 
         }
         #endregion
@@ -225,7 +233,14 @@
                 int HMaterID = mainList[0].HMaterID;
                 string HUpdater = mainList[0].HUpdater;
                 string HUpdaterDate = mainList[0].HUpdaterDate;
-
+                int HProjectClassID = mainList[0].HProjectClassID;
+                string HBuildComp = mainList[0].HBuildComp;
+                string HBuildAddress = mainList[0].HBuildAddress;
+                string HWorkNo = mainList[0].HWorkNo;
+                string HReDate = mainList[0].HReDate;
+                string HPicNo = mainList[0].HPicNo;
+                string HWorkTask = mainList[0].HWorkTask;
+                string HProjectNote = mainList[0].HProjectNote;
                 if (OperationType == 2)
                 {
                     ds = oCN.RunProcReturn("select * from PM_ProjectBillMain where HBillNo ='" + HBillNo + "'", "PM_ProjectBillMain");
@@ -245,7 +260,7 @@
                 {
                     string sql = "insert into PM_ProjectBillMain" +
                         "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HBillStatus,HRemark,HMaker,HMakeDate,HProNumber,HProName,HCusID,HBeginDate,HEndDate,HSumMoney," +
-                        "HProMoney,HWorkMoney,HOtherMoney,HProType,HPMEmpID,HWorkEmpID,HDepEmpID,HConWorkDays,HDepDays,HLastMoney,HPayCusID,HOrgID,HMaterID) " +
+                        "HProMoney,HWorkMoney,HOtherMoney,HProType,HPMEmpID,HWorkEmpID,HDepEmpID,HConWorkDays,HDepDays,HLastMoney,HPayCusID,HOrgID,HMaterID,HProjectClassID,HBuildComp,HBuildAddress,HWorkNo,HReDate,HPicNo,HWorkTask,HProjectNote) " +
                         "values(" +
                         "" + HYear +
                         "," + HPeriod +
@@ -277,7 +292,15 @@
                         "," + HPayCusID +
                         "," + HOrgID +
                         "," + HMaterID +
-                        ")";
+                        "," + HProjectClassID +
+                        ",'" + HBuildComp +
+                        "','" + HBuildAddress +
+                        "','" + HWorkNo +
+                        "','" + HReDate +
+                        "','" + HPicNo +
+                        "','" + HWorkTask +
+                        "','" + HProjectNote +
+                        "')";
 
                     //涓昏〃
                     oCN.RunProc(sql);
@@ -316,7 +339,15 @@
                         ",HPayCusID = " + HPayCusID +
                         ",HOrgID = " + HOrgID +
                         ",HMaterID = " + HMaterID +
-                        " where HInterID = " + HInterID;
+                        ",HProjectClassID = " + HProjectClassID +
+                        ",HBuildComp = '" + HBuildComp +
+                        "',HBuildAddress = '" + HBuildAddress +
+                        "',HWorkNo = '" + HWorkNo +
+                        "',HReDate = '" + HReDate +
+                        "',HPicNo = '" + HPicNo +
+                        "',HWorkTask = '" + HWorkTask +
+                        "',HProjectNote ='" + HProjectNote +
+                        "' where HInterID = " + HInterID;
 
                     oCN.RunProc(sql);
 
diff --git a/WebAPI/DLL/ClsGy_ProjectClass_Ctl.cs b/WebAPI/DLL/ClsGy_ProjectClass_Ctl.cs
new file mode 100644
index 0000000..da7a2bf
--- /dev/null
+++ b/WebAPI/DLL/ClsGy_ProjectClass_Ctl.cs
@@ -0,0 +1,102 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+    public class ClsGy_ProjectClass_Ctl : DBUtility.ClsGy_Base_Ctl   
+    {
+        
+           SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+        //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+        public string HOldNumber;
+        public Model.ClsGy_ProjectClass_Model oModel = new Model.ClsGy_ProjectClass_Model();
+        //鏂板
+        public override bool AddNew()
+        {
+            //
+            try
+            {
+                oCn.BeginTran();
+                oCn.RunProc("Insert into " + MvarItemKey + " " +
+                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+                    ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID) " +
+                    " 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 + "','" +DateTime.Now+ "','" + oModel.HUSEORGID + "','" + oModel.HUseFlag + "','" + oModel.HMakeEmp+ "','" + oModel.HUSEORGID + "')", 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 + "'" +
+                    ",HHelpCode='" + oModel.HHelpCode + "'" +
+                    ",HModifyTime='" + DateTime.Now + "'" +   
+                    ",HUSEORGID='" + oModel.HUSEORGID + "'" +
+                    ",HModifyEmp ='" + oModel.HMakeEmp + "'" +
+                    ",HUseFlag='" + oModel.HUseFlag + "'" +
+                    ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+                    ",HRemark= '" + oModel.HRemark + "' 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_ProjectClass_Ctl()
+        {
+            MvarItemKey = "Gy_ProjectClass";
+            MvarReportTitle = "椤圭洰绫诲埆璁剧疆";
+            oModel = new Model.ClsGy_ProjectClass_Model();
+        }
+
+    
+
+    }
+}
diff --git a/WebAPI/DLL/ClsGy_TaskClass_Ctl.cs b/WebAPI/DLL/ClsGy_TaskClass_Ctl.cs
new file mode 100644
index 0000000..0b4f5b7
--- /dev/null
+++ b/WebAPI/DLL/ClsGy_TaskClass_Ctl.cs
@@ -0,0 +1,102 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace WebAPI.DLL
+{
+    public class ClsGy_TaskClass_Ctl : DBUtility.ClsGy_Base_Ctl   
+    {
+        
+           SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+        //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+        public string HOldNumber;
+        public Model.ClsGy_TaskClass_Model oModel = new Model.ClsGy_TaskClass_Model();
+        //鏂板
+        public override bool AddNew()
+        {
+            //
+            try
+            {
+                oCn.BeginTran();
+                oCn.RunProc("Insert into " + MvarItemKey + " " +
+                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+                    ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID) " +
+                    " 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 + "','" +DateTime.Now+ "','" + oModel.HUSEORGID + "','" + oModel.HUseFlag + "','" + oModel.HMakeEmp+ "','" + oModel.HUSEORGID + "')", 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 + "'" +
+                    ",HHelpCode='" + oModel.HHelpCode + "'" +
+                    ",HModifyTime='" + DateTime.Now + "'" +   
+                    ",HUSEORGID='" + oModel.HUSEORGID + "'" +
+                    ",HModifyEmp ='" + oModel.HMakeEmp + "'" +
+                    ",HUseFlag='" + oModel.HUseFlag + "'" +
+                    ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+                    ",HRemark= '" + oModel.HRemark + "' 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_TaskClass_Ctl()
+        {
+            MvarItemKey = "Gy_TaskClass";
+            MvarReportTitle = "浠诲姟绫诲埆璁剧疆";
+            oModel = new Model.ClsGy_TaskClass_Model();
+        }
+
+    
+
+    }
+}
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index fbcfa0c..6e44e80 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -1122,6 +1122,30 @@
             List<Model.ClsGy_ProjectMoney_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ProjectMoney_Model>>(jsonString);
             return list;
         }
+        
+        /// <summary>  
+        /// 澶勭悊鏂板椤圭洰绫诲埆琛ㄧ殑json
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsGy_ProjectClass_Model> getObjectByJson_Gy_ProjectClass(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsGy_ProjectClass_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ProjectClass_Model>>(jsonString);
+            return list;
+        }
+
+        /// <summary>  
+        /// 澶勭悊鏂板椤圭洰绫诲埆琛ㄧ殑json
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsGy_TaskClass_Model> getObjectByJson_Gy_TaskClass(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsGy_TaskClass_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_TaskClass_Model>>(jsonString);
+            return list;
+        }
 
         /// <summary>  
         /// 澶勭悊鏂板寮傚父鍙嶉鎺ユ敹鍗曡〃鐨刯son
@@ -1242,6 +1266,30 @@
         }
 
         /// <summary>
+        /// 澶勭悊瀹夌伅閫愮骇鍛煎惛瑙勫垯涓昏〃鐨刯son
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsOA_AndengFlowRuleBillMain> getObjectByJson_OA_AndengFlowRuleBill(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsOA_AndengFlowRuleBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsOA_AndengFlowRuleBillMain>>(jsonString);
+            return list;
+        }
+
+        /// <summary>
+        /// 澶勭悊瀹夌伅閫愮骇鍛煎惛瑙勫垯瀛愯〃鐨刯son
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsOA_AndengFlowRuleBillSub> getObjectByJson_OA_AndengFlowRuleBillSub(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsOA_AndengFlowRuleBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsOA_AndengFlowRuleBillSub>>(jsonString);
+            return list;
+        }
+
+        /// <summary>
         /// 澶勭悊鏂板憳宸ユ妧鑳芥竻鍗曚富琛ㄧ殑json
         /// </summary>
         /// <param name="jsonString"></param>
diff --git a/WebAPI/Models/Supplier.cs b/WebAPI/Models/Supplier.cs
index 5508933..766438b 100644
--- a/WebAPI/Models/Supplier.cs
+++ b/WebAPI/Models/Supplier.cs
@@ -73,6 +73,7 @@
 
         public long HUseOrgID { get; set; }
 
+        public string HMaterClass { get; set; }
 
     }
 }
\ No newline at end of file
diff --git "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Duty.cs" "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Duty.cs"
index 9988568..074e8e2 100644
--- "a/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Duty.cs"
+++ "b/WebAPI/Models/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Duty.cs"
@@ -18,5 +18,6 @@
         public string HHelpCode { get; set; }
         public bool HStopflag;
         public int HEndFlag;
+        public string HUserCode;
     }
 }
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index dfb4618..90d34b8 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
-    <History>True|2024-04-09T05:59:05.4840966Z;True|2024-04-09T13:32:04.5173492+08:00;True|2024-04-09T10:49:57.0288282+08:00;True|2024-04-09T10:35:48.8906018+08:00;True|2024-04-08T13:40:57.0220970+08:00;True|2024-04-08T13:07:43.0357658+08:00;True|2024-04-08T08:51:13.3450522+08:00;True|2024-04-07T17:08:21.7140078+08:00;True|2024-04-07T16:20:47.0957220+08:00;True|2024-04-07T15:40:03.2944629+08:00;True|2024-04-07T15:36:39.8472773+08:00;True|2024-04-07T15:27:41.4586445+08:00;True|2024-04-07T15:24:44.9945335+08:00;True|2024-04-07T15:21:05.5907054+08:00;True|2024-04-07T14:18:24.9260992+08:00;True|2024-04-02T15:07:56.8405115+08:00;True|2024-03-28T09:57:40.6534155+08:00;True|2024-03-26T17:00:21.0687635+08:00;True|2024-03-26T16:55:53.0643450+08:00;True|2024-03-26T16:50:09.5271078+08:00;True|2024-03-26T16:35:58.3572743+08:00;True|2024-03-26T16:17:50.6562874+08:00;True|2024-03-26T16:02:58.7193861+08:00;True|2024-03-26T15:51:50.2451468+08:00;True|2024-03-26T15:38:02.2327749+08:00;True|2024-03-26T14:43:01.5314209+08:00;True|2024-03-26T14:36:32.9149121+08:00;True|2024-03-26T14:29:28.7806186+08:00;True|2024-03-26T14:11:55.5737213+08:00;True|2024-03-22T16:35:11.0518345+08:00;True|2024-03-21T15:56:07.0130392+08:00;True|2024-03-20T10:50:05.8645964+08:00;True|2024-03-19T15:59:58.2960231+08:00;True|2024-03-19T15:16:32.3388913+08:00;True|2024-03-19T14:51:16.6428107+08:00;True|2024-03-19T14:36:08.8885745+08:00;False|2024-03-19T14:34:44.2637614+08:00;True|2024-03-19T14:22:40.5900691+08:00;True|2024-03-19T14:02:08.9599381+08:00;True|2024-03-19T12:23:05.0332761+08:00;True|2024-03-19T11:53:43.6830010+08:00;True|2024-03-19T11:40:05.7903841+08:00;True|2024-03-15T20:49:17.5076444+08:00;True|2024-03-15T14:00:52.3630660+08:00;True|2024-03-15T12:47:34.8092587+08:00;True|2024-03-15T09:58:23.5517006+08:00;True|2024-03-13T15:28:48.6170490+08:00;True|2024-03-13T13:33:44.3051955+08:00;True|2024-03-13T13:25:15.0372313+08:00;True|2024-03-13T11:59:44.2551502+08:00;True|2024-03-13T11:49:04.7295629+08:00;True|2024-03-13T11:27:27.5893712+08:00;True|2024-03-13T11:12:33.2533839+08:00;True|2024-03-13T11:07:52.7174473+08:00;True|2024-03-13T09:34:08.0467534+08:00;True|2024-03-12T16:24:41.1248271+08:00;True|2024-03-12T12:57:34.1524922+08:00;True|2024-03-12T12:57:10.0401874+08:00;True|2024-03-12T12:37:38.8477356+08:00;True|2024-03-12T12:15:41.3846937+08:00;True|2024-03-12T11:42:00.2207406+08:00;True|2024-03-12T11:33:55.6697043+08:00;True|2024-03-12T11:05:02.7742504+08:00;True|2024-03-12T09:20:07.0762374+08:00;True|2024-03-11T23:16:36.7669114+08:00;True|2024-03-11T23:03:24.2725545+08:00;True|2024-03-11T22:49:15.9602661+08:00;True|2024-03-11T22:47:12.6755805+08:00;True|2024-03-11T17:00:27.3523033+08:00;True|2024-03-11T16:58:40.0175971+08:00;True|2024-03-11T16:44:38.6622087+08:00;True|2024-03-11T12:49:04.1659271+08:00;True|2024-03-11T12:34:46.2212554+08:00;True|2024-03-11T12:04:40.4848855+08:00;True|2024-03-11T11:58:33.1825785+08:00;True|2024-03-11T11:40:10.6536678+08:00;True|2024-03-11T09:04:20.1073972+08:00;True|2024-03-11T00:16:54.5372850+08:00;True|2024-03-11T00:13:59.7140451+08:00;True|2024-03-11T00:08:20.0809329+08:00;True|2024-03-10T23:51:03.0931056+08:00;True|2024-03-10T23:43:22.2299872+08:00;True|2024-03-10T23:31:27.0629130+08:00;True|2024-03-10T22:56:31.1232852+08:00;True|2024-03-10T22:36:41.8541660+08:00;True|2024-03-10T22:15:06.0859435+08:00;True|2024-03-10T21:44:04.4157994+08:00;True|2024-03-10T21:35:38.3813654+08:00;True|2024-03-10T21:21:19.7693278+08:00;True|2024-03-10T13:19:26.4221274+08:00;True|2024-03-08T16:42:34.3346854+08:00;True|2024-03-08T15:50:13.7379672+08:00;True|2024-03-08T15:44:16.4369842+08:00;True|2024-03-08T15:31:50.0622199+08:00;True|2024-03-08T14:26:09.1090416+08:00;True|2024-03-08T14:21:24.9470581+08:00;True|2024-03-08T14:17:32.2780390+08:00;True|2024-03-08T14:03:55.4922720+08:00;True|2024-03-08T13:57:55.4217170+08:00;True|2024-03-08T13:53:43.0935554+08:00;True|2024-03-08T12:54:18.4199897+08:00;True|2024-03-08T12:48:07.6789814+08:00;True|2024-03-08T12:38:48.2818977+08:00;True|2024-03-08T12:21:53.9153553+08:00;True|2024-03-08T12:06:46.9343077+08:00;True|2024-03-08T11:27:39.0237720+08:00;True|2024-03-08T10:59:31.7184492+08:00;True|2024-03-08T10:57:44.8205869+08:00;True|2024-03-08T10:47:27.6962408+08:00;True|2024-03-08T10:29:25.8508156+08:00;True|2024-03-08T10:23:30.0269659+08:00;True|2024-03-08T09:21:21.5915181+08:00;True|2024-03-08T09:16:30.6962592+08:00;True|2024-03-07T17:01:33.5406097+08:00;True|2024-03-07T16:52:05.1956454+08:00;True|2024-03-07T16:41:54.0594859+08:00;True|2024-03-07T16:33:14.5796954+08:00;True|2024-03-07T16:02:27.6565800+08:00;True|2024-03-07T15:45:18.3220942+08:00;True|2024-03-07T15:39:48.9700962+08:00;True|2024-03-07T15:35:21.4018654+08:00;True|2024-03-07T15:22:12.7348197+08:00;True|2024-03-07T15:19:49.2338225+08:00;True|2024-03-07T13:46:05.5084885+08:00;True|2024-03-07T13:42:41.9749496+08:00;True|2024-03-07T13:26:04.1927588+08:00;True|2024-03-07T13:04:29.8689660+08:00;True|2024-03-07T10:24:34.3368602+08:00;True|2024-03-07T09:18:28.2279706+08:00;True|2024-03-06T17:25:36.9409421+08:00;True|2024-03-06T17:04:06.6361562+08:00;True|2024-03-06T14:42:01.3198359+08:00;True|2024-03-06T12:10:29.5231191+08:00;True|2024-03-06T12:03:06.7428246+08:00;True|2024-03-06T11:51:03.6220101+08:00;True|2024-03-06T11:15:22.4977600+08:00;True|2024-03-06T09:38:13.9161080+08:00;True|2024-03-05T16:37:49.9679062+08:00;True|2024-03-05T15:12:23.1933204+08:00;True|2024-03-05T14:51:27.9123344+08:00;True|2024-03-05T12:42:45.6186917+08:00;True|2024-03-05T11:21:19.0499458+08:00;True|2024-03-05T11:07:43.2642432+08:00;True|2024-03-05T09:59:18.0467522+08:00;True|2024-03-05T09:57:25.8947310+08:00;True|2024-03-04T16:41:44.4465908+08:00;True|2024-03-04T16:27:02.5887336+08:00;True|2024-03-04T16:20:05.0027599+08:00;True|2024-03-04T16:19:26.5595399+08:00;True|2024-03-04T15:32:55.6131853+08:00;True|2024-03-04T15:28:44.2800619+08:00;True|2024-03-04T14:54:47.0567440+08:00;True|2024-03-04T10:23:15.8222065+08:00;True|2024-03-03T17:36:33.1017612+08:00;True|2024-03-03T16:51:26.3227366+08:00;True|2024-02-26T09:58:28.3684127+08:00;True|2024-02-26T09:40:27.2127438+08:00;True|2024-02-26T09:30:29.4139007+08:00;True|2024-02-26T08:58:31.6305017+08:00;True|2024-02-26T08:50:25.3686785+08:00;True|2024-02-25T22:42:22.6699571+08:00;True|2024-02-25T21:40:08.7124742+08:00;True|2024-02-23T16:33:06.9165845+08:00;True|2024-02-23T15:20:24.6631954+08:00;True|2024-02-22T13:35:39.8097749+08:00;True|2024-02-22T10:50:51.2245040+08:00;True|2024-02-22T10:37:36.2007251+08:00;True|2024-02-22T10:28:43.0780061+08:00;True|2024-02-22T10:25:14.6494230+08:00;True|2024-02-22T10:22:55.9164843+08:00;True|2024-02-22T10:20:22.7986646+08:00;True|2024-02-22T10:09:31.7828474+08:00;True|2024-02-22T09:52:49.6576546+08:00;True|2024-02-22T09:49:40.2304782+08:00;True|2024-02-22T09:11:37.5212025+08:00;False|2024-02-22T09:11:00.5740908+08:00;True|2024-02-22T09:08:58.7725741+08:00;True|2024-02-21T16:50:09.9380590+08:00;True|2024-02-21T16:25:03.2145943+08:00;True|2024-02-21T16:23:13.6740659+08:00;True|2024-02-21T16:17:53.0411127+08:00;True|2024-02-21T15:57:47.2254175+08:00;True|2024-02-21T15:10:17.2222102+08:00;True|2024-02-21T15:05:10.2464943+08:00;True|2024-02-21T14:27:06.5305080+08:00;True|2024-02-21T14:23:20.9423346+08:00;True|2024-02-21T14:10:37.5156508+08:00;True|2024-02-21T13:54:04.4018306+08:00;True|2024-02-21T08:47:17.0019565+08:00;True|2024-02-20T16:26:31.2412659+08:00;True|2024-02-20T16:23:36.2983740+08:00;True|2024-02-20T16:20:39.9515902+08:00;True|2024-02-20T15:46:12.8212665+08:00;True|2024-02-20T14:58:17.4600086+08:00;True|2024-02-20T10:45:52.2417786+08:00;True|2024-02-20T10:42:11.8298929+08:00;True|2024-02-19T13:06:24.8957799+08:00;True|2024-02-19T11:05:28.0139278+08:00;True|2024-02-19T10:27:01.0810368+08:00;True|2024-02-19T10:22:57.4053027+08:00;True|2024-02-19T10:15:48.5706154+08:00;True|2024-02-19T10:12:02.9076965+08:00;True|2024-02-18T14:57:44.7521494+08:00;True|2024-02-18T14:50:56.3550941+08:00;True|2024-02-18T13:36:49.3942430+08:00;True|2024-02-07T14:06:25.4964506+08:00;True|2024-02-07T10:42:52.2689528+08:00;True|2024-02-06T10:58:49.3342902+08:00;True|2024-02-06T10:53:42.5435511+08:00;True|2024-02-06T10:43:40.1003756+08:00;True|2024-02-06T10:40:46.8233200+08:00;True|2024-02-06T10:17:28.2865591+08:00;True|2024-02-06T10:14:31.6896095+08:00;True|2024-02-06T09:24:29.8745590+08:00;True|2024-02-06T09:20:58.3166183+08:00;True|2024-02-06T09:12:14.4841167+08:00;True|2024-02-06T09:05:10.5375167+08:00;True|2024-02-05T14:51:09.8954604+08:00;True|2024-02-05T14:30:01.0098544+08:00;True|2024-02-05T14:26:49.2548141+08:00;True|2024-02-05T14:05:18.6839229+08:00;True|2024-02-05T13:23:42.1639710+08:00;True|2024-02-05T08:39:07.5523831+08:00;True|2024-02-04T15:09:19.2455417+08:00;True|2024-02-04T13:27:46.2086590+08:00;True|2024-02-04T13:25:20.9639903+08:00;True|2024-02-04T13:20:32.2870983+08:00;True|2024-02-04T13:15:58.3909970+08:00;True|2024-02-04T11:18:59.5180822+08:00;True|2024-02-04T11:07:31.1414636+08:00;True|2024-02-04T11:03:38.8431285+08:00;True|2024-02-04T11:00:42.8307675+08:00;True|2024-02-04T10:59:07.3767796+08:00;True|2024-02-04T10:55:27.9454328+08:00;True|2024-02-04T10:52:29.5988914+08:00;True|2024-02-04T10:50:30.6883153+08:00;True|2024-02-04T10:38:13.0058874+08:00;True|2024-02-04T10:25:53.1906810+08:00;True|2024-02-04T10:14:51.7442720+08:00;True|2024-02-04T10:12:34.4696662+08:00;True|2024-02-04T10:08:56.5805097+08:00;True|2024-02-04T10:07:16.4922026+08:00;True|2024-02-04T09:59:27.2102397+08:00;True|2024-02-04T09:56:42.2238395+08:00;True|2024-02-04T09:52:47.5348300+08:00;True|2024-02-04T09:42:50.9349205+08:00;True|2024-02-04T09:30:32.3567175+08:00;True|2024-02-04T09:19:29.8036670+08:00;True|2024-02-04T09:11:56.0744927+08:00;True|2024-02-04T09:08:42.4432795+08:00;True|2024-02-04T09:05:25.4958302+08:00;True|2024-02-04T08:58:59.7993464+08:00;True|2024-02-04T08:51:20.3017735+08:00;True|2024-02-04T08:43:05.6974823+08:00;True|2024-02-02T16:12:24.3288882+08:00;True|2024-02-02T15:31:12.0724234+08:00;True|2024-02-02T15:14:24.5493301+08:00;True|2024-02-02T15:08:42.0775469+08:00;True|2024-02-02T14:50:25.2357715+08:00;True|2024-02-02T14:48:40.1311047+08:00;True|2024-02-02T14:44:57.9831751+08:00;True|2024-02-02T14:28:12.0713915+08:00;True|2024-02-02T13:55:59.7389347+08:00;True|2024-02-02T13:10:32.7073682+08:00;True|2024-02-02T10:21:41.3665075+08:00;True|2024-02-02T10:08:11.1755065+08:00;True|2024-02-01T16:28:42.6016378+08:00;True|2024-02-01T16:25:35.2865491+08:00;True|2024-02-01T15:48:00.8333105+08:00;True|2024-02-01T15:39:22.9864096+08:00;True|2024-02-01T15:30:30.4856347+08:00;True|2024-02-01T14:34:14.9484851+08:00;True|2024-02-01T13:53:48.9165284+08:00;False|2024-02-01T13:52:39.1911001+08:00;True|2024-02-01T10:40:28.0735829+08:00;True|2024-02-01T10:24:04.5914096+08:00;True|2024-02-01T10:13:00.9882363+08:00;True|2024-01-31T14:56:37.7352718+08:00;True|2024-01-31T14:46:49.9104890+08:00;True|2024-01-31T14:38:56.1841731+08:00;True|2024-01-31T14:35:45.4531352+08:00;True|2024-01-31T14:32:21.5100137+08:00;True|2024-01-31T14:15:26.3231430+08:00;True|2024-01-31T14:00:11.3994150+08:00;True|2024-01-31T13:18:54.8448212+08:00;True|2024-01-31T10:52:59.8159114+08:00;True|2024-01-31T10:28:03.5856625+08:00;True|2024-01-31T10:10:35.0250398+08:00;True|2024-01-30T09:53:14.3256577+08:00;True|2024-01-30T09:43:56.5551157+08:00;True|2024-01-30T08:27:16.7078317+08:00;True|2024-01-29T15:42:55.3394104+08:00;True|2024-01-29T15:36:57.2998818+08:00;True|2024-01-29T15:09:49.3214409+08:00;True|2024-01-29T14:54:23.0025170+08:00;True|2024-01-29T14:33:53.5586728+08:00;True|2024-01-29T10:21:47.9469052+08:00;True|2024-01-29T09:38:26.0354836+08:00;True|2024-01-29T09:28:57.3836958+08:00;True|2024-01-29T09:19:49.0488968+08:00;True|2024-01-26T16:11:46.3859476+08:00;True|2024-01-26T16:11:29.8529136+08:00;True|2024-01-26T10:23:35.6167838+08:00;True|2024-01-26T10:16:04.2780085+08:00;True|2024-01-26T10:05:56.0745647+08:00;True|2024-01-26T10:03:34.8490957+08:00;True|2024-01-26T09:18:57.1502238+08:00;True|2024-01-26T09:05:18.6887593+08:00;True|2024-01-25T16:19:44.3753587+08:00;True|2024-01-25T10:54:55.2695117+08:00;True|2024-01-25T10:52:43.0130697+08:00;True|2024-01-25T10:15:35.2061116+08:00;True|2024-01-25T10:12:55.7724345+08:00;True|2024-01-25T09:59:14.7336333+08:00;True|2024-01-25T09:54:00.8951944+08:00;True|2024-01-23T11:57:00.6176481+08:00;True|2024-01-23T11:48:46.0536266+08:00;True|2024-01-23T11:20:56.9686760+08:00;True|2024-01-23T10:07:03.1874795+08:00;True|2024-01-23T09:28:09.7921197+08:00;True|2024-01-22T17:23:56.8011615+08:00;True|2024-01-22T15:39:51.8307512+08:00;True|2024-01-21T16:56:29.0470984+08:00;True|2024-01-21T16:31:58.1736344+08:00;True|2024-01-21T16:24:19.3683647+08:00;True|2024-01-21T16:02:26.5427715+08:00;True|2024-01-21T15:45:21.0549809+08:00;True|2024-01-21T15:24:46.6563331+08:00;True|2024-01-21T12:57:07.2655536+08:00;True|2024-01-21T11:43:22.1675745+08:00;True|2024-01-21T11:04:07.4676661+08:00;True|2024-01-21T11:03:11.6972981+08:00;True|2024-01-19T12:12:51.7315607+08:00;True|2024-01-19T12:03:23.7846341+08:00;True|2024-01-19T09:21:40.1191844+08:00;True|2024-01-18T15:28:59.1079108+08:00;True|2024-01-18T15:25:00.9561275+08:00;True|2024-01-18T15:19:13.0404548+08:00;True|2024-01-18T13:06:18.2756609+08:00;True|2024-01-18T12:00:29.1983965+08:00;True|2024-01-18T09:51:08.2157377+08:00;True|2024-01-18T09:49:33.8817410+08:00;True|2024-01-17T17:14:07.4523354+08:00;True|2024-01-17T13:46:19.2002783+08:00;True|2024-01-17T13:17:28.0156428+08:00;True|2024-01-17T11:23:28.7024207+08:00;True|2024-01-17T11:07:35.4966809+08:00;True|2024-01-17T10:25:34.7098037+08:00;True|2024-01-17T09:13:26.1252511+08:00;True|2024-01-16T15:33:15.8976694+08:00;True|2024-01-16T13:06:21.8159184+08:00;True|2024-01-16T12:55:14.9963186+08:00;True|2024-01-16T10:26:35.3866122+08:00;True|2024-01-16T10:25:44.1826112+08:00;True|2024-01-12T16:34:51.6106928+08:00;True|2024-01-12T13:14:24.0546049+08:00;True|2024-01-12T13:06:52.9089433+08:00;True|2024-01-12T12:39:48.1623736+08:00;True|2024-01-12T12:36:04.4644966+08:00;True|2024-01-12T10:22:40.9168937+08:00;True|2024-01-12T10:10:47.1460616+08:00;True|2024-01-12T10:05:40.4318518+08:00;True|2024-01-12T10:02:01.3964907+08:00;True|2024-01-12T09:57:23.5579846+08:00;True|2024-01-12T09:52:39.7735343+08:00;True|2024-01-12T09:49:01.7855687+08:00;True|2024-01-12T09:44:26.1839115+08:00;True|2024-01-12T09:40:23.9216298+08:00;True|2024-01-12T09:36:41.0590000+08:00;True|2024-01-12T09:32:36.5860825+08:00;True|2024-01-12T09:18:47.5635433+08:00;True|2024-01-11T16:44:34.1615374+08:00;True|2024-01-11T16:40:15.6664078+08:00;True|2024-01-11T16:35:55.1073771+08:00;True|2024-01-11T16:30:59.0648321+08:00;True|2024-01-11T16:11:06.5473983+08:00;True|2024-01-11T16:00:13.6441008+08:00;True|2024-01-11T15:46:51.9760680+08:00;True|2024-01-11T15:36:57.4756880+08:00;True|2024-01-11T15:31:04.1093476+08:00;True|2024-01-11T15:29:01.9270892+08:00;True|2024-01-11T15:21:23.5612459+08:00;True|2024-01-11T15:20:16.1944310+08:00;True|2024-01-11T15:13:32.1080230+08:00;True|2024-01-11T15:06:57.4237688+08:00;True|2024-01-11T15:05:37.5128999+08:00;True|2024-01-11T14:57:22.7751079+08:00;True|2024-01-11T14:11:04.8587579+08:00;True|2024-01-11T11:21:14.0243941+08:00;True|2024-01-11T11:15:09.4678297+08:00;True|2024-01-09T17:06:36.4675498+08:00;True|2024-01-09T17:02:20.7904461+08:00;False|2024-01-09T11:59:36.2734315+08:00;False|2024-01-09T11:59:30.0330023+08:00;True|2024-01-09T11:59:17.2965616+08:00;True|2024-01-08T13:52:05.1989624+08:00;True|2024-01-08T11:12:57.8687468+08:00;True|2024-01-05T14:51:14.7636988+08:00;True|2024-01-05T14:05:34.1084252+08:00;True|2024-01-05T13:23:32.7473731+08:00;True|2024-01-05T11:23:22.0038600+08:00;True|2024-01-05T08:30:07.8997370+08:00;True|2024-01-04T17:03:59.0070371+08:00;True|2024-01-04T16:35:53.2667600+08:00;True|2024-01-04T13:54:55.5474585+08:00;True|2024-01-04T10:22:53.2575575+08:00;True|2024-01-04T10:19:29.6305295+08:00;True|2024-01-04T10:13:33.8544729+08:00;True|2024-01-04T10:09:45.5777175+08:00;True|2024-01-03T15:38:30.3306310+08:00;True|2024-01-03T15:33:57.3631133+08:00;True|2024-01-03T15:10:07.3593774+08:00;True|2024-01-03T13:01:19.4751344+08:00;True|2024-01-03T11:25:06.5732437+08:00;True|2024-01-03T10:55:20.7518873+08:00;True|2024-01-03T10:40:15.0650254+08:00;True|2024-01-03T10:29:15.9327684+08:00;True|2024-01-03T09:34:04.8587473+08:00;True|2024-01-03T08:19:57.3625106+08:00;True|2023-12-29T16:46:23.7770752+08:00;True|2023-12-29T16:45:18.9092534+08:00;True|2023-12-29T16:40:16.7253697+08:00;True|2023-12-29T16:35:46.0906100+08:00;True|2023-12-29T16:19:46.4369159+08:00;True|2023-12-29T15:13:11.2466536+08:00;True|2023-12-29T15:08:16.1413948+08:00;True|2023-12-29T11:54:24.8686181+08:00;True|2023-12-29T10:54:38.1200087+08:00;True|2023-12-29T10:43:44.2132588+08:00;True|2023-12-29T10:23:35.9589067+08:00;True|2023-12-29T10:21:38.3438976+08:00;True|2023-12-29T10:16:16.7097491+08:00;True|2023-12-29T09:53:37.8863387+08:00;True|2023-12-27T14:41:20.6098455+08:00;True|2023-12-27T14:15:27.0538444+08:00;True|2023-12-27T13:07:04.0423436+08:00;True|2023-12-27T11:13:53.7170363+08:00;True|2023-12-27T10:59:32.5371257+08:00;True|2023-12-27T10:48:01.7326864+08:00;True|2023-12-26T09:13:22.3086191+08:00;True|2023-12-26T09:12:47.2137946+08:00;True|2023-12-25T12:22:46.8608633+08:00;True|2023-12-25T12:18:59.4402254+08:00;True|2023-12-25T12:11:03.2410147+08:00;True|2023-12-25T09:37:48.6741194+08:00;True|2023-12-25T09:37:03.2635243+08:00;True|2023-12-22T09:44:26.5356492+08:00;True|2023-12-21T16:58:23.0505653+08:00;True|2023-12-21T16:51:26.4945132+08:00;True|2023-12-21T16:48:53.6772071+08:00;True|2023-12-21T16:23:16.4577315+08:00;True|2023-12-21T16:22:38.6599138+08:00;True|2023-12-21T16:11:43.8422015+08:00;True|2023-12-21T15:45:42.5751240+08:00;True|2023-12-15T16:26:52.3591879+08:00;True|2023-12-15T16:22:25.0756865+08:00;True|2023-12-15T14:19:10.1362534+08:00;True|2023-12-15T14:15:47.5585902+08:00;True|2023-12-15T13:41:56.8875380+08:00;True|2023-12-13T00:13:19.2052917+08:00;True|2023-12-12T23:45:04.0751980+08:00;True|2023-12-12T23:33:28.8199619+08:00;True|2023-12-11T16:31:01.1694979+08:00;True|2023-12-11T15:47:51.2813632+08:00;True|2023-12-11T14:31:49.0572919+08:00;True|2023-12-11T11:45:11.2736360+08:00;True|2023-12-11T11:42:47.5744097+08:00;True|2023-12-11T11:41:16.3262612+08:00;True|2023-12-11T11:32:42.2722966+08:00;True|2023-12-11T11:25:22.8877561+08:00;True|2023-12-11T11:18:20.8210764+08:00;True|2023-12-11T11:16:52.0927831+08:00;True|2023-12-11T11:12:29.9473078+08:00;True|2023-12-10T16:43:56.1726039+08:00;True|2023-12-08T16:50:00.8823437+08:00;True|2023-12-08T14:59:10.2356691+08:00;True|2023-12-08T14:53:13.6038106+08:00;True|2023-12-08T14:51:33.9002713+08:00;True|2023-12-08T14:49:22.0867686+08:00;True|2023-12-08T14:45:05.4216954+08:00;True|2023-12-08T14:30:25.7790911+08:00;True|2023-12-08T14:26:26.1041925+08:00;True|2023-12-08T10:55:36.7338237+08:00;True|2023-12-08T10:24:01.5463359+08:00;True|2023-12-08T10:04:35.7996746+08:00;True|2023-12-08T09:59:17.1279949+08:00;True|2023-12-08T09:52:45.7941909+08:00;True|2023-12-08T09:51:26.7251883+08:00;True|2023-12-08T09:27:43.4049328+08:00;True|2023-12-08T09:12:16.7029758+08:00;True|2023-12-07T11:13:10.4285460+08:00;True|2023-12-01T14:35:34.0005130+08:00;True|2023-12-01T13:21:46.3327168+08:00;True|2023-12-01T13:04:28.4801319+08:00;True|2023-11-30T16:46:41.8793520+08:00;True|2023-11-30T16:04:49.7131798+08:00;True|2023-11-30T15:51:12.9846550+08:00;True|2023-11-30T12:52:06.3440387+08:00;True|2023-11-28T11:20:26.3599705+08:00;True|2023-11-28T09:43:48.5733385+08:00;True|2023-11-27T12:13:11.3038226+08:00;True|2023-11-27T11:54:35.3665327+08:00;True|2023-11-24T13:10:19.3181494+08:00;True|2023-11-24T09:52:10.7335160+08:00;True|2023-11-24T09:31:32.3926443+08:00;True|2023-11-22T13:30:50.3888837+08:00;True|2023-11-22T13:22:29.5388053+08:00;True|2023-11-22T12:14:49.7935345+08:00;True|2023-11-22T11:28:30.8047701+08:00;True|2023-11-20T12:04:07.1512783+08:00;True|2023-11-20T11:58:16.7337435+08:00;True|2023-11-20T11:03:24.3231922+08:00;True|2023-11-20T10:59:12.6367033+08:00;True|2023-11-20T10:33:56.2434367+08:00;True|2023-11-17T15:05:08.6847106+08:00;True|2023-11-17T10:29:33.0225444+08:00;True|2023-11-16T14:21:42.1686146+08:00;True|2023-11-16T13:16:34.1913128+08:00;True|2023-11-16T12:57:16.2850606+08:00;True|2023-11-16T11:11:31.8430891+08:00;True|2023-11-16T10:20:42.1252046+08:00;True|2023-11-16T10:18:14.1408709+08:00;True|2023-11-16T09:23:36.6628173+08:00;True|2023-11-15T14:28:33.3369087+08:00;True|2023-11-15T12:26:26.2137336+08:00;True|2023-11-15T12:25:16.0092237+08:00;True|2023-11-15T11:14:45.4326153+08:00;True|2023-11-15T09:02:00.2711268+08:00;True|2023-11-15T08:53:27.1187290+08:00;True|2023-11-14T18:54:52.3812819+08:00;True|2023-11-14T18:52:20.2229451+08:00;True|2023-11-14T17:55:59.0996386+08:00;True|2023-11-14T17:04:46.5334994+08:00;True|2023-11-14T15:02:42.0419908+08:00;True|2023-11-14T14:56:49.6970449+08:00;True|2023-11-14T13:18:29.4329574+08:00;True|2023-11-14T12:23:09.7978978+08:00;True|2023-11-13T16:16:20.9105084+08:00;True|2023-11-13T16:11:45.1099698+08:00;True|2023-11-13T13:16:02.1477662+08:00;True|2023-11-13T13:15:15.6182523+08:00;True|2023-11-13T11:11:21.7620762+08:00;True|2023-11-13T10:01:31.2619079+08:00;True|2023-11-13T09:18:34.3054349+08:00;True|2023-11-13T00:48:47.6800494+08:00;True|2023-11-13T00:42:22.9854286+08:00;True|2023-11-10T16:59:57.9013482+08:00;True|2023-11-10T13:56:10.1520148+08:00;True|2023-11-10T12:25:28.8978413+08:00;True|2023-11-10T12:04:30.4991249+08:00;True|2023-11-10T11:55:52.1921552+08:00;True|2023-11-10T11:39:33.1910863+08:00;True|2023-11-10T11:17:17.2050570+08:00;True|2023-11-10T10:31:48.8350379+08:00;True|2023-11-09T13:11:02.1210376+08:00;True|2023-11-09T11:04:23.6279742+08:00;True|2023-11-09T09:52:39.0767165+08:00;True|2023-11-09T09:45:47.5629254+08:00;True|2023-11-09T09:41:09.1121998+08:00;True|2023-11-09T09:34:16.8133121+08:00;True|2023-11-08T16:33:38.3080500+08:00;True|2023-11-08T16:14:37.9282566+08:00;True|2023-11-08T15:31:46.8084522+08:00;True|2023-11-08T14:27:48.2352711+08:00;True|2023-11-08T12:23:56.5235127+08:00;True|2023-11-08T11:41:12.7035010+08:00;True|2023-11-08T11:38:42.5318310+08:00;True|2023-11-08T10:18:43.5798164+08:00;True|2023-11-08T09:06:35.6712939+08:00;True|2023-11-08T08:57:36.1174660+08:00;True|2023-11-08T00:07:44.2585670+08:00;True|2023-11-06T23:28:53.2559097+08:00;True|2023-11-06T23:00:40.3059201+08:00;True|2023-11-06T21:14:59.0505998+08:00;True|2023-11-03T22:08:06.7984691+08:00;True|2023-11-03T20:33:47.8005656+08:00;True|2023-11-03T19:18:45.1406730+08:00;True|2023-11-03T14:56:44.7332321+08:00;True|2023-11-02T20:13:15.5530300+08:00;True|2023-11-02T19:22:24.9140752+08:00;True|2023-11-02T18:58:18.1198017+08:00;True|2023-11-01T18:31:39.9490440+08:00;True|2023-11-01T14:49:43.8703361+08:00;True|2023-11-01T14:38:44.8729900+08:00;True|2023-11-01T14:14:57.6507597+08:00;True|2023-11-01T13:04:09.9744075+08:00;True|2023-10-31T13:03:41.1902847+08:00;True|2023-10-31T11:29:03.3252294+08:00;True|2023-10-30T18:35:01.5128678+08:00;True|2023-10-30T18:25:01.6612244+08:00;True|2023-10-26T17:07:56.7081658+08:00;True|2023-10-18T16:20:51.8420951+08:00;True|2023-10-16T16:44:43.7908528+08:00;True|2023-10-16T11:17:09.2728375+08:00;True|2023-10-16T10:28:07.3397339+08:00;True|2023-10-16T10:26:35.6073358+08:00;True|2023-10-16T10:21:48.9925797+08:00;True|2023-10-13T11:26:05.2730047+08:00;True|2023-10-12T08:19:04.3028512+08:00;True|2023-10-11T20:40:21.6934217+08:00;True|2023-10-11T20:28:04.3302789+08:00;True|2023-10-11T20:16:51.2741909+08:00;True|2023-10-11T20:10:01.4624158+08:00;True|2023-10-11T15:32:40.9782838+08:00;True|2023-10-11T15:21:09.0531801+08:00;True|2023-10-11T15:05:59.9622196+08:00;True|2023-10-11T10:51:46.8571661+08:00;True|2023-10-11T10:41:25.5037704+08:00;True|2023-10-11T10:13:32.2604453+08:00;True|2023-10-11T10:05:52.2170423+08:00;True|2023-10-11T09:47:35.6578975+08:00;True|2023-10-11T09:44:31.2001499+08:00;True|2023-10-11T09:37:09.6904898+08:00;True|2023-10-10T10:18:33.1073992+08:00;True|2023-10-10T09:32:05.6384867+08:00;True|2023-10-10T09:15:26.4844254+08:00;True|2023-10-10T09:03:39.1497247+08:00;True|2023-10-10T08:56:14.9475607+08:00;True|2023-10-09T15:38:52.6561232+08:00;True|2023-10-09T14:22:16.0301342+08:00;True|2023-10-09T13:24:40.4941388+08:00;True|2023-10-09T10:30:48.0015664+08:00;True|2023-10-09T09:52:47.4626658+08:00;True|2023-10-08T14:21:13.7960780+08:00;True|2023-10-08T10:31:55.0337899+08:00;True|2023-10-08T08:24:13.2663041+08:00;True|2023-10-07T10:40:04.1716715+08:00;True|2023-10-07T09:51:11.1928375+08:00;True|2023-10-07T09:43:13.8042516+08:00;True|2023-09-28T15:45:01.2865878+08:00;True|2023-09-28T15:32:23.8179822+08:00;True|2023-09-28T14:37:03.1119806+08:00;True|2023-09-28T14:30:07.0877531+08:00;True|2023-09-28T14:01:36.5862373+08:00;True|2023-09-28T08:29:16.5989163+08:00;True|2023-09-28T08:12:23.3924898+08:00;True|2023-09-27T17:04:09.2538198+08:00;True|2023-09-27T16:38:03.8237948+08:00;True|2023-09-27T16:12:28.7977056+08:00;True|2023-09-27T15:56:03.7725704+08:00;True|2023-09-27T15:12:31.1298921+08:00;True|2023-09-27T15:05:14.4058045+08:00;True|2023-09-27T14:55:43.4423114+08:00;True|2023-09-27T14:33:26.2272014+08:00;True|2023-09-22T13:26:44.6246077+08:00;True|2023-09-22T11:14:50.9067626+08:00;True|2023-09-22T09:36:50.6912928+08:00;True|2023-09-22T09:26:38.2305802+08:00;True|2023-09-22T09:02:22.5400635+08:00;True|2023-09-20T17:20:27.9780370+08:00;True|2023-09-19T09:20:00.1269897+08:00;True|2023-09-19T09:10:18.4900723+08:00;True|2023-09-19T08:30:20.1709390+08:00;True|2023-09-18T15:43:28.1580264+08:00;True|2023-09-15T10:08:50.6367258+08:00;True|2023-09-14T17:17:10.7002185+08:00;True|2023-09-14T16:55:47.7782477+08:00;True|2023-09-14T14:05:25.9485449+08:00;False|2023-09-14T14:04:51.9423918+08:00;True|2023-09-12T09:37:17.5430590+08:00;True|2023-09-11T16:38:00.9834961+08:00;True|2023-09-11T13:04:08.1338596+08:00;True|2023-09-11T09:33:03.5400174+08:00;True|2023-09-08T15:34:46.6427039+08:00;True|2023-09-08T15:32:26.7896155+08:00;True|2023-09-08T14:07:16.6283055+08:00;True|2023-09-08T08:21:08.8368055+08:00;True|2023-09-08T08:07:29.5992984+08:00;True|2023-09-07T13:03:24.6924914+08:00;True|2023-09-07T11:02:02.9462467+08:00;True|2023-09-07T08:57:36.4913496+08:00;True|2023-09-07T08:55:57.3245545+08:00;True|2023-09-06T13:47:04.0563026+08:00;True|2023-09-06T13:42:27.3031938+08:00;True|2023-09-05T08:28:44.6193871+08:00;True|2023-09-04T20:42:09.4672710+08:00;True|2023-09-03T14:06:37.5079909+08:00;True|2023-09-02T18:58:24.1492192+08:00;True|2023-09-01T13:19:28.2779978+08:00;True|2023-09-01T08:40:54.0577358+08:00;True|2023-08-31T16:47:34.8462721+08:00;True|2023-08-31T14:49:39.9056564+08:00;True|2023-08-31T14:20:01.4071384+08:00;True|2023-08-31T11:25:29.0233052+08:00;True|2023-08-31T10:28:13.4933678+08:00;True|2023-08-31T10:21:52.6638820+08:00;True|2023-08-31T08:46:57.8782261+08:00;True|2023-08-31T08:46:08.4791004+08:00;True|2023-08-30T09:06:17.4001684+08:00;True|2023-08-30T08:52:06.9481657+08:00;True|2023-08-29T17:11:33.7851914+08:00;True|2023-08-29T16:58:52.7298807+08:00;True|2023-08-29T15:58:23.4205277+08:00;True|2023-08-29T15:56:40.3534593+08:00;True|2023-08-29T15:54:29.1188567+08:00;True|2023-08-29T15:53:27.9719983+08:00;True|2023-08-29T15:52:38.7670005+08:00;True|2023-08-29T15:51:32.3703092+08:00;True|2023-08-29T15:47:38.5198946+08:00;True|2023-08-29T15:46:17.4698017+08:00;True|2023-08-29T15:42:04.1853400+08:00;True|2023-08-29T15:29:28.1098681+08:00;True|2023-08-29T15:18:40.8587286+08:00;True|2023-08-29T14:47:50.3088948+08:00;True|2023-08-29T14:47:27.6552611+08:00;False|2023-08-28T13:59:37.8725670+08:00;True|2023-08-18T13:23:38.9937084+08:00;True|2023-08-18T10:09:51.5247737+08:00;True|2023-08-18T08:26:21.8473123+08:00;True|2023-08-17T08:31:37.8696349+08:00;True|2023-08-17T08:23:59.5658185+08:00;True|2023-08-17T08:07:38.2174684+08:00;True|2023-08-16T16:49:44.2549852+08:00;True|2023-08-16T16:33:59.9298792+08:00;True|2023-08-16T15:35:29.6092783+08:00;True|2023-08-16T11:17:28.1086751+08:00;True|2023-08-16T11:17:22.3814672+08:00;True|2023-08-16T08:44:16.0941179+08:00;True|2023-08-15T15:29:15.8118269+08:00;True|2023-08-15T14:47:06.4963591+08:00;True|2023-08-11T16:49:35.8718314+08:00;True|2023-08-11T14:22:59.9440967+08:00;True|2023-08-11T14:16:25.0940743+08:00;True|2023-08-11T13:27:25.4148450+08:00;True|2023-08-11T09:08:31.5437265+08:00;True|2023-08-11T09:04:38.4540336+08:00;True|2023-08-10T14:11:07.0042283+08:00;True|2023-08-08T13:48:19.2402267+08:00;True|2023-08-08T13:44:15.6796969+08:00;True|2023-07-27T09:46:14.1491814+08:00;True|2023-07-21T11:13:10.0843656+08:00;True|2023-07-21T10:56:47.5835580+08:00;True|2023-07-21T10:30:33.0113443+08:00;True|2023-07-20T19:16:37.4936135+08:00;True|2023-07-20T19:00:41.0636578+08:00;True|2023-07-19T13:28:27.8671371+08:00;True|2023-07-19T13:23:42.1880500+08:00;True|2023-07-19T13:19:18.7201227+08:00;True|2023-07-19T13:06:38.9897249+08:00;True|2023-07-19T12:13:11.2061059+08:00;True|2023-07-19T11:45:20.0391356+08:00;True|2023-07-19T11:24:02.5425841+08:00;True|2023-07-19T10:32:06.7915754+08:00;True|2023-07-19T09:51:08.4553434+08:00;True|2023-07-19T09:48:11.2977426+08:00;True|2023-07-18T08:47:44.1724897+08:00;True|2023-07-17T16:25:10.8982872+08:00;True|2023-07-17T14:50:44.3708198+08:00;True|2023-07-17T14:20:26.4686898+08:00;True|2023-07-17T14:18:16.6127136+08:00;True|2023-07-17T14:16:34.9116950+08:00;True|2023-07-17T14:14:44.7988846+08:00;True|2023-07-17T14:06:18.1123806+08:00;True|2023-07-17T14:03:38.5290433+08:00;True|2023-07-17T13:48:54.3096778+08:00;True|2023-07-17T13:23:13.6097762+08:00;True|2023-07-17T09:54:25.9375716+08:00;True|2023-07-17T09:40:22.2531559+08:00;True|2023-07-17T09:21:15.0786649+08:00;True|2023-07-17T09:03:37.2081513+08:00;True|2023-07-16T21:20:45.3036514+08:00;True|2023-07-16T21:09:16.1559694+08:00;True|2023-07-16T21:05:22.2504644+08:00;True|2023-07-16T20:41:26.5956030+08:00;True|2023-07-16T20:19:33.5726613+08:00;True|2023-07-16T19:46:38.6493518+08:00;True|2023-07-14T10:33:17.6270692+08:00;True|2023-07-11T14:34:22.8852169+08:00;True|2023-07-11T14:27:22.7851108+08:00;True|2023-07-11T14:13:21.6512172+08:00;True|2023-07-11T14:06:33.9865646+08:00;True|2023-07-11T13:52:46.2830836+08:00;True|2023-07-11T13:38:56.3165889+08:00;True|2023-07-11T13:29:40.9636697+08:00;True|2023-07-11T13:25:23.0633788+08:00;True|2023-07-11T10:17:40.8002359+08:00;True|2023-07-11T10:15:47.5472709+08:00;True|2023-07-11T10:12:25.6440547+08:00;True|2023-07-11T10:07:39.3716167+08:00;True|2023-07-11T09:22:07.4191357+08:00;True|2023-07-04T13:07:10.1209516+08:00;True|2023-06-30T16:11:25.7541580+08:00;True|2023-06-30T15:39:26.6678989+08:00;True|2023-06-30T15:26:40.6581344+08:00;True|2023-06-30T15:12:57.9906312+08:00;True|2023-06-29T16:39:15.6477820+08:00;True|2023-06-28T17:01:51.9542466+08:00;True|2023-06-27T15:03:28.1320450+08:00;True|2023-06-27T13:36:39.6707848+08:00;True|2023-06-26T09:40:01.1754706+08:00;True|2023-06-25T12:16:28.9080024+08:00;True|2023-06-25T11:51:59.9238461+08:00;True|2023-06-25T11:50:29.3100358+08:00;True|2023-06-25T11:29:28.5338563+08:00;True|2023-06-25T09:10:26.2420288+08:00;True|2023-06-25T09:08:15.0702872+08:00;True|2023-06-25T08:43:15.0806611+08:00;True|2023-06-25T08:41:41.8156616+08:00;True|2023-06-25T08:39:30.6818013+08:00;True|2023-06-25T08:38:18.5996529+08:00;True|2023-06-25T08:36:34.1479706+08:00;True|2023-06-25T08:34:53.9856289+08:00;True|2023-06-25T08:31:24.0298080+08:00;True|2023-06-25T08:15:45.7453280+08:00;True|2023-06-25T08:01:52.7609075+08:00;True|2023-06-24T21:25:23.8938665+08:00;True|2023-06-22T03:02:26.7305758+08:00;True|2023-06-22T02:10:48.8222890+08:00;True|2023-06-22T01:57:41.7875184+08:00;True|2023-06-22T01:52:19.4217362+08:00;True|2023-06-21T16:27:15.1464129+08:00;True|2023-06-21T16:11:46.6111817+08:00;True|2023-06-21T13:14:00.6869253+08:00;True|2023-06-21T13:09:28.2689225+08:00;True|2023-06-21T12:24:02.6762426+08:00;True|2023-06-21T12:18:06.2748924+08:00;True|2023-06-21T11:18:02.6754143+08:00;True|2023-06-21T11:08:34.2149469+08:00;True|2023-06-21T08:20:50.0079906+08:00;True|2023-06-20T15:56:03.2638713+08:00;True|2023-06-20T15:48:38.2419545+08:00;True|2023-06-20T15:35:26.6615171+08:00;True|2023-06-20T15:20:31.9284860+08:00;True|2023-06-20T15:18:39.8265469+08:00;True|2023-06-20T15:09:16.7617272+08:00;True|2023-06-20T09:53:23.2658672+08:00;True|2023-06-16T10:00:58.0337616+08:00;True|2023-06-16T09:47:58.8912904+08:00;True|2023-06-16T09:26:36.4914832+08:00;True|2023-06-15T16:22:21.4509393+08:00;True|2023-06-12T13:21:12.0491357+08:00;True|2023-06-12T10:18:32.9287587+08:00;True|2023-06-09T16:22:24.1132267+08:00;True|2023-06-08T18:12:42.4814009+08:00;True|2023-06-08T11:08:48.0533571+08:00;True|2023-06-08T10:41:43.0121701+08:00;False|2023-06-08T10:40:19.2093235+08:00;True|2023-06-06T13:03:50.8124200+08:00;True|2023-06-05T10:12:24.1858209+08:00;True|2023-06-02T17:02:57.5817094+08:00;True|2023-05-26T13:54:40.2272218+08:00;True|2023-05-24T12:43:50.2427994+08:00;True|2023-05-24T12:34:24.3922836+08:00;True|2023-05-24T10:07:19.4995219+08:00;True|2023-05-24T09:21:29.1960080+08:00;True|2023-05-23T22:34:23.3220912+08:00;True|2023-05-23T22:01:14.4175449+08:00;True|2023-05-23T17:02:53.0308400+08:00;True|2023-05-23T16:30:11.7138623+08:00;True|2023-05-23T15:51:50.0152484+08:00;True|2023-05-23T15:50:52.0657433+08:00;True|2023-05-23T15:28:25.5802377+08:00;True|2023-05-23T15:25:56.4633020+08:00;True|2023-05-23T14:52:29.8759921+08:00;True|2023-05-23T14:48:44.6519763+08:00;True|2023-05-20T04:28:10.3108871+08:00;True|2023-05-20T03:56:22.7233820+08:00;True|2023-05-20T03:47:38.4405026+08:00;True|2023-05-20T03:46:40.6056451+08:00;True|2023-05-20T03:44:25.0883888+08:00;True|2023-05-20T03:41:10.1148691+08:00;True|2023-05-20T02:34:14.3757035+08:00;True|2023-05-20T02:27:50.5595075+08:00;True|2023-05-20T02:23:04.2256041+08:00;True|2023-05-20T01:46:59.9534021+08:00;True|2023-05-20T01:42:33.5106065+08:00;True|2023-05-20T01:40:39.6918060+08:00;True|2023-05-20T01:11:47.7436847+08:00;True|2023-05-20T01:03:58.9476094+08:00;True|2023-05-19T22:59:47.4591129+08:00;True|2023-05-19T22:34:44.7988447+08:00;True|2023-05-19T22:24:55.2320279+08:00;True|2023-05-19T21:40:19.5285575+08:00;True|2023-05-19T21:38:21.2073338+08:00;True|2023-05-19T20:54:59.2058809+08:00;True|2023-05-19T16:08:15.0151080+08:00;True|2023-05-19T15:26:16.2836301+08:00;True|2023-05-19T13:09:06.1592914+08:00;True|2023-05-19T12:24:23.6252771+08:00;True|2023-05-19T11:50:53.8948740+08:00;True|2023-05-19T11:43:57.9296933+08:00;True|2023-05-19T10:44:34.9904463+08:00;True|2023-05-19T09:32:02.1216663+08:00;False|2023-05-19T09:31:06.4251757+08:00;True|2023-05-18T22:34:36.5292968+08:00;True|2023-05-18T20:37:59.7940567+08:00;True|2023-05-18T20:36:35.2790349+08:00;True|2023-05-18T20:34:10.7400457+08:00;True|2023-05-18T20:32:43.8790879+08:00;True|2023-05-18T20:31:13.5389643+08:00;True|2023-05-18T20:29:19.6206139+08:00;True|2023-05-18T20:07:25.5074263+08:00;True|2023-05-18T18:19:43.5324315+08:00;True|2023-05-18T18:15:36.4290026+08:00;True|2023-05-18T18:12:31.8703551+08:00;True|2023-05-18T18:10:52.9289531+08:00;True|2023-05-18T18:09:23.9118797+08:00;True|2023-05-18T17:58:30.8068228+08:00;True|2023-05-18T17:56:55.8055382+08:00;False|2023-05-18T17:54:54.7950789+08:00;False|2023-05-18T17:11:18.2325105+08:00;True|2023-05-18T17:09:24.4186482+08:00;True|2023-05-18T17:06:32.0699130+08:00;False|2023-05-18T17:01:41.8164925+08:00;False|2023-05-18T16:59:32.1112741+08:00;True|2023-05-18T16:58:34.1784100+08:00;True|2023-05-18T16:56:36.9460541+08:00;True|2023-05-18T16:55:00.9843495+08:00;True|2023-05-18T16:49:04.0161640+08:00;True|2023-05-18T16:48:28.9011382+08:00;True|2023-05-18T16:44:52.0675900+08:00;False|2023-05-18T16:44:37.3514214+08:00;False|2023-05-18T16:43:23.3343369+08:00;True|2023-05-18T16:41:35.8818611+08:00;True|2023-05-18T16:25:43.5167900+08:00;False|2023-05-18T16:24:46.6646890+08:00;False|2023-05-18T16:19:55.4153618+08:00;False|2023-05-18T16:16:18.0052881+08:00;False|2023-05-18T16:14:32.3377278+08:00;True|2023-05-17T15:43:45.1868569+08:00;True|2023-05-17T15:35:42.2476880+08:00;True|2023-05-17T14:23:28.2390957+08:00;True|2023-05-17T13:54:00.6756387+08:00;True|2023-05-17T13:45:46.1115068+08:00;True|2023-05-17T07:57:34.7129429+08:00;True|2023-05-16T16:04:20.3198005+08:00;False|2023-05-16T16:03:52.0737233+08:00;True|2023-05-16T15:28:45.4945726+08:00;True|2023-05-16T15:14:10.4952128+08:00;True|2023-05-16T15:04:46.5706346+08:00;True|2023-05-16T14:46:48.7034492+08:00;True|2023-05-16T14:45:29.4047499+08:00;True|2023-05-16T14:42:47.3507679+08:00;True|2023-05-16T14:30:47.9199224+08:00;True|2023-05-16T14:29:10.9147184+08:00;True|2023-05-16T14:27:48.3632687+08:00;True|2023-05-16T14:24:44.6240034+08:00;True|2023-05-16T14:19:41.2962188+08:00;True|2023-05-16T13:41:13.3366211+08:00;True|2023-05-16T13:26:44.1532655+08:00;True|2023-05-16T13:23:40.2882422+08:00;True|2023-05-16T13:11:41.5416792+08:00;True|2023-05-16T13:08:41.6341863+08:00;True|2023-05-16T13:04:35.6916867+08:00;True|2023-05-16T13:00:34.6889598+08:00;True|2023-05-16T12:57:48.4561274+08:00;True|2023-05-16T12:50:57.7405833+08:00;True|2023-05-16T12:49:33.8394829+08:00;True|2023-05-16T12:44:28.6906226+08:00;True|2023-05-16T12:41:08.3554032+08:00;True|2023-05-16T12:32:32.3448036+08:00;True|2023-05-16T11:32:04.4504376+08:00;True|2023-05-15T18:39:28.9172042+08:00;True|2023-05-15T18:35:41.5268755+08:00;True|2023-05-15T18:16:16.2900985+08:00;True|2023-04-28T16:24:40.7430596+08:00;False|2023-04-28T16:21:34.8499384+08:00;True|2023-04-28T15:43:40.3023318+08:00;True|2023-04-28T15:41:18.8228620+08:00;True|2023-04-28T14:16:21.1595325+08:00;True|2023-04-28T10:27:55.2150739+08:00;True|2023-04-12T16:25:26.5218825+08:00;True|2023-04-12T15:45:29.3993255+08:00;True|2023-04-12T14:00:18.1960878+08:00;True|2023-04-12T13:16:39.0804178+08:00;True|2023-04-11T11:02:27.5200402+08:00;True|2023-04-11T09:57:11.5903829+08:00;True|2023-04-10T09:58:01.1775220+08:00;True|2023-03-13T11:19:32.0927720+08:00;True|2023-03-13T10:39:50.9250037+08:00;True|2023-03-13T08:54:57.5891390+08:00;True|2023-03-10T09:00:31.2441735+08:00;True|2023-03-08T08:25:11.1877416+08:00;True|2023-03-06T09:18:03.5502956+08:00;True|2023-03-06T09:14:57.8192971+08:00;True|2023-01-11T13:30:27.8190489+08:00;True|2023-01-06T14:29:14.6067256+08:00;True|2022-12-23T17:06:52.0688439+08:00;True|2022-12-23T16:12:04.4155951+08:00;True|2022-12-23T13:35:44.6439326+08:00;True|2022-11-30T08:24:02.9999976+08:00;True|2022-11-30T08:01:51.4579972+08:00;True|2022-11-29T21:32:14.4359673+08:00;True|2022-11-29T19:30:22.9466023+08:00;True|2022-11-29T19:24:30.1630119+08:00;True|2022-11-29T17:31:43.1926801+08:00;True|2022-11-29T17:14:32.5869985+08:00;True|2022-11-29T10:42:57.1877576+08:00;True|2022-11-27T14:40:28.4784748+08:00;True|2022-11-26T20:49:34.2789400+08:00;True|2022-11-26T19:24:58.9988205+08:00;True|2022-11-26T15:33:08.6274944+08:00;True|2022-11-26T14:37:46.3953592+08:00;True|2022-11-26T09:16:41.7487240+08:00;True|2022-11-24T09:49:50.7302637+08:00;True|2022-11-23T16:24:56.5946914+08:00;True|2022-11-23T16:19:57.5570583+08:00;True|2022-11-23T15:05:13.8032246+08:00;True|2022-11-22T20:24:39.7324815+08:00;True|2022-11-22T13:18:16.2143925+08:00;False|2022-11-22T13:12:53.0448580+08:00;True|2022-11-22T11:03:01.7571733+08:00;True|2022-11-21T13:20:11.1961237+08:00;True|2022-11-21T13:13:52.0360749+08:00;True|2022-11-18T15:48:13.0747365+08:00;True|2022-11-18T14:15:54.5626901+08:00;True|2022-11-17T18:41:26.5464503+08:00;True|2022-11-15T13:55:35.3496366+08:00;True|2022-11-15T11:03:23.6773297+08:00;True|2022-11-15T10:58:47.9703720+08:00;True|2022-11-15T10:12:27.8305782+08:00;True|2022-11-15T09:47:26.7480777+08:00;True|2022-11-15T08:55:44.0275263+08:00;True|2022-11-15T08:54:06.6396851+08:00;True|2022-11-15T08:44:18.2013404+08:00;True|2022-11-15T01:16:19.8154538+08:00;True|2022-11-15T01:15:03.7846810+08:00;True|2022-11-15T01:01:11.0318599+08:00;True|2022-11-15T00:30:33.7148460+08:00;True|2022-11-15T00:15:26.5178283+08:00;True|2022-11-14T23:54:32.6128172+08:00;True|2022-11-14T23:26:52.0335380+08:00;True|2022-11-14T22:21:28.0622050+08:00;True|2022-11-14T21:47:43.6964619+08:00;True|2022-11-14T21:41:42.3128804+08:00;True|2022-11-14T21:31:17.2784203+08:00;True|2022-11-14T20:48:20.0380343+08:00;True|2022-11-11T17:24:44.7029993+08:00;True|2022-11-11T16:47:29.3444029+08:00;True|2022-11-11T16:07:26.4718473+08:00;True|2022-11-11T15:52:41.7235701+08:00;True|2022-11-10T15:58:10.8883176+08:00;True|2022-11-10T15:29:59.3113740+08:00;True|2022-11-10T13:34:14.7380132+08:00;True|2022-11-10T10:28:02.1166569+08:00;True|2022-11-09T23:28:25.6401971+08:00;True|2022-11-09T16:20:53.2757536+08:00;True|2022-11-09T16:16:41.3169214+08:00;True|2022-11-09T14:02:55.1802832+08:00;True|2022-11-09T13:57:55.2726154+08:00;True|2022-11-09T13:28:53.2022669+08:00;True|2022-11-09T13:10:58.0740163+08:00;True|2022-11-09T12:59:42.2328933+08:00;True|2022-11-09T11:54:08.0187924+08:00;True|2022-11-09T11:49:32.4296758+08:00;True|2022-11-09T11:34:32.6613370+08:00;True|2022-11-09T11:06:56.9443306+08:00;True|2022-11-06T23:43:44.0833657+08:00;True|2022-11-06T23:29:52.0088244+08:00;True|2022-11-06T22:06:14.7091464+08:00;True|2022-11-06T22:03:25.2696951+08:00;True|2022-11-06T21:58:50.1055520+08:00;True|2022-11-06T21:54:14.0075395+08:00;True|2022-11-06T21:39:30.2652105+08:00;True|2022-11-04T15:54:37.9813194+08:00;True|2022-11-04T15:43:59.7702621+08:00;True|2022-11-04T13:59:29.3941234+08:00;True|2022-11-04T13:44:18.1212719+08:00;True|2022-11-04T13:42:06.1010393+08:00;True|2022-11-04T13:37:01.7814703+08:00;True|2022-11-04T13:35:43.1121709+08:00;True|2022-11-04T13:33:05.1362535+08:00;True|2022-11-04T13:30:11.1113703+08:00;True|2022-11-04T13:28:53.7185382+08:00;True|2022-11-04T13:27:08.0691684+08:00;True|2022-11-04T13:20:46.2297633+08:00;True|2022-11-04T13:17:57.1564250+08:00;True|2022-11-04T13:15:36.3651019+08:00;True|2022-11-04T13:13:44.6635701+08:00;True|2022-11-04T13:12:02.3968306+08:00;True|2022-11-04T13:08:07.7653927+08:00;True|2022-11-04T11:37:44.1975649+08:00;True|2022-11-04T11:36:20.3813848+08:00;True|2022-11-04T11:26:40.9713465+08:00;True|2022-11-04T10:17:36.4269558+08:00;True|2022-11-04T09:47:05.4607111+08:00;True|2022-11-04T09:28:27.9347785+08:00;True|2022-11-04T08:38:38.5253737+08:00;True|2022-11-03T13:31:32.7883545+08:00;False|2022-11-03T13:27:07.8579021+08:00;True|2022-11-03T11:07:07.3903101+08:00;True|2022-11-03T10:54:26.7818816+08:00;True|2022-11-03T10:35:59.1956262+08:00;True|2022-11-03T10:30:07.0651285+08:00;True|2022-11-03T10:01:20.8467911+08:00;True|2022-08-22T11:13:33.9211829+08:00;True|2022-06-17T11:19:24.4893458+08:00;True|2022-06-07T14:44:51.5702202+08:00;True|2022-06-07T14:42:44.8351600+08:00;True|2022-05-17T14:19:55.1158182+08:00;True|2022-05-17T13:25:44.2886247+08:00;True|2022-05-17T10:29:26.6813564+08:00;True|2022-05-17T09:02:49.1742018+08:00;True|2022-05-06T15:13:12.2438900+08:00;True|2022-05-06T14:49:39.8536594+08:00;True|2022-04-22T17:07:44.8823529+08:00;True|2022-04-19T19:13:40.8312746+08:00;True|2022-04-19T15:40:16.0022040+08:00;True|2022-04-19T15:13:32.9767736+08:00;False|2022-04-19T15:08:33.6507639+08:00;True|2022-04-19T15:02:51.9580210+08:00;True|2022-04-19T13:54:18.7579131+08:00;True|2022-04-12T10:36:02.1779173+08:00;True|2022-04-12T10:05:31.0222037+08:00;True|2022-04-12T09:47:49.3724819+08:00;True|2022-04-09T15:08:54.5697468+08:00;True|2022-04-08T17:31:31.0046258+08:00;True|2022-04-08T16:50:41.3018422+08:00;True|2022-04-08T10:35:36.5029980+08:00;True|2022-03-31T09:38:37.3646053+08:00;True|2022-03-29T13:57:45.4410942+08:00;True|2022-03-10T18:59:23.7994337+08:00;True|2022-03-10T18:52:39.5019082+08:00;True|2022-03-10T18:51:12.7949284+08:00;True|2022-03-10T18:50:47.2024177+08:00;True|2022-03-10T18:45:08.8409380+08:00;True|2022-03-10T18:41:17.0102564+08:00;True|2022-03-10T18:35:49.0742353+08:00;True|2022-03-10T17:57:47.4196965+08:00;True|2022-03-10T17:34:27.5723245+08:00;True|2022-03-10T16:13:59.3829164+08:00;True|2022-03-09T14:50:49.1222033+08:00;True|2022-03-09T11:21:03.0073651+08:00;False|2022-03-09T11:16:56.1792896+08:00;False|2022-03-09T11:16:49.7923320+08:00;True|2022-03-08T15:47:47.4722336+08:00;True|2022-03-08T15:47:28.5397115+08:00;True|2022-03-08T15:37:08.7379870+08:00;True|2022-03-02T17:37:54.4659976+08:00;True|2022-03-02T17:34:12.2949726+08:00;True|2022-03-02T17:26:38.7070673+08:00;True|2022-03-02T17:07:49.7024316+08:00;True|2022-03-02T17:05:22.4177336+08:00;True|2022-03-02T16:14:57.9880587+08:00;True|2022-03-01T17:52:52.6766959+08:00;True|2022-02-28T14:36:22.6449303+08:00;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;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>
+    <History>True|2024-04-20T12:55:50.0767203Z;True|2024-04-20T20:35:06.1422595+08:00;True|2024-04-20T20:14:35.8985582+08:00;True|2024-04-09T13:59:05.4840966+08:00;True|2024-04-09T13:32:04.5173492+08:00;True|2024-04-09T10:49:57.0288282+08:00;True|2024-04-09T10:35:48.8906018+08:00;True|2024-04-08T13:40:57.0220970+08:00;True|2024-04-08T13:07:43.0357658+08:00;True|2024-04-08T08:51:13.3450522+08:00;True|2024-04-07T17:08:21.7140078+08:00;True|2024-04-07T16:20:47.0957220+08:00;True|2024-04-07T15:40:03.2944629+08:00;True|2024-04-07T15:36:39.8472773+08:00;True|2024-04-07T15:27:41.4586445+08:00;True|2024-04-07T15:24:44.9945335+08:00;True|2024-04-07T15:21:05.5907054+08:00;True|2024-04-07T14:18:24.9260992+08:00;True|2024-04-02T15:07:56.8405115+08:00;True|2024-03-28T09:57:40.6534155+08:00;True|2024-03-26T17:00:21.0687635+08:00;True|2024-03-26T16:55:53.0643450+08:00;True|2024-03-26T16:50:09.5271078+08:00;True|2024-03-26T16:35:58.3572743+08:00;True|2024-03-26T16:17:50.6562874+08:00;True|2024-03-26T16:02:58.7193861+08:00;True|2024-03-26T15:51:50.2451468+08:00;True|2024-03-26T15:38:02.2327749+08:00;True|2024-03-26T14:43:01.5314209+08:00;True|2024-03-26T14:36:32.9149121+08:00;True|2024-03-26T14:29:28.7806186+08:00;True|2024-03-26T14:11:55.5737213+08:00;True|2024-03-22T16:35:11.0518345+08:00;True|2024-03-21T15:56:07.0130392+08:00;True|2024-03-20T10:50:05.8645964+08:00;True|2024-03-19T15:59:58.2960231+08:00;True|2024-03-19T15:16:32.3388913+08:00;True|2024-03-19T14:51:16.6428107+08:00;True|2024-03-19T14:36:08.8885745+08:00;False|2024-03-19T14:34:44.2637614+08:00;True|2024-03-19T14:22:40.5900691+08:00;True|2024-03-19T14:02:08.9599381+08:00;True|2024-03-19T12:23:05.0332761+08:00;True|2024-03-19T11:53:43.6830010+08:00;True|2024-03-19T11:40:05.7903841+08:00;True|2024-03-15T20:49:17.5076444+08:00;True|2024-03-15T14:00:52.3630660+08:00;True|2024-03-15T12:47:34.8092587+08:00;True|2024-03-15T09:58:23.5517006+08:00;True|2024-03-13T15:28:48.6170490+08:00;True|2024-03-13T13:33:44.3051955+08:00;True|2024-03-13T13:25:15.0372313+08:00;True|2024-03-13T11:59:44.2551502+08:00;True|2024-03-13T11:49:04.7295629+08:00;True|2024-03-13T11:27:27.5893712+08:00;True|2024-03-13T11:12:33.2533839+08:00;True|2024-03-13T11:07:52.7174473+08:00;True|2024-03-13T09:34:08.0467534+08:00;True|2024-03-12T16:24:41.1248271+08:00;True|2024-03-12T12:57:34.1524922+08:00;True|2024-03-12T12:57:10.0401874+08:00;True|2024-03-12T12:37:38.8477356+08:00;True|2024-03-12T12:15:41.3846937+08:00;True|2024-03-12T11:42:00.2207406+08:00;True|2024-03-12T11:33:55.6697043+08:00;True|2024-03-12T11:05:02.7742504+08:00;True|2024-03-12T09:20:07.0762374+08:00;True|2024-03-11T23:16:36.7669114+08:00;True|2024-03-11T23:03:24.2725545+08:00;True|2024-03-11T22:49:15.9602661+08:00;True|2024-03-11T22:47:12.6755805+08:00;True|2024-03-11T17:00:27.3523033+08:00;True|2024-03-11T16:58:40.0175971+08:00;True|2024-03-11T16:44:38.6622087+08:00;True|2024-03-11T12:49:04.1659271+08:00;True|2024-03-11T12:34:46.2212554+08:00;True|2024-03-11T12:04:40.4848855+08:00;True|2024-03-11T11:58:33.1825785+08:00;True|2024-03-11T11:40:10.6536678+08:00;True|2024-03-11T09:04:20.1073972+08:00;True|2024-03-11T00:16:54.5372850+08:00;True|2024-03-11T00:13:59.7140451+08:00;True|2024-03-11T00:08:20.0809329+08:00;True|2024-03-10T23:51:03.0931056+08:00;True|2024-03-10T23:43:22.2299872+08:00;True|2024-03-10T23:31:27.0629130+08:00;True|2024-03-10T22:56:31.1232852+08:00;True|2024-03-10T22:36:41.8541660+08:00;True|2024-03-10T22:15:06.0859435+08:00;True|2024-03-10T21:44:04.4157994+08:00;True|2024-03-10T21:35:38.3813654+08:00;True|2024-03-10T21:21:19.7693278+08:00;True|2024-03-10T13:19:26.4221274+08:00;True|2024-03-08T16:42:34.3346854+08:00;True|2024-03-08T15:50:13.7379672+08:00;True|2024-03-08T15:44:16.4369842+08:00;True|2024-03-08T15:31:50.0622199+08:00;True|2024-03-08T14:26:09.1090416+08:00;True|2024-03-08T14:21:24.9470581+08:00;True|2024-03-08T14:17:32.2780390+08:00;True|2024-03-08T14:03:55.4922720+08:00;True|2024-03-08T13:57:55.4217170+08:00;True|2024-03-08T13:53:43.0935554+08:00;True|2024-03-08T12:54:18.4199897+08:00;True|2024-03-08T12:48:07.6789814+08:00;True|2024-03-08T12:38:48.2818977+08:00;True|2024-03-08T12:21:53.9153553+08:00;True|2024-03-08T12:06:46.9343077+08:00;True|2024-03-08T11:27:39.0237720+08:00;True|2024-03-08T10:59:31.7184492+08:00;True|2024-03-08T10:57:44.8205869+08:00;True|2024-03-08T10:47:27.6962408+08:00;True|2024-03-08T10:29:25.8508156+08:00;True|2024-03-08T10:23:30.0269659+08:00;True|2024-03-08T09:21:21.5915181+08:00;True|2024-03-08T09:16:30.6962592+08:00;True|2024-03-07T17:01:33.5406097+08:00;True|2024-03-07T16:52:05.1956454+08:00;True|2024-03-07T16:41:54.0594859+08:00;True|2024-03-07T16:33:14.5796954+08:00;True|2024-03-07T16:02:27.6565800+08:00;True|2024-03-07T15:45:18.3220942+08:00;True|2024-03-07T15:39:48.9700962+08:00;True|2024-03-07T15:35:21.4018654+08:00;True|2024-03-07T15:22:12.7348197+08:00;True|2024-03-07T15:19:49.2338225+08:00;True|2024-03-07T13:46:05.5084885+08:00;True|2024-03-07T13:42:41.9749496+08:00;True|2024-03-07T13:26:04.1927588+08:00;True|2024-03-07T13:04:29.8689660+08:00;True|2024-03-07T10:24:34.3368602+08:00;True|2024-03-07T09:18:28.2279706+08:00;True|2024-03-06T17:25:36.9409421+08:00;True|2024-03-06T17:04:06.6361562+08:00;True|2024-03-06T14:42:01.3198359+08:00;True|2024-03-06T12:10:29.5231191+08:00;True|2024-03-06T12:03:06.7428246+08:00;True|2024-03-06T11:51:03.6220101+08:00;True|2024-03-06T11:15:22.4977600+08:00;True|2024-03-06T09:38:13.9161080+08:00;True|2024-03-05T16:37:49.9679062+08:00;True|2024-03-05T15:12:23.1933204+08:00;True|2024-03-05T14:51:27.9123344+08:00;True|2024-03-05T12:42:45.6186917+08:00;True|2024-03-05T11:21:19.0499458+08:00;True|2024-03-05T11:07:43.2642432+08:00;True|2024-03-05T09:59:18.0467522+08:00;True|2024-03-05T09:57:25.8947310+08:00;True|2024-03-04T16:41:44.4465908+08:00;True|2024-03-04T16:27:02.5887336+08:00;True|2024-03-04T16:20:05.0027599+08:00;True|2024-03-04T16:19:26.5595399+08:00;True|2024-03-04T15:32:55.6131853+08:00;True|2024-03-04T15:28:44.2800619+08:00;True|2024-03-04T14:54:47.0567440+08:00;True|2024-03-04T10:23:15.8222065+08:00;True|2024-03-03T17:36:33.1017612+08:00;True|2024-03-03T16:51:26.3227366+08:00;True|2024-02-26T09:58:28.3684127+08:00;True|2024-02-26T09:40:27.2127438+08:00;True|2024-02-26T09:30:29.4139007+08:00;True|2024-02-26T08:58:31.6305017+08:00;True|2024-02-26T08:50:25.3686785+08:00;True|2024-02-25T22:42:22.6699571+08:00;True|2024-02-25T21:40:08.7124742+08:00;True|2024-02-23T16:33:06.9165845+08:00;True|2024-02-23T15:20:24.6631954+08:00;True|2024-02-22T13:35:39.8097749+08:00;True|2024-02-22T10:50:51.2245040+08:00;True|2024-02-22T10:37:36.2007251+08:00;True|2024-02-22T10:28:43.0780061+08:00;True|2024-02-22T10:25:14.6494230+08:00;True|2024-02-22T10:22:55.9164843+08:00;True|2024-02-22T10:20:22.7986646+08:00;True|2024-02-22T10:09:31.7828474+08:00;True|2024-02-22T09:52:49.6576546+08:00;True|2024-02-22T09:49:40.2304782+08:00;True|2024-02-22T09:11:37.5212025+08:00;False|2024-02-22T09:11:00.5740908+08:00;True|2024-02-22T09:08:58.7725741+08:00;True|2024-02-21T16:50:09.9380590+08:00;True|2024-02-21T16:25:03.2145943+08:00;True|2024-02-21T16:23:13.6740659+08:00;True|2024-02-21T16:17:53.0411127+08:00;True|2024-02-21T15:57:47.2254175+08:00;True|2024-02-21T15:10:17.2222102+08:00;True|2024-02-21T15:05:10.2464943+08:00;True|2024-02-21T14:27:06.5305080+08:00;True|2024-02-21T14:23:20.9423346+08:00;True|2024-02-21T14:10:37.5156508+08:00;True|2024-02-21T13:54:04.4018306+08:00;True|2024-02-21T08:47:17.0019565+08:00;True|2024-02-20T16:26:31.2412659+08:00;True|2024-02-20T16:23:36.2983740+08:00;True|2024-02-20T16:20:39.9515902+08:00;True|2024-02-20T15:46:12.8212665+08:00;True|2024-02-20T14:58:17.4600086+08:00;True|2024-02-20T10:45:52.2417786+08:00;True|2024-02-20T10:42:11.8298929+08:00;True|2024-02-19T13:06:24.8957799+08:00;True|2024-02-19T11:05:28.0139278+08:00;True|2024-02-19T10:27:01.0810368+08:00;True|2024-02-19T10:22:57.4053027+08:00;True|2024-02-19T10:15:48.5706154+08:00;True|2024-02-19T10:12:02.9076965+08:00;True|2024-02-18T14:57:44.7521494+08:00;True|2024-02-18T14:50:56.3550941+08:00;True|2024-02-18T13:36:49.3942430+08:00;True|2024-02-07T14:06:25.4964506+08:00;True|2024-02-07T10:42:52.2689528+08:00;True|2024-02-06T10:58:49.3342902+08:00;True|2024-02-06T10:53:42.5435511+08:00;True|2024-02-06T10:43:40.1003756+08:00;True|2024-02-06T10:40:46.8233200+08:00;True|2024-02-06T10:17:28.2865591+08:00;True|2024-02-06T10:14:31.6896095+08:00;True|2024-02-06T09:24:29.8745590+08:00;True|2024-02-06T09:20:58.3166183+08:00;True|2024-02-06T09:12:14.4841167+08:00;True|2024-02-06T09:05:10.5375167+08:00;True|2024-02-05T14:51:09.8954604+08:00;True|2024-02-05T14:30:01.0098544+08:00;True|2024-02-05T14:26:49.2548141+08:00;True|2024-02-05T14:05:18.6839229+08:00;True|2024-02-05T13:23:42.1639710+08:00;True|2024-02-05T08:39:07.5523831+08:00;True|2024-02-04T15:09:19.2455417+08:00;True|2024-02-04T13:27:46.2086590+08:00;True|2024-02-04T13:25:20.9639903+08:00;True|2024-02-04T13:20:32.2870983+08:00;True|2024-02-04T13:15:58.3909970+08:00;True|2024-02-04T11:18:59.5180822+08:00;True|2024-02-04T11:07:31.1414636+08:00;True|2024-02-04T11:03:38.8431285+08:00;True|2024-02-04T11:00:42.8307675+08:00;True|2024-02-04T10:59:07.3767796+08:00;True|2024-02-04T10:55:27.9454328+08:00;True|2024-02-04T10:52:29.5988914+08:00;True|2024-02-04T10:50:30.6883153+08:00;True|2024-02-04T10:38:13.0058874+08:00;True|2024-02-04T10:25:53.1906810+08:00;True|2024-02-04T10:14:51.7442720+08:00;True|2024-02-04T10:12:34.4696662+08:00;True|2024-02-04T10:08:56.5805097+08:00;True|2024-02-04T10:07:16.4922026+08:00;True|2024-02-04T09:59:27.2102397+08:00;True|2024-02-04T09:56:42.2238395+08:00;True|2024-02-04T09:52:47.5348300+08:00;True|2024-02-04T09:42:50.9349205+08:00;True|2024-02-04T09:30:32.3567175+08:00;True|2024-02-04T09:19:29.8036670+08:00;True|2024-02-04T09:11:56.0744927+08:00;True|2024-02-04T09:08:42.4432795+08:00;True|2024-02-04T09:05:25.4958302+08:00;True|2024-02-04T08:58:59.7993464+08:00;True|2024-02-04T08:51:20.3017735+08:00;True|2024-02-04T08:43:05.6974823+08:00;True|2024-02-02T16:12:24.3288882+08:00;True|2024-02-02T15:31:12.0724234+08:00;True|2024-02-02T15:14:24.5493301+08:00;True|2024-02-02T15:08:42.0775469+08:00;True|2024-02-02T14:50:25.2357715+08:00;True|2024-02-02T14:48:40.1311047+08:00;True|2024-02-02T14:44:57.9831751+08:00;True|2024-02-02T14:28:12.0713915+08:00;True|2024-02-02T13:55:59.7389347+08:00;True|2024-02-02T13:10:32.7073682+08:00;True|2024-02-02T10:21:41.3665075+08:00;True|2024-02-02T10:08:11.1755065+08:00;True|2024-02-01T16:28:42.6016378+08:00;True|2024-02-01T16:25:35.2865491+08:00;True|2024-02-01T15:48:00.8333105+08:00;True|2024-02-01T15:39:22.9864096+08:00;True|2024-02-01T15:30:30.4856347+08:00;True|2024-02-01T14:34:14.9484851+08:00;True|2024-02-01T13:53:48.9165284+08:00;False|2024-02-01T13:52:39.1911001+08:00;True|2024-02-01T10:40:28.0735829+08:00;True|2024-02-01T10:24:04.5914096+08:00;True|2024-02-01T10:13:00.9882363+08:00;True|2024-01-31T14:56:37.7352718+08:00;True|2024-01-31T14:46:49.9104890+08:00;True|2024-01-31T14:38:56.1841731+08:00;True|2024-01-31T14:35:45.4531352+08:00;True|2024-01-31T14:32:21.5100137+08:00;True|2024-01-31T14:15:26.3231430+08:00;True|2024-01-31T14:00:11.3994150+08:00;True|2024-01-31T13:18:54.8448212+08:00;True|2024-01-31T10:52:59.8159114+08:00;True|2024-01-31T10:28:03.5856625+08:00;True|2024-01-31T10:10:35.0250398+08:00;True|2024-01-30T09:53:14.3256577+08:00;True|2024-01-30T09:43:56.5551157+08:00;True|2024-01-30T08:27:16.7078317+08:00;True|2024-01-29T15:42:55.3394104+08:00;True|2024-01-29T15:36:57.2998818+08:00;True|2024-01-29T15:09:49.3214409+08:00;True|2024-01-29T14:54:23.0025170+08:00;True|2024-01-29T14:33:53.5586728+08:00;True|2024-01-29T10:21:47.9469052+08:00;True|2024-01-29T09:38:26.0354836+08:00;True|2024-01-29T09:28:57.3836958+08:00;True|2024-01-29T09:19:49.0488968+08:00;True|2024-01-26T16:11:46.3859476+08:00;True|2024-01-26T16:11:29.8529136+08:00;True|2024-01-26T10:23:35.6167838+08:00;True|2024-01-26T10:16:04.2780085+08:00;True|2024-01-26T10:05:56.0745647+08:00;True|2024-01-26T10:03:34.8490957+08:00;True|2024-01-26T09:18:57.1502238+08:00;True|2024-01-26T09:05:18.6887593+08:00;True|2024-01-25T16:19:44.3753587+08:00;True|2024-01-25T10:54:55.2695117+08:00;True|2024-01-25T10:52:43.0130697+08:00;True|2024-01-25T10:15:35.2061116+08:00;True|2024-01-25T10:12:55.7724345+08:00;True|2024-01-25T09:59:14.7336333+08:00;True|2024-01-25T09:54:00.8951944+08:00;True|2024-01-23T11:57:00.6176481+08:00;True|2024-01-23T11:48:46.0536266+08:00;True|2024-01-23T11:20:56.9686760+08:00;True|2024-01-23T10:07:03.1874795+08:00;True|2024-01-23T09:28:09.7921197+08:00;True|2024-01-22T17:23:56.8011615+08:00;True|2024-01-22T15:39:51.8307512+08:00;True|2024-01-21T16:56:29.0470984+08:00;True|2024-01-21T16:31:58.1736344+08:00;True|2024-01-21T16:24:19.3683647+08:00;True|2024-01-21T16:02:26.5427715+08:00;True|2024-01-21T15:45:21.0549809+08:00;True|2024-01-21T15:24:46.6563331+08:00;True|2024-01-21T12:57:07.2655536+08:00;True|2024-01-21T11:43:22.1675745+08:00;True|2024-01-21T11:04:07.4676661+08:00;True|2024-01-21T11:03:11.6972981+08:00;True|2024-01-19T12:12:51.7315607+08:00;True|2024-01-19T12:03:23.7846341+08:00;True|2024-01-19T09:21:40.1191844+08:00;True|2024-01-18T15:28:59.1079108+08:00;True|2024-01-18T15:25:00.9561275+08:00;True|2024-01-18T15:19:13.0404548+08:00;True|2024-01-18T13:06:18.2756609+08:00;True|2024-01-18T12:00:29.1983965+08:00;True|2024-01-18T09:51:08.2157377+08:00;True|2024-01-18T09:49:33.8817410+08:00;True|2024-01-17T17:14:07.4523354+08:00;True|2024-01-17T13:46:19.2002783+08:00;True|2024-01-17T13:17:28.0156428+08:00;True|2024-01-17T11:23:28.7024207+08:00;True|2024-01-17T11:07:35.4966809+08:00;True|2024-01-17T10:25:34.7098037+08:00;True|2024-01-17T09:13:26.1252511+08:00;True|2024-01-16T15:33:15.8976694+08:00;True|2024-01-16T13:06:21.8159184+08:00;True|2024-01-16T12:55:14.9963186+08:00;True|2024-01-16T10:26:35.3866122+08:00;True|2024-01-16T10:25:44.1826112+08:00;True|2024-01-12T16:34:51.6106928+08:00;True|2024-01-12T13:14:24.0546049+08:00;True|2024-01-12T13:06:52.9089433+08:00;True|2024-01-12T12:39:48.1623736+08:00;True|2024-01-12T12:36:04.4644966+08:00;True|2024-01-12T10:22:40.9168937+08:00;True|2024-01-12T10:10:47.1460616+08:00;True|2024-01-12T10:05:40.4318518+08:00;True|2024-01-12T10:02:01.3964907+08:00;True|2024-01-12T09:57:23.5579846+08:00;True|2024-01-12T09:52:39.7735343+08:00;True|2024-01-12T09:49:01.7855687+08:00;True|2024-01-12T09:44:26.1839115+08:00;True|2024-01-12T09:40:23.9216298+08:00;True|2024-01-12T09:36:41.0590000+08:00;True|2024-01-12T09:32:36.5860825+08:00;True|2024-01-12T09:18:47.5635433+08:00;True|2024-01-11T16:44:34.1615374+08:00;True|2024-01-11T16:40:15.6664078+08:00;True|2024-01-11T16:35:55.1073771+08:00;True|2024-01-11T16:30:59.0648321+08:00;True|2024-01-11T16:11:06.5473983+08:00;True|2024-01-11T16:00:13.6441008+08:00;True|2024-01-11T15:46:51.9760680+08:00;True|2024-01-11T15:36:57.4756880+08:00;True|2024-01-11T15:31:04.1093476+08:00;True|2024-01-11T15:29:01.9270892+08:00;True|2024-01-11T15:21:23.5612459+08:00;True|2024-01-11T15:20:16.1944310+08:00;True|2024-01-11T15:13:32.1080230+08:00;True|2024-01-11T15:06:57.4237688+08:00;True|2024-01-11T15:05:37.5128999+08:00;True|2024-01-11T14:57:22.7751079+08:00;True|2024-01-11T14:11:04.8587579+08:00;True|2024-01-11T11:21:14.0243941+08:00;True|2024-01-11T11:15:09.4678297+08:00;True|2024-01-09T17:06:36.4675498+08:00;True|2024-01-09T17:02:20.7904461+08:00;False|2024-01-09T11:59:36.2734315+08:00;False|2024-01-09T11:59:30.0330023+08:00;True|2024-01-09T11:59:17.2965616+08:00;True|2024-01-08T13:52:05.1989624+08:00;True|2024-01-08T11:12:57.8687468+08:00;True|2024-01-05T14:51:14.7636988+08:00;True|2024-01-05T14:05:34.1084252+08:00;True|2024-01-05T13:23:32.7473731+08:00;True|2024-01-05T11:23:22.0038600+08:00;True|2024-01-05T08:30:07.8997370+08:00;True|2024-01-04T17:03:59.0070371+08:00;True|2024-01-04T16:35:53.2667600+08:00;True|2024-01-04T13:54:55.5474585+08:00;True|2024-01-04T10:22:53.2575575+08:00;True|2024-01-04T10:19:29.6305295+08:00;True|2024-01-04T10:13:33.8544729+08:00;True|2024-01-04T10:09:45.5777175+08:00;True|2024-01-03T15:38:30.3306310+08:00;True|2024-01-03T15:33:57.3631133+08:00;True|2024-01-03T15:10:07.3593774+08:00;True|2024-01-03T13:01:19.4751344+08:00;True|2024-01-03T11:25:06.5732437+08:00;True|2024-01-03T10:55:20.7518873+08:00;True|2024-01-03T10:40:15.0650254+08:00;True|2024-01-03T10:29:15.9327684+08:00;True|2024-01-03T09:34:04.8587473+08:00;True|2024-01-03T08:19:57.3625106+08:00;True|2023-12-29T16:46:23.7770752+08:00;True|2023-12-29T16:45:18.9092534+08:00;True|2023-12-29T16:40:16.7253697+08:00;True|2023-12-29T16:35:46.0906100+08:00;True|2023-12-29T16:19:46.4369159+08:00;True|2023-12-29T15:13:11.2466536+08:00;True|2023-12-29T15:08:16.1413948+08:00;True|2023-12-29T11:54:24.8686181+08:00;True|2023-12-29T10:54:38.1200087+08:00;True|2023-12-29T10:43:44.2132588+08:00;True|2023-12-29T10:23:35.9589067+08:00;True|2023-12-29T10:21:38.3438976+08:00;True|2023-12-29T10:16:16.7097491+08:00;True|2023-12-29T09:53:37.8863387+08:00;True|2023-12-27T14:41:20.6098455+08:00;True|2023-12-27T14:15:27.0538444+08:00;True|2023-12-27T13:07:04.0423436+08:00;True|2023-12-27T11:13:53.7170363+08:00;True|2023-12-27T10:59:32.5371257+08:00;True|2023-12-27T10:48:01.7326864+08:00;True|2023-12-26T09:13:22.3086191+08:00;True|2023-12-26T09:12:47.2137946+08:00;True|2023-12-25T12:22:46.8608633+08:00;True|2023-12-25T12:18:59.4402254+08:00;True|2023-12-25T12:11:03.2410147+08:00;True|2023-12-25T09:37:48.6741194+08:00;True|2023-12-25T09:37:03.2635243+08:00;True|2023-12-22T09:44:26.5356492+08:00;True|2023-12-21T16:58:23.0505653+08:00;True|2023-12-21T16:51:26.4945132+08:00;True|2023-12-21T16:48:53.6772071+08:00;True|2023-12-21T16:23:16.4577315+08:00;True|2023-12-21T16:22:38.6599138+08:00;True|2023-12-21T16:11:43.8422015+08:00;True|2023-12-21T15:45:42.5751240+08:00;True|2023-12-15T16:26:52.3591879+08:00;True|2023-12-15T16:22:25.0756865+08:00;True|2023-12-15T14:19:10.1362534+08:00;True|2023-12-15T14:15:47.5585902+08:00;True|2023-12-15T13:41:56.8875380+08:00;True|2023-12-13T00:13:19.2052917+08:00;True|2023-12-12T23:45:04.0751980+08:00;True|2023-12-12T23:33:28.8199619+08:00;True|2023-12-11T16:31:01.1694979+08:00;True|2023-12-11T15:47:51.2813632+08:00;True|2023-12-11T14:31:49.0572919+08:00;True|2023-12-11T11:45:11.2736360+08:00;True|2023-12-11T11:42:47.5744097+08:00;True|2023-12-11T11:41:16.3262612+08:00;True|2023-12-11T11:32:42.2722966+08:00;True|2023-12-11T11:25:22.8877561+08:00;True|2023-12-11T11:18:20.8210764+08:00;True|2023-12-11T11:16:52.0927831+08:00;True|2023-12-11T11:12:29.9473078+08:00;True|2023-12-10T16:43:56.1726039+08:00;True|2023-12-08T16:50:00.8823437+08:00;True|2023-12-08T14:59:10.2356691+08:00;True|2023-12-08T14:53:13.6038106+08:00;True|2023-12-08T14:51:33.9002713+08:00;True|2023-12-08T14:49:22.0867686+08:00;True|2023-12-08T14:45:05.4216954+08:00;True|2023-12-08T14:30:25.7790911+08:00;True|2023-12-08T14:26:26.1041925+08:00;True|2023-12-08T10:55:36.7338237+08:00;True|2023-12-08T10:24:01.5463359+08:00;True|2023-12-08T10:04:35.7996746+08:00;True|2023-12-08T09:59:17.1279949+08:00;True|2023-12-08T09:52:45.7941909+08:00;True|2023-12-08T09:51:26.7251883+08:00;True|2023-12-08T09:27:43.4049328+08:00;True|2023-12-08T09:12:16.7029758+08:00;True|2023-12-07T11:13:10.4285460+08:00;True|2023-12-01T14:35:34.0005130+08:00;True|2023-12-01T13:21:46.3327168+08:00;True|2023-12-01T13:04:28.4801319+08:00;True|2023-11-30T16:46:41.8793520+08:00;True|2023-11-30T16:04:49.7131798+08:00;True|2023-11-30T15:51:12.9846550+08:00;True|2023-11-30T12:52:06.3440387+08:00;True|2023-11-28T11:20:26.3599705+08:00;True|2023-11-28T09:43:48.5733385+08:00;True|2023-11-27T12:13:11.3038226+08:00;True|2023-11-27T11:54:35.3665327+08:00;True|2023-11-24T13:10:19.3181494+08:00;True|2023-11-24T09:52:10.7335160+08:00;True|2023-11-24T09:31:32.3926443+08:00;True|2023-11-22T13:30:50.3888837+08:00;True|2023-11-22T13:22:29.5388053+08:00;True|2023-11-22T12:14:49.7935345+08:00;True|2023-11-22T11:28:30.8047701+08:00;True|2023-11-20T12:04:07.1512783+08:00;True|2023-11-20T11:58:16.7337435+08:00;True|2023-11-20T11:03:24.3231922+08:00;True|2023-11-20T10:59:12.6367033+08:00;True|2023-11-20T10:33:56.2434367+08:00;True|2023-11-17T15:05:08.6847106+08:00;True|2023-11-17T10:29:33.0225444+08:00;True|2023-11-16T14:21:42.1686146+08:00;True|2023-11-16T13:16:34.1913128+08:00;True|2023-11-16T12:57:16.2850606+08:00;True|2023-11-16T11:11:31.8430891+08:00;True|2023-11-16T10:20:42.1252046+08:00;True|2023-11-16T10:18:14.1408709+08:00;True|2023-11-16T09:23:36.6628173+08:00;True|2023-11-15T14:28:33.3369087+08:00;True|2023-11-15T12:26:26.2137336+08:00;True|2023-11-15T12:25:16.0092237+08:00;True|2023-11-15T11:14:45.4326153+08:00;True|2023-11-15T09:02:00.2711268+08:00;True|2023-11-15T08:53:27.1187290+08:00;True|2023-11-14T18:54:52.3812819+08:00;True|2023-11-14T18:52:20.2229451+08:00;True|2023-11-14T17:55:59.0996386+08:00;True|2023-11-14T17:04:46.5334994+08:00;True|2023-11-14T15:02:42.0419908+08:00;True|2023-11-14T14:56:49.6970449+08:00;True|2023-11-14T13:18:29.4329574+08:00;True|2023-11-14T12:23:09.7978978+08:00;True|2023-11-13T16:16:20.9105084+08:00;True|2023-11-13T16:11:45.1099698+08:00;True|2023-11-13T13:16:02.1477662+08:00;True|2023-11-13T13:15:15.6182523+08:00;True|2023-11-13T11:11:21.7620762+08:00;True|2023-11-13T10:01:31.2619079+08:00;True|2023-11-13T09:18:34.3054349+08:00;True|2023-11-13T00:48:47.6800494+08:00;True|2023-11-13T00:42:22.9854286+08:00;True|2023-11-10T16:59:57.9013482+08:00;True|2023-11-10T13:56:10.1520148+08:00;True|2023-11-10T12:25:28.8978413+08:00;True|2023-11-10T12:04:30.4991249+08:00;True|2023-11-10T11:55:52.1921552+08:00;True|2023-11-10T11:39:33.1910863+08:00;True|2023-11-10T11:17:17.2050570+08:00;True|2023-11-10T10:31:48.8350379+08:00;True|2023-11-09T13:11:02.1210376+08:00;True|2023-11-09T11:04:23.6279742+08:00;True|2023-11-09T09:52:39.0767165+08:00;True|2023-11-09T09:45:47.5629254+08:00;True|2023-11-09T09:41:09.1121998+08:00;True|2023-11-09T09:34:16.8133121+08:00;True|2023-11-08T16:33:38.3080500+08:00;True|2023-11-08T16:14:37.9282566+08:00;True|2023-11-08T15:31:46.8084522+08:00;True|2023-11-08T14:27:48.2352711+08:00;True|2023-11-08T12:23:56.5235127+08:00;True|2023-11-08T11:41:12.7035010+08:00;True|2023-11-08T11:38:42.5318310+08:00;True|2023-11-08T10:18:43.5798164+08:00;True|2023-11-08T09:06:35.6712939+08:00;True|2023-11-08T08:57:36.1174660+08:00;True|2023-11-08T00:07:44.2585670+08:00;True|2023-11-06T23:28:53.2559097+08:00;True|2023-11-06T23:00:40.3059201+08:00;True|2023-11-06T21:14:59.0505998+08:00;True|2023-11-03T22:08:06.7984691+08:00;True|2023-11-03T20:33:47.8005656+08:00;True|2023-11-03T19:18:45.1406730+08:00;True|2023-11-03T14:56:44.7332321+08:00;True|2023-11-02T20:13:15.5530300+08:00;True|2023-11-02T19:22:24.9140752+08:00;True|2023-11-02T18:58:18.1198017+08:00;True|2023-11-01T18:31:39.9490440+08:00;True|2023-11-01T14:49:43.8703361+08:00;True|2023-11-01T14:38:44.8729900+08:00;True|2023-11-01T14:14:57.6507597+08:00;True|2023-11-01T13:04:09.9744075+08:00;True|2023-10-31T13:03:41.1902847+08:00;True|2023-10-31T11:29:03.3252294+08:00;True|2023-10-30T18:35:01.5128678+08:00;True|2023-10-30T18:25:01.6612244+08:00;True|2023-10-26T17:07:56.7081658+08:00;True|2023-10-18T16:20:51.8420951+08:00;True|2023-10-16T16:44:43.7908528+08:00;True|2023-10-16T11:17:09.2728375+08:00;True|2023-10-16T10:28:07.3397339+08:00;True|2023-10-16T10:26:35.6073358+08:00;True|2023-10-16T10:21:48.9925797+08:00;True|2023-10-13T11:26:05.2730047+08:00;True|2023-10-12T08:19:04.3028512+08:00;True|2023-10-11T20:40:21.6934217+08:00;True|2023-10-11T20:28:04.3302789+08:00;True|2023-10-11T20:16:51.2741909+08:00;True|2023-10-11T20:10:01.4624158+08:00;True|2023-10-11T15:32:40.9782838+08:00;True|2023-10-11T15:21:09.0531801+08:00;True|2023-10-11T15:05:59.9622196+08:00;True|2023-10-11T10:51:46.8571661+08:00;True|2023-10-11T10:41:25.5037704+08:00;True|2023-10-11T10:13:32.2604453+08:00;True|2023-10-11T10:05:52.2170423+08:00;True|2023-10-11T09:47:35.6578975+08:00;True|2023-10-11T09:44:31.2001499+08:00;True|2023-10-11T09:37:09.6904898+08:00;True|2023-10-10T10:18:33.1073992+08:00;True|2023-10-10T09:32:05.6384867+08:00;True|2023-10-10T09:15:26.4844254+08:00;True|2023-10-10T09:03:39.1497247+08:00;True|2023-10-10T08:56:14.9475607+08:00;True|2023-10-09T15:38:52.6561232+08:00;True|2023-10-09T14:22:16.0301342+08:00;True|2023-10-09T13:24:40.4941388+08:00;True|2023-10-09T10:30:48.0015664+08:00;True|2023-10-09T09:52:47.4626658+08:00;True|2023-10-08T14:21:13.7960780+08:00;True|2023-10-08T10:31:55.0337899+08:00;True|2023-10-08T08:24:13.2663041+08:00;True|2023-10-07T10:40:04.1716715+08:00;True|2023-10-07T09:51:11.1928375+08:00;True|2023-10-07T09:43:13.8042516+08:00;True|2023-09-28T15:45:01.2865878+08:00;True|2023-09-28T15:32:23.8179822+08:00;True|2023-09-28T14:37:03.1119806+08:00;True|2023-09-28T14:30:07.0877531+08:00;True|2023-09-28T14:01:36.5862373+08:00;True|2023-09-28T08:29:16.5989163+08:00;True|2023-09-28T08:12:23.3924898+08:00;True|2023-09-27T17:04:09.2538198+08:00;True|2023-09-27T16:38:03.8237948+08:00;True|2023-09-27T16:12:28.7977056+08:00;True|2023-09-27T15:56:03.7725704+08:00;True|2023-09-27T15:12:31.1298921+08:00;True|2023-09-27T15:05:14.4058045+08:00;True|2023-09-27T14:55:43.4423114+08:00;True|2023-09-27T14:33:26.2272014+08:00;True|2023-09-22T13:26:44.6246077+08:00;True|2023-09-22T11:14:50.9067626+08:00;True|2023-09-22T09:36:50.6912928+08:00;True|2023-09-22T09:26:38.2305802+08:00;True|2023-09-22T09:02:22.5400635+08:00;True|2023-09-20T17:20:27.9780370+08:00;True|2023-09-19T09:20:00.1269897+08:00;True|2023-09-19T09:10:18.4900723+08:00;True|2023-09-19T08:30:20.1709390+08:00;True|2023-09-18T15:43:28.1580264+08:00;True|2023-09-15T10:08:50.6367258+08:00;True|2023-09-14T17:17:10.7002185+08:00;True|2023-09-14T16:55:47.7782477+08:00;True|2023-09-14T14:05:25.9485449+08:00;False|2023-09-14T14:04:51.9423918+08:00;True|2023-09-12T09:37:17.5430590+08:00;True|2023-09-11T16:38:00.9834961+08:00;True|2023-09-11T13:04:08.1338596+08:00;True|2023-09-11T09:33:03.5400174+08:00;True|2023-09-08T15:34:46.6427039+08:00;True|2023-09-08T15:32:26.7896155+08:00;True|2023-09-08T14:07:16.6283055+08:00;True|2023-09-08T08:21:08.8368055+08:00;True|2023-09-08T08:07:29.5992984+08:00;True|2023-09-07T13:03:24.6924914+08:00;True|2023-09-07T11:02:02.9462467+08:00;True|2023-09-07T08:57:36.4913496+08:00;True|2023-09-07T08:55:57.3245545+08:00;True|2023-09-06T13:47:04.0563026+08:00;True|2023-09-06T13:42:27.3031938+08:00;True|2023-09-05T08:28:44.6193871+08:00;True|2023-09-04T20:42:09.4672710+08:00;True|2023-09-03T14:06:37.5079909+08:00;True|2023-09-02T18:58:24.1492192+08:00;True|2023-09-01T13:19:28.2779978+08:00;True|2023-09-01T08:40:54.0577358+08:00;True|2023-08-31T16:47:34.8462721+08:00;True|2023-08-31T14:49:39.9056564+08:00;True|2023-08-31T14:20:01.4071384+08:00;True|2023-08-31T11:25:29.0233052+08:00;True|2023-08-31T10:28:13.4933678+08:00;True|2023-08-31T10:21:52.6638820+08:00;True|2023-08-31T08:46:57.8782261+08:00;True|2023-08-31T08:46:08.4791004+08:00;True|2023-08-30T09:06:17.4001684+08:00;True|2023-08-30T08:52:06.9481657+08:00;True|2023-08-29T17:11:33.7851914+08:00;True|2023-08-29T16:58:52.7298807+08:00;True|2023-08-29T15:58:23.4205277+08:00;True|2023-08-29T15:56:40.3534593+08:00;True|2023-08-29T15:54:29.1188567+08:00;True|2023-08-29T15:53:27.9719983+08:00;True|2023-08-29T15:52:38.7670005+08:00;True|2023-08-29T15:51:32.3703092+08:00;True|2023-08-29T15:47:38.5198946+08:00;True|2023-08-29T15:46:17.4698017+08:00;True|2023-08-29T15:42:04.1853400+08:00;True|2023-08-29T15:29:28.1098681+08:00;True|2023-08-29T15:18:40.8587286+08:00;True|2023-08-29T14:47:50.3088948+08:00;True|2023-08-29T14:47:27.6552611+08:00;False|2023-08-28T13:59:37.8725670+08:00;True|2023-08-18T13:23:38.9937084+08:00;True|2023-08-18T10:09:51.5247737+08:00;True|2023-08-18T08:26:21.8473123+08:00;True|2023-08-17T08:31:37.8696349+08:00;True|2023-08-17T08:23:59.5658185+08:00;True|2023-08-17T08:07:38.2174684+08:00;True|2023-08-16T16:49:44.2549852+08:00;True|2023-08-16T16:33:59.9298792+08:00;True|2023-08-16T15:35:29.6092783+08:00;True|2023-08-16T11:17:28.1086751+08:00;True|2023-08-16T11:17:22.3814672+08:00;True|2023-08-16T08:44:16.0941179+08:00;True|2023-08-15T15:29:15.8118269+08:00;True|2023-08-15T14:47:06.4963591+08:00;True|2023-08-11T16:49:35.8718314+08:00;True|2023-08-11T14:22:59.9440967+08:00;True|2023-08-11T14:16:25.0940743+08:00;True|2023-08-11T13:27:25.4148450+08:00;True|2023-08-11T09:08:31.5437265+08:00;True|2023-08-11T09:04:38.4540336+08:00;True|2023-08-10T14:11:07.0042283+08:00;True|2023-08-08T13:48:19.2402267+08:00;True|2023-08-08T13:44:15.6796969+08:00;True|2023-07-27T09:46:14.1491814+08:00;True|2023-07-21T11:13:10.0843656+08:00;True|2023-07-21T10:56:47.5835580+08:00;True|2023-07-21T10:30:33.0113443+08:00;True|2023-07-20T19:16:37.4936135+08:00;True|2023-07-20T19:00:41.0636578+08:00;True|2023-07-19T13:28:27.8671371+08:00;True|2023-07-19T13:23:42.1880500+08:00;True|2023-07-19T13:19:18.7201227+08:00;True|2023-07-19T13:06:38.9897249+08:00;True|2023-07-19T12:13:11.2061059+08:00;True|2023-07-19T11:45:20.0391356+08:00;True|2023-07-19T11:24:02.5425841+08:00;True|2023-07-19T10:32:06.7915754+08:00;True|2023-07-19T09:51:08.4553434+08:00;True|2023-07-19T09:48:11.2977426+08:00;True|2023-07-18T08:47:44.1724897+08:00;True|2023-07-17T16:25:10.8982872+08:00;True|2023-07-17T14:50:44.3708198+08:00;True|2023-07-17T14:20:26.4686898+08:00;True|2023-07-17T14:18:16.6127136+08:00;True|2023-07-17T14:16:34.9116950+08:00;True|2023-07-17T14:14:44.7988846+08:00;True|2023-07-17T14:06:18.1123806+08:00;True|2023-07-17T14:03:38.5290433+08:00;True|2023-07-17T13:48:54.3096778+08:00;True|2023-07-17T13:23:13.6097762+08:00;True|2023-07-17T09:54:25.9375716+08:00;True|2023-07-17T09:40:22.2531559+08:00;True|2023-07-17T09:21:15.0786649+08:00;True|2023-07-17T09:03:37.2081513+08:00;True|2023-07-16T21:20:45.3036514+08:00;True|2023-07-16T21:09:16.1559694+08:00;True|2023-07-16T21:05:22.2504644+08:00;True|2023-07-16T20:41:26.5956030+08:00;True|2023-07-16T20:19:33.5726613+08:00;True|2023-07-16T19:46:38.6493518+08:00;True|2023-07-14T10:33:17.6270692+08:00;True|2023-07-11T14:34:22.8852169+08:00;True|2023-07-11T14:27:22.7851108+08:00;True|2023-07-11T14:13:21.6512172+08:00;True|2023-07-11T14:06:33.9865646+08:00;True|2023-07-11T13:52:46.2830836+08:00;True|2023-07-11T13:38:56.3165889+08:00;True|2023-07-11T13:29:40.9636697+08:00;True|2023-07-11T13:25:23.0633788+08:00;True|2023-07-11T10:17:40.8002359+08:00;True|2023-07-11T10:15:47.5472709+08:00;True|2023-07-11T10:12:25.6440547+08:00;True|2023-07-11T10:07:39.3716167+08:00;True|2023-07-11T09:22:07.4191357+08:00;True|2023-07-04T13:07:10.1209516+08:00;True|2023-06-30T16:11:25.7541580+08:00;True|2023-06-30T15:39:26.6678989+08:00;True|2023-06-30T15:26:40.6581344+08:00;True|2023-06-30T15:12:57.9906312+08:00;True|2023-06-29T16:39:15.6477820+08:00;True|2023-06-28T17:01:51.9542466+08:00;True|2023-06-27T15:03:28.1320450+08:00;True|2023-06-27T13:36:39.6707848+08:00;True|2023-06-26T09:40:01.1754706+08:00;True|2023-06-25T12:16:28.9080024+08:00;True|2023-06-25T11:51:59.9238461+08:00;True|2023-06-25T11:50:29.3100358+08:00;True|2023-06-25T11:29:28.5338563+08:00;True|2023-06-25T09:10:26.2420288+08:00;True|2023-06-25T09:08:15.0702872+08:00;True|2023-06-25T08:43:15.0806611+08:00;True|2023-06-25T08:41:41.8156616+08:00;True|2023-06-25T08:39:30.6818013+08:00;True|2023-06-25T08:38:18.5996529+08:00;True|2023-06-25T08:36:34.1479706+08:00;True|2023-06-25T08:34:53.9856289+08:00;True|2023-06-25T08:31:24.0298080+08:00;True|2023-06-25T08:15:45.7453280+08:00;True|2023-06-25T08:01:52.7609075+08:00;True|2023-06-24T21:25:23.8938665+08:00;True|2023-06-22T03:02:26.7305758+08:00;True|2023-06-22T02:10:48.8222890+08:00;True|2023-06-22T01:57:41.7875184+08:00;True|2023-06-22T01:52:19.4217362+08:00;True|2023-06-21T16:27:15.1464129+08:00;True|2023-06-21T16:11:46.6111817+08:00;True|2023-06-21T13:14:00.6869253+08:00;True|2023-06-21T13:09:28.2689225+08:00;True|2023-06-21T12:24:02.6762426+08:00;True|2023-06-21T12:18:06.2748924+08:00;True|2023-06-21T11:18:02.6754143+08:00;True|2023-06-21T11:08:34.2149469+08:00;True|2023-06-21T08:20:50.0079906+08:00;True|2023-06-20T15:56:03.2638713+08:00;True|2023-06-20T15:48:38.2419545+08:00;True|2023-06-20T15:35:26.6615171+08:00;True|2023-06-20T15:20:31.9284860+08:00;True|2023-06-20T15:18:39.8265469+08:00;True|2023-06-20T15:09:16.7617272+08:00;True|2023-06-20T09:53:23.2658672+08:00;True|2023-06-16T10:00:58.0337616+08:00;True|2023-06-16T09:47:58.8912904+08:00;True|2023-06-16T09:26:36.4914832+08:00;True|2023-06-15T16:22:21.4509393+08:00;True|2023-06-12T13:21:12.0491357+08:00;True|2023-06-12T10:18:32.9287587+08:00;True|2023-06-09T16:22:24.1132267+08:00;True|2023-06-08T18:12:42.4814009+08:00;True|2023-06-08T11:08:48.0533571+08:00;True|2023-06-08T10:41:43.0121701+08:00;False|2023-06-08T10:40:19.2093235+08:00;True|2023-06-06T13:03:50.8124200+08:00;True|2023-06-05T10:12:24.1858209+08:00;True|2023-06-02T17:02:57.5817094+08:00;True|2023-05-26T13:54:40.2272218+08:00;True|2023-05-24T12:43:50.2427994+08:00;True|2023-05-24T12:34:24.3922836+08:00;True|2023-05-24T10:07:19.4995219+08:00;True|2023-05-24T09:21:29.1960080+08:00;True|2023-05-23T22:34:23.3220912+08:00;True|2023-05-23T22:01:14.4175449+08:00;True|2023-05-23T17:02:53.0308400+08:00;True|2023-05-23T16:30:11.7138623+08:00;True|2023-05-23T15:51:50.0152484+08:00;True|2023-05-23T15:50:52.0657433+08:00;True|2023-05-23T15:28:25.5802377+08:00;True|2023-05-23T15:25:56.4633020+08:00;True|2023-05-23T14:52:29.8759921+08:00;True|2023-05-23T14:48:44.6519763+08:00;True|2023-05-20T04:28:10.3108871+08:00;True|2023-05-20T03:56:22.7233820+08:00;True|2023-05-20T03:47:38.4405026+08:00;True|2023-05-20T03:46:40.6056451+08:00;True|2023-05-20T03:44:25.0883888+08:00;True|2023-05-20T03:41:10.1148691+08:00;True|2023-05-20T02:34:14.3757035+08:00;True|2023-05-20T02:27:50.5595075+08:00;True|2023-05-20T02:23:04.2256041+08:00;True|2023-05-20T01:46:59.9534021+08:00;True|2023-05-20T01:42:33.5106065+08:00;True|2023-05-20T01:40:39.6918060+08:00;True|2023-05-20T01:11:47.7436847+08:00;True|2023-05-20T01:03:58.9476094+08:00;True|2023-05-19T22:59:47.4591129+08:00;True|2023-05-19T22:34:44.7988447+08:00;True|2023-05-19T22:24:55.2320279+08:00;True|2023-05-19T21:40:19.5285575+08:00;True|2023-05-19T21:38:21.2073338+08:00;True|2023-05-19T20:54:59.2058809+08:00;True|2023-05-19T16:08:15.0151080+08:00;True|2023-05-19T15:26:16.2836301+08:00;True|2023-05-19T13:09:06.1592914+08:00;True|2023-05-19T12:24:23.6252771+08:00;True|2023-05-19T11:50:53.8948740+08:00;True|2023-05-19T11:43:57.9296933+08:00;True|2023-05-19T10:44:34.9904463+08:00;True|2023-05-19T09:32:02.1216663+08:00;False|2023-05-19T09:31:06.4251757+08:00;True|2023-05-18T22:34:36.5292968+08:00;True|2023-05-18T20:37:59.7940567+08:00;True|2023-05-18T20:36:35.2790349+08:00;True|2023-05-18T20:34:10.7400457+08:00;True|2023-05-18T20:32:43.8790879+08:00;True|2023-05-18T20:31:13.5389643+08:00;True|2023-05-18T20:29:19.6206139+08:00;True|2023-05-18T20:07:25.5074263+08:00;True|2023-05-18T18:19:43.5324315+08:00;True|2023-05-18T18:15:36.4290026+08:00;True|2023-05-18T18:12:31.8703551+08:00;True|2023-05-18T18:10:52.9289531+08:00;True|2023-05-18T18:09:23.9118797+08:00;True|2023-05-18T17:58:30.8068228+08:00;True|2023-05-18T17:56:55.8055382+08:00;False|2023-05-18T17:54:54.7950789+08:00;False|2023-05-18T17:11:18.2325105+08:00;True|2023-05-18T17:09:24.4186482+08:00;True|2023-05-18T17:06:32.0699130+08:00;False|2023-05-18T17:01:41.8164925+08:00;False|2023-05-18T16:59:32.1112741+08:00;True|2023-05-18T16:58:34.1784100+08:00;True|2023-05-18T16:56:36.9460541+08:00;True|2023-05-18T16:55:00.9843495+08:00;True|2023-05-18T16:49:04.0161640+08:00;True|2023-05-18T16:48:28.9011382+08:00;True|2023-05-18T16:44:52.0675900+08:00;False|2023-05-18T16:44:37.3514214+08:00;False|2023-05-18T16:43:23.3343369+08:00;True|2023-05-18T16:41:35.8818611+08:00;True|2023-05-18T16:25:43.5167900+08:00;False|2023-05-18T16:24:46.6646890+08:00;False|2023-05-18T16:19:55.4153618+08:00;False|2023-05-18T16:16:18.0052881+08:00;False|2023-05-18T16:14:32.3377278+08:00;True|2023-05-17T15:43:45.1868569+08:00;True|2023-05-17T15:35:42.2476880+08:00;True|2023-05-17T14:23:28.2390957+08:00;True|2023-05-17T13:54:00.6756387+08:00;True|2023-05-17T13:45:46.1115068+08:00;True|2023-05-17T07:57:34.7129429+08:00;True|2023-05-16T16:04:20.3198005+08:00;False|2023-05-16T16:03:52.0737233+08:00;True|2023-05-16T15:28:45.4945726+08:00;True|2023-05-16T15:14:10.4952128+08:00;True|2023-05-16T15:04:46.5706346+08:00;True|2023-05-16T14:46:48.7034492+08:00;True|2023-05-16T14:45:29.4047499+08:00;True|2023-05-16T14:42:47.3507679+08:00;True|2023-05-16T14:30:47.9199224+08:00;True|2023-05-16T14:29:10.9147184+08:00;True|2023-05-16T14:27:48.3632687+08:00;True|2023-05-16T14:24:44.6240034+08:00;True|2023-05-16T14:19:41.2962188+08:00;True|2023-05-16T13:41:13.3366211+08:00;True|2023-05-16T13:26:44.1532655+08:00;True|2023-05-16T13:23:40.2882422+08:00;True|2023-05-16T13:11:41.5416792+08:00;True|2023-05-16T13:08:41.6341863+08:00;True|2023-05-16T13:04:35.6916867+08:00;True|2023-05-16T13:00:34.6889598+08:00;True|2023-05-16T12:57:48.4561274+08:00;True|2023-05-16T12:50:57.7405833+08:00;True|2023-05-16T12:49:33.8394829+08:00;True|2023-05-16T12:44:28.6906226+08:00;True|2023-05-16T12:41:08.3554032+08:00;True|2023-05-16T12:32:32.3448036+08:00;True|2023-05-16T11:32:04.4504376+08:00;True|2023-05-15T18:39:28.9172042+08:00;True|2023-05-15T18:35:41.5268755+08:00;True|2023-05-15T18:16:16.2900985+08:00;True|2023-04-28T16:24:40.7430596+08:00;False|2023-04-28T16:21:34.8499384+08:00;True|2023-04-28T15:43:40.3023318+08:00;True|2023-04-28T15:41:18.8228620+08:00;True|2023-04-28T14:16:21.1595325+08:00;True|2023-04-28T10:27:55.2150739+08:00;True|2023-04-12T16:25:26.5218825+08:00;True|2023-04-12T15:45:29.3993255+08:00;True|2023-04-12T14:00:18.1960878+08:00;True|2023-04-12T13:16:39.0804178+08:00;True|2023-04-11T11:02:27.5200402+08:00;True|2023-04-11T09:57:11.5903829+08:00;True|2023-04-10T09:58:01.1775220+08:00;True|2023-03-13T11:19:32.0927720+08:00;True|2023-03-13T10:39:50.9250037+08:00;True|2023-03-13T08:54:57.5891390+08:00;True|2023-03-10T09:00:31.2441735+08:00;True|2023-03-08T08:25:11.1877416+08:00;True|2023-03-06T09:18:03.5502956+08:00;True|2023-03-06T09:14:57.8192971+08:00;True|2023-01-11T13:30:27.8190489+08:00;True|2023-01-06T14:29:14.6067256+08:00;True|2022-12-23T17:06:52.0688439+08:00;True|2022-12-23T16:12:04.4155951+08:00;True|2022-12-23T13:35:44.6439326+08:00;True|2022-11-30T08:24:02.9999976+08:00;True|2022-11-30T08:01:51.4579972+08:00;True|2022-11-29T21:32:14.4359673+08:00;True|2022-11-29T19:30:22.9466023+08:00;True|2022-11-29T19:24:30.1630119+08:00;True|2022-11-29T17:31:43.1926801+08:00;True|2022-11-29T17:14:32.5869985+08:00;True|2022-11-29T10:42:57.1877576+08:00;True|2022-11-27T14:40:28.4784748+08:00;True|2022-11-26T20:49:34.2789400+08:00;True|2022-11-26T19:24:58.9988205+08:00;True|2022-11-26T15:33:08.6274944+08:00;True|2022-11-26T14:37:46.3953592+08:00;True|2022-11-26T09:16:41.7487240+08:00;True|2022-11-24T09:49:50.7302637+08:00;True|2022-11-23T16:24:56.5946914+08:00;True|2022-11-23T16:19:57.5570583+08:00;True|2022-11-23T15:05:13.8032246+08:00;True|2022-11-22T20:24:39.7324815+08:00;True|2022-11-22T13:18:16.2143925+08:00;False|2022-11-22T13:12:53.0448580+08:00;True|2022-11-22T11:03:01.7571733+08:00;True|2022-11-21T13:20:11.1961237+08:00;True|2022-11-21T13:13:52.0360749+08:00;True|2022-11-18T15:48:13.0747365+08:00;True|2022-11-18T14:15:54.5626901+08:00;True|2022-11-17T18:41:26.5464503+08:00;True|2022-11-15T13:55:35.3496366+08:00;True|2022-11-15T11:03:23.6773297+08:00;True|2022-11-15T10:58:47.9703720+08:00;True|2022-11-15T10:12:27.8305782+08:00;True|2022-11-15T09:47:26.7480777+08:00;True|2022-11-15T08:55:44.0275263+08:00;True|2022-11-15T08:54:06.6396851+08:00;True|2022-11-15T08:44:18.2013404+08:00;True|2022-11-15T01:16:19.8154538+08:00;True|2022-11-15T01:15:03.7846810+08:00;True|2022-11-15T01:01:11.0318599+08:00;True|2022-11-15T00:30:33.7148460+08:00;True|2022-11-15T00:15:26.5178283+08:00;True|2022-11-14T23:54:32.6128172+08:00;True|2022-11-14T23:26:52.0335380+08:00;True|2022-11-14T22:21:28.0622050+08:00;True|2022-11-14T21:47:43.6964619+08:00;True|2022-11-14T21:41:42.3128804+08:00;True|2022-11-14T21:31:17.2784203+08:00;True|2022-11-14T20:48:20.0380343+08:00;True|2022-11-11T17:24:44.7029993+08:00;True|2022-11-11T16:47:29.3444029+08:00;True|2022-11-11T16:07:26.4718473+08:00;True|2022-11-11T15:52:41.7235701+08:00;True|2022-11-10T15:58:10.8883176+08:00;True|2022-11-10T15:29:59.3113740+08:00;True|2022-11-10T13:34:14.7380132+08:00;True|2022-11-10T10:28:02.1166569+08:00;True|2022-11-09T23:28:25.6401971+08:00;True|2022-11-09T16:20:53.2757536+08:00;True|2022-11-09T16:16:41.3169214+08:00;True|2022-11-09T14:02:55.1802832+08:00;True|2022-11-09T13:57:55.2726154+08:00;True|2022-11-09T13:28:53.2022669+08:00;True|2022-11-09T13:10:58.0740163+08:00;True|2022-11-09T12:59:42.2328933+08:00;True|2022-11-09T11:54:08.0187924+08:00;True|2022-11-09T11:49:32.4296758+08:00;True|2022-11-09T11:34:32.6613370+08:00;True|2022-11-09T11:06:56.9443306+08:00;True|2022-11-06T23:43:44.0833657+08:00;True|2022-11-06T23:29:52.0088244+08:00;True|2022-11-06T22:06:14.7091464+08:00;True|2022-11-06T22:03:25.2696951+08:00;True|2022-11-06T21:58:50.1055520+08:00;True|2022-11-06T21:54:14.0075395+08:00;True|2022-11-06T21:39:30.2652105+08:00;True|2022-11-04T15:54:37.9813194+08:00;True|2022-11-04T15:43:59.7702621+08:00;True|2022-11-04T13:59:29.3941234+08:00;True|2022-11-04T13:44:18.1212719+08:00;True|2022-11-04T13:42:06.1010393+08:00;True|2022-11-04T13:37:01.7814703+08:00;True|2022-11-04T13:35:43.1121709+08:00;True|2022-11-04T13:33:05.1362535+08:00;True|2022-11-04T13:30:11.1113703+08:00;True|2022-11-04T13:28:53.7185382+08:00;True|2022-11-04T13:27:08.0691684+08:00;True|2022-11-04T13:20:46.2297633+08:00;True|2022-11-04T13:17:57.1564250+08:00;True|2022-11-04T13:15:36.3651019+08:00;True|2022-11-04T13:13:44.6635701+08:00;True|2022-11-04T13:12:02.3968306+08:00;True|2022-11-04T13:08:07.7653927+08:00;True|2022-11-04T11:37:44.1975649+08:00;True|2022-11-04T11:36:20.3813848+08:00;True|2022-11-04T11:26:40.9713465+08:00;True|2022-11-04T10:17:36.4269558+08:00;True|2022-11-04T09:47:05.4607111+08:00;True|2022-11-04T09:28:27.9347785+08:00;True|2022-11-04T08:38:38.5253737+08:00;True|2022-11-03T13:31:32.7883545+08:00;False|2022-11-03T13:27:07.8579021+08:00;True|2022-11-03T11:07:07.3903101+08:00;True|2022-11-03T10:54:26.7818816+08:00;True|2022-11-03T10:35:59.1956262+08:00;True|2022-11-03T10:30:07.0651285+08:00;True|2022-11-03T10:01:20.8467911+08:00;True|2022-08-22T11:13:33.9211829+08:00;True|2022-06-17T11:19:24.4893458+08:00;True|2022-06-07T14:44:51.5702202+08:00;True|2022-06-07T14:42:44.8351600+08:00;True|2022-05-17T14:19:55.1158182+08:00;True|2022-05-17T13:25:44.2886247+08:00;True|2022-05-17T10:29:26.6813564+08:00;True|2022-05-17T09:02:49.1742018+08:00;True|2022-05-06T15:13:12.2438900+08:00;True|2022-05-06T14:49:39.8536594+08:00;True|2022-04-22T17:07:44.8823529+08:00;True|2022-04-19T19:13:40.8312746+08:00;True|2022-04-19T15:40:16.0022040+08:00;True|2022-04-19T15:13:32.9767736+08:00;False|2022-04-19T15:08:33.6507639+08:00;True|2022-04-19T15:02:51.9580210+08:00;True|2022-04-19T13:54:18.7579131+08:00;True|2022-04-12T10:36:02.1779173+08:00;True|2022-04-12T10:05:31.0222037+08:00;True|2022-04-12T09:47:49.3724819+08:00;True|2022-04-09T15:08:54.5697468+08:00;True|2022-04-08T17:31:31.0046258+08:00;True|2022-04-08T16:50:41.3018422+08:00;True|2022-04-08T10:35:36.5029980+08:00;True|2022-03-31T09:38:37.3646053+08:00;True|2022-03-29T13:57:45.4410942+08:00;True|2022-03-10T18:59:23.7994337+08:00;True|2022-03-10T18:52:39.5019082+08:00;True|2022-03-10T18:51:12.7949284+08:00;True|2022-03-10T18:50:47.2024177+08:00;True|2022-03-10T18:45:08.8409380+08:00;True|2022-03-10T18:41:17.0102564+08:00;True|2022-03-10T18:35:49.0742353+08:00;True|2022-03-10T17:57:47.4196965+08:00;True|2022-03-10T17:34:27.5723245+08:00;True|2022-03-10T16:13:59.3829164+08:00;True|2022-03-09T14:50:49.1222033+08:00;True|2022-03-09T11:21:03.0073651+08:00;False|2022-03-09T11:16:56.1792896+08:00;False|2022-03-09T11:16:49.7923320+08:00;True|2022-03-08T15:47:47.4722336+08:00;True|2022-03-08T15:47:28.5397115+08:00;True|2022-03-08T15:37:08.7379870+08:00;True|2022-03-02T17:37:54.4659976+08:00;True|2022-03-02T17:34:12.2949726+08:00;True|2022-03-02T17:26:38.7070673+08:00;True|2022-03-02T17:07:49.7024316+08:00;True|2022-03-02T17:05:22.4177336+08:00;True|2022-03-02T16:14:57.9880587+08:00;True|2022-03-01T17:52:52.6766959+08:00;True|2022-02-28T14:36:22.6449303+08:00;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;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">
@@ -20,12 +20,12 @@
     <File Include="bin/BLL.dll">
       <publishTime>11/09/2022 16:02:08</publishTime>
       <publishTime>11/02/2022 22:03:01</publishTime>
-      <publishTime>04/09/2024 13:58:02</publishTime>
+      <publishTime>04/20/2024 20:54:41</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
       <publishTime>11/09/2022 16:02:08</publishTime>
       <publishTime>11/02/2022 22:03:01</publishTime>
-      <publishTime>04/09/2024 13:58:02</publishTime>
+      <publishTime>04/20/2024 20:54:41</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/18/2020 05:32:28</publishTime>
@@ -33,12 +33,12 @@
     <File Include="bin/DAL.dll">
       <publishTime>11/09/2022 16:02:06</publishTime>
       <publishTime>11/02/2022 22:02:58</publishTime>
-      <publishTime>04/09/2024 13:58:01</publishTime>
+      <publishTime>04/20/2024 20:54:39</publishTime>
     </File>
     <File Include="bin/DAL.pdb">
       <publishTime>11/09/2022 16:02:06</publishTime>
       <publishTime>11/02/2022 22:02:58</publishTime>
-      <publishTime>04/09/2024 13:58:01</publishTime>
+      <publishTime>04/20/2024 20:54:39</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
       <publishTime>07/22/2016 22:52:40</publishTime>
@@ -46,12 +46,12 @@
     <File Include="bin/DBUtility.dll">
       <publishTime>11/02/2022 22:02:56</publishTime>
       <publishTime>11/15/2022 13:55:23</publishTime>
-      <publishTime>04/09/2024 13:57:58</publishTime>
+      <publishTime>04/20/2024 20:54:35</publishTime>
     </File>
     <File Include="bin/DBUtility.pdb">
       <publishTime>11/09/2022 16:01:58</publishTime>
       <publishTime>11/02/2022 22:02:56</publishTime>
-      <publishTime>04/09/2024 13:57:58</publishTime>
+      <publishTime>04/20/2024 20:54:35</publishTime>
     </File>
     <File Include="bin/Grpc.Core.Api.dll">
       <publishTime>03/22/2022 13:17:26</publishTime>
@@ -107,12 +107,12 @@
     <File Include="bin/Model.dll">
       <publishTime>11/09/2022 16:02:01</publishTime>
       <publishTime>11/02/2022 22:02:56</publishTime>
-      <publishTime>04/09/2024 13:57:58</publishTime>
+      <publishTime>04/20/2024 20:54:36</publishTime>
     </File>
     <File Include="bin/Model.pdb">
       <publishTime>11/09/2022 16:02:01</publishTime>
       <publishTime>11/02/2022 22:02:56</publishTime>
-      <publishTime>04/09/2024 13:57:58</publishTime>
+      <publishTime>04/20/2024 20:54:36</publishTime>
     </File>
     <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
       <publishTime>04/06/2023 15:57:02</publishTime>
@@ -147,33 +147,33 @@
     <File Include="bin/Pub_Class.dll">
       <publishTime>11/09/2022 16:01:56</publishTime>
       <publishTime>11/02/2022 22:02:54</publishTime>
-      <publishTime>04/09/2024 13:57:56</publishTime>
+      <publishTime>04/20/2024 20:54:33</publishTime>
     </File>
     <File Include="bin/Pub_Class.pdb">
       <publishTime>11/09/2022 16:01:56</publishTime>
       <publishTime>11/02/2022 22:02:54</publishTime>
-      <publishTime>04/09/2024 13:57:56</publishTime>
+      <publishTime>04/20/2024 20:54:33</publishTime>
     </File>
     <File Include="bin/Pub_Control.dll">
       <publishTime>11/09/2022 16:01:57</publishTime>
       <publishTime>11/02/2022 22:02:55</publishTime>
-      <publishTime>04/09/2024 13:57:57</publishTime>
+      <publishTime>04/20/2024 20:54:34</publishTime>
     </File>
     <File Include="bin/Pub_Control.pdb">
       <publishTime>11/09/2022 16:01:57</publishTime>
       <publishTime>11/02/2022 22:02:55</publishTime>
-      <publishTime>04/09/2024 13:57:57</publishTime>
+      <publishTime>04/20/2024 20:54:34</publishTime>
     </File>
     <File Include="bin/RestSharp.dll">
       <publishTime>08/31/2012 06:22:50</publishTime>
     </File>
     <File Include="bin/SQLHelper.dll">
-      <publishTime>04/09/2024 13:57:57</publishTime>
+      <publishTime>04/20/2024 20:54:35</publishTime>
     </File>
     <File Include="bin/SQLHelper.pdb">
       <publishTime>11/09/2022 16:01:57</publishTime>
       <publishTime>11/02/2022 22:02:55</publishTime>
-      <publishTime>04/09/2024 13:57:57</publishTime>
+      <publishTime>04/20/2024 20:54:35</publishTime>
     </File>
     <File Include="bin/stdole.dll">
       <publishTime>05/09/2021 13:35:37</publishTime>
@@ -286,7 +286,7 @@
     <File Include="bin/WebAPI.dll">
       <publishTime>11/14/2022 11:23:59</publishTime>
       <publishTime>11/02/2022 22:03:04</publishTime>
-      <publishTime>04/09/2024 13:58:09</publishTime>
+      <publishTime>04/20/2024 20:54:47</publishTime>
     </File>
     <File Include="bin/WebAPI.dll.config">
       <publishTime>12/15/2021 17:59:43</publishTime>
@@ -294,7 +294,7 @@
     <File Include="bin/WebAPI.pdb">
       <publishTime>11/14/2022 11:23:59</publishTime>
       <publishTime>11/02/2022 22:03:04</publishTime>
-      <publishTime>04/09/2024 13:58:09</publishTime>
+      <publishTime>04/20/2024 20:54:47</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>07/18/2013 01:03:52</publishTime>
@@ -503,7 +503,7 @@
     <File Include="Web.config">
       <publishTime>11/14/2022 11:24:08</publishTime>
       <publishTime>11/02/2022 22:03:20</publishTime>
-      <publishTime>04/09/2024 13:59:04</publishTime>
+      <publishTime>04/20/2024 20:55:48</publishTime>
     </File>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/WebAPI/Service/LuBaoSevice.cs b/WebAPI/Service/LuBaoSevice.cs
index 3ef5df0..4fcbda0 100644
--- a/WebAPI/Service/LuBaoSevice.cs
+++ b/WebAPI/Service/LuBaoSevice.cs
@@ -643,6 +643,44 @@
         }
 
         /// <summary>
+        /// 椤圭洰绫诲埆鏍规嵁id鑾峰彇淇℃伅
+        /// </summary>
+        public static ApiResult<DataSet> GetGy_ProjectClassDetail(string HID)
+        {
+            if (string.IsNullOrEmpty(HID))
+                return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+            var dataSet = GetGy_ProjectClassDb(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 GetGy_ProjectClassDb(string HID)
+        {
+            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+            var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_ProjectClass  where HItemID= " + HID + " ", "h_v_Gy_ProjectClass");
+            return dataSet;
+        }
+
+        /// <summary>
+        /// 浠诲姟绫诲埆鏍规嵁id鑾峰彇淇℃伅
+        /// </summary>
+        public static ApiResult<DataSet> GetGy_TaskClassDetail(string HID)
+        {
+            if (string.IsNullOrEmpty(HID))
+                return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+            var dataSet = GetGy_TaskClassDb(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 GetGy_TaskClassDb(string HID)
+        {
+            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+            var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_TaskClass  where HItemID= " + HID + " ", "h_v_Gy_TaskClass");
+            return dataSet;
+        }
+
+        /// <summary>
         /// 寮傚父鍙嶉绫诲瀷鏍规嵁id鑾峰彇淇℃伅
         /// </summary>
         public static ApiResult<DataSet> GetGy_ErrMsgBackTypeDetail(string HID)
@@ -651,7 +689,7 @@
                 return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
             var dataSet = GetGy_ErrMsgBackTypeDb(HID);
             if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
-                return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄩ」鐩垂鐢ㄦ暟鎹�" };
+                return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄥ紓甯稿弽棣堢被鍨嬫暟鎹�" };
             return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
         }
         public static DataSet GetGy_ErrMsgBackTypeDb(string HID)
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 0eb305a..674d84e 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
 		<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
 		<!--<add key="FileIP" value="http://localhost:8080/" />-->
 		<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->
-		<!--add key="sUrl" value="http://192.168.63.53/WEBS-WMS/WebService1.asmx"/>   棰滃彴寮忔満-->
+		<add key="sUrl" value="http://192.168.63.53/WEBS-WMS/WebService1.asmx"/>   <!--棰滃彴寮忔満-->
 		<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
 		<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
 		<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    鍗氭棩绉戞妧-->
@@ -34,7 +34,7 @@
 		<!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS-WMS/WebService1.asmx"/>     瀹夌憺鏈嶅姟鍣�-->
 		<!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> -->	<!--娴嬭瘯鏈嶅姟鍣�-->
 		<!--<add key="sUrl" value="http://localhost:8082/WEBS/WebService1.asmx"/>    鏈湴-->
-		<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>	<!--闄堥洴闈欐湰鍦伴厤缃�-->
+		<!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>	闄堥洴闈欐湰鍦伴厤缃�-->
 		<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵-->
 
 		<add key="webpages:Version" value="3.0.0.0" />
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 70ecba5..fca7dca 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -653,6 +653,8 @@
     <Compile Include="DLL\ClsGy_AreaSet_Ctl.cs" />
     <Compile Include="DLL\ClsGy_CusType_Ctl.cs" />
     <Compile Include="DLL\ClsGy_ErrMsgBackType_Ctl.cs" />
+    <Compile Include="DLL\ClsGy_TaskClass_Ctl.cs" />
+    <Compile Include="DLL\ClsGy_ProjectClass_Ctl.cs" />
     <Compile Include="DLL\ClsGy_StockCheckItem_Ctl.cs" />
     <Compile Include="DLL\ClsGy_ProjectMoney_Ctl.cs" />
     <Compile Include="DLL\ClsGy_SupType_Ctl.cs" />

--
Gitblit v1.9.1