From 3eb99e4cb8be5175840c2e28f5f9d8ffd96e1ea4 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期六, 28 十二月 2024 15:34:21 +0800
Subject: [PATCH] 系统配置:保存功能

---
 SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt |    1 
 APSM/bin/Release/BLL.dll                                            |    0 
 BLL/bin/Release/DAL.dll                                             |    0 
 PlanM/bin/Release/PlanM.dll                                         |    0 
 APSM/bin/Release/BaseSet.dll                                        |    0 
 BaseSet/bin/Release/BLL.pdb                                         |    0 
 DAL/bin/Release/Model.dll                                           |    0 
 APSM/bin/Release/BLL.pdb                                            |    0 
 WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user        |   20 +-
 APSM/bin/Release/BaseSet.pdb                                        |    0 
 APSM/bin/Release/WorkM.dll                                          |    0 
 DAL/bin/Release/DAL.pdb                                             |    0 
 BaseSet/bin/Release/Model.pdb                                       |    0 
 BLL/bin/Release/Model.dll                                           |    0 
 BLL/bin/Release/DAL.pdb                                             |    0 
 BaseSet/bin/Release/BLL.dll                                         |    0 
 BaseSet/bin/Release/Model.dll                                       |    0 
 BLL/bin/Release/Model.pdb                                           |    0 
 DAL/bin/Release/DAL.dll                                             |    0 
 PlanM/bin/Release/BLL.dll                                           |    0 
 BaseSet/bin/Release/BaseSet.dll                                     |    0 
 DAL/bin/Release/Model.pdb                                           |    0 
 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll                            |    0 
 WarM/bin/Release/BLL.dll                                            |    0 
 APSM/bin/Release/WarM.pdb                                           |    0 
 WorkM/bin/Release/WorkM.pdb                                         |    0 
 WarM/bin/Release/WarM.pdb                                           |    0 
 WorkM/bin/Release/BLL.dll                                           |    0 
 BaseSet/bin/Release/BaseSet.pdb                                     |    0 
 Model/obj/Release/Model.pdb                                         |    0 
 BLL/bin/Release/BLL.pdb                                             |    0 
 PlanM/bin/Release/BLL.pdb                                           |    0 
 APSM/bin/Release/PlanM.dll                                          |    0 
 APSM/bin/Release/DAL.dll                                            |    0 
 APSM/bin/Release/WarM.dll                                           |    0 
 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll                            |    0 
 WarM/bin/Release/WarM.dll                                           |    0 
 APSM/bin/Release/PlanM.pdb                                          |    0 
 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache      |    0 
 WorkM/bin/Release/BLL.pdb                                           |    0 
 WebAPI/ListModels.cs                                                |   25 +++
 WorkM/bin/Release/Model.dll                                         |    0 
 WorkM/bin/Release/WorkM.dll                                         |    0 
 PlanM/bin/Release/Model.pdb                                         |    0 
 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt    |    1 
 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb                            |    0 
 DAL/DAL.csproj                                                      |    1 
 WarM/bin/Release/Model.pdb                                          |    0 
 WarM/bin/Release/Model.dll                                          |    0 
 APSM/bin/Release/DAL.pdb                                            |    0 
 PlanM/bin/Release/Model.dll                                         |    0 
 DAL/系统公用/ClsXt_DefineBillMainSet.cs                                 |  254 +++++++++++++++++++++++++++++++
 PlanM/bin/Release/DAL.dll                                           |    0 
 Model/系统公用/ClsXt_DefineBillMainSetMain.cs                           |   16 ++
 Model/Model.csproj                                                  |    2 
 WorkM/bin/Release/Model.pdb                                         |    0 
 WarM/bin/Release/DAL.dll                                            |    0 
 SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache      |    0 
 WarM/bin/Release/DAL.pdb                                            |    0 
 WorkM/bin/Release/WarM.pdb                                          |    0 
 WarM/bin/Release/BLL.pdb                                            |    0 
 BLL/bin/Release/BLL.dll                                             |    0 
 BaseSet/bin/Release/DAL.pdb                                         |    0 
 PlanM/bin/Release/DAL.pdb                                           |    0 
 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb                            |    0 
 Model/obj/Release/Model.dll                                         |    0 
 WorkM/bin/Release/WarM.dll                                          |    0 
 Model/系统公用/ClsXt_DefineBillMainSetSub.cs                            |   27 +++
 WebAPI/Controllers/Xt_DefineBillMainSetController.cs                |  101 ++++++++++++
 Model/obj/Release/Model.csproj.AssemblyReference.cache              |    0 
 Model/bin/Release/Model.pdb                                         |    0 
 BaseSet/bin/Release/DAL.dll                                         |    0 
 APSM/bin/Release/Model.dll                                          |    0 
 APSM/bin/Release/APSM.pdb                                           |    0 
 PlanM/bin/Release/PlanM.pdb                                         |    0 
 Model/bin/Release/Model.dll                                         |    0 
 /dev/null                                                           |    0 
 APSM/bin/Release/WorkM.pdb                                          |    0 
 APSM/bin/Release/Model.pdb                                          |    0 
 WorkM/bin/Release/DAL.pdb                                           |    0 
 APSM/bin/Release/APSM.dll                                           |    0 
 WorkM/bin/Release/DAL.dll                                           |    0 
 82 files changed, 435 insertions(+), 13 deletions(-)

