From 634bfacdb0ddf2415faebeab41d60be25ff697b2 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 30 十二月 2024 10:40:23 +0800
Subject: [PATCH] 系统配置：增加字段 字段附加字段
---
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
WorkM/bin/Release/Model.dll | 0
WorkM/bin/Release/WorkM.dll | 0
PlanM/bin/Release/Model.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
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 | 7 +++++--
PlanM/bin/Release/DAL.dll | 0
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 | 1 +
WebAPI/Controllers/Xt_DefineBillMainSetController.cs | 4 ++++
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
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
75 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/APSM/bin/Release/APSM.dll b/APSM/bin/Release/APSM.dll
index 93cc840..e154806 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 0d3ffb9..f59b1ee 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 4fd1bf6..b414787 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 8f33cd3..1bb2673 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 bcdd584..b4ac6a6 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 f6d0870..5f9804c 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 170ec9f..54d23e5 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 b0a66b4..e36b13e 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 4afdf14..28cfd8b 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 91f60d7..ea9e022 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 7f624eb..f9edd36 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 8713339..8140d3b 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 99c0a66..c2c8271 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 e63ac0d..e3ef4db 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 8575402..0ef2cd5 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 57a3957..62430bd 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 4fd1bf6..b414787 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 8f33cd3..1bb2673 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 170ec9f..54d23e5 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 b0a66b4..e36b13e 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 4afdf14..28cfd8b 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 91f60d7..ea9e022 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 4fd1bf6..b414787 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 8f33cd3..1bb2673 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 bcdd584..b4ac6a6 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 f6d0870..5f9804c 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 170ec9f..54d23e5 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 b0a66b4..e36b13e 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 4afdf14..28cfd8b 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 91f60d7..ea9e022 100644
--- a/BaseSet/bin/Release/Model.pdb
+++ b/BaseSet/bin/Release/Model.pdb
Binary files differ
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index 170ec9f..54d23e5 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 b0a66b4..e36b13e 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 4afdf14..28cfd8b 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 91f60d7..ea9e022 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"
index 29b8fc3..27ad7cf 100644
--- "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"
@@ -63,7 +63,7 @@
foreach (Model.ClsXt_DefineBillMainSetSub oSub in DetailColl)
{
string subSql = "Insert into Xt_DefineBillMainSetSub " +
- " (HInterID,HEntryID,HArrangeOrder,HArrangeOrderSub,HIsHide,HIsDisabled,HIsMust,HParentElementID,HElementID" +
+ " (HInterID,HEntryID,HArrangeOrder,HArrangeOrderSub,HIsHide,HIsDisabled,HIsMust,HParentElementID,HElementID,HElementIDAdditionalName" +
",HElementLabel,HElementType,HFieldMaxLength,HDefaultValue,HFieldName,HFieldDataType,HRelateUrl,HSubWindowBackData" +
",HSubWindowBackDataMethodName,HSelectContent" +
") values(" +
@@ -76,6 +76,7 @@
",'" + (oSub.HIsMust ? 1 : 0) + "'" +
",'" + oSub.HParentElementID + "'" +
",'" + oSub.HElementID + "'" +
+ ",'" + oSub.HElementIDAdditionalName + "'" +
",'" + oSub.HElementLabel + "'" +
",'" + oSub.HElementType + "'" +
",'" + oSub.HFieldMaxLength + "'" +
@@ -143,7 +144,7 @@
foreach (Model.ClsXt_DefineBillMainSetSub oSub in DetailColl)
{
string subSql = "Insert into Xt_DefineBillMainSetSub " +
- " (HInterID,HEntryID,HArrangeOrder,HArrangeOrderSub,HIsHide,HIsDisabled,HIsMust,HParentElementID,HElementID" +
+ " (HInterID,HEntryID,HArrangeOrder,HArrangeOrderSub,HIsHide,HIsDisabled,HIsMust,HParentElementID,HElementID,HElementIDAdditionalName" +
",HElementLabel,HElementType,HFieldMaxLength,HDefaultValue,HFieldName,HFieldDataType,HRelateUrl,HSubWindowBackData" +
",HSubWindowBackDataMethodName,HSelectContent" +
") values(" +
@@ -156,6 +157,7 @@
",'" + (oSub.HIsMust?1:0) + "'" +
",'" + oSub.HParentElementID + "'" +
",'" + oSub.HElementID + "'" +
+ ",'" + oSub.HElementIDAdditionalName + "'" +
",'" + oSub.HElementLabel + "'" +
",'" + oSub.HElementType + "'" +
",'" + oSub.HFieldMaxLength + "'" +
@@ -226,6 +228,7 @@
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.HElementIDAdditionalName = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HElementIDAdditionalName"]);
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"]);
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index f5e894a..c96789a 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/bin/Release/Model.dll b/Model/bin/Release/Model.dll
index 4afdf14..28cfd8b 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 91f60d7..ea9e022 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 f2f1252..d495885 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 4afdf14..28cfd8b 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 91f60d7..ea9e022 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_DefineBillMainSetSub.cs" "b/Model/\347\263\273\347\273\237\345\205\254\347\224\250/ClsXt_DefineBillMainSetSub.cs"
index 8795cbe..55c1294 100644
--- "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"
@@ -13,6 +13,7 @@
public bool HIsMust; //是否必填
public string HParentElementID; //父级组件ID
public string HElementID; //组件ID
+ public string HElementIDAdditionalName; //字段附加字段
public string HElementLabel; //组件标签
public string HElementType; //组件类型
public long HFieldMaxLength; //当组件为需要输入的文本框等组件时，设置最大的可输入长度
diff --git a/PlanM/bin/Release/BLL.dll b/PlanM/bin/Release/BLL.dll
index 4fd1bf6..b414787 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 8f33cd3..1bb2673 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 170ec9f..54d23e5 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 b0a66b4..e36b13e 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 4afdf14..28cfd8b 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 91f60d7..ea9e022 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 7f624eb..f9edd36 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 8713339..8140d3b 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 f5e894a..aba9f94 100644
--- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/WarM/bin/Release/BLL.dll b/WarM/bin/Release/BLL.dll
index 4fd1bf6..b414787 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 8f33cd3..1bb2673 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 170ec9f..54d23e5 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 b0a66b4..e36b13e 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 4afdf14..28cfd8b 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 91f60d7..ea9e022 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 99c0a66..c2c8271 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 e63ac0d..e3ef4db 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 d31d5d7..bf9bf71 100644
--- a/WebAPI/Controllers/Xt_DefineBillMainSetController.cs
+++ b/WebAPI/Controllers/Xt_DefineBillMainSetController.cs
@@ -149,6 +149,10 @@
ls = oListModels.getObjectByJson_Xt_DefineBillMainSetSub(msg3);
foreach (Model.ClsXt_DefineBillMainSetSub oItemSub in ls)
{
+ if ((oItemSub.HElementID == null || oItemSub.HElementID == "")&&oItemSub.HElementIDAdditionalName!="")
+ {
+ oItemSub.HElementID = oItemSub.HElementIDAdditionalName;
+ }
oBill.DetailColl.Add(oItemSub);
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 80e735c..0881a97 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-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>
+ <History>True|2024-12-28T07:59:32.1394796Z;True|2024-12-28T13:48:20.4283118+08:00;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/28/2024 13:47:46</publishTime>
+ <publishTime>12/28/2024 15:58:56</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/28/2024 13:47:46</publishTime>
+ <publishTime>12/28/2024 15:58:56</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>12/28/2024 13:47:44</publishTime>
+ <publishTime>12/28/2024 15:58:54</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/28/2024 13:47:44</publishTime>
+ <publishTime>12/28/2024 15:58:54</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/28/2024 10:27:18</publishTime>
+ <publishTime>12/28/2024 15:58:50</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/28/2024 10:27:18</publishTime>
+ <publishTime>12/28/2024 15:58:50</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/28/2024 13:48:14</publishTime>
+ <publishTime>12/28/2024 15:59:25</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/28/2024 13:48:14</publishTime>
+ <publishTime>12/28/2024 15:59:25</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>12/28/2024 13:48:18</publishTime>
+ <publishTime>12/28/2024 15:59:29</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 4fd1bf6..b414787 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 8f33cd3..1bb2673 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 170ec9f..54d23e5 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 b0a66b4..e36b13e 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 4afdf14..28cfd8b 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 91f60d7..ea9e022 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 99c0a66..c2c8271 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 e63ac0d..e3ef4db 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 8575402..0ef2cd5 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 57a3957..62430bd 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 babffaa..b993722 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 ef0e1a3..40b1232 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.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index babffaa..b993722 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 ef0e1a3..40b1232 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1