From 3db4bf5d314d3db5e691f6783b7b5d3afdec3263 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 29 十二月 2025 08:58:26 +0800
Subject: [PATCH] 1
---
SyntacticSugar/bin/Release/SyntacticSugar.dll | 0
Model/obj/x86/Release/Model.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs | 8
DAL/基础资料/公用基础资料/ClsGy_Car_Ctl_2.cs | 2
DBUtility/bin/Release/Pub_Class.dll | 0
SyntacticSugar/bin/Release/SyntacticSugar.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/MateOutController.cs | 383 ++
Model/bin/Release/Pub_Control.pdb | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb | 0
Model/bin/Release/Pub_Class.pdb | 0
WebAPI/Models/ClsGy_Material_Model.cs | 6
sdk_dingding/TopSdk/obj/Release/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.dll | 0
Model/obj/Release/Model.pdb | 0
BLL/bin/Release/BLL.pdb | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt | 2
WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml | 16
Model/bin/Release/Pub_Control.dll | 0
Pub_Control/bin/Release/Pub_Class.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user | 510 ++
WebAPI/Controllers/条码管理/MouldController.cs | 57
Model/质检管理/ClsQC_FirstPieceCheckBillSub.cs | 2
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
WebAPI/ListModels.cs | 64
Pub_Control/bin/Release/Pub_Class.dll | 0
WebAPI/WebAPI.csproj | 3
SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache | 0
Model/质检管理/ClsQC_LastPieceCheckBillSub.cs | 2
BLL/bin/Release/Pub_Control.pdb | 0
Pub_Control/bin/Release/Pub_Control.dll | 0
BLL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/SQLHelper.dll | 0
LMES/ClsShowMod.cs | 6
LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache | 0
DAL/质检管理/ClsQC_OutCompCheckBill.cs | 50
Model/bin/Release/DBUtility.pdb | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 3
WebAPI/Controllers/条码管理/WEBSController.cs | 128
Model/Model.csproj | 8
BLL/bin/Release/Pub_Control.dll | 0
WebAPI/Controllers/BaseSet/Gy_PropertyController.cs | 67
DAL/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache | 0
Model/采购管理/ClsCg_OrderTransportBillSub_Money_Model.cs | 29
SQLHelper/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.pdb | 0
Model/bin/Release/DBUtility.dll | 0
WebAPI/Web References/WebS/Reference.cs | 233 +
BLL/bin/Release/DBUtility.dll | 0
DAL/质检管理/ClsQC_ProcessCheckBill.cs | 10
WebAPI/Web.config | 10
BLL/bin/Release/BLL.dll | 0
Pub_Control/bin/Release/Pub_Control.pdb | 0
WebAPI/Controllers/品质管理/首件检验单/QC_FirstPieceCheckBillController.cs | 4
DBUtility/obj/Release/DBUtility.dll | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
Model/obj/Release/Model.dll | 0
Model/质检管理/ClsQC_POStockInCheckBillMain.cs | 2
WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs | 63
BLL/bin/Release/Pub_Class.dll | 0
Model/质检管理/ClsQC_FirstPieceCheckBillMain.cs | 1
DBUtility/业务单据/ClsXt_BaseBill.cs | 4
WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs | 34
DBUtility/bin/Release/SQLHelper.dll | 0
WarM/条码打印/Gy_BarCodeBill_XB_SelectMater.resx | 563 +++
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 246 +
DBUtility/bin/Release/SQLHelper.pdb | 0
Model/bin/Release/Pub_Class.dll | 0
WebAPI/Controllers/基础资料/基础资料/Gy_CarController.cs | 17
BLL/bin/Release/Pub_Class.pdb | 0
Model/质检管理/ClsQC_OutCompCheckBillSub_BadReason.cs | 22
WebAPI/Controllers/GZGL/Gy_SteppedPriceCoefficientController .cs | 55
WebAPI/Controllers/品质管理/工序检验单/QC_ProcessCheckBillController.cs | 3
DAL/质检管理/ClsQC_FirstPieceCheckBill.cs | 13
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 16
BLL/bin/Release/DAL.dll | 0
BLL/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/DBUtility.dll | 0
DAL/bin/Release/Pub_Control.dll | 0
DBUtility/bin/Release/Pub_Control.pdb | 0
SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0
BLL/bin/Release/SQLHelper.dll | 0
DAL/bin/Release/DBUtility.pdb | 0
DAL/计划管理/ClsGy_RoutingBill.cs | 82
DAL/bin/Release/Model.dll | 0
WarM/条码打印/Gy_BarCodeBill_XB_SelectMater.cs | 2215 ++++++++++++
WebAPI/Properties/PublishProfiles/YsjPath.pubxml.user | 301
Model/物流管理/ClsCg_CarTrajectoryBillSub.cs | 36
WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user | 49
SyntacticSugar/obj/Debug/SyntacticSugar.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
WebAPI/Controllers/QC_POStockInCheckBillController.cs | 102
BLL/bin/Release/Model.dll | 0
BLL/bin/Release/DAL.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml | 2
BLL/bin/Release/Model.pdb | 0
DAL/bin/Release/DAL.dll | 0
SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0
Model/质检管理/ClsQC_OutCompCheckBillSub.cs | 2
DAL/bin/Release/Model.pdb | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
Pub_Class/bin/Release/SyntacticSugar.pdb | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
DBUtility/bin/Release/DBUtility.pdb | 0
Model/采购管理/ClsCg_OrderTransportBill_Model.cs | 60
DBUtility/bin/Release/DBUtility.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
Pub_Class/bin/Release/SyntacticSugar.dll | 0
Model/采购管理/ClsCg_OrderTransportBillSub_Model.cs | 29
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 54
WebAPI/Controllers/WebAPIController.cs | 90
WarM/条码打印/Gy_BarCodeBill_Rework.cs | 12
WebAPI/Controllers/WLGL/Cg_CarTrajectoryBillController.cs | 949 +++++
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache | 0
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/仓存管理/调拨盘点/Kf_MoveStockRequestBillController.cs | 62
WebAPI/Controllers/仓存管理/领料发货/Kf_StockOutRequestBillController.cs | 63
WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | 5
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 27
SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0
WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs | 99
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
DAL/DAL.csproj | 3
WarM/条码打印/Gy_BarCodeBill_XB_SelectMater.designer.cs | 1016 +++++
DAL/质检管理/ClsQC_POStockInCheckBill.cs | 50
Pub_Class/bin/Release/Pub_Class.pdb | 0
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 174
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 264
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 47
SyntacticSugar/obj/Release/SyntacticSugar.dll | 0
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 49
PayM/obj/Release/PayM.csproj.ResolveComReference.cache | 0
SQLHelper/bin/Release/Pub_Class.pdb | 0
Pub_Class/bin/Release/Pub_Class.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.pdb | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
Model/质检管理/ClsQC_LastPieceCheckBillSub_BadReason.cs | 22
SQLHelper/bin/Release/Pub_Class.dll | 0
WebAPI/Controllers/CGGL/Cg_OrderTransportBillListController.cs | 926 +++++
DAL/质检管理/ClsQC_LastPieceCheckBill.cs | 52
DAL/bin/Release/Pub_Class.pdb | 0
Model/物流管理/ClsCg_CarTrajectoryBillMain.cs | 72
WarM/WarM.csproj | 9
NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache | 0
DAL/采购管理/ClsCg_OrderTransportBill_Ctl.cs | 146
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 11
Model/bin/Release/Model.pdb | 0
WebAPI/InvokeHelper.cs | 18
DAL/bin/Release/Pub_Class.dll | 0
Model/质检管理/ClsQC_LastPieceCheckBillMain.cs | 2
Model/质检管理/ClsQC_ProcessCheckBillSub.cs | 1
/dev/null | 0
Model/bin/Release/Model.dll | 0
DBUtility/bin/Release/Pub_Class.pdb | 0
Model/质检管理/ClsQC_POStockInCheckBillSub.cs | 1
Model/bin/Release/SQLHelper.dll | 0
Model/质检管理/ClsQC_POStockInCheckBillSub_BadReason.cs | 22
WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user | 58
DAL/WLGL/ClsCg_CarTrajectoryBill.cs | 684 +++
WebAPI/DLL/ClsGy_Material_Ctl.cs | 4
167 files changed, 9,972 insertions(+), 540 deletions(-)
diff --git a/APSM/bin/Release/APSM.dll b/APSM/bin/Release/APSM.dll
deleted file mode 100644
index 79181c9..0000000
--- a/APSM/bin/Release/APSM.dll
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/APSM.pdb b/APSM/bin/Release/APSM.pdb
deleted file mode 100644
index 4236bf5..0000000
--- a/APSM/bin/Release/APSM.pdb
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/BLL.dll b/APSM/bin/Release/BLL.dll
deleted file mode 100644
index 764bda7..0000000
--- a/APSM/bin/Release/BLL.dll
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/BLL.pdb b/APSM/bin/Release/BLL.pdb
deleted file mode 100644
index 0f10a0b..0000000
--- a/APSM/bin/Release/BLL.pdb
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/BaseSet.dll b/APSM/bin/Release/BaseSet.dll
deleted file mode 100644
index e053d46..0000000
--- a/APSM/bin/Release/BaseSet.dll
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/BaseSet.pdb b/APSM/bin/Release/BaseSet.pdb
deleted file mode 100644
index 252331b..0000000
--- a/APSM/bin/Release/BaseSet.pdb
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/DAL.dll b/APSM/bin/Release/DAL.dll
deleted file mode 100644
index 28a23d7..0000000
--- a/APSM/bin/Release/DAL.dll
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/DAL.pdb b/APSM/bin/Release/DAL.pdb
deleted file mode 100644
index 204e059..0000000
--- a/APSM/bin/Release/DAL.pdb
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/DBUtility.dll b/APSM/bin/Release/DBUtility.dll
deleted file mode 100644
index 85cd0a6..0000000
--- a/APSM/bin/Release/DBUtility.dll
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/DBUtility.pdb b/APSM/bin/Release/DBUtility.pdb
deleted file mode 100644
index a7e69cc..0000000
--- a/APSM/bin/Release/DBUtility.pdb
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/Model.dll b/APSM/bin/Release/Model.dll
deleted file mode 100644
index fbcf68d..0000000
--- a/APSM/bin/Release/Model.dll
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/Model.pdb b/APSM/bin/Release/Model.pdb
deleted file mode 100644
index 0b2c95c..0000000
--- a/APSM/bin/Release/Model.pdb
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/PlanM.dll b/APSM/bin/Release/PlanM.dll
deleted file mode 100644
index e0ef258..0000000
--- a/APSM/bin/Release/PlanM.dll
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/PlanM.pdb b/APSM/bin/Release/PlanM.pdb
deleted file mode 100644
index 0d5e494..0000000
--- a/APSM/bin/Release/PlanM.pdb
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/Pub_Class.dll b/APSM/bin/Release/Pub_Class.dll
deleted file mode 100644
index 9345109..0000000
--- a/APSM/bin/Release/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/Pub_Class.pdb b/APSM/bin/Release/Pub_Class.pdb
deleted file mode 100644
index 00d3533..0000000
--- a/APSM/bin/Release/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/Pub_Control.dll b/APSM/bin/Release/Pub_Control.dll
deleted file mode 100644
index 267256b..0000000
--- a/APSM/bin/Release/Pub_Control.dll
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/Pub_Control.pdb b/APSM/bin/Release/Pub_Control.pdb
deleted file mode 100644
index c77ec5c..0000000
--- a/APSM/bin/Release/Pub_Control.pdb
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/SQLHelper.dll b/APSM/bin/Release/SQLHelper.dll
deleted file mode 100644
index f29342c..0000000
--- a/APSM/bin/Release/SQLHelper.dll
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/SQLHelper.pdb b/APSM/bin/Release/SQLHelper.pdb
deleted file mode 100644
index a15cdb7..0000000
--- a/APSM/bin/Release/SQLHelper.pdb
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/WarM.dll b/APSM/bin/Release/WarM.dll
deleted file mode 100644
index ea41e3a..0000000
--- a/APSM/bin/Release/WarM.dll
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/WarM.pdb b/APSM/bin/Release/WarM.pdb
deleted file mode 100644
index 7611ce1..0000000
--- a/APSM/bin/Release/WarM.pdb
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/WorkM.dll b/APSM/bin/Release/WorkM.dll
deleted file mode 100644
index e6e952a..0000000
--- a/APSM/bin/Release/WorkM.dll
+++ /dev/null
Binary files differ
diff --git a/APSM/bin/Release/WorkM.pdb b/APSM/bin/Release/WorkM.pdb
deleted file mode 100644
index 0b4a6ae..0000000
--- a/APSM/bin/Release/WorkM.pdb
+++ /dev/null
Binary files differ
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index 379a637..93504d2 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 eb4898b..685a2dc 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 c0e8971..4d0c641 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 0c0f430..449cf56 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 166551e..2c655a5 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 c83301d..6130b22 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 56f8a2e..daafbe9 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 fcbe898..5695453 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 638a1a3..ce919d2 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 895e592..8d25596 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 347ba36..e0a4452 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 0adc8ce..76fd762 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 306da35..af26920 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 76eae00..847ae93 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
deleted file mode 100644
index 764bda7..0000000
--- a/BaseSet/bin/Release/BLL.dll
+++ /dev/null
Binary files differ
diff --git a/BaseSet/bin/Release/BLL.pdb b/BaseSet/bin/Release/BLL.pdb
deleted file mode 100644
index 0f10a0b..0000000
--- a/BaseSet/bin/Release/BLL.pdb
+++ /dev/null
Binary files differ
diff --git a/BaseSet/bin/Release/BaseSet.dll b/BaseSet/bin/Release/BaseSet.dll
deleted file mode 100644
index e053d46..0000000
--- a/BaseSet/bin/Release/BaseSet.dll
+++ /dev/null
Binary files differ
diff --git a/BaseSet/bin/Release/BaseSet.pdb b/BaseSet/bin/Release/BaseSet.pdb
deleted file mode 100644
index 252331b..0000000
--- a/BaseSet/bin/Release/BaseSet.pdb
+++ /dev/null
Binary files differ
diff --git a/BaseSet/bin/Release/DAL.dll b/BaseSet/bin/Release/DAL.dll
deleted file mode 100644
index 28a23d7..0000000
--- a/BaseSet/bin/Release/DAL.dll
+++ /dev/null
Binary files differ
diff --git a/BaseSet/bin/Release/DAL.pdb b/BaseSet/bin/Release/DAL.pdb
deleted file mode 100644
index 204e059..0000000
--- a/BaseSet/bin/Release/DAL.pdb
+++ /dev/null
Binary files differ
diff --git a/BaseSet/bin/Release/DBUtility.dll b/BaseSet/bin/Release/DBUtility.dll
deleted file mode 100644
index 85cd0a6..0000000
--- a/BaseSet/bin/Release/DBUtility.dll
+++ /dev/null
Binary files differ
diff --git a/BaseSet/bin/Release/DBUtility.pdb b/BaseSet/bin/Release/DBUtility.pdb
deleted file mode 100644
index a7e69cc..0000000
--- a/BaseSet/bin/Release/DBUtility.pdb
+++ /dev/null
Binary files differ
diff --git a/BaseSet/bin/Release/Model.dll b/BaseSet/bin/Release/Model.dll
deleted file mode 100644
index fbcf68d..0000000
--- a/BaseSet/bin/Release/Model.dll
+++ /dev/null
Binary files differ
diff --git a/BaseSet/bin/Release/Model.pdb b/BaseSet/bin/Release/Model.pdb
deleted file mode 100644
index 0b2c95c..0000000
--- a/BaseSet/bin/Release/Model.pdb
+++ /dev/null
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Class.dll b/BaseSet/bin/Release/Pub_Class.dll
deleted file mode 100644
index 9345109..0000000
--- a/BaseSet/bin/Release/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Class.pdb b/BaseSet/bin/Release/Pub_Class.pdb
deleted file mode 100644
index 00d3533..0000000
--- a/BaseSet/bin/Release/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Control.dll b/BaseSet/bin/Release/Pub_Control.dll
deleted file mode 100644
index 267256b..0000000
--- a/BaseSet/bin/Release/Pub_Control.dll
+++ /dev/null
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Control.pdb b/BaseSet/bin/Release/Pub_Control.pdb
deleted file mode 100644
index c77ec5c..0000000
--- a/BaseSet/bin/Release/Pub_Control.pdb
+++ /dev/null
Binary files differ
diff --git a/BaseSet/bin/Release/SQLHelper.dll b/BaseSet/bin/Release/SQLHelper.dll
deleted file mode 100644
index f29342c..0000000
--- a/BaseSet/bin/Release/SQLHelper.dll
+++ /dev/null
Binary files differ
diff --git a/BaseSet/bin/Release/SQLHelper.pdb b/BaseSet/bin/Release/SQLHelper.pdb
deleted file mode 100644
index a15cdb7..0000000
--- a/BaseSet/bin/Release/SQLHelper.pdb
+++ /dev/null
Binary files differ
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 9b496d0..ec5e9b6 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -82,6 +82,7 @@
<Compile Include="APS\ClsSc_ICMOChangeBill.cs" />
<Compile Include="ClsGy_MaterialPackingRelation.cs" />
<Compile Include="MES\ClsSc_MESStopRestoreWorkBill.cs" />
+ <Compile Include="WLGL\ClsCg_CarTrajectoryBill.cs" />
<Compile Include="浠撳簱绠＄悊\灏忚溅閿佸畾\ClsKf_TrolleyPositionBill.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Driver_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_Car_Ctl_2.cs" />
@@ -746,6 +747,7 @@
<Compile Include="閲囪喘绠＄悊\ClsCg_InvoiceSpecBill.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="閲囪喘绠＄悊\ClsCg_OrderTransportBill_Ctl.cs" />
<Compile Include="閲囪喘绠＄悊\ClsCg_POInStockBackBill.cs">
<SubType>Code</SubType>
</Compile>
@@ -1296,6 +1298,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="A3鍗曟嵁\" />
+ <Folder Include="Model\" />
<Folder Include="鍩虹璧勬枡\A3鍩虹璧勬枡\" />
<Folder Include="鍩虹璧勬枡\CLOUD鍩虹璧勬枡\" />
<Folder Include="鍩虹璧勬枡\鐗规畩绯荤粺\" />
diff --git a/DAL/WLGL/ClsCg_CarTrajectoryBill.cs b/DAL/WLGL/ClsCg_CarTrajectoryBill.cs
new file mode 100644
index 0000000..8f99a85
--- /dev/null
+++ b/DAL/WLGL/ClsCg_CarTrajectoryBill.cs
@@ -0,0 +1,684 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsCg_CarTrajectoryBill : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsCg_CarTrajectoryBillMain omodel = new Model.ClsCg_CarTrajectoryBillMain();
+ public List<Model.ClsCg_CarTrajectoryBillSub> DetailColl = new List<Model.ClsCg_CarTrajectoryBillSub>();
+
+ public ClsCg_CarTrajectoryBill()
+ {
+ base.MvarItemKeySub = "Cg_CarTrajectoryBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "Cg_CarTrajectoryBillMain";
+ base.MvarReportTitle = "杞﹁締杞ㄨ抗鍗曟嵁";
+ base.BillType = "1119";
+ base.HBillSubType = "1119";
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsCg_CarTrajectoryBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion
+
+ #region 鑷畾涔夋柟娉�
+
+ // 淇敼鍗曟嵁
+
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+
+ // 淇濆瓨鍓嶆帶鍒� - 涓庢柊澧炰繚鎸佷竴鑷�
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("EXEC h_p_Cg_CarTrajectoryBill_BeforeSaveCtrl " +
+ omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',2 ",
+ "h_p_Cg_CarTrajectoryBill_BeforeSaveCtrl");
+
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+
+ // 鏇存柊涓昏〃
+ string updateSql = "UPDATE Cg_CarTrajectoryBillMain SET " +
+ "HBillNo = '" + omodel.HBillNo + "', " +
+ "HDate = '" + omodel.HDate.ToString() + "', " +
+ "HYear = " + omodel.HYear.ToString() + ", " +
+ "HPeriod = " + omodel.HPeriod.ToString() + ", " +
+ "HRemark = '" + omodel.HRemark + "', " +
+ "HUpDater = '" + DBUtility.ClsPub.CurUserName + "', " +
+ "HUpDateDate = GETDATE(), " +
+ // 鑷畾涔夊瓧娈�
+ "HContractTransportBillMainID = " + (omodel.HContractTransportBillMainID.HasValue ? omodel.HContractTransportBillMainID.ToString() : "NULL") + ", " +
+ "HContractTransportBillNo = '" + (omodel.HContractTransportBillNo ?? "") + "', " +
+ "HCarNumber = '" + omodel.HCarNumber + "', " +
+ "HGetTime = '" + omodel.HGetTime.ToString() + "', " +
+ "HLongitude = " + (omodel.HLongitude.HasValue ? omodel.HLongitude.ToString() : "NULL") + ", " +
+ "HLatitude = " + (omodel.HLatitude.HasValue ? omodel.HLatitude.ToString() : "NULL") + " " +
+ "WHERE HInterID = " + lngBillKey.ToString();
+
+ // 璋冭瘯杈撳嚭
+ LogToFile("鎵ц鏇存柊SQL: " + updateSql);
+
+ oCn.RunProc(updateSql);
+
+ // 鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+
+ // 鍒犻櫎瀛愯〃
+ DeleteBillSub(omodel.HInterID);
+
+ // 鎻掑叆瀛愯〃鏁版嵁
+ foreach (Model.ClsCg_CarTrajectoryBillSub oSub in DetailColl)
+ {
+ string insertSubSql = "INSERT INTO Cg_CarTrajectoryBillSub " +
+ "(HInterID, HBillNo_bak, HEntryID, HCloseMan, HEntryCloseDate, HCloseType, HRemark, " +
+ "HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HRelationQty, HRelationMoney) " +
+ "VALUES (" +
+ omodel.HInterID.ToString() + ", '" +
+ omodel.HBillNo + "', " +
+ oSub.HEntryID.ToString() + ", '" +
+ oSub.HCloseMan + "', '" +
+ oSub.HEntryCloseDate.ToString("yyyy-MM-dd") + "', " +
+ Convert.ToInt32(oSub.HCloseType) + ", '" +
+ oSub.HRemark + "', " +
+ oSub.HSourceInterID.ToString() + ", " +
+ oSub.HSourceEntryID.ToString() + ", '" +
+ oSub.HSourceBillNo + "', '" +
+ oSub.HSourceBillType + "', " +
+ oSub.HRelationQty.ToString() + ", " +
+ oSub.HRelationMoney.ToString() + ")";
+
+ oCn.RunProc(insertSubSql);
+ }
+
+
+ DataSet ds2 = oCn.RunProcReturn("EXEC h_p_Cg_CarTrajectoryBill_AfterSaveCtrl " +
+ omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',2 ",
+ "h_p_Cg_CarTrajectoryBill_AfterSaveCtrl");
+
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ // 璁板綍璇︾粏鐨勯敊璇俊鎭�
+ string errorDetails = $"缂栬緫鍗曟嵁澶辫触锛丠InterID: {omodel.HInterID}, HBillNo: {omodel.HBillNo}\n" +
+ $"閿欒淇℃伅: {e.Message}\n" +
+ $"鍫嗘爤璺熻釜: {e.StackTrace}";
+
+ LogToFile(errorDetails);
+ System.Diagnostics.Debug.WriteLine(errorDetails);
+
+ sReturn = "缂栬緫鍗曟嵁澶辫触锛�" + e.Message;
+ oCn.RollBack();
+ throw;
+ }
+ }
+
+ // 娣诲姞鏃ュ織鏂规硶
+ private void LogToFile(string message)
+ {
+ string logPath = @"D:\Logs\MES-SQL.log";
+ try
+ {
+ if (!System.IO.Directory.Exists(@"D:\Logs"))
+ System.IO.Directory.CreateDirectory(@"D:\Logs");
+
+ System.IO.File.AppendAllText(logPath, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " - " + message + Environment.NewLine);
+ }
+ catch { }
+ }
+ // 鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+
+ // 鑾峰彇鏂扮殑HInterID
+ if (omodel.HInterID == 0)
+ {
+ sReturn = "123";
+ return false;
+ }
+
+ // 淇濆瓨鍓嶆帶鍒�
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("EXEC h_p_Cg_CarTrajectoryBill_BeforeSaveCtrl " +
+ omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ",
+ "h_p_Cg_CarTrajectoryBill_BeforeSaveCtrl");
+
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+
+ // 鎻掑叆涓昏〃
+ string insertMainSql = "INSERT INTO Cg_CarTrajectoryBillMain " +
+ "(HYear, HPeriod, HBillType, HBillSubType, HInterID, HDate, HBillNo, HBillStatus, " +
+ "HCheckItemNowID, HCheckItemNextID, HCheckFlowID, HRemark, HBacker, HBackDate, HBackRemark, " +
+ "HChecker, HCheckDate, HMaker, HMakeDate, HUpDater, HUpDateDate, HCloseMan, HCloseDate, " +
+ "HCloseType, HDeleteMan, HDeleteDate, HMainSourceBillType, HMainSourceInterID, " +
+ "HMainSourceEntryID, HMainSourceBillNo, HPrintQty, HContractTransportBillMainID, " +
+ "HContractTransportBillNo, HCarNumber, HGetTime, HLongitude, HLatitude) " +
+ "VALUES (" +
+ omodel.HYear.ToString() + ", " +
+ omodel.HPeriod.ToString() + ", '" +
+ this.BillType + "', '" +
+ this.HBillSubType + "', " +
+ omodel.HInterID.ToString() + ", '" +
+ omodel.HDate.ToString() + "', '" +
+ omodel.HBillNo + "', " +
+ omodel.HBillStatus.ToString() + ", " +
+ omodel.HCheckItemNowID.ToString() + ", " +
+ omodel.HCheckItemNextID.ToString() + ", " +
+ omodel.HCheckFlowID.ToString() + ", '" +
+ omodel.HRemark + "', '" +
+ omodel.HBacker + "', " +
+ (omodel.HBackDate.HasValue ? "'" + omodel.HBackDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + "'" : "NULL") + ", '" +
+ omodel.HBackRemark + "', '" +
+ omodel.HChecker + "', " +
+ (omodel.HCheckDate.HasValue ? "'" + omodel.HCheckDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + "'" : "NULL") + ", '" +
+ omodel.HMaker + "', '" +
+ omodel.HMakeDate.ToString() + "', '" +
+ omodel.HUpDater + "', " +
+ (omodel.HUpDateDate.HasValue ? "'" + omodel.HUpDateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + "'" : "NULL") + ", '" +
+ omodel.HCloseMan + "', " +
+ (omodel.HCloseDate.HasValue ? "'" + omodel.HCloseDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + "'" : "NULL") + ", " +
+ Convert.ToInt32(omodel.HCloseType) + ", '" +
+ omodel.HDeleteMan + "', " +
+ (omodel.HDeleteDate.HasValue ? "'" + omodel.HDeleteDate.Value.ToString("yyyy-MM-dd HH:mm:ss") + "'" : "NULL") + ", '" +
+ omodel.HMainSourceBillType + "', " +
+ (omodel.HMainSourceInterID.HasValue ? omodel.HMainSourceInterID.ToString() : "NULL") + ", " +
+ (omodel.HMainSourceEntryID.HasValue ? omodel.HMainSourceEntryID.ToString() : "NULL") + ", '" +
+ omodel.HMainSourceBillNo + "', " +
+ omodel.HPrintQty.ToString() + ", " +
+ (omodel.HContractTransportBillMainID.HasValue ? omodel.HContractTransportBillMainID.ToString() : "NULL") + ", '" +
+ omodel.HContractTransportBillNo + "', '" +
+ omodel.HCarNumber + "', '" +
+ omodel.HGetTime.ToString() + "', " +
+ (omodel.HLongitude.HasValue ? omodel.HLongitude.ToString() : "NULL") + ", " +
+ (omodel.HLatitude.HasValue ? omodel.HLatitude.ToString() : "NULL") + ")";
+
+
+ oCn.RunProc(insertMainSql);
+
+ // 鑾峰彇鑷姩鐢熸垚鐨凥InterID
+ //DataSet dsMainID = oCn.RunProcReturn("SELECT SCOPE_IDENTITY() AS HInterID", "GetMainID");
+ //if (dsMainID != null && dsMainID.Tables[0].Rows.Count > 0)
+ //{
+ // omodel.HInterID = Convert.ToInt32(dsMainID.Tables[0].Rows[0]["HInterID"]);
+ //}
+
+
+ // 鎻掑叆瀛愯〃鏁版嵁
+ foreach (Model.ClsCg_CarTrajectoryBillSub oSub in DetailColl)
+ {
+ string insertSubSql = "INSERT INTO Cg_CarTrajectoryBillSub " +
+ "(HInterID, HBillNo_bak, HEntryID, HCloseMan, HEntryCloseDate, HCloseType, HRemark, " +
+ "HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType, HRelationQty, HRelationMoney) " +
+ "VALUES (" +
+ omodel.HInterID.ToString() + ", '" +
+ omodel.HBillNo + "', " +
+ oSub.HEntryID.ToString() + ", '" +
+ oSub.HCloseMan + "', '" +
+ oSub.HEntryCloseDate.ToString("yyyy-MM-dd") + "', " +
+ Convert.ToInt32(oSub.HCloseType) + ", '" +
+ oSub.HRemark + "', " +
+ oSub.HSourceInterID.ToString() + ", " +
+ oSub.HSourceEntryID.ToString() + ", '" +
+ oSub.HSourceBillNo + "', '" +
+ oSub.HSourceBillType + "', " +
+ oSub.HRelationQty.ToString() + ", " +
+ oSub.HRelationMoney.ToString() + ")";
+
+ oCn.RunProc(insertSubSql);
+ }
+
+ // 淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("EXEC h_p_Cg_CarTrajectoryBill_AfterSaveCtrl " +
+ omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ",
+ "h_p_Cg_CarTrajectoryBill_AfterSaveCtrl");
+
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+
+ // 鏄剧ず鍗曟嵁
+
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ // 鏌ヨ涓昏〃
+ DataSet Ds = oCn.RunProcReturn("SELECT * FROM Cg_CarTrajectoryBillMain WHERE HInterID = " + lngBillKey.ToString(),
+ "Cg_CarTrajectoryBillMain");
+
+ if (Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+
+ DataRow row = Ds.Tables[0].Rows[0];
+
+ // 鍩烘湰瀛楁 - 浣跨敤瀹夊叏杞崲
+ omodel.HYear = SafeConvertToInt(row["HYear"]);
+ omodel.HPeriod = SafeConvertToInt(row["HPeriod"]);
+ omodel.HBillType = SafeConvertToString(row["HBillType"]);
+ omodel.HBillSubType = SafeConvertToString(row["HBillSubType"]);
+ omodel.HInterID = SafeConvertToInt(row["HInterID"]);
+ omodel.HDate = SafeConvertToDateTime(row["HDate"], DateTime.Now);
+ omodel.HBillNo = SafeConvertToString(row["HBillNo"]);
+ omodel.HBillStatus = SafeConvertToInt(row["HBillStatus"]);
+ omodel.HCheckItemNowID = SafeConvertToInt(row["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = SafeConvertToInt(row["HCheckItemNextID"]);
+ omodel.HCheckFlowID = SafeConvertToInt(row["HCheckFlowID"]);
+ omodel.HRemark = SafeConvertToString(row["HRemark"]);
+
+ // 鍙┖鏃ユ湡瀛楁
+ omodel.HBackDate = SafeConvertToNullableDateTime(row["HBackDate"]);
+ omodel.HBacker = SafeConvertToString(row["HBacker"]);
+ omodel.HBackRemark = SafeConvertToString(row["HBackRemark"]);
+ omodel.HCheckDate = SafeConvertToNullableDateTime(row["HCheckDate"]);
+ omodel.HChecker = SafeConvertToString(row["HChecker"]);
+ omodel.HMaker = SafeConvertToString(row["HMaker"]);
+ omodel.HMakeDate = SafeConvertToDateTime(row["HMakeDate"], DateTime.Now);
+ omodel.HUpDateDate = SafeConvertToNullableDateTime(row["HUpDateDate"]);
+ omodel.HUpDater = SafeConvertToString(row["HUpDater"]);
+ omodel.HCloseDate = SafeConvertToNullableDateTime(row["HCloseDate"]);
+ omodel.HCloseMan = SafeConvertToString(row["HCloseMan"]);
+ omodel.HCloseType = SafeConvertToBool(row["HCloseType"]);
+ omodel.HDeleteDate = SafeConvertToNullableDateTime(row["HDeleteDate"]);
+ omodel.HDeleteMan = SafeConvertToString(row["HDeleteMan"]);
+
+ // 婧愬崟淇℃伅
+ omodel.HMainSourceBillType = SafeConvertToString(row["HMainSourceBillType"]);
+ omodel.HMainSourceInterID = row["HMainSourceInterID"] == DBNull.Value ? (int?)null : SafeConvertToInt(row["HMainSourceInterID"]);
+ omodel.HMainSourceEntryID = row["HMainSourceEntryID"] == DBNull.Value ? (int?)null : SafeConvertToInt(row["HMainSourceEntryID"]);
+ omodel.HMainSourceBillNo = SafeConvertToString(row["HMainSourceBillNo"]);
+ omodel.HPrintQty = SafeConvertToInt(row["HPrintQty"]);
+
+ // 鑷畾涔夊瓧娈�
+ omodel.HContractTransportBillMainID = row["HContractTransportBillMainID"] == DBNull.Value ? (int?)null : SafeConvertToInt(row["HContractTransportBillMainID"]);
+ omodel.HContractTransportBillNo = SafeConvertToString(row["HContractTransportBillNo"]);
+ omodel.HCarNumber = SafeConvertToString(row["HCarNumber"]);
+ omodel.HGetTime = SafeConvertToDateTime(row["HGetTime"], DateTime.Now);
+
+ // 缁忕含搴﹀瓧娈�
+ omodel.HLongitude = row["HLongitude"] == DBNull.Value ? (decimal?)null : SafeConvertToDecimal(row["HLongitude"]);
+ omodel.HLatitude = row["HLatitude"] == DBNull.Value ? (decimal?)null : SafeConvertToDecimal(row["HLatitude"]);
+
+ omodel.HItemMainID = SafeConvertToInt(row["HItemMainID"]);
+
+ // 鏌ヨ瀛愯〃
+ DataSet DsSub = oCn.RunProcReturn("SELECT * FROM Cg_CarTrajectoryBillSub WHERE HInterID = " +
+ omodel.HInterID.ToString() + " ORDER BY HEntryID", "Cg_CarTrajectoryBillSub");
+
+ DetailColl.Clear();
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsCg_CarTrajectoryBillSub oSub = new Model.ClsCg_CarTrajectoryBillSub();
+ DataRow subRow = DsSub.Tables[0].Rows[i];
+
+ // 浣跨敤瀹夊叏杞崲
+ oSub.HInterID = SafeConvertToInt(subRow["HInterID"]);
+ oSub.HBillNo_bak = SafeConvertToString(subRow["HBillNo_bak"]);
+ oSub.HEntryID = SafeConvertToInt(subRow["HEntryID"]);
+ oSub.HCloseMan = SafeConvertToString(subRow["HCloseMan"]);
+ oSub.HEntryCloseDate = SafeConvertToDateTime(subRow["HEntryCloseDate"], DateTime.Now); // 绗�404琛屼慨澶�
+ oSub.HCloseType = SafeConvertToBool(subRow["HCloseType"]);
+ oSub.HRemark = SafeConvertToString(subRow["HRemark"]);
+ oSub.HSourceInterID = SafeConvertToInt(subRow["HSourceInterID"]);
+ oSub.HSourceEntryID = SafeConvertToInt(subRow["HSourceEntryID"]);
+ oSub.HSourceBillNo = SafeConvertToString(subRow["HSourceBillNo"]);
+ oSub.HSourceBillType = SafeConvertToString(subRow["HSourceBillType"]);
+ oSub.HRelationQty = SafeConvertToDecimal(subRow["HRelationQty"]);
+ oSub.HRelationMoney = SafeConvertToDecimal(subRow["HRelationMoney"]);
+ oSub.HItemSubID = SafeConvertToInt(subRow["HItemSubID"]);
+
+ DetailColl.Add(oSub);
+ }
+
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = $"鏄剧ず鍗曟嵁澶辫触锛佸崟鎹甀D: {lngBillKey}锛岄敊璇�: {e.Message}";
+ throw;
+ }
+ }
+
+
+ // 瀹夊叏杞崲杈呭姪鏂规硶 - 娣诲姞鍒� ClsCg_CarTrajectoryBill 绫讳腑
+
+ #region 瀹夊叏杞崲鏂规硶
+
+ /// <summary>
+ /// 瀹夊叏杞崲涓烘暣鏁�
+ /// </summary>
+ /// <param name="value">鏁版嵁搴撳��</param>
+ /// <returns>杞崲鍚庣殑鏁存暟锛岃浆鎹㈠け璐ヨ繑鍥�0</returns>
+ private int SafeConvertToInt(object value)
+ {
+ if (value == null || value == DBNull.Value)
+ return 0;
+
+ try
+ {
+ return Convert.ToInt32(value);
+ }
+ catch
+ {
+ // 濡傛灉杞崲澶辫触锛屽皾璇曞瓧绗︿覆瑙ｆ瀽
+ int result;
+ if (int.TryParse(value.ToString(), out result))
+ return result;
+
+ return 0; // 榛樿鍊�
+ }
+ }
+
+ /// <summary>
+ /// 瀹夊叏杞崲涓哄彲绌烘暣鏁�
+ /// </summary>
+ /// <param name="value">鏁版嵁搴撳��</param>
+ /// <returns>杞崲鍚庣殑鍙┖鏁存暟锛岃浆鎹㈠け璐ヨ繑鍥瀗ull</returns>
+ private int? SafeConvertToNullableInt(object value)
+ {
+ if (value == null || value == DBNull.Value)
+ return null;
+
+ try
+ {
+ return Convert.ToInt32(value);
+ }
+ catch
+ {
+ int result;
+ if (int.TryParse(value.ToString(), out result))
+ return result;
+
+ return null; // 杞崲澶辫触杩斿洖null
+ }
+ }
+
+ /// <summary>
+ /// 瀹夊叏杞崲涓哄瓧绗︿覆
+ /// </summary>
+ /// <param name="value">鏁版嵁搴撳��</param>
+ /// <returns>杞崲鍚庣殑瀛楃涓诧紝杞崲澶辫触杩斿洖绌哄瓧绗︿覆</returns>
+ private string SafeConvertToString(object value)
+ {
+ if (value == null || value == DBNull.Value)
+ return string.Empty;
+
+ try
+ {
+ return value.ToString().Trim();
+ }
+ catch
+ {
+ return string.Empty;
+ }
+ }
+
+ /// <summary>
+ /// 瀹夊叏杞崲涓哄彲绌烘棩鏈熸椂闂�
+ /// </summary>
+ /// <param name="value">鏁版嵁搴撳��</param>
+ /// <returns>杞崲鍚庣殑鍙┖鏃ユ湡鏃堕棿锛岃浆鎹㈠け璐ヨ繑鍥瀗ull</returns>
+ private DateTime? SafeConvertToNullableDateTime(object value)
+ {
+ if (value == null || value == DBNull.Value)
+ return null;
+
+ try
+ {
+ return Convert.ToDateTime(value);
+ }
+ catch
+ {
+ // 灏濊瘯瀛楃涓茶В鏋�
+ DateTime result;
+ if (DateTime.TryParse(value.ToString(), out result))
+ return result;
+
+ return null; // 鎵�鏈夊皾璇曢兘澶辫触
+ }
+ }
+
+ /// <summary>
+ /// 瀹夊叏杞崲涓烘棩鏈熸椂闂�
+ /// </summary>
+ /// <param name="value">鏁版嵁搴撳��</param>
+ /// <param name="defaultValue">榛樿鍊�</param>
+ /// <returns>杞崲鍚庣殑鏃ユ湡鏃堕棿锛岃浆鎹㈠け璐ヨ繑鍥為粯璁ゅ��</returns>
+ private DateTime SafeConvertToDateTime(object value, DateTime defaultValue)
+ {
+ DateTime? result = SafeConvertToNullableDateTime(value);
+ return result ?? defaultValue;
+ }
+
+ /// <summary>
+ /// 瀹夊叏杞崲涓哄皬鏁�
+ /// </summary>
+ /// <param name="value">鏁版嵁搴撳��</param>
+ /// <returns>杞崲鍚庣殑灏忔暟锛岃浆鎹㈠け璐ヨ繑鍥�0</returns>
+ private decimal SafeConvertToDecimal(object value)
+ {
+ if (value == null || value == DBNull.Value)
+ return 0m;
+
+ try
+ {
+ return Convert.ToDecimal(value);
+ }
+ catch
+ {
+ decimal result;
+ if (decimal.TryParse(value.ToString(), out result))
+ return result;
+
+ return 0m; // 榛樿鍊�
+ }
+ }
+
+ /// <summary>
+ /// 瀹夊叏杞崲涓哄彲绌哄皬鏁�
+ /// </summary>
+ /// <param name="value">鏁版嵁搴撳��</param>
+ /// <returns>杞崲鍚庣殑鍙┖灏忔暟锛岃浆鎹㈠け璐ヨ繑鍥瀗ull</returns>
+ private decimal? SafeConvertToNullableDecimal(object value)
+ {
+ if (value == null || value == DBNull.Value)
+ return null;
+
+ try
+ {
+ return Convert.ToDecimal(value);
+ }
+ catch
+ {
+ decimal result;
+ if (decimal.TryParse(value.ToString(), out result))
+ return result;
+
+ return null; // 杞崲澶辫触杩斿洖null
+ }
+ }
+
+ /// <summary>
+ /// 瀹夊叏杞崲涓哄竷灏斿��
+ /// </summary>
+ /// <param name="value">鏁版嵁搴撳��</param>
+ /// <returns>杞崲鍚庣殑甯冨皵鍊硷紝杞崲澶辫触杩斿洖false</returns>
+ private bool SafeConvertToBool(object value)
+ {
+ if (value == null || value == DBNull.Value)
+ return false;
+
+ try
+ {
+ // 澶勭悊鏁版嵁搴� BIT 绫诲瀷
+ if (value is bool)
+ return (bool)value;
+
+ if (value is int)
+ return ((int)value) != 0;
+
+ if (value is string)
+ {
+ string strValue = ((string)value).ToLower().Trim();
+ return strValue == "1" || strValue == "true" || strValue == "t" || strValue == "鏄�";
+ }
+
+ // 鏈�鍚庡皾璇曢�氱敤杞崲
+ return Convert.ToBoolean(value);
+ }
+ catch
+ {
+ return false; // 榛樿鍊�
+ }
+ }
+
+ /// <summary>
+ /// 瀹夊叏杞崲涓哄彲绌哄竷灏斿��
+ /// </summary>
+ /// <param name="value">鏁版嵁搴撳��</param>
+ /// <returns>杞崲鍚庣殑鍙┖甯冨皵鍊硷紝杞崲澶辫触杩斿洖null</returns>
+ private bool? SafeConvertToNullableBool(object value)
+ {
+ if (value == null || value == DBNull.Value)
+ return null;
+
+ try
+ {
+ if (value is bool)
+ return (bool)value;
+
+ if (value is int)
+ {
+ int intValue = (int)value;
+ if (intValue == 0) return false;
+ if (intValue == 1) return true;
+ return null; // 鏃犳晥鐨勫竷灏斿��
+ }
+
+ if (value is string)
+ {
+ string strValue = ((string)value).ToLower().Trim();
+ if (strValue == "0" || strValue == "false" || strValue == "f" || strValue == "鍚�") return false;
+ if (strValue == "1" || strValue == "true" || strValue == "t" || strValue == "鏄�") return true;
+ return null; // 鏃犳晥鐨勫竷灏斿��
+ }
+
+ bool result = Convert.ToBoolean(value);
+ return result;
+ }
+ catch
+ {
+ return null; // 杞崲澶辫触杩斿洖null
+ }
+ }
+
+ #endregion
+ // 鑾峰彇鏂扮殑HInterID
+
+
+ // 鍒ゆ柇鍗曟嵁鍙锋槸鍚﹀瓨鍦�
+ public override bool IsExistBillNo(ref string sReturn, string sBillNo, DBUtility.ClsPub.Enum_BillStatus eBillStatus, Int64 lngMainID)
+ {
+ try
+ {
+ string sql = "SELECT COUNT(*) AS CNT FROM Cg_CarTrajectoryBillMain WHERE HBillNo = '" + sBillNo + "'";
+ if (lngMainID > 0)
+ {
+ sql += " AND HInterID <> " + lngMainID.ToString();
+ }
+
+ DataSet ds = oCn.RunProcReturn(sql, "CheckBillNo");
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ int count = Convert.ToInt32(ds.Tables[0].Rows[0]["CNT"]);
+ return count > 0;
+ }
+ return false;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ return false;
+ }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index c0e8971..4d0c641 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 0c0f430..449cf56 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 166551e..2c655a5 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 c83301d..6130b22 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 56f8a2e..daafbe9 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 fcbe898..5695453 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 638a1a3..ce919d2 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 895e592..8d25596 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 347ba36..e0a4452 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 0adc8ce..76fd762 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 306da35..af26920 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 76eae00..847ae93 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Car_Ctl_2.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Car_Ctl_2.cs"
index 87f3b33..24cdb74 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Car_Ctl_2.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_Car_Ctl_2.cs"
@@ -70,7 +70,7 @@
HCarCardIDPic='{oModel.HCarCardIDPic}',
HCarCheckDate='{oModel.HCarCheckDate}',
HCarTypeID='{oModel.HCarTypeID}',
- HCarPic='{oModel.HCarPric}',
+ HCarPric='{oModel.HCarPric}',
HCompID='{oModel.HCompID}',
HModel='{oModel.HModel}',
HColor='{oModel.HColor}',
diff --git "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs" "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs"
index 4a5baff..e63466e 100644
--- "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs"
+++ "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs"
@@ -421,6 +421,88 @@
}
}
+ //椹冲洖
+ public override bool RejectCheckFlowProgress(Int64 lngBillKey, string HBillNo, string sUser, ref string sReturn)
+ {
+
+ if (isUse(lngBillKey, ref sReturn))
+ {
+ return false;
+ }
+ try
+ {
+ //寮�鍚簨鍔�
+ oCn.BeginTran();
+
+ //鍒ゆ柇鏄惁瀛樺湪瀹℃牳杩囩殑椤圭洰
+ //string sql0 = "select * from Xt_BillCheckFlowStatus where HBillInterID = " + lngBillKey + " and HBillTypeID = '" + this.BillType + "' and ISNULL(HChecker,'') <> ''";
+ //DataSet ds0 = oCn.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
+ //if (ds0 != null && ds0.Tables[0].Rows.Count == 0)
+ //{
+ // sReturn = "鍗曟嵁涓嶅瓨鍦ㄥ凡缁忓鏍哥殑椤圭洰锛�";
+ // return false;
+ //}
+
+ //鑾峰彇闇�瑕侀┏鍥炵殑瀹℃牳椤圭洰
+ string sql0 = "select c.* from Xt_CheckFlowMain as a " +
+ "inner join Xt_CheckFlowSub as b on a.HInterID = b.HInterID " +
+ "inner join Xt_BillCheckFlowStatus as c on a.HBillTypeID = c.HBillTypeID and b.HCheckItemID = c.HCheckItemID " +
+ "where c.HBillTypeID = '" + this.BillType + "' and c.HBillInterID = " + lngBillKey + " " +
+ "order by b.HFlowNo asc";
+ DataSet ds0 = oCn.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
+ if (ds0 == null || ds0.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "椹冲洖澶辫触!鍘熷洜:鏈彂璧峰鎵癸紒锛�";
+ return false;
+ }
+ //鑾峰彇褰撳墠瀹℃牳椤圭洰
+ string HCheckFlowID = ds0.Tables[0].Rows[0]["HCheckFlowID"].ToString(); //瀹℃壒娴佸唴鐮�
+ sql0 = "select * from " + MvarItemKey + " where HInterID = " + lngBillKey;
+ ds0 = oCn.RunProcReturn(sql0, MvarItemKey);
+ string HCheckItemNowID = ds0.Tables[0].Rows[0]["HCheckItemNowID"].ToString(); //褰撳墠瀹℃壒椤圭洰鍐呯爜
+ //鏌ユ壘鏄惁鏈夋潈闄�
+ string sql01 = "select * from Xt_CheckUserRight where HUserID = '" + sUser + "' and HCheckFlowInterID = " + HCheckFlowID + " and HCheckItemID = " + HCheckItemNowID + "";
+ DataSet ds01 = oCn.RunProcReturn(sql01, "Xt_CheckUserRight");
+ //鑾峰彇鐢ㄦ埛鍚嶇О
+ DataSet DsUser = new DataSet();
+ DsUser = oCn.RunProcReturn("select * from gy_czygl where czybm='" + sUser.Trim() + "'", "gy_czygl");
+ if(DsUser.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鏃犳硶鎵惧埌璇ョ敤鎴凤紒";
+ return false;
+ }
+ string userName = DsUser.Tables[0].Rows[0]["czymc"].ToString();
+
+ if (ds01.Tables[0].Rows.Count == 0 && !DBUtility.ClsPub.Security_Log_second("Gy_RoutingBill_Check", 1, false, userName))//鍗曟嵁鍘熷鏍告潈闄愪负澶氱骇瀹℃牳椹冲洖鏉冮檺
+ {
+ sReturn = "鏃犳潈闄愶紒";
+ return false;
+ }
+ //鏇存柊 椹冲洖鍒犻櫎瀹℃牳娴佺姸鎬佽〃
+ string sql02 = "Delete Xt_BillCheckFlowStatus where HBillTypeID = '" + this.BillType + "' and HBillInterID=" + lngBillKey + " and HCheckFlowID=" + HCheckFlowID;
+ oCn.RunProc(sql02);
+ oCn.RunProc(" Update " + MvarItemKey + " set HChecker='',HCheckDate=null,HBillStatus=5,HCheckItemNowID = 0,HCheckItemNextID = 0 Where HInterID=" + lngBillKey.ToString());
+
+ //鍐欏叆鏃ュ織
+ string WorkList = "椹冲洖鍗曟嵁锛屽崟鎹彿锛�" + HBillNo;
+ string SystemName = "LMES-" + MvarReportTitle + "妯″潡";
+ oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + sUser + "','" + "111" + "','" + WorkList + "','" + SystemName + "','" + "1111" + "','椹冲洖')"
+ );
+
+ sReturn = "鍙嶅鏍稿崟鎹垚鍔燂紒";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
//鍚敤宸ヨ壓璺嚎
public bool Sub_RoutingCheckAndUsed(Int64 HInterID)
{
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBill.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBill.cs"
index 856be7c..2e57f76 100644
--- "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBill.cs"
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBill.cs"
@@ -98,6 +98,7 @@
",HErrTreatment='" + omodel.HErrTreatment + "'" +
",HBatchNo='" + omodel.HBatchNo + "'" +
",HRemarkSN='" + omodel.HRemarkSN + "'" +
+ ",HCheckQty=" + omodel.HCheckQty +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -112,13 +113,13 @@
",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HQCCheckItemID,HQCStd,HUnit,HQCNote,HResult" +
- ",HMax,HMin,HAvg,HInspectVal,HUpLimit,HDownLimit,HInspectInstruMentID" +
+ ",HMax,HMin,HAvg,HInspectVal,HUpLimit,HDownLimit,HInspectInstruMentID, HInspectValQ" +
") values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
"," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HUnit + "','" + oSub.HQCNote + "','" + oSub.HResult +"'"+
- ",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "','"+ oSub.HInspectVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit + "','" + oSub.HInspectInstruMentID + "'" +
+ ",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "','"+ oSub.HInspectVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit + "','" + oSub.HInspectInstruMentID + "'" + "," + oSub.HInspectValQ +
") ");
}
//foreach (Model.ClsQC_FirstPieceCheckBillSub_Item oSub2 in DetailColl1)
@@ -211,14 +212,14 @@
",HSourceID,HICMOInterID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HLastResult" +
",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HICMOEntryID,HQCSchemeID,HShiftsID,HErrTreatment,HBatchNo" +
- ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID,HRemarkSN" +
+ ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID,HRemarkSN, HCheckQty" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
"," + omodel.HSourceID.ToString() + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HICMOQty.ToString() + "," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() + ", " + DBUtility.ClsPub.BoolToString(omodel.HLastResult) +
"," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'," + omodel.HICMOEntryID + "," + omodel.HQCSchemeID + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "','" + omodel.HBatchNo + "'" +
- ","+ omodel.HTakeSampleCheckBillID + ",'"+ omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "','" + omodel.HRemarkSN + "'" +
+ ","+ omodel.HTakeSampleCheckBillID + ",'"+ omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "','" + omodel.HRemarkSN + "'," + omodel.HCheckQty +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_FirstPieceCheckBillSub oSub in DetailColl)
@@ -231,7 +232,7 @@
",HMax,HMin,HAvg,HSampleSchemeID,HSampleQty,HSampleDamageQty,HAcceptQty" +
",HRejectQty,HSampleUnRightQty,HStatus,HUnitID,HInspectVal,HTargetVal" +
",HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" +
- ",HQualityStdID, HInspectMethodID, HInspectBasisID, HCompareSymbol" +
+ ",HQualityStdID, HInspectMethodID, HInspectBasisID, HCompareSymbol, HInspectValQ" +
") values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
@@ -240,7 +241,7 @@
",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" + "," + oSub.HSampleSchemeID + "," + oSub.HSampleQty +
"," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
"'," + oSub.HUnitID + ",'" + oSub.HInspectVal + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
- "','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'," + oSub.HQualityStdID + "," + oSub.HInspectMethodID + "," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "') ");
+ "','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'," + oSub.HQualityStdID + "," + oSub.HInspectMethodID + "," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "'," + oSub.HInspectValQ + ") ");
}
//foreach (Model.ClsQC_FirstPieceCheckBillSub_Item oSub2 in DetailColl1)
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBill.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBill.cs"
index c50079b..b567aa6 100644
--- "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBill.cs"
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBill.cs"
@@ -10,11 +10,12 @@
public Model.ClsQC_LastPieceCheckBillMain omodel = new Model.ClsQC_LastPieceCheckBillMain();
public List<Model.ClsQC_LastPieceCheckBillSub> DetailColl = new List<Model.ClsQC_LastPieceCheckBillSub>();
public List<Model.ClsQC_LastPieceCheckBillSub_ValueGrid> DetailColl_Value = new List<Model.ClsQC_LastPieceCheckBillSub_ValueGrid>();
+ public List<Model.ClsQC_LastPieceCheckBillSub_BadReason> DetailCol1_BadReason = new List<Model.ClsQC_LastPieceCheckBillSub_BadReason>();
public ClsQC_LastPieceCheckBill()
{
base.MvarItemKeySub = "QC_LastPieceCheckBillSub";
base.MvarItemKeySub2 = "QC_LastPieceCheckBillSub_ValueGrid";
- base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub3 = "QC_LastPieceCheckBillSub_BadReason";
base.MvarItemKeySub4 = "";
base.MvarItemKey="QC_LastPieceCheckBillMain";
base.MvarReportTitle="浜у搧鍏ュ簱妫�楠屽崟";
@@ -80,6 +81,8 @@
",HShiftsID=" + omodel.HShiftsID.ToString() +
",HErrTreatment='" + omodel.HErrTreatment + "'" +
",HBatchNo='" + omodel.HBatchNo + "'" +
+ ",HRemarkSN='" + omodel.HRemarkSN + "'" +
+ ",HCheckQty=" + omodel.HCheckQty +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -94,14 +97,14 @@
",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HQCCheckItemID,HQCStd,HUnit,HQCNote,HResult" +
- ",HMax,HMin,HAvg,HInspectVal,HUpLimit,HDownLimit,HInspectInstruMentID" +
+ ",HMax,HMin,HAvg,HInspectVal,HUpLimit,HDownLimit,HInspectInstruMentID, HInspectValQ" +
") values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
"," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HUnit + "','" + oSub.HQCNote + "','" + oSub.HResult + "'" +
",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "','" + oSub.HInspectVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit + "','" + oSub.HInspectInstruMentID + "'" +
- ") ");
+ ","+ oSub.HInspectValQ + ") ");
}
//foreach (Model.ClsQC_LastPieceCheckBillSub_Item oSub2 in DetailColl1)
//{
@@ -130,6 +133,8 @@
// return false;
// }
//}
+ AddBadReason(ref sReturn);
+
sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
@@ -157,14 +162,14 @@
",HSourceID,HICMOInterID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HLastResult" +
",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HICMOEntryID,HQCSchemeID,HShiftsID,HErrTreatment,HBatchNo" +
- ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID" +
+ ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID, HRemarkSN, HCheckQty" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
"," + omodel.HSourceID.ToString() + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HICMOQty.ToString() + "," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() + ", " + DBUtility.ClsPub.BoolToString(omodel.HLastResult) +
"," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'," + omodel.HICMOEntryID + "," + omodel.HQCSchemeID + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "','" + omodel.HBatchNo + "'" +
- "," + omodel.HTakeSampleCheckBillID + ",'" + omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "'" +
+ "," + omodel.HTakeSampleCheckBillID + ",'" + omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "','"+omodel.HRemarkSN + "'," + omodel.HCheckQty +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_LastPieceCheckBillSub oSub in DetailColl)
@@ -176,7 +181,7 @@
",HQCCheckItemID,HQCStd,HUnit,HQCNote,HResult" +
",HMax,HMin,HAvg,HSampleSchemeID,HSampleQty,HSampleDamageQty,HAcceptQty" +
",HRejectQty,HSampleUnRightQty,HStatus,HUnitID,HInspectVal,HTargetVal" +
- ",HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" +
+ ",HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult, HInspectValQ" +
") values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
@@ -185,7 +190,7 @@
",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "'" + "," + oSub.HSampleSchemeID + "," + oSub.HSampleQty +
"," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
"'," + oSub.HUnitID + ",'" + oSub.HInspectVal + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
- "','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" + ") ");
+ "','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'," + oSub.HInspectValQ +") ");
}
//foreach (Model.ClsQC_LastPieceCheckBillSub_Item oSub2 in DetailColl1)
//{
@@ -215,6 +220,7 @@
// }
//}
//
+ AddBadReason(ref sReturn);
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
@@ -447,6 +453,38 @@
}
}
+ //鏂板涓嶈壇鍘熷洜
+ public virtual bool AddBadReason(ref string sReturn)
+ {
+ try
+ {
+ if (DetailCol1_BadReason.Count == 0)
+ {
+ return true;
+ }
+ oCn.RunProc("delete from " + MvarItemKeySub3 +" where HInterID = " + DetailCol1_BadReason[0].HInterID);
+
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsQC_LastPieceCheckBillSub_BadReason reason in DetailCol1_BadReason)
+ {
+ oCn.RunProc("Insert into " + MvarItemKeySub3 +
+ " (HInterID,HEntryID,HBillNo_bak,HCloseMan" +
+ ",HRemark,HBadReasonID,HQty,HCheckTime" +
+ ") values("
+ + reason.HInterID + "," + reason.HEntryID + ",'" + reason.HBillNo_bak + "','','" +
+ reason.HRemark + "'," + reason.HBadReasonID + ",'" + reason.HQty + "',getdate()" +
+ ") ");
+ }
+ sReturn = "鏂板涓嶈壇鍘熷洜鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
//瀹℃牳
public bool CheckBill(Int64 lngBillKey, ref string sReturn)
{
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBill.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBill.cs"
index e5d151d..1dc2c92 100644
--- "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBill.cs"
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBill.cs"
@@ -10,13 +10,14 @@
public Model.ClsQC_OutCompCheckBillMain omodel = new Model.ClsQC_OutCompCheckBillMain();
public List<Model.ClsQC_OutCompCheckBillSub> DetailColl = new List<Model.ClsQC_OutCompCheckBillSub>();
public List<Model.ClsQC_OutCompCheckBillSub_ValueGrid> DetailColl_Value = new List<Model.ClsQC_OutCompCheckBillSub_ValueGrid>();
+ public List<Model.ClsQC_OutCompCheckBillSub_BadReason> DetailCol1_BadReason = new List<Model.ClsQC_OutCompCheckBillSub_BadReason>();
//public List<Model.ClsQC_OutCompCheckBillSub_Item> DetailColl1 = new List<Model.ClsQC_OutCompCheckBillSub_Item>();
public ClsQC_OutCompCheckBill()
{
base.MvarItemKeySub = "QC_OutCompCheckBillSub";
base.MvarItemKeySub2 = "QC_OutCompCheckBillSub_ValueGrid";
- base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub3 = "QC_OutCompCheckBillSub_BadReason";
base.MvarItemKeySub4 = "";
base.MvarItemKey="QC_OutCompCheckBillMain";
base.MvarReportTitle="鍑哄簱妫�楠屽崟";
@@ -83,6 +84,7 @@
",HErrTreatment='" + omodel.HErrTreatment + "'" +
",HBatchNo='" + omodel.HBatchNo + "'" +
",HRemarkSN='" + omodel.HRemarkSN + "'" +
+ ",HCheckQty=" + omodel.HCheckQty +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -98,13 +100,13 @@
",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HQCCheckItemID,HQCStd,HUnit,HQCNote,HResult" +
",HMax,HMin,HAvg,HInspectVal,HUpLimit,HDownLimit,HInspectInstruMentID,HQualityStdID,HInspectMethodID,HInspectBasisID,HCompareSymbol" +
- ") values("
+ ", HInsepctValQ) values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
"," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
"," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HUnit + "','" + oSub.HQCNote + "','" + oSub.HResult + "'" +
",'" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg + "','" + oSub.HInspectVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit + "','" + oSub.HInspectInstruMentID +
- "','" + oSub.HQualityStdID + "','" + oSub.HInspectMethodID + "'," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "'" +
+ "','" + oSub.HQualityStdID + "','" + oSub.HInspectMethodID + "'," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "'" + oSub.HInspectValQ +
") ");
}
//foreach (Model.ClsQC_OutCompCheckBillSub_Item oSub2 in DetailColl1)
@@ -134,6 +136,7 @@
// return false;
// }
//}
+ AddBadReason(ref sReturn);
sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
@@ -193,14 +196,14 @@
",HSourceID,HICMOInterID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HLastResult" +
",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HICMOEntryID,HQCSchemeID,HShiftsID,HErrTreatment,HBatchNo" +
- ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID,HRemarkSN" +
+ ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID,HRemarkSN, HCheckQty" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
"," + omodel.HSourceID.ToString() + "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," + omodel.HICMOQty.ToString() + "," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() + ", " + DBUtility.ClsPub.BoolToString(omodel.HLastResult) +
"," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'," + omodel.HICMOEntryID + "," + omodel.HQCSchemeID + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "','" + omodel.HBatchNo + "'" +
- "," + omodel.HTakeSampleCheckBillID + ",'" + omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "','" + omodel.HRemarkSN + "'" +
+ "," + omodel.HTakeSampleCheckBillID + ",'" + omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "','" + omodel.HRemarkSN + "'," + omodel.HCheckQty +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_OutCompCheckBillSub oSub in DetailColl)
@@ -213,7 +216,7 @@
",HMax,HMin,HAvg,HSampleSchemeID,HSampleQty,HSampleDamageQty,HAcceptQty" +
",HRejectQty,HSampleUnRightQty,HStatus,HUnitID,HInspectVal,HTargetVal" +
",HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult,HQualityStdID,HInspectMethodID,HInspectBasisID,HCompareSymbol" +
- ") values("
+ ", HInspectValQ) values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
"," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
@@ -222,7 +225,7 @@
"," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
"'," + oSub.HUnitID + ",'" + oSub.HInspectVal + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
"','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult+
- "','" + oSub.HQualityStdID + "','" + oSub.HInspectMethodID + "'," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "'" +
+ "','" + oSub.HQualityStdID + "','" + oSub.HInspectMethodID + "'," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "'," + oSub.HInspectValQ +
") ");
}
//foreach (Model.ClsQC_OutCompCheckBillSub_Item oSub2 in DetailColl1)
@@ -253,6 +256,7 @@
// }
//}
//
+ AddBadReason(ref sReturn);
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
@@ -456,6 +460,38 @@
}
}
+ //鏂板涓嶈壇鍘熷洜
+ public virtual bool AddBadReason(ref string sReturn)
+ {
+ try
+ {
+ if (DetailCol1_BadReason.Count == 0)
+ {
+ return true;
+ }
+ oCn.RunProc("delete from "+ MvarItemKeySub3 + " where HInterID = " + DetailCol1_BadReason[0].HInterID);
+
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsQC_OutCompCheckBillSub_BadReason reason in DetailCol1_BadReason)
+ {
+ oCn.RunProc("Insert into " + MvarItemKeySub3 +
+ " (HInterID,HEntryID,HBillNo_bak,HCloseMan" +
+ ",HRemark,HBadReasonID,HQty,HCheckTime" +
+ ") values("
+ + reason.HInterID + "," + reason.HEntryID + ",'" + reason.HBillNo_bak + "','','" +
+ reason.HRemark + "'," + reason.HBadReasonID + ",'" + reason.HQty + "',getdate()" +
+ ") ");
+ }
+ sReturn = "鏂板涓嶈壇鍘熷洜鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
//瀹℃牳
public bool CheckBill(Int64 lngBillKey, ref string sReturn)
{
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBill.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBill.cs"
index f651578..16c596f 100644
--- "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBill.cs"
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBill.cs"
@@ -10,13 +10,14 @@
public Model.ClsQC_POStockInCheckBillMain omodel = new Model.ClsQC_POStockInCheckBillMain();
public List<Model.ClsQC_POStockInCheckBillSub> DetailColl = new List<Model.ClsQC_POStockInCheckBillSub>();
public List<Model.ClsQC_POStockInCheckBillSub_ValueGrid> DetailColl_Value = new List<Model.ClsQC_POStockInCheckBillSub_ValueGrid>();
+ public List<Model.ClsQC_POStockInCheckBillSub_BadReason> DetailCol1_BadReason = new List<Model.ClsQC_POStockInCheckBillSub_BadReason>();
//public List<Model.ClsQC_POStockInCheckBillSub_Item> DetailColl1 = new List<Model.ClsQC_POStockInCheckBillSub_Item>();
public ClsQC_POStockInCheckBill()
{
base.MvarItemKeySub = "QC_POStockInCheckBillSub";
base.MvarItemKeySub2 = "QC_POStockInCheckBillSub_ValueGrid";
- base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub3 = "QC_POStockInCheckBillSub_BadReason";
base.MvarItemKeySub4 = "";
base.MvarItemKey="QC_POStockInCheckBillMain";
base.MvarReportTitle="鏉ユ枡妫�楠屽崟";
@@ -83,6 +84,7 @@
",HErrTreatment='" + omodel.HErrTreatment + "'" +
",HBatchNo='" + omodel.HBatchNo + "'" +
",HRemarkSN='" + omodel.HRemarkSN + "'" +
+ ",HCheckQty=" + omodel.HCheckQty +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -101,7 +103,7 @@
",HMax,HMin,HAvg,HSampleSchemeID,HSampleQty,HSampleDamageQty,HAcceptQty" +
",HRejectQty,HSampleUnRightQty,HStatus,HUnitID,HInspectVal,HTargetVal" +
",HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" +
- ",HCompareSymbol, HQualityStdID,HInspectMethodID,HInspectBasisID" +
+ ",HCompareSymbol, HQualityStdID,HInspectMethodID,HInspectBasisID, HInspectValQ" +
") values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
@@ -111,7 +113,7 @@
"," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
"'," + oSub.HUnitID + ",'" + oSub.HInspectVal + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
"','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" +
- $@",'{oSub.HCompareSymbol}',{oSub.HQualityStdID},{oSub.HInspectMethodID},{oSub.HInspectBasisID}" +
+ $@",'{oSub.HCompareSymbol}',{oSub.HQualityStdID},{oSub.HInspectMethodID},{oSub.HInspectBasisID}, {oSub.HInspectValQ}" +
") ");
}
//foreach (Model.ClsQC_POStockInCheckBillSub_Item oSub2 in DetailColl1)
@@ -141,6 +143,7 @@
// return false;
// }
//}
+ AddBadReason(ref sReturn);
sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
@@ -168,7 +171,7 @@
",HSourceID,HICMOInterID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HLastResult" +
",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HICMOEntryID,HQCSchemeID,HShiftsID,HErrTreatment,HBatchNo" +
- ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID, HRemarkSN" +
+ ",HTakeSampleCheckBillID,HTakeSampleCheckBillNo,HProcID, HRemarkSN, HCheckQty" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
@@ -176,7 +179,7 @@
",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() + ", " + DBUtility.ClsPub.BoolToString(omodel.HLastResult) +
"," + omodel.HMainSourceInterID + "," + omodel.HMainSourceEntryID + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'," + omodel.HICMOEntryID + "," + omodel.HQCSchemeID + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "','" + omodel.HBatchNo + "'" +
"," + omodel.HTakeSampleCheckBillID + ",'" + omodel.HTakeSampleCheckBillNo + "','" + omodel.HProcID + "'" +
- ",'" + omodel.HRemarkSN+ "') ");
+ ",'" + omodel.HRemarkSN+ "',"+ omodel.HCheckQty +") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_POStockInCheckBillSub oSub in DetailColl)
{
@@ -188,7 +191,7 @@
",HMax,HMin,HAvg,HSampleSchemeID,HSampleQty,HSampleDamageQty,HAcceptQty" +
",HRejectQty,HSampleUnRightQty,HStatus,HUnitID,HInspectVal,HTargetVal" +
",HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" +
- ",HCompareSymbol, HQualityStdID,HInspectMethodID,HInspectBasisID" +
+ ",HCompareSymbol, HQualityStdID,HInspectMethodID,HInspectBasisID, HInspectValQ" +
") values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
@@ -198,7 +201,7 @@
"," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
"'," + oSub.HUnitID + ",'" + oSub.HInspectVal + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
"','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "'" +
- $@",'{oSub.HCompareSymbol}',{oSub.HQualityStdID},{oSub.HInspectMethodID},{oSub.HInspectBasisID}"+
+ $@",'{oSub.HCompareSymbol}',{oSub.HQualityStdID},{oSub.HInspectMethodID},{oSub.HInspectBasisID}, {oSub.HInspectValQ}" +
") ");
}
//foreach (Model.ClsQC_POStockInCheckBillSub_Item oSub2 in DetailColl1)
@@ -229,6 +232,7 @@
// }
//}
//
+ AddBadReason(ref sReturn);
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
oCn.Commit();
return true;
@@ -461,6 +465,38 @@
}
}
+ //鏂板涓嶈壇鍘熷洜
+ public virtual bool AddBadReason(ref string sReturn)
+ {
+ try
+ {
+ if(DetailCol1_BadReason.Count == 0)
+ {
+ return true;
+ }
+ oCn.RunProc("delete from QC_POStockInCheckBillSub_BadReason where HInterID = " + DetailCol1_BadReason[0].HInterID);
+
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsQC_POStockInCheckBillSub_BadReason reason in DetailCol1_BadReason)
+ {
+ oCn.RunProc("Insert into QC_POStockInCheckBillSub_BadReason " +
+ " (HInterID,HEntryID,HBillNo_bak,HCloseMan" +
+ ",HRemark,HBadReasonID,HQty,HCheckTime" +
+ ") values("
+ + reason.HInterID + "," + reason.HEntryID + ",'" + reason.HBillNo_bak + "','','" +
+ reason.HRemark + "'," + reason.HBadReasonID + ",'" + reason.HQty + "',getdate()" +
+ ") ");
+ }
+ sReturn = "鏂板涓嶈壇鍘熷洜鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
//瀹℃牳
public bool CheckBill(Int64 lngBillKey, ref string sReturn)
{
diff --git "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_ProcessCheckBill.cs" "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_ProcessCheckBill.cs"
index 9e3331a..a8a52ec 100644
--- "a/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_ProcessCheckBill.cs"
+++ "b/DAL/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_ProcessCheckBill.cs"
@@ -127,7 +127,7 @@
",HProcCheckEmp,HProcCheckTime, HSampleSchemeID,HSampleQty,HSampleDamageQty,HAcceptQty" +
",HRejectQty,HSampleUnRightQty,HStatus,HUnitID,HInspectVal,HTargetVal" +
",HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" +
- ",HQCNote,HQualityStdID,HInspectMethodID,HInspectBasisID,HCompareSymbol) values("
+ ",HQCNote,HQualityStdID,HInspectMethodID,HInspectBasisID,HCompareSymbol, HInspectValQ) values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
"," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
@@ -136,7 +136,7 @@
"," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
"'," + oSub.HUnitID + ",'" + oSub.HInspectVal + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
"','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "','" + oSub.HQCNote +
- "','" + oSub.HQualityStdID + "','" + oSub.HInspectMethodID + "'," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "'" +
+ "','" + oSub.HQualityStdID + "','" + oSub.HInspectMethodID + "'," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "'," + oSub.HInspectValQ +
") ");
}
@@ -244,7 +244,7 @@
",HProcCheckEmp,HProcCheckTime, HSampleSchemeID,HSampleQty,HSampleDamageQty,HAcceptQty" +
",HRejectQty,HSampleUnRightQty,HStatus,HUnitID,HInspectVal,HTargetVal" +
",HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HKeyInspect,HAnalysisMethod,HInspectInstruMentID,HInspectResult" +
- ",HQCNote,HMax,HMin,HAvg,HQualityStdID,HInspectMethodID,HInspectBasisID,HCompareSymbol) values("
+ ",HQCNote,HMax,HMin,HAvg,HQualityStdID,HInspectMethodID,HInspectBasisID,HCompareSymbol, HInspectValQ) values("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
"," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
@@ -252,8 +252,8 @@
"," + oSub.HProcCheckEmp.ToString() + ",'" + oSub.HProcCheckTime + "'," + oSub.HSampleSchemeID + "," + oSub.HSampleQty +
"," + oSub.HSampleDamageQty + "," + oSub.HAcceptQty + "," + oSub.HRejectQty + "," + oSub.HSampleUnRightQty + ",'" + oSub.HStatus +
"'," + oSub.HUnitID + ",'" + oSub.HInspectVal + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
- "','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "','" + oSub.HQCNote + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg +
- "','" + oSub.HQualityStdID + "','" + oSub.HInspectMethodID + "'," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "'" +
+ "','" + oSub.HUpOffSet + "','" + oSub.HDownOffSet + "'," + oSub.HKeyInspect + ",'" + oSub.HAnalysisMethod + "'," + oSub.HInspectInstruMentID + ",'" + oSub.HInspectResult + "','" + oSub.HQCNote + "','" + oSub.HMax + "','" + oSub.HMin + "','" + oSub.HAvg+
+ "','" + oSub.HQualityStdID + "','" + oSub.HInspectMethodID + "'," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "'," + oSub.HInspectValQ +
") ");
}
diff --git "a/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBill_Ctl.cs" "b/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBill_Ctl.cs"
new file mode 100644
index 0000000..a752139
--- /dev/null
+++ "b/DAL/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBill_Ctl.cs"
@@ -0,0 +1,146 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DBUtility;
+
+namespace DAL
+{
+ public class ClsCg_OrderTransportBill_Ctl : ClsXt_BaseBill
+ {
+
+ public ClsCg_OrderTransportBill_Ctl()
+ {
+ base.MvarItemKeySub = "ClsCg_OrderTransportBillSub";
+ base.MvarItemKeySub2 = "ClsCg_OrderTransportBillSub_Money";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey = "ClsCg_OrderTransportBillMain";
+ base.MvarReportTitle = "杩愬崟鐢宠";
+ base.BillType = "1118";
+ base.HBillSubType = "1118";
+
+ }
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ public string HOldNumber;
+ public Model.ClsCg_OrderTransportBill_Model oModel = new Model.ClsCg_OrderTransportBill_Model();
+ public Model.ClsCg_OrderTransportBillSub_Model oModel_Sub = new Model.ClsCg_OrderTransportBillSub_Model();
+ public Model.ClsCg_OrderTransportBillSub_Money_Model oModel_Sub_Money = new Model.ClsCg_OrderTransportBillSub_Money_Model();
+
+ public override bool DeleteBill(long lngBillKey, ref string sReturn)
+ {
+ return base.DeleteBill(lngBillKey, ref sReturn);
+ }
+
+ public override bool IsExistMainID(ref string sReturn, long lngBillKey, Pub_Class.ClsPub.Enum_BillStatus oBillStatus)
+ {
+ return base.IsExistMainID(ref sReturn, lngBillKey, oBillStatus);
+ }
+
+ public override bool IsExistBillNo(ref string sReturn, string sBillNo, Pub_Class.ClsPub.Enum_BillStatus oBillStatus, long lngBillKey)
+ {
+ return base.IsExistBillNo(ref sReturn, sBillNo, oBillStatus, lngBillKey);
+ }
+
+ public override bool ModifyBill(long lngBillKey, ref string sReturn)
+ {
+ return base.ModifyBill(lngBillKey, ref sReturn);
+ }
+
+ public override bool AddBill(ref string sReturn)
+ {
+ bool success = false;
+ // 娣诲姞涓昏〃
+ string sql = $@" Insert Into {MvarItemKey}
+ INSERT INTO BillMain (
+ HYear, HPeriod, HBillType, HBillSubType, HInterID, HDate, HBillNo, HBillStatus,
+ HCheckItemNowID, HCheckItemNextID, HCheckFlowID, HRemark, HBacker, HBackDate, HBackRemark,
+ HChecker, HCheckDate, HMaker, HMakeDate, HUpDater, HUpDateDate, HCloseMan, HCloseDate,
+ HCloseType, HDeleteMan, HDeleteDate, HMainSourceBillType, HMainSourceInterID, HMainSourceEntryID,
+ HMainSourceBillNo, HPrintQty, HItemMainID, HCusID, HStockOutBillMainID, HStockOutBillNo,
+ HSupID, HOrderBillNumber, HOrderType, HTransportType, HTransportMoney, HSendAddr,
+ HReceAddr, HGoodsVolume, HTakeGoodsTime, HArriveGoodsTime, HCarID, HDriverID,
+ HLoadRate, HOrderStatus
+ ) VALUES (
+ {oModel.HYear}, {oModel.HPeriod}, '{oModel.HBillType}', '{oModel.HBillSubType}', {oModel.HInterID}, '{oModel.HDate}', '{oModel.HBillNo}', {oModel.HBillStatus},
+ {oModel.HCheckItemNowID}, {oModel.HCheckItemNextID}, {oModel.HCheckFlowID}, '{oModel.HRemark}', '{oModel.HBacker}', '{oModel.HBackDate}', '{oModel.HBackRemark}',
+ '{oModel.HChecker}', '{oModel.HCheckDate}', '{oModel.HMaker}', '{oModel.HMakeDate}', '{oModel.HUpDater}', '{oModel.HUpDateDate}', '{oModel.HCloseMan}', '{oModel.HCloseDate}',
+ {oModel.HCloseType}, '{oModel.HDeleteMan}', '{oModel.HDeleteDate}', '{oModel.HMainSourceBillType}', {oModel.HMainSourceInterID}, {oModel.HMainSourceEntryID},
+ '{oModel.HMainSourceBillNo}', {oModel.HPrintQty}, {oModel.HItemMainID}, {oModel.HCusID}, {oModel.HStockOutBillMainID}, '{oModel.HStockOutBillNo}',
+ {oModel.HSupID}, '{oModel.HOrderBillNumber}', '{oModel.HOrderType}', '{oModel.HTransportType}', {oModel.HTransportMoney}, '{oModel.HSendAddr}',
+ '{oModel.HReceAddr}', {oModel.HGoodsVolume}, '{oModel.HTakeGoodsTime}', '{oModel.HArriveGoodsTime}', {oModel.HCarID}, {oModel.HDriverID},
+ {oModel.HLoadRate}, {oModel.HOrderStatus}
+ ";
+
+ oCn.RunProc(sql);
+ // 娣诲姞瀛愯〃
+ success = AddBillSub(ref DBUtility.ClsPub.sExeReturnInfo);
+
+ // 娣诲姞瀛愯〃-閲戦
+ success = AddBillSub_Money(ref DBUtility.ClsPub.sExeReturnInfo);
+
+ return success;
+ }
+
+ public override bool ShowBill(long lngBillKey, ref string sReturn)
+ {
+ return base.ShowBill(lngBillKey, ref sReturn);
+ }
+
+ public override void DeleteRelation(ref string sReturn, long lngBillKey)
+ {
+ base.DeleteRelation(ref sReturn, lngBillKey);
+ }
+
+ public override void AddNewRelation(ref string sReturn, long lngBillKey)
+ {
+ base.AddNewRelation(ref sReturn, lngBillKey);
+ }
+
+ // 娣诲姞瀛愬崟鎹�
+ public bool AddBillSub(ref string sReturn)
+ {
+ string sql = $@"
+ INSERT INTO {MvarItemKeySub} (
+ HInterID, HBillNo_bak, HEntryID, HCloseMan, HEntryCloseDate, HCloseType,
+ HRemark, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType,
+ HRelationQty, HRelationMoney, HItemSubID, HMaterID, HVolume, HPack, HUnitID
+ ) VALUES (
+ {oModel_Sub.HInterID}, '{oModel_Sub.HBillNo_bak}', {oModel_Sub.HEntryID},
+ '{oModel_Sub.HCloseMan}', '{oModel_Sub.HEntryCloseDate}', {oModel_Sub.HCloseType},
+ '{oModel_Sub.HRemark}', {oModel_Sub.HSourceInterID}, {oModel_Sub.HSourceEntryID},
+ '{oModel_Sub.HSourceBillNo}', '{oModel_Sub.HSourceBillType}', {oModel_Sub.HRelationQty},
+ '{oModel_Sub.HRelationMoney}', {oModel_Sub.HItemSubID}, {oModel_Sub.HMaterID},
+ {oModel_Sub.HVolume}, '{oModel_Sub.HPack}', {oModel_Sub.HUnitID}
+ )
+ ";
+ oCn.RunProc(sql);
+
+ return true;
+ }
+
+ // 娣诲姞瀛愬崟鎹� 璐圭敤
+ public bool AddBillSub_Money(ref string sReturn)
+ {
+ string sql = $@"
+ INSERT INTO {MvarItemKeySub} (
+ HInterID, HBillNo_bak, HEntryID, HCloseMan, HEntryCloseDate, HCloseType,
+ HRemark, HSourceInterID, HSourceEntryID, HSourceBillNo, HSourceBillType,
+ HRelationQty, HRelationMoney, HItemSubID, HMaterID, HVolume, HPack, HUnitID
+ ) VALUES (
+ {oModel_Sub.HInterID}, '{oModel_Sub.HBillNo_bak}', {oModel_Sub.HEntryID},
+ '{oModel_Sub.HCloseMan}', '{oModel_Sub.HEntryCloseDate}', {oModel_Sub.HCloseType},
+ '{oModel_Sub.HRemark}', {oModel_Sub.HSourceInterID}, {oModel_Sub.HSourceEntryID},
+ '{oModel_Sub.HSourceBillNo}', '{oModel_Sub.HSourceBillType}', {oModel_Sub.HRelationQty},
+ '{oModel_Sub.HRelationMoney}', {oModel_Sub.HItemSubID}, {oModel_Sub.HMaterID},
+ {oModel_Sub.HVolume}, '{oModel_Sub.HPack}', {oModel_Sub.HUnitID}
+ )
+ ";
+ oCn.RunProc(sql);
+
+ return true;
+ }
+ }
+}
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index 166551e..2c655a5 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 c83301d..6130b22 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 638a1a3..ce919d2 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 895e592..8d25596 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 347ba36..e0a4452 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 0adc8ce..76fd762 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 306da35..af26920 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 76eae00..847ae93 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 a04540c..f5e894a 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 8282016..4f7ae16 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.dll b/DBUtility/obj/Release/DBUtility.dll
index 166551e..2c655a5 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 c83301d..6130b22 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs" "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
index 8019fda..cffe5a0 100644
--- "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
+++ "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
@@ -603,7 +603,7 @@
}
//椹冲洖
- public bool RejectCheckFlowProgress(Int64 lngBillKey, string HBillNo,string sUser, ref string sReturn)
+ public virtual bool RejectCheckFlowProgress(Int64 lngBillKey, string HBillNo,string sUser, ref string sReturn)
{
if (isUse(lngBillKey, ref sReturn))
@@ -644,7 +644,7 @@
//鏌ユ壘鏄惁鏈夋潈闄�
string sql01 = "select * from Xt_CheckUserRight where HUserID = '" + sUser + "' and HCheckFlowInterID = " + HCheckFlowID + " and HCheckItemID = " + HCheckItemNowID + "";
DataSet ds01 = oCn.RunProcReturn(sql01, "Xt_CheckUserRight");
- if (ds01.Tables[0].Rows.Count == 0 && !DBUtility.ClsPub.Security_Log_second("Gy_RoutingBill_Check", 1, false, sUser))//鍗曟嵁鍘熷鏍告潈闄愪负澶氱骇瀹℃牳椹冲洖鏉冮檺
+ if (ds01.Tables[0].Rows.Count == 0)//鍗曟嵁鍘熷鏍告潈闄愪负澶氱骇瀹℃牳椹冲洖鏉冮檺
{
sReturn = "鏃犳潈闄愶紒";
return false;
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index 99a2436..5a7a514 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -3646,6 +3646,12 @@
oGy_BarCodeBill_Rework.BillStatus = Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew;
oGy_BarCodeBill_Rework.ShowDialog();
break;
+ case "gy_barcodebill_xb_selectmater":
+ //
+ Gy_BarCodeBill_XB_SelectMater oGy_BarCodeBill_XB_SelectMater = new Gy_BarCodeBill_XB_SelectMater();
+ oGy_BarCodeBill_XB_SelectMater.BillStatus = Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ oGy_BarCodeBill_XB_SelectMater.ShowDialog();
+ break;
case "gy_barcodebill_xiabao":
//
Gy_BarCodeBill_XiaBao oGy_BarCodeBill_XiaBao = new Gy_BarCodeBill_XiaBao();
diff --git a/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache b/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
index f6f1c25..815889f 100644
--- a/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
+++ b/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
Binary files differ
diff --git a/MES/bin/Release/AxInterop.gregn6Lib.dll b/MES/bin/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index 76a7d93..0000000
--- a/MES/bin/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/BLL.dll b/MES/bin/Release/BLL.dll
deleted file mode 100644
index 764bda7..0000000
--- a/MES/bin/Release/BLL.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/BLL.pdb b/MES/bin/Release/BLL.pdb
deleted file mode 100644
index 0f10a0b..0000000
--- a/MES/bin/Release/BLL.pdb
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/DAL.dll b/MES/bin/Release/DAL.dll
deleted file mode 100644
index 28a23d7..0000000
--- a/MES/bin/Release/DAL.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/DAL.pdb b/MES/bin/Release/DAL.pdb
deleted file mode 100644
index 204e059..0000000
--- a/MES/bin/Release/DAL.pdb
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/DBUtility.dll b/MES/bin/Release/DBUtility.dll
deleted file mode 100644
index 7c156e8..0000000
--- a/MES/bin/Release/DBUtility.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/Interop.Excel.dll b/MES/bin/Release/Interop.Excel.dll
deleted file mode 100644
index 0e7f72e..0000000
--- a/MES/bin/Release/Interop.Excel.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/Interop.gregn6Lib.dll b/MES/bin/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index 1aebdc9..0000000
--- a/MES/bin/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/Kingdee.BOS.WebApi.Client.dll b/MES/bin/Release/Kingdee.BOS.WebApi.Client.dll
deleted file mode 100644
index 25dd347..0000000
--- a/MES/bin/Release/Kingdee.BOS.WebApi.Client.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/MES.exe b/MES/bin/Release/MES.exe
deleted file mode 100644
index 4d2d498..0000000
--- a/MES/bin/Release/MES.exe
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/MES.exe.config b/MES/bin/Release/MES.exe.config
deleted file mode 100644
index 51278a4..0000000
--- a/MES/bin/Release/MES.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/MES/bin/Release/MES.pdb b/MES/bin/Release/MES.pdb
deleted file mode 100644
index ef81b41..0000000
--- a/MES/bin/Release/MES.pdb
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/Model.dll b/MES/bin/Release/Model.dll
deleted file mode 100644
index fbcf68d..0000000
--- a/MES/bin/Release/Model.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/Model.pdb b/MES/bin/Release/Model.pdb
deleted file mode 100644
index 0b2c95c..0000000
--- a/MES/bin/Release/Model.pdb
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/Models/ClsSc_MouldScrapOutBillMain.cs b/MES/bin/Release/Models/ClsSc_MouldScrapOutBillMain.cs
deleted file mode 100644
index 84269e7..0000000
--- a/MES/bin/Release/Models/ClsSc_MouldScrapOutBillMain.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WebAPI.Models
-{
- public class ClsSc_MouldScrapOutBillMain: DBUtility.ClsXt_BaseBillMain
- {
- public long HMouldID;// int --产品模具
- public string HPlanNo;// varchar(50) --点检计划编号
- public long HPlanInterID;// int --点检计划内码
- public string HBeginDate;// datetime --点检开始日期
- public string HEndDate;// datetime --点检结束日期
- public string HExplanation;// varchar(500) --摘要
- public string HInnerBillNo;// varchar(50) --内部单据号
- public long HDeptID;// int --部门ID
- public long HWHID;// int --仓库ID
- public long HSecManagerID;// int --
- public long HKeeperID;// int --
- public bool HRedBlueFlag;// bool
- }
-}
diff --git a/MES/bin/Release/Newtonsoft.Json.dll b/MES/bin/Release/Newtonsoft.Json.dll
deleted file mode 100644
index 7af125a..0000000
--- a/MES/bin/Release/Newtonsoft.Json.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/Pub_Class.dll b/MES/bin/Release/Pub_Class.dll
deleted file mode 100644
index 6afcbf4..0000000
--- a/MES/bin/Release/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/Pub_Control.dll b/MES/bin/Release/Pub_Control.dll
deleted file mode 100644
index da2f7ad..0000000
--- a/MES/bin/Release/Pub_Control.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/SQLHelper.dll b/MES/bin/Release/SQLHelper.dll
deleted file mode 100644
index 404882a..0000000
--- a/MES/bin/Release/SQLHelper.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/WarM.dll b/MES/bin/Release/WarM.dll
deleted file mode 100644
index ea41e3a..0000000
--- a/MES/bin/Release/WarM.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/WarM.pdb b/MES/bin/Release/WarM.pdb
deleted file mode 100644
index 7611ce1..0000000
--- a/MES/bin/Release/WarM.pdb
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/grpc_csharp_ext.x64.dll b/MES/bin/Release/grpc_csharp_ext.x64.dll
deleted file mode 100644
index b09d9b4..0000000
--- a/MES/bin/Release/grpc_csharp_ext.x64.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/grpc_csharp_ext.x86.dll b/MES/bin/Release/grpc_csharp_ext.x86.dll
deleted file mode 100644
index 80f6ae1..0000000
--- a/MES/bin/Release/grpc_csharp_ext.x86.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/libgrpc_csharp_ext.x64.dylib b/MES/bin/Release/libgrpc_csharp_ext.x64.dylib
deleted file mode 100644
index e2a7a8f..0000000
--- a/MES/bin/Release/libgrpc_csharp_ext.x64.dylib
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Release/libgrpc_csharp_ext.x64.so b/MES/bin/Release/libgrpc_csharp_ext.x64.so
deleted file mode 100644
index 7523925..0000000
--- a/MES/bin/Release/libgrpc_csharp_ext.x64.so
+++ /dev/null
Binary files differ
diff --git a/Model/Model.csproj b/Model/Model.csproj
index efadc9e..949d008 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -124,6 +124,8 @@
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_ProjectMoneyClass_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RepairClass_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_RepairCheckClass_Model.cs" />
+ <Compile Include="鐗╂祦绠＄悊\ClsCg_CarTrajectoryBillMain.cs" />
+ <Compile Include="鐗╂祦绠＄悊\ClsCg_CarTrajectoryBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_ShiftsBeginInfoBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\ClsSc_ShiftsBeginInfoBillSub.cs" />
<Compile Include="ClsHR_EmpFosterBillMain.cs" />
@@ -213,6 +215,9 @@
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipRepairSignBillSub.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_LastPieceCheckBillSub_ValueGrid.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_OutCompCheckBillSub_ValueGrid.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_LastPieceCheckBillSub_BadReason.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_OutCompCheckBillSub_BadReason.cs" />
+ <Compile Include="璐ㄦ绠＄悊\ClsQC_POStockInCheckBillSub_BadReason.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_POStockInCheckBillSub_ValueGrid.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_TakeSampleCheckBillMain.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_TakeSampleCheckBillSub.cs" />
@@ -946,6 +951,9 @@
<Compile Include="閲囪喘绠＄悊\ClsCg_InvoiceSpecBillSub.cs">
<SubType>Code</SubType>
</Compile>
+ <Compile Include="閲囪喘绠＄悊\ClsCg_OrderTransportBillSub_Model.cs" />
+ <Compile Include="閲囪喘绠＄悊\ClsCg_OrderTransportBillSub_Money_Model.cs" />
+ <Compile Include="閲囪喘绠＄悊\ClsCg_OrderTransportBill_Model.cs" />
<Compile Include="閲囪喘绠＄悊\ClsCg_POInStockBackBillMain.cs">
<SubType>Code</SubType>
</Compile>
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index 166551e..2c655a5 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 c83301d..6130b22 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 56f8a2e..daafbe9 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 fcbe898..5695453 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 638a1a3..ce919d2 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 895e592..8d25596 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 347ba36..e0a4452 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 0adc8ce..76fd762 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 306da35..af26920 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 76eae00..847ae93 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 7304806..f5e894a 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 56f8a2e..daafbe9 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 fcbe898..5695453 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
index caf75e6..6c55bdc 100644
--- a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git "a/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsCg_CarTrajectoryBillMain.cs" "b/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsCg_CarTrajectoryBillMain.cs"
new file mode 100644
index 0000000..34f5d7e
--- /dev/null
+++ "b/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsCg_CarTrajectoryBillMain.cs"
@@ -0,0 +1,72 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsCg_CarTrajectoryBillMain
+ {
+ // 鍩烘湰鍗曟嵁淇℃伅
+ public int ?HYear { get; set; } // 骞翠唤
+ public int ?HPeriod { get; set; } // 鏈堜唤
+ public string HBillType { get; set; } // 鍗曟嵁绫诲瀷
+ public string HBillSubType { get; set; } // 鍗曟嵁瀛愮被鍨�
+ public int HInterID { get; set; } // 鍗曟嵁鍐呯爜锛堜富閿級
+ public DateTime?HDate { get; set; } // 鏃ユ湡
+ public string HBillNo { get; set; } // 鍗曟嵁鍙�
+ public int HBillStatus { get; set; } // 鍗曟嵁鐘舵��
+
+ // 瀹℃壒娴佺▼鐩稿叧
+ public int HCheckItemNowID { get; set; } // 褰撳墠瀹℃牳椤圭洰
+ public int HCheckItemNextID { get; set; } // 寰呭鏍搁」鐩�
+ public int HCheckFlowID { get; set; } // 瀹℃壒娴�
+ public string HRemark { get; set; } // 澶囨敞
+
+ // 瀹℃牳閫�鍥炵浉鍏�
+ public string HBacker { get; set; } // 閫�鍥炰汉
+ public DateTime? HBackDate { get; set; } // 閫�鍥炴棩鏈�
+ public string HBackRemark { get; set; } // 閫�鍥炲師鍥�
+
+ // 瀹℃牳鐩稿叧
+ public string HChecker { get; set; } // 瀹℃牳浜�
+ public DateTime? HCheckDate { get; set; } // 瀹℃牳鏃ユ湡
+
+ // 鍒跺崟鐩稿叧
+ public string HMaker { get; set; } // 鍒跺崟浜�
+ public DateTime? HMakeDate { get; set; } // 鍒跺崟鏃ユ湡
+
+ // 淇敼鐩稿叧
+ public string HUpDater { get; set; } // 淇敼浜�
+ public DateTime? HUpDateDate { get; set; } // 淇敼鏃ユ湡
+
+ // 鍏抽棴鐩稿叧
+ public string HCloseMan { get; set; } // 鍏抽棴浜�
+ public DateTime? HCloseDate { get; set; } // 鍏抽棴鏃ユ湡
+ public bool HCloseType { get; set; } // 鍏抽棴绫诲瀷
+
+ // 浣滃簾鐩稿叧
+ public string HDeleteMan { get; set; } // 浣滃簾浜�
+ public DateTime? HDeleteDate { get; set; } // 浣滃簾鏃ユ湡
+
+ // 婧愬崟淇℃伅锛堢晫闈笉鏄剧ず锛�
+ public string HMainSourceBillType { get; set; } // 婧愬崟绫诲瀷
+ public int? HMainSourceInterID { get; set; } // 婧愬崟涓诲唴鐮�
+ public int? HMainSourceEntryID { get; set; } // 婧愬崟瀛愬唴鐮�
+ public string HMainSourceBillNo { get; set; } // 婧愬崟鍙�
+
+ // 鍏朵粬
+ public int HPrintQty { get; set; } // 鎵撳嵃娆℃暟
+
+ // 鑷畾涔夊瓧娈碉紙杞﹁締杞ㄨ抗涓撶敤锛�
+ public int? HContractTransportBillMainID { get; set; } // 杩愬崟涓诲唴鐮�
+ public string HContractTransportBillNo { get; set; } // 杩愬崟鍙�
+ public string HCarNumber { get; set; } // 杞︾墝鍙�
+ public DateTime?HGetTime { get; set; } // 杞ㄨ抗鑾峰彇鏃堕棿
+ public decimal? HLongitude { get; set; } // 缁忓害
+ public decimal? HLatitude { get; set; } // 绾害
+
+ // 鑷鍒�
+ public int HItemMainID { get; set; } // 鑷鍒�
+
+ }
+}
\ No newline at end of file
diff --git "a/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsCg_CarTrajectoryBillSub.cs" "b/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsCg_CarTrajectoryBillSub.cs"
new file mode 100644
index 0000000..e22778d
--- /dev/null
+++ "b/Model/\347\211\251\346\265\201\347\256\241\347\220\206/ClsCg_CarTrajectoryBillSub.cs"
@@ -0,0 +1,36 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsCg_CarTrajectoryBillSub
+ {
+ // 鍏宠仈涓昏〃
+ public int HInterID { get; set; } // 涓诲唴鐮�
+ public string HBillNo_bak { get; set; } // 鍗曟嵁鍙凤紙澶囦唤锛�
+
+ // 瀛愯〃淇℃伅
+ public int HEntryID { get; set; } // 瀛愬唴鐮�
+
+ // 琛屽叧闂浉鍏�
+ public string HCloseMan { get; set; } // 琛屽叧闂汉
+ public DateTime HEntryCloseDate { get; set; } // 琛屽叧闂棩鏈�
+ public bool HCloseType { get; set; } // 鍏抽棴绫诲瀷
+
+ // 澶囨敞
+ public string HRemark { get; set; } // 琛ㄤ綋澶囨敞
+
+ // 婧愬崟淇℃伅
+ public int HSourceInterID { get; set; } // 婧愬崟ID
+ public int HSourceEntryID { get; set; } // 婧愬崟瀛怚D
+ public string HSourceBillNo { get; set; } // 婧愬崟鍗曞彿
+ public string HSourceBillType { get; set; } // 婧愬崟绫诲瀷
+ public decimal HRelationQty { get; set; } // 鍏宠仈鏁伴噺
+ public decimal HRelationMoney { get; set; } // 鍏宠仈閲戦
+
+ // 鑷鍒�
+ public int HItemSubID { get; set; } // 鑷鍒�
+
+ }
+}
\ No newline at end of file
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBillMain.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBillMain.cs"
index b629124..61991aa 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBillMain.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBillMain.cs"
@@ -31,5 +31,6 @@
public string HBatchNo;
public string HTakeSampleCheckBillNo;
public string HRemarkSN;
+ public Int64 HCheckQty;
}
}
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBillSub.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBillSub.cs"
index f087de4..efc27e3 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBillSub.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBillSub.cs"
@@ -40,6 +40,8 @@
public Int64 HInspectMethodID;//
public Int64 HInspectBasisID;//
public String HCompareSymbol;//
+
+ public decimal HInspectValQ;
//public HSamplingType;
//public HInspectionLevel;
//public HStrictness;
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillMain.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillMain.cs"
index 331c087..1ccb077 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillMain.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillMain.cs"
@@ -49,5 +49,7 @@
public string HBatchNo;
public string HTakeSampleCheckBillNo;
+
+ public string HRemarkSN;
}
}
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillSub.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillSub.cs"
index b2272d3..592b997 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillSub.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillSub.cs"
@@ -39,6 +39,8 @@
public Int64 HKeyInspect;
public Int64 HInspectInstruMentID;
public String HInspectResult;
+
+ public decimal HInspectValQ;
//public HSamplingType;
//public HInspectionLevel;
//public HStrictness;
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillSub_BadReason.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillSub_BadReason.cs"
new file mode 100644
index 0000000..b72a5c3
--- /dev/null
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_LastPieceCheckBillSub_BadReason.cs"
@@ -0,0 +1,22 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+ public class ClsQC_LastPieceCheckBillSub_BadReason
+ {
+ public long HInterID { get; set; }
+ public string HBillNo_bak { get; set; }
+ public int HEntryID { get; set; }
+ public string HCloseMan { get; set; }
+ public DateTime? HEntryCloseDate { get; set; }
+ public bool HCloseType { get; set; }
+ public string HRemark { get; set; }
+ public int HBadReasonID { get; set; }
+ public decimal HQty { get; set; }
+ public DateTime HCheckTime { get; set; }
+ }
+}
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBillSub.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBillSub.cs"
index 98c31e6..1650eaa 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBillSub.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBillSub.cs"
@@ -41,6 +41,8 @@
public Int64 HInspectMethodID;//检验方法
public Int64 HInspectBasisID;//检验标准
public String HCompareSymbol;//比较符
+
+ public decimal HInspectValQ;
//public HSamplingType;
//public HInspectionLevel;
//public HStrictness;
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBillSub_BadReason.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBillSub_BadReason.cs"
new file mode 100644
index 0000000..004d2de
--- /dev/null
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_OutCompCheckBillSub_BadReason.cs"
@@ -0,0 +1,22 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+ public class ClsQC_OutCompCheckBillSub_BadReason
+ {
+ public long HInterID { get; set; }
+ public string HBillNo_bak { get; set; }
+ public int HEntryID { get; set; }
+ public string HCloseMan { get; set; }
+ public DateTime? HEntryCloseDate { get; set; }
+ public bool HCloseType { get; set; }
+ public string HRemark { get; set; }
+ public int HBadReasonID { get; set; }
+ public decimal HQty { get; set; }
+ public DateTime HCheckTime { get; set; }
+ }
+}
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillMain.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillMain.cs"
index f95f75a..6b8d821 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillMain.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillMain.cs"
@@ -10,7 +10,7 @@
public Int64 HSupID;
public Int64 HMaterID;
public Int64 HInStockQty;
- public Int64 HCheckQty;
+ public decimal HCheckQty;
public Int64 HRightQty;
public Int64 HBadQty;
public Int64 HFirstCheckEmp;
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillSub.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillSub.cs"
index 142d999..e2f61f4 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillSub.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillSub.cs"
@@ -47,6 +47,7 @@
public Int64 HQualityStdID; // 质量标准
public Int64 HInspectMethodID; // 检验方法
public Int64 HInspectBasisID; // 检验依据
+ public decimal HInspectValQ; // 检验值(定量分析)
}
}
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillSub_BadReason.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillSub_BadReason.cs"
new file mode 100644
index 0000000..0d0ff3e
--- /dev/null
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_POStockInCheckBillSub_BadReason.cs"
@@ -0,0 +1,22 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+ public class ClsQC_POStockInCheckBillSub_BadReason
+ {
+ public long HInterID { get; set; }
+ public string HBillNo_bak { get; set; }
+ public int HEntryID { get; set; }
+ public string HCloseMan { get; set; }
+ public DateTime? HEntryCloseDate { get; set; }
+ public bool HCloseType { get; set; }
+ public string HRemark { get; set; }
+ public int HBadReasonID { get; set; }
+ public decimal HQty { get; set; }
+ public DateTime HCheckTime { get; set; }
+ }
+}
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_ProcessCheckBillSub.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_ProcessCheckBillSub.cs"
index 3dc3114..487cc0c 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_ProcessCheckBillSub.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_ProcessCheckBillSub.cs"
@@ -43,6 +43,7 @@
public Int64 HInspectMethodID;//检验方法
public Int64 HInspectBasisID;//检验标准
public String HCompareSymbol;//比较符
+ public decimal HInspectValQ;
//public HSamplingType;
//public HInspectionLevel;
//public HStrictness;
diff --git "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBillSub_Model.cs" "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBillSub_Model.cs"
new file mode 100644
index 0000000..2812826
--- /dev/null
+++ "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBillSub_Model.cs"
@@ -0,0 +1,29 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using DBUtility;
+
+namespace Model
+{
+ public class ClsCg_OrderTransportBillSub_Model : ClsGy_Base_Model
+ {
+ public int HInterID { get; set; }
+ public string HBillNo_bak { get; set; }
+ public int HEntryID { get; set; }
+ public string HCloseMan { get; set; }
+ public DateTime? HEntryCloseDate { get; set; }
+ public bool HCloseType { get; set; }
+ public string HRemark { get; set; }
+ public int? HSourceInterID { get; set; }
+ public int? HSourceEntryID { get; set; }
+ public string HSourceBillNo { get; set; }
+ public string HSourceBillType { get; set; }
+ public decimal? HRelationQty { get; set; }
+ public decimal? HRelationMoney { get; set; }
+ public int HItemSubID { get; set; }
+ public int? HMaterID { get; set; }
+ public decimal? HVolume { get; set; }
+ public string HPack { get; set; }
+ public int? HUnitID { get; set; }
+ }
+}
\ No newline at end of file
diff --git "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBillSub_Money_Model.cs" "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBillSub_Money_Model.cs"
new file mode 100644
index 0000000..9b0021e
--- /dev/null
+++ "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBillSub_Money_Model.cs"
@@ -0,0 +1,29 @@
+锘縰sing DBUtility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Model
+{
+ public class ClsCg_OrderTransportBillSub_Money_Model : ClsGy_Base_Model
+ {
+ public int HInterID { get; set; }
+ public string HBillNo_bak { get; set; }
+ public int HEntryID { get; set; }
+ public string HCloseMan { get; set; }
+ public DateTime? HEntryCloseDate { get; set; }
+ public bool HCloseType { get; set; }
+ public string HRemark { get; set; }
+ public int? HSourceInterID { get; set; }
+ public int? HSourceEntryID { get; set; }
+ public string HSourceBillNo { get; set; }
+ public string HSourceBillType { get; set; }
+ public decimal? HRelationQty { get; set; }
+ public decimal? HRelationMoney { get; set; }
+ public int HItemSubID { get; set; }
+ public int? HMoneysItemID { get; set; }
+ public decimal? HMoneys { get; set; }
+ public string HPic { get; set; }
+ public DateTime? HLoadTime { get; set; }
+ }
+}
\ No newline at end of file
diff --git "a/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBill_Model.cs" "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBill_Model.cs"
new file mode 100644
index 0000000..99880fd
--- /dev/null
+++ "b/Model/\351\207\207\350\264\255\347\256\241\347\220\206/ClsCg_OrderTransportBill_Model.cs"
@@ -0,0 +1,60 @@
+锘縰sing DBUtility;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Model
+{
+ public class ClsCg_OrderTransportBill_Model : ClsGy_Base_Model
+ {
+ public int HYear { get; set; }
+ public int HPeriod { get; set; }
+ public string HBillType { get; set; }
+ public string HBillSubType { get; set; }
+ public int HInterID { get; set; }
+ public DateTime HDate { get; set; }
+ public string HBillNo { get; set; }
+ public int HBillStatus { get; set; }
+ public int HCheckItemNowID { get; set; }
+ public int HCheckItemNextID { get; set; }
+ public int HCheckFlowID { get; set; }
+ public string HRemark { get; set; }
+ public string HBacker { get; set; }
+ public DateTime? HBackDate { get; set; }
+ public string HBackRemark { get; set; }
+ public string HChecker { get; set; }
+ public DateTime? HCheckDate { get; set; }
+ public string HMaker { get; set; }
+ public DateTime HMakeDate { get; set; }
+ public string HUpDater { get; set; }
+ public DateTime? HUpDateDate { get; set; }
+ public string HCloseMan { get; set; }
+ public DateTime? HCloseDate { get; set; }
+ public bool HCloseType { get; set; }
+ public string HDeleteMan { get; set; }
+ public DateTime? HDeleteDate { get; set; }
+ public string HMainSourceBillType { get; set; }
+ public int? HMainSourceInterID { get; set; }
+ public int? HMainSourceEntryID { get; set; }
+ public string HMainSourceBillNo { get; set; }
+ public int HPrintQty { get; set; }
+ public int HItemMainID { get; set; }
+ public int? HCusID { get; set; }
+ public int? HStockOutBillMainID { get; set; }
+ public string HStockOutBillNo { get; set; }
+ public int? HSupID { get; set; }
+ public string HOrderBillNumber { get; set; }
+ public string HOrderType { get; set; }
+ public string HTransportType { get; set; }
+ public decimal? HTransportMoney { get; set; }
+ public string HSendAddr { get; set; }
+ public string HReceAddr { get; set; }
+ public decimal? HGoodsVolume { get; set; }
+ public DateTime? HTakeGoodsTime { get; set; }
+ public DateTime? HArriveGoodsTime { get; set; }
+ public int? HCarID { get; set; }
+ public int? HDriverID { get; set; }
+ public decimal? HLoadRate { get; set; }
+ public int HOrderStatus { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/NETERPNoWin/bin/Release/AxInterop.grdes6Lib.dll b/NETERPNoWin/bin/Release/AxInterop.grdes6Lib.dll
deleted file mode 100644
index fbd0ebf..0000000
--- a/NETERPNoWin/bin/Release/AxInterop.grdes6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/AxInterop.gregn6Lib.dll b/NETERPNoWin/bin/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index f33f9ae..0000000
--- a/NETERPNoWin/bin/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/BLL.dll b/NETERPNoWin/bin/Release/BLL.dll
deleted file mode 100644
index 764bda7..0000000
--- a/NETERPNoWin/bin/Release/BLL.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/BLL.pdb b/NETERPNoWin/bin/Release/BLL.pdb
deleted file mode 100644
index 0f10a0b..0000000
--- a/NETERPNoWin/bin/Release/BLL.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/BaseSet.dll b/NETERPNoWin/bin/Release/BaseSet.dll
deleted file mode 100644
index e053d46..0000000
--- a/NETERPNoWin/bin/Release/BaseSet.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/BaseSet.pdb b/NETERPNoWin/bin/Release/BaseSet.pdb
deleted file mode 100644
index 252331b..0000000
--- a/NETERPNoWin/bin/Release/BaseSet.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/DAL.dll b/NETERPNoWin/bin/Release/DAL.dll
deleted file mode 100644
index 28a23d7..0000000
--- a/NETERPNoWin/bin/Release/DAL.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/DAL.pdb b/NETERPNoWin/bin/Release/DAL.pdb
deleted file mode 100644
index 204e059..0000000
--- a/NETERPNoWin/bin/Release/DAL.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/DBUtility.dll b/NETERPNoWin/bin/Release/DBUtility.dll
deleted file mode 100644
index 85cd0a6..0000000
--- a/NETERPNoWin/bin/Release/DBUtility.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/DBUtility.pdb b/NETERPNoWin/bin/Release/DBUtility.pdb
deleted file mode 100644
index a7e69cc..0000000
--- a/NETERPNoWin/bin/Release/DBUtility.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Interop.gregn6Lib.dll b/NETERPNoWin/bin/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index 528d259..0000000
--- a/NETERPNoWin/bin/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Kanban.dll b/NETERPNoWin/bin/Release/Kanban.dll
deleted file mode 100644
index 4950d6a..0000000
--- a/NETERPNoWin/bin/Release/Kanban.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Kanban.pdb b/NETERPNoWin/bin/Release/Kanban.pdb
deleted file mode 100644
index 5220ffb..0000000
--- a/NETERPNoWin/bin/Release/Kanban.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Kingdee.BOS.WebApi.Client.dll b/NETERPNoWin/bin/Release/Kingdee.BOS.WebApi.Client.dll
deleted file mode 100644
index 25dd347..0000000
--- a/NETERPNoWin/bin/Release/Kingdee.BOS.WebApi.Client.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Model.dll b/NETERPNoWin/bin/Release/Model.dll
deleted file mode 100644
index fbcf68d..0000000
--- a/NETERPNoWin/bin/Release/Model.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Model.pdb b/NETERPNoWin/bin/Release/Model.pdb
deleted file mode 100644
index 0b2c95c..0000000
--- a/NETERPNoWin/bin/Release/Model.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Models/ClsSc_MouldScrapOutBillMain.cs b/NETERPNoWin/bin/Release/Models/ClsSc_MouldScrapOutBillMain.cs
deleted file mode 100644
index 84269e7..0000000
--- a/NETERPNoWin/bin/Release/Models/ClsSc_MouldScrapOutBillMain.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WebAPI.Models
-{
- public class ClsSc_MouldScrapOutBillMain: DBUtility.ClsXt_BaseBillMain
- {
- public long HMouldID;// int --产品模具
- public string HPlanNo;// varchar(50) --点检计划编号
- public long HPlanInterID;// int --点检计划内码
- public string HBeginDate;// datetime --点检开始日期
- public string HEndDate;// datetime --点检结束日期
- public string HExplanation;// varchar(500) --摘要
- public string HInnerBillNo;// varchar(50) --内部单据号
- public long HDeptID;// int --部门ID
- public long HWHID;// int --仓库ID
- public long HSecManagerID;// int --
- public long HKeeperID;// int --
- public bool HRedBlueFlag;// bool
- }
-}
diff --git a/NETERPNoWin/bin/Release/NETERPNoWin.exe b/NETERPNoWin/bin/Release/NETERPNoWin.exe
deleted file mode 100644
index b3fd764..0000000
--- a/NETERPNoWin/bin/Release/NETERPNoWin.exe
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/NETERPNoWin.exe.config b/NETERPNoWin/bin/Release/NETERPNoWin.exe.config
deleted file mode 100644
index 51278a4..0000000
--- a/NETERPNoWin/bin/Release/NETERPNoWin.exe.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/NETERPNoWin/bin/Release/NETERPNoWin.pdb b/NETERPNoWin/bin/Release/NETERPNoWin.pdb
deleted file mode 100644
index e2a7c96..0000000
--- a/NETERPNoWin/bin/Release/NETERPNoWin.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/NPOI.OOXML.dll b/NETERPNoWin/bin/Release/NPOI.OOXML.dll
deleted file mode 100644
index a200471..0000000
--- a/NETERPNoWin/bin/Release/NPOI.OOXML.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/NPOI.OpenXml4Net.dll b/NETERPNoWin/bin/Release/NPOI.OpenXml4Net.dll
deleted file mode 100644
index 5034194..0000000
--- a/NETERPNoWin/bin/Release/NPOI.OpenXml4Net.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/NPOI.OpenXmlFormats.dll b/NETERPNoWin/bin/Release/NPOI.OpenXmlFormats.dll
deleted file mode 100644
index df8708d..0000000
--- a/NETERPNoWin/bin/Release/NPOI.OpenXmlFormats.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/NPOI.dll b/NETERPNoWin/bin/Release/NPOI.dll
deleted file mode 100644
index 907cfb1..0000000
--- a/NETERPNoWin/bin/Release/NPOI.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Newtonsoft.Json.dll b/NETERPNoWin/bin/Release/Newtonsoft.Json.dll
deleted file mode 100644
index 7af125a..0000000
--- a/NETERPNoWin/bin/Release/Newtonsoft.Json.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/OAM.dll b/NETERPNoWin/bin/Release/OAM.dll
deleted file mode 100644
index 2583842..0000000
--- a/NETERPNoWin/bin/Release/OAM.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/OAM.pdb b/NETERPNoWin/bin/Release/OAM.pdb
deleted file mode 100644
index 7612e6f..0000000
--- a/NETERPNoWin/bin/Release/OAM.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/PlanM.dll b/NETERPNoWin/bin/Release/PlanM.dll
deleted file mode 100644
index e0ef258..0000000
--- a/NETERPNoWin/bin/Release/PlanM.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/PlanM.pdb b/NETERPNoWin/bin/Release/PlanM.pdb
deleted file mode 100644
index 0d5e494..0000000
--- a/NETERPNoWin/bin/Release/PlanM.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Pub_Class.dll b/NETERPNoWin/bin/Release/Pub_Class.dll
deleted file mode 100644
index 9345109..0000000
--- a/NETERPNoWin/bin/Release/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Pub_Class.pdb b/NETERPNoWin/bin/Release/Pub_Class.pdb
deleted file mode 100644
index 00d3533..0000000
--- a/NETERPNoWin/bin/Release/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Pub_Control.dll b/NETERPNoWin/bin/Release/Pub_Control.dll
deleted file mode 100644
index 267256b..0000000
--- a/NETERPNoWin/bin/Release/Pub_Control.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Pub_Control.pdb b/NETERPNoWin/bin/Release/Pub_Control.pdb
deleted file mode 100644
index c77ec5c..0000000
--- a/NETERPNoWin/bin/Release/Pub_Control.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/SQLHelper.dll b/NETERPNoWin/bin/Release/SQLHelper.dll
deleted file mode 100644
index f29342c..0000000
--- a/NETERPNoWin/bin/Release/SQLHelper.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/SQLHelper.pdb b/NETERPNoWin/bin/Release/SQLHelper.pdb
deleted file mode 100644
index a15cdb7..0000000
--- a/NETERPNoWin/bin/Release/SQLHelper.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/WarM.dll b/NETERPNoWin/bin/Release/WarM.dll
deleted file mode 100644
index ea41e3a..0000000
--- a/NETERPNoWin/bin/Release/WarM.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/WarM.pdb b/NETERPNoWin/bin/Release/WarM.pdb
deleted file mode 100644
index 7611ce1..0000000
--- a/NETERPNoWin/bin/Release/WarM.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/WorkM.dll b/NETERPNoWin/bin/Release/WorkM.dll
deleted file mode 100644
index e6e952a..0000000
--- a/NETERPNoWin/bin/Release/WorkM.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/WorkM.pdb b/NETERPNoWin/bin/Release/WorkM.pdb
deleted file mode 100644
index 0b4a6ae..0000000
--- a/NETERPNoWin/bin/Release/WorkM.pdb
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/grpc_csharp_ext.x64.dll b/NETERPNoWin/bin/Release/grpc_csharp_ext.x64.dll
deleted file mode 100644
index b09d9b4..0000000
--- a/NETERPNoWin/bin/Release/grpc_csharp_ext.x64.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/grpc_csharp_ext.x86.dll b/NETERPNoWin/bin/Release/grpc_csharp_ext.x86.dll
deleted file mode 100644
index 80f6ae1..0000000
--- a/NETERPNoWin/bin/Release/grpc_csharp_ext.x86.dll
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/libgrpc_csharp_ext.x64.dylib b/NETERPNoWin/bin/Release/libgrpc_csharp_ext.x64.dylib
deleted file mode 100644
index e2a7a8f..0000000
--- a/NETERPNoWin/bin/Release/libgrpc_csharp_ext.x64.dylib
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/bin/Release/libgrpc_csharp_ext.x64.so b/NETERPNoWin/bin/Release/libgrpc_csharp_ext.x64.so
deleted file mode 100644
index 7523925..0000000
--- a/NETERPNoWin/bin/Release/libgrpc_csharp_ext.x64.so
+++ /dev/null
Binary files differ
diff --git a/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache b/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
index 17069e8..48f07b9 100644
--- a/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
+++ b/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
Binary files differ
diff --git a/OAM/bin/Release/BLL.dll b/OAM/bin/Release/BLL.dll
deleted file mode 100644
index 764bda7..0000000
--- a/OAM/bin/Release/BLL.dll
+++ /dev/null
Binary files differ
diff --git a/OAM/bin/Release/BLL.pdb b/OAM/bin/Release/BLL.pdb
deleted file mode 100644
index 0f10a0b..0000000
--- a/OAM/bin/Release/BLL.pdb
+++ /dev/null
Binary files differ
diff --git a/OAM/bin/Release/BaseSet.dll b/OAM/bin/Release/BaseSet.dll
deleted file mode 100644
index e053d46..0000000
--- a/OAM/bin/Release/BaseSet.dll
+++ /dev/null
Binary files differ
diff --git a/OAM/bin/Release/BaseSet.pdb b/OAM/bin/Release/BaseSet.pdb
deleted file mode 100644
index 252331b..0000000
--- a/OAM/bin/Release/BaseSet.pdb
+++ /dev/null
Binary files differ
diff --git a/OAM/bin/Release/DAL.dll b/OAM/bin/Release/DAL.dll
deleted file mode 100644
index 28a23d7..0000000
--- a/OAM/bin/Release/DAL.dll
+++ /dev/null
Binary files differ
diff --git a/OAM/bin/Release/DAL.pdb b/OAM/bin/Release/DAL.pdb
deleted file mode 100644
index 204e059..0000000
--- a/OAM/bin/Release/DAL.pdb
+++ /dev/null
Binary files differ
diff --git a/OAM/bin/Release/DBUtility.dll b/OAM/bin/Release/DBUtility.dll
deleted file mode 100644
index 85cd0a6..0000000
--- a/OAM/bin/Release/DBUtility.dll
+++ /dev/null
Binary files differ
diff --git a/OAM/bin/Release/DBUtility.pdb b/OAM/bin/Release/DBUtility.pdb
deleted file mode 100644
index a7e69cc..0000000
--- a/OAM/bin/Release/DBUtility.pdb
+++ /dev/null
Binary files differ
diff --git a/OAM/bin/Release/Model.dll b/OAM/bin/Release/Model.dll
deleted file mode 100644
index fbcf68d..0000000
--- a/OAM/bin/Release/Model.dll
+++ /dev/null
Binary files differ
diff --git a/OAM/bin/Release/Model.pdb b/OAM/bin/Release/Model.pdb
deleted file mode 100644
index 0b2c95c..0000000
--- a/OAM/bin/Release/Model.pdb
+++ /dev/null
Binary files differ
diff --git a/OAM/bin/Release/OAM.dll b/OAM/bin/Release/OAM.dll
deleted file mode 100644
index 2583842..0000000
--- a/OAM/bin/Release/OAM.dll
+++ /dev/null
Binary files differ
diff --git a/OAM/bin/Release/OAM.pdb b/OAM/bin/Release/OAM.pdb
deleted file mode 100644
index 7612e6f..0000000
--- a/OAM/bin/Release/OAM.pdb
+++ /dev/null
Binary files differ
diff --git a/OAM/bin/Release/Pub_Class.dll b/OAM/bin/Release/Pub_Class.dll
deleted file mode 100644
index 9345109..0000000
--- a/OAM/bin/Release/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/OAM/bin/Release/Pub_Class.pdb b/OAM/bin/Release/Pub_Class.pdb
deleted file mode 100644
index 00d3533..0000000
--- a/OAM/bin/Release/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/OAM/bin/Release/Pub_Control.dll b/OAM/bin/Release/Pub_Control.dll
deleted file mode 100644
index 267256b..0000000
--- a/OAM/bin/Release/Pub_Control.dll
+++ /dev/null
Binary files differ
diff --git a/OAM/bin/Release/Pub_Control.pdb b/OAM/bin/Release/Pub_Control.pdb
deleted file mode 100644
index c77ec5c..0000000
--- a/OAM/bin/Release/Pub_Control.pdb
+++ /dev/null
Binary files differ
diff --git a/OAM/bin/Release/SQLHelper.dll b/OAM/bin/Release/SQLHelper.dll
deleted file mode 100644
index f29342c..0000000
--- a/OAM/bin/Release/SQLHelper.dll
+++ /dev/null
Binary files differ
diff --git a/OAM/bin/Release/SQLHelper.pdb b/OAM/bin/Release/SQLHelper.pdb
deleted file mode 100644
index a15cdb7..0000000
--- a/OAM/bin/Release/SQLHelper.pdb
+++ /dev/null
Binary files differ
diff --git a/PayM/bin/Release/BLL.dll b/PayM/bin/Release/BLL.dll
deleted file mode 100644
index 764bda7..0000000
--- a/PayM/bin/Release/BLL.dll
+++ /dev/null
Binary files differ
diff --git a/PayM/bin/Release/BLL.pdb b/PayM/bin/Release/BLL.pdb
deleted file mode 100644
index 0f10a0b..0000000
--- a/PayM/bin/Release/BLL.pdb
+++ /dev/null
Binary files differ
diff --git a/PayM/bin/Release/DAL.dll b/PayM/bin/Release/DAL.dll
deleted file mode 100644
index 28a23d7..0000000
--- a/PayM/bin/Release/DAL.dll
+++ /dev/null
Binary files differ
diff --git a/PayM/bin/Release/DAL.pdb b/PayM/bin/Release/DAL.pdb
deleted file mode 100644
index 204e059..0000000
--- a/PayM/bin/Release/DAL.pdb
+++ /dev/null
Binary files differ
diff --git a/PayM/bin/Release/DBUtility.dll b/PayM/bin/Release/DBUtility.dll
deleted file mode 100644
index 85cd0a6..0000000
--- a/PayM/bin/Release/DBUtility.dll
+++ /dev/null
Binary files differ
diff --git a/PayM/bin/Release/DBUtility.pdb b/PayM/bin/Release/DBUtility.pdb
deleted file mode 100644
index a7e69cc..0000000
--- a/PayM/bin/Release/DBUtility.pdb
+++ /dev/null
Binary files differ
diff --git a/PayM/bin/Release/Model.dll b/PayM/bin/Release/Model.dll
deleted file mode 100644
index fbcf68d..0000000
--- a/PayM/bin/Release/Model.dll
+++ /dev/null
Binary files differ
diff --git a/PayM/bin/Release/Model.pdb b/PayM/bin/Release/Model.pdb
deleted file mode 100644
index 0b2c95c..0000000
--- a/PayM/bin/Release/Model.pdb
+++ /dev/null
Binary files differ
diff --git a/PayM/bin/Release/PayM.dll b/PayM/bin/Release/PayM.dll
deleted file mode 100644
index b2278c3..0000000
--- a/PayM/bin/Release/PayM.dll
+++ /dev/null
Binary files differ
diff --git a/PayM/bin/Release/PayM.pdb b/PayM/bin/Release/PayM.pdb
deleted file mode 100644
index 9108890..0000000
--- a/PayM/bin/Release/PayM.pdb
+++ /dev/null
Binary files differ
diff --git a/PayM/bin/Release/Pub_Class.dll b/PayM/bin/Release/Pub_Class.dll
deleted file mode 100644
index 9345109..0000000
--- a/PayM/bin/Release/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/PayM/bin/Release/Pub_Class.pdb b/PayM/bin/Release/Pub_Class.pdb
deleted file mode 100644
index 00d3533..0000000
--- a/PayM/bin/Release/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/PayM/bin/Release/Pub_Control.dll b/PayM/bin/Release/Pub_Control.dll
deleted file mode 100644
index 267256b..0000000
--- a/PayM/bin/Release/Pub_Control.dll
+++ /dev/null
Binary files differ
diff --git a/PayM/bin/Release/Pub_Control.pdb b/PayM/bin/Release/Pub_Control.pdb
deleted file mode 100644
index c77ec5c..0000000
--- a/PayM/bin/Release/Pub_Control.pdb
+++ /dev/null
Binary files differ
diff --git a/PayM/bin/Release/SQLHelper.dll b/PayM/bin/Release/SQLHelper.dll
deleted file mode 100644
index f29342c..0000000
--- a/PayM/bin/Release/SQLHelper.dll
+++ /dev/null
Binary files differ
diff --git a/PayM/bin/Release/SQLHelper.pdb b/PayM/bin/Release/SQLHelper.pdb
deleted file mode 100644
index a15cdb7..0000000
--- a/PayM/bin/Release/SQLHelper.pdb
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/Release/PayM.csproj.ResolveComReference.cache b/PayM/obj/Release/PayM.csproj.ResolveComReference.cache
index a43307a..48f07b9 100644
--- a/PayM/obj/Release/PayM.csproj.ResolveComReference.cache
+++ b/PayM/obj/Release/PayM.csproj.ResolveComReference.cache
Binary files differ
diff --git a/PayM/obj/Release/PayM.dll b/PayM/obj/Release/PayM.dll
deleted file mode 100644
index b2278c3..0000000
--- a/PayM/obj/Release/PayM.dll
+++ /dev/null
Binary files differ
diff --git a/PayM/obj/Release/PayM.pdb b/PayM/obj/Release/PayM.pdb
deleted file mode 100644
index 9108890..0000000
--- a/PayM/obj/Release/PayM.pdb
+++ /dev/null
Binary files differ
diff --git a/PlanM/bin/Release/BLL.dll b/PlanM/bin/Release/BLL.dll
deleted file mode 100644
index 764bda7..0000000
--- a/PlanM/bin/Release/BLL.dll
+++ /dev/null
Binary files differ
diff --git a/PlanM/bin/Release/BLL.pdb b/PlanM/bin/Release/BLL.pdb
deleted file mode 100644
index 0f10a0b..0000000
--- a/PlanM/bin/Release/BLL.pdb
+++ /dev/null
Binary files differ
diff --git a/PlanM/bin/Release/DAL.dll b/PlanM/bin/Release/DAL.dll
deleted file mode 100644
index 28a23d7..0000000
--- a/PlanM/bin/Release/DAL.dll
+++ /dev/null
Binary files differ
diff --git a/PlanM/bin/Release/DAL.pdb b/PlanM/bin/Release/DAL.pdb
deleted file mode 100644
index 204e059..0000000
--- a/PlanM/bin/Release/DAL.pdb
+++ /dev/null
Binary files differ
diff --git a/PlanM/bin/Release/DBUtility.dll b/PlanM/bin/Release/DBUtility.dll
deleted file mode 100644
index 85cd0a6..0000000
--- a/PlanM/bin/Release/DBUtility.dll
+++ /dev/null
Binary files differ
diff --git a/PlanM/bin/Release/DBUtility.pdb b/PlanM/bin/Release/DBUtility.pdb
deleted file mode 100644
index a7e69cc..0000000
--- a/PlanM/bin/Release/DBUtility.pdb
+++ /dev/null
Binary files differ
diff --git a/PlanM/bin/Release/Model.dll b/PlanM/bin/Release/Model.dll
deleted file mode 100644
index fbcf68d..0000000
--- a/PlanM/bin/Release/Model.dll
+++ /dev/null
Binary files differ
diff --git a/PlanM/bin/Release/Model.pdb b/PlanM/bin/Release/Model.pdb
deleted file mode 100644
index 0b2c95c..0000000
--- a/PlanM/bin/Release/Model.pdb
+++ /dev/null
Binary files differ
diff --git a/PlanM/bin/Release/PlanM.dll b/PlanM/bin/Release/PlanM.dll
deleted file mode 100644
index e0ef258..0000000
--- a/PlanM/bin/Release/PlanM.dll
+++ /dev/null
Binary files differ
diff --git a/PlanM/bin/Release/PlanM.pdb b/PlanM/bin/Release/PlanM.pdb
deleted file mode 100644
index 0d5e494..0000000
--- a/PlanM/bin/Release/PlanM.pdb
+++ /dev/null
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Class.dll b/PlanM/bin/Release/Pub_Class.dll
deleted file mode 100644
index 9345109..0000000
--- a/PlanM/bin/Release/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Class.pdb b/PlanM/bin/Release/Pub_Class.pdb
deleted file mode 100644
index 00d3533..0000000
--- a/PlanM/bin/Release/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Control.dll b/PlanM/bin/Release/Pub_Control.dll
deleted file mode 100644
index 267256b..0000000
--- a/PlanM/bin/Release/Pub_Control.dll
+++ /dev/null
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Control.pdb b/PlanM/bin/Release/Pub_Control.pdb
deleted file mode 100644
index c77ec5c..0000000
--- a/PlanM/bin/Release/Pub_Control.pdb
+++ /dev/null
Binary files differ
diff --git a/PlanM/bin/Release/SQLHelper.dll b/PlanM/bin/Release/SQLHelper.dll
deleted file mode 100644
index f29342c..0000000
--- a/PlanM/bin/Release/SQLHelper.dll
+++ /dev/null
Binary files differ
diff --git a/PlanM/bin/Release/SQLHelper.pdb b/PlanM/bin/Release/SQLHelper.pdb
deleted file mode 100644
index a15cdb7..0000000
--- a/PlanM/bin/Release/SQLHelper.pdb
+++ /dev/null
Binary files differ
diff --git a/ProM/bin/Release/BLL.dll b/ProM/bin/Release/BLL.dll
deleted file mode 100644
index 764bda7..0000000
--- a/ProM/bin/Release/BLL.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/bin/Release/BLL.pdb b/ProM/bin/Release/BLL.pdb
deleted file mode 100644
index 0f10a0b..0000000
--- a/ProM/bin/Release/BLL.pdb
+++ /dev/null
Binary files differ
diff --git a/ProM/bin/Release/DAL.dll b/ProM/bin/Release/DAL.dll
deleted file mode 100644
index 28a23d7..0000000
--- a/ProM/bin/Release/DAL.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/bin/Release/DAL.pdb b/ProM/bin/Release/DAL.pdb
deleted file mode 100644
index 204e059..0000000
--- a/ProM/bin/Release/DAL.pdb
+++ /dev/null
Binary files differ
diff --git a/ProM/bin/Release/DBUtility.dll b/ProM/bin/Release/DBUtility.dll
deleted file mode 100644
index 85cd0a6..0000000
--- a/ProM/bin/Release/DBUtility.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/bin/Release/DBUtility.pdb b/ProM/bin/Release/DBUtility.pdb
deleted file mode 100644
index a7e69cc..0000000
--- a/ProM/bin/Release/DBUtility.pdb
+++ /dev/null
Binary files differ
diff --git a/ProM/bin/Release/Model.dll b/ProM/bin/Release/Model.dll
deleted file mode 100644
index fbcf68d..0000000
--- a/ProM/bin/Release/Model.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/bin/Release/Model.pdb b/ProM/bin/Release/Model.pdb
deleted file mode 100644
index 0b2c95c..0000000
--- a/ProM/bin/Release/Model.pdb
+++ /dev/null
Binary files differ
diff --git a/ProM/bin/Release/ProM.dll b/ProM/bin/Release/ProM.dll
deleted file mode 100644
index a6909e5..0000000
--- a/ProM/bin/Release/ProM.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/bin/Release/ProM.pdb b/ProM/bin/Release/ProM.pdb
deleted file mode 100644
index 8a3c903..0000000
--- a/ProM/bin/Release/ProM.pdb
+++ /dev/null
Binary files differ
diff --git a/ProM/bin/Release/Pub_Class.dll b/ProM/bin/Release/Pub_Class.dll
deleted file mode 100644
index 9345109..0000000
--- a/ProM/bin/Release/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/bin/Release/Pub_Class.pdb b/ProM/bin/Release/Pub_Class.pdb
deleted file mode 100644
index 00d3533..0000000
--- a/ProM/bin/Release/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/ProM/bin/Release/Pub_Control.dll b/ProM/bin/Release/Pub_Control.dll
deleted file mode 100644
index 267256b..0000000
--- a/ProM/bin/Release/Pub_Control.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/bin/Release/Pub_Control.pdb b/ProM/bin/Release/Pub_Control.pdb
deleted file mode 100644
index c77ec5c..0000000
--- a/ProM/bin/Release/Pub_Control.pdb
+++ /dev/null
Binary files differ
diff --git a/ProM/bin/Release/SQLHelper.dll b/ProM/bin/Release/SQLHelper.dll
deleted file mode 100644
index f29342c..0000000
--- a/ProM/bin/Release/SQLHelper.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/bin/Release/SQLHelper.pdb b/ProM/bin/Release/SQLHelper.pdb
deleted file mode 100644
index a15cdb7..0000000
--- a/ProM/bin/Release/SQLHelper.pdb
+++ /dev/null
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index 638a1a3..ce919d2 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 895e592..8d25596 100644
--- a/Pub_Class/bin/Release/Pub_Class.pdb
+++ b/Pub_Class/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.dll b/Pub_Class/bin/Release/SyntacticSugar.dll
index 942273d..c0635b3 100644
--- a/Pub_Class/bin/Release/SyntacticSugar.dll
+++ b/Pub_Class/bin/Release/SyntacticSugar.dll
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.pdb b/Pub_Class/bin/Release/SyntacticSugar.pdb
index dcb8c0e..ca3eca3 100644
--- a/Pub_Class/bin/Release/SyntacticSugar.pdb
+++ b/Pub_Class/bin/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.dll b/Pub_Control/bin/Release/Pub_Class.dll
index 638a1a3..ce919d2 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 895e592..8d25596 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 347ba36..e0a4452 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 0adc8ce..76fd762 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 638a1a3..ce919d2 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 895e592..8d25596 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 306da35..af26920 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 76eae00..847ae93 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 87f69ee..f5e894a 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 306da35..af26920 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 76eae00..847ae93 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/SelM/bin/Release/BLL.dll b/SelM/bin/Release/BLL.dll
deleted file mode 100644
index 764bda7..0000000
--- a/SelM/bin/Release/BLL.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/BLL.pdb b/SelM/bin/Release/BLL.pdb
deleted file mode 100644
index 0f10a0b..0000000
--- a/SelM/bin/Release/BLL.pdb
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/DAL.dll b/SelM/bin/Release/DAL.dll
deleted file mode 100644
index 28a23d7..0000000
--- a/SelM/bin/Release/DAL.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/DAL.pdb b/SelM/bin/Release/DAL.pdb
deleted file mode 100644
index 204e059..0000000
--- a/SelM/bin/Release/DAL.pdb
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/DBUtility.dll b/SelM/bin/Release/DBUtility.dll
deleted file mode 100644
index 85cd0a6..0000000
--- a/SelM/bin/Release/DBUtility.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/DBUtility.pdb b/SelM/bin/Release/DBUtility.pdb
deleted file mode 100644
index a7e69cc..0000000
--- a/SelM/bin/Release/DBUtility.pdb
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/Model.dll b/SelM/bin/Release/Model.dll
deleted file mode 100644
index fbcf68d..0000000
--- a/SelM/bin/Release/Model.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/Model.pdb b/SelM/bin/Release/Model.pdb
deleted file mode 100644
index 0b2c95c..0000000
--- a/SelM/bin/Release/Model.pdb
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/Pub_Class.dll b/SelM/bin/Release/Pub_Class.dll
deleted file mode 100644
index 9345109..0000000
--- a/SelM/bin/Release/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/Pub_Class.pdb b/SelM/bin/Release/Pub_Class.pdb
deleted file mode 100644
index 00d3533..0000000
--- a/SelM/bin/Release/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/Pub_Control.dll b/SelM/bin/Release/Pub_Control.dll
deleted file mode 100644
index 267256b..0000000
--- a/SelM/bin/Release/Pub_Control.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/Pub_Control.pdb b/SelM/bin/Release/Pub_Control.pdb
deleted file mode 100644
index c77ec5c..0000000
--- a/SelM/bin/Release/Pub_Control.pdb
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/SQLHelper.dll b/SelM/bin/Release/SQLHelper.dll
deleted file mode 100644
index f29342c..0000000
--- a/SelM/bin/Release/SQLHelper.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/SQLHelper.pdb b/SelM/bin/Release/SQLHelper.pdb
deleted file mode 100644
index a15cdb7..0000000
--- a/SelM/bin/Release/SQLHelper.pdb
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/SelM.dll b/SelM/bin/Release/SelM.dll
deleted file mode 100644
index 910d033..0000000
--- a/SelM/bin/Release/SelM.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/SelM.pdb b/SelM/bin/Release/SelM.pdb
deleted file mode 100644
index 6e1dbe5..0000000
--- a/SelM/bin/Release/SelM.pdb
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/WarM.dll b/SelM/bin/Release/WarM.dll
deleted file mode 100644
index ea41e3a..0000000
--- a/SelM/bin/Release/WarM.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/WarM.pdb b/SelM/bin/Release/WarM.pdb
deleted file mode 100644
index 7611ce1..0000000
--- a/SelM/bin/Release/WarM.pdb
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/WorkM.dll b/SelM/bin/Release/WorkM.dll
deleted file mode 100644
index e6e952a..0000000
--- a/SelM/bin/Release/WorkM.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/bin/Release/WorkM.pdb b/SelM/bin/Release/WorkM.pdb
deleted file mode 100644
index 0b4a6ae..0000000
--- a/SelM/bin/Release/WorkM.pdb
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
index 5b1b47c..d8e48a9 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
index 2ab4ed6..9679f05 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.dll b/SyntacticSugar/bin/Release/SyntacticSugar.dll
index 942273d..c0635b3 100644
--- a/SyntacticSugar/bin/Release/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Release/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.pdb b/SyntacticSugar/bin/Release/SyntacticSugar.pdb
index dcb8c0e..ca3eca3 100644
--- a/SyntacticSugar/bin/Release/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index 0c8a028..3d92a3e 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -14,11 +14,6 @@
D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\WMES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\GitHub\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
@@ -31,12 +26,15 @@
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
<<<<<<< HEAD
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-=======
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
->>>>>>> 78f4b35f6f8fc84c3eeb1b47270bcf836e65fba5
+=======
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+>>>>>>> e6c9dc1eb94da184e00ff28ac6a558b788d05a6e
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index 5b1b47c..d8e48a9 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
index 2ab4ed6..9679f05 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
similarity index 100%
rename from SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
rename to SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
index 1b794e2..0518b72 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -17,7 +17,7 @@
D:\WMES\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.dll b/SyntacticSugar/obj/Release/SyntacticSugar.dll
index 942273d..c0635b3 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.pdb b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
index dcb8c0e..ca3eca3 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 9b9313f..a5f8263 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -719,6 +719,12 @@
<Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New_Change.designer.cs">
<DependentUpon>Gy_BarCodeBill_automaticallyByPLC_New_Change.cs</DependentUpon>
</Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_XB_SelectMater.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_XB_SelectMater.designer.cs">
+ <DependentUpon>Gy_BarCodeBill_XB_SelectMater.cs</DependentUpon>
+ </Compile>
<Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_Rework.cs">
<SubType>Form</SubType>
</Compile>
@@ -1232,6 +1238,9 @@
<DependentUpon>Gy_BarCodeBill_automaticallyByPLC_New_Change.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_XB_SelectMater.resx">
+ <DependentUpon>Gy_BarCodeBill_XB_SelectMater.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_Rework.resx">
<DependentUpon>Gy_BarCodeBill_Rework.cs</DependentUpon>
</EmbeddedResource>
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
index 45511c3..1b1d01d 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_Rework.cs"
@@ -595,6 +595,16 @@
string HPinfan = ""; //鍝佺暘
DateTime HEndDate; //璁″垝瀹屽伐鏃ユ湡
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0 && grdMain.Rows[j].Cells[HSubjoin2Col].Value.ToString() == "")
+ {
+ MessageBox.Show("绗�" + (j+1) + "琛岋紝鏈哄瀷鐮佹湭缁存姢锛屼笉鍏佽鐢熸垚鏉＄爜");
+ bc.Enabled = true;
+ return;
+ }
+ }
+
oCn.BeginTran();
Application.DoEvents();
//鑾峰彇鍚屼竴鎵圭敓鎴愭潯鐮佹�荤鏁�
@@ -674,7 +684,7 @@
string HModelLeft = HModelLen >= 4 ? grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString() : "";
string HSubjoin2 = grdMain.Rows[j].Cells[HSubjoin2Col].Value.ToString();
//鏉＄爜缂栧彿 = 宸ュ巶浠ｇ爜锛�1锛� + 杞﹂棿浠ｇ爜锛�060113锛�+ 鏈哄瀷鍙� + 骞� + 鏈� + 鏃� + 娴佹按鍙�
- TM = "1" + 060113.ToString() + HSubjoin2 + sYear + sPeriod + sDay + LSH.ToString("D5");
+ TM = "1" + "060113" + HSubjoin2 + sYear + sPeriod + sDay + LSH.ToString("D5");
}
HEntryID = j + 1;
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XB_SelectMater.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XB_SelectMater.cs"
new file mode 100644
index 0000000..c332cd3
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XB_SelectMater.cs"
@@ -0,0 +1,2215 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using gregn6Lib;
+using Pub_Class;
+using System.Threading;
+
+namespace WarM
+{
+ public partial class Gy_BarCodeBill_XB_SelectMater : Form
+ {
+ public Gy_BarCodeBill_XB_SelectMater()
+ {
+ InitializeComponent();
+ }
+ //瀹氫箟
+ public const Int16 HTagCol = 0;
+ public const Int16 HSnoCol = 1;
+ public const Int16 HMainIDCol = 2;
+ public const Int16 HSubIDCol = 3;
+ public const Int16 HBillNoCol = 4;
+ public const Int16 HBillTypeCol = 5;
+ public const Int16 HMaterIDCol = 6;
+ public const Int16 HMaterNumberCol = 7;
+ public const Int16 HMaterNameCol = 8;
+ public const Int16 HSubjoin2Col = 9;
+ public const Int16 HMaterModelCol = 10;
+ public const Int16 HAuxPropIDCol = 11;
+ public const Int16 HAuxPropNumberCol = 12;
+ public const Int16 HAuxPropNameCol = 13;
+ public const Int16 HBatchManagerCol = 14;
+ public const Int16 HBatchNoCol = 15;
+ public const Int16 HBarCodeTypeCol = 16;
+ public const Int16 HQtyCol = 17;
+ public const Int16 HMinQtyCol = 18;
+ public const Int16 HBQtyCol = 19;
+ public const Int16 HinitQtyCol = 20;
+ public const Int16 HISKFPERIODCol = 21;
+ public const Int16 HProduceDateCol = 22;
+ public const Int16 HExpiryDateCol = 23;
+ public const Int16 HEXPUNITCol = 24;
+ public const Int16 HEXPPERIODCol = 25;
+ public const Int16 HGiveAwayFlagCol = 26;
+ public const Int16 HUnitIDCol = 27;
+ public const Int16 HUnitNumberCol = 28;
+ public const Int16 HUnitNameCol = 29;
+ public const Int16 HWhIDCol = 30;
+ public const Int16 HWhNumberCol = 31;
+ public const Int16 HWhNameCol = 32;
+ public const Int16 HSPIDCol = 33;
+ public const Int16 HSPNumberCol = 34;
+ public const Int16 HSPNameCol = 35;
+ public const Int16 HMTONoCol = 36;
+ public const Int16 HRemarkCol = 37;
+ public const Int16 HDeptIDCol = 38;
+ public const Int16 HDeptNumberCol = 39;
+ public const Int16 HDeptNameCol = 40;
+ public const Int16 HSourceIDCol = 41;
+ public const Int16 HSourceNumberCol = 42;
+ public const Int16 HSourceNameCol = 43;
+ public const Int16 HSupIDCol = 44;
+ public const Int16 HSupNumberCol = 45;
+ public const Int16 HSupNameCol = 46;
+ public const Int16 HGroupIDCol = 47;
+ public const Int16 HGroupNumberCol = 48;
+ public const Int16 HGroupNameCol = 49;
+ public const Int16 HCusIDCol = 50;
+ public const Int16 HCusNumberCol = 51;
+ public const Int16 HCusNameCol = 52;
+ public const Int16 HCusTypeCol = 53;
+ public const Int16 HSeOrderBillNoCol = 54;
+ public const Int16 HSeOrderSEQCol = 55;
+ public const Int16 HInnerBillNoCol = 56;
+ public const Int16 HEndDateCol = 57;
+ public const Int16 HSourceBillQtyCol = 58;
+ public const Int16 HPinfanCol = 59;
+
+ //
+ public string ModName = "85";
+ public string ModCaption = "鏉＄爜鐢熸垚";
+ public const string ModRightName = "Gy_BarCodeBill_XB_SelectMater";
+ public const string ModRightNameSourceQty = ModRightName + "_SourceQty"; //瓒呮簮鍗曟暟閲忔帶鍒�
+
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public DBUtility.ClsXt_BaseBill BaseBill;
+ public DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
+ ClsGridViewSum oSumGrid = new ClsGridViewSum();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ public Frm_Split oDlg = new Frm_Split();
+ public bool grdStatus;
+ public int selectRow = 0;
+ public Int64 HInterID = 0; //鍐呯爜
+ public Int64 HOrgID = ClsPub.HOrgID;
+ public string HOrgNumber = ClsPub.HOrgNumber;
+ public string HOrgName = ClsPub.HOrgName;
+ public string ERPMode = ""; //ERP妯″紡锛圵ISE銆丆LOUD锛�
+ public string CampanyName = ""; //瀹㈡埛瀹氬埗鍖栧悕绉�
+ public string SourceQtyCtl = ""; //瓒呮簮鍗曟暟閲忔帶鍒�
+ public long PrintQty = 0; //鍏佽鏉＄爜鎵撳嵃娆℃暟
+ public string PrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鎺у埗
+ public string UpdatePrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鏇存柊
+ public string sReturn = "";
+ public string HExpiryDate = "";
+
+ #region 鍥哄畾浠ｇ爜
+
+ //娓呯┖鐣岄潰
+ public void Sub_ClearBill()
+ {
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
+ //鑾峰彇褰撳墠缁勭粐
+ DataSet Ds1 = oCn.RunProcReturn("select * from Xt_ORGANIZATIONS with(nolock) where HItemID=" + ClsPub.HOrgID, "Xt_ORGANIZATIONS", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (Ds1.Tables[0].Rows.Count != 0)
+ {
+ cmbHOrgID.Text = DBUtility.ClsPub.isStrNull(Ds1.Tables[0].Rows[0]["HName"]);
+ }
+
+ txtHMaker.Text = ClsPub.CurUserName;
+ txtHMakeDate.Text = "";
+ txtHChecker.Text = "";
+ txtHCheckDate.Text = "";
+ txtHCloseMan.Text = "";
+ txtHCloseDate.Text = "";
+ txtHDeleteMan.Text = "";
+ txtHDeleteDate.Text = "";
+ txtHUpDater.Text = "";
+ txtHUpDateDate.Text = "";
+ initGrid();
+ grdList.DataSource = null;
+ }
+
+ //淇濆瓨鍒楀
+ private void bclk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdList, this.Name + "grdList");
+ }
+
+ //榛樿鍒楀
+ private void mrlk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdList, this.Name + "grdList");
+ }
+
+ //澧炶鎸夐挳
+ private void AddRow_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.AddRow(oSumGrid);
+ }
+
+ //鍒犺鎸夌航
+ private void DelRow_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DelRow(oSumGrid);
+ }
+
+ //淇濆瓨鎸夐挳
+ private void bc_Click(object sender, EventArgs e)
+ {
+ this.Sub_SaveBill();
+ Display();
+ }
+
+ //閲嶇疆鎸夌航
+ private void cz_Click(object sender, EventArgs e)
+ {
+ if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew || BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
+ {
+ if (MessageBox.Show("纭畾瑕佹竻绌哄綋鍓嶇晫闈俊鎭紝閲嶇疆鐣岄潰锛�", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
+ {
+ this.Sub_AddBill();
+ }
+ }
+ grdMain.Columns[HBillNoCol].ReadOnly = false;
+ tabControl1.SelectedIndex = 0;
+ }
+
+ //鏂板鍗曟嵁
+ private void Sub_AddBill()
+ {
+ this.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ this.Sub_OperStatus();//璁剧疆TOOLBAR
+ this.Sub_ClearBill();//娓呯┖鐣岄潰
+ }
+
+ //閫�鍑烘寜閽�
+ private void tc_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ //绂诲紑鍗曞厓鏍�
+ private void grdMain_LeaveCell(object sender, EventArgs e)
+ {
+ oSumGrid.LeaveCell();
+ }
+
+ //缃戞牸鍗曞厓鏍煎彉鍖栦簨浠�
+ private void grdMain_RowColChange(object sender, EventArgs e)
+ {
+ if (!grdStatus)
+ {
+ return;
+ }
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ //
+ //if (oSumGrid.Changelock)
+ // return;
+ //if(oSumGrid.EditStatus)
+ //{
+ if (!CheckGridRow(oSumGrid.OldCell.Row))
+ return;
+ //}
+ }
+
+ private void Gy_BarCodeBill_XB_SelectMater_Paint(object sender, PaintEventArgs e)//鐢荤嚎
+ {
+ Graphics g = this.panel2.CreateGraphics();
+ Pen p = new Pen(Color.Gray);
+ p.Width = 1;
+ g.DrawLine(p, new Point(txtHMaker.Left, txtHMaker.Top + txtHMaker.Height), new Point(txtHMaker.Left + txtHMaker.Width, txtHMaker.Top + txtHMaker.Height));
+ g.DrawLine(p, new Point(txtHMakeDate.Left, txtHMakeDate.Top + txtHMakeDate.Height), new Point(txtHMakeDate.Left + txtHMakeDate.Width, txtHMakeDate.Top + txtHMakeDate.Height));
+ //
+ g.DrawLine(p, new Point(txtHChecker.Left, txtHChecker.Top + txtHChecker.Height), new Point(txtHChecker.Left + txtHChecker.Width, txtHChecker.Top + txtHChecker.Height));
+ g.DrawLine(p, new Point(txtHCheckDate.Left, txtHCheckDate.Top + txtHCheckDate.Height), new Point(txtHCheckDate.Left + txtHCheckDate.Width, txtHCheckDate.Top + txtHCheckDate.Height));
+ //
+ g.DrawLine(p, new Point(txtHCloseMan.Left, txtHCloseMan.Top + txtHCloseMan.Height), new Point(txtHCloseMan.Left + txtHCloseMan.Width, txtHCloseMan.Top + txtHCloseMan.Height));
+ g.DrawLine(p, new Point(txtHCloseDate.Left, txtHCloseDate.Top + txtHCloseDate.Height), new Point(txtHCloseDate.Left + txtHCloseDate.Width, txtHCloseDate.Top + txtHCloseDate.Height));
+ //
+ g.DrawLine(p, new Point(this.txtHDeleteMan.Left, txtHDeleteMan.Top + txtHDeleteMan.Height), new Point(txtHDeleteMan.Left + txtHDeleteMan.Width, txtHDeleteMan.Top + txtHDeleteMan.Height));
+ g.DrawLine(p, new Point(txtHDeleteDate.Left, txtHDeleteDate.Top + txtHDeleteDate.Height), new Point(txtHDeleteDate.Left + txtHDeleteDate.Width, txtHDeleteDate.Top + txtHDeleteDate.Height));
+ //
+ g.DrawLine(p, new Point(this.txtHUpDater.Left, txtHUpDater.Top + txtHUpDater.Height), new Point(txtHUpDater.Left + txtHUpDater.Width, txtHUpDater.Top + txtHUpDater.Height));
+ g.DrawLine(p, new Point(txtHUpDateDate.Left, txtHUpDateDate.Top + txtHUpDateDate.Height), new Point(txtHUpDateDate.Left + txtHUpDateDate.Width, txtHUpDateDate.Top + txtHUpDateDate.Height));
+ //鎺т欢浣嶇疆璁剧疆
+
+ }
+
+ //鎺т欢浣嶇疆
+ private void Sub_ControlLocation()
+ {
+ //gbUp.Width = P1.Width - 20;
+ //gbUp.Left = 10;
+ //gbUp.Height = P1.Height - 35;
+ //gbUp.Top = 30;
+ }
+
+ //绐椾綋鍔犺浇
+ private void Gy_BarCodeBill_XB_SelectMater_Load(object sender, EventArgs e)
+ {
+ //鎵撳嵃鍒濆鍖�
+ oSumGrid.NoCol = HSnoCol;
+ oSumGrid.ogrdMain = grdMain;
+ oSumGrid.oGridsum = grdSum;
+ this.Text = ModCaption;
+ this.lblCaption.Text = ModCaption;
+ //鍔犺浇缁勭粐淇℃伅
+ Sub_AddOrdList();
+
+ //鑾峰彇绯荤粺鍙傛暟
+ ClsXt_SystemParameter oSystemParameter = new ClsXt_SystemParameter();
+ if (oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo) == false)
+ {
+ MessageBox.Show("鑾峰彇绯荤粺鍙傛暟澶辫触锛佸師鍥�:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
+ return;
+ }
+ else
+ {
+ ERPMode = oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode; //ERP妯″紡锛圵ISE銆丆LOUD锛�
+ CampanyName = oSystemParameter.omodel.WMS_CampanyName; //瀹㈡埛瀹氬埗鍖栧悕绉�
+ SourceQtyCtl = oSystemParameter.omodel.BarCode_SourceQtyCtl; //瓒呮簮鍗曟暟閲忔帶鍒�
+ PrintQty = oSystemParameter.omodel.BarCode_PrintQty; //鍏佽鏉＄爜鎵撳嵃娆℃暟
+ PrintQtyCtl = oSystemParameter.omodel.BarCode_PrintQtyCtl; //鏉＄爜鎵撳嵃娆℃暟鎺у埗
+ UpdatePrintQtyCtl = oSystemParameter.omodel.BarCode_UpdatePrintQtyCtl; //鏉＄爜鎵撳嵃娆℃暟鏇存柊
+ }
+ //绯荤粺鍙傛暟锛屾湁婧愬崟鐢熸垚鏉＄爜锛岀敓鎴愭潯鐮佹暟閲忓彲鍚﹁秴婧愬崟鏁伴噺鎺у埗锛圢涓轰笉鍙秴婧愬崟鏁伴噺锛�
+ if (SourceQtyCtl == "N")
+ {
+ //绯荤粺鍙傛暟涓轰笉鍙秴婧愬崟鏁伴噺鏃讹紝鍐嶆鍒ゆ柇鐢ㄦ埛鏉冮檺鏄惁鍙秴婧愬崟鏁伴噺
+ //鍒ゆ柇鐢ㄦ埛鏉冮檺锛屾湁鏉冮檺鍙秴婧愬崟鏁伴噺鐢熸垚鏉＄爜
+ if (ClsPub.Security_Log(ModRightNameSourceQty, 3, false, ClsPub.CurUserName))
+ {
+ SourceQtyCtl = "Y";
+ }
+ }
+ }
+
+ //鍔犺浇缁勭粐淇℃伅
+ private void Sub_AddOrdList()
+ {
+ DataSet ds;
+ DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+ ds = oClsGy_ORGANIZATIONS_View.GetList();
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鑾峰彇缁勭粐澶辫触");
+ return;
+ }
+ cmbHOrgID.DataSource = null;
+ cmbHOrgID.Items.Clear();
+ cmbHOrgID.DataSource = ds.Tables[0];
+ cmbHOrgID.DisplayMember = "HName";
+ cmbHOrgID.ValueMember = "HItemID";
+ }
+
+ //绐椾綋灏哄鍙樺寲鏃�
+ private void Gy_BarCodeBill_XB_SelectMater_Resize(object sender, EventArgs e)
+ {
+ //Sub_ControlLocation();
+ }
+
+ //鏍规嵁缂栬緫鐘舵�� 璁剧疆 鎺т欢鏄惁鍏佽褰曞叆
+ private void Sub_LrtextStatus(bool TextEnabled)
+ {
+ if (TextEnabled == true)
+ {
+ //鎺т欢鍏ㄩ儴鏈夋晥
+ gbUp.Enabled = true;
+ grdMain.BackColor = ClsPub.EditColor;
+ }
+ else
+ { //鎺т欢鍏ㄩ儴鏃犳晥
+ gbUp.Enabled = false;
+ grdMain.BackColor = ClsPub.ViewColor;
+ }
+ }
+
+ //timer
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ timer1.Enabled = false;
+ Sub_ControlLocation();
+ if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_View)
+ {
+ //this.Sub_ShowBill();
+ }
+ else
+ {
+ this.Sub_AddBill();
+ }
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ }
+
+ //绐椾綋鍗歌浇
+ private void Gy_BarCodeBill_XB_SelectMater_FormClosing(object sender, FormClosingEventArgs e)
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ }
+
+ //TOOLBAR鐘舵�� 鎸夐挳鏄惁鐏板害
+ public void Sub_OperStatus()
+ {
+ switch (BillStatus)
+ {
+ case DBUtility.ClsPub.Enum_BillStatus.BillStatus_View:
+ //娴忚鐘舵��
+ yl.Enabled = true;
+ AddRow.Enabled = false;
+ DelRow.Enabled = false;
+ bc.Enabled = false;
+ cz.Enabled = false;
+ tc.Enabled = true;
+ //鏈鏍�
+ if (txtHChecker.Text.Trim() == "")
+ {
+ //鏈鏍�
+ pic1.Visible = false;
+ pic1.Image = null;
+ //
+ }
+ else if (txtHCloseMan.Text.Trim() == "" && txtHChecker.Text.Trim() != "")//瀹℃牳鏈叧闂�
+ {
+ //
+ pic1.Visible = true;
+ pic1.Image = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/Pic/Checked.jpg");
+ //
+ }
+ else//宸插叧闂�
+ {
+ //
+ pic1.Visible = true;
+ pic1.Image = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/Pic/Closed.jpg");
+ //
+ }
+ if (txtHDeleteMan.Text.Trim() == "")
+ {
+ }
+ else //宸蹭綔搴�
+ {
+ AddRow.Enabled = false;
+ DelRow.Enabled = false;
+ bc.Enabled = false;
+ cz.Enabled = false;
+ //
+ pic1.Visible = true;
+ pic1.Image = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/Pic/Deleted.jpg");
+ //
+ }
+ Sub_LrtextStatus(false);
+ grdStatus = false;
+ break;
+ case DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew:
+ //鏂板鐘舵��
+ yl.Enabled = true;
+ AddRow.Enabled = true;
+ DelRow.Enabled = true;
+ bc.Enabled = true;
+ cz.Enabled = true;
+ tc.Enabled = true;
+ Sub_LrtextStatus(true);
+ grdStatus = true;
+ //鏈鏍�
+ pic1.Visible = false;
+ pic1.Image = null;
+ //
+ break;
+ case DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify:
+ //淇敼鐘舵��
+ yl.Enabled = true;
+ AddRow.Enabled = true;
+ DelRow.Enabled = true;
+ bc.Enabled = true;
+ cz.Enabled = true;
+ tc.Enabled = true;
+ Sub_LrtextStatus(true);
+ grdStatus = true;
+ //鏈鏍�
+ pic1.Visible = false;
+ pic1.Image = null;
+ //
+ break;
+ }
+ }
+
+ #endregion
+
+
+ #region 鐢熸垚鏉＄爜
+
+ private bool Sub_SaveBill()
+ {
+ //鑾峰彇鍐呯爜
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ lblCaption.Focus();
+ //鐢熸垚鏉＄爜鍓嶆帶鍒�
+ if (!Sub_AllowSave())
+ {
+ return false;
+ }
+ bc.Enabled = false;
+ SaveBarCode();
+ return true;
+ }
+
+ #region 鐢熸垚鏉＄爜鍓嶆帶鍒�
+ private bool Sub_AllowSave()
+ {
+ string sHRemark = "";
+ //鏄庣粏琛ㄦ槸鍚︿负闆惰
+ bool b = false;
+ for (int i = 0; i < grdMain.RowCount; i++)
+ {
+ if (!IsNullRow(i))
+ {
+ b = true;
+ break;
+ }
+ }
+ if (b == false)
+ {
+ MessageBox.Show("鏄庣粏琛屼笉瀛樺湪锛�", "鎻愮ず");
+ return false;
+ }
+
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ long HSno = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value); // 搴忓彿
+ string HBarCodeType = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBarCodeTypeCol].Value); // 鏉＄爜绫诲瀷
+ string HSourceBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value); // 婧愬崟鍗曞彿
+ long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value); // 鐗╂枡鍐呯爜
+ string HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value); // 鎵瑰彿
+ long HAuxPropID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value); // 杈呭姪灞炴�D
+ double HSourceQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HSourceBillQtyCol].Value); // 婧愬崟鏁伴噺
+ double HQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value); // 鏁伴噺
+ double HMinQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value); // 鏈�灏忓寘瑁呮暟
+ bool HISKFPERIOD = DBUtility.ClsPub.isBool(grdMain.Rows[j].Cells[HISKFPERIODCol].Value); // 鏄惁鍚敤淇濊川鏈�
+ DateTime HProduceDate = DBUtility.ClsPub.isDate(grdMain.Rows[j].Cells[HProduceDateCol].Value); // 鐢熶骇鏃ユ湡
+
+ if (HMaterID != 0)
+ {
+ DataSet oDsCheck = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_AddCheck " + HSno.ToString() + ",'" + HBarCodeType + "','" + HSourceBillNo + "'," + HMaterID.ToString() + ",'" + HBatchNo + "'," + HAuxPropID.ToString() + "," + HSourceQty.ToString() + "," + HQty.ToString() + "," + HMinQty.ToString() + "," + HOrgID.ToString() + ",'" + SourceQtyCtl + "'", "h_p_Gy_BarCodeBill_AddCheck");
+ //
+ if (oDsCheck == null && oDsCheck.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鏉＄爜鐢熸垚瀹屾暣鎬у垽鏂敊璇紒");
+ return false;
+ }
+ else if (DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0][0]) == "1")
+ {
+ sHRemark = sHRemark + DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HRemark"]);
+ }
+ //鍒ゆ柇褰曞叆鐨勭敓浜ф棩鏈熴�佹湁鏁堟湡鑷虫槸鍚︽纭�
+ if(HISKFPERIOD && HProduceDate<DBUtility.ClsPub.isDate("2000-01-01"))
+ {
+ sHRemark = sHRemark + " 绗�" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "琛岋紝鐗╂枡锛�" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNameCol].Value) + " 鍚敤淇濊川鏈熺鐞嗭紝鐢熶骇鏃ユ湡褰曞叆閿欒锛�";
+ }
+ else if (HISKFPERIOD && ClsPub.isStrNull(grdMain.Rows[j].Cells[HExpiryDateCol].Value)=="")
+ {
+ sHRemark = sHRemark + " 绗�" + ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value) + "琛岋紝鐗╂枡锛�" + ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNameCol].Value) + " 鍚敤淇濊川鏈熺鐞嗭紝鏈夋晥鏈熻嚦涓嶈兘涓虹┖锛�";
+ }
+ }
+ }
+ if (sHRemark != "")
+ {
+ MessageBox.Show(sHRemark);
+ return false;
+ }
+ return true;
+ }
+
+ #endregion
+
+ #region 鐢熸垚鏉＄爜
+ private void SaveBarCode()
+ {
+ try
+ {
+ string TM = ""; //鏉＄爜
+ int LSHlen = 6; //娴佹按鍙烽暱搴�
+ double HSumQty = 0; //浜у搧鏁伴噺
+ double HMinQty = 0; //鏈�灏忓寘瑁呮暟
+ Int64 HBQty = 0; //绠辨暟
+ Int64 LSH = 0; //娴佹按鍙�
+ string LSH2 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
+ string sDate = ""; //鏃ユ湡
+ string sYear = ""; //骞�
+ string sPeriod = ""; //鏈�
+ string sDay = ""; //鏃�
+ string sMaterID = ""; //鐗╂枡ID杞崲鎴愬瓧绗�
+ string sSourceEntryID = ""; //婧愬崟瀛怚D杞崲鎴愬瓧绗�
+ string sTMNumber = ""; //鏉＄爜鑷畾涔夊墠缂�
+ int HSumBQty = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佹�荤鏁�
+ int n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
+ DataSet Ds;
+
+ Int64 HEntryID = 0; //瀛怚D
+ string HBarCode = ""; //鏉″舰鐮�
+ string HBarCodeType = ""; //鏉＄爜绫诲瀷
+ Int64 HMaterID = 0; //鐗╂枡ID
+ Int64 HUnitID = 0; //璁￠噺鍗曚綅ID
+ Int64 HAuxPropID = 0; //杈呭姪灞炴�D
+ string HBatchNo = ""; //鎵规鍙�
+ string HMTONo = ""; //MTO鍙�
+ double HQty = 0; //鏁伴噺
+ double HinitQty = 0; //鍒濆鍖栨暟閲忥紙鐢熸垚鏉＄爜鏃舵暟閲忥級
+ double HSourceBillQty = 0; //婧愬崟鍙敓鎴愭潯鐮佹暟閲�
+ bool HGiveAwayFlag = false; //鏄惁璧犲搧
+ string HProduceDate; //鐢熶骇鏃ユ湡锛堜繚璐ㄦ湡鐢級
+ string HExpiryDate; //淇濊川鏈熻嚦锛堜繚璐ㄦ湡鐢級
+ bool HISKFPERIOD = false; //鏄惁鍚敤淇濊川鏈�
+ string HEXPUNIT = ""; //淇濊川鏈熷崟浣�
+ double HEXPPERIOD = 0; //淇濊川鏈�
+ Int64 HWhID = 0; //浠撳簱ID
+ Int64 HSPID = 0; //浠撲綅ID
+ Int64 HBarcodeQtys = 0; //鎬绘墭鏁�
+ Int64 HBarcodeNo = 0; //褰撳墠鎵樺彿
+ string HEndQty = ""; //灏炬暟
+ Int64 HSourceInterID = 0; //婧愬崟ID
+ Int64 HSourceEntryID = 0; //婧愬崟瀛怚D
+ string HSourceBillNo = ""; //婧愬崟鍗曞彿
+ string HSourceBillType = ""; //婧愬崟绫诲瀷
+ Int64 HInitSourceEntryID = 0; //鍒濆鍖栨簮鍗曞瓙ID锛堢敓鎴愭潯鐮佹椂婧愬崟瀛怚D锛�
+ string HRemark = ""; //澶囨敞
+ Int64 HPrintQty = 0; //鎵撳嵃娆℃暟
+ Int64 HSTOCKORGID = 0; //缁勭粐ID
+ Int64 HOWNERID = 0; //璐т富ID
+ Int64 HDeptID = 0; //閮ㄩ棬ID
+ Int64 HSupID = 0; //寰�鏉ュ崟浣岻D
+ Int64 HGroupID = 0; //鐢熶骇鐝粍ID
+ Int64 HCusID = 0; //瀹㈡埛ID
+ string HCusType = ""; //瀹㈡埛鍨嬪彿
+ string HSeOrderBillNo = ""; //閿�鍞鍗曞彿
+ Int64 HSeOrderSEQ = 0; //閿�鍞鍗曡鍙�
+ string HInnerBillNo = ""; //鍐呴儴閲囪喘璁㈠崟鍙�
+ string HWorkLineName = ""; //鐢熶骇绾�
+ string HMaterName = ""; //浜у搧鍚嶇О
+ string HMaterModel = ""; //浜у搧瑙勬牸鍨嬪彿
+ string HPinfan = ""; //鍝佺暘
+ DateTime HEndDate; //璁″垝瀹屽伐鏃ユ湡
+
+ oCn.BeginTran();
+ Application.DoEvents();
+ //鑾峰彇鍚屼竴鎵圭敓鎴愭潯鐮佹�荤鏁�
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
+ {
+ HSumBQty = HSumBQty + ClsPub.isInt(grdMain.Rows[j].Cells[HBQtyCol].Value);
+ }
+ }
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
+ {
+ sMaterID = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterIDCol].Value);
+ HBatchNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
+ HBarCodeType = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBarCodeTypeCol].Value);
+ //鏃ユ湡鑾峰彇鏂瑰紡
+ sDate = dtpHDate.Value.ToShortDateString();
+ sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+ sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+ sDay = sDay.Substring(sDay.Length - 2, 2);
+ //==================================
+ if (HBarCodeType == "鍞竴鏉＄爜")
+ {
+ //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ //sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
+ sTMNumber = sYear + sPeriod + sDay;
+
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo_ReWorkBar '" + sTMNumber + "'", "h_p_WMS_GetMaxNo_ReWorkBar"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ }
+ else
+ {
+ MessageBox.Show("閿欒鐨勬潯鐮佺被鍨嬶紝涓嶈兘鐢熸垚鏉＄爜锛�");
+ bc.Enabled = true;
+ oCn.RollBack();
+ return;
+ }
+
+ HBQty = ClsPub.isLong(grdMain.Rows[j].Cells[HBQtyCol].Value);
+ HMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);
+ HSumQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value);
+
+ int nn = 0; //鏈娴佹按鍙风疮璁′娇鐢ㄤ釜鏁�
+ for (int i = 0; i < HBQty; i++)
+ {
+ if (HSumQty - HMinQty > 0)
+ {
+ HEndQty = "";
+ HSumQty = HSumQty - HMinQty;
+ }
+ else
+ {
+ if (HSumQty == HMinQty)
+ {
+ HEndQty = "";
+ }
+ else
+ {
+ HEndQty = "灏炬暟";
+ }
+ HMinQty = HSumQty;
+ }
+ //
+ LSH = LSH + 1;
+ LSH2 = LSH.ToString();
+ while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙蜂綅鏁板皬浜� LSHlen 鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
+ if (HBarCodeType == "鍞竴鏉＄爜")
+ {
+ Int32 HModelLen = grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString().Length;
+ string HModelLeft = HModelLen >= 4 ? grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString() : "";
+ string HSubjoin2 = grdMain.Rows[j].Cells[HSubjoin2Col].Value.ToString();
+ TM = HOrgNumber + sMaterID + sYear + sPeriod + sDay + LSH.ToString("D5");
+ }
+
+ HEntryID = j + 1;
+ HBarCode = TM;
+ HMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);
+ HUnitID = ClsPub.isLong(grdMain.Rows[j].Cells[HUnitIDCol].Value);
+ HAuxPropID = ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value);
+ HBatchNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
+ HMTONo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMTONoCol].Value);
+ HQty = HMinQty;
+ HinitQty = HMinQty;
+ HSourceBillQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HSourceBillQtyCol].Value);
+ HGiveAwayFlag = ClsPub.isBool(grdMain.Rows[j].Cells[HGiveAwayFlagCol].Value);
+ HISKFPERIOD = ClsPub.isBool(grdMain.Rows[j].Cells[HISKFPERIODCol].Value);
+ if(HISKFPERIOD)
+ {
+ HProduceDate = ClsPub.isStrNull(ClsPub.isDate(grdMain.Rows[j].Cells[HProduceDateCol].Value));
+ HExpiryDate = ClsPub.isStrNull(grdMain.Rows[j].Cells[HExpiryDateCol].Value);
+ }
+ else
+ {
+ HProduceDate = "";
+ HExpiryDate = "";
+ }
+ HEXPUNIT = ClsPub.isStrNull(grdMain.Rows[j].Cells[HEXPUNITCol].Value);
+ HEXPPERIOD = ClsPub.isDoule(grdMain.Rows[j].Cells[HEXPPERIODCol].Value);
+ HWhID = ClsPub.isLong(grdMain.Rows[j].Cells[HWhIDCol].Value);
+ HSPID = ClsPub.isLong(grdMain.Rows[j].Cells[HSPIDCol].Value);
+ HBarcodeQtys = HBQty;
+ HBarcodeNo = i + 1;
+ HSourceInterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMainIDCol].Value);
+ HSourceEntryID = ClsPub.isLong(grdMain.Rows[j].Cells[HSubIDCol].Value);
+ HSourceBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value);
+ HSourceBillType = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillTypeCol].Value);
+ HInitSourceEntryID = ClsPub.isLong(grdMain.Rows[j].Cells[HSubIDCol].Value);
+ HRemark = ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value);
+ HPrintQty = 0;
+ HSTOCKORGID = HOrgID;
+ HOWNERID = HOrgID;
+ HDeptID = ClsPub.isLong(grdMain.Rows[j].Cells[HDeptIDCol].Value);
+ HSupID = ClsPub.isLong(grdMain.Rows[j].Cells[HSupIDCol].Value);
+ HGroupID = ClsPub.isLong(grdMain.Rows[j].Cells[HGroupIDCol].Value);
+ HCusID = ClsPub.isLong(grdMain.Rows[j].Cells[HCusIDCol].Value);
+ HCusType = ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusTypeCol].Value);
+ HSeOrderBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HSeOrderBillNoCol].Value);
+ HSeOrderSEQ = ClsPub.isLong(grdMain.Rows[j].Cells[HSeOrderSEQCol].Value);
+ HInnerBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HInnerBillNoCol].Value);
+ HWorkLineName = ClsPub.isStrNull(grdMain.Rows[j].Cells[HSourceNameCol].Value);
+ HMaterName = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNameCol].Value);
+ HMaterModel = ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterModelCol].Value);
+ HPinfan = ClsPub.isStrNull(grdMain.Rows[j].Cells[HPinfanCol].Value);
+ HEndDate = ClsPub.isDate(grdMain.Rows[j].Cells[HEndDateCol].Value);
+
+ oCn.RunProc("insert into Gy_BarCodeBill" +
+ "(HInterID,HEntryID,HBarCode,HBarCodeType,HMaterID,HUnitID" +
+ ",HAuxPropID,HBatchNo,HMTONo,HQty,HinitQty,HSourceBillQty" +
+ ",HProduceDate,HExpiryDate" +
+ ",HISKFPERIOD,HEXPUNIT,HEXPPERIOD,HBarCodeDate,HGiveAwayFlag" +
+ ",HWhID,HSPID,HBarcodeQtys,HBarcodeNo,HEndQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HInitSourceEntryID,HRemark" +
+ ",HPrintQty,HSTOCKORGID,HOWNERID,HDeptID,HSupID,HGroupID" +
+ ",HCusID,HCusType,HSeOrderBillNo,HSeOrderSEQ,HInnerBillNo,HWorkLineName" +
+ ",HMaterName,HMaterModel,HPinfan,HEndDate,HMaker,HMakeDate" +
+ ") values ("
+ + " " + HInterID.ToString() + "," + HEntryID.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString()
+ + ", " + HAuxPropID.ToString() + ",'" + HBatchNo + "','" + HMTONo + "'," + HQty.ToString() + "," + HinitQty.ToString() + "," + HSourceBillQty.ToString()
+ + ", " + (HProduceDate == "" ? "NULL" : "'" + HProduceDate + "'") + "," + (HExpiryDate == "" ? "NULL" : "'" + HExpiryDate + "'")
+ + ", " + DBUtility.ClsPub.BoolToString(HISKFPERIOD) + ",'" + HEXPUNIT + "'," + HEXPPERIOD.ToString() + ",'" + sDate + "'," + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
+ + ", " + HWhID.ToString() + "," + HSPID.ToString() + "," + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + ",'" + HEndQty + "'"
+ + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'," + HInitSourceEntryID.ToString() + ",'" + HRemark + "'"
+ + ", " + HPrintQty.ToString() + "," + HSTOCKORGID.ToString() + "," + HOWNERID.ToString() + "," + HDeptID.ToString() + "," + HSupID.ToString() + "," + HGroupID.ToString()
+ + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HSeOrderBillNo + "'," + HSeOrderSEQ.ToString() + ",'" + HInnerBillNo + "','" + HWorkLineName + "'"
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "','" + HEndDate.ToShortDateString() + "','" + ClsPub.CurUserName + "',getdate()" +
+ ")");
+ n = n + 1;
+ nn = nn + 1;
+ }
+ //鍥炲～娴佹按鍙蜂俊鎭�
+ oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "'," + nn.ToString() + " ");
+ }
+ }
+ oCn.Commit();
+ MessageBox.Show("鏉＄爜鐢熸垚瀹屾瘯锛�");
+ tabControl1.SelectedIndex = 1;
+ }
+ catch (Exception e)
+ {
+ bc.Enabled = true;
+ oCn.RollBack();
+ MessageBox.Show("鏉＄爜鐢熸垚澶辫触锛�" + e.Message);
+ }
+ }
+
+ #endregion
+
+ #region 鍒锋柊鏉＄爜鍒楄〃
+ private void Display()
+ {
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList where HInterID=" + HInterID.ToString() + " order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DSet == null)
+ {
+ MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ //
+ grdList.DataSource = DSet.Tables[0].DefaultView;
+ //鍐荤粨
+ int FrCol = 0;
+ string s = "鏄�";
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdList, this.Name + "grdList", s, FrCol);
+ //鐢荤嚎
+ GraphLine();
+ }
+ private void GraphLine()
+ {
+ int MainIDCol = Fun_GetCol("hmainid");
+ int SubIDCol = Fun_GetCol("hsubid");
+ string s = "鏄�";
+ long n = 0;
+ DBUtility.Xt_BaseBillFun.GraphLine(grdList, MainIDCol, SubIDCol, s, ref n);
+ }
+
+ #endregion
+
+ #endregion
+
+
+ #region 绐椾綋澶勭悊鏂规硶
+ //鍒濆鍖朑RID
+ private void initGrid()
+ {
+ grdMain.RowCount = 0;
+ grdMain.ColumnCount = 60; //鎬诲垪鏁�
+ DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
+ grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
+ grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
+ grdMain.Columns[HSubIDCol].HeaderText = "婧愬崟瀛怚D";
+ grdMain.Columns[HBillNoCol].HeaderText = "婧愬崟鍗曞彿";
+ grdMain.Columns[HBillTypeCol].HeaderText = "婧愬崟鍗曟嵁绫诲瀷";
+ grdMain.Columns[HMaterIDCol].HeaderText = "鐗╂枡ID";
+ grdMain.Columns[HMaterNumberCol].HeaderText = "鐗╂枡浠ｇ爜";
+ grdMain.Columns[HMaterNameCol].HeaderText = "鐗╂枡鍚嶇О";
+ grdMain.Columns[HMaterModelCol].HeaderText = "瑙勬牸鍨嬪彿";
+ grdMain.Columns[HSubjoin2Col].HeaderText = "鏈哄瀷鐮�";
+ grdMain.Columns[HPinfanCol].HeaderText = "鍝佺暘";
+ grdMain.Columns[HUnitIDCol].HeaderText = "璁￠噺鍗曚綅ID";
+ grdMain.Columns[HUnitNumberCol].HeaderText = "璁￠噺鍗曚綅浠ｇ爜";
+ grdMain.Columns[HUnitNameCol].HeaderText = "璁￠噺鍗曚綅鍚嶇О";
+ grdMain.Columns[HAuxPropIDCol].HeaderText = "杈呭姪灞炴�D";
+ grdMain.Columns[HAuxPropNumberCol].HeaderText = "杈呭姪灞炴�т唬鐮�";
+ grdMain.Columns[HAuxPropNameCol].HeaderText = "杈呭姪灞炴�у悕绉�";
+ grdMain.Columns[HBatchManagerCol].HeaderText = "鏄惁鍚敤鎵规";
+ grdMain.Columns[HBatchNoCol].HeaderText = "鎵瑰彿";
+ grdMain.Columns[HQtyCol].HeaderText = "鏁伴噺";
+ grdMain.Columns[HMinQtyCol].HeaderText = "鏈�灏忓寘瑁呮暟";
+ grdMain.Columns[HBQtyCol].HeaderText = "绠辨暟";
+ grdMain.Columns[HinitQtyCol].HeaderText = "鍒濆鍖栨暟閲�";
+ grdMain.Columns[HSourceBillQtyCol].HeaderText = "婧愬崟鍙敓鎴愭潯鐮佹暟閲�";
+ grdMain.Columns[HBarCodeTypeCol].HeaderText = "鏉＄爜绫诲瀷";
+ grdMain.Columns[HISKFPERIODCol].HeaderText = "鏄惁鍚敤淇濊川鏈�";
+ grdMain.Columns[HProduceDateCol].HeaderText = "鐢熶骇鏃ユ湡";
+ grdMain.Columns[HExpiryDateCol].HeaderText = "鏈夋晥鏈熻嚦";
+ grdMain.Columns[HEXPUNITCol].HeaderText = "淇濊川鏈熷崟浣�";
+ grdMain.Columns[HEXPPERIODCol].HeaderText = "淇濊川鏈�";
+ grdMain.Columns[HGiveAwayFlagCol].HeaderText = "鏄惁璧犲搧";
+ grdMain.Columns[HWhIDCol].HeaderText = "浠撳簱ID";
+ grdMain.Columns[HWhNumberCol].HeaderText = "浠撳簱浠ｇ爜";
+ grdMain.Columns[HWhNameCol].HeaderText = "浠撳簱";
+ grdMain.Columns[HSPIDCol].HeaderText = "浠撲綅ID";
+ grdMain.Columns[HSPNumberCol].HeaderText = "浠撲綅浠ｇ爜";
+ grdMain.Columns[HSPNameCol].HeaderText = "浠撲綅";
+ grdMain.Columns[HMTONoCol].HeaderText = "璁″垝璺熻釜鍙�";
+ grdMain.Columns[HRemarkCol].HeaderText = "澶囨敞";
+ grdMain.Columns[HDeptIDCol].HeaderText = "杞﹂棿ID";
+ grdMain.Columns[HDeptNumberCol].HeaderText = "杞﹂棿浠ｇ爜";
+ grdMain.Columns[HDeptNameCol].HeaderText = "杞﹂棿";
+ grdMain.Columns[HSourceIDCol].HeaderText = "鐢熶骇绾縄D";
+ grdMain.Columns[HSourceNumberCol].HeaderText = "鐢熶骇绾夸唬鐮�";
+ grdMain.Columns[HSourceNameCol].HeaderText = "鐢熶骇绾�";
+ grdMain.Columns[HSupIDCol].HeaderText = "渚涘簲鍟咺D";
+ grdMain.Columns[HSupNumberCol].HeaderText = "渚涘簲鍟嗕唬鐮�";
+ grdMain.Columns[HSupNameCol].HeaderText = "渚涘簲鍟�";
+ grdMain.Columns[HGroupIDCol].HeaderText = "鐢熶骇鐝粍ID";
+ grdMain.Columns[HGroupNumberCol].HeaderText = "鐢熶骇鐝粍浠ｇ爜";
+ grdMain.Columns[HGroupNameCol].HeaderText = "鐢熶骇鐝粍";
+ grdMain.Columns[HCusIDCol].HeaderText = "瀹㈡埛ID";
+ grdMain.Columns[HCusNumberCol].HeaderText = "瀹㈡埛浠ｇ爜";
+ grdMain.Columns[HCusNameCol].HeaderText = "瀹㈡埛";
+ grdMain.Columns[HCusTypeCol].HeaderText = "瀹㈡埛鍨嬪彿";
+ grdMain.Columns[HSeOrderBillNoCol].HeaderText = "閿�鍞鍗曞彿";
+ grdMain.Columns[HSeOrderSEQCol].HeaderText = "閿�鍞鍗曡鍙�";
+ grdMain.Columns[HInnerBillNoCol].HeaderText = "鍐呴儴閲囪喘璁㈠崟鍙�";
+ grdMain.Columns[HEndDateCol].HeaderText = "璁″垝瀹屽伐鏃ユ湡";
+
+
+ //鏍煎紡鍖� 闅愯棌鍒�
+ grdMain.Columns[HTagCol].Visible = false;
+ grdMain.Columns[HMainIDCol].Visible = false;
+ grdMain.Columns[HSubIDCol].Visible = false;
+ grdMain.Columns[HBillTypeCol].Visible = false;
+ grdMain.Columns[HMaterIDCol].Visible = false;
+ grdMain.Columns[HPinfanCol].Visible = false;
+ grdMain.Columns[HUnitIDCol].Visible = false;
+ grdMain.Columns[HAuxPropIDCol].Visible = false;
+ grdMain.Columns[HinitQtyCol].Visible = false;
+ grdMain.Columns[HSourceBillQtyCol].Visible = false;
+ //grdMain.Columns[HExpiryDateCol].Visible = false;
+ //grdMain.Columns[HEXPUNITCol].Visible = false;
+ //grdMain.Columns[HEXPPERIODCol].Visible = false;
+ grdMain.Columns[HWhIDCol].Visible = false;
+ grdMain.Columns[HWhNumberCol].Visible = false;
+ grdMain.Columns[HWhNameCol].Visible = false;
+ grdMain.Columns[HSPIDCol].Visible = false;
+ grdMain.Columns[HSPNumberCol].Visible = false;
+ grdMain.Columns[HSPNameCol].Visible = false;
+ grdMain.Columns[HMTONoCol].Visible = false;
+ grdMain.Columns[HDeptIDCol].Visible = false;
+ grdMain.Columns[HDeptNumberCol].Visible = false;
+ grdMain.Columns[HDeptNameCol].Visible = false;
+ grdMain.Columns[HSourceIDCol].Visible = false;
+ grdMain.Columns[HSourceNumberCol].Visible = false;
+ grdMain.Columns[HSourceNameCol].Visible = false;
+ grdMain.Columns[HSupIDCol].Visible = false;
+ grdMain.Columns[HSupNumberCol].Visible = false;
+ grdMain.Columns[HSupNameCol].Visible = false;
+ grdMain.Columns[HGroupIDCol].Visible = false;
+ grdMain.Columns[HGroupNumberCol].Visible = false;
+ grdMain.Columns[HGroupNameCol].Visible = false;
+ grdMain.Columns[HCusIDCol].Visible = false;
+ grdMain.Columns[HCusNumberCol].Visible = false;
+ grdMain.Columns[HCusNameCol].Visible = false;
+ grdMain.Columns[HCusTypeCol].Visible = false;
+ grdMain.Columns[HSeOrderBillNoCol].Visible = false;
+ grdMain.Columns[HSeOrderSEQCol].Visible = false;
+ grdMain.Columns[HInnerBillNoCol].Visible = false;
+ grdMain.Columns[HEndDateCol].Visible = false;
+ grdMain.Columns[HBillNoCol].Visible = false;
+ grdMain.Columns[HAuxPropNumberCol].Visible = false;
+ grdMain.Columns[HAuxPropNameCol].Visible = false;
+ grdMain.Columns[HSubjoin2Col].Visible = false;
+
+ //璁剧疆鍙紪杈戝垪
+ string sAllowCol = HQtyCol.ToString() +
+ "," + HMinQtyCol.ToString() +
+ "," + HMaterNumberCol.ToString() +
+ "," + HUnitNumberCol.ToString() +
+ "," + HAuxPropNumberCol.ToString() +
+ "," + HBatchNoCol.ToString() +
+ "," + HBarCodeTypeCol.ToString() +
+ "," + HProduceDateCol.ToString() +
+ "," + HRemarkCol.ToString();
+
+ //璁剧疆鍚堣鍒�
+ string sTotalCol = HQtyCol.ToString();
+
+ //璁剧疆鐗规畩鍒�
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ //缃戞牸鎵撳嬀
+ //鏄惁鍚敤鎵规
+ DataGridViewCheckBoxCell oCell1 = new DataGridViewCheckBoxCell();
+ oCell1.ThreeState = false;
+ oCell1.Value = 0;
+ oCell1.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[i].Cells[HBatchManagerCol] = oCell1;
+ //鏄惁鍚敤淇濊川鏈�
+ DataGridViewCheckBoxCell oCell2 = new DataGridViewCheckBoxCell();
+ oCell2.ThreeState = false;
+ oCell2.Value = 0;
+ oCell2.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[i].Cells[HISKFPERIODCol] = oCell2;
+ //鏄惁璧犲搧
+ DataGridViewCheckBoxCell oCell3 = new DataGridViewCheckBoxCell();
+ oCell3.ThreeState = false;
+ oCell3.Value = 0;
+ oCell3.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[i].Cells[HGiveAwayFlagCol] = oCell3;
+ //缃戞牸涓嬫媺閫夋嫨妗�
+ DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
+
+ column.Items.Add("鍞竴鏉＄爜");
+
+ grdMain.Rows[i].Cells[HBarCodeTypeCol] = column;
+ }
+
+ DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol,oSumGrid);
+ DBUtility.Xt_BaseBillFun.GetGrid(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.initGridList(grdList, this.Name + "grdList");
+ }
+
+ //鍏紡閲嶇畻
+ private void RowCount(int sRow, int sTag)
+ {
+ if (sTag == 0)
+ {
+ //绠辨暟鍒�=鏁伴噺/鏈�灏忓寘瑁呮暟
+ double sMoney = 0;
+ if (ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value) == 0)
+ {
+ sMoney = 0;
+ }
+ else
+ {
+ sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
+ }
+ sMoney = Math.Round(sMoney, 10); // 淇濈暀10浣嶅皬鏁拌繘琛屽洓鑸嶄簲鍏�
+ sMoney = Math.Ceiling(sMoney);
+ grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
+ }
+ else
+ {
+
+ }
+ }
+
+ //鏄惁鏄┖琛�
+ private bool IsNullRow(int Row)
+ {
+ return DBUtility.Xt_BaseBillFun.IsNullRow(Row, HMaterIDCol,grdMain);
+ }
+
+ //鍒ゆ柇缃戞牸琛岀殑褰曞叆鏄惁姝ｇ‘
+ private bool CheckGridRow(int Row)
+ {
+ Cell oCell = new Cell();
+ int c = 0;
+ //if (ClsPub.isStrNull(grdMain.get_TextMatrix(Row, HTagCol)) != "*")
+ //{
+ // return true;
+ //}
+ //
+ for (c = 0; c < grdMain.ColumnCount; c++)
+ {
+ oCell.Row = Row;
+ oCell.Col = c;
+ //if (!CheckGridCell(oCell))
+ // return false;
+ }
+ return true;
+ }
+
+ //甯姪鍑芥暟
+ private void Sub_GridKey(int sKeyCode, int sRow, int sCol, DataGridViewTextBoxEditingControl oEdit)
+ {
+ string sWhere = "";
+ DAL.ClsIF_Material_View oMater = new DAL.ClsIF_Material_View();//鐗╂枡
+ DAL.ClsIF_Unit_View oUnit = new DAL.ClsIF_Unit_View();//璁￠噺鍗曚綅
+ DAL.ClsIF_Property_View oProperty = new DAL.ClsIF_Property_View();//杈呭姪灞炴��
+ if (!grdStatus)
+ {
+ return;
+ }
+ oSumGrid.EditStatus = true;
+
+ switch (sKeyCode)
+ {
+ case 118: //F7
+ {
+ switch (sCol)
+ {
+ case HMaterNumberCol:
+ oMater.WherePart = "";
+ sWhere = " and HUSEORGID = " + HOrgID;
+ if (oMater.RefreshViewForBig(sWhere))
+ {
+ if (oMater.GetInfoByID(oMater.oModel.HItemID))
+ {
+ grdMain.Rows[sRow].Cells[HMaterIDCol].Value = oMater.omodel.HItemID.ToString();
+ grdMain.Rows[sRow].Cells[HMaterNumberCol].Value = oMater.omodel.HNumber;
+ grdMain.Rows[sRow].Cells[HMaterNameCol].Value = oMater.omodel.HName;
+ grdMain.Rows[sRow].Cells[HMaterModelCol].Value = oMater.omodel.HModel;
+ grdMain.Rows[sRow].Cells[HMinQtyCol].Value = oMater.omodel.HQtyMin;
+ grdMain.Rows[sRow].Cells[HUnitIDCol].Value = oMater.omodel.HUnitID.ToString();
+ grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = oMater.omodel.HUnitNumber;
+ grdMain.Rows[sRow].Cells[HUnitNameCol].Value = oMater.omodel.HUnitName;
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = oMater.omodel.HAuxPropID.ToString();
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = oMater.omodel.HAuxPropNumber;
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = oMater.omodel.HAuxPropName;
+ grdMain.Rows[sRow].Cells[HBatchManagerCol].Value = oMater.omodel.HBatchManager;
+ grdMain.Rows[sRow].Cells[HISKFPERIODCol].Value = oMater.omodel.HISKFPERIOD;
+ grdMain.Rows[sRow].Cells[HSubjoin2Col].Value = oMater.omodel.HSubjoin2;
+ grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = "鍞竴鏉＄爜";
+ //鍚敤鎵规
+ if (oMater.omodel.HBatchManager)
+ {
+ grdMain.Rows[sRow].Cells[HBatchNoCol].Value = oMater.omodel.HBatchNo;
+ }
+ //鍚敤淇濊川鏈�
+ if (oMater.omodel.HISKFPERIOD)
+ {
+ grdMain.Rows[sRow].Cells[HEXPUNITCol].Value = oMater.omodel.HEXPUNIT;
+ grdMain.Rows[sRow].Cells[HEXPPERIODCol].Value = oMater.omodel.HEXPPERIOD;
+ grdMain.Rows[sRow].Cells[HProduceDateCol].Value = dtpHDate.Value.ToShortDateString();
+ //鑾峰彇鏈夋晥鏈熻嚦
+ if (GetExpiryDate(dtpHDate.Value, oMater.omodel.HEXPUNIT, DBUtility.ClsPub.isInt(oMater.omodel.HEXPPERIOD), ref sReturn, ref HExpiryDate))
+ {
+ grdMain.Rows[sRow].Cells[HExpiryDateCol].Value = HExpiryDate;
+ }
+ }
+ else
+ {
+ grdMain.Rows[sRow].Cells[HEXPUNITCol].Value = "";
+ grdMain.Rows[sRow].Cells[HEXPPERIODCol].Value = "";
+ grdMain.Rows[sRow].Cells[HProduceDateCol].Value = "";
+ grdMain.Rows[sRow].Cells[HExpiryDateCol].Value = "";
+ }
+
+ oEdit.Text = oMater.omodel.HNumber;
+ }
+ else
+ {
+ grdMain.Rows[sRow].Cells[HMaterIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HMaterNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMaterNameCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMaterModelCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMinQtyCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
+ grdMain.Rows[sRow].Cells[HBatchManagerCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HBatchNoCol].Value = "";
+ grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = "";
+ grdMain.Rows[sRow].Cells[HISKFPERIODCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HEXPUNITCol].Value = "";
+ grdMain.Rows[sRow].Cells[HEXPPERIODCol].Value = "";
+ grdMain.Rows[sRow].Cells[HProduceDateCol].Value = "";
+ grdMain.Rows[sRow].Cells[HExpiryDateCol].Value = "";
+ }
+ }
+ else
+ {
+ grdMain.Rows[sRow].Cells[HMaterIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HMaterNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMaterNameCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMaterModelCol].Value = "";
+ grdMain.Rows[sRow].Cells[HMinQtyCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
+ grdMain.Rows[sRow].Cells[HBatchManagerCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HBatchNoCol].Value = "";
+ grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = "";
+ grdMain.Rows[sRow].Cells[HISKFPERIODCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HEXPUNITCol].Value = "";
+ grdMain.Rows[sRow].Cells[HEXPPERIODCol].Value = "";
+ grdMain.Rows[sRow].Cells[HProduceDateCol].Value = "";
+ grdMain.Rows[sRow].Cells[HExpiryDateCol].Value = "";
+ }
+ break;
+
+ case HUnitNumberCol:
+ BLL.ClsBaseSelect_InterFace.SetGridByUnit(grdMain, sRow, HUnitIDCol, HUnitNumberCol, HUnitNameCol);
+ oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HUnitNumberCol].Value);
+ break;
+
+ case HAuxPropNumberCol:
+ oProperty.WherePart = "";
+ if (ERPMode == "CLOUD")
+ {
+ sWhere = " and HMaterNumber = '" + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[HMaterNumberCol].Value) + "'";
+ }
+ else
+ {
+ sWhere = "";
+ }
+ if (oProperty.RefreshView(sWhere))
+ {
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = oProperty.oModel.HItemID.ToString();
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = oProperty.oModel.HNumber;
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = oProperty.oModel.HName;
+ oEdit.Text = oProperty.oModel.HNumber;
+ }
+ else
+ {
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
+ }
+ break;
+
+ case HDeptNumberCol:
+ BLL.ClsBaseSelect_InterFace.SetGridByDept(grdMain, sRow, HDeptIDCol, HDeptNumberCol, HDeptNameCol);
+ oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HDeptNumberCol].Value);
+ break;
+
+ case HCusNumberCol:
+ BLL.ClsBaseSelect_InterFace.SetGridByCus(grdMain, sRow, HCusIDCol, HCusNumberCol, HCusNameCol);
+ oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HCusNumberCol].Value);
+ break;
+
+ case HProduceDateCol:
+ BLL.ClsPub_BLL.Sub_SelectDate(grdMain, sRow, HProduceDateCol);
+ //鑾峰彇鏈夋晥鏈熻嚦
+ DateTime HProduceDate= DBUtility.ClsPub.isDate(grdMain.Rows[sRow].Cells[HProduceDateCol].Value); //鐢熶骇鏃ユ湡
+ string HEXPUNIT = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HEXPUNITCol].Value); //淇濊川鏈熷崟浣�
+ int HEXPPERIOD = DBUtility.ClsPub.isInt(grdMain.Rows[sRow].Cells[HEXPPERIODCol].Value); //淇濊川鏈�
+ if (GetExpiryDate(HProduceDate, HEXPUNIT, HEXPPERIOD, ref sReturn, ref HExpiryDate))
+ {
+ grdMain.Rows[sRow].Cells[HExpiryDateCol].Value = HExpiryDate;
+ }
+ oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HProduceDateCol].Value);
+ break;
+
+ default:
+ break;
+ }
+ bc.Enabled = true;
+ break;
+ }
+ case 117: //F6
+ {
+ switch (sCol)
+ {
+
+
+ default:
+ break;
+ }
+ break;
+ }
+ default:
+ break;
+ }
+ }
+
+ //缃戞牸缂栬緫鍓嶅垽鏂�
+ private void grdMain_CellBeginEdit(object sender, DataGridViewCellCancelEventArgs e)
+ {
+ int i = grdMain.CurrentCell.ColumnIndex;
+ if (DBUtility.Xt_BaseBillFun.AllowEdit(grdStatus, oSumGrid,i))
+ {
+ e.Cancel = true;
+ }
+ }
+
+ //缃戞牸缂栬緫鍚庡鐞�
+ private void grdMain_CellEndEdit(object sender, DataGridViewCellEventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ if (e.ColumnIndex == HMinQtyCol)
+ {
+ RowCount(e.RowIndex, 0); //
+ }
+ else if (e.ColumnIndex == HQtyCol)
+ {
+ RowCount(e.RowIndex, 0); //
+ }
+ else if (e.ColumnIndex == HProduceDateCol)
+ {
+ //鑾峰彇鏈夋晥鏈熻嚦
+ DateTime HProduceDate = DBUtility.ClsPub.isDate(grdMain.Rows[e.RowIndex].Cells[HProduceDateCol].Value); //鐢熶骇鏃ユ湡
+ string HEXPUNIT = DBUtility.ClsPub.isStrNull(grdMain.Rows[e.RowIndex].Cells[HEXPUNITCol].Value); //淇濊川鏈熷崟浣�
+ int HEXPPERIOD = DBUtility.ClsPub.isInt(grdMain.Rows[e.RowIndex].Cells[HEXPPERIODCol].Value); //淇濊川鏈�
+ if (GetExpiryDate(HProduceDate, HEXPUNIT, HEXPPERIOD, ref sReturn, ref HExpiryDate))
+ {
+ grdMain.Rows[e.RowIndex].Cells[HExpiryDateCol].Value = HExpiryDate;
+ }
+ }
+ //
+ if (this.EditingControl != null) //閲婃斁浜嬩欢
+ {
+ EditingControl.KeyDown -= new KeyEventHandler(this.EditingControl_KeyDown);
+ this.EditingControl = null;
+ }
+ }
+ DataGridViewTextBoxEditingControl EditingControl;
+
+ private void grdMain_CellLeave(object sender, DataGridViewCellEventArgs e)
+ {
+ if (!grdStatus)
+ {
+ return;
+ }
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ //
+ //if (oSumGrid.Changelock)
+ // return;
+ //if(oSumGrid.EditStatus)
+ //{
+ if (!CheckGridRow(oSumGrid.OldCell.Row))
+ return;
+ //}
+ }
+
+ private void grdMain_ColumnWidthChanged(object sender, DataGridViewColumnEventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ }
+
+ private void grdMain_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e)
+ {
+ if (grdMain.CurrentCell != null)
+ {
+ if (e.Control is DataGridViewTextBoxEditingControl)
+ {
+ this.EditingControl = (DataGridViewTextBoxEditingControl)e.Control;
+ //澧炲姞濮旀墭澶勭悊
+ this.EditingControl.KeyDown += new KeyEventHandler(this.EditingControl_KeyDown);
+ }
+ }
+ }
+
+ private void EditingControl_KeyDown(object sender, KeyEventArgs e)
+ {
+ //涓氬姟澶勭悊
+ Sub_GridKey(e.KeyValue, grdMain.CurrentRow.Index, grdMain.CurrentCell.ColumnIndex, EditingControl);
+ }
+
+ private void grdMain_RowHeadersWidthChanged(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ }
+
+ private void grdMain_Scroll(object sender, ScrollEventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ oSumGrid.DisplayCurRow();
+ }
+
+ #endregion
+
+ private void FillSelectData(List<DBUtility.BillSelect> oList)
+ {
+ DataSet Ds;
+ oSumGrid.Changelock = true;
+ initGrid();
+ int i = -1;
+ foreach (DBUtility.BillSelect oSelectRow in oList)
+ {
+ i = i + 1;
+ //鐢熶骇璁㈠崟
+ if (oSelectRow.BillType == "3710")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_ICMOBillList " + oSelectRow.BillMainID.ToString() + "," + oSelectRow.BillSubID.ToString() + ",'" + SourceQtyCtl + "'", "h_p_Gy_BarCodeBill_ICMOBillList");
+ //Ds = oCn.RunProcReturn("select * from h_v_IFCLD_ICMOList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IFCLD_ICMOList");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm(Ds.Tables[0], i);
+ }
+ //鐢熶骇姹囨姤鍗�
+ if (oSelectRow.BillType == "3711")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_IF_ICMOReportList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ICMOReportList");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm1(Ds.Tables[0], i);
+ }
+ //鏀舵枡閫氱煡鍗�
+ if (oSelectRow.BillType == "1103")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_IF_POInStockList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POInStockList");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm1(Ds.Tables[0], i);
+ }
+ //閲囪喘璁㈠崟
+ if (oSelectRow.BillType == "1102")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_IF_POOrderList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POOrderList");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm1(Ds.Tables[0], i);
+ }
+ //濮斿璁㈠崟
+ if (oSelectRow.BillType == "1601")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_IF_EntrustOrderList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_EntrustOrderList");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm1(Ds.Tables[0], i);
+ }
+ //閲囪喘鍏ュ簱鍗�
+ if (oSelectRow.BillType == "1201")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_IF_POStockInBillList_Source where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POStockInBillList_Source");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm1(Ds.Tables[0], i);
+ }
+ //閫�璐ч�氱煡鍗�
+ if (oSelectRow.BillType == "1403")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_IF_SeOutStockBackList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_SeOutStockBackList");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm1(Ds.Tables[0], i);
+ }
+ //鍏朵粬鍏ュ簱鍗�
+ if (oSelectRow.BillType == "1203")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_IF_OtherInList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_OtherInList");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm1(Ds.Tables[0], i);
+ }
+ //鐩存帴璋冩嫧鍗�
+ if (oSelectRow.BillType == "1207")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_IF_MoveStockList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_MoveStockList");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm1(Ds.Tables[0], i);
+ }
+ //閲囪喘閫�鏂欏崟
+ if (oSelectRow.BillType == "1239")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_IF_POStockInBackList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_POStockInBackList");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm1(Ds.Tables[0], i);
+ }
+ //鐢熶骇閫�鏂欏崟
+ if (oSelectRow.BillType == "1244")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_IF_MateOutBackList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_MateOutBackList");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm1(Ds.Tables[0], i);
+ }
+ //缁勮鎷嗗嵏鍗�
+ if (oSelectRow.BillType == "1255")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_IF_PackageDismantleList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_PackageDismantleList");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm1(Ds.Tables[0], i);
+ }
+ //宸ュ簭娴佽浆鍗�
+ if (oSelectRow.BillType == "3772")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_IF_ProcessExchangeList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ProcessExchangeList");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm1(Ds.Tables[0], i);
+ }
+ //宸ュ簭姹囨姤鍗�
+ if (oSelectRow.BillType == "3714")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_IF_ProcessReportList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IF_ProcessReportList");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm1(Ds.Tables[0], i);
+ }
+ //鍗虫椂搴撳瓨
+ if (oSelectRow.BillType == "JSKC")
+ {
+ grdMain.Rows.Add();
+ Application.DoEvents();
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("select * from h_v_KF_ICInventoryList_IF where hmaterid=" + oSelectRow.BillMainID + " and hwhid=" + oSelectRow.BillSubID + " and hspid=" + oSelectRow.SPID + " and HAuxPropID=" + oSelectRow.HAuxPropID + " and 鎵规='" + oSelectRow.BatchNo + "' and 璁″垝璺熻釜鍙�='" + oSelectRow.BillNo + "' and 鐢熶骇鏃ユ湡='" + oSelectRow.HProduceDate + "' and 鏈夋晥鏈熻嚦='" + oSelectRow.HExpiryDate + "'", "h_v_KF_ICInventoryList_IF");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm2(Ds.Tables[0], i);
+ }
+ }
+ //
+ oSumGrid.Changelock = false;
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ }
+
+ //鏍规嵁TABLE鍐欏叆鐣岄潰(鐢熶骇浠诲姟鍗�)
+ private void Sub_WriteInForm(DataTable oTable, int i)
+ {
+ //鍔犺浇琛ㄤ綋
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ grdMain.Rows[i].Cells[HQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+ grdMain.Rows[i].Cells[HSourceBillQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+ grdMain.Rows[i].Cells[HMainIDCol].Value = oTable.Rows[0]["hmainid"].ToString();
+ grdMain.Rows[i].Cells[HSubIDCol].Value = oTable.Rows[0]["hsubid"].ToString();
+ grdMain.Rows[i].Cells[HBillNoCol].Value = oTable.Rows[0]["鍗曟嵁鍙�"].ToString();
+ grdMain.Rows[i].Cells[HBillTypeCol].Value = oTable.Rows[0]["HBillType"].ToString();
+ grdMain.Rows[i].Cells[HSupIDCol].Value = oTable.Rows[0]["hsupid"].ToString();
+ grdMain.Rows[i].Cells[HSupNumberCol].Value = oTable.Rows[0]["渚涘簲鍟嗕唬鐮�"].ToString();
+ grdMain.Rows[i].Cells[HSupNameCol].Value = oTable.Rows[0]["渚涘簲鍟�"].ToString();
+ grdMain.Rows[i].Cells[HDeptIDCol].Value = oTable.Rows[0]["HDeptID"].ToString();
+ grdMain.Rows[i].Cells[HDeptNumberCol].Value = oTable.Rows[0]["閮ㄩ棬浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HDeptNameCol].Value = oTable.Rows[0]["閮ㄩ棬"].ToString();
+ grdMain.Rows[i].Cells[HMaterIDCol].Value = oTable.Rows[0]["HMaterID"].ToString();
+ grdMain.Rows[i].Cells[HMaterNumberCol].Value = oTable.Rows[0]["鐗╂枡浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HMaterNameCol].Value = oTable.Rows[0]["鐗╂枡鍚嶇О"].ToString();
+ grdMain.Rows[i].Cells[HMaterModelCol].Value = oTable.Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+ grdMain.Rows[i].Cells[HBatchManagerCol].Value = oTable.Rows[0]["HBatchManager"].ToString();
+ grdMain.Rows[i].Cells[HBatchNoCol].Value = oTable.Rows[0]["鎵规"].ToString();
+ grdMain.Rows[i].Cells[HUnitIDCol].Value = oTable.Rows[0]["HUnitID"].ToString();
+ grdMain.Rows[i].Cells[HUnitNumberCol].Value = oTable.Rows[0]["璁￠噺鍗曚綅浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HUnitNameCol].Value = oTable.Rows[0]["璁￠噺鍗曚綅"].ToString();
+ grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["澶囨敞"].ToString();
+ grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["璁″垝璺熻釜鍙�"].ToString();
+ grdMain.Rows[i].Cells[HCusIDCol].Value = oTable.Rows[0]["HCusID"].ToString();
+ grdMain.Rows[i].Cells[HCusNumberCol].Value = oTable.Rows[0]["瀹㈡埛浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HCusNameCol].Value = oTable.Rows[0]["瀹㈡埛"].ToString();
+ grdMain.Rows[i].Cells[HCusTypeCol].Value = oTable.Rows[0]["瀹㈡埛鍨嬪彿"].ToString();
+ grdMain.Rows[i].Cells[HPinfanCol].Value = oTable.Rows[0]["HPinfan"].ToString();
+ grdMain.Rows[i].Cells[HSourceNameCol].Value = oTable.Rows[0]["鐢熶骇绾�"].ToString();
+ grdMain.Rows[i].Cells[HEndDateCol].Value = oTable.Rows[0]["璁″垝瀹屽伐鏃ユ湡"].ToString();
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+ grdMain.Rows[i].Cells[HBarCodeTypeCol].Value = oTable.Rows[0]["HBarCodeType"].ToString();
+ grdMain.Rows[i].Cells[HISKFPERIODCol].Value = oTable.Rows[0]["HISKFPERIOD"].ToString();
+
+ //鍚敤淇濊川鏈�
+ if (DBUtility.ClsPub.isBool(oTable.Rows[0]["HISKFPERIOD"].ToString()))
+ {
+ grdMain.Rows[i].Cells[HEXPUNITCol].Value = oTable.Rows[0]["HEXPUNIT"].ToString();
+ grdMain.Rows[i].Cells[HEXPPERIODCol].Value = DBUtility.ClsPub.isInt(oTable.Rows[0]["HEXPPERIOD"]).ToString();
+ //婧愬崟涓婃湁鐢熶骇鏃ユ湡銆佹湁鏁堟湡鑷冲彇婧愬崟涓婏紝娌℃湁鐢熶骇鏃ユ湡鍙栫晫闈㈡墍閫夋棩鏈�
+ if (oTable.Rows[0]["HProduceDate"].ToString()=="" || oTable.Rows[0]["HExpiryDate"].ToString()=="")
+ {
+ grdMain.Rows[i].Cells[HProduceDateCol].Value = dtpHDate.Value.ToShortDateString();
+ //鑾峰彇鏈夋晥鏈熻嚦
+ string HEXPUNIT = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HEXPUNITCol].Value); //淇濊川鏈熷崟浣�
+ int HEXPPERIOD = DBUtility.ClsPub.isInt(grdMain.Rows[i].Cells[HEXPPERIODCol].Value); //淇濊川鏈�
+ if (GetExpiryDate(dtpHDate.Value, HEXPUNIT, HEXPPERIOD, ref sReturn, ref HExpiryDate))
+ {
+ grdMain.Rows[i].Cells[HExpiryDateCol].Value = HExpiryDate;
+ }
+ }
+ else
+ {
+ grdMain.Rows[i].Cells[HProduceDateCol].Value = oTable.Rows[0]["HProduceDate"].ToString();
+ grdMain.Rows[i].Cells[HExpiryDateCol].Value = oTable.Rows[0]["HExpiryDate"].ToString();
+ }
+ }
+ else
+ {
+ grdMain.Rows[i].Cells[HEXPUNITCol].Value = "";
+ grdMain.Rows[i].Cells[HEXPPERIODCol].Value = "";
+ grdMain.Rows[i].Cells[HProduceDateCol].Value = "";
+ grdMain.Rows[i].Cells[HExpiryDateCol].Value = "";
+ }
+
+ //--
+ //璁剧疆鍙紪杈戝垪
+ string sAllowCol = HQtyCol.ToString() +
+ "," + HMinQtyCol.ToString() +
+ "," + HAuxPropNumberCol.ToString() +
+ "," + HBatchNoCol.ToString() +
+ "," + HBarCodeTypeCol.ToString() +
+ "," + HProduceDateCol.ToString() +
+ "," + HRemarkCol.ToString();
+ grdMain.Columns[HBillNoCol].ReadOnly = true;
+ //璁剧疆鍚堣鍒�
+ string sTotalCol = HQtyCol.ToString();
+ //
+ DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid);
+ tabControl1.SelectedIndex = 0;
+ bc.Enabled = true;
+ //
+ RowCount(i, 0);
+ }
+
+ //鏍规嵁TABLE鍐欏叆鐣岄潰
+ private void Sub_WriteInForm1(DataTable oTable, int i)
+ {
+ //鍔犺浇琛ㄤ綋
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ grdMain.Rows[i].Cells[HQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+ grdMain.Rows[i].Cells[HSourceBillQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+ grdMain.Rows[i].Cells[HMainIDCol].Value = oTable.Rows[0]["hmainid"].ToString();
+ grdMain.Rows[i].Cells[HSubIDCol].Value = oTable.Rows[0]["hsubid"].ToString();
+ grdMain.Rows[i].Cells[HBillNoCol].Value = oTable.Rows[0]["鍗曟嵁鍙�"].ToString();
+ grdMain.Rows[i].Cells[HBillTypeCol].Value = oTable.Rows[0]["HBillType"].ToString();
+ grdMain.Rows[i].Cells[HDeptIDCol].Value = oTable.Rows[0]["HDeptID"].ToString();
+ grdMain.Rows[i].Cells[HDeptNumberCol].Value = oTable.Rows[0]["閮ㄩ棬浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HDeptNameCol].Value = oTable.Rows[0]["閮ㄩ棬"].ToString();
+ grdMain.Rows[i].Cells[HMaterIDCol].Value = oTable.Rows[0]["HMaterID"].ToString();
+ grdMain.Rows[i].Cells[HMaterNumberCol].Value = oTable.Rows[0]["鐗╂枡浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HMaterNameCol].Value = oTable.Rows[0]["鐗╂枡鍚嶇О"].ToString();
+ grdMain.Rows[i].Cells[HMaterModelCol].Value = oTable.Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+ grdMain.Rows[i].Cells[HBatchManagerCol].Value = oTable.Rows[0]["HBatchManager"].ToString();
+ grdMain.Rows[i].Cells[HBatchNoCol].Value = oTable.Rows[0]["鎵规"].ToString();
+ grdMain.Rows[i].Cells[HUnitIDCol].Value = oTable.Rows[0]["HUnitID"].ToString();
+ grdMain.Rows[i].Cells[HUnitNumberCol].Value = oTable.Rows[0]["璁￠噺鍗曚綅浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HUnitNameCol].Value = oTable.Rows[0]["璁￠噺鍗曚綅"].ToString();
+ grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["澶囨敞"].ToString();
+ grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["璁″垝璺熻釜鍙�"].ToString();
+ grdMain.Rows[i].Cells[HBarCodeTypeCol].Value = oTable.Rows[0]["HBarCodeType"].ToString();
+ grdMain.Rows[i].Cells[HISKFPERIODCol].Value = oTable.Rows[0]["HISKFPERIOD"].ToString();
+
+ //鍚敤淇濊川鏈�
+ if (DBUtility.ClsPub.isBool(oTable.Rows[0]["HISKFPERIOD"].ToString()))
+ {
+ grdMain.Rows[i].Cells[HEXPUNITCol].Value = oTable.Rows[0]["HEXPUNIT"].ToString();
+ grdMain.Rows[i].Cells[HEXPPERIODCol].Value = DBUtility.ClsPub.isInt(oTable.Rows[0]["HEXPPERIOD"]).ToString();
+ //婧愬崟涓婃湁鐢熶骇鏃ユ湡銆佹湁鏁堟湡鑷冲彇婧愬崟涓婏紝娌℃湁鐢熶骇鏃ユ湡鍙栫晫闈㈡墍閫夋棩鏈�
+ if (oTable.Rows[0]["鐢熶骇鏃ユ湡"].ToString() == "" || oTable.Rows[0]["鏈夋晥鏈熻嚦"].ToString() == "")
+ {
+ grdMain.Rows[i].Cells[HProduceDateCol].Value = dtpHDate.Value.ToShortDateString();
+ //鑾峰彇鏈夋晥鏈熻嚦
+ string HEXPUNIT = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HEXPUNITCol].Value); //淇濊川鏈熷崟浣�
+ int HEXPPERIOD = DBUtility.ClsPub.isInt(grdMain.Rows[i].Cells[HEXPPERIODCol].Value); //淇濊川鏈�
+ if (GetExpiryDate(dtpHDate.Value, HEXPUNIT, HEXPPERIOD, ref sReturn, ref HExpiryDate))
+ {
+ grdMain.Rows[i].Cells[HExpiryDateCol].Value = HExpiryDate;
+ }
+ }
+ else
+ {
+ grdMain.Rows[i].Cells[HProduceDateCol].Value = oTable.Rows[0]["鐢熶骇鏃ユ湡"].ToString();
+ grdMain.Rows[i].Cells[HExpiryDateCol].Value = oTable.Rows[0]["鏈夋晥鏈熻嚦"].ToString();
+ }
+ }
+ else
+ {
+ grdMain.Rows[i].Cells[HEXPUNITCol].Value = "";
+ grdMain.Rows[i].Cells[HEXPPERIODCol].Value = "";
+ grdMain.Rows[i].Cells[HProduceDateCol].Value = "";
+ grdMain.Rows[i].Cells[HExpiryDateCol].Value = "";
+ }
+
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+
+ //--
+ //璁剧疆鍙紪杈戝垪
+ string sAllowCol = HQtyCol.ToString() +
+ "," + HMinQtyCol.ToString() +
+ "," + HAuxPropNumberCol.ToString() +
+ "," + HBatchNoCol.ToString() +
+ "," + HBarCodeTypeCol.ToString() +
+ "," + HProduceDateCol.ToString() +
+ "," + HRemarkCol.ToString();
+ grdMain.Columns[HBillNoCol].ReadOnly = true;
+ //璁剧疆鍚堣鍒�
+ string sTotalCol = HQtyCol.ToString();
+ //
+ DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid);
+ tabControl1.SelectedIndex = 0;
+ bc.Enabled = true;
+ //
+ RowCount(i, 0);
+ }
+
+ //鏍规嵁TABLE鍐欏叆鐣岄潰锛堥噾铦跺嵆鏃跺簱瀛橈級
+ private void Sub_WriteInForm2(DataTable oTable, int i)
+ {
+ //鍔犺浇琛ㄤ綋
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ grdMain.Rows[i].Cells[HQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏁伴噺"]);
+ grdMain.Rows[i].Cells[HSourceBillQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏁伴噺"]);
+ grdMain.Rows[i].Cells[HMaterIDCol].Value = oTable.Rows[0]["HMaterID"].ToString();
+ grdMain.Rows[i].Cells[HMaterNumberCol].Value = oTable.Rows[0]["鐗╂枡浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HMaterNameCol].Value = oTable.Rows[0]["鐗╂枡鍚嶇О"].ToString();
+ grdMain.Rows[i].Cells[HMaterModelCol].Value = oTable.Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+ grdMain.Rows[i].Cells[HAuxPropIDCol].Value = oTable.Rows[0]["HAuxPropID"].ToString();
+ grdMain.Rows[i].Cells[HAuxPropNumberCol].Value = oTable.Rows[0]["杈呭姪灞炴�т唬鐮�"].ToString();
+ grdMain.Rows[i].Cells[HAuxPropNameCol].Value = oTable.Rows[0]["杈呭姪灞炴�у悕绉�"].ToString();
+ grdMain.Rows[i].Cells[HBatchManagerCol].Value = oTable.Rows[0]["HBatchManager"].ToString();
+ grdMain.Rows[i].Cells[HBatchNoCol].Value = oTable.Rows[0]["鎵规"].ToString();
+ grdMain.Rows[i].Cells[HUnitIDCol].Value = oTable.Rows[0]["HUnitID"].ToString();
+ grdMain.Rows[i].Cells[HUnitNumberCol].Value = oTable.Rows[0]["璁￠噺鍗曚綅浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HUnitNameCol].Value = oTable.Rows[0]["璁￠噺鍗曚綅"].ToString();
+ grdMain.Rows[i].Cells[HSupIDCol].Value = oTable.Rows[0]["HSupplyID"].ToString();
+ grdMain.Rows[i].Cells[HSupNumberCol].Value = oTable.Rows[0]["渚涘簲鍟嗕唬鐮�"].ToString();
+ grdMain.Rows[i].Cells[HSupNameCol].Value = oTable.Rows[0]["渚涘簲鍟�"].ToString();
+ grdMain.Rows[i].Cells[HWhIDCol].Value = oTable.Rows[0]["HWhID"].ToString();
+ grdMain.Rows[i].Cells[HWhNumberCol].Value = oTable.Rows[0]["浠撳簱浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HWhNameCol].Value = oTable.Rows[0]["浠撳簱"].ToString();
+ grdMain.Rows[i].Cells[HSPIDCol].Value = oTable.Rows[0]["HSPID"].ToString();
+ grdMain.Rows[i].Cells[HSPNumberCol].Value = oTable.Rows[0]["浠撲綅浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HSPNameCol].Value = oTable.Rows[0]["浠撲綅"].ToString();
+ grdMain.Rows[i].Cells[HRemarkCol].Value = "鎸夊簱瀛樼敓鎴�";
+ grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["璁″垝璺熻釜鍙�"].ToString();
+ grdMain.Rows[i].Cells[HBarCodeTypeCol].Value = oTable.Rows[0]["HBarCodeType"].ToString();
+ grdMain.Rows[i].Cells[HISKFPERIODCol].Value = oTable.Rows[0]["HISKFPERIOD"].ToString();
+
+ //鍚敤淇濊川鏈�
+ if (DBUtility.ClsPub.isBool(oTable.Rows[0]["HISKFPERIOD"].ToString()))
+ {
+ grdMain.Rows[i].Cells[HEXPUNITCol].Value = oTable.Rows[0]["HEXPUNIT"].ToString();
+ grdMain.Rows[i].Cells[HEXPPERIODCol].Value = DBUtility.ClsPub.isInt(oTable.Rows[0]["HEXPPERIOD"]).ToString();
+ grdMain.Rows[i].Cells[HProduceDateCol].Value = oTable.Rows[0]["鐢熶骇鏃ユ湡"].ToString();
+ grdMain.Rows[i].Cells[HExpiryDateCol].Value = oTable.Rows[0]["鏈夋晥鏈熻嚦"].ToString();
+ }
+ else
+ {
+ grdMain.Rows[i].Cells[HEXPUNITCol].Value = "";
+ grdMain.Rows[i].Cells[HEXPPERIODCol].Value = "";
+ grdMain.Rows[i].Cells[HProduceDateCol].Value = "";
+ grdMain.Rows[i].Cells[HExpiryDateCol].Value = "";
+ }
+
+ //--
+ //璁剧疆鍙紪杈戝垪
+ string sAllowCol = HQtyCol.ToString() +
+ "," + HBarCodeTypeCol.ToString() +
+ "," + HMinQtyCol.ToString();
+ grdMain.Columns[HBillNoCol].ReadOnly = true;
+ //璁剧疆鍚堣鍒�
+ string sTotalCol = HQtyCol.ToString();
+ //
+ DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid);
+ tabControl1.SelectedIndex = 0;
+ bc.Enabled = true;
+ //
+ RowCount(i, 0);
+ }
+
+
+
+
+
+ #region //鎵撳嵃璁剧疆
+
+ GridppReport Report;
+ string sBarCodeItemID = ""; //鏉＄爜鑷鍒�
+
+ #region 棰勮
+ private void yl_Click(object sender, EventArgs e)
+ {
+ //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
+ if (grdList.Rows.Count < 1)
+ {
+ MessageBox.Show("鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀棰勮锛�");
+ return;
+ }
+
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+ if (ReportPrintBegin())
+ {
+ return;
+ }
+
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.PrintPreview(false);
+ Thread.Sleep(1000);
+ }
+ }
+
+ #endregion
+
+ #region 鎵撳嵃
+ private void dy_Click(object sender, EventArgs e)
+ {
+ //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
+ if (grdList.Rows.Count < 1)
+ {
+ MessageBox.Show("鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀鎵撳嵃锛�");
+ return;
+ }
+
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+ if (ReportPrintBegin())
+ {
+ return;
+ }
+
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ //寰幆閫変腑琛�
+ Sub_SetReport(oFrm.sOpenTmp);
+ Report.Print(true);
+ Thread.Sleep(1000);
+ }
+ }
+
+ #endregion
+
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟
+ private bool ReportPrintBegin()
+ {
+ string sHRemark = "";
+ if (PrintQtyCtl == "Y")
+ {
+ if (oBar.Set_CheckPrintQty_SD(HInterID, PrintQty, ref sHRemark))
+ {
+ MessageBox.Show(sHRemark);
+ return true;
+ }
+ return false;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ private void Sub_SetReport(string sOpenTmp)
+ {
+ //鍒ゆ柇琛屾暟
+ for (int i = 0; i < grdList.Rows.Count; i++)
+ {
+ grdList.Rows[i].Cells[0].Value = "*";
+ }
+ //
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
+ }
+
+ //濉叆鍗曟嵁琛ㄥご淇℃伅
+ private void ReportBeforePostRecord()//
+ {
+ try
+ {
+ //Report.FieldByName("澶囨敞").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HRemark2Col].Value);
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!琛ㄥご锛�" + e.Message);
+ }
+ }
+
+ //濉叆鍗曟嵁琛ㄤ綋淇℃伅
+ private void ReportFetchRecordByDataTable()
+ {
+ try
+ {
+ DataTable ds = new DataTable();
+ BLL.Utility.FillRecordToReport_Sel(Report, grdList, ds, Fun_GetCol("閫夋嫨"));
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!琛ㄤ綋锛�" + e.Message);
+ }
+ }
+
+ //鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+ private void ReportPrintEnd()
+ {
+ if (UpdatePrintQtyCtl == "Y")
+ {
+ oBar.Set_UpdatePrintQty_SD(HInterID);
+ }
+ }
+
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdList);
+ }
+
+ #region 璇曟墦鍗�
+ private void sdy_Click(object sender, EventArgs e)
+ {
+ //鍒ゆ柇鏄惁宸茬粡鐢熸垚鏉＄爜
+ if (grdList.Rows.Count < 1)
+ {
+ MessageBox.Show("鏉＄爜鏈敓鎴愶紝璇峰厛鐢熸垚鏉＄爜鍚庡啀娴忚锛�");
+ return;
+ }
+
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹀凡鎵撳嵃杩�
+ if (ReportPrintBegin_SDY())
+ {
+ return;
+ }
+
+ //閫夋嫨鎵撳嵃妯℃澘
+ BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();
+ oFrm.sBillName = ModName;
+ oFrm.sBillModel = ModCaption;
+ oFrm.ShowDialog();
+ if (oFrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ Sub_SetReportView(oFrm.sOpenTmp);
+ Report.PrintPreview(false);
+ Thread.Sleep(1000);
+ }
+ }
+
+ //鎵撳嵃鍓嶅垽鏂潯鐮佹槸鍚﹁秴杩囧厑璁稿彲鎵撳嵃娆℃暟
+ private bool ReportPrintBegin_SDY()
+ {
+ string sHRemark = "";
+ sBarCodeItemID = "";
+ for (int i = 0; i < grdList.SelectedRows.Count; i++)
+ {
+ sBarCodeItemID = sBarCodeItemID + "," + DBUtility.ClsPub.isLong(grdList.Rows[grdList.SelectedRows[i].Index].Cells[Fun_GetCol("HItemID")].Value).ToString();
+ }
+ sBarCodeItemID = sBarCodeItemID.Remove(0, 1);
+
+ if (PrintQtyCtl == "Y")
+ {
+ if (oBar.Set_CheckPrintQty(sBarCodeItemID, PrintQty, ref sHRemark))
+ {
+ MessageBox.Show(sHRemark);
+ return true;
+ }
+ return false;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ private void Sub_SetReportView(string sOpenTmp)
+ {
+ //鍒ゆ柇琛屾暟
+ for (int i = 0; i < grdList.Rows.Count; i++)
+ {
+ grdList.Rows[i].Cells[0].Value = "";
+ }
+ for (int i = 0; i < grdList.SelectedRows.Count; i++)
+ {
+ grdList.Rows[grdList.SelectedRows[i].Index].Cells[0].Value = "*";
+ }
+ //
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + sOpenTmp + ".grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd_SDY);
+ }
+
+ //鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+ private void ReportPrintEnd_SDY()
+ {
+ if (UpdatePrintQtyCtl == "Y")
+ {
+ oBar.Set_UpdatePrintQty(sBarCodeItemID);
+ }
+ }
+
+ #endregion
+
+ #endregion
+
+
+ #region 閫夋嫨缁勭粐
+ private void cmbHOrgID_SelectionChangeCommitted(object sender, EventArgs e)
+ {
+ HOrgID = ClsPub.isLong(cmbHOrgID.SelectedValue);
+ //娓呯┖鍒濆鍖栧垪琛�
+ initGrid();
+ grdMain.Columns[HBillNoCol].ReadOnly = false;
+ }
+
+ #endregion
+
+ #region 閫夋嫨鏃ユ湡
+ private void dtpHDate_ValueChanged(object sender, EventArgs e)
+ {
+ //if (chkUpdateSubDate.Checked == true)
+ //{
+ // for (int j = 0; j < grdMain.Rows.Count; j++)
+ // {
+ // long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value); // 鐗╂枡鍐呯爜
+ // if (HMaterID != 0 && DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HRemarkCol].Value) != "鎸夊簱瀛樼敓鎴�")
+ // {
+ // //鑾峰彇鐢熶骇鏃ユ湡銆佹湁鏁堟湡鑷�
+ // DateTime HProduceDate = dtpHDate.Value; //鐢熶骇鏃ユ湡
+ // string HEXPUNIT = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HEXPUNITCol].Value); //淇濊川鏈熷崟浣�
+ // int HEXPPERIOD = DBUtility.ClsPub.isInt(grdMain.Rows[j].Cells[HEXPPERIODCol].Value); //淇濊川鏈�
+ // //鐢熶骇鏃ユ湡
+ // grdMain.Rows[j].Cells[HProduceDateCol].Value = dtpHDate.Value.ToShortDateString();
+
+ // if (GetExpiryDate(HProduceDate, HEXPUNIT, HEXPPERIOD, ref sReturn, ref HExpiryDate))
+ // {
+ // //鏈夋晥鏈熻嚦
+ // grdMain.Rows[j].Cells[HExpiryDateCol].Value = HExpiryDate;
+ // }
+ // }
+ // }
+ //}
+ }
+
+ #endregion
+
+ #region 鑾峰彇鏈夋晥鏈熻嚦
+ public bool GetExpiryDate(DateTime HProduceDate, string HEXPUNIT, int HEXPPERIOD, ref string sReturn, ref string HExpiryDate)
+ {
+ if (HEXPUNIT != "Y" && HEXPUNIT != "M" && HEXPUNIT != "D")
+ {
+ sReturn = "鐗╂枡鍚敤淇濊川鏈熺鐞嗭紝鐗╂枡鍩虹璧勬枡涓殑淇濊川鏈熷崟浣嶄笉鍏佽涓虹┖锛�";
+ return false;
+ }
+ else if (HEXPPERIOD == 0)
+ {
+ sReturn = "鐗╂枡鍚敤淇濊川鏈熺鐞嗭紝鐗╂枡鍩虹璧勬枡涓殑淇濊川鏈熶笉鍏佽涓虹┖锛�";
+ return false;
+ }
+ else if (HEXPUNIT == "Y")
+ {
+ HExpiryDate = HProduceDate.AddYears(HEXPPERIOD).ToShortDateString();
+ return true;
+ }
+ else if (HEXPUNIT == "M")
+ {
+ HExpiryDate = HProduceDate.AddMonths(HEXPPERIOD).ToShortDateString();
+ return true;
+ }
+ else
+ {
+ HExpiryDate = HProduceDate.AddDays(HEXPPERIOD).ToShortDateString();
+ return true;
+ }
+ }
+
+ #endregion
+
+
+ #region 鎷嗚
+ private void spRow_Click(object sender, EventArgs e)
+ {
+ oDlg.ShowDialog();
+ if (oDlg.IsOk == 1)
+ {
+ grdMainData_CF(DBUtility.ClsPub.isInt(oDlg.txtHQ.Text));
+ }
+ }
+ private void grdMainData_CF(int HQty)
+ {
+ double hq = 0;
+ int Qty = HQty - 1;
+ int row = grdMain.CurrentCell.RowIndex;
+ grdMain.Rows.Insert(row + 1, Qty);
+ hq = DBUtility.ClsPub.isDoule(grdMain.Rows[row].Cells[HQtyCol].Value) / HQty;
+ grdMain.Rows[row].Cells[HQtyCol].Value = hq;
+ for (int i = 0; i < Qty; i++)
+ {
+ int r = i + 1;
+ grdMain.Rows[row + r].Cells[HTagCol].Value = grdMain.Rows[row].Cells[HTagCol].Value;
+ grdMain.Rows[row + r].Cells[HMainIDCol].Value = grdMain.Rows[row].Cells[HMainIDCol].Value;
+ grdMain.Rows[row + r].Cells[HSubIDCol].Value = grdMain.Rows[row].Cells[HSubIDCol].Value;
+ grdMain.Rows[row + r].Cells[HBillNoCol].Value = grdMain.Rows[row].Cells[HBillNoCol].Value;
+ grdMain.Rows[row + r].Cells[HBillTypeCol].Value = grdMain.Rows[row].Cells[HBillTypeCol].Value;
+ grdMain.Rows[row + r].Cells[HMaterIDCol].Value = grdMain.Rows[row].Cells[HMaterIDCol].Value;
+ grdMain.Rows[row + r].Cells[HMaterNumberCol].Value = grdMain.Rows[row].Cells[HMaterNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HMaterNameCol].Value = grdMain.Rows[row].Cells[HMaterNameCol].Value;
+ grdMain.Rows[row + r].Cells[HPinfanCol].Value = grdMain.Rows[row].Cells[HPinfanCol].Value;
+ grdMain.Rows[row + r].Cells[HMaterModelCol].Value = grdMain.Rows[row].Cells[HMaterModelCol].Value;
+ grdMain.Rows[row + r].Cells[HAuxPropIDCol].Value = grdMain.Rows[row].Cells[HAuxPropIDCol].Value;
+ grdMain.Rows[row + r].Cells[HAuxPropNumberCol].Value = grdMain.Rows[row].Cells[HAuxPropNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HAuxPropNameCol].Value = grdMain.Rows[row].Cells[HAuxPropNameCol].Value;
+ grdMain.Rows[row + r].Cells[HBatchNoCol].Value = grdMain.Rows[row].Cells[HBatchNoCol].Value;
+ grdMain.Rows[row + r].Cells[HQtyCol].Value = DBUtility.ClsPub.isDoule(hq, 4);
+ grdMain.Rows[row + r].Cells[HMinQtyCol].Value = 0;
+ grdMain.Rows[row + r].Cells[HSourceBillQtyCol].Value = DBUtility.ClsPub.isDoule(hq, 4);
+ grdMain.Rows[row + r].Cells[HProduceDateCol].Value = grdMain.Rows[row].Cells[HProduceDateCol].Value;
+ grdMain.Rows[row + r].Cells[HExpiryDateCol].Value = grdMain.Rows[row].Cells[HExpiryDateCol].Value;
+ grdMain.Rows[row + r].Cells[HEXPUNITCol].Value = grdMain.Rows[row].Cells[HEXPUNITCol].Value;
+ grdMain.Rows[row + r].Cells[HEXPPERIODCol].Value = grdMain.Rows[row].Cells[HEXPPERIODCol].Value;
+ grdMain.Rows[row + r].Cells[HUnitIDCol].Value = grdMain.Rows[row].Cells[HUnitIDCol].Value;
+ grdMain.Rows[row + r].Cells[HUnitNumberCol].Value = grdMain.Rows[row].Cells[HUnitNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HUnitNameCol].Value = grdMain.Rows[row].Cells[HUnitNameCol].Value;
+ grdMain.Rows[row + r].Cells[HWhIDCol].Value = grdMain.Rows[row].Cells[HWhIDCol].Value;
+ grdMain.Rows[row + r].Cells[HWhNumberCol].Value = grdMain.Rows[row].Cells[HWhNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HWhNameCol].Value = grdMain.Rows[row].Cells[HWhNameCol].Value;
+ grdMain.Rows[row + r].Cells[HSPIDCol].Value = grdMain.Rows[row].Cells[HSPIDCol].Value;
+ grdMain.Rows[row + r].Cells[HSPNumberCol].Value = grdMain.Rows[row].Cells[HSPNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HSPNameCol].Value = grdMain.Rows[row].Cells[HSPNameCol].Value;
+ grdMain.Rows[row + r].Cells[HMTONoCol].Value = grdMain.Rows[row].Cells[HMTONoCol].Value;
+ grdMain.Rows[row + r].Cells[HRemarkCol].Value = grdMain.Rows[row].Cells[HRemarkCol].Value;
+ grdMain.Rows[row + r].Cells[HDeptIDCol].Value = grdMain.Rows[row].Cells[HDeptIDCol].Value;
+ grdMain.Rows[row + r].Cells[HDeptNumberCol].Value = grdMain.Rows[row].Cells[HDeptNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HDeptNameCol].Value = grdMain.Rows[row].Cells[HDeptNameCol].Value;
+ grdMain.Rows[row + r].Cells[HSourceIDCol].Value = grdMain.Rows[row].Cells[HSourceIDCol].Value;
+ grdMain.Rows[row + r].Cells[HSourceNumberCol].Value = grdMain.Rows[row].Cells[HSourceNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HSourceNameCol].Value = grdMain.Rows[row].Cells[HSourceNameCol].Value;
+ grdMain.Rows[row + r].Cells[HSupIDCol].Value = grdMain.Rows[row].Cells[HSupIDCol].Value;
+ grdMain.Rows[row + r].Cells[HSupNumberCol].Value = grdMain.Rows[row].Cells[HSupNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HSupNameCol].Value = grdMain.Rows[row].Cells[HSupNameCol].Value;
+ grdMain.Rows[row + r].Cells[HGroupIDCol].Value = grdMain.Rows[row].Cells[HGroupIDCol].Value;
+ grdMain.Rows[row + r].Cells[HGroupNumberCol].Value = grdMain.Rows[row].Cells[HGroupNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HGroupNameCol].Value = grdMain.Rows[row].Cells[HGroupNameCol].Value;
+ grdMain.Rows[row + r].Cells[HCusIDCol].Value = grdMain.Rows[row].Cells[HCusIDCol].Value;
+ grdMain.Rows[row + r].Cells[HCusNumberCol].Value = grdMain.Rows[row].Cells[HCusNumberCol].Value;
+ grdMain.Rows[row + r].Cells[HCusNameCol].Value = grdMain.Rows[row].Cells[HCusNameCol].Value;
+ grdMain.Rows[row + r].Cells[HCusTypeCol].Value = grdMain.Rows[row].Cells[HCusTypeCol].Value;
+ grdMain.Rows[row + r].Cells[HSeOrderBillNoCol].Value = grdMain.Rows[row].Cells[HSeOrderBillNoCol].Value;
+ grdMain.Rows[row + r].Cells[HSeOrderSEQCol].Value = grdMain.Rows[row].Cells[HSeOrderSEQCol].Value;
+ grdMain.Rows[row + r].Cells[HInnerBillNoCol].Value = grdMain.Rows[row].Cells[HInnerBillNoCol].Value;
+ grdMain.Rows[row + r].Cells[HEndDateCol].Value = grdMain.Rows[row].Cells[HEndDateCol].Value;
+ //缃戞牸鎵撳嬀
+ //鏄惁鍚敤鎵规
+ DataGridViewCheckBoxCell oCell1 = new DataGridViewCheckBoxCell();
+ oCell1.ThreeState = false;
+ oCell1.Value = grdMain.Rows[row].Cells[HBatchManagerCol].Value;
+ oCell1.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[row + r].Cells[HBatchManagerCol] = oCell1;
+ //鏄惁鍚敤淇濊川鏈�
+ DataGridViewCheckBoxCell oCell2 = new DataGridViewCheckBoxCell();
+ oCell2.ThreeState = false;
+ oCell2.Value = grdMain.Rows[row].Cells[HISKFPERIODCol].Value;
+ oCell2.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[row + r].Cells[HISKFPERIODCol] = oCell2;
+ //鏄惁璧犲搧
+ DataGridViewCheckBoxCell oCell3 = new DataGridViewCheckBoxCell();
+ oCell3.ThreeState = false;
+ oCell3.Value = grdMain.Rows[row].Cells[HGiveAwayFlagCol].Value;
+ oCell3.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[row + r].Cells[HGiveAwayFlagCol] = oCell3;
+ //缃戞牸涓嬫媺閫夋嫨妗�
+ DataGridViewComboBoxCell column = new DataGridViewComboBoxCell();
+
+ column.Items.Add("鍞竴鏉＄爜");
+
+ grdMain.Rows[row + r].Cells[HBarCodeTypeCol] = column;
+ }
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ }
+
+ #endregion
+
+
+ #region 鎸夊簱瀛樼敓鎴愭潯鐮�
+
+ private void kc_Click(object sender, EventArgs e)
+ {
+ string sWhere = " and HOrgID =" + HOrgID.ToString();
+ BLL.Cls_S_KF_ICInventoryList_IF oadd = new BLL.Cls_S_KF_ICInventoryList_IF();
+ if (oadd.Refresh(sWhere)) //閫夋嫨鍘熷崟
+ //if (oadd.Refresh(" and HErpClsID in (1,2,3) ")) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oadd.oBillSelectColl);
+ }
+ }
+ #endregion
+
+
+ #region 鍚屾鍩虹璧勬枡淇℃伅
+ private void tb_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ oCn.RunProc("exec h_p_IF_ERPDataToLocal", ref DBUtility.ClsPub.sExeReturnInfo);
+ MessageBox.Show("鍚屾鍩虹璧勬枡鎴愬姛锛�");
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show("鍚屾鍩虹璧勬枡澶辫触锛�" + ex);
+ }
+ }
+ #endregion
+
+
+ #region 鍏宠仈鎸夐挳
+ private void gl_Click(object sender, EventArgs e)
+ {
+ try
+ {
+ long HInterID = DBUtility.ClsPub.isLong(grdList.Rows[0].Cells[Fun_GetCol("HInterID")].Value);
+ string HBarCode = DBUtility.ClsPub.isStrNull(grdList.Rows[0].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value);
+ string HBarCodeType = DBUtility.ClsPub.isStrNull(grdList.Rows[0].Cells[Fun_GetCol("鏉＄爜绫诲瀷")].Value);
+ string HSourceBillType = DBUtility.ClsPub.isStrNull(grdList.Rows[0].Cells[Fun_GetCol("HSourceBillType")].Value);
+
+ DataSet oDs = oCn.RunProcReturn("exec h_p_WMS_BarCodeToICStockBillSub_Insert " + HInterID.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "','" + HSourceBillType + "'", "h_p_WMS_BarCodeToICStockBillSub_Insert");
+ //
+ if (oDs == null && oDs.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鍏宠仈鑷姩鐢熸垚鏉＄爜鍑哄叆搴撹褰曞け璐ワ紒");
+ }
+ else
+ {
+ MessageBox.Show(DBUtility.ClsPub.isStrNull(oDs.Tables[0].Rows[0]["HRemark"]));
+ }
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show("鍏宠仈鑷姩鐢熸垚鏉＄爜鍑哄叆搴撹褰曞け璐�22锛�" + ex);
+ }
+ }
+ #endregion
+
+
+ #region 鎵规鎸夐挳
+ private void BatchNo_Click(object sender, EventArgs e)
+ {
+ lblCaption.Focus();
+ bool b = false;
+ for (int i = 0; i < grdMain.RowCount; i++)
+ {
+ long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value); // 鐗╂枡鍐呯爜
+ string HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HBatchNoCol].Value); // 鎵瑰彿
+
+ if (HMaterID != 0)
+ {
+ DataSet oDs = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_GetBatchNo " + HMaterID.ToString() + ",'" + HBatchNo + "','" + dtpHDate.Value.ToShortDateString() + "','" + CampanyName + "'", "h_p_Gy_BarCodeBill_GetBatchNo");
+ //
+ if (oDs == null && oDs.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鐢熸垚鎵规澶辫触锛�");
+ return;
+ }
+ else if (DBUtility.ClsPub.isStrNull(oDs.Tables[0].Rows[0][0]) == "1")
+ {
+ grdMain.Rows[i].Cells[HBatchNoCol].Value = DBUtility.ClsPub.isStrNull(oDs.Tables[0].Rows[0]["HBatchNo"]);
+ b = true;
+ }
+ }
+ }
+ //鏄庣粏琛ㄦ槸鍚︿负闆惰
+ if (b == false)
+ {
+ MessageBox.Show("娌℃湁闇�瑕佺敓鎴愭壒娆＄殑鏄庣粏琛岋紒", "鎻愮ず");
+ return;
+ }
+ }
+
+ #endregion
+
+ }
+}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XB_SelectMater.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XB_SelectMater.designer.cs"
new file mode 100644
index 0000000..ca2fb33
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XB_SelectMater.designer.cs"
@@ -0,0 +1,1016 @@
+锘縩amespace WarM
+{
+ partial class Gy_BarCodeBill_XB_SelectMater
+ {
+ /// <summary>
+ /// 蹇呴渶鐨勮璁″櫒鍙橀噺銆�
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// 娓呯悊鎵�鏈夋鍦ㄤ娇鐢ㄧ殑璧勬簮銆�
+ /// </summary>
+ /// <param name="disposing">濡傛灉搴旈噴鏀炬墭绠¤祫婧愶紝涓� true锛涘惁鍒欎负 false銆�</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows 绐椾綋璁捐鍣ㄧ敓鎴愮殑浠ｇ爜
+
+ /// <summary>
+ /// 璁捐鍣ㄦ敮鎸佹墍闇�鐨勬柟娉� - 涓嶈
+ /// 浣跨敤浠ｇ爜缂栬緫鍣ㄤ慨鏀规鏂规硶鐨勫唴瀹广��
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_BarCodeBill_XB_SelectMater));
+ this.Tool = new System.Windows.Forms.ToolStrip();
+ this.dy = new System.Windows.Forms.ToolStripButton();
+ this.sdy = new System.Windows.Forms.ToolStripButton();
+ this.yl = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+ this.AddRow = new System.Windows.Forms.ToolStripButton();
+ this.spRow = new System.Windows.Forms.ToolStripButton();
+ this.DelRow = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.bc = new System.Windows.Forms.ToolStripButton();
+ this.cz = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.kc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+ this.tb = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+ this.gl = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
+ this.BatchNo = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+ this.mrlk = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
+ this.bclk = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
+ this.tc = new System.Windows.Forms.ToolStripButton();
+ this.lblCaption = new System.Windows.Forms.Label();
+ this.P1 = new System.Windows.Forms.Panel();
+ this.pic1 = new System.Windows.Forms.PictureBox();
+ this.gbUp = new System.Windows.Forms.GroupBox();
+ this.dtpHDate = new System.Windows.Forms.DateTimePicker();
+ this.label2 = new System.Windows.Forms.Label();
+ this.cmbHOrgID = new System.Windows.Forms.ComboBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.cmdHEmpID = new System.Windows.Forms.Button();
+ this.panel2 = new System.Windows.Forms.Panel();
+ this.txtHDeleteDate = new System.Windows.Forms.Label();
+ this.label25 = new System.Windows.Forms.Label();
+ this.txtHDeleteMan = new System.Windows.Forms.Label();
+ this.label27 = new System.Windows.Forms.Label();
+ this.txtHUpDateDate = new System.Windows.Forms.Label();
+ this.label23 = new System.Windows.Forms.Label();
+ this.txtHUpDater = new System.Windows.Forms.Label();
+ this.label21 = new System.Windows.Forms.Label();
+ this.txtHCloseDate = new System.Windows.Forms.Label();
+ this.label19 = new System.Windows.Forms.Label();
+ this.txtHCloseMan = new System.Windows.Forms.Label();
+ this.label17 = new System.Windows.Forms.Label();
+ this.txtHCheckDate = new System.Windows.Forms.Label();
+ this.label15 = new System.Windows.Forms.Label();
+ this.txtHChecker = new System.Windows.Forms.Label();
+ this.label13 = new System.Windows.Forms.Label();
+ this.txtHMakeDate = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
+ this.txtHMaker = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.panel3 = new System.Windows.Forms.Panel();
+ this.grdSum = new System.Windows.Forms.DataGridView();
+ this.grdPrint = new System.Windows.Forms.DataGridView();
+ this.tabPage3 = new System.Windows.Forms.TabPage();
+ this.grdList = new System.Windows.Forms.DataGridView();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.grdMain = new System.Windows.Forms.DataGridView();
+ this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.Tool.SuspendLayout();
+ this.P1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
+ this.gbUp.SuspendLayout();
+ this.panel2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
+ this.tabPage3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdList)).BeginInit();
+ this.tabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
+ this.tabControl1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // Tool
+ //
+ this.Tool.AutoSize = false;
+ this.Tool.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("Tool.BackgroundImage")));
+ this.Tool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
+ this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.dy,
+ this.sdy,
+ this.yl,
+ this.toolStripSeparator2,
+ this.AddRow,
+ this.spRow,
+ this.DelRow,
+ this.toolStripSeparator3,
+ this.bc,
+ this.cz,
+ this.toolStripSeparator1,
+ this.kc,
+ this.toolStripSeparator4,
+ this.toolStripSeparator6,
+ this.tb,
+ this.toolStripSeparator9,
+ this.gl,
+ this.toolStripSeparator13,
+ this.BatchNo,
+ this.toolStripSeparator5,
+ this.mrlk,
+ this.toolStripSeparator11,
+ this.bclk,
+ this.toolStripSeparator10,
+ this.tc});
+ this.Tool.Location = new System.Drawing.Point(0, 0);
+ this.Tool.Name = "Tool";
+ this.Tool.Padding = new System.Windows.Forms.Padding(0);
+ this.Tool.Size = new System.Drawing.Size(2034, 100);
+ this.Tool.Stretch = true;
+ this.Tool.TabIndex = 17;
+ this.Tool.Text = "toolStrip1";
+ //
+ // dy
+ //
+ this.dy.AutoSize = false;
+ this.dy.Image = ((System.Drawing.Image)(resources.GetObject("dy.Image")));
+ this.dy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.dy.ImageTransparentColor = System.Drawing.Color.White;
+ this.dy.Name = "dy";
+ this.dy.Size = new System.Drawing.Size(35, 47);
+ this.dy.Text = "鎵撳嵃";
+ this.dy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.dy.Click += new System.EventHandler(this.dy_Click);
+ //
+ // sdy
+ //
+ this.sdy.AutoSize = false;
+ this.sdy.Image = ((System.Drawing.Image)(resources.GetObject("sdy.Image")));
+ this.sdy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sdy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.sdy.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.sdy.Name = "sdy";
+ this.sdy.Size = new System.Drawing.Size(35, 47);
+ this.sdy.Text = "娴忚";
+ this.sdy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sdy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.sdy.Click += new System.EventHandler(this.sdy_Click);
+ //
+ // yl
+ //
+ this.yl.AutoSize = false;
+ this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image")));
+ this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.yl.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.yl.Name = "yl";
+ this.yl.Size = new System.Drawing.Size(35, 47);
+ this.yl.Text = "棰勮";
+ this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.yl.Click += new System.EventHandler(this.yl_Click);
+ //
+ // toolStripSeparator2
+ //
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 100);
+ //
+ // AddRow
+ //
+ this.AddRow.AutoSize = false;
+ this.AddRow.Image = ((System.Drawing.Image)(resources.GetObject("AddRow.Image")));
+ this.AddRow.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.AddRow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.AddRow.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.AddRow.Name = "AddRow";
+ this.AddRow.Size = new System.Drawing.Size(35, 47);
+ this.AddRow.Text = "澧炶";
+ this.AddRow.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.AddRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.AddRow.Click += new System.EventHandler(this.AddRow_Click);
+ //
+ // spRow
+ //
+ this.spRow.AutoSize = false;
+ this.spRow.Image = ((System.Drawing.Image)(resources.GetObject("spRow.Image")));
+ this.spRow.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.spRow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.spRow.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.spRow.Name = "spRow";
+ this.spRow.Size = new System.Drawing.Size(35, 47);
+ this.spRow.Text = "鎷嗚";
+ this.spRow.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.spRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.spRow.Click += new System.EventHandler(this.spRow_Click);
+ //
+ // DelRow
+ //
+ this.DelRow.AutoSize = false;
+ this.DelRow.Image = ((System.Drawing.Image)(resources.GetObject("DelRow.Image")));
+ this.DelRow.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.DelRow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.DelRow.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.DelRow.Name = "DelRow";
+ this.DelRow.Size = new System.Drawing.Size(35, 47);
+ this.DelRow.Text = "鍒犺";
+ this.DelRow.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.DelRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.DelRow.Click += new System.EventHandler(this.DelRow_Click);
+ //
+ // toolStripSeparator3
+ //
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 100);
+ //
+ // bc
+ //
+ this.bc.AutoSize = false;
+ this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
+ this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.bc.Name = "bc";
+ this.bc.Size = new System.Drawing.Size(35, 47);
+ this.bc.Text = "鐢熸垚";
+ this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bc.Click += new System.EventHandler(this.bc_Click);
+ //
+ // cz
+ //
+ this.cz.AutoSize = false;
+ this.cz.Image = ((System.Drawing.Image)(resources.GetObject("cz.Image")));
+ this.cz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.cz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.cz.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.cz.Name = "cz";
+ this.cz.Size = new System.Drawing.Size(35, 47);
+ this.cz.Text = "閲嶇疆";
+ this.cz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.cz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.cz.Click += new System.EventHandler(this.cz_Click);
+ //
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 100);
+ //
+ // kc
+ //
+ this.kc.AutoSize = false;
+ this.kc.Image = ((System.Drawing.Image)(resources.GetObject("kc.Image")));
+ this.kc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.kc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.kc.ImageTransparentColor = System.Drawing.Color.White;
+ this.kc.Name = "kc";
+ this.kc.Size = new System.Drawing.Size(35, 47);
+ this.kc.Text = "搴撳瓨";
+ this.kc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.kc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.kc.Click += new System.EventHandler(this.kc_Click);
+ //
+ // toolStripSeparator4
+ //
+ this.toolStripSeparator4.Name = "toolStripSeparator4";
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 100);
+ //
+ // toolStripSeparator6
+ //
+ this.toolStripSeparator6.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator6.Name = "toolStripSeparator6";
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 100);
+ //
+ // tb
+ //
+ this.tb.AutoSize = false;
+ this.tb.Image = ((System.Drawing.Image)(resources.GetObject("tb.Image")));
+ this.tb.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tb.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.tb.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tb.Name = "tb";
+ this.tb.Size = new System.Drawing.Size(80, 47);
+ this.tb.Text = "鍚屾璧勬枡";
+ this.tb.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tb.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.tb.ToolTipText = "鍚屾鍩虹璧勬枡";
+ this.tb.Click += new System.EventHandler(this.tb_Click);
+ //
+ // toolStripSeparator9
+ //
+ this.toolStripSeparator9.Name = "toolStripSeparator9";
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 100);
+ //
+ // gl
+ //
+ this.gl.AutoSize = false;
+ this.gl.Image = ((System.Drawing.Image)(resources.GetObject("gl.Image")));
+ this.gl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.gl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.gl.ImageTransparentColor = System.Drawing.Color.White;
+ this.gl.Name = "gl";
+ this.gl.Size = new System.Drawing.Size(35, 47);
+ this.gl.Text = "鍏宠仈";
+ this.gl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.gl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.gl.Click += new System.EventHandler(this.gl_Click);
+ //
+ // toolStripSeparator13
+ //
+ this.toolStripSeparator13.Name = "toolStripSeparator13";
+ this.toolStripSeparator13.Size = new System.Drawing.Size(6, 100);
+ //
+ // BatchNo
+ //
+ this.BatchNo.AutoSize = false;
+ this.BatchNo.Image = ((System.Drawing.Image)(resources.GetObject("BatchNo.Image")));
+ this.BatchNo.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.BatchNo.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.BatchNo.ImageTransparentColor = System.Drawing.Color.White;
+ this.BatchNo.Name = "BatchNo";
+ this.BatchNo.Size = new System.Drawing.Size(36, 47);
+ this.BatchNo.Text = "鎵规";
+ this.BatchNo.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.BatchNo.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.BatchNo.Click += new System.EventHandler(this.BatchNo_Click);
+ //
+ // toolStripSeparator5
+ //
+ this.toolStripSeparator5.Name = "toolStripSeparator5";
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 100);
+ //
+ // mrlk
+ //
+ this.mrlk.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.mrlk.Image = ((System.Drawing.Image)(resources.GetObject("mrlk.Image")));
+ this.mrlk.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
+ this.mrlk.Name = "mrlk";
+ this.mrlk.Size = new System.Drawing.Size(114, 94);
+ this.mrlk.Text = "榛樿鍒楀";
+ this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.mrlk.Click += new System.EventHandler(this.mrlk_Click);
+ //
+ // toolStripSeparator11
+ //
+ this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator11.Name = "toolStripSeparator11";
+ this.toolStripSeparator11.Size = new System.Drawing.Size(6, 100);
+ //
+ // bclk
+ //
+ this.bclk.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.bclk.Image = ((System.Drawing.Image)(resources.GetObject("bclk.Image")));
+ this.bclk.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.bclk.ImageTransparentColor = System.Drawing.Color.White;
+ this.bclk.Name = "bclk";
+ this.bclk.Size = new System.Drawing.Size(114, 94);
+ this.bclk.Text = "淇濆瓨鍒楀";
+ this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bclk.Click += new System.EventHandler(this.bclk_Click);
+ //
+ // toolStripSeparator10
+ //
+ this.toolStripSeparator10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator10.Name = "toolStripSeparator10";
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 100);
+ //
+ // tc
+ //
+ this.tc.AutoSize = false;
+ this.tc.Image = ((System.Drawing.Image)(resources.GetObject("tc.Image")));
+ this.tc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.tc.ImageTransparentColor = System.Drawing.Color.White;
+ this.tc.Name = "tc";
+ this.tc.Size = new System.Drawing.Size(35, 47);
+ this.tc.Text = "閫�鍑�";
+ this.tc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.tc.Click += new System.EventHandler(this.tc_Click);
+ //
+ // lblCaption
+ //
+ this.lblCaption.AutoSize = true;
+ this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lblCaption.Location = new System.Drawing.Point(1002, 24);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.lblCaption.Name = "lblCaption";
+ this.lblCaption.Size = new System.Drawing.Size(173, 38);
+ this.lblCaption.TabIndex = 18;
+ this.lblCaption.Text = "鍗曟嵁缂栬緫";
+ //
+ // P1
+ //
+ this.P1.BackColor = System.Drawing.Color.Lavender;
+ this.P1.Controls.Add(this.pic1);
+ this.P1.Controls.Add(this.lblCaption);
+ this.P1.Controls.Add(this.gbUp);
+ this.P1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.P1.Location = new System.Drawing.Point(82, 100);
+ this.P1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.P1.Name = "P1";
+ this.P1.Size = new System.Drawing.Size(1874, 196);
+ this.P1.TabIndex = 31;
+ //
+ // pic1
+ //
+ this.pic1.Location = new System.Drawing.Point(626, 6);
+ this.pic1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.pic1.Name = "pic1";
+ this.pic1.Size = new System.Drawing.Size(156, 82);
+ this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pic1.TabIndex = 36;
+ this.pic1.TabStop = false;
+ this.pic1.Visible = false;
+ //
+ // gbUp
+ //
+ this.gbUp.BackColor = System.Drawing.Color.Transparent;
+ this.gbUp.Controls.Add(this.dtpHDate);
+ this.gbUp.Controls.Add(this.label2);
+ this.gbUp.Controls.Add(this.cmbHOrgID);
+ this.gbUp.Controls.Add(this.label3);
+ this.gbUp.Controls.Add(this.cmdHEmpID);
+ this.gbUp.Location = new System.Drawing.Point(28, 78);
+ this.gbUp.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.gbUp.Name = "gbUp";
+ this.gbUp.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.gbUp.Size = new System.Drawing.Size(1784, 103);
+ this.gbUp.TabIndex = 33;
+ this.gbUp.TabStop = false;
+ //
+ // dtpHDate
+ //
+ this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHDate.Location = new System.Drawing.Point(788, 34);
+ this.dtpHDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.dtpHDate.Name = "dtpHDate";
+ this.dtpHDate.Size = new System.Drawing.Size(372, 35);
+ this.dtpHDate.TabIndex = 96;
+ this.dtpHDate.ValueChanged += new System.EventHandler(this.dtpHDate_ValueChanged);
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(654, 42);
+ this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(106, 24);
+ this.label2.TabIndex = 95;
+ this.label2.Text = "鏃� 鏈�";
+ //
+ // cmbHOrgID
+ //
+ this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbHOrgID.FormattingEnabled = true;
+ this.cmbHOrgID.Location = new System.Drawing.Point(202, 34);
+ this.cmbHOrgID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.cmbHOrgID.Name = "cmbHOrgID";
+ this.cmbHOrgID.Size = new System.Drawing.Size(372, 32);
+ this.cmbHOrgID.TabIndex = 85;
+ this.cmbHOrgID.SelectionChangeCommitted += new System.EventHandler(this.cmbHOrgID_SelectionChangeCommitted);
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.ForeColor = System.Drawing.Color.Black;
+ this.label3.Location = new System.Drawing.Point(70, 42);
+ this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(106, 24);
+ this.label3.TabIndex = 84;
+ this.label3.Text = "缁� 缁�";
+ //
+ // cmdHEmpID
+ //
+ this.cmdHEmpID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHEmpID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHEmpID.Image")));
+ this.cmdHEmpID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHEmpID.Location = new System.Drawing.Point(1784, -14);
+ this.cmdHEmpID.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.cmdHEmpID.Name = "cmdHEmpID";
+ this.cmdHEmpID.Size = new System.Drawing.Size(44, 44);
+ this.cmdHEmpID.TabIndex = 79;
+ this.cmdHEmpID.UseVisualStyleBackColor = false;
+ this.cmdHEmpID.Visible = false;
+ //
+ // panel2
+ //
+ this.panel2.BackColor = System.Drawing.Color.Lavender;
+ this.panel2.Controls.Add(this.txtHDeleteDate);
+ this.panel2.Controls.Add(this.label25);
+ this.panel2.Controls.Add(this.txtHDeleteMan);
+ this.panel2.Controls.Add(this.label27);
+ this.panel2.Controls.Add(this.txtHUpDateDate);
+ this.panel2.Controls.Add(this.label23);
+ this.panel2.Controls.Add(this.txtHUpDater);
+ this.panel2.Controls.Add(this.label21);
+ this.panel2.Controls.Add(this.txtHCloseDate);
+ this.panel2.Controls.Add(this.label19);
+ this.panel2.Controls.Add(this.txtHCloseMan);
+ this.panel2.Controls.Add(this.label17);
+ this.panel2.Controls.Add(this.txtHCheckDate);
+ this.panel2.Controls.Add(this.label15);
+ this.panel2.Controls.Add(this.txtHChecker);
+ this.panel2.Controls.Add(this.label13);
+ this.panel2.Controls.Add(this.txtHMakeDate);
+ this.panel2.Controls.Add(this.label11);
+ this.panel2.Controls.Add(this.txtHMaker);
+ this.panel2.Controls.Add(this.label8);
+ this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panel2.Location = new System.Drawing.Point(82, 1012);
+ this.panel2.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.panel2.Name = "panel2";
+ this.panel2.Size = new System.Drawing.Size(1874, 186);
+ this.panel2.TabIndex = 32;
+ //
+ // txtHDeleteDate
+ //
+ this.txtHDeleteDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHDeleteDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHDeleteDate.Location = new System.Drawing.Point(1450, 94);
+ this.txtHDeleteDate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.txtHDeleteDate.Name = "txtHDeleteDate";
+ this.txtHDeleteDate.Size = new System.Drawing.Size(196, 30);
+ this.txtHDeleteDate.TabIndex = 19;
+ //
+ // label25
+ //
+ this.label25.AutoSize = true;
+ this.label25.BackColor = System.Drawing.Color.Transparent;
+ this.label25.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label25.Location = new System.Drawing.Point(1332, 100);
+ this.label25.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label25.Name = "label25";
+ this.label25.Size = new System.Drawing.Size(106, 24);
+ this.label25.TabIndex = 18;
+ this.label25.Text = "浣滃簾鏃ユ湡";
+ //
+ // txtHDeleteMan
+ //
+ this.txtHDeleteMan.BackColor = System.Drawing.Color.Transparent;
+ this.txtHDeleteMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHDeleteMan.Location = new System.Drawing.Point(1450, 24);
+ this.txtHDeleteMan.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.txtHDeleteMan.Name = "txtHDeleteMan";
+ this.txtHDeleteMan.Size = new System.Drawing.Size(196, 30);
+ this.txtHDeleteMan.TabIndex = 17;
+ //
+ // label27
+ //
+ this.label27.AutoSize = true;
+ this.label27.BackColor = System.Drawing.Color.Transparent;
+ this.label27.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label27.Location = new System.Drawing.Point(1332, 24);
+ this.label27.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label27.Name = "label27";
+ this.label27.Size = new System.Drawing.Size(82, 24);
+ this.label27.TabIndex = 16;
+ this.label27.Text = "浣滃簾浜�";
+ //
+ // txtHUpDateDate
+ //
+ this.txtHUpDateDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHUpDateDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHUpDateDate.Location = new System.Drawing.Point(1124, 94);
+ this.txtHUpDateDate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.txtHUpDateDate.Name = "txtHUpDateDate";
+ this.txtHUpDateDate.Size = new System.Drawing.Size(196, 30);
+ this.txtHUpDateDate.TabIndex = 15;
+ //
+ // label23
+ //
+ this.label23.AutoSize = true;
+ this.label23.BackColor = System.Drawing.Color.Transparent;
+ this.label23.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label23.Location = new System.Drawing.Point(1006, 94);
+ this.label23.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label23.Name = "label23";
+ this.label23.Size = new System.Drawing.Size(106, 24);
+ this.label23.TabIndex = 14;
+ this.label23.Text = "淇敼鏃ユ湡";
+ //
+ // txtHUpDater
+ //
+ this.txtHUpDater.BackColor = System.Drawing.Color.Transparent;
+ this.txtHUpDater.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHUpDater.Location = new System.Drawing.Point(1124, 24);
+ this.txtHUpDater.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.txtHUpDater.Name = "txtHUpDater";
+ this.txtHUpDater.Size = new System.Drawing.Size(196, 30);
+ this.txtHUpDater.TabIndex = 13;
+ //
+ // label21
+ //
+ this.label21.AutoSize = true;
+ this.label21.BackColor = System.Drawing.Color.Transparent;
+ this.label21.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label21.Location = new System.Drawing.Point(1006, 24);
+ this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label21.Name = "label21";
+ this.label21.Size = new System.Drawing.Size(82, 24);
+ this.label21.TabIndex = 12;
+ this.label21.Text = "淇敼浜�";
+ //
+ // txtHCloseDate
+ //
+ this.txtHCloseDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHCloseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHCloseDate.Location = new System.Drawing.Point(794, 94);
+ this.txtHCloseDate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.txtHCloseDate.Name = "txtHCloseDate";
+ this.txtHCloseDate.Size = new System.Drawing.Size(196, 30);
+ this.txtHCloseDate.TabIndex = 11;
+ //
+ // label19
+ //
+ this.label19.AutoSize = true;
+ this.label19.BackColor = System.Drawing.Color.Transparent;
+ this.label19.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label19.Location = new System.Drawing.Point(676, 100);
+ this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label19.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(106, 24);
+ this.label19.TabIndex = 10;
+ this.label19.Text = "鍏抽棴鏃ユ湡";
+ //
+ // txtHCloseMan
+ //
+ this.txtHCloseMan.BackColor = System.Drawing.Color.Transparent;
+ this.txtHCloseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHCloseMan.Location = new System.Drawing.Point(792, 26);
+ this.txtHCloseMan.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.txtHCloseMan.Name = "txtHCloseMan";
+ this.txtHCloseMan.Size = new System.Drawing.Size(196, 30);
+ this.txtHCloseMan.TabIndex = 9;
+ //
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.BackColor = System.Drawing.Color.Transparent;
+ this.label17.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label17.Location = new System.Drawing.Point(676, 32);
+ this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(82, 24);
+ this.label17.TabIndex = 8;
+ this.label17.Text = "鍏抽棴浜�";
+ //
+ // txtHCheckDate
+ //
+ this.txtHCheckDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHCheckDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHCheckDate.Location = new System.Drawing.Point(468, 94);
+ this.txtHCheckDate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.txtHCheckDate.Name = "txtHCheckDate";
+ this.txtHCheckDate.Size = new System.Drawing.Size(196, 30);
+ this.txtHCheckDate.TabIndex = 7;
+ //
+ // label15
+ //
+ this.label15.AutoSize = true;
+ this.label15.BackColor = System.Drawing.Color.Transparent;
+ this.label15.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label15.Location = new System.Drawing.Point(350, 100);
+ this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label15.Name = "label15";
+ this.label15.Size = new System.Drawing.Size(106, 24);
+ this.label15.TabIndex = 6;
+ this.label15.Text = "瀹℃牳鏃ユ湡";
+ //
+ // txtHChecker
+ //
+ this.txtHChecker.BackColor = System.Drawing.Color.Transparent;
+ this.txtHChecker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHChecker.Location = new System.Drawing.Point(468, 26);
+ this.txtHChecker.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.txtHChecker.Name = "txtHChecker";
+ this.txtHChecker.Size = new System.Drawing.Size(196, 30);
+ this.txtHChecker.TabIndex = 5;
+ //
+ // label13
+ //
+ this.label13.AutoSize = true;
+ this.label13.BackColor = System.Drawing.Color.Transparent;
+ this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label13.Location = new System.Drawing.Point(350, 32);
+ this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label13.Name = "label13";
+ this.label13.Size = new System.Drawing.Size(82, 24);
+ this.label13.TabIndex = 4;
+ this.label13.Text = "瀹℃牳浜�";
+ //
+ // txtHMakeDate
+ //
+ this.txtHMakeDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHMakeDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHMakeDate.Location = new System.Drawing.Point(142, 94);
+ this.txtHMakeDate.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.txtHMakeDate.Name = "txtHMakeDate";
+ this.txtHMakeDate.Size = new System.Drawing.Size(196, 30);
+ this.txtHMakeDate.TabIndex = 3;
+ //
+ // label11
+ //
+ this.label11.AutoSize = true;
+ this.label11.BackColor = System.Drawing.Color.Transparent;
+ this.label11.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label11.Location = new System.Drawing.Point(24, 100);
+ this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(106, 24);
+ this.label11.TabIndex = 2;
+ this.label11.Text = "鍒跺崟鏃ユ湡";
+ //
+ // txtHMaker
+ //
+ this.txtHMaker.BackColor = System.Drawing.Color.Transparent;
+ this.txtHMaker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHMaker.Location = new System.Drawing.Point(142, 26);
+ this.txtHMaker.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.txtHMaker.Name = "txtHMaker";
+ this.txtHMaker.Size = new System.Drawing.Size(196, 30);
+ this.txtHMaker.TabIndex = 1;
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.BackColor = System.Drawing.Color.Transparent;
+ this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label8.Location = new System.Drawing.Point(24, 32);
+ this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(82, 24);
+ this.label8.TabIndex = 0;
+ this.label8.Text = "鍒跺崟浜�";
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // panel1
+ //
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.panel1.Location = new System.Drawing.Point(0, 100);
+ this.panel1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(82, 1098);
+ this.panel1.TabIndex = 33;
+ //
+ // panel3
+ //
+ this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
+ this.panel3.Location = new System.Drawing.Point(1956, 100);
+ this.panel3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.panel3.Name = "panel3";
+ this.panel3.Size = new System.Drawing.Size(78, 1098);
+ this.panel3.TabIndex = 34;
+ //
+ // grdSum
+ //
+ this.grdSum.AllowUserToAddRows = false;
+ this.grdSum.AllowUserToDeleteRows = false;
+ this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
+ this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.grdSum.Location = new System.Drawing.Point(82, 974);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.grdSum.Name = "grdSum";
+ this.grdSum.ReadOnly = true;
+ this.grdSum.RowHeadersWidth = 51;
+ this.grdSum.RowTemplate.Height = 23;
+ this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
+ this.grdSum.Size = new System.Drawing.Size(1874, 38);
+ this.grdSum.TabIndex = 45;
+ //
+ // grdPrint
+ //
+ this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdPrint.Location = new System.Drawing.Point(1618, 1086);
+ this.grdPrint.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowHeadersWidth = 51;
+ this.grdPrint.RowTemplate.Height = 23;
+ this.grdPrint.Size = new System.Drawing.Size(50, 48);
+ this.grdPrint.TabIndex = 46;
+ this.grdPrint.Visible = false;
+ //
+ // tabPage3
+ //
+ this.tabPage3.Controls.Add(this.grdList);
+ this.tabPage3.Location = new System.Drawing.Point(8, 39);
+ this.tabPage3.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.tabPage3.Name = "tabPage3";
+ this.tabPage3.Size = new System.Drawing.Size(1858, 553);
+ this.tabPage3.TabIndex = 2;
+ this.tabPage3.Text = "鏉＄爜鏄庣粏";
+ this.tabPage3.UseVisualStyleBackColor = true;
+ //
+ // grdList
+ //
+ this.grdList.AllowUserToAddRows = false;
+ this.grdList.AllowUserToDeleteRows = false;
+ this.grdList.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+ this.grdList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.grdList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdList.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdList.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.grdList.Location = new System.Drawing.Point(0, 0);
+ this.grdList.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.grdList.Name = "grdList";
+ this.grdList.ReadOnly = true;
+ this.grdList.RowHeadersWidth = 30;
+ this.grdList.RowTemplate.Height = 23;
+ this.grdList.Size = new System.Drawing.Size(1858, 553);
+ this.grdList.TabIndex = 46;
+ //
+ // tabPage1
+ //
+ this.tabPage1.Controls.Add(this.grdMain);
+ this.tabPage1.Location = new System.Drawing.Point(8, 39);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.tabPage1.Name = "tabPage1";
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.tabPage1.Size = new System.Drawing.Size(1858, 631);
+ this.tabPage1.TabIndex = 0;
+ this.tabPage1.Text = "鐗╂枡淇℃伅";
+ this.tabPage1.UseVisualStyleBackColor = true;
+ //
+ // grdMain
+ //
+ this.grdMain.AllowUserToAddRows = false;
+ this.grdMain.AllowUserToDeleteRows = false;
+ this.grdMain.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+ this.grdMain.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdMain.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.grdMain.Location = new System.Drawing.Point(6, 6);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.grdMain.Name = "grdMain";
+ this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 30;
+ this.grdMain.RowTemplate.Height = 23;
+ this.grdMain.Size = new System.Drawing.Size(1846, 619);
+ this.grdMain.TabIndex = 44;
+ this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
+ this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
+ this.grdMain.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellEndEdit);
+ this.grdMain.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellLeave);
+ this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+ this.grdMain.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.grdMain_EditingControlShowing);
+ this.grdMain.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Scroll);
+ //
+ // tabControl1
+ //
+ this.tabControl1.Controls.Add(this.tabPage1);
+ this.tabControl1.Controls.Add(this.tabPage3);
+ this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabControl1.Location = new System.Drawing.Point(82, 296);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ this.tabControl1.Size = new System.Drawing.Size(1874, 678);
+ this.tabControl1.TabIndex = 47;
+ //
+ // Gy_BarCodeBill_XB_SelectMater
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.Lavender;
+ this.ClientSize = new System.Drawing.Size(2034, 1198);
+ this.Controls.Add(this.tabControl1);
+ this.Controls.Add(this.grdSum);
+ this.Controls.Add(this.panel2);
+ this.Controls.Add(this.P1);
+ this.Controls.Add(this.panel1);
+ this.Controls.Add(this.panel3);
+ this.Controls.Add(this.Tool);
+ this.Controls.Add(this.grdPrint);
+ this.ForeColor = System.Drawing.Color.Black;
+ this.KeyPreview = true;
+ this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+ this.Name = "Gy_BarCodeBill_XB_SelectMater";
+ this.Text = "鍗曟嵁缂栬緫";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Gy_BarCodeBill_XB_SelectMater_FormClosing);
+ this.Load += new System.EventHandler(this.Gy_BarCodeBill_XB_SelectMater_Load);
+ this.Paint += new System.Windows.Forms.PaintEventHandler(this.Gy_BarCodeBill_XB_SelectMater_Paint);
+ this.Resize += new System.EventHandler(this.Gy_BarCodeBill_XB_SelectMater_Resize);
+ this.Tool.ResumeLayout(false);
+ this.Tool.PerformLayout();
+ this.P1.ResumeLayout(false);
+ this.P1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pic1)).EndInit();
+ this.gbUp.ResumeLayout(false);
+ this.gbUp.PerformLayout();
+ this.panel2.ResumeLayout(false);
+ this.panel2.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).EndInit();
+ this.tabPage3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdList)).EndInit();
+ this.tabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
+ this.tabControl1.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.ToolStrip Tool;
+ private System.Windows.Forms.ToolStripButton yl;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+ private System.Windows.Forms.ToolStripButton bc;
+ private System.Windows.Forms.ToolStripButton cz;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+ private System.Windows.Forms.Label lblCaption;
+ private System.Windows.Forms.Panel P1;
+ private System.Windows.Forms.Panel panel2;
+ private System.Windows.Forms.Label txtHMaker;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Label txtHUpDateDate;
+ private System.Windows.Forms.Label label23;
+ private System.Windows.Forms.Label txtHUpDater;
+ private System.Windows.Forms.Label label21;
+ private System.Windows.Forms.Label txtHCloseDate;
+ private System.Windows.Forms.Label label19;
+ private System.Windows.Forms.Label txtHCloseMan;
+ private System.Windows.Forms.Label label17;
+ private System.Windows.Forms.Label txtHCheckDate;
+ private System.Windows.Forms.Label label15;
+ private System.Windows.Forms.Label txtHChecker;
+ private System.Windows.Forms.Label label13;
+ private System.Windows.Forms.Label txtHMakeDate;
+ private System.Windows.Forms.Label label11;
+ private System.Windows.Forms.Label txtHDeleteDate;
+ private System.Windows.Forms.Label label25;
+ private System.Windows.Forms.Label txtHDeleteMan;
+ private System.Windows.Forms.Label label27;
+ private System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.ToolStripButton DelRow;
+ private System.Windows.Forms.GroupBox gbUp;
+ private System.Windows.Forms.ToolStripButton tc;
+ private System.Windows.Forms.ToolStripButton mrlk;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
+ private System.Windows.Forms.ToolStripButton bclk;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;
+ private System.Windows.Forms.PictureBox pic1;
+ private System.Windows.Forms.Button cmdHEmpID;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Panel panel3;
+ private System.Windows.Forms.DataGridView grdSum;
+ private System.Windows.Forms.DataGridView grdPrint;
+ private System.Windows.Forms.ToolStripButton dy;
+ private System.Windows.Forms.ComboBox cmbHOrgID;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.DateTimePicker dtpHDate;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TabPage tabPage3;
+ private System.Windows.Forms.DataGridView grdList;
+ private System.Windows.Forms.TabPage tabPage1;
+ private System.Windows.Forms.DataGridView grdMain;
+ private System.Windows.Forms.TabControl tabControl1;
+ private System.Windows.Forms.ToolStripButton sdy;
+ private System.Windows.Forms.ToolStripButton spRow;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+ private System.Windows.Forms.ToolStripButton kc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+ private System.Windows.Forms.ToolStripButton AddRow;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
+ private System.Windows.Forms.ToolStripButton tb;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
+ private System.Windows.Forms.ToolStripButton gl;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator13;
+ private System.Windows.Forms.ToolStripButton BatchNo;
+ }
+}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XB_SelectMater.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XB_SelectMater.resx"
new file mode 100644
index 0000000..0700745
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_XB_SelectMater.resx"
@@ -0,0 +1,563 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ /9j/4AAQSkZJRgABAQEASABIAAD/4QSARXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
+ AAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAUAAAAcgEyAAIAAAAUAAAAhodpAAQAAAAB
+ AAAAmgAAAMYASAAAAAEAAABIAAAAAQAAQWRvYmUgUGhvdG9zaG9wIDcuMAAyMDA0OjEwOjE0IDE1OjUw
+ OjUwAAADoAEAAwAAAAH//wAAoAIABAAAAAEAAAQAoAMABAAAAAEAAABoAAAAAAAAAAYBAwADAAAAAQAG
+ AAABGgAFAAAAAQAAARQBGwAFAAAAAQAAARwBKAADAAAAAQACAAACAQAEAAAAAQAAASQCAgAEAAAAAQAA
+ A1QAAAAAAAAASAAAAAEAAABIAAAAAf/Y/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4d
+ GhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIy
+ MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgABgCgAwEhAAIRAQMR
+ Af/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAE
+ EQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElK
+ U1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrC
+ w8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAAB
+ AgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkj
+ M1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5
+ eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm
+ 5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A9P8A+EAsf+fy4o/4QCy/5/Liuv6z/dOf2HmH/CAWX/P5
+ cUf8IBZf8/lz+lH1n+6HsPMP+EAsv+fy5/Oj/hALL/n8uKPrP90PYeYf8IBZf8/lxR/wgFl/z+XFH1n+
+ 6HsPMP8AhALL/n8uKP8AhX9j/wA/lxR9Z/uh7B9w/wCFf2P/AD+XFH/CAWP/AD+XFH1n+6HsH3D/AIQC
+ x/5/Lij/AIQCy/5/Lij6z/dD2HmH/CAWX/P5cUf8K/sf+fy4o+tf3Q9h5h/wgFj/AM/lxR/wgFl/z+XF
+ H1r+6HsPMP8AhALL/n8uKP8AhALL/n8uKPrX90PYeZ//2f/bAEMAAgEBAgEBAgICAgICAgIDBQMDAwMD
+ BgQEAwUHBgcHBwYHBwgJCwkICAoIBwcKDQoKCwwMDAwHCQ4PDQwOCwwMDP/bAEMBAgICAwMDBgMDBgwI
+ BwgMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDP/AABEIACoE
+ AAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUE
+ BAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4
+ OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmq
+ srO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEB
+ AQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIy
+ gQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZn
+ aGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV
+ 1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APWB+2p4nH/MN0Qf9w20/wDjNL/w2t4o
+ P/MP0X/wW2n/AMZri/8AhDh6Uf8ACHD0r9f/ALPp/wAp+cfXJ9zsj+2p4oOQdO0U/wDcMtP/AIzR/wAN
+ peJ++m6KP+4Zaf8AxmuN/wCEOH93FH/CHD0prL4fyh9cn/Mdl/w2j4m/6B2if+Cy0/8AjNH/AA2n4mXr
+ puiEf9g20/8AjNcb/wAIcPSj/hDh/dNL+z6f8qBYyf8AMdkf21fEv/QN0T/wW2n/AMZo/wCG1fEv/QN0
+ T/wW2f8A8ZrjP+ENH9yl/wCEOA6KRR9Qp/yj+uz/AJmdl/w2r4l/6Buif+C2z/8AjNH/AA2r4l/6Buif
+ +C2z/wDjNcb/AMIcP7po/wCEOH900/7Ph/KL65P+Y7Mftq+JMf8AIO0Uf9w20/8AjNB/bU8S5407RD/3
+ DbT/AOM1xZ8HqOq0f8Iiv900v7Pp/wAofXZ/zHZf8NqeJe+m6L/4LbT/AOM0q/to+Je+naKP+4baf/Ga
+ 4z/hEV/umgeEAeimj+z4fyh9cn/Mdn/w2n4l/wCgdon/AILbT/4zR/w2n4l/6B2if+C20/8AjNcb/wAI
+ cP7po/4Q4f3TR/Z8P5UH1yf8x2P/AA2p4l/6Bui/+C20/wDjNH/DaniX/oG6L/4LbT/4zXHf8IcP7ppP
+ +ENH9yj+z4fyh9cn/MdmP21vEo66do3/AILbT/4zSj9tbxKemm6MT/2DbT/4zXF/8IcB/Cfyo/4RAf3T
+ +VCy+n/KH1uf8x2g/bT8SnrpmiD/ALhtp/8AGaD+2n4lH/MN0QY/6htn/wDGa4z/AIQ9f7rflSHwcp/h
+ P5U/7Pp/yjWMqfzM7Q/tp+Juo0zRP/BZZ/8AxmlX9tLxNj/kHaIP+4bZ/wDxmuK/4Q8eh/Kj/hDx6H8q
+ X9n0/wCUFjJ92ds37aPiY8HTtEx/2DbP/wCM0L+2l4lLZOnaJ/4LbP8A+M1xP/CHj0P5UDweOPlb8qP7
+ Pp/yieMn3Z2zftp+JP8AoG6Kf+4bZ/8Axmm/8Nq+Jf8AoF6L/wCC20/+M1xf/CID+435Uf8ACID+435U
+ f2fT/lD65PuztP8AhtXxJ/0DdG/8Ftp/8Zo/4bU8Rj/mG6MP+4Zaf/Ga4v8A4RH0Q4+lH/CI/wCyw+go
+ /s+n/Kg+tz7s7MftqeJP+gfop/7htp/8ZoP7aviUDjT9D/HTLT/4zXGDwgfRvypR4NY9FYj3WhZfT/lH
+ 9cn3Oy/4bU8Tf9A7Q/8AwWWn/wAZo/4bU8Tf9A7Q/wDwWWn/AMZrjv8AhDW/uH/vmk/4Q4/3f0oWX0/5
+ QWNn/Mzsv+G1fEv/AED9Fx7abaf/ABmj/htbxN/0D9F/8Ftn/wDGa40+Dj/dP5Un/CHH+6fyp/2fT/lF
+ 9bn3Oy/4bV8Tf9A7Rf8AwW2f/wAZpf8AhtXxP/0DtF/8Ftn/APGa4z/hDx/dP5Uf8IgP7p/Kl/Z9P+Uf
+ 1yp3Oz/4bU8S/wDQP0b/AMFtn/8AGaP+G1vE3bTtFx/2DbP/AOM1xn/CID+6fypR4OB/hIoWX0/5RfW5
+ 92dkf21fEx66fog/7hln/wDGaP8AhtbxP/0D9E/8Ftp/8Zrjf+EOHpS/8Id/s/pQsvp/yoFjJ/zHY/8A
+ Da3if/oH6J/4LbT/AOM0f8NqeJv+gfon/gttP/jNcePBuf4QPwo/4Qz2H5Uf2fT/AJR/XZ/zHXn9tXxL
+ 307RSf8AsG2n/wAZpR+2r4k/6B2ig/8AYNtP/jNcefBn+zTf+EOHpQsvp/yh9cqfzHZn9tPxKOPsGi/+
+ C20/+M0H9tLxKQSLDRCR2/s20/8AjNcZ/wAIcPSl/wCEOH90flR/Z9P+UX1up/Mzsf8AhtTxN/0DtD/8
+ Flp/8Zo/4bU8S99O0Q/TTbT/AOM1x3/CHj+6Pypf+ENH90/lQsvp/wAoLGVP5mdgf21PEo/5h2i/+C20
+ /wDjNJ/w2r4m3Z/s7RT9NMtP/jNcefBo/un8qP8AhDB/dYfhR/Z9P+UPrlT+Y7H/AIbW8S9Dp2igf9gy
+ 0/8AjNJ/w2r4l/6B2i/+Cyz/APjNcd/whwzjaRR/whw9KP7Ph/KCxlTudl/w2r4l/wCgdon/AILbT/4z
+ R/w2p4l/6B2if+C20/8AjNcb/wAIcPSl/wCEPH90flQsvp/ygsXU7nZf8Nq+JT007Rh/3DbT/wCM0f8A
+ Danic9NP0U5/6hlp/wDGa43/AIQ8f3R+VJ/who67Cc0LL6f8o/rlT+Y7M/tp+Jz00/RT/wBwy0H/ALRp
+ P+G0/E//AED9F/8ABZaf/Ga43/hDf9g0f8Ib/sGn/Z9P+VAsbP8AmZ2X/DaXif8A6B+in/uGWn/xmlH7
+ anicDjTtE/8ABXaf/Ga43/hDP9k0f8IZ/sml/Z8P5UL67P8AmOw/4bS8T/8AQO0X/wAFlp/8Zpf+G0/E
+ 46afon/grtP/AIzXHf8ACGf7Jo/4Qz/ZNP6hD+VB9dqfzHY/8NpeJ/8AoG6L/wCCu0/+M0v/AA2p4n/6
+ B+if+Cy0/wDjNcb/AMIZ/smj/hDP9k0ll9P+VB9dn/Mdl/w2l4nzn+ztEP8A3C7T/wCM0f8ADaXiftp2
+ iH/uF2n/AMZrjP8AhDf9g0f8Ib/sGhZfT/lQfXJ/zHZf8NpeJiMf2douf+wZaf8Axmj/AIbT8T/9A7Rf
+ /BZaf/Ga43/hDf8AYNH/AAhv+waay+H8qD65P+Y7H/htHxP/ANA3RP8AwW2n/wAZp3/DafifnOnaL/4L
+ bT/4zXF/8IkP7h/KlHhEHqhA+lDy+n/Kh/XKnc7P/htTxP207Rf/AAWWn/xmlP7anicgf6Boo/7hlp/8
+ ZrjP+EQX0P8A3zSf8Iev90n8KX9n0/5RfXKnc7P/AIbU8Tgc6fo2D/1DLT/4zSL+2n4l/wCfDRR/3C7T
+ /wCM1xv/AAh6/wB1vypf+ENX0P5Uf2fT/lQ/rlTuzsv+G1fEo/5cNF/8Flnj/wBE0p/bV8Sn/lw0XH/Y
+ Ms//AIzXGf8ACGr6H8qT/hDl9Dj6Uf2fT/lQvrdTuzs/+G0PEv8A0D9EI99MtP8A4zQf20PEwGRp2iE/
+ 9g20/wDjNcYfB6+hP4Uf8Iev91vyo/s+n/Kg+uVO7Oy/4bU8T/8AQO0X/wAFtp/8Zo/4bT8T/wDQO0X/
+ AMFtp/8AGa43/hER/dP5Uf8ACIjsp/Kj+z6f8ofXKnc7L/htLxP1Om6L/wCC20/+M0n/AA2p4l76foo/
+ 7h1p/wDGa43/AIREf3Dz7Uf8IgP7jflT/s+n/KCxlTuzs/8AhtTxKemn6If+4dZ//GaP+G0vEv8A0DtE
+ /wDBdaf/ABmuMHg8H+Aij/hEB/dP5Uv7Pp/yoPrdTudn/wANq+Jv+gdov/gttP8A4zR/w2p4m76fohH/
+ AGDbT/4zXGf8IgP7p/Kj/hEB/dP5U1l9P+UFjKnc7P8A4bW8Tf8AQO0X/wAFtp/8ZoH7aviYf8w7RR/3
+ DbT/AOM1xn/CID+6fypR4OB/hIpf2dT/AJUNYyp/Mzsx+2n4mPA07RMf9g20/wDjNB/bU8S9Dp+iZ/7B
+ tn/8ZrjP+EOHpR/whw9KP7Pp/wAqB4yf8zOy/wCG1vE//QP0T/wWWf8A8ZpT+2r4m76foo/7hln/APGa
+ 4z/hDQOi0f8ACHD+6aP7Pp9IoHjJ/wAzOzP7afiY9dP0Xj/qGWf/AMZpB+2n4m3f8g/RM/8AYNtP/jNc
+ aPBoPUYpf+ENHoKP7Ph/KhLGT/mOw/4bS8T5407RP/Bbaf8AxmlP7aXifHOn6Jj/ALBtp/8AGa43/hDh
+ 6Uf8IcPSj+z6f8qH9bqd2dl/w2n4m/6B2i49f7MtP/jNH/DafiXp/Z+iY/7Blp/8Zrjf+EOHpR/whw9K
+ f9n0/wCUPrlTudl/w2l4l/6B+if+Cy0/+M0f8NpeJP8AoH6J/wCCy0/+M1xv/CHD0o/4Q4elH1Cn/KH1
+ up3Z2Y/bV8Sr00/RP/BZaf8Axml/4bX8TdrDRef+oZaf/Ga4v/hDh6Uf8IcPShZfT/lD63U7s7P/AIbV
+ 8Tf9A/RP/BZaf/GaD+2r4mPA0/RSf+wbaf8AxmuM/wCEOHpR/wAIcPSj+z6f8ofW6ndnZf8ADanif/oH
+ aL/4LbT/AOM0f8NqeKP+gdon/gstP/jNcb/whw9KP+EOHpS/s+n/ACoFi6ndnZD9tPxOM507RB/3DbT/
+ AOM07/htTxMB/wAg7Rf/AAW2n/xmuLPg4dlo/wCEOHofyoeAp/yoPrlTudn/AMNp+Jcc6foo/wC4baf/
+ ABmg/to+JT107Rv/AAW2n/xmuMHg0Htj8KP+ENHpn8KFl9P+VCWMqfzHZ/8ADaHiT/oH6L/4LbT/AOM0
+ f8NpeJRnGnaKf+4Zaf8AxmuN/wCENX0P5Un/AAhw/un8qP7Pp/yoPrlT+Y7M/tqeJv8AoHaKf+4Zaf8A
+ xmk/4bU8T/8AQN0b/wAFtp/8Zrjf+EOH90/lSjwaPQCj+z6f8qGsZPuzsh+2n4mI507Rh/3DbT/4zTv+
+ G0fEpOf7P0Uf9wy0P/tGuL/4Q0ego/4Q0ego/s+n/Kg+t1O7Oz/4bT8Sj/mHaN/4LLQf+0aQ/to+Je2n
+ aKf+4Zaf/Ga4z/hDh6Uf8IcPSj+z6f8AKg+uVO7OzP7afiftp2ikf9gy0/8AjNJ/w2p4mHXTtFH/AHDL
+ T/4zXG/8IcPSg+DgP4SaP7Pp/wAqD65Puzsv+G1vEY66foo/7hlp/wDGaP8AhtbxIeP7P0Xn/qG2n/xm
+ uM/4RAf3T+VH/CID+6fyprL6f8oLGVO7OyP7a3iQH/kH6N/4LLT/AOM0f8Nq+Jf+gdov/gss/wD4zXG/
+ 8IgP7p/Kl/4RAf3f0pfUKf8AKH1yfdnY/wDDa3iUZP8AZ+ijH/UMs/8A4zSf8Nq+Jf8AoHaN/wCC20/+
+ M1x//CID+7+lH/CID+7+lNYCn/KCxk+7PVv+FeX/APz4T/mv+NH/AAr6+/58J/zX/Gv1p/4QTQ/+gLpH
+ /gJH/hR/wgmh/wDQF0j/AMBI/wDCvDfGlD/ny/8AwJf5Hp/6sVf+fi+5/wCZ+S3/AAr6+/58J/zX/Gj/
+ AIV9ff8APhP+a/41+tP/AAgmh/8AQF0j/wABI/8ACj/hBND/AOgLpH/gJH/hS/10of8APl/+BL/IP9WK
+ v/P1fc/8z8lv+FfX3/PhP+a/40h+Hl9jmwn/ADX/ABr9av8AhBND/wCgLpH/AICR/wCFH/CCaH/0BdI/
+ 8BI/8KFxpQ/58v8A8CX+Qf6sVf8An6vuf+Z+So+HV8RkWE/5r/jS/wDCvL5ePsE/5r/jX60/8IJof/QF
+ 0j/wEj/wo/4QTQ/+gLpH/gJH/hT/ANdKH/Pl/wDgS/yF/qxV/wCfq+5/5n5Lf8K+vv8Anwn/ADX/ABo/
+ 4V9ff8+E/wCa/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hS/wBdKH/Pl/ev8g/1Yq/8
+ /V9z/wAz8lv+FfX3/PhP+a/40f8ACvr7/nwn/Nf8a/Wn/hBND/6Aukf+Akf+FH/CCaH/ANAXSP8AwEj/
+ AMKP9dKH/Pl/ev8AIP8AVir/AM/V9z/zPyW/4V9ff8+E/wCa/wCNH/Cvr7/nwn/Nf8a/Wn/hBND/AOgL
+ pH/gJH/hR/wgmh/9AXSP/ASP/Cj/AF0of8+X96/yD/Vir/z9X3P/ADPyW/4V9ff8+E/5r/jR/wAK+vv+
+ fCf81/xr9af+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/10of8+X96/wAg/wBWKv8Az9X3P/M/
+ JUfDy/IOdPnP4r/jR/wru+/6B9x/47/jX61f8IJof/QF0j/wEj/wo/4QTQ/+gLpH/gJH/hQuNKH/AD5f
+ 3r/IP9WKv/P1fc/8z8lR8O77tp9x+a/40v8Awru//wCfC4/Nf8a/Wn/hBND/AOgLpH/gJH/hR/wgmh/9
+ AXSP/ASP/Cn/AK6UP+fL/wDAl/kP/Vir/wA/V9z/AMz8lv8AhXd//wA+FwfxX/Gk/wCFd33/AD43H/fS
+ /wCNfrV/wgmh/wDQF0j/AMBI/wDCj/hBND/6Aukf+Akf+FH+ulD/AJ8v/wACX+Qv9WKv/P1fc/8AM/JX
+ /hXd9/z43H/fS/40f8K6viP+PCc/iv8AjX61f8IJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ
+ /wCfL/8AAl/kH+rFX/n6vuf+Z+Sv/Cur7/oHz/mv+NA+HeoDgWEwH1X/ABr9av8AhBND/wCgLpH/AICR
+ /wCFH/CCaH/0BdI/8BI/8KP9dKH/AD5f/gS/yGuGKv8Az9X3P/M/Jb/hXd//AM+M3/jv+NH/AAry/wD+
+ fCf81/xr9af+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/10of8+X/4Ev8AIP8AVmr/AM/V9z/z
+ PyWPw6vyedPn/Nf8aT/hXd8Dxp8+f+AnP61+tX/CCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66
+ UP8Any//AAJf5D/1Zq/8/V9z/wAz8lf+Fe3/APz4T8f7v+NH/Cvb/wD58J//AB3/ABr9av8AhBND/wCg
+ LpH/AICR/wCFH/CCaH/0BdI/8BI/8KFxpQ/58v8A8CX+Qv8AVmr/AM/V9z/zPyV/4V7f/wDPhP8A+O/4
+ 0v8Awr+//wCgfN/47/jX60/8IJof/QF0j/wEj/wo/wCEE0P/AKAukf8AgJH/AIUf66UP+fL/APAl/kH+
+ rFX/AJ+L7n/mfkt/wr+//wCgfN/47/jR/wAK/v8A/oHzf+O/41+tP/CCaH/0BdI/8BI/8KP+EE0P/oC6
+ R/4CR/4Uf66UP+fL/wDAl/kH+rFX/n4vuf8Amfkt/wAK/v8A/oHzf+O/40f8K/v/APoHzf8Ajv8AjX60
+ /wDCCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66UP8Any//AAJf5B/qxV/5+L7n/mfkt/wr+/8A
+ +gfN/wCO/wCNH/Cv7/8A58Jh/wB8/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hS/wBd
+ KH/Pl/8AgS/yD/Vir/z9X3P/ADPyW/4V9fn/AJcZh/3yf60n/Cu9QPIsrgf98/41+tX/AAgmh/8AQF0j
+ /wABI/8ACj/hBND/AOgLpH/gJH/hTXGlD/ny/wDwJf5CXDFX/n6vuf8Amfkr/wAK71D/AJ8Z/wDx3/Gk
+ /wCFd3//AD4T/wDjv+NfrX/wgmh/9AXSP/ASP/Cj/hBND/6Aukf+Akf+FH+ulD/ny/8AwJf5D/1Yq/8A
+ P1fc/wDM/JQfDq/6/YJ8f8B/xpf+Fe32P+QfN+a/41+tX/CCaH/0BdI/8BI/8KP+EE0P/oC6R/4CR/4U
+ f66UP+fL/wDAl/kL/Vir/wA/V9z/AMz8lv8AhXt/n/jwnz/wH/Gj/hXl/wD8+E/5r/jX60/8IJof/QF0
+ j/wEj/wo/wCEE0P/AKAukf8AgJH/AIUf66UP+fL/APAl/kH+rFX/AJ+r7n/mfkt/wry//wCfCf8ANf8A
+ Gj/hXl//AM+E/wCa/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/k
+ H+rFX/n6vuf+Z+S3/CvL/wD58J/zX/Gj/hXl/wD8+E/5r/jX60/8IJof/QF0j/wEj/wo/wCEE0P/AKAu
+ kf8AgJH/AIUf66UP+fL/APAl/kH+rFX/AJ+r7n/mfkt/wry//wCfCf8ANf8AGj/hXl//AM+E/wCa/wCN
+ frT/AMIJof8A0BdI/wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/kH+rFX/n6vuf+Z+S3/CvL
+ /wD58J/zX/Gj/hXd9/0D5/8Ax3/Gv1p/4QTQ/wDoC6R/4CR/4Uf8IJof/QF0j/wEj/wo/wBdKH/Pl/8A
+ gS/yD/Vir/z9X3P/ADPyW/4V3ff9A+f/AMd/xpP+FfX/AEFhOMe6/wCNfrV/wgmh/wDQF0j/AMBI/wDC
+ j/hBND/6Aukf+Akf+FC40of8+X/4Ev8AIf8AqxV/5+L7n/mfkr/wr2//AOfGb81/xo/4V7f/APPjN+a/
+ 41+tX/CCaH/0BdI/8BI/8KP+EE0P/oC6R/4CR/4Uf660P+fL+9f5B/qxV/5+L7n/AJn5K/8ACvb/AP58
+ ZvzX/Gj/AIV7f/8APjN+a/41+tX/AAgmh/8AQF0j/wABI/8ACj/hBND/AOgLpH/gJH/hR/rrQ/58v71/
+ kH+rFX/n4vuf+Z+Sv/Cvb/8A58ZvzX/Gj/hXt/8A8+M35r/jX61f8IJof/QF0j/wEj/wo/4QTQ/+gLpH
+ /gJH/hR/rrQ/58v71/kH+rFX/n4vuf8Amfkr/wAK9v8A/nxm/Nf8aP8AhXt//wA+M35r/jX61f8ACCaH
+ /wBAXSP/AAEj/wAKP+EE0P8A6Aukf+Akf+FH+utD/ny/vX+Qf6sVf+fi+5/5n5K/8K9v/wDnxm/Nf8aP
+ +Fe3/wDz4zfmv+NfrV/wgmh/9AXSP/ASP/Cj/hBND/6Aukf+Akf+FH+utD/ny/vX+Qf6sVf+fi+5/wCZ
+ +Sv/AAr2/wD+fGb81/xo/wCFe3//AD4zfmv+NfrV/wAIJof/AEBdI/8AASP/AAo/4QTQ/wDoC6R/4CR/
+ 4Uf660P+fL+9f5B/qxV/5+L7n/mfkt/wr+//AOgfN/47/jSH4f3/AE+wTf8Ajv8AjX61f8IJof8A0BdI
+ /wDASP8Awo/4QTQ/+gLpH/gJH/hR/rpQ/wCfL/8AAl/kH+rFX/n4vuf+Z+Sv/Cvb/wD58ZvzX/Gj/hXt
+ /wD8+M35r/jX61f8IJof/QF0j/wEj/wo/wCEE0P/AKAukf8AgJH/AIULjSh/z5f3r/IP9WKv/Pxfc/8A
+ M/JX/hXt/wD8+M35r/jR/wAK9v8A/nxm/Nf8a/Wr/hBND/6Aukf+Akf+FH/CCaH/ANAXSP8AwEj/AMKP
+ 9daH/Pl/ev8AIP8AVir/AM/F9z/zPyV/4V7f/wDPjN+a/wCNH/Cvb/8A58ZvzX/Gv1q/4QTQ/wDoC6R/
+ 4CR/4Uf8IJof/QF0j/wEj/wo/wBdaH/Pl/ev8g/1Yq/8/F9z/wAz8lf+Fe3/APz4zfmv+NH/AAr2/wD+
+ fGb81/xr9av+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/11of8+X96/wAg/wBWKv8Az8X3P/M/
+ JX/hXt//AM+M35r/AI07/hXt/wD8+Ev/AI7/AI1+tH/CCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4
+ Uf66UP8Any/vX+Qf6sVf+fi+5/5n5L/8K81DnNjNj/gP+NN/4V9ff8+E5/Ff8a/Wn/hBND/6Auk/+Acf
+ +FH/AAgmh/8AQF0n/wAA4/8ACk+NKH/Pl/8AgS/yF/qxV/5+L7n/AJn5Lf8ACv77/nwn/Nf8aD8Pr/8A
+ 58Jx/wB8/wCNfrV/wguh/wDQF0j/AMA4/wDCj/hBdD/6Aukf+Acf+FH+ulD/AJ8v/wACX+QLhir/AM/F
+ 9z/zPyW/4V5f/wDPjP8A+O/40n/Cvr//AJ8Zv/Hf8a/Wr/hBdD/6Aukf+Acf+FH/AAguh/8AQF0j/wAA
+ 4/8ACj/XSh/z5f8A4Ev8g/1Yq/8AP1fd/wAE/JX/AIV9f/8APjN/47/jR/wr6/8A+fGb/wAd/wAa/Wr/
+ AIQXQ/8AoC6R/wCAcf8AhR/wguh/9AXSP/AOP/Cj/XSh/wA+X/4Ev8g/1Yq/8/V93/BPyV/4V9f/APPj
+ N/47/jR/wr6//wCfGb/x3/Gv1q/4QXQ/+gLpH/gHH/hR/wAILof/AEBdI/8AAOP/AAo/10of8+X/AOBL
+ /IP9WKv/AD9X3f8ABPyVPw71Dp9huB/3yP60f8K8vxx9inP4r/jX61f8ILof/QF0j/wDj/wo/wCEF0P/
+ AKAukf8AgHH/AIUf660P+fL/APAl/kC4Yq/8/V9z/wAz8lf+Fe34/wCXGf8A8d/xpP8AhX1//wA+M/8A
+ 47/jX61/8ILof/QF0j/wDj/wpP8AhBND/wCgLpP/AIBx/wCFNca0P+fL+9f5AuGKv/Pxfc/8z8lv+Ff3
+ /wDz4T/+O/40f8K9v/8Anxm/Nf8AGv1q/wCEE0P/AKAukf8AgJH/AIUf8IJof/QF0j/wEj/woXGlD/ny
+ /vX+Q/8AVir/AM/F9z/zPyV/4V7f/wDPjN+a/wCNH/Cvb/8A58ZvzX/Gv1q/4QTQ/wDoC6R/4CR/4Uf8
+ IJof/QF0j/wEj/wo/wBdaH/Pl/ev8g/1Yq/8/F9z/wAz8lf+Fe3/APz4zfmv+NH/AAr2/wD+fGb81/xr
+ 9av+EE0P/oC6R/4CR/4Uf8IJof8A0BdI/wDASP8Awo/11of8+X96/wAg/wBWKv8Az8X3P/M/JX/hXt//
+ AM+M35r/AI0f8K9v/wDnxm/Nf8a/Wr/hBND/AOgLpH/gJH/hR/wgmh/9AXSP/ASP/Cj/AF1of8+X96/y
+ D/Vir/z8X3P/ADPyV/4V7f8A/PjN+a/40f8ACvb/AP58ZvzX/Gv1q/4QTQ/+gLpH/gJH/hR/wgmh/wDQ
+ F0j/AMBI/wDCj/XWh/z5f3r/ACD/AFYq/wDPxfc/8z8lf+Fe3/8Az4zfmv8AjR/wr2//AOfGb81/xr9a
+ v+EE0P8A6Aukf+Akf+FH/CCaH/0BdI/8BI/8KP8AXWh/z5f3r/IP9WKv/Pxfc/8AM/JX/hXmof8APhN+
+ a/40v/Cvb/vYT5/4D/jX60/8IJof/QF0j/wEj/wo/wCEE0P/AKAukf8AgJH/AIUf66UP+fL/APAl/kH+
+ rFX/AJ+L7n/mfkt/wr2//wCfCf8A8d/xo/4V7f8A/PhP/wCO/wCNfrT/AMIJof8A0BdI/wDASP8Awo/4
+ QTQ/+gLpH/gJH/hR/rrR/wCfL/8AAl/kL/Vir/z9X3P/ADPyW/4V5f8A/PhP/wCO/wCNH/Cvr7/nwn/N
+ f8a/Wn/hBND/AOgLpH/gJH/hR/wgmh/9AXSP/ASP/Cj/AF0of8+X/wCBL/IP9WKv/P1fc/8AM/Jb/hX1
+ 9/z4T/mv+NH/AAr2/wCMWE+Pqv8AjX60/wDCCaH/ANAXSP8AwEj/AMKP+EE0P/oC6R/4CR/4Uf66UP8A
+ ny//AAJf5B/qxV/5+L7n/mfkt/wry/8A+fCf81/xo/4V5f8A/PhP+a/41+tP/CCaH/0BdI/8BI/8KP8A
+ hBND/wCgLpH/AICR/wCFH+ulD/ny/wDwJf5B/qxV/wCfq+5/5n5Lf8K8v/8Anwn/ADX/ABo/4V5qBGDY
+ T/mv+NfrT/wgmh/9AXSP/ASP/Cj/AIQTQ/8AoC6R/wCAkf8AhR/rpQ/58v8A8CX+Qf6sVf8An6vuf+Z+
+ Sv8Awrq+/wCgfOD9V/xpR8O78dNPn/Nf8a/Wn/hBND/6Aukf+Akf+FH/AAgmh/8AQF0j/wABI/8ACl/r
+ pQ/58v8A8CX+Q/8AVir/AM/F9z/zPyW/4V5fnpYTj8V/xo/4V3f/APPjN/47/jX60/8ACCaH/wBAXSP/
+ AAEj/wAKP+EE0P8A6Aukf+Akf+FP/XSh/wA+X/4Ev8g/1Yq/8/F9z/zPyW/4V3f/APPjN/47/jR/wru/
+ /wCfGb/x3/Gv1p/4QTQ/+gLpH/gJH/hR/wAIJof/AEBdI/8AASP/AAo/10of8+X/AOBL/IP9Wav/AD8X
+ 3P8AzPyW/wCFd3//AD4zf+O/40f8K7v/APnxm/8AHf8AGv1p/wCEE0P/AKAukf8AgJH/AIUf8IJof/QF
+ 0j/wEj/wo/10of8APl/+BL/IP9Wav/Pxfc/8zUwfQ/lRg+h/KvyDHxY8VZP/ABU3iD/wYzf/ABVH/C2f
+ FX/QzeIP/BjN/wDFV8N9W8z7C5+vmD6H8qMH0P5V+Qf/AAtnxV/0M3iD/wAGM3/xVH/C2fFX/QzeIP8A
+ wYzf/FUnh/MHI/XzB9D+VGD6H8q/IP8A4Wz4q/6GbxB/4MZv/iqR/i14rGMeJvEIx/1EZv8A4qj6v5i5
+ j9fcH0P5UYPofyr8gP8Ahbniv/oZ/EP/AIMZv/iqP+FteK/+hm8Q/wDgxm/+Kpew8w5z9f8AB9D+VGD6
+ H8q/ID/hbXiv/oZvEP8A4MZv/iqP+FteK/8AoZvEP/gxm/8AiqPYeYKR+v8Ag+h/KjB9D+VfkB/wtrxX
+ /wBDN4h/8GM3/wAVR/wtrxX/ANDN4h/8GM3/AMVR7DzBSP1/wfQ/lRg+h/KvyA/4W14r/wChm8Q/+DGb
+ /wCKo/4W14r/AOhm8Q/+DGb/AOKo9h5gpH6/4PofyowfQ/lX5Af8La8V/wDQzeIf/BjN/wDFUf8AC2vF
+ f/QzeIf/AAYzf/FUew8wUj9f8H0P5UYPofyr8gP+FteK/wDoZvEP/gxm/wDiqP8AhbXiv/oZvEP/AIMZ
+ v/iqPYeYKR+v+D6H8qMH0P5V+QH/AAtrxX/0M3iH/wAGM3/xVH/C2vFf/QzeIf8AwYzf/FUew8wUj9f8
+ H0P5UYPofyr8gP8Ahbfiv/oZvEP/AIMZv/iqP+FteK/+hm8Q/wDgxm/+Ko9h5gpH6/4PofyowfQ/lX5A
+ f8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1/wAH0P5UYPofyr8gP+FteK/+hm8Q
+ /wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P5V+QH/C2vFf/AEM3iH/wYzf/ABVH
+ /C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/AKGbxD/4MZv/AIqj/hbXiv8A6Gbx
+ D/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/AMVR/wALa8V/9DN4h/8ABjN/8VR7
+ DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/+hm8Q/8Agxm/+Ko9h5gpH6/4Pofy
+ owfQ/lX5Af8AC2vFf/QzeIf/AAYzf/FUf8La8V/9DN4h/wDBjN/8VR7DzBSP1/wfQ/lRg+h/KvyA/wCF
+ teK/+hm8Q/8Agxm/+Ko/4W14r/6GbxD/AODGb/4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/0M3iH/AMGM
+ 3/xVH/C2vFf/AEM3iH/wYzf/ABVHsPMFI/X/AAfQ/lRg+h/KvyA/4W14r/6GbxD/AODGb/4qj/hbXiv/
+ AKGbxD/4MZv/AIqj2HmCkfr/AIPofyowfQ/lX5Af8La8V/8AQzeIf/BjN/8AFUf8La8V/wDQzeIf/BjN
+ /wDFUew8wUj9f8H0P5UYPofyr8gP+FteK/8AoZvEP/gxm/8AiqP+FteK/wDoZvEP/gxm/wDiqPYeYKR+
+ v+D6H8qMH0P5V+QH/C2vFf8A0M3iH/wYzf8AxVH/AAtrxX/0M3iH/wAGM3/xVHsPMFI/X/B9D+VGD6H8
+ q/ID/hbXiv8A6GbxD/4MZv8A4qj/AIW14r/6GbxD/wCDGb/4qj2HmCkfr/g+h/KjB9D+VfkB/wALa8V/
+ 9DN4h/8ABjN/8VR/wtrxX/0M3iH/AMGM3/xVHsPMFI/X/B9D+VGD6H8q/ID/AIW14r/6GbxD/wCDGb/4
+ qj/hbXiv/oZvEP8A4MZv/iqPYeYKR+v+D6H8qMH0P5V+QH/C2vFf/QzeIf8AwYzf/FUf8La8V/8AQzeI
+ f/BjN/8AFUew8wUj9f8AB9D+VGD6H8q/ID/hbXiv/oZvEP8A4MZv/iqP+FteK/8AoZvEP/gxm/8AiqPY
+ eYKR+v8Ag+h/KjB9D+VfkB/wtrxX/wBDN4h/8GM3/wAVR/wtrxX/ANDN4h/8GM3/AMVR7DzBSP1/wfQ/
+ lRg+h/KvyA/4W14r/wChm8Q/+DGb/wCKo/4W14r/AOhm8Q/+DGb/AOKo9h5gpH6/4PofyowfQ/lX5Af8
+ La8V/wDQzeIf/BjN/wDFUf8AC2vFf/QzeIf/AAYzf/FUew8wUj9f8H0P5UYPofyr8gP+FteK/wDoZvEP
+ /gxm/wDiqP8AhbXiv/oZvEP/AIMZv/iqPYeYKR+v+D6H8qMH0P5V+QH/AAtvxX/0M3iH/wAGM3/xVH/C
+ 2vFf/QzeIf8AwYzf/FUew8wUj9f8H0P5UYPofyr8gP8AhbXiv/oZvEP/AIMZv/iqP+FteK/+hm8Q/wDg
+ xm/+Ko9h5gpH6/4PofyowfQ/lX5Af8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1
+ /wAH0P5UYPofyr8gP+FteK/+hm8Q/wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P
+ 5V+QH/C2vFf/AEM3iH/wYzf/ABVH/C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/
+ AKGbxD/4MZv/AIqj/hbXiv8A6GbxD/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/
+ AMVR/wALa8V/9DN4h/8ABjN/8VR7DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/
+ +hm8Q/8Agxm/+Ko9h5gpH6/4PofyowfQ/lX5Af8AC2/Ff/Qz+If/AAYzf/FUf8La8V/9DN4h/wDBjN/8
+ VR7DzBSP1/wfQ/lRg+h/KvyA/wCFteK/+hm8Q/8Agxm/+Ko/4W14r/6GbxD/AODGb/4qj2HmCkfr/g+h
+ /KjB9D+VfkB/wtrxX/0M3iH/AMGM3/xVH/C2vFf/AEM3iH/wYzf/ABVHsPMFI/X/AAfQ/lRg+h/KvyA/
+ 4W14r/6GbxD/AODGb/4qj/hbXiv/AKGbxD/4MZv/AIqj2HmCkfr/AIPofyowfQ/lX5Af8La8V/8AQzeI
+ f/BjN/8AFUf8La8V/wDQzeIf/BjN/wDFUew8wUj9f8H0P5UYPofyr8gP+Ft+K/8AoZvEP/gxm/8AiqP+
+ Ft+Kz18T+If/AAYzf/FUew8wUj9f8H0P5UYPofyr8gP+FteK/wDoZvEP/gxm/wDiqP8AhbXiv/oZvEP/
+ AIMZv/iqPYeYKR+v+D6H8qMH0P5V+QH/AAtrxX/0M3iH/wAGM3/xVH/C2vFf/QzeIf8AwYzf/FUew8wU
+ j9f8H0P5UYPofyr8gP8AhbXiv/oZvEP/AIMZv/iqP+FteK/+hm8Q/wDgxm/+Ko9h5gpH6/4PofyowfQ/
+ lX5Af8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1/wAH0P5UYPofyr8gP+FteK/+
+ hm8Q/wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P5V+QH/C2vFf/AEM3iH/wYzf/
+ ABVH/C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/AKGbxD/4MZv/AIqj/hbXiv8A
+ 6GbxD/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/AMVR/wALa8V/9DN4h/8ABjN/
+ 8VR7DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/+hm8Q/8Agxm/+Ko9h5gpH6/4
+ PofyowfQ/lX5Af8AC2vFf/QzeIf/AAYzf/FUf8Lb8Vjp4n8Q/wDgxm/+Ko9h5gpH6/4PofyowfQ/lX5A
+ f8La8V/9DN4h/wDBjN/8VR/wtrxX/wBDN4h/8GM3/wAVR7DzBSP1/wAH0P5UYPofyr8gP+FteK/+hm8Q
+ /wDgxm/+Ko/4W14r/wChm8Q/+DGb/wCKo9h5gpH6/wCD6H8qMH0P5V+QH/C2/Ff/AEM/iH/wYzf/ABVH
+ /C2vFf8A0M3iH/wYzf8AxVHsPMFI/X/B9D+VGD6H8q/ID/hbXiv/AKGbxD/4MZv/AIqj/hbXiv8A6Gbx
+ D/4MZv8A4qj2HmCkfr/g+h/KjB9D+VfkB/wtrxX/ANDN4h/8GM3/AMVR/wALa8V/9DN4h/8ABjN/8VR7
+ DzBSP1/wfQ/lRg+h/KvyA/4W14r/AOhm8Q/+DGb/AOKo/wCFteK/+hm8Q/8Agxm/+Ko9h5i5/I/X/B9D
+ +VGD6H8q/ID/AIW14r/6GbxD/wCDGb/4qj/hbXiv/oZvEP8A4MZv/iqPYeY1M//Z
+</value>
+ </data>
+ <data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
+ grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
+ FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
+ u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="sdy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
+ V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
+ 9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
+ f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
+ NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
+ BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
+ AABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
+ V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
+ 9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
+ f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
+ NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
+ BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
+ AABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ 9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
+ W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
+ mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
+ jP+Ny1r/F00v+5/akQW3DWQzSDNWF6CHwcbdGzAwSAPMZhjAagByLIDwiuXLwRhmK4YBZ8+cIRqD1CMD
+ sAGkYmRAYXb+/x8A86/iJXr/E3YAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="spRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ 9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
+ W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
+ mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
+ jP+Ny1r/F00v+5/akQW3DWQzSDNWF6CHwcbdGzAwSAPMZhjAagByLIDwiuXLwRhmK4YBZ8+cIRqD1CMD
+ sAGkYmRAYXb+/x8A86/iJXr/E3YAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
+ G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
+ 5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
+ EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
+ E8pc2+4AAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ /gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
+ mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
+ ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
+ rTWjutBHQN0+oOxgCbE4NuIJW2tGJc4jgNvvgUu9LLzYhHRuQ96Yp1vvdWwjt2UR0mVA6vdf4h1+hSv9
+ BDxfh1R+huS/ghR0Hnd+Bxu+QKrdcEwkmY2dAAwQ8DScGe8sSRUbqj0Y+c5zR+QUwOOQFbz2EtKyij+/
+ rTc/69tFKLjzH+DyM9O2wq3MiXSsux8JGGSx+YcFKHpNQBD+b8Dc/C78Pw2E/3L9RwGPAhYg654LeY4l
+ ZA+x2DiH9CaPeZygaQEBBrU5sJxCNJo6BOgSHi4wrz8TdbF8GJefBUn0IRYBQktAmKtZXeExsoPouoF0
+ eosbh3u/3ot3QQKafJAHsxZAlVUxCinthlx3QkreHrqY1+oS+maP5Rs8L6Xvj2MPx8IASe80O9sAAAAA
+ SUVORK5CYII=
+</value>
+ </data>
+ <data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
+ mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
+ OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="kc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
+ 2wOLaKet2NlEsFtIiohgJR6xEdQ0Gojwu/9k59xdL1z84Ye73Z1vZmfWpLJVgeMD02l//K8IACy+l2N8
+ vl1h8XyO14cTzO0RnsaHEgxbEhBDer0B6CzLkOc5CPp6d4B6DXixgwYgSUIIA+/qWjZWy1vJTBD/+/1T
+ 8dwDfNCvNTgEDIc3YkIW9Vl0hcfrfdxf7GE62tkMkLu70gnQClJPRrvbAdIesILZZUcF4RXastMTBVBt
+ TeQkqqpyB0pZj3rgKogAFCE0s2owVh8oS45rDdlYQSge1IdUuE/jOGIP0Qqm2sRUCtBMAnErIWTmxthZ
+ QTiNNkgzhVRF0TzRyOxNCAn2tldaiV/+nwgRkMiYHwIr6UXY3sHBAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="tb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
+ EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
+ cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
+ 6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
+ ArrI3Rmmkq3NDWRK40o13XiAxYXPsltBkAb7YbIRN6HoyVyEDyt51rhSV67dRTL5EcqgxV5yn91GQvI4
+ 1BjFViHBEeCNI98qqGu+ibnEB7h8UaiqWaiLlo3Jpd9w8J15BC6ZzVdWQX3LbfSPPBUPjY4jqJ2cXxDg
+ YENE4LkdoMi/mF3AOlvhwonSM+JjJeUYHhkT+EBDzAbLsYr7ZabRbM08p6sg5bjf/hVm6Xi2eOirVv8H
+ x2foKkhcgFcV/4YnQhFkOnDJvF+Bd74D2zEp2YO/pJZtefqFO/Dy9Xu8iCQQin1CgEHSXoHLocSs+LQh
+ Gc4yw6w676yRL37ccRpHS87hfqUZPnKqzCzRmhoz0EYzznCWmQvOWvwCAklSiLgvRB8AAAAASUVORK5C
+ YII=
+</value>
+ </data>
+ <data name="gl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
+ NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
+ Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
+ yioKMfc5Zc4IkhUMCAOXVgvY4OQsNeJJBYl/qKYM8/ZtQr9QCwlZtFf0j3lI+PiUIQmoaHvg/RJ7mMzX
+ KlDtv6NXUIBjeJoG3mNfiMbNlFXdXGy/MplZAGB1QeqxPtcUHV4lbUkxg7K2PK4XOW7+N3PYBiaoeI5+
+ 4uXDINdWu1hhM0evc5SEx7c4nt4TRL51rvEAXLT+MR+fGn8m67YPUXH/IuH+NUbkNZnVB0C5opD8m3Me
+ QndfXpGHXECnlRF/ZILJ09zWhaqGJlTVG+R6ZW0jeAgNadjZ29f72iz36Cpj3yFNGCz1c9N0AAAAAElF
+ TkSuQmCC
+</value>
+ </data>
+ <data name="BatchNo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
+ CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
+ tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
+ cx82d1+EpURiHmu8817neYkEHQH+BEtZSfYHLCWSdTgI3vBtcjUXOHiVAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
+ znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
+ vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
+ AG0RaJ0Gqp8A+0ICGBIZLkZLifXv8Xb3YnVlRdrdb23gtAHHjpdj5hAVRVdv+vBlaVkes+6pPVzhieHn
+ YQKiwHtHpSFp6+rB4sIn+Y37R+3hB5kNec2SSKV5isvebuiZj8YPxoKxYrSMAR90RyWc2AZqgp/lKSzB
+ Jc91xJI6nEoUdCECchrRJlZl4YA7XgJL+Yl7BszjauvEu9QCZoUk8UFHMq3jW+6HLJS1p+1hniZXO6pq
+ 63Hk5Bkr/Fy9SHvC4+FXhuTa7V6s/dopydbOriXA7Ll/YN7nHrNSENeXMDA4aq0WvP0V2IpLSQFOpuaQ
+ mF+WPSm4Iv7CxmaXNBbWPwUtDpLhZ8/HwyU9ZolvjjkaUH3qrBUuV9WeBkv4mufh42clHWYaz7vwG72U
+ TLZQdeFnAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ /QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
+ 77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
+ aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
+ JWylHvVeGGCm+hBQnNlCNIatWNxW6lGv9B0D3PsIXOrnQts2pGsX0mOdLX3WuYsbjT8gvTyNmsOPeJ+n
+ cOUtAa2bkEdfIbkdkLyuk8rtZGAGUuGCYzxBb/QUYJCAlpAp73+jnIEKN979pNcRPgPQEDSA7HZI4xpW
+ /pgvP+vdRzCwx/Y1AKeP3uZVtjIr0rJKPhMwxMX6RQO41U1AAL45YP77Pny/Ugitc//HAc/8BpD1wIkc
+ xxKuDnOxdh7pbc45rKBuAX4aNexfTiISYQNlALqFpwv068/EcbF0BJdfBEj0IhoGgktAKAisrXIO7yGy
+ mUI6vcPGYe/XePA+QECdF/Jk1gB0ZJWNQgpfQ273QQpeHSmf96oCquiN0R1eF1IPP+AAgRmsjnCqFmoA
+ AAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
+ <data name="cmdHEmpID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIZBAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>93, 17</value>
+ </metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>62</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index f6d5708..d90dc1f 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -4922,11 +4922,23 @@
public object UploadFile_Gy_MouldFilen()
{
+ string path = "";
string HBillNo = HttpContext.Current.Request.Params["HBillNo"]; //鍗曟嵁鍙�
string HRemark = HttpContext.Current.Request.Params["HRemark"]; //澶囨敞
string HUserName = HttpContext.Current.Request.Params["HUserName"]; //鍒涘缓浜�
HttpPostedFile files = HttpContext.Current.Request.Files["file"];
- string path = HttpContext.Current.Server.MapPath("~/../Files/Gy_MouldFilen/" + HBillNo);
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒")
+ {
+ path = "D:/缃戠珯鍙戝竷/LAYUI/Files/Gy_MouldFilen/" + HBillNo;
+ }
+ else
+ {
+ path = HttpContext.Current.Server.MapPath("~/../Files/Gy_MouldFilen/" + HBillNo);
+ }
+ }
dynamic dyResult = UploadFile_Gy_MouldFilen(files, path, HBillNo, HRemark, HUserName);
if (dyResult != null && dyResult.result == 1)
{
@@ -4981,7 +4993,20 @@
{
File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
files.SaveAs(fileurl);
- string StrPath = "/files/Gy_MouldFilen/" + HBillNo + "/" + filename;
+ string StrPath = "";
+
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒")
+ {
+ StrPath = "D:/缃戠珯鍙戝竷/LAYUI/Files/Gy_MouldFilen/" + HBillNo + "/" + filename;
+ }
+ else
+ {
+ StrPath = "/files/Gy_MouldFilen/" + HBillNo + "/" + filename;
+ }
+ }
if (File.Exists(fileurl))
{
//杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
@@ -5041,7 +5066,19 @@
[HttpGet]
public object Gy_MouldFilen_Filelist(string HBillNo)
{
- var url = fileip + "/Files/Gy_MouldFilen/" + HBillNo + "/";
+ string Ret = "";
+ var url = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒")
+ {
+ url = "D:/缃戠珯鍙戝竷/LAYUI/Files/Gy_MouldFilen/" + HBillNo + "/";
+ }
+ else
+ {
+ url = fileip + "/Files/Gy_MouldFilen/" + HBillNo + "/";
+ }
+ }
try
{
@@ -5075,9 +5112,7 @@
try
{
- oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);
- string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/Gy_MouldFilen/" + HSourceBillNo), HFileName);
- File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
+ oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
@@ -5103,7 +5138,7 @@
{
try
{
- ds = oCN.RunProcReturn($"select * from Gy_BarCodeBill where HBarCode='{HbarCode}' ", "Gy_Material");
+ ds = oCN.RunProcReturn($"select *,b.hnumber HMaterNumber,b.hname HMaterName_m from Gy_BarCodeBill a left join Gy_Material b on a.HMaterID=b.HItemID where HBarCode='{HbarCode}' ", "Gy_Material");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/BaseSet/Gy_PropertyController.cs b/WebAPI/Controllers/BaseSet/Gy_PropertyController.cs
index 4f3c7a4..2e9b717 100644
--- a/WebAPI/Controllers/BaseSet/Gy_PropertyController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_PropertyController.cs
@@ -19,6 +19,73 @@
DataSet ds;
+ #region 杈呭姪灞炴�у垪琛�-鍒嗛〉
+ [Route("Gy_Property/listPage")]
+ [HttpGet]
+ public object listPage(string sWhere, string user, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_Property", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_IF_PropertyList " + page + "," + size + "," + "''", "h_p_Gy_CarList");
+ }
+ else
+ {
+ sWhere = sWhere.Replace("'", "''");
+
+ ds = oCN.RunProcReturn("exec h_p_IF_PropertyList " + page + "," + size + ",'" + sWhere + "'", "h_p_Gy_CarList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
/// <summary>
/// 杩斿洖杈呭姪灞炴�у垪琛�
///鍙傛暟锛歴tring sql銆�
diff --git a/WebAPI/Controllers/CGGL/Cg_OrderTransportBillListController.cs b/WebAPI/Controllers/CGGL/Cg_OrderTransportBillListController.cs
new file mode 100644
index 0000000..73705ef
--- /dev/null
+++ b/WebAPI/Controllers/CGGL/Cg_OrderTransportBillListController.cs
@@ -0,0 +1,926 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.IO;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+using WebAPI.Service;
+
+namespace WebAPI.Controllers
+{
+ public class Cg_OrderTransportBillListController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ /// <summary>
+ /// 杩斿洖杩愬崟鐢宠鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Cg_OrderTransportBill/list")]
+ [HttpGet]
+ public object list(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cg_OrderTransportBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Cg_OrderTransportBillList where 1=1 order by hmainid ", "h_v_Cg_OrderTransportBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Cg_OrderTransportBillList where 1=1 ";
+ string sql = sql1 + sWhere + " order by hmainid";
+ ds = oCN.RunProcReturn(sql, "h_v_Cg_OrderTransportBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region 杩愬崟鐢宠鍒楄〃-鍒嗛〉
+ [Route("Cg_OrderTransportBill/list_byPage")]
+ [HttpGet]
+ public object GetCarList_byPage(string sWhere, string user, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cg_OrderTransportBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Cg_OrderTransportBillListPage " + page + "," + size + "," + "''", "h_p_Cg_OrderTransportBillList");
+ }
+ else
+ {
+ sWhere = sWhere.Replace("'", "''");
+
+ ds = oCN.RunProcReturn("exec h_p_Cg_OrderTransportBillListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Cg_OrderTransportBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 淇濆瓨 杩愬崟鐢宠淇℃伅
+ /// <summary>
+ /// 淇濆瓨杩愬崟鐢宠淇℃伅
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Cg_OrderTransportBill/SaveCg_OrderTransportBill")]
+ [HttpPost]
+ public object SaveCg_OrderTransportBill([FromBody] JObject msg)
+ {
+ DataSet ds;
+ var _value = msg["msg"].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg2 = sArray[1].ToString();
+ string oprType = sArray[2].ToString();
+
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cg_OrderTransportBill_Edit", 1, false, msg2))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ Int64 HItemID = 0;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇鏈�澶D鍊艰祴鍊�
+ // DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Cg_OrderTransportBill ", "Cg_OrderTransportBill");
+ // if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
+ // {
+ // var maxid = 0;
+ // if (Maxds.Tables[0].Rows[0]["HItemID"] != DBNull.Value)
+ // {
+ // //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
+ // maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
+ // maxid += 1;
+ // }
+ //
+ // HItemID = maxid;
+ // }
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DAL.ClsCg_OrderTransportBill_Ctl oBill = new DAL.ClsCg_OrderTransportBill_Ctl();
+ List<Model.ClsCg_OrderTransportBill_Model> lsmain = new List<Model.ClsCg_OrderTransportBill_Model>();
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Cg_OrderTransportBill(msg1);
+ foreach (Model.ClsCg_OrderTransportBill_Model oItem in lsmain)
+ {
+ //鏂板鏃跺垽鏂�
+ if (oprType == "1" || oprType == "2")
+ {
+ oItem.HMaker = msg2;//鍒涘缓浜�
+ }
+ else if(oprType == "3")//缂栬緫鏃跺垽鏂�
+ {
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Cg_OrderTransportBill where HItemID=" + oItem.HItemID, "Cg_OrderTransportBill");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ oBill.oModel = oItem;
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oprType == "1" || oprType == "2")
+ {
+
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if(oprType == "3")
+ {
+ oBill.oModel.HModifyEmp = msg2;
+ bResult = oBill.ModifyBill(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ throw new Exception("璇ュ崟鎹负娴忚鐘舵�侊紝涓嶅彲淇濆瓨");
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 杩愬崟鐢宠瀹℃牳銆佸弽瀹℃牳
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Cg_OrderTransportBill/AuditCg_OrderTransportBill")]
+ [HttpGet]
+ public object AuditCg_OrderTransportBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ DAL.ClsCg_OrderTransportBill_Ctl oBill = new DAL.ClsCg_OrderTransportBill_Ctl();
+ string sReturn = "";
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Cg_OrderTransportBill_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Cg_OrderTransportBillMain where HItemID=" + HInterID, "Cg_OrderTransportBill");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Cg_OrderTransportBill_BeforeCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Cg_OrderTransportBill_BeforeCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+
+ oBill.CheckBill(HInterID, ref sReturn);
+
+
+ //瀹℃牳鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Cg_OrderTransportBill_AfterCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Cg_OrderTransportBill_AfterCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍚庡垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ string sql1 = "exec h_p_Cg_OrderTransportBill_BeforeUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Cg_OrderTransportBill_BeforeCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ oBill.AbandonCheck(HInterID, ref sReturn);
+
+ //鍙嶅鏍稿悗鎺у埗=========================================
+ string sql2 = "exec h_p_Cg_OrderTransportBill_AfterUnCheckCtrl " + HInterID + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Cg_OrderTransportBill_AfterUnCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿悗鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杩愬崟鐢宠鍗� 浣滃簾/鍙嶄綔搴熷姛鑳�
+ [Route("Cg_OrderTransportBill/DropCg_OrderTransportBill")]
+ [HttpGet]
+ public object DropCg_OrderTransportBill(string HInterID, int Type, string user)
+ {
+ DAL.ClsCg_OrderTransportBill_Ctl oBill = new DAL.ClsCg_OrderTransportBill_Ctl();
+ try
+ {
+ //鍒ゆ柇鏄惁鏈変綔搴熸潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cg_OrderTransportBill_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愪綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 浣滃簾 2 鍙嶄綔搴�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡浣滃簾
+ DataSet ds;
+ string sql = "select * from " + oBill.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶉渶瑕佸啀浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() == "6")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍦ㄥ鏍镐腑!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //浣滃簾鍗曟嵁
+ if (!oBill.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶄綔搴�
+ DataSet ds;
+ string sql = "select * from " + oBill.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] == null || ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸啀鍙嶄綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() == "6")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍦ㄥ鏍镐腑!涓嶈兘杩涜鍙嶄綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶄綔搴熷崟鎹�
+ if (!oBill.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏀舵枡閫氱煡鍗� 鍏抽棴/鍙嶅叧闂姛鑳�
+ [Route("Cg_OrderTransportBill/CloseCg_OrderTransportBill")]
+ [HttpGet]
+ public object CloseCg_OrderTransportBill(string HInterID, int Type, string user)
+ {
+ DAL.ClsCg_OrderTransportBill_Ctl oBill = new DAL.ClsCg_OrderTransportBill_Ctl();
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cg_OrderTransportBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oBill.MvarItemKey = "Cg_OrderTransportBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍏抽棴
+ DataSet ds;
+ string sql = "select * from " + oBill.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍏抽棴鍗曟嵁
+ if (!oBill.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅叧闂�
+ DataSet ds;
+ string sql = "select * from " + oBill.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HCloseMan"] == null || ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸啀鍙嶅叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅叧闂崟鎹�
+ if (!oBill.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 缂栬緫鏃惰繍鍗曠敵璇蜂俊鎭幏鍙�
+ [Route("Cg_OrderTransportBill/GetCg_OrderTransportBillDetail")]
+ [HttpGet]
+ public object GetCg_OrderTransportBillDetail(int HID)
+ {
+
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ string sql1 = $@"select * from h_v_Cg_OrderTransportBillList where HItemID = {HID}";
+ ds = oCN.RunProcReturn(sql1, "h_v_Cg_OrderTransportBillList");
+ //娣诲姞鍒楀悕
+ 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("Cg_OrderTransportBill/Cg_OrderTransportBill_UploadFile")]
+ [HttpPost]
+ public object Cg_OrderTransportBill_UploadFile()
+ {
+
+ string HBillNo = HttpContext.Current.Request.Params["HBillNo"]; //杞︾墝鍙�
+ string HUserName = HttpContext.Current.Request.Params["HUserName"]; //鍒涘缓浜�
+ HttpPostedFile files = HttpContext.Current.Request.Files["file"];
+ string path = HttpContext.Current.Server.MapPath("~/../Files/Cg_OrderTransportBill/" + HBillNo);
+
+ dynamic dyResult = UpLoadFile(files, path, HBillNo, HUserName);
+ if (dyResult != null && dyResult.result == 1)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "涓婁紶鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = dyResult.returnval;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ #endregion
+
+ public dynamic UpLoadFile(HttpPostedFile files, string path, string HBillNo, string HUserName)
+ {
+ dynamic Result_Ob = new { result = 1, returnval = "涓婁紶鎴愬姛锛�" };
+ string filePath = Path.GetFullPath(files.FileName);//鏂囦欢涓婁紶璺緞
+ string fileExtension = Path.GetExtension(files.FileName);// 鏂囦欢鎵╁睍鍚�
+ string filename = files.FileName;//鏂囦欢鍚�
+ string fileSavePath = path;// 涓婁紶淇濆瓨璺緞
+ int filesize = files.ContentLength;//鑾峰彇涓婁紶鏂囦欢鐨勫ぇ灏忓崟浣嶄负瀛楄妭byte
+ int Maxsize = 40000 * 1024;//瀹氫箟涓婁紶鏂囦欢鐨勬渶澶х┖闂村ぇ灏忎负40M
+ try
+ {
+ if (files == null || files.ContentLength <= 0)
+ {
+ Result_Ob = new { result = 0, returnval = "鏂囦欢涓嶈兘涓虹┖!" };
+ return Result_Ob;
+ }
+ if (filesize >= Maxsize)
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶鏂囦欢瓒呰繃40M锛屼笉鑳戒笂浼狅紒" };
+ return Result_Ob;
+ }
+
+ string fileurl = Path.Combine(fileSavePath, filename);
+ if (Directory.Exists(fileurl) == true) //濡傛灉瀛樺湪閲嶅悕鏂囦欢灏辨彁绀�
+ {
+ Result_Ob = new { result = 0, returnval = "瀛樺湪鍚屽悕鏂囦欢锛�" };
+ return Result_Ob;
+ }
+ //鍒犻櫎鏁版嵁琛ㄦ暟鎹�
+ ds = oCN.RunProcReturn("delete from MES_AccessoriesList where HSourceBillNo ='" + HBillNo + "' and HFileName='" + filename + "'", "MES_AccessoriesList");
+ if (Directory.Exists(path))
+ {
+ File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
+ files.SaveAs(fileurl);
+ string StrPath = "/files/Cg_OrderTransportBill/" + HBillNo + "/" + filename;
+ if (File.Exists(fileurl))
+ {
+ //杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
+ //鍐欏叆鏁版嵁琛�
+ oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
+ ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
+ ",HFileClsID,HSourceBillNo" +
+ ") values('"
+ + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+ ",'" + HUserName + "',getdate(),'','V1','" + filesize +
+ "','" + 0 + "','" + HBillNo +
+ "') ");
+ }
+ else
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+ }
+ }
+ else
+ {
+ Directory.CreateDirectory(fileSavePath); //娣诲姞鏂囦欢澶�
+ files.SaveAs(fileurl);
+ string StrPath = "/files/Cg_OrderTransportBill/" + HBillNo + "/" + filename;
+ if (File.Exists(fileurl))
+ {
+ //杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
+ //鍐欏叆鏁版嵁琛�
+ oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
+ ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
+ ",HFileClsID,HSourceBillNo" +
+ ") values('"
+ + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+ ",'" + HUserName + "',getdate(),'','V1','" + filesize +
+ "','" + 0 + "','" + HBillNo +
+ "') ");
+ }
+ else
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ Result_Ob = new { result = 0, returnval = e.Message };
+ }
+ return Result_Ob;
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 74cbdee..9a3e451 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -758,6 +758,7 @@
var _value = sMainSub["sMainSub"].ToString();
string msg1 = _value.ToString();
oCN.BeginTran();
+
//淇濆瓨涓昏〃
objJsonResult = AddBillMain(msg1);
if (objJsonResult.code == "0")
@@ -770,6 +771,16 @@
return objJsonResult;
}
oCN.Commit();
+ //#region 鐢熸垚閲戣澏鍗曟嵁锛堝厛淇濆瓨鍒癿es鏈湴锛岄�氳繃鏈湴璋冪敤鐢熸垚閲戣澏鍗曟嵁锛�
+ //if (!jindieCloud(msg1))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "杩斿洖閲戣澏鍗曟嵁澶辫触"; //鎴愬姛锛�
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //#endregion
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
@@ -787,7 +798,237 @@
return objJsonResult;
}
}
+ [Route("Cg_POOrderBill/jindieCloud")]
+ [HttpPost]
+ public bool jindieCloud(int HSupID,int MaterID)
+ {
+ Int64 HInterID = 0;
+ string HBillNo = "";
+ string sErrMsg = "";
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod("1102", ref sErrMsg);
+ HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("1102", ref sErrMsg, true);
+ WebS.ClsCg_POOrderBillMain websLsmain = new WebS.ClsCg_POOrderBillMain();
+
+ websLsmain.HInterID = HInterID;
+ websLsmain.HDate = DateTime.Now;
+ websLsmain.HBillNo = HBillNo;
+ websLsmain.HSupID = HSupID;
+ websLsmain.HEmpID = MaterID;
+ websLsmain.HSTOCKORGID = 100038;
+ //websLsmain.HBillType = mainList[0].HBillType;
+ if (!oWebs.set_Bill_New(websLsmain, "1100", ref DBUtility.ClsPub.sErrInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖閲戣澏鍗曟嵁澶辫触"; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return false;
+ }
+ objJsonResult = AddBillMould(HBillNo, MaterID, HSupID);
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return false;
+ }
+ return true;
+ }
+ public json AddBillMould(string HBillNo,int MaterID,int HSupID)
+ {
+ //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ //string msg2 = sArray[0].ToString();
+ //string msg3 = sArray[1].ToString();
+ try
+ {
+ //msg2 = "[" + msg2.ToString() + "]";
+ //List<Gy_Mould> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg2);
+ //List<Gy_Mould> mainList1 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Mould>>(msg3);
+ string BillType = "3899";
+ //寰楀埌mainid
+ long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //string HBillNo = HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ DateTime HDate = DateTime.Now;//鏃ユ湡
+ int HYear = DBUtility.ClsPub.isInt(DateTime.Now.Year);
+ double HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ string HMouldNo = HInterID+"xxx";
+ string HBarCode = HBillNo+"xxx";
+ string HName = "娴嬭瘯妯″叿";
+ string HModel = "娴嬭瘯";
+ string HModel2 = "娴嬭瘯";
+ string HDiameter = "娴嬭瘯";
+ string HSubjoin = "娴嬭瘯";
+ string HSubjoin2 = "娴嬭瘯";
+ string HPICNo = "娴嬭瘯";
+ string HWorkMaterModel = "娴嬭瘯";
+ long HMaterID = MaterID;
+ long HMouleTypeID = 1;
+ long HUnitID = 1;
+ DateTime HOutComDate = DateTime.Now;
+ string HOutComNo = "娴嬭瘯";
+ long HDeptID = 0;
+ //long HSupID = HSupID;
+ string HMouldStatus = "0";
+ long HWHID = 0;
+ long HRoutingID = 0;
+ long HBOMID = 0;
+ string HVersion = "娴嬭瘯";
+ long HSPGroupID = 0;
+ long HSPID = 0;
+ Double HDesignLife = 0;
+ Double HUseLife = 0;
+ Double HInitLife = 0;//涓婄嚎鍒濆鍖栧鍛�
+ Double HLeaveLife =0;
+ Double HProdQty = 0;
+ Double HProdWeight = 0;
+ string HRemark = "娴嬭瘯";
+ string HMaker = "admin";
+ string HMaterNumber = "admin";
+ string HSupNumber = "test";
+ long HPrintQty =1;
+ string HMouldOWNER = "test";
+ string HSaveLife = "0";
+ int HCaveQty = 0;
+ int HMouldDotCheckRuleInterID =0;
+ int HMouldMaintainRuleInterID = 0;
+ int HNowSupID = 0;
+ int HNowSupTypeID = 0;
+ int HMadeSupID =0;
+ string HMouldClass = "test";
+ int HNowWHID = 0;
+ int HNowSPID = 0;
+ string HMouldUseStatus = "test";
+ int HCREATEORGID = 100038;
+ int HUSEORGID = 100038;
+ bool HTransPackFlag = false; //鍛ㄨ浆瀹瑰櫒鏍囪
+ bool HSendPackFlag = false; //鍙戣揣瀹瑰櫒鏍囪
+ int HMouldLength =0; //闀�
+ int HMouldWidth = 0; //瀹�
+ int HMouldHeight = 0; //楂�
+ int HMouldFoldHeight =0; //鎶樺彔楂樺害
+ int HUserID = 0; // 浣跨敤浜猴紙Gy_Employee锛�
+ string HBrand = "娴嬭瘯"; // 鍝佺墝
+ string HCalibrationType = "娴嬭瘯"; // 鏍″噯绫诲瀷 (鍐�/澶栨牎)
+ string HLocation = "娴嬭瘯"; // 浣嶇疆
+ DateTime HCalibrationDate =DateTime.Now; // 鏍″噯鏃ユ湡
+ string HCalibrationCycle = "娴嬭瘯"; // 鏍″噯鍛ㄦ湡
+ string HProductDesignSize = "娴嬭瘯"; // 浜у搧璁捐灏哄
+ string HGaugeDesignSize = "娴嬭瘯"; // 妫�鍏疯璁″昂瀵�
+ int HProductQTY = 1; // 浜у搧鏁伴噺
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ ds = oCN.RunProcReturn("Exec h_p_Gy_MouldFileMain_BeforeSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_MouldFileMain_BeforeSaveCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:淇濆瓨鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HBackRemark"].ToString(); ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+
+ //涓昏〃
+ oCN.RunProc("Insert Into Gy_MouldFileMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HMouldNo,HName,HModel,HModel2,HDiameter" +
+ ",HSubjoin,HSubjoin2,HPICNo,HWorkMaterModel" +
+ ",HMaterID,HMaterNumber,HMouldType,HUnitID" +
+ ",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
+ ",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
+ ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
+ ",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID,HBarCode,HMadeSupID" +
+ ",HMouldClass,HNowWHID,HNowSPID,HInitLife,HMouldUseStatus,HCREATEORGID,HUSEORGID " +
+ ",HMouldLength,HMouldWidth,HMouldHeight,HMouldFoldHeight,HTransPackFlag,HSendPackFlag," +
+ "HUserID,HBrand,HCalibrationType,HLocation,HCalibrationDate,HCalibrationCycle,HProductDesignSize,HGaugeDesignSize,HProductQTY ) " +
+
+ " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
+ ",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
+ ",'" + HSubjoin + "','" + HSubjoin2 + "','" + HPICNo + "','" + HWorkMaterModel + "'" +
+ "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
+ ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
+ "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
+ "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
+ ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
+ ",'" + HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "','" + HMouldUseStatus + "'," + HCREATEORGID + "," + HUSEORGID +
+ "," + HMouldLength + "," + HMouldWidth + "," + HMouldHeight + "," + HMouldFoldHeight + "," + Convert.ToString(HTransPackFlag ? 1 : 0) + "," + Convert.ToString(HSendPackFlag ? 1 : 0) + "," +
+ "'" + HUserID + "','" + HBrand + "','" + HCalibrationType + "','" + HLocation + "','" + HCalibrationDate + "','" + HCalibrationCycle + "','" + HProductDesignSize + "','" + HGaugeDesignSize + "','" + HProductQTY + "') ");
+
+ //瀛愯〃
+ oCN.RunProc("Insert into Gy_MouldFileSub " +
+ " (HInterID,HEntryID,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ") " +
+ " values('" + HInterID + "',0,''" +
+ ",0,0,'','',0,0 " +
+ ") ");
+
+ //objJsonResult = AddBillSub(msg5, msg6, msg7, HInterID, HBillNo);
+
+ //淇濆瓨鍚庢帶鍒�=========================================
+ ds = oCN.RunProcReturn("Exec h_p_Gy_MouldFileMain_AfterSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "','" + HBillNote + "',1 ", "h_p_Gy_MouldFileMain_AfterSaveCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:淇濆瓨鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HBackRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //=========================================================
+
+
+ if (objJsonResult.code == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.HInterID = HInterID.ToString();
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
public json AddBillMain(string msg1)
{
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -796,12 +1037,11 @@
int OperationType = int.Parse(sArray[2].ToString()); // 鏁版嵁绫诲瀷 1娣诲姞 3淇敼
string user = sArray[3].ToString();
string msg_allVal = sArray[4].ToString(); //涓昏〃+瀛愯〃鎵�鏈夋暟鎹�
-
+
try
{
msg2 = "[" + msg2.ToString() + "]";
List<ClsCg_POOrderBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_POOrderBillMain>>(msg2);
-
long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
long HPRDORGID = mainList[0].HPRDORGID;//缁勭粐
@@ -1225,6 +1465,8 @@
}
#endregion
+ public WebS.WebService1 oWebs = new WebS.WebService1();
+
/// <summary>
///鍒犻櫎鍔熻兘
/// </summary>
diff --git a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
index 038a859..ff2a970 100644
--- a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
+++ b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
@@ -618,6 +618,69 @@
}
#endregion
+ #region 閲囪喘鍏ュ簱鍗� - 鎵樻暟鍙樻洿鍔熻兘
+ [Route("Kf_POStockInBill/UpdatePallet")]
+ [HttpPost]
+ public object UpdatePallet([FromBody] JObject data)
+ {
+ try
+ {
+ long hmainid = data["hmainid"]?.ToObject<long>() ?? 0;
+ int newPallet = data["newPallet"]?.ToObject<int>() ?? 0;
+ string operatorName = data["operator"]?.ToString() ?? "";
+
+ if (hmainid <= 0)
+ return new { code = "0", count = 0, Message = "鍗曟嵁ID涓嶈兘涓虹┖锛�" };
+
+ if (newPallet <= 0)
+ return new { code = "0", count = 0, Message = "鎵樻暟蹇呴』澶т簬0锛�" };
+
+ // 妫�鏌ユ槸鍚﹀凡瀹℃牳
+ string checkAuditSql = $@"
+ SELECT COUNT(*) as HasAudit
+ FROM Kf_ICStockBillMain
+ WHERE HInterID = {hmainid}
+ AND HChecker IS NOT NULL
+ AND HCheckDate IS NOT NULL";
+
+ DataSet dsAudit = oCN.RunProcReturn(checkAuditSql, "CheckAudit");
+
+ if (dsAudit != null && dsAudit.Tables[0].Rows.Count > 0)
+ {
+ int hasAudit = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HasAudit"]);
+ if (hasAudit > 0)
+ {
+ return new { code = "0", count = 0, Message = "鍗曟嵁宸插鏍革紝涓嶈兘淇敼鎵樻暟锛�" };
+ }
+ }
+
+ // 鐩存帴鏇存柊鎵樻暟锛屼笉妫�鏌ヨ繑鍥炲��
+ string updateSql = $@"
+ UPDATE Kf_ICStockBillMain
+ SET HPackQtys = {newPallet}
+ WHERE HInterID = {hmainid}";
+
+ oCN.RunProc(updateSql); // 鐩存帴璋冪敤锛屼笉璧嬪�肩粰鍙橀噺
+
+ return new
+ {
+ code = "1",
+ count = 1,
+ Message = "鎵樻暟淇敼鎴愬姛锛�"
+ };
+ }
+ catch (Exception e)
+ {
+ return new
+ {
+ code = "0",
+ count = 0,
+ Message = "淇敼澶辫触锛�" + e.Message
+ };
+ }
+ }
+ #endregion
+
#region 鏌ユ壘璁板綍鍔熻兘
/// <summary>
/// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index d028b41..bd7fe67 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -3446,7 +3446,8 @@
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Sc_UnbindStation_BarList order by 鏉＄爜鏃ユ湡 desc", "h_v_Sc_UnbindStation_BarList");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_UnbindStation_BarList" +
+ " order by 鏉＄爜鏃ユ湡 desc", "h_v_Sc_UnbindStation_BarList");
}
else
{
diff --git a/WebAPI/Controllers/GZGL/Gy_SteppedPriceCoefficientController .cs b/WebAPI/Controllers/GZGL/Gy_SteppedPriceCoefficientController .cs
index d1ad83a..4ed2894 100644
--- a/WebAPI/Controllers/GZGL/Gy_SteppedPriceCoefficientController .cs
+++ b/WebAPI/Controllers/GZGL/Gy_SteppedPriceCoefficientController .cs
@@ -117,6 +117,7 @@
try
{
+
errorLogs.Add($"=== {DateTime.Now:yyyy-MM-dd HH:mm:ss} 淇濆瓨寮�濮� ===");
// 1. 瑙ｆ瀽鏁版嵁
@@ -124,6 +125,16 @@
string[] sArray = _value.Split(';');
string jsonData = sArray[0];
string user = sArray.Length > 1 ? sArray[1] : "unknown";
+
+ // 鏌ョ湅鏉冮檺妫�鏌�
+ if (!DBUtility.ClsPub.Security_Log("Gy_SteppedPriceCoefficient_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犵紪杈戞潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
errorLogs.Add($"瑙ｆ瀽鏁版嵁: user={user}");
@@ -308,7 +319,7 @@
HMainSourceBillType, HMainSourceInterID, HMainSourceEntryID, HMainSourceBillNo,
HPrintQty, HProcID, HEmpID, HDeptID, HStockOrgID
) VALUES (
- {HYear}, {HPeriod}, 'GYST', '',
+ {HYear}, {HPeriod}, '3341', '',
{HInterID}, '{HDate.ToString("yyyy-MM-dd HH:mm:ss")}', '{safeHBillNo}', 1, '{safeHRemark}',
'', '{safeUser}', '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}',
'', 0, 0, '', 0,
@@ -468,14 +479,14 @@
List<object> columnNameList = new List<object>();
// 鏌ョ湅鏉冮檺妫�鏌�
- //if (!DBUtility.ClsPub.Security_Log("Gy_MateNumRelation_Sec_Query", 1, false, user))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犳煡鐪嬫潈闄�";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("Gy_SteppedPriceCoefficient_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
// 鏋勫缓鍩虹SQL
string baseSql = @"select * from h_v_Gy_SteppedPriceCoefficientBillWithSub";
@@ -485,7 +496,7 @@
// 澶勭悊鏌ヨ鏉′欢锛堢害瀹氾細鍓嶇鍙彂閫佹潯浠惰〃杈惧紡锛屽彲鑳戒互 AND 寮�澶达級
string whereClause = ProcessWhereClause(sWhere);
- string orderByClause = "order by HItemID";
+ string orderByClause = "order by hmainid";
// 鏋勫缓瀹屾暣SQL
string sql;
@@ -596,6 +607,8 @@
{
Console.WriteLine($"=== 缂栬緫椤甸潰鍒濆鍖栧紑濮� ===");
Console.WriteLine($"鍙傛暟 - HInterID: {HInterID}, User: {user}");
+
+
if (string.IsNullOrEmpty(HInterID) || HInterID == "0")
{
@@ -752,7 +765,15 @@
objJsonResult.data = null;
return objJsonResult;
}
-
+ // 鏌ョ湅鏉冮檺妫�鏌�
+ if (!DBUtility.ClsPub.Security_Log("Gy_SteppedPriceCoefficient_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//妫�鏌ュ崟鎹姸鎬�
string sql = "SELECT HBillStatus, HChecker FROM Gy_SteppedPriceCoefficientBillMain WHERE HInterID = " + HInterID;
ds = oCN.RunProcReturn(sql, "CheckStatus");
@@ -813,6 +834,18 @@
{
try
{
+
+ // 鏌ョ湅鏉冮檺妫�鏌�
+ if (!DBUtility.ClsPub.Security_Log("Gy_SteppedPriceCoefficient_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲鏍告潈闄�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
//妫�鏌ュ崟鎹姸鎬�
string checkSql = "SELECT HBillStatus, HChecker FROM Gy_SteppedPriceCoefficientBillMain WHERE HInterID = " + HInterID;
ds = oCN.RunProcReturn(checkSql, "CheckStatus");
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index a6c7077..517102f 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -1074,40 +1074,175 @@
{
try
{
-
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
List<object> columnNameList = new List<object>();
- DataSet ds = oCN.RunProcReturn("exec h_p_KF_ICInventoryByMaterIDList1 '" + HBarCode + "'," + sHWHID + "," + sHSPID+","+ HOWNERID+",'"+ sWhere+"'", "h_p_KF_ICInventoryByMaterIDList");
- //娣诲姞鍒楀悕
- foreach (DataColumn col in ds.Tables[0].Columns)
+ string Ret = "";
+
+ if (oSystemParameter.ShowBill(ref Ret))
{
- Type dataType = col.DataType;
- string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
- columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ if (oSystemParameter.omodel.WMS_CloudMode == "Y")
+ {
+ DataSet ds = oCN.RunProcReturn("exec h_p_KF_ICInventoryByMaterIDList1 '" + HBarCode + "'," + sHWHID + "," + sHSPID + "," + HOWNERID + ",'" + sWhere + "'", "h_p_KF_ICInventoryByMaterIDList");
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ //浠庨厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
+ if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "ERP搴撳瓨鏌ヨ锛屽悓姝ヨ幏鍙栫櫥褰曡处鍙峰瘑鐮佸け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ if (isSuccess == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐧诲綍閲戣澏澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string queryJson = BuildDynamicQueryJson(HBarCode, sHWHID, HOWNERID);
+
+ string result = InvokeHelper.ExecuteBillQuery("STK_Inventory", queryJson);//鏌ヨ
+ var dataArray = JArray.Parse(result);
+
+ if (dataArray == null || dataArray.Count == 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鎴愬姛锛屾棤鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 绗竴姝ワ細鏀堕泦鎵�鏈夐渶瑕佹煡璇㈢殑ID
+ var ids = CollectIdsFromDataArray(dataArray);
+
+ // 绗簩姝ワ細鎵归噺鏌ヨ鏁版嵁搴撲腑鐨勫熀纭�淇℃伅锛堝悓姝ユ柟寮忥級
+ var stockDict = BatchQuery(oCN, "Gy_Warehouse", "HName", ids.StockIds);
+ var locationDict = BatchQuery(oCN, "Gy_StockPlace", "HName", ids.LocationIds);
+ var materialDict = BatchQuery(oCN, "Gy_Material", "HNumber", ids.MaterialIds);
+ var orgDict = BatchQuery(oCN, "Xt_ORGANIZATIONS", "HName", ids.OwnerIds);
+ var propDict = BatchQuery(oCN, "Gy_Property", "HName", ids.PropIds);
+
+ // 绗笁姝ワ細鎵归噺鏌ヨ鎵规淇℃伅锛堣皟鐢ㄩ噾铦舵帴鍙ｏ級
+ var batchDict = BatchQueryBatchInfo(ids.BatchIds);
+
+ var finalResults = new List<Dictionary<string, object>>();
+
+ // 绗洓姝ワ細澶勭悊鏁版嵁
+ foreach (JArray item in dataArray)
+ {
+ if (item.Count >= 11)
+ {
+ int HMaterID = item[0]?.Value<int>() ?? 0;
+ int HStockId = item[3]?.Value<int>() ?? 0;
+ int HLocationId = item[5]?.Value<int>() ?? 0;
+ int FAuxPropId = item[8]?.Value<int>() ?? 0;
+ int ownerId = item[11]?.Value<int>() ?? 0;
+ int FLot = item[6]?.Value<int>() ?? 0; // 鎵规ID
+
+ // 鍒涘缓缁撴灉瀛楀吀锛屼娇鐢ㄤ腑鏂囧瓧娈靛悕
+ var resultDict = new Dictionary<string, object>
+ {
+ ["鐗╂枡鍚嶇О"] = item[1].Value<string>(),
+ ["瑙勬牸鍨嬪彿"] = item[2].Value<string>(),
+ ["鏁伴噺"] = item[4].Value<decimal>(),
+
+ ["鐢熶骇鏃ユ湡"] = DBUtility.ClsPub.isDate(item[8]?.Value<string>()),
+ ["鏈夋晥鏈熻嚦"] = DBUtility.ClsPub.isDate(item[9]?.Value<string>())
+ };
+
+ // 浠庡瓧鍏歌幏鍙栦粨搴撳悕绉�
+ if (HStockId > 0 && stockDict.TryGetValue(HStockId, out string stockName))
+ resultDict["浠撳簱"] = stockName;
+ else
+ resultDict["浠撳簱"] = "";
+
+ // 浠庡瓧鍏歌幏鍙栦粨浣嶅悕绉�
+ if (HLocationId > 0 && locationDict.TryGetValue(HLocationId, out string locationName))
+ resultDict["浠撲綅"] = locationName;
+ else
+ resultDict["浠撲綅"] = "";
+
+ // 浠庡瓧鍏歌幏鍙栫墿鏂欎唬鐮�
+ if (HMaterID > 0 && materialDict.TryGetValue(HMaterID, out string materialCode))
+ resultDict["鐗╂枡浠ｇ爜"] = materialCode;
+ else
+ resultDict["鐗╂枡浠ｇ爜"] = "";
+
+ // 浠庡瓧鍏歌幏鍙栫粍缁囧悕绉�
+ if (ownerId > 0 && orgDict.TryGetValue(ownerId, out string orgName))
+ resultDict["缁勭粐"] = orgName;
+ else
+ resultDict["缁勭粐"] = "";
+
+ // 浠庡瓧鍏歌幏鍙栬緟鍔╁睘鎬у悕绉�
+ if (FAuxPropId > 0 && propDict.TryGetValue(FAuxPropId, out string propName))
+ resultDict["杈呭姪灞炴��"] = propName;
+ else
+ resultDict["杈呭姪灞炴��"] = "";
+
+ // 浠庡瓧鍏歌幏鍙栨壒娆″悕绉�
+ if (FLot > 0 && batchDict.TryGetValue(FLot, out string batchName))
+ resultDict["鎵规"] = batchName;
+ else
+ resultDict["鎵规"] = "";
+
+ finalResults.Add(resultDict);
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = finalResults.Count;
+ objJsonResult.Message = "鏌ヨ鎴愬姛锛�";
+ objJsonResult.data = finalResults;
+ return objJsonResult;
+ }
+ }
}
- if (ds == null || ds.Tables[0].Rows.Count <= 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- objJsonResult.data = null;
- return objJsonResult;
- //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
- objJsonResult.list = columnNameList;
- return objJsonResult;
- }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
}
catch (Exception e)
{
-
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
@@ -1116,6 +1251,202 @@
}
}
+ #region 閲戣澏鍙婃椂搴撳瓨鏌ヨ 浣跨敤鏂规硶
+
+ // 杈呭姪绫伙細鐢ㄤ簬鏀堕泦鎵�鏈夐渶瑕佹煡璇㈢殑ID
+ private class CollectedIds
+ {
+ public HashSet<int> StockIds { get; set; } = new HashSet<int>();
+ public HashSet<int> LocationIds { get; set; } = new HashSet<int>();
+ public HashSet<int> MaterialIds { get; set; } = new HashSet<int>();
+ public HashSet<int> OwnerIds { get; set; } = new HashSet<int>();
+ public HashSet<int> PropIds { get; set; } = new HashSet<int>();
+ public HashSet<int> BatchIds { get; set; } = new HashSet<int>(); // 鎵规ID
+ }
+
+ // 鏀堕泦鎵�鏈夐渶瑕佹煡璇㈢殑ID
+ private CollectedIds CollectIdsFromDataArray(JArray dataArray)
+ {
+ var ids = new CollectedIds();
+
+ foreach (JArray item in dataArray)
+ {
+ if (item.Count >= 11)
+ {
+ int HMaterID = item[0]?.Value<int>() ?? 0;
+ int HStockId = item[3]?.Value<int>() ?? 0;
+ int HLocationId = item[5]?.Value<int>() ?? 0;
+ int FAuxPropId = item[8]?.Value<int>() ?? 0;
+ int ownerId = item[11]?.Value<int>() ?? 0;
+ int FLot = item[6]?.Value<int>() ?? 0; // 鎵规ID
+
+ if (HStockId > 0) ids.StockIds.Add(HStockId);
+ if (HLocationId > 0) ids.LocationIds.Add(HLocationId);
+ if (HMaterID > 0) ids.MaterialIds.Add(HMaterID);
+ if (ownerId > 0) ids.OwnerIds.Add(ownerId);
+ if (FAuxPropId > 0) ids.PropIds.Add(FAuxPropId);
+ if (FLot > 0) ids.BatchIds.Add(FLot); // 鏀堕泦鎵规ID
+ }
+ }
+
+ return ids;
+ }
+
+ // 鎵归噺鏌ヨ鏂规硶锛堝悓姝ョ増鏈級
+ private Dictionary<int, string> BatchQuery(SQLHelper.ClsCN oCN, string tableName, string nameColumn, HashSet<int> ids)
+ {
+ if (ids == null || ids.Count == 0)
+ return new Dictionary<int, string>();
+
+ string idList = string.Join(",", ids);
+ string query = $"select Hitemid, {nameColumn} from {tableName} with (nolock) where Hitemid in ({idList})";
+
+ DataSet ds = oCN.RunProcReturn(query, tableName);
+ var dict = new Dictionary<int, string>();
+
+ if (ds != null && ds.Tables.Count > 0)
+ {
+ foreach (DataRow row in ds.Tables[0].Rows)
+ {
+ int id = Convert.ToInt32(row["Hitemid"]);
+ string name = row[nameColumn].ToString();
+ dict[id] = name;
+ }
+ }
+
+ return dict;
+ }
+
+ // 鎵归噺鏌ヨ鎵规淇℃伅锛堣皟鐢ㄩ噾铦舵帴鍙ｏ級
+ private Dictionary<int, string> BatchQueryBatchInfo(HashSet<int> batchIds)
+ {
+ var batchDict = new Dictionary<int, string>();
+
+ if (batchIds == null || batchIds.Count == 0)
+ return batchDict;
+
+ // 濡傛灉闇�瑕佸苟琛屾煡璇紝鍙互浣跨敤 Parallel.ForEach
+ // 浣嗘敞鎰忥細濡傛灉鎺ュ彛涓嶆敮鎸侀珮骞跺彂锛屽彲浠ユ敼涓洪『搴忔煡璇�
+ foreach (int batchId in batchIds)
+ {
+ try
+ {
+ // 鏋勫缓鏌ヨ鍙傛暟
+ var queryJson = $"{{\"Id\": {batchId}, \"IsSortBySeq\": \"false\"}}";
+
+ // 璋冪敤鎵规鏌ヨ鎺ュ彛
+ string result = InvokeHelper.View("BD_BatchMainFile", queryJson);
+
+ // 瑙ｆ瀽杩斿洖鐨凧SON
+ var jsonObj = JObject.Parse(result);
+
+ // 鑾峰彇鎵规鍚嶇О锛堜粠Name鏁扮粍鐨勭涓�涓厓绱犵殑Value锛�
+ var nameArray = jsonObj["Result"]?["Result"]?["Name"] as JArray;
+ if (nameArray != null && nameArray.Count > 0)
+ {
+ string batchName = nameArray[0]["Value"]?.ToString();
+ if (!string.IsNullOrEmpty(batchName))
+ {
+ batchDict[batchId] = batchName;
+ }
+ else
+ {
+ // 濡傛灉Name鏁扮粍涓病鏈夊�硷紝灏濊瘯浠嶯umber瀛楁鑾峰彇
+ string number = jsonObj["Result"]?["Result"]?["Number"]?.ToString();
+ if (!string.IsNullOrEmpty(number))
+ {
+ batchDict[batchId] = number;
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ // 璁板綍閿欒鏃ュ織锛屼絾缁х画澶勭悊鍏朵粬鎵规
+ Console.WriteLine($"鏌ヨ鎵规淇℃伅澶辫触锛屾壒娆D: {batchId}, 閿欒: {ex.Message}");
+ // 濡傛灉鏌ヨ澶辫触锛屽彲浠ュ皢鎵规ID浣滀负榛樿鍊�
+ batchDict[batchId] = batchId.ToString();
+ }
+ }
+
+ return batchDict;
+ }
+
+ //JSON瀛楃涓插弬鏁�
+ public static string BuildDynamicQueryJson(string materialNumber = null, long FHStockId=0, long HOWNERID = 0)
+ {
+ // 鍒涘缓鍔ㄦ�佽繃婊ゆ潯浠跺垪琛�
+ var filterList = new List<object>();
+ if (HOWNERID!= 100038)
+ {
+ // 濡傛灉鏈夌墿鏂欑紪鐮侊紝娣诲姞鐗╂枡鏉′欢
+ if (!string.IsNullOrWhiteSpace(materialNumber))
+ {
+ filterList.Add(new
+ {
+ Left = "",
+ FieldName = "FHMaterID.FNumber",
+ Compare = "67", // 绛変簬
+ Value = materialNumber,
+ Right = "",
+ Logic = filterList.Count > 0 ? 1 : 0 // 濡傛灉鏈夊涓潯浠讹紝Logic=1琛ㄧずOR
+ });
+ }
+ // 濡傛灉鏈変粨搴撳悕绉帮紝娣诲姞浠撳簱鏉′欢
+ if (FHStockId != 0)
+ {
+ filterList.Add(new
+ {
+ Left = "",
+ FieldName = "FHStockId",
+ Compare = "67", // 鍖呭惈
+ Value = FHStockId,
+ Right = "",
+ Logic = filterList.Count > 0 ? 1 : 0 // 濡傛灉鏈夊涓潯浠讹紝Logic=1琛ㄧずOR
+ });
+ }
+ // 濡傛灉鏈夌粍缁嘔D锛屾坊鍔犵粍缁囨潯浠�
+ if (HOWNERID != 0)
+ {
+ filterList.Add(new
+ {
+ Left = "",
+ FieldName = "FStockOrgId",
+ Compare = "67", // 鍖呭惈
+ Value = HOWNERID, // 淇濇寔涔嬪墠鐨勭被鍨嬭浆鎹慨澶�
+ Right = "",
+ Logic = filterList.Count > 0 ? 1 : 0 // 濡傛灉鏈夊涓潯浠讹紝Logic=1琛ㄧずOR
+ });
+ }
+
+ // 鏋勫缓瀹屾暣鐨勬煡璇㈠弬鏁�
+ var queryParams = new
+ {
+ FormId = "STK_Inventory",
+ FieldKeys = "FMaterialId,FMaterialName,FModel,FStockUnitId,FBaseQty,FStockId,FStockLocId,FLot,FAuxPropId,FProduceDate,FExpiryDate,FStockOrgId",
+ FilterString = filterList
+ };
+ return JsonConvert.SerializeObject(queryParams);
+ }
+ else
+ {
+
+ //47 涓嶆敮鎸佷笂闈㈢殑鍔ㄦ�佽繃婊ゆ潯浠� 鏋勫缓瀹屾暣鐨勬煡璇㈠弬鏁�
+ var queryParams1 = new
+ {
+ FormId = "STK_Inventory",
+ FieldKeys = "FMaterialId,FMaterialName,FModel,FStockUnitId,FBaseQty,FStockId,FStockLocId,FLot,FAuxPropId,FProduceDate,FExpiryDate,FStockOrgId",
+ FilterString = ""
+ };
+ return JsonConvert.SerializeObject(queryParams1);
+ }
+
+
+
+ }
+
+ #endregion
+
//鍒锋柊琛ㄤ綋 杞﹂棿瀹氫綅 杩斿洖杞﹂棿鍗虫椂搴撳瓨搴撳瓨淇℃伅缃戦〉PDA鐗�
[Route("KF_ICInventory_WorkShopByMaterID/GetWorkShopICInventory")]
[HttpGet]
diff --git a/WebAPI/Controllers/QC_POStockInCheckBillController.cs b/WebAPI/Controllers/QC_POStockInCheckBillController.cs
index 7bbf6dd..1405bdb 100644
--- a/WebAPI/Controllers/QC_POStockInCheckBillController.cs
+++ b/WebAPI/Controllers/QC_POStockInCheckBillController.cs
@@ -104,7 +104,7 @@
}
#endregion
- #region 鏉ユ枡妫�楠屽崟鏍规嵁婧愬崟鑾峰彇淇℃伅-婧愬崟涓虹敓浜ц鍗�(1102)
+ #region 鏉ユ枡妫�楠屽崟鏍规嵁婧愬崟鑾峰彇淇℃伅-婧愬崟涓洪噰璐鍗�(1102)
/// <summary>
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
@@ -971,6 +971,15 @@
string OperationType = sArray[2].ToString().Trim();
string user = sArray[3].ToString();
string Value = sArray[4].ToString();
+ string BadReason = null;
+ if (sArray.Length > 4)
+ {
+ BadReason = sArray[5].ToString();
+ }
+ if (String.IsNullOrWhiteSpace(BadReason) == true)
+ {
+ BadReason = "[]";
+ }
bool bResult;
try
{
@@ -1003,6 +1012,18 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ // 鍒ゆ柇鍗曟嵁鏄惁閲嶅
+ DataSet ds2 = oCN.RunProcReturn("select top 1 HInterID from QC_POStockInCheckBillMain where HInterID=" + mainList[0].HInterID, "QC_POStockInCheckBillMain");
+ if(ds2.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒鍗曟嵁閲嶅鎻愪氦!";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
BillNew.omodel.HYear = sYear;
BillNew.omodel.HPeriod = sPeriod;
//鍥哄畾璧嬪��=================================
@@ -1036,14 +1057,16 @@
BillNew.omodel.HTakeSampleCheckBillID = ClsPub.isLong(mainList[0].HTakeSampleCheckBillID);
BillNew.omodel.HTakeSampleCheckBillNo = ClsPub.isStrNull(mainList[0].HTakeSampleCheckBillNo);
BillNew.omodel.HRemarkSN = ClsPub.isStrNull(mainList[0].HRemarkSN);
+ BillNew.omodel.HCheckQty = mainList[0].HCheckQty;
List<Model.ClsQC_POStockInCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_POStockInCheckBillSub>>(msg3);
+ List<Model.ClsQC_POStockInCheckBillSub_BadReason> badReasonList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_POStockInCheckBillSub_BadReason>>(BadReason);
BillNew.DetailColl = new List<Model.ClsQC_POStockInCheckBillSub>();
+
for (int i = 0; i < subList.ToArray().Length; i++)
{
if (i >= 0)//HQty
{
- LogService.Write(subList[i]);
Model.ClsQC_POStockInCheckBillSub oSub = new Model.ClsQC_POStockInCheckBillSub();
oSub.HEntryID = i + 1;
oSub.HRemark = ClsPub.isStrNull(subList[i].HRemark);
@@ -1088,6 +1111,8 @@
oSub.HQualityStdID = DBUtility.ClsPub.isLong(subList[i].HQualityStdID);
oSub.HInspectMethodID = DBUtility.ClsPub.isLong(subList[i].HInspectMethodID);
oSub.HInspectBasisID = DBUtility.ClsPub.isLong(subList[i].HInspectBasisID);
+ oSub.HInspectValQ = subList[i].HInspectValQ;
+
BillNew.DetailColl.Add(oSub);
}
else
@@ -1100,9 +1125,28 @@
}
}
+ for (int i = 0; i < badReasonList.ToArray().Length; i++)
+ {
+ if (i >= 0)//HQty
+ {
+ Model.ClsQC_POStockInCheckBillSub_BadReason oSub = new Model.ClsQC_POStockInCheckBillSub_BadReason();
+ oSub.HInterID = mainList[0].HInterID;
+ oSub.HEntryID = i + 1;
+ oSub.HRemark = ClsPub.isStrNull(subList[i].HRemark);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(badReasonList[i].HCloseMan);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(badReasonList[i].HEntryCloseDate);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(badReasonList[i].HCloseType);
+ oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(mainList[0].HBillNo);
+ oSub.HQty = badReasonList[i].HQty;
+ oSub.HBadReasonID = badReasonList[i].HBadReasonID;
+
+ BillNew.DetailCol1_BadReason.Add(oSub);
+ }
+ }
-
+
+
//淇濆瓨瀹屾瘯鍚庡鐞�
if (OperationType.Equals("1") || OperationType.Equals("2"))
@@ -1160,6 +1204,58 @@
}
#endregion
+ #region [妫�楠屽崟鑾峰彇 涓嶈壇鍘熷洜]
+ [Route("QC_POStockInCheckBill_BadReason/getBadReasonList")]
+ [HttpGet]
+ public object getBadReasonList(Int64 HInterID, string user)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("select * from QC_POStockInCheckBillSub_BadReason where HInterID=" + HInterID, "QC_POStockInCheckBillSub_BadReason");
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱笉鑹師鍥犳暟鎹紒";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍涓嶈壇鍘熷洜璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region [鏉ユ枡鍏ュ簱妫�楠屽崟]
/// <summary>
/// 杩斿洖鍒楄〃
diff --git a/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
index e5089bb..16c41e9 100644
--- a/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
+++ b/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
@@ -747,6 +747,15 @@
string OperationType = sArray[2].ToString().Trim();
string user = sArray[3].ToString();
string Value = sArray[4].ToString();
+ string BadReason = null;
+ if (sArray.Length > 4)
+ {
+ BadReason = sArray[5].ToString();
+ }
+ if (String.IsNullOrWhiteSpace(BadReason) == true)
+ {
+ BadReason = "[]";
+ }
bool bResult;
try
{
@@ -779,6 +788,19 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ // 鍒ゆ柇鍗曟嵁鏄惁閲嶅
+ DataSet ds2 = oCN.RunProcReturn("select top 1 HInterID from QC_LastPieceCheckBillMain where HInterID=" + mainList[0].HInterID, "QC_LastPieceCheckBillMain");
+ if (ds2.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒鍗曟嵁閲嶅鎻愪氦!";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+
BillNew.omodel.HYear = sYear;
BillNew.omodel.HPeriod = sPeriod;
//鍥哄畾璧嬪��=================================
@@ -811,8 +833,12 @@
BillNew.omodel.HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
BillNew.omodel.HTakeSampleCheckBillID = ClsPub.isLong(mainList[0].HTakeSampleCheckBillID);
BillNew.omodel.HTakeSampleCheckBillNo = ClsPub.isStrNull(mainList[0].HTakeSampleCheckBillNo);
+ BillNew.omodel.HRemarkSN = ClsPub.isStrNull(mainList[0].HRemarkSN);
+ BillNew.omodel.HCheckQty = mainList[0].HCheckQty;
List<Model.ClsQC_LastPieceCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_LastPieceCheckBillSub>>(msg3);
+ List<Model.ClsQC_LastPieceCheckBillSub_BadReason> badReasonList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_LastPieceCheckBillSub_BadReason>>(BadReason);
+
BillNew.DetailColl = new List<Model.ClsQC_LastPieceCheckBillSub>();
for (int i = 0; i < subList.ToArray().Length; i++)
@@ -859,6 +885,8 @@
oSub.HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect);
oSub.HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID);
oSub.HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult);
+ oSub.HInspectValQ = subList[i].HInspectValQ;
+
BillNew.DetailColl.Add(oSub);
}
else
@@ -868,6 +896,25 @@
objJsonResult.Message = "鏃犳槑缁嗚淇℃伅!";
objJsonResult.data = null;
return objJsonResult;
+ }
+ }
+
+ for (int i = 0; i < badReasonList.ToArray().Length; i++)
+ {
+ if (i >= 0)//HQty
+ {
+ Model.ClsQC_LastPieceCheckBillSub_BadReason oSub = new Model.ClsQC_LastPieceCheckBillSub_BadReason();
+ oSub.HInterID = mainList[0].HInterID;
+ oSub.HEntryID = i + 1;
+ oSub.HRemark = ClsPub.isStrNull(subList[i].HRemark);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(badReasonList[i].HCloseMan);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(badReasonList[i].HEntryCloseDate);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(badReasonList[i].HCloseType);
+ oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(mainList[0].HBillNo);
+ oSub.HQty = badReasonList[i].HQty;
+ oSub.HBadReasonID = badReasonList[i].HBadReasonID;
+
+ BillNew.DetailCol1_BadReason.Add(oSub);
}
}
@@ -1069,6 +1116,58 @@
}
#endregion
+ #region [妫�楠屽崟鑾峰彇 涓嶈壇鍘熷洜]
+ [Route("QC_LastPieceCheckBill_BadReason/getBadReasonList")]
+ [HttpGet]
+ public object getBadReasonList(Int64 HInterID, string user)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("select * from QC_LastPieceCheckBillSub_BadReason where HInterID=" + HInterID, "QC_LastPieceCheckBillSub_BadReason");
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱笉鑹師鍥犳暟鎹紒";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍涓嶈壇鍘熷洜璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 鐢熶骇鍏ュ簱妫�楠屽崟鏍规嵁婧愬崟鑾峰彇淇￠�氳繃鍗曟嵁鍙锋淮鍏�-婧愬崟涓虹敓浜ф眹鎶ュ崟(3711)
/// <summary>
///鍙傛暟锛歴tring sql銆�
diff --git a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
index ea72ee8..212630d 100644
--- a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
+++ b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
@@ -262,6 +262,15 @@
string OperationType = sArray[2].ToString();
string user = sArray[3].ToString();
string Value = sArray[4].ToString();
+ string BadReason = null;
+ if(sArray.Length > 4)
+ {
+ BadReason = sArray[5].ToString();
+ }
+ if (String.IsNullOrWhiteSpace(BadReason) == true)
+ {
+ BadReason = "[]";
+ }
bool bResult;
try
{
@@ -325,8 +334,11 @@
BillNew.omodel.HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
BillNew.omodel.HTakeSampleCheckBillID = ClsPub.isLong(mainList[0].HTakeSampleCheckBillID);
BillNew.omodel.HTakeSampleCheckBillNo = ClsPub.isStrNull(mainList[0].HTakeSampleCheckBillNo);
-
+ BillNew.omodel.HRemarkSN = ClsPub.isStrNull(mainList[0].HRemarkSN);
+ BillNew.omodel.HCheckQty = mainList[0].HCheckQty;
List<Model.ClsQC_OutCompCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_OutCompCheckBillSub>>(msg3);
+ List<Model.ClsQC_POStockInCheckBillSub_BadReason> badReasonList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_POStockInCheckBillSub_BadReason>>(BadReason);
+
BillNew.DetailColl = new List<Model.ClsQC_OutCompCheckBillSub>();
for (int i = 0; i < subList.ToArray().Length; i++)
@@ -378,6 +390,7 @@
oSub.HInspectMethodID = DBUtility.ClsPub.isLong(subList[i].HInspectMethodID);//妫�楠屾柟娉�
oSub.HInspectBasisID = DBUtility.ClsPub.isLong(subList[i].HInspectBasisID);//妫�楠屼緷鎹�
oSub.HCompareSymbol = DBUtility.ClsPub.isStrNull(subList[i].HCompareSymbol);//姣旇緝绗�
+ oSub.HInspectValQ = subList[i].HInspectValQ;
BillNew.DetailColl.Add(oSub);
}
@@ -391,6 +404,25 @@
}
}
+ for (int i = 0; i < badReasonList.ToArray().Length; i++)
+ {
+ if (i >= 0)//HQty
+ {
+ Model.ClsQC_OutCompCheckBillSub_BadReason oSub = new Model.ClsQC_OutCompCheckBillSub_BadReason();
+ oSub.HInterID = mainList[0].HInterID;
+ oSub.HEntryID = i + 1;
+ oSub.HRemark = ClsPub.isStrNull(subList[i].HRemark);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(badReasonList[i].HCloseMan);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(badReasonList[i].HEntryCloseDate);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(badReasonList[i].HCloseType);
+ oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(mainList[0].HBillNo);
+ oSub.HQty = badReasonList[i].HQty;
+ oSub.HBadReasonID = badReasonList[i].HBadReasonID;
+
+ BillNew.DetailCol1_BadReason.Add(oSub);
+ }
+ }
+
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
index bc8613a..74a36af 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
@@ -1847,6 +1847,14 @@
var ds = oCN.RunProcReturn($@"select * from Gy_Source where HName= '{HSourceName}'", "Gy_Source");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熶骇璧勬簮鍚嶇О鏈夎锛岀郴缁熸湭鏌ヨ鍒板搴旀暟鎹�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
HSourceID = ds.Tables[0].Rows[0]["HItemID"].ToString();
string sql = $"select * from Sc_WorkBillSortBillMain where HMainSourceInterID={HMainSourceInterID}" +
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index 871fe78..e21742b 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -15653,12 +15653,23 @@
[HttpPost]
public object UploadFile_Gy_QCVerification()
{
-
+ string path = "";
string HBillNo = HttpContext.Current.Request.Params["HBillNo"]; //鍗曟嵁鍙�
string HRemark = HttpContext.Current.Request.Params["HRemark"]; //澶囨敞
string HUserName = HttpContext.Current.Request.Params["HUserName"]; //鍒涘缓浜�
- HttpPostedFile files = HttpContext.Current.Request.Files["file"];
- string path = HttpContext.Current.Server.MapPath("~/../Files/Gy_QCVerification/" + HBillNo);
+ HttpPostedFile files = HttpContext.Current.Request.Files["file"];
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒")
+ {
+ path = "D:/缃戠珯鍙戝竷/LAYUI/Files/Gy_QCVerification/" + HBillNo;
+ }
+ else
+ {
+ path = HttpContext.Current.Server.MapPath("~/../Files/Gy_QCVerification/" + HBillNo);
+ }
+ }
dynamic dyResult = UploadFile_Gy_QCVerification(files, path, HBillNo, HRemark, HUserName);
if (dyResult != null && dyResult.result == 1)
{
@@ -15713,7 +15724,20 @@
{
File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
files.SaveAs(fileurl);
- string StrPath = "/files/Gy_QCVerification/" + HBillNo + "/" + filename;
+ string StrPath = "";
+
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒")
+ {
+ StrPath = "D:/缃戠珯鍙戝竷/LAYUI/Files/Gy_QCVerification/" + HBillNo + "/" + filename;
+ }
+ else
+ {
+ StrPath = "/files/Gy_QCVerification/" + HBillNo + "/" + filename;
+ }
+ }
if (File.Exists(fileurl))
{
//杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
@@ -15773,8 +15797,19 @@
[HttpGet]
public object Gy_QCVerification_Filelist(string HBillNo)
{
- var url = fileip + "/Files/Gy_QCVerification/" + HBillNo + "/";
-
+ string Ret = "";
+ var url = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鍑礉濂堢壒")
+ {
+ url = "D:/缃戠珯鍙戝竷/LAYUI/Files/Gy_QCVerification/" + HBillNo + "/";
+ }
+ else
+ {
+ url = fileip + "/Files/Gy_QCVerification/" + HBillNo + "/";
+ }
+ }
try
{
ds = oCN.RunProcReturn("select *,'" + url + "'+CAST(HFileName as varchar(200))as url from MES_AccessoriesList where HSourceBillNo='" + HBillNo + "'", "MES_AccessoriesList");
@@ -15808,8 +15843,7 @@
{
oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);
- string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/Gy_QCVerification/" + HSourceBillNo), HFileName);
- File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
@@ -15825,7 +15859,11 @@
return objJsonResult;
}
}
+
+
#endregion
+
+
#endregion
diff --git a/WebAPI/Controllers/WLGL/Cg_CarTrajectoryBillController.cs b/WebAPI/Controllers/WLGL/Cg_CarTrajectoryBillController.cs
new file mode 100644
index 0000000..5390bf3
--- /dev/null
+++ b/WebAPI/Controllers/WLGL/Cg_CarTrajectoryBillController.cs
@@ -0,0 +1,949 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+using SyntacticSugar.constant;
+
+namespace WebAPI.Controllers
+{
+ public class Cg_CarTrajectoryBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public const string ModName = "1119"; // 鍗曟嵁绫诲瀷浠ｇ爜
+ public const string ModCaption = "杞﹁締杞ㄨ抗鍗曟嵁"; // 鍗曟嵁鍚嶇О
+ public const string ModRightName = "Cg_CarTrajectoryBill";
+ public const string ModRightNameQuery = ModRightName + "_Query"; // 鏌ヨ鏉冮檺
+ public const string ModRightNameEdit = ModRightName + "_Edit"; // 缂栬緫鏉冮檺
+ public const string ModRightNameCheck = ModRightName + "_Check"; // 瀹℃牳鏉冮檺
+ public const string ModRightNameClose = ModRightName + "_Close"; // 鍏抽棴鏉冮檺
+ public const string ModRightNameDelete = ModRightName + "_Delete"; // 浣滃簾鏉冮檺
+ public const string ModRightNameDrop = ModRightName + "_Drop"; // 鍒犻櫎鏉冮檺
+
+ public DataSet ds = new DataSet();
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ public DAL.ClsCg_CarTrajectoryBill oBill = new DAL.ClsCg_CarTrajectoryBill();
+ public DAL.ClsCg_CarTrajectoryBill BillNew = new DAL.ClsCg_CarTrajectoryBill(); // 瀵瑰簲鍗曟嵁绫�
+ public DAL.ClsCg_CarTrajectoryBill BillOld = new DAL.ClsCg_CarTrajectoryBill(); // 瀵瑰簲鍗曟嵁绫�
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); // 鑾峰彇绯荤粺鍙傛暟
+
+ #region 杞﹁締杞ㄨ抗鍗曟嵁鍒楄〃
+ /// <summary>
+ /// 鑾峰彇杞﹁締杞ㄨ抗鍗曟嵁鍒楄〃淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("Cg_CarTrajectoryBill/GetCg_CarTrajectoryBillList")]
+ [HttpGet]
+ public object GetCg_CarTrajectoryBillList(string sWhere, string HMaker)
+ {
+ try
+ {
+ // 鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameQuery, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺锛岃涓庣鐞嗗憳鑱旂郴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 杩斿洖鍒楄〃淇℃伅
+ ds = oCn.RunProcReturn("SELECT * FROM h_v_Cg_CarTrajectoryBillMainList WHERE 1=1 " + sWhere + " ORDER BY HInterID DESC", "h_v_Cg_CarTrajectoryBillMainList");
+
+ 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));
+ }
+
+ objJsonResult.code = "0";
+ objJsonResult.count = ds.Tables[0].Rows.Count;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杞﹁締杞ㄨ抗鍗曟嵁鍒犻櫎
+ /// <summary>
+ /// 鍒犻櫎杞﹁締杞ㄨ抗鍗曟嵁
+ /// </summary>
+ /// <returns></returns>
+ [Route("Cg_CarTrajectoryBill/DeleteCg_CarTrajectoryBill")]
+ [HttpGet]
+ public object DeleteCg_CarTrajectoryBill(Int64 HInterID, string HMaker)
+ {
+ try
+ {
+ // 鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDrop, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍒犻櫎鍔熻兘鏉冮檺锛岃涓庣鐞嗗憳鑱旂郴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ // 鍒犻櫎鍓嶆帶鍒�
+ string sql1 = "EXEC h_p_Cg_CarTrajectoryBill_BeforeDelCtrl " + BillOld.omodel.HInterID + ",'" + BillOld.omodel.HBillNo + "','" + HMaker + "'";
+ ds = oCn.RunProcReturn(sql1, "h_p_Cg_CarTrajectoryBill_BeforeDelCtrl");
+
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佸師鍥狅細鍒犻櫎鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佸師鍥狅細" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 鍒犻櫎鍗曟嵁锛堝寘鍚垹闄ゅ悗鎺у埗銆佸啓鍏ユ棩蹇楋級
+ if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Cg_CarTrajectoryBill_AfterDelCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛佸師鍥狅細" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ヨ溅杈嗚建杩瑰崟鎹紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杞﹁締杞ㄨ抗鍗曟嵁鍒嗛〉鍒楄〃
+ [Route("Cg_CarTrajectoryBill/GetCg_CarTrajectoryBillList_Page")]
+ [HttpGet]
+ public json GetCg_CarTrajectoryBillList_Page(string sWhere, string user, int page, int size)
+ {
+ DataSet ds;
+ json res = new json();
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameQuery, 3, false, user))
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ res.data = null;
+ return res;
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCn.RunProcReturn("exec h_p_Cg_CarTrajectoryBillList " + page + "," + size + ",''", "h_p_Cg_CarTrajectoryBillList");
+ }
+ else
+ {
+ ds = oCn.RunProcReturn("exec h_p_Cg_CarTrajectoryBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_Cg_CarTrajectoryBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ res.code = CodeConstant.SUCCEED;
+ res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ res.Message = "Sucess锛�";
+ res.list = columnNameList;
+ res.data = ds.Tables[0];
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+ #endregion
+
+ #region 杞﹁締杞ㄨ抗鍗曟嵁瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// 瀹℃牳/鍙嶅鏍歌溅杈嗚建杩瑰崟鎹�
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(1),鍙嶅鏍�(2)</param>
+ /// <param name="HMaker">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Cg_CarTrajectoryBill/AuditCg_CarTrajectoryBill")]
+ [HttpGet]
+ public object AuditCg_CarTrajectoryBill(Int64 HInterID, int IsAudit, string HMaker)
+ {
+ try
+ {
+ // 鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡瀹℃牳/鍙嶅鏍稿姛鑳芥潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsCg_CarTrajectoryBill oBill = new DAL.ClsCg_CarTrajectoryBill();
+
+ // 鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ // IsAudit 1 瀹℃牳 2 鍙嶅鏍�
+ if (IsAudit == 1)
+ {
+ // 瀹℃牳鍓嶆鏌�
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍革紝涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂紒涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴燂紒涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 瀹℃牳鍓嶆帶鍒�
+ string sql1 = "EXEC h_p_Cg_CarTrajectoryBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'";
+ ds = oCn.RunProcReturn(sql1, "h_p_Cg_CarTrajectoryBill_BeforeCheckCtrl");
+
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佸師鍥狅細瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCn.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佸師鍥狅細" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ oCn.RollBack();
+ return objJsonResult;
+ }
+
+ // 瀹℃牳鍗曟嵁
+ if (!oBill.CheckBill(HInterID, oBill.omodel.HBillNo, "h_p_Cg_CarTrajectoryBill_AfterCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佸師鍥狅細" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 瀹℃牳鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else // 鍙嶅鏍�
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍革紝涓嶉渶瑕佸弽瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 鍙嶅鏍稿墠鎺у埗
+ string sql1 = "EXEC h_p_Cg_CarTrajectoryBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'";
+ ds = oCn.RunProcReturn(sql1, "h_p_Cg_CarTrajectoryBill_BeforeUnCheckCtrl");
+
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒鍘熷洜锛氬弽瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒鍘熷洜锛�" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 鍙嶅鏍稿崟鎹�
+ if (!oBill.AbandonCheck(HInterID, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒鍘熷洜锛�" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶅鏍告垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ヨ溅杈嗚建杩瑰崟鎹紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杞﹁締杞ㄨ抗鍗曟嵁鍏抽棴/鍙嶅叧闂�
+ /// <summary>
+ /// 鍏抽棴/鍙嶅叧闂溅杈嗚建杩瑰崟鎹�
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">鍏抽棴(1),鍙嶅叧闂�(2)</param>
+ /// <param name="HMaker">鍏抽棴浜�</param>
+ /// <returns></returns>
+ [Route("Cg_CarTrajectoryBill/CloseCg_CarTrajectoryBill")]
+ [HttpGet]
+ public object CloseCg_CarTrajectoryBill(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ // 鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameClose, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍏抽棴/鍙嶅叧闂姛鑳芥潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ // Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴燂紒涓嶈兘杩涜鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍革紒涓嶈兘杩涜鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂紝涓嶈兘鍐嶆鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 鍏抽棴鍗曟嵁
+ if (!oBill.CloseBill(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触锛佸師鍥狅細" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else // 鍙嶅叧闂�
+ {
+ if (oBill.omodel.HCloseMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂紝涓嶉渶瑕佸弽鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 鍙嶅叧闂崟鎹�
+ if (!oBill.CancelClose(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅叧闂け璐ワ紒鍘熷洜锛�" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ヨ溅杈嗚建杩瑰崟鎹紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴鎴栧弽鍏抽棴澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杞﹁締杞ㄨ抗鍗曟嵁浣滃簾/鍙嶄綔搴�
+ /// <summary>
+ /// 浣滃簾/鍙嶄綔搴熻溅杈嗚建杩瑰崟鎹�
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">浣滃簾(1),鍙嶄綔搴�(2)</param>
+ /// <param name="HMaker">浣滃簾浜�</param>
+ /// <returns></returns>
+ [Route("Cg_CarTrajectoryBill/DropCg_CarTrajectoryBill")]
+ [HttpGet]
+ public object DropCg_CarTrajectoryBill(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡浣滃簾/鍙嶄綔搴熷姛鑳芥潈闄愶紝璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ // Type 1 浣滃簾 2 鍙嶄綔搴�
+ if (Type == 1)
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍革紒涓嶈兘杩涜浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴燂紒涓嶈兘鍐嶄綔搴燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 浣滃簾鍓嶆帶鍒�
+ string sql1 = "EXEC h_p_Cg_CarTrajectoryBill_BeforeDropCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'";
+ ds = oCn.RunProcReturn(sql1, "h_p_Cg_CarTrajectoryBill_BeforeDropCtrl");
+
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾澶辫触锛佸師鍥狅細浣滃簾鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCn.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾澶辫触锛佸師鍥狅細" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ oCn.RollBack();
+ return objJsonResult;
+ }
+
+ // 浣滃簾鍗曟嵁
+ if (!oBill.Cancelltion(HInterID, oBill.omodel.HBillNo, "h_p_Cg_CarTrajectoryBill_AfterDropCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触锛佸師鍥狅細" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else // 鍙嶄綔搴�
+ {
+ if (oBill.omodel.HDeleteMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴燂紝涓嶉渶瑕佸弽浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 鍙嶄綔搴熷墠鎺у埗
+ string sql1 = "EXEC h_p_Cg_CarTrajectoryBill_BeforeUnDropCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + HMaker + "'";
+ ds = oCn.RunProcReturn(sql1, "h_p_Cg_CarTrajectoryBill_BeforeUnDropCtrl");
+
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐ワ紒鍘熷洜锛氬弽浣滃簾鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCn.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐ワ紒鍘熷洜锛�" + ds.Tables[0].Rows[0]["HRemark"].ToString();
+ objJsonResult.data = null;
+ oCn.RollBack();
+ return objJsonResult;
+ }
+
+ // 鍙嶄綔搴熷崟鎹�
+ if (!oBill.AbandonCancelltion(HInterID, oBill.omodel.HBillNo, "h_p_Cg_CarTrajectoryBill_AfterUnDropCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐ワ紒鍘熷洜锛�" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶄綔搴熸垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ヨ溅杈嗚建杩瑰崟鎹紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾鎴栧弽浣滃簾澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杞﹁締杞ㄨ抗鍗曟嵁缂栬緫
+ /// <summary>
+ /// 杞﹁締杞ㄨ抗鍗曟嵁缂栬緫鏃讹紝鏍规嵁鍗曟嵁ID鑾峰彇鍗曟嵁淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("Cg_CarTrajectoryBill/EditCg_CarTrajectoryBill")]
+ [HttpGet]
+ public object EditCg_CarTrajectoryBill(Int64 HInterID, string HMaker)
+ {
+ try
+ {
+ // 鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡缂栬緫鏉冮檺锛岃涓庣鐞嗗憳鑱旂郴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ // 杩斿洖缂栬緫淇℃伅
+ ds = oCn.RunProcReturn("SELECT * FROM h_v_Cg_CarTrajectoryBillMainEdit WHERE 鍗曟嵁鍐呯爜 = " + HInterID, "h_v_Cg_CarTrajectoryBillMainEdit");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ヨ溅杈嗚建杩瑰崟鎹紝璇峰埛鏂版暟鎹悗閲嶆柊閫夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖杞﹁締杞ㄨ抗鍗曟嵁淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杞﹁締杞ㄨ抗鍗曟嵁 鏂板
+ [Route("Cg_CarTrajectoryBill/SaveCg_CarTrajectoryBill")]
+ [HttpPost]
+ public object SaveCg_CarTrajectoryBill([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); // 涓昏〃鏁版嵁
+ string msg3 = sArray[1].ToString(); // 瀛愯〃鏁版嵁
+ string refSav = sArray[2].ToString(); // 鎿嶄綔鏂瑰紡锛欰dd娣诲姞 Update淇敼
+ string msg4 = sArray[3].ToString(); // 鐢ㄦ埛鍚�
+
+ DBUtility.ClsPub.CurUserName = msg4;
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+
+ try
+ {
+ // 缂栬緫鏉冮檺妫�鏌�
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameEdit, 3, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsCg_CarTrajectoryBill oBill = new DAL.ClsCg_CarTrajectoryBill();
+ List<Model.ClsCg_CarTrajectoryBillMain> lsmain = new List<Model.ClsCg_CarTrajectoryBillMain>();
+
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
+ lsmain = oListModels.getObjectByJson_ClsCg_CarTrajectoryBillMain(msg2);
+
+ foreach (Model.ClsCg_CarTrajectoryBillMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ // 鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ if (refSav == "Update")
+ {
+ if (BillOld.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ // 鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ if (BillOld.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ UserName = oItem.HMaker; // 鍒跺崟浜�
+ oItem.HBillType = "CT";
+ oItem.HBillSubType = "CT";
+ oItem.HYear = DateTime.Now.Year;
+ oItem.HPeriod = DateTime.Now.Month;
+ oItem.HMakeDate = DateTime.Now;
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ oBill.omodel = oItem;
+ }
+
+ // 琛ㄤ綋鏁版嵁澶勭悊锛堝鏋滈渶瑕侊級
+ if (!string.IsNullOrEmpty(msg3) && msg3 != "[]")
+ {
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", "");
+
+ List<Model.ClsCg_CarTrajectoryBillSub> ls = new List<Model.ClsCg_CarTrajectoryBillSub>();
+ ls = oListModels.getObjectByJson_ClsCg_CarTrajectoryBillSub(msg3);
+
+ int i = 0;
+ foreach (Model.ClsCg_CarTrajectoryBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; // 鍏抽棴绫诲瀷
+ oBill.DetailColl.Add(oItemSub);
+ }
+ }
+
+ // 淇濆瓨鍗曟嵁
+ bool bResult;
+ if (refSav == "Add")
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+
+ if (bResult)
+ {
+ // 鑷姩瀹℃牳璁剧疆
+ if (refSav == "Add")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); // 杩斿洖涓籌D
+
+ //// 绯荤粺鍙傛暟 - 鑷姩瀹℃牳
+ //string sReturn = "";
+ //if (oSystemParameter.ShowBill(ref sReturn) == true)
+ //{
+ // // 杩欓噷闇�瑕佹牴鎹疄闄呯郴缁熷弬鏁伴厤缃�
+ // if (oSystemParameter.omodel.Cg_CarTrajectoryBill_AutoCheck == "Y") // 绯荤粺鍙傛暟 鑷姩瀹℃牳
+ // {
+ // objJsonResult.Verify = "Y";
+ // }
+ // else
+ // {
+ // objJsonResult.Verify = "N";
+ // }
+ //}
+ }
+ else if (refSav == "Update")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); // 杩斿洖涓籌D
+ objJsonResult.Verify = "N";
+ }
+
+ 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/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index c590ab1..87e8be2 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1424,6 +1424,48 @@
}
}
+ /// <summary>
+ /// 鑾峰彇鐢熶骇璧勬簮鍒楄〃涓嬫媺妗�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetSouceList_Select")]
+ [HttpGet]
+ public object GetSouceList_Select(string HMaterID,Int64 HOrgID)
+ {
+ sWhere = " and HStopFlag=0 and HUSEORGID =" + HOrgID + "";
+ try
+ {
+ string sql = "EXEC h_p_Gy_SouceList_PC " + HMaterID + ",'" + sWhere + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_Gy_SouceList_PC");
+
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
/// <summary>
/// 鑾峰彇鑱屽憳鍒楄〃
@@ -20273,6 +20315,54 @@
}
/// <summary>
+ /// 鏍规嵁妫�楠屾柟妗堜富鍐呯爜鑾峰彇妫�楠岄」鐩�,鍓嶉潰鐨勪細鎶婂厛鑾峰彇鐗╂枡鐨勯粯璁よ川妫�鏂规锛孉PP鍙牴鎹楠屾柟妗圛D鑾峰彇瀵瑰簲妫�楠岄」鐩�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetCheckItemByCheckProjectID_Sec")]
+ [HttpGet]
+ public object GetCheckItemByCheckProjectID_Sec(int CheckProjectID, int HBatchQty, int HMaterID, string HBillType)
+ {
+ //if (CheckProjectID <= 0)
+ //{
+ // objjson.code = "0";
+ // objjson.count = 0;
+ // objjson.Message = "妫�楠屾柟妗堟湭閫夋嫨";
+ // objjson.data = null;
+ // return objjson;
+ //}
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ string sql = "exec h_p_Gy_GetQCCheckItemByProject_Sec " + CheckProjectID + "," + HBatchQty + "," + HMaterID + ",'" + HBillType + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_Gy_GetQCCheckItemByProject_Sec");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ /// <summary>
/// 鏍规嵁鍣ㄥ叿涓诲唴鐮佽幏鍙栧櫒鍏蜂繚鍏绘楠岄」鐩�
/// </summary>
/// <returns></returns>
diff --git "a/WebAPI/Controllers/\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 708430f..b818d4d 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"
@@ -207,11 +207,11 @@
if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�")
{
count = new SQLHelper.ClsCN().RunProcReturn("select top 1000 * from h_v_IF_POInStockBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
- sql = string.Format(@"select * from(select top 1000 row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ sql = string.Format(@"select * from(select top 1000 row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
}
else
{
- count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid ", tabname).Tables[0].Rows.Count;
sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
}
break;
@@ -303,6 +303,148 @@
return objJsonResult;
}
#endregion
+
+ #region [閫氳繃婧愬崟绫诲瀷鏌ユ壘涓嶅悓鍗曟嵁淇℃伅] 浣跨敤鏂扮殑鍒嗛〉鏂瑰紡
+ [Route("Sc_BarCode/ReportFromBillList_New")]
+ [HttpGet]
+ public object ReportFromBillList_New(int page, int limit, string sWhere, string HSouceBillType, string HOrgID)
+ {
+ oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ int count = 0;
+ int pageNum = page;
+ int pageSize = limit;
+ string sql = "";
+ string tabname = "";
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ sWhere = " where 1=1 and HOrgID='" + HOrgID + "' ";
+ }
+ else
+ {
+ sWhere = " where 1=1 and HOrgID='" + HOrgID + "' " + sWhere;
+ }
+ switch (HSouceBillType)
+ {
+ case "鐢熶骇璁㈠崟":
+ tabname = "h_v_IFCLD_ICMOBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IFCLD_ICMOBillList_Source " + sWhere + " and 浠诲姟鏁伴噺>isnull(鍏ュ簱鏁伴噺,0) and 鐘舵��<>'缁撴' order by 鍗曟嵁鍙�", tabname).Tables[0].Rows.Count;
+ sql = string.Format($@"select * from h_v_IFCLD_ICMOBillList_Source {sWhere} and 浠诲姟鏁伴噺>isnull(鍏ュ簱鏁伴噺,0) and 鐘舵��<>'缁撴' order by 鍗曟嵁鍙� offset {(pageNum - 1)*pageSize} rows fetch next {pageSize} rows only;");
+ break;
+ case "鐢熶骇姹囨姤鍗�":
+ tabname = "h_v_IF_ICMOReportBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ICMOReportBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_ICMOReportBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ break;
+ case "閲囪喘璁㈠崟":
+ tabname = "h_v_IF_POOrderBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POOrderBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format($@"select * from h_v_IF_POOrderBillList_Source {sWhere} order by 鍗曟嵁鍙� offset {(pageNum - 1)*pageSize} rows fetch next {pageSize} rows only;");
+ break;
+ case "鏀舵枡閫氱煡鍗�":
+ tabname = "h_v_IF_POInStockBillList_Source";
+ if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�")
+ {
+ count = new SQLHelper.ClsCN().RunProcReturn("select top 1000 * from h_v_IF_POInStockBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select * from(select top 1000 row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_POInStockBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ }
+ else
+ {
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POInStockBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid ", tabname).Tables[0].Rows.Count;
+ sql = string.Format($@"select * from h_v_IF_POInStockBillList_Source {sWhere} order by 鍗曟嵁鍙� offset {(pageNum - 1) * pageSize} rows fetch next {pageSize} rows only; ");
+ }
+ break;
+ case "濮斿璁㈠崟":
+ tabname = "h_v_IF_EntrustOrderBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_EntrustOrderBillList_Source " + sWhere + " order by 鍗曟嵁鍙� desc,hsubid", tabname).Tables[0].Rows.Count;
+ sql = string.Format(@"select * from(select row_number() over (order by 鍗曟嵁鍙� desc,hsubid) as HRowNumber,* from h_v_IF_EntrustOrderBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ break;
+ case "鐢熶骇鍏ュ簱鍗�":
+ tabname = "h_v_IF_ProductInBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProductInBillList_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_ProductInBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ break;
+ case "閲囪喘鍏ュ簱鍗�":
+ tabname = "h_v_IF_POStockInBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POStockInBillList_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_POStockInBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ break;
+ case "閿�鍞��璐у崟":
+ tabname = "h_v_IF_SellOutBackBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBackBillList_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_SellOutBackBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ break;
+ case "鐢熶骇閫�鏂欏崟":
+ tabname = "h_v_IF_MateOutBackBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MateOutBackBillList_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_MateOutBackBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ break;
+ case "宸ュ簭娴佽浆鍗�":
+ tabname = "h_v_IF_ProcessExchangeBillList_Source";
+ 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;
+ case "棰嗘枡鍑哄簱鍗�":
+ tabname = "h_v_IF_MateOutBillList_Source";
+ count = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MateOutBillList_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_MateOutBillList_Source " + sWhere + ") as A where HRowNumber >" + pageSize + " *(" + pageNum + "-1)");
+ break;
+ default:
+ break;
+ }
+ ds = new SQLHelper.ClsCN().RunProcReturn(sql, tabname);
+ string aa = ds.Tables[0].Columns[0].ToString();
+ //ds.Tables[0].Columns["hmainid"].ColumnName.ToUpper();
+ //ds.Tables[0].Columns["hsubid"].ColumnName.ToUpper();
+ ds.Tables[0].Columns["hmainid"].ColumnName = "HMainID";
+ ds.Tables[0].Columns["hsubid"].ColumnName = "HSubID";
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = count;
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛棤璧勬簮缁戝畾锛�";
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+ objJsonResult.list = columnNameList;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
#region [閫氳繃鏉＄爜缂栧彿鑾峰彇HItemId]
[Route("Sc_BarCode/Get_HItemId")]
@@ -916,7 +1058,6 @@
string HPOInStockBillNo = ""; // 鏀舵枡閫氱煡鍗曞彿
string HPOOrderBillNo = ""; // 閲囪喘璁㈠崟鍙�
-
DataSet Ds;
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
@@ -927,6 +1068,7 @@
if (ClsPub.isLong(ordrlist[j].HMaterID) != 0)
{
HNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterID);
+ HSupNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HSupNumber);//渚涘簲鍟�
HMaterNumber = DBUtility.ClsPub.isStrNull(ordrlist[j].HMaterNumber);
HBatchNo = ClsPub.isStrNull(ordrlist[j].HBatchNo);
@@ -1082,11 +1224,24 @@
}
else if (CampanyName.Contains("灏忓崼"))
{
- // 灏忓崼鐢靛櫒
- // 鏉＄爜鍓嶇紑 = 鍗曟嵁鍙� + 鐗╂枡缂栫爜 + 鎵规鍙�
- sTMNumber = HPOOrderBillNo + "@" + HMaterNumber + "@" + HBatchNo;
- Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
- LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ if(HSourceBillTypeName== "閲囪喘璁㈠崟")
+ {
+
+ //鏉＄爜瑙勫垯涓猴細鐗╂枡缂栫爜-渚涘簲鍟嗙紪鐮�-鏉ユ枡鎵瑰彿-鏉ユ枡鏁伴噺-閲囪喘璁㈠崟缂栫爜
+ sTMNumber = HMaterNumber + "-" + HSupNumber + "-" + HBatchNo + "-" + HBQty + "-" + HPOInStockBillNo;
+
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ }
+ else
+ {
+ // 灏忓崼鐢靛櫒
+ // 鏉＄爜鍓嶇紑 = 鍗曟嵁鍙� + 鐗╂枡缂栫爜 + 鎵规鍙�
+ sTMNumber = HPOOrderBillNo + "@" + HMaterNumber + "@" + HBatchNo;
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ }
+
}
else //閫氱敤鏂规硶
{
@@ -1285,7 +1440,7 @@
TM = HNumber + "@" + sHMTONo.Replace(" ","") + "@" + HBatchNo.Replace(" ","") + "@" + sHQty;
}
}
-
+
barcode.HBarCode2 = TM;
barcode.HEntryID2 = ClsPub.isStrNull(j + 1);
barcode.HMaterID2 = ordrlist[j].HMaterID;
@@ -1426,6 +1581,7 @@
{
HBarCode = HBarCode + ClsPub.isStrNull(ListRows[i].HMTONo2);
}
+
//
HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
HEntryID = ClsPub.isLong(ListRows[i].HEntryID2);
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
index 7b3048d..76494a9 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\350\260\203\346\213\250\347\233\230\347\202\271/Kf_MoveStockRequestBillController.cs"
@@ -415,6 +415,68 @@
}
}
+ #region 璋冩嫧鐢宠鍗� - 鎵樻暟鍙樻洿鍔熻兘
+ [Route("Kf_MoveStockRequestBill/UpdatePallet")]
+ [HttpPost]
+ public object UpdatePallet([FromBody] JObject data)
+ {
+ try
+ {
+ long hmainid = data["hmainid"]?.ToObject<long>() ?? 0;
+ int newPallet = data["newPallet"]?.ToObject<int>() ?? 0;
+ string operatorName = data["operator"]?.ToString() ?? "";
+
+ if (hmainid <= 0)
+ return new { code = "0", count = 0, Message = "鍗曟嵁ID涓嶈兘涓虹┖锛�" };
+
+ if (newPallet <= 0)
+ return new { code = "0", count = 0, Message = "鎵樻暟蹇呴』澶т簬0锛�" };
+
+
+ string checkAuditSql = $@"
+ SELECT COUNT(*) as HasAudit
+ FROM Kf_MoveStockRequestBillMain
+ WHERE HInterID = {hmainid}
+ AND HChecker IS NOT NULL
+ AND HCheckDate IS NOT NULL";
+
+ DataSet dsAudit = oCn.RunProcReturn(checkAuditSql, "CheckAudit");
+
+ if (dsAudit != null && dsAudit.Tables[0].Rows.Count > 0)
+ {
+ int hasAudit = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HasAudit"]);
+ if (hasAudit > 0)
+ {
+ return new { code = "0", count = 0, Message = "鍗曟嵁宸插鏍革紝涓嶈兘淇敼鎵樻暟锛�" };
+ }
+ }
+
+ string updateSql = $@"
+ UPDATE Kf_MoveStockRequestBillMain
+ SET HPackQtys = {newPallet}
+ WHERE HInterID = {hmainid}";
+
+ oCn.RunProc(updateSql); // 鐩存帴璋冪敤锛屼笉璧嬪�肩粰鍙橀噺
+
+ return new
+ {
+ code = "1",
+ count = 1,
+ Message = "鎵樻暟淇敼鎴愬姛锛�"
+ };
+ }
+ catch (Exception e)
+ {
+ return new
+ {
+ code = "0",
+ count = 0,
+ Message = "淇敼澶辫触锛�" + e.Message
+ };
+ }
+ }
+ #endregion
+
#region 璋冩嫧鐢宠鍗� 瀹℃牳/鍙嶅鏍�
/// <summary>
///
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StockOutRequestBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StockOutRequestBillController.cs"
index 736ed46..aef9728 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StockOutRequestBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_StockOutRequestBillController.cs"
@@ -304,6 +304,69 @@
#endregion
+ #region 鍑哄簱鐢宠鍗� - 鎵樻暟鍙樻洿鍔熻兘
+ [Route("Kf_StockOutRequestBill/UpdatePallet")]
+ [HttpPost]
+ public object UpdatePallet([FromBody] JObject data)
+ {
+ try
+ {
+ long hmainid = data["hmainid"]?.ToObject<long>() ?? 0;
+ int newPallet = data["newPallet"]?.ToObject<int>() ?? 0;
+ string operatorName = data["operator"]?.ToString() ?? "";
+
+ if (hmainid <= 0)
+ return new { code = "0", count = 0, Message = "鍗曟嵁ID涓嶈兘涓虹┖锛�" };
+
+ if (newPallet <= 0)
+ return new { code = "0", count = 0, Message = "鎵樻暟蹇呴』澶т簬0锛�" };
+
+ // 妫�鏌ユ槸鍚﹀凡瀹℃牳 - 鏀逛负妫�鏌ュ嚭搴撶敵璇峰崟涓昏〃
+ string checkAuditSql = $@"
+ SELECT COUNT(*) as HasAudit
+ FROM Kf_StockOutRequestBillMain
+ WHERE HInterID = {hmainid}
+ AND HChecker IS NOT NULL
+ AND HCheckDate IS NOT NULL";
+
+ DataSet dsAudit = oCn.RunProcReturn(checkAuditSql, "CheckAudit");
+
+ if (dsAudit != null && dsAudit.Tables[0].Rows.Count > 0)
+ {
+ int hasAudit = Convert.ToInt32(dsAudit.Tables[0].Rows[0]["HasAudit"]);
+ if (hasAudit > 0)
+ {
+ return new { code = "0", count = 0, Message = "鍗曟嵁宸插鏍革紝涓嶈兘淇敼鎵樻暟锛�" };
+ }
+ }
+
+ // 鐩存帴鏇存柊鎵樻暟 - 鏀逛负鏇存柊鍑哄簱鐢宠鍗曚富琛�
+ string updateSql = $@"
+ UPDATE Kf_StockOutRequestBillMain
+ SET HPackQtys = {newPallet}
+ WHERE HInterID = {hmainid}";
+
+ oCn.RunProc(updateSql); // 鐩存帴璋冪敤锛屼笉璧嬪�肩粰鍙橀噺
+
+ return new
+ {
+ code = "1",
+ count = 1,
+ Message = "鎵樻暟淇敼鎴愬姛锛�"
+ };
+ }
+ catch (Exception e)
+ {
+ return new
+ {
+ code = "0",
+ count = 0,
+ Message = "淇敼澶辫触锛�" + e.Message
+ };
+ }
+ }
+ #endregion
+
#region 鍑哄簱鐢宠鍗曞垪琛�
[Route("Kf_StockOutRequestBill/cx")]
[HttpGet]
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
index 3745706..dfc0236 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBillController.cs"
@@ -892,6 +892,8 @@
BillNew.omodel.HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
BillNew.omodel.HTakeSampleCheckBillID = ClsPub.isLong(mainList[0].HTakeSampleCheckBillID);
BillNew.omodel.HTakeSampleCheckBillNo = ClsPub.isStrNull(mainList[0].HTakeSampleCheckBillNo);
+ BillNew.omodel.HCheckQty = ClsPub.isLong(mainList[0].HCheckQty);
+
List<Model.ClsQC_ProcessCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_ProcessCheckBillSub>>(msg3);
BillNew.DetailColl = new List<Model.ClsQC_ProcessCheckBillSub>();
for (int i = 0; i < subList.ToArray().Length; i++)
@@ -941,6 +943,7 @@
oSub.HInspectMethodID = DBUtility.ClsPub.isLong(subList[i].HInspectMethodID);//妫�楠屾柟娉�
oSub.HInspectBasisID = DBUtility.ClsPub.isLong(subList[i].HInspectBasisID);//妫�楠屼緷鎹�
oSub.HCompareSymbol = DBUtility.ClsPub.isStrNull(subList[i].HCompareSymbol);//姣旇緝绗�
+ oSub.HInspectValQ = subList[i].HInspectValQ;
BillNew.DetailColl.Add(oSub);
}
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
index 4e7f4fe..3e43e2c 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_QualityReportsController.cs"
@@ -2423,9 +2423,10 @@
string HNumber = dic["HNumber"].ToString();
string HName = dic["HName"].ToString();
string HDayWarning = dic["HDayWarning"].ToString();
-
+ string HMouldClass = dic["HMouldClass"].ToString();
- ds = oCN.RunProcReturn("exec h_p_Gy_InspectWarningReport '" + HNumber + "','" + HName + "','" + HDayWarning + "','"+ HOrgID + "'", "h_p_Gy_InspectWarningReport");
+
+ ds = oCN.RunProcReturn("exec h_p_Gy_InspectWarningReport '" + HNumber + "','" + HName + "','" + HDayWarning + "','" + HMouldClass + "','" + HOrgID + "'", "h_p_Gy_InspectWarningReport");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
index c54127d..7d830b6 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
@@ -327,6 +327,9 @@
BillNew.omodel.HTakeSampleCheckBillID = ClsPub.isLong(mainList[0].HTakeSampleCheckBillID);
BillNew.omodel.HTakeSampleCheckBillNo = ClsPub.isStrNull(mainList[0].HTakeSampleCheckBillNo);
BillNew.omodel.HRemarkSN = mainList[0].HRemarkSN;
+ BillNew.omodel.HCheckQty = mainList[0].HCheckQty;
+
+
List<Model.ClsQC_FirstPieceCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillSub>>(msg3);
BillNew.DetailColl = new List<Model.ClsQC_FirstPieceCheckBillSub>();
for (int i = 0; i < subList.ToArray().Length; i++)
@@ -379,6 +382,7 @@
oSub.HInspectBasisID = DBUtility.ClsPub.isLong(subList[i].HInspectBasisID);//
oSub.HCompareSymbol = DBUtility.ClsPub.isStrNull(subList[i].HCompareSymbol);//
+ oSub.HInspectValQ = DBUtility.ClsPub.isLong(subList[i].HInspectValQ);
BillNew.DetailColl.Add(oSub);
}
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarController.cs"
index 2f06ac1..6180a18 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarController.cs"
@@ -93,7 +93,7 @@
#region 杞﹁締鍒楄〃-鍒嗛〉
[Route("Gy_Car/list_byPage")]
[HttpGet]
- public object GetSourceList_byPage(string sWhere, string user, int page, int size)
+ public object GetCarList_byPage(string sWhere, string user, int page, int size)
{
try
{
@@ -127,9 +127,19 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
+ if(ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+
objJsonResult.code = "1";
- objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
- objJsonResult.Message = "Sucess锛�";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
objJsonResult.list = columnNameList;
objJsonResult.data = ds.Tables[0];
return objJsonResult;
@@ -329,6 +339,7 @@
}
else
{
+ oBill.oModel.HModifyEmp = msg2;
bResult = oBill.ModifyByID(oBill.oModel.HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
}
if (bResult)
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs"
index 0757f38..a85b288 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/MouldController.cs"
@@ -1993,6 +1993,63 @@
#endregion
+ #region 婧愬崟鏉＄爜澶勭悊鏂瑰紡
+ #region 鍣ㄥ叿棰嗙敤鍗� 鎵弿婧愬崟鏉＄爜
+
+ /// <summary>
+ /// 鍣ㄥ叿棰嗙敤鍗� 鎵弿婧愬崟鏉＄爜
+ /// </summary>
+ /// <returns></returns>
+ [Route("MouldController/Get_SourceBarCode_ProdOut_Json")]
+ [HttpGet]
+ public object get_SourceBarCode_ProdOut_Json(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Int64 HStockOrgID)
+ {
+ try
+ {
+ //灏嗘簮鍗曚俊鎭瓨鍏ユ潯鐮佸嚭鍏ュ簱涓存椂琛�
+ DataSet ds1 = oCn.RunProcReturn("exec h_p_WMS_AddMouldBarCode_ProdOut " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + 0 + ",'" + HMaker + "'," + 0 + "," + HStockOrgID.ToString(), "h_p_WMS_AddMouldBarCode_ProdOut");
+ if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛涘皢婧愬崟淇℃伅瀛樺叆鏉＄爜鍑哄叆搴撲复鏃惰〃澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0][0]) == 0)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = ds1.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛�" + DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿婧愬崟鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+ #endregion
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 bb34737..c050db8 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"
@@ -8321,11 +8321,7 @@
#endregion
#region 鐢熶骇缁勬墭鍗曟ā鍧� 鎵弿瀹㈡埛绠憋紙鎵橈級鏉＄爜 -鍑礉瑁呯鍗� 20251103
-
- /// <summary>
- /// 鐢熶骇缁勬墭鍗曟ā鍧� 鎵弿绠憋紙鎵橈級鏉＄爜
- /// </summary>
- /// <returns></returns>
+
[Route("WEBSController/Get_PackBarCode_PackUnionBill_New_Json_Cus")]
[HttpGet]
public object Get_PackBarCode_PackUnionBill_New_Json_Cus(Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack, string HSourceBillNo)
@@ -13361,11 +13357,11 @@
/// <returns></returns>
[Route("WEBSController/BindCarAndWH")]
[HttpGet]
- public object BindCarAndWH( string HMaker, Int64 HWhID, Int64 HSPID, string HCarBarCode, Int64 HStockOrgID)
+ public object BindCarAndWH( string HMaker, Int64 HWhID, Int64 HSPID, string HCarBarCode, Int64 HStockOrgID,int bindsignal)
{
try
{
- ds = oCn.RunProcReturn("exec h_p_bindingCarintoWh " + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HCarBarCode + "','" + HMaker+ "'," + HStockOrgID.ToString(), "h_p_bindingCarintoWh");
+ ds = oCn.RunProcReturn("exec h_p_bindingCarintoWh " + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HCarBarCode + "','" + HMaker+ "'," + HStockOrgID.ToString()+","+ bindsignal, "h_p_bindingCarintoWh");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -13405,7 +13401,8 @@
}
#endregion
- //杞Щ妯″潡
+ #region 杞Щ妯″潡
+ // 杞Щ妯″潡
[Route("WEBSController/CheckHW")]
[HttpGet]
public object CheckHW(int HWhID,int HSPID,int HWhID2,int HSPID2,string HBarCode,string HCarBarCode1,string HCarBarCode2,string UserID)
@@ -13450,8 +13447,9 @@
return objJsonResult;
}
}
+ #endregion
- #region 鎯犲悍 鐢熶骇棰嗘枡鍗曟牎楠� 鎵弿婧愬崟 鑾峰彇鐢熶骇棰嗘枡鍗曞拰涓嬫父棰嗘枡鍗曟湭瀹℃牳 鍗曟嵁
+ #region 鎯犲悍 鐢熶骇棰嗘枡鍗曟牎楠� 鎵弿婧愬崟 鑾峰彇鐢熶骇棰嗘枡鍗曞拰涓嬫父棰嗘枡鍗曟湭瀹℃牳 鍗曟嵁
[Route("WEBSController/get_BillBarCode_BillCheck_Json_MateOut_HuiKang")]
[HttpGet]
public Object get_BillBarCode_BillCheck_Json_MateOut_HuiKang(string HBillNo, string HBillType, string HMaker, Int64 HStockOrgID)
@@ -13563,5 +13561,117 @@
#endregion
+ #region 妫�楠屽崟 鎵弿婧愬崟 鏍规嵁鍗曟嵁绫诲瀷 婧愬崟绫诲瀷 婧愬崟鍙� 瑙ｆ瀽骞惰繑鍥炴楠岄」鐩�
+ [Route("WEBSController/get_CheckBillBarCode_Json_CheckItem")]
+ [HttpGet]
+ public Object get_CheckBillBarCode_Json_CheckItem(int HBillType, int HSourceBillType, string HBarCode, string HInterID, string HEntryID, int Mode)
+ {
+ try
+ {
+ // Mode = 1 琛ㄧず 鎵爜妯″紡 Mode = 2 琛ㄧず 閫夊崟妯″紡
+ if(Mode == 1)
+ {
+ //鎵爜妯″紡闇�瑕佽В鏋愭潯鐮佽幏鍙朒InterID鍜孒EntryID
+ ds = oCn.RunProcReturn($@"
+ exec h_p_CheckBillBarCode_AnalysisBarcode
+ @HBillType={HBillType},
+ @HSourceBillType={HSourceBillType},
+ @HBarCode={HBarCode}
+ ", "h_p_CheckBillBarCode_AnalysisBarcode");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鍗曟嵁鏉＄爜澶辫触锛佹潯鐮佽В鏋愬け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ HInterID = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ HEntryID = ds.Tables[0].Rows[0]["HEntryID"].ToString();
+ }
+ // 閫夊崟妯″紡鐩存帴閫掑叆HInterID 鍜� HEntryID 鏍规嵁 鍙栬川妫�鏂规鏉ユ簮 鑾峰彇 妫�楠岄」鐩�
+ ds = oCn.RunProcReturn($@"
+ exec h_p_CheckBillBarCode_CheckItem
+ @HBillType={HBillType},
+ @HSourceBillType={HSourceBillType},
+ @HInterID={HInterID},
+ @HEntryID={HEntryID}
+ ", "h_p_CheckBillBarCode_CheckItem");
+
+ if(ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鍗曟嵁鏉＄爜澶辫触锛佹棤缁戝畾璐ㄦ鏂规淇℃伅";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "success锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鍗曟嵁鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍑礉 瑁呯鍗曟壂鎻忕鏉＄爜鏌ヨ鏄惁鍦ㄥ鎴锋潯鐮佹。妗堬紝涓嶅湪灏辫В鏋愪繚瀛樺鎴锋潯鐮佹。妗堣〃
+
+ [Route("WEBSController/GetHBarCode_CusJX")]
+ [HttpGet]
+ public object GetHBarCode_CusJX(Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack, string HSourceBillNo)
+ {
+ try
+ {
+
+ ds = oCn.RunProcReturn("exec h_p_WMS_AddPackBarCode_PackUnionBill_New_CusJX " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "','" + HSourceBillNo + "'", "h_p_WMS_AddPackBarCode_PackUnionBill_New_CusJX");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿绠便�佹墭鏉＄爜鍙戠敓閿欒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎻掑叆瀹㈡埛鏉＄爜妗ｆ琛ㄥけ璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
}
}
diff --git a/WebAPI/DLL/ClsGy_Material_Ctl.cs b/WebAPI/DLL/ClsGy_Material_Ctl.cs
index 3e64a6d..2b8e64c 100644
--- a/WebAPI/DLL/ClsGy_Material_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_Material_Ctl.cs
@@ -128,7 +128,7 @@
",HPieceMaxQty,HCommonUseFlag,HAvgStockPrice,HFootPrice,HTaxCost,HNoTaxCost" +
",HLength,HWidth,HHeight,HJQty,HPlanMode,HUseFlag,HMakeTime,HCHECKINCOMING,HAuxPropFlag" +
", HISKFPERIOD, HEXPUNIT, HEXPPERIOD, HAuxUnitID, HSNUnitID, HBASEUNITID, HSALEUNITID" +
- ", HSALEPRICEUNITID, HPERUNITSTANDHOUR, HSTDLABORPREPARETIME, HSTDMACHINEPREPARETIME, HMASTERID,HQtyDec,HPriceDec,HMoneyDec,HMinPOQty" +
+ ", HSALEPRICEUNITID, HPERUNITSTANDHOUR, HSTDLABORPREPARETIME, HSTDMACHINEPREPARETIME, HMASTERID,HQtyDec,HPriceDec,HMoneyDec,HMinPOQty,HMaterColor,HMidBoxSize,HVolume" +
",HWeight,HColor,HMaxPOQty,HSubjoin,HEngName) " +
" Values('" + oModel.HItemID + "','" + 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 + "'" +
@@ -141,7 +141,7 @@
oModel.HPieceMaxQty.ToString() + "','" + oModel.HCommonUseFlag.ToString() + "','" + oModel.HAvgStockPrice.ToString() + "','" + oModel.HFootPrice.ToString() + "','" + oModel.HTaxCost.ToString() + "','" + oModel.HNoTaxCost.ToString() + "',"+
oModel.HLength.ToString() + "," +oModel.HWidth.ToString() + "," + oModel.HHeight.ToString() + "," + oModel.HJQty.ToString() + "," + oModel.HPlanMode.ToString() + ",'" + oModel.HUseFlag.ToString() + "','" + oModel.HMakeTime.ToString() + "'," + oModel.HCHECKINCOMING.ToString() + "," + oModel.HAuxPropFlag.ToString() + ","+
oModel.HISKFPERIOD.ToString() + ",'" + oModel.HEXPUNIT.ToString() + "'," + oModel.HEXPPERIOD.ToString() + "," + oModel.HAuxUnitID.ToString() + "," + oModel.HSNUnitID.ToString() + "," + oModel.HBASEUNITID.ToString() + "," + oModel.HSALEUNITID.ToString() + ","+
- oModel.HSALEPRICEUNITID.ToString() + "," + oModel.HPERUNITSTANDHOUR.ToString() + "," + oModel.HSTDLABORPREPARETIME.ToString() + "," + oModel.HSTDMACHINEPREPARETIME.ToString() + "," + oModel.HMASTERID.ToString() + ",'" + oModel.HQtyDec + "','" + oModel.HPriceDec + "','" + oModel.HMoneyDec +"','"+ oModel.HMinPOQty + "'" +
+ oModel.HSALEPRICEUNITID.ToString() + "," + oModel.HPERUNITSTANDHOUR.ToString() + "," + oModel.HSTDLABORPREPARETIME.ToString() + "," + oModel.HSTDMACHINEPREPARETIME.ToString() + "," + oModel.HMASTERID.ToString() + ",'" + oModel.HQtyDec + "','" + oModel.HPriceDec + "','" + oModel.HMoneyDec +"','"+ oModel.HMinPOQty + "','" + oModel.HMaterColor + "','"+ oModel.HMidBoxSize + "','" + oModel.HVolume + "'"+
",'" + oModel.HWeight + "','" + oModel.HColor + "','" + oModel.HMaxPOQty + "','" + oModel.HSubjoin + "','" + oModel.HEngName + "')", ref DBUtility.ClsPub.sExeReturnInfo);
sql = "set identity_insert gy_material off";
oCn.RunProc(sql);
diff --git a/WebAPI/InvokeHelper.cs b/WebAPI/InvokeHelper.cs
index 35b5972..e919122 100644
--- a/WebAPI/InvokeHelper.cs
+++ b/WebAPI/InvokeHelper.cs
@@ -229,6 +229,24 @@
}
/// <summary>
+ /// 鏌ヨ
+ /// </summary>
+ /// <param name="formId"></param>
+ /// <param name="content"></param>
+ /// <returns></returns>
+ public static string ExecuteBillQuery(string formId, string content)
+ {
+ HttpClient httpClient = new HttpClient();
+ httpClient.Url = string.Concat(CloudUrl, "Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc");
+
+ List<object> Parameters = new List<object>();
+ //Json瀛椾覆
+ Parameters.Add(content);
+ httpClient.Content = JsonConvert.SerializeObject(Parameters);
+ return httpClient.SyncRequest();
+ }
+
+ /// <summary>
/// 闄勪欢涓婁紶
/// </summary>
/// <param name="formId"></param>
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index ddfa10a..f9f6120 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -4746,6 +4746,33 @@
}
#endregion
+ #region 杞﹁締杞ㄨ抗鍗曟嵁
+ /// <summary>
+ /// 杞﹁締杞ㄨ抗鍗曟嵁涓昏〃json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsCg_CarTrajectoryBillMain> getObjectByJson_ClsCg_CarTrajectoryBillMain(string jsonString)
+ {
+ // 鎸夌収鎮ㄧ殑妯″紡锛屾坊鍔犳柟鎷彿鍖呰
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsCg_CarTrajectoryBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_CarTrajectoryBillMain>>(jsonString);
+ return list;
+ }
+ /// <summary>
+ /// 杞﹁締杞ㄨ抗鍗曟嵁瀛愯〃json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsCg_CarTrajectoryBillSub> getObjectByJson_ClsCg_CarTrajectoryBillSub(string jsonString)
+ {
+ // 鎸夌収鎮ㄧ殑妯″紡锛屾坊鍔犳柟鎷彿鍖呰
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsCg_CarTrajectoryBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_CarTrajectoryBillSub>>(jsonString);
+ return list;
+ }
+ #endregion
+
#region 鎺掍骇閿佸畾鐢宠鍗�
/// <summary>
/// 鎺掍骇閿佸畾鐢宠鍗曚富琛╦son
@@ -5244,5 +5271,42 @@
List<ClsWW_EntrustOrderBillMain_1> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsWW_EntrustOrderBillMain_1>>(jsonString);
return list;
}
+
+ /// <summary>
+ /// 杩愬崟鐢宠 涓昏〃
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<ClsCg_OrderTransportBill_Model> getObjectByJson_Cg_OrderTransportBill(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<ClsCg_OrderTransportBill_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_OrderTransportBill_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 杩愬崟鐢宠 瀛愯〃
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<ClsCg_OrderTransportBillSub_Model> getObjectByJson_Cg_OrderTransportBill_Sub(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<ClsCg_OrderTransportBillSub_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_OrderTransportBillSub_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 杩愬崟鐢宠 瀛愯〃 Money
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<ClsCg_OrderTransportBillSub_Money_Model> getObjectByJson_Cg_OrderTransportBill_SubMoney(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<ClsCg_OrderTransportBillSub_Money_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_OrderTransportBillSub_Money_Model>>(jsonString);
+ return list;
+ }
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs
index 8198210..5288163 100644
--- a/WebAPI/Models/ClsGy_Material_Model.cs
+++ b/WebAPI/Models/ClsGy_Material_Model.cs
@@ -119,9 +119,13 @@
public string HMaterRuleExternType; // 缇婃瘺鍏紡
public string HMaterRuleExternType1; // 姣涘皷鍏紡
public string HCircularKnittingMachineCode; //鍦嗘満浠ｇ爜
-
+ //灏忓崼鑷畾涔�
public int HMinPOQty;//绠辫
public int HMaxPOQty;//鎵樿
+ public string HMaterColor;//鎵樿
+ public string HMidBoxSize;//鎵樿
+ public string HVolume;//鎵樿
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
index c9d7cf9..28a7ac1 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <DeleteExistingFiles>False</DeleteExistingFiles>
+ <DeleteExistingFiles>True</DeleteExistingFiles>
<ExcludeApp_Data>False</ExcludeApp_Data>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 065c823..149ef9b 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,17 +4,12 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
-<<<<<<< HEAD
<_PublishTargetUrl>D:\gz\缃戠珯鍙戝竷\MES-WEB-TM</_PublishTargetUrl>
- <History>True|2025-12-15T12:54:35.4097653Z;False|2025-12-15T20:54:11.9143310+08:00;True|2025-12-14T20:32:04.6394297+08:00;True|2025-12-14T16:47:12.2506996+08:00;True|2025-12-14T16:36:24.9330433+08:00;True|2025-12-14T16:35:52.7170086+08:00;True|2025-12-14T15:41:29.5073257+08:00;False|2025-12-14T15:40:14.4411682+08:00;False|2025-12-14T15:40:01.5301775+08:00;True|2025-12-14T15:34:54.5721570+08:00;False|2025-12-14T15:34:32.2986292+08:00;True|2025-12-12T15:50:59.4494145+08:00;True|2025-12-12T15:30:08.5999630+08:00;True|2025-12-12T15:29:37.6355016+08:00;True|2025-12-12T15:26:36.0975578+08:00;True|2025-12-12T15:23:12.7761112+08:00;False|2025-12-12T15:22:34.8984757+08:00;False|2025-12-12T15:22:22.9133736+08:00;True|2025-12-12T15:11:12.9177962+08:00;True|2025-12-12T14:49:32.3142678+08:00;True|2025-12-12T14:40:41.8407994+08:00;True|2025-12-12T09:18:25.3621132+08:00;True|2025-12-12T08:29:40.4938122+08:00;True|2025-12-12T08:26:45.2254936+08:00;True|2025-12-12T08:26:21.5016790+08:00;True|2025-12-12T08:26:11.7352963+08:00;False|2025-12-12T08:25:19.2974589+08:00;True|2025-12-09T08:45:50.1203655+08:00;True|2025-12-09T08:21:11.0727775+08:00;</History>
-=======
- <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2025-12-16T08:19:15.9939619Z;True|2025-12-16T16:11:21.5317233+08:00;False|2025-12-16T16:09:03.3480811+08:00;True|2025-12-15T15:52:23.2171057+08:00;False|2025-12-15T15:47:38.0568890+08:00;True|2025-12-10T17:20:39.5982655+08:00;False|2025-12-10T17:17:43.4541161+08:00;True|2025-09-18T10:41:20.2798392+08:00;False|2025-09-18T10:39:06.5228618+08:00;True|2025-09-18T09:52:57.6301177+08:00;False|2025-09-18T09:52:47.3037996+08:00;True|2025-09-17T17:05:24.5224152+08:00;False|2025-09-17T17:04:58.8883167+08:00;True|2025-09-17T11:00:50.8000254+08:00;False|2025-09-17T11:00:40.1836384+08:00;True|2025-09-10T08:26:46.9605753+08:00;False|2025-09-10T08:26:40.3385273+08:00;True|2025-09-09T15:25:39.9311084+08:00;True|2025-09-09T13:03:12.0756515+08:00;True|2025-09-09T12:56:09.8729182+08:00;True|2025-09-09T10:51:18.6323732+08:00;True|2025-09-09T10:39:52.6011470+08:00;False|2025-09-09T10:33:53.8003825+08:00;True|2025-09-05T13:47:08.0944867+08:00;False|2025-09-05T13:46:12.5485302+08:00;True|2025-09-04T13:48:02.8051977+08:00;False|2025-09-04T13:47:53.2802035+08:00;True|2025-09-03T18:39:26.1332777+08:00;True|2025-09-03T18:20:22.4934269+08:00;False|2025-09-03T18:20:13.8667227+08:00;True|2025-09-02T16:12:00.2274762+08:00;True|2025-09-02T15:35:26.3909085+08:00;False|2025-09-02T15:35:09.4393740+08:00;True|2025-09-01T08:47:17.0454342+08:00;False|2025-09-01T08:45:40.7879170+08:00;True|2025-08-29T15:54:08.5149695+08:00;True|2025-08-29T09:22:35.2179291+08:00;False|2025-08-29T09:22:27.4927662+08:00;True|2025-08-26T14:46:50.1212861+08:00;True|2025-08-26T14:40:54.1072746+08:00;True|2025-08-26T14:37:14.2139355+08:00;True|2025-08-26T12:01:11.1189796+08:00;True|2025-08-26T11:54:47.2021440+08:00;True|2025-08-26T11:49:47.5991764+08:00;True|2025-08-26T11:33:02.0942557+08:00;False|2025-08-26T11:32:54.2592669+08:00;True|2025-08-25T11:49:31.4870909+08:00;False|2025-08-25T11:49:24.9199834+08:00;True|2025-08-23T10:40:03.4354114+08:00;True|2025-08-23T10:00:38.3940426+08:00;False|2025-08-23T10:00:29.6119379+08:00;False|2025-08-22T22:57:21.2783621+08:00;True|2025-08-22T17:22:26.6012072+08:00;True|2025-08-22T16:57:41.8592690+08:00;False|2025-08-22T16:57:30.5555900+08:00;True|2025-08-19T17:11:59.8763854+08:00;False|2025-08-19T17:11:47.8353587+08:00;True|2025-08-19T16:19:06.3815378+08:00;False|2025-08-19T16:18:53.7096338+08:00;True|2025-08-18T13:19:25.9723571+08:00;False|2025-08-18T13:16:01.4105292+08:00;True|2025-08-16T00:13:21.9700042+08:00;False|2025-08-16T00:11:33.3863026+08:00;True|2025-08-15T23:08:34.0110238+08:00;False|2025-08-15T23:06:21.6309395+08:00;True|2025-08-07T17:19:57.6386527+08:00;False|2025-08-07T17:17:34.5522859+08:00;True|2025-07-29T15:53:42.7268834+08:00;False|2025-07-29T15:51:20.7915637+08:00;True|2025-07-26T12:55:43.4400544+08:00;False|2025-07-26T12:53:36.0616448+08:00;True|2025-07-25T18:25:41.8239453+08:00;True|2025-07-25T18:01:10.6254788+08:00;True|2025-07-25T14:28:52.8690060+08:00;False|2025-07-25T14:13:46.4148339+08:00;True|2025-07-16T15:43:25.2534569+08:00;True|2025-07-16T15:24:52.9969412+08:00;False|2025-07-16T15:22:55.3654100+08:00;True|2025-07-15T17:05:36.6478560+08:00;False|2025-07-15T17:02:17.4260705+08:00;True|2025-07-14T13:52:18.8459994+08:00;True|2025-07-14T13:48:19.0105537+08:00;False|2025-07-14T13:46:49.4038358+08:00;False|2025-07-10T14:16:35.2809623+08:00;False|2025-07-10T14:14:51.7758457+08:00;False|2025-07-10T14:14:36.5501099+08:00;False|2025-07-10T14:14:02.2363862+08:00;True|2025-07-07T18:50:30.7867050+08:00;False|2025-07-07T18:47:15.6387529+08:00;False|2025-06-30T15:14:55.9800245+08:00;True|2025-06-24T13:14:17.3173717+08:00;True|2025-06-24T13:10:46.7305152+08:00;True|2025-06-24T13:07:14.9336201+08:00;True|2025-06-24T11:17:29.1465402+08:00;True|2025-06-24T11:05:06.9843355+08:00;False|2025-06-24T11:05:00.5024005+08:00;True|2025-06-23T14:48:15.1693047+08:00;True|2025-06-23T14:45:12.4631189+08:00;True|2025-06-23T14:33:08.3987412+08:00;False|2025-06-23T14:33:02.8486336+08:00;True|2025-06-23T10:11:37.1688411+08:00;False|2025-06-23T10:10:19.3935582+08:00;True|2025-06-17T08:06:56.2515052+08:00;True|2025-06-17T08:03:40.1954689+08:00;False|2025-06-17T08:03:33.0012043+08:00;True|2025-06-16T17:04:54.4138980+08:00;True|2025-06-16T16:59:05.9331013+08:00;True|2025-06-16T16:51:47.5631962+08:00;True|2025-06-16T15:17:39.2922900+08:00;True|2025-06-16T10:38:18.3048926+08:00;False|2025-06-16T10:37:59.4675787+08:00;True|2025-06-13T09:01:17.9321837+08:00;False|2025-06-13T08:59:04.5979301+08:00;False|2025-06-13T08:59:01.9805490+08:00;True|2025-06-13T08:56:29.5270273+08:00;False|2025-06-13T08:53:18.9572756+08:00;False|2025-06-13T08:53:06.3695780+08:00;False|2025-06-13T08:53:01.9064985+08:00;True|2025-06-13T08:49:41.5192055+08:00;True|2025-06-13T08:45:33.7544056+08:00;True|2025-06-13T08:40:40.7377156+08:00;False|2025-06-13T08:39:06.9984945+08:00;False|2025-06-13T08:38:53.7654421+08:00;True|2025-06-13T08:36:54.1958073+08:00;True|2025-06-13T08:28:46.2608858+08:00;True|2025-06-13T08:21:30.1336656+08:00;False|2025-06-13T08:20:51.0814327+08:00;True|2025-06-12T16:52:14.0135723+08:00;True|2025-06-12T16:43:42.1233335+08:00;True|2025-06-12T16:32:50.7737857+08:00;True|2025-06-12T16:30:35.2094777+08:00;True|2025-06-12T16:29:17.1397493+08:00;True|2025-06-12T14:09:13.4515329+08:00;False|2025-06-12T14:07:40.0063885+08:00;True|2024-08-16T09:32:12.4453203+08:00;True|2024-08-15T17:00:45.6076539+08:00;True|2024-08-15T16:56:11.0376497+08:00;True|2024-08-15T15:20:25.6712652+08:00;True|2024-08-12T15:39:44.2226127+08:00;True|2024-08-12T09:16:29.1745128+08:00;True|2024-08-08T10:31:58.5649180+08:00;True|2024-08-08T08:15:09.1193918+08:00;False|2024-08-08T08:14:02.5199272+08:00;True|2024-08-01T09:43:43.6784774+08:00;True|2024-08-01T09:40:02.4079567+08:00;True|2024-08-01T09:35:04.9124938+08:00;True|2024-08-01T08:28:31.1169790+08:00;True|2024-07-31T16:28:57.1998735+08:00;True|2024-07-31T15:45:55.8662513+08:00;True|2024-07-31T14:26:15.2233690+08:00;True|2024-07-31T14:21:11.7562937+08:00;True|2024-07-31T14:17:38.4767888+08:00;True|2024-07-30T14:54:15.0857651+08:00;True|2024-07-30T10:36:44.3196154+08:00;True|2024-07-30T10:33:47.9939196+08:00;True|2024-07-30T08:24:50.6533897+08:00;True|2024-07-30T08:14:40.6316443+08:00;True|2024-07-29T16:45:55.2924546+08:00;True|2024-07-29T14:38:29.4404460+08:00;True|2024-07-29T14:30:16.8621054+08:00;True|2024-07-29T10:35:00.7076482+08:00;True|2024-07-29T10:24:39.9808538+08:00;True|2024-07-29T10:15:01.4868159+08:00;True|2024-07-29T10:05:43.2636977+08:00;False|2024-07-29T10:05:09.6693126+08:00;True|2024-07-26T14:38:44.1514082+08:00;True|2024-07-25T16:35:47.6323299+08:00;True|2024-07-25T15:58:51.9114716+08:00;True|2024-07-25T15:38:57.7661457+08:00;True|2024-07-25T13:57:30.2286832+08:00;True|2024-07-25T11:21:08.5619866+08:00;True|2024-07-24T08:13:20.3643753+08:00;True|2024-07-22T11:29:48.3793112+08:00;True|2024-07-18T07:54:11.8093513+08:00;False|2024-07-11T20:03:42.7691659+08:00;True|2024-07-11T14:57:48.5724072+08:00;True|2024-07-11T13:34:59.3808490+08:00;True|2024-07-11T13:29:39.6653752+08:00;True|2024-07-11T11:25:43.0064657+08:00;True|2024-07-11T11:03:52.2243070+08:00;True|2024-07-11T10:57:55.3634360+08:00;True|2024-07-11T10:55:17.3989127+08:00;True|2024-07-11T10:53:11.1279865+08:00;True|2024-07-11T10:49:35.5725210+08:00;True|2024-07-10T16:36:17.0590402+08:00;True|2024-07-10T16:09:12.7215230+08:00;True|2024-07-10T09:06:06.6122865+08:00;True|2024-07-10T08:58:59.2321344+08:00;False|2024-07-10T08:58:29.3335548+08:00;True|2024-07-09T15:53:30.3772131+08:00;True|2024-07-09T15:37:33.0710407+08:00;True|2024-07-09T11:27:46.2165607+08:00;True|2024-07-09T10:40:47.2074513+08:00;True|2024-07-09T10:17:03.9180076+08:00;True|2024-07-08T16:06:01.1344634+08:00;True|2024-07-08T13:33:47.3535952+08:00;True|2024-07-04T15:51:48.1760451+08:00;True|2024-07-04T15:49:15.1000691+08:00;True|2024-07-04T15:05:00.4478900+08:00;True|2024-07-04T13:12:24.9294846+08:00;True|2024-07-04T09:06:52.4883805+08:00;True|2024-07-04T08:58:25.4069888+08:00;True|2024-07-03T17:06:10.1893662+08:00;True|2024-07-03T10:48:38.3910245+08:00;True|2024-07-03T10:24:59.3744052+08:00;True|2024-07-03T09:26:05.1371941+08:00;True|2024-07-03T09:19:07.9195348+08:00;True|2024-07-03T09:10:32.1837100+08:00;True|2024-07-02T16:44:49.8694946+08:00;False|2024-07-02T16:44:19.1893536+08:00;True|2024-07-02T13:53:28.4262842+08:00;True|2024-07-02T13:34:27.7478080+08:00;True|2024-06-28T11:58:25.6532295+08:00;True|2024-06-28T11:46:38.1547999+08:00;True|2024-06-28T11:41:20.7737151+08:00;True|2024-06-28T11:39:56.7636352+08:00;True|2024-06-28T11:26:10.3582659+08:00;True|2024-06-28T11:02:05.7702621+08:00;True|2024-06-28T10:23:08.4165999+08:00;True|2024-06-27T21:02:20.9289634+08:00;True|2024-06-27T15:44:07.3125345+08:00;True|2024-06-27T15:41:49.5015439+08:00;True|2024-06-27T15:39:21.1879348+08:00;True|2024-06-26T20:46:59.4747014+08:00;True|2024-06-26T20:42:59.3192496+08:00;True|2024-06-26T17:24:29.0121504+08:00;True|2024-06-25T20:03:09.4001117+08:00;True|2024-06-25T13:23:02.0928195+08:00;True|2024-06-20T15:39:47.3427120+08:00;True|2024-06-20T15:11:19.3766436+08:00;True|2024-06-20T15:02:38.8825341+08:00;True|2024-06-20T14:14:33.8431830+08:00;True|2024-06-20T14:10:14.6375855+08:00;True|2024-06-20T14:05:08.8218199+08:00;True|2024-06-20T13:58:23.3085838+08:00;True|2024-06-20T13:47:50.8475268+08:00;True|2024-06-20T10:41:38.1805408+08:00;True|2024-06-20T10:36:20.0215771+08:00;True|2024-06-20T10:30:18.5030326+08:00;True|2024-06-20T10:27:24.0723174+08:00;True|2024-06-20T10:14:49.3084076+08:00;True|2024-06-19T11:22:25.9638091+08:00;True|2024-06-19T11:14:32.9224254+08:00;True|2024-06-19T11:10:09.7376610+08:00;True|2024-06-19T10:49:20.4465588+08:00;True|2024-06-19T10:36:57.1639231+08:00;True|2024-06-11T14:41:11.8639568+08:00;True|2024-06-07T16:18:01.8672070+08:00;True|2024-06-07T15:58:33.8827805+08:00;True|2024-06-07T14:15:58.8759776+08:00;False|2024-06-07T11:11:44.5669069+08:00;True|2024-06-07T10:02:50.1266977+08:00;True|2024-06-07T09:49:53.1460072+08:00;True|2024-06-07T09:48:38.1399118+08:00;True|2024-06-07T08:38:41.8354576+08:00;True|2024-06-07T08:30:23.1369397+08:00;True|2024-06-06T12:59:50.5625799+08:00;True|2024-06-06T10:31:30.2337440+08:00;True|2024-06-06T10:25:28.1353268+08:00;True|2024-06-05T17:02:30.6367920+08:00;True|2024-06-05T16:55:31.1762741+08:00;True|2024-06-05T16:46:00.6507154+08:00;True|2024-06-05T13:36:04.5422998+08:00;True|2024-06-05T13:18:09.8841001+08:00;True|2024-06-05T10:21:42.5518509+08:00;False|2024-06-05T10:08:44.4622592+08:00;True|2024-06-05T08:50:04.4599368+08:00;True|2024-06-05T08:35:12.4434623+08:00;True|2024-06-04T16:17:31.9354255+08:00;True|2024-06-04T15:19:09.2382571+08:00;True|2024-06-04T14:55:11.4221703+08:00;True|2024-06-04T10:47:15.3458246+08:00;True|2024-05-31T15:57:19.8208236+08:00;True|2024-05-31T15:22:42.1789930+08:00;True|2024-05-31T15:13:09.3310754+08:00;True|2024-05-31T15:07:27.2528961+08:00;True|2024-05-31T14:46:54.7960188+08:00;True|2024-05-31T14:34:13.9077799+08:00;True|2024-05-31T14:05:03.8345173+08:00;True|2024-05-31T12:52:38.8326102+08:00;True|2024-05-31T10:29:32.0441427+08:00;True|2024-05-31T10:08:48.0021543+08:00;True|2024-05-31T09:43:32.2488411+08:00;True|2024-05-30T16:29:38.6305342+08:00;True|2024-05-30T16:16:08.3671859+08:00;True|2024-05-30T16:00:42.8690838+08:00;True|2024-05-30T15:07:20.8506508+08:00;True|2024-05-30T14:28:44.1018902+08:00;True|2024-05-30T14:14:25.3034479+08:00;True|2024-05-30T13:36:02.4352359+08:00;True|2024-05-29T13:45:51.8854629+08:00;True|2024-05-28T08:33:52.1977980+08:00;True|2024-05-27T16:00:53.4656146+08:00;True|2024-05-27T10:43:46.1023173+08:00;True|2024-05-27T09:14:09.4690569+08:00;False|2024-05-27T09:09:16.7204665+08:00;False|2024-05-27T08:51:21.5199349+08:00;False|2024-05-27T08:35:49.4339724+08:00;False|2024-05-27T08:29:02.9972247+08:00;True|2024-05-24T14:24:09.8444039+08:00;True|2024-05-24T10:52:44.4487225+08:00;True|2024-05-23T16:36:02.2415058+08:00;True|2024-05-23T13:43:27.7682349+08:00;True|2024-05-23T13:41:26.5710135+08:00;True|2024-05-23T13:25:30.0501860+08:00;True|2024-05-23T13:01:01.8142912+08:00;True|2024-05-22T11:27:52.3476712+08:00;True|2024-04-28T11:08:24.9627592+08:00;True|2024-04-28T09:08:43.2454678+08:00;True|2024-04-09T13:59:05.4840966+08:00;True|2024-04-09T13:32:04.5173492+08:00;True|2024-04-09T10:49:57.0288282+08:00;True|2024-04-09T10:35:48.8906018+08:00;True|2024-04-08T13:40:57.0220970+08:00;True|2024-04-08T13:07:43.0357658+08:00;True|2024-04-08T08:51:13.3450522+08:00;True|2024-04-07T17:08:21.7140078+08:00;True|2024-04-07T16:20:47.0957220+08:00;True|2024-04-07T15:40:03.2944629+08:00;True|2024-04-07T15:36:39.8472773+08:00;True|2024-04-07T15:27:41.4586445+08:00;True|2024-04-07T15:24:44.9945335+08:00;True|2024-04-07T15:21:05.5907054+08:00;True|2024-04-07T14:18:24.9260992+08:00;True|2024-04-02T15:07:56.8405115+08:00;True|2024-03-28T09:57:40.6534155+08:00;True|2024-03-26T17:00:21.0687635+08:00;True|2024-03-26T16:55:53.0643450+08:00;True|2024-03-26T16:50:09.5271078+08:00;True|2024-03-26T16:35:58.3572743+08:00;True|2024-03-26T16:17:50.6562874+08:00;True|2024-03-26T16:02:58.7193861+08:00;True|2024-03-26T15:51:50.2451468+08:00;True|2024-03-26T15:38:02.2327749+08:00;True|2024-03-26T14:43:01.5314209+08:00;True|2024-03-26T14:36:32.9149121+08:00;True|2024-03-26T14:29:28.7806186+08:00;True|2024-03-26T14:11:55.5737213+08:00;True|2024-03-22T16:35:11.0518345+08:00;True|2024-03-21T15:56:07.0130392+08:00;True|2024-03-20T10:50:05.8645964+08:00;True|2024-03-19T15:59:58.2960231+08:00;True|2024-03-19T15:16:32.3388913+08:00;True|2024-03-19T14:51:16.6428107+08:00;True|2024-03-19T14:36:08.8885745+08:00;False|2024-03-19T14:34:44.2637614+08:00;True|2024-03-19T14:22:40.5900691+08:00;True|2024-03-19T14:02:08.9599381+08:00;True|2024-03-19T12:23:05.0332761+08:00;True|2024-03-19T11:53:43.6830010+08:00;True|2024-03-19T11:40:05.7903841+08:00;True|2024-03-15T20:49:17.5076444+08:00;True|2024-03-15T14:00:52.3630660+08:00;True|2024-03-15T12:47:34.8092587+08:00;True|2024-03-15T09:58:23.5517006+08:00;True|2024-03-13T15:28:48.6170490+08:00;True|2024-03-13T13:33:44.3051955+08:00;True|2024-03-13T13:25:15.0372313+08:00;True|2024-03-13T11:59:44.2551502+08:00;True|2024-03-13T11:49:04.7295629+08:00;True|2024-03-13T11:27:27.5893712+08:00;True|2024-03-13T11:12:33.2533839+08:00;True|2024-03-13T11:07:52.7174473+08:00;True|2024-03-13T09:34:08.0467534+08:00;True|2024-03-12T16:24:41.1248271+08:00;True|2024-03-12T12:57:34.1524922+08:00;True|2024-03-12T12:57:10.0401874+08:00;True|2024-03-12T12:37:38.8477356+08:00;True|2024-03-12T12:15:41.3846937+08:00;True|2024-03-12T11:42:00.2207406+08:00;True|2024-03-12T11:33:55.6697043+08:00;True|2024-03-12T11:05:02.7742504+08:00;True|2024-03-12T09:20:07.0762374+08:00;True|2024-03-11T23:16:36.7669114+08:00;True|2024-03-11T23:03:24.2725545+08:00;True|2024-03-11T22:49:15.9602661+08:00;True|2024-03-11T22:47:12.6755805+08:00;True|2024-03-11T17:00:27.3523033+08:00;True|2024-03-11T16:58:40.0175971+08:00;True|2024-03-11T16:44:38.6622087+08:00;True|2024-03-11T12:49:04.1659271+08:00;True|2024-03-11T12:34:46.2212554+08:00;True|2024-03-11T12:04:40.4848855+08:00;True|2024-03-11T11:58:33.1825785+08:00;True|2024-03-11T11:40:10.6536678+08:00;True|2024-03-11T09:04:20.1073972+08:00;True|2024-03-11T00:16:54.5372850+08:00;True|2024-03-11T00:13:59.7140451+08:00;True|2024-03-11T00:08:20.0809329+08:00;True|2024-03-10T23:51:03.0931056+08:00;True|2024-03-10T23:43:22.2299872+08:00;True|2024-03-10T23:31:27.0629130+08:00;True|2024-03-10T22:56:31.1232852+08:00;True|2024-03-10T22:36:41.8541660+08:00;True|2024-03-10T22:15:06.0859435+08:00;True|2024-03-10T21:44:04.4157994+08:00;True|2024-03-10T21:35:38.3813654+08:00;True|2024-03-10T21:21:19.7693278+08:00;True|2024-03-10T13:19:26.4221274+08:00;True|2024-03-08T16:42:34.3346854+08:00;True|2024-03-08T15:50:13.7379672+08:00;True|2024-03-08T15:44:16.4369842+08:00;True|2024-03-08T15:31:50.0622199+08:00;True|2024-03-08T14:26:09.1090416+08:00;True|2024-03-08T14:21:24.9470581+08:00;True|2024-03-08T14:17:32.2780390+08:00;True|2024-03-08T14:03:55.4922720+08:00;True|2024-03-08T13:57:55.4217170+08:00;True|2024-03-08T13:53:43.0935554+08:00;True|2024-03-08T12:54:18.4199897+08:00;True|2024-03-08T12:48:07.6789814+08:00;True|2024-03-08T12:38:48.2818977+08:00;True|2024-03-08T12:21:53.9153553+08:00;True|2024-03-08T12:06:46.9343077+08:00;True|2024-03-08T11:27:39.0237720+08:00;True|2024-03-08T10:59:31.7184492+08:00;True|2024-03-08T10:57:44.8205869+08:00;True|2024-03-08T10:47:27.6962408+08:00;True|2024-03-08T10:29:25.8508156+08:00;True|2024-03-08T10:23:30.0269659+08:00;True|2024-03-08T09:21:21.5915181+08:00;True|2024-03-08T09:16:30.6962592+08:00;True|2024-03-07T17:01:33.5406097+08:00;True|2024-03-07T16:52:05.1956454+08:00;True|2024-03-07T16:41:54.0594859+08:00;True|2024-03-07T16:33:14.5796954+08:00;True|2024-03-07T16:02:27.6565800+08:00;True|2024-03-07T15:45:18.3220942+08:00;True|2024-03-07T15:39:48.9700962+08:00;True|2024-03-07T15:35:21.4018654+08:00;True|2024-03-07T15:22:12.7348197+08:00;True|2024-03-07T15:19:49.2338225+08:00;True|2024-03-07T13:46:05.5084885+08:00;True|2024-03-07T13:42:41.9749496+08:00;True|2024-03-07T13:26:04.1927588+08:00;True|2024-03-07T13:04:29.8689660+08:00;True|2024-03-07T10:24:34.3368602+08:00;True|2024-03-07T09:18:28.2279706+08:00;True|2024-03-06T17:25:36.9409421+08:00;True|2024-03-06T17:04:06.6361562+08:00;True|2024-03-06T14:42:01.3198359+08:00;True|2024-03-06T12:10:29.5231191+08:00;True|2024-03-06T12:03:06.7428246+08:00;True|2024-03-06T11:51:03.6220101+08:00;True|2024-03-06T11:15:22.4977600+08:00;True|2024-03-06T09:38:13.9161080+08:00;True|2024-03-05T16:37:49.9679062+08:00;True|2024-03-05T15:12:23.1933204+08:00;True|2024-03-05T14:51:27.9123344+08:00;True|2024-03-05T12:42:45.6186917+08:00;True|2024-03-05T11:21:19.0499458+08:00;True|2024-03-05T11:07:43.2642432+08:00;True|2024-03-05T09:59:18.0467522+08:00;True|2024-03-05T09:57:25.8947310+08:00;True|2024-03-04T16:41:44.4465908+08:00;True|2024-03-04T16:27:02.5887336+08:00;True|2024-03-04T16:20:05.0027599+08:00;True|2024-03-04T16:19:26.5595399+08:00;True|2024-03-04T15:32:55.6131853+08:00;True|2024-03-04T15:28:44.2800619+08:00;True|2024-03-04T14:54:47.0567440+08:00;True|2024-03-04T10:23:15.8222065+08:00;True|2024-03-03T17:36:33.1017612+08:00;True|2024-03-03T16:51:26.3227366+08:00;True|2024-02-26T09:58:28.3684127+08:00;True|2024-02-26T09:40:27.2127438+08:00;True|2024-02-26T09:30:29.4139007+08:00;True|2024-02-26T08:58:31.6305017+08:00;True|2024-02-26T08:50:25.3686785+08:00;True|2024-02-25T22:42:22.6699571+08:00;True|2024-02-25T21:40:08.7124742+08:00;True|2024-02-23T16:33:06.9165845+08:00;True|2024-02-23T15:20:24.6631954+08:00;True|2024-02-22T13:35:39.8097749+08:00;True|2024-02-22T10:50:51.2245040+08:00;True|2024-02-22T10:37:36.2007251+08:00;True|2024-02-22T10:28:43.0780061+08:00;True|2024-02-22T10:25:14.6494230+08:00;True|2024-02-22T10:22:55.9164843+08:00;True|2024-02-22T10:20:22.7986646+08:00;True|2024-02-22T10:09:31.7828474+08:00;True|2024-02-22T09:52:49.6576546+08:00;True|2024-02-22T09:49:40.2304782+08:00;True|2024-02-22T09:11:37.5212025+08:00;False|2024-02-22T09:11:00.5740908+08:00;True|2024-02-22T09:08:58.7725741+08:00;True|2024-02-21T16:50:09.9380590+08:00;True|2024-02-21T16:25:03.2145943+08:00;True|2024-02-21T16:23:13.6740659+08:00;True|2024-02-21T16:17:53.0411127+08:00;True|2024-02-21T15:57:47.2254175+08:00;True|2024-02-21T15:10:17.2222102+08:00;True|2024-02-21T15:05:10.2464943+08:00;True|2024-02-21T14:27:06.5305080+08:00;True|2024-02-21T14:23:20.9423346+08:00;True|2024-02-21T14:10:37.5156508+08:00;True|2024-02-21T13:54:04.4018306+08:00;True|2024-02-21T08:47:17.0019565+08:00;True|2024-02-20T16:26:31.2412659+08:00;True|2024-02-20T16:23:36.2983740+08:00;True|2024-02-20T16:20:39.9515902+08:00;True|2024-02-20T15:46:12.8212665+08:00;True|2024-02-20T14:58:17.4600086+08:00;True|2024-02-20T10:45:52.2417786+08:00;True|2024-02-20T10:42:11.8298929+08:00;True|2024-02-19T13:06:24.8957799+08:00;True|2024-02-19T11:05:28.0139278+08:00;True|2024-02-19T10:27:01.0810368+08:00;True|2024-02-19T10:22:57.4053027+08:00;True|2024-02-19T10:15:48.5706154+08:00;True|2024-02-19T10:12:02.9076965+08:00;True|2024-02-18T14:57:44.7521494+08:00;True|2024-02-18T14:50:56.3550941+08:00;True|2024-02-18T13:36:49.3942430+08:00;True|2024-02-07T14:06:25.4964506+08:00;True|2024-02-07T10:42:52.2689528+08:00;True|2024-02-06T10:58:49.3342902+08:00;True|2024-02-06T10:53:42.5435511+08:00;True|2024-02-06T10:43:40.1003756+08:00;True|2024-02-06T10:40:46.8233200+08:00;True|2024-02-06T10:17:28.2865591+08:00;True|2024-02-06T10:14:31.6896095+08:00;True|2024-02-06T09:24:29.8745590+08:00;True|2024-02-06T09:20:58.3166183+08:00;True|2024-02-06T09:12:14.4841167+08:00;True|2024-02-06T09:05:10.5375167+08:00;True|2024-02-05T14:51:09.8954604+08:00;True|2024-02-05T14:30:01.0098544+08:00;True|2024-02-05T14:26:49.2548141+08:00;True|2024-02-05T14:05:18.6839229+08:00;True|2024-02-05T13:23:42.1639710+08:00;True|2024-02-05T08:39:07.5523831+08:00;True|2024-02-04T15:09:19.2455417+08:00;True|2024-02-04T13:27:46.2086590+08:00;True|2024-02-04T13:25:20.9639903+08:00;True|2024-02-04T13:20:32.2870983+08:00;True|2024-02-04T13:15:58.3909970+08:00;True|2024-02-04T11:18:59.5180822+08:00;True|2024-02-04T11:07:31.1414636+08:00;True|2024-02-04T11:03:38.8431285+08:00;True|2024-02-04T11:00:42.8307675+08:00;True|2024-02-04T10:59:07.3767796+08:00;True|2024-02-04T10:55:27.9454328+08:00;True|2024-02-04T10:52:29.5988914+08:00;True|2024-02-04T10:50:30.6883153+08:00;True|2024-02-04T10:38:13.0058874+08:00;True|2024-02-04T10:25:53.1906810+08:00;True|2024-02-04T10:14:51.7442720+08:00;True|2024-02-04T10:12:34.4696662+08:00;True|2024-02-04T10:08:56.5805097+08:00;True|2024-02-04T10:07:16.4922026+08:00;True|2024-02-04T09:59:27.2102397+08:00;True|2024-02-04T09:56:42.2238395+08:00;True|2024-02-04T09:52:47.5348300+08:00;True|2024-02-04T09:42:50.9349205+08:00;True|2024-02-04T09:30:32.3567175+08:00;True|2024-02-04T09:19:29.8036670+08:00;True|2024-02-04T09:11:56.0744927+08:00;True|2024-02-04T09:08:42.4432795+08:00;True|2024-02-04T09:05:25.4958302+08:00;True|2024-02-04T08:58:59.7993464+08:00;True|2024-02-04T08:51:20.3017735+08:00;True|2024-02-04T08:43:05.6974823+08:00;True|2024-02-02T16:12:24.3288882+08:00;True|2024-02-02T15:31:12.0724234+08:00;True|2024-02-02T15:14:24.5493301+08:00;True|2024-02-02T15:08:42.0775469+08:00;True|2024-02-02T14:50:25.2357715+08:00;True|2024-02-02T14:48:40.1311047+08:00;True|2024-02-02T14:44:57.9831751+08:00;True|2024-02-02T14:28:12.0713915+08:00;True|2024-02-02T13:55:59.7389347+08:00;True|2024-02-02T13:10:32.7073682+08:00;True|2024-02-02T10:21:41.3665075+08:00;True|2024-02-02T10:08:11.1755065+08:00;True|2024-02-01T16:28:42.6016378+08:00;True|2024-02-01T16:25:35.2865491+08:00;True|2024-02-01T15:48:00.8333105+08:00;True|2024-02-01T15:39:22.9864096+08:00;True|2024-02-01T15:30:30.4856347+08:00;True|2024-02-01T14:34:14.9484851+08:00;True|2024-02-01T13:53:48.9165284+08:00;False|2024-02-01T13:52:39.1911001+08:00;True|2024-02-01T10:40:28.0735829+08:00;True|2024-02-01T10:24:04.5914096+08:00;True|2024-02-01T10:13:00.9882363+08:00;True|2024-01-31T14:56:37.7352718+08:00;True|2024-01-31T14:46:49.9104890+08:00;True|2024-01-31T14:38:56.1841731+08:00;True|2024-01-31T14:35:45.4531352+08:00;True|2024-01-31T14:32:21.5100137+08:00;True|2024-01-31T14:15:26.3231430+08:00;True|2024-01-31T14:00:11.3994150+08:00;True|2024-01-31T13:18:54.8448212+08:00;True|2024-01-31T10:52:59.8159114+08:00;True|2024-01-31T10:28:03.5856625+08:00;True|2024-01-31T10:10:35.0250398+08:00;True|2024-01-30T09:53:14.3256577+08:00;True|2024-01-30T09:43:56.5551157+08:00;True|2024-01-30T08:27:16.7078317+08:00;True|2024-01-29T15:42:55.3394104+08:00;True|2024-01-29T15:36:57.2998818+08:00;True|2024-01-29T15:09:49.3214409+08:00;True|2024-01-29T14:54:23.0025170+08:00;True|2024-01-29T14:33:53.5586728+08:00;True|2024-01-29T10:21:47.9469052+08:00;True|2024-01-29T09:38:26.0354836+08:00;True|2024-01-29T09:28:57.3836958+08:00;True|2024-01-29T09:19:49.0488968+08:00;True|2024-01-26T16:11:46.3859476+08:00;True|2024-01-26T16:11:29.8529136+08:00;True|2024-01-26T10:23:35.6167838+08:00;True|2024-01-26T10:16:04.2780085+08:00;True|2024-01-26T10:05:56.0745647+08:00;True|2024-01-26T10:03:34.8490957+08:00;True|2024-01-26T09:18:57.1502238+08:00;True|2024-01-26T09:05:18.6887593+08:00;True|2024-01-25T16:19:44.3753587+08:00;True|2024-01-25T10:54:55.2695117+08:00;True|2024-01-25T10:52:43.0130697+08:00;True|2024-01-25T10:15:35.2061116+08:00;True|2024-01-25T10:12:55.7724345+08:00;True|2024-01-25T09:59:14.7336333+08:00;True|2024-01-25T09:54:00.8951944+08:00;True|2024-01-23T11:57:00.6176481+08:00;True|2024-01-23T11:48:46.0536266+08:00;True|2024-01-23T11:20:56.9686760+08:00;True|2024-01-23T10:07:03.1874795+08:00;True|2024-01-23T09:28:09.7921197+08:00;True|2024-01-22T17:23:56.8011615+08:00;True|2024-01-22T15:39:51.8307512+08:00;True|2024-01-21T16:56:29.0470984+08:00;True|2024-01-21T16:31:58.1736344+08:00;True|2024-01-21T16:24:19.3683647+08:00;True|2024-01-21T16:02:26.5427715+08:00;True|2024-01-21T15:45:21.0549809+08:00;True|2024-01-21T15:24:46.6563331+08:00;True|2024-01-21T12:57:07.2655536+08:00;True|2024-01-21T11:43:22.1675745+08:00;True|2024-01-21T11:04:07.4676661+08:00;True|2024-01-21T11:03:11.6972981+08:00;True|2024-01-19T12:12:51.7315607+08:00;True|2024-01-19T12:03:23.7846341+08:00;True|2024-01-19T09:21:40.1191844+08:00;True|2024-01-18T15:28:59.1079108+08:00;True|2024-01-18T15:25:00.9561275+08:00;True|2024-01-18T15:19:13.0404548+08:00;True|2024-01-18T13:06:18.2756609+08:00;True|2024-01-18T12:00:29.1983965+08:00;True|2024-01-18T09:51:08.2157377+08:00;True|2024-01-18T09:49:33.8817410+08:00;True|2024-01-17T17:14:07.4523354+08:00;True|2024-01-17T13:46:19.2002783+08:00;True|2024-01-17T13:17:28.0156428+08:00;True|2024-01-17T11:23:28.7024207+08:00;True|2024-01-17T11:07:35.4966809+08:00;True|2024-01-17T10:25:34.7098037+08:00;True|2024-01-17T09:13:26.1252511+08:00;True|2024-01-16T15:33:15.8976694+08:00;True|2024-01-16T13:06:21.8159184+08:00;True|2024-01-16T12:55:14.9963186+08:00;True|2024-01-16T10:26:35.3866122+08:00;True|2024-01-16T10:25:44.1826112+08:00;True|2024-01-12T16:34:51.6106928+08:00;True|2024-01-12T13:14:24.0546049+08:00;True|2024-01-12T13:06:52.9089433+08:00;True|2024-01-12T12:39:48.1623736+08:00;True|2024-01-12T12:36:04.4644966+08:00;True|2024-01-12T10:22:40.9168937+08:00;True|2024-01-12T10:10:47.1460616+08:00;True|2024-01-12T10:05:40.4318518+08:00;True|2024-01-12T10:02:01.3964907+08:00;True|2024-01-12T09:57:23.5579846+08:00;True|2024-01-12T09:52:39.7735343+08:00;True|2024-01-12T09:49:01.7855687+08:00;True|2024-01-12T09:44:26.1839115+08:00;True|2024-01-12T09:40:23.9216298+08:00;True|2024-01-12T09:36:41.0590000+08:00;True|2024-01-12T09:32:36.5860825+08:00;True|2024-01-12T09:18:47.5635433+08:00;True|2024-01-11T16:44:34.1615374+08:00;True|2024-01-11T16:40:15.6664078+08:00;True|2024-01-11T16:35:55.1073771+08:00;True|2024-01-11T16:30:59.0648321+08:00;True|2024-01-11T16:11:06.5473983+08:00;True|2024-01-11T16:00:13.6441008+08:00;True|2024-01-11T15:46:51.9760680+08:00;True|2024-01-11T15:36:57.4756880+08:00;True|2024-01-11T15:31:04.1093476+08:00;True|2024-01-11T15:29:01.9270892+08:00;True|2024-01-11T15:21:23.5612459+08:00;True|2024-01-11T15:20:16.1944310+08:00;True|2024-01-11T15:13:32.1080230+08:00;True|2024-01-11T15:06:57.4237688+08:00;True|2024-01-11T15:05:37.5128999+08:00;True|2024-01-11T14:57:22.7751079+08:00;True|2024-01-11T14:11:04.8587579+08:00;True|2024-01-11T11:21:14.0243941+08:00;True|2024-01-11T11:15:09.4678297+08:00;True|2024-01-09T17:06:36.4675498+08:00;True|2024-01-09T17:02:20.7904461+08:00;False|2024-01-09T11:59:36.2734315+08:00;False|2024-01-09T11:59:30.0330023+08:00;True|2024-01-09T11:59:17.2965616+08:00;True|2024-01-08T13:52:05.1989624+08:00;True|2024-01-08T11:12:57.8687468+08:00;True|2024-01-05T14:51:14.7636988+08:00;True|2024-01-05T14:05:34.1084252+08:00;True|2024-01-05T13:23:32.7473731+08:00;True|2024-01-05T11:23:22.0038600+08:00;True|2024-01-05T08:30:07.8997370+08:00;True|2024-01-04T17:03:59.0070371+08:00;True|2024-01-04T16:35:53.2667600+08:00;True|2024-01-04T13:54:55.5474585+08:00;True|2024-01-04T10:22:53.2575575+08:00;True|2024-01-04T10:19:29.6305295+08:00;True|2024-01-04T10:13:33.8544729+08:00;True|2024-01-04T10:09:45.5777175+08:00;True|2024-01-03T15:38:30.3306310+08:00;True|2024-01-03T15:33:57.3631133+08:00;True|2024-01-03T15:10:07.3593774+08:00;True|2024-01-03T13:01:19.4751344+08:00;True|2024-01-03T11:25:06.5732437+08:00;True|2024-01-03T10:55:20.7518873+08:00;True|2024-01-03T10:40:15.0650254+08:00;True|2024-01-03T10:29:15.9327684+08:00;True|2024-01-03T09:34:04.8587473+08:00;True|2024-01-03T08:19:57.3625106+08:00;True|2023-12-29T16:46:23.7770752+08:00;True|2023-12-29T16:45:18.9092534+08:00;True|2023-12-29T16:40:16.7253697+08:00;True|2023-12-29T16:35:46.0906100+08:00;True|2023-12-29T16:19:46.4369159+08:00;True|2023-12-29T15:13:11.2466536+08:00;True|2023-12-29T15:08:16.1413948+08:00;True|2023-12-29T11:54:24.8686181+08:00;True|2023-12-29T10:54:38.1200087+08:00;True|2023-12-29T10:43:44.2132588+08:00;True|2023-12-29T10:23:35.9589067+08:00;True|2023-12-29T10:21:38.3438976+08:00;True|2023-12-29T10:16:16.7097491+08:00;True|2023-12-29T09:53:37.8863387+08:00;True|2023-12-27T14:41:20.6098455+08:00;True|2023-12-27T14:15:27.0538444+08:00;True|2023-12-27T13:07:04.0423436+08:00;True|2023-12-27T11:13:53.7170363+08:00;True|2023-12-27T10:59:32.5371257+08:00;True|2023-12-27T10:48:01.7326864+08:00;True|2023-12-26T09:13:22.3086191+08:00;True|2023-12-26T09:12:47.2137946+08:00;True|2023-12-25T12:22:46.8608633+08:00;True|2023-12-25T12:18:59.4402254+08:00;True|2023-12-25T12:11:03.2410147+08:00;True|2023-12-25T09:37:48.6741194+08:00;True|2023-12-25T09:37:03.2635243+08:00;True|2023-12-22T09:44:26.5356492+08:00;True|2023-12-21T16:58:23.0505653+08:00;True|2023-12-21T16:51:26.4945132+08:00;True|2023-12-21T16:48:53.6772071+08:00;True|2023-12-21T16:23:16.4577315+08:00;True|2023-12-21T16:22:38.6599138+08:00;True|2023-12-21T16:11:43.8422015+08:00;True|2023-12-21T15:45:42.5751240+08:00;True|2023-12-15T16:26:52.3591879+08:00;True|2023-12-15T16:22:25.0756865+08:00;True|2023-12-15T14:19:10.1362534+08:00;True|2023-12-15T14:15:47.5585902+08:00;True|2023-12-15T13:41:56.8875380+08:00;True|2023-12-13T00:13:19.2052917+08:00;True|2023-12-12T23:45:04.0751980+08:00;True|2023-12-12T23:33:28.8199619+08:00;True|2023-12-11T16:31:01.1694979+08:00;True|2023-12-11T15:47:51.2813632+08:00;True|2023-12-11T14:31:49.0572919+08:00;True|2023-12-11T11:45:11.2736360+08:00;True|2023-12-11T11:42:47.5744097+08:00;True|2023-12-11T11:41:16.3262612+08:00;True|2023-12-11T11:32:42.2722966+08:00;True|2023-12-11T11:25:22.8877561+08:00;True|2023-12-11T11:18:20.8210764+08:00;True|2023-12-11T11:16:52.0927831+08:00;True|2023-12-11T11:12:29.9473078+08:00;True|2023-12-10T16:43:56.1726039+08:00;True|2023-12-08T16:50:00.8823437+08:00;True|2023-12-08T14:59:10.2356691+08:00;True|2023-12-08T14:53:13.6038106+08:00;True|2023-12-08T14:51:33.9002713+08:00;True|2023-12-08T14:49:22.0867686+08:00;True|2023-12-08T14:45:05.4216954+08:00;True|2023-12-08T14:30:25.7790911+08:00;True|2023-12-08T14:26:26.1041925+08:00;True|2023-12-08T10:55:36.7338237+08:00;True|2023-12-08T10:24:01.5463359+08:00;True|2023-12-08T10:04:35.7996746+08:00;True|2023-12-08T09:59:17.1279949+08:00;True|2023-12-08T09:52:45.7941909+08:00;True|2023-12-08T09:51:26.7251883+08:00;True|2023-12-08T09:27:43.4049328+08:00;True|2023-12-08T09:12:16.7029758+08:00;True|2023-12-07T11:13:10.4285460+08:00;True|2023-12-01T14:35:34.0005130+08:00;True|2023-12-01T13:21:46.3327168+08:00;True|2023-12-01T13:04:28.4801319+08:00;True|2023-11-30T16:46:41.8793520+08:00;True|2023-11-30T16:04:49.7131798+08:00;True|2023-11-30T15:51:12.9846550+08:00;True|2023-11-30T12:52:06.3440387+08:00;True|2023-11-28T11:20:26.3599705+08:00;True|2023-11-28T09:43:48.5733385+08:00;True|2023-11-27T12:13:11.3038226+08:00;True|2023-11-27T11:54:35.3665327+08:00;True|2023-11-24T13:10:19.3181494+08:00;True|2023-11-24T09:52:10.7335160+08:00;True|2023-11-24T09:31:32.3926443+08:00;True|2023-11-22T13:30:50.3888837+08:00;True|2023-11-22T13:22:29.5388053+08:00;True|2023-11-22T12:14:49.7935345+08:00;True|2023-11-22T11:28:30.8047701+08:00;True|2023-11-20T12:04:07.1512783+08:00;True|2023-11-20T11:58:16.7337435+08:00;True|2023-11-20T11:03:24.3231922+08:00;True|2023-11-20T10:59:12.6367033+08:00;True|2023-11-20T10:33:56.2434367+08:00;True|2023-11-17T15:05:08.6847106+08:00;True|2023-11-17T10:29:33.0225444+08:00;True|2023-11-16T14:21:42.1686146+08:00;True|2023-11-16T13:16:34.1913128+08:00;True|2023-11-16T12:57:16.2850606+08:00;True|2023-11-16T11:11:31.8430891+08:00;True|2023-11-16T10:20:42.1252046+08:00;True|2023-11-16T10:18:14.1408709+08:00;True|2023-11-16T09:23:36.6628173+08:00;True|2023-11-15T14:28:33.3369087+08:00;True|2023-11-15T12:26:26.2137336+08:00;True|2023-11-15T12:25:16.0092237+08:00;True|2023-11-15T11:14:45.4326153+08:00;True|2023-11-15T09:02:00.2711268+08:00;True|2023-11-15T08:53:27.1187290+08:00;True|2023-11-14T18:54:52.3812819+08:00;True|2023-11-14T18:52:20.2229451+08:00;True|2023-11-14T17:55:59.0996386+08:00;True|2023-11-14T17:04:46.5334994+08:00;True|2023-11-14T15:02:42.0419908+08:00;True|2023-11-14T14:56:49.6970449+08:00;True|2023-11-14T13:18:29.4329574+08:00;True|2023-11-14T12:23:09.7978978+08:00;True|2023-11-13T16:16:20.9105084+08:00;True|2023-11-13T16:11:45.1099698+08:00;True|2023-11-13T13:16:02.1477662+08:00;True|2023-11-13T13:15:15.6182523+08:00;True|2023-11-13T11:11:21.7620762+08:00;True|2023-11-13T10:01:31.2619079+08:00;True|2023-11-13T09:18:34.3054349+08:00;True|2023-11-13T00:48:47.6800494+08:00;True|2023-11-13T00:42:22.9854286+08:00;True|2023-11-10T16:59:57.9013482+08:00;True|2023-11-10T13:56:10.1520148+08:00;True|2023-11-10T12:25:28.8978413+08:00;True|2023-11-10T12:04:30.4991249+08:00;True|2023-11-10T11:55:52.1921552+08:00;True|2023-11-10T11:39:33.1910863+08:00;True|2023-11-10T11:17:17.2050570+08:00;True|2023-11-10T10:31:48.8350379+08:00;True|2023-11-09T13:11:02.1210376+08:00;True|2023-11-09T11:04:23.6279742+08:00;True|2023-11-09T09:52:39.0767165+08:00;True|2023-11-09T09:45:47.5629254+08:00;True|2023-11-09T09:41:09.1121998+08:00;True|2023-11-09T09:34:16.8133121+08:00;True|2023-11-08T16:33:38.3080500+08:00;True|2023-11-08T16:14:37.9282566+08:00;True|2023-11-08T15:31:46.8084522+08:00;True|2023-11-08T14:27:48.2352711+08:00;True|2023-11-08T12:23:56.5235127+08:00;True|2023-11-08T11:41:12.7035010+08:00;True|2023-11-08T11:38:42.5318310+08:00;True|2023-11-08T10:18:43.5798164+08:00;True|2023-11-08T09:06:35.6712939+08:00;True|2023-11-08T08:57:36.1174660+08:00;True|2023-11-08T00:07:44.2585670+08:00;True|2023-11-06T23:28:53.2559097+08:00;True|2023-11-06T23:00:40.3059201+08:00;True|2023-11-06T21:14:59.0505998+08:00;True|2023-11-03T22:08:06.7984691+08:00;True|2023-11-03T20:33:47.8005656+08:00;True|2023-11-03T19:18:45.1406730+08:00;True|2023-11-03T14:56:44.7332321+08:00;True|2023-11-02T20:13:15.5530300+08:00;True|2023-11-02T19:22:24.9140752+08:00;True|2023-11-02T18:58:18.1198017+08:00;True|2023-11-01T18:31:39.9490440+08:00;True|2023-11-01T14:49:43.8703361+08:00;True|2023-11-01T14:38:44.8729900+08:00;True|2023-11-01T14:14:57.6507597+08:00;True|2023-11-01T13:04:09.9744075+08:00;True|2023-10-31T13:03:41.1902847+08:00;True|2023-10-31T11:29:03.3252294+08:00;True|2023-10-30T18:35:01.5128678+08:00;True|2023-10-30T18:25:01.6612244+08:00;True|2023-10-26T17:07:56.7081658+08:00;True|2023-10-18T16:20:51.8420951+08:00;True|2023-10-16T16:44:43.7908528+08:00;True|2023-10-16T11:17:09.2728375+08:00;True|2023-10-16T10:28:07.3397339+08:00;True|2023-10-16T10:26:35.6073358+08:00;True|2023-10-16T10:21:48.9925797+08:00;True|2023-10-13T11:26:05.2730047+08:00;True|2023-10-12T08:19:04.3028512+08:00;True|2023-10-11T20:40:21.6934217+08:00;True|2023-10-11T20:28:04.3302789+08:00;True|2023-10-11T20:16:51.2741909+08:00;True|2023-10-11T20:10:01.4624158+08:00;True|2023-10-11T15:32:40.9782838+08:00;True|2023-10-11T15:21:09.0531801+08:00;True|2023-10-11T15:05:59.9622196+08:00;True|2023-10-11T10:51:46.8571661+08:00;True|2023-10-11T10:41:25.5037704+08:00;True|2023-10-11T10:13:32.2604453+08:00;True|2023-10-11T10:05:52.2170423+08:00;True|2023-10-11T09:47:35.6578975+08:00;True|2023-10-11T09:44:31.2001499+08:00;True|2023-10-11T09:37:09.6904898+08:00;True|2023-10-10T10:18:33.1073992+08:00;True|2023-10-10T09:32:05.6384867+08:00;True|2023-10-10T09:15:26.4844254+08:00;True|2023-10-10T09:03:39.1497247+08:00;True|2023-10-10T08:56:14.9475607+08:00;True|2023-10-09T15:38:52.6561232+08:00;True|2023-10-09T14:22:16.0301342+08:00;True|2023-10-09T13:24:40.4941388+08:00;True|2023-10-09T10:30:48.0015664+08:00;True|2023-10-09T09:52:47.4626658+08:00;True|2023-10-08T14:21:13.7960780+08:00;True|2023-10-08T10:31:55.0337899+08:00;True|2023-10-08T08:24:13.2663041+08:00;True|2023-10-07T10:40:04.1716715+08:00;True|2023-10-07T09:51:11.1928375+08:00;True|2023-10-07T09:43:13.8042516+08:00;True|2023-09-28T15:45:01.2865878+08:00;True|2023-09-28T15:32:23.8179822+08:00;True|2023-09-28T14:37:03.1119806+08:00;True|2023-09-28T14:30:07.0877531+08:00;True|2023-09-28T14:01:36.5862373+08:00;True|2023-09-28T08:29:16.5989163+08:00;True|2023-09-28T08:12:23.3924898+08:00;True|2023-09-27T17:04:09.2538198+08:00;True|2023-09-27T16:38:03.8237948+08:00;True|2023-09-27T16:12:28.7977056+08:00;True|2023-09-27T15:56:03.7725704+08:00;True|2023-09-27T15:12:31.1298921+08:00;True|2023-09-27T15:05:14.4058045+08:00;True|2023-09-27T14:55:43.4423114+08:00;True|2023-09-27T14:33:26.2272014+08:00;True|2023-09-22T13:26:44.6246077+08:00;True|2023-09-22T11:14:50.9067626+08:00;True|2023-09-22T09:36:50.6912928+08:00;True|2023-09-22T09:26:38.2305802+08:00;True|2023-09-22T09:02:22.5400635+08:00;True|2023-09-20T17:20:27.9780370+08:00;True|2023-09-19T09:20:00.1269897+08:00;True|2023-09-19T09:10:18.4900723+08:00;True|2023-09-19T08:30:20.1709390+08:00;True|2023-09-18T15:43:28.1580264+08:00;True|2023-09-15T10:08:50.6367258+08:00;True|2023-09-14T17:17:10.7002185+08:00;True|2023-09-14T16:55:47.7782477+08:00;True|2023-09-14T14:05:25.9485449+08:00;False|2023-09-14T14:04:51.9423918+08:00;True|2023-09-12T09:37:17.5430590+08:00;True|2023-09-11T16:38:00.9834961+08:00;True|2023-09-11T13:04:08.1338596+08:00;True|2023-09-11T09:33:03.5400174+08:00;True|2023-09-08T15:34:46.6427039+08:00;True|2023-09-08T15:32:26.7896155+08:00;True|2023-09-08T14:07:16.6283055+08:00;True|2023-09-08T08:21:08.8368055+08:00;True|2023-09-08T08:07:29.5992984+08:00;True|2023-09-07T13:03:24.6924914+08:00;True|2023-09-07T11:02:02.9462467+08:00;True|2023-09-07T08:57:36.4913496+08:00;True|2023-09-07T08:55:57.3245545+08:00;True|2023-09-06T13:47:04.0563026+08:00;True|2023-09-06T13:42:27.3031938+08:00;True|2023-09-05T08:28:44.6193871+08:00;True|2023-09-04T20:42:09.4672710+08:00;True|2023-09-03T14:06:37.5079909+08:00;True|2023-09-02T18:58:24.1492192+08:00;True|2023-09-01T13:19:28.2779978+08:00;True|2023-09-01T08:40:54.0577358+08:00;True|2023-08-31T16:47:34.8462721+08:00;True|2023-08-31T14:49:39.9056564+08:00;True|2023-08-31T14:20:01.4071384+08:00;True|2023-08-31T11:25:29.0233052+08:00;True|2023-08-31T10:28:13.4933678+08:00;True|2023-08-31T10:21:52.6638820+08:00;True|2023-08-31T08:46:57.8782261+08:00;True|2023-08-31T08:46:08.4791004+08:00;True|2023-08-30T09:06:17.4001684+08:00;True|2023-08-30T08:52:06.9481657+08:00;True|2023-08-29T17:11:33.7851914+08:00;True|2023-08-29T16:58:52.7298807+08:00;True|2023-08-29T15:58:23.4205277+08:00;True|2023-08-29T15:56:40.3534593+08:00;True|2023-08-29T15:54:29.1188567+08:00;True|2023-08-29T15:53:27.9719983+08:00;True|2023-08-29T15:52:38.7670005+08:00;True|2023-08-29T15:51:32.3703092+08:00;True|2023-08-29T15:47:38.5198946+08:00;True|2023-08-29T15:46:17.4698017+08:00;True|2023-08-29T15:42:04.1853400+08:00;True|2023-08-29T15:29:28.1098681+08:00;True|2023-08-29T15:18:40.8587286+08:00;True|2023-08-29T14:47:50.3088948+08:00;True|2023-08-29T14:47:27.6552611+08:00;False|2023-08-28T13:59:37.8725670+08:00;True|2023-08-18T13:23:38.9937084+08:00;True|2023-08-18T10:09:51.5247737+08:00;True|2023-08-18T08:26:21.8473123+08:00;True|2023-08-17T08:31:37.8696349+08:00;True|2023-08-17T08:23:59.5658185+08:00;True|2023-08-17T08:07:38.2174684+08:00;True|2023-08-16T16:49:44.2549852+08:00;True|2023-08-16T16:33:59.9298792+08:00;True|2023-08-16T15:35:29.6092783+08:00;True|2023-08-16T11:17:28.1086751+08:00;True|2023-08-16T11:17:22.3814672+08:00;True|2023-08-16T08:44:16.0941179+08:00;True|2023-08-15T15:29:15.8118269+08:00;True|2023-08-15T14:47:06.4963591+08:00;True|2023-08-11T16:49:35.8718314+08:00;True|2023-08-11T14:22:59.9440967+08:00;True|2023-08-11T14:16:25.0940743+08:00;True|2023-08-11T13:27:25.4148450+08:00;True|2023-08-11T09:08:31.5437265+08:00;True|2023-08-11T09:04:38.4540336+08:00;True|2023-08-10T14:11:07.0042283+08:00;True|2023-08-08T13:48:19.2402267+08:00;True|2023-08-08T13:44:15.6796969+08:00;True|2023-07-27T09:46:14.1491814+08:00;True|2023-07-21T11:13:10.0843656+08:00;True|2023-07-21T10:56:47.5835580+08:00;True|2023-07-21T10:30:33.0113443+08:00;True|2023-07-20T19:16:37.4936135+08:00;True|2023-07-20T19:00:41.0636578+08:00;True|2023-07-19T13:28:27.8671371+08:00;True|2023-07-19T13:23:42.1880500+08:00;True|2023-07-19T13:19:18.7201227+08:00;True|2023-07-19T13:06:38.9897249+08:00;True|2023-07-19T12:13:11.2061059+08:00;True|2023-07-19T11:45:20.0391356+08:00;True|2023-07-19T11:24:02.5425841+08:00;True|2023-07-19T10:32:06.7915754+08:00;True|2023-07-19T09:51:08.4553434+08:00;True|2023-07-19T09:48:11.2977426+08:00;True|2023-07-18T08:47:44.1724897+08:00;True|2023-07-17T16:25:10.8982872+08:00;True|2023-07-17T14:50:44.3708198+08:00;True|2023-07-17T14:20:26.4686898+08:00;True|2023-07-17T14:18:16.6127136+08:00;True|2023-07-17T14:16:34.9116950+08:00;True|2023-07-17T14:14:44.7988846+08:00;True|2023-07-17T14:06:18.1123806+08:00;True|2023-07-17T14:03:38.5290433+08:00;True|2023-07-17T13:48:54.3096778+08:00;True|2023-07-17T13:23:13.6097762+08:00;True|2023-07-17T09:54:25.9375716+08:00;True|2023-07-17T09:40:22.2531559+08:00;True|2023-07-17T09:21:15.0786649+08:00;True|2023-07-17T09:03:37.2081513+08:00;True|2023-07-16T21:20:45.3036514+08:00;True|2023-07-16T21:09:16.1559694+08:00;True|2023-07-16T21:05:22.2504644+08:00;True|2023-07-16T20:41:26.5956030+08:00;True|2023-07-16T20:19:33.5726613+08:00;True|2023-07-16T19:46:38.6493518+08:00;True|2023-07-14T10:33:17.6270692+08:00;True|2023-07-11T14:34:22.8852169+08:00;True|2023-07-11T14:27:22.7851108+08:00;True|2023-07-11T14:13:21.6512172+08:00;True|2023-07-11T14:06:33.9865646+08:00;True|2023-07-11T13:52:46.2830836+08:00;True|2023-07-11T13:38:56.3165889+08:00;True|2023-07-11T13:29:40.9636697+08:00;True|2023-07-11T13:25:23.0633788+08:00;True|2023-07-11T10:17:40.8002359+08:00;True|2023-07-11T10:15:47.5472709+08:00;True|2023-07-11T10:12:25.6440547+08:00;True|2023-07-11T10:07:39.3716167+08:00;True|2023-07-11T09:22:07.4191357+08:00;True|2023-07-04T13:07:10.1209516+08:00;True|2023-06-30T16:11:25.7541580+08:00;True|2023-06-30T15:39:26.6678989+08:00;True|2023-06-30T15:26:40.6581344+08:00;True|2023-06-30T15:12:57.9906312+08:00;True|2023-06-29T16:39:15.6477820+08:00;True|2023-06-28T17:01:51.9542466+08:00;True|2023-06-27T15:03:28.1320450+08:00;True|2023-06-27T13:36:39.6707848+08:00;True|2023-06-26T09:40:01.1754706+08:00;True|2023-06-25T12:16:28.9080024+08:00;True|2023-06-25T11:51:59.9238461+08:00;True|2023-06-25T11:50:29.3100358+08:00;True|2023-06-25T11:29:28.5338563+08:00;True|2023-06-25T09:10:26.2420288+08:00;True|2023-06-25T09:08:15.0702872+08:00;True|2023-06-25T08:43:15.0806611+08:00;True|2023-06-25T08:41:41.8156616+08:00;True|2023-06-25T08:39:30.6818013+08:00;True|2023-06-25T08:38:18.5996529+08:00;True|2023-06-25T08:36:34.1479706+08:00;True|2023-06-25T08:34:53.9856289+08:00;True|2023-06-25T08:31:24.0298080+08:00;True|2023-06-25T08:15:45.7453280+08:00;True|2023-06-25T08:01:52.7609075+08:00;True|2023-06-24T21:25:23.8938665+08:00;True|2023-06-22T03:02:26.7305758+08:00;True|2023-06-22T02:10:48.8222890+08:00;True|2023-06-22T01:57:41.7875184+08:00;True|2023-06-22T01:52:19.4217362+08:00;True|2023-06-21T16:27:15.1464129+08:00;True|2023-06-21T16:11:46.6111817+08:00;True|2023-06-21T13:14:00.6869253+08:00;True|2023-06-21T13:09:28.2689225+08:00;True|2023-06-21T12:24:02.6762426+08:00;True|2023-06-21T12:18:06.2748924+08:00;True|2023-06-21T11:18:02.6754143+08:00;True|2023-06-21T11:08:34.2149469+08:00;True|2023-06-21T08:20:50.0079906+08:00;True|2023-06-20T15:56:03.2638713+08:00;True|2023-06-20T15:48:38.2419545+08:00;True|2023-06-20T15:35:26.6615171+08:00;True|2023-06-20T15:20:31.9284860+08:00;True|2023-06-20T15:18:39.8265469+08:00;True|2023-06-20T15:09:16.7617272+08:00;True|2023-06-20T09:53:23.2658672+08:00;True|2023-06-16T10:00:58.0337616+08:00;True|2023-06-16T09:47:58.8912904+08:00;True|2023-06-16T09:26:36.4914832+08:00;True|2023-06-15T16:22:21.4509393+08:00;True|2023-06-12T13:21:12.0491357+08:00;True|2023-06-12T10:18:32.9287587+08:00;True|2023-06-09T16:22:24.1132267+08:00;True|2023-06-08T18:12:42.4814009+08:00;True|2023-06-08T11:08:48.0533571+08:00;True|2023-06-08T10:41:43.0121701+08:00;False|2023-06-08T10:40:19.2093235+08:00;True|2023-06-06T13:03:50.8124200+08:00;True|2023-06-05T10:12:24.1858209+08:00;True|2023-06-02T17:02:57.5817094+08:00;True|2023-05-26T13:54:40.2272218+08:00;True|2023-05-24T12:43:50.2427994+08:00;True|2023-05-24T12:34:24.3922836+08:00;True|2023-05-24T10:07:19.4995219+08:00;True|2023-05-24T09:21:29.1960080+08:00;True|2023-05-23T22:34:23.3220912+08:00;True|2023-05-23T22:01:14.4175449+08:00;True|2023-05-23T17:02:53.0308400+08:00;True|2023-05-23T16:30:11.7138623+08:00;True|2023-05-23T15:51:50.0152484+08:00;True|2023-05-23T15:50:52.0657433+08:00;True|2023-05-23T15:28:25.5802377+08:00;True|2023-05-23T15:25:56.4633020+08:00;True|2023-05-23T14:52:29.8759921+08:00;True|2023-05-23T14:48:44.6519763+08:00;True|2023-05-20T04:28:10.3108871+08:00;True|2023-05-20T03:56:22.7233820+08:00;True|2023-05-20T03:47:38.4405026+08:00;True|2023-05-20T03:46:40.6056451+08:00;True|2023-05-20T03:44:25.0883888+08:00;True|2023-05-20T03:41:10.1148691+08:00;True|2023-05-20T02:34:14.3757035+08:00;True|2023-05-20T02:27:50.5595075+08:00;True|2023-05-20T02:23:04.2256041+08:00;True|2023-05-20T01:46:59.9534021+08:00;True|2023-05-20T01:42:33.5106065+08:00;True|2023-05-20T01:40:39.6918060+08:00;True|2023-05-20T01:11:47.7436847+08:00;True|2023-05-20T01:03:58.9476094+08:00;True|2023-05-19T22:59:47.4591129+08:00;True|2023-05-19T22:34:44.7988447+08:00;True|2023-05-19T22:24:55.2320279+08:00;True|2023-05-19T21:40:19.5285575+08:00;True|2023-05-19T21:38:21.2073338+08:00;True|2023-05-19T20:54:59.2058809+08:00;True|2023-05-19T16:08:15.0151080+08:00;True|2023-05-19T15:26:16.2836301+08:00;True|2023-05-19T13:09:06.1592914+08:00;True|2023-05-19T12:24:23.6252771+08:00;True|2023-05-19T11:50:53.8948740+08:00;True|2023-05-19T11:43:57.9296933+08:00;True|2023-05-19T10:44:34.9904463+08:00;True|2023-05-19T09:32:02.1216663+08:00;False|2023-05-19T09:31:06.4251757+08:00;True|2023-05-18T22:34:36.5292968+08:00;True|2023-05-18T20:37:59.7940567+08:00;True|2023-05-18T20:36:35.2790349+08:00;True|2023-05-18T20:34:10.7400457+08:00;True|2023-05-18T20:32:43.8790879+08:00;True|2023-05-18T20:31:13.5389643+08:00;True|2023-05-18T20:29:19.6206139+08:00;True|2023-05-18T20:07:25.5074263+08:00;True|2023-05-18T18:19:43.5324315+08:00;True|2023-05-18T18:15:36.4290026+08:00;True|2023-05-18T18:12:31.8703551+08:00;True|2023-05-18T18:10:52.9289531+08:00;True|2023-05-18T18:09:23.9118797+08:00;True|2023-05-18T17:58:30.8068228+08:00;True|2023-05-18T17:56:55.8055382+08:00;False|2023-05-18T17:54:54.7950789+08:00;False|2023-05-18T17:11:18.2325105+08:00;True|2023-05-18T17:09:24.4186482+08:00;True|2023-05-18T17:06:32.0699130+08:00;False|2023-05-18T17:01:41.8164925+08:00;False|2023-05-18T16:59:32.1112741+08:00;True|2023-05-18T16:58:34.1784100+08:00;True|2023-05-18T16:56:36.9460541+08:00;True|2023-05-18T16:55:00.9843495+08:00;True|2023-05-18T16:49:04.0161640+08:00;True|2023-05-18T16:48:28.9011382+08:00;True|2023-05-18T16:44:52.0675900+08:00;False|2023-05-18T16:44:37.3514214+08:00;False|2023-05-18T16:43:23.3343369+08:00;True|2023-05-18T16:41:35.8818611+08:00;True|2023-05-18T16:25:43.5167900+08:00;False|2023-05-18T16:24:46.6646890+08:00;False|2023-05-18T16:19:55.4153618+08:00;False|2023-05-18T16:16:18.0052881+08:00;False|2023-05-18T16:14:32.3377278+08:00;True|2023-05-17T15:43:45.1868569+08:00;True|2023-05-17T15:35:42.2476880+08:00;True|2023-05-17T14:23:28.2390957+08:00;True|2023-05-17T13:54:00.6756387+08:00;True|2023-05-17T13:45:46.1115068+08:00;True|2023-05-17T07:57:34.7129429+08:00;True|2023-05-16T16:04:20.3198005+08:00;False|2023-05-16T16:03:52.0737233+08:00;True|2023-05-16T15:28:45.4945726+08:00;True|2023-05-16T15:14:10.4952128+08:00;True|2023-05-16T15:04:46.5706346+08:00;True|2023-05-16T14:46:48.7034492+08:00;True|2023-05-16T14:45:29.4047499+08:00;True|2023-05-16T14:42:47.3507679+08:00;True|2023-05-16T14:30:47.9199224+08:00;True|2023-05-16T14:29:10.9147184+08:00;True|2023-05-16T14:27:48.3632687+08:00;True|2023-05-16T14:24:44.6240034+08:00;True|2023-05-16T14:19:41.2962188+08:00;True|2023-05-16T13:41:13.3366211+08:00;True|2023-05-16T13:26:44.1532655+08:00;True|2023-05-16T13:23:40.2882422+08:00;True|2023-05-16T13:11:41.5416792+08:00;True|2023-05-16T13:08:41.6341863+08:00;True|2023-05-16T13:04:35.6916867+08:00;True|2023-05-16T13:00:34.6889598+08:00;True|2023-05-16T12:57:48.4561274+08:00;True|2023-05-16T12:50:57.7405833+08:00;True|2023-05-16T12:49:33.8394829+08:00;True|2023-05-16T12:44:28.6906226+08:00;True|2023-05-16T12:41:08.3554032+08:00;True|2023-05-16T12:32:32.3448036+08:00;True|2023-05-16T11:32:04.4504376+08:00;True|2023-05-15T18:39:28.9172042+08:00;True|2023-05-15T18:35:41.5268755+08:00;True|2023-05-15T18:16:16.2900985+08:00;True|2023-04-28T16:24:40.7430596+08:00;False|2023-04-28T16:21:34.8499384+08:00;True|2023-04-28T15:43:40.3023318+08:00;True|2023-04-28T15:41:18.8228620+08:00;True|2023-04-28T14:16:21.1595325+08:00;True|2023-04-28T10:27:55.2150739+08:00;True|2023-04-12T16:25:26.5218825+08:00;True|2023-04-12T15:45:29.3993255+08:00;True|2023-04-12T14:00:18.1960878+08:00;True|2023-04-12T13:16:39.0804178+08:00;True|2023-04-11T11:02:27.5200402+08:00;True|2023-04-11T09:57:11.5903829+08:00;True|2023-04-10T09:58:01.1775220+08:00;True|2023-03-13T11:19:32.0927720+08:00;True|2023-03-13T10:39:50.9250037+08:00;True|2023-03-13T08:54:57.5891390+08:00;True|2023-03-10T09:00:31.2441735+08:00;True|2023-03-08T08:25:11.1877416+08:00;True|2023-03-06T09:18:03.5502956+08:00;True|2023-03-06T09:14:57.8192971+08:00;True|2023-01-11T13:30:27.8190489+08:00;True|2023-01-06T14:29:14.6067256+08:00;True|2022-12-23T17:06:52.0688439+08:00;True|2022-12-23T16:12:04.4155951+08:00;True|2022-12-23T13:35:44.6439326+08:00;True|2022-11-30T08:24:02.9999976+08:00;True|2022-11-30T08:01:51.4579972+08:00;True|2022-11-29T21:32:14.4359673+08:00;True|2022-11-29T19:30:22.9466023+08:00;True|2022-11-29T19:24:30.1630119+08:00;True|2022-11-29T17:31:43.1926801+08:00;True|2022-11-29T17:14:32.5869985+08:00;True|2022-11-29T10:42:57.1877576+08:00;True|2022-11-27T14:40:28.4784748+08:00;True|2022-11-26T20:49:34.2789400+08:00;True|2022-11-26T19:24:58.9988205+08:00;True|2022-11-26T15:33:08.6274944+08:00;True|2022-11-26T14:37:46.3953592+08:00;True|2022-11-26T09:16:41.7487240+08:00;True|2022-11-24T09:49:50.7302637+08:00;True|2022-11-23T16:24:56.5946914+08:00;True|2022-11-23T16:19:57.5570583+08:00;True|2022-11-23T15:05:13.8032246+08:00;True|2022-11-22T20:24:39.7324815+08:00;True|2022-11-22T13:18:16.2143925+08:00;False|2022-11-22T13:12:53.0448580+08:00;True|2022-11-22T11:03:01.7571733+08:00;True|2022-11-21T13:20:11.1961237+08:00;True|2022-11-21T13:13:52.0360749+08:00;True|2022-11-18T15:48:13.0747365+08:00;True|2022-11-18T14:15:54.5626901+08:00;True|2022-11-17T18:41:26.5464503+08:00;True|2022-11-15T13:55:35.3496366+08:00;True|2022-11-15T11:03:23.6773297+08:00;True|2022-11-15T10:58:47.9703720+08:00;True|2022-11-15T10:12:27.8305782+08:00;True|2022-11-15T09:47:26.7480777+08:00;True|2022-11-15T08:55:44.0275263+08:00;True|2022-11-15T08:54:06.6396851+08:00;True|2022-11-15T08:44:18.2013404+08:00;True|2022-11-15T01:16:19.8154538+08:00;True|2022-11-15T01:15:03.7846810+08:00;True|2022-11-15T01:01:11.0318599+08:00;True|2022-11-15T00:30:33.7148460+08:00;True|2022-11-15T00:15:26.5178283+08:00;True|2022-11-14T23:54:32.6128172+08:00;True|2022-11-14T23:26:52.0335380+08:00;True|2022-11-14T22:21:28.0622050+08:00;True|2022-11-14T21:47:43.6964619+08:00;True|2022-11-14T21:41:42.3128804+08:00;True|2022-11-14T21:31:17.2784203+08:00;True|2022-11-14T20:48:20.0380343+08:00;True|2022-11-11T17:24:44.7029993+08:00;True|2022-11-11T16:47:29.3444029+08:00;True|2022-11-11T16:07:26.4718473+08:00;True|2022-11-11T15:52:41.7235701+08:00;True|2022-11-10T15:58:10.8883176+08:00;True|2022-11-10T15:29:59.3113740+08:00;True|2022-11-10T13:34:14.7380132+08:00;True|2022-11-10T10:28:02.1166569+08:00;True|2022-11-09T23:28:25.6401971+08:00;True|2022-11-09T16:20:53.2757536+08:00;True|2022-11-09T16:16:41.3169214+08:00;True|2022-11-09T14:02:55.1802832+08:00;True|2022-11-09T13:57:55.2726154+08:00;True|2022-11-09T13:28:53.2022669+08:00;True|2022-11-09T13:10:58.0740163+08:00;True|2022-11-09T12:59:42.2328933+08:00;True|2022-11-09T11:54:08.0187924+08:00;True|2022-11-09T11:49:32.4296758+08:00;True|2022-11-09T11:34:32.6613370+08:00;True|2022-11-09T11:06:56.9443306+08:00;True|2022-11-06T23:43:44.0833657+08:00;True|2022-11-06T23:29:52.0088244+08:00;True|2022-11-06T22:06:14.7091464+08:00;True|2022-11-06T22:03:25.2696951+08:00;True|2022-11-06T21:58:50.1055520+08:00;True|2022-11-06T21:54:14.0075395+08:00;True|2022-11-06T21:39:30.2652105+08:00;True|2022-11-04T15:54:37.9813194+08:00;True|2022-11-04T15:43:59.7702621+08:00;True|2022-11-04T13:59:29.3941234+08:00;True|2022-11-04T13:44:18.1212719+08:00;True|2022-11-04T13:42:06.1010393+08:00;True|2022-11-04T13:37:01.7814703+08:00;True|2022-11-04T13:35:43.1121709+08:00;True|2022-11-04T13:33:05.1362535+08:00;True|2022-11-04T13:30:11.1113703+08:00;True|2022-11-04T13:28:53.7185382+08:00;True|2022-11-04T13:27:08.0691684+08:00;True|2022-11-04T13:20:46.2297633+08:00;True|2022-11-04T13:17:57.1564250+08:00;True|2022-11-04T13:15:36.3651019+08:00;True|2022-11-04T13:13:44.6635701+08:00;True|2022-11-04T13:12:02.3968306+08:00;True|2022-11-04T13:08:07.7653927+08:00;True|2022-11-04T11:37:44.1975649+08:00;True|2022-11-04T11:36:20.3813848+08:00;True|2022-11-04T11:26:40.9713465+08:00;True|2022-11-04T10:17:36.4269558+08:00;True|2022-11-04T09:47:05.4607111+08:00;True|2022-11-04T09:28:27.9347785+08:00;True|2022-11-04T08:38:38.5253737+08:00;True|2022-11-03T13:31:32.7883545+08:00;False|2022-11-03T13:27:07.8579021+08:00;True|2022-11-03T11:07:07.3903101+08:00;True|2022-11-03T10:54:26.7818816+08:00;True|2022-11-03T10:35:59.1956262+08:00;True|2022-11-03T10:30:07.0651285+08:00;True|2022-11-03T10:01:20.8467911+08:00;True|2022-08-22T11:13:33.9211829+08:00;True|2022-06-17T11:19:24.4893458+08:00;True|2022-06-07T14:44:51.5702202+08:00;True|2022-06-07T14:42:44.8351600+08:00;True|2022-05-17T14:19:55.1158182+08:00;True|2022-05-17T13:25:44.2886247+08:00;True|2022-05-17T10:29:26.6813564+08:00;True|2022-05-17T09:02:49.1742018+08:00;True|2022-05-06T15:13:12.2438900+08:00;True|2022-05-06T14:49:39.8536594+08:00;True|2022-04-22T17:07:44.8823529+08:00;True|2022-04-19T19:13:40.8312746+08:00;True|2022-04-19T15:40:16.0022040+08:00;True|2022-04-19T15:13:32.9767736+08:00;False|2022-04-19T15:08:33.6507639+08:00;True|2022-04-19T15:02:51.9580210+08:00;True|2022-04-19T13:54:18.7579131+08:00;True|2022-04-12T10:36:02.1779173+08:00;True|2022-04-12T10:05:31.0222037+08:00;True|2022-04-12T09:47:49.3724819+08:00;True|2022-04-09T15:08:54.5697468+08:00;True|2022-04-08T17:31:31.0046258+08:00;True|2022-04-08T16:50:41.3018422+08:00;True|2022-04-08T10:35:36.5029980+08:00;True|2022-03-31T09:38:37.3646053+08:00;True|2022-03-29T13:57:45.4410942+08:00;True|2022-03-10T18:59:23.7994337+08:00;True|2022-03-10T18:52:39.5019082+08:00;True|2022-03-10T18:51:12.7949284+08:00;True|2022-03-10T18:50:47.2024177+08:00;True|2022-03-10T18:45:08.8409380+08:00;True|2022-03-10T18:41:17.0102564+08:00;True|2022-03-10T18:35:49.0742353+08:00;True|2022-03-10T17:57:47.4196965+08:00;True|2022-03-10T17:34:27.5723245+08:00;True|2022-03-10T16:13:59.3829164+08:00;True|2022-03-09T14:50:49.1222033+08:00;True|2022-03-09T11:21:03.0073651+08:00;False|2022-03-09T11:16:56.1792896+08:00;False|2022-03-09T11:16:49.7923320+08:00;True|2022-03-08T15:47:47.4722336+08:00;True|2022-03-08T15:47:28.5397115+08:00;True|2022-03-08T15:37:08.7379870+08:00;True|2022-03-02T17:37:54.4659976+08:00;True|2022-03-02T17:34:12.2949726+08:00;True|2022-03-02T17:26:38.7070673+08:00;True|2022-03-02T17:07:49.7024316+08:00;True|2022-03-02T17:05:22.4177336+08:00;True|2022-03-02T16:14:57.9880587+08:00;True|2022-03-01T17:52:52.6766959+08:00;True|2022-02-28T14:36:22.6449303+08:00;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
->>>>>>> 585e3021b7ed52a1884dc563c627177783a7e97b
+ <History>True|2025-12-25T01:47:31.7968459Z;True|2025-12-25T09:43:32.4013731+08:00;False|2025-12-25T09:42:54.8820662+08:00;True|2025-12-17T10:26:48.8234300+08:00;True|2025-12-17T10:12:06.6418461+08:00;False|2025-12-17T10:10:27.1500572+08:00;True|2025-12-16T16:37:43.2675887+08:00;False|2025-12-16T16:37:07.1445745+08:00;True|2025-12-16T16:19:15.9939619+08:00;True|2025-12-16T16:11:21.5317233+08:00;False|2025-12-16T16:09:03.3480811+08:00;True|2025-12-15T15:52:23.2171057+08:00;False|2025-12-15T15:47:38.0568890+08:00;True|2025-12-10T17:20:39.5982655+08:00;False|2025-12-10T17:17:43.4541161+08:00;True|2025-09-18T10:41:20.2798392+08:00;False|2025-09-18T10:39:06.5228618+08:00;True|2025-09-18T09:52:57.6301177+08:00;False|2025-09-18T09:52:47.3037996+08:00;True|2025-09-17T17:05:24.5224152+08:00;False|2025-09-17T17:04:58.8883167+08:00;True|2025-09-17T11:00:50.8000254+08:00;False|2025-09-17T11:00:40.1836384+08:00;True|2025-09-10T08:26:46.9605753+08:00;False|2025-09-10T08:26:40.3385273+08:00;True|2025-09-09T15:25:39.9311084+08:00;True|2025-09-09T13:03:12.0756515+08:00;True|2025-09-09T12:56:09.8729182+08:00;True|2025-09-09T10:51:18.6323732+08:00;True|2025-09-09T10:39:52.6011470+08:00;False|2025-09-09T10:33:53.8003825+08:00;True|2025-09-05T13:47:08.0944867+08:00;False|2025-09-05T13:46:12.5485302+08:00;True|2025-09-04T13:48:02.8051977+08:00;False|2025-09-04T13:47:53.2802035+08:00;True|2025-09-03T18:39:26.1332777+08:00;True|2025-09-03T18:20:22.4934269+08:00;False|2025-09-03T18:20:13.8667227+08:00;True|2025-09-02T16:12:00.2274762+08:00;True|2025-09-02T15:35:26.3909085+08:00;False|2025-09-02T15:35:09.4393740+08:00;True|2025-09-01T08:47:17.0454342+08:00;False|2025-09-01T08:45:40.7879170+08:00;True|2025-08-29T15:54:08.5149695+08:00;True|2025-08-29T09:22:35.2179291+08:00;False|2025-08-29T09:22:27.4927662+08:00;True|2025-08-26T14:46:50.1212861+08:00;True|2025-08-26T14:40:54.1072746+08:00;True|2025-08-26T14:37:14.2139355+08:00;True|2025-08-26T12:01:11.1189796+08:00;True|2025-08-26T11:54:47.2021440+08:00;True|2025-08-26T11:49:47.5991764+08:00;True|2025-08-26T11:33:02.0942557+08:00;False|2025-08-26T11:32:54.2592669+08:00;True|2025-08-25T11:49:31.4870909+08:00;False|2025-08-25T11:49:24.9199834+08:00;True|2025-08-23T10:40:03.4354114+08:00;True|2025-08-23T10:00:38.3940426+08:00;False|2025-08-23T10:00:29.6119379+08:00;False|2025-08-22T22:57:21.2783621+08:00;True|2025-08-22T17:22:26.6012072+08:00;True|2025-08-22T16:57:41.8592690+08:00;False|2025-08-22T16:57:30.5555900+08:00;True|2025-08-19T17:11:59.8763854+08:00;False|2025-08-19T17:11:47.8353587+08:00;True|2025-08-19T16:19:06.3815378+08:00;False|2025-08-19T16:18:53.7096338+08:00;True|2025-08-18T13:19:25.9723571+08:00;False|2025-08-18T13:16:01.4105292+08:00;True|2025-08-16T00:13:21.9700042+08:00;False|2025-08-16T00:11:33.3863026+08:00;True|2025-08-15T23:08:34.0110238+08:00;False|2025-08-15T23:06:21.6309395+08:00;True|2025-08-07T17:19:57.6386527+08:00;False|2025-08-07T17:17:34.5522859+08:00;True|2025-07-29T15:53:42.7268834+08:00;False|2025-07-29T15:51:20.7915637+08:00;True|2025-07-26T12:55:43.4400544+08:00;False|2025-07-26T12:53:36.0616448+08:00;True|2025-07-25T18:25:41.8239453+08:00;True|2025-07-25T18:01:10.6254788+08:00;True|2025-07-25T14:28:52.8690060+08:00;False|2025-07-25T14:13:46.4148339+08:00;True|2025-07-16T15:43:25.2534569+08:00;True|2025-07-16T15:24:52.9969412+08:00;False|2025-07-16T15:22:55.3654100+08:00;True|2025-07-15T17:05:36.6478560+08:00;False|2025-07-15T17:02:17.4260705+08:00;True|2025-07-14T13:52:18.8459994+08:00;True|2025-07-14T13:48:19.0105537+08:00;False|2025-07-14T13:46:49.4038358+08:00;False|2025-07-10T14:16:35.2809623+08:00;False|2025-07-10T14:14:51.7758457+08:00;False|2025-07-10T14:14:36.5501099+08:00;False|2025-07-10T14:14:02.2363862+08:00;True|2025-07-07T18:50:30.7867050+08:00;False|2025-07-07T18:47:15.6387529+08:00;False|2025-06-30T15:14:55.9800245+08:00;True|2025-06-24T13:14:17.3173717+08:00;True|2025-06-24T13:10:46.7305152+08:00;True|2025-06-24T13:07:14.9336201+08:00;True|2025-06-24T11:17:29.1465402+08:00;True|2025-06-24T11:05:06.9843355+08:00;False|2025-06-24T11:05:00.5024005+08:00;True|2025-06-23T14:48:15.1693047+08:00;True|2025-06-23T14:45:12.4631189+08:00;True|2025-06-23T14:33:08.3987412+08:00;False|2025-06-23T14:33:02.8486336+08:00;True|2025-06-23T10:11:37.1688411+08:00;False|2025-06-23T10:10:19.3935582+08:00;True|2025-06-17T08:06:56.2515052+08:00;True|2025-06-17T08:03:40.1954689+08:00;False|2025-06-17T08:03:33.0012043+08:00;True|2025-06-16T17:04:54.4138980+08:00;True|2025-06-16T16:59:05.9331013+08:00;True|2025-06-16T16:51:47.5631962+08:00;True|2025-06-16T15:17:39.2922900+08:00;True|2025-06-16T10:38:18.3048926+08:00;False|2025-06-16T10:37:59.4675787+08:00;True|2025-06-13T09:01:17.9321837+08:00;False|2025-06-13T08:59:04.5979301+08:00;False|2025-06-13T08:59:01.9805490+08:00;True|2025-06-13T08:56:29.5270273+08:00;False|2025-06-13T08:53:18.9572756+08:00;False|2025-06-13T08:53:06.3695780+08:00;False|2025-06-13T08:53:01.9064985+08:00;True|2025-06-13T08:49:41.5192055+08:00;True|2025-06-13T08:45:33.7544056+08:00;True|2025-06-13T08:40:40.7377156+08:00;False|2025-06-13T08:39:06.9984945+08:00;False|2025-06-13T08:38:53.7654421+08:00;True|2025-06-13T08:36:54.1958073+08:00;True|2025-06-13T08:28:46.2608858+08:00;True|2025-06-13T08:21:30.1336656+08:00;False|2025-06-13T08:20:51.0814327+08:00;True|2025-06-12T16:52:14.0135723+08:00;True|2025-06-12T16:43:42.1233335+08:00;True|2025-06-12T16:32:50.7737857+08:00;True|2025-06-12T16:30:35.2094777+08:00;True|2025-06-12T16:29:17.1397493+08:00;True|2025-06-12T14:09:13.4515329+08:00;False|2025-06-12T14:07:40.0063885+08:00;True|2024-08-16T09:32:12.4453203+08:00;True|2024-08-15T17:00:45.6076539+08:00;True|2024-08-15T16:56:11.0376497+08:00;True|2024-08-15T15:20:25.6712652+08:00;True|2024-08-12T15:39:44.2226127+08:00;True|2024-08-12T09:16:29.1745128+08:00;True|2024-08-08T10:31:58.5649180+08:00;True|2024-08-08T08:15:09.1193918+08:00;False|2024-08-08T08:14:02.5199272+08:00;True|2024-08-01T09:43:43.6784774+08:00;True|2024-08-01T09:40:02.4079567+08:00;True|2024-08-01T09:35:04.9124938+08:00;True|2024-08-01T08:28:31.1169790+08:00;True|2024-07-31T16:28:57.1998735+08:00;True|2024-07-31T15:45:55.8662513+08:00;True|2024-07-31T14:26:15.2233690+08:00;True|2024-07-31T14:21:11.7562937+08:00;True|2024-07-31T14:17:38.4767888+08:00;True|2024-07-30T14:54:15.0857651+08:00;True|2024-07-30T10:36:44.3196154+08:00;True|2024-07-30T10:33:47.9939196+08:00;True|2024-07-30T08:24:50.6533897+08:00;True|2024-07-30T08:14:40.6316443+08:00;True|2024-07-29T16:45:55.2924546+08:00;True|2024-07-29T14:38:29.4404460+08:00;True|2024-07-29T14:30:16.8621054+08:00;True|2024-07-29T10:35:00.7076482+08:00;True|2024-07-29T10:24:39.9808538+08:00;True|2024-07-29T10:15:01.4868159+08:00;True|2024-07-29T10:05:43.2636977+08:00;False|2024-07-29T10:05:09.6693126+08:00;True|2024-07-26T14:38:44.1514082+08:00;True|2024-07-25T16:35:47.6323299+08:00;True|2024-07-25T15:58:51.9114716+08:00;True|2024-07-25T15:38:57.7661457+08:00;True|2024-07-25T13:57:30.2286832+08:00;True|2024-07-25T11:21:08.5619866+08:00;True|2024-07-24T08:13:20.3643753+08:00;True|2024-07-22T11:29:48.3793112+08:00;True|2024-07-18T07:54:11.8093513+08:00;False|2024-07-11T20:03:42.7691659+08:00;True|2024-07-11T14:57:48.5724072+08:00;True|2024-07-11T13:34:59.3808490+08:00;True|2024-07-11T13:29:39.6653752+08:00;True|2024-07-11T11:25:43.0064657+08:00;True|2024-07-11T11:03:52.2243070+08:00;True|2024-07-11T10:57:55.3634360+08:00;True|2024-07-11T10:55:17.3989127+08:00;True|2024-07-11T10:53:11.1279865+08:00;True|2024-07-11T10:49:35.5725210+08:00;True|2024-07-10T16:36:17.0590402+08:00;True|2024-07-10T16:09:12.7215230+08:00;True|2024-07-10T09:06:06.6122865+08:00;True|2024-07-10T08:58:59.2321344+08:00;False|2024-07-10T08:58:29.3335548+08:00;True|2024-07-09T15:53:30.3772131+08:00;True|2024-07-09T15:37:33.0710407+08:00;True|2024-07-09T11:27:46.2165607+08:00;True|2024-07-09T10:40:47.2074513+08:00;True|2024-07-09T10:17:03.9180076+08:00;True|2024-07-08T16:06:01.1344634+08:00;True|2024-07-08T13:33:47.3535952+08:00;True|2024-07-04T15:51:48.1760451+08:00;True|2024-07-04T15:49:15.1000691+08:00;True|2024-07-04T15:05:00.4478900+08:00;True|2024-07-04T13:12:24.9294846+08:00;True|2024-07-04T09:06:52.4883805+08:00;True|2024-07-04T08:58:25.4069888+08:00;True|2024-07-03T17:06:10.1893662+08:00;True|2024-07-03T10:48:38.3910245+08:00;True|2024-07-03T10:24:59.3744052+08:00;True|2024-07-03T09:26:05.1371941+08:00;True|2024-07-03T09:19:07.9195348+08:00;True|2024-07-03T09:10:32.1837100+08:00;True|2024-07-02T16:44:49.8694946+08:00;False|2024-07-02T16:44:19.1893536+08:00;True|2024-07-02T13:53:28.4262842+08:00;True|2024-07-02T13:34:27.7478080+08:00;True|2024-06-28T11:58:25.6532295+08:00;True|2024-06-28T11:46:38.1547999+08:00;True|2024-06-28T11:41:20.7737151+08:00;True|2024-06-28T11:39:56.7636352+08:00;True|2024-06-28T11:26:10.3582659+08:00;True|2024-06-28T11:02:05.7702621+08:00;True|2024-06-28T10:23:08.4165999+08:00;True|2024-06-27T21:02:20.9289634+08:00;True|2024-06-27T15:44:07.3125345+08:00;True|2024-06-27T15:41:49.5015439+08:00;True|2024-06-27T15:39:21.1879348+08:00;True|2024-06-26T20:46:59.4747014+08:00;True|2024-06-26T20:42:59.3192496+08:00;True|2024-06-26T17:24:29.0121504+08:00;True|2024-06-25T20:03:09.4001117+08:00;True|2024-06-25T13:23:02.0928195+08:00;True|2024-06-20T15:39:47.3427120+08:00;True|2024-06-20T15:11:19.3766436+08:00;True|2024-06-20T15:02:38.8825341+08:00;True|2024-06-20T14:14:33.8431830+08:00;True|2024-06-20T14:10:14.6375855+08:00;True|2024-06-20T14:05:08.8218199+08:00;True|2024-06-20T13:58:23.3085838+08:00;True|2024-06-20T13:47:50.8475268+08:00;True|2024-06-20T10:41:38.1805408+08:00;True|2024-06-20T10:36:20.0215771+08:00;True|2024-06-20T10:30:18.5030326+08:00;True|2024-06-20T10:27:24.0723174+08:00;True|2024-06-20T10:14:49.3084076+08:00;True|2024-06-19T11:22:25.9638091+08:00;True|2024-06-19T11:14:32.9224254+08:00;True|2024-06-19T11:10:09.7376610+08:00;True|2024-06-19T10:49:20.4465588+08:00;True|2024-06-19T10:36:57.1639231+08:00;True|2024-06-11T14:41:11.8639568+08:00;True|2024-06-07T16:18:01.8672070+08:00;True|2024-06-07T15:58:33.8827805+08:00;True|2024-06-07T14:15:58.8759776+08:00;False|2024-06-07T11:11:44.5669069+08:00;True|2024-06-07T10:02:50.1266977+08:00;True|2024-06-07T09:49:53.1460072+08:00;True|2024-06-07T09:48:38.1399118+08:00;True|2024-06-07T08:38:41.8354576+08:00;True|2024-06-07T08:30:23.1369397+08:00;True|2024-06-06T12:59:50.5625799+08:00;True|2024-06-06T10:31:30.2337440+08:00;True|2024-06-06T10:25:28.1353268+08:00;True|2024-06-05T17:02:30.6367920+08:00;True|2024-06-05T16:55:31.1762741+08:00;True|2024-06-05T16:46:00.6507154+08:00;True|2024-06-05T13:36:04.5422998+08:00;True|2024-06-05T13:18:09.8841001+08:00;True|2024-06-05T10:21:42.5518509+08:00;False|2024-06-05T10:08:44.4622592+08:00;True|2024-06-05T08:50:04.4599368+08:00;True|2024-06-05T08:35:12.4434623+08:00;True|2024-06-04T16:17:31.9354255+08:00;True|2024-06-04T15:19:09.2382571+08:00;True|2024-06-04T14:55:11.4221703+08:00;True|2024-06-04T10:47:15.3458246+08:00;True|2024-05-31T15:57:19.8208236+08:00;True|2024-05-31T15:22:42.1789930+08:00;True|2024-05-31T15:13:09.3310754+08:00;True|2024-05-31T15:07:27.2528961+08:00;True|2024-05-31T14:46:54.7960188+08:00;True|2024-05-31T14:34:13.9077799+08:00;True|2024-05-31T14:05:03.8345173+08:00;True|2024-05-31T12:52:38.8326102+08:00;True|2024-05-31T10:29:32.0441427+08:00;True|2024-05-31T10:08:48.0021543+08:00;True|2024-05-31T09:43:32.2488411+08:00;True|2024-05-30T16:29:38.6305342+08:00;True|2024-05-30T16:16:08.3671859+08:00;True|2024-05-30T16:00:42.8690838+08:00;True|2024-05-30T15:07:20.8506508+08:00;True|2024-05-30T14:28:44.1018902+08:00;True|2024-05-30T14:14:25.3034479+08:00;True|2024-05-30T13:36:02.4352359+08:00;True|2024-05-29T13:45:51.8854629+08:00;True|2024-05-28T08:33:52.1977980+08:00;True|2024-05-27T16:00:53.4656146+08:00;True|2024-05-27T10:43:46.1023173+08:00;True|2024-05-27T09:14:09.4690569+08:00;False|2024-05-27T09:09:16.7204665+08:00;False|2024-05-27T08:51:21.5199349+08:00;False|2024-05-27T08:35:49.4339724+08:00;False|2024-05-27T08:29:02.9972247+08:00;True|2024-05-24T14:24:09.8444039+08:00;True|2024-05-24T10:52:44.4487225+08:00;True|2024-05-23T16:36:02.2415058+08:00;True|2024-05-23T13:43:27.7682349+08:00;True|2024-05-23T13:41:26.5710135+08:00;True|2024-05-23T13:25:30.0501860+08:00;True|2024-05-23T13:01:01.8142912+08:00;True|2024-05-22T11:27:52.3476712+08:00;True|2024-04-28T11:08:24.9627592+08:00;True|2024-04-28T09:08:43.2454678+08:00;True|2024-04-09T13:59:05.4840966+08:00;True|2024-04-09T13:32:04.5173492+08:00;True|2024-04-09T10:49:57.0288282+08:00;True|2024-04-09T10:35:48.8906018+08:00;True|2024-04-08T13:40:57.0220970+08:00;True|2024-04-08T13:07:43.0357658+08:00;True|2024-04-08T08:51:13.3450522+08:00;True|2024-04-07T17:08:21.7140078+08:00;True|2024-04-07T16:20:47.0957220+08:00;True|2024-04-07T15:40:03.2944629+08:00;True|2024-04-07T15:36:39.8472773+08:00;True|2024-04-07T15:27:41.4586445+08:00;True|2024-04-07T15:24:44.9945335+08:00;True|2024-04-07T15:21:05.5907054+08:00;True|2024-04-07T14:18:24.9260992+08:00;True|2024-04-02T15:07:56.8405115+08:00;True|2024-03-28T09:57:40.6534155+08:00;True|2024-03-26T17:00:21.0687635+08:00;True|2024-03-26T16:55:53.0643450+08:00;True|2024-03-26T16:50:09.5271078+08:00;True|2024-03-26T16:35:58.3572743+08:00;True|2024-03-26T16:17:50.6562874+08:00;True|2024-03-26T16:02:58.7193861+08:00;True|2024-03-26T15:51:50.2451468+08:00;True|2024-03-26T15:38:02.2327749+08:00;True|2024-03-26T14:43:01.5314209+08:00;True|2024-03-26T14:36:32.9149121+08:00;True|2024-03-26T14:29:28.7806186+08:00;True|2024-03-26T14:11:55.5737213+08:00;True|2024-03-22T16:35:11.0518345+08:00;True|2024-03-21T15:56:07.0130392+08:00;True|2024-03-20T10:50:05.8645964+08:00;True|2024-03-19T15:59:58.2960231+08:00;True|2024-03-19T15:16:32.3388913+08:00;True|2024-03-19T14:51:16.6428107+08:00;True|2024-03-19T14:36:08.8885745+08:00;False|2024-03-19T14:34:44.2637614+08:00;True|2024-03-19T14:22:40.5900691+08:00;True|2024-03-19T14:02:08.9599381+08:00;True|2024-03-19T12:23:05.0332761+08:00;True|2024-03-19T11:53:43.6830010+08:00;True|2024-03-19T11:40:05.7903841+08:00;True|2024-03-15T20:49:17.5076444+08:00;True|2024-03-15T14:00:52.3630660+08:00;True|2024-03-15T12:47:34.8092587+08:00;True|2024-03-15T09:58:23.5517006+08:00;True|2024-03-13T15:28:48.6170490+08:00;True|2024-03-13T13:33:44.3051955+08:00;True|2024-03-13T13:25:15.0372313+08:00;True|2024-03-13T11:59:44.2551502+08:00;True|2024-03-13T11:49:04.7295629+08:00;True|2024-03-13T11:27:27.5893712+08:00;True|2024-03-13T11:12:33.2533839+08:00;True|2024-03-13T11:07:52.7174473+08:00;True|2024-03-13T09:34:08.0467534+08:00;True|2024-03-12T16:24:41.1248271+08:00;True|2024-03-12T12:57:34.1524922+08:00;True|2024-03-12T12:57:10.0401874+08:00;True|2024-03-12T12:37:38.8477356+08:00;True|2024-03-12T12:15:41.3846937+08:00;True|2024-03-12T11:42:00.2207406+08:00;True|2024-03-12T11:33:55.6697043+08:00;True|2024-03-12T11:05:02.7742504+08:00;True|2024-03-12T09:20:07.0762374+08:00;True|2024-03-11T23:16:36.7669114+08:00;True|2024-03-11T23:03:24.2725545+08:00;True|2024-03-11T22:49:15.9602661+08:00;True|2024-03-11T22:47:12.6755805+08:00;True|2024-03-11T17:00:27.3523033+08:00;True|2024-03-11T16:58:40.0175971+08:00;True|2024-03-11T16:44:38.6622087+08:00;True|2024-03-11T12:49:04.1659271+08:00;True|2024-03-11T12:34:46.2212554+08:00;True|2024-03-11T12:04:40.4848855+08:00;True|2024-03-11T11:58:33.1825785+08:00;True|2024-03-11T11:40:10.6536678+08:00;True|2024-03-11T09:04:20.1073972+08:00;True|2024-03-11T00:16:54.5372850+08:00;True|2024-03-11T00:13:59.7140451+08:00;True|2024-03-11T00:08:20.0809329+08:00;True|2024-03-10T23:51:03.0931056+08:00;True|2024-03-10T23:43:22.2299872+08:00;True|2024-03-10T23:31:27.0629130+08:00;True|2024-03-10T22:56:31.1232852+08:00;True|2024-03-10T22:36:41.8541660+08:00;True|2024-03-10T22:15:06.0859435+08:00;True|2024-03-10T21:44:04.4157994+08:00;True|2024-03-10T21:35:38.3813654+08:00;True|2024-03-10T21:21:19.7693278+08:00;True|2024-03-10T13:19:26.4221274+08:00;True|2024-03-08T16:42:34.3346854+08:00;True|2024-03-08T15:50:13.7379672+08:00;True|2024-03-08T15:44:16.4369842+08:00;True|2024-03-08T15:31:50.0622199+08:00;True|2024-03-08T14:26:09.1090416+08:00;True|2024-03-08T14:21:24.9470581+08:00;True|2024-03-08T14:17:32.2780390+08:00;True|2024-03-08T14:03:55.4922720+08:00;True|2024-03-08T13:57:55.4217170+08:00;True|2024-03-08T13:53:43.0935554+08:00;True|2024-03-08T12:54:18.4199897+08:00;True|2024-03-08T12:48:07.6789814+08:00;True|2024-03-08T12:38:48.2818977+08:00;True|2024-03-08T12:21:53.9153553+08:00;True|2024-03-08T12:06:46.9343077+08:00;True|2024-03-08T11:27:39.0237720+08:00;True|2024-03-08T10:59:31.7184492+08:00;True|2024-03-08T10:57:44.8205869+08:00;True|2024-03-08T10:47:27.6962408+08:00;True|2024-03-08T10:29:25.8508156+08:00;True|2024-03-08T10:23:30.0269659+08:00;True|2024-03-08T09:21:21.5915181+08:00;True|2024-03-08T09:16:30.6962592+08:00;True|2024-03-07T17:01:33.5406097+08:00;True|2024-03-07T16:52:05.1956454+08:00;True|2024-03-07T16:41:54.0594859+08:00;True|2024-03-07T16:33:14.5796954+08:00;True|2024-03-07T16:02:27.6565800+08:00;True|2024-03-07T15:45:18.3220942+08:00;True|2024-03-07T15:39:48.9700962+08:00;True|2024-03-07T15:35:21.4018654+08:00;True|2024-03-07T15:22:12.7348197+08:00;True|2024-03-07T15:19:49.2338225+08:00;True|2024-03-07T13:46:05.5084885+08:00;True|2024-03-07T13:42:41.9749496+08:00;True|2024-03-07T13:26:04.1927588+08:00;True|2024-03-07T13:04:29.8689660+08:00;True|2024-03-07T10:24:34.3368602+08:00;True|2024-03-07T09:18:28.2279706+08:00;True|2024-03-06T17:25:36.9409421+08:00;True|2024-03-06T17:04:06.6361562+08:00;True|2024-03-06T14:42:01.3198359+08:00;True|2024-03-06T12:10:29.5231191+08:00;True|2024-03-06T12:03:06.7428246+08:00;True|2024-03-06T11:51:03.6220101+08:00;True|2024-03-06T11:15:22.4977600+08:00;True|2024-03-06T09:38:13.9161080+08:00;True|2024-03-05T16:37:49.9679062+08:00;True|2024-03-05T15:12:23.1933204+08:00;True|2024-03-05T14:51:27.9123344+08:00;True|2024-03-05T12:42:45.6186917+08:00;True|2024-03-05T11:21:19.0499458+08:00;True|2024-03-05T11:07:43.2642432+08:00;True|2024-03-05T09:59:18.0467522+08:00;True|2024-03-05T09:57:25.8947310+08:00;True|2024-03-04T16:41:44.4465908+08:00;True|2024-03-04T16:27:02.5887336+08:00;True|2024-03-04T16:20:05.0027599+08:00;True|2024-03-04T16:19:26.5595399+08:00;True|2024-03-04T15:32:55.6131853+08:00;True|2024-03-04T15:28:44.2800619+08:00;True|2024-03-04T14:54:47.0567440+08:00;True|2024-03-04T10:23:15.8222065+08:00;True|2024-03-03T17:36:33.1017612+08:00;True|2024-03-03T16:51:26.3227366+08:00;True|2024-02-26T09:58:28.3684127+08:00;True|2024-02-26T09:40:27.2127438+08:00;True|2024-02-26T09:30:29.4139007+08:00;True|2024-02-26T08:58:31.6305017+08:00;True|2024-02-26T08:50:25.3686785+08:00;True|2024-02-25T22:42:22.6699571+08:00;True|2024-02-25T21:40:08.7124742+08:00;True|2024-02-23T16:33:06.9165845+08:00;True|2024-02-23T15:20:24.6631954+08:00;True|2024-02-22T13:35:39.8097749+08:00;True|2024-02-22T10:50:51.2245040+08:00;True|2024-02-22T10:37:36.2007251+08:00;True|2024-02-22T10:28:43.0780061+08:00;True|2024-02-22T10:25:14.6494230+08:00;True|2024-02-22T10:22:55.9164843+08:00;True|2024-02-22T10:20:22.7986646+08:00;True|2024-02-22T10:09:31.7828474+08:00;True|2024-02-22T09:52:49.6576546+08:00;True|2024-02-22T09:49:40.2304782+08:00;True|2024-02-22T09:11:37.5212025+08:00;False|2024-02-22T09:11:00.5740908+08:00;True|2024-02-22T09:08:58.7725741+08:00;True|2024-02-21T16:50:09.9380590+08:00;True|2024-02-21T16:25:03.2145943+08:00;True|2024-02-21T16:23:13.6740659+08:00;True|2024-02-21T16:17:53.0411127+08:00;True|2024-02-21T15:57:47.2254175+08:00;True|2024-02-21T15:10:17.2222102+08:00;True|2024-02-21T15:05:10.2464943+08:00;True|2024-02-21T14:27:06.5305080+08:00;True|2024-02-21T14:23:20.9423346+08:00;True|2024-02-21T14:10:37.5156508+08:00;True|2024-02-21T13:54:04.4018306+08:00;True|2024-02-21T08:47:17.0019565+08:00;True|2024-02-20T16:26:31.2412659+08:00;True|2024-02-20T16:23:36.2983740+08:00;True|2024-02-20T16:20:39.9515902+08:00;True|2024-02-20T15:46:12.8212665+08:00;True|2024-02-20T14:58:17.4600086+08:00;True|2024-02-20T10:45:52.2417786+08:00;True|2024-02-20T10:42:11.8298929+08:00;True|2024-02-19T13:06:24.8957799+08:00;True|2024-02-19T11:05:28.0139278+08:00;True|2024-02-19T10:27:01.0810368+08:00;True|2024-02-19T10:22:57.4053027+08:00;True|2024-02-19T10:15:48.5706154+08:00;True|2024-02-19T10:12:02.9076965+08:00;True|2024-02-18T14:57:44.7521494+08:00;True|2024-02-18T14:50:56.3550941+08:00;True|2024-02-18T13:36:49.3942430+08:00;True|2024-02-07T14:06:25.4964506+08:00;True|2024-02-07T10:42:52.2689528+08:00;True|2024-02-06T10:58:49.3342902+08:00;True|2024-02-06T10:53:42.5435511+08:00;True|2024-02-06T10:43:40.1003756+08:00;True|2024-02-06T10:40:46.8233200+08:00;True|2024-02-06T10:17:28.2865591+08:00;True|2024-02-06T10:14:31.6896095+08:00;True|2024-02-06T09:24:29.8745590+08:00;True|2024-02-06T09:20:58.3166183+08:00;True|2024-02-06T09:12:14.4841167+08:00;True|2024-02-06T09:05:10.5375167+08:00;True|2024-02-05T14:51:09.8954604+08:00;True|2024-02-05T14:30:01.0098544+08:00;True|2024-02-05T14:26:49.2548141+08:00;True|2024-02-05T14:05:18.6839229+08:00;True|2024-02-05T13:23:42.1639710+08:00;True|2024-02-05T08:39:07.5523831+08:00;True|2024-02-04T15:09:19.2455417+08:00;True|2024-02-04T13:27:46.2086590+08:00;True|2024-02-04T13:25:20.9639903+08:00;True|2024-02-04T13:20:32.2870983+08:00;True|2024-02-04T13:15:58.3909970+08:00;True|2024-02-04T11:18:59.5180822+08:00;True|2024-02-04T11:07:31.1414636+08:00;True|2024-02-04T11:03:38.8431285+08:00;True|2024-02-04T11:00:42.8307675+08:00;True|2024-02-04T10:59:07.3767796+08:00;True|2024-02-04T10:55:27.9454328+08:00;True|2024-02-04T10:52:29.5988914+08:00;True|2024-02-04T10:50:30.6883153+08:00;True|2024-02-04T10:38:13.0058874+08:00;True|2024-02-04T10:25:53.1906810+08:00;True|2024-02-04T10:14:51.7442720+08:00;True|2024-02-04T10:12:34.4696662+08:00;True|2024-02-04T10:08:56.5805097+08:00;True|2024-02-04T10:07:16.4922026+08:00;True|2024-02-04T09:59:27.2102397+08:00;True|2024-02-04T09:56:42.2238395+08:00;True|2024-02-04T09:52:47.5348300+08:00;True|2024-02-04T09:42:50.9349205+08:00;True|2024-02-04T09:30:32.3567175+08:00;True|2024-02-04T09:19:29.8036670+08:00;True|2024-02-04T09:11:56.0744927+08:00;True|2024-02-04T09:08:42.4432795+08:00;True|2024-02-04T09:05:25.4958302+08:00;True|2024-02-04T08:58:59.7993464+08:00;True|2024-02-04T08:51:20.3017735+08:00;True|2024-02-04T08:43:05.6974823+08:00;True|2024-02-02T16:12:24.3288882+08:00;True|2024-02-02T15:31:12.0724234+08:00;True|2024-02-02T15:14:24.5493301+08:00;True|2024-02-02T15:08:42.0775469+08:00;True|2024-02-02T14:50:25.2357715+08:00;True|2024-02-02T14:48:40.1311047+08:00;True|2024-02-02T14:44:57.9831751+08:00;True|2024-02-02T14:28:12.0713915+08:00;True|2024-02-02T13:55:59.7389347+08:00;True|2024-02-02T13:10:32.7073682+08:00;True|2024-02-02T10:21:41.3665075+08:00;True|2024-02-02T10:08:11.1755065+08:00;True|2024-02-01T16:28:42.6016378+08:00;True|2024-02-01T16:25:35.2865491+08:00;True|2024-02-01T15:48:00.8333105+08:00;True|2024-02-01T15:39:22.9864096+08:00;True|2024-02-01T15:30:30.4856347+08:00;True|2024-02-01T14:34:14.9484851+08:00;True|2024-02-01T13:53:48.9165284+08:00;False|2024-02-01T13:52:39.1911001+08:00;True|2024-02-01T10:40:28.0735829+08:00;True|2024-02-01T10:24:04.5914096+08:00;True|2024-02-01T10:13:00.9882363+08:00;True|2024-01-31T14:56:37.7352718+08:00;True|2024-01-31T14:46:49.9104890+08:00;True|2024-01-31T14:38:56.1841731+08:00;True|2024-01-31T14:35:45.4531352+08:00;True|2024-01-31T14:32:21.5100137+08:00;True|2024-01-31T14:15:26.3231430+08:00;True|2024-01-31T14:00:11.3994150+08:00;True|2024-01-31T13:18:54.8448212+08:00;True|2024-01-31T10:52:59.8159114+08:00;True|2024-01-31T10:28:03.5856625+08:00;True|2024-01-31T10:10:35.0250398+08:00;True|2024-01-30T09:53:14.3256577+08:00;True|2024-01-30T09:43:56.5551157+08:00;True|2024-01-30T08:27:16.7078317+08:00;True|2024-01-29T15:42:55.3394104+08:00;True|2024-01-29T15:36:57.2998818+08:00;True|2024-01-29T15:09:49.3214409+08:00;True|2024-01-29T14:54:23.0025170+08:00;True|2024-01-29T14:33:53.5586728+08:00;True|2024-01-29T10:21:47.9469052+08:00;True|2024-01-29T09:38:26.0354836+08:00;True|2024-01-29T09:28:57.3836958+08:00;True|2024-01-29T09:19:49.0488968+08:00;True|2024-01-26T16:11:46.3859476+08:00;True|2024-01-26T16:11:29.8529136+08:00;True|2024-01-26T10:23:35.6167838+08:00;True|2024-01-26T10:16:04.2780085+08:00;True|2024-01-26T10:05:56.0745647+08:00;True|2024-01-26T10:03:34.8490957+08:00;True|2024-01-26T09:18:57.1502238+08:00;True|2024-01-26T09:05:18.6887593+08:00;True|2024-01-25T16:19:44.3753587+08:00;True|2024-01-25T10:54:55.2695117+08:00;True|2024-01-25T10:52:43.0130697+08:00;True|2024-01-25T10:15:35.2061116+08:00;True|2024-01-25T10:12:55.7724345+08:00;True|2024-01-25T09:59:14.7336333+08:00;True|2024-01-25T09:54:00.8951944+08:00;True|2024-01-23T11:57:00.6176481+08:00;True|2024-01-23T11:48:46.0536266+08:00;True|2024-01-23T11:20:56.9686760+08:00;True|2024-01-23T10:07:03.1874795+08:00;True|2024-01-23T09:28:09.7921197+08:00;True|2024-01-22T17:23:56.8011615+08:00;True|2024-01-22T15:39:51.8307512+08:00;True|2024-01-21T16:56:29.0470984+08:00;True|2024-01-21T16:31:58.1736344+08:00;True|2024-01-21T16:24:19.3683647+08:00;True|2024-01-21T16:02:26.5427715+08:00;True|2024-01-21T15:45:21.0549809+08:00;True|2024-01-21T15:24:46.6563331+08:00;True|2024-01-21T12:57:07.2655536+08:00;True|2024-01-21T11:43:22.1675745+08:00;True|2024-01-21T11:04:07.4676661+08:00;True|2024-01-21T11:03:11.6972981+08:00;True|2024-01-19T12:12:51.7315607+08:00;True|2024-01-19T12:03:23.7846341+08:00;True|2024-01-19T09:21:40.1191844+08:00;True|2024-01-18T15:28:59.1079108+08:00;True|2024-01-18T15:25:00.9561275+08:00;True|2024-01-18T15:19:13.0404548+08:00;True|2024-01-18T13:06:18.2756609+08:00;True|2024-01-18T12:00:29.1983965+08:00;True|2024-01-18T09:51:08.2157377+08:00;True|2024-01-18T09:49:33.8817410+08:00;True|2024-01-17T17:14:07.4523354+08:00;True|2024-01-17T13:46:19.2002783+08:00;True|2024-01-17T13:17:28.0156428+08:00;True|2024-01-17T11:23:28.7024207+08:00;True|2024-01-17T11:07:35.4966809+08:00;True|2024-01-17T10:25:34.7098037+08:00;True|2024-01-17T09:13:26.1252511+08:00;True|2024-01-16T15:33:15.8976694+08:00;True|2024-01-16T13:06:21.8159184+08:00;True|2024-01-16T12:55:14.9963186+08:00;True|2024-01-16T10:26:35.3866122+08:00;True|2024-01-16T10:25:44.1826112+08:00;True|2024-01-12T16:34:51.6106928+08:00;True|2024-01-12T13:14:24.0546049+08:00;True|2024-01-12T13:06:52.9089433+08:00;True|2024-01-12T12:39:48.1623736+08:00;True|2024-01-12T12:36:04.4644966+08:00;True|2024-01-12T10:22:40.9168937+08:00;True|2024-01-12T10:10:47.1460616+08:00;True|2024-01-12T10:05:40.4318518+08:00;True|2024-01-12T10:02:01.3964907+08:00;True|2024-01-12T09:57:23.5579846+08:00;True|2024-01-12T09:52:39.7735343+08:00;True|2024-01-12T09:49:01.7855687+08:00;True|2024-01-12T09:44:26.1839115+08:00;True|2024-01-12T09:40:23.9216298+08:00;True|2024-01-12T09:36:41.0590000+08:00;True|2024-01-12T09:32:36.5860825+08:00;True|2024-01-12T09:18:47.5635433+08:00;True|2024-01-11T16:44:34.1615374+08:00;True|2024-01-11T16:40:15.6664078+08:00;True|2024-01-11T16:35:55.1073771+08:00;True|2024-01-11T16:30:59.0648321+08:00;True|2024-01-11T16:11:06.5473983+08:00;True|2024-01-11T16:00:13.6441008+08:00;True|2024-01-11T15:46:51.9760680+08:00;True|2024-01-11T15:36:57.4756880+08:00;True|2024-01-11T15:31:04.1093476+08:00;True|2024-01-11T15:29:01.9270892+08:00;True|2024-01-11T15:21:23.5612459+08:00;True|2024-01-11T15:20:16.1944310+08:00;True|2024-01-11T15:13:32.1080230+08:00;True|2024-01-11T15:06:57.4237688+08:00;True|2024-01-11T15:05:37.5128999+08:00;True|2024-01-11T14:57:22.7751079+08:00;True|2024-01-11T14:11:04.8587579+08:00;True|2024-01-11T11:21:14.0243941+08:00;True|2024-01-11T11:15:09.4678297+08:00;True|2024-01-09T17:06:36.4675498+08:00;True|2024-01-09T17:02:20.7904461+08:00;False|2024-01-09T11:59:36.2734315+08:00;False|2024-01-09T11:59:30.0330023+08:00;True|2024-01-09T11:59:17.2965616+08:00;True|2024-01-08T13:52:05.1989624+08:00;True|2024-01-08T11:12:57.8687468+08:00;True|2024-01-05T14:51:14.7636988+08:00;True|2024-01-05T14:05:34.1084252+08:00;True|2024-01-05T13:23:32.7473731+08:00;True|2024-01-05T11:23:22.0038600+08:00;True|2024-01-05T08:30:07.8997370+08:00;True|2024-01-04T17:03:59.0070371+08:00;True|2024-01-04T16:35:53.2667600+08:00;True|2024-01-04T13:54:55.5474585+08:00;True|2024-01-04T10:22:53.2575575+08:00;True|2024-01-04T10:19:29.6305295+08:00;True|2024-01-04T10:13:33.8544729+08:00;True|2024-01-04T10:09:45.5777175+08:00;True|2024-01-03T15:38:30.3306310+08:00;True|2024-01-03T15:33:57.3631133+08:00;True|2024-01-03T15:10:07.3593774+08:00;True|2024-01-03T13:01:19.4751344+08:00;True|2024-01-03T11:25:06.5732437+08:00;True|2024-01-03T10:55:20.7518873+08:00;True|2024-01-03T10:40:15.0650254+08:00;True|2024-01-03T10:29:15.9327684+08:00;True|2024-01-03T09:34:04.8587473+08:00;True|2024-01-03T08:19:57.3625106+08:00;True|2023-12-29T16:46:23.7770752+08:00;True|2023-12-29T16:45:18.9092534+08:00;True|2023-12-29T16:40:16.7253697+08:00;True|2023-12-29T16:35:46.0906100+08:00;True|2023-12-29T16:19:46.4369159+08:00;True|2023-12-29T15:13:11.2466536+08:00;True|2023-12-29T15:08:16.1413948+08:00;True|2023-12-29T11:54:24.8686181+08:00;True|2023-12-29T10:54:38.1200087+08:00;True|2023-12-29T10:43:44.2132588+08:00;True|2023-12-29T10:23:35.9589067+08:00;True|2023-12-29T10:21:38.3438976+08:00;True|2023-12-29T10:16:16.7097491+08:00;True|2023-12-29T09:53:37.8863387+08:00;True|2023-12-27T14:41:20.6098455+08:00;True|2023-12-27T14:15:27.0538444+08:00;True|2023-12-27T13:07:04.0423436+08:00;True|2023-12-27T11:13:53.7170363+08:00;True|2023-12-27T10:59:32.5371257+08:00;True|2023-12-27T10:48:01.7326864+08:00;True|2023-12-26T09:13:22.3086191+08:00;True|2023-12-26T09:12:47.2137946+08:00;True|2023-12-25T12:22:46.8608633+08:00;True|2023-12-25T12:18:59.4402254+08:00;True|2023-12-25T12:11:03.2410147+08:00;True|2023-12-25T09:37:48.6741194+08:00;True|2023-12-25T09:37:03.2635243+08:00;True|2023-12-22T09:44:26.5356492+08:00;True|2023-12-21T16:58:23.0505653+08:00;True|2023-12-21T16:51:26.4945132+08:00;True|2023-12-21T16:48:53.6772071+08:00;True|2023-12-21T16:23:16.4577315+08:00;True|2023-12-21T16:22:38.6599138+08:00;True|2023-12-21T16:11:43.8422015+08:00;True|2023-12-21T15:45:42.5751240+08:00;True|2023-12-15T16:26:52.3591879+08:00;True|2023-12-15T16:22:25.0756865+08:00;True|2023-12-15T14:19:10.1362534+08:00;True|2023-12-15T14:15:47.5585902+08:00;True|2023-12-15T13:41:56.8875380+08:00;True|2023-12-13T00:13:19.2052917+08:00;True|2023-12-12T23:45:04.0751980+08:00;True|2023-12-12T23:33:28.8199619+08:00;True|2023-12-11T16:31:01.1694979+08:00;True|2023-12-11T15:47:51.2813632+08:00;True|2023-12-11T14:31:49.0572919+08:00;True|2023-12-11T11:45:11.2736360+08:00;True|2023-12-11T11:42:47.5744097+08:00;True|2023-12-11T11:41:16.3262612+08:00;True|2023-12-11T11:32:42.2722966+08:00;True|2023-12-11T11:25:22.8877561+08:00;True|2023-12-11T11:18:20.8210764+08:00;True|2023-12-11T11:16:52.0927831+08:00;True|2023-12-11T11:12:29.9473078+08:00;True|2023-12-10T16:43:56.1726039+08:00;True|2023-12-08T16:50:00.8823437+08:00;True|2023-12-08T14:59:10.2356691+08:00;True|2023-12-08T14:53:13.6038106+08:00;True|2023-12-08T14:51:33.9002713+08:00;True|2023-12-08T14:49:22.0867686+08:00;True|2023-12-08T14:45:05.4216954+08:00;True|2023-12-08T14:30:25.7790911+08:00;True|2023-12-08T14:26:26.1041925+08:00;True|2023-12-08T10:55:36.7338237+08:00;True|2023-12-08T10:24:01.5463359+08:00;True|2023-12-08T10:04:35.7996746+08:00;True|2023-12-08T09:59:17.1279949+08:00;True|2023-12-08T09:52:45.7941909+08:00;True|2023-12-08T09:51:26.7251883+08:00;True|2023-12-08T09:27:43.4049328+08:00;True|2023-12-08T09:12:16.7029758+08:00;True|2023-12-07T11:13:10.4285460+08:00;True|2023-12-01T14:35:34.0005130+08:00;True|2023-12-01T13:21:46.3327168+08:00;True|2023-12-01T13:04:28.4801319+08:00;True|2023-11-30T16:46:41.8793520+08:00;True|2023-11-30T16:04:49.7131798+08:00;True|2023-11-30T15:51:12.9846550+08:00;True|2023-11-30T12:52:06.3440387+08:00;True|2023-11-28T11:20:26.3599705+08:00;True|2023-11-28T09:43:48.5733385+08:00;True|2023-11-27T12:13:11.3038226+08:00;True|2023-11-27T11:54:35.3665327+08:00;True|2023-11-24T13:10:19.3181494+08:00;True|2023-11-24T09:52:10.7335160+08:00;True|2023-11-24T09:31:32.3926443+08:00;True|2023-11-22T13:30:50.3888837+08:00;True|2023-11-22T13:22:29.5388053+08:00;True|2023-11-22T12:14:49.7935345+08:00;True|2023-11-22T11:28:30.8047701+08:00;True|2023-11-20T12:04:07.1512783+08:00;True|2023-11-20T11:58:16.7337435+08:00;True|2023-11-20T11:03:24.3231922+08:00;True|2023-11-20T10:59:12.6367033+08:00;True|2023-11-20T10:33:56.2434367+08:00;True|2023-11-17T15:05:08.6847106+08:00;True|2023-11-17T10:29:33.0225444+08:00;True|2023-11-16T14:21:42.1686146+08:00;True|2023-11-16T13:16:34.1913128+08:00;True|2023-11-16T12:57:16.2850606+08:00;True|2023-11-16T11:11:31.8430891+08:00;True|2023-11-16T10:20:42.1252046+08:00;True|2023-11-16T10:18:14.1408709+08:00;True|2023-11-16T09:23:36.6628173+08:00;True|2023-11-15T14:28:33.3369087+08:00;True|2023-11-15T12:26:26.2137336+08:00;True|2023-11-15T12:25:16.0092237+08:00;True|2023-11-15T11:14:45.4326153+08:00;True|2023-11-15T09:02:00.2711268+08:00;True|2023-11-15T08:53:27.1187290+08:00;True|2023-11-14T18:54:52.3812819+08:00;True|2023-11-14T18:52:20.2229451+08:00;True|2023-11-14T17:55:59.0996386+08:00;True|2023-11-14T17:04:46.5334994+08:00;True|2023-11-14T15:02:42.0419908+08:00;True|2023-11-14T14:56:49.6970449+08:00;True|2023-11-14T13:18:29.4329574+08:00;True|2023-11-14T12:23:09.7978978+08:00;True|2023-11-13T16:16:20.9105084+08:00;True|2023-11-13T16:11:45.1099698+08:00;True|2023-11-13T13:16:02.1477662+08:00;True|2023-11-13T13:15:15.6182523+08:00;True|2023-11-13T11:11:21.7620762+08:00;True|2023-11-13T10:01:31.2619079+08:00;True|2023-11-13T09:18:34.3054349+08:00;True|2023-11-13T00:48:47.6800494+08:00;True|2023-11-13T00:42:22.9854286+08:00;True|2023-11-10T16:59:57.9013482+08:00;True|2023-11-10T13:56:10.1520148+08:00;True|2023-11-10T12:25:28.8978413+08:00;True|2023-11-10T12:04:30.4991249+08:00;True|2023-11-10T11:55:52.1921552+08:00;True|2023-11-10T11:39:33.1910863+08:00;True|2023-11-10T11:17:17.2050570+08:00;True|2023-11-10T10:31:48.8350379+08:00;True|2023-11-09T13:11:02.1210376+08:00;True|2023-11-09T11:04:23.6279742+08:00;True|2023-11-09T09:52:39.0767165+08:00;True|2023-11-09T09:45:47.5629254+08:00;True|2023-11-09T09:41:09.1121998+08:00;True|2023-11-09T09:34:16.8133121+08:00;True|2023-11-08T16:33:38.3080500+08:00;True|2023-11-08T16:14:37.9282566+08:00;True|2023-11-08T15:31:46.8084522+08:00;True|2023-11-08T14:27:48.2352711+08:00;True|2023-11-08T12:23:56.5235127+08:00;True|2023-11-08T11:41:12.7035010+08:00;True|2023-11-08T11:38:42.5318310+08:00;True|2023-11-08T10:18:43.5798164+08:00;True|2023-11-08T09:06:35.6712939+08:00;True|2023-11-08T08:57:36.1174660+08:00;True|2023-11-08T00:07:44.2585670+08:00;True|2023-11-06T23:28:53.2559097+08:00;True|2023-11-06T23:00:40.3059201+08:00;True|2023-11-06T21:14:59.0505998+08:00;True|2023-11-03T22:08:06.7984691+08:00;True|2023-11-03T20:33:47.8005656+08:00;True|2023-11-03T19:18:45.1406730+08:00;True|2023-11-03T14:56:44.7332321+08:00;True|2023-11-02T20:13:15.5530300+08:00;True|2023-11-02T19:22:24.9140752+08:00;True|2023-11-02T18:58:18.1198017+08:00;True|2023-11-01T18:31:39.9490440+08:00;True|2023-11-01T14:49:43.8703361+08:00;True|2023-11-01T14:38:44.8729900+08:00;True|2023-11-01T14:14:57.6507597+08:00;True|2023-11-01T13:04:09.9744075+08:00;True|2023-10-31T13:03:41.1902847+08:00;True|2023-10-31T11:29:03.3252294+08:00;True|2023-10-30T18:35:01.5128678+08:00;True|2023-10-30T18:25:01.6612244+08:00;True|2023-10-26T17:07:56.7081658+08:00;True|2023-10-18T16:20:51.8420951+08:00;True|2023-10-16T16:44:43.7908528+08:00;True|2023-10-16T11:17:09.2728375+08:00;True|2023-10-16T10:28:07.3397339+08:00;True|2023-10-16T10:26:35.6073358+08:00;True|2023-10-16T10:21:48.9925797+08:00;True|2023-10-13T11:26:05.2730047+08:00;True|2023-10-12T08:19:04.3028512+08:00;True|2023-10-11T20:40:21.6934217+08:00;True|2023-10-11T20:28:04.3302789+08:00;True|2023-10-11T20:16:51.2741909+08:00;True|2023-10-11T20:10:01.4624158+08:00;True|2023-10-11T15:32:40.9782838+08:00;True|2023-10-11T15:21:09.0531801+08:00;True|2023-10-11T15:05:59.9622196+08:00;True|2023-10-11T10:51:46.8571661+08:00;True|2023-10-11T10:41:25.5037704+08:00;True|2023-10-11T10:13:32.2604453+08:00;True|2023-10-11T10:05:52.2170423+08:00;True|2023-10-11T09:47:35.6578975+08:00;True|2023-10-11T09:44:31.2001499+08:00;True|2023-10-11T09:37:09.6904898+08:00;True|2023-10-10T10:18:33.1073992+08:00;True|2023-10-10T09:32:05.6384867+08:00;True|2023-10-10T09:15:26.4844254+08:00;True|2023-10-10T09:03:39.1497247+08:00;True|2023-10-10T08:56:14.9475607+08:00;True|2023-10-09T15:38:52.6561232+08:00;True|2023-10-09T14:22:16.0301342+08:00;True|2023-10-09T13:24:40.4941388+08:00;True|2023-10-09T10:30:48.0015664+08:00;True|2023-10-09T09:52:47.4626658+08:00;True|2023-10-08T14:21:13.7960780+08:00;True|2023-10-08T10:31:55.0337899+08:00;True|2023-10-08T08:24:13.2663041+08:00;True|2023-10-07T10:40:04.1716715+08:00;True|2023-10-07T09:51:11.1928375+08:00;True|2023-10-07T09:43:13.8042516+08:00;True|2023-09-28T15:45:01.2865878+08:00;True|2023-09-28T15:32:23.8179822+08:00;True|2023-09-28T14:37:03.1119806+08:00;True|2023-09-28T14:30:07.0877531+08:00;True|2023-09-28T14:01:36.5862373+08:00;True|2023-09-28T08:29:16.5989163+08:00;True|2023-09-28T08:12:23.3924898+08:00;True|2023-09-27T17:04:09.2538198+08:00;True|2023-09-27T16:38:03.8237948+08:00;True|2023-09-27T16:12:28.7977056+08:00;True|2023-09-27T15:56:03.7725704+08:00;True|2023-09-27T15:12:31.1298921+08:00;True|2023-09-27T15:05:14.4058045+08:00;True|2023-09-27T14:55:43.4423114+08:00;True|2023-09-27T14:33:26.2272014+08:00;True|2023-09-22T13:26:44.6246077+08:00;True|2023-09-22T11:14:50.9067626+08:00;True|2023-09-22T09:36:50.6912928+08:00;True|2023-09-22T09:26:38.2305802+08:00;True|2023-09-22T09:02:22.5400635+08:00;True|2023-09-20T17:20:27.9780370+08:00;True|2023-09-19T09:20:00.1269897+08:00;True|2023-09-19T09:10:18.4900723+08:00;True|2023-09-19T08:30:20.1709390+08:00;True|2023-09-18T15:43:28.1580264+08:00;True|2023-09-15T10:08:50.6367258+08:00;True|2023-09-14T17:17:10.7002185+08:00;True|2023-09-14T16:55:47.7782477+08:00;True|2023-09-14T14:05:25.9485449+08:00;False|2023-09-14T14:04:51.9423918+08:00;True|2023-09-12T09:37:17.5430590+08:00;True|2023-09-11T16:38:00.9834961+08:00;True|2023-09-11T13:04:08.1338596+08:00;True|2023-09-11T09:33:03.5400174+08:00;True|2023-09-08T15:34:46.6427039+08:00;True|2023-09-08T15:32:26.7896155+08:00;True|2023-09-08T14:07:16.6283055+08:00;True|2023-09-08T08:21:08.8368055+08:00;True|2023-09-08T08:07:29.5992984+08:00;True|2023-09-07T13:03:24.6924914+08:00;True|2023-09-07T11:02:02.9462467+08:00;True|2023-09-07T08:57:36.4913496+08:00;True|2023-09-07T08:55:57.3245545+08:00;True|2023-09-06T13:47:04.0563026+08:00;True|2023-09-06T13:42:27.3031938+08:00;True|2023-09-05T08:28:44.6193871+08:00;True|2023-09-04T20:42:09.4672710+08:00;True|2023-09-03T14:06:37.5079909+08:00;True|2023-09-02T18:58:24.1492192+08:00;True|2023-09-01T13:19:28.2779978+08:00;True|2023-09-01T08:40:54.0577358+08:00;True|2023-08-31T16:47:34.8462721+08:00;True|2023-08-31T14:49:39.9056564+08:00;True|2023-08-31T14:20:01.4071384+08:00;True|2023-08-31T11:25:29.0233052+08:00;True|2023-08-31T10:28:13.4933678+08:00;True|2023-08-31T10:21:52.6638820+08:00;True|2023-08-31T08:46:57.8782261+08:00;True|2023-08-31T08:46:08.4791004+08:00;True|2023-08-30T09:06:17.4001684+08:00;True|2023-08-30T08:52:06.9481657+08:00;True|2023-08-29T17:11:33.7851914+08:00;True|2023-08-29T16:58:52.7298807+08:00;True|2023-08-29T15:58:23.4205277+08:00;True|2023-08-29T15:56:40.3534593+08:00;True|2023-08-29T15:54:29.1188567+08:00;True|2023-08-29T15:53:27.9719983+08:00;True|2023-08-29T15:52:38.7670005+08:00;True|2023-08-29T15:51:32.3703092+08:00;True|2023-08-29T15:47:38.5198946+08:00;True|2023-08-29T15:46:17.4698017+08:00;True|2023-08-29T15:42:04.1853400+08:00;True|2023-08-29T15:29:28.1098681+08:00;True|2023-08-29T15:18:40.8587286+08:00;True|2023-08-29T14:47:50.3088948+08:00;True|2023-08-29T14:47:27.6552611+08:00;False|2023-08-28T13:59:37.8725670+08:00;True|2023-08-18T13:23:38.9937084+08:00;True|2023-08-18T10:09:51.5247737+08:00;True|2023-08-18T08:26:21.8473123+08:00;True|2023-08-17T08:31:37.8696349+08:00;True|2023-08-17T08:23:59.5658185+08:00;True|2023-08-17T08:07:38.2174684+08:00;True|2023-08-16T16:49:44.2549852+08:00;True|2023-08-16T16:33:59.9298792+08:00;True|2023-08-16T15:35:29.6092783+08:00;True|2023-08-16T11:17:28.1086751+08:00;True|2023-08-16T11:17:22.3814672+08:00;True|2023-08-16T08:44:16.0941179+08:00;True|2023-08-15T15:29:15.8118269+08:00;True|2023-08-15T14:47:06.4963591+08:00;True|2023-08-11T16:49:35.8718314+08:00;True|2023-08-11T14:22:59.9440967+08:00;True|2023-08-11T14:16:25.0940743+08:00;True|2023-08-11T13:27:25.4148450+08:00;True|2023-08-11T09:08:31.5437265+08:00;True|2023-08-11T09:04:38.4540336+08:00;True|2023-08-10T14:11:07.0042283+08:00;True|2023-08-08T13:48:19.2402267+08:00;True|2023-08-08T13:44:15.6796969+08:00;True|2023-07-27T09:46:14.1491814+08:00;True|2023-07-21T11:13:10.0843656+08:00;True|2023-07-21T10:56:47.5835580+08:00;True|2023-07-21T10:30:33.0113443+08:00;True|2023-07-20T19:16:37.4936135+08:00;True|2023-07-20T19:00:41.0636578+08:00;True|2023-07-19T13:28:27.8671371+08:00;True|2023-07-19T13:23:42.1880500+08:00;True|2023-07-19T13:19:18.7201227+08:00;True|2023-07-19T13:06:38.9897249+08:00;True|2023-07-19T12:13:11.2061059+08:00;True|2023-07-19T11:45:20.0391356+08:00;True|2023-07-19T11:24:02.5425841+08:00;True|2023-07-19T10:32:06.7915754+08:00;True|2023-07-19T09:51:08.4553434+08:00;True|2023-07-19T09:48:11.2977426+08:00;True|2023-07-18T08:47:44.1724897+08:00;True|2023-07-17T16:25:10.8982872+08:00;True|2023-07-17T14:50:44.3708198+08:00;True|2023-07-17T14:20:26.4686898+08:00;True|2023-07-17T14:18:16.6127136+08:00;True|2023-07-17T14:16:34.9116950+08:00;True|2023-07-17T14:14:44.7988846+08:00;True|2023-07-17T14:06:18.1123806+08:00;True|2023-07-17T14:03:38.5290433+08:00;True|2023-07-17T13:48:54.3096778+08:00;True|2023-07-17T13:23:13.6097762+08:00;True|2023-07-17T09:54:25.9375716+08:00;True|2023-07-17T09:40:22.2531559+08:00;True|2023-07-17T09:21:15.0786649+08:00;True|2023-07-17T09:03:37.2081513+08:00;True|2023-07-16T21:20:45.3036514+08:00;True|2023-07-16T21:09:16.1559694+08:00;True|2023-07-16T21:05:22.2504644+08:00;True|2023-07-16T20:41:26.5956030+08:00;True|2023-07-16T20:19:33.5726613+08:00;True|2023-07-16T19:46:38.6493518+08:00;True|2023-07-14T10:33:17.6270692+08:00;True|2023-07-11T14:34:22.8852169+08:00;True|2023-07-11T14:27:22.7851108+08:00;True|2023-07-11T14:13:21.6512172+08:00;True|2023-07-11T14:06:33.9865646+08:00;True|2023-07-11T13:52:46.2830836+08:00;True|2023-07-11T13:38:56.3165889+08:00;True|2023-07-11T13:29:40.9636697+08:00;True|2023-07-11T13:25:23.0633788+08:00;True|2023-07-11T10:17:40.8002359+08:00;True|2023-07-11T10:15:47.5472709+08:00;True|2023-07-11T10:12:25.6440547+08:00;True|2023-07-11T10:07:39.3716167+08:00;True|2023-07-11T09:22:07.4191357+08:00;True|2023-07-04T13:07:10.1209516+08:00;True|2023-06-30T16:11:25.7541580+08:00;True|2023-06-30T15:39:26.6678989+08:00;True|2023-06-30T15:26:40.6581344+08:00;True|2023-06-30T15:12:57.9906312+08:00;True|2023-06-29T16:39:15.6477820+08:00;True|2023-06-28T17:01:51.9542466+08:00;True|2023-06-27T15:03:28.1320450+08:00;True|2023-06-27T13:36:39.6707848+08:00;True|2023-06-26T09:40:01.1754706+08:00;True|2023-06-25T12:16:28.9080024+08:00;True|2023-06-25T11:51:59.9238461+08:00;True|2023-06-25T11:50:29.3100358+08:00;True|2023-06-25T11:29:28.5338563+08:00;True|2023-06-25T09:10:26.2420288+08:00;True|2023-06-25T09:08:15.0702872+08:00;True|2023-06-25T08:43:15.0806611+08:00;True|2023-06-25T08:41:41.8156616+08:00;True|2023-06-25T08:39:30.6818013+08:00;True|2023-06-25T08:38:18.5996529+08:00;True|2023-06-25T08:36:34.1479706+08:00;True|2023-06-25T08:34:53.9856289+08:00;True|2023-06-25T08:31:24.0298080+08:00;True|2023-06-25T08:15:45.7453280+08:00;True|2023-06-25T08:01:52.7609075+08:00;True|2023-06-24T21:25:23.8938665+08:00;True|2023-06-22T03:02:26.7305758+08:00;True|2023-06-22T02:10:48.8222890+08:00;True|2023-06-22T01:57:41.7875184+08:00;True|2023-06-22T01:52:19.4217362+08:00;True|2023-06-21T16:27:15.1464129+08:00;True|2023-06-21T16:11:46.6111817+08:00;True|2023-06-21T13:14:00.6869253+08:00;True|2023-06-21T13:09:28.2689225+08:00;True|2023-06-21T12:24:02.6762426+08:00;True|2023-06-21T12:18:06.2748924+08:00;True|2023-06-21T11:18:02.6754143+08:00;True|2023-06-21T11:08:34.2149469+08:00;True|2023-06-21T08:20:50.0079906+08:00;True|2023-06-20T15:56:03.2638713+08:00;True|2023-06-20T15:48:38.2419545+08:00;True|2023-06-20T15:35:26.6615171+08:00;True|2023-06-20T15:20:31.9284860+08:00;True|2023-06-20T15:18:39.8265469+08:00;True|2023-06-20T15:09:16.7617272+08:00;True|2023-06-20T09:53:23.2658672+08:00;True|2023-06-16T10:00:58.0337616+08:00;True|2023-06-16T09:47:58.8912904+08:00;True|2023-06-16T09:26:36.4914832+08:00;True|2023-06-15T16:22:21.4509393+08:00;True|2023-06-12T13:21:12.0491357+08:00;True|2023-06-12T10:18:32.9287587+08:00;True|2023-06-09T16:22:24.1132267+08:00;True|2023-06-08T18:12:42.4814009+08:00;True|2023-06-08T11:08:48.0533571+08:00;True|2023-06-08T10:41:43.0121701+08:00;False|2023-06-08T10:40:19.2093235+08:00;True|2023-06-06T13:03:50.8124200+08:00;True|2023-06-05T10:12:24.1858209+08:00;True|2023-06-02T17:02:57.5817094+08:00;True|2023-05-26T13:54:40.2272218+08:00;True|2023-05-24T12:43:50.2427994+08:00;True|2023-05-24T12:34:24.3922836+08:00;True|2023-05-24T10:07:19.4995219+08:00;True|2023-05-24T09:21:29.1960080+08:00;True|2023-05-23T22:34:23.3220912+08:00;True|2023-05-23T22:01:14.4175449+08:00;True|2023-05-23T17:02:53.0308400+08:00;True|2023-05-23T16:30:11.7138623+08:00;True|2023-05-23T15:51:50.0152484+08:00;True|2023-05-23T15:50:52.0657433+08:00;True|2023-05-23T15:28:25.5802377+08:00;True|2023-05-23T15:25:56.4633020+08:00;True|2023-05-23T14:52:29.8759921+08:00;True|2023-05-23T14:48:44.6519763+08:00;True|2023-05-20T04:28:10.3108871+08:00;True|2023-05-20T03:56:22.7233820+08:00;True|2023-05-20T03:47:38.4405026+08:00;True|2023-05-20T03:46:40.6056451+08:00;True|2023-05-20T03:44:25.0883888+08:00;True|2023-05-20T03:41:10.1148691+08:00;True|2023-05-20T02:34:14.3757035+08:00;True|2023-05-20T02:27:50.5595075+08:00;True|2023-05-20T02:23:04.2256041+08:00;True|2023-05-20T01:46:59.9534021+08:00;True|2023-05-20T01:42:33.5106065+08:00;True|2023-05-20T01:40:39.6918060+08:00;True|2023-05-20T01:11:47.7436847+08:00;True|2023-05-20T01:03:58.9476094+08:00;True|2023-05-19T22:59:47.4591129+08:00;True|2023-05-19T22:34:44.7988447+08:00;True|2023-05-19T22:24:55.2320279+08:00;True|2023-05-19T21:40:19.5285575+08:00;True|2023-05-19T21:38:21.2073338+08:00;True|2023-05-19T20:54:59.2058809+08:00;True|2023-05-19T16:08:15.0151080+08:00;True|2023-05-19T15:26:16.2836301+08:00;True|2023-05-19T13:09:06.1592914+08:00;True|2023-05-19T12:24:23.6252771+08:00;True|2023-05-19T11:50:53.8948740+08:00;True|2023-05-19T11:43:57.9296933+08:00;True|2023-05-19T10:44:34.9904463+08:00;True|2023-05-19T09:32:02.1216663+08:00;False|2023-05-19T09:31:06.4251757+08:00;True|2023-05-18T22:34:36.5292968+08:00;True|2023-05-18T20:37:59.7940567+08:00;True|2023-05-18T20:36:35.2790349+08:00;True|2023-05-18T20:34:10.7400457+08:00;True|2023-05-18T20:32:43.8790879+08:00;True|2023-05-18T20:31:13.5389643+08:00;True|2023-05-18T20:29:19.6206139+08:00;True|2023-05-18T20:07:25.5074263+08:00;True|2023-05-18T18:19:43.5324315+08:00;True|2023-05-18T18:15:36.4290026+08:00;True|2023-05-18T18:12:31.8703551+08:00;True|2023-05-18T18:10:52.9289531+08:00;True|2023-05-18T18:09:23.9118797+08:00;True|2023-05-18T17:58:30.8068228+08:00;True|2023-05-18T17:56:55.8055382+08:00;False|2023-05-18T17:54:54.7950789+08:00;False|2023-05-18T17:11:18.2325105+08:00;True|2023-05-18T17:09:24.4186482+08:00;True|2023-05-18T17:06:32.0699130+08:00;False|2023-05-18T17:01:41.8164925+08:00;False|2023-05-18T16:59:32.1112741+08:00;True|2023-05-18T16:58:34.1784100+08:00;True|2023-05-18T16:56:36.9460541+08:00;True|2023-05-18T16:55:00.9843495+08:00;True|2023-05-18T16:49:04.0161640+08:00;True|2023-05-18T16:48:28.9011382+08:00;True|2023-05-18T16:44:52.0675900+08:00;False|2023-05-18T16:44:37.3514214+08:00;False|2023-05-18T16:43:23.3343369+08:00;True|2023-05-18T16:41:35.8818611+08:00;True|2023-05-18T16:25:43.5167900+08:00;False|2023-05-18T16:24:46.6646890+08:00;False|2023-05-18T16:19:55.4153618+08:00;False|2023-05-18T16:16:18.0052881+08:00;False|2023-05-18T16:14:32.3377278+08:00;True|2023-05-17T15:43:45.1868569+08:00;True|2023-05-17T15:35:42.2476880+08:00;True|2023-05-17T14:23:28.2390957+08:00;True|2023-05-17T13:54:00.6756387+08:00;True|2023-05-17T13:45:46.1115068+08:00;True|2023-05-17T07:57:34.7129429+08:00;True|2023-05-16T16:04:20.3198005+08:00;False|2023-05-16T16:03:52.0737233+08:00;True|2023-05-16T15:28:45.4945726+08:00;True|2023-05-16T15:14:10.4952128+08:00;True|2023-05-16T15:04:46.5706346+08:00;True|2023-05-16T14:46:48.7034492+08:00;True|2023-05-16T14:45:29.4047499+08:00;True|2023-05-16T14:42:47.3507679+08:00;True|2023-05-16T14:30:47.9199224+08:00;True|2023-05-16T14:29:10.9147184+08:00;True|2023-05-16T14:27:48.3632687+08:00;True|2023-05-16T14:24:44.6240034+08:00;True|2023-05-16T14:19:41.2962188+08:00;True|2023-05-16T13:41:13.3366211+08:00;True|2023-05-16T13:26:44.1532655+08:00;True|2023-05-16T13:23:40.2882422+08:00;True|2023-05-16T13:11:41.5416792+08:00;True|2023-05-16T13:08:41.6341863+08:00;True|2023-05-16T13:04:35.6916867+08:00;True|2023-05-16T13:00:34.6889598+08:00;True|2023-05-16T12:57:48.4561274+08:00;True|2023-05-16T12:50:57.7405833+08:00;True|2023-05-16T12:49:33.8394829+08:00;True|2023-05-16T12:44:28.6906226+08:00;True|2023-05-16T12:41:08.3554032+08:00;True|2023-05-16T12:32:32.3448036+08:00;True|2023-05-16T11:32:04.4504376+08:00;True|2023-05-15T18:39:28.9172042+08:00;True|2023-05-15T18:35:41.5268755+08:00;True|2023-05-15T18:16:16.2900985+08:00;True|2023-04-28T16:24:40.7430596+08:00;False|2023-04-28T16:21:34.8499384+08:00;True|2023-04-28T15:43:40.3023318+08:00;True|2023-04-28T15:41:18.8228620+08:00;True|2023-04-28T14:16:21.1595325+08:00;True|2023-04-28T10:27:55.2150739+08:00;True|2023-04-12T16:25:26.5218825+08:00;True|2023-04-12T15:45:29.3993255+08:00;True|2023-04-12T14:00:18.1960878+08:00;True|2023-04-12T13:16:39.0804178+08:00;True|2023-04-11T11:02:27.5200402+08:00;True|2023-04-11T09:57:11.5903829+08:00;True|2023-04-10T09:58:01.1775220+08:00;True|2023-03-13T11:19:32.0927720+08:00;True|2023-03-13T10:39:50.9250037+08:00;True|2023-03-13T08:54:57.5891390+08:00;True|2023-03-10T09:00:31.2441735+08:00;True|2023-03-08T08:25:11.1877416+08:00;True|2023-03-06T09:18:03.5502956+08:00;True|2023-03-06T09:14:57.8192971+08:00;True|2023-01-11T13:30:27.8190489+08:00;True|2023-01-06T14:29:14.6067256+08:00;True|2022-12-23T17:06:52.0688439+08:00;True|2022-12-23T16:12:04.4155951+08:00;True|2022-12-23T13:35:44.6439326+08:00;True|2022-11-30T08:24:02.9999976+08:00;True|2022-11-30T08:01:51.4579972+08:00;True|2022-11-29T21:32:14.4359673+08:00;True|2022-11-29T19:30:22.9466023+08:00;True|2022-11-29T19:24:30.1630119+08:00;True|2022-11-29T17:31:43.1926801+08:00;True|2022-11-29T17:14:32.5869985+08:00;True|2022-11-29T10:42:57.1877576+08:00;True|2022-11-27T14:40:28.4784748+08:00;True|2022-11-26T20:49:34.2789400+08:00;True|2022-11-26T19:24:58.9988205+08:00;True|2022-11-26T15:33:08.6274944+08:00;True|2022-11-26T14:37:46.3953592+08:00;True|2022-11-26T09:16:41.7487240+08:00;True|2022-11-24T09:49:50.7302637+08:00;True|2022-11-23T16:24:56.5946914+08:00;True|2022-11-23T16:19:57.5570583+08:00;True|2022-11-23T15:05:13.8032246+08:00;True|2022-11-22T20:24:39.7324815+08:00;True|2022-11-22T13:18:16.2143925+08:00;False|2022-11-22T13:12:53.0448580+08:00;True|2022-11-22T11:03:01.7571733+08:00;True|2022-11-21T13:20:11.1961237+08:00;True|2022-11-21T13:13:52.0360749+08:00;True|2022-11-18T15:48:13.0747365+08:00;True|2022-11-18T14:15:54.5626901+08:00;True|2022-11-17T18:41:26.5464503+08:00;True|2022-11-15T13:55:35.3496366+08:00;True|2022-11-15T11:03:23.6773297+08:00;True|2022-11-15T10:58:47.9703720+08:00;True|2022-11-15T10:12:27.8305782+08:00;True|2022-11-15T09:47:26.7480777+08:00;True|2022-11-15T08:55:44.0275263+08:00;True|2022-11-15T08:54:06.6396851+08:00;True|2022-11-15T08:44:18.2013404+08:00;True|2022-11-15T01:16:19.8154538+08:00;True|2022-11-15T01:15:03.7846810+08:00;True|2022-11-15T01:01:11.0318599+08:00;True|2022-11-15T00:30:33.7148460+08:00;True|2022-11-15T00:15:26.5178283+08:00;True|2022-11-14T23:54:32.6128172+08:00;True|2022-11-14T23:26:52.0335380+08:00;True|2022-11-14T22:21:28.0622050+08:00;True|2022-11-14T21:47:43.6964619+08:00;True|2022-11-14T21:41:42.3128804+08:00;True|2022-11-14T21:31:17.2784203+08:00;True|2022-11-14T20:48:20.0380343+08:00;True|2022-11-11T17:24:44.7029993+08:00;True|2022-11-11T16:47:29.3444029+08:00;True|2022-11-11T16:07:26.4718473+08:00;True|2022-11-11T15:52:41.7235701+08:00;True|2022-11-10T15:58:10.8883176+08:00;True|2022-11-10T15:29:59.3113740+08:00;True|2022-11-10T13:34:14.7380132+08:00;True|2022-11-10T10:28:02.1166569+08:00;True|2022-11-09T23:28:25.6401971+08:00;True|2022-11-09T16:20:53.2757536+08:00;True|2022-11-09T16:16:41.3169214+08:00;True|2022-11-09T14:02:55.1802832+08:00;True|2022-11-09T13:57:55.2726154+08:00;True|2022-11-09T13:28:53.2022669+08:00;True|2022-11-09T13:10:58.0740163+08:00;True|2022-11-09T12:59:42.2328933+08:00;True|2022-11-09T11:54:08.0187924+08:00;True|2022-11-09T11:49:32.4296758+08:00;True|2022-11-09T11:34:32.6613370+08:00;True|2022-11-09T11:06:56.9443306+08:00;True|2022-11-06T23:43:44.0833657+08:00;True|2022-11-06T23:29:52.0088244+08:00;True|2022-11-06T22:06:14.7091464+08:00;True|2022-11-06T22:03:25.2696951+08:00;True|2022-11-06T21:58:50.1055520+08:00;True|2022-11-06T21:54:14.0075395+08:00;True|2022-11-06T21:39:30.2652105+08:00;True|2022-11-04T15:54:37.9813194+08:00;True|2022-11-04T15:43:59.7702621+08:00;True|2022-11-04T13:59:29.3941234+08:00;True|2022-11-04T13:44:18.1212719+08:00;True|2022-11-04T13:42:06.1010393+08:00;True|2022-11-04T13:37:01.7814703+08:00;True|2022-11-04T13:35:43.1121709+08:00;True|2022-11-04T13:33:05.1362535+08:00;True|2022-11-04T13:30:11.1113703+08:00;True|2022-11-04T13:28:53.7185382+08:00;True|2022-11-04T13:27:08.0691684+08:00;True|2022-11-04T13:20:46.2297633+08:00;True|2022-11-04T13:17:57.1564250+08:00;True|2022-11-04T13:15:36.3651019+08:00;True|2022-11-04T13:13:44.6635701+08:00;True|2022-11-04T13:12:02.3968306+08:00;True|2022-11-04T13:08:07.7653927+08:00;True|2022-11-04T11:37:44.1975649+08:00;True|2022-11-04T11:36:20.3813848+08:00;True|2022-11-04T11:26:40.9713465+08:00;True|2022-11-04T10:17:36.4269558+08:00;True|2022-11-04T09:47:05.4607111+08:00;True|2022-11-04T09:28:27.9347785+08:00;True|2022-11-04T08:38:38.5253737+08:00;True|2022-11-03T13:31:32.7883545+08:00;False|2022-11-03T13:27:07.8579021+08:00;True|2022-11-03T11:07:07.3903101+08:00;True|2022-11-03T10:54:26.7818816+08:00;True|2022-11-03T10:35:59.1956262+08:00;True|2022-11-03T10:30:07.0651285+08:00;True|2022-11-03T10:01:20.8467911+08:00;True|2022-08-22T11:13:33.9211829+08:00;True|2022-06-17T11:19:24.4893458+08:00;True|2022-06-07T14:44:51.5702202+08:00;True|2022-06-07T14:42:44.8351600+08:00;True|2022-05-17T14:19:55.1158182+08:00;True|2022-05-17T13:25:44.2886247+08:00;True|2022-05-17T10:29:26.6813564+08:00;True|2022-05-17T09:02:49.1742018+08:00;True|2022-05-06T15:13:12.2438900+08:00;True|2022-05-06T14:49:39.8536594+08:00;True|2022-04-22T17:07:44.8823529+08:00;True|2022-04-19T19:13:40.8312746+08:00;True|2022-04-19T15:40:16.0022040+08:00;True|2022-04-19T15:13:32.9767736+08:00;False|2022-04-19T15:08:33.6507639+08:00;True|2022-04-19T15:02:51.9580210+08:00;True|2022-04-19T13:54:18.7579131+08:00;True|2022-04-12T10:36:02.1779173+08:00;True|2022-04-12T10:05:31.0222037+08:00;True|2022-04-12T09:47:49.3724819+08:00;True|2022-04-09T15:08:54.5697468+08:00;True|2022-04-08T17:31:31.0046258+08:00;True|2022-04-08T16:50:41.3018422+08:00;True|2022-04-08T10:35:36.5029980+08:00;True|2022-03-31T09:38:37.3646053+08:00;True|2022-03-29T13:57:45.4410942+08:00;True|2022-03-10T18:59:23.7994337+08:00;True|2022-03-10T18:52:39.5019082+08:00;True|2022-03-10T18:51:12.7949284+08:00;True|2022-03-10T18:50:47.2024177+08:00;True|2022-03-10T18:45:08.8409380+08:00;True|2022-03-10T18:41:17.0102564+08:00;True|2022-03-10T18:35:49.0742353+08:00;True|2022-03-10T17:57:47.4196965+08:00;True|2022-03-10T17:34:27.5723245+08:00;True|2022-03-10T16:13:59.3829164+08:00;True|2022-03-09T14:50:49.1222033+08:00;True|2022-03-09T11:21:03.0073651+08:00;False|2022-03-09T11:16:56.1792896+08:00;False|2022-03-09T11:16:49.7923320+08:00;True|2022-03-08T15:47:47.4722336+08:00;True|2022-03-08T15:47:28.5397115+08:00;True|2022-03-08T15:37:08.7379870+08:00;True|2022-03-02T17:37:54.4659976+08:00;True|2022-03-02T17:34:12.2949726+08:00;True|2022-03-02T17:26:38.7070673+08:00;True|2022-03-02T17:07:49.7024316+08:00;True|2022-03-02T17:05:22.4177336+08:00;True|2022-03-02T16:14:57.9880587+08:00;True|2022-03-01T17:52:52.6766959+08:00;True|2022-02-28T14:36:22.6449303+08:00;True|2022-02-24T15:43:36.8244163+08:00;True|2022-02-23T17:57:14.3693224+08:00;True|2022-02-23T17:46:42.1078183+08:00;False|2022-02-23T17:41:06.5886724+08:00;True|2022-02-23T16:59:45.5533581+08:00;True|2022-02-23T16:57:43.3328895+08:00;True|2022-02-21T09:09:37.2601134+08:00;True|2022-02-21T09:03:32.4071009+08:00;True|2022-02-21T08:59:59.0172082+08:00;True|2022-02-18T14:05:39.1358825+08:00;True|2022-02-18T10:23:02.4391239+08:00;True|2022-02-18T10:21:31.0559267+08:00;True|2022-02-17T16:50:11.7192509+08:00;True|2022-02-17T13:19:13.7697894+08:00;True|2022-02-11T10:36:12.7757100+08:00;True|2022-02-10T10:54:25.2685040+08:00;True|2022-02-10T10:37:02.1034768+08:00;True|2022-02-09T17:32:45.6511283+08:00;True|2022-02-09T17:24:32.5115193+08:00;True|2022-02-09T17:00:24.0662114+08:00;True|2022-02-09T16:56:42.3364622+08:00;True|2022-02-09T14:17:25.8688855+08:00;True|2022-02-09T14:11:51.6149822+08:00;True|2022-02-07T23:29:26.2842648+08:00;True|2022-02-07T23:28:58.8242274+08:00;False|2022-02-07T23:25:29.0647793+08:00;True|2022-02-07T13:06:37.5515985+08:00;True|2022-02-07T12:42:19.5220491+08:00;True|2022-02-07T09:52:59.6728595+08:00;True|2022-02-01T11:32:10.5831557+08:00;True|2022-01-29T14:09:02.9178986+08:00;True|2022-01-28T12:01:45.1416438+08:00;True|2022-01-28T11:03:41.6361866+08:00;True|2022-01-28T10:44:53.5367862+08:00;True|2022-01-28T10:40:41.6697563+08:00;True|2022-01-28T10:25:56.7093616+08:00;True|2022-01-28T09:58:13.0733060+08:00;True|2022-01-27T09:26:29.6568807+08:00;True|2022-01-27T00:47:57.9102528+08:00;True|2022-01-27T00:46:52.8845001+08:00;True|2022-01-27T00:36:34.5330938+08:00;True|2022-01-27T00:35:19.5439329+08:00;True|2022-01-27T00:33:38.5701950+08:00;True|2022-01-27T00:32:00.9028982+08:00;True|2022-01-27T00:30:13.2390921+08:00;True|2022-01-27T00:28:23.2989144+08:00;True|2022-01-27T00:16:01.3789455+08:00;True|2022-01-27T00:09:58.8112352+08:00;True|2022-01-27T00:00:40.8353538+08:00;True|2022-01-26T23:37:50.9494735+08:00;True|2022-01-26T23:29:39.8647473+08:00;True|2022-01-26T23:20:49.3274392+08:00;True|2022-01-26T23:15:53.7037293+08:00;True|2022-01-26T23:06:28.8595953+08:00;True|2022-01-26T23:02:12.9882299+08:00;True|2022-01-26T22:55:33.2535730+08:00;True|2022-01-26T22:51:01.8427947+08:00;True|2022-01-26T22:47:44.0715387+08:00;True|2022-01-26T22:20:21.7217039+08:00;True|2022-01-26T22:13:39.5372069+08:00;True|2022-01-26T22:01:31.2113177+08:00;True|2022-01-26T21:55:26.5478921+08:00;True|2022-01-26T21:50:18.2700369+08:00;True|2022-01-26T21:48:52.0020233+08:00;True|2022-01-26T19:19:29.4530523+08:00;True|2022-01-26T19:07:21.6474231+08:00;True|2022-01-26T18:25:42.2933291+08:00;True|2022-01-26T12:39:02.0149050+08:00;True|2022-01-26T12:13:43.9149452+08:00;True|2022-01-26T11:24:33.5742248+08:00;True|2022-01-26T08:51:10.8105076+08:00;True|2022-01-25T21:07:32.9069261+08:00;True|2022-01-24T01:35:12.3309466+08:00;True|2022-01-23T23:19:15.9702821+08:00;True|2022-01-23T21:50:41.6903353+08:00;True|2022-01-23T21:25:57.6084267+08:00;True|2022-01-23T21:16:10.1516535+08:00;True|2022-01-23T20:52:08.3745284+08:00;True|2022-01-23T18:19:32.2386502+08:00;True|2022-01-23T18:11:42.0830325+08:00;True|2022-01-23T18:00:01.3239547+08:00;True|2022-01-23T12:18:48.2466943+08:00;True|2022-01-22T00:48:50.4531647+08:00;True|2022-01-21T13:10:32.8173598+08:00;True|2022-01-21T13:04:01.6388059+08:00;True|2022-01-21T12:51:40.5304103+08:00;True|2022-01-21T12:44:06.3059885+08:00;True|2022-01-21T12:34:33.9314010+08:00;True|2022-01-21T11:39:20.1088577+08:00;True|2022-01-20T11:33:49.0516846+08:00;True|2022-01-20T10:02:12.0295471+08:00;True|2022-01-20T10:02:03.3535503+08:00;True|2022-01-19T23:56:18.7293193+08:00;True|2022-01-19T22:30:14.6986228+08:00;True|2022-01-19T22:15:08.8608795+08:00;True|2022-01-19T21:57:55.2295030+08:00;True|2022-01-19T13:50:37.8588759+08:00;True|2022-01-19T13:42:52.9761531+08:00;True|2022-01-19T00:26:36.9722917+08:00;True|2022-01-19T00:15:30.8583143+08:00;True|2022-01-18T21:19:30.6193048+08:00;True|2022-01-18T21:12:07.1453825+08:00;True|2022-01-18T20:35:27.3779956+08:00;True|2022-01-18T17:44:45.2318570+08:00;True|2022-01-18T14:45:29.0299640+08:00;True|2022-01-17T22:23:20.8214203+08:00;True|2022-01-17T21:49:15.7740045+08:00;True|2022-01-17T21:47:24.6997598+08:00;True|2022-01-17T21:44:00.1942787+08:00;True|2022-01-17T21:43:15.5992687+08:00;True|2022-01-17T21:33:16.8034756+08:00;True|2022-01-17T21:25:39.9909343+08:00;True|2022-01-17T21:13:03.9659338+08:00;True|2022-01-17T20:32:14.8869091+08:00;True|2022-01-17T19:01:46.5753686+08:00;True|2022-01-17T18:31:24.1032169+08:00;True|2022-01-17T18:21:39.2918684+08:00;True|2022-01-17T18:12:07.4859038+08:00;True|2022-01-17T18:09:26.6989718+08:00;True|2022-01-17T18:04:36.7564997+08:00;True|2022-01-17T17:57:44.7814863+08:00;True|2022-01-17T17:51:50.1516107+08:00;True|2022-01-17T17:39:29.2918799+08:00;True|2022-01-17T14:55:21.5859341+08:00;True|2022-01-17T14:38:06.5091500+08:00;True|2022-01-17T14:30:25.5378436+08:00;True|2022-01-16T19:15:24.5874858+08:00;True|2022-01-16T19:07:49.0613424+08:00;True|2022-01-16T16:10:47.3112741+08:00;False|2022-01-14T19:09:41.9296709+08:00;False|2022-01-14T18:56:11.0569808+08:00;False|2022-01-14T18:28:20.1376762+08:00;False|2022-01-14T18:27:30.8678130+08:00;False|2022-01-14T18:22:45.4436504+08:00;False|2022-01-14T18:19:37.0374753+08:00;False|2022-01-14T18:18:48.5868254+08:00;False|2022-01-14T18:14:02.5810257+08:00;False|2022-01-14T18:09:51.1730754+08:00;False|2022-01-14T18:09:17.8940754+08:00;True|2022-01-13T20:08:16.2937608+08:00;True|2022-01-13T20:07:30.1505466+08:00;True|2022-01-13T13:39:42.0146294+08:00;True|2022-01-13T13:38:07.5062471+08:00;True|2022-01-13T11:29:49.3751232+08:00;True|2022-01-13T11:05:43.9574142+08:00;True|2022-01-13T10:33:23.1921058+08:00;True|2022-01-12T20:38:16.9165651+08:00;True|2022-01-12T20:24:46.3779264+08:00;True|2022-01-12T20:03:06.5030626+08:00;True|2022-01-12T19:44:55.4294326+08:00;True|2022-01-12T12:58:45.9548600+08:00;True|2022-01-12T11:28:44.7797749+08:00;True|2022-01-11T18:07:30.9151356+08:00;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:48</publishTime>
</File>
<File Include="bin/AlibabaCloud.EndpointUtil.dll">
<publishTime>04/07/2020 16:33:48</publishTime>
@@ -50,61 +45,40 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
-<<<<<<< HEAD
- <publishTime>12/15/2025 20:54:25</publishTime>
- </File>
- <File Include="bin/BLL.pdb">
- <publishTime>12/15/2025 20:54:25</publishTime>
-=======
<publishTime>11/09/2022 16:02:08</publishTime>
<publishTime>11/02/2022 22:03:01</publishTime>
- <publishTime>12/10/2025 17:18:25</publishTime>
+ <publishTime>12/25/2025 09:43:17</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>11/09/2022 16:02:08</publishTime>
<publishTime>11/02/2022 22:03:01</publishTime>
- <publishTime>12/10/2025 17:18:25</publishTime>
->>>>>>> 585e3021b7ed52a1884dc563c627177783a7e97b
+ <publishTime>12/25/2025 09:43:17</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
-<<<<<<< HEAD
- <publishTime>12/15/2025 20:54:24</publishTime>
- </File>
- <File Include="bin/DAL.pdb">
- <publishTime>12/15/2025 20:54:24</publishTime>
-=======
<publishTime>11/09/2022 16:02:06</publishTime>
<publishTime>11/02/2022 22:02:58</publishTime>
- <publishTime>12/10/2025 17:18:07</publishTime>
+ <publishTime>12/25/2025 09:43:16</publishTime>
</File>
<File Include="bin/DAL.pdb">
<publishTime>11/09/2022 16:02:06</publishTime>
<publishTime>11/02/2022 22:02:58</publishTime>
- <publishTime>12/10/2025 17:18:07</publishTime>
->>>>>>> 585e3021b7ed52a1884dc563c627177783a7e97b
+ <publishTime>12/25/2025 09:43:16</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
-<<<<<<< HEAD
- <publishTime>12/12/2025 08:26:27</publishTime>
- </File>
- <File Include="bin/DBUtility.pdb">
- <publishTime>12/12/2025 08:26:27</publishTime>
-=======
<publishTime>11/02/2022 22:02:56</publishTime>
<publishTime>11/15/2022 13:55:23</publishTime>
- <publishTime>12/10/2025 17:17:59</publishTime>
+ <publishTime>12/25/2025 09:43:13</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
<publishTime>11/09/2022 16:01:58</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>12/10/2025 17:17:59</publishTime>
->>>>>>> 585e3021b7ed52a1884dc563c627177783a7e97b
+ <publishTime>12/25/2025 09:43:13</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -134,7 +108,7 @@
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -158,28 +132,21 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
-<<<<<<< HEAD
- <publishTime>12/12/2025 08:26:27</publishTime>
- </File>
- <File Include="bin/Model.pdb">
- <publishTime>12/12/2025 08:26:27</publishTime>
-=======
<publishTime>11/09/2022 16:02:01</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
<publishTime>08/20/2024 16:32:50</publishTime>
- <publishTime>12/10/2025 17:18:04</publishTime>
+ <publishTime>12/25/2025 09:43:13</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>11/09/2022 16:02:01</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>12/10/2025 17:18:04</publishTime>
->>>>>>> 585e3021b7ed52a1884dc563c627177783a7e97b
+ <publishTime>12/25/2025 09:43:13</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/08/2023 15:09:56</publishTime>
@@ -209,77 +176,50 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
-<<<<<<< HEAD
- <publishTime>12/12/2025 08:26:26</publishTime>
- </File>
- <File Include="bin/Pub_Class.pdb">
- <publishTime>12/12/2025 08:26:26</publishTime>
- </File>
- <File Include="bin/Pub_Control.dll">
- <publishTime>12/12/2025 08:26:27</publishTime>
- </File>
- <File Include="bin/Pub_Control.pdb">
- <publishTime>12/12/2025 08:26:27</publishTime>
-=======
<publishTime>11/09/2022 16:01:56</publishTime>
<publishTime>11/02/2022 22:02:54</publishTime>
- <publishTime>12/10/2025 17:17:50</publishTime>
+ <publishTime>12/25/2025 09:43:09</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
<publishTime>11/09/2022 16:01:56</publishTime>
<publishTime>11/02/2022 22:02:54</publishTime>
- <publishTime>12/10/2025 17:17:50</publishTime>
+ <publishTime>12/25/2025 09:43:09</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>12/10/2025 17:17:54</publishTime>
+ <publishTime>12/25/2025 09:43:11</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>12/10/2025 17:17:54</publishTime>
->>>>>>> 585e3021b7ed52a1884dc563c627177783a7e97b
+ <publishTime>12/25/2025 09:43:11</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
-<<<<<<< HEAD
- <publishTime>12/12/2025 08:26:27</publishTime>
- </File>
- <File Include="bin/SQLHelper.pdb">
- <publishTime>12/12/2025 08:26:27</publishTime>
-=======
- <publishTime>12/10/2025 17:17:55</publishTime>
+ <publishTime>12/25/2025 09:43:12</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>12/10/2025 17:17:55</publishTime>
+ <publishTime>12/25/2025 09:43:12</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
->>>>>>> 585e3021b7ed52a1884dc563c627177783a7e97b
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
-<<<<<<< HEAD
- <publishTime>12/12/2025 08:26:25</publishTime>
+ <publishTime>12/24/2025 14:37:37</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>12/12/2025 08:26:25</publishTime>
-=======
- <publishTime>12/10/2025 17:08:59</publishTime>
+ <publishTime>12/24/2025 14:37:37</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>12/10/2025 17:08:59</publishTime>
- </File>
- <File Include="bin/SyntacticSugar.pdb">
- <publishTime>12/10/2025 17:08:59</publishTime>
->>>>>>> 585e3021b7ed52a1884dc563c627177783a7e97b
+ <publishTime>12/24/2025 14:37:37</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -357,7 +297,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -390,37 +330,21 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
-<<<<<<< HEAD
- <publishTime>12/12/2025 08:26:28</publishTime>
+ <publishTime>12/24/2025 14:37:37</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>12/12/2025 08:26:28</publishTime>
-=======
- <publishTime>12/10/2025 17:08:59</publishTime>
+ <publishTime>12/24/2025 14:37:37</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>12/10/2025 17:08:59</publishTime>
- </File>
- <File Include="bin/TopSdk.pdb">
- <publishTime>12/10/2025 17:08:59</publishTime>
->>>>>>> 585e3021b7ed52a1884dc563c627177783a7e97b
+ <publishTime>12/24/2025 14:37:37</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
-<<<<<<< HEAD
- <publishTime>12/15/2025 20:54:31</publishTime>
- </File>
- <File Include="bin/WebAPI.pdb">
- <publishTime>12/15/2025 20:54:31</publishTime>
- </File>
- <File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>12/15/2025 20:54:34</publishTime>
-=======
<publishTime>11/14/2022 11:23:59</publishTime>
<publishTime>11/02/2022 22:03:04</publishTime>
- <publishTime>12/16/2025 16:18:16</publishTime>
+ <publishTime>12/25/2025 11:10:20</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
@@ -428,8 +352,10 @@
<File Include="bin/WebAPI.pdb">
<publishTime>11/14/2022 11:23:59</publishTime>
<publishTime>11/02/2022 22:03:04</publishTime>
- <publishTime>12/16/2025 16:18:16</publishTime>
->>>>>>> 585e3021b7ed52a1884dc563c627177783a7e97b
+ <publishTime>12/25/2025 11:10:20</publishTime>
+ </File>
+ <File Include="bin/WebAPI.XmlSerializers.dll">
+ <publishTime>12/25/2025 11:10:24</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -441,58 +367,61 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/Interop.grsvr6Lib.dll">
+ <publishTime>12/17/2025 13:18:47</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:48</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:48</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:48</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:48</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -501,7 +430,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -510,121 +439,124 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:48</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="packages.config">
- <publishTime>10/13/2025 14:50:13</publishTime>
+ <publishTime>11/12/2025 10:43:48</publishTime>
</File>
<File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
- <publishTime>12/10/2025 17:08:59</publishTime>
+ <publishTime>12/09/2025 08:11:33</publishTime>
</File>
<File Include="Template/barCodeTemplateStorage.json">
- <publishTime>09/05/2025 16:16:48</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Utility/Barcode.ashx">
+ <publishTime>12/17/2025 13:18:47</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>08/21/2025 15:39:36</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>08/21/2025 15:39:36</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>08/21/2025 15:39:36</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>08/21/2025 15:39:36</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>08/21/2025 15:39:36</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>08/21/2025 15:39:36</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web References/WebS/Reference.cs">
<publishTime>12/20/2021 13:19:56</publishTime>
@@ -642,13 +574,9 @@
<publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web.config">
-<<<<<<< HEAD
- <publishTime>12/12/2025 08:26:44</publishTime>
-=======
<publishTime>11/14/2022 11:24:08</publishTime>
<publishTime>11/02/2022 22:03:20</publishTime>
- <publishTime>12/10/2025 17:20:37</publishTime>
->>>>>>> 585e3021b7ed52a1884dc563c627177783a7e97b
+ <publishTime>12/25/2025 09:43:28</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 8ea1add..0be7814 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\gz\缃戠珯鍙戝竷\MES-WEB-API</_PublishTargetUrl>
- <History>True|2025-12-11T08:34:18.2286479Z;True|2025-12-11T16:25:03.6684824+08:00;True|2025-12-11T15:19:27.7542472+08:00;True|2025-12-11T15:09:46.6354048+08:00;True|2025-12-11T11:12:05.6798003+08:00;True|2025-12-11T10:32:15.1262803+08:00;True|2025-12-11T10:14:58.6988444+08:00;True|2025-12-11T09:46:20.5053893+08:00;True|2025-12-11T09:37:47.2905248+08:00;True|2025-12-11T09:01:44.3527409+08:00;False|2025-12-11T08:54:26.1829984+08:00;True|2025-12-11T08:44:02.1955946+08:00;True|2025-12-11T08:42:19.6321305+08:00;True|2025-12-11T08:29:21.8963360+08:00;True|2025-12-11T08:01:49.9994713+08:00;True|2025-12-11T07:54:24.8110893+08:00;True|2025-12-11T07:51:49.1569200+08:00;False|2025-12-11T07:51:35.2583285+08:00;True|2025-12-10T16:51:17.2118031+08:00;True|2025-12-10T16:38:42.2021141+08:00;True|2025-12-10T16:28:59.3351097+08:00;False|2025-12-10T16:25:39.0701282+08:00;True|2025-12-10T13:48:18.2826625+08:00;True|2025-12-10T13:13:33.8087883+08:00;False|2025-12-10T13:07:58.6662619+08:00;True|2025-12-10T13:01:57.0050047+08:00;True|2025-12-10T11:27:30.1389865+08:00;True|2025-12-10T11:18:54.9338464+08:00;True|2025-12-10T11:11:10.4500171+08:00;True|2025-12-10T11:06:30.2945401+08:00;True|2025-12-10T11:03:56.4911771+08:00;True|2025-12-10T11:01:40.0726896+08:00;True|2025-12-10T10:59:59.0524547+08:00;True|2025-12-10T10:58:36.1532569+08:00;True|2025-12-10T10:55:58.0328508+08:00;True|2025-12-10T10:55:38.9128685+08:00;False|2025-12-10T10:54:42.0747084+08:00;False|2025-12-10T10:54:32.9305200+08:00;True|2025-12-10T09:42:35.6599111+08:00;True|2025-12-10T09:39:42.3067823+08:00;True|2025-12-10T09:18:03.8247860+08:00;True|2025-12-10T09:07:40.9609222+08:00;False|2025-12-10T09:04:41.3274271+08:00;False|2025-12-10T09:04:35.4614345+08:00;False|2025-12-10T09:04:28.5108048+08:00;True|2025-12-10T08:43:42.5026624+08:00;False|2025-12-10T08:43:05.0557534+08:00;True|2025-12-10T08:03:05.3393161+08:00;False|2025-12-10T08:02:51.6498739+08:00;True|2025-12-09T15:44:41.4253971+08:00;True|2025-12-09T15:22:38.7362157+08:00;True|2025-12-09T14:44:20.3719785+08:00;True|2025-12-09T14:42:54.3480629+08:00;True|2025-12-09T14:33:45.5473815+08:00;True|2025-12-09T11:24:53.4316326+08:00;True|2025-12-09T09:12:42.1851533+08:00;True|2025-12-09T08:51:41.5250104+08:00;True|2025-12-09T08:50:16.5728922+08:00;</History>
+ <History>True|2025-12-23T02:24:35.4754773Z;True|2025-12-23T10:17:44.1961719+08:00;True|2025-12-23T10:08:39.7701021+08:00;True|2025-12-23T09:51:53.3364693+08:00;True|2025-12-23T09:36:04.2616368+08:00;True|2025-12-23T09:06:46.1666847+08:00;True|2025-12-23T09:05:33.2687731+08:00;True|2025-12-23T08:56:18.6678340+08:00;True|2025-12-23T08:46:18.9952807+08:00;False|2025-12-23T08:39:59.0144170+08:00;True|2025-12-22T18:00:47.7249009+08:00;True|2025-12-22T17:57:38.5478545+08:00;False|2025-12-22T17:57:16.3832026+08:00;True|2025-12-22T17:00:33.5665247+08:00;True|2025-12-22T16:57:25.0555116+08:00;True|2025-12-22T16:53:44.1106242+08:00;True|2025-12-22T16:44:24.1864298+08:00;True|2025-12-22T16:33:59.7444130+08:00;True|2025-12-22T16:28:42.7442168+08:00;True|2025-12-22T16:23:53.9420059+08:00;True|2025-12-22T15:44:01.8406153+08:00;True|2025-12-22T15:36:15.8542845+08:00;True|2025-12-22T15:07:14.4064973+08:00;True|2025-12-22T13:44:39.1483456+08:00;True|2025-12-22T12:35:53.7951228+08:00;True|2025-12-22T11:25:41.6070045+08:00;True|2025-12-22T11:22:53.7625130+08:00;True|2025-12-22T11:14:59.7419708+08:00;True|2025-12-22T11:12:31.7769783+08:00;True|2025-12-22T11:10:32.3218587+08:00;True|2025-12-22T11:07:07.1189966+08:00;True|2025-12-22T10:32:09.8822738+08:00;True|2025-12-22T10:19:35.9799201+08:00;True|2025-12-22T09:58:48.7158182+08:00;False|2025-12-22T09:58:23.6500441+08:00;True|2025-12-22T09:04:46.4351793+08:00;True|2025-12-22T09:02:18.3037006+08:00;False|2025-12-22T08:48:58.6740068+08:00;True|2025-12-21T14:27:49.3790838+08:00;False|2025-12-21T14:27:31.8942961+08:00;True|2025-12-20T21:37:58.5356880+08:00;False|2025-12-20T21:37:36.4615240+08:00;True|2025-12-19T16:20:56.4661781+08:00;True|2025-12-19T15:00:28.5376490+08:00;False|2025-12-19T15:00:00.2629357+08:00;True|2025-12-11T16:34:18.2286479+08:00;True|2025-12-11T16:25:03.6684824+08:00;True|2025-12-11T15:19:27.7542472+08:00;True|2025-12-11T15:09:46.6354048+08:00;True|2025-12-11T11:12:05.6798003+08:00;True|2025-12-11T10:32:15.1262803+08:00;True|2025-12-11T10:14:58.6988444+08:00;True|2025-12-11T09:46:20.5053893+08:00;True|2025-12-11T09:37:47.2905248+08:00;True|2025-12-11T09:01:44.3527409+08:00;False|2025-12-11T08:54:26.1829984+08:00;True|2025-12-11T08:44:02.1955946+08:00;True|2025-12-11T08:42:19.6321305+08:00;True|2025-12-11T08:29:21.8963360+08:00;True|2025-12-11T08:01:49.9994713+08:00;True|2025-12-11T07:54:24.8110893+08:00;True|2025-12-11T07:51:49.1569200+08:00;False|2025-12-11T07:51:35.2583285+08:00;True|2025-12-10T16:51:17.2118031+08:00;True|2025-12-10T16:38:42.2021141+08:00;True|2025-12-10T16:28:59.3351097+08:00;False|2025-12-10T16:25:39.0701282+08:00;True|2025-12-10T13:48:18.2826625+08:00;True|2025-12-10T13:13:33.8087883+08:00;False|2025-12-10T13:07:58.6662619+08:00;True|2025-12-10T13:01:57.0050047+08:00;True|2025-12-10T11:27:30.1389865+08:00;True|2025-12-10T11:18:54.9338464+08:00;True|2025-12-10T11:11:10.4500171+08:00;True|2025-12-10T11:06:30.2945401+08:00;True|2025-12-10T11:03:56.4911771+08:00;True|2025-12-10T11:01:40.0726896+08:00;True|2025-12-10T10:59:59.0524547+08:00;True|2025-12-10T10:58:36.1532569+08:00;True|2025-12-10T10:55:58.0328508+08:00;True|2025-12-10T10:55:38.9128685+08:00;False|2025-12-10T10:54:42.0747084+08:00;False|2025-12-10T10:54:32.9305200+08:00;True|2025-12-10T09:42:35.6599111+08:00;True|2025-12-10T09:39:42.3067823+08:00;True|2025-12-10T09:18:03.8247860+08:00;True|2025-12-10T09:07:40.9609222+08:00;False|2025-12-10T09:04:41.3274271+08:00;False|2025-12-10T09:04:35.4614345+08:00;False|2025-12-10T09:04:28.5108048+08:00;True|2025-12-10T08:43:42.5026624+08:00;False|2025-12-10T08:43:05.0557534+08:00;True|2025-12-10T08:03:05.3393161+08:00;False|2025-12-10T08:02:51.6498739+08:00;True|2025-12-09T15:44:41.4253971+08:00;True|2025-12-09T15:22:38.7362157+08:00;True|2025-12-09T14:44:20.3719785+08:00;True|2025-12-09T14:42:54.3480629+08:00;True|2025-12-09T14:33:45.5473815+08:00;True|2025-12-09T11:24:53.4316326+08:00;True|2025-12-09T09:12:42.1851533+08:00;True|2025-12-09T08:51:41.5250104+08:00;True|2025-12-09T08:50:16.5728922+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/10/2025 13:05:26</publishTime>
+ <publishTime>12/23/2025 10:24:27</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/10/2025 13:05:26</publishTime>
+ <publishTime>12/23/2025 10:24:27</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>12/10/2025 13:05:25</publishTime>
+ <publishTime>12/23/2025 10:24:25</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/10/2025 13:05:25</publishTime>
+ <publishTime>12/23/2025 10:24:25</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>12/10/2025 13:05:22</publishTime>
+ <publishTime>12/19/2025 15:00:10</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>12/10/2025 13:05:22</publishTime>
+ <publishTime>12/19/2025 15:00:10</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/10/2025 13:05:23</publishTime>
+ <publishTime>12/23/2025 09:35:51</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/10/2025 13:05:23</publishTime>
+ <publishTime>12/23/2025 09:35:51</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>11/12/2025 10:43:47</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>12/10/2025 13:05:21</publishTime>
+ <publishTime>12/19/2025 15:00:07</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>12/10/2025 13:05:21</publishTime>
+ <publishTime>12/19/2025 15:00:07</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>12/10/2025 13:05:21</publishTime>
+ <publishTime>12/19/2025 15:00:09</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>12/10/2025 13:05:21</publishTime>
+ <publishTime>12/19/2025 15:00:09</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>12/10/2025 13:05:21</publishTime>
+ <publishTime>12/19/2025 15:00:09</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>12/10/2025 13:05:21</publishTime>
+ <publishTime>12/19/2025 15:00:09</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>12/10/2025 13:05:19</publishTime>
+ <publishTime>12/12/2025 08:26:25</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>12/10/2025 13:05:19</publishTime>
+ <publishTime>12/12/2025 08:26:25</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,22 +285,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>12/10/2025 13:05:22</publishTime>
+ <publishTime>12/12/2025 08:26:28</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>12/10/2025 13:05:22</publishTime>
+ <publishTime>12/12/2025 08:26:28</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>12/11/2025 16:34:14</publishTime>
+ <publishTime>12/23/2025 10:24:31</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/11/2025 16:34:14</publishTime>
+ <publishTime>12/23/2025 10:24:31</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>12/11/2025 16:34:17</publishTime>
+ <publishTime>12/23/2025 10:24:35</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -394,6 +394,9 @@
</File>
<File Include="Template/barCodeTemplateStorage.json">
<publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Utility/Barcode.ashx">
+ <publishTime>12/17/2025 13:18:47</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
<publishTime>11/12/2025 10:43:47</publishTime>
@@ -498,7 +501,7 @@
<publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web.config">
- <publishTime>12/10/2025 13:13:33</publishTime>
+ <publishTime>12/19/2025 15:00:27</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml
new file mode 100644
index 0000000..a21a6fd
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile11.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>False</DeleteExistingFiles>
+ <ExcludeApp_Data>False</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>D:\gz\缃戠珯鍙戝竷\MES-WEB-API</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user
new file mode 100644
index 0000000..a052877
--- /dev/null
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile11.pubxml.user
@@ -0,0 +1,510 @@
+锘�<?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>
+ <_PublishTargetUrl>D:\gz\缃戠珯鍙戝竷\MES-WEB-API</_PublishTargetUrl>
+ <History>True|2025-12-26T00:20:29.5411144Z;True|2025-12-26T08:16:26.6662581+08:00;False|2025-12-26T08:16:07.5700329+08:00;True|2025-12-25T17:07:24.9496892+08:00;True|2025-12-25T17:04:00.1314291+08:00;True|2025-12-25T16:53:07.6258358+08:00;True|2025-12-25T16:47:09.1816088+08:00;True|2025-12-25T11:23:19.3812293+08:00;True|2025-12-25T11:15:13.7273857+08:00;</History>
+ </PropertyGroup>
+ <ItemGroup>
+ <File Include="apiapp.json">
+ <publishTime>11/12/2025 10:43:48</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/25/2025 09:43:17</publishTime>
+ </File>
+ <File Include="bin/BLL.pdb">
+ <publishTime>12/25/2025 09:43:17</publishTime>
+ </File>
+ <File Include="bin/BouncyCastle.Crypto.dll">
+ <publishTime>12/18/2020 05:32:28</publishTime>
+ </File>
+ <File Include="bin/DAL.dll">
+ <publishTime>12/25/2025 09:43:16</publishTime>
+ </File>
+ <File Include="bin/DAL.pdb">
+ <publishTime>12/25/2025 09:43:16</publishTime>
+ </File>
+ <File Include="bin/Dapper.dll">
+ <publishTime>07/22/2016 22:52:40</publishTime>
+ </File>
+ <File Include="bin/DBUtility.dll">
+ <publishTime>12/25/2025 09:43:13</publishTime>
+ </File>
+ <File Include="bin/DBUtility.pdb">
+ <publishTime>12/25/2025 09:43:13</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>11/12/2025 10:43:47</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/25/2025 09:43:13</publishTime>
+ </File>
+ <File Include="bin/Model.pdb">
+ <publishTime>12/25/2025 09:43:13</publishTime>
+ </File>
+ <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
+ <publishTime>11/12/2025 10:43:47</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/25/2025 09:43:09</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.pdb">
+ <publishTime>12/25/2025 09:43:09</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.dll">
+ <publishTime>12/25/2025 09:43:11</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.pdb">
+ <publishTime>12/25/2025 09:43:11</publishTime>
+ </File>
+ <File Include="bin/RestSharp.dll">
+ <publishTime>08/31/2012 06:22:50</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.dll">
+ <publishTime>12/25/2025 09:43:12</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.pdb">
+ <publishTime>12/25/2025 09:43:12</publishTime>
+ </File>
+ <File Include="bin/Swashbuckle.Core.dll">
+ <publishTime>02/16/2015 01:57:08</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.dll">
+ <publishTime>12/24/2025 14:37:37</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.pdb">
+ <publishTime>12/24/2025 14:37:37</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>11/12/2025 10:43:47</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/24/2025 14:37:37</publishTime>
+ </File>
+ <File Include="bin/TopSdk.pdb">
+ <publishTime>12/24/2025 14:37:37</publishTime>
+ </File>
+ <File Include="bin/WebActivatorEx.dll">
+ <publishTime>11/24/2014 19:18:48</publishTime>
+ </File>
+ <File Include="bin/WebAPI.dll">
+ <publishTime>12/26/2025 08:20:24</publishTime>
+ </File>
+ <File Include="bin/WebAPI.pdb">
+ <publishTime>12/26/2025 08:20:24</publishTime>
+ </File>
+ <File Include="bin/WebAPI.XmlSerializers.dll">
+ <publishTime>12/26/2025 08:20:27</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>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Content/bootstrap.css">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Content/bootstrap.min.css">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Content/Site.css">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/BLL.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/DAL.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/DBUtility.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/Interop.grsvr6Lib.dll">
+ <publishTime>12/17/2025 13:18:47</publishTime>
+ </File>
+ <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/Model.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/Newtonsoft.Json.Net35.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/Pub_Class.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/Pub_Control.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="DLL/SQLHelper.dll">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.eot">
+ <publishTime>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.svg">
+ <publishTime>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.ttf">
+ <publishTime>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.woff">
+ <publishTime>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="Global.asax">
+ <publishTime>11/12/2025 10:43:47</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>11/12/2025 10:43:47</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>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="packages.config">
+ <publishTime>11/12/2025 10:43:48</publishTime>
+ </File>
+ <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
+ <publishTime>12/09/2025 08:11:33</publishTime>
+ </File>
+ <File Include="Template/barCodeTemplateStorage.json">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Utility/Barcode.ashx">
+ <publishTime>12/17/2025 13:18:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.min.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.map">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.min.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Scripts/modernizr-2.6.2.js">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Shared/Error.cshtml">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/Shared/_Layout.cshtml">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/web.config">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Views/_ViewStart.cshtml">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
+ <publishTime>11/12/2025 10:43:47</publishTime>
+ </File>
+ <File Include="Web.config">
+ <publishTime>12/25/2025 11:15:12</publishTime>
+ </File>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
index bc97764..2b9267f 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2025-08-13T05:32:18.1126471Z;True|2025-08-13T10:05:10.6784109+08:00;True|2025-08-13T09:59:40.2588968+08:00;True|2024-11-11T15:03:29.1473573+08:00;True|2024-11-11T14:52:17.0201354+08:00;True|2024-11-11T14:16:53.8725631+08:00;True|2024-11-11T13:04:30.9909737+08:00;False|2024-11-11T13:04:04.3586012+08:00;True|2024-11-07T13:54:38.7153293+08:00;False|2024-11-07T13:54:23.0036881+08:00;False|2024-11-07T13:53:56.1173012+08:00;True|2024-11-07T10:03:15.6008864+08:00;True|2024-11-07T09:45:59.3293360+08:00;False|2024-11-07T09:45:15.0034274+08:00;True|2024-11-04T14:38:54.4763789+08:00;True|2024-10-31T16:00:46.6075171+08:00;True|2024-10-31T15:22:22.3369744+08:00;True|2024-10-31T12:51:43.2180719+08:00;False|2024-10-31T12:50:50.6521635+08:00;True|2024-10-31T12:14:45.2826348+08:00;True|2024-10-31T09:58:20.1772497+08:00;False|2024-10-31T09:57:06.4220474+08:00;True|2024-10-29T08:23:40.1187027+08:00;False|2024-10-29T08:22:57.5875931+08:00;True|2024-10-28T16:59:15.9197469+08:00;True|2024-10-28T14:29:39.0107178+08:00;False|2024-10-28T14:28:48.1635009+08:00;True|2024-10-25T13:45:33.6424342+08:00;True|2024-10-25T09:58:38.8392001+08:00;False|2024-10-25T09:57:49.7417333+08:00;True|2024-10-18T16:43:35.1364495+08:00;False|2024-10-18T16:42:59.5332813+08:00;True|2024-10-18T11:56:15.8267584+08:00;False|2024-10-18T11:55:41.7667883+08:00;True|2024-10-17T16:35:21.5250546+08:00;True|2024-10-17T15:39:45.6140281+08:00;True|2024-10-17T15:13:04.7104524+08:00;True|2024-10-17T14:54:20.5672206+08:00;True|2024-10-17T13:03:49.0562978+08:00;True|2024-10-16T11:57:09.2205029+08:00;True|2024-10-16T11:47:09.1175797+08:00;True|2024-10-16T11:12:45.2631759+08:00;False|2024-10-16T11:11:57.2236500+08:00;True|2024-10-15T16:20:02.9116206+08:00;True|2024-10-15T15:58:43.2926050+08:00;True|2024-10-15T15:42:21.7936803+08:00;True|2024-10-15T15:08:43.2300880+08:00;True|2024-10-15T14:57:53.1025144+08:00;True|2024-10-15T14:49:52.0203753+08:00;True|2024-10-15T13:43:28.4322672+08:00;True|2024-10-15T13:02:51.9833820+08:00;True|2024-10-15T10:35:13.3052884+08:00;True|2024-10-15T10:31:23.7280933+08:00;True|2024-10-15T10:16:45.0292893+08:00;True|2024-10-15T09:59:30.2256849+08:00;True|2024-10-15T09:53:37.7284098+08:00;True|2024-10-15T09:45:34.6928334+08:00;False|2024-10-15T09:45:08.0828173+08:00;True|2024-10-15T09:20:15.0444151+08:00;False|2024-10-15T09:18:15.4388995+08:00;True|2024-10-14T15:31:49.0978922+08:00;False|2024-10-14T15:31:08.3741419+08:00;True|2024-10-14T15:09:44.3508500+08:00;True|2024-10-14T14:45:34.5430843+08:00;True|2024-10-14T14:04:11.8258435+08:00;True|2024-10-14T13:54:24.2353356+08:00;True|2024-10-14T13:48:16.0893349+08:00;False|2024-10-14T13:47:57.1909782+08:00;True|2024-10-14T11:12:14.9583385+08:00;False|2024-10-14T11:11:21.0058133+08:00;True|2024-10-11T16:49:55.1188159+08:00;True|2024-10-11T16:11:04.2021026+08:00;True|2024-10-11T15:48:50.7687290+08:00;True|2024-10-11T15:33:27.8527915+08:00;True|2024-10-11T14:49:01.6142514+08:00;False|2024-10-11T14:48:33.6149374+08:00;True|2024-10-11T13:50:33.4424142+08:00;False|2024-10-11T13:41:53.6580199+08:00;False|2024-10-11T13:41:39.5167380+08:00;False|2024-10-11T13:37:52.6531605+08:00;False|2024-10-11T13:37:11.7263329+08:00;</History>
+ <History>True|2025-12-22T08:02:06.5410343Z;True|2025-12-22T15:43:45.9660702+08:00;True|2025-12-22T15:28:36.1194727+08:00;True|2025-12-22T15:15:46.1540932+08:00;True|2025-12-22T15:14:03.4401553+08:00;True|2025-12-22T13:39:55.5754991+08:00;True|2025-12-22T13:32:39.0919790+08:00;False|2025-12-22T13:31:43.7527463+08:00;True|2025-12-19T15:51:36.9735361+08:00;True|2025-12-19T15:25:54.2767592+08:00;True|2025-12-19T14:41:07.3130752+08:00;True|2025-12-19T14:37:24.0368827+08:00;True|2025-12-19T14:33:43.2528937+08:00;True|2025-12-19T14:22:42.8786085+08:00;False|2025-12-19T14:21:47.3281347+08:00;True|2025-12-18T17:00:25.3978317+08:00;False|2025-12-18T16:59:08.8776140+08:00;True|2025-12-17T15:05:20.4972081+08:00;True|2025-12-17T14:56:40.4723575+08:00;True|2025-12-17T14:42:54.7527692+08:00;True|2025-12-17T14:14:57.6558359+08:00;True|2025-12-17T13:46:50.8083801+08:00;True|2025-12-17T09:27:07.4023648+08:00;False|2025-12-17T09:25:56.6443842+08:00;True|2025-12-16T16:18:59.7366636+08:00;False|2025-12-16T16:18:08.0149952+08:00;True|2025-12-16T10:46:52.7815645+08:00;True|2025-12-16T10:32:25.9340809+08:00;True|2025-12-16T10:23:58.5183174+08:00;False|2025-12-16T10:23:06.1859498+08:00;True|2025-12-15T08:06:12.6833489+08:00;False|2025-12-15T08:05:23.3449223+08:00;True|2025-12-14T21:32:50.6557670+08:00;True|2025-08-13T13:32:18.1126471+08:00;True|2025-08-13T10:05:10.6784109+08:00;True|2025-08-13T09:59:40.2588968+08:00;True|2024-11-11T15:03:29.1473573+08:00;True|2024-11-11T14:52:17.0201354+08:00;True|2024-11-11T14:16:53.8725631+08:00;True|2024-11-11T13:04:30.9909737+08:00;False|2024-11-11T13:04:04.3586012+08:00;True|2024-11-07T13:54:38.7153293+08:00;False|2024-11-07T13:54:23.0036881+08:00;False|2024-11-07T13:53:56.1173012+08:00;True|2024-11-07T10:03:15.6008864+08:00;True|2024-11-07T09:45:59.3293360+08:00;False|2024-11-07T09:45:15.0034274+08:00;True|2024-11-04T14:38:54.4763789+08:00;True|2024-10-31T16:00:46.6075171+08:00;True|2024-10-31T15:22:22.3369744+08:00;True|2024-10-31T12:51:43.2180719+08:00;False|2024-10-31T12:50:50.6521635+08:00;True|2024-10-31T12:14:45.2826348+08:00;True|2024-10-31T09:58:20.1772497+08:00;False|2024-10-31T09:57:06.4220474+08:00;True|2024-10-29T08:23:40.1187027+08:00;False|2024-10-29T08:22:57.5875931+08:00;True|2024-10-28T16:59:15.9197469+08:00;True|2024-10-28T14:29:39.0107178+08:00;False|2024-10-28T14:28:48.1635009+08:00;True|2024-10-25T13:45:33.6424342+08:00;True|2024-10-25T09:58:38.8392001+08:00;False|2024-10-25T09:57:49.7417333+08:00;True|2024-10-18T16:43:35.1364495+08:00;False|2024-10-18T16:42:59.5332813+08:00;True|2024-10-18T11:56:15.8267584+08:00;False|2024-10-18T11:55:41.7667883+08:00;True|2024-10-17T16:35:21.5250546+08:00;True|2024-10-17T15:39:45.6140281+08:00;True|2024-10-17T15:13:04.7104524+08:00;True|2024-10-17T14:54:20.5672206+08:00;True|2024-10-17T13:03:49.0562978+08:00;True|2024-10-16T11:57:09.2205029+08:00;True|2024-10-16T11:47:09.1175797+08:00;True|2024-10-16T11:12:45.2631759+08:00;False|2024-10-16T11:11:57.2236500+08:00;True|2024-10-15T16:20:02.9116206+08:00;True|2024-10-15T15:58:43.2926050+08:00;True|2024-10-15T15:42:21.7936803+08:00;True|2024-10-15T15:08:43.2300880+08:00;True|2024-10-15T14:57:53.1025144+08:00;True|2024-10-15T14:49:52.0203753+08:00;True|2024-10-15T13:43:28.4322672+08:00;True|2024-10-15T13:02:51.9833820+08:00;True|2024-10-15T10:35:13.3052884+08:00;True|2024-10-15T10:31:23.7280933+08:00;True|2024-10-15T10:16:45.0292893+08:00;True|2024-10-15T09:59:30.2256849+08:00;True|2024-10-15T09:53:37.7284098+08:00;True|2024-10-15T09:45:34.6928334+08:00;False|2024-10-15T09:45:08.0828173+08:00;True|2024-10-15T09:20:15.0444151+08:00;False|2024-10-15T09:18:15.4388995+08:00;True|2024-10-14T15:31:49.0978922+08:00;False|2024-10-14T15:31:08.3741419+08:00;True|2024-10-14T15:09:44.3508500+08:00;True|2024-10-14T14:45:34.5430843+08:00;True|2024-10-14T14:04:11.8258435+08:00;True|2024-10-14T13:54:24.2353356+08:00;True|2024-10-14T13:48:16.0893349+08:00;False|2024-10-14T13:47:57.1909782+08:00;True|2024-10-14T11:12:14.9583385+08:00;False|2024-10-14T11:11:21.0058133+08:00;True|2024-10-11T16:49:55.1188159+08:00;True|2024-10-11T16:11:04.2021026+08:00;True|2024-10-11T15:48:50.7687290+08:00;True|2024-10-11T15:33:27.8527915+08:00;True|2024-10-11T14:49:01.6142514+08:00;False|2024-10-11T14:48:33.6149374+08:00;True|2024-10-11T13:50:33.4424142+08:00;False|2024-10-11T13:41:53.6580199+08:00;False|2024-10-11T13:41:39.5167380+08:00;False|2024-10-11T13:37:52.6531605+08:00;False|2024-10-11T13:37:11.7263329+08:00;</History>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>08/08/2025 13:13:07</publishTime>
+ <publishTime>12/22/2025 16:01:41</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/08/2025 13:13:07</publishTime>
+ <publishTime>12/22/2025 16:01:41</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/08/2025 13:13:05</publishTime>
+ <publishTime>12/22/2025 16:01:39</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/08/2025 13:13:05</publishTime>
+ <publishTime>12/22/2025 16:01:39</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/08/2025 13:13:01</publishTime>
+ <publishTime>12/19/2025 14:11:56</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/08/2025 13:13:01</publishTime>
+ <publishTime>12/19/2025 14:11:56</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>08/08/2025 13:13:02</publishTime>
+ <publishTime>12/22/2025 16:01:33</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/08/2025 13:13:02</publishTime>
+ <publishTime>12/22/2025 16:01:33</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/21/2025 11:46:16</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>08/08/2025 13:12:59</publishTime>
+ <publishTime>12/19/2025 14:11:54</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/08/2025 13:12:59</publishTime>
+ <publishTime>12/19/2025 14:11:54</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/08/2025 13:13:00</publishTime>
+ <publishTime>12/19/2025 14:11:55</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/08/2025 13:13:00</publishTime>
+ <publishTime>12/19/2025 14:11:55</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/08/2025 13:13:00</publishTime>
+ <publishTime>12/19/2025 14:11:55</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/08/2025 13:13:00</publishTime>
+ <publishTime>12/19/2025 14:11:55</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>08/08/2025 10:08:01</publishTime>
+ <publishTime>12/19/2025 14:11:51</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>08/08/2025 10:08:01</publishTime>
+ <publishTime>12/19/2025 14:11:51</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,22 +285,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>08/08/2025 12:29:49</publishTime>
+ <publishTime>12/19/2025 14:11:58</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>08/08/2025 12:29:52</publishTime>
+ <publishTime>12/19/2025 14:11:58</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/13/2025 13:31:56</publishTime>
+ <publishTime>12/22/2025 16:01:51</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/13/2025 13:31:56</publishTime>
+ <publishTime>12/22/2025 16:01:51</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>08/13/2025 13:32:16</publishTime>
+ <publishTime>12/22/2025 16:02:04</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -331,6 +331,9 @@
</File>
<File Include="DLL/DBUtility.dll">
<publishTime>04/21/2025 11:46:16</publishTime>
+ </File>
+ <File Include="DLL/Interop.grsvr6Lib.dll">
+ <publishTime>12/14/2025 21:28:19</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
<publishTime>04/21/2025 11:46:16</publishTime>
@@ -388,6 +391,15 @@
</File>
<File Include="packages.config">
<publishTime>04/21/2025 11:46:17</publishTime>
+ </File>
+ <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
+ <publishTime>12/07/2025 12:01:10</publishTime>
+ </File>
+ <File Include="Template/barCodeTemplateStorage.json">
+ <publishTime>08/29/2025 09:43:09</publishTime>
+ </File>
+ <File Include="Utility/Barcode.ashx">
+ <publishTime>12/14/2025 21:28:19</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
<publishTime>04/21/2025 11:46:17</publishTime>
@@ -495,7 +507,7 @@
<publishTime>05/06/2024 13:47:57</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/13/2025 09:59:38</publishTime>
+ <publishTime>12/19/2025 14:22:41</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index aad738d..cba7ea2 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2025-12-17T05:08:15.8085856Z;True|2025-12-17T12:05:52.9797421+08:00;True|2025-12-17T11:27:47.6416543+08:00;False|2025-12-17T11:27:42.3019407+08:00;True|2025-12-17T11:14:49.0908221+08:00;True|2025-12-17T11:08:53.4369374+08:00;False|2025-12-17T11:08:45.0402692+08:00;True|2025-12-16T16:06:53.1110683+08:00;True|2025-12-16T15:53:59.2905202+08:00;False|2025-12-16T15:53:50.3369570+08:00;True|2025-12-16T13:20:43.3609968+08:00;True|2025-12-16T13:04:36.7893657+08:00;False|2025-12-16T13:04:09.5572052+08:00;True|2025-12-11T17:06:16.6959487+08:00;False|2025-12-11T17:06:03.7184361+08:00;True|2025-12-11T16:18:49.6369388+08:00;False|2025-12-11T16:18:37.3969848+08:00;True|2025-12-08T17:02:56.3292906+08:00;False|2025-12-08T17:02:50.6587191+08:00;True|2025-12-08T14:22:05.5028004+08:00;False|2025-12-08T14:21:51.5681305+08:00;True|2025-12-03T16:01:44.3905890+08:00;False|2025-12-03T16:01:35.0635101+08:00;True|2025-11-28T11:27:04.6248331+08:00;True|2025-11-28T11:07:17.0249718+08:00;False|2025-11-28T11:07:11.3086456+08:00;True|2025-11-27T18:37:16.9508633+08:00;True|2025-11-27T17:10:40.3522364+08:00;True|2025-11-27T16:35:58.2595051+08:00;True|2025-11-27T10:18:55.2307371+08:00;False|2025-11-27T10:18:46.2066993+08:00;True|2025-11-17T09:27:55.7259977+08:00;False|2025-11-17T09:27:16.7136935+08:00;True|2025-11-11T13:58:05.2172999+08:00;True|2025-11-11T10:37:35.1191334+08:00;True|2025-11-10T15:06:22.3357673+08:00;False|2025-11-10T15:06:11.8400556+08:00;True|2025-11-07T08:57:00.1734758+08:00;True|2025-11-06T16:48:00.0284671+08:00;False|2025-11-06T16:47:45.7437599+08:00;True|2025-11-05T13:31:44.6179596+08:00;True|2025-11-05T08:33:54.1548243+08:00;False|2025-11-05T08:33:24.5684931+08:00;True|2025-11-03T13:35:15.5366201+08:00;True|2025-11-03T10:57:58.1269080+08:00;True|2025-11-03T09:27:46.8362957+08:00;False|2025-11-03T09:27:37.6852594+08:00;True|2025-10-31T15:18:06.4022197+08:00;True|2025-10-31T13:32:17.1759540+08:00;False|2025-10-31T13:32:08.0028313+08:00;True|2025-10-31T11:15:10.5355694+08:00;False|2025-10-31T11:14:55.6627999+08:00;True|2025-10-31T10:49:30.4944361+08:00;True|2025-10-31T10:42:57.7706914+08:00;True|2025-10-30T16:15:53.3336368+08:00;False|2025-10-30T16:15:40.9253965+08:00;True|2025-10-28T16:01:06.5666553+08:00;False|2025-10-28T16:00:38.5947348+08:00;True|2025-10-27T13:43:49.5161274+08:00;False|2025-10-27T13:43:42.5342286+08:00;True|2025-10-27T09:42:46.5335165+08:00;True|2025-10-27T08:53:31.2276269+08:00;False|2025-10-27T08:53:25.4177209+08:00;True|2025-10-22T08:11:11.0901859+08:00;False|2025-10-22T08:11:03.4971724+08:00;True|2025-10-16T09:53:45.6893131+08:00;True|2025-10-16T09:46:23.1367811+08:00;True|2025-10-16T09:41:45.9417321+08:00;True|2025-10-16T09:37:10.8036335+08:00;True|2025-10-16T09:34:38.7879337+08:00;True|2025-10-16T09:27:23.7972937+08:00;False|2025-10-16T09:27:15.3584640+08:00;True|2025-10-15T13:18:13.1534605+08:00;True|2025-10-15T11:54:34.1416019+08:00;True|2025-10-14T14:52:11.7549757+08:00;True|2025-10-14T14:02:31.7864158+08:00;True|2025-10-14T13:58:05.5977325+08:00;True|2025-10-14T10:12:35.5186964+08:00;True|2025-10-13T09:24:47.5787047+08:00;False|2025-10-13T09:24:42.7177753+08:00;True|2025-10-13T09:16:46.4811414+08:00;True|2025-10-13T09:15:21.5309960+08:00;True|2025-10-13T09:09:15.1695102+08:00;False|2025-10-13T09:09:08.5879473+08:00;True|2025-10-09T10:00:33.5750010+08:00;True|2025-10-09T09:33:11.4532680+08:00;False|2025-10-09T09:33:04.5858282+08:00;True|2025-09-26T11:07:04.5894247+08:00;False|2025-09-26T11:06:52.9247286+08:00;True|2025-09-24T16:34:25.3145173+08:00;True|2025-09-23T09:30:03.7438798+08:00;False|2025-09-23T09:29:41.1444600+08:00;True|2025-09-17T17:02:04.9034722+08:00;False|2025-09-17T17:01:53.0112736+08:00;True|2025-09-14T18:27:58.3167162+08:00;False|2025-09-14T18:27:47.9377936+08:00;True|2025-08-29T09:29:06.6419251+08:00;True|2025-08-29T09:23:11.0758344+08:00;False|2025-08-29T09:23:00.6033841+08:00;True|2025-08-25T13:43:52.6697107+08:00;False|2025-08-25T13:43:42.8785673+08:00;True|2025-08-21T13:29:18.9335767+08:00;True|2025-08-21T11:13:20.9093967+08:00;False|2025-08-21T11:13:10.8256540+08:00;True|2025-08-19T15:35:19.4743877+08:00;True|2025-08-19T15:09:57.0299457+08:00;False|2025-08-19T15:09:49.9658349+08:00;False|2025-08-19T15:02:52.4274789+08:00;False|2025-08-19T15:02:39.9727509+08:00;False|2025-08-19T15:02:36.7287443+08:00;True|2025-08-19T11:03:00.3784015+08:00;True|2025-08-18T16:53:43.4851878+08:00;False|2025-08-18T16:53:30.4295443+08:00;True|2025-08-18T16:01:19.9787029+08:00;False|2025-08-18T16:01:03.9842180+08:00;True|2025-08-14T18:32:31.1936983+08:00;True|2025-08-13T16:33:00.5421619+08:00;True|2025-08-13T13:22:53.0413832+08:00;False|2025-08-13T13:22:41.0451268+08:00;True|2025-08-12T10:23:11.0645305+08:00;False|2025-08-12T10:23:04.2787778+08:00;True|2025-08-09T13:19:27.9772377+08:00;False|2025-08-09T13:19:12.2232716+08:00;True|2025-08-08T17:01:57.4731423+08:00;True|2025-08-08T12:51:45.7474316+08:00;True|2025-08-08T10:20:06.0336393+08:00;False|2025-08-08T10:19:49.3475689+08:00;True|2025-08-04T22:23:46.6736035+08:00;False|2025-08-04T22:23:34.5441277+08:00;True|2025-08-04T22:17:39.1859867+08:00;True|2025-08-04T22:07:00.9139591+08:00;False|2025-08-04T22:06:52.0807225+08:00;True|2025-08-04T21:40:22.9828884+08:00;True|2025-08-04T21:38:38.0973676+08:00;True|2025-08-04T17:13:55.3765124+08:00;True|2025-08-04T16:47:49.6221076+08:00;False|2025-08-04T16:47:33.9713263+08:00;True|2025-07-24T13:53:49.6344878+08:00;False|2025-07-24T13:53:30.5020566+08:00;True|2025-07-22T16:17:28.5098998+08:00;False|2025-07-22T16:17:11.7327042+08:00;True|2025-07-18T14:36:12.8758873+08:00;True|2025-07-18T14:34:51.0308463+08:00;True|2025-07-17T13:46:41.7825452+08:00;False|2025-07-17T13:46:34.7923451+08:00;True|2025-07-10T15:32:46.2125476+08:00;True|2025-07-10T13:04:51.1753421+08:00;False|2025-07-10T13:04:36.0826557+08:00;True|2025-06-30T15:07:20.0280664+08:00;True|2025-06-27T15:26:25.9639936+08:00;True|2025-06-27T14:47:26.1931097+08:00;True|2025-06-26T14:55:48.9758888+08:00;False|2025-06-26T14:55:35.8969707+08:00;True|2025-06-26T10:10:12.9628884+08:00;True|2025-06-23T11:10:52.6295857+08:00;False|2025-06-23T11:10:46.2505309+08:00;True|2025-06-18T14:13:15.0141966+08:00;False|2025-06-18T14:13:08.3724816+08:00;True|2025-06-18T13:24:40.1027054+08:00;True|2025-06-17T08:19:03.1298222+08:00;False|2025-06-17T08:18:48.1583742+08:00;True|2025-06-12T15:16:16.9926905+08:00;False|2025-06-12T15:16:09.7255464+08:00;True|2025-06-10T07:49:56.5698941+08:00;False|2025-06-10T07:49:47.3414841+08:00;True|2025-06-06T21:04:33.8746305+08:00;True|2025-06-06T20:56:56.6195108+08:00;True|2025-06-06T16:32:26.7872473+08:00;False|2025-06-06T16:31:43.4644697+08:00;True|2025-05-27T13:34:19.9152695+08:00;True|2025-05-26T13:59:11.0434021+08:00;True|2025-05-26T10:32:52.6605356+08:00;False|2025-05-26T10:32:38.4759922+08:00;True|2025-05-21T19:58:17.4859837+08:00;True|2025-05-21T19:56:00.7906025+08:00;True|2025-05-21T19:38:51.0984867+08:00;True|2025-05-21T16:49:04.2014052+08:00;True|2025-05-21T14:47:57.4746320+08:00;True|2025-05-20T19:29:56.6172010+08:00;False|2025-05-20T19:29:50.2198527+08:00;True|2025-05-19T15:06:53.2645411+08:00;True|2025-05-16T16:32:02.9818718+08:00;True|2025-05-16T16:30:33.9588010+08:00;True|2025-05-16T15:44:32.5318879+08:00;True|2025-05-16T15:10:54.6822997+08:00;True|2025-05-16T15:01:00.7569816+08:00;True|2025-05-16T13:50:40.0040164+08:00;True|2025-05-16T13:01:14.5388124+08:00;True|2025-05-16T10:38:20.4876566+08:00;True|2025-05-16T10:23:09.0484073+08:00;True|2025-05-16T10:14:49.6622040+08:00;False|2025-05-16T10:14:36.5792240+08:00;True|2025-05-15T14:29:05.4556596+08:00;True|2025-05-15T14:00:45.9974491+08:00;True|2025-05-15T13:58:06.3825427+08:00;True|2025-05-15T08:35:55.0404130+08:00;True|2025-05-15T08:35:27.5658528+08:00;True|2025-05-14T16:08:41.1106680+08:00;True|2025-05-14T15:43:29.5573491+08:00;True|2025-05-14T15:34:13.5272127+08:00;True|2025-05-13T15:19:29.7660222+08:00;True|2025-05-12T15:58:42.3279365+08:00;True|2025-05-12T14:46:40.4175974+08:00;True|2025-05-12T14:25:17.7975975+08:00;True|2025-05-12T14:15:03.6854114+08:00;True|2025-05-12T13:20:39.4575875+08:00;True|2025-05-12T13:04:59.2637345+08:00;True|2025-05-12T11:05:39.1423146+08:00;True|2025-05-12T11:04:52.2191892+08:00;True|2025-05-12T11:00:33.9329101+08:00;False|2025-05-12T11:00:26.8429710+08:00;True|2025-05-12T10:24:55.6169026+08:00;False|2025-05-12T10:24:26.9432217+08:00;True|2025-05-09T15:17:47.6968997+08:00;False|2025-05-09T15:17:41.5165040+08:00;True|2025-05-08T15:55:24.8437328+08:00;True|2025-05-08T15:49:52.1982131+08:00;True|2025-05-08T14:30:58.6658233+08:00;True|2025-05-08T13:57:47.2409635+08:00;True|2025-05-08T13:49:25.7927065+08:00;True|2025-05-08T10:56:53.9086795+08:00;True|2025-05-08T10:47:04.1369521+08:00;True|2025-05-07T11:19:22.7005176+08:00;True|2025-05-07T11:12:33.5037815+08:00;True|2025-05-07T11:08:26.5089483+08:00;True|2025-05-06T09:56:16.4670446+08:00;True|2025-05-06T09:53:13.1199697+08:00;False|2025-05-06T09:53:05.2692896+08:00;True|2025-04-30T10:16:44.1151152+08:00;True|2025-04-30T10:00:47.3410363+08:00;True|2025-04-30T09:39:12.0356027+08:00;True|2025-04-30T08:45:37.0637703+08:00;True|2025-04-30T08:18:50.0996148+08:00;False|2025-04-30T08:18:21.1738369+08:00;True|2025-04-30T08:09:22.0615915+08:00;False|2025-04-30T08:09:12.5664882+08:00;True|2025-04-29T16:21:28.2743192+08:00;True|2025-04-29T14:10:09.9848859+08:00;True|2025-04-28T11:01:44.6987411+08:00;False|2025-04-28T11:01:34.7062558+08:00;True|2025-04-27T16:12:37.4743910+08:00;False|2025-04-27T16:12:24.8989765+08:00;True|2025-04-24T11:13:25.0763421+08:00;True|2025-04-24T10:49:10.1323679+08:00;True|2025-04-23T11:12:58.7127237+08:00;True|2025-04-22T17:15:39.9949091+08:00;False|2025-04-22T17:15:33.9335391+08:00;True|2025-04-21T16:13:12.9842708+08:00;True|2025-04-21T16:11:03.4262306+08:00;True|2025-04-21T16:06:02.5167412+08:00;True|2025-04-21T16:03:57.2299958+08:00;False|2025-04-21T16:03:44.4356436+08:00;True|2025-04-21T15:28:15.2307697+08:00;True|2025-04-21T15:17:17.5682286+08:00;True|2025-04-21T15:12:16.8982275+08:00;True|2025-04-21T14:53:26.4605418+08:00;True|2025-04-21T14:49:48.8960696+08:00;True|2025-04-21T14:35:59.4591551+08:00;False|2025-04-21T14:35:46.2281772+08:00;True|2025-04-08T13:10:52.8749775+08:00;True|2025-04-08T09:10:05.3755564+08:00;True|2025-04-07T09:32:09.4220262+08:00;True|2025-04-02T10:07:49.7129656+08:00;True|2025-04-02T09:28:18.3104138+08:00;False|2025-04-02T09:28:06.8644783+08:00;True|2025-04-02T09:03:43.1765932+08:00;False|2025-04-02T09:03:36.6874678+08:00;True|2025-03-26T08:15:22.1038130+08:00;True|2025-03-25T17:13:07.6600191+08:00;True|2025-03-25T16:53:58.9214849+08:00;False|2025-03-25T16:53:46.3315797+08:00;True|2025-03-24T15:53:51.6757690+08:00;True|2025-03-24T14:18:37.5668299+08:00;True|2025-03-21T15:06:33.1307351+08:00;True|2025-03-21T15:04:11.9681650+08:00;True|2025-03-21T14:14:59.1591046+08:00;True|2025-03-21T10:25:57.3452453+08:00;True|2025-03-21T09:07:23.5814841+08:00;True|2025-03-20T16:42:24.9342284+08:00;False|2025-03-20T16:42:17.5165982+08:00;True|2025-03-20T16:34:56.3337544+08:00;True|2025-03-20T16:29:15.1683525+08:00;True|2025-03-20T16:23:42.5038047+08:00;True|2025-03-19T20:24:10.0975063+08:00;True|2025-03-18T09:34:22.6164243+08:00;True|2025-03-17T21:47:20.2930413+08:00;True|2025-03-17T19:41:02.3815065+08:00;False|2025-03-17T19:40:55.9908892+08:00;True|2025-03-17T19:19:49.8872115+08:00;True|2025-03-17T18:58:03.6903198+08:00;True|2025-03-17T14:26:34.9258043+08:00;True|2025-03-14T15:40:57.9378742+08:00;False|2025-03-14T15:40:46.0132033+08:00;False|2025-03-14T12:34:38.6551944+08:00;True|2025-03-05T14:35:44.7812995+08:00;True|2025-03-05T12:57:06.2539555+08:00;True|2025-03-05T11:19:01.3450138+08:00;True|2025-03-04T15:25:38.6174966+08:00;True|2025-03-04T14:54:41.4026832+08:00;True|2025-03-04T11:08:16.5619007+08:00;True|2025-03-04T10:01:43.5782535+08:00;True|2025-03-04T08:42:48.4526420+08:00;False|2025-03-04T08:42:42.2828130+08:00;True|2025-02-27T15:13:52.3469275+08:00;True|2025-02-27T10:59:33.6194212+08:00;False|2025-02-27T10:59:25.0394841+08:00;True|2025-02-27T10:44:18.9014583+08:00;True|2025-02-26T14:27:14.6049136+08:00;False|2025-02-26T14:27:02.9843524+08:00;True|2025-02-25T15:20:23.1640745+08:00;True|2025-02-25T14:48:55.2842125+08:00;False|2025-02-25T14:48:42.2715748+08:00;True|2025-02-11T10:10:05.6068846+08:00;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
+ <History>True|2025-12-23T01:43:13.8918995Z;True|2025-12-23T09:42:09.7206407+08:00;True|2025-12-22T15:40:41.8795215+08:00;False|2025-12-22T15:40:35.2940687+08:00;True|2025-12-22T08:45:57.3615997+08:00;False|2025-12-22T08:45:51.0771978+08:00;True|2025-12-19T16:28:59.2288561+08:00;False|2025-12-19T16:28:41.4920964+08:00;True|2025-12-19T15:43:54.2823664+08:00;True|2025-12-18T08:46:09.8358401+08:00;False|2025-12-18T08:46:02.7318186+08:00;True|2025-12-18T08:07:54.3693074+08:00;False|2025-12-18T08:07:45.6090674+08:00;True|2025-12-17T17:05:23.5970528+08:00;True|2025-12-17T13:08:15.8085856+08:00;True|2025-12-17T12:05:52.9797421+08:00;True|2025-12-17T11:27:47.6416543+08:00;False|2025-12-17T11:27:42.3019407+08:00;True|2025-12-17T11:14:49.0908221+08:00;True|2025-12-17T11:08:53.4369374+08:00;False|2025-12-17T11:08:45.0402692+08:00;True|2025-12-16T16:06:53.1110683+08:00;True|2025-12-16T15:53:59.2905202+08:00;False|2025-12-16T15:53:50.3369570+08:00;True|2025-12-16T13:20:43.3609968+08:00;True|2025-12-16T13:04:36.7893657+08:00;False|2025-12-16T13:04:09.5572052+08:00;True|2025-12-11T17:06:16.6959487+08:00;False|2025-12-11T17:06:03.7184361+08:00;True|2025-12-11T16:18:49.6369388+08:00;False|2025-12-11T16:18:37.3969848+08:00;True|2025-12-08T17:02:56.3292906+08:00;False|2025-12-08T17:02:50.6587191+08:00;True|2025-12-08T14:22:05.5028004+08:00;False|2025-12-08T14:21:51.5681305+08:00;True|2025-12-03T16:01:44.3905890+08:00;False|2025-12-03T16:01:35.0635101+08:00;True|2025-11-28T11:27:04.6248331+08:00;True|2025-11-28T11:07:17.0249718+08:00;False|2025-11-28T11:07:11.3086456+08:00;True|2025-11-27T18:37:16.9508633+08:00;True|2025-11-27T17:10:40.3522364+08:00;True|2025-11-27T16:35:58.2595051+08:00;True|2025-11-27T10:18:55.2307371+08:00;False|2025-11-27T10:18:46.2066993+08:00;True|2025-11-17T09:27:55.7259977+08:00;False|2025-11-17T09:27:16.7136935+08:00;True|2025-11-11T13:58:05.2172999+08:00;True|2025-11-11T10:37:35.1191334+08:00;True|2025-11-10T15:06:22.3357673+08:00;False|2025-11-10T15:06:11.8400556+08:00;True|2025-11-07T08:57:00.1734758+08:00;True|2025-11-06T16:48:00.0284671+08:00;False|2025-11-06T16:47:45.7437599+08:00;True|2025-11-05T13:31:44.6179596+08:00;True|2025-11-05T08:33:54.1548243+08:00;False|2025-11-05T08:33:24.5684931+08:00;True|2025-11-03T13:35:15.5366201+08:00;True|2025-11-03T10:57:58.1269080+08:00;True|2025-11-03T09:27:46.8362957+08:00;False|2025-11-03T09:27:37.6852594+08:00;True|2025-10-31T15:18:06.4022197+08:00;True|2025-10-31T13:32:17.1759540+08:00;False|2025-10-31T13:32:08.0028313+08:00;True|2025-10-31T11:15:10.5355694+08:00;False|2025-10-31T11:14:55.6627999+08:00;True|2025-10-31T10:49:30.4944361+08:00;True|2025-10-31T10:42:57.7706914+08:00;True|2025-10-30T16:15:53.3336368+08:00;False|2025-10-30T16:15:40.9253965+08:00;True|2025-10-28T16:01:06.5666553+08:00;False|2025-10-28T16:00:38.5947348+08:00;True|2025-10-27T13:43:49.5161274+08:00;False|2025-10-27T13:43:42.5342286+08:00;True|2025-10-27T09:42:46.5335165+08:00;True|2025-10-27T08:53:31.2276269+08:00;False|2025-10-27T08:53:25.4177209+08:00;True|2025-10-22T08:11:11.0901859+08:00;False|2025-10-22T08:11:03.4971724+08:00;True|2025-10-16T09:53:45.6893131+08:00;True|2025-10-16T09:46:23.1367811+08:00;True|2025-10-16T09:41:45.9417321+08:00;True|2025-10-16T09:37:10.8036335+08:00;True|2025-10-16T09:34:38.7879337+08:00;True|2025-10-16T09:27:23.7972937+08:00;False|2025-10-16T09:27:15.3584640+08:00;True|2025-10-15T13:18:13.1534605+08:00;True|2025-10-15T11:54:34.1416019+08:00;True|2025-10-14T14:52:11.7549757+08:00;True|2025-10-14T14:02:31.7864158+08:00;True|2025-10-14T13:58:05.5977325+08:00;True|2025-10-14T10:12:35.5186964+08:00;True|2025-10-13T09:24:47.5787047+08:00;False|2025-10-13T09:24:42.7177753+08:00;True|2025-10-13T09:16:46.4811414+08:00;True|2025-10-13T09:15:21.5309960+08:00;True|2025-10-13T09:09:15.1695102+08:00;False|2025-10-13T09:09:08.5879473+08:00;True|2025-10-09T10:00:33.5750010+08:00;True|2025-10-09T09:33:11.4532680+08:00;False|2025-10-09T09:33:04.5858282+08:00;True|2025-09-26T11:07:04.5894247+08:00;False|2025-09-26T11:06:52.9247286+08:00;True|2025-09-24T16:34:25.3145173+08:00;True|2025-09-23T09:30:03.7438798+08:00;False|2025-09-23T09:29:41.1444600+08:00;True|2025-09-17T17:02:04.9034722+08:00;False|2025-09-17T17:01:53.0112736+08:00;True|2025-09-14T18:27:58.3167162+08:00;False|2025-09-14T18:27:47.9377936+08:00;True|2025-08-29T09:29:06.6419251+08:00;True|2025-08-29T09:23:11.0758344+08:00;False|2025-08-29T09:23:00.6033841+08:00;True|2025-08-25T13:43:52.6697107+08:00;False|2025-08-25T13:43:42.8785673+08:00;True|2025-08-21T13:29:18.9335767+08:00;True|2025-08-21T11:13:20.9093967+08:00;False|2025-08-21T11:13:10.8256540+08:00;True|2025-08-19T15:35:19.4743877+08:00;True|2025-08-19T15:09:57.0299457+08:00;False|2025-08-19T15:09:49.9658349+08:00;False|2025-08-19T15:02:52.4274789+08:00;False|2025-08-19T15:02:39.9727509+08:00;False|2025-08-19T15:02:36.7287443+08:00;True|2025-08-19T11:03:00.3784015+08:00;True|2025-08-18T16:53:43.4851878+08:00;False|2025-08-18T16:53:30.4295443+08:00;True|2025-08-18T16:01:19.9787029+08:00;False|2025-08-18T16:01:03.9842180+08:00;True|2025-08-14T18:32:31.1936983+08:00;True|2025-08-13T16:33:00.5421619+08:00;True|2025-08-13T13:22:53.0413832+08:00;False|2025-08-13T13:22:41.0451268+08:00;True|2025-08-12T10:23:11.0645305+08:00;False|2025-08-12T10:23:04.2787778+08:00;True|2025-08-09T13:19:27.9772377+08:00;False|2025-08-09T13:19:12.2232716+08:00;True|2025-08-08T17:01:57.4731423+08:00;True|2025-08-08T12:51:45.7474316+08:00;True|2025-08-08T10:20:06.0336393+08:00;False|2025-08-08T10:19:49.3475689+08:00;True|2025-08-04T22:23:46.6736035+08:00;False|2025-08-04T22:23:34.5441277+08:00;True|2025-08-04T22:17:39.1859867+08:00;True|2025-08-04T22:07:00.9139591+08:00;False|2025-08-04T22:06:52.0807225+08:00;True|2025-08-04T21:40:22.9828884+08:00;True|2025-08-04T21:38:38.0973676+08:00;True|2025-08-04T17:13:55.3765124+08:00;True|2025-08-04T16:47:49.6221076+08:00;False|2025-08-04T16:47:33.9713263+08:00;True|2025-07-24T13:53:49.6344878+08:00;False|2025-07-24T13:53:30.5020566+08:00;True|2025-07-22T16:17:28.5098998+08:00;False|2025-07-22T16:17:11.7327042+08:00;True|2025-07-18T14:36:12.8758873+08:00;True|2025-07-18T14:34:51.0308463+08:00;True|2025-07-17T13:46:41.7825452+08:00;False|2025-07-17T13:46:34.7923451+08:00;True|2025-07-10T15:32:46.2125476+08:00;True|2025-07-10T13:04:51.1753421+08:00;False|2025-07-10T13:04:36.0826557+08:00;True|2025-06-30T15:07:20.0280664+08:00;True|2025-06-27T15:26:25.9639936+08:00;True|2025-06-27T14:47:26.1931097+08:00;True|2025-06-26T14:55:48.9758888+08:00;False|2025-06-26T14:55:35.8969707+08:00;True|2025-06-26T10:10:12.9628884+08:00;True|2025-06-23T11:10:52.6295857+08:00;False|2025-06-23T11:10:46.2505309+08:00;True|2025-06-18T14:13:15.0141966+08:00;False|2025-06-18T14:13:08.3724816+08:00;True|2025-06-18T13:24:40.1027054+08:00;True|2025-06-17T08:19:03.1298222+08:00;False|2025-06-17T08:18:48.1583742+08:00;True|2025-06-12T15:16:16.9926905+08:00;False|2025-06-12T15:16:09.7255464+08:00;True|2025-06-10T07:49:56.5698941+08:00;False|2025-06-10T07:49:47.3414841+08:00;True|2025-06-06T21:04:33.8746305+08:00;True|2025-06-06T20:56:56.6195108+08:00;True|2025-06-06T16:32:26.7872473+08:00;False|2025-06-06T16:31:43.4644697+08:00;True|2025-05-27T13:34:19.9152695+08:00;True|2025-05-26T13:59:11.0434021+08:00;True|2025-05-26T10:32:52.6605356+08:00;False|2025-05-26T10:32:38.4759922+08:00;True|2025-05-21T19:58:17.4859837+08:00;True|2025-05-21T19:56:00.7906025+08:00;True|2025-05-21T19:38:51.0984867+08:00;True|2025-05-21T16:49:04.2014052+08:00;True|2025-05-21T14:47:57.4746320+08:00;True|2025-05-20T19:29:56.6172010+08:00;False|2025-05-20T19:29:50.2198527+08:00;True|2025-05-19T15:06:53.2645411+08:00;True|2025-05-16T16:32:02.9818718+08:00;True|2025-05-16T16:30:33.9588010+08:00;True|2025-05-16T15:44:32.5318879+08:00;True|2025-05-16T15:10:54.6822997+08:00;True|2025-05-16T15:01:00.7569816+08:00;True|2025-05-16T13:50:40.0040164+08:00;True|2025-05-16T13:01:14.5388124+08:00;True|2025-05-16T10:38:20.4876566+08:00;True|2025-05-16T10:23:09.0484073+08:00;True|2025-05-16T10:14:49.6622040+08:00;False|2025-05-16T10:14:36.5792240+08:00;True|2025-05-15T14:29:05.4556596+08:00;True|2025-05-15T14:00:45.9974491+08:00;True|2025-05-15T13:58:06.3825427+08:00;True|2025-05-15T08:35:55.0404130+08:00;True|2025-05-15T08:35:27.5658528+08:00;True|2025-05-14T16:08:41.1106680+08:00;True|2025-05-14T15:43:29.5573491+08:00;True|2025-05-14T15:34:13.5272127+08:00;True|2025-05-13T15:19:29.7660222+08:00;True|2025-05-12T15:58:42.3279365+08:00;True|2025-05-12T14:46:40.4175974+08:00;True|2025-05-12T14:25:17.7975975+08:00;True|2025-05-12T14:15:03.6854114+08:00;True|2025-05-12T13:20:39.4575875+08:00;True|2025-05-12T13:04:59.2637345+08:00;True|2025-05-12T11:05:39.1423146+08:00;True|2025-05-12T11:04:52.2191892+08:00;True|2025-05-12T11:00:33.9329101+08:00;False|2025-05-12T11:00:26.8429710+08:00;True|2025-05-12T10:24:55.6169026+08:00;False|2025-05-12T10:24:26.9432217+08:00;True|2025-05-09T15:17:47.6968997+08:00;False|2025-05-09T15:17:41.5165040+08:00;True|2025-05-08T15:55:24.8437328+08:00;True|2025-05-08T15:49:52.1982131+08:00;True|2025-05-08T14:30:58.6658233+08:00;True|2025-05-08T13:57:47.2409635+08:00;True|2025-05-08T13:49:25.7927065+08:00;True|2025-05-08T10:56:53.9086795+08:00;True|2025-05-08T10:47:04.1369521+08:00;True|2025-05-07T11:19:22.7005176+08:00;True|2025-05-07T11:12:33.5037815+08:00;True|2025-05-07T11:08:26.5089483+08:00;True|2025-05-06T09:56:16.4670446+08:00;True|2025-05-06T09:53:13.1199697+08:00;False|2025-05-06T09:53:05.2692896+08:00;True|2025-04-30T10:16:44.1151152+08:00;True|2025-04-30T10:00:47.3410363+08:00;True|2025-04-30T09:39:12.0356027+08:00;True|2025-04-30T08:45:37.0637703+08:00;True|2025-04-30T08:18:50.0996148+08:00;False|2025-04-30T08:18:21.1738369+08:00;True|2025-04-30T08:09:22.0615915+08:00;False|2025-04-30T08:09:12.5664882+08:00;True|2025-04-29T16:21:28.2743192+08:00;True|2025-04-29T14:10:09.9848859+08:00;True|2025-04-28T11:01:44.6987411+08:00;False|2025-04-28T11:01:34.7062558+08:00;True|2025-04-27T16:12:37.4743910+08:00;False|2025-04-27T16:12:24.8989765+08:00;True|2025-04-24T11:13:25.0763421+08:00;True|2025-04-24T10:49:10.1323679+08:00;True|2025-04-23T11:12:58.7127237+08:00;True|2025-04-22T17:15:39.9949091+08:00;False|2025-04-22T17:15:33.9335391+08:00;True|2025-04-21T16:13:12.9842708+08:00;True|2025-04-21T16:11:03.4262306+08:00;True|2025-04-21T16:06:02.5167412+08:00;True|2025-04-21T16:03:57.2299958+08:00;False|2025-04-21T16:03:44.4356436+08:00;True|2025-04-21T15:28:15.2307697+08:00;True|2025-04-21T15:17:17.5682286+08:00;True|2025-04-21T15:12:16.8982275+08:00;True|2025-04-21T14:53:26.4605418+08:00;True|2025-04-21T14:49:48.8960696+08:00;True|2025-04-21T14:35:59.4591551+08:00;False|2025-04-21T14:35:46.2281772+08:00;True|2025-04-08T13:10:52.8749775+08:00;True|2025-04-08T09:10:05.3755564+08:00;True|2025-04-07T09:32:09.4220262+08:00;True|2025-04-02T10:07:49.7129656+08:00;True|2025-04-02T09:28:18.3104138+08:00;False|2025-04-02T09:28:06.8644783+08:00;True|2025-04-02T09:03:43.1765932+08:00;False|2025-04-02T09:03:36.6874678+08:00;True|2025-03-26T08:15:22.1038130+08:00;True|2025-03-25T17:13:07.6600191+08:00;True|2025-03-25T16:53:58.9214849+08:00;False|2025-03-25T16:53:46.3315797+08:00;True|2025-03-24T15:53:51.6757690+08:00;True|2025-03-24T14:18:37.5668299+08:00;True|2025-03-21T15:06:33.1307351+08:00;True|2025-03-21T15:04:11.9681650+08:00;True|2025-03-21T14:14:59.1591046+08:00;True|2025-03-21T10:25:57.3452453+08:00;True|2025-03-21T09:07:23.5814841+08:00;True|2025-03-20T16:42:24.9342284+08:00;False|2025-03-20T16:42:17.5165982+08:00;True|2025-03-20T16:34:56.3337544+08:00;True|2025-03-20T16:29:15.1683525+08:00;True|2025-03-20T16:23:42.5038047+08:00;True|2025-03-19T20:24:10.0975063+08:00;True|2025-03-18T09:34:22.6164243+08:00;True|2025-03-17T21:47:20.2930413+08:00;True|2025-03-17T19:41:02.3815065+08:00;False|2025-03-17T19:40:55.9908892+08:00;True|2025-03-17T19:19:49.8872115+08:00;True|2025-03-17T18:58:03.6903198+08:00;True|2025-03-17T14:26:34.9258043+08:00;True|2025-03-14T15:40:57.9378742+08:00;False|2025-03-14T15:40:46.0132033+08:00;False|2025-03-14T12:34:38.6551944+08:00;True|2025-03-05T14:35:44.7812995+08:00;True|2025-03-05T12:57:06.2539555+08:00;True|2025-03-05T11:19:01.3450138+08:00;True|2025-03-04T15:25:38.6174966+08:00;True|2025-03-04T14:54:41.4026832+08:00;True|2025-03-04T11:08:16.5619007+08:00;True|2025-03-04T10:01:43.5782535+08:00;True|2025-03-04T08:42:48.4526420+08:00;False|2025-03-04T08:42:42.2828130+08:00;True|2025-02-27T15:13:52.3469275+08:00;True|2025-02-27T10:59:33.6194212+08:00;False|2025-02-27T10:59:25.0394841+08:00;True|2025-02-27T10:44:18.9014583+08:00;True|2025-02-26T14:27:14.6049136+08:00;False|2025-02-26T14:27:02.9843524+08:00;True|2025-02-25T15:20:23.1640745+08:00;True|2025-02-25T14:48:55.2842125+08:00;False|2025-02-25T14:48:42.2715748+08:00;True|2025-02-11T10:10:05.6068846+08:00;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>12/17/2025 13:07:55</publishTime>
+ <publishTime>12/23/2025 17:02:56</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/17/2025 13:07:55</publishTime>
+ <publishTime>12/23/2025 17:02: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/17/2025 13:07:49</publishTime>
+ <publishTime>12/23/2025 17:02:51</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/17/2025 13:07:49</publishTime>
+ <publishTime>12/23/2025 17:02:51</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>12/17/2025 13:07:44</publishTime>
+ <publishTime>12/23/2025 17:02:46</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>12/17/2025 13:07:44</publishTime>
+ <publishTime>12/23/2025 17:02:46</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/17/2025 13:07:47</publishTime>
+ <publishTime>12/23/2025 17:02:48</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/17/2025 13:07:47</publishTime>
+ <publishTime>12/23/2025 17:02:48</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/18/2025 16:11:18</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>12/17/2025 13:07:40</publishTime>
+ <publishTime>12/23/2025 17:02:42</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>12/17/2025 13:07:40</publishTime>
+ <publishTime>12/23/2025 17:02:42</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>12/17/2025 13:07:42</publishTime>
+ <publishTime>12/23/2025 17:02:44</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>12/17/2025 13:07:42</publishTime>
+ <publishTime>12/23/2025 17:02:44</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>12/17/2025 13:07:42</publishTime>
+ <publishTime>12/23/2025 17:02:43</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>12/17/2025 13:07:42</publishTime>
+ <publishTime>12/23/2025 17:02:43</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>12/17/2025 13:07:38</publishTime>
+ <publishTime>12/23/2025 17:02:41</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>12/17/2025 13:07:38</publishTime>
+ <publishTime>12/23/2025 17:02:41</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/17/2025 13:07:41</publishTime>
+ <publishTime>12/23/2025 09:36:09</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>12/17/2025 13:07:41</publishTime>
+ <publishTime>12/23/2025 09:36:09</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>12/17/2025 13:08:05</publishTime>
+ <publishTime>12/23/2025 17:03:05</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/17/2025 13:08:05</publishTime>
+ <publishTime>12/23/2025 17:03:05</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
@@ -331,6 +331,9 @@
</File>
<File Include="DLL/DBUtility.dll">
<publishTime>08/18/2025 16:11:18</publishTime>
+ </File>
+ <File Include="DLL/Interop.grsvr6Lib.dll">
+ <publishTime>12/15/2025 08:04:16</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
<publishTime>08/18/2025 16:11:18</publishTime>
@@ -504,7 +507,7 @@
<publishTime>04/29/2024 08:30:03</publishTime>
</File>
<File Include="Web.config">
- <publishTime>12/17/2025 13:08:13</publishTime>
+ <publishTime>12/23/2025 17:04:46</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/YsjPath.pubxml.user b/WebAPI/Properties/PublishProfiles/YsjPath.pubxml.user
index e4d0401..010be9a 100644
--- a/WebAPI/Properties/PublishProfiles/YsjPath.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/YsjPath.pubxml.user
@@ -5,179 +5,179 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2025-12-01T11:22:21.9416380Z;False|2025-12-01T19:22:14.0582794+08:00;True|2025-12-01T17:38:22.0847469+08:00;</History>
+ <History>True|2025-12-22T06:16:49.4981363Z;True|2025-12-22T10:43:43.6377456+08:00;True|2025-12-22T10:31:45.9028615+08:00;True|2025-12-22T10:24:06.8991758+08:00;True|2025-12-22T10:11:51.3143511+08:00;True|2025-12-22T09:34:47.3603279+08:00;False|2025-12-22T09:32:22.5385633+08:00;True|2025-12-19T10:20:23.4428995+08:00;False|2025-12-19T10:14:53.8747410+08:00;True|2025-12-18T17:15:13.3905366+08:00;True|2025-12-18T17:11:49.3437079+08:00;True|2025-12-18T16:17:48.6402963+08:00;True|2025-12-18T15:50:55.2709023+08:00;True|2025-12-18T15:44:33.9913783+08:00;True|2025-12-18T15:31:28.7580119+08:00;True|2025-12-18T15:31:15.7950222+08:00;True|2025-12-18T15:11:21.7608037+08:00;True|2025-12-18T12:51:44.7771285+08:00;True|2025-12-18T12:22:07.2748884+08:00;False|2025-12-18T12:19:38.3081567+08:00;True|2025-12-17T18:20:27.1265305+08:00;False|2025-12-17T18:18:59.5244466+08:00;False|2025-12-17T18:17:10.5036160+08:00;True|2025-12-17T17:58:02.5866472+08:00;True|2025-12-17T17:22:20.6401292+08:00;True|2025-12-17T15:54:31.5881737+08:00;True|2025-12-17T15:45:32.7951585+08:00;True|2025-12-17T14:42:33.6108738+08:00;True|2025-12-17T11:12:36.6951182+08:00;True|2025-12-17T10:30:06.3785953+08:00;True|2025-12-01T19:22:21.9416380+08:00;False|2025-12-01T19:22:14.0582794+08:00;True|2025-12-01T17:38:22.0847469+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>09/05/2022 17:03:11</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="bin/AlibabaCloud.EndpointUtil.dll">
- <publishTime>04/07/2020 08:33:48</publishTime>
+ <publishTime>04/07/2020 16:33:48</publishTime>
</File>
<File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
- <publishTime>04/25/2023 09:49:04</publishTime>
+ <publishTime>04/25/2023 17:49:04</publishTime>
</File>
<File Include="bin/AlibabaCloud.GatewaySpi.dll">
- <publishTime>07/31/2024 12:50:30</publishTime>
+ <publishTime>07/31/2024 20:50:30</publishTime>
</File>
<File Include="bin/AlibabaCloud.OpenApiClient.dll">
- <publishTime>08/06/2024 10:07:52</publishTime>
+ <publishTime>08/06/2024 18:07:52</publishTime>
</File>
<File Include="bin/AlibabaCloud.OpenApiUtil.dll">
- <publishTime>11/22/2022 03:24:18</publishTime>
+ <publishTime>11/22/2022 11:24:18</publishTime>
</File>
<File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
- <publishTime>08/08/2024 11:43:22</publishTime>
+ <publishTime>08/08/2024 19:43:22</publishTime>
</File>
<File Include="bin/AlibabaCloud.TeaUtil.dll">
- <publishTime>07/15/2024 12:25:56</publishTime>
+ <publishTime>07/15/2024 20:25:56</publishTime>
</File>
<File Include="bin/AlibabaCloud.TeaXML.dll">
- <publishTime>08/03/2022 13:46:08</publishTime>
+ <publishTime>08/03/2022 21:46:08</publishTime>
</File>
<File Include="bin/Aliyun.Credentials.dll">
- <publishTime>07/24/2024 02:36:58</publishTime>
+ <publishTime>07/24/2024 10:36:58</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
- <publishTime>02/22/2013 08:43:40</publishTime>
+ <publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.pdb">
- <publishTime>02/22/2013 08:43:40</publishTime>
+ <publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>12/01/2025 19:21:09</publishTime>
+ <publishTime>12/19/2025 10:16:57</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/01/2025 19:21:09</publishTime>
+ <publishTime>12/19/2025 10:16:57</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
- <publishTime>12/17/2020 21:32:28</publishTime>
+ <publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>12/01/2025 19:21:08</publishTime>
+ <publishTime>12/19/2025 10:16:35</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/01/2025 19:21:08</publishTime>
+ <publishTime>12/19/2025 10:16:35</publishTime>
</File>
<File Include="bin/Dapper.dll">
- <publishTime>07/22/2016 14:52:40</publishTime>
+ <publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>12/01/2025 19:21:06</publishTime>
+ <publishTime>12/19/2025 10:15:49</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>12/01/2025 19:21:06</publishTime>
+ <publishTime>12/19/2025 10:15:49</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
- <publishTime>03/22/2022 05:17:26</publishTime>
+ <publishTime>03/22/2022 13:17:26</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.pdb">
- <publishTime>03/18/2022 23:39:42</publishTime>
+ <publishTime>03/19/2022 07:39:42</publishTime>
</File>
<File Include="bin/Grpc.Core.dll">
- <publishTime>03/22/2022 05:17:20</publishTime>
+ <publishTime>03/22/2022 13:17:20</publishTime>
</File>
<File Include="bin/Grpc.Core.pdb">
- <publishTime>03/18/2022 23:39:48</publishTime>
+ <publishTime>03/19/2022 07:39:48</publishTime>
</File>
<File Include="bin/grpc_csharp_ext.x64.dll">
- <publishTime>03/22/2022 05:17:22</publishTime>
+ <publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="bin/grpc_csharp_ext.x86.dll">
- <publishTime>03/22/2022 05:17:22</publishTime>
+ <publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="bin/ICSharpCode.SharpZipLib.dll">
- <publishTime>05/08/2021 17:08:30</publishTime>
+ <publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/ICSharpCode.SharpZipLib.pdb">
- <publishTime>05/08/2021 17:08:30</publishTime>
+ <publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>02/08/2023 09:18:13</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="bin/libgrpc_csharp_ext.x64.dylib">
- <publishTime>03/18/2022 23:38:44</publishTime>
+ <publishTime>03/19/2022 07:38:44</publishTime>
</File>
<File Include="bin/libgrpc_csharp_ext.x64.so">
- <publishTime>03/18/2022 23:38:42</publishTime>
+ <publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
- <publishTime>03/18/2015 17:02:50</publishTime>
+ <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 11:48:56</publishTime>
+ <publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>12/01/2025 19:21:06</publishTime>
+ <publishTime>12/19/2025 10:16:23</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/01/2025 19:21:06</publishTime>
+ <publishTime>12/19/2025 10:16:23</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>09/05/2022 17:03:10</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
- <publishTime>03/08/2023 07:09:56</publishTime>
+ <publishTime>03/08/2023 15:09:56</publishTime>
</File>
<File Include="bin/NPOI.dll">
- <publishTime>10/23/2021 01:07:54</publishTime>
+ <publishTime>10/23/2021 09:07:54</publishTime>
</File>
<File Include="bin/NPOI.OOXML.dll">
- <publishTime>10/23/2021 01:07:56</publishTime>
- </File>
- <File Include="bin/NPOI.OOXML.pdb">
<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 01:07:54</publishTime>
+ <publishTime>10/23/2021 09:07:54</publishTime>
</File>
<File Include="bin/NPOI.OpenXml4Net.pdb">
- <publishTime>10/23/2021 09:07:54</publishTime>
+ <publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/NPOI.OpenXmlFormats.dll">
- <publishTime>10/23/2021 01:07:54</publishTime>
+ <publishTime>10/23/2021 09:07:54</publishTime>
</File>
<File Include="bin/NPOI.OpenXmlFormats.pdb">
- <publishTime>10/23/2021 09:07:54</publishTime>
+ <publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/NPOI.pdb">
- <publishTime>10/23/2021 09:07:54</publishTime>
+ <publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>12/01/2025 19:21:05</publishTime>
+ <publishTime>12/19/2025 10:15:29</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>12/01/2025 19:21:05</publishTime>
+ <publishTime>12/19/2025 10:15:29</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>12/01/2025 19:21:05</publishTime>
+ <publishTime>12/19/2025 10:15:36</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>12/01/2025 19:21:05</publishTime>
+ <publishTime>12/19/2025 10:15:36</publishTime>
</File>
<File Include="bin/RestSharp.dll">
- <publishTime>08/30/2012 22:22:50</publishTime>
+ <publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>12/01/2025 19:21:05</publishTime>
+ <publishTime>12/19/2025 10:15:38</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>12/01/2025 19:21:05</publishTime>
+ <publishTime>12/19/2025 10:15:38</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
- <publishTime>02/15/2015 17:57:08</publishTime>
+ <publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>12/01/2025 19:21:03</publishTime>
+ <publishTime>12/18/2025 17:37:23</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>12/01/2025 19:21:03</publishTime>
+ <publishTime>12/18/2025 17:37:26</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
- <publishTime>07/19/2017 10:01:28</publishTime>
+ <publishTime>07/19/2017 18:01:28</publishTime>
</File>
<File Include="bin/System.ComponentModel.DataAnnotations.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -201,25 +201,25 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
- <publishTime>08/19/2014 10:03:34</publishTime>
+ <publishTime>08/19/2014 18:03:34</publishTime>
</File>
<File Include="bin/System.Memory.dll">
- <publishTime>04/17/2019 16:24:34</publishTime>
+ <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/19/2015 20:10:46</publishTime>
+ <publishTime>02/20/2015 04:10:46</publishTime>
</File>
<File Include="bin/System.Net.Http.Formatting.dll">
- <publishTime>11/28/2018 13:00:36</publishTime>
+ <publishTime>11/28/2018 21:00:36</publishTime>
</File>
<File Include="bin/System.Net.Http.Primitives.dll">
- <publishTime>02/19/2015 20:10:46</publishTime>
+ <publishTime>02/20/2015 04:10:46</publishTime>
</File>
<File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
- <publishTime>09/18/2018 19:38:10</publishTime>
+ <publishTime>09/19/2018 03:38:10</publishTime>
</File>
<File Include="bin/System.Runtime.Serialization.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -228,7 +228,7 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Cors.dll">
- <publishTime>11/28/2018 12:58:44</publishTime>
+ <publishTime>11/28/2018 20:58:44</publishTime>
</File>
<File Include="bin/System.Web.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -243,37 +243,37 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/System.Web.Helpers.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Web.Http.Cors.dll">
- <publishTime>11/28/2018 13:01:26</publishTime>
+ <publishTime>11/28/2018 21:01:26</publishTime>
</File>
<File Include="bin/System.Web.Http.dll">
- <publishTime>11/28/2018 13:01:00</publishTime>
+ <publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>09/05/2022 17:03:08</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
- <publishTime>01/28/2015 04:02:18</publishTime>
+ <publishTime>01/28/2015 12:02:18</publishTime>
</File>
<File Include="bin/System.Web.Optimization.dll">
- <publishTime>02/11/2014 15:26:04</publishTime>
+ <publishTime>02/11/2014 23:26:04</publishTime>
</File>
<File Include="bin/System.Web.Razor.dll">
- <publishTime>01/28/2015 04:02:32</publishTime>
+ <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 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Web.WebPages.Razor.dll">
- <publishTime>01/28/2015 04:04:30</publishTime>
+ <publishTime>01/28/2015 12:04:30</publishTime>
</File>
<File Include="bin/System.Xml.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
@@ -282,217 +282,226 @@
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
<File Include="bin/Tea.dll">
- <publishTime>05/09/2023 02:43:40</publishTime>
+ <publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>12/01/2025 19:21:06</publishTime>
+ <publishTime>12/18/2025 17:36:51</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>12/01/2025 19:21:06</publishTime>
+ <publishTime>12/18/2025 17:36:54</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
- <publishTime>11/24/2014 11:18:48</publishTime>
+ <publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>12/01/2025 19:21:14</publishTime>
+ <publishTime>12/22/2025 14:13:32</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/01/2025 19:21:14</publishTime>
+ <publishTime>12/22/2025 14:13:32</publishTime>
</File>
<File Include="bin/WebGrease.dll">
- <publishTime>07/17/2013 17:03:52</publishTime>
+ <publishTime>07/18/2013 01:03:52</publishTime>
</File>
<File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
- <publishTime>11/29/2018 13:26:02</publishTime>
+ <publishTime>11/29/2018 21:26:02</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.Http.resources.dll">
- <publishTime>11/29/2018 13:26:30</publishTime>
+ <publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>11/27/2023 09:14:13</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>09/05/2022 17:02:53</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>09/05/2022 17:02:53</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>09/05/2022 17:02:53</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>09/05/2022 17:03:02</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>09/05/2022 17:03:06</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>09/05/2022 17:03:07</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
+ </File>
+ <File Include="DLL/Interop.grsvr6Lib.dll">
+ <publishTime>12/16/2025 16:29:36</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>02/08/2023 09:18:13</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>09/05/2022 17:03:07</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>09/05/2022 17:03:07</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>09/05/2022 17:03:07</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>09/05/2022 17:03:08</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>09/05/2022 17:03:08</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>09/05/2022 17:03:11</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>09/05/2022 17:03:11</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>09/05/2022 17:03:11</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>09/05/2022 17:03:11</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>01/10/2023 17:20:14</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
- <publishTime>03/22/2022 05:17:22</publishTime>
+ <publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="grpc_csharp_ext.x86.dll">
- <publishTime>03/22/2022 05:17:22</publishTime>
+ <publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>09/05/2022 17:03:09</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
- <publishTime>03/18/2022 23:38:44</publishTime>
+ <publishTime>03/19/2022 07:38:44</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.so">
- <publishTime>03/18/2022 23:38:42</publishTime>
+ <publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>07/24/2023 08:56:46</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>09/05/2022 17:03:09</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="packages.config">
- <publishTime>09/18/2024 18:59:21</publishTime>
+ <publishTime>10/13/2025 14:50:13</publishTime>
+ </File>
+ <File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
+ <publishTime>12/10/2025 17:08:59</publishTime>
</File>
<File Include="Template/barCodeTemplateStorage.json">
- <publishTime>09/13/2025 17:30:20</publishTime>
+ <publishTime>09/05/2025 16:16:48</publishTime>
+ </File>
+ <File Include="Utility/Barcode.ashx">
+ <publishTime>12/16/2025 16:29:36</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>09/05/2022 17:03:10</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>09/05/2022 17:03:10</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>09/05/2022 17:03:11</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>09/05/2022 17:03:11</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>09/05/2022 17:03:11</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>09/05/2022 17:03:11</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>09/05/2022 17:03:11</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>09/05/2022 17:03:11</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>09/05/2022 17:03:11</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>09/05/2022 17:03:11</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>09/05/2022 17:03:11</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>09/05/2022 17:03:11</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>09/05/2022 17:03:11</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>09/05/2022 17:03:11</publishTime>
+ <publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>01/24/2024 11:35:25</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>01/24/2024 11:35:25</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>01/24/2024 11:35:25</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>01/24/2024 11:35:25</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>01/24/2024 11:35:25</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>01/24/2024 11:35:25</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>01/24/2024 11:35:25</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>01/24/2024 11:35:26</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>01/24/2024 11:35:26</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>01/24/2024 11:35:26</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>01/24/2024 11:35:25</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>01/24/2024 11:35:26</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>01/24/2024 11:35:26</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>01/24/2024 11:35:25</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>01/24/2024 11:35:26</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>01/24/2024 11:35:26</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>01/24/2024 11:35:26</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>01/24/2024 11:35:25</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>01/24/2024 11:35:26</publishTime>
+ <publishTime>08/21/2025 15:39:36</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>01/24/2024 11:35:25</publishTime>
+ <publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web.config">
- <publishTime>12/01/2025 19:22:21</publishTime>
+ <publishTime>12/19/2025 10:20:22</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/Reference.cs b/WebAPI/Web References/WebS/Reference.cs
index b8abf10..773f20f 100644
--- a/WebAPI/Web References/WebS/Reference.cs
+++ b/WebAPI/Web References/WebS/Reference.cs
@@ -15020,7 +15020,17 @@
sErrMsg = ((string)(results[1]));
return ((bool)(results[0]));
}
-
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_Bill_New", RequestNamespace = "http://tempuri.org/", ResponseNamespace = "http://tempuri.org/", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public bool set_Bill_New(ClsCg_POOrderBillMain oMain, string sHSourceType, ref string sErrMsg)
+ {
+ object[] results = this.Invoke("set_Bill_New", new object[] {
+ oMain,
+ sHSourceType,
+ sErrMsg});
+ sErrMsg = ((string)(results[1]));
+ return ((bool)(results[0]));
+ }
+
/// <remarks/>
public void set_SaveOtherOutBill_NewAsync(ClsKf_OtherOutBillMain oMain, string sHSourceType, string sErrMsg) {
this.set_SaveOtherOutBill_NewAsync(oMain, sHSourceType, sErrMsg, null);
@@ -41873,7 +41883,226 @@
}
}
}
-
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.9032.0")]
+ [System.SerializableAttribute()]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ [System.Xml.Serialization.XmlTypeAttribute(Namespace = "http://tempuri.org/")]
+ public partial class ClsCg_POOrderBillMain : ClsXt_BaseBillMain
+ {
+
+
+ private long hSupIDField;
+
+ private long hWHIDField;
+
+ private long hSCWHIDField;
+
+ private long hEmpIDField;
+
+ private long hManagerIDField;
+
+ private long hSecManagerIDField;
+
+ private long hKeeperIDField;
+
+ private long hDeptIDField;
+
+ private string hExplanationField;
+
+ private string hInnerBillNoField;
+
+ private bool hRedBlueFlagField;
+
+ private string hStockStyleField;
+
+ private long hSTOCKORGIDField;
+
+ private long hOWNERIDField;
+
+ /// <remarks/>
+ public long HSupID
+ {
+ get
+ {
+ return this.hSupIDField;
+ }
+ set
+ {
+ this.hSupIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HWHID
+ {
+ get
+ {
+ return this.hWHIDField;
+ }
+ set
+ {
+ this.hWHIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSCWHID
+ {
+ get
+ {
+ return this.hSCWHIDField;
+ }
+ set
+ {
+ this.hSCWHIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HEmpID
+ {
+ get
+ {
+ return this.hEmpIDField;
+ }
+ set
+ {
+ this.hEmpIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HManagerID
+ {
+ get
+ {
+ return this.hManagerIDField;
+ }
+ set
+ {
+ this.hManagerIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSecManagerID
+ {
+ get
+ {
+ return this.hSecManagerIDField;
+ }
+ set
+ {
+ this.hSecManagerIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HKeeperID
+ {
+ get
+ {
+ return this.hKeeperIDField;
+ }
+ set
+ {
+ this.hKeeperIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HDeptID
+ {
+ get
+ {
+ return this.hDeptIDField;
+ }
+ set
+ {
+ this.hDeptIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HExplanation
+ {
+ get
+ {
+ return this.hExplanationField;
+ }
+ set
+ {
+ this.hExplanationField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HInnerBillNo
+ {
+ get
+ {
+ return this.hInnerBillNoField;
+ }
+ set
+ {
+ this.hInnerBillNoField = value;
+ }
+ }
+
+ /// <remarks/>
+ public bool HRedBlueFlag
+ {
+ get
+ {
+ return this.hRedBlueFlagField;
+ }
+ set
+ {
+ this.hRedBlueFlagField = value;
+ }
+ }
+
+ /// <remarks/>
+ public string HStockStyle
+ {
+ get
+ {
+ return this.hStockStyleField;
+ }
+ set
+ {
+ this.hStockStyleField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HSTOCKORGID
+ {
+ get
+ {
+ return this.hSTOCKORGIDField;
+ }
+ set
+ {
+ this.hSTOCKORGIDField = value;
+ }
+ }
+
+ /// <remarks/>
+ public long HOWNERID
+ {
+ get
+ {
+ return this.hOWNERIDField;
+ }
+ set
+ {
+ this.hOWNERIDField = value;
+ }
+ }
+ }
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3752.0")]
[System.SerializableAttribute()]
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index e56b653..cd232ba 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -32,15 +32,15 @@
<!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS/WebService1.asmx"/> 瀹夌憺鏈嶅姟鍣�-->
<!--<add key="sUrl" value="http://122.227.133.186:8090/WEBS/WebService1.asmx"/> -->
<!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS-WMS/WebService1.asmx"/> 瀹夌憺鏈嶅姟鍣�-->
- <add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> <!--娴嬭瘯鏈嶅姟鍣�-->
- <!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/>--> <!--鏈湴-->
+ <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/>--> <!--娴嬭瘯鏈嶅姟鍣�-->
+ <!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> --><!--鏈湴-->
<!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�-->
<!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx" />--> <!--缈佹稕娑涙湰鍦伴厤缃�-->
<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵-->
<!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--鏂帿灏�-->
<!--<add key="surl" value="http://192.168.0.113/WEBS-WMS/Webservice1.asmx" />涓夊崌鏈湴閰嶇疆-->
<!--<add key="surl" value="http://36.134.2.30:200/WEBS-WMS/WebService1.asmx" />--> <!--閲戝竻-->
- <!--<add key="sUrl" value="http://localhost:8082/WEBS/WebService1.asmx"/>-->
+ <add key="sUrl" value="http://localhost:8082/WEBS/WebService1.asmx"/>
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
@@ -109,13 +109,13 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://47.96.97.237/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
+ <endpoint address="http://localhost:8082/WEBS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
</client>
</system.serviceModel>
<applicationSettings>
<WebAPI.Properties.Settings>
<setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://47.96.97.237/WEBS-WMS/WebService1.asmx</value>
+ <value>http://localhost:8082/WEBS/WebService1.asmx</value>
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 1e892d4..33d7050 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -272,6 +272,7 @@
<Content Include="DLL\BLL.dll" />
<Content Include="DLL\DAL.dll" />
<Content Include="DLL\DBUtility.dll" />
+ <Content Include="DLL\Interop.grsvr6Lib.dll" />
<Content Include="DLL\Kingdee.BOS.WebApi.Client.dll" />
<Content Include="DLL\Model.dll" />
<Content Include="DLL\Newtonsoft.Json.Net35.dll" />
@@ -428,6 +429,7 @@
<Compile Include="Controllers\BLL\Xt_SystemLogController.cs" />
<Compile Include="Controllers\CellWidthController.cs" />
<Compile Include="Controllers\CGGL\Cg_ContractBillController.cs" />
+ <Compile Include="Controllers\CGGL\Cg_OrderTransportBillListController.cs" />
<Compile Include="Controllers\CGGL\Cg_PORequestBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_PurchaseReturnController.cs" />
<Compile Include="Controllers\CGGL\Kf_POStockInBackBillController.cs" />
@@ -473,6 +475,7 @@
<Compile Include="Controllers\SCGL\Sc_RepairCodeBindingController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormBill_TKController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Xs_SendGoodsPlanBillController.cs" />
+ <Compile Include="Controllers\WLGL\Cg_CarTrajectoryBillController.cs" />
<Compile Include="Controllers\XSGL\Crm_ComplainVisitBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SellOutBillList_SecController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeQuotationBillController.cs" />
diff --git a/WorkM/bin/Release/BLL.dll b/WorkM/bin/Release/BLL.dll
deleted file mode 100644
index 764bda7..0000000
--- a/WorkM/bin/Release/BLL.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/bin/Release/BLL.pdb b/WorkM/bin/Release/BLL.pdb
deleted file mode 100644
index 0f10a0b..0000000
--- a/WorkM/bin/Release/BLL.pdb
+++ /dev/null
Binary files differ
diff --git a/WorkM/bin/Release/DAL.dll b/WorkM/bin/Release/DAL.dll
deleted file mode 100644
index 28a23d7..0000000
--- a/WorkM/bin/Release/DAL.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/bin/Release/DAL.pdb b/WorkM/bin/Release/DAL.pdb
deleted file mode 100644
index 204e059..0000000
--- a/WorkM/bin/Release/DAL.pdb
+++ /dev/null
Binary files differ
diff --git a/WorkM/bin/Release/DBUtility.dll b/WorkM/bin/Release/DBUtility.dll
deleted file mode 100644
index 85cd0a6..0000000
--- a/WorkM/bin/Release/DBUtility.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/bin/Release/DBUtility.pdb b/WorkM/bin/Release/DBUtility.pdb
deleted file mode 100644
index a7e69cc..0000000
--- a/WorkM/bin/Release/DBUtility.pdb
+++ /dev/null
Binary files differ
diff --git a/WorkM/bin/Release/Model.dll b/WorkM/bin/Release/Model.dll
deleted file mode 100644
index fbcf68d..0000000
--- a/WorkM/bin/Release/Model.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/bin/Release/Model.pdb b/WorkM/bin/Release/Model.pdb
deleted file mode 100644
index 0b2c95c..0000000
--- a/WorkM/bin/Release/Model.pdb
+++ /dev/null
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Class.dll b/WorkM/bin/Release/Pub_Class.dll
deleted file mode 100644
index 9345109..0000000
--- a/WorkM/bin/Release/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Class.pdb b/WorkM/bin/Release/Pub_Class.pdb
deleted file mode 100644
index 00d3533..0000000
--- a/WorkM/bin/Release/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Control.dll b/WorkM/bin/Release/Pub_Control.dll
deleted file mode 100644
index 267256b..0000000
--- a/WorkM/bin/Release/Pub_Control.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Control.pdb b/WorkM/bin/Release/Pub_Control.pdb
deleted file mode 100644
index c77ec5c..0000000
--- a/WorkM/bin/Release/Pub_Control.pdb
+++ /dev/null
Binary files differ
diff --git a/WorkM/bin/Release/SQLHelper.dll b/WorkM/bin/Release/SQLHelper.dll
deleted file mode 100644
index f29342c..0000000
--- a/WorkM/bin/Release/SQLHelper.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/bin/Release/SQLHelper.pdb b/WorkM/bin/Release/SQLHelper.pdb
deleted file mode 100644
index a15cdb7..0000000
--- a/WorkM/bin/Release/SQLHelper.pdb
+++ /dev/null
Binary files differ
diff --git a/WorkM/bin/Release/WarM.dll b/WorkM/bin/Release/WarM.dll
deleted file mode 100644
index ea41e3a..0000000
--- a/WorkM/bin/Release/WarM.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/bin/Release/WarM.pdb b/WorkM/bin/Release/WarM.pdb
deleted file mode 100644
index 7611ce1..0000000
--- a/WorkM/bin/Release/WarM.pdb
+++ /dev/null
Binary files differ
diff --git a/WorkM/bin/Release/WorkM.dll b/WorkM/bin/Release/WorkM.dll
deleted file mode 100644
index e6e952a..0000000
--- a/WorkM/bin/Release/WorkM.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/bin/Release/WorkM.pdb b/WorkM/bin/Release/WorkM.pdb
deleted file mode 100644
index 0b4a6ae..0000000
--- a/WorkM/bin/Release/WorkM.pdb
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 3319626..e2fbf03 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index e43b0ef..7da1fbc 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
index a238d2d..fa3b43e 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
index ae0b1fa..0cb5aeb 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
index 47f44a9..35e5324 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ 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 393d0a6..1c8db44 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -15,29 +15,30 @@
D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
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.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
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-<<<<<<< HEAD
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-=======
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+<<<<<<< HEAD
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
->>>>>>> 585e3021b7ed52a1884dc563c627177783a7e97b
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+=======
+>>>>>>> 033d6d49fbb0a924653c7fd3ef3700a24f37ee59
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 3319626..e2fbf03 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index e43b0ef..7da1fbc 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..d77c332
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
index cfa128a..1107276 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -1,11 +1,12 @@
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
-D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
index a238d2d..fa3b43e 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
index ae0b1fa..0cb5aeb 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1