diff --git a/APSM/bin/Release/APSM.dll b/APSM/bin/Release/APSM.dll
index 5fe43b0..93cc840 100644
--- a/APSM/bin/Release/APSM.dll
+++ b/APSM/bin/Release/APSM.dll
Binary files differ
diff --git a/APSM/bin/Release/APSM.pdb b/APSM/bin/Release/APSM.pdb
index 0adf23a..0d3ffb9 100644
--- a/APSM/bin/Release/APSM.pdb
+++ b/APSM/bin/Release/APSM.pdb
Binary files differ
diff --git a/APSM/bin/Release/BLL.dll b/APSM/bin/Release/BLL.dll
index 60b274f..4fd1bf6 100644
--- a/APSM/bin/Release/BLL.dll
+++ b/APSM/bin/Release/BLL.dll
Binary files differ
diff --git a/APSM/bin/Release/BLL.pdb b/APSM/bin/Release/BLL.pdb
index 46278c7..8f33cd3 100644
--- a/APSM/bin/Release/BLL.pdb
+++ b/APSM/bin/Release/BLL.pdb
Binary files differ
diff --git a/APSM/bin/Release/BaseSet.dll b/APSM/bin/Release/BaseSet.dll
index 7dcec45..bcdd584 100644
--- a/APSM/bin/Release/BaseSet.dll
+++ b/APSM/bin/Release/BaseSet.dll
Binary files differ
diff --git a/APSM/bin/Release/BaseSet.pdb b/APSM/bin/Release/BaseSet.pdb
index cf909a3..f6d0870 100644
--- a/APSM/bin/Release/BaseSet.pdb
+++ b/APSM/bin/Release/BaseSet.pdb
Binary files differ
diff --git a/APSM/bin/Release/DAL.dll b/APSM/bin/Release/DAL.dll
index 5465d24..170ec9f 100644
--- a/APSM/bin/Release/DAL.dll
+++ b/APSM/bin/Release/DAL.dll
Binary files differ
diff --git a/APSM/bin/Release/DAL.pdb b/APSM/bin/Release/DAL.pdb
index d85dff9..b0a66b4 100644
--- a/APSM/bin/Release/DAL.pdb
+++ b/APSM/bin/Release/DAL.pdb
Binary files differ
diff --git a/APSM/bin/Release/Model.dll b/APSM/bin/Release/Model.dll
index cef4a0f..4afdf14 100644
--- a/APSM/bin/Release/Model.dll
+++ b/APSM/bin/Release/Model.dll
Binary files differ
diff --git a/APSM/bin/Release/Model.pdb b/APSM/bin/Release/Model.pdb
index b8a1619..91f60d7 100644
--- a/APSM/bin/Release/Model.pdb
+++ b/APSM/bin/Release/Model.pdb
Binary files differ
diff --git a/APSM/bin/Release/PlanM.dll b/APSM/bin/Release/PlanM.dll
index a4d7814..7f624eb 100644
--- a/APSM/bin/Release/PlanM.dll
+++ b/APSM/bin/Release/PlanM.dll
Binary files differ
diff --git a/APSM/bin/Release/PlanM.pdb b/APSM/bin/Release/PlanM.pdb
index 4f9dfc0..8713339 100644
--- a/APSM/bin/Release/PlanM.pdb
+++ b/APSM/bin/Release/PlanM.pdb
Binary files differ
diff --git a/APSM/bin/Release/WarM.dll b/APSM/bin/Release/WarM.dll
index f528b48..99c0a66 100644
--- a/APSM/bin/Release/WarM.dll
+++ b/APSM/bin/Release/WarM.dll
Binary files differ
diff --git a/APSM/bin/Release/WarM.pdb b/APSM/bin/Release/WarM.pdb
index c650d30..e63ac0d 100644
--- a/APSM/bin/Release/WarM.pdb
+++ b/APSM/bin/Release/WarM.pdb
Binary files differ
diff --git a/APSM/bin/Release/WorkM.dll b/APSM/bin/Release/WorkM.dll
index 7d438cc..8575402 100644
--- a/APSM/bin/Release/WorkM.dll
+++ b/APSM/bin/Release/WorkM.dll
Binary files differ
diff --git a/APSM/bin/Release/WorkM.pdb b/APSM/bin/Release/WorkM.pdb
index 15c7fab..57a3957 100644
--- a/APSM/bin/Release/WorkM.pdb
+++ b/APSM/bin/Release/WorkM.pdb
Binary files differ
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index 60b274f..4fd1bf6 100644
--- a/BLL/bin/Release/BLL.dll
+++ b/BLL/bin/Release/BLL.dll
Binary files differ
diff --git a/BLL/bin/Release/BLL.pdb b/BLL/bin/Release/BLL.pdb
index 46278c7..8f33cd3 100644
--- a/BLL/bin/Release/BLL.pdb
+++ b/BLL/bin/Release/BLL.pdb
Binary files differ
diff --git a/BLL/bin/Release/DAL.dll b/BLL/bin/Release/DAL.dll
index 5465d24..170ec9f 100644
--- a/BLL/bin/Release/DAL.dll
+++ b/BLL/bin/Release/DAL.dll
Binary files differ
diff --git a/BLL/bin/Release/DAL.pdb b/BLL/bin/Release/DAL.pdb
index d85dff9..b0a66b4 100644
--- a/BLL/bin/Release/DAL.pdb
+++ b/BLL/bin/Release/DAL.pdb
Binary files differ
diff --git a/BLL/bin/Release/Model.dll b/BLL/bin/Release/Model.dll
index cef4a0f..4afdf14 100644
--- a/BLL/bin/Release/Model.dll
+++ b/BLL/bin/Release/Model.dll
Binary files differ
diff --git a/BLL/bin/Release/Model.pdb b/BLL/bin/Release/Model.pdb
index b8a1619..91f60d7 100644
--- a/BLL/bin/Release/Model.pdb
+++ b/BLL/bin/Release/Model.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/BLL.dll b/BaseSet/bin/Release/BLL.dll
index 60b274f..4fd1bf6 100644
--- a/BaseSet/bin/Release/BLL.dll
+++ b/BaseSet/bin/Release/BLL.dll
Binary files differ
diff --git a/BaseSet/bin/Release/BLL.pdb b/BaseSet/bin/Release/BLL.pdb
index 46278c7..8f33cd3 100644
--- a/BaseSet/bin/Release/BLL.pdb
+++ b/BaseSet/bin/Release/BLL.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/BaseSet.dll b/BaseSet/bin/Release/BaseSet.dll
index 7dcec45..bcdd584 100644
--- a/BaseSet/bin/Release/BaseSet.dll
+++ b/BaseSet/bin/Release/BaseSet.dll
Binary files differ
diff --git a/BaseSet/bin/Release/BaseSet.pdb b/BaseSet/bin/Release/BaseSet.pdb
index cf909a3..f6d0870 100644
--- a/BaseSet/bin/Release/BaseSet.pdb
+++ b/BaseSet/bin/Release/BaseSet.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/DAL.dll b/BaseSet/bin/Release/DAL.dll
index 5465d24..170ec9f 100644
--- a/BaseSet/bin/Release/DAL.dll
+++ b/BaseSet/bin/Release/DAL.dll
Binary files differ
diff --git a/BaseSet/bin/Release/DAL.pdb b/BaseSet/bin/Release/DAL.pdb
index d85dff9..b0a66b4 100644
--- a/BaseSet/bin/Release/DAL.pdb
+++ b/BaseSet/bin/Release/DAL.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/Model.dll b/BaseSet/bin/Release/Model.dll
index cef4a0f..4afdf14 100644
--- a/BaseSet/bin/Release/Model.dll
+++ b/BaseSet/bin/Release/Model.dll
Binary files differ
diff --git a/BaseSet/bin/Release/Model.pdb b/BaseSet/bin/Release/Model.pdb
index b8a1619..91f60d7 100644
--- a/BaseSet/bin/Release/Model.pdb
+++ b/BaseSet/bin/Release/Model.pdb
Binary files differ
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 8c96bf8..86c93e9 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -93,6 +93,7 @@
     <Compile Include="ClsPM_WorkPlanMonthBillMain.cs" />
     <Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOBillList_CusBarCodeBill.cs" />
     <Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOReportBillList_CusBarCodeBill.cs" />
