From 50fceef7f1d136e4992353465ba268e752f68c3a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 31 十二月 2024 15:59:23 +0800
Subject: [PATCH] 1
---
Model/基础资料/基础资料/ClsGy_InspectInstruMent_Model.cs | 4
PlanM/bin/Release/PlanM.dll | 0
APSM/bin/Release/SQLHelper.dll | 0
BaseSet/bin/Release/BLL.pdb | 0
WebAPI/WebAPI.csproj.user | 4
BaseSet/bin/Release/DBUtility.pdb | 0
DBUtility/bin/Release/Pub_Class.dll | 0
WarM/bin/Release/DBUtility.dll | 0
WebAPI/DLL/ClsGy_InspectInstruMent_Ctl.cs | 10
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
WarM/bin/Release/DBUtility.pdb | 0
PlanM/bin/Release/Pub_Control.pdb | 0
Model/bin/Release/Pub_Control.pdb | 0
Model/bin/Release/Pub_Class.pdb | 0
BaseSet/bin/Release/BLL.dll | 0
BaseSet/bin/Release/BaseSet.dll | 0
APSM/bin/Release/WarM.pdb | 0
BaseSet/bin/Release/BaseSet.pdb | 0
Model/obj/Release/Model.pdb | 0
BLL/bin/Release/BLL.pdb | 0
APSM/bin/Release/PlanM.dll | 0
APSM/bin/Release/DAL.dll | 0
APSM/bin/Release/WarM.dll | 0
APSM/bin/Release/PlanM.pdb | 0
Model/bin/Release/Pub_Control.dll | 0
Pub_Control/bin/Release/Pub_Class.pdb | 0
WebAPI/Controllers/生产管理/报工台工序/Sc_MESBeginStepWorkBillController.cs | 3
WebAPI/ListModels.cs | 25 +
PlanM/bin/Release/Pub_Class.dll | 0
Pub_Control/bin/Release/Pub_Class.dll | 0
APSM/bin/Release/DAL.pdb | 0
PlanM/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/Pub_Control.pdb | 0
PlanM/bin/Release/DAL.dll | 0
Pub_Control/bin/Release/Pub_Control.dll | 0
BLL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/SQLHelper.dll | 0
Model/bin/Release/DBUtility.pdb | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
WebAPI/Controllers/条码管理/WEBSController.cs | 40 +
APSM/bin/Release/Pub_Control.pdb | 0
APSM/bin/Release/DBUtility.pdb | 0
Model/Model.csproj | 2
BLL/bin/Release/Pub_Control.dll | 0
WorkM/bin/Release/Pub_Class.dll | 0
DAL/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache | 0
SQLHelper/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.pdb | 0
Model/bin/Release/DBUtility.dll | 0
BLL/bin/Release/DBUtility.dll | 0
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache | 0
BaseSet/bin/Release/SQLHelper.pdb | 0
WarM/bin/Release/BLL.pdb | 0
WorkM/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/BLL.dll | 0
Pub_Control/bin/Release/Pub_Control.pdb | 0
BaseSet/bin/Release/SQLHelper.dll | 0
PlanM/bin/Release/DAL.pdb | 0
DBUtility/obj/Release/DBUtility.dll | 0
APSM/bin/Release/DBUtility.dll | 0
Model/obj/Release/Model.dll | 0
WorkM/bin/Release/Pub_Control.pdb | 0
BLL/bin/Release/Pub_Class.dll | 0
WorkM/bin/Release/DBUtility.pdb | 0
PlanM/bin/Release/Pub_Control.dll | 0
DBUtility/bin/Release/SQLHelper.dll | 0
WorkM/bin/Release/DBUtility.dll | 0
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
DBUtility/bin/Release/SQLHelper.pdb | 0
Model/bin/Release/Pub_Class.dll | 0
APSM/bin/Release/Model.dll | 0
PlanM/bin/Release/PlanM.pdb | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache | 0
BLL/bin/Release/Pub_Class.pdb | 0
APSM/bin/Release/Model.pdb | 0
WorkM/bin/Release/DAL.pdb | 0
WorkM/bin/Release/Pub_Control.dll | 0
APSM/bin/Release/Pub_Class.dll | 0
APSM/bin/Release/Pub_Control.dll | 0
WorkM/bin/Release/DAL.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 30 +
WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user | 44
APSM/bin/Release/BLL.dll | 0
BLL/bin/Release/DAL.dll | 0
BLL/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/DBUtility.dll | 0
PlanM/bin/Release/SQLHelper.dll | 0
BaseSet/bin/Release/Pub_Control.pdb | 0
WarM/bin/Release/Pub_Control.pdb | 0
DAL/bin/Release/Pub_Control.dll | 0
DBUtility/bin/Release/Pub_Control.pdb | 0
APSM/bin/Release/BaseSet.dll | 0
BLL/bin/Release/SQLHelper.dll | 0
DAL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/Model.dll | 0
BaseSet/bin/Release/Pub_Control.dll | 0
APSM/bin/Release/BLL.pdb | 0
APSM/bin/Release/Pub_Class.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user | 22
APSM/bin/Release/BaseSet.pdb | 0
APSM/bin/Release/WorkM.dll | 0
DBUtility/bin/Release/Pub_Control.dll | 0
Model/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/Pub_Control.pdb | 0
DAL/bin/Release/DAL.pdb | 0
SQLHelper/obj/Release/SQLHelper.dll | 0
BaseSet/bin/Release/Model.pdb | 0
BLL/bin/Release/Model.dll | 0
WebAPI/bin.rar | 0
BaseSet/bin/Release/Pub_Class.dll | 0
BLL/bin/Release/DAL.pdb | 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
DAL/bin/Release/Model.pdb | 0
BaseSet/bin/Release/Pub_Class.pdb | 0
WarM/bin/Release/BLL.dll | 0
WorkM/bin/Release/WorkM.pdb | 0
WarM/bin/Release/WarM.pdb | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
WorkM/bin/Release/BLL.dll | 0
DBUtility/bin/Release/DBUtility.pdb | 0
PlanM/bin/Release/BLL.pdb | 0
DBUtility/bin/Release/DBUtility.dll | 0
WarM/bin/Release/WarM.dll | 0
WebAPI/Controllers/WebAPIController.cs | 6
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
WorkM/bin/Release/BLL.pdb | 0
WarM/bin/Release/Pub_Class.dll | 0
WarM/bin/Release/Pub_Control.dll | 0
WarM/bin/Release/SQLHelper.pdb | 0
WorkM/bin/Release/Model.dll | 0
PlanM/bin/Release/SQLHelper.pdb | 0
WorkM/bin/Release/WorkM.dll | 0
PlanM/bin/Release/Model.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 30 +
DAL/DAL.csproj | 1
WarM/bin/Release/Model.pdb | 0
WarM/bin/Release/Pub_Class.pdb | 0
WarM/bin/Release/Model.dll | 0
PlanM/bin/Release/Model.dll | 0
DAL/系统公用/ClsXt_DefineBillMainSet.cs | 257 +++++++++++
Pub_Class/bin/Release/Pub_Class.pdb | 0
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 20
Model/系统公用/ClsXt_DefineBillMainSetMain.cs | 16
PlanM/bin/Release/DBUtility.dll | 0
SQLHelper/bin/Release/Pub_Class.pdb | 0
WarM/bin/Release/SQLHelper.dll | 0
WorkM/bin/Release/Model.pdb | 0
Pub_Class/bin/Release/Pub_Class.dll | 0
WarM/bin/Release/DAL.dll | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
SQLHelper/bin/Release/Pub_Class.dll | 0
WarM/bin/Release/DAL.pdb | 0
DAL/bin/Release/Pub_Class.pdb | 0
WebAPI/Controllers/CJGL/Sc_OEEReportController.cs | 55 ++
WorkM/bin/Release/WarM.pdb | 0
PlanM/bin/Release/DBUtility.pdb | 0
BaseSet/bin/Release/DAL.pdb | 0
WorkM/bin/Release/WarM.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml | 16
Model/系统公用/ClsXt_DefineBillMainSetSub.cs | 28 +
WebAPI/Controllers/Xt_DefineBillMainSetController.cs | 105 ++++
WorkM/bin/Release/SQLHelper.pdb | 0
Model/bin/Release/Model.pdb | 0
BaseSet/bin/Release/DAL.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml.user | 498 +++++++++++++++++++++
DAL/bin/Release/Pub_Class.dll | 0
APSM/bin/Release/APSM.pdb | 0
Model/bin/Release/Model.dll | 0
DBUtility/bin/Release/Pub_Class.pdb | 0
APSM/bin/Release/WorkM.pdb | 0
Model/bin/Release/SQLHelper.dll | 0
APSM/bin/Release/APSM.dll | 0
BaseSet/bin/Release/DBUtility.dll | 0
WorkM/bin/Release/SQLHelper.dll | 0
APSM/bin/Release/SQLHelper.pdb | 0
WebAPI/Controllers/ReportPlatFormController.cs | 157 ++++++
180 files changed, 1,331 insertions(+), 42 deletions(-)
diff --git a/APSM/bin/Release/APSM.dll b/APSM/bin/Release/APSM.dll
index 1359446..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 0c35208..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 b448243..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 3a47154..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 db73ebf..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 7ee4ec9..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 3114d49..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 82e4dfc..e36b13e 100644
--- a/APSM/bin/Release/DAL.pdb
+++ b/APSM/bin/Release/DAL.pdb
Binary files differ
diff --git a/APSM/bin/Release/DBUtility.dll b/APSM/bin/Release/DBUtility.dll
index 5b73185..e149e84 100644
--- a/APSM/bin/Release/DBUtility.dll
+++ b/APSM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/APSM/bin/Release/DBUtility.pdb b/APSM/bin/Release/DBUtility.pdb
index 5868f01..27f69f8 100644
--- a/APSM/bin/Release/DBUtility.pdb
+++ b/APSM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/APSM/bin/Release/Model.dll b/APSM/bin/Release/Model.dll
index d1768cf..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 415de8d..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 7f477f0..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 0ed08cd..8140d3b 100644
--- a/APSM/bin/Release/PlanM.pdb
+++ b/APSM/bin/Release/PlanM.pdb
Binary files differ
diff --git a/APSM/bin/Release/Pub_Class.dll b/APSM/bin/Release/Pub_Class.dll
index 5a27deb..6ac1eea 100644
--- a/APSM/bin/Release/Pub_Class.dll
+++ b/APSM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/APSM/bin/Release/Pub_Class.pdb b/APSM/bin/Release/Pub_Class.pdb
index 52a6297..9a615cd 100644
--- a/APSM/bin/Release/Pub_Class.pdb
+++ b/APSM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/APSM/bin/Release/Pub_Control.dll b/APSM/bin/Release/Pub_Control.dll
index 244bf7f..944241b 100644
--- a/APSM/bin/Release/Pub_Control.dll
+++ b/APSM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/APSM/bin/Release/Pub_Control.pdb b/APSM/bin/Release/Pub_Control.pdb
index edce0ca..4a1acf9 100644
--- a/APSM/bin/Release/Pub_Control.pdb
+++ b/APSM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/APSM/bin/Release/SQLHelper.dll b/APSM/bin/Release/SQLHelper.dll
index 6fdd03e..a358039 100644
--- a/APSM/bin/Release/SQLHelper.dll
+++ b/APSM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/APSM/bin/Release/SQLHelper.pdb b/APSM/bin/Release/SQLHelper.pdb
index 5c090db..04f7af8 100644
--- a/APSM/bin/Release/SQLHelper.pdb
+++ b/APSM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/APSM/bin/Release/WarM.dll b/APSM/bin/Release/WarM.dll
index 9d378ec..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 29141d2..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 edb22ab..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 bfb4791..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 b448243..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 3a47154..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 3114d49..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 82e4dfc..e36b13e 100644
--- a/BLL/bin/Release/DAL.pdb
+++ b/BLL/bin/Release/DAL.pdb
Binary files differ
diff --git a/BLL/bin/Release/DBUtility.dll b/BLL/bin/Release/DBUtility.dll
index 5b73185..e149e84 100644
--- a/BLL/bin/Release/DBUtility.dll
+++ b/BLL/bin/Release/DBUtility.dll
Binary files differ
diff --git a/BLL/bin/Release/DBUtility.pdb b/BLL/bin/Release/DBUtility.pdb
index 5868f01..27f69f8 100644
--- a/BLL/bin/Release/DBUtility.pdb
+++ b/BLL/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/BLL/bin/Release/Model.dll b/BLL/bin/Release/Model.dll
index d1768cf..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 415de8d..ea9e022 100644
--- a/BLL/bin/Release/Model.pdb
+++ b/BLL/bin/Release/Model.pdb
Binary files differ
diff --git a/BLL/bin/Release/Pub_Class.dll b/BLL/bin/Release/Pub_Class.dll
index 5a27deb..6ac1eea 100644
--- a/BLL/bin/Release/Pub_Class.dll
+++ b/BLL/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/BLL/bin/Release/Pub_Class.pdb b/BLL/bin/Release/Pub_Class.pdb
index 52a6297..9a615cd 100644
--- a/BLL/bin/Release/Pub_Class.pdb
+++ b/BLL/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/BLL/bin/Release/Pub_Control.dll b/BLL/bin/Release/Pub_Control.dll
index 244bf7f..944241b 100644
--- a/BLL/bin/Release/Pub_Control.dll
+++ b/BLL/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/BLL/bin/Release/Pub_Control.pdb b/BLL/bin/Release/Pub_Control.pdb
index edce0ca..4a1acf9 100644
--- a/BLL/bin/Release/Pub_Control.pdb
+++ b/BLL/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/BLL/bin/Release/SQLHelper.dll b/BLL/bin/Release/SQLHelper.dll
index 6fdd03e..a358039 100644
--- a/BLL/bin/Release/SQLHelper.dll
+++ b/BLL/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/BLL/bin/Release/SQLHelper.pdb b/BLL/bin/Release/SQLHelper.pdb
index 5c090db..04f7af8 100644
--- a/BLL/bin/Release/SQLHelper.pdb
+++ b/BLL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/BLL.dll b/BaseSet/bin/Release/BLL.dll
index b448243..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 3a47154..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 db73ebf..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 7ee4ec9..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 3114d49..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 82e4dfc..e36b13e 100644
--- a/BaseSet/bin/Release/DAL.pdb
+++ b/BaseSet/bin/Release/DAL.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/DBUtility.dll b/BaseSet/bin/Release/DBUtility.dll
index 5b73185..e149e84 100644
--- a/BaseSet/bin/Release/DBUtility.dll
+++ b/BaseSet/bin/Release/DBUtility.dll
Binary files differ
diff --git a/BaseSet/bin/Release/DBUtility.pdb b/BaseSet/bin/Release/DBUtility.pdb
index 5868f01..27f69f8 100644
--- a/BaseSet/bin/Release/DBUtility.pdb
+++ b/BaseSet/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/Model.dll b/BaseSet/bin/Release/Model.dll
index d1768cf..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 415de8d..ea9e022 100644
--- a/BaseSet/bin/Release/Model.pdb
+++ b/BaseSet/bin/Release/Model.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Class.dll b/BaseSet/bin/Release/Pub_Class.dll
index 5a27deb..6ac1eea 100644
--- a/BaseSet/bin/Release/Pub_Class.dll
+++ b/BaseSet/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Class.pdb b/BaseSet/bin/Release/Pub_Class.pdb
index 52a6297..9a615cd 100644
--- a/BaseSet/bin/Release/Pub_Class.pdb
+++ b/BaseSet/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Control.dll b/BaseSet/bin/Release/Pub_Control.dll
index 244bf7f..944241b 100644
--- a/BaseSet/bin/Release/Pub_Control.dll
+++ b/BaseSet/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Control.pdb b/BaseSet/bin/Release/Pub_Control.pdb
index edce0ca..4a1acf9 100644
--- a/BaseSet/bin/Release/Pub_Control.pdb
+++ b/BaseSet/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/SQLHelper.dll b/BaseSet/bin/Release/SQLHelper.dll
index 6fdd03e..a358039 100644
--- a/BaseSet/bin/Release/SQLHelper.dll
+++ b/BaseSet/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/BaseSet/bin/Release/SQLHelper.pdb b/BaseSet/bin/Release/SQLHelper.pdb
index 5c090db..04f7af8 100644
--- a/BaseSet/bin/Release/SQLHelper.pdb
+++ b/BaseSet/bin/Release/SQLHelper.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 3114d49..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 82e4dfc..e36b13e 100644
--- a/DAL/bin/Release/DAL.pdb
+++ b/DAL/bin/Release/DAL.pdb
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.dll b/DAL/bin/Release/DBUtility.dll
index 5b73185..e149e84 100644
--- a/DAL/bin/Release/DBUtility.dll
+++ b/DAL/bin/Release/DBUtility.dll
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.pdb b/DAL/bin/Release/DBUtility.pdb
index 5868f01..27f69f8 100644
--- a/DAL/bin/Release/DBUtility.pdb
+++ b/DAL/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/DAL/bin/Release/Model.dll b/DAL/bin/Release/Model.dll
index d1768cf..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 415de8d..ea9e022 100644
--- a/DAL/bin/Release/Model.pdb
+++ b/DAL/bin/Release/Model.pdb
Binary files differ
diff --git a/DAL/bin/Release/Pub_Class.dll b/DAL/bin/Release/Pub_Class.dll
index 5a27deb..6ac1eea 100644
--- a/DAL/bin/Release/Pub_Class.dll
+++ b/DAL/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/DAL/bin/Release/Pub_Class.pdb b/DAL/bin/Release/Pub_Class.pdb
index 52a6297..9a615cd 100644
--- a/DAL/bin/Release/Pub_Class.pdb
+++ b/DAL/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/DAL/bin/Release/Pub_Control.dll b/DAL/bin/Release/Pub_Control.dll
index 244bf7f..944241b 100644
--- a/DAL/bin/Release/Pub_Control.dll
+++ b/DAL/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/DAL/bin/Release/Pub_Control.pdb b/DAL/bin/Release/Pub_Control.pdb
index edce0ca..4a1acf9 100644
--- a/DAL/bin/Release/Pub_Control.pdb
+++ b/DAL/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.dll b/DAL/bin/Release/SQLHelper.dll
index 6fdd03e..a358039 100644
--- a/DAL/bin/Release/SQLHelper.dll
+++ b/DAL/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.pdb b/DAL/bin/Release/SQLHelper.pdb
index 5c090db..04f7af8 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.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..27ad7cf
--- /dev/null
+++ "b/DAL/\347\263\273\347\273\237\345\205\254\347\224\250/ClsXt_DefineBillMainSet.cs"
@@ -0,0 +1,257 @@
+锘縰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 鍥哄畾浠ｇ爜
+
+ ~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,HElementIDAdditionalName" +
+ ",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.HElementIDAdditionalName + "'" +
+ ",'" + 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,HElementIDAdditionalName" +
+ ",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.HElementIDAdditionalName + "'" +
+ ",'" + 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.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"]);
+ 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/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index 5b73185..e149e84 100644
--- a/DBUtility/bin/Release/DBUtility.dll
+++ b/DBUtility/bin/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/bin/Release/DBUtility.pdb b/DBUtility/bin/Release/DBUtility.pdb
index 5868f01..27f69f8 100644
--- a/DBUtility/bin/Release/DBUtility.pdb
+++ b/DBUtility/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Class.dll b/DBUtility/bin/Release/Pub_Class.dll
index 5a27deb..6ac1eea 100644
--- a/DBUtility/bin/Release/Pub_Class.dll
+++ b/DBUtility/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Class.pdb b/DBUtility/bin/Release/Pub_Class.pdb
index 52a6297..9a615cd 100644
--- a/DBUtility/bin/Release/Pub_Class.pdb
+++ b/DBUtility/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Control.dll b/DBUtility/bin/Release/Pub_Control.dll
index 244bf7f..944241b 100644
--- a/DBUtility/bin/Release/Pub_Control.dll
+++ b/DBUtility/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Control.pdb b/DBUtility/bin/Release/Pub_Control.pdb
index edce0ca..4a1acf9 100644
--- a/DBUtility/bin/Release/Pub_Control.pdb
+++ b/DBUtility/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.dll b/DBUtility/bin/Release/SQLHelper.dll
index 6fdd03e..a358039 100644
--- a/DBUtility/bin/Release/SQLHelper.dll
+++ b/DBUtility/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.pdb b/DBUtility/bin/Release/SQLHelper.pdb
index 5c090db..04f7af8 100644
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index 6e21ee4..c96789a 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
index d4f0c96..6f47755 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
index 59940f0..7c8776c 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.dll b/DBUtility/obj/Release/DBUtility.dll
index 5b73185..e149e84 100644
--- a/DBUtility/obj/Release/DBUtility.dll
+++ b/DBUtility/obj/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.pdb b/DBUtility/obj/Release/DBUtility.pdb
index 5868f01..27f69f8 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
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/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index 5b73185..e149e84 100644
--- a/Model/bin/Release/DBUtility.dll
+++ b/Model/bin/Release/DBUtility.dll
Binary files differ
diff --git a/Model/bin/Release/DBUtility.pdb b/Model/bin/Release/DBUtility.pdb
index 5868f01..27f69f8 100644
--- a/Model/bin/Release/DBUtility.pdb
+++ b/Model/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/Release/Model.dll b/Model/bin/Release/Model.dll
index d1768cf..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 415de8d..ea9e022 100644
--- a/Model/bin/Release/Model.pdb
+++ b/Model/bin/Release/Model.pdb
Binary files differ
diff --git a/Model/bin/Release/Pub_Class.dll b/Model/bin/Release/Pub_Class.dll
index 5a27deb..6ac1eea 100644
--- a/Model/bin/Release/Pub_Class.dll
+++ b/Model/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Model/bin/Release/Pub_Class.pdb b/Model/bin/Release/Pub_Class.pdb
index 52a6297..9a615cd 100644
--- a/Model/bin/Release/Pub_Class.pdb
+++ b/Model/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Model/bin/Release/Pub_Control.dll b/Model/bin/Release/Pub_Control.dll
index 244bf7f..944241b 100644
--- a/Model/bin/Release/Pub_Control.dll
+++ b/Model/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/Model/bin/Release/Pub_Control.pdb b/Model/bin/Release/Pub_Control.pdb
index edce0ca..4a1acf9 100644
--- a/Model/bin/Release/Pub_Control.pdb
+++ b/Model/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.dll b/Model/bin/Release/SQLHelper.dll
index 6fdd03e..a358039 100644
--- a/Model/bin/Release/SQLHelper.dll
+++ b/Model/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.pdb b/Model/bin/Release/SQLHelper.pdb
index 5c090db..04f7af8 100644
--- a/Model/bin/Release/SQLHelper.pdb
+++ b/Model/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache
index 7d164ad..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 d1768cf..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 415de8d..ea9e022 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
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_InspectInstruMent_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_InspectInstruMent_Model.cs"
index ea44833..86d21e2 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_InspectInstruMent_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_InspectInstruMent_Model.cs"
@@ -12,5 +12,9 @@
public string HMakeEmp;
public DateTime HModifyTime;
public int HERPItemID;
+ public string HExpiryDay;
+ public string HCalibrationStatus;
+ public DateTime HValidDate;
+ public DateTime HCalibrationDate;
}
}
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..55c1294
--- /dev/null
+++ "b/Model/\347\263\273\347\273\237\345\205\254\347\224\250/ClsXt_DefineBillMainSetSub.cs"
@@ -0,0 +1,28 @@
+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 HElementIDAdditionalName; //字段附加字段
+ 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 b448243..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 3a47154..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 3114d49..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 82e4dfc..e36b13e 100644
--- a/PlanM/bin/Release/DAL.pdb
+++ b/PlanM/bin/Release/DAL.pdb
Binary files differ
diff --git a/PlanM/bin/Release/DBUtility.dll b/PlanM/bin/Release/DBUtility.dll
index 5b73185..e149e84 100644
--- a/PlanM/bin/Release/DBUtility.dll
+++ b/PlanM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/PlanM/bin/Release/DBUtility.pdb b/PlanM/bin/Release/DBUtility.pdb
index 5868f01..27f69f8 100644
--- a/PlanM/bin/Release/DBUtility.pdb
+++ b/PlanM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/PlanM/bin/Release/Model.dll b/PlanM/bin/Release/Model.dll
index d1768cf..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 415de8d..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 7f477f0..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 0ed08cd..8140d3b 100644
--- a/PlanM/bin/Release/PlanM.pdb
+++ b/PlanM/bin/Release/PlanM.pdb
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Class.dll b/PlanM/bin/Release/Pub_Class.dll
index 5a27deb..6ac1eea 100644
--- a/PlanM/bin/Release/Pub_Class.dll
+++ b/PlanM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Class.pdb b/PlanM/bin/Release/Pub_Class.pdb
index 52a6297..9a615cd 100644
--- a/PlanM/bin/Release/Pub_Class.pdb
+++ b/PlanM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Control.dll b/PlanM/bin/Release/Pub_Control.dll
index 244bf7f..944241b 100644
--- a/PlanM/bin/Release/Pub_Control.dll
+++ b/PlanM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Control.pdb b/PlanM/bin/Release/Pub_Control.pdb
index edce0ca..4a1acf9 100644
--- a/PlanM/bin/Release/Pub_Control.pdb
+++ b/PlanM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/PlanM/bin/Release/SQLHelper.dll b/PlanM/bin/Release/SQLHelper.dll
index 6fdd03e..a358039 100644
--- a/PlanM/bin/Release/SQLHelper.dll
+++ b/PlanM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/PlanM/bin/Release/SQLHelper.pdb b/PlanM/bin/Release/SQLHelper.pdb
index 5c090db..04f7af8 100644
--- a/PlanM/bin/Release/SQLHelper.pdb
+++ b/PlanM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index 5a27deb..6ac1eea 100644
--- a/Pub_Class/bin/Release/Pub_Class.dll
+++ b/Pub_Class/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.pdb b/Pub_Class/bin/Release/Pub_Class.pdb
index 52a6297..9a615cd 100644
--- a/Pub_Class/bin/Release/Pub_Class.pdb
+++ b/Pub_Class/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.dll b/Pub_Control/bin/Release/Pub_Class.dll
index 5a27deb..6ac1eea 100644
--- a/Pub_Control/bin/Release/Pub_Class.dll
+++ b/Pub_Control/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.pdb b/Pub_Control/bin/Release/Pub_Class.pdb
index 52a6297..9a615cd 100644
--- a/Pub_Control/bin/Release/Pub_Class.pdb
+++ b/Pub_Control/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Control.dll b/Pub_Control/bin/Release/Pub_Control.dll
index 244bf7f..944241b 100644
--- a/Pub_Control/bin/Release/Pub_Control.dll
+++ b/Pub_Control/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Control.pdb b/Pub_Control/bin/Release/Pub_Control.pdb
index edce0ca..4a1acf9 100644
--- a/Pub_Control/bin/Release/Pub_Control.pdb
+++ b/Pub_Control/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.dll b/SQLHelper/bin/Release/Pub_Class.dll
index 5a27deb..6ac1eea 100644
--- a/SQLHelper/bin/Release/Pub_Class.dll
+++ b/SQLHelper/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.pdb b/SQLHelper/bin/Release/Pub_Class.pdb
index 52a6297..9a615cd 100644
--- a/SQLHelper/bin/Release/Pub_Class.pdb
+++ b/SQLHelper/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.dll b/SQLHelper/bin/Release/SQLHelper.dll
index 6fdd03e..a358039 100644
--- a/SQLHelper/bin/Release/SQLHelper.dll
+++ b/SQLHelper/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.pdb b/SQLHelper/bin/Release/SQLHelper.pdb
index 5c090db..04f7af8 100644
--- a/SQLHelper/bin/Release/SQLHelper.pdb
+++ b/SQLHelper/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
index 89d8190..aba9f94 100644
--- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.dll b/SQLHelper/obj/Release/SQLHelper.dll
index 6fdd03e..a358039 100644
--- a/SQLHelper/obj/Release/SQLHelper.dll
+++ b/SQLHelper/obj/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.pdb b/SQLHelper/obj/Release/SQLHelper.pdb
index 5c090db..04f7af8 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..b04aad7
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index 058b657..e193990 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,5 +1,35 @@
+<<<<<<< HEAD
+=======
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+>>>>>>> 98fdb31018bde24c16598b98cdd1cf526dc1113f
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
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
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+=======
+D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+<<<<<<< HEAD
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+=======
+>>>>>>> 124dd32a34ced09ae87935e953dec6401d86f9ac
+>>>>>>> 7d2677241200a3a1fd110e5d37864571c6d87f67
+>>>>>>> 98fdb31018bde24c16598b98cdd1cf526dc1113f
diff --git a/WarM/bin/Release/BLL.dll b/WarM/bin/Release/BLL.dll
index b448243..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 3a47154..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 3114d49..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 82e4dfc..e36b13e 100644
--- a/WarM/bin/Release/DAL.pdb
+++ b/WarM/bin/Release/DAL.pdb
Binary files differ
diff --git a/WarM/bin/Release/DBUtility.dll b/WarM/bin/Release/DBUtility.dll
index 5b73185..e149e84 100644
--- a/WarM/bin/Release/DBUtility.dll
+++ b/WarM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/WarM/bin/Release/DBUtility.pdb b/WarM/bin/Release/DBUtility.pdb
index 5868f01..27f69f8 100644
--- a/WarM/bin/Release/DBUtility.pdb
+++ b/WarM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/WarM/bin/Release/Model.dll b/WarM/bin/Release/Model.dll
index d1768cf..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 415de8d..ea9e022 100644
--- a/WarM/bin/Release/Model.pdb
+++ b/WarM/bin/Release/Model.pdb
Binary files differ
diff --git a/WarM/bin/Release/Pub_Class.dll b/WarM/bin/Release/Pub_Class.dll
index 5a27deb..6ac1eea 100644
--- a/WarM/bin/Release/Pub_Class.dll
+++ b/WarM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/WarM/bin/Release/Pub_Class.pdb b/WarM/bin/Release/Pub_Class.pdb
index 52a6297..9a615cd 100644
--- a/WarM/bin/Release/Pub_Class.pdb
+++ b/WarM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/WarM/bin/Release/Pub_Control.dll b/WarM/bin/Release/Pub_Control.dll
index 244bf7f..944241b 100644
--- a/WarM/bin/Release/Pub_Control.dll
+++ b/WarM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/WarM/bin/Release/Pub_Control.pdb b/WarM/bin/Release/Pub_Control.pdb
index edce0ca..4a1acf9 100644
--- a/WarM/bin/Release/Pub_Control.pdb
+++ b/WarM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/WarM/bin/Release/SQLHelper.dll b/WarM/bin/Release/SQLHelper.dll
index 6fdd03e..a358039 100644
--- a/WarM/bin/Release/SQLHelper.dll
+++ b/WarM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/WarM/bin/Release/SQLHelper.pdb b/WarM/bin/Release/SQLHelper.pdb
index 5c090db..04f7af8 100644
--- a/WarM/bin/Release/SQLHelper.pdb
+++ b/WarM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/WarM/bin/Release/WarM.dll b/WarM/bin/Release/WarM.dll
index 9d378ec..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 29141d2..e3ef4db 100644
--- a/WarM/bin/Release/WarM.pdb
+++ b/WarM/bin/Release/WarM.pdb
Binary files differ
diff --git a/WebAPI/Controllers/CJGL/Sc_OEEReportController.cs b/WebAPI/Controllers/CJGL/Sc_OEEReportController.cs
index 3bfc014..9bcb6b8 100644
--- a/WebAPI/Controllers/CJGL/Sc_OEEReportController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_OEEReportController.cs
@@ -83,7 +83,7 @@
/// </summary>
[Route("Sc_OEEReport/getSc_OEEReportDetailist")]
[HttpGet]
- public object getSc_OEEReportDetailist(string sWhere, string user)
+ public object getSc_OEEReportDetailist(string HSourceCode, string HDate, string HType, string user)
{
try
{
@@ -98,7 +98,7 @@
return objJsonResult;
}
- string sql = "exec h_p_SB_getLatestDataOfOEEDataDetailist " + sWhere;
+ string sql = "exec h_p_SB_getLatestDataOfOEEDataDetailist '" + HSourceCode + "','" + HDate + "','" + HType + "'";
ds = oCN.RunProcReturn(sql, "h_p_SB_getLatestDataOfOEEDataDetailist");
//娣诲姞鍒楀悕
@@ -126,5 +126,56 @@
}
}
#endregion
+
+ #region OEE鎶ヨ〃 鏌ヨ(鐝)
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sc_OEEReport/getSc_OEEReport_WorkShift")]
+ [HttpGet]
+ public object getSc_OEEReport_WorkShift(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ ////鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_OEEReport", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sql = "exec h_p_Sc_OEEReport_WorkShift " + sWhere;
+ ds = oCN.RunProcReturn(sql, "h_p_Sc_OEEReport_WorkShift");
+
+ //娣诲姞鍒楀悕
+ 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/ReportPlatFormController.cs b/WebAPI/Controllers/ReportPlatFormController.cs
index 34de546..badc91b 100644
--- a/WebAPI/Controllers/ReportPlatFormController.cs
+++ b/WebAPI/Controllers/ReportPlatFormController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -279,5 +280,159 @@
return objJsonResult;
}
#endregion
+
+ #region 鎶ュ伐骞冲彴鎸夐挳鏌ヨ
+ [Route("ReportPlatForm/getButtonlist")]
+ [HttpGet]
+ public object getButtonlist(string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_UserButton where 鐢ㄦ埛鍚嶇О='" + user+ "' order by 鎸夐挳鎺掑簭", "h_v_Gy_UserButton");
+
+ //娣诲姞鍒楀悕
+ 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
+
+ #region 鎶ュ伐骞冲彴鎸夐挳娣诲姞
+ [Route("ReportPlatForm/AddButtonlist")]
+ [HttpGet]
+ public object AddButtonlist(string HUserName,string HButtonID, string HButtonName, string HButtonSize, string HButtonOrder)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select * from Gy_UserButtons where HButtonID='" + HButtonID + "' and HUserName='" + HUserName + "'", "Gy_UserButtons");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "褰撳墠浜哄憳宸插垱寤烘敼鎸夐挳,涓嶅厑璁搁噸澶嶅垱寤猴紒";
+ objJsonResult.data = null;
+
+ }
+ else
+ {
+ oCN.BeginTran();
+ //鍐欏叆鎸夐挳缁戝畾
+ oCN.RunProc("insert into Gy_UserButtons(HUserName,HButtonID,HButtonName,HButtonSize,HButtonOrder)values('" + HUserName+"','"+HButtonID+ "','" + HButtonName + "','" + HButtonSize + "','" + HButtonOrder + "')");
+ oCN.Commit();
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ }
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region 鎶ュ伐骞冲彴鎸夐挳鍒犻櫎
+ [Route("ReportPlatForm/DeleteButtonlist")]
+ [HttpGet]
+ public object DeleteButtonlist(int HItemID)
+ {
+ try
+ {
+ oCN.BeginTran();
+ oCN.RunProc("delete from Gy_UserButtons where HItemID ='" + HItemID + "'");
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎸夐挳鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region 鎶ュ伐骞冲彴鎸夐挳鍩虹璧勬枡鏌ヨ
+ [Route("ReportPlatForm/GetGy_BGButtons")]
+ [HttpGet]
+ public object GetGy_BGButtons(string sWhere)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select HItemID 鎸夐挳id,HNumber 鎸夐挳浠ｇ爜,HName 鎸夐挳鍚嶇О from Gy_BGButtons", "Gy_BGButtons");
+ }
+ else
+ {
+ string sql1 = "select HItemID 鎸夐挳id,HNumber 鎸夐挳浠ｇ爜,HName 鎸夐挳鍚嶇О from Gy_BGButtons where 1 = 1 ";
+ string sql = sql1 + sWhere;
+ ds = oCN.RunProcReturn(sql, "Gy_BGButtons");
+ }
+
+ //娣诲姞鍒楀悕
+ 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
}
}
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index f0829eb..1536146 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -16736,6 +16736,12 @@
string sql = "select a.HSubFuncID, a.HCaption,a.HPicNum,b.Hurl from Xt_UserFastMenu as a join Gy_Menu_1 as b on a.HSubFuncID = b.HItemID where a.HUserID = '" + HMakeName + "' and b.HType = '" + HType + "' Order by a.HItemID";
ds = oCn.RunProcReturn(sql, "Xt_UserFastMenu"); //鑾峰彇Xt_UserFastMenu涓鐢ㄦ埛璁剧疆鐨勮嚜瀹氫箟鑿滃崟淇℃伅锛岀敤浜庡湪鍓嶇鍔犺浇
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ sql = "select a.HSubFuncID, a.HCaption,a.HPicNum,b.Hurl from Xt_UserFastMenu as a join Gy_Menu_1 as b on a.HSubFuncID = b.HItemID where a.HUserID = 'admin' and b.HType = '" + HType + "' Order by a.HItemID";
+ ds = oCn.RunProcReturn(sql, "Xt_UserFastMenu"); //鑾峰彇Xt_UserFastMenu涓鐢ㄦ埛璁剧疆鐨勮嚜瀹氫箟鑿滃崟淇℃伅锛岀敤浜庡湪鍓嶇鍔犺浇
+ }
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鏌ヨ鎴愬姛锛�";
diff --git a/WebAPI/Controllers/Xt_DefineBillMainSetController.cs b/WebAPI/Controllers/Xt_DefineBillMainSetController.cs
index c92cd5a..bf9bf71 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,106 @@
}
#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)
+ {
+ if ((oItemSub.HElementID == null || oItemSub.HElementID == "")&&oItemSub.HElementIDAdditionalName!="")
+ {
+ oItemSub.HElementID = oItemSub.HElementIDAdditionalName;
+ }
+ 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/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index 7875f1c..81390b2 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -237,6 +237,11 @@
count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProcessExchangeBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_ProcessExchangeBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
break;
+ case "閿�鍞嚭搴撳崟":
+ tabname = "h_v_IF_SellOutBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select top " + pageSize + " * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_SellOutBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ break;
default:
break;
}
@@ -350,6 +355,12 @@
case "3711": //鐢熶骇姹囨姤鍗�
//寰楀埌淇℃伅
ds = oCN.RunProcReturn("select * from h_v_IF_ICMOReportList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ICMOReportList");
+ //鍐欏叆淇℃伅
+ ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
+ break;
+ case "1205": //閿�鍞嚭搴撳崟
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select * from h_v_IF_SellOutBillList_BarCode where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_SellOutBillList_BarCode");
//鍐欏叆淇℃伅
ListRows.Add(HSourceOrderList1(ds.Tables[0], ordrlist, HBarCodeType, HSourceBillType));
break;
@@ -582,6 +593,15 @@
ordrlist.HSPNumber = dt.Rows[i]["浠撲綅浠ｇ爜"].ToString();
ordrlist.HSPName = dt.Rows[i]["浠撲綅"].ToString();
}
+ if(HSourceBillType == "閿�鍞嚭搴撳崟")
+ {
+ ordrlist.HWhID = dt.Rows[i]["HWhID"].ToString();
+ ordrlist.HWhNumber = dt.Rows[i]["浠撳簱浠ｇ爜"].ToString();
+ ordrlist.HWhName = dt.Rows[i]["浠撳簱"].ToString();
+ //ordrlist.HSPID = dt.Rows[i]["HSPID"].ToString();
+ //ordrlist.HSPNumber = dt.Rows[i]["浠撲綅浠ｇ爜"].ToString();
+ //ordrlist.HSPName = dt.Rows[i]["浠撲綅"].ToString();
+ }
}
return ordrlist;
}
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index bc008d0..f657688 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -8886,6 +8886,46 @@
}
}
#endregion
+
+ #region 閿�鍞嚭搴撹拷婧褰曟姤琛�
+ /// <summary>
+ /// 鑾峰彇閿�鍞嚭搴撹拷婧褰�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/GetKf_SellOutBarTraceReport_Json")]
+ [HttpGet]
+ public object GetKf_SellOutBarTraceReport_Json(DateTime HBeginDate, DateTime HEndDate, string HBarCode, Int64 HStockOrgID, string HWhere)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_Kf_SellOutBarTraceReport '" + HBeginDate.ToShortDateString() + "','" + HEndDate.ToShortDateString() + "','" + HBarCode + "'," + HStockOrgID.ToString() + ",'" + HWhere + "'", "h_p_Kf_SellOutBarTraceReport");
+
+ 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
+
#endregion
#region 瀹㈡埛鏉＄爜鎵弿璁板綍鍗�
diff --git "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs" "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
index 6cfe6fd..13636b3 100644
--- "a/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
+++ "b/WebAPI/Controllers/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/Sc_MESBeginStepWorkBillController.cs"
@@ -46,8 +46,6 @@
try
{
List<object> a = new List<object>();
- LogService.Write("鎵ц浜�0");
-
//鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
if (!DBUtility.ClsPub.Security_Log("MES_MESBeginWorkBill_Query", 1, false, user))
{
@@ -57,7 +55,6 @@
objJsonResult.data = null;
return objJsonResult;
}
- LogService.Write("鎵ц浜�");
ds = Sc_GetMESBeginStepWorkBill(sWhere);
foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
{
diff --git a/WebAPI/DLL/ClsGy_InspectInstruMent_Ctl.cs b/WebAPI/DLL/ClsGy_InspectInstruMent_Ctl.cs
index 3349773..7640ef2 100644
--- a/WebAPI/DLL/ClsGy_InspectInstruMent_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_InspectInstruMent_Ctl.cs
@@ -20,9 +20,11 @@
oCn.BeginTran();
oCn.RunProc("Insert into " + MvarItemKey + " " +
" (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID,HERPItemID) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime,HUSEORGID,HUseFlag,HMakeEmp,HCREATEORGID,HERPItemID" +
+ ",HCalibrationStatus,HCalibrationDate,HValidDate,HExpiryDay) " +
" 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 + "','" + 0 + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ "," + 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 + "','" + 0 + "'" +
+ ",'" + oModel.HCalibrationStatus.ToString() + "','" + oModel.HCalibrationDate.ToString() + "','" + oModel.HValidDate.ToString() + "','" + oModel.HExpiryDay.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCn.Commit();
@@ -51,6 +53,10 @@
",HUSEORGID='" + oModel.HUSEORGID + "'" +
",HModifyEmp ='" + oModel.HMakeEmp + "'" +
",HUseFlag='" + oModel.HUseFlag + "'" +
+ ",HCalibrationStatus='" + oModel.HCalibrationStatus + "'" +
+ ",HCalibrationDate='" + oModel.HCalibrationDate + "'" +
+ ",HValidDate='" + oModel.HValidDate + "'" +
+ ",HExpiryDay='" + oModel.HExpiryDay + "'" +
",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
",HRemark= '" + oModel.HRemark + "' Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼瀛愰」鐩唬鐮�
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 106b2b4..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-16T02:57:23.0694936Z;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/11/2024 22:40:41</publishTime>
+ <publishTime>12/28/2024 15:58:56</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/11/2024 22:40:41</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/11/2024 22:40:40</publishTime>
+ <publishTime>12/28/2024 15:58:54</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/11/2024 22:40:40</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/11/2024 22:40:36</publishTime>
+ <publishTime>12/28/2024 15:58:50</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/11/2024 22:40:36</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/16/2024 10:57:16</publishTime>
+ <publishTime>12/28/2024 15:59:25</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/16/2024 10:57:16</publishTime>
+ <publishTime>12/28/2024 15:59:25</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>12/16/2024 10:57:21</publishTime>
+ <publishTime>12/28/2024 15:59:29</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -495,7 +495,7 @@
<publishTime>05/06/2024 13:47:57</publishTime>
</File>
<File Include="Web.config">
- <publishTime>12/11/2024 22:41:12</publishTime>
+ <publishTime>12/23/2024 13:05:43</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml
new file mode 100644
index 0000000..86e2fec
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml
@@ -0,0 +1,16 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <DeleteExistingFiles>true</DeleteExistingFiles>
+ <ExcludeApp_Data>False</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml.user
new file mode 100644
index 0000000..7c12bdc
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile9.pubxml.user
@@ -0,0 +1,498 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <History>True|2024-12-30T03:17:50.7918409Z;True|2024-12-30T11:17:26.1353379+08:00;False|2024-12-30T11:16:45.7291107+08:00;</History>
+ <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
+ </PropertyGroup>
+ <ItemGroup>
+ <File Include="apiapp.json">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.EndpointUtil.dll">
+ <publishTime>04/07/2020 16:33:48</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
+ <publishTime>04/25/2023 17:49:04</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewaySpi.dll">
+ <publishTime>07/31/2024 20:50:30</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiClient.dll">
+ <publishTime>08/06/2024 18:07:52</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
+ <publishTime>11/22/2022 11:24:18</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
+ <publishTime>08/08/2024 19:43:22</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaUtil.dll">
+ <publishTime>07/15/2024 20:25:56</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaXML.dll">
+ <publishTime>08/03/2022 21:46:08</publishTime>
+ </File>
+ <File Include="bin/Aliyun.Credentials.dll">
+ <publishTime>07/24/2024 10:36:58</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.dll">
+ <publishTime>02/22/2013 16:43:40</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.pdb">
+ <publishTime>02/22/2013 16:43:40</publishTime>
+ </File>
+ <File Include="bin/BLL.dll">
+ <publishTime>12/30/2024 11:16:58</publishTime>
+ </File>
+ <File Include="bin/BLL.pdb">
+ <publishTime>12/30/2024 11:16:58</publishTime>
+ </File>
+ <File Include="bin/BouncyCastle.Crypto.dll">
+ <publishTime>12/18/2020 05:32:28</publishTime>
+ </File>
+ <File Include="bin/DAL.dll">
+ <publishTime>12/30/2024 11:16:56</publishTime>
+ </File>
+ <File Include="bin/DAL.pdb">
+ <publishTime>12/30/2024 11:16:56</publishTime>
+ </File>
+ <File Include="bin/Dapper.dll">
+ <publishTime>07/22/2016 22:52:40</publishTime>
+ </File>
+ <File Include="bin/DBUtility.dll">
+ <publishTime>12/30/2024 11:16:53</publishTime>
+ </File>
+ <File Include="bin/DBUtility.pdb">
+ <publishTime>12/30/2024 11:16:53</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.Api.dll">
+ <publishTime>03/22/2022 13:17:26</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.Api.pdb">
+ <publishTime>03/19/2022 07:39:42</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.dll">
+ <publishTime>03/22/2022 13:17:20</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.pdb">
+ <publishTime>03/19/2022 07:39:48</publishTime>
+ </File>
+ <File Include="bin/grpc_csharp_ext.x64.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="bin/grpc_csharp_ext.x86.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="bin/ICSharpCode.SharpZipLib.dll">
+ <publishTime>05/09/2021 01:08:30</publishTime>
+ </File>
+ <File Include="bin/ICSharpCode.SharpZipLib.pdb">
+ <publishTime>05/09/2021 01:08:30</publishTime>
+ </File>
+ <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>02/08/2023 09:47:46</publishTime>
+ </File>
+ <File Include="bin/libgrpc_csharp_ext.x64.dylib">
+ <publishTime>03/19/2022 07:38:44</publishTime>
+ </File>
+ <File Include="bin/libgrpc_csharp_ext.x64.so">
+ <publishTime>03/19/2022 07:38:42</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
+ <publishTime>03/19/2015 01:02:50</publishTime>
+ </File>
+ <File Include="bin/Microsoft.CSharp.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Web.Infrastructure.dll">
+ <publishTime>07/25/2012 19:48:56</publishTime>
+ </File>
+ <File Include="bin/Model.dll">
+ <publishTime>12/30/2024 11:16:54</publishTime>
+ </File>
+ <File Include="bin/Model.pdb">
+ <publishTime>12/30/2024 11:16:54</publishTime>
+ </File>
+ <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="bin/Newtonsoft.Json.dll">
+ <publishTime>03/08/2023 15:09:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.dll">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OOXML.dll">
+ <publishTime>10/23/2021 09:07:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.OOXML.pdb">
+ <publishTime>10/23/2021 17:07:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXml4Net.dll">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXml4Net.pdb">
+ <publishTime>10/23/2021 17:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXmlFormats.dll">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXmlFormats.pdb">
+ <publishTime>10/23/2021 17:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.pdb">
+ <publishTime>10/23/2021 17:07:54</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.dll">
+ <publishTime>12/30/2024 11:16:51</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.pdb">
+ <publishTime>12/30/2024 11:16:51</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.dll">
+ <publishTime>12/30/2024 11:16:52</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.pdb">
+ <publishTime>12/30/2024 11:16:52</publishTime>
+ </File>
+ <File Include="bin/RestSharp.dll">
+ <publishTime>08/31/2012 06:22:50</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.dll">
+ <publishTime>12/30/2024 11:16:52</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.pdb">
+ <publishTime>12/30/2024 11:16:52</publishTime>
+ </File>
+ <File Include="bin/Swashbuckle.Core.dll">
+ <publishTime>02/16/2015 01:57:08</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.dll">
+ <publishTime>12/18/2024 11:02:10</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.pdb">
+ <publishTime>12/18/2024 11:02:10</publishTime>
+ </File>
+ <File Include="bin/System.Buffers.dll">
+ <publishTime>07/19/2017 18:01:28</publishTime>
+ </File>
+ <File Include="bin/System.ComponentModel.DataAnnotations.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Configuration.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.DataSetExtensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Drawing.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.EnterpriseServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
+ <publishTime>08/19/2014 18:03:34</publishTime>
+ </File>
+ <File Include="bin/System.Memory.dll">
+ <publishTime>04/18/2019 00:24:34</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Extensions.dll">
+ <publishTime>02/20/2015 04:10:46</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Formatting.dll">
+ <publishTime>11/28/2018 21:00:36</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Primitives.dll">
+ <publishTime>02/20/2015 04:10:46</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
+ <publishTime>09/19/2018 03:38:10</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.Serialization.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.ApplicationServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Cors.dll">
+ <publishTime>11/28/2018 20:58:44</publishTime>
+ </File>
+ <File Include="bin/System.Web.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.DynamicData.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Entity.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Extensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Helpers.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.Cors.dll">
+ <publishTime>11/28/2018 21:01:26</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.dll">
+ <publishTime>11/28/2018 21:01:00</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.WebHost.dll">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="bin/System.Web.Mvc.dll">
+ <publishTime>01/28/2015 12:02:18</publishTime>
+ </File>
+ <File Include="bin/System.Web.Optimization.dll">
+ <publishTime>02/11/2014 23:26:04</publishTime>
+ </File>
+ <File Include="bin/System.Web.Razor.dll">
+ <publishTime>01/28/2015 12:02:32</publishTime>
+ </File>
+ <File Include="bin/System.Web.Services.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Deployment.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Razor.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Xml.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Xml.Linq.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/Tea.dll">
+ <publishTime>05/09/2023 10:43:40</publishTime>
+ </File>
+ <File Include="bin/TopSdk.dll">
+ <publishTime>12/18/2024 11:03:19</publishTime>
+ </File>
+ <File Include="bin/TopSdk.pdb">
+ <publishTime>12/18/2024 11:03:19</publishTime>
+ </File>
+ <File Include="bin/WebActivatorEx.dll">
+ <publishTime>11/24/2014 19:18:48</publishTime>
+ </File>
+ <File Include="bin/WebAPI.dll">
+ <publishTime>12/30/2024 11:17:44</publishTime>
+ </File>
+ <File Include="bin/WebAPI.pdb">
+ <publishTime>12/30/2024 11:17:44</publishTime>
+ </File>
+ <File Include="bin/WebAPI.XmlSerializers.dll">
+ <publishTime>12/30/2024 11:17:48</publishTime>
+ </File>
+ <File Include="bin/WebGrease.dll">
+ <publishTime>07/18/2013 01:03:52</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
+ <publishTime>11/29/2018 21:26:02</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
+ <publishTime>11/29/2018 21:26:30</publishTime>
+ </File>
+ <File Include="Config/kdapi.config">
+ <publishTime>08/15/2022 15:46:13</publishTime>
+ </File>
+ <File Include="Content/bootstrap.css">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="Content/bootstrap.min.css">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="Content/Site.css">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="DLL/BLL.dll">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="DLL/DAL.dll">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="DLL/DBUtility.dll">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>02/08/2023 09:47:46</publishTime>
+ </File>
+ <File Include="DLL/Model.dll">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="DLL/Newtonsoft.Json.Net35.dll">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="DLL/Pub_Class.dll">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="DLL/Pub_Control.dll">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="DLL/SQLHelper.dll">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.eot">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.svg">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.ttf">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.woff">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="Global.asax">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="grpc_csharp_ext.x64.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="grpc_csharp_ext.x86.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="Index.html">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="libgrpc_csharp_ext.x64.dylib">
+ <publishTime>03/19/2022 07:38:44</publishTime>
+ </File>
+ <File Include="libgrpc_csharp_ext.x64.so">
+ <publishTime>03/19/2022 07:38:42</publishTime>
+ </File>
+ <File Include="libman.json">
+ <publishTime>07/18/2023 17:26:29</publishTime>
+ </File>
+ <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="packages.config">
+ <publishTime>09/19/2024 08:47:56</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.js">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.min.js">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.js">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.js">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.map">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.js">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.min.js">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="Views/Scripts/modernizr-2.6.2.js">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="Views/Shared/Error.cshtml">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="Views/Shared/_Layout.cshtml">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="Views/web.config">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="Views/_ViewStart.cshtml">
+ <publishTime>03/15/2022 10:06:42</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
+ <publishTime>03/31/2023 09:57:09</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
+ <publishTime>03/31/2023 09:57:08</publishTime>
+ </File>
+ <File Include="Web.config">
+ <publishTime>12/30/2024 11:17:21</publishTime>
+ </File>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
index f83e0f7..75dc922 100644
--- a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/JFAPI.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-12-26T03:35:42.2760106Z;False|2024-12-26T11:35:08.9255789+08:00;True|2024-12-26T10:10:29.7487991+08:00;True|2024-12-26T09:27:40.2637311+08:00;False|2024-12-26T09:25:52.1339136+08:00;True|2024-12-24T15:11:48.9968778+08:00;True|2024-12-24T15:06:55.0283993+08:00;True|2024-12-24T14:36:29.6466740+08:00;True|2024-12-24T10:28:42.7489880+08:00;False|2024-12-24T10:28:08.6809715+08:00;True|2024-12-24T10:06:05.9449103+08:00;False|2024-12-24T10:05:32.8409161+08:00;True|2024-12-23T14:56:40.3416256+08:00;True|2024-12-23T14:50:50.2677378+08:00;True|2024-12-23T14:48:27.8169391+08:00;True|2024-12-23T14:45:25.5341474+08:00;True|2024-12-23T14:42:23.7825087+08:00;True|2024-12-23T14:35:53.8876449+08:00;True|2024-12-23T14:14:00.4257926+08:00;True|2024-12-23T11:10:54.5874876+08:00;True|2024-12-23T11:08:44.0250304+08:00;False|2024-12-23T11:08:18.5757850+08:00;True|2024-12-20T12:51:29.2354841+08:00;True|2024-12-20T12:46:13.7636932+08:00;False|2024-12-20T12:44:21.1473486+08:00;False|2024-12-20T12:44:06.5427106+08:00;True|2024-12-20T12:29:33.9971940+08:00;False|2024-12-20T12:29:01.0285205+08:00;True|2024-12-19T15:49:19.9906264+08:00;True|2024-12-19T14:55:54.3323405+08:00;True|2024-12-19T14:17:50.5086161+08:00;True|2024-12-19T14:08:16.0919011+08:00;True|2024-12-19T14:02:50.3092759+08:00;True|2024-12-19T13:54:41.2332165+08:00;False|2024-12-19T13:54:07.6973483+08:00;True|2024-12-19T09:34:54.5332110+08:00;True|2024-12-19T08:49:05.5690428+08:00;False|2024-12-19T08:48:51.0618113+08:00;True|2024-12-18T15:45:34.7174246+08:00;False|2024-12-18T15:45:10.3226822+08:00;True|2024-12-18T15:32:03.5983267+08:00;True|2024-12-18T15:31:20.1219502+08:00;True|2024-12-18T11:57:09.1595607+08:00;True|2024-12-18T11:13:37.4765697+08:00;True|2024-12-18T10:07:54.1294714+08:00;True|2024-12-18T10:04:16.0967342+08:00;False|2024-12-18T10:04:04.1561560+08:00;True|2024-12-16T17:07:07.3386872+08:00;True|2024-12-16T16:34:59.1101964+08:00;True|2024-12-16T16:19:07.9287470+08:00;False|2024-12-16T16:18:46.4617432+08:00;True|2024-12-13T18:06:11.0778539+08:00;True|2024-12-13T16:53:52.2283177+08:00;True|2024-12-13T16:23:15.9531944+08:00;True|2024-12-13T13:58:03.7464045+08:00;True|2024-12-13T10:40:33.9285602+08:00;True|2024-12-13T10:38:03.8494063+08:00;False|2024-12-13T10:37:52.4251132+08:00;True|2024-12-13T10:31:07.4994631+08:00;False|2024-12-13T10:30:40.8021885+08:00;True|2024-12-12T10:01:42.4944750+08:00;False|2024-12-12T10:01:15.7147977+08:00;True|2024-12-11T17:21:58.0453583+08:00;True|2024-12-11T10:59:15.3836831+08:00;True|2024-12-11T09:49:19.4060272+08:00;False|2024-12-11T09:48:51.7603525+08:00;True|2024-12-11T08:58:41.4567855+08:00;False|2024-12-11T08:58:09.2160433+08:00;True|2024-12-10T17:25:49.3068154+08:00;True|2024-12-10T17:21:30.0155027+08:00;True|2024-12-10T17:16:56.7587487+08:00;False|2024-12-10T17:16:34.7816611+08:00;True|2024-12-10T16:55:40.3777585+08:00;False|2024-12-10T16:55:13.2621448+08:00;False|2024-12-09T13:59:27.6362265+08:00;True|2024-12-06T16:55:30.6422980+08:00;True|2024-12-06T15:08:49.5834939+08:00;True|2024-12-06T14:31:56.0968616+08:00;False|2024-12-06T14:31:44.2264009+08:00;True|2024-12-06T13:59:52.8150929+08:00;False|2024-12-06T13:48:22.6073939+08:00;True|2024-12-05T17:33:27.9247467+08:00;True|2024-12-05T17:30:23.1740838+08:00;False|2024-12-05T17:30:03.9977311+08:00;True|2024-12-04T15:18:41.4963816+08:00;True|2024-12-04T15:16:45.1121101+08:00;True|2024-12-04T15:14:33.5954776+08:00;True|2024-12-04T15:12:27.2913137+08:00;True|2024-12-04T14:10:19.6190673+08:00;False|2024-12-04T14:10:02.0319713+08:00;True|2024-12-03T16:08:46.6721098+08:00;True|2024-12-03T15:16:04.1754554+08:00;True|2024-12-03T15:13:25.4927626+08:00;True|2024-12-03T14:55:09.4413291+08:00;True|2024-12-03T14:43:11.8243897+08:00;True|2024-12-03T14:29:16.1511932+08:00;True|2024-12-03T14:24:07.9561838+08:00;False|2024-12-03T14:23:55.1293602+08:00;True|2024-12-02T16:31:22.0404862+08:00;False|2024-12-02T16:28:53.1721961+08:00;True|2024-12-02T15:41:24.9462025+08:00;True|2024-12-02T14:12:12.9356193+08:00;False|2024-12-02T14:11:35.7159488+08:00;True|2024-12-02T10:59:31.5582757+08:00;True|2024-11-29T12:08:55.4868083+08:00;False|2024-11-29T12:08:37.0353185+08:00;True|2024-11-28T10:47:27.2071355+08:00;False|2024-11-28T10:47:13.6670955+08:00;True|2024-11-27T15:21:57.6747082+08:00;False|2024-11-27T15:20:07.2403056+08:00;True|2024-11-27T15:13:36.1461091+08:00;True|2024-11-27T14:34:35.5908753+08:00;False|2024-11-27T14:33:30.7118923+08:00;True|2024-11-26T15:16:44.1854927+08:00;True|2024-11-26T15:14:33.4021067+08:00;False|2024-11-26T15:14:07.9955135+08:00;True|2024-11-26T14:48:35.6408418+08:00;True|2024-11-26T14:45:00.7251556+08:00;True|2024-11-26T14:04:58.4232988+08:00;False|2024-11-26T14:04:28.1286675+08:00;True|2024-11-25T13:45:07.6935933+08:00;True|2024-11-25T13:43:59.0788650+08:00;False|2024-11-25T13:43:44.2225194+08:00;True|2024-11-25T08:54:05.5144014+08:00;False|2024-11-25T08:53:49.2284063+08:00;False|2024-11-22T09:53:13.7879664+08:00;True|2024-11-21T13:48:31.7056264+08:00;True|2024-11-21T13:46:55.0891551+08:00;True|2024-11-21T13:44:05.5221110+08:00;True|2024-11-21T13:43:39.1385899+08:00;False|2024-11-21T13:43:19.9351488+08:00;True|2024-11-20T11:33:52.0324053+08:00;True|2024-11-20T11:20:58.4917889+08:00;True|2024-11-20T11:03:46.9552623+08:00;True|2024-11-20T10:45:10.9517109+08:00;False|2024-11-20T10:44:58.3221116+08:00;False|2024-11-19T15:39:27.3889104+08:00;True|2024-11-19T14:42:32.0854561+08:00;True|2024-11-19T14:19:19.6198070+08:00;True|2024-11-19T14:13:08.2003750+08:00;False|2024-11-19T14:12:15.5442850+08:00;True|2024-11-18T13:05:41.0455534+08:00;True|2024-11-18T11:05:30.2819404+08:00;True|2024-11-18T10:51:07.1852818+08:00;False|2024-11-18T10:50:21.5098527+08:00;True|2024-11-18T10:15:38.5429366+08:00;True|2024-11-18T10:00:51.0847524+08:00;True|2024-11-18T09:34:52.1772715+08:00;True|2024-11-18T09:27:23.6013754+08:00;False|2024-11-18T09:26:00.9323551+08:00;True|2024-11-15T11:20:51.7576376+08:00;True|2024-11-15T11:11:17.5580168+08:00;True|2024-11-15T11:03:58.4142996+08:00;True|2024-11-15T10:44:50.5207827+08:00;True|2024-11-15T10:10:05.5550418+08:00;True|2024-11-15T09:49:30.6631382+08:00;False|2024-11-15T09:47:05.3973379+08:00;True|2024-11-14T18:31:54.8247681+08:00;True|2024-11-14T17:14:56.3660185+08:00;True|2024-11-14T16:49:44.7526912+08:00;True|2024-11-14T16:49:09.3427608+08:00;True|2024-11-14T15:59:00.2572264+08:00;True|2024-11-14T11:21:03.5110818+08:00;True|2024-11-14T10:51:10.7864658+08:00;False|2024-11-14T10:50:55.5384248+08:00;True|2024-11-14T10:29:13.6760158+08:00;False|2024-11-14T10:28:09.8622863+08:00;True|2024-11-13T17:48:46.4827219+08:00;True|2024-11-13T17:45:13.0659280+08:00;True|2024-11-13T16:01:55.2278671+08:00;False|2024-11-13T16:01:03.0040446+08:00;True|2024-11-12T17:24:06.3763535+08:00;True|2024-11-12T17:21:51.8459552+08:00;True|2024-11-12T17:11:57.9239909+08:00;True|2024-11-12T17:09:04.4322824+08:00;True|2024-11-12T17:07:12.1839548+08:00;True|2024-11-12T17:04:27.4579152+08:00;True|2024-11-12T17:03:59.6843282+08:00;True|2024-11-12T16:40:44.0714862+08:00;True|2024-11-12T16:36:27.7792764+08:00;True|2024-11-12T16:32:36.5262040+08:00;False|2024-11-12T16:32:23.9550194+08:00;True|2024-11-12T10:58:16.1987697+08:00;False|2024-11-12T10:58:04.8469631+08:00;True|2024-11-11T13:40:53.2582255+08:00;True|2024-11-11T13:37:45.0401833+08:00;True|2024-11-11T12:35:13.2429166+08:00;True|2024-11-11T11:27:29.0530688+08:00;False|2024-11-11T11:27:12.2765506+08:00;True|2024-11-08T15:52:17.1278870+08:00;False|2024-11-08T15:52:04.4379380+08:00;True|2024-11-07T18:27:41.8163960+08:00;False|2024-11-07T18:27:30.6037983+08:00;True|2024-11-06T15:55:27.6450488+08:00;True|2024-11-06T15:54:13.5957004+08:00;True|2024-11-06T15:25:33.3862531+08:00;True|2024-11-06T13:33:57.8502278+08:00;False|2024-11-06T13:33:39.2337086+08:00;True|2024-11-06T11:33:12.6755239+08:00;True|2024-11-05T18:34:17.7048247+08:00;True|2024-11-05T18:30:08.5724471+08:00;True|2024-11-05T18:24:35.5372980+08:00;True|2024-11-05T18:06:29.7644779+08:00;True|2024-11-05T17:53:50.9554703+08:00;True|2024-11-05T17:50:05.6376900+08:00;True|2024-11-05T11:13:46.2906508+08:00;True|2024-11-05T10:35:55.5423834+08:00;False|2024-11-05T10:35:20.4104039+08:00;True|2024-11-01T10:22:05.7636122+08:00;False|2024-11-01T10:21:33.2954398+08:00;True|2024-10-31T20:03:37.9075888+08:00;True|2024-10-31T18:35:31.6618415+08:00;True|2024-10-31T18:34:56.2479021+08:00;True|2024-10-31T09:43:29.0841188+08:00;False|2024-10-31T09:43:04.8780818+08:00;True|2024-10-30T18:42:11.0523067+08:00;True|2024-10-30T18:07:05.5603627+08:00;True|2024-10-30T18:03:15.3516621+08:00;True|2024-10-30T17:58:14.3276504+08:00;False|2024-10-30T17:57:44.5353118+08:00;True|2024-10-30T17:47:41.2889491+08:00;True|2024-10-30T17:19:36.6172721+08:00;True|2024-10-30T17:10:00.4399703+08:00;False|2024-10-30T17:08:57.6500450+08:00;True|2024-10-29T16:58:15.6006676+08:00;True|2024-10-29T16:51:56.8406649+08:00;True|2024-10-29T16:05:48.4297695+08:00;True|2024-10-29T15:12:15.1522377+08:00;True|2024-10-29T15:10:51.8431754+08:00;True|2024-10-29T11:21:01.5660940+08:00;False|2024-10-29T11:20:33.3958980+08:00;True|2024-10-28T17:51:26.7156861+08:00;False|2024-10-28T17:50:41.4388196+08:00;True|2024-10-28T13:34:14.8764262+08:00;True|2024-10-28T12:44:27.2083620+08:00;False|2024-10-28T12:43:57.5942717+08:00;True|2024-10-25T11:49:47.9817458+08:00;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
+ <History>True|2024-12-30T01:32:44.3898729Z;True|2024-12-30T09:31:24.5771941+08:00;False|2024-12-30T09:30:52.4031391+08:00;True|2024-12-27T16:12:20.2836752+08:00;False|2024-12-27T16:11:04.6614343+08:00;True|2024-12-27T15:07:23.0750147+08:00;True|2024-12-27T15:04:52.7876532+08:00;True|2024-12-27T14:37:54.3154829+08:00;False|2024-12-27T14:37:26.9546174+08:00;True|2024-12-26T16:33:56.0452167+08:00;True|2024-12-26T16:29:21.4115458+08:00;True|2024-12-26T16:29:02.0242815+08:00;True|2024-12-26T15:17:24.7390981+08:00;False|2024-12-26T15:13:26.8863189+08:00;True|2024-12-26T15:06:35.4541902+08:00;True|2024-12-26T11:35:42.2760106+08:00;False|2024-12-26T11:35:08.9255789+08:00;True|2024-12-26T10:10:29.7487991+08:00;True|2024-12-26T09:27:40.2637311+08:00;False|2024-12-26T09:25:52.1339136+08:00;True|2024-12-24T15:11:48.9968778+08:00;True|2024-12-24T15:06:55.0283993+08:00;True|2024-12-24T14:36:29.6466740+08:00;True|2024-12-24T10:28:42.7489880+08:00;False|2024-12-24T10:28:08.6809715+08:00;True|2024-12-24T10:06:05.9449103+08:00;False|2024-12-24T10:05:32.8409161+08:00;True|2024-12-23T14:56:40.3416256+08:00;True|2024-12-23T14:50:50.2677378+08:00;True|2024-12-23T14:48:27.8169391+08:00;True|2024-12-23T14:45:25.5341474+08:00;True|2024-12-23T14:42:23.7825087+08:00;True|2024-12-23T14:35:53.8876449+08:00;True|2024-12-23T14:14:00.4257926+08:00;True|2024-12-23T11:10:54.5874876+08:00;True|2024-12-23T11:08:44.0250304+08:00;False|2024-12-23T11:08:18.5757850+08:00;True|2024-12-20T12:51:29.2354841+08:00;True|2024-12-20T12:46:13.7636932+08:00;False|2024-12-20T12:44:21.1473486+08:00;False|2024-12-20T12:44:06.5427106+08:00;True|2024-12-20T12:29:33.9971940+08:00;False|2024-12-20T12:29:01.0285205+08:00;True|2024-12-19T15:49:19.9906264+08:00;True|2024-12-19T14:55:54.3323405+08:00;True|2024-12-19T14:17:50.5086161+08:00;True|2024-12-19T14:08:16.0919011+08:00;True|2024-12-19T14:02:50.3092759+08:00;True|2024-12-19T13:54:41.2332165+08:00;False|2024-12-19T13:54:07.6973483+08:00;True|2024-12-19T09:34:54.5332110+08:00;True|2024-12-19T08:49:05.5690428+08:00;False|2024-12-19T08:48:51.0618113+08:00;True|2024-12-18T15:45:34.7174246+08:00;False|2024-12-18T15:45:10.3226822+08:00;True|2024-12-18T15:32:03.5983267+08:00;True|2024-12-18T15:31:20.1219502+08:00;True|2024-12-18T11:57:09.1595607+08:00;True|2024-12-18T11:13:37.4765697+08:00;True|2024-12-18T10:07:54.1294714+08:00;True|2024-12-18T10:04:16.0967342+08:00;False|2024-12-18T10:04:04.1561560+08:00;True|2024-12-16T17:07:07.3386872+08:00;True|2024-12-16T16:34:59.1101964+08:00;True|2024-12-16T16:19:07.9287470+08:00;False|2024-12-16T16:18:46.4617432+08:00;True|2024-12-13T18:06:11.0778539+08:00;True|2024-12-13T16:53:52.2283177+08:00;True|2024-12-13T16:23:15.9531944+08:00;True|2024-12-13T13:58:03.7464045+08:00;True|2024-12-13T10:40:33.9285602+08:00;True|2024-12-13T10:38:03.8494063+08:00;False|2024-12-13T10:37:52.4251132+08:00;True|2024-12-13T10:31:07.4994631+08:00;False|2024-12-13T10:30:40.8021885+08:00;True|2024-12-12T10:01:42.4944750+08:00;False|2024-12-12T10:01:15.7147977+08:00;True|2024-12-11T17:21:58.0453583+08:00;True|2024-12-11T10:59:15.3836831+08:00;True|2024-12-11T09:49:19.4060272+08:00;False|2024-12-11T09:48:51.7603525+08:00;True|2024-12-11T08:58:41.4567855+08:00;False|2024-12-11T08:58:09.2160433+08:00;True|2024-12-10T17:25:49.3068154+08:00;True|2024-12-10T17:21:30.0155027+08:00;True|2024-12-10T17:16:56.7587487+08:00;False|2024-12-10T17:16:34.7816611+08:00;True|2024-12-10T16:55:40.3777585+08:00;False|2024-12-10T16:55:13.2621448+08:00;False|2024-12-09T13:59:27.6362265+08:00;True|2024-12-06T16:55:30.6422980+08:00;True|2024-12-06T15:08:49.5834939+08:00;True|2024-12-06T14:31:56.0968616+08:00;False|2024-12-06T14:31:44.2264009+08:00;True|2024-12-06T13:59:52.8150929+08:00;False|2024-12-06T13:48:22.6073939+08:00;True|2024-12-05T17:33:27.9247467+08:00;True|2024-12-05T17:30:23.1740838+08:00;False|2024-12-05T17:30:03.9977311+08:00;True|2024-12-04T15:18:41.4963816+08:00;True|2024-12-04T15:16:45.1121101+08:00;True|2024-12-04T15:14:33.5954776+08:00;True|2024-12-04T15:12:27.2913137+08:00;True|2024-12-04T14:10:19.6190673+08:00;False|2024-12-04T14:10:02.0319713+08:00;True|2024-12-03T16:08:46.6721098+08:00;True|2024-12-03T15:16:04.1754554+08:00;True|2024-12-03T15:13:25.4927626+08:00;True|2024-12-03T14:55:09.4413291+08:00;True|2024-12-03T14:43:11.8243897+08:00;True|2024-12-03T14:29:16.1511932+08:00;True|2024-12-03T14:24:07.9561838+08:00;False|2024-12-03T14:23:55.1293602+08:00;True|2024-12-02T16:31:22.0404862+08:00;False|2024-12-02T16:28:53.1721961+08:00;True|2024-12-02T15:41:24.9462025+08:00;True|2024-12-02T14:12:12.9356193+08:00;False|2024-12-02T14:11:35.7159488+08:00;True|2024-12-02T10:59:31.5582757+08:00;True|2024-11-29T12:08:55.4868083+08:00;False|2024-11-29T12:08:37.0353185+08:00;True|2024-11-28T10:47:27.2071355+08:00;False|2024-11-28T10:47:13.6670955+08:00;True|2024-11-27T15:21:57.6747082+08:00;False|2024-11-27T15:20:07.2403056+08:00;True|2024-11-27T15:13:36.1461091+08:00;True|2024-11-27T14:34:35.5908753+08:00;False|2024-11-27T14:33:30.7118923+08:00;True|2024-11-26T15:16:44.1854927+08:00;True|2024-11-26T15:14:33.4021067+08:00;False|2024-11-26T15:14:07.9955135+08:00;True|2024-11-26T14:48:35.6408418+08:00;True|2024-11-26T14:45:00.7251556+08:00;True|2024-11-26T14:04:58.4232988+08:00;False|2024-11-26T14:04:28.1286675+08:00;True|2024-11-25T13:45:07.6935933+08:00;True|2024-11-25T13:43:59.0788650+08:00;False|2024-11-25T13:43:44.2225194+08:00;True|2024-11-25T08:54:05.5144014+08:00;False|2024-11-25T08:53:49.2284063+08:00;False|2024-11-22T09:53:13.7879664+08:00;True|2024-11-21T13:48:31.7056264+08:00;True|2024-11-21T13:46:55.0891551+08:00;True|2024-11-21T13:44:05.5221110+08:00;True|2024-11-21T13:43:39.1385899+08:00;False|2024-11-21T13:43:19.9351488+08:00;True|2024-11-20T11:33:52.0324053+08:00;True|2024-11-20T11:20:58.4917889+08:00;True|2024-11-20T11:03:46.9552623+08:00;True|2024-11-20T10:45:10.9517109+08:00;False|2024-11-20T10:44:58.3221116+08:00;False|2024-11-19T15:39:27.3889104+08:00;True|2024-11-19T14:42:32.0854561+08:00;True|2024-11-19T14:19:19.6198070+08:00;True|2024-11-19T14:13:08.2003750+08:00;False|2024-11-19T14:12:15.5442850+08:00;True|2024-11-18T13:05:41.0455534+08:00;True|2024-11-18T11:05:30.2819404+08:00;True|2024-11-18T10:51:07.1852818+08:00;False|2024-11-18T10:50:21.5098527+08:00;True|2024-11-18T10:15:38.5429366+08:00;True|2024-11-18T10:00:51.0847524+08:00;True|2024-11-18T09:34:52.1772715+08:00;True|2024-11-18T09:27:23.6013754+08:00;False|2024-11-18T09:26:00.9323551+08:00;True|2024-11-15T11:20:51.7576376+08:00;True|2024-11-15T11:11:17.5580168+08:00;True|2024-11-15T11:03:58.4142996+08:00;True|2024-11-15T10:44:50.5207827+08:00;True|2024-11-15T10:10:05.5550418+08:00;True|2024-11-15T09:49:30.6631382+08:00;False|2024-11-15T09:47:05.3973379+08:00;True|2024-11-14T18:31:54.8247681+08:00;True|2024-11-14T17:14:56.3660185+08:00;True|2024-11-14T16:49:44.7526912+08:00;True|2024-11-14T16:49:09.3427608+08:00;True|2024-11-14T15:59:00.2572264+08:00;True|2024-11-14T11:21:03.5110818+08:00;True|2024-11-14T10:51:10.7864658+08:00;False|2024-11-14T10:50:55.5384248+08:00;True|2024-11-14T10:29:13.6760158+08:00;False|2024-11-14T10:28:09.8622863+08:00;True|2024-11-13T17:48:46.4827219+08:00;True|2024-11-13T17:45:13.0659280+08:00;True|2024-11-13T16:01:55.2278671+08:00;False|2024-11-13T16:01:03.0040446+08:00;True|2024-11-12T17:24:06.3763535+08:00;True|2024-11-12T17:21:51.8459552+08:00;True|2024-11-12T17:11:57.9239909+08:00;True|2024-11-12T17:09:04.4322824+08:00;True|2024-11-12T17:07:12.1839548+08:00;True|2024-11-12T17:04:27.4579152+08:00;True|2024-11-12T17:03:59.6843282+08:00;True|2024-11-12T16:40:44.0714862+08:00;True|2024-11-12T16:36:27.7792764+08:00;True|2024-11-12T16:32:36.5262040+08:00;False|2024-11-12T16:32:23.9550194+08:00;True|2024-11-12T10:58:16.1987697+08:00;False|2024-11-12T10:58:04.8469631+08:00;True|2024-11-11T13:40:53.2582255+08:00;True|2024-11-11T13:37:45.0401833+08:00;True|2024-11-11T12:35:13.2429166+08:00;True|2024-11-11T11:27:29.0530688+08:00;False|2024-11-11T11:27:12.2765506+08:00;True|2024-11-08T15:52:17.1278870+08:00;False|2024-11-08T15:52:04.4379380+08:00;True|2024-11-07T18:27:41.8163960+08:00;False|2024-11-07T18:27:30.6037983+08:00;True|2024-11-06T15:55:27.6450488+08:00;True|2024-11-06T15:54:13.5957004+08:00;True|2024-11-06T15:25:33.3862531+08:00;True|2024-11-06T13:33:57.8502278+08:00;False|2024-11-06T13:33:39.2337086+08:00;True|2024-11-06T11:33:12.6755239+08:00;True|2024-11-05T18:34:17.7048247+08:00;True|2024-11-05T18:30:08.5724471+08:00;True|2024-11-05T18:24:35.5372980+08:00;True|2024-11-05T18:06:29.7644779+08:00;True|2024-11-05T17:53:50.9554703+08:00;True|2024-11-05T17:50:05.6376900+08:00;True|2024-11-05T11:13:46.2906508+08:00;True|2024-11-05T10:35:55.5423834+08:00;False|2024-11-05T10:35:20.4104039+08:00;True|2024-11-01T10:22:05.7636122+08:00;False|2024-11-01T10:21:33.2954398+08:00;True|2024-10-31T20:03:37.9075888+08:00;True|2024-10-31T18:35:31.6618415+08:00;True|2024-10-31T18:34:56.2479021+08:00;True|2024-10-31T09:43:29.0841188+08:00;False|2024-10-31T09:43:04.8780818+08:00;True|2024-10-30T18:42:11.0523067+08:00;True|2024-10-30T18:07:05.5603627+08:00;True|2024-10-30T18:03:15.3516621+08:00;True|2024-10-30T17:58:14.3276504+08:00;False|2024-10-30T17:57:44.5353118+08:00;True|2024-10-30T17:47:41.2889491+08:00;True|2024-10-30T17:19:36.6172721+08:00;True|2024-10-30T17:10:00.4399703+08:00;False|2024-10-30T17:08:57.6500450+08:00;True|2024-10-29T16:58:15.6006676+08:00;True|2024-10-29T16:51:56.8406649+08:00;True|2024-10-29T16:05:48.4297695+08:00;True|2024-10-29T15:12:15.1522377+08:00;True|2024-10-29T15:10:51.8431754+08:00;True|2024-10-29T11:21:01.5660940+08:00;False|2024-10-29T11:20:33.3958980+08:00;True|2024-10-28T17:51:26.7156861+08:00;False|2024-10-28T17:50:41.4388196+08:00;True|2024-10-28T13:34:14.8764262+08:00;True|2024-10-28T12:44:27.2083620+08:00;False|2024-10-28T12:43:57.5942717+08:00;True|2024-10-25T11:49:47.9817458+08:00;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>12/26/2024 11:35:21</publishTime>
+ <publishTime>12/30/2024 10:55:01</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/26/2024 11:35:21</publishTime>
+ <publishTime>12/30/2024 10:55:01</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>12/26/2024 11:35:20</publishTime>
+ <publishTime>12/30/2024 10:54:59</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/26/2024 11:35:20</publishTime>
+ <publishTime>12/30/2024 10:54:59</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>12/26/2024 11:35:16</publishTime>
+ <publishTime>12/30/2024 09:31:01</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>12/26/2024 11:35:16</publishTime>
+ <publishTime>12/30/2024 09:31:01</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>12/26/2024 11:35:17</publishTime>
+ <publishTime>12/30/2024 10:54:56</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/26/2024 11:35:17</publishTime>
+ <publishTime>12/30/2024 10:54:56</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/25/2024 09:46:41</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>12/26/2024 11:35:15</publishTime>
+ <publishTime>12/30/2024 09:30:59</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>12/26/2024 11:35:15</publishTime>
+ <publishTime>12/30/2024 09:30:59</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>12/26/2024 11:35:15</publishTime>
+ <publishTime>12/30/2024 09:31:00</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>12/26/2024 11:35:15</publishTime>
+ <publishTime>12/30/2024 09:31:00</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>12/26/2024 11:35:15</publishTime>
+ <publishTime>12/30/2024 09:31:00</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>12/26/2024 11:35:15</publishTime>
+ <publishTime>12/30/2024 09:31:00</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>12/26/2024 11:34:32</publishTime>
+ <publishTime>12/30/2024 09:27:53</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>12/26/2024 11:34:32</publishTime>
+ <publishTime>12/30/2024 09:27:53</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>12/26/2024 11:34:36</publishTime>
+ <publishTime>12/30/2024 09:29:28</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>12/26/2024 11:34:36</publishTime>
+ <publishTime>12/30/2024 09:29:33</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>12/26/2024 11:35:00</publishTime>
+ <publishTime>12/30/2024 10:54:44</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/26/2024 11:35:00</publishTime>
+ <publishTime>12/30/2024 10:54:44</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -492,7 +492,7 @@
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web.config">
- <publishTime>12/20/2024 13:54:08</publishTime>
+ <publishTime>12/30/2024 09:31:22</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index be6507d..09aa3a5 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -2,7 +2,11 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+<<<<<<< HEAD
+ <NameOfLastUsedPublishProfile>E:\鏅轰簯mes\mes\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile9.pubxml</NameOfLastUsedPublishProfile>
+=======
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
+>>>>>>> 7d2677241200a3a1fd110e5d37864571c6d87f67
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WebAPI/bin.rar b/WebAPI/bin.rar
new file mode 100644
index 0000000..59234d1
--- /dev/null
+++ b/WebAPI/bin.rar
Binary files differ
diff --git a/WorkM/bin/Release/BLL.dll b/WorkM/bin/Release/BLL.dll
index b448243..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 3a47154..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 3114d49..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 82e4dfc..e36b13e 100644
--- a/WorkM/bin/Release/DAL.pdb
+++ b/WorkM/bin/Release/DAL.pdb
Binary files differ
diff --git a/WorkM/bin/Release/DBUtility.dll b/WorkM/bin/Release/DBUtility.dll
index 5b73185..e149e84 100644
--- a/WorkM/bin/Release/DBUtility.dll
+++ b/WorkM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/WorkM/bin/Release/DBUtility.pdb b/WorkM/bin/Release/DBUtility.pdb
index 5868f01..27f69f8 100644
--- a/WorkM/bin/Release/DBUtility.pdb
+++ b/WorkM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/WorkM/bin/Release/Model.dll b/WorkM/bin/Release/Model.dll
index d1768cf..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 415de8d..ea9e022 100644
--- a/WorkM/bin/Release/Model.pdb
+++ b/WorkM/bin/Release/Model.pdb
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Class.dll b/WorkM/bin/Release/Pub_Class.dll
index 5a27deb..6ac1eea 100644
--- a/WorkM/bin/Release/Pub_Class.dll
+++ b/WorkM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Class.pdb b/WorkM/bin/Release/Pub_Class.pdb
index 52a6297..9a615cd 100644
--- a/WorkM/bin/Release/Pub_Class.pdb
+++ b/WorkM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Control.dll b/WorkM/bin/Release/Pub_Control.dll
index 244bf7f..944241b 100644
--- a/WorkM/bin/Release/Pub_Control.dll
+++ b/WorkM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Control.pdb b/WorkM/bin/Release/Pub_Control.pdb
index edce0ca..4a1acf9 100644
--- a/WorkM/bin/Release/Pub_Control.pdb
+++ b/WorkM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/WorkM/bin/Release/SQLHelper.dll b/WorkM/bin/Release/SQLHelper.dll
index 6fdd03e..a358039 100644
--- a/WorkM/bin/Release/SQLHelper.dll
+++ b/WorkM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/WorkM/bin/Release/SQLHelper.pdb b/WorkM/bin/Release/SQLHelper.pdb
index 5c090db..04f7af8 100644
--- a/WorkM/bin/Release/SQLHelper.pdb
+++ b/WorkM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/WorkM/bin/Release/WarM.dll b/WorkM/bin/Release/WarM.dll
index 9d378ec..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 29141d2..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 edb22ab..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 bfb4791..62430bd 100644
--- a/WorkM/bin/Release/WorkM.pdb
+++ b/WorkM/bin/Release/WorkM.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
new file mode 100644
index 0000000..b45cbe2
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
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 202a177..73725d3 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,5 +1,35 @@
+<<<<<<< HEAD
+=======
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+>>>>>>> 98fdb31018bde24c16598b98cdd1cf526dc1113f
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+=======
+D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+<<<<<<< HEAD
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+=======
+>>>>>>> 124dd32a34ced09ae87935e953dec6401d86f9ac
+>>>>>>> 7d2677241200a3a1fd110e5d37864571c6d87f67
+>>>>>>> 98fdb31018bde24c16598b98cdd1cf526dc1113f
--
Gitblit v1.9.1