+    <Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSet.cs" />
     <Compile Include="璐ㄦ绠$悊\ClsQC_EnvironmentTestDotCheckBillMain.cs" />
     <Compile Include="璐ㄦ绠$悊\ClsQC_MonthTarGetBill.cs" />
     <Compile Include="鐢熶骇绠$悊\璁惧绠$悊\ClsSb_EquipRepairSignBill.cs" />
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index 5465d24..170ec9f 100644
--- a/DAL/bin/Release/DAL.dll
+++ b/DAL/bin/Release/DAL.dll
Binary files differ
diff --git a/DAL/bin/Release/DAL.pdb b/DAL/bin/Release/DAL.pdb
index d85dff9..b0a66b4 100644
--- a/DAL/bin/Release/DAL.pdb
+++ b/DAL/bin/Release/DAL.pdb
Binary files differ
diff --git a/DAL/bin/Release/Model.dll b/DAL/bin/Release/Model.dll
index cef4a0f..4afdf14 100644
--- a/DAL/bin/Release/Model.dll
+++ b/DAL/bin/Release/Model.dll
Binary files differ
diff --git a/DAL/bin/Release/Model.pdb b/DAL/bin/Release/Model.pdb
index b8a1619..91f60d7 100644
--- a/DAL/bin/Release/Model.pdb
+++ b/DAL/bin/Release/Model.pdb
Binary files differ
diff --git "a/DAL/\347\263\273\347\273\237\345\205\254\347\224\250/ClsXt_DefineBillMainSet.cs" "b/DAL/\347\263\273\347\273\237\345\205\254\347\224\250/ClsXt_DefineBillMainSet.cs"
new file mode 100644
index 0000000..29b8fc3
--- /dev/null
+++ "b/DAL/\347\263\273\347\273\237\345\205\254\347\224\250/ClsXt_DefineBillMainSet.cs"
@@ -0,0 +1,254 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+    public  class ClsXt_DefineBillMainSet : DBUtility.ClsXt_BaseBill
+    {
+        public Model.ClsXt_DefineBillMainSetMain omodel = new Model.ClsXt_DefineBillMainSetMain();
+        public List<Model.ClsXt_DefineBillMainSetSub> DetailColl = new List<Model.ClsXt_DefineBillMainSetSub>();
+
+        public ClsXt_DefineBillMainSet()
+        {
+            base.MvarItemKeyForWeb = "";
+            base.MvarItemKeySubForWeb = "Xt_DefineBillMainSet";
+            base.MvarItemKeySub = "Xt_DefineBillMainSetSub";
+            base.MvarItemKeySub2 = "";
+            base.MvarItemKeySub3 = "";
+            base.MvarItemKeySub4 = "";
+            base.MvarItemKey= "Xt_DefineBillMainSetMain";
+            base.MvarReportTitle="琛ㄥご鑷畾涔夊崟鎹�";
+            base.BillType="";
+            base.HBillSubType = "";
+
+        }
+
+        #region 鍥哄畾浠g爜
+
+        ~ClsXt_DefineBillMainSet()
+        {
+            DetailColl = null;
+        }
+
+        #endregion   鑷畾涔夋柟娉�
+
+        #region 淇敼鍗曟嵁
+        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+        {
+            try
+            {
+                oCn.BeginTran();
+                omodel.HInterID = lngBillKey;
+                //鏇存柊涓昏〃
+                string mainSql = "update Xt_DefineBillMainSetMain set  " +
+                "HInterID = '" + omodel.HInterID + "'" +
+                ",HModName = '" + omodel.HModName + "'" +
+                ",HUser = '" + omodel.HUser + "'" +
+                ",HTableName = '" + omodel.HTableName + "'" +
+                ",HDataViewName = '" + omodel.HDataViewName + "'" +
+                ",HDataProcName = '" + omodel.HDataProcName + "'" +
+                ",HUpdater = '" + omodel.HUpDater + "'" +
+                ",HUpdateDate = " + "getdate()" + "" +
+                ",HRowElementCount = '" + omodel.HRowElementCount + "'" +
+                " where HInterID=" + lngBillKey.ToString();
+                oCn.RunProc(mainSql);
+
+                //鍒犻櫎瀛愯〃
+                DeleteBillSub(lngBillKey);
+
+                //鎻掑叆瀛愯〃
+                int HEntryID = 1;
+                foreach (Model.ClsXt_DefineBillMainSetSub oSub in DetailColl)
+                {
+                    string subSql = "Insert into Xt_DefineBillMainSetSub " +
+                      " (HInterID,HEntryID,HArrangeOrder,HArrangeOrderSub,HIsHide,HIsDisabled,HIsMust,HParentElementID,HElementID" +
+                      ",HElementLabel,HElementType,HFieldMaxLength,HDefaultValue,HFieldName,HFieldDataType,HRelateUrl,HSubWindowBackData" +
+                      ",HSubWindowBackDataMethodName,HSelectContent" +
+                      ") values(" +
+                        "'" + omodel.HInterID + "'" +
+                        ",'" + (HEntryID++) + "'" +
+                        ",'" + oSub.HArrangeOrder + "'" +
+                        ",'" + oSub.HArrangeOrderSub + "'" +
+                        ",'" + (oSub.HIsHide ? 1 : 0) + "'" +
+                        ",'" + (oSub.HIsDisabled ? 1 : 0) + "'" +
+                        ",'" + (oSub.HIsMust ? 1 : 0) + "'" +
+                        ",'" + oSub.HParentElementID + "'" +
+                        ",'" + oSub.HElementID + "'" +
+                        ",'" + oSub.HElementLabel + "'" +
+                        ",'" + oSub.HElementType + "'" +
+                        ",'" + oSub.HFieldMaxLength + "'" +
+                        ",'" + oSub.HDefaultValue + "'" +
+                        ",'" + oSub.HFieldName + "'" +
+                        ",'" + oSub.HFieldDataType + "'" +
+                        ",'" + oSub.HRelateUrl + "'" +
+                        ",'" + oSub.HSubWindowBackData + "'" +
+                        ",'" + oSub.HSubWindowBackDataMethodName + "'" +
+                        ",'" + oSub.HSelectContent + "'" +
+                        ") ";
+                    oCn.RunProc(subSql);
+                }
+
+                sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+                oCn.Commit();
+                return true;
+            }
+            catch (Exception e)
+            {
+                sReturn = e.Message;
+                oCn.RollBack();
+                throw (e);
+            }
+        }
+        #endregion
+
+        #region 鏂板鍗曟嵁
+        public override bool AddBill(ref string sReturn)
+        {
+            try
+            {
+                
+
+                string sql_0 = "select top(1)* from Xt_DefineBillMainSetMain order by HInterID desc";
+                DataSet dataSet = oCn.RunProcReturn(sql_0, "Xt_DefineBillMainSetMain");
+                if(dataSet!=null && dataSet.Tables[0].Rows.Count > 0)
+                {
+                    omodel.HInterID = DBUtility.ClsPub.isLong(dataSet.Tables[0].Rows[0]["HInterID"]) + 1;
+                }
+                else
+                {
+                    omodel.HInterID = 1;
+                }
+
+                oCn.BeginTran();
+                //涓昏〃
+                string mainSql = "Insert Into Xt_DefineBillMainSetMain" +
+                "(HInterID,HModName,HUser,HTableName,HDataViewName,HDataProcName,HMaker,HMakeDate,HRowElementCount) " +
+                " values(" +
+                "'" + omodel.HInterID + "'" +
+                ",'" + omodel.HModName + "'" +
+                ",'" + omodel.HUser + "'" +
+                ",'" + omodel.HTableName + "'" +
+                ",'" + omodel.HDataViewName + "'" +
+                ",'" + omodel.HDataProcName + "'" +
+                ",'" + omodel.HMaker + "'" +
+                "," + "getdate()" + "" +
+                ",'" + omodel.HRowElementCount + "'" +
+                ")";
+                oCn.RunProc(mainSql);
+
+                //鎻掑叆瀛愯〃
+                int HEntryID = 1;
+                foreach (Model.ClsXt_DefineBillMainSetSub oSub in DetailColl)
+                {
+                    string subSql = "Insert into Xt_DefineBillMainSetSub " +
+                      " (HInterID,HEntryID,HArrangeOrder,HArrangeOrderSub,HIsHide,HIsDisabled,HIsMust,HParentElementID,HElementID" +
+                      ",HElementLabel,HElementType,HFieldMaxLength,HDefaultValue,HFieldName,HFieldDataType,HRelateUrl,HSubWindowBackData" +
+                      ",HSubWindowBackDataMethodName,HSelectContent" +
+                      ") values(" +
+                        "'" + omodel.HInterID + "'" +
+                        ",'" + (HEntryID++) + "'" +
+                        ",'" + oSub.HArrangeOrder + "'" +
+                        ",'" + oSub.HArrangeOrderSub + "'" +
+                        ",'" + (oSub.HIsHide?1:0) + "'" +
+                        ",'" + (oSub.HIsDisabled?1:0) + "'" +
+                        ",'" + (oSub.HIsMust?1:0) + "'" +
+                        ",'" + oSub.HParentElementID + "'" +
+                        ",'" + oSub.HElementID + "'" +
+                        ",'" + oSub.HElementLabel + "'" +
+                        ",'" + oSub.HElementType + "'" +
+                        ",'" + oSub.HFieldMaxLength + "'" +
+                        ",'" + oSub.HDefaultValue + "'" +
+                        ",'" + oSub.HFieldName + "'" +
+                        ",'" + oSub.HFieldDataType + "'" +
+                        ",'" + oSub.HRelateUrl + "'" +
+                        ",'" + oSub.HSubWindowBackData + "'" +
+                        ",'" + oSub.HSubWindowBackDataMethodName + "'" +
+                        ",'" + oSub.HSelectContent + "'" +
+                        ") ";
+                    oCn.RunProc(subSql);
+                }
+                
+                sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+                oCn.Commit();
+                return true;
+            }
+            catch (Exception e)
+            {
+                sReturn = e.Message;
+                oCn.RollBack();
+                throw (e);
+            }
+        }
+        #endregion
+
+        #region 鏄剧ず鍗曟嵁
+        public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+        {
+            try
+            {
+                //鏌ヨ涓昏〃
+                DataSet Ds ;
+                Ds = oCn.RunProcReturn("Select * from Xt_DefineBillMainSetMain Where HInterID=" + lngBillKey.ToString(), "Xt_DefineBillMainSetMain");
+                if(Ds.Tables[0].Rows.Count==0)
+                {
+                    sReturn = "鍗曟嵁鏈壘鍒帮紒";
+                    return false;
+                }
+                //鍥哄畾璧嬪��===========================================
+                omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+                omodel.HModName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HModName"]);
+                omodel.HUser = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUser"]);
+                omodel.HTableName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HTableName"]);
+                omodel.HDataViewName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDataViewName"]);
+                omodel.HDataProcName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDataProcName"]);
+                omodel.HMaker = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaker"]);
+                omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+                omodel.HUpDater = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HUpDater"]);
+                omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+                omodel.HRowElementCount = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HRowElementCount"]);
+                
+                //寰幆
+                DataSet DsSub ;
+                DsSub = oCn.RunProcReturn("Select * from Xt_DefineBillMainSetSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Xt_DefineBillMainSetSub");
+                DetailColl.Clear();//娓呯┖
+                for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+                {
+                    Model.ClsXt_DefineBillMainSetSub oSub = new Model.ClsXt_DefineBillMainSetSub();
+                    // 鍥哄畾璧嬪��===============================================
+                    oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+                    oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+                    oSub.HArrangeOrder = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HArrangeOrder"]);
+                    oSub.HArrangeOrderSub = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HArrangeOrderSub"]);
+                    oSub.HIsHide = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HIsHide"])==1?true:false;
+                    oSub.HIsDisabled = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HIsDisabled"]) == 1 ? true : false;
+                    oSub.HIsMust = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HIsMust"]) == 1 ? true : false;
+                    oSub.HParentElementID = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HParentElementID"]);
+                    oSub.HElementID = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HElementID"]);
+                    oSub.HElementLabel = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HElementLabel"]);
+                    oSub.HElementType = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HElementType"]);
+                    oSub.HFieldMaxLength = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HFieldMaxLength"]);
+                    oSub.HDefaultValue = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HDefaultValue"]);
+                    oSub.HFieldName = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HFieldName"]);
+                    oSub.HFieldDataType = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HFieldDataType"]);
+                    oSub.HRelateUrl = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HRelateUrl"]);
+                    oSub.HSubWindowBackData = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSubWindowBackData"]);
+                    oSub.HSubWindowBackDataMethodName = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSubWindowBackDataMethodName"]);
+                    oSub.HSelectContent = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSelectContent"]);
+                    DetailColl.Add(oSub);
+                }
+                sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+                return true;
+            }
+            catch (Exception e)
+            {
+                sReturn = e.Message;
+                throw (e);
+            }
+        }
+        #endregion
+
+    }
+
+}
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index 4bdba7e..f5e894a 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 4bcdef2..493585a 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -151,6 +151,8 @@
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TechnologyParameterType_Model .cs" />
     <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RestDay_Model.cs" />
     <Compile Include="鐢熶骇绠$悊\妯″叿绠$悊\ClsSc_MouldMaintainPlanBillSub_Plan.cs" />
+    <Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSetSub.cs" />
+    <Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSetMain.cs" />
     <Compile Include="璐ㄦ绠$悊\ClsQC_EnvironmentTestDotCheckBillMain.cs" />
     <Compile Include="璐ㄦ绠$悊\ClsQC_EnvironmentTestDotCheckBillSub.cs" />
     <Compile Include="璐ㄦ绠$悊\ClsQC_MonthTarGetBillMain.cs" />
diff --git a/Model/bin/Release/Model.dll b/Model/bin/Release/Model.dll
index cef4a0f..4afdf14 100644
--- a/Model/bin/Release/Model.dll
+++ b/Model/bin/Release/Model.dll
Binary files differ
diff --git a/Model/bin/Release/Model.pdb b/Model/bin/Release/Model.pdb
index b8a1619..91f60d7 100644
--- a/Model/bin/Release/Model.pdb
+++ b/Model/bin/Release/Model.pdb
Binary files differ
diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache
index 7d164ad..f2f1252 100644
--- a/Model/obj/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/obj/Release/Model.dll b/Model/obj/Release/Model.dll
index cef4a0f..4afdf14 100644
--- a/Model/obj/Release/Model.dll
+++ b/Model/obj/Release/Model.dll
Binary files differ
diff --git a/Model/obj/Release/Model.pdb b/Model/obj/Release/Model.pdb
index b8a1619..91f60d7 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git "a/Model/\347\263\273\347\273\237\345\205\254\347\224\250/ClsXt_DefineBillMainSetMain.cs" "b/Model/\347\263\273\347\273\237\345\205\254\347\224\250/ClsXt_DefineBillMainSetMain.cs"
new file mode 100644
index 0000000..76668e4
--- /dev/null
+++ "b/Model/\347\263\273\347\273\237\345\205\254\347\224\250/ClsXt_DefineBillMainSetMain.cs"
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+    public class ClsXt_DefineBillMainSetMain : DBUtility.ClsXt_BaseBillMain
+    {
+        public string HModName;                         //模块名
+        public string HUser;                            //用户名
+        public string HTableName;                       //主表名
+        public string HDataViewName;                    //编辑赋值的视图名
+        public string HDataProcName;                    //存储过程名
+        public long HRowElementCount;                    //每行元素数
+    }
+}
diff --git "a/Model/\347\263\273\347\273\237\345\205\254\347\224\250/ClsXt_DefineBillMainSetSub.cs" "b/Model/\347\263\273\347\273\237\345\205\254\347\224\250/ClsXt_DefineBillMainSetSub.cs"
new file mode 100644
index 0000000..8795cbe
--- /dev/null
+++ "b/Model/\347\263\273\347\273\237\345\205\254\347\224\250/ClsXt_DefineBillMainSetSub.cs"
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+    public class ClsXt_DefineBillMainSetSub : DBUtility.ClsXt_BaseBillSub
+    {
+		public long HArrangeOrder; 							//排列顺序
+		public long HArrangeOrderSub;                        //子排列顺序
+		public bool HIsHide;                                //是否隐藏
+		public bool HIsDisabled;                            //是否禁用
+		public bool HIsMust;								//是否必填
+		public string HParentElementID;                     //父级组件ID
+		public string HElementID;                           //组件ID
+		public string HElementLabel;                        //组件标签
+		public string HElementType;                         //组件类型
+		public long HFieldMaxLength;                         //当组件为需要输入的文本框等组件时,设置最大的可输入长度
+		public string HDefaultValue;                        //默认值
+		public string HFieldName;                           //数据对应字段名,用于在编辑时进行赋值
+		public string HFieldDataType;                       //数据对应字段的数据类型
+		public string HRelateUrl;                           //可能用到的链接信息
+		public string HSubWindowBackData;                   //打开弹窗获取数据后需要设置的数据,格式【窗口元素ID-子窗口数据field】,多个设置间用分号';'分隔
+		public string HSubWindowBackDataMethodName;         //添加的方法名,用于弹窗调用并返回数据
+		public string HSelectContent;						//下拉列表选项。格式【value值——显示值】,多个设置间用分号';'分隔
+	}
+}
diff --git a/PlanM/bin/Release/BLL.dll b/PlanM/bin/Release/BLL.dll
index 60b274f..4fd1bf6 100644
--- a/PlanM/bin/Release/BLL.dll
+++ b/PlanM/bin/Release/BLL.dll
Binary files differ
diff --git a/PlanM/bin/Release/BLL.pdb b/PlanM/bin/Release/BLL.pdb
index 46278c7..8f33cd3 100644
--- a/PlanM/bin/Release/BLL.pdb
+++ b/PlanM/bin/Release/BLL.pdb
Binary files differ
diff --git a/PlanM/bin/Release/DAL.dll b/PlanM/bin/Release/DAL.dll
index 5465d24..170ec9f 100644
--- a/PlanM/bin/Release/DAL.dll
+++ b/PlanM/bin/Release/DAL.dll
Binary files differ
diff --git a/PlanM/bin/Release/DAL.pdb b/PlanM/bin/Release/DAL.pdb
index d85dff9..b0a66b4 100644
--- a/PlanM/bin/Release/DAL.pdb
+++ b/PlanM/bin/Release/DAL.pdb
Binary files differ
diff --git a/PlanM/bin/Release/Model.dll b/PlanM/bin/Release/Model.dll
index cef4a0f..4afdf14 100644
--- a/PlanM/bin/Release/Model.dll
+++ b/PlanM/bin/Release/Model.dll
Binary files differ
diff --git a/PlanM/bin/Release/Model.pdb b/PlanM/bin/Release/Model.pdb
index b8a1619..91f60d7 100644
--- a/PlanM/bin/Release/Model.pdb
+++ b/PlanM/bin/Release/Model.pdb
Binary files differ
diff --git a/PlanM/bin/Release/PlanM.dll b/PlanM/bin/Release/PlanM.dll
index a4d7814..7f624eb 100644
--- a/PlanM/bin/Release/PlanM.dll
+++ b/PlanM/bin/Release/PlanM.dll
Binary files differ
diff --git a/PlanM/bin/Release/PlanM.pdb b/PlanM/bin/Release/PlanM.pdb
index 4f9dfc0..8713339 100644
--- a/PlanM/bin/Release/PlanM.pdb
+++ b/PlanM/bin/Release/PlanM.pdb
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
index aba9f94..f5e894a 100644
--- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
deleted file mode 100644
index fea44e6..0000000
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index 432c230..5e4a382 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -8,4 +8,3 @@
 C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
 C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
 C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
diff --git a/WarM/bin/Release/BLL.dll b/WarM/bin/Release/BLL.dll
index 60b274f..4fd1bf6 100644
--- a/WarM/bin/Release/BLL.dll
+++ b/WarM/bin/Release/BLL.dll
Binary files differ
diff --git a/WarM/bin/Release/BLL.pdb b/WarM/bin/Release/BLL.pdb
index 46278c7..8f33cd3 100644
--- a/WarM/bin/Release/BLL.pdb
+++ b/WarM/bin/Release/BLL.pdb
Binary files differ
diff --git a/WarM/bin/Release/DAL.dll b/WarM/bin/Release/DAL.dll
index 5465d24..170ec9f 100644
--- a/WarM/bin/Release/DAL.dll
+++ b/WarM/bin/Release/DAL.dll
Binary files differ
diff --git a/WarM/bin/Release/DAL.pdb b/WarM/bin/Release/DAL.pdb
index d85dff9..b0a66b4 100644
--- a/WarM/bin/Release/DAL.pdb
+++ b/WarM/bin/Release/DAL.pdb
Binary files differ
diff --git a/WarM/bin/Release/Model.dll b/WarM/bin/Release/Model.dll
index cef4a0f..4afdf14 100644
--- a/WarM/bin/Release/Model.dll
+++ b/WarM/bin/Release/Model.dll
Binary files differ
diff --git a/WarM/bin/Release/Model.pdb b/WarM/bin/Release/Model.pdb
index b8a1619..91f60d7 100644
--- a/WarM/bin/Release/Model.pdb
+++ b/WarM/bin/Release/Model.pdb
Binary files differ
diff --git a/WarM/bin/Release/WarM.dll b/WarM/bin/Release/WarM.dll
index f528b48..99c0a66 100644
--- a/WarM/bin/Release/WarM.dll
+++ b/WarM/bin/Release/WarM.dll
Binary files differ
diff --git a/WarM/bin/Release/WarM.pdb b/WarM/bin/Release/WarM.pdb
index c650d30..e63ac0d 100644
--- a/WarM/bin/Release/WarM.pdb
+++ b/WarM/bin/Release/WarM.pdb
Binary files differ
diff --git a/WebAPI/Controllers/Xt_DefineBillMainSetController.cs b/WebAPI/Controllers/Xt_DefineBillMainSetController.cs
index c92cd5a..d31d5d7 100644
--- a/WebAPI/Controllers/Xt_DefineBillMainSetController.cs
+++ b/WebAPI/Controllers/Xt_DefineBillMainSetController.cs
@@ -21,7 +21,9 @@
         private json objJsonResult = new json();
         public DataSet ds = new DataSet();
         public SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
-      
+        public DAL.ClsXt_DefineBillMainSet BillOld = new DAL.ClsXt_DefineBillMainSet();
+        public DAL.ClsXt_DefineBillMainSet BillNew0 = new DAL.ClsXt_DefineBillMainSet();
+
         #region 鑷姩鍔犺浇椤甸潰琛ㄥご
         /// <summary>
         /// 杩斿洖椤圭洰闃舵鍒楄〃
@@ -99,5 +101,102 @@
         }
         #endregion
 
+        #region 琛ㄥご鑷姩鍔犺浇淇濆瓨 鏂板/缂栬緫
+        [Route("Xt_DefineBillMainSet/SaveXt_DefineBillMainSet")]
+        [HttpPost]
+        public object SaveXt_DefineBillMainSet([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();                             //瀛愯〃1鏁版嵁
+            string msg4 = sArray[2].ToString();                             //鐢ㄦ埛
+
+            ListModels oListModels = new ListModels();
+            try
+            {
+                ////缂栬緫鏉冮檺
+                //if (!DBUtility.ClsPub.Security_Log_second("Xt_DefineBillMainSet_Edit", 1, false, msg4))
+                //{
+                //    objJsonResult.code = "0";
+                //    objJsonResult.count = 0;
+                //    objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+                //    objJsonResult.data = null;
+                //    return objJsonResult;
+                //}
+
+                DAL.ClsXt_DefineBillMainSet oBill = new DAL.ClsXt_DefineBillMainSet();
+
+                //琛ㄥご鏁版嵁
+                List<Model.ClsXt_DefineBillMainSetMain> lsmain = new List<Model.ClsXt_DefineBillMainSetMain>();
+                msg2 = msg2.Replace("\\", "");
+                msg2 = msg2.Replace("\n", "");
+                lsmain = oListModels.getObjectByJson_Xt_DefineBillMainSetMain(msg2);
+                foreach (Model.ClsXt_DefineBillMainSetMain oItem in lsmain)
+                {
+                    oItem.HMaker = msg4;
+                    oItem.HUpDater = msg4;
+
+                    oBill.omodel = oItem;
+                }
+
+                //琛ㄤ綋鏁版嵁
+                msg3 = msg3.Substring(1, msg3.Length - 2);
+                msg3 = msg3.Replace("\\", "");
+                msg3 = msg3.Replace("\n", "");
+                List<Model.ClsXt_DefineBillMainSetSub> ls = new List<Model.ClsXt_DefineBillMainSetSub>();
+                ls = oListModels.getObjectByJson_Xt_DefineBillMainSetSub(msg3);
+                foreach (Model.ClsXt_DefineBillMainSetSub oItemSub in ls)
+                {
+                    oBill.DetailColl.Add(oItemSub);
+                }
+
+
+                //淇濆瓨
+                //淇濆瓨瀹屾瘯鍚庡鐞�
+                bool bResult;
+                if (oBill.omodel.HInterID == 0)
+                {
+                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+                }
+                else if (oBill.omodel.HInterID > 0)
+                {
+                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+                }
+                else
+                {
+                    bResult = false;
+                }
+
+
+                //string message = "msg2:銆�" + msg2 + "銆�;msg3:銆�" + msg3 + "銆戯紱msg4:銆�" + msg4 + "銆�";
+                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
     }
 }
\ No newline at end of file
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 476fb14..926cbf1 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -4051,6 +4051,31 @@
         }
         #endregion
 
+        #region 琛ㄥご鑷姩鍔犺浇
+        /// <summary>
+        /// 琛ㄥご鑷姩鍔犺浇涓昏〃json
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsXt_DefineBillMainSetMain> getObjectByJson_Xt_DefineBillMainSetMain(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsXt_DefineBillMainSetMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXt_DefineBillMainSetMain>>(jsonString);
+            return list;
+        }
+        /// <summary>
+        /// 琛ㄥご鑷姩鍔犺浇瀛愯〃json2
+        /// </summary>
+        /// <param name="jsonString"></param>
+        /// <returns></returns>
+        public List<Model.ClsXt_DefineBillMainSetSub> getObjectByJson_Xt_DefineBillMainSetSub(string jsonString)
+        {
+            jsonString = "[" + jsonString.ToString() + "]";
+            List<Model.ClsXt_DefineBillMainSetSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXt_DefineBillMainSetSub>>(jsonString);
+            return list;
+        }
+        #endregion
+
         #region 鐢熶骇璐ㄩ噺姹囨姤鍗�
         /// <summary>
         /// 鐢熶骇璐ㄩ噺姹囨姤鍗曚富琛╦son
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 443a8b6..80e735c 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -4,7 +4,7 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <History>True|2024-12-24T02:52:25.3403292Z;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
+    <History>True|2024-12-28T05:48:20.4283118Z;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
     <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
   </PropertyGroup>
   <ItemGroup>
@@ -45,19 +45,19 @@
       <publishTime>02/22/2013 16:43:40</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>12/23/2024 13:05:14</publishTime>
+      <publishTime>12/28/2024 13:47:46</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>12/23/2024 13:05:14</publishTime>
+      <publishTime>12/28/2024 13:47:46</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/18/2020 05:32:28</publishTime>
     </File>
     <File Include="bin/DAL.dll">
-      <publishTime>12/23/2024 13:05:13</publishTime>
+      <publishTime>12/28/2024 13:47:44</publishTime>
     </File>
     <File Include="bin/DAL.pdb">
-      <publishTime>12/23/2024 13:05:13</publishTime>
+      <publishTime>12/28/2024 13:47:44</publishTime>
     </File>
     <File Include="bin/Dapper.dll">
       <publishTime>07/22/2016 22:52:40</publishTime>
@@ -111,10 +111,10 @@
       <publishTime>07/25/2012 19:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>12/23/2024 13:05:10</publishTime>
+      <publishTime>12/28/2024 10:27:18</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>12/23/2024 13:05:10</publishTime>
+      <publishTime>12/28/2024 10:27:18</publishTime>
     </File>
     <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
       <publishTime>04/06/2023 15:57:02</publishTime>
@@ -294,13 +294,13 @@
       <publishTime>11/24/2014 19:18:48</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>12/24/2024 10:52:18</publishTime>
+      <publishTime>12/28/2024 13:48:14</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>12/24/2024 10:52:18</publishTime>
+      <publishTime>12/28/2024 13:48:14</publishTime>
     </File>
     <File Include="bin/WebAPI.XmlSerializers.dll">
-      <publishTime>12/24/2024 10:52:24</publishTime>
+      <publishTime>12/28/2024 13:48:18</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>07/18/2013 01:03:52</publishTime>
diff --git a/WorkM/bin/Release/BLL.dll b/WorkM/bin/Release/BLL.dll
index 60b274f..4fd1bf6 100644
--- a/WorkM/bin/Release/BLL.dll
+++ b/WorkM/bin/Release/BLL.dll
Binary files differ
diff --git a/WorkM/bin/Release/BLL.pdb b/WorkM/bin/Release/BLL.pdb
index 46278c7..8f33cd3 100644
--- a/WorkM/bin/Release/BLL.pdb
+++ b/WorkM/bin/Release/BLL.pdb
Binary files differ
diff --git a/WorkM/bin/Release/DAL.dll b/WorkM/bin/Release/DAL.dll
index 5465d24..170ec9f 100644
--- a/WorkM/bin/Release/DAL.dll
+++ b/WorkM/bin/Release/DAL.dll
Binary files differ
diff --git a/WorkM/bin/Release/DAL.pdb b/WorkM/bin/Release/DAL.pdb
index d85dff9..b0a66b4 100644
--- a/WorkM/bin/Release/DAL.pdb
+++ b/WorkM/bin/Release/DAL.pdb
Binary files differ
diff --git a/WorkM/bin/Release/Model.dll b/WorkM/bin/Release/Model.dll
index cef4a0f..4afdf14 100644
--- a/WorkM/bin/Release/Model.dll
+++ b/WorkM/bin/Release/Model.dll
Binary files differ
diff --git a/WorkM/bin/Release/Model.pdb b/WorkM/bin/Release/Model.pdb
index b8a1619..91f60d7 100644
--- a/WorkM/bin/Release/Model.pdb
+++ b/WorkM/bin/Release/Model.pdb
Binary files differ
diff --git a/WorkM/bin/Release/WarM.dll b/WorkM/bin/Release/WarM.dll
index f528b48..99c0a66 100644
--- a/WorkM/bin/Release/WarM.dll
+++ b/WorkM/bin/Release/WarM.dll
Binary files differ
diff --git a/WorkM/bin/Release/WarM.pdb b/WorkM/bin/Release/WarM.pdb
index c650d30..e63ac0d 100644
--- a/WorkM/bin/Release/WarM.pdb
+++ b/WorkM/bin/Release/WarM.pdb
Binary files differ
diff --git a/WorkM/bin/Release/WorkM.dll b/WorkM/bin/Release/WorkM.dll
index 7d438cc..8575402 100644
--- a/WorkM/bin/Release/WorkM.dll
+++ b/WorkM/bin/Release/WorkM.dll
Binary files differ
diff --git a/WorkM/bin/Release/WorkM.pdb b/WorkM/bin/Release/WorkM.pdb
index 15c7fab..57a3957 100644
--- a/WorkM/bin/Release/WorkM.pdb
+++ b/WorkM/bin/Release/WorkM.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 66b7d83..babffaa 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index 3d96cd5..ef0e1a3 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
deleted file mode 100644
index b3a6f35..0000000
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index aa49cca..65df6de 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,6 +1,5 @@
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
 D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 66b7d83..babffaa 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index 3d96cd5..ef0e1a3 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ

--
Gitblit v1.9.1