From 589a0bd5d0a812f0a69ba0ba3c88780b2b79ba51 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期二, 25 十一月 2025 17:23:27 +0800
Subject: [PATCH] 1
---
ProM/bin/Release/DBUtility.dll | 0
ProM/bin/Release/DAL.pdb | 0
PlanM/bin/Release/PlanM.dll | 0
ProM/bin/Release/DBUtility.pdb | 0
WebAPI/WebAPI.csproj.user | 4
BaseSet/bin/Release/DBUtility.pdb | 0
NETERPNoWin/bin/Release/WorkM.pdb | 0
ProM/bin/Release/DAL.dll | 0
WebAPI/Controllers/MateOutController.cs | 96 +
Model/bin/Release/Pub_Control.pdb | 0
NETERPNoWin/bin/Release/WorkM.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb | 0
WebAPI/Models/ClsGy_Material_Model.cs | 1
WebAPI/Controllers/数据同步/钉钉同步/DD_DataSynchronizationController.cs | 22
sdk_dingding/TopSdk/obj/Release/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.dll | 0
Model/obj/Release/Model.pdb | 0
DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources | 0
OAM/bin/Release/BaseSet.pdb | 0
APSM/bin/Release/DAL.dll | 0
OAM/bin/Release/BaseSet.dll | 0
Model/bin/Release/Pub_Control.dll | 0
SelM/bin/Release/BLL.pdb | 0
Pub_Control/bin/Release/Pub_Class.pdb | 0
SelM/bin/Release/BLL.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 30
MES/bin/Release/BLL.pdb | 0
Pub_Control/bin/Release/Pub_Class.dll | 0
MES/bin/Release/AxInterop.gregn6Lib.dll | 0
NETERPNoWin/bin/Release/NETERPNoWin.exe | 0
APSM/bin/Release/DAL.pdb | 0
MES/bin/Release/BLL.dll | 0
DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources | 0
Pub_Control/bin/Release/Pub_Control.dll | 0
BLL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/SQLHelper.dll | 0
NETERPNoWin/bin/Release/DBUtility.pdb | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | 693 ++++++
SelM/bin/Release/WorkM.pdb | 0
APSM/bin/Release/DBUtility.pdb | 0
WorkM/bin/Release/Pub_Class.dll | 0
DAL/bin/Release/SQLHelper.pdb | 0
SelM/bin/Release/DBUtility.pdb | 0
Model/质检管理/ClsQC_PatrolProcCheckBillMain.cs | 2
OAM/bin/Release/SQLHelper.dll | 0
SelM/bin/Release/WorkM.dll | 0
SQLHelper/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.pdb | 0
BLL/bin/Release/DBUtility.dll | 0
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache | 0
MES/bin/Release/MES.pdb | 0
WorkM/bin/Release/Pub_Class.pdb | 0
Pub_Control/bin/Release/Pub_Control.pdb | 0
OAM/bin/Release/SQLHelper.pdb | 0
WebAPI/Controllers/基础资料/基础资料/Gy_MultipleCode_ReportController.cs | 81
WebAPI/Controllers/品质管理/首件检验单/QC_FirstPieceCheckBillController.cs | 65
DBUtility/obj/Release/DBUtility.dll | 0
APSM/bin/Release/DBUtility.dll | 0
Model/obj/Release/Model.dll | 0
BLL/bin/Release/Pub_Class.dll | 0
Model/质检管理/ClsQC_FirstPieceCheckBillMain.cs | 1
WorkM/bin/Release/DBUtility.pdb | 0
Model/质检管理/ClsQC_PatrolProcCheckBillSub.cs | 11
WorkM/bin/Release/DBUtility.dll | 0
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
APSM/bin/Release/Model.dll | 0
PlanM/bin/Release/PlanM.pdb | 0
WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs | 18
BLL/bin/Release/Pub_Class.pdb | 0
SelM/bin/Release/DBUtility.dll | 0
APSM/bin/Release/Model.pdb | 0
NETERPNoWin/bin/Release/DBUtility.dll | 0
SelM/bin/Release/DAL.dll | 0
WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs | 126 +
WebAPI/Controllers/品质管理/工序检验单/QC_ProcessCheckBillController.cs | 4
BLL/bin/Release/DAL.dll | 0
BLL/bin/Release/SQLHelper.pdb | 0
PlanM/bin/Release/SQLHelper.dll | 0
BaseSet/bin/Release/Pub_Control.pdb | 0
DBUtility/bin/Release/Pub_Control.pdb | 0
NETERPNoWin/bin/Release/Kanban.pdb | 0
APSM/bin/Release/BaseSet.dll | 0
BLL/bin/Release/SQLHelper.dll | 0
DAL/bin/Release/Model.dll | 0
BaseSet/bin/Release/Pub_Control.dll | 0
OAM/bin/Release/OAM.pdb | 0
APSM/bin/Release/BaseSet.pdb | 0
DBUtility/bin/Release/Pub_Control.dll | 0
OAM/bin/Release/Model.dll | 0
OAM/bin/Release/OAM.dll | 0
SelM/bin/Release/Pub_Control.pdb | 0
Model/项目管理/ClsGy_MaterialPackingRelationSub.cs | 17
NETERPNoWin/bin/Release/PlanM.pdb | 0
BaseSet/bin/Release/Pub_Class.dll | 0
PayM/bin/Release/SQLHelper.dll | 0
BLL/bin/Release/DAL.pdb | 0
PlanM/bin/Release/BLL.dll | 0
SelM/bin/Release/Pub_Control.dll | 0
DAL/bin/Release/Model.pdb | 0
NETERPNoWin/bin/Release/PlanM.dll | 0
BaseSet/bin/Release/Pub_Class.pdb | 0
NETERPNoWin/bin/Release/Interop.gregn6Lib.dll | 0
NETERPNoWin/bin/Release/Pub_Class.dll | 0
WorkM/bin/Release/BLL.dll | 0
DBUtility/bin/Release/DBUtility.pdb | 0
PlanM/bin/Release/BLL.pdb | 0
DBUtility/bin/Release/DBUtility.dll | 0
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
WorkM/bin/Release/BLL.pdb | 0
NETERPNoWin/bin/Release/Pub_Class.pdb | 0
ProM/bin/Release/Pub_Control.dll | 0
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 2
PayM/bin/Release/BLL.pdb | 0
PlanM/bin/Release/SQLHelper.pdb | 0
PlanM/bin/Release/Model.pdb | 0
WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs | 75
DAL/DAL.csproj | 2
NETERPNoWin/bin/Release/DAL.pdb | 0
PlanM/bin/Release/Model.dll | 0
ProM/bin/Release/Pub_Control.pdb | 0
OAM/bin/Release/Pub_Class.pdb | 0
MES/bin/Release/Model.dll | 0
WarM/条码打印/Gy_CusBarCodeBill_KaiBei.cs | 7
PayM/bin/Release/BLL.dll | 0
ProM/bin/Release/ProM.dll | 0
SQLHelper/bin/Release/Pub_Class.pdb | 0
ProM/bin/Release/ProM.pdb | 0
Model/项目管理/ClsGy_MaterialPackingRelationMain.cs | 16
WebAPI/Controllers/仓存管理/条码生成/KF_BarCodeStatusChangeBillController.cs | 7
PayM/bin/Release/DBUtility.dll | 0
PayM/bin/Release/DBUtility.pdb | 0
PayM/bin/Release/PayM.pdb | 0
ProM/bin/Release/Model.pdb | 0
SQLHelper/bin/Release/Pub_Class.dll | 0
DAL/bin/Release/Pub_Class.pdb | 0
ProM/bin/Release/Model.dll | 0
NETERPNoWin/bin/Release/NETERPNoWin.pdb | 0
OAM/bin/Release/Pub_Class.dll | 0
BaseSet/bin/Release/DAL.pdb | 0
PayM/bin/Release/PayM.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 9
NETERPNoWin/bin/Release/Pub_Control.dll | 0
Model/生产管理/模具管理/ClsSc_MouldMoveStockRequestBillSub.cs | 44
BaseSet/bin/Release/DAL.dll | 0
DAL/bin/Release/Pub_Class.dll | 0
ProM/bin/Release/Pub_Class.dll | 0
APSM/bin/Release/APSM.pdb | 0
DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources | 0
ProM/bin/Release/Pub_Class.pdb | 0
OAM/bin/Release/BLL.dll | 0
APSM/bin/Release/APSM.dll | 0
OAM/bin/Release/BLL.pdb | 0
APSM/bin/Release/SQLHelper.pdb | 0
NETERPNoWin/bin/Release/Pub_Control.pdb | 0
WebAPI/DLL/ClsGy_Material_Ctl.cs | 8
NETERPNoWin/bin/Release/SQLHelper.pdb | 0
PayM/bin/Release/Pub_Class.pdb | 0
NETERPNoWin/bin/Release/Model.dll | 0
APSM/bin/Release/SQLHelper.dll | 0
BaseSet/bin/Release/BLL.pdb | 0
SelM/bin/Release/SQLHelper.pdb | 0
SyntacticSugar/bin/Release/SyntacticSugar.dll | 0
DBUtility/bin/Release/Pub_Class.dll | 0
PayM/bin/Release/Pub_Class.dll | 0
SyntacticSugar/bin/Release/SyntacticSugar.pdb | 0
NETERPNoWin/bin/Release/Model.pdb | 0
SelM/bin/Release/SQLHelper.dll | 0
MES/bin/Release/Interop.gregn6Lib.dll | 0
PlanM/bin/Release/Pub_Control.pdb | 0
WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs | 19
Model/bin/Release/Pub_Class.pdb | 0
BaseSet/bin/Release/BLL.dll | 0
NETERPNoWin/bin/Release/SQLHelper.dll | 0
NETERPNoWin/bin/Release/BaseSet.dll | 0
BaseSet/bin/Release/BaseSet.dll | 0
OAM/bin/Release/DAL.pdb | 0
BaseSet/bin/Release/BaseSet.pdb | 0
BLL/bin/Release/BLL.pdb | 0
APSM/bin/Release/PlanM.dll | 0
OAM/bin/Release/DAL.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt | 20
WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs | 55
APSM/bin/Release/PlanM.pdb | 0
Model/质检管理/ClsQC_FirstPieceCheckBillSub.cs | 5
WarM/条码打印/Gy_CusBarCodeBill_KaiBei_HuaSan.cs | 43
PlanM/bin/Release/Pub_Class.dll | 0
WebAPI/Controllers/MJGL/Sc_MouldMoveStockRequestBillController.cs | 792 ++++++++
MES/bin/Release/MES.exe | 0
WebAPI/WebAPI.csproj | 4
MES/bin/Release/Model.pdb | 0
PlanM/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/Pub_Control.pdb | 0
ProM/bin/Release/SQLHelper.dll | 0
PlanM/bin/Release/DAL.dll | 0
DAL/ClsGy_MaterialPackingRelation.cs | 254 ++
Model/bin/Release/DBUtility.pdb | 0
NETERPNoWin/bin/Release/DAL.dll | 0
WebAPI/Controllers/条码管理/WEBSController.cs | 403 +++
APSM/bin/Release/Pub_Control.pdb | 0
Model/Model.csproj | 4
BLL/bin/Release/Pub_Control.dll | 0
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache | 0
ProM/bin/Release/SQLHelper.pdb | 0
Model/bin/Release/DBUtility.dll | 0
BaseSet/bin/Release/SQLHelper.pdb | 0
ProM/bin/Release/BLL.dll | 0
BLL/bin/Release/BLL.dll | 0
PayM/bin/Release/Pub_Control.dll | 0
BaseSet/bin/Release/SQLHelper.dll | 0
PlanM/bin/Release/DAL.pdb | 0
NETERPNoWin/bin/Release/BaseSet.pdb | 0
WorkM/bin/Release/Pub_Control.pdb | 0
PlanM/bin/Release/Pub_Control.dll | 0
DBUtility/bin/Release/SQLHelper.dll | 0
WebAPI/Controllers/MJGL/Gy_MaterialPackingRelationController.cs | 758 +++++++
DBUtility/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.Xt_BillType.resources | 0
PayM/bin/Release/Pub_Control.pdb | 0
PayM/bin/Release/SQLHelper.pdb | 0
ProM/bin/Release/BLL.pdb | 0
Model/bin/Release/Pub_Class.dll | 0
OAM/bin/Release/Model.pdb | 0
NETERPNoWin/bin/Release/Kanban.dll | 0
PayM/obj/Release/PayM.dll | 0
WorkM/bin/Release/DAL.pdb | 0
WorkM/bin/Release/Pub_Control.dll | 0
PayM/obj/Release/PayM.pdb | 0
APSM/bin/Release/Pub_Class.dll | 0
APSM/bin/Release/Pub_Control.dll | 0
WorkM/bin/Release/DAL.dll | 0
DAL/质检管理/ClsQC_FirstPieceCheckBill.cs | 11
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 32
WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user | 196 +
APSM/bin/Release/BLL.dll | 0
DAL/bin/Release/DBUtility.dll | 0
OAM/bin/Release/Pub_Control.pdb | 0
DAL/bin/Release/Pub_Control.dll | 0
SelM/bin/Release/DAL.pdb | 0
DAL/bin/Release/DBUtility.pdb | 0
APSM/bin/Release/BLL.pdb | 0
APSM/bin/Release/Pub_Class.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user | 168
APSM/bin/Release/WorkM.dll | 0
WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs | 72
Model/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/Pub_Control.pdb | 0
DAL/bin/Release/DAL.pdb | 0
SQLHelper/obj/Release/SQLHelper.dll | 0
BaseSet/bin/Release/Model.pdb | 0
BLL/bin/Release/Model.dll | 0
PayM/bin/Release/Model.dll | 0
BaseSet/bin/Release/Model.dll | 0
OAM/bin/Release/Pub_Control.dll | 0
BLL/bin/Release/Model.pdb | 0
DAL/bin/Release/DAL.dll | 0
PayM/bin/Release/Model.pdb | 0
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs | 228 ++
WorkM/bin/Release/WorkM.pdb | 0
Pub_Class/bin/Release/SyntacticSugar.pdb | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
SelM/bin/Release/Pub_Class.dll | 0
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 137 +
Pub_Class/bin/Release/SyntacticSugar.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache | 0
SelM/bin/Release/Pub_Class.pdb | 0
WorkM/bin/Release/Model.dll | 0
WorkM/bin/Release/WorkM.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 22
Pub_Class/bin/Release/Pub_Class.pdb | 0
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 345 +++
PlanM/bin/Release/DBUtility.dll | 0
WebAPI/Models/StationBill.cs | 2
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 40
DAL/生产管理/模具管理/ClsSc_MouldMoveStockRequestBill.cs | 384 ++++
SyntacticSugar/obj/Release/SyntacticSugar.dll | 0
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 208 +
WorkM/bin/Release/Model.pdb | 0
Pub_Class/bin/Release/Pub_Class.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.pdb | 0
DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources | 0
SelM/bin/Release/Model.pdb | 0
SelM/bin/Release/Model.dll | 0
PlanM/bin/Release/DBUtility.pdb | 0
NETERPNoWin/bin/Release/OAM.pdb | 0
PayM/bin/Release/DAL.dll | 0
Model/生产管理/模具管理/ClsSc_MouldMoveStockRequestBillMain.cs | 32
WorkM/bin/Release/SQLHelper.pdb | 0
Model/bin/Release/Model.pdb | 0
NETERPNoWin/bin/Release/BLL.pdb | 0
Model/bin/Release/Model.dll | 0
SelM/bin/Release/SelM.pdb | 0
DBUtility/bin/Release/Pub_Class.pdb | 0
MES/bin/Release/DAL.dll | 0
APSM/bin/Release/WorkM.pdb | 0
Model/bin/Release/SQLHelper.dll | 0
OAM/bin/Release/DBUtility.dll | 0
PayM/bin/Release/DAL.pdb | 0
NETERPNoWin/bin/Release/OAM.dll | 0
MES/bin/Release/DAL.pdb | 0
NETERPNoWin/bin/Release/BLL.dll | 0
BaseSet/bin/Release/DBUtility.dll | 0
SelM/bin/Release/SelM.dll | 0
OAM/bin/Release/DBUtility.pdb | 0
WorkM/bin/Release/SQLHelper.dll | 0
WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs | 180 +
309 files changed, 5,410 insertions(+), 345 deletions(-)
diff --git a/APSM/bin/Release/APSM.dll b/APSM/bin/Release/APSM.dll
index 28f6afc..089425a 100644
--- a/APSM/bin/Release/APSM.dll
+++ b/APSM/bin/Release/APSM.dll
Binary files differ
diff --git a/APSM/bin/Release/APSM.pdb b/APSM/bin/Release/APSM.pdb
index 4ddd984..07a9c29 100644
--- a/APSM/bin/Release/APSM.pdb
+++ b/APSM/bin/Release/APSM.pdb
Binary files differ
diff --git a/APSM/bin/Release/BLL.dll b/APSM/bin/Release/BLL.dll
index ecd7a62..b824932 100644
--- a/APSM/bin/Release/BLL.dll
+++ b/APSM/bin/Release/BLL.dll
Binary files differ
diff --git a/APSM/bin/Release/BLL.pdb b/APSM/bin/Release/BLL.pdb
index 7b5778a..f7d385d 100644
--- a/APSM/bin/Release/BLL.pdb
+++ b/APSM/bin/Release/BLL.pdb
Binary files differ
diff --git a/APSM/bin/Release/BaseSet.dll b/APSM/bin/Release/BaseSet.dll
index bb429d4..df983c8 100644
--- a/APSM/bin/Release/BaseSet.dll
+++ b/APSM/bin/Release/BaseSet.dll
Binary files differ
diff --git a/APSM/bin/Release/BaseSet.pdb b/APSM/bin/Release/BaseSet.pdb
index c6b1f13..d7bebc7 100644
--- a/APSM/bin/Release/BaseSet.pdb
+++ b/APSM/bin/Release/BaseSet.pdb
Binary files differ
diff --git a/APSM/bin/Release/DAL.dll b/APSM/bin/Release/DAL.dll
index ccfc945..a285c62 100644
--- a/APSM/bin/Release/DAL.dll
+++ b/APSM/bin/Release/DAL.dll
Binary files differ
diff --git a/APSM/bin/Release/DAL.pdb b/APSM/bin/Release/DAL.pdb
index e35b94a..68197f6 100644
--- a/APSM/bin/Release/DAL.pdb
+++ b/APSM/bin/Release/DAL.pdb
Binary files differ
diff --git a/APSM/bin/Release/DBUtility.dll b/APSM/bin/Release/DBUtility.dll
index 30d0908..cda9b46 100644
--- a/APSM/bin/Release/DBUtility.dll
+++ b/APSM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/APSM/bin/Release/DBUtility.pdb b/APSM/bin/Release/DBUtility.pdb
index 005852f..549937e 100644
--- a/APSM/bin/Release/DBUtility.pdb
+++ b/APSM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/APSM/bin/Release/Model.dll b/APSM/bin/Release/Model.dll
index d6a3af8..0edb04d 100644
--- a/APSM/bin/Release/Model.dll
+++ b/APSM/bin/Release/Model.dll
Binary files differ
diff --git a/APSM/bin/Release/Model.pdb b/APSM/bin/Release/Model.pdb
index be1faf0..0b04106 100644
--- a/APSM/bin/Release/Model.pdb
+++ b/APSM/bin/Release/Model.pdb
Binary files differ
diff --git a/APSM/bin/Release/PlanM.dll b/APSM/bin/Release/PlanM.dll
index ec5fb4d..00ac956 100644
--- a/APSM/bin/Release/PlanM.dll
+++ b/APSM/bin/Release/PlanM.dll
Binary files differ
diff --git a/APSM/bin/Release/PlanM.pdb b/APSM/bin/Release/PlanM.pdb
index 731a2b1..0504c79 100644
--- a/APSM/bin/Release/PlanM.pdb
+++ b/APSM/bin/Release/PlanM.pdb
Binary files differ
diff --git a/APSM/bin/Release/Pub_Class.dll b/APSM/bin/Release/Pub_Class.dll
index 76b8835..d8c5d3d 100644
--- a/APSM/bin/Release/Pub_Class.dll
+++ b/APSM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/APSM/bin/Release/Pub_Class.pdb b/APSM/bin/Release/Pub_Class.pdb
index 927f7ae..aed801f 100644
--- a/APSM/bin/Release/Pub_Class.pdb
+++ b/APSM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/APSM/bin/Release/Pub_Control.dll b/APSM/bin/Release/Pub_Control.dll
index cd84ffb..e87f9b4 100644
--- a/APSM/bin/Release/Pub_Control.dll
+++ b/APSM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/APSM/bin/Release/Pub_Control.pdb b/APSM/bin/Release/Pub_Control.pdb
index 20c6c24..bbea18d 100644
--- a/APSM/bin/Release/Pub_Control.pdb
+++ b/APSM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/APSM/bin/Release/SQLHelper.dll b/APSM/bin/Release/SQLHelper.dll
index e5fde45..dc89991 100644
--- a/APSM/bin/Release/SQLHelper.dll
+++ b/APSM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/APSM/bin/Release/SQLHelper.pdb b/APSM/bin/Release/SQLHelper.pdb
index 3e5309a..8695262 100644
--- a/APSM/bin/Release/SQLHelper.pdb
+++ b/APSM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/APSM/bin/Release/WorkM.dll b/APSM/bin/Release/WorkM.dll
index 4c03d6b..eb3ec3c 100644
--- a/APSM/bin/Release/WorkM.dll
+++ b/APSM/bin/Release/WorkM.dll
Binary files differ
diff --git a/APSM/bin/Release/WorkM.pdb b/APSM/bin/Release/WorkM.pdb
index 11f9da4..2c08597 100644
--- a/APSM/bin/Release/WorkM.pdb
+++ b/APSM/bin/Release/WorkM.pdb
Binary files differ
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index bffab08..9cb1f21 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 d91c6ad..fce969c 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 aac1b66..998c8d6 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 57f84ec..9d1968f 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 3118aea..99c364d 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 5c27446..fb0711a 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 0edbe64..7bb1c8f 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 897dc6e..8cb503c 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 e137ff5..d0a2868 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 95b8f7c..3cb3898 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 2210640..b55e7be 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 b6bd04f..aa67b56 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 9f43b95..724ae3c 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 1ae4bb5..345c353 100644
--- a/BLL/bin/Release/SQLHelper.pdb
+++ b/BLL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/BLL.dll b/BaseSet/bin/Release/BLL.dll
index ecd7a62..b824932 100644
--- a/BaseSet/bin/Release/BLL.dll
+++ b/BaseSet/bin/Release/BLL.dll
Binary files differ
diff --git a/BaseSet/bin/Release/BLL.pdb b/BaseSet/bin/Release/BLL.pdb
index 7b5778a..f7d385d 100644
--- a/BaseSet/bin/Release/BLL.pdb
+++ b/BaseSet/bin/Release/BLL.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/BaseSet.dll b/BaseSet/bin/Release/BaseSet.dll
index bb429d4..df983c8 100644
--- a/BaseSet/bin/Release/BaseSet.dll
+++ b/BaseSet/bin/Release/BaseSet.dll
Binary files differ
diff --git a/BaseSet/bin/Release/BaseSet.pdb b/BaseSet/bin/Release/BaseSet.pdb
index c6b1f13..d7bebc7 100644
--- a/BaseSet/bin/Release/BaseSet.pdb
+++ b/BaseSet/bin/Release/BaseSet.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/DAL.dll b/BaseSet/bin/Release/DAL.dll
index ccfc945..a285c62 100644
--- a/BaseSet/bin/Release/DAL.dll
+++ b/BaseSet/bin/Release/DAL.dll
Binary files differ
diff --git a/BaseSet/bin/Release/DAL.pdb b/BaseSet/bin/Release/DAL.pdb
index e35b94a..68197f6 100644
--- a/BaseSet/bin/Release/DAL.pdb
+++ b/BaseSet/bin/Release/DAL.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/DBUtility.dll b/BaseSet/bin/Release/DBUtility.dll
index 30d0908..cda9b46 100644
--- a/BaseSet/bin/Release/DBUtility.dll
+++ b/BaseSet/bin/Release/DBUtility.dll
Binary files differ
diff --git a/BaseSet/bin/Release/DBUtility.pdb b/BaseSet/bin/Release/DBUtility.pdb
index 005852f..549937e 100644
--- a/BaseSet/bin/Release/DBUtility.pdb
+++ b/BaseSet/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/Model.dll b/BaseSet/bin/Release/Model.dll
index d6a3af8..0edb04d 100644
--- a/BaseSet/bin/Release/Model.dll
+++ b/BaseSet/bin/Release/Model.dll
Binary files differ
diff --git a/BaseSet/bin/Release/Model.pdb b/BaseSet/bin/Release/Model.pdb
index be1faf0..0b04106 100644
--- a/BaseSet/bin/Release/Model.pdb
+++ b/BaseSet/bin/Release/Model.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Class.dll b/BaseSet/bin/Release/Pub_Class.dll
index 76b8835..d8c5d3d 100644
--- a/BaseSet/bin/Release/Pub_Class.dll
+++ b/BaseSet/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Class.pdb b/BaseSet/bin/Release/Pub_Class.pdb
index 927f7ae..aed801f 100644
--- a/BaseSet/bin/Release/Pub_Class.pdb
+++ b/BaseSet/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Control.dll b/BaseSet/bin/Release/Pub_Control.dll
index cd84ffb..e87f9b4 100644
--- a/BaseSet/bin/Release/Pub_Control.dll
+++ b/BaseSet/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Control.pdb b/BaseSet/bin/Release/Pub_Control.pdb
index 20c6c24..bbea18d 100644
--- a/BaseSet/bin/Release/Pub_Control.pdb
+++ b/BaseSet/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/SQLHelper.dll b/BaseSet/bin/Release/SQLHelper.dll
index e5fde45..dc89991 100644
--- a/BaseSet/bin/Release/SQLHelper.dll
+++ b/BaseSet/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/BaseSet/bin/Release/SQLHelper.pdb b/BaseSet/bin/Release/SQLHelper.pdb
index 3e5309a..8695262 100644
--- a/BaseSet/bin/Release/SQLHelper.pdb
+++ b/BaseSet/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DAL/ClsGy_MaterialPackingRelation.cs b/DAL/ClsGy_MaterialPackingRelation.cs
new file mode 100644
index 0000000..817f58d
--- /dev/null
+++ b/DAL/ClsGy_MaterialPackingRelation.cs
@@ -0,0 +1,254 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_MaterialPackingRelation : DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsGy_MaterialPackingRelationMain omodel = new Model.ClsGy_MaterialPackingRelationMain();
+ public List<Model.ClsGy_MaterialPackingRelationSub> DetailColl = new List<Model.ClsGy_MaterialPackingRelationSub>();
+ public ClsGy_MaterialPackingRelation()
+ {
+ base.MvarItemKeySub = "Gy_MaterialPackingRelationSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey= "Gy_MaterialPackingRelationMain";
+ base.MvarReportTitle="浜у搧鍖呰鍏宠仈淇℃伅";
+ base.BillType="3339";
+ base.HBillSubType = "3339";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+ #region 鏃犲弬鏋勯�犲嚱鏁�
+ ~ClsGy_MaterialPackingRelation()
+ {
+ DetailColl = null;
+ }
+ #endregion
+ #endregion
+
+ #region 鍏宠仈鏁伴噺
+
+ //鍒犻櫎鍏宠仈
+ public override void DeleteRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ }
+ //鏂板鍏宠仈
+ public override void AddNewRelation(ref string sReturn, Int64 lngBillKey)
+ {
+ }
+
+ #endregion
+
+ #region 淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ string mainSql = "update Gy_MaterialPackingRelationMain set " +
+ "HBillNo = '" + omodel.HBillNo + "'" +
+ ",HDate = '" + omodel.HDate + "'" +
+ ",HUpDater = '" + omodel.HUpDater + "'" +
+ ",HUpDateDate = '" + DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss")) + "'" +
+ ",HCusID = " + omodel.HCusID + "" +
+ ",HProjectName = '" + omodel.HProjectName + "'" +
+ ",HMaterID = " + omodel.HMaterID + "" +
+ ",HRemark = '" + omodel.HRemark + "'" +
+ ",HOrgID = " + omodel.HOrgID + "" +
+ " where HInterID = " + omodel.HInterID;
+ oCn.RunProc(mainSql);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsGy_MaterialPackingRelationSub oSub in DetailColl)
+ {
+ string subSql = "insert into Gy_MaterialPackingRelationSub" +
+ "(HInterID,HEntryID,HMouldID,HSNP,HTransPackFlag,HSendPackFlag" +
+ ",HDefaultTransPackFlag,HDefaultSendPackFlag,HUseFlag,HRemark) " +
+ " values(" +
+ "" + omodel.HInterID + "" +
+ "," + oSub.HEntryID + "" +
+ "," + oSub.HMouldID + "" +
+ "," + oSub.HSNP + "" +
+ "," + oSub.HTransPackFlag + "" +
+ "," + oSub.HSendPackFlag + "" +
+ "," + oSub.HDefaultTransPackFlag + "" +
+ "," + oSub.HDefaultSendPackFlag + "" +
+ "," + oSub.HUseFlag + "" +
+ ",'" + oSub.HRemark + "'" +
+ ")";
+ oCn.RunProc(subSql);
+ }
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ #endregion
+
+ #region 鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ DataSet ds;
+
+ oCn.BeginTran();
+ //妫�鏌ヤ富琛ㄥ唴鐮佹槸鍚﹂噸澶嶏紝鑻ラ噸澶嶅垯閲嶆柊鐢熸垚骞剁户缁鏌ワ紝鐩村埌涓嶅啀閲嶅
+ while (true)
+ {
+ ds = oCn.RunProcReturn("select * from Gy_MaterialPackingRelationMain where HInterID = " + omodel.HInterID, "Gy_MaterialPackingRelationMain");
+ if(ds!=null && ds.Tables[0].Rows.Count > 0)
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ break;
+ }
+ }
+
+ //鎻掑叆涓昏〃
+ string mainSql = "insert into Gy_MaterialPackingRelationMain" +
+ "(HInterID,HBillNo,HDate,HYear,HPeriod,HBillType" +
+ ",HMaker,HMakeDate,HCusID,HProjectName,HMaterID,HRemark,HOrgID) " +
+ "values(" +
+ "" + omodel.HInterID + "" +
+ ",'" + omodel.HBillNo + "'" +
+ ",'" + omodel.HDate + "'" +
+ "," + DBUtility.ClsPub.isLong(DateTime.Now.Year) + "" +
+ "," + DBUtility.ClsPub.isLong(DateTime.Now.Month) + "" +
+ ",'" + BillType + "'" +
+ ",'" + omodel.HMaker + "'" +
+ ",'" + DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss")) + "'" +
+ "," + omodel.HCusID + "" +
+ ",'" + omodel.HProjectName + "'" +
+ "," + omodel.HMaterID + "" +
+ ",'" + omodel.HRemark + "'" +
+ "," + omodel.HOrgID + "" +
+ ")";
+
+ oCn.RunProc(mainSql);
+
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsGy_MaterialPackingRelationSub oSub in DetailColl)
+ {
+ string subSql = "insert into Gy_MaterialPackingRelationSub" +
+ "(HInterID,HEntryID,HMouldID,HSNP,HTransPackFlag,HSendPackFlag" +
+ ",HDefaultTransPackFlag,HDefaultSendPackFlag,HUseFlag,HRemark) " +
+ " values(" +
+ "" + omodel.HInterID + "" +
+ "," + oSub.HEntryID + "" +
+ "," + oSub.HMouldID + "" +
+ "," + oSub.HSNP + "" +
+ "," + oSub.HTransPackFlag + "" +
+ "," + oSub.HSendPackFlag + "" +
+ "," + oSub.HDefaultTransPackFlag + "" +
+ "," + oSub.HDefaultSendPackFlag + "" +
+ "," + oSub.HUseFlag + "" +
+ ",'" + oSub.HRemark + "'" +
+ ")";
+ oCn.RunProc(subSql);
+ }
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ #endregion
+
+ #region 鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds ;
+ Ds = oCn.RunProcReturn("select * from Gy_MaterialPackingRelationMain Where HInterID = " + lngBillKey.ToString(), "Gy_MaterialPackingRelationMain");
+ if(Ds.Tables[0].Rows.Count==0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+
+ //鍥哄畾璧嬪��===========================================
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan= Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //========================================================
+ omodel.HCusID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCusID"]);
+ omodel.HProjectName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProjectName"]);
+ omodel.HMaterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterID"]);
+ omodel.HOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"]);
+
+ //寰幆
+ DataSet DsSub ;
+ DsSub = oCn.RunProcReturn("select * from Gy_MaterialPackingRelationSub where HInterID = " + lngBillKey.ToString() + "order by HEntryID", "Gy_MaterialPackingRelationSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsGy_MaterialPackingRelationSub oSub = new Model.ClsGy_MaterialPackingRelationSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+ oSub.HMouldID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMouldID"]);
+ oSub.HSNP = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSNP"]);
+ oSub.HTransPackFlag = DBUtility.ClsPub.isInt(DsSub.Tables[0].Rows[i]["HTransPackFlag"]);
+ oSub.HSendPackFlag = DBUtility.ClsPub.isInt(DsSub.Tables[0].Rows[i]["HSendPackFlag"]);
+ oSub.HDefaultTransPackFlag = DBUtility.ClsPub.isInt(DsSub.Tables[0].Rows[i]["HDefaultTransPackFlag"]);
+ oSub.HDefaultSendPackFlag = DBUtility.ClsPub.isInt(DsSub.Tables[0].Rows[i]["HDefaultSendPackFlag"]);
+ oSub.HUseFlag = DBUtility.ClsPub.isInt(DsSub.Tables[0].Rows[i]["HUseFlag"]);
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+ #endregion
+
+ }
+
+}
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index efd183c..37f9aba 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -80,6 +80,7 @@
<ItemGroup>
<Compile Include="APS\ClsSc_WorkBillMonthSortBill.cs" />
<Compile Include="APS\ClsSc_ICMOChangeBill.cs" />
+ <Compile Include="ClsGy_MaterialPackingRelation.cs" />
<Compile Include="MES\ClsSc_MESStopRestoreWorkBill.cs" />
<Compile Include="浠撳簱绠＄悊\灏忚溅閿佸畾\ClsKf_TrolleyPositionBill.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_PatrolCheckItemMethod_Ctl.cs" />
@@ -108,6 +109,7 @@
<Compile Include="鐢熶骇绠＄悊\瀹㈡埛鏍囩\ClsSc_CustomerTagInfo.cs" />
<Compile Include="鐢熶骇绠＄悊\鎺掍骇瑙ｉ攣鐢宠鍗昞ClsJIT_UnLockRequestBill.cs" />
<Compile Include="鐢熶骇绠＄悊\鎺掍骇閿佸畾鐢宠鍗昞ClsJIT_LockRequestBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMoveStockRequestBill.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipPatrolCheckPlanBill.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipPatrolCheckBill.cs" />
<Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSet.cs" />
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index aac1b66..998c8d6 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 57f84ec..9d1968f 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 3118aea..99c364d 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 5c27446..fb0711a 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 0edbe64..7bb1c8f 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 897dc6e..8cb503c 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 e137ff5..d0a2868 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 95b8f7c..3cb3898 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 2210640..b55e7be 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 b6bd04f..aa67b56 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 9f43b95..724ae3c 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 1ae4bb5..345c353 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMoveStockRequestBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMoveStockRequestBill.cs"
new file mode 100644
index 0000000..8b6e58c
--- /dev/null
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMoveStockRequestBill.cs"
@@ -0,0 +1,384 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsSc_MouldMoveStockRequestBill:DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsSc_MouldMoveStockRequestBillMain omodel = new Model.ClsSc_MouldMoveStockRequestBillMain();
+ public List<Model.ClsSc_MouldMoveStockRequestBillSub> DetailColl = new List<Model.ClsSc_MouldMoveStockRequestBillSub>();
+
+ public ClsSc_MouldMoveStockRequestBill()
+ {
+ base.MvarItemKeySub = "Sc_MouldMoveStockRequestBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey="Sc_MouldMoveStockRequestBillMain";
+ base.MvarReportTitle= "鍣ㄥ叿璋冩嫧鐢宠鍗�";
+ base.BillType= "3850";
+ base.HBillSubType = "3850";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsSc_MouldMoveStockRequestBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+
+ //淇濆瓨鍓嶆帶鍒�
+ public bool BeforeSave(Int64 HInterID, string HBillNo, Int64 OperationType, ref string sReturn)
+ {
+ try
+ {
+ DataSet Ds = oCn.RunProcReturn("Exec h_p_Sc_MouldMoveStockRequestBill_BeforeSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + OperationType.ToString(), "h_p_Sc_MouldMoveStockRequestBill_BeforeSaveCtrl");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ }
+ return true;
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ //淇濆瓨鍚庢帶鍒�
+ public bool AfterSave(Int64 HInterID, string HBillNo, Int64 OperationType, ref string sReturn)
+ {
+ try
+ {
+ DataSet Ds = oCn.RunProcReturn("Exec h_p_Sc_MouldMoveStockRequestBill_AfterSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + OperationType.ToString(), "h_p_Sc_MouldMoveStockRequestBill_AfterSaveCtrl");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "淇濆瓨鍚庡垽鏂け璐ワ紒";
+ return false;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ }
+ return true;
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+ //淇濆瓨鍓嶆帶鍒�
+ if (!BeforeSave(lngBillKey, omodel.HBillNo, 2, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Sc_MouldMoveStockRequestBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ ",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HSupTypeID=" + omodel.HSupTypeID.ToString() +
+ ",HSupID=" + omodel.HSupID.ToString() +
+ ",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HWHID=" + omodel.HWHID.ToString() +
+ ",HSCWHID=" + omodel.HSCWHID.ToString() +
+ ",HEmpID=" + omodel.HEmpID.ToString() +
+ ",HMangerID=" + omodel.HMangerID.ToString() +
+ ",HSecManagerID=" + omodel.HSecManagerID.ToString() +
+ ",HKeeperID=" + omodel.HKeeperID.ToString() +
+ ",HExplanation='" + omodel.HExplanation + "'" +
+ ",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HStockStyle='" + omodel.HStockStyle + "'" +
+ ",HStockInOrgID=" + omodel.HStockInOrgID.ToString() +
+ ",HStockOutOrgID=" + omodel.HStockOutOrgID.ToString() +
+ ",HERPInterID=" + omodel.HERPInterID.ToString() +
+ ",HERPBillType='" + omodel.HERPBillType + "'" +
+ ",HOWNERTYPEHEADID='" + omodel.HOWNERTYPEHEADID + "'" +
+ ",HTRANSTYPE='" + omodel.HTRANSTYPE + "'" +
+ ",HOWNERTYPEINID='" + omodel.HOWNERTYPEINID + "'" +
+ ",HBUSINESSTYPE='" + omodel.HBUSINESSTYPE + "'" +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsSc_MouldMoveStockRequestBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sc_MouldMoveStockRequestBillSub " +
+ " (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
+ ",HQty,HPrice,HMoney,HOutPrice,HOutMoney,HWHID" +
+ ",HSCWHID,HSPID,HSCSPID,HERPInterID,HERPEntryID" +
+ ",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
+ ",HICMOInterID,HICMOEntryID,HICMOBillNo,HSTOCKORGID,HOWNERID,HOWNERTYPEID" +
+ ",HSTOCKORGINID,HOWNERINID,HOWNERTYPEINID,HBASEUNITID,HEXTAUXUNITID,HSECQTY" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
+ "," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
+ "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HOutPrice.ToString() + "," + oSub.HOutMoney.ToString() + "," + oSub.HWHID.ToString() +
+ "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() + "," + oSub.HSCSPID.ToString() + "," + oSub.HERPInterID.ToString() + "," + oSub.HERPEntryID.ToString() +
+ "," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
+ "," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HSTOCKORGID.ToString() + "," + oSub.HOWNERID.ToString() + ",'" + oSub.HOWNERTYPEID + "'" +
+ "," + oSub.HSTOCKORGINID.ToString() + "," + oSub.HOWNERINID.ToString() + ",'" + oSub.HOWNERTYPEINID + "'," + oSub.HBASEUNITID.ToString() + "," + oSub.HEXTAUXUNITID.ToString() + "," + oSub.HSECQTY.ToString() +
+ ") ");
+ }
+ //淇濆瓨鍚庢帶鍒�
+ if (!AfterSave(lngBillKey, omodel.HBillNo, 2, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 淇敼鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ //淇濆瓨鍓嶆帶鍒�
+ if (!BeforeSave(omodel.HInterID, omodel.HBillNo, 1, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
+ //涓昏〃
+ oCn.RunProc("Insert Into Sc_MouldMoveStockRequestBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
+ ",HSupTypeID,HSupID,HDeptID,HWHID,HSCWHID" +
+ ",HEmpID,HMangerID,HSecManagerID,HKeeperID,HExplanation" +
+ ",HInnerBillNo,HStockStyle,HStockInOrgID,HStockOutOrgID,HERPInterID" +
+ ",HERPBillType,HOWNERTYPEHEADID,HTRANSTYPE,HOWNERTYPEINID,HBUSINESSTYPE" +
+ ") " +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate.ToShortDateString() + "'" +
+ ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ ", " + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'" +
+ ", " + omodel.HSupTypeID.ToString() + "," + omodel.HSupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HWHID.ToString() + "," + omodel.HSCWHID.ToString() +
+ ", " + omodel.HEmpID.ToString() + "," + omodel.HMangerID.ToString() + "," + omodel.HSecManagerID.ToString() + "," + omodel.HKeeperID.ToString() + ",'" + omodel.HExplanation + "'" +
+ ",'" + omodel.HInnerBillNo + "','" + omodel.HStockStyle + "'," + omodel.HStockInOrgID.ToString() + "," + omodel.HStockOutOrgID.ToString() + "," + omodel.HERPInterID.ToString() +
+ ",'" + omodel.HERPBillType + "','" + omodel.HOWNERTYPEHEADID + "','" + omodel.HTRANSTYPE + "','" + omodel.HOWNERTYPEINID + "','" + omodel.HBUSINESSTYPE + "'" +
+ ") ");
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsSc_MouldMoveStockRequestBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sc_MouldMoveStockRequestBillSub " +
+ " (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HMaterID,HPropertyID,HSecUnitID,HSecUnitRate,HUnitID,HQtyMust" +
+ ",HQty,HPrice,HMoney,HOutPrice,HOutMoney,HWHID" +
+ ",HSCWHID,HSPID,HSCSPID,HERPInterID,HERPEntryID" +
+ ",HPOOrderInterID,HPOOrderEntryID,HPOOrderBillNo,HSeOrderInterID,HSeOrderEntryID,HSeOrderBillNo" +
+ ",HICMOInterID,HICMOEntryID,HICMOBillNo,HSTOCKORGID,HOWNERID,HOWNERTYPEID" +
+ ",HSTOCKORGINID,HOWNERINID,HOWNERTYPEINID,HBASEUNITID,HEXTAUXUNITID,HSECQTY" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
+ "," + oSub.HMaterID.ToString() + "," + oSub.HPropertyID.ToString() + "," + oSub.HSecUnitID.ToString() + "," + oSub.HSecUnitRate.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
+ "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HOutPrice.ToString() + "," + oSub.HOutMoney.ToString() + "," + oSub.HWHID.ToString() +
+ "," + oSub.HSCWHID.ToString() + "," + oSub.HSPID.ToString() + "," + oSub.HSCSPID.ToString() + "," + oSub.HERPInterID.ToString() + "," + oSub.HERPEntryID.ToString() +
+ "," + oSub.HPOOrderInterID.ToString() + "," + oSub.HPOOrderEntryID.ToString() + ",'" + oSub.HPOOrderBillNo + "'," + oSub.HSeOrderInterID.ToString() + "," + oSub.HSeOrderEntryID.ToString() + ",'" + oSub.HSeOrderBillNo + "'" +
+ "," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HSTOCKORGID.ToString() + "," + oSub.HOWNERID.ToString() + ",'" + oSub.HOWNERTYPEID + "'" +
+ "," + oSub.HSTOCKORGINID.ToString() + "," + oSub.HOWNERINID.ToString() + ",'" + oSub.HOWNERTYPEINID + "'," + oSub.HBASEUNITID.ToString() + "," + oSub.HEXTAUXUNITID.ToString() + "," + oSub.HSECQTY.ToString() +
+ ") ");
+ }
+ //淇濆瓨鍚庢帶鍒�
+ if (!AfterSave(omodel.HInterID, omodel.HBillNo, 1, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 鏂板鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds;
+ Ds = oCn.RunProcReturn("Select * from Sc_MouldMoveStockRequestBillMain Where HInterID=" + lngBillKey.ToString(), "Sc_MouldMoveStockRequestBillMain");
+ if (Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //鍥哄畾璧嬪��===========================================
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]);
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //========================================================
+ omodel.HSupTypeID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupTypeID"]);
+ omodel.HSupID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSupID"]);
+ omodel.HDeptID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HDeptID"]);
+ omodel.HWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWHID"]);
+ omodel.HSCWHID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSCWHID"]);
+ omodel.HEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEmpID"]);
+ omodel.HMangerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMangerID"]);
+ omodel.HSecManagerID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HSecManagerID"]);
+ omodel.HKeeperID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HKeeperID"]);
+ omodel.HExplanation = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HExplanation"]);
+ omodel.HInnerBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HInnerBillNo"]);
+ omodel.HERPInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HERPInterID"]);
+ omodel.HStockInOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HStockInOrgID"]);
+ omodel.HStockOutOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HStockOutOrgID"]);
+ omodel.HERPBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HERPBillType"]);
+ omodel.HOWNERTYPEHEADID = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HOWNERTYPEHEADID"]);
+ omodel.HTRANSTYPE = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HTRANSTYPE"]);
+ omodel.HOWNERTYPEINID = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HOWNERTYPEINID"]);
+ omodel.HBUSINESSTYPE = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBUSINESSTYPE"]);
+
+ //寰幆
+ DataSet DsSub;
+ DsSub = oCn.RunProcReturn("Select * from Sc_MouldMoveStockRequestBillSub Where HInterID=" + lngBillKey.ToString() + "order by HEntryID", "Sc_MouldMoveStockRequestBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsSc_MouldMoveStockRequestBillSub oSub = new Model.ClsSc_MouldMoveStockRequestBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HBillNo_bak = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HBillNo_bak"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+ oSub.HMaterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID"]);
+ oSub.HPropertyID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPropertyID"]);
+ oSub.HSecUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSecUnitID"]);
+ oSub.HSecUnitRate = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HSecUnitRate"]);
+ oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]);
+ oSub.HQtyMust = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQtyMust"]);
+ oSub.HQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQty"]);
+ oSub.HPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPrice"]);
+ oSub.HMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HMoney"]);
+ oSub.HOutPrice = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HOutPrice"]);
+ oSub.HOutMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HOutMoney"]);
+ oSub.HWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWHID"]);
+ oSub.HSCWHID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCWHID"]);
+ oSub.HSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSPID"]);
+ oSub.HSCSPID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSCSPID"]);
+ oSub.HERPInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HERPInterID"]);
+ oSub.HERPEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HERPEntryID"]);
+ oSub.HPOOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderInterID"]);
+ oSub.HPOOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HPOOrderEntryID"]);
+ oSub.HPOOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPOOrderBillNo"]);
+ oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderInterID"]);
+ oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSeOrderEntryID"]);
+ oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HSeOrderBillNo"]);
+ oSub.HICMOInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HICMOInterID"]);
+ oSub.HICMOEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HICMOEntryID"]);
+ oSub.HICMOBillNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HICMOBillNo"]);
+ oSub.HSTOCKORGID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSTOCKORGID"]);
+ oSub.HOWNERID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HOWNERID"]);
+ oSub.HOWNERTYPEID = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HOWNERTYPEID"]);
+ oSub.HSTOCKORGINID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSTOCKORGINID"]);
+ oSub.HOWNERINID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HOWNERINID"]);
+ oSub.HOWNERTYPEINID = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HOWNERTYPEINID"]);
+ oSub.HBASEUNITID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HBASEUNITID"]);
+ oSub.HEXTAUXUNITID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEXTAUXUNITID"]);
+ oSub.HSECQTY = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HSECQTY"]);
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+ }
+
+}
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 0717e5d..114ac5a 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"
@@ -97,6 +97,7 @@
",HShiftsID=" + omodel.HShiftsID.ToString() +
",HErrTreatment='" + omodel.HErrTreatment + "'" +
",HBatchNo='" + omodel.HBatchNo + "'" +
+ ",HRemarkSN='" + omodel.HRemarkSN + "'" +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -210,14 +211,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" +
") " +
" 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 + "'" +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_FirstPieceCheckBillSub oSub in DetailColl)
@@ -230,6 +231,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("
+ omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
@@ -238,8 +240,9 @@
",'" + 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.HQualityStdID + "," + oSub.HInspectMethodID + "," + oSub.HInspectBasisID + ",'" + oSub.HCompareSymbol + "') ");
+
+ }
//foreach (Model.ClsQC_FirstPieceCheckBillSub_Item oSub2 in DetailColl1)
//{
// oCn.RunProc("Insert into QC_FirstPieceCheckBillSub_Item " +
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index 3118aea..99c364d 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 5c27446..fb0711a 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 e137ff5..d0a2868 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 95b8f7c..3cb3898 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 2210640..b55e7be 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 b6bd04f..aa67b56 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 9f43b95..724ae3c 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 1ae4bb5..345c353 100644
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources b/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
index 4409d1f..552e300 100644
--- a/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
+++ b/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_BillType.resources b/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
index c956059..561c1c7 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
index de8645b..9103b7d 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
index dc6af89..fe71e8f 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
index 4bdcdb9..ae4f855 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
index 3d487c6..89f77dc 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index b2ba826..5c05a84 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 7c45b82..d4f0c96 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
index 430deb8..59940f0 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.dll b/DBUtility/obj/Release/DBUtility.dll
index 3118aea..99c364d 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 5c27446..fb0711a 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git a/MES/bin/Release/AxInterop.gregn6Lib.dll b/MES/bin/Release/AxInterop.gregn6Lib.dll
index 5b64e7f..13ec212 100644
--- a/MES/bin/Release/AxInterop.gregn6Lib.dll
+++ b/MES/bin/Release/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/MES/bin/Release/BLL.dll b/MES/bin/Release/BLL.dll
index ecd7a62..b824932 100644
--- a/MES/bin/Release/BLL.dll
+++ b/MES/bin/Release/BLL.dll
Binary files differ
diff --git a/MES/bin/Release/BLL.pdb b/MES/bin/Release/BLL.pdb
index 7b5778a..f7d385d 100644
--- a/MES/bin/Release/BLL.pdb
+++ b/MES/bin/Release/BLL.pdb
Binary files differ
diff --git a/MES/bin/Release/DAL.dll b/MES/bin/Release/DAL.dll
index ccfc945..a285c62 100644
--- a/MES/bin/Release/DAL.dll
+++ b/MES/bin/Release/DAL.dll
Binary files differ
diff --git a/MES/bin/Release/DAL.pdb b/MES/bin/Release/DAL.pdb
index e35b94a..68197f6 100644
--- a/MES/bin/Release/DAL.pdb
+++ b/MES/bin/Release/DAL.pdb
Binary files differ
diff --git a/MES/bin/Release/Interop.gregn6Lib.dll b/MES/bin/Release/Interop.gregn6Lib.dll
index 03d72c0..3fd89a5 100644
--- a/MES/bin/Release/Interop.gregn6Lib.dll
+++ b/MES/bin/Release/Interop.gregn6Lib.dll
Binary files differ
diff --git a/MES/bin/Release/MES.exe b/MES/bin/Release/MES.exe
index 0e453b3..0106b48 100644
--- a/MES/bin/Release/MES.exe
+++ b/MES/bin/Release/MES.exe
Binary files differ
diff --git a/MES/bin/Release/MES.pdb b/MES/bin/Release/MES.pdb
index 7d0a2f9..1739e3d 100644
--- a/MES/bin/Release/MES.pdb
+++ b/MES/bin/Release/MES.pdb
Binary files differ
diff --git a/MES/bin/Release/Model.dll b/MES/bin/Release/Model.dll
index d6a3af8..0edb04d 100644
--- a/MES/bin/Release/Model.dll
+++ b/MES/bin/Release/Model.dll
Binary files differ
diff --git a/MES/bin/Release/Model.pdb b/MES/bin/Release/Model.pdb
index be1faf0..0b04106 100644
--- a/MES/bin/Release/Model.pdb
+++ b/MES/bin/Release/Model.pdb
Binary files differ
diff --git a/Model/Model.csproj b/Model/Model.csproj
index fd972a1..fd9ef8f 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -180,6 +180,8 @@
<Compile Include="鐢熶骇绠＄悊\鎺掍骇閿佸畾鐢宠鍗昞ClsJIT_LockRequestBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\鎺掍骇閿佸畾鐢宠鍗昞ClsJIT_LockRequestBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainPlanBillSub_Plan.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMoveStockRequestBillMain.cs" />
+ <Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMoveStockRequestBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\鐢熶骇棰嗘枡\ClsKf_ProductReceiveMaterialBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\鐢熶骇棰嗘枡\ClsKf_ProductReceiveMaterialBillSub.cs" />
<Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipPatrolCheckPlanBillSub.cs" />
@@ -1141,8 +1143,10 @@
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_LadingBillSub.cs" />
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_ShippingAdviceBillMain.cs" />
<Compile Include="閿�鍞鐞哱鍗曡瘉绠＄悊\ClsXs_ShippingAdviceBillSub.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsGy_MaterialPackingRelationSub.cs" />
<Compile Include="椤圭洰绠＄悊\ClsGy_ProjectMoneyBOMBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsGy_ProjectMoneyBOMBillSub.cs" />
+ <Compile Include="椤圭洰绠＄悊\ClsGy_MaterialPackingRelationMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_ProjectEndBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_ProjectBeginBillMain.cs" />
<Compile Include="椤圭洰绠＄悊\ClsPM_ProjectEndBillSub.cs" />
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index 3118aea..99c364d 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 5c27446..fb0711a 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 0edbe64..7bb1c8f 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 897dc6e..8cb503c 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 e137ff5..d0a2868 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 95b8f7c..3cb3898 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 2210640..b55e7be 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 b6bd04f..aa67b56 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 9f43b95..724ae3c 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 1ae4bb5..345c353 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 f7765a9..3518fda 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 0edbe64..7bb1c8f 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 897dc6e..8cb503c 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMoveStockRequestBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMoveStockRequestBillMain.cs"
new file mode 100644
index 0000000..2386593
--- /dev/null
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMoveStockRequestBillMain.cs"
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSc_MouldMoveStockRequestBillMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HPrintQty; // int --打印次数
+ public Int64 HSupID; // int --往来单位
+ public Int64 HSupTypeID; // int --往来类型
+ public Int64 HDeptID; // int --部门
+ public Int64 HWHID; // int ---调入仓库
+ public Int64 HSCWHID; // int --调出仓库
+ public Int64 HEmpID; // int --业务员
+ public Int64 HMangerID; // int --主管
+ public Int64 HSecManagerID; // int --验收
+ public Int64 HKeeperID; // int --保管员
+ public string HExplanation; // varchar(200) --摘要
+ public string HInnerBillNo; // varchar(50) --内部单据号
+ public string HStockStyle; // varchar(100) --调拨类型
+ public Int64 HStockInOrgID; // int --调入组织ID
+ public Int64 HStockOutOrgID; // int --调出组织ID
+ public Int64 HERPInterID; // int --ERP内码
+ public string HERPBillType; // varchar(100) --ERP单据类型
+ public string HOWNERTYPEHEADID; // varchar(50) --调出货主类型
+ public string HTRANSTYPE; // varchar(50) --调拨类型
+ public string HOWNERTYPEINID; // varchar(50) --调入货主类型
+ public string HBUSINESSTYPE; // varchar(50) --业务类型
+
+ }
+}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMoveStockRequestBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMoveStockRequestBillSub.cs"
new file mode 100644
index 0000000..e50c405
--- /dev/null
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMoveStockRequestBillSub.cs"
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSc_MouldMoveStockRequestBillSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HMaterID; // int --模具ID
+ public Int64 HPropertyID; // int --辅助属性
+ public Int64 HSecUnitID; // int --辅助计量单位
+ public Single HSecUnitRate; // money --换算率
+ public Int64 HUnitID; // int --计量单位
+ public double HQtyMust; // dec(18,8) --应收数量
+ public double HQty; // dec(18,8) --申请数量
+ public double HPrice; // dec(18,8) --单价
+ public double HMoney; // dec(18,8) --金额
+ public double HOutPrice; // dec(18,8) --调出单价（默认0） --addnew
+ public double HOutMoney; // dec(18,8) --调出金额（默认0） --addnew
+ public Int64 HWHID; // int --调入仓库
+ public Int64 HSCWHID; // int --调出仓库
+ public Int64 HSPID; // int --调入仓位
+ public Int64 HSCSPID; // int --调出仓位
+ public Int64 HERPInterID;
+ public Int64 HERPEntryID;
+ public Int64 HPOOrderInterID; // int --采购订单主ID
+ public Int64 HPOOrderEntryID; // int --采购订单子ID
+ public string HPOOrderBillNo; // varchar(50) --采购订单号
+ public Int64 HSeOrderInterID; // int --销售订单主ID
+ public Int64 HSeOrderEntryID; // int --销售订单子ID
+ public string HSeOrderBillNo; // varchar(50) --销售订单号
+ public Int64 HICMOInterID; // int --生产订单主ID
+ public Int64 HICMOEntryID; // int --生产订单子ID
+ public string HICMOBillNo; // varchar(100) --生产订单号
+ public Int64 HSTOCKORGID; // int --调出组织
+ public Int64 HSTOCKORGINID; // int --调入组织
+ public Int64 HOWNERINID; // int --调入货主
+ public string HOWNERTYPEINID; // varchar(50) --调入货主类型
+ public Int64 HBASEUNITID; // int --基本计量单位
+ public Int64 HEXTAUXUNITID; // int --辅单位
+ public double HSECQTY; // dec(18,8) --申请数量（库存辅单位）
+
+ }
+}
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 d6aa9c1..b629124 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"
@@ -30,5 +30,6 @@
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_FirstPieceCheckBillSub.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_FirstPieceCheckBillSub.cs"
index d3b9107..f087de4 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"
@@ -35,6 +35,11 @@
public Int64 HKeyInspect;
public Int64 HInspectInstruMentID;
public String HInspectResult;
+
+ public Int64 HQualityStdID;//
+ public Int64 HInspectMethodID;//
+ public Int64 HInspectBasisID;//
+ public String HCompareSymbol;//
//public HSamplingType;
//public HInspectionLevel;
//public HStrictness;
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillMain.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillMain.cs"
index 658e8c0..6bd9e59 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillMain.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillMain.cs"
@@ -10,6 +10,7 @@
//
public Int64 HSourceID;
public Int64 HICMOInterID;
+ public Int64 HICMOEntryID;
public String HICMOBillNo;
public Int64 HICMOQty;
public Int64 HProcExchInterID;
@@ -23,5 +24,6 @@
public Int64 HShiftsID;
public string HErrTreatment;
+ public Int64 HQCSchemeID;
}
}
diff --git "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillSub.cs" "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillSub.cs"
index d01cdaf..69de7ba 100644
--- "a/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillSub.cs"
+++ "b/Model/\350\264\250\346\243\200\347\256\241\347\220\206/ClsQC_PatrolProcCheckBillSub.cs"
@@ -20,5 +20,16 @@
public String HQCNote8;
public String HQCNote9;
public String HQCNote10;
+ public String HQCNote1_SN;
+ public String HQCNote2_SN;
+ public String HQCNote3_SN;
+ public String HQCNote4_SN;
+ public String HQCNote5_SN;
+ public String HQCNote6_SN;
+ public String HQCNote7_SN;
+ public String HQCNote8_SN;
+ public String HQCNote9_SN;
+ public String HQCNote10_SN;
+
}
}
diff --git "a/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsGy_MaterialPackingRelationMain.cs" "b/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsGy_MaterialPackingRelationMain.cs"
new file mode 100644
index 0000000..11ce5b9
--- /dev/null
+++ "b/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsGy_MaterialPackingRelationMain.cs"
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_MaterialPackingRelationMain : DBUtility.ClsXt_BaseBillMain
+ {
+ public string HDate; //日期
+ public Int64 HCusID; //客户
+ public string HProjectName; //项目名称
+ public Int64 HMaterID; //物料
+ public Int64 HOrgID; //组织
+ public string HUseFlag; //启用标记
+ }
+}
diff --git "a/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsGy_MaterialPackingRelationSub.cs" "b/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsGy_MaterialPackingRelationSub.cs"
new file mode 100644
index 0000000..0aea5d9
--- /dev/null
+++ "b/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsGy_MaterialPackingRelationSub.cs"
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_MaterialPackingRelationSub : DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HMouldID;
+ public Int64 HSNP;
+ public int HTransPackFlag;
+ public int HSendPackFlag;
+ public int HDefaultTransPackFlag;
+ public int HDefaultSendPackFlag;
+ public int HUseFlag;
+ }
+}
diff --git a/NETERPNoWin/bin/Release/BLL.dll b/NETERPNoWin/bin/Release/BLL.dll
index ecd7a62..b824932 100644
--- a/NETERPNoWin/bin/Release/BLL.dll
+++ b/NETERPNoWin/bin/Release/BLL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Release/BLL.pdb b/NETERPNoWin/bin/Release/BLL.pdb
index 7b5778a..f7d385d 100644
--- a/NETERPNoWin/bin/Release/BLL.pdb
+++ b/NETERPNoWin/bin/Release/BLL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Release/BaseSet.dll b/NETERPNoWin/bin/Release/BaseSet.dll
index bb429d4..df983c8 100644
--- a/NETERPNoWin/bin/Release/BaseSet.dll
+++ b/NETERPNoWin/bin/Release/BaseSet.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Release/BaseSet.pdb b/NETERPNoWin/bin/Release/BaseSet.pdb
index c6b1f13..d7bebc7 100644
--- a/NETERPNoWin/bin/Release/BaseSet.pdb
+++ b/NETERPNoWin/bin/Release/BaseSet.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Release/DAL.dll b/NETERPNoWin/bin/Release/DAL.dll
index ccfc945..a285c62 100644
--- a/NETERPNoWin/bin/Release/DAL.dll
+++ b/NETERPNoWin/bin/Release/DAL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Release/DAL.pdb b/NETERPNoWin/bin/Release/DAL.pdb
index e35b94a..68197f6 100644
--- a/NETERPNoWin/bin/Release/DAL.pdb
+++ b/NETERPNoWin/bin/Release/DAL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Release/DBUtility.dll b/NETERPNoWin/bin/Release/DBUtility.dll
index 30d0908..cda9b46 100644
--- a/NETERPNoWin/bin/Release/DBUtility.dll
+++ b/NETERPNoWin/bin/Release/DBUtility.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Release/DBUtility.pdb b/NETERPNoWin/bin/Release/DBUtility.pdb
index 005852f..549937e 100644
--- a/NETERPNoWin/bin/Release/DBUtility.pdb
+++ b/NETERPNoWin/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Interop.gregn6Lib.dll b/NETERPNoWin/bin/Release/Interop.gregn6Lib.dll
index 7cf2772..60031bf 100644
--- a/NETERPNoWin/bin/Release/Interop.gregn6Lib.dll
+++ b/NETERPNoWin/bin/Release/Interop.gregn6Lib.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Kanban.dll b/NETERPNoWin/bin/Release/Kanban.dll
index 641fe28..c799123 100644
--- a/NETERPNoWin/bin/Release/Kanban.dll
+++ b/NETERPNoWin/bin/Release/Kanban.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Kanban.pdb b/NETERPNoWin/bin/Release/Kanban.pdb
index e313b74..a3de8b7 100644
--- a/NETERPNoWin/bin/Release/Kanban.pdb
+++ b/NETERPNoWin/bin/Release/Kanban.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Model.dll b/NETERPNoWin/bin/Release/Model.dll
index d6a3af8..0edb04d 100644
--- a/NETERPNoWin/bin/Release/Model.dll
+++ b/NETERPNoWin/bin/Release/Model.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Model.pdb b/NETERPNoWin/bin/Release/Model.pdb
index be1faf0..0b04106 100644
--- a/NETERPNoWin/bin/Release/Model.pdb
+++ b/NETERPNoWin/bin/Release/Model.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Release/NETERPNoWin.exe b/NETERPNoWin/bin/Release/NETERPNoWin.exe
index ede0a86..eb997a4 100644
--- a/NETERPNoWin/bin/Release/NETERPNoWin.exe
+++ b/NETERPNoWin/bin/Release/NETERPNoWin.exe
Binary files differ
diff --git a/NETERPNoWin/bin/Release/NETERPNoWin.pdb b/NETERPNoWin/bin/Release/NETERPNoWin.pdb
index 234a458..8bdadb1 100644
--- a/NETERPNoWin/bin/Release/NETERPNoWin.pdb
+++ b/NETERPNoWin/bin/Release/NETERPNoWin.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Release/OAM.dll b/NETERPNoWin/bin/Release/OAM.dll
index 7f66274..e979e78 100644
--- a/NETERPNoWin/bin/Release/OAM.dll
+++ b/NETERPNoWin/bin/Release/OAM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Release/OAM.pdb b/NETERPNoWin/bin/Release/OAM.pdb
index 9f5dc2a..567ba55 100644
--- a/NETERPNoWin/bin/Release/OAM.pdb
+++ b/NETERPNoWin/bin/Release/OAM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Release/PlanM.dll b/NETERPNoWin/bin/Release/PlanM.dll
index ec5fb4d..00ac956 100644
--- a/NETERPNoWin/bin/Release/PlanM.dll
+++ b/NETERPNoWin/bin/Release/PlanM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Release/PlanM.pdb b/NETERPNoWin/bin/Release/PlanM.pdb
index 731a2b1..0504c79 100644
--- a/NETERPNoWin/bin/Release/PlanM.pdb
+++ b/NETERPNoWin/bin/Release/PlanM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Pub_Class.dll b/NETERPNoWin/bin/Release/Pub_Class.dll
index 76b8835..d8c5d3d 100644
--- a/NETERPNoWin/bin/Release/Pub_Class.dll
+++ b/NETERPNoWin/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Pub_Class.pdb b/NETERPNoWin/bin/Release/Pub_Class.pdb
index 927f7ae..aed801f 100644
--- a/NETERPNoWin/bin/Release/Pub_Class.pdb
+++ b/NETERPNoWin/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Pub_Control.dll b/NETERPNoWin/bin/Release/Pub_Control.dll
index cd84ffb..e87f9b4 100644
--- a/NETERPNoWin/bin/Release/Pub_Control.dll
+++ b/NETERPNoWin/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Release/Pub_Control.pdb b/NETERPNoWin/bin/Release/Pub_Control.pdb
index 20c6c24..bbea18d 100644
--- a/NETERPNoWin/bin/Release/Pub_Control.pdb
+++ b/NETERPNoWin/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Release/SQLHelper.dll b/NETERPNoWin/bin/Release/SQLHelper.dll
index e5fde45..dc89991 100644
--- a/NETERPNoWin/bin/Release/SQLHelper.dll
+++ b/NETERPNoWin/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Release/SQLHelper.pdb b/NETERPNoWin/bin/Release/SQLHelper.pdb
index 3e5309a..8695262 100644
--- a/NETERPNoWin/bin/Release/SQLHelper.pdb
+++ b/NETERPNoWin/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Release/WorkM.dll b/NETERPNoWin/bin/Release/WorkM.dll
index 4c03d6b..eb3ec3c 100644
--- a/NETERPNoWin/bin/Release/WorkM.dll
+++ b/NETERPNoWin/bin/Release/WorkM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Release/WorkM.pdb b/NETERPNoWin/bin/Release/WorkM.pdb
index 11f9da4..2c08597 100644
--- a/NETERPNoWin/bin/Release/WorkM.pdb
+++ b/NETERPNoWin/bin/Release/WorkM.pdb
Binary files differ
diff --git a/OAM/bin/Release/BLL.dll b/OAM/bin/Release/BLL.dll
index ecd7a62..b824932 100644
--- a/OAM/bin/Release/BLL.dll
+++ b/OAM/bin/Release/BLL.dll
Binary files differ
diff --git a/OAM/bin/Release/BLL.pdb b/OAM/bin/Release/BLL.pdb
index 7b5778a..f7d385d 100644
--- a/OAM/bin/Release/BLL.pdb
+++ b/OAM/bin/Release/BLL.pdb
Binary files differ
diff --git a/OAM/bin/Release/BaseSet.dll b/OAM/bin/Release/BaseSet.dll
index bb429d4..df983c8 100644
--- a/OAM/bin/Release/BaseSet.dll
+++ b/OAM/bin/Release/BaseSet.dll
Binary files differ
diff --git a/OAM/bin/Release/BaseSet.pdb b/OAM/bin/Release/BaseSet.pdb
index c6b1f13..d7bebc7 100644
--- a/OAM/bin/Release/BaseSet.pdb
+++ b/OAM/bin/Release/BaseSet.pdb
Binary files differ
diff --git a/OAM/bin/Release/DAL.dll b/OAM/bin/Release/DAL.dll
index ccfc945..a285c62 100644
--- a/OAM/bin/Release/DAL.dll
+++ b/OAM/bin/Release/DAL.dll
Binary files differ
diff --git a/OAM/bin/Release/DAL.pdb b/OAM/bin/Release/DAL.pdb
index e35b94a..68197f6 100644
--- a/OAM/bin/Release/DAL.pdb
+++ b/OAM/bin/Release/DAL.pdb
Binary files differ
diff --git a/OAM/bin/Release/DBUtility.dll b/OAM/bin/Release/DBUtility.dll
index 30d0908..cda9b46 100644
--- a/OAM/bin/Release/DBUtility.dll
+++ b/OAM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/OAM/bin/Release/DBUtility.pdb b/OAM/bin/Release/DBUtility.pdb
index 005852f..549937e 100644
--- a/OAM/bin/Release/DBUtility.pdb
+++ b/OAM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/OAM/bin/Release/Model.dll b/OAM/bin/Release/Model.dll
index d6a3af8..0edb04d 100644
--- a/OAM/bin/Release/Model.dll
+++ b/OAM/bin/Release/Model.dll
Binary files differ
diff --git a/OAM/bin/Release/Model.pdb b/OAM/bin/Release/Model.pdb
index be1faf0..0b04106 100644
--- a/OAM/bin/Release/Model.pdb
+++ b/OAM/bin/Release/Model.pdb
Binary files differ
diff --git a/OAM/bin/Release/OAM.dll b/OAM/bin/Release/OAM.dll
index 7f66274..e979e78 100644
--- a/OAM/bin/Release/OAM.dll
+++ b/OAM/bin/Release/OAM.dll
Binary files differ
diff --git a/OAM/bin/Release/OAM.pdb b/OAM/bin/Release/OAM.pdb
index 9f5dc2a..567ba55 100644
--- a/OAM/bin/Release/OAM.pdb
+++ b/OAM/bin/Release/OAM.pdb
Binary files differ
diff --git a/OAM/bin/Release/Pub_Class.dll b/OAM/bin/Release/Pub_Class.dll
index 76b8835..d8c5d3d 100644
--- a/OAM/bin/Release/Pub_Class.dll
+++ b/OAM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/OAM/bin/Release/Pub_Class.pdb b/OAM/bin/Release/Pub_Class.pdb
index 927f7ae..aed801f 100644
--- a/OAM/bin/Release/Pub_Class.pdb
+++ b/OAM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/OAM/bin/Release/Pub_Control.dll b/OAM/bin/Release/Pub_Control.dll
index cd84ffb..e87f9b4 100644
--- a/OAM/bin/Release/Pub_Control.dll
+++ b/OAM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/OAM/bin/Release/Pub_Control.pdb b/OAM/bin/Release/Pub_Control.pdb
index 20c6c24..bbea18d 100644
--- a/OAM/bin/Release/Pub_Control.pdb
+++ b/OAM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/OAM/bin/Release/SQLHelper.dll b/OAM/bin/Release/SQLHelper.dll
index e5fde45..dc89991 100644
--- a/OAM/bin/Release/SQLHelper.dll
+++ b/OAM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/OAM/bin/Release/SQLHelper.pdb b/OAM/bin/Release/SQLHelper.pdb
index 3e5309a..8695262 100644
--- a/OAM/bin/Release/SQLHelper.pdb
+++ b/OAM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/PayM/bin/Release/BLL.dll b/PayM/bin/Release/BLL.dll
index ecd7a62..b824932 100644
--- a/PayM/bin/Release/BLL.dll
+++ b/PayM/bin/Release/BLL.dll
Binary files differ
diff --git a/PayM/bin/Release/BLL.pdb b/PayM/bin/Release/BLL.pdb
index 7b5778a..f7d385d 100644
--- a/PayM/bin/Release/BLL.pdb
+++ b/PayM/bin/Release/BLL.pdb
Binary files differ
diff --git a/PayM/bin/Release/DAL.dll b/PayM/bin/Release/DAL.dll
index ccfc945..a285c62 100644
--- a/PayM/bin/Release/DAL.dll
+++ b/PayM/bin/Release/DAL.dll
Binary files differ
diff --git a/PayM/bin/Release/DAL.pdb b/PayM/bin/Release/DAL.pdb
index e35b94a..68197f6 100644
--- a/PayM/bin/Release/DAL.pdb
+++ b/PayM/bin/Release/DAL.pdb
Binary files differ
diff --git a/PayM/bin/Release/DBUtility.dll b/PayM/bin/Release/DBUtility.dll
index 30d0908..cda9b46 100644
--- a/PayM/bin/Release/DBUtility.dll
+++ b/PayM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/PayM/bin/Release/DBUtility.pdb b/PayM/bin/Release/DBUtility.pdb
index 005852f..549937e 100644
--- a/PayM/bin/Release/DBUtility.pdb
+++ b/PayM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/PayM/bin/Release/Model.dll b/PayM/bin/Release/Model.dll
index d6a3af8..0edb04d 100644
--- a/PayM/bin/Release/Model.dll
+++ b/PayM/bin/Release/Model.dll
Binary files differ
diff --git a/PayM/bin/Release/Model.pdb b/PayM/bin/Release/Model.pdb
index be1faf0..0b04106 100644
--- a/PayM/bin/Release/Model.pdb
+++ b/PayM/bin/Release/Model.pdb
Binary files differ
diff --git a/PayM/bin/Release/PayM.dll b/PayM/bin/Release/PayM.dll
index 50f10ec..c09361b 100644
--- a/PayM/bin/Release/PayM.dll
+++ b/PayM/bin/Release/PayM.dll
Binary files differ
diff --git a/PayM/bin/Release/PayM.pdb b/PayM/bin/Release/PayM.pdb
index 9711482..9504ac4 100644
--- a/PayM/bin/Release/PayM.pdb
+++ b/PayM/bin/Release/PayM.pdb
Binary files differ
diff --git a/PayM/bin/Release/Pub_Class.dll b/PayM/bin/Release/Pub_Class.dll
index 76b8835..d8c5d3d 100644
--- a/PayM/bin/Release/Pub_Class.dll
+++ b/PayM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/PayM/bin/Release/Pub_Class.pdb b/PayM/bin/Release/Pub_Class.pdb
index 927f7ae..aed801f 100644
--- a/PayM/bin/Release/Pub_Class.pdb
+++ b/PayM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/PayM/bin/Release/Pub_Control.dll b/PayM/bin/Release/Pub_Control.dll
index cd84ffb..e87f9b4 100644
--- a/PayM/bin/Release/Pub_Control.dll
+++ b/PayM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/PayM/bin/Release/Pub_Control.pdb b/PayM/bin/Release/Pub_Control.pdb
index 20c6c24..bbea18d 100644
--- a/PayM/bin/Release/Pub_Control.pdb
+++ b/PayM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/PayM/bin/Release/SQLHelper.dll b/PayM/bin/Release/SQLHelper.dll
index e5fde45..dc89991 100644
--- a/PayM/bin/Release/SQLHelper.dll
+++ b/PayM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/PayM/bin/Release/SQLHelper.pdb b/PayM/bin/Release/SQLHelper.pdb
index 3e5309a..8695262 100644
--- a/PayM/bin/Release/SQLHelper.pdb
+++ b/PayM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/PayM/obj/Release/PayM.dll b/PayM/obj/Release/PayM.dll
index 50f10ec..c09361b 100644
--- a/PayM/obj/Release/PayM.dll
+++ b/PayM/obj/Release/PayM.dll
Binary files differ
diff --git a/PayM/obj/Release/PayM.pdb b/PayM/obj/Release/PayM.pdb
index 9711482..9504ac4 100644
--- a/PayM/obj/Release/PayM.pdb
+++ b/PayM/obj/Release/PayM.pdb
Binary files differ
diff --git a/PlanM/bin/Release/BLL.dll b/PlanM/bin/Release/BLL.dll
index ecd7a62..b824932 100644
--- a/PlanM/bin/Release/BLL.dll
+++ b/PlanM/bin/Release/BLL.dll
Binary files differ
diff --git a/PlanM/bin/Release/BLL.pdb b/PlanM/bin/Release/BLL.pdb
index 7b5778a..f7d385d 100644
--- a/PlanM/bin/Release/BLL.pdb
+++ b/PlanM/bin/Release/BLL.pdb
Binary files differ
diff --git a/PlanM/bin/Release/DAL.dll b/PlanM/bin/Release/DAL.dll
index ccfc945..a285c62 100644
--- a/PlanM/bin/Release/DAL.dll
+++ b/PlanM/bin/Release/DAL.dll
Binary files differ
diff --git a/PlanM/bin/Release/DAL.pdb b/PlanM/bin/Release/DAL.pdb
index e35b94a..68197f6 100644
--- a/PlanM/bin/Release/DAL.pdb
+++ b/PlanM/bin/Release/DAL.pdb
Binary files differ
diff --git a/PlanM/bin/Release/DBUtility.dll b/PlanM/bin/Release/DBUtility.dll
index 30d0908..cda9b46 100644
--- a/PlanM/bin/Release/DBUtility.dll
+++ b/PlanM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/PlanM/bin/Release/DBUtility.pdb b/PlanM/bin/Release/DBUtility.pdb
index 005852f..549937e 100644
--- a/PlanM/bin/Release/DBUtility.pdb
+++ b/PlanM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/PlanM/bin/Release/Model.dll b/PlanM/bin/Release/Model.dll
index d6a3af8..0edb04d 100644
--- a/PlanM/bin/Release/Model.dll
+++ b/PlanM/bin/Release/Model.dll
Binary files differ
diff --git a/PlanM/bin/Release/Model.pdb b/PlanM/bin/Release/Model.pdb
index be1faf0..0b04106 100644
--- a/PlanM/bin/Release/Model.pdb
+++ b/PlanM/bin/Release/Model.pdb
Binary files differ
diff --git a/PlanM/bin/Release/PlanM.dll b/PlanM/bin/Release/PlanM.dll
index ec5fb4d..00ac956 100644
--- a/PlanM/bin/Release/PlanM.dll
+++ b/PlanM/bin/Release/PlanM.dll
Binary files differ
diff --git a/PlanM/bin/Release/PlanM.pdb b/PlanM/bin/Release/PlanM.pdb
index 731a2b1..0504c79 100644
--- a/PlanM/bin/Release/PlanM.pdb
+++ b/PlanM/bin/Release/PlanM.pdb
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Class.dll b/PlanM/bin/Release/Pub_Class.dll
index 76b8835..d8c5d3d 100644
--- a/PlanM/bin/Release/Pub_Class.dll
+++ b/PlanM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Class.pdb b/PlanM/bin/Release/Pub_Class.pdb
index 927f7ae..aed801f 100644
--- a/PlanM/bin/Release/Pub_Class.pdb
+++ b/PlanM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Control.dll b/PlanM/bin/Release/Pub_Control.dll
index cd84ffb..e87f9b4 100644
--- a/PlanM/bin/Release/Pub_Control.dll
+++ b/PlanM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Control.pdb b/PlanM/bin/Release/Pub_Control.pdb
index 20c6c24..bbea18d 100644
--- a/PlanM/bin/Release/Pub_Control.pdb
+++ b/PlanM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/PlanM/bin/Release/SQLHelper.dll b/PlanM/bin/Release/SQLHelper.dll
index e5fde45..dc89991 100644
--- a/PlanM/bin/Release/SQLHelper.dll
+++ b/PlanM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/PlanM/bin/Release/SQLHelper.pdb b/PlanM/bin/Release/SQLHelper.pdb
index 3e5309a..8695262 100644
--- a/PlanM/bin/Release/SQLHelper.pdb
+++ b/PlanM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/ProM/bin/Release/BLL.dll b/ProM/bin/Release/BLL.dll
index ecd7a62..b824932 100644
--- a/ProM/bin/Release/BLL.dll
+++ b/ProM/bin/Release/BLL.dll
Binary files differ
diff --git a/ProM/bin/Release/BLL.pdb b/ProM/bin/Release/BLL.pdb
index 7b5778a..f7d385d 100644
--- a/ProM/bin/Release/BLL.pdb
+++ b/ProM/bin/Release/BLL.pdb
Binary files differ
diff --git a/ProM/bin/Release/DAL.dll b/ProM/bin/Release/DAL.dll
index ccfc945..a285c62 100644
--- a/ProM/bin/Release/DAL.dll
+++ b/ProM/bin/Release/DAL.dll
Binary files differ
diff --git a/ProM/bin/Release/DAL.pdb b/ProM/bin/Release/DAL.pdb
index e35b94a..68197f6 100644
--- a/ProM/bin/Release/DAL.pdb
+++ b/ProM/bin/Release/DAL.pdb
Binary files differ
diff --git a/ProM/bin/Release/DBUtility.dll b/ProM/bin/Release/DBUtility.dll
index 30d0908..cda9b46 100644
--- a/ProM/bin/Release/DBUtility.dll
+++ b/ProM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/ProM/bin/Release/DBUtility.pdb b/ProM/bin/Release/DBUtility.pdb
index 005852f..549937e 100644
--- a/ProM/bin/Release/DBUtility.pdb
+++ b/ProM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/ProM/bin/Release/Model.dll b/ProM/bin/Release/Model.dll
index d6a3af8..0edb04d 100644
--- a/ProM/bin/Release/Model.dll
+++ b/ProM/bin/Release/Model.dll
Binary files differ
diff --git a/ProM/bin/Release/Model.pdb b/ProM/bin/Release/Model.pdb
index be1faf0..0b04106 100644
--- a/ProM/bin/Release/Model.pdb
+++ b/ProM/bin/Release/Model.pdb
Binary files differ
diff --git a/ProM/bin/Release/ProM.dll b/ProM/bin/Release/ProM.dll
index e961272..0cbd8ba 100644
--- a/ProM/bin/Release/ProM.dll
+++ b/ProM/bin/Release/ProM.dll
Binary files differ
diff --git a/ProM/bin/Release/ProM.pdb b/ProM/bin/Release/ProM.pdb
index 09c0237..5b41d85 100644
--- a/ProM/bin/Release/ProM.pdb
+++ b/ProM/bin/Release/ProM.pdb
Binary files differ
diff --git a/ProM/bin/Release/Pub_Class.dll b/ProM/bin/Release/Pub_Class.dll
index 76b8835..d8c5d3d 100644
--- a/ProM/bin/Release/Pub_Class.dll
+++ b/ProM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/ProM/bin/Release/Pub_Class.pdb b/ProM/bin/Release/Pub_Class.pdb
index 927f7ae..aed801f 100644
--- a/ProM/bin/Release/Pub_Class.pdb
+++ b/ProM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/ProM/bin/Release/Pub_Control.dll b/ProM/bin/Release/Pub_Control.dll
index cd84ffb..e87f9b4 100644
--- a/ProM/bin/Release/Pub_Control.dll
+++ b/ProM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/ProM/bin/Release/Pub_Control.pdb b/ProM/bin/Release/Pub_Control.pdb
index 20c6c24..bbea18d 100644
--- a/ProM/bin/Release/Pub_Control.pdb
+++ b/ProM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/ProM/bin/Release/SQLHelper.dll b/ProM/bin/Release/SQLHelper.dll
index e5fde45..dc89991 100644
--- a/ProM/bin/Release/SQLHelper.dll
+++ b/ProM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/ProM/bin/Release/SQLHelper.pdb b/ProM/bin/Release/SQLHelper.pdb
index 3e5309a..8695262 100644
--- a/ProM/bin/Release/SQLHelper.pdb
+++ b/ProM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index e137ff5..d0a2868 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 95b8f7c..3cb3898 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 c0635b3..9a5be6e 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 ca3eca3..310ad83 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 e137ff5..d0a2868 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 95b8f7c..3cb3898 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 2210640..b55e7be 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 b6bd04f..aa67b56 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 e137ff5..d0a2868 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 95b8f7c..3cb3898 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 9f43b95..724ae3c 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 1ae4bb5..345c353 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 a277b75..0f8dfd0 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 9f43b95..724ae3c 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 1ae4bb5..345c353 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
index ecd7a62..b824932 100644
--- a/SelM/bin/Release/BLL.dll
+++ b/SelM/bin/Release/BLL.dll
Binary files differ
diff --git a/SelM/bin/Release/BLL.pdb b/SelM/bin/Release/BLL.pdb
index 7b5778a..f7d385d 100644
--- a/SelM/bin/Release/BLL.pdb
+++ b/SelM/bin/Release/BLL.pdb
Binary files differ
diff --git a/SelM/bin/Release/DAL.dll b/SelM/bin/Release/DAL.dll
index ccfc945..a285c62 100644
--- a/SelM/bin/Release/DAL.dll
+++ b/SelM/bin/Release/DAL.dll
Binary files differ
diff --git a/SelM/bin/Release/DAL.pdb b/SelM/bin/Release/DAL.pdb
index e35b94a..68197f6 100644
--- a/SelM/bin/Release/DAL.pdb
+++ b/SelM/bin/Release/DAL.pdb
Binary files differ
diff --git a/SelM/bin/Release/DBUtility.dll b/SelM/bin/Release/DBUtility.dll
index 30d0908..cda9b46 100644
--- a/SelM/bin/Release/DBUtility.dll
+++ b/SelM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/SelM/bin/Release/DBUtility.pdb b/SelM/bin/Release/DBUtility.pdb
index 005852f..549937e 100644
--- a/SelM/bin/Release/DBUtility.pdb
+++ b/SelM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/SelM/bin/Release/Model.dll b/SelM/bin/Release/Model.dll
index d6a3af8..0edb04d 100644
--- a/SelM/bin/Release/Model.dll
+++ b/SelM/bin/Release/Model.dll
Binary files differ
diff --git a/SelM/bin/Release/Model.pdb b/SelM/bin/Release/Model.pdb
index be1faf0..0b04106 100644
--- a/SelM/bin/Release/Model.pdb
+++ b/SelM/bin/Release/Model.pdb
Binary files differ
diff --git a/SelM/bin/Release/Pub_Class.dll b/SelM/bin/Release/Pub_Class.dll
index 76b8835..d8c5d3d 100644
--- a/SelM/bin/Release/Pub_Class.dll
+++ b/SelM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/SelM/bin/Release/Pub_Class.pdb b/SelM/bin/Release/Pub_Class.pdb
index 927f7ae..aed801f 100644
--- a/SelM/bin/Release/Pub_Class.pdb
+++ b/SelM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/SelM/bin/Release/Pub_Control.dll b/SelM/bin/Release/Pub_Control.dll
index cd84ffb..e87f9b4 100644
--- a/SelM/bin/Release/Pub_Control.dll
+++ b/SelM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/SelM/bin/Release/Pub_Control.pdb b/SelM/bin/Release/Pub_Control.pdb
index 20c6c24..bbea18d 100644
--- a/SelM/bin/Release/Pub_Control.pdb
+++ b/SelM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/SelM/bin/Release/SQLHelper.dll b/SelM/bin/Release/SQLHelper.dll
index e5fde45..dc89991 100644
--- a/SelM/bin/Release/SQLHelper.dll
+++ b/SelM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/SelM/bin/Release/SQLHelper.pdb b/SelM/bin/Release/SQLHelper.pdb
index 3e5309a..8695262 100644
--- a/SelM/bin/Release/SQLHelper.pdb
+++ b/SelM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/SelM/bin/Release/SelM.dll b/SelM/bin/Release/SelM.dll
index 175623e..6c3db4c 100644
--- a/SelM/bin/Release/SelM.dll
+++ b/SelM/bin/Release/SelM.dll
Binary files differ
diff --git a/SelM/bin/Release/SelM.pdb b/SelM/bin/Release/SelM.pdb
index 58c90fd..13b35d8 100644
--- a/SelM/bin/Release/SelM.pdb
+++ b/SelM/bin/Release/SelM.pdb
Binary files differ
diff --git a/SelM/bin/Release/WorkM.dll b/SelM/bin/Release/WorkM.dll
index 4c03d6b..eb3ec3c 100644
--- a/SelM/bin/Release/WorkM.dll
+++ b/SelM/bin/Release/WorkM.dll
Binary files differ
diff --git a/SelM/bin/Release/WorkM.pdb b/SelM/bin/Release/WorkM.pdb
index 11f9da4..2c08597 100644
--- a/SelM/bin/Release/WorkM.pdb
+++ b/SelM/bin/Release/WorkM.pdb
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.dll b/SyntacticSugar/bin/Release/SyntacticSugar.dll
index c0635b3..9a5be6e 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 ca3eca3..310ad83 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 64e23a6..6d92568 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,6 +1,38 @@
+<<<<<<< HEAD
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+=======
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+<<<<<<< HEAD
+=======
+D:\WMES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+D:\WMES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+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
+<<<<<<< HEAD
+=======
+C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+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
+D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\GitHub\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+>>>>>>> 7857ee010972be30ae38d3d73c1516dd87d58d79
+>>>>>>> 7141e956ca8488f6feb082828cd60653382b6c89
+>>>>>>> b67a44dcc2871d3e4866be1fe63da74b7912deaf
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..c9f257c
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -0,0 +1,20 @@
+<<<<<<< HEAD
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
+=======
+D:\WMES\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
+D:\WMES\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
+D:\WMES\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
+D:\WMES\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\WMES\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
+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.CoreCompileInputs.cache
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
+>>>>>>> 7141e956ca8488f6feb082828cd60653382b6c89
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.dll b/SyntacticSugar/obj/Release/SyntacticSugar.dll
new file mode 100644
index 0000000..9a5be6e
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.pdb b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
new file mode 100644
index 0000000..310ad83
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
Binary files differ
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
index 1f5897b..cbd21d2 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei.cs"
@@ -752,10 +752,15 @@
LSH2 = "0" + LSH2;
}
- if (HBarCodeType == "閿愭嵎鏍囩" || HBarCodeType == "鍗庡嫟鏍囩" || HBarCodeType == "鑻变笟杈炬爣绛�")
+ if (HBarCodeType == "閿愭嵎鏍囩" || HBarCodeType == "鑻变笟杈炬爣绛�")
{
TM = sTMNumber + LSH2;
}
+ else if (HBarCodeType == "鍗庡嫟鏍囩")
+ {
+ //鏉＄爜缂栧彿 = 瀹㈡埛鏂欏彿+2浣嶅浐瀹氣��00鈥�+骞村懆+ 娴佹按鍙凤紙4浣嶏級
+ TM = sHCusModelName + "00" + sYearWeek + LSH2;
+ }
else
//瓒呰仛鍙樺唴鏍囩
{
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_HuaSan.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_HuaSan.cs"
index 9092c8c..2ad2937 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_HuaSan.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_HuaSan.cs"
@@ -710,7 +710,14 @@
HEntryID = j + 1;
HBarCode = TM.ToUpper();
- HBarCodeType = "鏂板崕涓夊唴绠辩爜";
+ if (cmbHCusName.Text.Contains("涓滄柟閫氫俊"))
+ {
+ HBarCodeType = "涓滄柟閫氫俊鍐呯鐮�";
+ }
+ else
+ {
+ HBarCodeType = "鏂板崕涓夊唴绠辩爜";
+ }
HMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);
HBatchNo = sYear4 + sPeriod2 + sDay;
HUnitID = ClsPub.isLong(grdMain.Rows[j].Cells[HUnitIDCol].Value);
@@ -787,8 +794,17 @@
HInnerBillNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HInnerBillNoCol].Value); //閿�鍞鍗曞彿
//鑾峰彇鏈�澶ф祦姘村彿
- //鏉＄爜鍓嶇紑 = 渚涘簲鍟嗕唬鐮� + 閿�鍞鍗曞彿
- sWTMNumber = "151091" + HInnerBillNo;
+ if (cmbHCusName.Text.Contains("涓滄柟閫氫俊"))
+ {
+ //鏉＄爜鍓嶇紑 = 2浣嶅浐瀹氱爜锛�'09'锛� + CPN瀹㈡埛缂栫爜锛堣鏍煎瀷鍙凤級+ 2浣嶉鐣欑爜锛堝浐瀹�'01'锛�+ 5浣嶅勾骞存湀鏃ユ棩锛圷YMDD锛� + 3浣�09鐮佹祦姘村彿锛堝浐瀹�'001'锛� + 渚涘簲鍟嗕唬鐮侊紙鍥哄畾'105652'锛�
+ sWTMNumber = "09" + HMaterModel + "01" + sYear + sPeriod + sDay + "001105652";
+ }
+ //鏂板崕涓�
+ else
+ {
+ //鏉＄爜鍓嶇紑 = 2浣嶅浐瀹氱爜锛�'09'锛� + CPN瀹㈡埛缂栫爜锛堣鏍煎瀷鍙凤級+ 2浣嶉鐣欑爜锛堝浐瀹�'01'锛�+ 5浣嶅勾骞存湀鏃ユ棩锛圷YMDD锛� + 3浣�09鐮佹祦姘村彿锛堝浐瀹�'001'锛� + 渚涘簲鍟嗕唬鐮侊紙鍥哄畾'151091'锛�
+ sWTMNumber = "09" + HMaterModel + "01" + sYear + sPeriod + sDay + "001151091";
+ }
Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sWTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
LWSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
@@ -816,11 +832,18 @@
}
//鏉＄爜缂栧彿 = 2浣嶅浐瀹氱爜锛�'09'锛� + CPN瀹㈡埛缂栫爜锛堣鏍煎瀷鍙凤級+ 2浣嶉鐣欑爜锛堝浐瀹�'01'锛�+ 5浣嶅勾骞存湀鏃ユ棩锛圷YMDD锛� + 3浣�09鐮佹祦姘村彿锛堝浐瀹�'001'锛� + 渚涘簲鍟嗕唬鐮侊紙鍥哄畾'151091'锛�+ 3浣嶆祦姘村彿
- TM = "09" + HMaterModel + "01" + sYear + sPeriod + sDay + "001151091" + LSH2;
+ TM = sWTMNumber + LSH2;
HEntryID = j + 1;
HBarCode = TM.ToUpper();
- HBarCodeType = "鏂板崕涓夊绠辩爜";
+ if (cmbHCusName.Text.Contains("涓滄柟閫氫俊"))
+ {
+ HBarCodeType = "涓滄柟閫氫俊澶栫鐮�";
+ }
+ else
+ {
+ HBarCodeType = "鏂板崕涓夊绠辩爜";
+ }
HMaterID = ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value);
HBatchNo = sYear4 + sPeriod2 + sDay;
HUnitID = ClsPub.isLong(grdMain.Rows[j].Cells[HUnitIDCol].Value);
@@ -903,7 +926,7 @@
private void Display()
{
//鍒锋柊鍐呯鐮佸垪琛�
- DataSet DSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and 鏉＄爜绫诲瀷='鏂板崕涓夊唴绠辩爜' order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (鏉＄爜绫诲瀷='鏂板崕涓夊唴绠辩爜' or 鏉＄爜绫诲瀷='涓滄柟閫氫俊鍐呯鐮�) order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
if (DSet == null)
{
@@ -914,7 +937,7 @@
grdSub.DataSource = DSet.Tables[0].DefaultView;
//鍒锋柊澶栫鐮佸垪琛�
- DataSet DWSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and 鏉＄爜绫诲瀷='鏂板崕涓夊绠辩爜' order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
+ DataSet DWSet = oCn.RunProcReturn("select * from h_v_Gy_BarCodeBill_CusList where HInterID=" + HInterID.ToString() + " and (鏉＄爜绫诲瀷='鏂板崕涓夊绠辩爜' or 鏉＄爜绫诲瀷='涓滄柟閫氫俊澶栫鐮�) order by HItemID", "h_v_Gy_BarCodeBill_CusList", ref DBUtility.ClsPub.sExeReturnInfo);
//鐢熸垚棣栬鏍囬
if (DWSet == null)
{
@@ -1049,7 +1072,7 @@
grdMain.Columns[HEXPPERIODCol].Visible = false;
grdMain.Columns[HLSHCol].Visible = false;
grdMain.Columns[HBaNoCol].Visible = false;
- grdMain.Columns[HCusModelNameCol].Visible = false;
+ //grdMain.Columns[HCusModelNameCol].Visible = false;
grdMain.Columns[HCusModelCol].Visible = false;
grdMain.Columns[HBatchNoCol].Visible = false;
grdMain.Columns[HCode1Col].Visible = false;
@@ -1670,7 +1693,7 @@
{
try
{
- oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType='鏂板崕涓夊唴绠辩爜' and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType in ('鏂板崕涓夊唴绠辩爜','涓滄柟閫氫俊鍐呯鐮�') and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
}
catch (Exception e)
{
@@ -1785,7 +1808,7 @@
{
try
{
- oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType='鏂板崕涓夊绠辩爜' and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.RunProc("update Gy_BarCodeBill_Cus set HPrintQty=isnull(HPrintQty,0)+1 where HBarCodeType in ('鏂板崕涓夊绠辩爜','涓滄柟閫氫俊澶栫鐮�') and HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
}
catch (Exception e)
{
diff --git a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
index 29368da..2fcd8e6 100644
--- a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
@@ -26,6 +26,7 @@
DataSet ds;
string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];
+ #region 杩斿洖鑱屽憳鍒楄〃
/// <summary>
/// 杩斿洖鑱屽憳鍒楄〃
///鍙傛暟锛歴tring sql銆�
@@ -83,6 +84,68 @@
return objJsonResult;
}
}
+
+ #endregion
+
+ #region 杩斿洖鑱屽憳鍒楄〃
+ /// <summary>
+ /// 杩斿洖鑱屽憳鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Employee/listPage")]
+ [HttpGet]
+ public object lislistPaget(string sWhere, string user, string Organization, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Employee_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_IF_EmployeeListPage {page}, {size}, ''", "h_p_IF_StockPlaceListPage");
+ }
+ else
+ {
+ sWhere = sWhere.Replace("'", "''");
+
+ ds = oCN.RunProcReturn($@"exec h_p_IF_EmployeeListPage {page}, {size}, '{sWhere}'", "h_p_IF_StockPlaceListPage");
+ }
+ //娣诲姞鍒楀悕
+ 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 = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ 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 鑱屽憳 鏍戝舰鍥�
public class TreeModel
@@ -375,6 +438,7 @@
string msg4 = sArray[2].ToString();
//string msg4 = sArray[2].ToString();
//string msg5 = sArray[3].ToString();
+
oCN.BeginTran();
//缂栬緫鏉冮檺
if (!DBUtility.ClsPub.Security_Log_second("Gy_Employee_Edit", 1, false, msg3))
@@ -590,7 +654,6 @@
+ itemID + "," + listOne.HPostID +",N'" + listOne.HRemark + "');";
}
- LogService.Write(sql3);
oCN.RunProcReturn(sql3, "Gy_Employee_Post");
}
@@ -612,6 +675,7 @@
objJsonResult.data = null;
return objJsonResult;
}
+
oCN.RunProc("Update Gy_Employee set " +
" HNumber='" + HNumber + "'" +
",HName='" + HName + "'" +
@@ -698,15 +762,17 @@
",HAddress='" + HAddress.ToString() + "'" +
",HDeptID= '" + HDeptID + "' Where HItemID=" + HItemID);
+
+
oCN.RunProcReturn("delete from Gy_Employee_Post where HEmpID = " + HItemID, "Gy_Employee_Post");
string sql3 = "";
foreach (ClsGy_EmployeeSub listOne in list1)
{
sql3 += "insert into Gy_Employee_Post(HEmpID, HPostID, HRemark) Values("
- + HItemID + "," + listOne.HPostID + ",N'" + listOne.HRemark + "');";
+ + HItemID + ",N'" + listOne.HPostID + "',N'" + listOne.HRemark + "');";
+
}
- LogService.Write(sql3);
oCN.RunProcReturn(sql3, "Gy_WorkCenterSub");
}
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index b6107d7..880faae 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -1808,12 +1808,12 @@
}
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by 鏃ユ湡 desc", "h_v_Gy_MouldFileList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by 鏉＄爜缂栧彿 desc", "h_v_Gy_MouldFileList");
}
else
{
string sql1 = "select * from h_v_Gy_MouldFileList where 1 = 1 ";
- string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + "order by 鏉＄爜缂栧彿 desc";
ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList");
}
@@ -2918,8 +2918,7 @@
}
//=========================================================
- //涓昏〃
- oCN.RunProc("UpDate Gy_MouldFileMain set " +
+ string sql = "UpDate Gy_MouldFileMain set " +
" HBillNo='" + HBillNo + "'" + //鍥哄畾璧嬪��===============
",HDate='" + HDate + "'" +
",HYear='" + HYear.ToString() + "'" +
@@ -2972,10 +2971,13 @@
",HMadeSupID=" + HMadeSupID +
",HNowWHID=" + HNowWHID +
",HNowSPID=" + HNowSPID +
- ",HInitLife='" + HInitLife +
- "',HNextMainDate='" + HNextMainDate +
+ ",HInitLife='" + HInitLife + "'" +
+ ",HNextMainDate='" + HNextMainDate +
"',HMouldUseStatus='" + HMouldUseStatus +
- "' where HInterID=" + HInterID.ToString());
+ "' where HInterID=" + HInterID.ToString();
+
+ //涓昏〃
+ oCN.RunProc(sql);
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -4377,11 +4379,11 @@
if (!tb2.Columns.Contains("鐘舵��"))
error += "娌℃湁鎵惧埌銆愮姸鎬併�戠殑鏍囬,";
- if (!tb2.Columns.Contains("榛樿浠撳簱"))
- error += "娌℃湁鎵惧埌銆愰粯璁や粨搴撱�戠殑鏍囬,";
+ //if (!tb2.Columns.Contains("榛樿浠撳簱"))
+ // error += "娌℃湁鎵惧埌銆愰粯璁や粨搴撱�戠殑鏍囬,";
- if (!tb2.Columns.Contains("榛樿浠撲綅"))
- error += "娌℃湁鎵惧埌銆愰粯璁や粨浣嶃�戠殑鏍囬,";
+ //if (!tb2.Columns.Contains("榛樿浠撲綅"))
+ // error += "娌℃湁鎵惧埌銆愰粯璁や粨浣嶃�戠殑鏍囬,";
if (!tb2.Columns.Contains("鐗堟湰鍙�"))
error += "娌℃湁鎵惧埌銆愮増鏈彿銆戠殑鏍囬,";
@@ -4442,8 +4444,8 @@
HMaterName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["瀵瑰簲ERP鐗╂枡"].ToString());
HUnitName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["璁￠噺鍗曚綅"].ToString());
HDeptName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["浣跨敤閮ㄩ棬"].ToString());
- HWHName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["榛樿浠撳簱"].ToString());
- HSPName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["榛樿浠撲綅"].ToString());
+ HWHName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["榛樿浠撳簱"].ToString());
+ HSPName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["榛樿浠撲綅"].ToString());
HSupName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["渚涘簲鍟�"].ToString());
HSupNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["渚涘簲鍟嗕唬鐮�"].ToString());
HMadeSupName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鍒堕�犲晢"].ToString());
@@ -4534,67 +4536,83 @@
{
tb2.Rows[i]["HDeptID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
}
- //鏌ヨ浠撳簱
- ds = oCN.RunProcReturn("select * from Gy_Warehouse where HName='" + HWHName + "' and HUSEORGID=" + HORGid + "", "Gy_Warehouse");
+ if (HWHName != "")
+ {
+ //鏌ヨ浠撳簱
+ ds = oCN.RunProcReturn("select * from Gy_Warehouse where HName='" + HWHName + "' and HUSEORGID=" + HORGid + "", "Gy_Warehouse");
- if (ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,浠撳簱:" + HWHName + ",涓嶅瓨鍦紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- tb2.Rows[i]["HWHID"] = ds.Tables[0].Rows[0]["HSPGroupID"].ToString();
- }
- string HWHID = tb2.Rows[i]["HWHID"].ToString();
- //鏌ヨ浠撲綅
- ds = oCN.RunProcReturn("select * from Gy_StockPlace where HName='" + HSPName + "'and HSPGroupID=" + HWHID+ " and HUSEORGID=" + HORGid + "", "Gy_StockPlace");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,浠撳簱:" + HWHName + ",涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HWHID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+
+ string HWHID = tb2.Rows[i]["HWHID"].ToString();
+ if (HWHID != "")
+ {
+ //鏌ヨ浠撲綅
+ ds = oCN.RunProcReturn("select * from Gy_StockPlace where HName='" + HSPName + "'and HSPGroupID=" + HWHID + " and HUSEORGID=" + HORGid + "", "Gy_StockPlace");
- if (ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,浠撲綅:" + HSPName + ",涓嶅瓨鍦紒";
- objJsonResult.data = null;
- return objJsonResult;
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,浠撲綅:" + HSPName + ",涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HSPID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ }
+
}
- else
+ if(HSupName!="")
{
- tb2.Rows[i]["HSPID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ ds = oCN.RunProcReturn("select * from Gy_Supplier where HNumber='" + HSupNumber + "' and HUSEORGID=" + HORGid + "", "Gy_Supplier");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,渚涘簲鍟�:" + HSupName + ",涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HSupID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
}
//鏌ヨ渚涘簲鍟�
- ds = oCN.RunProcReturn("select * from Gy_Supplier where HNumber='" + HSupNumber + "' and HUSEORGID=" + HORGid + "", "Gy_Supplier");
+ if(HMadeSupName!="")
+ {
+ //鏌ヨ鍒堕�犲晢
+ ds = oCN.RunProcReturn("select * from Gy_Supplier where HName='" + HMadeSupName + "' and HUSEORGID=" + HORGid + "", "Gy_Supplier");
- if (ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,渚涘簲鍟�:" + HSupName + ",涓嶅瓨鍦紒";
- objJsonResult.data = null;
- return objJsonResult;
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,鍒堕�犲晢:" + HMadeSupName + ",涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HMadeSupID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
}
- else
- {
- tb2.Rows[i]["HSupID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
- }
- //鏌ヨ鍒堕�犲晢
- ds = oCN.RunProcReturn("select * from Gy_Supplier where HName='" + HMadeSupName + "' and HUSEORGID=" + HORGid + "", "Gy_Supplier");
-
- if (ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,鍒堕�犲晢:" + HMadeSupName + ",涓嶅瓨鍦紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- tb2.Rows[i]["HMadeSupID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
- }
+
+
//鍣ㄥ叿妗ｆ鍚嶇О
if (HMouldName == "")
@@ -4704,15 +4722,19 @@
long HUnitID = int.Parse(item["HUnitID"].ToString());
DateTime HOutComDate = DateTime.Now;
string HOutComNo = item["鍣ㄥ叿鍑哄巶缂栧彿"].ToString();
- long HDeptID = int.Parse(item["HDeptID"].ToString());
- long HSupID = int.Parse(item["HSupID"].ToString());
+ var HDeptID_temp = item["HDeptID"].ToString() == "" ? "0" : item["HDeptID"].ToString();
+ long HDeptID = int.Parse(HDeptID_temp);
+ var HSupID_temp = item["HSupID"].ToString() == "" ? "0" : item["HSupID"].ToString();
+ long HSupID = int.Parse(HSupID_temp);
string HMouldStatus = item["鐘舵��"].ToString();
- long HWHID = int.Parse(item["HWHID"].ToString());
+ var HWHID_TEMP = item["HWHID"].ToString() == "" ? "0" : item["HWHID"].ToString();
+ long HWHID = int.Parse(HWHID_TEMP);
long HRoutingID = 0;//宸ヨ壓璺嚎id
long HBOMID = 0;
string HVersion = "";//鐗堟湰
long HSPGroupID = 0;//榛樿浠撲綅缁�
- long HSPID = int.Parse(item["HSPID"].ToString());//浠撲綅id
+ var HSPID_temp = item["HSPID"].ToString() == "" ? "0" : item["HSPID"].ToString();
+ long HSPID = int.Parse(HSPID_temp);//浠撲綅id
Double HDesignLife = item["璁捐瀵垮懡"].ToString()=="" ? 0: double.Parse(item["璁捐瀵垮懡"].ToString());
Double HUseLife = item["浣跨敤瀵垮懡"].ToString() == "" ? 0 : double.Parse(item["浣跨敤瀵垮懡"].ToString());
Double HInitLife = 0;//涓婄嚎鍒濆鍖栧鍛�
@@ -4855,5 +4877,51 @@
#endregion
#endregion
+
+ //鏍规嵁鏉＄爜鎵剧墿鏂欎俊鎭�
+ [Route("Gy_Material/findMaterialByNumber")]
+ [HttpGet]
+ public object findMaterialByNumber(string HbarCode,string HSTOCKORGID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn($"select * from Gy_BarCodeBill where HBarCode='{HbarCode}' ", "Gy_Material");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒濆鍖栧け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ [Route("Gy_BarCodeBillList/GetBarCodeBillPermission")]
+ [HttpGet]
+ public object GetBarCodeBillPermission(string user)
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_BarCodeBillList_Print", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = 0;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ }
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
index be10d55..ce7ed88 100644
--- a/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_WarehouseController.cs
@@ -84,6 +84,65 @@
}
}
+ #region 杩斿洖浠撳簱鍒楄〃 鍒嗛〉
+ /// <summary>
+ /// 杩斿洖浠撳簱鍒楄〃 鍒嗛〉
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_Warehouse/listPage")]
+ [HttpGet]
+ public object listPage(string sWhere, string user, string Organization, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Warehouse", 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_Gy_WareHouse_ListPage {page}, {size}, ''", "h_p_Gy_WareHouse_ListPage");
+ }
+ else
+ {
+ sWhere = sWhere.Replace("'", "''");
+
+ ds = oCN.RunProcReturn($@"exec h_p_Gy_WareHouse_ListPage {page}, {size}, '{sWhere}'", "h_p_Gy_WareHouse_ListPage");
+ }
+
+
+ //娣诲姞鍒楀悕
+ 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 = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ 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
public class TreeModel
{
@@ -211,7 +270,126 @@
}
}
-
+ #region 杩斿洖浠撳簱鍒楄〃 鍒嗛〉
+ /// <summary>
+ /// 杩斿洖浠撳簱鍒楄〃 鍒嗛〉
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_StockPlace/list1Page")]
+ [HttpGet]
+ public object list1Page(string sWhere, string user, string Organization, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Warehouse", 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_StockPlaceListPage {page}, {size}, ''", "h_p_IF_StockPlaceListPage");
+ }
+ else
+ {
+ sWhere = sWhere.Replace("'", "''");
+
+ ds = oCN.RunProcReturn($@"exec h_p_IF_StockPlaceListPage {page}, {size}, '{sWhere}'", "h_p_IF_StockPlaceListPage");
+ }
+
+
+ //娣诲姞鍒楀悕
+ 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 = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ 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 杩斿洖浠撳簱鍒楄〃 鍒嗛〉 鍚� 缁勭粐绛涢��
+ /// <summary>
+ /// 杩斿洖浠撳簱鍒楄〃 鍒嗛〉
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_StockPlace/list2Page")]
+ [HttpGet]
+ public object list2Page(string sWhere, string user, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Warehouse", 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_StockPlaceListPage {page}, {size}, ''", "h_p_IF_StockPlaceListPage");
+ }
+ else
+ {
+ sWhere = sWhere.Replace("'", "''");
+
+ ds = oCN.RunProcReturn($@"exec h_p_IF_StockPlaceListPage {page}, {size}, '{sWhere}'", "h_p_IF_StockPlaceListPage");
+ }
+
+
+ //娣诲姞鍒楀悕
+ 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 = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ 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
+
/// <summary>
/// 杩斿洖浠撲綅鍒楄〃
diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
index efaf9ba..13a9690 100644
--- a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
@@ -1098,6 +1098,7 @@
//瀹℃牳鎻愪氦
if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Cg_POInStockBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛";
@@ -1178,6 +1179,233 @@
}
#endregion
+ #region 鏀舵枡閫氱煡鍗� 瀹℃牳/鍙嶅鏍� Swell瀹℃牳鏃跺弽鍐欓噾铦朵簯
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Cg_POInStockBill/AuditCg_POInStockBill_Swell")]
+ [HttpGet]
+ public object AuditCg_POInStockBill_Swell(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Cg_POInStockBill_Check";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //HInterID鏁版嵁鍒ゆ柇
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsCg_POInStockBill oBill = new DAL.ClsCg_POInStockBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
+ if (IsAudit == 0) //瀹℃牳鎻愪氦
+ {
+
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Cg_POInStockBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Cg_POInStockBill_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;
+ 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;
+ }
+ //==================================================================================
+
+
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+ //瀹℃牳鎻愪氦
+ bool result = oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Cg_POInStockBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if(result == true)
+ {
+ // 鍙嶅啓閲戣澏浜�
+ DataSet ds = oCN.RunProcReturn($@"exec h_p_auditPOInStockBill_K3 {oBill.omodel.HBillNo},{CurUserName}", "h_p_auditPOInStockBill_K3");
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() == "1")
+ {
+ DBUtility.ClsPub.sExeReturnInfo = ds.Tables[0].Rows[0]["HBackRemark"].ToString();
+ result = false;
+ }
+
+
+ }
+ if (result)
+ {
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ DataSet ds = oCN.RunProcReturn("Exec h_p_Cg_POInStockBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'", "h_p_Cg_POInStockBill_BeforeUnCheckCtrl");
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + "鍙嶅鏍稿墠鍒ゆ柇澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+
+ //杩涜 浼氳鏈熼棿 缁撹处 鐨勫垽鏂拰鎺у埗
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ DateTime HDate = DateTime.Now;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.Message = s;
+ return objJsonResult;
+ }
+
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Cg_POInStockBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
#region 鏀舵枡閫氱煡鍗� 鍏抽棴/鍙嶅叧闂姛鑳�
[Route("Cg_POInStockBill/CloseCg_POInStockBill")]
[HttpGet]
diff --git a/WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs b/WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs
new file mode 100644
index 0000000..1bf08df
--- /dev/null
+++ b/WebAPI/Controllers/CJGL/Cj_CheckBarcodeController.cs
@@ -0,0 +1,126 @@
+锘縰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;
+
+namespace WebAPI.Controllers.CJGL
+{
+ public class Cj_CheckBarcodeController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ DataSet ds;
+
+
+ #region 涓夌爜鍚堜竴锛屽垽鏂壂鎻忕墿鏂欐潯鐮佺粦瀹氫俊鎭槸鍚︿竴鑷�
+ [Route("CheckBarcodeController/Get_BarCode_BarcodeCheck")]
+ [HttpGet]
+ public object CheckBarcode(string HBarCode_Pallet, string HBarCode_Destination, string HBarCode_MiddleBox, string HBarCode_SN, int HBarCodeType,int HInterID, string HBillNo,string HMaker)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_Cj_CheckBarcodeBing '" + HBarCode_Pallet + "','" + HBarCode_Destination + "','" + HBarCode_MiddleBox + "','" + HBarCode_SN + "','" + HBarCodeType + "'," + HInterID + ",'" + HBillNo + "','" + HMaker + "'", "h_p_Cj_CheckBarcodeBing");
+ 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]["HBackRemark"]);
+ 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("CheckBarcodeController/Save_BarCode_BarcodeCheck")]
+ [HttpGet]
+ public object Save_BarCode_BarcodeCheck(Int64 HInterID, string HBillNo)
+ {
+ try
+ {
+ oCn.BeginTran();
+ DataSet ds = oCn.RunProcReturn("exec h_p_WMS_BarCodeBingCheckBill_Insert " + HInterID.ToString() + ",'" + HBillNo + "'", "h_p_WMS_BarCodeBingCheckBill_Insert");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ oCn.RollBack();
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 1)
+ {
+ oCn.RollBack();
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ oCn.Commit();
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + HBillNo + " 淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熸垚鍗曟嵁澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
index 05c1b76..1e76dd7 100644
--- a/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -2439,7 +2439,7 @@
#region 灏忓崼鍗曞搧杩囩珯鎺ュ彛
- #region 宸ュ簭鍗曞搧杩囩珯 鎵规鐮佹牎楠岃繑鍥炰俊鎭�(鍙敤浜庨獙璇佹壒娆℃槸鍚﹀叆搴�)
+ #region 宸ュ簭鍗曞搧杩囩珯 鎵潯鐮佺爜鏍￠獙杩斿洖淇℃伅(鍙敤浜庨獙璇佹壒娆℃槸鍚﹀叆搴�)
[Route("Cj_SingleStation/checkHBarCode_Batch")]
[HttpGet]
public object checkHBarCode_Batch(string HBarCode,string user, int HOrgID)
@@ -2538,7 +2538,7 @@
}
//鏉＄爜涓婇亾宸ュ簭鏄惁杩囩珯
- ds = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + barCode_SN + "'," + omodel.HProcID, "h_p_Sc_SNBarcodeProcCtrl_S");
+ ds = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_XW '" + barCode_SN + "'," + omodel.HProcID, "h_p_Sc_SNBarcodeProcCtrl_XW");
if (ClsPub.isInt(ds.Tables[0].Rows.Count) == 0)
{
objJsonResult.code = "0";
@@ -2547,7 +2547,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- else if (ds.Tables[0].Rows[0]["HBack"].ToString() == "2")
+ else if (ds.Tables[0].Rows[0]["HBack"].ToString() == "1")
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -2557,17 +2557,523 @@
}
//鍒ゆ柇鏉＄爜鏄惁宸茬粡鍑虹珯
- ds = oCN.RunProcReturn("select * from h_v_Gy_QualifiedRecordsList WITH(NOLOCK) where 浜у搧鏉＄爜='" + barCode_SN + "' and HProcExchInterID=" + omodel.HProcExchInterID + " and HProcExchEntryID=" + omodel.HProcExchEntryID + " and HProcID=" + omodel.HProcID, "h_v_Gy_QualifiedRecordsList");
+ //ds = oCN.RunProcReturn("select * from h_v_Gy_QualifiedRecordsList WITH(NOLOCK) where 浜у搧鏉＄爜='" + barCode_SN + "' and HProcExchInterID=" + omodel.HProcExchInterID + " and HProcExchEntryID=" + omodel.HProcExchEntryID + " and HProcID=" + omodel.HProcID, "h_v_Gy_QualifiedRecordsList");
- if (ds.Tables[0].Rows.Count > 0)
+ //if (ds.Tables[0].Rows.Count > 0)
+ //{
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "[0000-2-039]鏉＄爜:" + barCode_SN + ",宸插嚭绔�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ long HMainInterID = 0;
+ string BillType = "3791";
+ string HBillSubType = "3791";
+ long HInterID = omodel.HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HBillNo = omodel.HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ int HBillStatus = 1;
+ string HMaker = user;//鍒跺崟浜�
+ string HMouldNum = omodel.HMouldNum;//妯＄┐鍙�
+ int HYear = DateTime.Now.Year;
+ double HPeriod = DateTime.Now.Month;
+ string HRemark = omodel.HRemark;//澶囨敞
+ string HSourceName = omodel.HSourceName;//鐢熶骇璧勬簮鍚嶇О
+ double HPieceQty = omodel.HPieceQty;//杩涚珯PCS鏁�
+ double HWasterQty = 0;//鎶ュ簾鏁伴噺
+ double HPlanPieceQty = 0;//杩涚珯PNL鏁�
+ double HBadPNL = 0;//鎶ュ簾PNL鏁�
+ long HICMOInterID = omodel.HICMOInterID;//浠诲姟鍗旾D
+ long HICMOEntryID = omodel.HICMOEntryID;//浠诲姟鍗旾D
+ string HICMOBillNo = omodel.HICMOBillNo;//浠诲姟鍗�
+ int HProcPlanInterID = 0;
+ int HProcPlanEntryID = 0;
+ string HProcPlanBillNo = "";
+ long HProcExchInterID = omodel.HProcExchInterID;
+ long HProcExchEntryID = omodel.HProcExchEntryID;
+ string HProcExchBillNo = omodel.HProcExchBillNo;//娴佽浆鍗�
+ long HMaterID = omodel.HMaterID;//浜у搧ID
+ long HProcID = omodel.HProcID;//褰撳墠宸ュ簭ID
+ double HICMOQty = omodel.HICMOQty;//浠诲姟鍗曟暟閲�
+ double HPlanQty = omodel.HICMOQty;//绉讳氦PNL鏁�
+ DateTime HStationOutTime = DateTime.Now;//姹囨姤鏃堕棿
+ long HSourceID = omodel.HSourceID;//鐢熶骇璧勬簮ID
+ long HPayProcID = 0;//鏍哥畻宸ュ簭ID
+ long HGroupID = omodel.HGroupID;//鐝粍ID
+ long HDeptID = omodel.HDeptID;
+ long HEmpID = omodel.HEmpID;//鎿嶄綔鍛業D
+ long HEmpID2 = omodel.HEmpID2;////鎿嶄綔鍛�2ID
+ string HBarCode = barCode_SN;//鏉″舰鐮�
+ string HAddr = "";
+ string HBarCodeMaker = "";
+ long HSourceID2 = 0;//鐢熶骇璧勬簮2ID
+ long HSourceID3 = 0;//鐢熶骇璧勬簮3ID
+ long HSourceID4 = 0;//鐢熶骇璧勬簮4ID
+ long HSourceID5 = 0;//鐢熶骇璧勬簮5ID
+ long HSupID = 0;
+ double HQty = omodel.HQty;//鍚堟牸鏁伴噺
+ double HPrice = 0;
+ double HMoney = 0;
+ double HBadCount = omodel.HBadCount;//涓嶈壇鏁伴噺
+ long HCenterID = omodel.HCenterID;//宸ヤ綔涓績ID
+ string HProcNo = omodel.HProcNo;//娴佹按鍙�
+ string HOrderProcNO = omodel.HOrderProcNO;//璁㈠崟璺熻釜鍙�
+ string HSourceNameList = omodel.HSourceNameList;//璁惧娓呭崟
+ long HMainSourceInterID = omodel.HProcExchInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ string HMainSourceBillNo = omodel.HProcExchBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
+ string HMainSourceBillType = "3772";
+ bool HLastSubProc = omodel.HLastSubProc;//杞笅宸ュ簭
+ long HEmpID3 = 0;//鎿嶄綔鍛�3ID
+ long HEmpID4 = 0;//鎿嶄綔鍛�4ID
+ long HEmpID5 = 0;//鎿嶄綔鍛�5ID
+ double HDSQty = 0;//鎶樺集鍒�鏁�
+ double HChongQty = 0;//NCT鍐叉鏁�
+ double HPriceRate = 0;//绯绘暟
+ double HWorkTimes = 0;//宸ユ椂
+ long HQCCheckID = omodel.HEmpID;//妫�楠屽憳ID
+ long HPRDOrgID = omodel.HPRDOrgID;//缁勭粐ID
+ double HmaterOutqty = 0;//鐧藉澂鍙戝竷
+ double HProcPriceRate = 0;//宸ヤ环绯绘暟
+ int HTemporaryAreaID = 0;//鏆傛斁鍖�
+ int HShiftsID = 0;
+ string HBatchNo = omodel.HBatchNo;
+ double HWeight = omodel.HWeight;
+ //鑾峰彇褰撳墠鐝
+ //DataSet set = oCN.RunProcReturn("exec h_p_Gy_GetWorkShiftInfo " + HDeptID + "," + HCenterID, "h_p_Gy_GetWorkShiftInfo");
+ //if (set.Tables[0].Rows.Count > 0)
+ //{
+ // HShiftsID = int.Parse(set.Tables[0].Rows[0]["HInterID"].ToString());
+ //}
+ //鍒ゆ柇褰撳ぉ褰撳墠鐨勬祦杞崱鏄惁鏈夊嚭绔欏崟
+
+ HInterID = DBUtility.ClsPub.CreateBillID("3791", ref sExeReturnInfo);//閫掑叆type寰楀埌鐨勫崟鎹甀D
+ HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("3791", ref sExeReturnInfo, true);//閫掑叆type寰楀埌鐨勫崟鎹彿
+
+ //涓昏〃鎻掑叆
+ oCN.RunProc("Insert Into Sc_StationOutBillMain" +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate,HMouldNum" +
+ ",HYear,HPeriod,HRemark,HSourceName,HPieceQty,HWasterQty,HPlanPieceQty,HBadPNL" +
+ ",HICMOInterID,HICMOBillNo,HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HProcExchInterID,HProcExchEntryID" +
+ ",HProcExchBillNo,HMaterID,HProcID,HICMOQty,HPlanQty,HStationOutTime,HSourceID,HPayProcID" +
+ ",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate,HSourceID2,HSourceID3,HSourceID4,HSourceID5" +
+ ",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
+ ",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
+ ",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID,HPRDOrgID" +
+ ",HmaterOutqty,HProcPriceRate,HTemporaryAreaID,HShiftsID" +
+ ") " +
+ " values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
+ "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
+ "," + HICMOInterID + ",'" + HICMOBillNo + "'," + HProcPlanInterID + "," + HProcPlanEntryID + ",'" + HProcPlanBillNo + "'," + HProcExchInterID + "," + HProcExchEntryID +
+ ",'" + HProcExchBillNo + "'," + HMaterID + "," + HProcID + "," + HICMOQty + "," + HPlanQty + ",getdate()," + HSourceID + "," + HPayProcID +
+ "," + HGroupID + "," + HDeptID + "," + HEmpID + ",'" + HBarCode + "','" + HAddr + "','" + HBarCodeMaker + "',getdate()" + "," + HSourceID2 + "," + HSourceID3 + "," + HSourceID4 + "," + HSourceID5 +
+ "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HBadCount + "," + HCenterID + "," + HProcNo + ",'" + HOrderProcNO + "'" + ",'" + HSourceNameList + "'" +
+ "," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
+ "," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID +
+ "," + HmaterOutqty + "," + HProcPriceRate + "," + HTemporaryAreaID + "," + HShiftsID + ") ");
+
+
+ ds = oCN.RunProcReturn("select * from Sc_StationOutBillSub_SN WITH(NOLOCK) where HInterID='" + omodel.HInterID + "' order by HEntryID desc", "Sc_StationOutBillSub_SN");
+
+ oCN.RunProc($@"insert into Sc_StationOutBillSub_SN(HInterID,HBillNo_bak,HEntryID,HBarCode,HBarCodeQty,HMakeTime,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HBatchNo,HWeight)
+ values({HInterID}, '{HBillNo}', {(ds.Tables[0].Rows.Count == 0 ? 1 : int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1)}, '{barCode_SN}', 1, GETDATE(), '', " + HProcExchInterID + "," + HProcExchEntryID + ", '" + HProcExchBillNo + $"', '', 0, 0,'{HBatchNo}',{HWeight})");
+
+ //鎶婃潯鐮佸啓鍏ユ棩蹇楅噷闈�
+ LogService.CustomWriteLog("鏉＄爜:" + barCode_SN + ",宸ュ簭:" + HProcID + ",鍑虹珯鏃堕棿:" + DateTime.Now, "TM" + DateTime.Now.ToString("yyyy-MM-dd"));
+
+ //鍙嶅啓宸ュ簭鍑虹珯鍗曠殑鍚堟牸鏁伴噺
+ //oCN.RunProc("update Sc_StationOutBillMain set HQty+=1 where HProcExchInterID='" + HProcExchInterID + "' and HProcExchEntryID=" + HProcExchEntryID + " and HInterID=" + HInterID);
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCN.RunProcReturn("Exec h_p_Sc_SingleStationOutBill_AfterSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + $@"',{(ds.Tables[0].Rows.Count == 0 ? 1 : int.Parse(ds.Tables[0].Rows[0]["HEntryID"].ToString()) + 1)},'{barCode_SN}','{user}' ", "h_p_Sc_SingleStationOutBill_AfterSaveCtrl");
+ if (ds2 == null)
{
oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "[0000-2-039]鏉＄爜:" + barCode_SN + ",宸插嚭绔�!";
+ objJsonResult.Message = "[0000-2-016]淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-051]淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
objJsonResult.data = null;
return objJsonResult;
}
+ //============================
+
+ //ds = oCN.RunProcReturn($@"select (b.HQty -sum(isnull(ou.HQty,0))-sum(isnull(ou.HBadCount,0))) HQty from Sc_ProcessExchangeBillSub b WITH(NOLOCK)
+ // left join Sc_StationOutBillMain ou WITH(NOLOCK) on b.HInterID=ou.HProcExchInterID and b.HEntryID=ou.HProcExchEntryID
+ // where b.HInterID={HProcExchInterID} and b.HEntryID={HProcExchEntryID}
+ // group by b.HInterID,b.HEntryID,b.HQty", "Sc_ProcessExchangeBill_Out");
+
+ //if (double.Parse(ds.Tables[0].Rows[0][0].ToString()) < 0)
+ //{
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "[3791-2-028]鍑虹珯鏁伴噺瓒呰繃娴佽浆鍗℃暟閲�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-1-050]淇濆瓨鎴愬姛!";
+ objJsonResult.data = HInterID;//杩斿洖鍑虹珯姹囨姤鍗昳d
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-051]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杩斿洖鍘嗗彶鍑烘垬姹囨姤鍗曚俊鎭紙鍗冲巻鍙茶繃绔欐竻鍗曪級
+ [Route("Cj_SingleStation/SingleStationOutBillList")]
+ [HttpGet]
+ public object get_Display(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-068]鍑虹珯鍗曟棤鏌ヨ鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select Top 1000 * from h_v_Sc_SingleStationOutBillList where 1 = 1" + sWhere + "order by hmainid desc", "h_v_Sc_SingleStationOutBillList");
+ }
+ else
+ {
+ string sql1 = "select Top 1000 * from h_v_Sc_SingleStationOutBillList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_SingleStationOutBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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 = "[0000-1-037]Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ュ簭鍗曞搧杩囩珯 SN闀洉鐮佹煡璇㈠叧閿欢娓呭崟
+ [Route("Cj_SingleStation/HBardCodeBomList_XW")]
+ [HttpGet]
+ public object HBardCodeBomList_XW(string HBillNo,string HBarCode,int HProcID,int HOrgID, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-068]鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鎵�鎵潯鐮佹槸鍚﹀瓨鍦ㄦ潯鐮佹。妗堝綋涓�
+ ds = oCN.RunProcReturn(@"select 1 from Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇ユ潯鐮佷笉瀛樺湪锛�" + HBarCode;
+ objJsonResult.data = "";
+ return objJsonResult;
+
+ }
+
+ //鏉＄爜妗ｆ涓凡鏈夋湰娆℃壂鎻忕殑鏉＄爜锛屽尮閰嶇敤鏂欐竻鍗曪紙鎵爜鏁版嵁鍐欏叆涓存椂琛級
+ ds = oCN.RunProcReturn(@"exec h_p_Gy_BarCodeBillBomMatch_XW '" + HBillNo + "','" + HBarCode + "','" + HProcID + "'," + HOrgID, "h_p_Gy_BarCodeBillBomList_XW");
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ヨ鍒版暟鎹�";
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ュ簭鍗曞搧杩囩珯 鍏抽敭浠剁粦瀹氶厤浠朵俊鎭复鏃跺瓨鍌�
+ [Route("Cj_SingleStation/BarCodeBillBomMatch_XW")]
+ [HttpGet]
+ public object PartsBardCode_JX(string HBillNo,string HBarCode, string HBarCode_P, int HProcID, string user, int HOrgID)
+ {
+ try
+ {
+ //鍒ゆ柇鎵�鎵潯鐮佹槸鍚﹀瓨鍦ㄦ潯鐮佹。妗堝綋涓�
+ ds = oCN.RunProcReturn(@"select 1 from Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ //鏉＄爜妗ｆ涓病鏈夋湰娆℃壂鎻忕殑鏉＄爜锛屽垯鏍规嵁瑙勫垯瑙ｆ瀽鐢熸垚鏉＄爜
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇ユ潯鐮佷笉瀛樺湪锛�" + HBarCode;
+ objJsonResult.data = "";
+ return objJsonResult;
+
+ }
+
+ //鏉＄爜妗ｆ涓凡鏈夋湰娆℃壂鎻忕殑鏉＄爜锛屾煡璇㈤厤浠朵俊鎭紙鎵弿鏉＄爜淇℃伅鍐欏叆涓存椂琛級
+ ds = oCN.RunProcReturn(@"exec h_p_Gy_BarCodeBillBomBind_XW '" + HBillNo + "','" + HBarCode + "','" + HBarCode_P + "','" + HProcID + "','" + HOrgID + "'", "h_p_Gy_BarCodeBillBomBind_XW");
+
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "";
+ objJsonResult.data = "娌℃湁鏌ヨ鍒版暟鎹�";
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "ERROR锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ュ簭鍗曞搧杩囩珯 鎵玈N鐮佸嚭绔欎繚瀛�(淇濆瓨鍒板嚭绔欐眹鎶ラ噷(+鍏抽敭浠剁粦瀹�))
+ [Route("Cj_SingleStation/AddStationOutBillAndAssemblyBill")]
+ [HttpPost]
+ public object AddStationOutBillAndAssemblyBill([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg = _value.ToString();
+ string[] sArray = msg.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string sMainStr = sArray[0].ToString();//涓昏〃淇℃伅鍖呭惈宸ュ簭锛岀彮缁�,鎵规绛変俊鎭�
+ string barCode_SN = sArray[1].ToString();//鎵弿鐨凷N鐮侀暛闆曠爜浜у搧淇℃伅
+ string sSubStr = sArray[2].ToString();//瀛愯〃鍏抽敭浠朵俊鎭�
+ string user = sArray[3].ToString();
+
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-2-038]鏃犱繚瀛樻潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+ string sExeReturnInfo = "";
+
+ StationBill omodel = new StationBill();
+ omodel = JsonConvert.DeserializeObject<StationBill>(sMainStr);
+
+ List<Model.ClsSc_AssemblyBillSub> sub = new List<Model.ClsSc_AssemblyBillSub>();
+ sub = JsonConvert.DeserializeObject<List<Model.ClsSc_AssemblyBillSub>>(sSubStr);
+
+ //鍒ゆ柇鏄惁鏈夊搴旀祦杞崱淇℃伅骞惰幏鍙�
+ ds = oCN.RunProcReturn(@"exec h_p_Sc_ProcessExchangeBillList_XW '" + barCode_SN + "'," + omodel.HProcID, "h_p_Sc_ProcessExchangeBillList");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ //灏嗘祦杞崱淇℃伅鍐欏叆
+ omodel.HProcExchBillNo = ds.Tables[0].Rows[0]["HProcExchBillNo"].ToString();
+ omodel.HProcExchInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HProcExchInterID"].ToString());
+ omodel.HProcExchEntryID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HProcExchEntryID"].ToString());
+ omodel.HMaterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HMainMaterID"].ToString());
+ omodel.HCenterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HCenterID"].ToString());
+ omodel.HICMOBillNo = ds.Tables[0].Rows[0]["HICMOBillNo"].ToString();
+ omodel.HICMOInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HICMOInterID"].ToString());
+ omodel.HICMOEntryID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HICMOEntryID"].ToString());
+ omodel.HICMOQty = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HICMOQty"].ToString());
+ omodel.HProcNo = ds.Tables[0].Rows[0]["HProcNo"].ToString();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3791-2-019]]褰撳墠SN鐮佸拰宸ュ簭鏃犳硶鎵惧埌瀵瑰簲娴佽浆鍗¤妫�鏌ユ槸鍚﹁緭鍏ラ�夋嫨閿欒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鏉＄爜涓婇亾宸ュ簭鏄惁杩囩珯浠ュ強鏈亾鏉＄爜鏄惁宸茬粡鍑虹珯
+ ds = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_XW '" + barCode_SN + "'," + omodel.HProcID, "h_p_Sc_SNBarcodeProcCtrl_XW");
+ if (ClsPub.isInt(ds.Tables[0].Rows.Count) == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (ds.Tables[0].Rows[0]["HBack"].ToString() == "1")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-051]" + ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇鏉＄爜鏄惁宸茬粡鍑虹珯
+ //ds = oCN.RunProcReturn("select * from h_v_Gy_QualifiedRecordsList WITH(NOLOCK) where 浜у搧鏉＄爜='" + barCode_SN + "' and HProcExchInterID=" + omodel.HProcExchInterID + " and HProcExchEntryID=" + omodel.HProcExchEntryID + " and HProcID=" + omodel.HProcID, "h_v_Gy_QualifiedRecordsList");
+
+ //if (ds.Tables[0].Rows.Count > 0)
+ //{
+ // oCN.RollBack();
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "[0000-2-039]鏉＄爜:" + barCode_SN + ",宸插嚭绔�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ //澧炲姞浜х嚎缁勮杩芥函鍗�
+ DataSet ds1;
+ if (1==1)
+ {
+ ds1 = oCN.RunProcReturn("select * from Sc_AssemblyBillMain WITH(NOLOCK) where HMainSourceInterID =" + omodel.HProcExchInterID + " and HMainSourceEntryID =" + omodel.HProcExchEntryID + " and HBarCode_P = '" + barCode_SN + "'", "Sc_AssemblyBillMain");
+
+ if (ds1.Tables[0].Rows.Count == 0)
+ {
+ Int64 HInterID1 = DBUtility.ClsPub.CreateBillID("3727", ref DBUtility.ClsPub.sExeReturnInfo);
+ string HBillNo1 = DBUtility.ClsPub.CreateBillCode("3727", ref DBUtility.ClsPub.sExeReturnInfo, true);
+
+ //淇濆瓨鐢熶骇缁勮鍗曚富琛�
+ string sql = $@"Insert Into Sc_AssemblyBillMain(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate
+ ,HBillNo,HBillStatus,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo
+ ,HICMOInterID,HICMOBillNo,HBarCode_P,HMaterID,HUnitID,HAssemblyStatus,HProdOrgID)
+ values('{DateTime.Now.Year}','{DateTime.Now.Month}','3727','3727',{HInterID1},getdate()
+ ,'{HBillNo1}','1','{user}',getdate(),{omodel.HProcExchInterID.ToString()},{omodel.HProcExchEntryID.ToString()},'{omodel.HProcExchBillNo.ToString()}'
+ ,{omodel.HICMOInterID.ToString()},'{omodel.HICMOBillNo.ToString()}','{barCode_SN.ToString()}',{omodel.HMaterID},0,'姹囨姤',{omodel.HPRDOrgID})";
+ oCN.RunProc(sql);
+
+
+ for (int i = 0; i < sub.Count; i++)
+ {
+ //瀛愯〃瀛樺偍
+ string sq2 = $@"Insert Into Sc_AssemblyBillSub(HInterID,HBillNo_bak,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo
+ ,HSourceBillType,HMaterID,HSourceID,HEquipID,HUnitID,HQty
+ ,HGroupID,HWorkerID,HScanDate,HBarCode,HBarCode_P,HSNNumber)
+ values({HInterID1},'{HBillNo1}',{(i + 1)},0,0,''
+ ,'',{sub[i].HMaterID},0,0,0,1
+ ,0,0,getdate(),'{sub[i].HBarCode}','{barCode_SN}','') ";
+ oCN.RunProc(sq2);
+ }
+ }
+ else
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-2-039]鏉＄爜宸插瓨鍦ㄧ粦瀹氬崟:" + barCode_SN + "";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
long HMainInterID = 0;
string BillType = "3791";
@@ -2671,7 +3177,7 @@
"," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
"," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID +
"," + HmaterOutqty + "," + HProcPriceRate + "," + HTemporaryAreaID + "," + HShiftsID + ") ");
-
+
ds = oCN.RunProcReturn("select * from Sc_StationOutBillSub_SN WITH(NOLOCK) where HInterID='" + omodel.HInterID + "' order by HEntryID desc", "Sc_StationOutBillSub_SN");
@@ -2743,35 +3249,86 @@
}
#endregion
- #region 杩斿洖鍘嗗彶鍑烘垬姹囨姤鍗曚俊鎭紙鍗冲巻鍙茶繃绔欐竻鍗曪級
- [Route("Cj_SingleStation/SingleStationOutBillList")]
+ #region 宸ュ簭鍗曞搧杩囩珯 涓鐮佺敓鎴�
+ [Route("Cj_SingleStation/AddCaseCode")]
+ [HttpPost]
+ public object AddCaseCode([FromBody] JObject sMainSub)
+ {
+ try
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg = _value.ToString();
+ string[] sArray = msg.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string sMainStr = sArray[0].ToString();//涓昏〃淇℃伅SN鐮佹。妗坕d杩欑鏍煎紡
+ string user = sArray[1].ToString();
+
+ oCN.BeginTran();
+ ds = oCN.RunProcReturn("exec h_p_Gy_CaseCodeBySN '" + sMainStr + "'", "h_p_Sc_SNBarcodeProcCtrl_S");
+ if (ClsPub.isInt(ds.Tables[0].Rows.Count) == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-045]鏌ユ棤鏁版嵁!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (ds.Tables[0].Rows[0]["HBack"].ToString() == "2")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-051]" + ds.Tables[0].Rows[0]["HBackRemark"].ToString() + "锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-1-050]淇濆瓨鎴愬姛!";
+ objJsonResult.data = ds.Tables[0].Rows[0]["HBackRemark"].ToString();
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-051]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 杩囩珯瑙ｇ粦鍒楄〃 鏌ヨ
+ [Route("Cj_SingleStation/UnbindBarList")]
[HttpGet]
- public object get_Display(string sWhere, string user)
+ public object BarList(string sWhere, string user)
{
try
{
List<object> columnNameList = new List<object>();
-
- //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
- if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cj_SingleStation_UnbindBarList", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "[0000-1-068]鍑虹珯鍗曟棤鏌ヨ鏉冮檺!";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
-
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select Top 1000 * from h_v_Sc_SingleStationOutBillList where 1 = 1" + sWhere + "order by hmainid desc", "h_v_Sc_SingleStationOutBillList");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_UnbindStation_BarList order by 鏉＄爜鏃ユ湡 desc", "h_v_Sc_UnbindStation_BarList");
}
else
{
- string sql1 = "select Top 1000 * from h_v_Sc_SingleStationOutBillList where 1 = 1 ";
- string sql = sql1 + sWhere + " order by hmainid desc";
- ds = oCN.RunProcReturn(sql, "h_v_Sc_SingleStationOutBillList");
+ string sql1 = "select * from h_v_Sc_UnbindStation_BarList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鏉＄爜鏃ユ湡 desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_UnbindStation_BarList");
}
//娣诲姞鍒楀悕
@@ -2782,26 +3339,114 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
-
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "[0000-1-037]Sucess锛�";
- objJsonResult.list = columnNameList;
+ objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
return objJsonResult;
-
}
catch (Exception e)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "[0000-1-038]Exception锛�" + e.ToString();
+ objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
}
#endregion
+ #region 閲嶅伐鏉＄爜淇℃伅 鏌ヨ
+ [Route("Cj_SingleStation/UnbindBarInfo")]
+ [HttpGet]
+ public object UnbindBarInfo(string HBarCodeIDs, string user)
+ {
+ try
+ {
+ if (HBarCodeIDs == null || HBarCodeIDs.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閲嶅伐鏉＄爜淇℃伅鏈�掑叆锛岃閫�鍑洪噸璇�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string sql = "exec h_p_Sc_UnbindBarInfo '" + HBarCodeIDs + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_Sc_UnbindBarInfo");
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 瑙ｉ櫎鍖呰鍏崇郴銆佹媶闄ょ墿鏂�(1:瑙ｉ櫎鍖呰鍏崇郴锛�2.鎷嗛櫎鐗╂枡)
+ [Route("Cj_SingleStation/DelRelation")]
+ [HttpGet]
+ public object DelRelation(string HBarCodeIDs, Int64 HICMOInterID, Int64 HICMOEntryID, Int64 HProcID, Int64 HType, string user)
+ {
+ try
+ {
+ if (HBarCodeIDs == null || HBarCodeIDs.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎷嗛櫎鏉＄爜淇℃伅鏈�掑叆锛岃閫�鍑洪噸璇�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string sql = "exec h_p_Sc_DelbindBarRelation '" + HBarCodeIDs + "'," + HICMOInterID + "," + HICMOEntryID + "," + HProcID + "," + HType;
+ ds = oCN.RunProcReturn(sql, "h_p_Sc_DelbindBarRelation");
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() == "0")
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString();
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
#endregion
}
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 785ba0b..2560108 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -2761,6 +2761,143 @@
}
#endregion
+ #region 鏍规嵁id鍒犻櫎鍑虹珯鍗曞拰鍏抽敭浠舵竻鍗曡〃
+ [Route("Cj_StationOutBill/del_StationOutBillandAssemblyBill")]
+ [HttpGet]
+ public object del_StationOutBillandAssemblyBill(long HInterID, string HBarCode_P, string HDeleteMan, string HBillSubType)
+ {
+ try
+ {
+ string HComputerName = SystemInformation.ComputerName; //璁惧鍚嶇О
+ if (HBillSubType == "SUB")
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Sub_Drop", 1, false, HDeleteMan))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3791-1-001]瀹屽伐鍗曟棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Drop", 1, false, HDeleteMan))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3791-1-001]鍑虹珯鍗曟棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ DAL.ClsSc_StationOutBill oBill = new DAL.ClsSc_StationOutBill();
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn))
+ {
+ if (oSystemParameter.omodel.MES_StationOutBill_DeleteCtl == "Y")
+ {
+ if (oBill.omodel.HMaker != HDeleteMan && (HDeleteMan != "admin" && HDeleteMan != "Admin"))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-011]鍙兘鍒犻櫎鏈汉鐨勫崟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet ds;
+ //鍒ゆ柇鏄惁瀛樺湪 鐩稿悓鍗曟嵁鍙� 鐨勯鏂欏崟 鍒ゆ柇鐢熶骇璁㈠崟鏄惁宸茬粨妗堬紝瑕佹眰璁″垝鎵嬪伐鍙嶇粨妗�
+ ds = oCn.RunProcReturn("exec h_p_MES_StationOutBill_DelCtrl '" + oBill.omodel.HBillNo + "'", "h_p_MES_StationOutBill_DelCtrl");
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-2-018]鍒ゆ柇鍏宠仈澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows.Count > 0 && Pub_Class.ClsPub.isInt(ds.Tables[0].Rows[0][0]) == 2)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-007]" + Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-013]鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCn.RunProcReturn($"exec h_p_DelOutInBill {HInterID},'MES_StationOutBill_DeleteRelationCtl'", "h_p_DelOutInBill");
+
+ if (ds.Tables[0].Rows[0][0].ToString() == "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3791-1-002]绯荤粺鍙傛暟鎺у埗,宸叉湁涓嬮亾宸ュ簭,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCn.BeginTran();
+
+ ds = oCn.RunProcReturn($"select * from Sc_AssemblyBillMain where HMainSourceInterID={oBill.omodel.HProcExchInterID} and HMainSourceEntryID={oBill.omodel.HProcExchEntryID} and HBarCode_P='{HBarCode_P}'", "Sc_AssemblyBillMain");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ oCn.RunProc($"delete from Sc_AssemblyBillMain where HMainSourceInterID={oBill.omodel.HProcExchInterID} and HMainSourceEntryID={oBill.omodel.HProcExchEntryID} and HBarCode_P='{HBarCode_P}'");
+ oCn.RunProc($"delete from Sc_AssemblyBillSub where HInterID={ds.Tables[0].Rows[0]["HInterID"].ToString()} and HBarCode_P='{HBarCode_P}'");
+ }
+
+ oCn.RunProc("delete from Sc_StationOutBillSub_SN where HInterID=" + HInterID + " and HBarCode='" + HBarCode_P + "'");
+ oCn.RunProc($"delete from Sc_StationOutBillMain where HInterID={HInterID}");
+
+
+ oCn.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-1-008]鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-005]鍗曟嵁鏈壘鍒帮紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-007]寮傚父锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 缂栬緫鍓嶅垽鏂�
[Route("Cj_StationOutBill/set_ShowBillJudge")]
[HttpGet]
diff --git a/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs b/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
index 1e1093e..74339aa 100644
--- a/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
+++ b/WebAPI/Controllers/CJGL/Mes_OrderProcFlowAllReportController.cs
@@ -86,13 +86,17 @@
#region 杞﹂棿宸ュ簭鍏ㄧ▼璺熻釜鎶ヨ〃 鏌ヨ
[Route("Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList")]
[HttpGet]
- public object OrderProcFlowAllReportList(string sWhere)
+ public object OrderProcFlowAllReportList(string txtHOrderProcNo, string txtHMaterNumber, string check, string txtHDeptName, string sWhere)
{
try
{
//鍙嶅簭鍒楀寲浼犻�掔殑鍊�
+ if (sWhere != null)
+ {
+ sWhere = sWhere.Replace("'", "''");
+ }
- ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport " +sWhere+"", "h_p_Mes_OrderProcFlowAllReport");
+ ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport '" + txtHOrderProcNo +"','"+ txtHMaterNumber +"','"+ check +"','"+ txtHDeptName + "','"+sWhere+"'", "h_p_Mes_OrderProcFlowAllReport");
List<object> listCol = new List<object>();
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -123,13 +127,19 @@
#region 杞﹂棿宸ュ簭鍏ㄧ▼璺熻釜鎶ヨ〃 鏌ヨ
[Route("Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList_TK")]
[HttpGet]
- public object OrderProcFlowAllReportList_TK(string sWhere)
+ public object OrderProcFlowAllReportList_TK(string txtHOrderProcNo, string txtHMaterNumber, string check, string txtHDeptName, string sWhere)
{
try
{
//鍙嶅簭鍒楀寲浼犻�掔殑鍊�
+ if (sWhere != null)
+ {
+ sWhere = sWhere.Replace("'", "''");
+ }
- ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport_TK " + sWhere + "", "h_p_Mes_OrderProcFlowAllReport_TK");
+ ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport '" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "','" + txtHDeptName + "','" + sWhere + "'", "h_p_Mes_OrderProcFlowAllReport");
+
+ // ds = oCN.RunProcReturn($"exec h_p_Mes_OrderProcFlowAllReport_TK " + sWhere + "", "h_p_Mes_OrderProcFlowAllReport_TK");
List<object> listCol = new List<object>();
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git a/WebAPI/Controllers/MJGL/Gy_MaterialPackingRelationController.cs b/WebAPI/Controllers/MJGL/Gy_MaterialPackingRelationController.cs
new file mode 100644
index 0000000..6087989
--- /dev/null
+++ b/WebAPI/Controllers/MJGL/Gy_MaterialPackingRelationController.cs
@@ -0,0 +1,758 @@
+锘縰sing DBUtility;
+using Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Web;
+using System.Web.Http;
+using System.Windows.Forms;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.MJGL
+{
+ public class Gy_MaterialPackingRelationController : ApiController
+ {
+
+
+ //浜у搧鍣ㄥ叿娓呭崟 Sc_MouldinventoryBill Gy_MaterialMouldBillMain
+
+
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ public DAL.ClsGy_MaterialPackingRelation BillNew1 = new DAL.ClsGy_MaterialPackingRelation();
+ public DAL.ClsGy_MaterialPackingRelation BillOld1 = new DAL.ClsGy_MaterialPackingRelation();
+
+ #region 浜у搧鍖呰鍏宠仈淇℃伅鍒楄〃
+ [Route("Gy_MaterialPackingRelation/Gy_MaterialPackingRelationList")]
+ [HttpGet]
+ public object Gy_MaterialPackingRelationList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ ////缂栬緫鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_MaterialPackingRelation_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_Gy_MaterialPackingRelationList order by 鍗曟嵁鍙� desc", "h_v_Gy_MaterialPackingRelationList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Gy_MaterialPackingRelationList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterialPackingRelationList");
+ }
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 浜у搧鍖呰鍏宠仈淇℃伅 淇濆瓨/缂栬緫
+ /// <summary>
+ /// 淇濆瓨妯″叿缁翠慨鍗�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Gy_MaterialPackingRelation/SaveGy_MaterialPackingRelation")]
+ [HttpPost]
+ public object SaveGy_MaterialPackingRelation([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString(); //瀛愯〃
+ string refSav = sArray[2].ToString();//鎿嶄綔鏂瑰紡鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
+ string user = sArray[3].ToString();//鐢ㄦ埛鍚�
+
+ string UserName = "";
+ string s = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ ////淇濆瓨鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_MaterialPackingRelation_Edit", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ DAL.ClsGy_MaterialPackingRelation oBill = new DAL.ClsGy_MaterialPackingRelation();
+ List<Model.ClsGy_MaterialPackingRelationMain> lsmain = new List<Model.ClsGy_MaterialPackingRelationMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ msg2 = "[" + msg2 + "]";
+ lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MaterialPackingRelationMain>>(msg2);
+ foreach (Model.ClsGy_MaterialPackingRelationMain oItem in lsmain)
+ {
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew1.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld1.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (BillOld1.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld1.omodel.HChecker != "" && BillOld1.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld1, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3339";
+ oBill.omodel = oItem;
+ }
+
+ // 琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ msg3 = "[" + msg3 + "]";
+ List<Model.ClsGy_MaterialPackingRelationSub> ls = new List<Model.ClsGy_MaterialPackingRelationSub>();
+ ls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MaterialPackingRelationSub>>(msg3);
+
+ int i = 0;
+ foreach (Model.ClsGy_MaterialPackingRelationSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+ oBill.DetailColl.Add(oItemSub);
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (refSav == "Add")
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else if (refSav == "Update")
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = false;
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 浜у搧鍖呰鍏宠仈淇℃伅缂栬緫鏃惰幏鍙栬〃浣撴暟鎹�
+ [Route("Gy_MaterialPackingRelation/Gy_MaterialPackingRelationEditList")]
+ [HttpGet]
+ public object Gy_MaterialPackingRelationEditList(string HInterID, string User)
+ {
+ try
+ {
+ //鏌ョ湅鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_MaterialPackingRelation_Edit", 1, false, User))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ if (HInterID == null || HInterID.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_MaterialPackingRelationList_Edit where HInterID = " + HInterID, "h_v_Gy_MaterialPackingRelationList_Edit");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 浜у搧鍖呰鍏宠仈淇℃伅鍒犻櫎鍔熻兘
+ [Route("Gy_MaterialPackingRelation/DeleteGy_MaterialPackingRelation")]
+ [HttpGet]
+ public object DeleteGy_MaterialPackingRelation(string HInterID, string user)
+ {
+ try
+ {
+ //鏌ョ湅鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log("Gy_MaterialPackingRelation_Drop", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ if (HInterID == null || HInterID.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+ oCN.RunProc("delete from Gy_MaterialPackingRelationMain where HInterID = " + HInterID);
+ oCN.RunProc("delete from Gy_MaterialPackingRelationSub where HInterID = " + HInterID);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 浜у搧鍖呰鍏宠仈淇℃伅 瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_MaterialPackingRelation/AuditGy_MaterialPackingRelation")]
+ [HttpGet]
+ public object AuditGy_MaterialPackingRelation(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Gy_MaterialPackingRelation_Check";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ ////瀹℃牳鏉冮檺
+ //if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+ //HInterID鏁版嵁鍒ゆ柇
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsGy_MaterialPackingRelation oBill = new DAL.ClsGy_MaterialPackingRelation(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
+ if (IsAudit == 0) //瀹℃牳鎻愪氦
+ {
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(oBill.omodel.HInterID, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛锛�" ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 浜у搧鍖呰鍏宠仈淇℃伅 鍏抽棴/鍙嶅叧闂�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">鍏抽棴(0),鍙嶅叧闂�(1)</param>
+ /// <param name="CurUserName">鍏抽棴浜�</param>
+ /// <returns></returns>
+ [Route("Gy_MaterialPackingRelation/CloseGy_MaterialPackingRelation")]
+ [HttpGet]
+ public object CloseGy_MaterialPackingRelation(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Gy_MaterialPackingRelation_Close";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ ////妫�鏌ユ潈闄�
+ //if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鍏抽棴澶辫触锛佹棤鏉冮檺锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //HInterID鏁版嵁鍒ゆ柇
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsGy_MaterialPackingRelation oBill = new DAL.ClsGy_MaterialPackingRelation(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //鍏抽棴鍒ゆ柇
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅叧闂垽鏂�
+ {
+ if (oBill.omodel.HCloseMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸弽鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //杩涜闇�瑕佽繘琛岀殑鍏抽棴/鍙嶅叧闂搷浣�
+ if (IsAudit == 0) //鍏抽棴鎻愪氦
+ {
+ //鍏抽棴鎻愪氦
+ if (oBill.CloseBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅叧闂彁浜�
+ {
+ //鍙嶅叧闂彁浜�
+ if (oBill.CancelClose(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触鎴栬�呭弽鍏抽棴澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 浜у搧鍖呰鍏宠仈淇℃伅 浣滃簾/鍙嶄綔搴�
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">浣滃簾(0),鍙嶄綔搴�(1)</param>
+ /// <param name="CurUserName">浣滃簾浜�</param>
+ /// <returns></returns>
+ [Route("Gy_MaterialPackingRelation/DeleteGy_MaterialPackingRelation")]
+ [HttpGet]
+ public object DeleteGy_MaterialPackingRelation(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Gy_MaterialPackingRelation_Delete";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ ////妫�鏌ユ潈闄�
+ //if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "浣滃簾澶辫触锛佹棤鏉冮檺锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //HInterID鏁版嵁鍒ゆ柇
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsGy_MaterialPackingRelation oBill = new DAL.ClsGy_MaterialPackingRelation(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+
+ //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HBillStatus.ToString() == "6")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍦ㄥ鏍镐腑!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //浣滃簾鍒ゆ柇
+ {
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶄綔搴燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶄綔搴熷垽鏂�
+ {
+ if (oBill.omodel.HDeleteMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸弽浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //杩涜闇�瑕佽繘琛岀殑浣滃簾/鍙嶄綔搴熸搷浣�
+ if (IsAudit == 0) //浣滃簾鎻愪氦
+ {
+ //浣滃簾鎻愪氦
+ if (oBill.Cancelltion(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅叧闂彁浜�
+ {
+ //鍙嶅叧闂彁浜�
+ if (oBill.AbandonCancelltion(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶄綔搴熸垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触鎴栬�呭弽浣滃簾澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockRequestBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockRequestBillController.cs
new file mode 100644
index 0000000..cf9543e
--- /dev/null
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockRequestBillController.cs
@@ -0,0 +1,792 @@
+锘縰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 System.Windows.Forms;
+using SyntacticSugar.constant;
+namespace WebAPI.Controllers
+{
+
+ public class Sc_MouldMoveStockRequestBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public const string ModName = "3850"; //鍗曟嵁绫诲瀷
+ public const string ModCaption = "鍣ㄥ叿璋冩嫧鐢宠鍗�"; //鍗曟嵁鍚嶇О
+ public const string ModRightName = "Sc_MouldMoveStockRequestBill";
+ public const string ModRightNameList = ModRightName + "List"; //鍒楄〃
+ public const string ModRightNameEdit = ModRightName + "_Edit"; //缂栬緫
+ public const string ModRightNameCheck = ModRightName + "_Check"; //瀹℃牳
+ public const string ModRightNameClose = ModRightName + "_Close"; //鍏抽棴
+ public const string ModRightNameDelete = ModRightName + "_Delete"; //浣滃簾
+ public const string ModRightNameDrop = ModRightName + "_Drop"; //鍒犻櫎
+ public DataSet ds = new DataSet();
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ public DAL.ClsSc_MouldMoveStockRequestBill oBill = new DAL.ClsSc_MouldMoveStockRequestBill();
+
+
+ #region 鍣ㄥ叿璋冩嫧鐢宠鍗曞垎椤靛垪琛�
+ [Route("Sc_MouldMoveStockRequestBillController/page")]
+ [HttpGet]
+ public json Sc_MouldMoveStockRequestBillPage(string sWhere, string user, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameList, 3, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCn.RunProcReturn("exec h_p_Sc_MouldMoveStockRequestBillList " + page + "," + size + ",''", "h_p_Sc_MouldMoveStockRequestBillList");
+ }
+ else
+ {
+ ds = oCn.RunProcReturn("exec h_p_Sc_MouldMoveStockRequestBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_Sc_MouldMoveStockRequestBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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 = CodeConstant.SUCCEED;
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏌ヨ鍒楄〃淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿璋冩嫧鐢宠鍗� 鍒犻櫎
+ /// <summary>
+ /// 鍒犻櫎鍣ㄥ叿璋冩嫧鐢宠鍗�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Delete_Json")]
+ [HttpGet]
+ public object GetSc_MouldMoveStockRequestBill_Delete_Json(Int64 HInterID, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDrop, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍒犻櫎鍔熻兘鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //鍒犻櫎鍓嶆帶鍒�
+ DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Sc_MouldMoveStockRequestBill_BeforeDelCtrl " + HInterID.ToString() + ",'" + HMaker + "'", "h_p_Sc_MouldMoveStockRequestBill_BeforeDelCtrl");
+ if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //鍒犻櫎鍗曟嵁锛堝寘鍚垹闄ゅ悗鎺у埗銆佸啓鍏ユ棩蹇楋級
+ if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Sc_MouldMoveStockRequestBill_AfterDelCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鍣ㄥ叿璋冩嫧鐢宠鍗曟垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ櫒鍏疯皟鎷ㄧ敵璇峰崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鍣ㄥ叿璋冩嫧鐢宠鍗曞け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿璋冩嫧鐢宠鍗� 瀹℃牳/鍙嶅鏍�
+ /// <summary>
+ /// 瀹℃牳/鍙嶅鏍稿櫒鍏疯皟鎷ㄧ敵璇峰崟
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">瀹℃牳(1),鍙嶅鏍�(2)</param>
+ /// <param name="HMaker">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Check_Json")]
+ [HttpGet]
+ public object GetSc_MouldMoveStockRequestBill_Check_Json(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡瀹℃牳/鍙嶅鏍稿姛鑳芥潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍革紝涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂紝涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴燂紝涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //瀹℃牳鍓嶆帶鍒�
+ DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Sc_MouldMoveStockRequestBill_BeforeCheckCtrl " + HInterID.ToString() + ",'" + HMaker + "'", "h_p_Sc_MouldMoveStockRequestBill_BeforeCheckCtrl");
+ if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //瀹℃牳鍗曟嵁
+ if (!oBill.CheckBill(HInterID, oBill.omodel.HBillNo, "h_p_Sc_MouldMoveStockRequestBill_AfterCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 瀹℃牳鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍革紝涓嶉渶瑕佸弽瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅鏍稿墠鎺у埗
+ DataSet BeforeDs = oCn.RunProcReturn("Exec h_p_Sc_MouldMoveStockRequestBill_BeforeUnCheckCtrl " + HInterID.ToString() + ",'" + HMaker + "'", "h_p_Sc_MouldMoveStockRequestBill_BeforeUnCheckCtrl");
+ if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿墠鍒ゆ柇澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐ワ紒" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //鍙嶅鏍稿崟鎹�
+ if (!oBill.AbandonCheck(HInterID, oBill.omodel.HBillNo, "h_p_Sc_MouldMoveStockRequestBill_AfterUnCheckCtrl", HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶅鏍告垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ櫒鍏疯皟鎷ㄧ敵璇峰崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳鍣ㄥ叿璋冩嫧鐢宠鍗曞け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿璋冩嫧鐢宠鍗� 鎵归噺瀹℃牳
+ /// <summary>
+ /// 鎵归噺瀹℃牳/鍙嶅鏍稿櫒鍏疯皟鎷ㄧ敵璇峰崟
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">瀹℃牳(1),鍙嶅鏍�(2)</param>
+ /// <param name="HMaker">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldMoveStockRequestBillController/CheckAll")]
+ [HttpGet]
+ public object CheckAll(string ids, int Type, string HMaker)
+ {
+ try
+ {
+ //澶勭悊瀛楃涓�
+ if (!string.IsNullOrEmpty(ids))
+ {
+ long[] idArray = Array.ConvertAll(ids.Split(','), long.Parse);
+ // 澶勭悊idArray...
+ oCn.BeginTran();
+ for (int i = 0; i < idArray.Length; i++)
+ {
+ objJsonResult = (json)GetSc_MouldMoveStockRequestBill_Check_Json(idArray[i], Type, HMaker);//瀹℃牳鎵ц
+ if (objJsonResult.count == 0)
+ {
+ oCn.RollBack();
+ objJsonResult.Message += "绗�" + (i + 1) + "琛屽嚭鐜伴棶棰樻棤娉曠户缁畬鎴�";
+ return objJsonResult;
+ }
+ }
+ oCn.Commit();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨姝ｇ‘琛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳鍣ㄥ叿璋冩嫧鐢宠鍗曞け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿璋冩嫧鐢宠鍗� 鍏抽棴/鍙嶅叧闂�
+ /// <summary>
+ /// 鍏抽棴/鍙嶅叧闂櫒鍏疯皟鎷ㄧ敵璇峰崟
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">鍏抽棴(1),鍙嶅叧闂�(2)</param>
+ /// <param name="HMaker">鍏抽棴浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Close_Json")]
+ [HttpGet]
+ public object GetSc_MouldMoveStockRequestBill_Close_Json(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameClose, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鍏抽棴/鍙嶅叧闂姛鑳芥潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂紝涓嶈兘鍐嶆鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍏抽棴鍗曟嵁
+ if (!oBill.CloseBill(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍏抽棴鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HCloseMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂紝涓嶉渶瑕佸弽鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅叧闂崟鎹�
+ if (!oBill.CancelClose(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶅叧闂垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ櫒鍏疯皟鎷ㄧ敵璇峰崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴鎴栧弽鍏抽棴鍣ㄥ叿璋冩嫧鐢宠鍗曞け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿璋冩嫧鐢宠鍗� 浣滃簾/鍙嶄綔搴�
+ /// <summary>
+ /// 浣滃簾/鍙嶄綔搴� 鍣ㄥ叿璋冩嫧鐢宠鍗�
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="Type">浣滃簾(1),鍙嶄綔搴�(2)</param>
+ /// <param name="HMaker">浣滃簾浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Cancelltion_Json")]
+ [HttpGet]
+ public object GetSc_MouldMoveStockRequestBill_Cancelltion_Json(Int64 HInterID, int Type, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡浣滃簾/鍙嶄綔搴熷姛鑳芥潈闄�,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒ゆ柇瀛樺湪鎬�
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ //Type 1 浣滃簾 2 鍙嶄綔搴�
+ if (Type == 1)
+ {
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴燂紝涓嶈兘鍐嶆浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //浣滃簾鍗曟嵁
+ if (!oBill.Cancelltion(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 浣滃簾鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ else
+ {
+ if (oBill.omodel.HDeleteMan.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴燂紝涓嶉渶瑕佸弽浣滃簾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶄綔搴熷崟鎹�
+ if (!oBill.AbandonCancelltion(HInterID, oBill.omodel.HBillNo, HMaker, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁鍙凤細" + oBill.omodel.HBillNo + " 鍙嶄綔搴熸垚鍔燂紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ櫒鍏疯皟鎷ㄧ敵璇峰崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浣滃簾鎴栧弽浣滃簾鍣ㄥ叿璋冩嫧鐢宠鍗曞け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿璋冩嫧鐢宠鍗曟ā鍧� 浠庡垪琛ㄩ�変腑鎵撳紑鍗曟嵁锛岃繑鍥炲崟鎹俊鎭椂璋冪敤
+ /// <summary>
+ /// 鍣ㄥ叿璋冩嫧鐢宠鍗曠紪杈戞椂锛屾牴鎹崟鎹甀D鑾峰彇鍗曟嵁淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Json")]
+ [HttpGet]
+ public object GetSc_MouldMoveStockRequestBill_Json(Int64 HInterID, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡缂栬緫鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //杩斿洖鍒楄〃淇℃伅
+ ds = oCn.RunProcReturn("exec h_p_Sc_MouldMoveStockRequestBill_EditInit " + HInterID, "h_p_Sc_MouldMoveStockRequestBill_EditInit");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ櫒鍏疯皟鎷ㄧ敵璇峰崟锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖鍣ㄥ叿璋冩嫧鐢宠鍗曚俊鎭け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿璋冩嫧鐢宠鍗� 淇濆瓨
+ /// <summary>
+ /// 鍣ㄥ叿璋冩嫧鐢宠鍗曚繚瀛�
+ /// </summary>
+ [Route("Sc_MouldMoveStockRequestBillController/GetSc_MouldMoveStockRequestBill_Save_Json")]
+ [HttpPost]
+ public object GetSc_MouldMoveStockRequestBill_Save_Json([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string sMainStr = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string sSubStr = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ string OperationType = sArray[2].ToString(); //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
+ string HMaker = sArray[3].ToString(); //鍒跺崟浜�
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (OperationType == "1")
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ //鍒ゆ柇鏂板鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightName, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏂板鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify;
+ //鍒ゆ柇缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡缂栬緫鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //琛ㄥご璧嬪��
+ sMainStr = sMainStr.Replace("\\", "");
+ sMainStr = sMainStr.Replace("\n", "");
+ sMainStr = "[" + sMainStr.ToString() + "]";
+ List<Model.ClsSc_MouldMoveStockRequestBillMain> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMoveStockRequestBillMain>>(sMainStr);
+ foreach (Model.ClsSc_MouldMoveStockRequestBillMain oItem in lsmain)
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (oBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, oItem.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod_Pay(oItem.HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oItem.HYear = sYear;
+ oItem.HPeriod = sPeriod;
+ DBUtility.ClsPub.CurUserName = oItem.HMaker;
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋璧嬪��
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ sSubStr = sSubStr.Substring(1, sSubStr.Length - 2);
+ sSubStr = sSubStr.Replace("\\", "");
+ sSubStr = sSubStr.Replace("\n", "");
+ sSubStr = "[" + sSubStr.ToString() + "]";
+ List<Model.ClsSc_MouldMoveStockRequestBillSub> ls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMoveStockRequestBillSub>>(sSubStr);
+ int i = 0;
+ foreach (Model.ClsSc_MouldMoveStockRequestBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+ oBill.DetailColl.Add(oItemSub);
+ }
+
+ //淇濆瓨
+ bool bResult;
+ if (OperationType == "1") //鏂板淇濆瓨
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else //缂栬緫淇濆瓨
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/MateOutController.cs b/WebAPI/Controllers/MateOutController.cs
index 9c2b315..cfbae7f 100644
--- a/WebAPI/Controllers/MateOutController.cs
+++ b/WebAPI/Controllers/MateOutController.cs
@@ -1212,6 +1212,98 @@
}
}
+ #region 杞﹂棿瀹氫綅 杞﹂棿鏌ヨ鏉＄爜鏄惁瀛樺湪
+ [Route("KF_ICInventory_WorkShop/SearchHBarCode")]
+ [HttpGet]
+ public object checkHBarCode_Batch(string HBarCode, string user, int HOrgID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn(@"select * from h_v_Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBarCode + "'", "h_v_Gy_BarCodeBill");
+
+ //鍒ゆ柇鏉＄爜鏄惁瀛樺湪鏉＄爜妗ｆ
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-1-037]鏍￠獙鎴愬姛";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛佸綋鍓嶆壒娆＄爜鏃犲叆搴撲俊鎭妫�鏌ユ槸鍚︽壂閿�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 杞﹂棿瀹氫綅 鍒犻櫎鏉＄爜搴撳瓨璁板綍
+ [Route("KF_ICInventory_WorkShop/ClearHBarCode")]
+ [HttpGet]
+ public object ClearHBarCode(string HBarCode, long HWHID, long HSPID, string user, int HOrgID)
+ {
+ try
+ {
+
+ //淇濆瓨鍚庢帶鍒�=========================================
+ ds = oCN.RunProcReturn($"exec h_p_KF_MaterialUpper_Clear '{HBarCode}','{HWHID}',{HSPID},'{user}',{HOrgID}", "h_p_KF_ICInventory_Clear");
+
+ //鍐欏叆鏃ュ織
+ ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛岀墿鏂欎唬鐮侊細" + HBarCode + ",浠撲綅id锛�" + HSPID, user);
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-1-010]娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
//杞﹂棿瀹氫綅 杞﹂棿涓婁笅鏋舵椂闂存煡璇�
[Route("Kf_WorkShopICStockBill/List")]
[HttpGet]
@@ -1222,6 +1314,10 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
List<object> columnNameList = new List<object>();
+ if(sWhere!=null)
+ {
+ sWhere = sWhere.Replace("'", "''");
+ }
DataSet ds = oCN.RunProcReturn("exec h_p_KF_WorkShopICStockBillList '" + HBillType + "','" + HCarBarCode + "','" + HProcExBillNo + "','" + HMaterNumber + "'," + HWHID + "," + HSPID + ",'" + sWhere + "'", "h_p_KF_WorkShopICStockBillList");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
diff --git a/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
index 1056f78..e5089bb 100644
--- a/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
+++ b/WebAPI/Controllers/SCGL/QC_LastPieceCheckBillController.cs
@@ -1069,6 +1069,81 @@
}
#endregion
+ #region 鐢熶骇鍏ュ簱妫�楠屽崟鏍规嵁婧愬崟鑾峰彇淇￠�氳繃鍗曟嵁鍙锋淮鍏�-婧愬崟涓虹敓浜ф眹鎶ュ崟(3711)
+ /// <summary>
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("QC_LastPieceCheckBill/get_ICMOReportBill_Tmp_getByBillNo")]
+ [HttpGet]
+ public object get_ICMOReportBill_Tmp_getByBillNo(string HBillNo, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ if ( HBillNo.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙傛暟涓嶅叏锛岃幏鍙栨簮鍗曚俊鎭け璐ワ紒HInterID锛�" + HBillNo +"";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sReturn = "";
+ string sql = "";
+ if (oSystemParameter.ShowBill(ref sReturn))
+ {
+ switch (oSystemParameter.omodel.QC_LastPieceCheckBill_QCSchemeSource)
+ {
+ case "鐗╂枡":
+ sql = "exec h_p_QC_GetInfoByICMOReportBill_getByBillNo " + "'鐗╂枡'" + ",'" + HBillNo + "'" ;
+ break;
+ }
+
+ }
+
+ ds = oCN.RunProcReturn(sql, "h_p_QC_GetInfoByICMOReportBill_getByBillNo");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃煡璇㈠埌鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ //娣诲姞鍒楀悕
+ 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 = "杩斿洖璁板綍鎴愬姛锛�";
+ 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 [宸插簾寮僝
#region[缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index cf1e209..5ead2e8 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -3586,6 +3586,36 @@
}
#endregion
+ #region 鐢熶骇鏃ヨ鍒掑钩鍙� 鐩戝惉鍗曞厓鏍兼暟鎹慨鏀规煇涓�澶╃殑鎺掍骇鏁伴噺
+ [Route("JIT_DayPlanPlatFormBill/UpdateDayPlanQty")]
+ [HttpGet]
+ public object UpdateDayPlanQty(int HWorkBillSortInterID, string HMasterDate, string HQty, string HSumWorkQty)
+ {
+ try
+ {
+ string sql = $"exec h_p_JIT_UpdateDayPlanQty {HWorkBillSortInterID},'{HMasterDate}','{HQty}','{HSumWorkQty}'";
+
+ //鏇存柊鎴栨柊澧炶鍗曟煇涓�澶╃殑鎺掍骇鏁伴噺
+ oCN.RunProc(sql);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎺掍骇鏁伴噺淇敼鎴愬姛锛�";
+ objJsonResult.data = "";
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎺掍骇鏁伴噺淇敼澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 鐢熶骇鏃ヨ鍒掑钩鍙� 鏍规嵁杞﹂棿娣诲姞鏈帓浜х敓浜ц鍗曪紙浜ゆ湡鍥炲鎶撳彇锛�
[Route("JIT_DayPlanPlatFormBill/JIT_ICMOBillListByDept_Reply")]
[HttpGet]
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index e48fc84..088a0ce 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -1191,6 +1191,8 @@
objJsonResult.data = null;
return objJsonResult;
}
+ sWhere = sWhere.Replace("'", "''");
+
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("exec h_p_Xs_SeOrderBillList_Query " + page + "," + size + ",'" + Organization + "'," + "'',1", "h_p_Xs_SeOrderBillList_Query");
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs
index 6af0fa2..3149f28 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs
@@ -92,6 +92,61 @@
}
#endregion
+ #region 杩斿洖閫�璐ч�氱煡鍗曞垪琛�-鍒嗛〉
+ [Route("Xs_SeOutStockBackBill/list_byPage")]
+ [HttpGet]
+ public object list_byPag(string sWhere, string user, string Organization, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOutStockBackBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_IF_SeOutStockBackBillListPage " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_IF_SeOutStockBackBillListPage");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_IF_SeOutStockBackBillListPage " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_IF_SeOutStockBackBillListPage");
+ }
+
+ //娣诲姞鍒楀悕
+ 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 = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 鍒犻櫎鍔熻兘
/// <summary>
///鍒犻櫎鍔熻兘
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/KF_BarCodeStatusChangeBillController.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/KF_BarCodeStatusChangeBillController.cs"
index cb02911..6e75168 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/KF_BarCodeStatusChangeBillController.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/KF_BarCodeStatusChangeBillController.cs"
@@ -202,12 +202,11 @@
oCN.RunProc("update KF_BarCodeStatusChangeBillMain set " +
"HRemark='" + HRemark + "', HChecker='" + HMaker + "', HCheckDate=getdate()" + ",HBillStatus=" + HBillStatus +
",HEmpID=" + HEmpID + ",HDeptID=" + HDeptID + " where HInterID=" + HInterID);
-
//鍒犻櫎瀛愯〃
oCN.RunProc("delete from KF_BarCodeStatusChangeBillSub where HInterID='" + HInterID + "'");
}
//淇濆瓨瀛愯〃
- objJsonResult = AddBillSub(msg3, HInterID, OperationType);
+ objJsonResult = AddBillSub(msg3, HInterID, OperationType, HMaker);
if (objJsonResult.code == "0")
{
@@ -234,7 +233,7 @@
}
}
- public json AddBillSub(string msg3, long HInterID, int OperationType)
+ public json AddBillSub(string msg3, long HInterID, int OperationType,string user)
{
List<ClsKF_BarCodeStatusChangeBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsKF_BarCodeStatusChangeBillSub>>(msg3);
@@ -259,6 +258,8 @@
,HRelationMoney,HBarCode,HBarCodeStatus_Old,HBarCodeStatus_New,HAuxPropID_Old,HAuxPropID_New,HMTONo_Old,HMTONo_New)
values({HInterID},{NewHEntryID},'{oSub.HBillNo_bak}','{oSub.HRemark}',{oSub.HSourceInterID}
,{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HRelationQty},{oSub.HRelationMoney},'{oSub.HBarCode}','{oSub.HBarCodeStatus_Old}','{oSub.HBarCodeStatus_New}','{oSub.HAuxPropID_Old}','{oSub.HAuxPropID_New}','{oSub.HMTONo_Old}','{oSub.HMTONo_New}')");
+ oCN.RunProc("update Gy_BarCodeBill set " +
+ "HBarCodeStatus='" + oSub.HBarCodeStatus_New + "', HStatusMan='" + user + "'," + " HStatusDate=getdate()" + " where HBarCode='" + oSub.HBarCode+"'");
}
objJsonResult.code = "1";
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 10103a7..01cff2b 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"
@@ -2807,6 +2807,351 @@
}
#endregion
+
+ #region [鏉＄爜鐢熸垚鎺ュ彛_灏忓崼鎵樻潯鐮乚
+ [Route("Sc_BarCode/Sub_SaveBill_xiaowei")]
+ [HttpPost]
+ public object Sub_SaveBill_xiaowei([FromBody] JObject msg)
+ {
+ try
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string HOrgType = sArray[1].ToString();//缁勭粐鍚嶇О
+ string HSourceBillTypeName = "鐢熶骇璁㈠崟";//婧愬崟绫诲瀷
+ string HSelectBarCodeType = "鎵樼洏鏉＄爜";
+ string CampanyName = "灏忓崼";
+ string UserName = sArray[2].ToString();//鐢ㄦ埛
+ ClsPub.CurUserName = UserName;
+
+ //鑾峰彇鍐呯爜
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+ HOrgNumber = "";
+ if (oClsGy_ORGANIZATIONS_View.GetInfoByName(HOrgType))
+ {
+ HOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID;
+ HOrgNumber = DBUtility.ClsPub.isStrNull(oClsGy_ORGANIZATIONS_View.omodel.HNumber);
+ }
+ if (HOrgID == -1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-2-055]閫夋嫨缁勭粐鏈夐敊璇�!";
+ return objJsonResult;
+ }
+ //if (!Sub_AllowSave(msg2, HSelectBarCodeType))//鍗曟嵁瀹屾暣鎬у垽鏂�
+ //{
+ // return objJsonResult;
+ //}
+ if (HSelectBarCodeType == "浠櫒鎴愬搧鏉＄爜瑙勫垯")
+ {
+ //瀹㈡埛瀹氬埗
+ }
+ else
+ {
+ //鐢熸垚鏉＄爜
+ SaveBarCode_xiaowei(msg2, HSelectBarCodeType, CampanyName, HSourceBillTypeName);
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3899-2-006]鏉＄爜鐢熸垚澶辫触!" + e.Message;
+ return objJsonResult;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region[鏉＄爜鐢熸垚鏂规硶_xiaowei]
+ private object SaveBarCode_xiaowei(string msg2, string HSelectBarCodeType, string CampanyName, string HSourceBillTypeName)
+ {
+ DateTime sDate = DateTime.Now; //鏃ユ湡
+ string HSourceBillType_Temp = ""; //婧愬崟绫诲瀷
+ int n = 0; //鍚屾壒鐢熸垚鐨勬潯鐮佺储寮�
+
+ //鑾峰彇鏄庣粏淇℃伅
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ HSouceOrderList ordrlist = Newtonsoft.Json.JsonConvert.DeserializeObject<HSouceOrderList>(msg2);
+
+ // List<HSouceOrderList> ordrlist = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HSouceOrderList>>(msg2);
+ List<HBarCodeList> ListRows = new List<HBarCodeList>();
+
+ DataSet Ds;
+ for (int i = 0; i < 1; i++)
+ {
+ HSourceBillType_Temp = ordrlist.HBillType;
+
+ if (ClsPub.isLong(ordrlist.HMaterID) != 0)
+ {
+ if (HSelectBarCodeType == "鎵樼洏鏉＄爜")
+ {
+ //鎷嗗垎姣忔潯鐗╂枡璁板綍涓哄鏉℃潯鐮佽褰�
+ double HSumQty = ClsPub.isDoule(ordrlist.HQty); //浜у搧鏁伴噺
+ double HQty = ClsPub.isDoule(ordrlist.HQty); //鏁伴噺
+ double HMinQty = ClsPub.isDoule(ordrlist.HMinQty); //鏈�灏忓寘瑁呮暟
+ int HBQty = ClsPub.isInt(ordrlist.HBQty); //绠辨暟
+ string WeiShu = ""; //灏炬暟
+
+ for (int j = 0; j < HBQty; j++)
+ {
+ string HBarCode_Temp = ""; //鏉＄爜
+ string sTMNumber = ""; //鏉＄爜鍓嶇紑
+ string LSH = ""; //鏈�澶ф祦姘村彿
+ int HLen = 6; //娴佹按鍙烽暱搴�
+
+ //鏉＄爜鎷兼帴鎵�闇�瀛楁
+ string HMaterialName = DBUtility.ClsPub.isStrNull(ordrlist.HMaterName);
+ string HSupNumber = DBUtility.ClsPub.isStrNull(ordrlist.HSupNumber).Replace(".", ""); //渚涘簲鍟嗕唬鐮侊紙鍘绘帀鍒嗛殧绗︼級
+ int lastDigit = int.Parse(DateTime.Today.Year.ToString().Last().ToString());
+ char productionMonth = DateTime.Today.Month <= 9
+ ? (char)(DateTime.Today.Month + '0')
+ : (char)('A' + DateTime.Today.Month - 10);
+ if (HMaterialName.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐗╂枡涓嶈兘涓虹┖锛屼笉鑳界敓鎴愭潯鐮侊紒";
+ return objJsonResult;
+ }
+ //todo
+ //鏉＄爜鍓嶇紑 = p+鍟嗗搧SKU+鐢熶骇骞翠唤+鐢熶骇鏈堜唤+6浣嶆祦姘村彿+鐢熶骇宸ュ巶浠ｇ爜
+ sTMNumber = "P" + HMaterialName + lastDigit+ productionMonth;
+
+ //鏍规嵁鏉＄爜鍓嶇紑鑾峰彇鏈�澶ф祦姘村彿
+ Ds = oCN.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");
+ LSH = String.Format("{0:D" + HLen + "}", ClsPub.isInt(Ds.Tables[0].Rows[0][0]) + 1);
+
+ //鎷兼帴鏉＄爜
+ HBarCode_Temp = sTMNumber + LSH+"XXX";
+
+
+ if (HSumQty - HMinQty > 0)
+ {
+ WeiShu = "";
+ HSumQty = HSumQty - HMinQty;
+ }
+ else
+ {
+ if (HSumQty == HMinQty)
+ {
+ WeiShu = "";
+ }
+ else
+ {
+ WeiShu = "灏炬暟";
+ }
+ HMinQty = HSumQty;
+ }
+
+ HBarCodeList barcode = new HBarCodeList();
+ barcode.HBarCode2 = HBarCode_Temp;
+ barcode.HBarCodeType2 = "鎵樼洏鏉＄爜";
+ barcode.HBarCodeSubType2 = "鎵樻潯鐮�";
+ barcode.HEntryID2 = ClsPub.isStrNull(i + 1);
+ barcode.HMaterID2 = ordrlist.HMaterID;
+ barcode.HMaterNumber2 = ordrlist.HMaterNumber;
+ barcode.HMaterName2 = ordrlist.HMaterName;
+ barcode.HMaterModel2 = ordrlist.HMaterModel;
+ barcode.HPinfan2 = ordrlist.HPinfan;
+ barcode.HPinfanBarCode2 = ordrlist.HPinfanBarCode;
+ barcode.HAuxPropID2 = ordrlist.HAuxPropID;
+ barcode.HAuxPropNumber2 = ordrlist.HAuxPropNumber;
+ barcode.HAuxPropName2 = ordrlist.HAuxPropName;
+ barcode.HUnitID2 = ordrlist.HUnitID;
+ barcode.HUnitNumber2 = ordrlist.HUnitNumber;
+ barcode.HUnitName2 = ordrlist.HUnitName;
+ barcode.HQty2 = ClsPub.isStrNull(HMinQty);
+ barcode.HBatchNo2 = ordrlist.HBatchNo;
+ barcode.HSourceInterID2 = ordrlist.HMainID;
+ barcode.HSourceEntryID2 = ordrlist.HSubID;
+ barcode.HSourceBillNo2 = ordrlist.HBillNo;
+ barcode.HSourceBillType2 = ordrlist.HBillType;
+ barcode.HPrint = "0";
+ barcode.HWei = WeiShu;
+ barcode.HBarcodeNo = ClsPub.isStrNull(n + 1);
+ barcode.HBarcodeQtys = ordrlist.HBQty;
+ barcode.HSupID2 = ordrlist.HSupID;
+ barcode.HSupNumber2 = ordrlist.HSupNumber;
+ barcode.HSupName2 = ordrlist.HSupName;
+ barcode.HDeptID2 = ordrlist.HDeptID;
+ barcode.HDeptNumber2 = ordrlist.HDeptNumber;
+ barcode.HDeptName2 = ordrlist.HDeptName;
+ barcode.HRemark2 = ordrlist.HRemark;
+ barcode.HDate2 = ordrlist.HDate;
+ barcode.HShowDate2 = ordrlist.HShowDate;
+ barcode.HWhID2 = ordrlist.HWhID;
+ barcode.HWhNumber2 = ordrlist.HWhNumber;
+ barcode.HWhName2 = ordrlist.HWhName;
+ barcode.HSPID2 = ordrlist.HSPID;
+ barcode.HSPNumber2 = ordrlist.HSPNumber;
+ barcode.HSPName2 = ordrlist.HSPName;
+ barcode.HMTONo2 = ordrlist.HMTONo;
+ barcode.HCusID2 = ordrlist.HCusID;
+ barcode.HCusNumber2 = ordrlist.HCusNumber;
+ barcode.HCusName2 = ordrlist.HCusName;
+ barcode.HCusType2 = ordrlist.HCusType;
+ barcode.HSourceID2 = ordrlist.HSourceID;
+ barcode.HSourceNumber2 = ordrlist.HSourceNumber;
+ barcode.HSourceName2 = ordrlist.HSourceName;
+ barcode.HEndDate2 = ordrlist.HEndDate;
+ barcode.HSeOrderBillNo2 = ordrlist.HSeOrderBillNo;
+ barcode.HInnerBillNo2 = ordrlist.HInnerBillNo;
+ barcode.HMaker2 = ordrlist.HMaker;
+ barcode.HGiveAwayFlag2 = ordrlist.HGiveAwayFlag;
+ barcode.HCoilNO = ordrlist.HCoilNO;
+ barcode.HFurnaceNO = ordrlist.HFurnaceNO;
+ barcode.HFactory = ordrlist.HFactory;
+ barcode.HAuxQty = ordrlist.HAuxQty;
+ barcode.HheatNO = ordrlist.HheatNO;
+ barcode.HGroupID2 = ordrlist.HGroupID;
+ barcode.HEmpID2 = ordrlist.HEmpID;
+ barcode.HCusModel2 = ordrlist.HCusModel;
+ barcode.HCusMaterName2 = ordrlist.HCusMaterName;
+ barcode.HCheckEmpName2 = ordrlist.HCheckEmpName;
+ barcode.HZZRQ = ordrlist.HZZRQ;
+ ListRows.Add(barcode);
+
+ n += 1; //鏇存柊鍚屾壒鐢熸垚鐨勬潯鐮佹暟
+ oCN.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'"); //鏇存柊鏈�澶ф祦姘村彿
+ }
+ }
+
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閿欒鐨勬潯鐮佺被鍨嬶紝涓嶈兘鐢熸垚鏉＄爜锛�";
+ return objJsonResult;
+ }
+ }
+ }
+
+
+ try
+ {
+ oCN.BeginTran();
+ for (int i = 0; i < ListRows.Count; i++)
+ {
+ if (ClsPub.isLong(ListRows[i].HMaterID2) != 0)
+ {
+ string HBarCode = ClsPub.isStrNull(ListRows[i].HBarCode2);
+ string HBarCodeType = ClsPub.isStrNull(ListRows[i].HBarCodeType2);
+ string HBarCodeSubType = ClsPub.isStrNull(ListRows[i].HBarCodeSubType2);
+ Int64 HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
+ Int64 HEntryID = ClsPub.isLong(ListRows[i].HEntryID2);
+ Int64 HAuxPropID = ClsPub.isLong(ListRows[i].HAuxPropID2);
+ Int64 HUnitID = ClsPub.isLong(ListRows[i].HUnitID2);
+ double HQty2 = ClsPub.isDoule(ListRows[i].HQty2);
+ string HWei = ClsPub.isStrNull(ListRows[i].HWei);
+ string HBatchNo2 = ClsPub.isStrNull(ListRows[i].HBatchNo2);
+ Int64 HSourceInterID = ClsPub.isLong(ListRows[i].HSourceInterID2);
+ Int64 HSourceEntryID = ClsPub.isLong(ListRows[i].HSourceEntryID2);
+ string HSourceBillNo = ClsPub.isStrNull(ListRows[i].HSourceBillNo2);
+ string HSourceBillType = ClsPub.isStrNull(ListRows[i].HSourceBillType2);
+ Int64 HBarcodeQtys = ClsPub.isLong(ListRows[i].HBarcodeQtys);
+ Int64 HBarcodeNo = ClsPub.isLong(ListRows[i].HBarcodeNo);
+ Int64 HSupID = ClsPub.isLong(ListRows[i].HSupID2);
+ Int64 HDeptID = ClsPub.isLong(ListRows[i].HDeptID2);
+ Int64 HWhID = ClsPub.isLong(ListRows[i].HWhID2);
+ Int64 HSPID = ClsPub.isLong(ListRows[i].HSPID2);
+ string HRemark = ClsPub.isStrNull(ListRows[i].HRemark2);
+ string HMaterName = ClsPub.isStrNull(ListRows[i].HMaterName2);
+ string HMaterModel = ClsPub.isStrNull(ListRows[i].HMaterModel2);
+ string HPinfan = ClsPub.isStrNull(ListRows[i].HPinfan2);
+ string HMTONo = ClsPub.isStrNull(ListRows[i].HMTONo2);
+ Int64 HCusID = ClsPub.isLong(ListRows[i].HCusID2);
+ string HCusType = ClsPub.isStrNull(ListRows[i].HCusType2);
+ DateTime HEndDate = ClsPub.isDate(ListRows[i].HEndDate2);
+ string HWorkLineName = ClsPub.isStrNull(ListRows[i].HSourceName2);
+ string HSeOrderBillNo = ClsPub.isStrNull(ListRows[i].HSeOrderBillNo2);
+ string HInnerBillNo = ClsPub.isStrNull(ListRows[i].HInnerBillNo2);
+ bool HGiveAwayFlag = ClsPub.isBool(ListRows[i].HGiveAwayFlag2);
+ int HPrintQty = ClsPub.isInt(ListRows[i].HPrint);
+
+ string HCoilNO2 = ClsPub.isStrNull(ListRows[i].HCoilNO);
+ string HFurnaceNO2 = ClsPub.isStrNull(ListRows[i].HFurnaceNO);
+ string HFactory2 = ClsPub.isStrNull(ListRows[i].HFactory);
+ Int64 HAuxQty2 = ClsPub.isLong(ListRows[i].HAuxQty);
+ string HheatNO2 = ClsPub.isStrNull(ListRows[i].HheatNO);
+ DateTime HProduceDate = ClsPub.isDate(ListRows[i].HProduceDate);
+ DateTime HExpiryDate = ClsPub.isDate(ListRows[i].HExpiryDate);
+ int HGroupID2 = ClsPub.isInt(ListRows[i].HGroupID2);
+ Int64 HEmpID2 = ClsPub.isLong(ListRows[i].HEmpID2);
+ string HCusModel2 = ClsPub.isStrNull(ListRows[i].HCusModel2);
+ string HCusMaterName2 = ClsPub.isStrNull(ListRows[i].HCusMaterName2);
+ string HCheckEmpName2 = ClsPub.isStrNull(ListRows[i].HCheckEmpName2);
+ string HZZRQ = ClsPub.isStrNull(ListRows[i].HZZRQ);
+ oCN.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HBarCodeSubType,HMaterID,HUnitID,HQty" +
+ ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
+ ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
+ ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
+ ",HGiveAwayFlag " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
+ ",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName,HZZRQ " +
+ ") values ("
+ + "'" + HBarCode + "','" + HBarCodeType + "','" + HBarCodeSubType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
+ + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID2.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
+ + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
+ + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+ + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
+ + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
+ + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "'"
+ + ",'" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "','" + HZZRQ + "'" + ")");
+
+ }
+ }
+ //澧炲姞 鏉＄爜瓒呰繃鏈敓鎴愬姛鑳芥帶鍒�
+
+ //
+ //鑷姩瑁呯
+ string sql_autoForBoxBill = "exec h_v_Gy_BarCode_AutoProductBarCodeBox " + HInterID.ToString();
+ oCN.RunProc(sql_autoForBoxBill);
+
+ oCN.Commit();
+ List<Object> listobj = ListRows.ConvertAll(s => (object)s);//List瀹炰綋绫昏浆鎹负object
+ //鑾峰彇鐢熸垚鐨勬潯鐮佷俊鎭�
+ string sql = string.Format(@"select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID");
+ ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_IF_ICMOBillList_Table");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "[0000-1-037]鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //搴忓垪鍖朌ataSet涓殑鏃堕棿鏍煎紡锛岀劧鍚庡啀鍙嶅簭鍒楀寲鍥炴潵
+ objJsonResult.list = listobj;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[0000-2-020]娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ objJsonResult.list = listobj;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "[3899-2-006]鏉＄爜鐢熸垚澶辫触锛�" + e.Message;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#endregion
}
}
\ No newline at end of file
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 841c551..7f58cfc 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"
@@ -326,7 +326,7 @@
}
}
- oCN.RunProc("update QC_ProcessCheckBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() where HInterID=" + HInterID);
+ oCN.RunProc("update QC_ProcessCheckBillMain set HBillStatus=2,HChecker='" + CurUserName + "',HCheckDate=getdate() where HInterID=" + HInterID);
//瀹℃牳鍚庢帶鍒�
DataSet EndDs = oCN.RunProcReturn("Exec h_p_QC_ProcessCheckBill_AfterCheckCtrl " + HInterID.ToString() + ",'" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','" + CurUserName + "'", "h_p_QC_ProcessCheckBill_AfterCheckCtrl");
@@ -380,7 +380,7 @@
}
}
- oCN.RunProc("update QC_ProcessCheckBillMain set HChecker='',HCheckDate=null where HInterID=" + HInterID);
+ oCN.RunProc("update QC_ProcessCheckBillMain set HBillStatus=1,HChecker='',HCheckDate=null where HInterID=" + HInterID);
//鍙嶅鏍稿悗鎺у埗
DataSet EndDs = oCN.RunProcReturn("Exec h_p_QC_ProcessCheckBill_AfterUnCheckCtrl " + HInterID.ToString() + ",'" + ds.Tables[0].Rows[0]["HBillNo"].ToString() + "','" + CurUserName + "'", " h_p_QC_ProcessCheckBill_AfterUnCheckCtrl");
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 d2f8d7c..fdaed74 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"
@@ -202,7 +202,7 @@
List<object> columnNameList = new List<object>();
string sql1 = "select * from h_v_QC_FirstPieceCheckBill_Edit where 1 = 1 ";
- string sql = sql1 + sWhere + " order by hmainid desc";
+ string sql = sql1 + sWhere + " order by hmainid desc,hsubid asc";
ds = oCN.RunProcReturn(sql, "h_v_QC_FirstPieceCheckBill_Edit");
//娣诲姞鍒楀悕
@@ -326,6 +326,7 @@
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 = mainList[0].HRemarkSN;
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++)
@@ -372,6 +373,13 @@
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.HQualityStdID = DBUtility.ClsPub.isLong(subList[i].HQualityStdID);//
+ oSub.HInspectMethodID = DBUtility.ClsPub.isLong(subList[i].HInspectMethodID);//
+ oSub.HInspectBasisID = DBUtility.ClsPub.isLong(subList[i].HInspectBasisID);//
+ oSub.HCompareSymbol = DBUtility.ClsPub.isStrNull(subList[i].HCompareSymbol);//
+
+
BillNew.DetailColl.Add(oSub);
}
else
@@ -1654,7 +1662,62 @@
}
#endregion
+<<<<<<< HEAD
+=======
+ #region 宸℃妫�楠屽崟鏍规嵁婧愬崟绫诲瀷鑾峰彇淇℃伅-婧愬崟涓虹敓浜ц鍗�
+ [Route("QC_PatrolProcCheckBill/get_ICMOBill")]
+ [HttpGet]
+ public object get_ICMOBill_PatrolProcCheck(string HICMOInterID, string HICMOEntryID, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sReturn = "";
+ string sql = "";
+ if (oSystemParameter.ShowBill(ref sReturn))
+ {
+ switch (oSystemParameter.omodel.QC_PatrolProcCheckBill_QCSchemeSource)
+ {
+ case "鐗╂枡":
+ sql = "exec h_p_QC_PatrolProcCheck_GetICMOBillList " + "'鐗╂枡','" + HICMOInterID + "','" + HICMOEntryID + "'";
+ break;
+ case "宸ヨ壓璺嚎":
+ sql = "exec h_p_QC_PatrolProcCheck_GetICMOBillList " + "'宸ヨ壓璺嚎','" + HICMOInterID + "','" + HICMOEntryID + "'";
+ break;
+ }
+
+ }
+
+ ds = oCN.RunProcReturn(sql, "h_p_QC_PatrolProcCheck_GetICMOBillList");
+
+ //娣诲姞鍒楀悕
+ 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 = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+>>>>>>> b67a44dcc2871d3e4866be1fe63da74b7912deaf
}
}
\ No newline at end of file
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_MultipleCode_ReportController.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_MultipleCode_ReportController.cs"
new file mode 100644
index 0000000..006b54a
--- /dev/null
+++ "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_MultipleCode_ReportController.cs"
@@ -0,0 +1,81 @@
+锘縰sing System;
+using System.Collections.Generic;
+using 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.Http;
+using WebAPI.DLL;
+using WebAPI.Models;
+using WebAPI.Service;
+using Kingdee.BOS.WebApi.Client;
+using System.Linq;
+
+namespace WebAPI.Controllers.鍩虹璧勬枡.鍩虹璧勬枡
+{
+
+
+ public class Gy_MultipleCode_ReportController : ApiController
+ {
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ [Route("Gy_MultipleCode_ReportController/getList")]
+ [HttpGet]
+ public object getList(string sWhere, string HBeginDate, string HEndDate)
+ {
+ List<object> columnNameList = new List<object>();
+ try
+ {
+ // 楠岃瘉鏃ユ湡
+ if (!DateTime.TryParse(HBeginDate, out DateTime beginDate) || !DateTime.TryParse(HEndDate, out DateTime endDate))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃ユ湡鏍煎紡涓嶆纭�";
+ return objJsonResult;
+
+ }
+ if(sWhere!=null)
+ ds = oCN.RunProcReturn($"select * from h_v_Gy_MultipleCodes_onOne where 鏃ユ湡<='{HEndDate}' and 鏃ユ湡>='{HBeginDate}' {sWhere}", "h_v_Gy_MultipleCodes_onOne");
+ else
+ ds = oCN.RunProcReturn($"select * from h_v_Gy_MultipleCodes_onOne where 鏃ユ湡<='{HEndDate}' and 鏃ユ湡>='{HBeginDate}'", "h_v_Gy_MultipleCodes_onOne");
+ // 娣诲姞鍒楀悕
+ 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 = "1";
+ objJsonResult.count = ds.Tables[0].Rows.Count;
+ objJsonResult.Message = "Success锛�";
+ 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;
+ }
+
+
+ }
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs" "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
index 0a6bfe8..de12a8f 100644
--- "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
+++ "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
@@ -3336,14 +3336,30 @@
HDeptID = ds.Tables[0].Rows[0]["HDeptID"].ToString();
}
oItem.HDeptID = int.Parse(HDeptID);
- ds = oCN.RunProcReturn("select * from Gy_Group with(nolock) where HName='" + oItem.HGroupName + "'", "Gy_Group");
+ //鐝粍涓烘彁浜や汉鐨勭彮缁�
+ //ds = oCN.RunProcReturn("select * from Gy_Group with(nolock) where HName='" + oItem.HGroupName + "'", "Gy_Group");
+ //string HGroupID = "0";
+ //if (ds.Tables[0].Rows.Count > 0)
+ //{
+ // HGroupID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ //}
+ //oItem.HGroupID = int.Parse(HGroupID);
+ string input = getProcessInstanceResponse.Body.Result.Title;
+ int index = input.IndexOf("鎻愪氦");
+ string HGroupEmpName = "";
+ if (index > 0)
+ {
+ HGroupEmpName = input.Substring(0, index).Trim();//鎴彇鎻愪氦浜哄悕绉板嵆鐝粍闀垮悕绉�
+ }
+ ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock) where HName='" + HGroupEmpName + "'", "Gy_Employee");
string HGroupID = "0";
if (ds.Tables[0].Rows.Count > 0)
{
- HGroupID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ HGroupID = ds.Tables[0].Rows[0]["HGroupID"].ToString();
}
oItem.HGroupID = int.Parse(HGroupID);
-
+
+
//鍙嶅簭鍒楀寲鏄庣粏鍐呭
string tableFieldValue = getProcessInstanceResponse.Body.Result.FormComponentValues[11].Value;
List<Row> rows = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Row>>(tableFieldValue);
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 100555b..34e16f8 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"
@@ -2166,50 +2166,73 @@
[HttpGet]
public object set_DeleteICStockBillAndWMS_Json(Int64 HInterID, string HBillNo, string HBillType, string HMaker, string MvarReportTitle)
{
- try
+ //鑾峰彇绯荤粺鍙傛暟
+ string sErrMsg = "";
+ if (oSystemParameter.ShowBill(ref sErrMsg) == true)
{
- string WorkList = "鎾ら攢宸蹭笂浼犲崟鎹紝鍗曟嵁鍙凤細" + HBillNo;
- string SystemName = "WMS-" + MvarReportTitle + "妯″潡";
- oCn.BeginTran();
- ds = oCn.RunProcReturn("exec h_p_WMS_ICStockBillAndWMS_Delete " + HInterID + ",'" + HBillNo + "','" + HBillType + "'", "h_p_WMS_ICStockBillAndWMS_Delete");
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+ //鎾ら攢鍓嶅垽鏂噾铦朵簯涓崟鎹槸鍚﹀瓨鍦�
+ if (!GetBillQuery_WMS(HInterID, HBillNo, HBillType, HMaker, oSystemParameter.omodel.WMS_CloudMode, oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode, 2, ref sErrMsg))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ try
+ {
+ oCn.BeginTran();
+ ds = oCn.RunProcReturn("exec h_p_WMS_ICStockBillAndWMS_Delete " + HInterID + ",'" + HBillNo + "','" + HBillType + "'", "h_p_WMS_ICStockBillAndWMS_Delete");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ oCn.RollBack();
+ 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)
+ {
+ oCn.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0; //澶辫触锛�
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ string WorkList = "鎾ら攢宸蹭笂浼犲崟鎹紝鍗曟嵁鍙凤細" + HBillNo;
+ string SystemName = "WMS-" + MvarReportTitle + "妯″潡";
+ //鍐欏叆鏃ュ織
+ oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
+ "(getdate(),'" + HMaker + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','','鎾ら攢')"
+ );
+ oCn.Commit();
+ objJsonResult.code = "0";
+ objJsonResult.count = 1; //鎴愬姛锛�
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
{
oCn.RollBack();
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)
- {
- oCn.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0; //澶辫触锛�
- objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- //鍐欏叆鏃ュ織
- oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
- "(getdate(),'" + HMaker + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','','鎾ら攢')"
- );
- oCn.Commit();
- objJsonResult.code = "0";
- objJsonResult.count = 1; //鎴愬姛锛�
- objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.Message = "鎾ら攢鍗曟嵁宸蹭笂浼犺褰曞け璐ワ紒" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
}
- catch (Exception e)
+ else
{
- oCn.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鎾ら攢鍗曟嵁宸蹭笂浼犺褰曞け璐ワ紒" + e.ToString();
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
objJsonResult.data = null;
return objJsonResult;
}
@@ -2349,10 +2372,18 @@
sFIFOCtl = "Y";
}
+ //鍒犻櫎鍓嶅垽鏂噾铦朵簯涓崟鎹槸鍚﹀瓨鍦�
+ if (!GetBillQuery_WMS(HInterID, HBillNo, HBillType, HMaker, oSystemParameter.omodel.WMS_CloudMode, sERPMode, 1, ref sErrMsg))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
try
{
- string WorkList = "鍒犻櫎缂撳瓨鍗曟嵁锛屽崟鎹彿锛�" + HBillNo;
- string SystemName = "WMS-" + MvarReportTitle + "妯″潡";
oCn.BeginTran();
ds = oCn.RunProcReturn("exec h_p_WMS_PonderationBillMain_Temp_Delete " + HInterID + ",'" + HBillNo + "','" + HBillType + "','" + sFIFOCtl + "','" + sERPMode + "'", "h_p_WMS_PonderationBillMain_Temp_Delete");
if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -2375,6 +2406,8 @@
}
else
{
+ string WorkList = "鍒犻櫎缂撳瓨鍗曟嵁锛屽崟鎹彿锛�" + HBillNo;
+ string SystemName = "WMS-" + MvarReportTitle + "妯″潡";
//鍐欏叆鏃ュ織
oCn.RunProc("Insert into System_Log(GeginDate,userid,WorkstationName,WorkList,SystemName,NetUserName,State) values " +
"(getdate(),'" + HMaker + "','" + ComputerName + "','" + WorkList + "','" + SystemName + "','','鍒犻櫎')"
@@ -2444,6 +2477,210 @@
}
}
+ #endregion
+
+ #region 閲戣澏浜戝崟鎹煡璇�
+ public bool GetBillQuery_WMS(Int64 HInterID, string HBillNo, string HBillType, string HMaker, string sCloudMode, string sERPMode, Int64 sHType, ref string sErrMsg)
+ {
+ //sCloudMode锛氱郴缁熷弬鏁� 鏄惁涓虹鏈変簯妯″紡(N涓哄叕鏈変簯妯″紡锛孻涓虹鏈変簯妯″紡)锛�
+ //sERPMode锛氱郴缁熷弬鏁� 搴撳瓨鎺у埗-WMS搴撳瓨鎺у埗ERP妯″紡 (WISE銆丆LOUD銆丮ES)锛�
+ //sHType锛氬�� 1 瀵瑰簲缂撳瓨鍒楄〃鍒犻櫎锛涘�� 2 瀵瑰簲宸蹭笂浼犳挙閿�锛�
+
+ //鍏湁浜戞ā寮�
+ if (sCloudMode == "N")
+ {
+ string sFormId = ""; //涓氬姟瀵硅薄琛ㄥ崟Id
+
+ //鐢熶骇姹囨姤鍗�
+ if (HBillType == "3711")
+ {
+ sFormId = "PRD_MORPT";
+ }
+ //閲囪喘鍏ュ簱鍗曘�佸澶栧叆搴撳崟
+ else if (HBillType == "1201" || HBillType == "1210")
+ {
+ sFormId = "STK_InStock";
+ }
+ //鐢熶骇鍏ュ簱鍗�
+ else if (HBillType == "1202")
+ {
+ sFormId = "PRD_INSTOCK";
+ }
+ //鍏朵粬鍏ュ簱鍗�
+ else if (HBillType == "1203")
+ {
+ sFormId = "STK_MISCELLANEOUS";
+ }
+ //棰嗘枡鍑哄簱鍗�
+ else if (HBillType == "1204")
+ {
+ sFormId = "PRD_PickMtrl";
+ }
+ //閿�鍞嚭搴撳崟
+ else if (HBillType == "1205")
+ {
+ sFormId = "SAL_OUTSTOCK";
+ }
+ //鍏朵粬鍑哄簱鍗�
+ else if (HBillType == "1206")
+ {
+ sFormId = "STK_MisDelivery";
+ }
+ //濮斿鍑哄簱鍗�
+ else if (HBillType == "1211")
+ {
+ sFormId = "SUB_PickMtrl";
+ }
+ //鐢熶骇琛ユ枡鍗�
+ else if (HBillType == "1254")
+ {
+ sFormId = "PRD_FeedMtrl";
+ }
+ //濮斿琛ユ枡鍗�
+ else if (HBillType == "1255")
+ {
+ sFormId = "SUB_FEEDMTRL";
+ }
+ //鐩存帴璋冩嫧鍗�
+ else if (HBillType == "1207")
+ {
+ sFormId = "STK_TransferDirect";
+ }
+ //鍒嗘寮忚皟鍑哄崟
+ else if (HBillType == "1250")
+ {
+ sFormId = "STK_TRANSFEROUT";
+ }
+ //鍒嗘寮忚皟鍏ュ崟
+ else if (HBillType == "1251")
+ {
+ sFormId = "STK_TRANSFERIN";
+ }
+ //閲囪喘閫�鏂欏崟锛堥噰璐叆搴撳崟绾㈠瓧锛�
+ else if (HBillType == "1239")
+ {
+ sFormId = "PUR_MRB";
+ }
+ //鐢熶骇閫�搴撳崟锛堜骇鍝佸叆搴撳崟绾㈠瓧锛�
+ else if (HBillType == "1245")
+ {
+ sFormId = "PRD_RetStock";
+ }
+ //鍏朵粬鍏ュ簱鍗曪紙绾㈠瓧锛�
+ else if (HBillType == "1248")
+ {
+ sFormId = "";
+ }
+ //濮斿閫�搴撳崟锛堝澶栧叆搴撳崟绾㈠瓧锛�
+ else if (HBillType == "1246")
+ {
+ sFormId = "";
+ }
+ //鐢熶骇閫�鏂欏崟锛堢敓浜ч鏂欏崟绾㈠瓧锛�
+ else if (HBillType == "1244")
+ {
+ sFormId = "PRD_ReturnMtrl";
+ }
+ //閿�鍞��璐у崟锛堥攢鍞嚭搴撳崟绾㈠瓧锛�
+ else if (HBillType == "1247")
+ {
+ sFormId = "SAL_RETURNSTOCK";
+ }
+ //鍏朵粬鍑哄簱鍗曪紙绾㈠瓧锛�
+ else if (HBillType == "1249")
+ {
+ sFormId = "";
+ }
+ //濮斿閫�鏂欏崟锛堝澶栧嚭搴撳崟绾㈠瓧锛�
+ else if (HBillType == "1238")
+ {
+ sFormId = "SUB_RETURNMTRL";
+ }
+
+ //鐧诲綍閲戣澏
+ var loginRet = InvokeHelper.Login();
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ //鍒ゆ柇鏄惁鐧诲綍鎴愬姛
+ if (isSuccess < 0)
+ {
+ sErrMsg = "榛樿閲戣澏浜戣处鍙风櫥褰曞け璐ワ紒";
+ return false;
+ }
+ else
+ {
+ //鍗曟嵁鏌ヨ
+ var sJson = new
+ {
+ FormId = sFormId,
+ FieldKeys = "FBillNo",
+ FilterString = $@"FBillNo='{HBillNo}'",
+ OrderString = "",
+ TopRowCount = 0,
+ StartRow = 0,
+ Limit = 0
+ };;
+ var _result = InvokeHelper.Query(sFormId, JsonConvert.SerializeObject(sJson));
+ var _saveObj = JArray.Parse(_result);
+
+ //鍒ゆ柇杩斿洖鐨勬暟缁勪腑鏈夋棤鏁版嵁锛屾棤鏁版嵁浠ｈ〃娌℃煡璇㈠埌瀵瑰簲鍗曟嵁
+ if (_saveObj.Count == 0)
+ {
+ return true;
+ }
+ else
+ {
+ //sHType = 1瀵瑰簲缂撳瓨鍒楄〃鍒犻櫎
+ if (sHType == 1)
+ {
+ //鍒ゆ柇杩斿洖鐨勬暟缁勬暟鎹腑鏄惁瀛樺湪"false"锛屽瓨鍦ㄤ唬琛ㄩ�掑叆鐨勪笟鍔″璞¤〃鍗旾d涓嶆纭�
+ if (_saveObj[0][0].ToString().Contains("false") == true)
+ {
+ return true;
+ }
+ else
+ {
+ sErrMsg = "鏁版嵁瀛樺湪寮傚父锛屼笉鍏佽鍒犻櫎锛佸崟鎹彿锛�" + HBillNo + " 鍦ㄩ噾铦朵簯涓凡鐢熸垚鍗曟嵁锛岃鍏堝湪閲戣澏浜戦噷鍒犻櫎璇ュ崟鎹紝骞跺湪缂撳瓨鍒楄〃鐨勫凡涓婁紶鐣岄潰鎾ら攢璇ュ崟鎹紝鍐嶅璇ュ崟鎹繘琛岀紪杈戞垨鍒犻櫎鎿嶄綔锛�";
+ return false;
+ }
+ }
+ //sHType = 2瀵瑰簲宸蹭笂浼犳挙閿�
+ else
+ {
+ //鍒ゆ柇杩斿洖鐨勬暟缁勬暟鎹腑鏄惁瀛樺湪"false"锛屽瓨鍦ㄤ唬琛ㄩ�掑叆鐨勪笟鍔″璞¤〃鍗旾d涓嶆纭�
+ if (_saveObj[0][0].ToString().Contains("false") == true)
+ {
+ sErrMsg = "姝ゆā鍧楁殏涓嶆敮鎸佹挙閿�鍔熻兘锛�";
+ return false;
+ }
+ else
+ {
+ sErrMsg = "鎾ら攢鍗曟嵁澶辫触锛屽崟鎹彿锛�" + HBillNo + "锛岄噾铦朵簯閲屾湭鍒犻櫎锛屼笉鍏佽鎾ら攢锛�";
+ return false;
+ }
+ }
+ }
+ }
+ }
+ //绉佹湁浜戞ā寮�
+ else
+ {
+ ds = oCn.RunProcReturn("exec h_p_WMS_BillQuery " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + sERPMode + "'," + sHType.ToString(), "h_p_WMS_BillQuery");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ sErrMsg = "鍗曟嵁鏌ヨ鍙戠敓閿欒锛�";
+ return false;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ sErrMsg = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+ }
+ }
#endregion
#endregion
@@ -4736,6 +4973,33 @@
}
}
+ #endregion
+
+ #region 灏忓崼缁勬墭鏉＄爜灞曠ず
+ [Route("WEBSController/get_SavePackUnion_xiaowei")]
+ [HttpGet]
+ public object get_SavePackUnion_xiaowei(string HBarCode_Pack)
+ {
+ try
+ {
+
+ DataSet ds=oCn.RunProcReturn($"select * from h_v_get_PackUnionBill where 鏍堟澘鐮�='{HBarCode_Pack}'", "h_v_get_PackUnionBill");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "success";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //澶辫触锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
#endregion
#region 涓婃枡闃查敊鍗� 涓婁紶鐢熷崟
@@ -7968,6 +8232,76 @@
try
{
ds = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_PackUnionBill_New '" + HBarCode + "'," + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "','" + HMaterNumber_Pack + "','" + sMaterialCtl + "','" + sSourceBillTypeCtl + "','" + sSourceBillNoCtl + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddBarCode_PackUnionBill_New");
+ 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 = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵弿鏉＄爜澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鐢熶骇缁勬墭鍗曟ā鍧� 鎵弿鎵樻潯鐮佸搴旀潯鐮�--xiaowei 20250630
+
+ /// <summary>
+ /// 鐢熶骇缁勬墭鍗曟ā鍧� 鎵弿鎵樻潯鐮佸搴旀潯鐮�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/get_BarCode_PackUnionBill_New_Json_xiaowei")]
+ [HttpGet]
+ public object get_BarCode_PackUnionBill_New_Json_xiaowei(string HBarCode, Int64 HInterID, string HBillNo, string HBillType, string HBillSubType, string HBarCode_Pack, string HMaterNumber_Pack, string HMaker, Int64 HStockOrgID)
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ string sErrMsg = "";
+ if (oSystemParameter.ShowBillByOrgID(HStockOrgID, ref sErrMsg) == true)
+ {
+ string sMaterialCtl = "Y"; //缁勬墭鐗╂枡鏄惁涓�鑷存帶鍒讹紙Y涓烘帶鍒讹級
+ string sSourceBillTypeCtl = "Y"; //鏈叆搴撴潯鐮佽繘琛岀粍鎵樻椂锛岃繘琛屽悓婧愬崟绫诲瀷鎺у埗锛圷涓烘帶鍒讹級
+ string sSourceBillNoCtl = "Y"; //鏈叆搴撴潯鐮佽繘琛岀粍鎵樻椂锛岃繘琛屽悓婧愬崟鎺у埗锛圷涓烘帶鍒讹級
+ sMaterialCtl = oSystemParameter.omodel.Sc_PackUnionBill_MaterialCtl.ToUpper();
+ sSourceBillTypeCtl = oSystemParameter.omodel.Sc_PackUnionBill_SourceBillTypeCtl.ToUpper();
+ sSourceBillNoCtl = oSystemParameter.omodel.Sc_PackUnionBill_SourceBillNoCtl.ToUpper();
+
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_WMS_AddBarCode_PackUnionBill_New_xiaowei '" + HBarCode + "'," + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HBillSubType + "','" + HBarCode_Pack + "','" + HMaterNumber_Pack + "','" + sMaterialCtl + "','" + sSourceBillTypeCtl + "','" + sSourceBillNoCtl + "','" + HMaker + "'," + HStockOrgID.ToString(), "h_p_WMS_AddBarCode_PackUnionBill_New");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -13025,5 +13359,6 @@
}
#endregion
+
}
}
diff --git a/WebAPI/DLL/ClsGy_Material_Ctl.cs b/WebAPI/DLL/ClsGy_Material_Ctl.cs
index fc2c086..a653a51 100644
--- a/WebAPI/DLL/ClsGy_Material_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_Material_Ctl.cs
@@ -101,7 +101,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) " +
+ ", HSALEPRICEUNITID, HPERUNITSTANDHOUR, HSTDLABORPREPARETIME, HSTDMACHINEPREPARETIME, HMASTERID,HQtyDec,HPriceDec,HMoneyDec,HMinPOQty) " +
" 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 + "'" +
",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() +
@@ -113,7 +113,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.HSALEPRICEUNITID.ToString() + "," + oModel.HPERUNITSTANDHOUR.ToString() + "," + oModel.HSTDLABORPREPARETIME.ToString() + "," + oModel.HSTDMACHINEPREPARETIME.ToString() + "," + oModel.HMASTERID.ToString() +",'" + oModel.HQtyDec + "','" + oModel.HPriceDec + "','" + oModel.HMoneyDec +"',"+ oModel.HMinPOQty + ")");
oCn.RunProc("Insert into Gy_Material (" +
"HItemId,HNumber,HName,HHelpCode,HShortNumber,HParentID" +
",HLevel,HEndFlag,HStopflag,HRemark" +
@@ -126,7 +126,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) " +
+ ", HSALEPRICEUNITID, HPERUNITSTANDHOUR, HSTDLABORPREPARETIME, HSTDMACHINEPREPARETIME, HMASTERID,HQtyDec,HPriceDec,HMoneyDec,HMinPOQty) " +
" 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 + "'" +
",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() +
@@ -138,7 +138,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 + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ oModel.HSALEPRICEUNITID.ToString() + "," + oModel.HPERUNITSTANDHOUR.ToString() + "," + oModel.HSTDLABORPREPARETIME.ToString() + "," + oModel.HSTDMACHINEPREPARETIME.ToString() + "," + oModel.HMASTERID.ToString() + ",'" + oModel.HQtyDec + "','" + oModel.HPriceDec + "','" + oModel.HMoneyDec +"',"+ oModel.HMinPOQty + ")", ref DBUtility.ClsPub.sExeReturnInfo);
sql = "set identity_insert gy_material off";
oCn.RunProc(sql);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
diff --git a/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs b/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
index e8511ee..2e4db56 100644
--- a/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
+++ b/WebAPI/DLL/ClsQC_PatrolProcCheckBill.cs
@@ -96,6 +96,7 @@
",HMainProcID=" + omodel.HMainProcID.ToString() +
",HShiftsID=" + omodel.HShiftsID.ToString() +
",HErrTreatment='" + omodel.HErrTreatment + "'" +
+ ",HQCSchemeID='" + omodel.HQCSchemeID + "'" +
" where HInterID=" + lngBillKey.ToString();
//鏇存柊涓昏〃
oCn.RunProc(sqlerro);
@@ -116,13 +117,15 @@
",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HQCCheckItemID,HQCStd,HQCNote1,HQCNote2,HQCNote3,HQCNote4" +
",HQCNote5,HQCNote6,HQCNote7,HQCNote8,HQCNote9,HQCNote10" +
+ ",HQCNote1_SN,HQCNote2_SN,HQCNote3_SN,HQCNote4_SN,HQCNote5_SN" +
+ ",HQCNote6_SN,HQCNote7_SN,HQCNote8_SN,HQCNote9_SN,HQCNote10_SN" +
") 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.HQCNote1 + "','" + oSub.HQCNote2 + "','" + oSub.HQCNote3 + "','" + oSub.HQCNote4 + "'" +
- ",'" + oSub.HQCNote5 + "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "'" +
- ") ");
+ ",'" + oSub.HQCNote5 + "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "','" + oSub.HQCNote1_SN + "','" + oSub.HQCNote2_SN + "','" + oSub.HQCNote3_SN + "','" + oSub.HQCNote4_SN + "','" + oSub.HQCNote5_SN + "','" + oSub.HQCNote6_SN + "','" + oSub.HQCNote7_SN + "','" + oSub.HQCNote8_SN + "','" + oSub.HQCNote9_SN + "','" + oSub.HQCNote10_SN + "'" +
+ ") ");
}
//鎻掑叆瀛愯〃2
@@ -224,13 +227,13 @@
oCn.RunProc("Insert Into QC_PatrolProcCheckBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark" +
- ",HSourceID,HICMOInterID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
- ",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HMainProcID,HLastResult,HShiftsID,HErrTreatment" +
+ ",HSourceID,HICMOInterID,HICMOEntryID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID" +
+ ",HProcExchBillNo,HProcExchQty,HMaterID,HFirstCheckEmp,HMainProcID,HLastResult,HShiftsID,HErrTreatment,HQCSchemeID" +
") " +
" 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() + "," + omodel.HMainProcID +" ,"+ omodel.HLastResult + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "'" +
+ "," + omodel.HSourceID.ToString() + "," + omodel.HICMOInterID.ToString() + "," + omodel.HICMOEntryID + ",'" + omodel.HICMOBillNo + "'," + omodel.HICMOQty.ToString() + "," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
+ ",'" + omodel.HProcExchBillNo + "'," + omodel.HProcExchQty.ToString() + "," + omodel.HMaterID.ToString() + "," + omodel.HFirstCheckEmp.ToString() + "," + omodel.HMainProcID +" ,"+ omodel.HLastResult + "," + omodel.HShiftsID + ",'" + omodel.HErrTreatment + "'," + omodel.HQCSchemeID +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsQC_PatrolProcCheckBillSub oSub in DetailColl)
@@ -241,12 +244,14 @@
",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
",HQCCheckItemID,HQCStd,HQCNote1,HQCNote2,HQCNote3,HQCNote4" +
",HQCNote5,HQCNote6,HQCNote7,HQCNote8,HQCNote9,HQCNote10" +
+ ",HQCNote1_SN,HQCNote2_SN,HQCNote3_SN,HQCNote4_SN,HQCNote5_SN" +
+ ",HQCNote6_SN,HQCNote7_SN,HQCNote8_SN,HQCNote9_SN,HQCNote10_SN" +
") 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.HQCNote1 + "','" + oSub.HQCNote2 + "','" + oSub.HQCNote3 + "','" + oSub.HQCNote4 + "'" +
- ",'" + oSub.HQCNote5 + "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "'" +
+ ",'" + oSub.HQCNote5 + "','" + oSub.HQCNote6 + "','" + oSub.HQCNote7 + "','" + oSub.HQCNote8 + "','" + oSub.HQCNote9 + "','" + oSub.HQCNote10 + "','" + oSub.HQCNote1_SN + "','" + oSub.HQCNote2_SN + "','" + oSub.HQCNote3_SN + "','" + oSub.HQCNote4_SN + "','" + oSub.HQCNote5_SN + "','" + oSub.HQCNote6_SN + "','" + oSub.HQCNote7_SN + "','" + oSub.HQCNote8_SN + "','" + oSub.HQCNote9_SN + "','" + oSub.HQCNote10_SN + "'" +
") ");
}
//鎻掑叆瀛愯〃2
diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs
index 09adba9..37cdef5 100644
--- a/WebAPI/Models/ClsGy_Material_Model.cs
+++ b/WebAPI/Models/ClsGy_Material_Model.cs
@@ -120,6 +120,7 @@
public string HMaterRuleExternType1; // 姣涘皷鍏紡
public string HCircularKnittingMachineCode; //鍦嗘満浠ｇ爜
+ public int HMinPOQty;//绠辫
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/StationBill.cs b/WebAPI/Models/StationBill.cs
index 1fbe9d9..67271c3 100644
--- a/WebAPI/Models/StationBill.cs
+++ b/WebAPI/Models/StationBill.cs
@@ -101,5 +101,7 @@
public int HIsTimeFlag { get; set; } = 0;
public string HBatchNo { get; set; }//瀛愯〃鎵规
+ public double HWeight { get; set; }//瀛愯〃閲嶉噺
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 32b959f..b380dc7 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -5,13 +5,13 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<History>True|2025-08-08T02:12:39.6115833Z;True|2025-08-08T10:11:05.4976467+08:00;False|2025-08-08T10:10:56.7508294+08:00;True|2025-08-07T13:09:32.3688293+08:00;False|2025-08-07T13:09:23.7335601+08:00;True|2025-08-06T15:13:44.9956787+08:00;True|2025-08-06T12:29:30.0783854+08:00;False|2025-08-06T12:29:22.9174579+08:00;True|2025-08-05T11:46:04.9109530+08:00;True|2025-08-05T09:12:36.4757799+08:00;False|2025-08-05T09:12:29.5152051+08:00;True|2025-08-04T22:16:55.8153764+08:00;False|2025-08-04T22:16:45.6812380+08:00;True|2025-08-04T17:48:30.5101840+08:00;True|2025-08-04T16:18:16.1499446+08:00;True|2025-08-04T11:40:28.5722111+08:00;False|2025-08-04T10:45:46.8681527+08:00;True|2025-07-31T15:11:55.0100072+08:00;False|2025-07-31T15:10:51.6681759+08:00;True|2025-07-30T16:00:10.5159335+08:00;True|2025-07-30T15:41:51.5648646+08:00;True|2025-07-30T15:13:07.2401528+08:00;False|2025-07-30T15:12:40.5946471+08:00;True|2025-07-29T23:14:46.2298438+08:00;False|2025-07-29T23:13:41.1630729+08:00;True|2025-07-29T14:02:02.2575808+08:00;True|2025-07-29T13:43:01.6607651+08:00;True|2025-07-29T13:21:53.3427945+08:00;False|2025-07-29T13:21:12.3710695+08:00;True|2025-07-02T16:19:48.0004187+08:00;True|2025-07-02T16:15:36.5831869+08:00;True|2025-07-02T16:09:00.5399469+08:00;True|2025-07-02T15:56:09.9783494+08:00;True|2025-07-02T15:14:06.9937801+08:00;True|2025-07-02T15:09:36.8804234+08:00;True|2025-07-02T15:05:41.0676357+08:00;True|2025-07-02T15:00:26.6768478+08:00;True|2025-07-02T14:57:55.9749557+08:00;True|2025-07-02T14:54:09.4801906+08:00;True|2025-07-02T14:48:13.1406954+08:00;True|2025-07-02T14:43:16.6621615+08:00;False|2025-07-02T14:42:39.8858427+08:00;True|2025-06-30T14:07:33.6198921+08:00;False|2025-06-30T14:06:54.9141774+08:00;True|2025-06-27T16:10:37.5346733+08:00;True|2025-06-27T15:53:52.6099110+08:00;True|2025-06-27T15:49:37.6381262+08:00;True|2025-06-27T15:45:18.4426363+08:00;True|2025-06-27T15:09:40.0483579+08:00;True|2025-06-27T15:03:45.2696849+08:00;True|2025-06-27T14:59:53.6972427+08:00;True|2025-06-27T14:56:36.5300707+08:00;True|2025-06-27T14:52:12.7121868+08:00;True|2025-06-27T14:31:22.7250138+08:00;True|2025-06-27T14:23:27.1058306+08:00;True|2025-06-27T14:13:54.1440171+08:00;True|2025-06-27T14:04:48.1872541+08:00;True|2025-06-27T14:00:10.1802914+08:00;False|2025-06-27T13:59:47.2300395+08:00;True|2025-06-26T17:03:34.2617207+08:00;True|2025-06-26T16:59:16.3043451+08:00;True|2025-06-26T16:47:46.3910675+08:00;True|2025-06-26T16:40:45.0917549+08:00;True|2025-06-26T16:19:04.7496278+08:00;True|2025-06-26T13:40:17.4650939+08:00;True|2025-06-26T08:46:10.4559278+08:00;False|2025-06-26T08:45:48.2231639+08:00;True|2025-06-25T16:40:12.2933893+08:00;True|2025-06-25T16:33:19.5628638+08:00;True|2025-06-25T16:28:13.3282882+08:00;True|2025-06-25T14:26:38.1487280+08:00;True|2025-06-25T14:23:03.3981021+08:00;True|2025-06-25T14:20:01.5127640+08:00;True|2025-06-25T14:12:47.4447383+08:00;True|2025-06-25T14:09:39.8493477+08:00;True|2025-06-25T14:04:07.9655837+08:00;False|2025-06-25T14:03:01.5528773+08:00;True|2025-06-24T14:39:55.5403167+08:00;True|2025-06-24T14:36:51.3363222+08:00;True|2025-06-24T14:33:34.6605389+08:00;True|2025-06-24T14:29:44.9508636+08:00;True|2025-06-24T14:24:49.4487525+08:00;True|2025-06-24T14:19:31.0243854+08:00;True|2025-06-24T14:15:42.8043990+08:00;True|2025-06-24T14:10:25.3126511+08:00;True|2025-06-24T14:01:11.7808866+08:00;True|2025-06-24T13:56:29.6124906+08:00;True|2025-06-24T13:42:27.5554459+08:00;True|2025-06-24T13:35:02.3147995+08:00;True|2025-06-24T13:31:15.2833438+08:00;True|2025-06-24T13:26:22.4759378+08:00;True|2025-06-24T13:22:58.0143749+08:00;False|2025-06-24T13:22:30.7295943+08:00;True|2025-06-24T13:20:08.9526835+08:00;True|2025-06-24T13:15:10.2719394+08:00;True|2025-06-20T15:38:22.6724181+08:00;True|2025-06-20T14:44:29.4284749+08:00;True|2025-06-20T14:34:29.3160274+08:00;True|2025-06-20T14:29:26.1084681+08:00;False|2025-06-20T14:28:47.7761889+08:00;True|2025-06-18T16:26:56.9181027+08:00;True|2025-06-18T16:22:48.3649541+08:00;True|2025-06-18T09:45:22.1840933+08:00;True|2025-06-18T09:38:27.4616553+08:00;True|2025-06-18T09:24:22.0260493+08:00;True|2025-06-18T08:58:42.0314631+08:00;True|2025-06-18T08:54:57.3762593+08:00;True|2025-06-18T08:52:30.6977045+08:00;True|2025-06-18T08:44:16.3868101+08:00;True|2025-06-18T08:38:06.2335478+08:00;False|2025-06-18T08:37:43.3356541+08:00;True|2025-06-18T08:32:29.9036211+08:00;True|2025-06-18T08:19:00.7253184+08:00;True|2025-06-18T08:14:01.8413793+08:00;True|2025-06-18T08:06:59.1976807+08:00;False|2025-06-18T08:06:29.3417533+08:00;True|2025-06-17T15:36:04.6217443+08:00;True|2025-06-17T15:31:43.3563632+08:00;True|2025-06-17T14:58:43.8735144+08:00;True|2025-06-17T14:39:01.2795873+08:00;True|2025-06-17T14:34:00.1695810+08:00;True|2025-06-17T14:30:54.8417757+08:00;False|2025-06-17T14:30:22.5535404+08:00;True|2025-06-17T14:26:29.1534249+08:00;True|2025-06-17T14:23:01.5750276+08:00;True|2025-06-17T14:13:44.7734613+08:00;True|2025-06-17T13:20:22.6676313+08:00;True|2025-06-17T12:45:59.6935151+08:00;True|2025-06-17T11:26:53.3105073+08:00;True|2025-06-17T11:21:58.4556792+08:00;True|2025-06-17T11:17:39.0062665+08:00;True|2025-06-17T11:14:12.1161810+08:00;True|2025-06-17T11:09:51.0123982+08:00;True|2025-06-17T11:03:35.4540889+08:00;True|2025-06-17T10:58:06.1870442+08:00;True|2025-06-17T10:47:25.6201207+08:00;True|2025-06-17T09:22:36.4275453+08:00;True|2025-06-17T09:15:44.1593969+08:00;True|2025-06-17T09:12:05.5473137+08:00;True|2025-06-17T09:08:48.4974735+08:00;True|2025-06-17T09:04:26.9345188+08:00;True|2025-06-17T09:03:36.0326872+08:00;True|2025-06-17T08:57:42.1551977+08:00;True|2025-06-17T08:53:55.5708883+08:00;True|2025-06-17T08:49:04.2922881+08:00;True|2025-06-17T08:41:04.9647614+08:00;True|2025-06-17T08:34:49.0188503+08:00;True|2025-06-17T08:29:57.4868889+08:00;True|2025-06-17T08:23:10.2489747+08:00;True|2025-06-17T08:17:38.8483538+08:00;False|2025-06-17T08:16:14.0757416+08:00;True|2025-06-13T15:52:22.7401602+08:00;False|2025-06-13T15:52:01.7388701+08:00;True|2025-06-13T15:35:05.4281004+08:00;True|2025-06-13T15:24:25.2717953+08:00;True|2025-06-13T15:13:54.7230551+08:00;True|2025-06-13T14:02:03.6551564+08:00;True|2025-06-13T11:18:18.1123581+08:00;True|2025-06-13T10:40:20.8774077+08:00;True|2025-06-13T10:36:36.1411085+08:00;False|2025-06-13T10:35:41.3893604+08:00;True|2025-06-13T10:32:13.4521145+08:00;True|2025-06-13T10:30:35.6640860+08:00;True|2025-06-03T10:51:41.3862145+08:00;False|2025-06-03T10:51:16.5345521+08:00;True|2025-05-30T20:09:32.5107276+08:00;False|2025-05-30T20:09:00.9663790+08:00;False|2025-05-30T17:15:54.5728888+08:00;True|2025-05-30T15:31:12.6393961+08:00;True|2025-05-30T14:59:23.7338679+08:00;True|2025-05-30T14:47:49.7374652+08:00;False|2025-05-30T14:46:56.5791293+08:00;True|2025-05-30T09:13:25.7216738+08:00;False|2025-05-30T09:12:56.3890721+08:00;True|2025-05-29T20:42:40.3409827+08:00;False|2025-05-29T20:42:06.9658631+08:00;True|2025-05-29T20:21:44.3234619+08:00;False|2025-05-29T20:21:05.8899839+08:00;True|2025-05-27T15:28:35.5206538+08:00;True|2025-05-27T14:10:48.2114238+08:00;True|2025-05-27T11:21:56.3013946+08:00;True|2025-05-27T11:12:39.5518701+08:00;True|2025-05-27T11:01:46.8317706+08:00;True|2025-05-27T10:58:06.6334127+08:00;True|2025-05-27T10:50:01.5656763+08:00;True|2025-05-27T09:32:10.3357581+08:00;False|2025-05-27T09:31:40.1660002+08:00;True|2025-05-22T19:13:07.9924074+08:00;True|2025-05-22T18:44:05.4014437+08:00;False|2025-05-22T18:43:42.8647214+08:00;True|2025-05-20T14:23:23.3914216+08:00;False|2025-05-20T14:22:55.1487818+08:00;True|2025-05-20T14:02:04.1738192+08:00;False|2025-05-20T14:01:35.3257179+08:00;True|2025-05-16T10:26:39.2771408+08:00;True|2025-05-16T09:56:14.9524606+08:00;True|2025-05-16T09:41:14.7986426+08:00;False|2025-05-16T09:40:49.7515669+08:00;True|2025-05-15T16:11:15.6104624+08:00;False|2025-05-15T16:10:29.3231781+08:00;True|2025-05-08T08:33:00.5573071+08:00;False|2025-05-08T08:32:20.5353159+08:00;True|2025-04-23T15:11:05.1490455+08:00;True|2025-04-23T14:22:24.5406543+08:00;False|2025-04-23T14:21:47.8685695+08:00;True|2025-04-18T13:54:27.4746888+08:00;False|2025-04-18T13:53:45.2296528+08:00;False|2025-04-18T13:53:29.7890054+08:00;False|2025-04-18T13:53:23.5770264+08:00;False|2025-04-18T13:53:18.0054565+08:00;True|2025-04-18T13:51:28.8449212+08:00;True|2025-04-18T13:24:50.1548645+08:00;True|2025-04-18T13:17:41.8781012+08:00;True|2025-04-18T13:07:11.4243777+08:00;True|2025-04-18T13:03:51.8972162+08:00;True|2025-04-18T12:59:24.3674835+08:00;True|2025-04-18T12:54:51.7546338+08:00;True|2025-04-18T12:51:54.3531129+08:00;False|2025-04-18T12:51:42.0198325+08:00;True|2025-04-18T09:11:06.5087174+08:00;False|2025-04-18T09:10:56.3178793+08:00;True|2025-04-17T11:20:10.9926709+08:00;True|2025-04-17T11:01:50.8902725+08:00;True|2025-04-17T10:53:40.1335186+08:00;True|2025-04-17T10:50:33.6109824+08:00;True|2025-04-17T10:31:35.1972930+08:00;True|2025-04-17T10:27:13.0718237+08:00;False|2025-04-17T10:27:05.4243104+08:00;True|2025-04-17T10:21:17.1039399+08:00;True|2025-04-17T10:17:30.5257362+08:00;True|2025-04-17T09:04:16.5959099+08:00;False|2025-04-17T09:04:08.5643163+08:00;True|2025-04-16T16:50:10.4001088+08:00;True|2025-04-16T16:37:30.0492166+08:00;False|2025-04-16T16:37:20.9070255+08:00;True|2025-04-15T14:55:05.4396103+08:00;True|2025-04-15T14:48:11.6729078+08:00;True|2025-04-15T14:18:53.0805178+08:00;True|2025-04-15T13:48:11.5252569+08:00;True|2025-04-15T13:37:14.4720847+08:00;True|2025-04-15T11:19:10.1766439+08:00;True|2025-04-15T11:16:15.9677953+08:00;True|2025-04-15T11:01:18.4337723+08:00;False|2025-04-15T11:01:06.9132978+08:00;True|2025-04-15T10:55:53.9650790+08:00;False|2025-04-15T10:55:45.2763971+08:00;True|2025-04-09T11:24:21.9466324+08:00;True|2025-04-09T11:14:25.0603792+08:00;True|2025-04-09T11:03:10.0252216+08:00;False|2025-04-09T11:03:01.0837419+08:00;True|2025-04-08T15:00:39.6673341+08:00;True|2025-04-08T14:55:20.5714659+08:00;True|2025-04-08T14:41:57.1855163+08:00;True|2025-04-08T13:31:03.4382266+08:00;True|2025-04-08T11:20:45.0300955+08:00;True|2025-04-08T10:59:59.6997668+08:00;False|2025-04-08T10:59:53.2827828+08:00;True|2025-04-08T10:48:17.4232977+08:00;False|2025-04-08T10:48:09.5363986+08:00;True|2025-04-03T13:53:30.6471699+08:00;False|2025-04-03T13:53:22.8762999+08:00;True|2025-04-02T12:47:31.3375226+08:00;False|2025-04-02T12:47:24.2095072+08:00;True|2025-04-01T16:29:52.7465502+08:00;False|2025-04-01T16:29:33.7844649+08:00;True|2025-03-28T16:22:29.8664470+08:00;True|2025-03-28T15:53:12.1106288+08:00;False|2025-03-28T15:53:01.4674242+08:00;True|2025-03-28T13:34:17.5506822+08:00;False|2025-03-28T13:34:09.5853308+08:00;True|2025-03-26T12:42:08.9630741+08:00;True|2025-03-26T12:40:07.7144561+08:00;True|2025-03-26T12:30:37.3503331+08:00;True|2025-03-26T12:26:47.5061658+08:00;True|2025-03-26T10:54:47.2556717+08:00;True|2025-03-26T10:49:59.7897145+08:00;True|2025-03-26T10:47:02.6195828+08:00;False|2025-03-26T10:46:54.9421244+08:00;True|2025-03-26T01:10:19.1227462+08:00;True|2025-03-26T01:00:04.3583740+08:00;True|2025-03-26T00:38:57.4757071+08:00;True|2025-03-26T00:28:24.9370188+08:00;True|2025-03-26T00:04:05.4507425+08:00;True|2025-03-25T23:06:56.2284828+08:00;False|2025-03-25T23:06:46.7023339+08:00;True|2025-03-25T22:57:08.3127897+08:00;False|2025-03-25T22:55:05.8028873+08:00;False|2025-03-25T22:54:51.2053101+08:00;False|2025-03-04T11:23:36.7757604+08:00;True|2025-02-12T14:05:06.1068587+08:00;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
- <History>True|2025-11-04T11:17:45.5603487Z;True|2025-11-04T19:11:47.2752365+08:00;True|2025-11-04T19:03:45.5322242+08:00;False|2025-11-04T19:03:39.4250980+08:00;True|2025-11-04T16:50:16.5434783+08:00;False|2025-11-04T16:48:55.4710843+08:00;False|2025-11-04T10:18:33.1061874+08:00;True|2025-11-04T10:09:49.1909636+08:00;False|2025-11-04T10:09:34.7314682+08:00;True|2025-11-03T21:06:15.1536191+08:00;True|2025-11-03T20:56:12.6822879+08:00;True|2025-11-03T20:44:04.2025850+08:00;True|2025-11-03T20:14:36.4630198+08:00;True|2025-11-03T20:07:09.2433655+08:00;True|2025-11-03T20:01:50.9456797+08:00;True|2025-11-03T20:00:05.0853816+08:00;True|2025-11-03T19:53:51.3672186+08:00;True|2025-11-03T19:48:12.0716362+08:00;True|2025-11-03T19:44:24.4522872+08:00;True|2025-11-03T19:41:26.2318062+08:00;True|2025-11-03T19:38:28.4994026+08:00;True|2025-11-03T19:33:17.2885424+08:00;True|2025-11-03T19:30:25.3588784+08:00;True|2025-11-03T19:17:24.4456905+08:00;True|2025-11-03T19:02:48.7431782+08:00;True|2025-11-03T19:00:57.6205790+08:00;True|2025-11-03T18:58:41.3715002+08:00;True|2025-11-03T18:52:18.7290280+08:00;True|2025-11-03T18:51:31.3457792+08:00;True|2025-11-03T18:50:02.2777202+08:00;True|2025-11-03T18:42:26.2489688+08:00;True|2025-11-03T18:33:58.6517887+08:00;False|2025-11-03T18:33:30.9016641+08:00;True|2025-11-03T17:03:56.8168314+08:00;True|2025-11-03T16:37:23.1875396+08:00;True|2025-11-03T16:35:22.1415518+08:00;True|2025-11-03T16:23:24.7946129+08:00;True|2025-11-03T16:01:55.3410012+08:00;True|2025-11-03T15:55:45.4552373+08:00;True|2025-11-03T15:23:18.6590354+08:00;True|2025-11-03T13:59:08.2051690+08:00;True|2025-11-03T13:37:54.4852025+08:00;True|2025-11-03T13:29:18.5157654+08:00;True|2025-11-03T13:07:45.3317842+08:00;True|2025-11-03T11:13:25.6519453+08:00;True|2025-11-03T11:13:10.5791581+08:00;True|2025-11-03T10:34:10.0596118+08:00;True|2025-11-03T10:28:56.3897100+08:00;True|2025-11-03T10:28:16.9924970+08:00;True|2025-11-03T10:25:03.7825735+08:00;True|2025-11-03T10:16:43.0587573+08:00;False|2025-11-03T10:16:36.3657463+08:00;True|2025-10-31T13:34:46.1165905+08:00;False|2025-10-31T13:34:33.3438488+08:00;True|2025-10-31T11:29:29.5141205+08:00;True|2025-10-31T11:23:52.5139459+08:00;True|2025-10-31T08:43:37.3654106+08:00;True|2025-10-31T08:37:04.9350963+08:00;False|2025-10-31T08:36:40.2469123+08:00;True|2025-10-30T09:11:07.2250641+08:00;False|2025-10-30T09:10:58.0617103+08:00;True|2025-10-29T13:12:23.0956238+08:00;False|2025-10-29T13:12:13.6839931+08:00;True|2025-10-27T11:29:10.8757820+08:00;True|2025-10-27T09:11:56.0461783+08:00;True|2025-10-27T08:46:33.8385015+08:00;False|2025-10-27T08:46:25.9218178+08:00;True|2025-10-26T21:43:49.1070018+08:00;True|2025-10-26T21:28:56.8654510+08:00;True|2025-10-26T21:10:21.4574543+08:00;True|2025-10-26T20:56:38.4423282+08:00;True|2025-10-26T20:50:01.5280041+08:00;True|2025-10-26T20:37:48.4086441+08:00;False|2025-10-26T20:37:31.3912427+08:00;True|2025-10-26T17:35:44.4110603+08:00;False|2025-10-26T17:35:24.7299709+08:00;True|2025-10-23T10:35:54.5878865+08:00;True|2025-10-23T10:09:14.9748622+08:00;True|2025-10-23T09:42:38.4409516+08:00;True|2025-10-23T09:31:52.7604969+08:00;True|2025-10-23T08:49:18.9260075+08:00;True|2025-10-23T08:35:30.8975599+08:00;False|2025-10-23T08:35:04.0733855+08:00;True|2025-10-22T16:46:02.7918658+08:00;True|2025-10-22T16:38:06.2456061+08:00;True|2025-10-22T15:21:22.9621680+08:00;True|2025-10-22T14:41:47.2415866+08:00;False|2025-10-22T14:41:24.5633960+08:00;True|2025-10-22T13:55:01.6606172+08:00;True|2025-10-22T13:49:54.9893977+08:00;True|2025-10-22T10:17:49.5376761+08:00;True|2025-10-22T10:04:20.3966155+08:00;False|2025-10-22T10:04:03.2828016+08:00;True|2025-10-21T15:39:11.5730043+08:00;True|2025-10-21T15:24:53.0229268+08:00;True|2025-10-21T15:09:25.0420129+08:00;True|2025-10-21T14:40:28.3393938+08:00;False|2025-10-21T14:40:20.1005353+08:00;True|2025-10-20T22:28:26.5520634+08:00;True|2025-10-20T22:26:20.5228241+08:00;True|2025-10-20T22:23:24.6480809+08:00;True|2025-10-20T22:20:58.2890596+08:00;True|2025-10-20T22:18:30.9160925+08:00;True|2025-10-20T22:15:21.2863110+08:00;True|2025-10-20T22:12:20.6348279+08:00;True|2025-10-20T21:22:16.8600213+08:00;True|2025-10-20T21:19:56.0205365+08:00;True|2025-10-20T21:16:50.6213897+08:00;True|2025-10-20T21:14:33.3790831+08:00;True|2025-10-20T21:11:11.9975681+08:00;True|2025-10-20T21:06:04.3240487+08:00;True|2025-10-20T21:00:01.6053675+08:00;True|2025-10-20T20:34:35.3099486+08:00;False|2025-10-20T20:34:29.2183933+08:00;False|2025-10-20T15:27:53.5360052+08:00;True|2025-10-20T15:20:30.5120326+08:00;True|2025-10-20T13:54:00.8679623+08:00;True|2025-10-20T13:05:08.9389701+08:00;True|2025-10-20T08:59:05.0510232+08:00;False|2025-10-20T08:58:50.0149015+08:00;True|2025-10-20T08:32:50.2511747+08:00;False|2025-10-20T08:32:32.8187925+08:00;True|2025-10-19T12:46:59.0474294+08:00;True|2025-10-19T12:17:05.5045348+08:00;True|2025-10-19T12:00:27.8220844+08:00;True|2025-10-19T11:57:38.1588249+08:00;True|2025-10-19T11:43:25.8988056+08:00;True|2025-10-19T11:40:29.7941053+08:00;True|2025-10-19T11:37:45.9750452+08:00;True|2025-10-19T11:34:03.7597755+08:00;True|2025-10-19T11:09:16.3000734+08:00;True|2025-10-19T11:05:47.9442601+08:00;True|2025-10-19T11:03:27.8038065+08:00;True|2025-10-19T11:00:37.9633453+08:00;True|2025-10-19T10:57:56.3513561+08:00;True|2025-10-19T10:53:34.9130003+08:00;True|2025-10-19T10:48:58.3678541+08:00;True|2025-10-19T09:10:59.2999711+08:00;False|2025-10-19T09:10:51.6274795+08:00;True|2025-10-17T16:37:58.3731778+08:00;True|2025-10-17T16:21:35.1192676+08:00;True|2025-10-17T16:14:18.8244934+08:00;True|2025-10-17T16:10:51.5103118+08:00;True|2025-10-17T15:51:21.7012733+08:00;True|2025-10-17T14:42:14.5930715+08:00;True|2025-10-17T14:00:43.0733177+08:00;False|2025-10-17T14:00:35.0737472+08:00;True|2025-10-16T15:37:21.3626583+08:00;True|2025-10-16T15:31:57.0338104+08:00;True|2025-10-16T15:25:03.4242778+08:00;True|2025-10-16T15:20:08.3874966+08:00;True|2025-10-16T15:15:24.5602394+08:00;True|2025-10-16T15:11:52.3736891+08:00;True|2025-10-16T15:07:10.4377170+08:00;True|2025-10-16T13:49:35.1728968+08:00;False|2025-10-16T13:48:55.3938422+08:00;True|2025-10-16T11:23:20.6986784+08:00;True|2025-10-16T10:47:39.7780393+08:00;True|2025-10-16T09:22:03.2189706+08:00;True|2025-10-16T08:20:57.6678046+08:00;True|2025-10-16T08:11:35.7964397+08:00;True|2025-10-16T08:07:18.0903111+08:00;True|2025-10-16T07:47:25.9227982+08:00;False|2025-10-16T07:47:21.3257373+08:00;True|2025-10-15T15:51:20.2623472+08:00;True|2025-10-15T15:46:44.7664557+08:00;True|2025-10-15T15:43:38.0230986+08:00;True|2025-10-15T15:14:08.7527334+08:00;True|2025-10-15T14:29:42.9061678+08:00;False|2025-10-15T14:29:33.4631032+08:00;True|2025-10-15T13:48:02.8333725+08:00;False|2025-10-15T13:47:00.0211104+08:00;True|2025-10-15T09:58:44.6863528+08:00;True|2025-10-15T09:58:36.8408696+08:00;True|2025-10-15T09:58:16.6816177+08:00;True|2025-10-15T09:49:13.6909655+08:00;True|2025-10-15T09:19:22.6018871+08:00;True|2025-10-15T09:14:22.5605148+08:00;True|2025-10-15T09:10:04.5145534+08:00;True|2025-10-15T09:08:43.2379652+08:00;True|2025-10-15T08:57:07.0664653+08:00;True|2025-10-15T08:55:08.2361265+08:00;True|2025-10-15T08:45:39.6227479+08:00;True|2025-10-15T08:39:59.8084757+08:00;True|2025-10-15T08:32:37.1409001+08:00;True|2025-10-15T08:19:48.0192400+08:00;True|2025-10-15T08:00:59.6277122+08:00;False|2025-10-15T08:00:52.8765789+08:00;True|2025-10-14T15:31:12.3135759+08:00;False|2025-10-14T15:30:35.0641150+08:00;True|2025-10-13T08:29:52.0989138+08:00;False|2025-10-13T08:29:45.5235296+08:00;True|2025-09-29T14:19:56.3493999+08:00;True|2025-09-29T13:45:50.3942453+08:00;True|2025-09-29T13:42:06.1110553+08:00;True|2025-09-29T13:36:03.8122720+08:00;True|2025-09-29T08:02:25.4433936+08:00;False|2025-09-29T08:01:34.9956194+08:00;True|2025-09-28T16:32:32.1205217+08:00;False|2025-09-28T16:32:22.2949617+08:00;True|2025-09-26T14:52:29.3520681+08:00;True|2025-09-26T14:32:54.2746904+08:00;True|2025-09-26T14:30:03.3405779+08:00;True|2025-09-26T14:27:07.1365132+08:00;True|2025-09-26T14:17:38.1278517+08:00;False|2025-09-26T14:17:15.2222928+08:00;True|2025-09-26T13:27:46.3116713+08:00;True|2025-09-26T13:20:12.4936518+08:00;True|2025-09-26T10:02:30.8281583+08:00;False|2025-09-26T10:02:03.9362462+08:00;True|2025-09-26T09:53:20.0008961+08:00;True|2025-09-26T09:50:19.6692823+08:00;False|2025-09-26T09:49:53.3697350+08:00;True|2025-09-25T09:30:42.4579039+08:00;True|2025-09-25T09:28:06.6361895+08:00;True|2025-09-25T09:21:03.5626551+08:00;True|2025-09-25T09:07:49.5781444+08:00;True|2025-09-25T09:05:39.3361215+08:00;True|2025-09-25T08:57:49.0092670+08:00;True|2025-09-25T08:53:18.1932158+08:00;False|2025-09-25T08:52:41.4831686+08:00;True|2025-09-24T10:55:06.7583576+08:00;True|2025-09-24T10:42:07.4293256+08:00;True|2025-09-24T10:35:21.5131843+08:00;True|2025-09-24T10:01:34.6039507+08:00;False|2025-09-24T10:01:02.2423847+08:00;True|2025-09-23T14:10:09.5716580+08:00;False|2025-09-23T14:09:16.6824875+08:00;True|2025-09-23T10:19:03.9148941+08:00;False|2025-09-23T10:18:54.9945094+08:00;True|2025-09-22T16:10:40.3493996+08:00;True|2025-09-22T16:06:30.7648048+08:00;True|2025-09-22T15:58:01.2588123+08:00;True|2025-09-22T13:22:29.7402684+08:00;True|2025-09-22T10:50:24.6032398+08:00;True|2025-09-22T10:18:57.4239252+08:00;True|2025-09-22T09:44:34.1606021+08:00;True|2025-09-22T09:37:22.2102591+08:00;False|2025-09-22T09:37:13.3244518+08:00;False|2025-09-22T09:37:05.6707374+08:00;True|2025-09-22T09:20:00.1335697+08:00;True|2025-09-22T08:50:45.0839990+08:00;False|2025-09-22T08:50:39.5078616+08:00;True|2025-09-19T16:54:50.1840540+08:00;True|2025-09-19T15:58:56.7629702+08:00;True|2025-09-19T15:34:55.4164772+08:00;True|2025-09-19T15:19:17.0615575+08:00;False|2025-09-19T15:17:40.3055696+08:00;True|2025-09-17T16:33:38.7832139+08:00;False|2025-09-17T16:32:33.8056170+08:00;True|2025-09-15T15:31:28.0110309+08:00;True|2025-09-15T08:59:48.0264567+08:00;True|2025-09-15T08:55:35.9132476+08:00;False|2025-09-15T08:55:15.9462000+08:00;True|2025-09-10T15:37:27.9811453+08:00;True|2025-09-10T15:31:46.7985512+08:00;True|2025-09-10T15:25:13.0432246+08:00;True|2025-09-10T15:04:50.9925337+08:00;True|2025-09-10T14:45:51.9588268+08:00;True|2025-09-10T13:39:21.5732215+08:00;True|2025-09-10T13:30:34.6821425+08:00;False|2025-09-10T13:29:58.0985305+08:00;True|2025-09-10T11:09:10.4474163+08:00;True|2025-09-10T11:01:18.2664245+08:00;False|2025-09-10T11:01:11.7600095+08:00;True|2025-09-09T11:11:08.2737365+08:00;True|2025-09-09T10:48:12.8653988+08:00;True|2025-09-09T10:45:55.8371735+08:00;False|2025-09-09T10:45:50.0271007+08:00;True|2025-09-05T15:34:30.9324454+08:00;True|2025-09-05T15:25:04.5703586+08:00;True|2025-09-05T15:18:44.7836555+08:00;True|2025-09-05T15:18:15.3564889+08:00;True|2025-09-05T15:14:02.2490100+08:00;True|2025-09-05T15:13:22.0106066+08:00;True|2025-09-05T15:07:13.1733932+08:00;True|2025-09-05T14:34:49.5160527+08:00;True|2025-09-05T14:25:56.7476432+08:00;True|2025-09-05T14:11:06.6130566+08:00;True|2025-09-05T14:06:03.3723817+08:00;True|2025-09-05T13:59:08.2676824+08:00;True|2025-09-05T13:55:29.3608816+08:00;True|2025-09-05T13:50:19.1500461+08:00;True|2025-09-05T13:44:07.8244320+08:00;True|2025-09-05T13:32:55.8727194+08:00;True|2025-09-05T13:32:31.4266652+08:00;True|2025-09-05T13:29:54.4476848+08:00;True|2025-09-05T13:20:46.5358233+08:00;True|2025-09-05T13:12:44.2176702+08:00;True|2025-09-05T13:01:20.7462374+08:00;True|2025-09-05T13:00:45.2360436+08:00;True|2025-09-05T12:50:48.1213509+08:00;False|2025-09-05T12:50:41.6099269+08:00;True|2025-09-04T10:26:10.4040299+08:00;True|2025-09-04T10:22:55.8468850+08:00;True|2025-09-04T10:12:00.1744374+08:00;True|2025-09-04T10:11:20.8053602+08:00;False|2025-09-04T10:10:37.1981071+08:00;True|2025-09-03T16:53:33.7806439+08:00;True|2025-09-03T16:23:53.1760759+08:00;True|2025-09-03T16:13:51.7648089+08:00;True|2025-09-01T11:27:28.5171063+08:00;True|2025-09-01T09:10:26.2807200+08:00;True|2025-08-30T16:17:23.6280447+08:00;True|2025-08-30T16:08:45.2704012+08:00;False|2025-08-30T16:07:49.5332724+08:00;True|2025-08-29T13:42:08.9331590+08:00;True|2025-08-29T09:30:26.3865231+08:00;True|2025-08-29T09:26:59.6931531+08:00;True|2025-08-29T09:24:15.7633865+08:00;True|2025-08-29T09:20:15.7248945+08:00;True|2025-08-29T09:16:10.8305341+08:00;False|2025-08-29T09:15:37.6509149+08:00;True|2025-08-29T09:10:52.5758523+08:00;True|2025-08-29T09:07:28.0167672+08:00;True|2025-08-29T08:37:03.5161584+08:00;False|2025-08-29T08:36:22.9701878+08:00;True|2025-08-28T09:09:16.5053336+08:00;False|2025-08-28T09:08:31.8483468+08:00;True|2025-08-27T15:23:37.2451244+08:00;True|2025-08-27T14:08:19.4652541+08:00;True|2025-08-27T10:30:22.9583542+08:00;True|2025-08-27T10:24:39.3809926+08:00;True|2025-08-27T10:19:14.5440743+08:00;False|2025-08-27T10:18:22.9365507+08:00;True|2025-08-26T16:22:15.9301705+08:00;True|2025-08-26T16:15:50.6064453+08:00;False|2025-08-26T16:13:43.3734036+08:00;True|2025-08-26T10:03:33.2470619+08:00;True|2025-08-26T09:56:19.7100523+08:00;True|2025-08-26T09:51:10.1388633+08:00;True|2025-08-26T09:44:17.2173284+08:00;True|2025-08-26T09:36:15.5978463+08:00;False|2025-08-26T09:35:33.7420993+08:00;True|2025-08-25T15:01:50.5666742+08:00;True|2025-08-25T14:36:52.7376096+08:00;True|2025-08-25T14:29:34.9048354+08:00;True|2025-08-25T13:55:21.2896736+08:00;False|2025-08-25T13:53:29.3900423+08:00;True|2025-08-21T16:22:43.4480748+08:00;True|2025-08-21T16:13:59.7952292+08:00;True|2025-08-21T16:08:00.4465834+08:00;True|2025-08-21T15:47:33.0090744+08:00;False|2025-08-21T15:44:54.3140769+08:00;True|2025-08-20T13:59:43.5478179+08:00;True|2025-08-20T09:42:23.4176514+08:00;True|2025-08-20T08:58:41.0775117+08:00;False|2025-08-20T08:57:48.1366515+08:00;True|2025-08-19T16:07:02.0546263+08:00;True|2025-08-19T13:54:20.3065647+08:00;True|2025-08-19T13:04:16.6242527+08:00;False|2025-08-19T13:03:35.6928433+08:00;True|2025-08-18T13:03:14.7153952+08:00;True|2025-08-18T10:28:34.6874829+08:00;False|2025-08-18T10:22:59.8356232+08:00;True|2025-08-15T08:49:26.9915062+08:00;True|2025-08-15T08:40:21.8574257+08:00;True|2025-08-15T08:33:10.0952126+08:00;True|2025-08-12T11:00:19.2136555+08:00;True|2025-08-12T08:16:54.4308560+08:00;False|2025-08-12T08:16:20.5681009+08:00;True|2025-08-11T09:33:02.5662651+08:00;True|2025-08-11T09:29:33.8368533+08:00;True|2025-08-11T09:21:37.6200426+08:00;True|2025-08-11T09:17:43.9802106+08:00;True|2025-08-11T08:52:44.9690249+08:00;True|2025-08-11T08:26:58.0223608+08:00;False|2025-08-11T08:26:23.1079192+08:00;True|2025-08-08T15:39:38.6720210+08:00;True|2025-08-08T14:20:03.4053835+08:00;True|2025-08-08T13:13:34.5963008+08:00;False|2025-08-08T13:12:52.5341192+08:00;True|2025-08-07T13:09:32.3688293+08:00;False|2025-08-07T13:09:23.7335601+08:00;True|2025-08-06T15:13:44.9956787+08:00;True|2025-08-06T12:29:30.0783854+08:00;False|2025-08-06T12:29:22.9174579+08:00;True|2025-08-05T11:46:04.9109530+08:00;True|2025-08-05T09:12:36.4757799+08:00;False|2025-08-05T09:12:29.5152051+08:00;True|2025-08-04T22:16:55.8153764+08:00;False|2025-08-04T22:16:45.6812380+08:00;True|2025-08-04T17:48:30.5101840+08:00;True|2025-08-04T16:18:16.1499446+08:00;True|2025-08-04T11:40:28.5722111+08:00;False|2025-08-04T10:45:46.8681527+08:00;True|2025-07-31T15:11:55.0100072+08:00;False|2025-07-31T15:10:51.6681759+08:00;True|2025-07-30T16:00:10.5159335+08:00;True|2025-07-30T15:41:51.5648646+08:00;True|2025-07-30T15:13:07.2401528+08:00;False|2025-07-30T15:12:40.5946471+08:00;True|2025-07-29T23:14:46.2298438+08:00;False|2025-07-29T23:13:41.1630729+08:00;True|2025-07-29T14:02:02.2575808+08:00;True|2025-07-29T13:43:01.6607651+08:00;True|2025-07-29T13:21:53.3427945+08:00;False|2025-07-29T13:21:12.3710695+08:00;True|2025-07-02T16:19:48.0004187+08:00;True|2025-07-02T16:15:36.5831869+08:00;True|2025-07-02T16:09:00.5399469+08:00;True|2025-07-02T15:56:09.9783494+08:00;True|2025-07-02T15:14:06.9937801+08:00;True|2025-07-02T15:09:36.8804234+08:00;True|2025-07-02T15:05:41.0676357+08:00;True|2025-07-02T15:00:26.6768478+08:00;True|2025-07-02T14:57:55.9749557+08:00;True|2025-07-02T14:54:09.4801906+08:00;True|2025-07-02T14:48:13.1406954+08:00;True|2025-07-02T14:43:16.6621615+08:00;False|2025-07-02T14:42:39.8858427+08:00;True|2025-06-30T14:07:33.6198921+08:00;False|2025-06-30T14:06:54.9141774+08:00;True|2025-06-27T16:10:37.5346733+08:00;True|2025-06-27T15:53:52.6099110+08:00;True|2025-06-27T15:49:37.6381262+08:00;True|2025-06-27T15:45:18.4426363+08:00;True|2025-06-27T15:09:40.0483579+08:00;True|2025-06-27T15:03:45.2696849+08:00;True|2025-06-27T14:59:53.6972427+08:00;True|2025-06-27T14:56:36.5300707+08:00;True|2025-06-27T14:52:12.7121868+08:00;True|2025-06-27T14:31:22.7250138+08:00;True|2025-06-27T14:23:27.1058306+08:00;True|2025-06-27T14:13:54.1440171+08:00;True|2025-06-27T14:04:48.1872541+08:00;True|2025-06-27T14:00:10.1802914+08:00;False|2025-06-27T13:59:47.2300395+08:00;True|2025-06-26T17:03:34.2617207+08:00;True|2025-06-26T16:59:16.3043451+08:00;True|2025-06-26T16:47:46.3910675+08:00;True|2025-06-26T16:40:45.0917549+08:00;True|2025-06-26T16:19:04.7496278+08:00;True|2025-06-26T13:40:17.4650939+08:00;True|2025-06-26T08:46:10.4559278+08:00;False|2025-06-26T08:45:48.2231639+08:00;True|2025-06-25T16:40:12.2933893+08:00;True|2025-06-25T16:33:19.5628638+08:00;True|2025-06-25T16:28:13.3282882+08:00;True|2025-06-25T14:26:38.1487280+08:00;True|2025-06-25T14:23:03.3981021+08:00;True|2025-06-25T14:20:01.5127640+08:00;True|2025-06-25T14:12:47.4447383+08:00;True|2025-06-25T14:09:39.8493477+08:00;True|2025-06-25T14:04:07.9655837+08:00;False|2025-06-25T14:03:01.5528773+08:00;True|2025-06-24T14:39:55.5403167+08:00;True|2025-06-24T14:36:51.3363222+08:00;True|2025-06-24T14:33:34.6605389+08:00;True|2025-06-24T14:29:44.9508636+08:00;True|2025-06-24T14:24:49.4487525+08:00;True|2025-06-24T14:19:31.0243854+08:00;True|2025-06-24T14:15:42.8043990+08:00;True|2025-06-24T14:10:25.3126511+08:00;True|2025-06-24T14:01:11.7808866+08:00;True|2025-06-24T13:56:29.6124906+08:00;True|2025-06-24T13:42:27.5554459+08:00;True|2025-06-24T13:35:02.3147995+08:00;True|2025-06-24T13:31:15.2833438+08:00;True|2025-06-24T13:26:22.4759378+08:00;True|2025-06-24T13:22:58.0143749+08:00;False|2025-06-24T13:22:30.7295943+08:00;True|2025-06-24T13:20:08.9526835+08:00;True|2025-06-24T13:15:10.2719394+08:00;True|2025-06-20T15:38:22.6724181+08:00;True|2025-06-20T14:44:29.4284749+08:00;True|2025-06-20T14:34:29.3160274+08:00;True|2025-06-20T14:29:26.1084681+08:00;False|2025-06-20T14:28:47.7761889+08:00;True|2025-06-18T16:26:56.9181027+08:00;True|2025-06-18T16:22:48.3649541+08:00;True|2025-06-18T09:45:22.1840933+08:00;True|2025-06-18T09:38:27.4616553+08:00;True|2025-06-18T09:24:22.0260493+08:00;True|2025-06-18T08:58:42.0314631+08:00;True|2025-06-18T08:54:57.3762593+08:00;True|2025-06-18T08:52:30.6977045+08:00;True|2025-06-18T08:44:16.3868101+08:00;True|2025-06-18T08:38:06.2335478+08:00;False|2025-06-18T08:37:43.3356541+08:00;True|2025-06-18T08:32:29.9036211+08:00;True|2025-06-18T08:19:00.7253184+08:00;True|2025-06-18T08:14:01.8413793+08:00;True|2025-06-18T08:06:59.1976807+08:00;False|2025-06-18T08:06:29.3417533+08:00;True|2025-06-17T15:36:04.6217443+08:00;True|2025-06-17T15:31:43.3563632+08:00;True|2025-06-17T14:58:43.8735144+08:00;True|2025-06-17T14:39:01.2795873+08:00;True|2025-06-17T14:34:00.1695810+08:00;True|2025-06-17T14:30:54.8417757+08:00;False|2025-06-17T14:30:22.5535404+08:00;True|2025-06-17T14:26:29.1534249+08:00;True|2025-06-17T14:23:01.5750276+08:00;True|2025-06-17T14:13:44.7734613+08:00;True|2025-06-17T13:20:22.6676313+08:00;True|2025-06-17T12:45:59.6935151+08:00;True|2025-06-17T11:26:53.3105073+08:00;True|2025-06-17T11:21:58.4556792+08:00;True|2025-06-17T11:17:39.0062665+08:00;True|2025-06-17T11:14:12.1161810+08:00;True|2025-06-17T11:09:51.0123982+08:00;True|2025-06-17T11:03:35.4540889+08:00;True|2025-06-17T10:58:06.1870442+08:00;True|2025-06-17T10:47:25.6201207+08:00;True|2025-06-17T09:22:36.4275453+08:00;True|2025-06-17T09:15:44.1593969+08:00;True|2025-06-17T09:12:05.5473137+08:00;True|2025-06-17T09:08:48.4974735+08:00;True|2025-06-17T09:04:26.9345188+08:00;True|2025-06-17T09:03:36.0326872+08:00;True|2025-06-17T08:57:42.1551977+08:00;True|2025-06-17T08:53:55.5708883+08:00;True|2025-06-17T08:49:04.2922881+08:00;True|2025-06-17T08:41:04.9647614+08:00;True|2025-06-17T08:34:49.0188503+08:00;True|2025-06-17T08:29:57.4868889+08:00;True|2025-06-17T08:23:10.2489747+08:00;True|2025-06-17T08:17:38.8483538+08:00;False|2025-06-17T08:16:14.0757416+08:00;True|2025-06-13T15:52:22.7401602+08:00;False|2025-06-13T15:52:01.7388701+08:00;True|2025-06-13T15:35:05.4281004+08:00;True|2025-06-13T15:24:25.2717953+08:00;True|2025-06-13T15:13:54.7230551+08:00;True|2025-06-13T14:02:03.6551564+08:00;True|2025-06-13T11:18:18.1123581+08:00;True|2025-06-13T10:40:20.8774077+08:00;True|2025-06-13T10:36:36.1411085+08:00;False|2025-06-13T10:35:41.3893604+08:00;True|2025-06-13T10:32:13.4521145+08:00;True|2025-06-13T10:30:35.6640860+08:00;True|2025-06-03T10:51:41.3862145+08:00;False|2025-06-03T10:51:16.5345521+08:00;True|2025-05-30T20:09:32.5107276+08:00;False|2025-05-30T20:09:00.9663790+08:00;False|2025-05-30T17:15:54.5728888+08:00;True|2025-05-30T15:31:12.6393961+08:00;True|2025-05-30T14:59:23.7338679+08:00;True|2025-05-30T14:47:49.7374652+08:00;False|2025-05-30T14:46:56.5791293+08:00;True|2025-05-30T09:13:25.7216738+08:00;False|2025-05-30T09:12:56.3890721+08:00;True|2025-05-29T20:42:40.3409827+08:00;False|2025-05-29T20:42:06.9658631+08:00;True|2025-05-29T20:21:44.3234619+08:00;False|2025-05-29T20:21:05.8899839+08:00;True|2025-05-27T15:28:35.5206538+08:00;True|2025-05-27T14:10:48.2114238+08:00;True|2025-05-27T11:21:56.3013946+08:00;True|2025-05-27T11:12:39.5518701+08:00;True|2025-05-27T11:01:46.8317706+08:00;True|2025-05-27T10:58:06.6334127+08:00;True|2025-05-27T10:50:01.5656763+08:00;True|2025-05-27T09:32:10.3357581+08:00;False|2025-05-27T09:31:40.1660002+08:00;True|2025-05-22T19:13:07.9924074+08:00;True|2025-05-22T18:44:05.4014437+08:00;False|2025-05-22T18:43:42.8647214+08:00;True|2025-05-20T14:23:23.3914216+08:00;False|2025-05-20T14:22:55.1487818+08:00;True|2025-05-20T14:02:04.1738192+08:00;False|2025-05-20T14:01:35.3257179+08:00;True|2025-05-16T10:26:39.2771408+08:00;True|2025-05-16T09:56:14.9524606+08:00;True|2025-05-16T09:41:14.7986426+08:00;False|2025-05-16T09:40:49.7515669+08:00;True|2025-05-15T16:11:15.6104624+08:00;False|2025-05-15T16:10:29.3231781+08:00;True|2025-05-08T08:33:00.5573071+08:00;False|2025-05-08T08:32:20.5353159+08:00;True|2025-04-23T15:11:05.1490455+08:00;True|2025-04-23T14:22:24.5406543+08:00;False|2025-04-23T14:21:47.8685695+08:00;True|2025-04-18T13:54:27.4746888+08:00;False|2025-04-18T13:53:45.2296528+08:00;False|2025-04-18T13:53:29.7890054+08:00;False|2025-04-18T13:53:23.5770264+08:00;False|2025-04-18T13:53:18.0054565+08:00;True|2025-04-18T13:51:28.8449212+08:00;True|2025-04-18T13:24:50.1548645+08:00;True|2025-04-18T13:17:41.8781012+08:00;True|2025-04-18T13:07:11.4243777+08:00;True|2025-04-18T13:03:51.8972162+08:00;True|2025-04-18T12:59:24.3674835+08:00;True|2025-04-18T12:54:51.7546338+08:00;True|2025-04-18T12:51:54.3531129+08:00;False|2025-04-18T12:51:42.0198325+08:00;True|2025-04-18T09:11:06.5087174+08:00;False|2025-04-18T09:10:56.3178793+08:00;True|2025-04-17T11:20:10.9926709+08:00;True|2025-04-17T11:01:50.8902725+08:00;True|2025-04-17T10:53:40.1335186+08:00;True|2025-04-17T10:50:33.6109824+08:00;True|2025-04-17T10:31:35.1972930+08:00;True|2025-04-17T10:27:13.0718237+08:00;False|2025-04-17T10:27:05.4243104+08:00;True|2025-04-17T10:21:17.1039399+08:00;True|2025-04-17T10:17:30.5257362+08:00;True|2025-04-17T09:04:16.5959099+08:00;False|2025-04-17T09:04:08.5643163+08:00;True|2025-04-16T16:50:10.4001088+08:00;True|2025-04-16T16:37:30.0492166+08:00;False|2025-04-16T16:37:20.9070255+08:00;True|2025-04-15T14:55:05.4396103+08:00;True|2025-04-15T14:48:11.6729078+08:00;True|2025-04-15T14:18:53.0805178+08:00;True|2025-04-15T13:48:11.5252569+08:00;True|2025-04-15T13:37:14.4720847+08:00;True|2025-04-15T11:19:10.1766439+08:00;True|2025-04-15T11:16:15.9677953+08:00;True|2025-04-15T11:01:18.4337723+08:00;False|2025-04-15T11:01:06.9132978+08:00;True|2025-04-15T10:55:53.9650790+08:00;False|2025-04-15T10:55:45.2763971+08:00;True|2025-04-09T11:24:21.9466324+08:00;True|2025-04-09T11:14:25.0603792+08:00;True|2025-04-09T11:03:10.0252216+08:00;False|2025-04-09T11:03:01.0837419+08:00;True|2025-04-08T15:00:39.6673341+08:00;True|2025-04-08T14:55:20.5714659+08:00;True|2025-04-08T14:41:57.1855163+08:00;True|2025-04-08T13:31:03.4382266+08:00;True|2025-04-08T11:20:45.0300955+08:00;True|2025-04-08T10:59:59.6997668+08:00;False|2025-04-08T10:59:53.2827828+08:00;True|2025-04-08T10:48:17.4232977+08:00;False|2025-04-08T10:48:09.5363986+08:00;True|2025-04-03T13:53:30.6471699+08:00;False|2025-04-03T13:53:22.8762999+08:00;True|2025-04-02T12:47:31.3375226+08:00;False|2025-04-02T12:47:24.2095072+08:00;True|2025-04-01T16:29:52.7465502+08:00;False|2025-04-01T16:29:33.7844649+08:00;True|2025-03-28T16:22:29.8664470+08:00;True|2025-03-28T15:53:12.1106288+08:00;False|2025-03-28T15:53:01.4674242+08:00;True|2025-03-28T13:34:17.5506822+08:00;False|2025-03-28T13:34:09.5853308+08:00;True|2025-03-26T12:42:08.9630741+08:00;True|2025-03-26T12:40:07.7144561+08:00;True|2025-03-26T12:30:37.3503331+08:00;True|2025-03-26T12:26:47.5061658+08:00;True|2025-03-26T10:54:47.2556717+08:00;True|2025-03-26T10:49:59.7897145+08:00;True|2025-03-26T10:47:02.6195828+08:00;False|2025-03-26T10:46:54.9421244+08:00;True|2025-03-26T01:10:19.1227462+08:00;True|2025-03-26T01:00:04.3583740+08:00;True|2025-03-26T00:38:57.4757071+08:00;True|2025-03-26T00:28:24.9370188+08:00;True|2025-03-26T00:04:05.4507425+08:00;True|2025-03-25T23:06:56.2284828+08:00;False|2025-03-25T23:06:46.7023339+08:00;True|2025-03-25T22:57:08.3127897+08:00;False|2025-03-25T22:55:05.8028873+08:00;False|2025-03-25T22:54:51.2053101+08:00;False|2025-03-04T11:23:36.7757604+08:00;True|2025-02-12T14:05:06.1068587+08:00;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
+ <History>True|2025-11-07T08:34:43.8454867Z;True|2025-11-07T16:05:28.9073909+08:00;True|2025-11-07T16:01:49.1416161+08:00;True|2025-11-07T14:46:13.2471475+08:00;True|2025-11-07T14:19:47.9318085+08:00;False|2025-11-07T14:19:41.1003987+08:00;True|2025-11-05T16:02:11.0615592+08:00;False|2025-11-05T16:01:56.9412646+08:00;False|2025-11-05T15:53:20.8449563+08:00;True|2025-10-20T15:21:47.5140367+08:00;True|2025-10-20T14:04:18.3367894+08:00;False|2025-10-20T14:03:49.0696842+08:00;True|2025-10-17T10:00:49.9734449+08:00;False|2025-10-17T10:00:00.3400111+08:00;True|2025-10-16T14:33:50.0143974+08:00;True|2025-10-16T14:14:19.8272515+08:00;False|2025-10-16T14:13:52.8518376+08:00;True|2025-10-16T13:44:11.7580081+08:00;False|2025-10-16T13:43:40.6391342+08:00;True|2025-10-13T17:32:19.0994950+08:00;False|2025-10-13T17:31:43.3980965+08:00;True|2025-10-12T22:15:36.2044271+08:00;False|2025-10-12T22:15:05.5130292+08:00;True|2025-10-12T22:02:48.0519352+08:00;False|2025-10-12T22:02:03.0640348+08:00;False|2025-10-12T21:55:51.1042699+08:00;False|2025-10-12T21:55:25.7755321+08:00;False|2025-10-12T21:54:38.5630629+08:00;False|2025-10-12T21:54:00.2904646+08:00;False|2025-10-12T21:52:49.1718673+08:00;True|2025-09-29T14:19:56.3493999+08:00;True|2025-09-29T13:45:50.3942453+08:00;True|2025-09-29T13:42:06.1110553+08:00;True|2025-09-29T13:36:03.8122720+08:00;True|2025-09-29T08:02:25.4433936+08:00;False|2025-09-29T08:01:34.9956194+08:00;True|2025-09-28T16:32:32.1205217+08:00;False|2025-09-28T16:32:22.2949617+08:00;True|2025-09-26T14:52:29.3520681+08:00;True|2025-09-26T14:32:54.2746904+08:00;True|2025-09-26T14:30:03.3405779+08:00;True|2025-09-26T14:27:07.1365132+08:00;True|2025-09-26T14:17:38.1278517+08:00;False|2025-09-26T14:17:15.2222928+08:00;True|2025-09-26T13:27:46.3116713+08:00;True|2025-09-26T13:20:12.4936518+08:00;True|2025-09-26T10:02:30.8281583+08:00;False|2025-09-26T10:02:03.9362462+08:00;True|2025-09-26T09:53:20.0008961+08:00;True|2025-09-26T09:50:19.6692823+08:00;False|2025-09-26T09:49:53.3697350+08:00;True|2025-09-25T09:30:42.4579039+08:00;True|2025-09-25T09:28:06.6361895+08:00;True|2025-09-25T09:21:03.5626551+08:00;True|2025-09-25T09:07:49.5781444+08:00;True|2025-09-25T09:05:39.3361215+08:00;True|2025-09-25T08:57:49.0092670+08:00;True|2025-09-25T08:53:18.1932158+08:00;False|2025-09-25T08:52:41.4831686+08:00;True|2025-09-24T10:55:06.7583576+08:00;True|2025-09-24T10:42:07.4293256+08:00;True|2025-09-24T10:35:21.5131843+08:00;True|2025-09-24T10:01:34.6039507+08:00;False|2025-09-24T10:01:02.2423847+08:00;True|2025-09-23T14:10:09.5716580+08:00;False|2025-09-23T14:09:16.6824875+08:00;True|2025-09-23T10:19:03.9148941+08:00;False|2025-09-23T10:18:54.9945094+08:00;True|2025-09-22T16:10:40.3493996+08:00;True|2025-09-22T16:06:30.7648048+08:00;True|2025-09-22T15:58:01.2588123+08:00;True|2025-09-22T13:22:29.7402684+08:00;True|2025-09-22T10:50:24.6032398+08:00;True|2025-09-22T10:18:57.4239252+08:00;True|2025-09-22T09:44:34.1606021+08:00;True|2025-09-22T09:37:22.2102591+08:00;False|2025-09-22T09:37:13.3244518+08:00;False|2025-09-22T09:37:05.6707374+08:00;True|2025-09-22T09:20:00.1335697+08:00;True|2025-09-22T08:50:45.0839990+08:00;False|2025-09-22T08:50:39.5078616+08:00;True|2025-09-19T16:54:50.1840540+08:00;True|2025-09-19T15:58:56.7629702+08:00;True|2025-09-19T15:34:55.4164772+08:00;True|2025-09-19T15:19:17.0615575+08:00;False|2025-09-19T15:17:40.3055696+08:00;True|2025-09-17T16:33:38.7832139+08:00;False|2025-09-17T16:32:33.8056170+08:00;True|2025-09-15T15:31:28.0110309+08:00;True|2025-09-15T08:59:48.0264567+08:00;True|2025-09-15T08:55:35.9132476+08:00;False|2025-09-15T08:55:15.9462000+08:00;True|2025-09-10T15:37:27.9811453+08:00;True|2025-09-10T15:31:46.7985512+08:00;True|2025-09-10T15:25:13.0432246+08:00;True|2025-09-10T15:04:50.9925337+08:00;True|2025-09-10T14:45:51.9588268+08:00;True|2025-09-10T13:39:21.5732215+08:00;True|2025-09-10T13:30:34.6821425+08:00;False|2025-09-10T13:29:58.0985305+08:00;True|2025-09-10T11:09:10.4474163+08:00;True|2025-09-10T11:01:18.2664245+08:00;False|2025-09-10T11:01:11.7600095+08:00;True|2025-09-09T11:11:08.2737365+08:00;True|2025-09-09T10:48:12.8653988+08:00;True|2025-09-09T10:45:55.8371735+08:00;False|2025-09-09T10:45:50.0271007+08:00;True|2025-09-05T15:34:30.9324454+08:00;True|2025-09-05T15:25:04.5703586+08:00;True|2025-09-05T15:18:44.7836555+08:00;True|2025-09-05T15:18:15.3564889+08:00;True|2025-09-05T15:14:02.2490100+08:00;True|2025-09-05T15:13:22.0106066+08:00;True|2025-09-05T15:07:13.1733932+08:00;True|2025-09-05T14:34:49.5160527+08:00;True|2025-09-05T14:25:56.7476432+08:00;True|2025-09-05T14:11:06.6130566+08:00;True|2025-09-05T14:06:03.3723817+08:00;True|2025-09-05T13:59:08.2676824+08:00;True|2025-09-05T13:55:29.3608816+08:00;True|2025-09-05T13:50:19.1500461+08:00;True|2025-09-05T13:44:07.8244320+08:00;True|2025-09-05T13:32:55.8727194+08:00;True|2025-09-05T13:32:31.4266652+08:00;True|2025-09-05T13:29:54.4476848+08:00;True|2025-09-05T13:20:46.5358233+08:00;True|2025-09-05T13:12:44.2176702+08:00;True|2025-09-05T13:01:20.7462374+08:00;True|2025-09-05T13:00:45.2360436+08:00;True|2025-09-05T12:50:48.1213509+08:00;False|2025-09-05T12:50:41.6099269+08:00;True|2025-09-04T10:26:10.4040299+08:00;True|2025-09-04T10:22:55.8468850+08:00;True|2025-09-04T10:12:00.1744374+08:00;True|2025-09-04T10:11:20.8053602+08:00;False|2025-09-04T10:10:37.1981071+08:00;True|2025-09-03T16:53:33.7806439+08:00;True|2025-09-03T16:23:53.1760759+08:00;True|2025-09-03T16:13:51.7648089+08:00;True|2025-09-01T11:27:28.5171063+08:00;True|2025-09-01T09:10:26.2807200+08:00;True|2025-08-30T16:17:23.6280447+08:00;True|2025-08-30T16:08:45.2704012+08:00;False|2025-08-30T16:07:49.5332724+08:00;True|2025-08-29T13:42:08.9331590+08:00;True|2025-08-29T09:30:26.3865231+08:00;True|2025-08-29T09:26:59.6931531+08:00;True|2025-08-29T09:24:15.7633865+08:00;True|2025-08-29T09:20:15.7248945+08:00;True|2025-08-29T09:16:10.8305341+08:00;False|2025-08-29T09:15:37.6509149+08:00;True|2025-08-29T09:10:52.5758523+08:00;True|2025-08-29T09:07:28.0167672+08:00;True|2025-08-29T08:37:03.5161584+08:00;False|2025-08-29T08:36:22.9701878+08:00;True|2025-08-28T09:09:16.5053336+08:00;False|2025-08-28T09:08:31.8483468+08:00;True|2025-08-27T15:23:37.2451244+08:00;True|2025-08-27T14:08:19.4652541+08:00;True|2025-08-27T10:30:22.9583542+08:00;True|2025-08-27T10:24:39.3809926+08:00;True|2025-08-27T10:19:14.5440743+08:00;False|2025-08-27T10:18:22.9365507+08:00;True|2025-08-26T16:22:15.9301705+08:00;True|2025-08-26T16:15:50.6064453+08:00;False|2025-08-26T16:13:43.3734036+08:00;True|2025-08-26T10:03:33.2470619+08:00;True|2025-08-26T09:56:19.7100523+08:00;True|2025-08-26T09:51:10.1388633+08:00;True|2025-08-26T09:44:17.2173284+08:00;True|2025-08-26T09:36:15.5978463+08:00;False|2025-08-26T09:35:33.7420993+08:00;True|2025-08-25T15:01:50.5666742+08:00;True|2025-08-25T14:36:52.7376096+08:00;True|2025-08-25T14:29:34.9048354+08:00;True|2025-08-25T13:55:21.2896736+08:00;False|2025-08-25T13:53:29.3900423+08:00;True|2025-08-21T16:22:43.4480748+08:00;True|2025-08-21T16:13:59.7952292+08:00;True|2025-08-21T16:08:00.4465834+08:00;True|2025-08-21T15:47:33.0090744+08:00;False|2025-08-21T15:44:54.3140769+08:00;True|2025-08-20T13:59:43.5478179+08:00;True|2025-08-20T09:42:23.4176514+08:00;True|2025-08-20T08:58:41.0775117+08:00;False|2025-08-20T08:57:48.1366515+08:00;True|2025-08-19T16:07:02.0546263+08:00;True|2025-08-19T13:54:20.3065647+08:00;True|2025-08-19T13:04:16.6242527+08:00;False|2025-08-19T13:03:35.6928433+08:00;True|2025-08-18T13:03:14.7153952+08:00;True|2025-08-18T10:28:34.6874829+08:00;False|2025-08-18T10:22:59.8356232+08:00;True|2025-08-15T08:49:26.9915062+08:00;True|2025-08-15T08:40:21.8574257+08:00;True|2025-08-15T08:33:10.0952126+08:00;True|2025-08-12T11:00:19.2136555+08:00;True|2025-08-12T08:16:54.4308560+08:00;False|2025-08-12T08:16:20.5681009+08:00;True|2025-08-11T09:33:02.5662651+08:00;True|2025-08-11T09:29:33.8368533+08:00;True|2025-08-11T09:21:37.6200426+08:00;True|2025-08-11T09:17:43.9802106+08:00;True|2025-08-11T08:52:44.9690249+08:00;True|2025-08-11T08:26:58.0223608+08:00;False|2025-08-11T08:26:23.1079192+08:00;True|2025-08-08T15:39:38.6720210+08:00;True|2025-08-08T14:20:03.4053835+08:00;True|2025-08-08T13:13:34.5963008+08:00;False|2025-08-08T13:12:52.5341192+08:00;True|2025-08-07T13:09:32.3688293+08:00;False|2025-08-07T13:09:23.7335601+08:00;True|2025-08-06T15:13:44.9956787+08:00;True|2025-08-06T12:29:30.0783854+08:00;False|2025-08-06T12:29:22.9174579+08:00;True|2025-08-05T11:46:04.9109530+08:00;True|2025-08-05T09:12:36.4757799+08:00;False|2025-08-05T09:12:29.5152051+08:00;True|2025-08-04T22:16:55.8153764+08:00;False|2025-08-04T22:16:45.6812380+08:00;True|2025-08-04T17:48:30.5101840+08:00;True|2025-08-04T16:18:16.1499446+08:00;True|2025-08-04T11:40:28.5722111+08:00;False|2025-08-04T10:45:46.8681527+08:00;True|2025-07-31T15:11:55.0100072+08:00;False|2025-07-31T15:10:51.6681759+08:00;True|2025-07-30T16:00:10.5159335+08:00;True|2025-07-30T15:41:51.5648646+08:00;True|2025-07-30T15:13:07.2401528+08:00;False|2025-07-30T15:12:40.5946471+08:00;True|2025-07-29T23:14:46.2298438+08:00;False|2025-07-29T23:13:41.1630729+08:00;True|2025-07-29T14:02:02.2575808+08:00;True|2025-07-29T13:43:01.6607651+08:00;True|2025-07-29T13:21:53.3427945+08:00;False|2025-07-29T13:21:12.3710695+08:00;True|2025-07-02T16:19:48.0004187+08:00;True|2025-07-02T16:15:36.5831869+08:00;True|2025-07-02T16:09:00.5399469+08:00;True|2025-07-02T15:56:09.9783494+08:00;True|2025-07-02T15:14:06.9937801+08:00;True|2025-07-02T15:09:36.8804234+08:00;True|2025-07-02T15:05:41.0676357+08:00;True|2025-07-02T15:00:26.6768478+08:00;True|2025-07-02T14:57:55.9749557+08:00;True|2025-07-02T14:54:09.4801906+08:00;True|2025-07-02T14:48:13.1406954+08:00;True|2025-07-02T14:43:16.6621615+08:00;False|2025-07-02T14:42:39.8858427+08:00;True|2025-06-30T14:07:33.6198921+08:00;False|2025-06-30T14:06:54.9141774+08:00;True|2025-06-27T16:10:37.5346733+08:00;True|2025-06-27T15:53:52.6099110+08:00;True|2025-06-27T15:49:37.6381262+08:00;True|2025-06-27T15:45:18.4426363+08:00;True|2025-06-27T15:09:40.0483579+08:00;True|2025-06-27T15:03:45.2696849+08:00;True|2025-06-27T14:59:53.6972427+08:00;True|2025-06-27T14:56:36.5300707+08:00;True|2025-06-27T14:52:12.7121868+08:00;True|2025-06-27T14:31:22.7250138+08:00;True|2025-06-27T14:23:27.1058306+08:00;True|2025-06-27T14:13:54.1440171+08:00;True|2025-06-27T14:04:48.1872541+08:00;True|2025-06-27T14:00:10.1802914+08:00;False|2025-06-27T13:59:47.2300395+08:00;True|2025-06-26T17:03:34.2617207+08:00;True|2025-06-26T16:59:16.3043451+08:00;True|2025-06-26T16:47:46.3910675+08:00;True|2025-06-26T16:40:45.0917549+08:00;True|2025-06-26T16:19:04.7496278+08:00;True|2025-06-26T13:40:17.4650939+08:00;True|2025-06-26T08:46:10.4559278+08:00;False|2025-06-26T08:45:48.2231639+08:00;True|2025-06-25T16:40:12.2933893+08:00;True|2025-06-25T16:33:19.5628638+08:00;True|2025-06-25T16:28:13.3282882+08:00;True|2025-06-25T14:26:38.1487280+08:00;True|2025-06-25T14:23:03.3981021+08:00;True|2025-06-25T14:20:01.5127640+08:00;True|2025-06-25T14:12:47.4447383+08:00;True|2025-06-25T14:09:39.8493477+08:00;True|2025-06-25T14:04:07.9655837+08:00;False|2025-06-25T14:03:01.5528773+08:00;True|2025-06-24T14:39:55.5403167+08:00;True|2025-06-24T14:36:51.3363222+08:00;True|2025-06-24T14:33:34.6605389+08:00;True|2025-06-24T14:29:44.9508636+08:00;True|2025-06-24T14:24:49.4487525+08:00;True|2025-06-24T14:19:31.0243854+08:00;True|2025-06-24T14:15:42.8043990+08:00;True|2025-06-24T14:10:25.3126511+08:00;True|2025-06-24T14:01:11.7808866+08:00;True|2025-06-24T13:56:29.6124906+08:00;True|2025-06-24T13:42:27.5554459+08:00;True|2025-06-24T13:35:02.3147995+08:00;True|2025-06-24T13:31:15.2833438+08:00;True|2025-06-24T13:26:22.4759378+08:00;True|2025-06-24T13:22:58.0143749+08:00;False|2025-06-24T13:22:30.7295943+08:00;True|2025-06-24T13:20:08.9526835+08:00;True|2025-06-24T13:15:10.2719394+08:00;True|2025-06-20T15:38:22.6724181+08:00;True|2025-06-20T14:44:29.4284749+08:00;True|2025-06-20T14:34:29.3160274+08:00;True|2025-06-20T14:29:26.1084681+08:00;False|2025-06-20T14:28:47.7761889+08:00;True|2025-06-18T16:26:56.9181027+08:00;True|2025-06-18T16:22:48.3649541+08:00;True|2025-06-18T09:45:22.1840933+08:00;True|2025-06-18T09:38:27.4616553+08:00;True|2025-06-18T09:24:22.0260493+08:00;True|2025-06-18T08:58:42.0314631+08:00;True|2025-06-18T08:54:57.3762593+08:00;True|2025-06-18T08:52:30.6977045+08:00;True|2025-06-18T08:44:16.3868101+08:00;True|2025-06-18T08:38:06.2335478+08:00;False|2025-06-18T08:37:43.3356541+08:00;True|2025-06-18T08:32:29.9036211+08:00;True|2025-06-18T08:19:00.7253184+08:00;True|2025-06-18T08:14:01.8413793+08:00;True|2025-06-18T08:06:59.1976807+08:00;False|2025-06-18T08:06:29.3417533+08:00;True|2025-06-17T15:36:04.6217443+08:00;True|2025-06-17T15:31:43.3563632+08:00;True|2025-06-17T14:58:43.8735144+08:00;True|2025-06-17T14:39:01.2795873+08:00;True|2025-06-17T14:34:00.1695810+08:00;True|2025-06-17T14:30:54.8417757+08:00;False|2025-06-17T14:30:22.5535404+08:00;True|2025-06-17T14:26:29.1534249+08:00;True|2025-06-17T14:23:01.5750276+08:00;True|2025-06-17T14:13:44.7734613+08:00;True|2025-06-17T13:20:22.6676313+08:00;True|2025-06-17T12:45:59.6935151+08:00;True|2025-06-17T11:26:53.3105073+08:00;True|2025-06-17T11:21:58.4556792+08:00;True|2025-06-17T11:17:39.0062665+08:00;True|2025-06-17T11:14:12.1161810+08:00;True|2025-06-17T11:09:51.0123982+08:00;True|2025-06-17T11:03:35.4540889+08:00;True|2025-06-17T10:58:06.1870442+08:00;True|2025-06-17T10:47:25.6201207+08:00;True|2025-06-17T09:22:36.4275453+08:00;True|2025-06-17T09:15:44.1593969+08:00;True|2025-06-17T09:12:05.5473137+08:00;True|2025-06-17T09:08:48.4974735+08:00;True|2025-06-17T09:04:26.9345188+08:00;True|2025-06-17T09:03:36.0326872+08:00;True|2025-06-17T08:57:42.1551977+08:00;True|2025-06-17T08:53:55.5708883+08:00;True|2025-06-17T08:49:04.2922881+08:00;True|2025-06-17T08:41:04.9647614+08:00;True|2025-06-17T08:34:49.0188503+08:00;True|2025-06-17T08:29:57.4868889+08:00;True|2025-06-17T08:23:10.2489747+08:00;True|2025-06-17T08:17:38.8483538+08:00;False|2025-06-17T08:16:14.0757416+08:00;True|2025-06-13T15:52:22.7401602+08:00;False|2025-06-13T15:52:01.7388701+08:00;True|2025-06-13T15:35:05.4281004+08:00;True|2025-06-13T15:24:25.2717953+08:00;True|2025-06-13T15:13:54.7230551+08:00;True|2025-06-13T14:02:03.6551564+08:00;True|2025-06-13T11:18:18.1123581+08:00;True|2025-06-13T10:40:20.8774077+08:00;True|2025-06-13T10:36:36.1411085+08:00;False|2025-06-13T10:35:41.3893604+08:00;True|2025-06-13T10:32:13.4521145+08:00;True|2025-06-13T10:30:35.6640860+08:00;True|2025-06-03T10:51:41.3862145+08:00;False|2025-06-03T10:51:16.5345521+08:00;True|2025-05-30T20:09:32.5107276+08:00;False|2025-05-30T20:09:00.9663790+08:00;False|2025-05-30T17:15:54.5728888+08:00;True|2025-05-30T15:31:12.6393961+08:00;True|2025-05-30T14:59:23.7338679+08:00;True|2025-05-30T14:47:49.7374652+08:00;False|2025-05-30T14:46:56.5791293+08:00;True|2025-05-30T09:13:25.7216738+08:00;False|2025-05-30T09:12:56.3890721+08:00;True|2025-05-29T20:42:40.3409827+08:00;False|2025-05-29T20:42:06.9658631+08:00;True|2025-05-29T20:21:44.3234619+08:00;False|2025-05-29T20:21:05.8899839+08:00;True|2025-05-27T15:28:35.5206538+08:00;True|2025-05-27T14:10:48.2114238+08:00;True|2025-05-27T11:21:56.3013946+08:00;True|2025-05-27T11:12:39.5518701+08:00;True|2025-05-27T11:01:46.8317706+08:00;True|2025-05-27T10:58:06.6334127+08:00;True|2025-05-27T10:50:01.5656763+08:00;True|2025-05-27T09:32:10.3357581+08:00;False|2025-05-27T09:31:40.1660002+08:00;True|2025-05-22T19:13:07.9924074+08:00;True|2025-05-22T18:44:05.4014437+08:00;False|2025-05-22T18:43:42.8647214+08:00;True|2025-05-20T14:23:23.3914216+08:00;False|2025-05-20T14:22:55.1487818+08:00;True|2025-05-20T14:02:04.1738192+08:00;False|2025-05-20T14:01:35.3257179+08:00;True|2025-05-16T10:26:39.2771408+08:00;True|2025-05-16T09:56:14.9524606+08:00;True|2025-05-16T09:41:14.7986426+08:00;False|2025-05-16T09:40:49.7515669+08:00;True|2025-05-15T16:11:15.6104624+08:00;False|2025-05-15T16:10:29.3231781+08:00;True|2025-05-08T08:33:00.5573071+08:00;False|2025-05-08T08:32:20.5353159+08:00;True|2025-04-23T15:11:05.1490455+08:00;True|2025-04-23T14:22:24.5406543+08:00;False|2025-04-23T14:21:47.8685695+08:00;True|2025-04-18T13:54:27.4746888+08:00;False|2025-04-18T13:53:45.2296528+08:00;False|2025-04-18T13:53:29.7890054+08:00;False|2025-04-18T13:53:23.5770264+08:00;False|2025-04-18T13:53:18.0054565+08:00;True|2025-04-18T13:51:28.8449212+08:00;True|2025-04-18T13:24:50.1548645+08:00;True|2025-04-18T13:17:41.8781012+08:00;True|2025-04-18T13:07:11.4243777+08:00;True|2025-04-18T13:03:51.8972162+08:00;True|2025-04-18T12:59:24.3674835+08:00;True|2025-04-18T12:54:51.7546338+08:00;True|2025-04-18T12:51:54.3531129+08:00;False|2025-04-18T12:51:42.0198325+08:00;True|2025-04-18T09:11:06.5087174+08:00;False|2025-04-18T09:10:56.3178793+08:00;True|2025-04-17T11:20:10.9926709+08:00;True|2025-04-17T11:01:50.8902725+08:00;True|2025-04-17T10:53:40.1335186+08:00;True|2025-04-17T10:50:33.6109824+08:00;True|2025-04-17T10:31:35.1972930+08:00;True|2025-04-17T10:27:13.0718237+08:00;False|2025-04-17T10:27:05.4243104+08:00;True|2025-04-17T10:21:17.1039399+08:00;True|2025-04-17T10:17:30.5257362+08:00;True|2025-04-17T09:04:16.5959099+08:00;False|2025-04-17T09:04:08.5643163+08:00;True|2025-04-16T16:50:10.4001088+08:00;True|2025-04-16T16:37:30.0492166+08:00;False|2025-04-16T16:37:20.9070255+08:00;True|2025-04-15T14:55:05.4396103+08:00;True|2025-04-15T14:48:11.6729078+08:00;True|2025-04-15T14:18:53.0805178+08:00;True|2025-04-15T13:48:11.5252569+08:00;True|2025-04-15T13:37:14.4720847+08:00;True|2025-04-15T11:19:10.1766439+08:00;True|2025-04-15T11:16:15.9677953+08:00;True|2025-04-15T11:01:18.4337723+08:00;False|2025-04-15T11:01:06.9132978+08:00;True|2025-04-15T10:55:53.9650790+08:00;False|2025-04-15T10:55:45.2763971+08:00;True|2025-04-09T11:24:21.9466324+08:00;True|2025-04-09T11:14:25.0603792+08:00;True|2025-04-09T11:03:10.0252216+08:00;False|2025-04-09T11:03:01.0837419+08:00;True|2025-04-08T15:00:39.6673341+08:00;True|2025-04-08T14:55:20.5714659+08:00;True|2025-04-08T14:41:57.1855163+08:00;True|2025-04-08T13:31:03.4382266+08:00;True|2025-04-08T11:20:45.0300955+08:00;True|2025-04-08T10:59:59.6997668+08:00;False|2025-04-08T10:59:53.2827828+08:00;True|2025-04-08T10:48:17.4232977+08:00;False|2025-04-08T10:48:09.5363986+08:00;True|2025-04-03T13:53:30.6471699+08:00;False|2025-04-03T13:53:22.8762999+08:00;True|2025-04-02T12:47:31.3375226+08:00;False|2025-04-02T12:47:24.2095072+08:00;True|2025-04-01T16:29:52.7465502+08:00;False|2025-04-01T16:29:33.7844649+08:00;True|2025-03-28T16:22:29.8664470+08:00;True|2025-03-28T15:53:12.1106288+08:00;False|2025-03-28T15:53:01.4674242+08:00;True|2025-03-28T13:34:17.5506822+08:00;False|2025-03-28T13:34:09.5853308+08:00;True|2025-03-26T12:42:08.9630741+08:00;True|2025-03-26T12:40:07.7144561+08:00;True|2025-03-26T12:30:37.3503331+08:00;True|2025-03-26T12:26:47.5061658+08:00;True|2025-03-26T10:54:47.2556717+08:00;True|2025-03-26T10:49:59.7897145+08:00;True|2025-03-26T10:47:02.6195828+08:00;False|2025-03-26T10:46:54.9421244+08:00;True|2025-03-26T01:10:19.1227462+08:00;True|2025-03-26T01:00:04.3583740+08:00;True|2025-03-26T00:38:57.4757071+08:00;True|2025-03-26T00:28:24.9370188+08:00;True|2025-03-26T00:04:05.4507425+08:00;True|2025-03-25T23:06:56.2284828+08:00;False|2025-03-25T23:06:46.7023339+08:00;True|2025-03-25T22:57:08.3127897+08:00;False|2025-03-25T22:55:05.8028873+08:00;False|2025-03-25T22:54:51.2053101+08:00;False|2025-03-04T11:23:36.7757604+08:00;True|2025-02-12T14:05:06.1068587+08:00;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
<!-- <History>True|2025-05-30T12:09:45.0529442Z;True|2025-05-30T20:00:10.4746636+08:00;True|2025-05-30T19:57:36.8909388+08:00;True|2025-05-30T19:54:23.3709863+08:00;True|2025-05-30T19:45:59.1224560+08:00;True|2025-05-30T16:11:23.1078874+08:00;True|2025-05-30T15:25:44.1369253+08:00;False|2025-05-30T15:22:59.6023666+08:00;True|2025-05-29T16:10:27.4758580+08:00;True|2025-05-29T15:52:51.1913782+08:00;True|2025-05-29T15:04:09.5789210+08:00;True|2025-05-29T15:02:08.3369006+08:00;True|2025-05-29T14:56:02.6701408+08:00;True|2025-05-29T14:53:01.2526336+08:00;True|2025-05-29T14:06:14.4134236+08:00;True|2025-05-29T10:41:57.8589729+08:00;False|2025-05-29T10:39:13.1065954+08:00;True|2025-05-28T20:49:52.1040536+08:00;True|2025-05-28T20:29:58.7610235+08:00;True|2025-05-28T18:15:25.8543366+08:00;True|2025-05-28T18:08:49.2159745+08:00;True|2025-05-28T16:42:11.4418993+08:00;True|2025-05-28T16:28:22.4271997+08:00;True|2025-05-28T15:04:01.9930101+08:00;True|2025-05-28T14:59:50.5569363+08:00;False|2025-05-28T14:56:53.2197560+08:00;True|2025-05-27T18:43:26.0645332+08:00;True|2025-05-27T18:39:48.9213232+08:00;True|2025-05-27T18:31:00.6833134+08:00;True|2025-05-27T18:14:59.2401391+08:00;True|2025-05-27T18:08:30.5462780+08:00;True|2025-05-27T10:38:24.2792089+08:00;True|2025-05-27T10:35:14.0648253+08:00;True|2025-05-27T09:16:15.6299226+08:00;True|2025-05-27T09:12:14.8112320+08:00;False|2025-05-27T09:10:17.1762667+08:00;True|2025-05-26T20:46:47.2266490+08:00;True|2025-05-26T20:11:25.6943227+08:00;True|2025-05-26T20:06:54.0567323+08:00;True|2025-05-26T20:02:04.0505311+08:00;True|2025-05-26T19:52:14.7038690+08:00;False|2025-05-26T19:46:38.1383433+08:00;True|2025-05-26T14:58:12.1359700+08:00;True|2025-05-26T14:54:29.9414372+08:00;True|2025-05-26T14:50:27.3163470+08:00;True|2025-05-26T14:44:56.5112541+08:00;False|2025-05-26T14:40:09.3953370+08:00;True|2025-05-26T14:25:54.4627693+08:00;False|2025-05-26T14:24:14.2496726+08:00;True|2025-05-22T15:38:35.3926523+08:00;True|2025-05-22T15:35:00.5689883+08:00;True|2025-05-22T14:42:49.5863941+08:00;True|2025-05-22T14:36:46.1020298+08:00;True|2025-05-22T14:32:53.2788353+08:00;True|2025-05-22T14:29:17.0533776+08:00;True|2025-05-22T14:24:40.1069304+08:00;False|2025-05-22T14:23:17.8312640+08:00;True|2025-05-21T15:28:11.4510589+08:00;True|2025-05-21T15:15:40.5460368+08:00;False|2025-05-21T15:12:30.3957240+08:00;True|2025-05-20T20:28:55.1865798+08:00;True|2025-05-20T20:15:51.1649682+08:00;True|2025-05-20T20:02:38.4286705+08:00;True|2025-05-20T19:56:10.5284769+08:00;True|2025-05-20T19:45:37.6791824+08:00;False|2025-05-20T19:42:43.1477567+08:00;True|2025-05-19T15:21:07.7633659+08:00;True|2025-05-19T15:18:18.7396942+08:00;True|2025-05-19T15:13:00.1330400+08:00;True|2025-05-19T14:49:49.2534084+08:00;True|2025-05-19T14:37:59.0451180+08:00;True|2025-05-19T14:33:11.8539600+08:00;True|2025-05-19T14:27:59.3745627+08:00;True|2025-05-19T14:18:26.3913082+08:00;True|2025-05-19T14:00:37.9360187+08:00;False|2025-05-19T13:58:41.7143238+08:00;True|2025-05-12T14:57:55.0385595+08:00;True|2025-05-12T13:06:26.8782755+08:00;True|2025-05-12T12:53:08.7545688+08:00;True|2025-05-12T12:27:23.2918738+08:00;True|2025-05-12T12:14:00.1464431+08:00;True|2025-05-12T11:30:29.5971323+08:00;True|2025-05-12T11:25:21.8905995+08:00;True|2025-05-12T11:19:11.3233309+08:00;True|2025-05-12T11:06:09.4136287+08:00;True|2025-05-12T10:10:42.1771130+08:00;True|2025-05-12T10:09:14.6246190+08:00;True|2025-05-12T08:44:01.0613625+08:00;False|2025-05-12T08:42:33.7100817+08:00;True|2025-05-09T09:52:01.5341669+08:00;True|2025-05-09T09:47:27.3989887+08:00;True|2025-05-09T09:42:36.2617901+08:00;False|2025-05-09T09:40:08.0947782+08:00;True|2025-05-08T16:00:29.8759120+08:00;True|2025-05-08T13:24:39.2927841+08:00;True|2025-05-08T13:14:18.5422608+08:00;True|2025-05-08T12:47:12.7136145+08:00;True|2025-05-08T12:41:36.1177461+08:00;True|2025-05-08T12:41:04.5029523+08:00;True|2025-05-08T12:32:03.0031025+08:00;True|2025-05-08T12:00:14.8603925+08:00;True|2025-05-08T11:23:29.4928832+08:00;True|2025-05-08T11:22:57.1560531+08:00;True|2025-05-08T11:16:10.4999105+08:00;False|2025-05-08T11:14:23.0464674+08:00;True|2025-05-07T13:31:07.7140287+08:00;False|2025-05-07T13:30:22.3469816+08:00;True|2025-05-06T13:31:16.7226626+08:00;True|2025-05-06T11:05:36.8250941+08:00;True|2025-05-06T10:25:27.0035953+08:00;True|2025-05-06T09:55:27.8816646+08:00;True|2025-05-06T09:48:24.2023114+08:00;True|2025-05-06T09:36:31.5646471+08:00;True|2025-05-06T09:31:22.0639528+08:00;False|2025-05-06T09:30:02.7830632+08:00;True|2025-04-30T15:20:59.1827605+08:00;True|2025-04-30T15:14:37.3331777+08:00;True|2025-04-30T13:14:51.3154029+08:00;True|2025-04-30T13:14:15.0963455+08:00;True|2025-04-30T13:10:13.3727222+08:00;False|2025-04-30T13:06:39.8843484+08:00;False|2025-04-30T13:05:01.8963304+08:00;True|2025-04-30T10:23:53.7061459+08:00;True|2025-04-30T10:18:28.2879871+08:00;True|2025-04-30T10:14:38.6366499+08:00;True|2025-04-30T10:02:44.3278308+08:00;True|2025-04-30T09:53:29.6346041+08:00;True|2025-04-30T09:45:29.5572300+08:00;True|2025-04-30T09:14:32.0665725+08:00;True|2025-04-30T09:07:25.5826394+08:00;True|2025-04-30T09:01:28.5360494+08:00;False|2025-04-30T08:59:36.4959754+08:00;True|2025-04-29T16:32:47.7145278+08:00;True|2025-04-29T15:41:44.7116258+08:00;True|2025-04-29T15:32:49.4490248+08:00;False|2025-04-29T15:25:51.5282600+08:00;False|2025-04-29T15:23:33.1022530+08:00;True|2025-04-29T14:39:42.0427387+08:00;True|2025-04-29T14:14:37.1424704+08:00;True|2025-04-29T13:53:06.8818046+08:00;True|2025-04-29T13:38:29.5948294+08:00;True|2025-04-29T08:50:02.3834885+08:00;True|2025-04-29T08:45:53.9723523+08:00;True|2025-04-29T08:41:10.0539041+08:00;True|2025-04-29T08:40:36.8094165+08:00;True|2025-04-29T08:36:14.3169515+08:00;True|2025-04-29T08:18:50.9294272+08:00;True|2025-04-29T08:13:21.0111785+08:00;True|2025-04-29T08:08:41.1470031+08:00;False|2025-04-29T08:08:00.8674071+08:00;True|2025-04-24T14:03:47.0390589+08:00;True|2025-04-24T13:08:57.8491077+08:00;True|2025-04-24T11:15:53.7224800+08:00;True|2025-04-24T11:12:55.2113887+08:00;False|2025-04-24T11:09:59.9499198+08:00;True|2025-04-21T16:51:11.0234671+08:00;False|2025-04-21T16:50:27.9924375+08:00;True|2025-04-21T16:28:02.4554241+08:00;True|2025-04-21T16:26:45.7389516+08:00;True|2025-04-21T16:17:59.3641418+08:00;True|2025-04-21T16:11:42.4953735+08:00;False|2025-04-21T16:10:57.0902986+08:00;False|2025-04-21T16:08:30.7814654+08:00;False|2025-04-21T16:06:31.1495468+08:00;False|2025-04-21T15:32:02.6951071+08:00;False|2025-04-21T15:31:03.0207208+08:00;False|2025-04-21T15:27:46.3232315+08:00;False|2025-04-21T15:26:04.3356811+08:00;False|2025-04-21T15:24:39.2075383+08:00;True|2025-04-03T13:53:30.6471699+08:00;False|2025-04-03T13:53:22.8762999+08:00;True|2025-04-02T12:47:31.3375226+08:00;False|2025-04-02T12:47:24.2095072+08:00;True|2025-04-01T16:29:52.7465502+08:00;False|2025-04-01T16:29:33.7844649+08:00;True|2025-03-28T16:22:29.8664470+08:00;True|2025-03-28T15:53:12.1106288+08:00;False|2025-03-28T15:53:01.4674242+08:00;True|2025-03-28T13:34:17.5506822+08:00;False|2025-03-28T13:34:09.5853308+08:00;True|2025-03-26T12:42:08.9630741+08:00;True|2025-03-26T12:40:07.7144561+08:00;True|2025-03-26T12:30:37.3503331+08:00;True|2025-03-26T12:26:47.5061658+08:00;True|2025-03-26T10:54:47.2556717+08:00;True|2025-03-26T10:49:59.7897145+08:00;True|2025-03-26T10:47:02.6195828+08:00;False|2025-03-26T10:46:54.9421244+08:00;True|2025-03-26T01:10:19.1227462+08:00;True|2025-03-26T01:00:04.3583740+08:00;True|2025-03-26T00:38:57.4757071+08:00;True|2025-03-26T00:28:24.9370188+08:00;True|2025-03-26T00:04:05.4507425+08:00;True|2025-03-25T23:06:56.2284828+08:00;False|2025-03-25T23:06:46.7023339+08:00;True|2025-03-25T22:57:08.3127897+08:00;False|2025-03-25T22:55:05.8028873+08:00;False|2025-03-25T22:54:51.2053101+08:00;False|2025-03-04T11:23:36.7757604+08:00;True|2025-02-12T14:05:06.1068587+08:00;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History> -->
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
<!-- <publishTime>04/21/2025 11:46:17</publishTime> -->
</File>
<File Include="BarCodeTemplate/barCodeTemplateStorage.json">
@@ -51,28 +51,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>11/04/2025 19:16:21</publishTime>
+ <publishTime>11/07/2025 16:34:21</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>11/04/2025 19:16:21</publishTime>
+ <publishTime>11/07/2025 16:34:21</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>11/04/2025 19:16:20</publishTime>
+ <publishTime>11/07/2025 16:34:20</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>11/04/2025 19:16:20</publishTime>
+ <publishTime>11/07/2025 16:34:20</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>11/04/2025 19:16:16</publishTime>
+ <publishTime>11/07/2025 16:34:15</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>11/04/2025 19:16:16</publishTime>
+ <publishTime>11/07/2025 16:34:15</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -99,7 +99,7 @@
<publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
<!-- <publishTime>04/21/2025 11:46:16</publishTime> -->
</File>
<File Include="bin/libgrpc_csharp_ext.x64.dylib">
@@ -118,13 +118,13 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>11/04/2025 19:16:16</publishTime>
+ <publishTime>11/07/2025 16:34:16</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>11/04/2025 19:16:16</publishTime>
+ <publishTime>11/07/2025 16:34:16</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/08/2023 15:09:56</publishTime>
@@ -154,34 +154,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>11/04/2025 19:16:14</publishTime>
+ <publishTime>11/07/2025 16:34:13</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>11/04/2025 19:16:14</publishTime>
+ <publishTime>11/07/2025 16:34:13</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>11/04/2025 19:16:15</publishTime>
+ <publishTime>11/07/2025 16:34:14</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>11/04/2025 19:16:15</publishTime>
+ <publishTime>11/07/2025 16:34:14</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>11/04/2025 19:16:15</publishTime>
+ <publishTime>11/07/2025 16:34:14</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>11/04/2025 19:16:15</publishTime>
+ <publishTime>11/07/2025 16:34:14</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>11/04/2025 19:16:13</publishTime>
+ <publishTime>11/07/2025 16:34:10</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>11/04/2025 19:16:13</publishTime>
+ <publishTime>11/07/2025 16:34:10</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -259,7 +259,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -292,22 +292,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>11/04/2025 19:16:17</publishTime>
+ <publishTime>11/07/2025 16:34:15</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>11/04/2025 19:16:17</publishTime>
+ <publishTime>11/07/2025 16:34:15</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>11/04/2025 19:16:27</publishTime>
+ <publishTime>11/07/2025 16:34:32</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>11/04/2025 19:16:27</publishTime>
+ <publishTime>11/07/2025 16:34:32</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>11/04/2025 19:16:41</publishTime>
+ <publishTime>11/07/2025 16:34:36</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -319,58 +319,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>04/21/2025 11:46:15</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>04/21/2025 11:46:15</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>04/21/2025 11:46:15</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>04/21/2025 11:46:15</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -379,7 +379,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -388,124 +388,124 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>07/12/2023 08:14:21</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>04/21/2025 11:46:16</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="packages.config">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>09/19/2024 10:10:46</publishTime>
</File>
<File Include="Template/barCodeTemplateStorage.json">
- <publishTime>08/29/2025 09:43:09</publishTime>
+ <publishTime>09/01/2025 08:23:20</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>04/21/2025 11:46:17</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>05/06/2024 13:47:57</publishTime>
</File>
<File Include="Web.config">
- <publishTime>11/04/2025 19:17:45</publishTime>
+ <publishTime>11/07/2025 16:34:42</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 f4e97db..a171ce0 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-11-03T05:35:15.5366201Z;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-11-17T01:27:55.7259977Z;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>11/03/2025 13:34:06</publishTime>
+ <publishTime>11/17/2025 16:08:34</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>11/03/2025 13:34:06</publishTime>
+ <publishTime>11/17/2025 16:08:34</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>11/03/2025 13:33:58</publishTime>
+ <publishTime>11/17/2025 16:08:31</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>11/03/2025 13:33:58</publishTime>
+ <publishTime>11/17/2025 16:08:31</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>11/03/2025 13:33:48</publishTime>
+ <publishTime>11/17/2025 16:08:27</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>11/03/2025 13:33:48</publishTime>
+ <publishTime>11/17/2025 16:08:27</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>11/03/2025 13:33:53</publishTime>
+ <publishTime>11/17/2025 16:08:29</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>11/03/2025 13:33:53</publishTime>
+ <publishTime>11/17/2025 16:08:29</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/18/2025 16:11:18</publishTime>
@@ -147,25 +147,25 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>11/03/2025 13:33:41</publishTime>
+ <publishTime>11/17/2025 16:08:25</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>11/03/2025 13:33:41</publishTime>
+ <publishTime>11/17/2025 16:08:25</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>11/03/2025 13:33:45</publishTime>
+ <publishTime>11/17/2025 16:08:26</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>11/03/2025 13:33:45</publishTime>
+ <publishTime>11/17/2025 16:08:26</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>11/03/2025 13:33:45</publishTime>
+ <publishTime>11/17/2025 16:08:26</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>11/03/2025 13:33:45</publishTime>
+ <publishTime>11/17/2025 16:08:26</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>11/03/2025 13:33:44</publishTime>
+ <publishTime>11/17/2025 16:08:26</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>11/03/2025 13:33:44</publishTime>
+ <publishTime>11/17/2025 16:08:26</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>11/03/2025 13:34:23</publishTime>
+ <publishTime>11/17/2025 16:08:45</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>11/03/2025 13:34:23</publishTime>
+ <publishTime>11/17/2025 16:08:45</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
@@ -498,7 +498,7 @@
<publishTime>04/29/2024 08:30:03</publishTime>
</File>
<File Include="Web.config">
- <publishTime>11/03/2025 13:35:12</publishTime>
+ <publishTime>11/17/2025 16:09:58</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
index 2ced14c..3a80c89 100644
--- a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
@@ -5,11 +5,15 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
+<<<<<<< HEAD
<History>True|2025-11-20T07:22:39.3935923Z;True|2025-11-20T15:10:21.2380303+08:00;True|2025-11-20T11:31:01.4696819+08:00;False|2025-11-20T11:26:35.6553578+08:00;True|2025-11-14T09:35:49.2182873+08:00;False|2025-11-14T09:30:58.7367678+08:00;True|2025-11-13T16:12:28.4711680+08:00;True|2025-11-13T16:01:01.9808527+08:00;True|2025-11-13T15:54:36.3117342+08:00;True|2025-11-13T15:43:52.8224051+08:00;False|2025-11-13T15:41:05.1307216+08:00;True|2025-11-06T19:21:00.7914472+08:00;True|2025-11-06T19:14:26.9765718+08:00;True|2025-11-06T12:55:56.0208932+08:00;True|2025-11-06T12:52:49.5813940+08:00;True|2025-11-06T10:59:45.1102977+08:00;False|2025-11-06T10:57:46.6088633+08:00;True|2025-11-05T15:43:39.3774100+08:00;False|2025-11-05T15:36:21.0652785+08:00;True|2025-11-05T13:34:36.2693873+08:00;True|2025-11-05T13:26:56.7405745+08:00;False|2025-11-05T13:25:26.5283561+08:00;True|2025-11-05T13:09:11.5464917+08:00;True|2025-11-05T11:29:10.2440646+08:00;False|2025-11-05T11:25:30.2261523+08:00;True|2025-11-04T15:55:36.7389839+08:00;False|2025-11-04T15:50:10.3823467+08:00;True|2025-11-03T17:47:28.0534177+08:00;False|2025-11-03T17:45:32.0330377+08:00;False|2025-11-03T17:44:31.0234643+08:00;True|2025-11-03T16:46:31.6737971+08:00;True|2025-11-03T15:31:47.1887341+08:00;False|2025-11-03T15:24:58.5995610+08:00;True|2025-10-24T09:52:58.8066045+08:00;False|2025-10-24T09:50:59.5626675+08:00;True|2025-10-23T17:25:11.7690424+08:00;True|2025-10-23T15:56:37.3414516+08:00;True|2025-10-23T11:28:21.9899129+08:00;True|2025-10-23T10:55:55.2143820+08:00;False|2025-10-23T10:50:13.9939872+08:00;True|2025-10-23T08:48:56.7489638+08:00;False|2025-10-23T08:46:06.9380234+08:00;True|2025-10-22T13:24:32.4517457+08:00;True|2025-10-22T13:14:52.6978411+08:00;True|2025-10-22T12:38:10.4103742+08:00;True|2025-10-22T12:13:31.1805654+08:00;False|2025-10-22T11:40:08.9986668+08:00;True|2025-10-22T11:08:20.5861814+08:00;True|2025-10-22T09:37:38.3080326+08:00;False|2025-10-22T09:35:09.3574541+08:00;True|2025-10-21T16:08:56.4966266+08:00;True|2025-10-21T15:25:06.3357306+08:00;False|2025-10-21T15:22:41.7149016+08:00;True|2025-10-20T14:50:47.1241942+08:00;True|2025-10-20T14:45:42.5304904+08:00;True|2025-10-20T14:17:10.9062289+08:00;True|2025-10-20T14:15:15.7397902+08:00;False|2025-10-20T14:12:37.5558428+08:00;False|2025-10-20T14:09:57.0131208+08:00;True|2025-10-20T13:58:26.2518761+08:00;True|2025-10-20T13:55:56.3549666+08:00;True|2025-10-20T13:17:37.6632220+08:00;False|2025-10-20T13:15:59.5621533+08:00;True|2025-10-20T11:14:22.2170121+08:00;True|2025-10-20T11:10:25.0072488+08:00;False|2025-10-20T11:08:24.7275434+08:00;True|2025-10-20T10:25:35.3193847+08:00;True|2025-10-20T10:20:14.8074035+08:00;False|2025-10-20T10:17:15.3929008+08:00;True|2025-10-19T14:35:10.9395863+08:00;True|2025-10-19T14:23:40.8671794+08:00;True|2025-10-19T14:13:09.2729359+08:00;False|2025-10-19T14:10:57.4726058+08:00;True|2025-10-19T11:59:19.1660855+08:00;True|2025-10-19T11:47:16.4699144+08:00;True|2025-10-19T11:45:35.4143220+08:00;True|2025-10-19T11:31:53.0209769+08:00;True|2025-10-19T10:47:57.3931727+08:00;True|2025-10-19T10:45:06.6812418+08:00;False|2025-10-19T10:42:54.2163177+08:00;True|2025-10-19T10:20:06.4782131+08:00;False|2025-10-19T10:18:01.8058657+08:00;True|2025-10-17T11:10:09.1489159+08:00;True|2025-10-17T10:33:04.7168767+08:00;False|2025-10-17T10:27:11.3138860+08:00;True|2025-10-16T12:29:24.1716426+08:00;True|2025-10-16T12:20:41.5817250+08:00;True|2025-10-16T10:19:01.8439680+08:00;True|2025-10-16T10:02:02.5889100+08:00;False|2025-10-16T10:00:38.1610021+08:00;True|2025-10-15T20:46:58.1522873+08:00;False|2025-10-15T20:42:53.0506824+08:00;True|2025-10-15T17:36:57.4541860+08:00;False|2025-10-15T17:34:10.9457782+08:00;True|2025-10-15T17:19:52.5991524+08:00;True|2025-10-15T16:09:57.9276298+08:00;False|2025-10-15T16:08:24.3962303+08:00;True|2025-10-15T10:09:08.0107312+08:00;True|2025-10-09T15:24:42.4560259+08:00;False|2025-10-09T15:20:43.4377150+08:00;True|2025-09-28T17:39:01.4122102+08:00;True|2025-09-28T17:23:59.6256603+08:00;True|2025-09-28T17:20:10.2720630+08:00;True|2025-09-28T17:10:01.5933556+08:00;True|2025-09-28T17:01:36.2635675+08:00;False|2025-09-28T16:57:58.0434039+08:00;True|2025-09-28T15:33:28.1138855+08:00;True|2025-09-28T13:54:09.0761773+08:00;True|2025-09-28T13:43:59.6070727+08:00;True|2025-09-28T11:40:32.5773904+08:00;True|2025-09-28T10:54:19.3898563+08:00;True|2025-09-28T09:02:31.2718788+08:00;True|2025-09-28T08:55:54.6379136+08:00;False|2025-09-28T08:53:05.5935208+08:00;True|2025-09-26T15:08:54.6463165+08:00;False|2025-09-26T15:06:30.8411543+08:00;True|2025-09-26T08:57:16.1799945+08:00;False|2025-09-26T08:55:20.5817252+08:00;True|2025-09-24T17:34:56.2354349+08:00;True|2025-09-24T17:26:27.8886486+08:00;True|2025-09-24T17:20:15.7029115+08:00;False|2025-09-24T17:17:28.6152388+08:00;True|2025-09-24T16:25:26.7220464+08:00;True|2025-09-24T13:42:47.8780761+08:00;True|2025-09-24T13:13:30.8791802+08:00;False|2025-09-24T13:11:56.1071557+08:00;True|2025-09-24T12:51:02.7536001+08:00;False|2025-09-24T12:48:52.2469777+08:00;True|2025-09-20T15:00:07.2952817+08:00;True|2025-09-20T14:47:01.1751178+08:00;True|2025-09-18T14:52:31.3755289+08:00;False|2025-09-18T14:50:11.5291940+08:00;True|2025-09-16T15:30:08.0145366+08:00;True|2025-09-16T15:27:31.7629600+08:00;False|2025-09-16T15:25:15.0943961+08:00;True|2025-09-15T19:23:59.0543073+08:00;True|2025-09-15T19:20:21.3029019+08:00;True|2025-09-15T18:13:37.9864558+08:00;False|2025-09-15T18:10:12.3885406+08:00;True|2025-09-14T21:09:45.9197976+08:00;True|2025-09-14T21:03:52.7527133+08:00;True|2025-09-14T20:56:52.2491624+08:00;False|2025-09-14T20:55:01.8853672+08:00;True|2025-09-14T16:58:21.0385604+08:00;True|2025-09-14T16:41:26.6519186+08:00;True|2025-09-14T16:30:36.5574469+08:00;True|2025-09-14T16:23:45.2762908+08:00;False|2025-09-14T16:21:18.5334593+08:00;True|2025-09-14T15:04:31.1675947+08:00;False|2025-09-14T14:57:42.9897459+08:00;True|2025-09-13T17:28:50.1423186+08:00;True|2025-09-13T17:13:40.7143728+08:00;False|2025-09-13T17:11:07.4845992+08:00;True|2025-09-13T10:32:54.3135574+08:00;False|2025-09-13T10:29:41.2329666+08:00;True|2025-09-12T17:21:58.7767942+08:00;True|2025-09-12T17:17:34.6111776+08:00;True|2025-09-12T16:05:55.5204914+08:00;True|2025-09-12T10:49:47.5209267+08:00;True|2025-09-12T10:14:46.2153571+08:00;True|2025-09-12T10:06:51.2221370+08:00;False|2025-09-12T10:04:11.5652251+08:00;True|2025-09-11T11:11:29.8887214+08:00;True|2025-09-11T10:27:48.7134647+08:00;False|2025-09-11T10:23:41.2156688+08:00;True|2025-09-05T15:03:23.2924671+08:00;False|2025-09-05T14:59:52.8082545+08:00;True|2025-09-04T17:13:06.8482753+08:00;True|2025-09-04T16:51:17.9091339+08:00;True|2025-09-04T16:46:29.2592010+08:00;True|2025-09-04T16:32:41.5306406+08:00;True|2025-09-04T16:02:52.3082524+08:00;True|2025-09-04T15:23:33.3525695+08:00;False|2025-09-04T15:18:50.2597330+08:00;True|2025-09-03T10:06:32.1523528+08:00;False|2025-09-03T10:05:14.8010326+08:00;True|2025-09-01T16:52:15.1818207+08:00;True|2025-09-01T16:47:25.7185448+08:00;True|2025-09-01T16:22:38.8407074+08:00;True|2025-09-01T16:06:25.7945621+08:00;True|2025-09-01T15:31:27.0834619+08:00;True|2025-09-01T14:59:08.5890520+08:00;False|2025-09-01T14:57:28.7657119+08:00;True|2025-09-01T13:53:31.9343713+08:00;True|2025-09-01T08:41:50.2295520+08:00;False|2025-09-01T08:38:01.5713406+08:00;True|2025-08-28T14:55:03.0173079+08:00;True|2025-08-28T14:52:51.2565418+08:00;False|2025-08-28T14:51:30.6840568+08:00;True|2025-08-28T13:35:10.1467445+08:00;False|2025-08-28T13:32:25.9131327+08:00;True|2025-08-27T11:02:31.7343752+08:00;False|2025-08-27T10:59:44.5559719+08:00;True|2025-08-21T15:59:13.4177899+08:00;True|2025-08-21T14:47:51.4421324+08:00;True|2025-08-21T14:21:13.8063997+08:00;True|2025-08-21T12:18:57.8433282+08:00;False|2025-08-21T12:13:51.6764234+08:00;True|2025-08-20T16:17:04.7867436+08:00;True|2025-08-20T16:02:21.9630937+08:00;True|2025-08-20T14:39:47.9097820+08:00;True|2025-08-20T14:23:55.2878167+08:00;True|2025-08-20T14:03:03.7939796+08:00;False|2025-08-20T14:01:49.8057856+08:00;True|2025-08-20T13:26:02.0693167+08:00;True|2025-08-20T13:22:41.5516334+08:00;False|2025-08-20T13:20:01.9442856+08:00;True|2025-08-19T16:17:40.4179908+08:00;True|2025-06-26T14:26:16.3020605+08:00;False|2025-06-26T14:24:24.5583234+08:00;True|2025-06-25T15:02:18.2205903+08:00;True|2025-06-25T09:34:33.1671232+08:00;True|2025-06-25T09:26:33.7399794+08:00;False|2025-06-25T09:22:46.7930507+08:00;True|2025-06-24T17:43:37.3371343+08:00;True|2025-06-24T17:00:08.5835940+08:00;True|2025-06-24T16:47:41.4472010+08:00;True|2025-06-24T11:41:43.2862393+08:00;True|2025-06-24T10:48:03.1738588+08:00;False|2025-06-24T10:45:52.9978454+08:00;True|2025-06-23T13:18:10.4096300+08:00;True|2025-06-23T12:31:59.0813412+08:00;False|2025-06-23T12:29:46.4664908+08:00;True|2025-06-20T16:03:35.3322992+08:00;False|2025-06-20T16:01:23.2618070+08:00;True|2025-06-20T15:28:37.6392295+08:00;True|2025-06-20T15:09:48.2308611+08:00;False|2025-06-20T15:04:55.3964352+08:00;True|2025-06-19T21:36:23.6708072+08:00;True|2025-06-19T19:53:14.7964263+08:00;False|2025-06-19T19:49:48.7469721+08:00;True|2025-06-19T11:41:12.9312505+08:00;False|2025-06-19T11:38:58.9943665+08:00;True|2025-06-16T19:09:22.3809399+08:00;False|2025-06-16T19:05:38.2360178+08:00;True|2025-06-11T16:11:09.7034263+08:00;True|2025-06-11T15:56:14.8299331+08:00;False|2025-06-11T15:52:19.5986426+08:00;True|2025-06-10T15:06:31.8605608+08:00;True|2025-06-10T13:56:48.6878035+08:00;True|2025-06-10T13:35:14.9094641+08:00;False|2025-06-10T13:30:23.2522090+08:00;True|2025-06-09T16:52:17.1298062+08:00;False|2025-06-09T16:50:41.4781506+08:00;True|2025-06-09T16:37:16.6960996+08:00;True|2025-06-09T16:18:47.6732333+08:00;False|2025-06-09T16:16:10.1076624+08:00;True|2025-06-09T11:41:26.6044246+08:00;False|2025-06-09T11:37:35.8219274+08:00;True|2025-05-30T20:50:31.5911403+08:00;True|2025-05-30T20:38:47.7863634+08:00;False|2025-05-30T20:36:56.9724524+08:00;True|2025-05-30T20:23:14.4714105+08:00;False|2025-05-30T20:20:59.6202693+08:00;True|2025-05-30T15:16:03.9417907+08:00;True|2025-05-30T15:07:53.4672683+08:00;True|2025-05-30T14:04:31.7468839+08:00;True|2025-05-30T11:40:00.7584518+08:00;False|2025-05-30T11:19:37.1214784+08:00;True|2025-05-30T10:09:42.0861719+08:00;True|2025-05-30T09:27:19.0448124+08:00;False|2025-05-30T09:22:08.8075236+08:00;True|2025-05-29T15:10:29.6652561+08:00;True|2025-05-29T14:58:05.0587060+08:00;True|2025-05-29T14:39:03.1390234+08:00;False|2025-05-29T14:36:03.2767085+08:00;True|2025-05-29T13:52:51.2348257+08:00;False|2025-05-29T13:45:44.5019969+08:00;False|2025-05-29T13:42:23.7583639+08:00;True|2025-05-28T15:19:47.4421065+08:00;True|2025-05-28T14:35:41.9319120+08:00;True|2025-05-28T14:31:54.4492539+08:00;False|2025-05-28T14:29:48.7367846+08:00;True|2025-05-26T20:16:27.4322301+08:00;True|2025-05-26T18:20:27.4706158+08:00;False|2025-05-26T18:16:05.8755995+08:00;True|2025-05-23T10:08:04.4148373+08:00;False|2025-05-23T10:04:56.4532406+08:00;True|2025-05-19T19:37:04.9188427+08:00;True|2025-05-19T19:22:46.1250782+08:00;True|2025-05-19T09:42:31.7002049+08:00;False|2025-05-19T09:32:01.6350123+08:00;True|2025-05-17T14:14:12.0279596+08:00;True|2025-05-17T13:44:20.1547573+08:00;True|2025-05-17T13:09:56.7254199+08:00;True|2025-05-17T12:22:45.9766542+08:00;True|2025-05-17T11:49:56.8647669+08:00;False|2025-05-17T11:46:23.8688151+08:00;True|2025-05-16T14:56:34.3445988+08:00;True|2025-05-16T13:09:24.9723517+08:00;False|2025-05-16T12:53:18.5385817+08:00;True|2025-05-15T17:17:23.2057769+08:00;True|2025-05-15T16:28:03.1493226+08:00;True|2025-05-15T16:09:34.5928723+08:00;True|2025-05-15T15:50:13.7185578+08:00;True|2025-05-15T15:43:43.9742646+08:00;True|2025-05-15T15:02:16.5848076+08:00;True|2025-05-15T14:28:35.2194847+08:00;False|2025-05-15T14:26:02.0933523+08:00;False|2025-05-15T14:25:16.4746523+08:00;False|2025-05-15T14:23:37.0444052+08:00;False|2025-05-15T14:22:38.2549781+08:00;True|2025-05-15T14:08:47.9908883+08:00;True|2025-05-15T13:30:28.6027783+08:00;False|2025-05-15T13:27:35.2019769+08:00;True|2025-05-14T14:33:50.7542669+08:00;False|2025-05-14T12:58:34.3790659+08:00;True|2025-05-06T18:16:13.1825659+08:00;False|2025-05-06T18:13:36.1768928+08:00;False|2025-04-30T10:51:25.6190120+08:00;True|2025-04-15T13:47:43.0319806+08:00;False|2025-04-15T13:43:39.5193511+08:00;True|2025-04-14T16:55:07.6035477+08:00;True|2025-04-14T16:10:02.4925200+08:00;True|2025-04-14T15:59:48.1256324+08:00;True|2025-04-14T15:35:58.3739263+08:00;True|2025-04-14T15:18:20.0231874+08:00;True|2025-04-14T15:15:48.1937642+08:00;True|2025-04-14T15:06:18.1485320+08:00;True|2025-04-14T13:58:54.9488220+08:00;True|2025-04-14T13:45:21.9528067+08:00;True|2025-04-14T13:32:41.8026503+08:00;True|2025-04-14T13:24:25.1609026+08:00;False|2025-04-14T13:21:46.7999422+08:00;True|2025-04-14T11:22:02.0084668+08:00;False|2025-04-14T11:16:39.7668266+08:00;True|2025-04-11T16:42:49.2287375+08:00;True|2025-04-11T15:21:50.9239660+08:00;False|2025-04-11T15:18:52.8043694+08:00;True|2025-04-09T17:30:38.2292747+08:00;True|2025-04-09T17:26:46.2681749+08:00;False|2025-04-09T17:24:55.8631858+08:00;True|2025-04-09T14:49:05.0786518+08:00;False|2025-04-09T14:47:08.0080072+08:00;True|2025-04-09T14:07:09.5914371+08:00;False|2025-04-09T14:03:54.1549615+08:00;True|2025-04-09T10:47:08.9478457+08:00;False|2025-04-09T10:42:24.4815543+08:00;True|2025-04-08T13:55:42.3999925+08:00;True|2025-04-08T13:03:18.1047211+08:00;False|2025-04-08T13:01:24.7284945+08:00;True|2025-04-08T12:45:45.9591473+08:00;True|2025-04-08T10:37:46.2486194+08:00;True|2025-04-08T10:19:41.4391162+08:00;True|2025-04-08T09:03:06.3555124+08:00;False|2025-04-08T09:00:24.5011547+08:00;True|2025-04-03T13:30:58.8690712+08:00;True|2025-04-03T11:11:58.9675862+08:00;True|2025-04-03T08:26:57.1183260+08:00;False|2025-04-03T08:24:15.5585637+08:00;True|2025-04-02T17:22:56.3662600+08:00;True|2025-04-02T16:34:30.3902014+08:00;False|2025-04-02T16:31:03.2711601+08:00;True|2025-04-02T08:53:58.9022912+08:00;False|2025-04-02T08:49:36.2482604+08:00;True|2025-04-01T14:11:15.6665093+08:00;True|2025-04-01T13:59:03.5182641+08:00;True|2025-04-01T11:34:01.0473928+08:00;False|2025-04-01T11:27:06.6219808+08:00;True|2025-03-31T11:32:14.3010437+08:00;False|2025-03-31T11:28:54.7180398+08:00;True|2025-03-28T16:33:00.1667734+08:00;True|2025-03-28T15:59:08.0311042+08:00;True|2025-03-28T14:24:00.8058555+08:00;True|2025-03-28T11:20:49.2519130+08:00;True|2025-03-28T09:46:40.2335440+08:00;True|2025-03-28T09:44:23.8324494+08:00;False|2025-03-28T09:39:07.0797562+08:00;True|2025-03-27T17:42:12.3457479+08:00;True|2025-03-27T16:53:40.2462518+08:00;True|2025-03-27T15:41:05.4036532+08:00;True|2025-03-27T14:20:24.3597261+08:00;True|2025-03-27T10:51:24.2799353+08:00;False|2025-03-27T10:45:28.9126200+08:00;True|2025-03-26T13:49:06.9257931+08:00;False|2025-03-26T13:44:48.7676302+08:00;True|2025-03-25T15:17:55.4790872+08:00;False|2025-03-25T15:14:39.3949477+08:00;True|2025-03-25T14:23:34.4515442+08:00;True|2025-03-24T16:49:42.0663422+08:00;True|2025-03-24T13:12:18.9244375+08:00;False|2025-03-24T13:07:19.8409939+08:00;False|2025-03-24T12:48:52.4860847+08:00;False|2025-03-24T11:39:21.1805195+08:00;False|2025-03-24T11:37:43.6802081+08:00;False|2025-03-24T11:33:57.1454920+08:00;False|2025-03-24T11:30:14.3844034+08:00;False|2025-03-24T11:28:02.5067052+08:00;False|2025-03-21T12:21:29.9136433+08:00;True|2025-03-20T16:39:21.8390481+08:00;True|2025-03-20T14:41:37.0419379+08:00;False|2025-03-20T14:37:15.3728461+08:00;True|2025-03-20T12:27:20.0312759+08:00;True|2025-03-20T10:42:53.0161637+08:00;True|2025-03-20T09:30:05.5790815+08:00;False|2025-03-20T09:25:15.2327164+08:00;True|2025-03-19T17:06:57.7672924+08:00;True|2025-03-19T15:46:30.3411577+08:00;True|2025-03-19T13:45:31.7138375+08:00;True|2025-03-19T11:09:17.0875638+08:00;False|2025-03-19T11:05:00.7852430+08:00;True|2025-03-18T17:07:26.8842323+08:00;False|2025-03-18T17:02:33.5857720+08:00;False|2025-03-17T11:09:34.0681444+08:00;True|2025-03-17T10:50:21.9158331+08:00;True|2025-03-17T09:42:47.9252167+08:00;False|2025-03-17T09:31:53.1872136+08:00;True|2025-03-14T17:46:56.2806627+08:00;True|2025-03-14T16:26:15.6828252+08:00;True|2025-03-14T16:14:53.0710942+08:00;True|2025-03-14T16:08:09.5365263+08:00;True|2025-03-14T15:59:01.3358337+08:00;True|2025-03-14T14:22:42.7725023+08:00;True|2025-03-14T09:54:22.0848434+08:00;False|2025-03-14T09:51:59.6649411+08:00;True|2025-03-14T09:36:17.1134782+08:00;False|2025-03-14T09:31:58.5198805+08:00;True|2025-03-13T13:08:01.9024847+08:00;False|2025-03-13T13:03:35.7160929+08:00;True|2025-03-12T15:37:13.4111189+08:00;True|2025-03-12T15:23:55.5422176+08:00;True|2025-03-12T15:16:21.2123980+08:00;True|2025-03-12T14:49:24.9895017+08:00;True|2025-03-12T14:41:41.5663090+08:00;False|2025-03-12T14:39:27.3156286+08:00;True|2025-03-12T14:10:23.4204108+08:00;False|2025-03-12T14:08:08.4985635+08:00;True|2025-03-12T13:34:39.8492928+08:00;False|2025-03-12T13:31:34.8359622+08:00;True|2025-03-12T11:39:34.2976894+08:00;False|2025-03-12T09:22:45.9334513+08:00;True|2025-03-10T15:59:42.1283263+08:00;False|2025-03-10T15:53:57.2115226+08:00;True|2025-03-07T16:23:25.1589274+08:00;True|2025-03-07T16:18:46.0202723+08:00;True|2025-03-07T15:59:34.8313474+08:00;True|2025-03-07T15:37:59.1693363+08:00;True|2025-03-07T14:05:40.7253978+08:00;True|2025-03-07T11:21:14.9610137+08:00;False|2025-03-07T11:15:41.4171028+08:00;True|2025-03-07T10:23:24.0437379+08:00;True|2025-03-07T10:07:03.4231550+08:00;False|2025-03-07T10:04:32.6854924+08:00;True|2025-03-06T16:32:23.7096239+08:00;True|2025-03-06T15:45:46.0345284+08:00;True|2025-03-06T15:40:00.7026164+08:00;True|2025-03-06T15:20:20.3523488+08:00;True|2025-03-06T14:19:37.2403331+08:00;True|2025-03-06T13:49:03.6420821+08:00;False|2025-03-06T13:46:35.7037619+08:00;True|2025-03-06T11:03:29.5882789+08:00;True|2025-03-06T09:59:53.3080173+08:00;True|2025-03-06T09:43:48.4337079+08:00;False|2025-03-06T09:35:05.3462434+08:00;True|2025-03-05T18:25:35.2595591+08:00;True|2025-03-05T18:03:37.5687895+08:00;True|2025-03-05T17:48:08.3418269+08:00;False|2025-03-05T17:44:40.0721881+08:00;True|2025-03-05T17:23:30.5871011+08:00;True|2025-03-05T16:31:12.2285816+08:00;True|2025-03-05T16:00:25.5496303+08:00;True|2025-03-05T15:11:30.9434230+08:00;True|2025-03-05T14:22:08.4650724+08:00;True|2025-03-05T13:29:42.9306833+08:00;True|2025-03-05T11:28:17.5541196+08:00;True|2025-03-05T11:10:22.3318023+08:00;True|2025-03-05T10:55:33.6796527+08:00;True|2025-03-05T10:08:26.7761472+08:00;True|2025-03-05T10:02:32.8701262+08:00;False|2025-03-05T09:59:55.0044057+08:00;True|2025-03-04T17:48:24.6869079+08:00;True|2025-03-04T17:42:05.0276293+08:00;False|2025-03-04T17:39:53.6208557+08:00;False|2025-03-04T17:39:30.0759309+08:00;False|2025-03-04T17:05:37.2163588+08:00;True|2025-03-04T16:51:15.6884461+08:00;True|2025-03-04T16:49:03.3836181+08:00;True|2025-03-04T16:31:36.5847402+08:00;True|2025-03-04T15:52:09.1977151+08:00;True|2025-03-04T15:24:25.0194954+08:00;True|2025-03-04T15:12:44.1606138+08:00;False|2025-03-04T15:10:47.3915404+08:00;True|2025-03-04T14:31:42.7483906+08:00;True|2025-03-04T11:28:36.6001869+08:00;False|2025-02-27T19:55:43.0462466+08:00;True|2025-02-24T16:03:00.5507258+08:00;False|2025-02-24T16:00:00.9104160+08:00;True|2025-02-19T16:55:31.8966125+08:00;True|2025-02-19T14:51:19.5866770+08:00;False|2025-02-19T14:49:16.2857645+08:00;True|2025-02-19T14:11:03.8109482+08:00;False|2025-02-19T14:08:17.7243950+08:00;True|2025-02-19T11:16:48.1875981+08:00;False|2025-02-19T11:14:24.0571589+08:00;True|2025-02-19T10:17:34.3257301+08:00;False|2025-02-19T10:14:49.0730325+08:00;True|2025-02-18T09:38:54.9616937+08:00;True|2025-02-18T09:16:03.1196071+08:00;False|2025-02-18T09:13:52.5022130+08:00;True|2025-02-17T17:28:38.1103164+08:00;True|2025-02-17T17:06:19.1494960+08:00;True|2025-02-17T16:58:21.8893871+08:00;False|2025-02-17T16:56:34.0012780+08:00;True|2025-02-17T15:56:45.9560949+08:00;False|2025-02-17T15:29:32.9323141+08:00;False|2025-02-17T15:27:54.6615301+08:00;False|2025-02-17T15:25:42.7179137+08:00;True|2025-02-12T10:48:39.4029671+08:00;True|2025-02-12T10:45:09.8138793+08:00;False|2025-02-12T10:43:37.5751112+08:00;False|2025-02-12T10:43:24.8201898+08:00;False|2025-02-12T10:42:58.2736984+08:00;False|2025-02-12T10:42:46.1482594+08:00;False|2025-02-12T10:42:01.5427330+08:00;False|2025-02-12T10:41:48.3761346+08:00;False|2025-02-12T10:41:29.3367142+08:00;True|2025-02-11T15:41:34.0746843+08:00;True|2025-02-11T15:39:37.3374891+08:00;False|2025-02-11T15:39:27.0449176+08:00;False|2025-02-11T15:08:35.2970100+08:00;True|2025-02-11T14:59:59.6539416+08:00;True|2025-02-11T14:56:20.5954601+08:00;False|2025-02-11T14:55:35.6700921+08:00;True|2025-02-10T09:39:38.7399451+08:00;False|2025-02-10T09:39:10.1358642+08:00;True|2025-02-08T16:00:23.1136903+08:00;False|2025-02-08T15:59:50.0414065+08:00;True|2025-01-17T10:17:41.6850215+08:00;False|2025-01-17T10:16:20.3202054+08:00;True|2025-01-17T09:00:26.6966310+08:00;False|2025-01-17T08:59:59.9527727+08:00;True|2025-01-16T11:06:57.1014257+08:00;True|2025-01-16T10:27:57.2742426+08:00;False|2025-01-16T10:27:27.5197746+08:00;True|2025-01-15T11:05:17.5523582+08:00;True|2025-01-15T09:37:34.6118980+08:00;False|2025-01-15T09:36:27.7987949+08:00;True|2025-01-14T12:52:06.2234405+08:00;True|2025-01-14T12:50:08.8487446+08:00;False|2025-01-14T12:49:45.2743330+08:00;True|2025-01-14T10:31:18.6477403+08:00;False|2025-01-14T10:29:30.1534049+08:00;True|2025-01-13T15:27:00.4497527+08:00;True|2025-01-13T15:01:33.6142160+08:00;True|2025-01-13T10:29:49.4772980+08:00;True|2025-01-13T10:11:15.7993265+08:00;True|2025-01-13T10:08:58.9378828+08:00;False|2025-01-13T10:08:44.9869073+08:00;True|2025-01-13T10:02:17.5175561+08:00;False|2025-01-13T10:02:00.9991870+08:00;True|2025-01-08T17:50:21.7468469+08:00;True|2025-01-08T16:38:48.8592252+08:00;True|2025-01-08T10:44:42.9161086+08:00;False|2025-01-08T10:44:09.4840640+08:00;True|2025-01-08T10:34:31.5982265+08:00;False|2025-01-08T10:33:57.3576390+08:00;True|2025-01-03T17:19:09.1765100+08:00;True|2025-01-03T17:10:41.8794009+08:00;True|2025-01-03T17:10:11.4245485+08:00;True|2025-01-03T15:54:22.3387906+08:00;True|2025-01-03T15:41:44.9897120+08:00;False|2025-01-03T15:40:42.1357112+08:00;False|2025-01-03T15:39:09.0564197+08:00;True|2025-01-03T14:58:31.5701467+08:00;True|2025-01-03T14:29:13.4456304+08:00;False|2025-01-03T14:27:18.9925263+08:00;True|2025-01-02T16:08:24.1819376+08:00;True|2025-01-02T16:07:01.1636705+08:00;True|2025-01-02T16:03:02.6520904+08:00;True|2025-01-02T10:03:56.0551738+08:00;False|2025-01-02T10:03:34.8632732+08:00;True|2024-12-31T15:27:01.3180960+08:00;True|2024-12-31T11:17:12.2977529+08:00;True|2024-12-31T10:48:14.7205535+08:00;True|2024-12-31T10:18:45.6669875+08:00;False|2024-12-31T10:18:21.6706557+08:00;True|2024-12-30T09:32:44.3898729+08:00;True|2024-12-30T09:31:24.5771941+08:00;False|2024-12-30T09:30:52.4031391+08:00;True|2024-12-27T16:12:20.2836752+08:00;False|2024-12-27T16:11:04.6614343+08:00;True|2024-12-27T15:07:23.0750147+08:00;True|2024-12-27T15:04:52.7876532+08:00;True|2024-12-27T14:37:54.3154829+08:00;False|2024-12-27T14:37:26.9546174+08:00;True|2024-12-26T16:33:56.0452167+08:00;True|2024-12-26T16:29:21.4115458+08:00;True|2024-12-26T16:29:02.0242815+08:00;True|2024-12-26T15:17:24.7390981+08:00;False|2024-12-26T15:13:26.8863189+08:00;True|2024-12-26T15:06:35.4541902+08:00;True|2024-12-26T11:35:42.2760106+08:00;False|2024-12-26T11:35:08.9255789+08:00;True|2024-12-26T10:10:29.7487991+08:00;True|2024-12-26T09:27:40.2637311+08:00;False|2024-12-26T09:25:52.1339136+08:00;True|2024-12-24T15:11:48.9968778+08:00;True|2024-12-24T15:06:55.0283993+08:00;True|2024-12-24T14:36:29.6466740+08:00;True|2024-12-24T10:28:42.7489880+08:00;False|2024-12-24T10:28:08.6809715+08:00;True|2024-12-24T10:06:05.9449103+08:00;False|2024-12-24T10:05:32.8409161+08:00;True|2024-12-23T14:56:40.3416256+08:00;True|2024-12-23T14:50:50.2677378+08:00;True|2024-12-23T14:48:27.8169391+08:00;True|2024-12-23T14:45:25.5341474+08:00;True|2024-12-23T14:42:23.7825087+08:00;True|2024-12-23T14:35:53.8876449+08:00;True|2024-12-23T14:14:00.4257926+08:00;True|2024-12-23T11:10:54.5874876+08:00;True|2024-12-23T11:08:44.0250304+08:00;False|2024-12-23T11:08:18.5757850+08:00;True|2024-12-20T12:51:29.2354841+08:00;True|2024-12-20T12:46:13.7636932+08:00;False|2024-12-20T12:44:21.1473486+08:00;False|2024-12-20T12:44:06.5427106+08:00;True|2024-12-20T12:29:33.9971940+08:00;False|2024-12-20T12:29:01.0285205+08:00;True|2024-12-19T15:49:19.9906264+08:00;True|2024-12-19T14:55:54.3323405+08:00;True|2024-12-19T14:17:50.5086161+08:00;True|2024-12-19T14:08:16.0919011+08:00;True|2024-12-19T14:02:50.3092759+08:00;True|2024-12-19T13:54:41.2332165+08:00;False|2024-12-19T13:54:07.6973483+08:00;True|2024-12-19T09:34:54.5332110+08:00;True|2024-12-19T08:49:05.5690428+08:00;False|2024-12-19T08:48:51.0618113+08:00;True|2024-12-18T15:45:34.7174246+08:00;False|2024-12-18T15:45:10.3226822+08:00;True|2024-12-18T15:32:03.5983267+08:00;True|2024-12-18T15:31:20.1219502+08:00;True|2024-12-18T11:57:09.1595607+08:00;True|2024-12-18T11:13:37.4765697+08:00;True|2024-12-18T10:07:54.1294714+08:00;True|2024-12-18T10:04:16.0967342+08:00;False|2024-12-18T10:04:04.1561560+08:00;True|2024-12-16T17:07:07.3386872+08:00;True|2024-12-16T16:34:59.1101964+08:00;True|2024-12-16T16:19:07.9287470+08:00;False|2024-12-16T16:18:46.4617432+08:00;True|2024-12-13T18:06:11.0778539+08:00;True|2024-12-13T16:53:52.2283177+08:00;True|2024-12-13T16:23:15.9531944+08:00;True|2024-12-13T13:58:03.7464045+08:00;True|2024-12-13T10:40:33.9285602+08:00;True|2024-12-13T10:38:03.8494063+08:00;False|2024-12-13T10:37:52.4251132+08:00;True|2024-12-13T10:31:07.4994631+08:00;False|2024-12-13T10:30:40.8021885+08:00;True|2024-12-12T10:01:42.4944750+08:00;False|2024-12-12T10:01:15.7147977+08:00;True|2024-12-11T17:21:58.0453583+08:00;True|2024-12-11T10:59:15.3836831+08:00;True|2024-12-11T09:49:19.4060272+08:00;False|2024-12-11T09:48:51.7603525+08:00;True|2024-12-11T08:58:41.4567855+08:00;False|2024-12-11T08:58:09.2160433+08:00;True|2024-12-10T17:25:49.3068154+08:00;True|2024-12-10T17:21:30.0155027+08:00;True|2024-12-10T17:16:56.7587487+08:00;False|2024-12-10T17:16:34.7816611+08:00;True|2024-12-10T16:55:40.3777585+08:00;False|2024-12-10T16:55:13.2621448+08:00;False|2024-12-09T13:59:27.6362265+08:00;True|2024-12-06T16:55:30.6422980+08:00;True|2024-12-06T15:08:49.5834939+08:00;True|2024-12-06T14:31:56.0968616+08:00;False|2024-12-06T14:31:44.2264009+08:00;True|2024-12-06T13:59:52.8150929+08:00;False|2024-12-06T13:48:22.6073939+08:00;True|2024-12-05T17:33:27.9247467+08:00;True|2024-12-05T17:30:23.1740838+08:00;False|2024-12-05T17:30:03.9977311+08:00;True|2024-12-04T15:18:41.4963816+08:00;True|2024-12-04T15:16:45.1121101+08:00;True|2024-12-04T15:14:33.5954776+08:00;True|2024-12-04T15:12:27.2913137+08:00;True|2024-12-04T14:10:19.6190673+08:00;False|2024-12-04T14:10:02.0319713+08:00;True|2024-12-03T16:08:46.6721098+08:00;True|2024-12-03T15:16:04.1754554+08:00;True|2024-12-03T15:13:25.4927626+08:00;True|2024-12-03T14:55:09.4413291+08:00;True|2024-12-03T14:43:11.8243897+08:00;True|2024-12-03T14:29:16.1511932+08:00;True|2024-12-03T14:24:07.9561838+08:00;False|2024-12-03T14:23:55.1293602+08:00;True|2024-12-02T16:31:22.0404862+08:00;False|2024-12-02T16:28:53.1721961+08:00;True|2024-12-02T15:41:24.9462025+08:00;True|2024-12-02T14:12:12.9356193+08:00;False|2024-12-02T14:11:35.7159488+08:00;True|2024-12-02T10:59:31.5582757+08:00;True|2024-11-29T12:08:55.4868083+08:00;False|2024-11-29T12:08:37.0353185+08:00;True|2024-11-28T10:47:27.2071355+08:00;False|2024-11-28T10:47:13.6670955+08:00;True|2024-11-27T15:21:57.6747082+08:00;False|2024-11-27T15:20:07.2403056+08:00;True|2024-11-27T15:13:36.1461091+08:00;True|2024-11-27T14:34:35.5908753+08:00;False|2024-11-27T14:33:30.7118923+08:00;True|2024-11-26T15:16:44.1854927+08:00;True|2024-11-26T15:14:33.4021067+08:00;False|2024-11-26T15:14:07.9955135+08:00;True|2024-11-26T14:48:35.6408418+08:00;True|2024-11-26T14:45:00.7251556+08:00;True|2024-11-26T14:04:58.4232988+08:00;False|2024-11-26T14:04:28.1286675+08:00;True|2024-11-25T13:45:07.6935933+08:00;True|2024-11-25T13:43:59.0788650+08:00;False|2024-11-25T13:43:44.2225194+08:00;True|2024-11-25T08:54:05.5144014+08:00;False|2024-11-25T08:53:49.2284063+08:00;False|2024-11-22T09:53:13.7879664+08:00;True|2024-11-21T13:48:31.7056264+08:00;True|2024-11-21T13:46:55.0891551+08:00;True|2024-11-21T13:44:05.5221110+08:00;True|2024-11-21T13:43:39.1385899+08:00;False|2024-11-21T13:43:19.9351488+08:00;True|2024-11-20T11:33:52.0324053+08:00;True|2024-11-20T11:20:58.4917889+08:00;True|2024-11-20T11:03:46.9552623+08:00;True|2024-11-20T10:45:10.9517109+08:00;False|2024-11-20T10:44:58.3221116+08:00;False|2024-11-19T15:39:27.3889104+08:00;True|2024-11-19T14:42:32.0854561+08:00;True|2024-11-19T14:19:19.6198070+08:00;True|2024-11-19T14:13:08.2003750+08:00;False|2024-11-19T14:12:15.5442850+08:00;True|2024-11-18T13:05:41.0455534+08:00;True|2024-11-18T11:05:30.2819404+08:00;True|2024-11-18T10:51:07.1852818+08:00;False|2024-11-18T10:50:21.5098527+08:00;True|2024-11-18T10:15:38.5429366+08:00;True|2024-11-18T10:00:51.0847524+08:00;True|2024-11-18T09:34:52.1772715+08:00;True|2024-11-18T09:27:23.6013754+08:00;False|2024-11-18T09:26:00.9323551+08:00;True|2024-11-15T11:20:51.7576376+08:00;True|2024-11-15T11:11:17.5580168+08:00;True|2024-11-15T11:03:58.4142996+08:00;True|2024-11-15T10:44:50.5207827+08:00;True|2024-11-15T10:10:05.5550418+08:00;True|2024-11-15T09:49:30.6631382+08:00;False|2024-11-15T09:47:05.3973379+08:00;True|2024-11-14T18:31:54.8247681+08:00;True|2024-11-14T17:14:56.3660185+08:00;True|2024-11-14T16:49:44.7526912+08:00;True|2024-11-14T16:49:09.3427608+08:00;True|2024-11-14T15:59:00.2572264+08:00;True|2024-11-14T11:21:03.5110818+08:00;True|2024-11-14T10:51:10.7864658+08:00;False|2024-11-14T10:50:55.5384248+08:00;True|2024-11-14T10:29:13.6760158+08:00;False|2024-11-14T10:28:09.8622863+08:00;True|2024-11-13T17:48:46.4827219+08:00;True|2024-11-13T17:45:13.0659280+08:00;True|2024-11-13T16:01:55.2278671+08:00;False|2024-11-13T16:01:03.0040446+08:00;True|2024-11-12T17:24:06.3763535+08:00;True|2024-11-12T17:21:51.8459552+08:00;True|2024-11-12T17:11:57.9239909+08:00;True|2024-11-12T17:09:04.4322824+08:00;True|2024-11-12T17:07:12.1839548+08:00;True|2024-11-12T17:04:27.4579152+08:00;True|2024-11-12T17:03:59.6843282+08:00;True|2024-11-12T16:40:44.0714862+08:00;True|2024-11-12T16:36:27.7792764+08:00;True|2024-11-12T16:32:36.5262040+08:00;False|2024-11-12T16:32:23.9550194+08:00;True|2024-11-12T10:58:16.1987697+08:00;False|2024-11-12T10:58:04.8469631+08:00;True|2024-11-11T13:40:53.2582255+08:00;True|2024-11-11T13:37:45.0401833+08:00;True|2024-11-11T12:35:13.2429166+08:00;True|2024-11-11T11:27:29.0530688+08:00;False|2024-11-11T11:27:12.2765506+08:00;True|2024-11-08T15:52:17.1278870+08:00;False|2024-11-08T15:52:04.4379380+08:00;True|2024-11-07T18:27:41.8163960+08:00;False|2024-11-07T18:27:30.6037983+08:00;True|2024-11-06T15:55:27.6450488+08:00;True|2024-11-06T15:54:13.5957004+08:00;True|2024-11-06T15:25:33.3862531+08:00;True|2024-11-06T13:33:57.8502278+08:00;False|2024-11-06T13:33:39.2337086+08:00;True|2024-11-06T11:33:12.6755239+08:00;True|2024-11-05T18:34:17.7048247+08:00;True|2024-11-05T18:30:08.5724471+08:00;True|2024-11-05T18:24:35.5372980+08:00;True|2024-11-05T18:06:29.7644779+08:00;True|2024-11-05T17:53:50.9554703+08:00;True|2024-11-05T17:50:05.6376900+08:00;True|2024-11-05T11:13:46.2906508+08:00;True|2024-11-05T10:35:55.5423834+08:00;False|2024-11-05T10:35:20.4104039+08:00;True|2024-11-01T10:22:05.7636122+08:00;False|2024-11-01T10:21:33.2954398+08:00;True|2024-10-31T20:03:37.9075888+08:00;True|2024-10-31T18:35:31.6618415+08:00;True|2024-10-31T18:34:56.2479021+08:00;True|2024-10-31T09:43:29.0841188+08:00;False|2024-10-31T09:43:04.8780818+08:00;True|2024-10-30T18:42:11.0523067+08:00;True|2024-10-30T18:07:05.5603627+08:00;True|2024-10-30T18:03:15.3516621+08:00;True|2024-10-30T17:58:14.3276504+08:00;False|2024-10-30T17:57:44.5353118+08:00;True|2024-10-30T17:47:41.2889491+08:00;True|2024-10-30T17:19:36.6172721+08:00;True|2024-10-30T17:10:00.4399703+08:00;False|2024-10-30T17:08:57.6500450+08:00;True|2024-10-29T16:58:15.6006676+08:00;True|2024-10-29T16:51:56.8406649+08:00;True|2024-10-29T16:05:48.4297695+08:00;True|2024-10-29T15:12:15.1522377+08:00;True|2024-10-29T15:10:51.8431754+08:00;True|2024-10-29T11:21:01.5660940+08:00;False|2024-10-29T11:20:33.3958980+08:00;True|2024-10-28T17:51:26.7156861+08:00;False|2024-10-28T17:50:41.4388196+08:00;True|2024-10-28T13:34:14.8764262+08:00;True|2024-10-28T12:44:27.2083620+08:00;False|2024-10-28T12:43:57.5942717+08:00;True|2024-10-25T11:49:47.9817458+08:00;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
+=======
+ <History>True|2025-11-17T03:29:35.8537690Z;False|2025-11-17T11:28:19.0924595+08:00;True|2025-11-16T16:14:52.2247424+08:00;False|2025-11-16T16:14:43.5901469+08:00;True|2025-11-12T16:06:29.1348916+08:00;True|2025-11-12T14:09:18.5722345+08:00;True|2025-11-12T13:43:22.7175368+08:00;True|2025-11-12T10:10:28.7878039+08:00;True|2025-11-12T10:05:49.0074341+08:00;False|2025-11-12T10:04:20.4734786+08:00;True|2025-11-11T12:28:13.5697894+08:00;False|2025-11-11T12:26:44.2315500+08:00;True|2025-11-05T13:34:36.2693873+08:00;True|2025-11-05T13:26:56.7405745+08:00;False|2025-11-05T13:25:26.5283561+08:00;True|2025-11-05T13:09:11.5464917+08:00;True|2025-11-05T11:29:10.2440646+08:00;False|2025-11-05T11:25:30.2261523+08:00;True|2025-11-04T15:55:36.7389839+08:00;False|2025-11-04T15:50:10.3823467+08:00;True|2025-11-03T17:47:28.0534177+08:00;False|2025-11-03T17:45:32.0330377+08:00;False|2025-11-03T17:44:31.0234643+08:00;True|2025-11-03T16:46:31.6737971+08:00;True|2025-11-03T15:31:47.1887341+08:00;False|2025-11-03T15:24:58.5995610+08:00;True|2025-10-24T09:52:58.8066045+08:00;False|2025-10-24T09:50:59.5626675+08:00;True|2025-10-23T17:25:11.7690424+08:00;True|2025-10-23T15:56:37.3414516+08:00;True|2025-10-23T11:28:21.9899129+08:00;True|2025-10-23T10:55:55.2143820+08:00;False|2025-10-23T10:50:13.9939872+08:00;True|2025-10-23T08:48:56.7489638+08:00;False|2025-10-23T08:46:06.9380234+08:00;True|2025-10-22T13:24:32.4517457+08:00;True|2025-10-22T13:14:52.6978411+08:00;True|2025-10-22T12:38:10.4103742+08:00;True|2025-10-22T12:13:31.1805654+08:00;False|2025-10-22T11:40:08.9986668+08:00;True|2025-10-22T11:08:20.5861814+08:00;True|2025-10-22T09:37:38.3080326+08:00;False|2025-10-22T09:35:09.3574541+08:00;True|2025-10-21T16:08:56.4966266+08:00;True|2025-10-21T15:25:06.3357306+08:00;False|2025-10-21T15:22:41.7149016+08:00;True|2025-10-20T14:50:47.1241942+08:00;True|2025-10-20T14:45:42.5304904+08:00;True|2025-10-20T14:17:10.9062289+08:00;True|2025-10-20T14:15:15.7397902+08:00;False|2025-10-20T14:12:37.5558428+08:00;False|2025-10-20T14:09:57.0131208+08:00;True|2025-10-20T13:58:26.2518761+08:00;True|2025-10-20T13:55:56.3549666+08:00;True|2025-10-20T13:17:37.6632220+08:00;False|2025-10-20T13:15:59.5621533+08:00;True|2025-10-20T11:14:22.2170121+08:00;True|2025-10-20T11:10:25.0072488+08:00;False|2025-10-20T11:08:24.7275434+08:00;True|2025-10-20T10:25:35.3193847+08:00;True|2025-10-20T10:20:14.8074035+08:00;False|2025-10-20T10:17:15.3929008+08:00;True|2025-10-19T14:35:10.9395863+08:00;True|2025-10-19T14:23:40.8671794+08:00;True|2025-10-19T14:13:09.2729359+08:00;False|2025-10-19T14:10:57.4726058+08:00;True|2025-10-19T11:59:19.1660855+08:00;True|2025-10-19T11:47:16.4699144+08:00;True|2025-10-19T11:45:35.4143220+08:00;True|2025-10-19T11:31:53.0209769+08:00;True|2025-10-19T10:47:57.3931727+08:00;True|2025-10-19T10:45:06.6812418+08:00;False|2025-10-19T10:42:54.2163177+08:00;True|2025-10-19T10:20:06.4782131+08:00;False|2025-10-19T10:18:01.8058657+08:00;True|2025-10-17T11:10:09.1489159+08:00;True|2025-10-17T10:33:04.7168767+08:00;False|2025-10-17T10:27:11.3138860+08:00;True|2025-10-16T12:29:24.1716426+08:00;True|2025-10-16T12:20:41.5817250+08:00;True|2025-10-16T10:19:01.8439680+08:00;True|2025-10-16T10:02:02.5889100+08:00;False|2025-10-16T10:00:38.1610021+08:00;True|2025-10-15T20:46:58.1522873+08:00;False|2025-10-15T20:42:53.0506824+08:00;True|2025-10-15T17:36:57.4541860+08:00;False|2025-10-15T17:34:10.9457782+08:00;True|2025-10-15T17:19:52.5991524+08:00;True|2025-10-15T16:09:57.9276298+08:00;False|2025-10-15T16:08:24.3962303+08:00;True|2025-10-15T10:09:08.0107312+08:00;True|2025-10-09T15:24:42.4560259+08:00;False|2025-10-09T15:20:43.4377150+08:00;True|2025-09-28T17:39:01.4122102+08:00;True|2025-09-28T17:23:59.6256603+08:00;True|2025-09-28T17:20:10.2720630+08:00;True|2025-09-28T17:10:01.5933556+08:00;True|2025-09-28T17:01:36.2635675+08:00;False|2025-09-28T16:57:58.0434039+08:00;True|2025-09-28T15:33:28.1138855+08:00;True|2025-09-28T13:54:09.0761773+08:00;True|2025-09-28T13:43:59.6070727+08:00;True|2025-09-28T11:40:32.5773904+08:00;True|2025-09-28T10:54:19.3898563+08:00;True|2025-09-28T09:02:31.2718788+08:00;True|2025-09-28T08:55:54.6379136+08:00;False|2025-09-28T08:53:05.5935208+08:00;True|2025-09-26T15:08:54.6463165+08:00;False|2025-09-26T15:06:30.8411543+08:00;True|2025-09-26T08:57:16.1799945+08:00;False|2025-09-26T08:55:20.5817252+08:00;True|2025-09-24T17:34:56.2354349+08:00;True|2025-09-24T17:26:27.8886486+08:00;True|2025-09-24T17:20:15.7029115+08:00;False|2025-09-24T17:17:28.6152388+08:00;True|2025-09-24T16:25:26.7220464+08:00;True|2025-09-24T13:42:47.8780761+08:00;True|2025-09-24T13:13:30.8791802+08:00;False|2025-09-24T13:11:56.1071557+08:00;True|2025-09-24T12:51:02.7536001+08:00;False|2025-09-24T12:48:52.2469777+08:00;True|2025-09-20T15:00:07.2952817+08:00;True|2025-09-20T14:47:01.1751178+08:00;True|2025-09-18T14:52:31.3755289+08:00;False|2025-09-18T14:50:11.5291940+08:00;True|2025-09-16T15:30:08.0145366+08:00;True|2025-09-16T15:27:31.7629600+08:00;False|2025-09-16T15:25:15.0943961+08:00;True|2025-09-15T19:23:59.0543073+08:00;True|2025-09-15T19:20:21.3029019+08:00;True|2025-09-15T18:13:37.9864558+08:00;False|2025-09-15T18:10:12.3885406+08:00;True|2025-09-14T21:09:45.9197976+08:00;True|2025-09-14T21:03:52.7527133+08:00;True|2025-09-14T20:56:52.2491624+08:00;False|2025-09-14T20:55:01.8853672+08:00;True|2025-09-14T16:58:21.0385604+08:00;True|2025-09-14T16:41:26.6519186+08:00;True|2025-09-14T16:30:36.5574469+08:00;True|2025-09-14T16:23:45.2762908+08:00;False|2025-09-14T16:21:18.5334593+08:00;True|2025-09-14T15:04:31.1675947+08:00;False|2025-09-14T14:57:42.9897459+08:00;True|2025-09-13T17:28:50.1423186+08:00;True|2025-09-13T17:13:40.7143728+08:00;False|2025-09-13T17:11:07.4845992+08:00;True|2025-09-13T10:32:54.3135574+08:00;False|2025-09-13T10:29:41.2329666+08:00;True|2025-09-12T17:21:58.7767942+08:00;True|2025-09-12T17:17:34.6111776+08:00;True|2025-09-12T16:05:55.5204914+08:00;True|2025-09-12T10:49:47.5209267+08:00;True|2025-09-12T10:14:46.2153571+08:00;True|2025-09-12T10:06:51.2221370+08:00;False|2025-09-12T10:04:11.5652251+08:00;True|2025-09-11T11:11:29.8887214+08:00;True|2025-09-11T10:27:48.7134647+08:00;False|2025-09-11T10:23:41.2156688+08:00;True|2025-09-05T15:03:23.2924671+08:00;False|2025-09-05T14:59:52.8082545+08:00;True|2025-09-04T17:13:06.8482753+08:00;True|2025-09-04T16:51:17.9091339+08:00;True|2025-09-04T16:46:29.2592010+08:00;True|2025-09-04T16:32:41.5306406+08:00;True|2025-09-04T16:02:52.3082524+08:00;True|2025-09-04T15:23:33.3525695+08:00;False|2025-09-04T15:18:50.2597330+08:00;True|2025-09-03T10:06:32.1523528+08:00;False|2025-09-03T10:05:14.8010326+08:00;True|2025-09-01T16:52:15.1818207+08:00;True|2025-09-01T16:47:25.7185448+08:00;True|2025-09-01T16:22:38.8407074+08:00;True|2025-09-01T16:06:25.7945621+08:00;True|2025-09-01T15:31:27.0834619+08:00;True|2025-09-01T14:59:08.5890520+08:00;False|2025-09-01T14:57:28.7657119+08:00;True|2025-09-01T13:53:31.9343713+08:00;True|2025-09-01T08:41:50.2295520+08:00;False|2025-09-01T08:38:01.5713406+08:00;True|2025-08-28T14:55:03.0173079+08:00;True|2025-08-28T14:52:51.2565418+08:00;False|2025-08-28T14:51:30.6840568+08:00;True|2025-08-28T13:35:10.1467445+08:00;False|2025-08-28T13:32:25.9131327+08:00;True|2025-08-27T11:02:31.7343752+08:00;False|2025-08-27T10:59:44.5559719+08:00;True|2025-08-21T15:59:13.4177899+08:00;True|2025-08-21T14:47:51.4421324+08:00;True|2025-08-21T14:21:13.8063997+08:00;True|2025-08-21T12:18:57.8433282+08:00;False|2025-08-21T12:13:51.6764234+08:00;True|2025-08-20T16:17:04.7867436+08:00;True|2025-08-20T16:02:21.9630937+08:00;True|2025-08-20T14:39:47.9097820+08:00;True|2025-08-20T14:23:55.2878167+08:00;True|2025-08-20T14:03:03.7939796+08:00;False|2025-08-20T14:01:49.8057856+08:00;True|2025-08-20T13:26:02.0693167+08:00;True|2025-08-20T13:22:41.5516334+08:00;False|2025-08-20T13:20:01.9442856+08:00;True|2025-08-19T16:17:40.4179908+08:00;True|2025-06-26T14:26:16.3020605+08:00;False|2025-06-26T14:24:24.5583234+08:00;True|2025-06-25T15:02:18.2205903+08:00;True|2025-06-25T09:34:33.1671232+08:00;True|2025-06-25T09:26:33.7399794+08:00;False|2025-06-25T09:22:46.7930507+08:00;True|2025-06-24T17:43:37.3371343+08:00;True|2025-06-24T17:00:08.5835940+08:00;True|2025-06-24T16:47:41.4472010+08:00;True|2025-06-24T11:41:43.2862393+08:00;True|2025-06-24T10:48:03.1738588+08:00;False|2025-06-24T10:45:52.9978454+08:00;True|2025-06-23T13:18:10.4096300+08:00;True|2025-06-23T12:31:59.0813412+08:00;False|2025-06-23T12:29:46.4664908+08:00;True|2025-06-20T16:03:35.3322992+08:00;False|2025-06-20T16:01:23.2618070+08:00;True|2025-06-20T15:28:37.6392295+08:00;True|2025-06-20T15:09:48.2308611+08:00;False|2025-06-20T15:04:55.3964352+08:00;True|2025-06-19T21:36:23.6708072+08:00;True|2025-06-19T19:53:14.7964263+08:00;False|2025-06-19T19:49:48.7469721+08:00;True|2025-06-19T11:41:12.9312505+08:00;False|2025-06-19T11:38:58.9943665+08:00;True|2025-06-16T19:09:22.3809399+08:00;False|2025-06-16T19:05:38.2360178+08:00;True|2025-06-11T16:11:09.7034263+08:00;True|2025-06-11T15:56:14.8299331+08:00;False|2025-06-11T15:52:19.5986426+08:00;True|2025-06-10T15:06:31.8605608+08:00;True|2025-06-10T13:56:48.6878035+08:00;True|2025-06-10T13:35:14.9094641+08:00;False|2025-06-10T13:30:23.2522090+08:00;True|2025-06-09T16:52:17.1298062+08:00;False|2025-06-09T16:50:41.4781506+08:00;True|2025-06-09T16:37:16.6960996+08:00;True|2025-06-09T16:18:47.6732333+08:00;False|2025-06-09T16:16:10.1076624+08:00;True|2025-06-09T11:41:26.6044246+08:00;False|2025-06-09T11:37:35.8219274+08:00;True|2025-05-30T20:50:31.5911403+08:00;True|2025-05-30T20:38:47.7863634+08:00;False|2025-05-30T20:36:56.9724524+08:00;True|2025-05-30T20:23:14.4714105+08:00;False|2025-05-30T20:20:59.6202693+08:00;True|2025-05-30T15:16:03.9417907+08:00;True|2025-05-30T15:07:53.4672683+08:00;True|2025-05-30T14:04:31.7468839+08:00;True|2025-05-30T11:40:00.7584518+08:00;False|2025-05-30T11:19:37.1214784+08:00;True|2025-05-30T10:09:42.0861719+08:00;True|2025-05-30T09:27:19.0448124+08:00;False|2025-05-30T09:22:08.8075236+08:00;True|2025-05-29T15:10:29.6652561+08:00;True|2025-05-29T14:58:05.0587060+08:00;True|2025-05-29T14:39:03.1390234+08:00;False|2025-05-29T14:36:03.2767085+08:00;True|2025-05-29T13:52:51.2348257+08:00;False|2025-05-29T13:45:44.5019969+08:00;False|2025-05-29T13:42:23.7583639+08:00;True|2025-05-28T15:19:47.4421065+08:00;True|2025-05-28T14:35:41.9319120+08:00;True|2025-05-28T14:31:54.4492539+08:00;False|2025-05-28T14:29:48.7367846+08:00;True|2025-05-26T20:16:27.4322301+08:00;True|2025-05-26T18:20:27.4706158+08:00;False|2025-05-26T18:16:05.8755995+08:00;True|2025-05-23T10:08:04.4148373+08:00;False|2025-05-23T10:04:56.4532406+08:00;True|2025-05-19T19:37:04.9188427+08:00;True|2025-05-19T19:22:46.1250782+08:00;True|2025-05-19T09:42:31.7002049+08:00;False|2025-05-19T09:32:01.6350123+08:00;True|2025-05-17T14:14:12.0279596+08:00;True|2025-05-17T13:44:20.1547573+08:00;True|2025-05-17T13:09:56.7254199+08:00;True|2025-05-17T12:22:45.9766542+08:00;True|2025-05-17T11:49:56.8647669+08:00;False|2025-05-17T11:46:23.8688151+08:00;True|2025-05-16T14:56:34.3445988+08:00;True|2025-05-16T13:09:24.9723517+08:00;False|2025-05-16T12:53:18.5385817+08:00;True|2025-05-15T17:17:23.2057769+08:00;True|2025-05-15T16:28:03.1493226+08:00;True|2025-05-15T16:09:34.5928723+08:00;True|2025-05-15T15:50:13.7185578+08:00;True|2025-05-15T15:43:43.9742646+08:00;True|2025-05-15T15:02:16.5848076+08:00;True|2025-05-15T14:28:35.2194847+08:00;False|2025-05-15T14:26:02.0933523+08:00;False|2025-05-15T14:25:16.4746523+08:00;False|2025-05-15T14:23:37.0444052+08:00;False|2025-05-15T14:22:38.2549781+08:00;True|2025-05-15T14:08:47.9908883+08:00;True|2025-05-15T13:30:28.6027783+08:00;False|2025-05-15T13:27:35.2019769+08:00;True|2025-05-14T14:33:50.7542669+08:00;False|2025-05-14T12:58:34.3790659+08:00;True|2025-05-06T18:16:13.1825659+08:00;False|2025-05-06T18:13:36.1768928+08:00;False|2025-04-30T10:51:25.6190120+08:00;True|2025-04-15T13:47:43.0319806+08:00;False|2025-04-15T13:43:39.5193511+08:00;True|2025-04-14T16:55:07.6035477+08:00;True|2025-04-14T16:10:02.4925200+08:00;True|2025-04-14T15:59:48.1256324+08:00;True|2025-04-14T15:35:58.3739263+08:00;True|2025-04-14T15:18:20.0231874+08:00;True|2025-04-14T15:15:48.1937642+08:00;True|2025-04-14T15:06:18.1485320+08:00;True|2025-04-14T13:58:54.9488220+08:00;True|2025-04-14T13:45:21.9528067+08:00;True|2025-04-14T13:32:41.8026503+08:00;True|2025-04-14T13:24:25.1609026+08:00;False|2025-04-14T13:21:46.7999422+08:00;True|2025-04-14T11:22:02.0084668+08:00;False|2025-04-14T11:16:39.7668266+08:00;True|2025-04-11T16:42:49.2287375+08:00;True|2025-04-11T15:21:50.9239660+08:00;False|2025-04-11T15:18:52.8043694+08:00;True|2025-04-09T17:30:38.2292747+08:00;True|2025-04-09T17:26:46.2681749+08:00;False|2025-04-09T17:24:55.8631858+08:00;True|2025-04-09T14:49:05.0786518+08:00;False|2025-04-09T14:47:08.0080072+08:00;True|2025-04-09T14:07:09.5914371+08:00;False|2025-04-09T14:03:54.1549615+08:00;True|2025-04-09T10:47:08.9478457+08:00;False|2025-04-09T10:42:24.4815543+08:00;True|2025-04-08T13:55:42.3999925+08:00;True|2025-04-08T13:03:18.1047211+08:00;False|2025-04-08T13:01:24.7284945+08:00;True|2025-04-08T12:45:45.9591473+08:00;True|2025-04-08T10:37:46.2486194+08:00;True|2025-04-08T10:19:41.4391162+08:00;True|2025-04-08T09:03:06.3555124+08:00;False|2025-04-08T09:00:24.5011547+08:00;True|2025-04-03T13:30:58.8690712+08:00;True|2025-04-03T11:11:58.9675862+08:00;True|2025-04-03T08:26:57.1183260+08:00;False|2025-04-03T08:24:15.5585637+08:00;True|2025-04-02T17:22:56.3662600+08:00;True|2025-04-02T16:34:30.3902014+08:00;False|2025-04-02T16:31:03.2711601+08:00;True|2025-04-02T08:53:58.9022912+08:00;False|2025-04-02T08:49:36.2482604+08:00;True|2025-04-01T14:11:15.6665093+08:00;True|2025-04-01T13:59:03.5182641+08:00;True|2025-04-01T11:34:01.0473928+08:00;False|2025-04-01T11:27:06.6219808+08:00;True|2025-03-31T11:32:14.3010437+08:00;False|2025-03-31T11:28:54.7180398+08:00;True|2025-03-28T16:33:00.1667734+08:00;True|2025-03-28T15:59:08.0311042+08:00;True|2025-03-28T14:24:00.8058555+08:00;True|2025-03-28T11:20:49.2519130+08:00;True|2025-03-28T09:46:40.2335440+08:00;True|2025-03-28T09:44:23.8324494+08:00;False|2025-03-28T09:39:07.0797562+08:00;True|2025-03-27T17:42:12.3457479+08:00;True|2025-03-27T16:53:40.2462518+08:00;True|2025-03-27T15:41:05.4036532+08:00;True|2025-03-27T14:20:24.3597261+08:00;True|2025-03-27T10:51:24.2799353+08:00;False|2025-03-27T10:45:28.9126200+08:00;True|2025-03-26T13:49:06.9257931+08:00;False|2025-03-26T13:44:48.7676302+08:00;True|2025-03-25T15:17:55.4790872+08:00;False|2025-03-25T15:14:39.3949477+08:00;True|2025-03-25T14:23:34.4515442+08:00;True|2025-03-24T16:49:42.0663422+08:00;True|2025-03-24T13:12:18.9244375+08:00;False|2025-03-24T13:07:19.8409939+08:00;False|2025-03-24T12:48:52.4860847+08:00;False|2025-03-24T11:39:21.1805195+08:00;False|2025-03-24T11:37:43.6802081+08:00;False|2025-03-24T11:33:57.1454920+08:00;False|2025-03-24T11:30:14.3844034+08:00;False|2025-03-24T11:28:02.5067052+08:00;False|2025-03-21T12:21:29.9136433+08:00;True|2025-03-20T16:39:21.8390481+08:00;True|2025-03-20T14:41:37.0419379+08:00;False|2025-03-20T14:37:15.3728461+08:00;True|2025-03-20T12:27:20.0312759+08:00;True|2025-03-20T10:42:53.0161637+08:00;True|2025-03-20T09:30:05.5790815+08:00;False|2025-03-20T09:25:15.2327164+08:00;True|2025-03-19T17:06:57.7672924+08:00;True|2025-03-19T15:46:30.3411577+08:00;True|2025-03-19T13:45:31.7138375+08:00;True|2025-03-19T11:09:17.0875638+08:00;False|2025-03-19T11:05:00.7852430+08:00;True|2025-03-18T17:07:26.8842323+08:00;False|2025-03-18T17:02:33.5857720+08:00;False|2025-03-17T11:09:34.0681444+08:00;True|2025-03-17T10:50:21.9158331+08:00;True|2025-03-17T09:42:47.9252167+08:00;False|2025-03-17T09:31:53.1872136+08:00;True|2025-03-14T17:46:56.2806627+08:00;True|2025-03-14T16:26:15.6828252+08:00;True|2025-03-14T16:14:53.0710942+08:00;True|2025-03-14T16:08:09.5365263+08:00;True|2025-03-14T15:59:01.3358337+08:00;True|2025-03-14T14:22:42.7725023+08:00;True|2025-03-14T09:54:22.0848434+08:00;False|2025-03-14T09:51:59.6649411+08:00;True|2025-03-14T09:36:17.1134782+08:00;False|2025-03-14T09:31:58.5198805+08:00;True|2025-03-13T13:08:01.9024847+08:00;False|2025-03-13T13:03:35.7160929+08:00;True|2025-03-12T15:37:13.4111189+08:00;True|2025-03-12T15:23:55.5422176+08:00;True|2025-03-12T15:16:21.2123980+08:00;True|2025-03-12T14:49:24.9895017+08:00;True|2025-03-12T14:41:41.5663090+08:00;False|2025-03-12T14:39:27.3156286+08:00;True|2025-03-12T14:10:23.4204108+08:00;False|2025-03-12T14:08:08.4985635+08:00;True|2025-03-12T13:34:39.8492928+08:00;False|2025-03-12T13:31:34.8359622+08:00;True|2025-03-12T11:39:34.2976894+08:00;False|2025-03-12T09:22:45.9334513+08:00;True|2025-03-10T15:59:42.1283263+08:00;False|2025-03-10T15:53:57.2115226+08:00;True|2025-03-07T16:23:25.1589274+08:00;True|2025-03-07T16:18:46.0202723+08:00;True|2025-03-07T15:59:34.8313474+08:00;True|2025-03-07T15:37:59.1693363+08:00;True|2025-03-07T14:05:40.7253978+08:00;True|2025-03-07T11:21:14.9610137+08:00;False|2025-03-07T11:15:41.4171028+08:00;True|2025-03-07T10:23:24.0437379+08:00;True|2025-03-07T10:07:03.4231550+08:00;False|2025-03-07T10:04:32.6854924+08:00;True|2025-03-06T16:32:23.7096239+08:00;True|2025-03-06T15:45:46.0345284+08:00;True|2025-03-06T15:40:00.7026164+08:00;True|2025-03-06T15:20:20.3523488+08:00;True|2025-03-06T14:19:37.2403331+08:00;True|2025-03-06T13:49:03.6420821+08:00;False|2025-03-06T13:46:35.7037619+08:00;True|2025-03-06T11:03:29.5882789+08:00;True|2025-03-06T09:59:53.3080173+08:00;True|2025-03-06T09:43:48.4337079+08:00;False|2025-03-06T09:35:05.3462434+08:00;True|2025-03-05T18:25:35.2595591+08:00;True|2025-03-05T18:03:37.5687895+08:00;True|2025-03-05T17:48:08.3418269+08:00;False|2025-03-05T17:44:40.0721881+08:00;True|2025-03-05T17:23:30.5871011+08:00;True|2025-03-05T16:31:12.2285816+08:00;True|2025-03-05T16:00:25.5496303+08:00;True|2025-03-05T15:11:30.9434230+08:00;True|2025-03-05T14:22:08.4650724+08:00;True|2025-03-05T13:29:42.9306833+08:00;True|2025-03-05T11:28:17.5541196+08:00;True|2025-03-05T11:10:22.3318023+08:00;True|2025-03-05T10:55:33.6796527+08:00;True|2025-03-05T10:08:26.7761472+08:00;True|2025-03-05T10:02:32.8701262+08:00;False|2025-03-05T09:59:55.0044057+08:00;True|2025-03-04T17:48:24.6869079+08:00;True|2025-03-04T17:42:05.0276293+08:00;False|2025-03-04T17:39:53.6208557+08:00;False|2025-03-04T17:39:30.0759309+08:00;False|2025-03-04T17:05:37.2163588+08:00;True|2025-03-04T16:51:15.6884461+08:00;True|2025-03-04T16:49:03.3836181+08:00;True|2025-03-04T16:31:36.5847402+08:00;True|2025-03-04T15:52:09.1977151+08:00;True|2025-03-04T15:24:25.0194954+08:00;True|2025-03-04T15:12:44.1606138+08:00;False|2025-03-04T15:10:47.3915404+08:00;True|2025-03-04T14:31:42.7483906+08:00;True|2025-03-04T11:28:36.6001869+08:00;False|2025-02-27T19:55:43.0462466+08:00;True|2025-02-24T16:03:00.5507258+08:00;False|2025-02-24T16:00:00.9104160+08:00;True|2025-02-19T16:55:31.8966125+08:00;True|2025-02-19T14:51:19.5866770+08:00;False|2025-02-19T14:49:16.2857645+08:00;True|2025-02-19T14:11:03.8109482+08:00;False|2025-02-19T14:08:17.7243950+08:00;True|2025-02-19T11:16:48.1875981+08:00;False|2025-02-19T11:14:24.0571589+08:00;True|2025-02-19T10:17:34.3257301+08:00;False|2025-02-19T10:14:49.0730325+08:00;True|2025-02-18T09:38:54.9616937+08:00;True|2025-02-18T09:16:03.1196071+08:00;False|2025-02-18T09:13:52.5022130+08:00;True|2025-02-17T17:28:38.1103164+08:00;True|2025-02-17T17:06:19.1494960+08:00;True|2025-02-17T16:58:21.8893871+08:00;False|2025-02-17T16:56:34.0012780+08:00;True|2025-02-17T15:56:45.9560949+08:00;False|2025-02-17T15:29:32.9323141+08:00;False|2025-02-17T15:27:54.6615301+08:00;False|2025-02-17T15:25:42.7179137+08:00;True|2025-02-12T10:48:39.4029671+08:00;True|2025-02-12T10:45:09.8138793+08:00;False|2025-02-12T10:43:37.5751112+08:00;False|2025-02-12T10:43:24.8201898+08:00;False|2025-02-12T10:42:58.2736984+08:00;False|2025-02-12T10:42:46.1482594+08:00;False|2025-02-12T10:42:01.5427330+08:00;False|2025-02-12T10:41:48.3761346+08:00;False|2025-02-12T10:41:29.3367142+08:00;True|2025-02-11T15:41:34.0746843+08:00;True|2025-02-11T15:39:37.3374891+08:00;False|2025-02-11T15:39:27.0449176+08:00;False|2025-02-11T15:08:35.2970100+08:00;True|2025-02-11T14:59:59.6539416+08:00;True|2025-02-11T14:56:20.5954601+08:00;False|2025-02-11T14:55:35.6700921+08:00;True|2025-02-10T09:39:38.7399451+08:00;False|2025-02-10T09:39:10.1358642+08:00;True|2025-02-08T16:00:23.1136903+08:00;False|2025-02-08T15:59:50.0414065+08:00;True|2025-01-17T10:17:41.6850215+08:00;False|2025-01-17T10:16:20.3202054+08:00;True|2025-01-17T09:00:26.6966310+08:00;False|2025-01-17T08:59:59.9527727+08:00;True|2025-01-16T11:06:57.1014257+08:00;True|2025-01-16T10:27:57.2742426+08:00;False|2025-01-16T10:27:27.5197746+08:00;True|2025-01-15T11:05:17.5523582+08:00;True|2025-01-15T09:37:34.6118980+08:00;False|2025-01-15T09:36:27.7987949+08:00;True|2025-01-14T12:52:06.2234405+08:00;True|2025-01-14T12:50:08.8487446+08:00;False|2025-01-14T12:49:45.2743330+08:00;True|2025-01-14T10:31:18.6477403+08:00;False|2025-01-14T10:29:30.1534049+08:00;True|2025-01-13T15:27:00.4497527+08:00;True|2025-01-13T15:01:33.6142160+08:00;True|2025-01-13T10:29:49.4772980+08:00;True|2025-01-13T10:11:15.7993265+08:00;True|2025-01-13T10:08:58.9378828+08:00;False|2025-01-13T10:08:44.9869073+08:00;True|2025-01-13T10:02:17.5175561+08:00;False|2025-01-13T10:02:00.9991870+08:00;True|2025-01-08T17:50:21.7468469+08:00;True|2025-01-08T16:38:48.8592252+08:00;True|2025-01-08T10:44:42.9161086+08:00;False|2025-01-08T10:44:09.4840640+08:00;True|2025-01-08T10:34:31.5982265+08:00;False|2025-01-08T10:33:57.3576390+08:00;True|2025-01-03T17:19:09.1765100+08:00;True|2025-01-03T17:10:41.8794009+08:00;True|2025-01-03T17:10:11.4245485+08:00;True|2025-01-03T15:54:22.3387906+08:00;True|2025-01-03T15:41:44.9897120+08:00;False|2025-01-03T15:40:42.1357112+08:00;False|2025-01-03T15:39:09.0564197+08:00;True|2025-01-03T14:58:31.5701467+08:00;True|2025-01-03T14:29:13.4456304+08:00;False|2025-01-03T14:27:18.9925263+08:00;True|2025-01-02T16:08:24.1819376+08:00;True|2025-01-02T16:07:01.1636705+08:00;True|2025-01-02T16:03:02.6520904+08:00;True|2025-01-02T10:03:56.0551738+08:00;False|2025-01-02T10:03:34.8632732+08:00;True|2024-12-31T15:27:01.3180960+08:00;True|2024-12-31T11:17:12.2977529+08:00;True|2024-12-31T10:48:14.7205535+08:00;True|2024-12-31T10:18:45.6669875+08:00;False|2024-12-31T10:18:21.6706557+08:00;True|2024-12-30T09:32:44.3898729+08:00;True|2024-12-30T09:31:24.5771941+08:00;False|2024-12-30T09:30:52.4031391+08:00;True|2024-12-27T16:12:20.2836752+08:00;False|2024-12-27T16:11:04.6614343+08:00;True|2024-12-27T15:07:23.0750147+08:00;True|2024-12-27T15:04:52.7876532+08:00;True|2024-12-27T14:37:54.3154829+08:00;False|2024-12-27T14:37:26.9546174+08:00;True|2024-12-26T16:33:56.0452167+08:00;True|2024-12-26T16:29:21.4115458+08:00;True|2024-12-26T16:29:02.0242815+08:00;True|2024-12-26T15:17:24.7390981+08:00;False|2024-12-26T15:13:26.8863189+08:00;True|2024-12-26T15:06:35.4541902+08:00;True|2024-12-26T11:35:42.2760106+08:00;False|2024-12-26T11:35:08.9255789+08:00;True|2024-12-26T10:10:29.7487991+08:00;True|2024-12-26T09:27:40.2637311+08:00;False|2024-12-26T09:25:52.1339136+08:00;True|2024-12-24T15:11:48.9968778+08:00;True|2024-12-24T15:06:55.0283993+08:00;True|2024-12-24T14:36:29.6466740+08:00;True|2024-12-24T10:28:42.7489880+08:00;False|2024-12-24T10:28:08.6809715+08:00;True|2024-12-24T10:06:05.9449103+08:00;False|2024-12-24T10:05:32.8409161+08:00;True|2024-12-23T14:56:40.3416256+08:00;True|2024-12-23T14:50:50.2677378+08:00;True|2024-12-23T14:48:27.8169391+08:00;True|2024-12-23T14:45:25.5341474+08:00;True|2024-12-23T14:42:23.7825087+08:00;True|2024-12-23T14:35:53.8876449+08:00;True|2024-12-23T14:14:00.4257926+08:00;True|2024-12-23T11:10:54.5874876+08:00;True|2024-12-23T11:08:44.0250304+08:00;False|2024-12-23T11:08:18.5757850+08:00;True|2024-12-20T12:51:29.2354841+08:00;True|2024-12-20T12:46:13.7636932+08:00;False|2024-12-20T12:44:21.1473486+08:00;False|2024-12-20T12:44:06.5427106+08:00;True|2024-12-20T12:29:33.9971940+08:00;False|2024-12-20T12:29:01.0285205+08:00;True|2024-12-19T15:49:19.9906264+08:00;True|2024-12-19T14:55:54.3323405+08:00;True|2024-12-19T14:17:50.5086161+08:00;True|2024-12-19T14:08:16.0919011+08:00;True|2024-12-19T14:02:50.3092759+08:00;True|2024-12-19T13:54:41.2332165+08:00;False|2024-12-19T13:54:07.6973483+08:00;True|2024-12-19T09:34:54.5332110+08:00;True|2024-12-19T08:49:05.5690428+08:00;False|2024-12-19T08:48:51.0618113+08:00;True|2024-12-18T15:45:34.7174246+08:00;False|2024-12-18T15:45:10.3226822+08:00;True|2024-12-18T15:32:03.5983267+08:00;True|2024-12-18T15:31:20.1219502+08:00;True|2024-12-18T11:57:09.1595607+08:00;True|2024-12-18T11:13:37.4765697+08:00;True|2024-12-18T10:07:54.1294714+08:00;True|2024-12-18T10:04:16.0967342+08:00;False|2024-12-18T10:04:04.1561560+08:00;True|2024-12-16T17:07:07.3386872+08:00;True|2024-12-16T16:34:59.1101964+08:00;True|2024-12-16T16:19:07.9287470+08:00;False|2024-12-16T16:18:46.4617432+08:00;True|2024-12-13T18:06:11.0778539+08:00;True|2024-12-13T16:53:52.2283177+08:00;True|2024-12-13T16:23:15.9531944+08:00;True|2024-12-13T13:58:03.7464045+08:00;True|2024-12-13T10:40:33.9285602+08:00;True|2024-12-13T10:38:03.8494063+08:00;False|2024-12-13T10:37:52.4251132+08:00;True|2024-12-13T10:31:07.4994631+08:00;False|2024-12-13T10:30:40.8021885+08:00;True|2024-12-12T10:01:42.4944750+08:00;False|2024-12-12T10:01:15.7147977+08:00;True|2024-12-11T17:21:58.0453583+08:00;True|2024-12-11T10:59:15.3836831+08:00;True|2024-12-11T09:49:19.4060272+08:00;False|2024-12-11T09:48:51.7603525+08:00;True|2024-12-11T08:58:41.4567855+08:00;False|2024-12-11T08:58:09.2160433+08:00;True|2024-12-10T17:25:49.3068154+08:00;True|2024-12-10T17:21:30.0155027+08:00;True|2024-12-10T17:16:56.7587487+08:00;False|2024-12-10T17:16:34.7816611+08:00;True|2024-12-10T16:55:40.3777585+08:00;False|2024-12-10T16:55:13.2621448+08:00;False|2024-12-09T13:59:27.6362265+08:00;True|2024-12-06T16:55:30.6422980+08:00;True|2024-12-06T15:08:49.5834939+08:00;True|2024-12-06T14:31:56.0968616+08:00;False|2024-12-06T14:31:44.2264009+08:00;True|2024-12-06T13:59:52.8150929+08:00;False|2024-12-06T13:48:22.6073939+08:00;True|2024-12-05T17:33:27.9247467+08:00;True|2024-12-05T17:30:23.1740838+08:00;False|2024-12-05T17:30:03.9977311+08:00;True|2024-12-04T15:18:41.4963816+08:00;True|2024-12-04T15:16:45.1121101+08:00;True|2024-12-04T15:14:33.5954776+08:00;True|2024-12-04T15:12:27.2913137+08:00;True|2024-12-04T14:10:19.6190673+08:00;False|2024-12-04T14:10:02.0319713+08:00;True|2024-12-03T16:08:46.6721098+08:00;True|2024-12-03T15:16:04.1754554+08:00;True|2024-12-03T15:13:25.4927626+08:00;True|2024-12-03T14:55:09.4413291+08:00;True|2024-12-03T14:43:11.8243897+08:00;True|2024-12-03T14:29:16.1511932+08:00;True|2024-12-03T14:24:07.9561838+08:00;False|2024-12-03T14:23:55.1293602+08:00;True|2024-12-02T16:31:22.0404862+08:00;False|2024-12-02T16:28:53.1721961+08:00;True|2024-12-02T15:41:24.9462025+08:00;True|2024-12-02T14:12:12.9356193+08:00;False|2024-12-02T14:11:35.7159488+08:00;True|2024-12-02T10:59:31.5582757+08:00;True|2024-11-29T12:08:55.4868083+08:00;False|2024-11-29T12:08:37.0353185+08:00;True|2024-11-28T10:47:27.2071355+08:00;False|2024-11-28T10:47:13.6670955+08:00;True|2024-11-27T15:21:57.6747082+08:00;False|2024-11-27T15:20:07.2403056+08:00;True|2024-11-27T15:13:36.1461091+08:00;True|2024-11-27T14:34:35.5908753+08:00;False|2024-11-27T14:33:30.7118923+08:00;True|2024-11-26T15:16:44.1854927+08:00;True|2024-11-26T15:14:33.4021067+08:00;False|2024-11-26T15:14:07.9955135+08:00;True|2024-11-26T14:48:35.6408418+08:00;True|2024-11-26T14:45:00.7251556+08:00;True|2024-11-26T14:04:58.4232988+08:00;False|2024-11-26T14:04:28.1286675+08:00;True|2024-11-25T13:45:07.6935933+08:00;True|2024-11-25T13:43:59.0788650+08:00;False|2024-11-25T13:43:44.2225194+08:00;True|2024-11-25T08:54:05.5144014+08:00;False|2024-11-25T08:53:49.2284063+08:00;False|2024-11-22T09:53:13.7879664+08:00;True|2024-11-21T13:48:31.7056264+08:00;True|2024-11-21T13:46:55.0891551+08:00;True|2024-11-21T13:44:05.5221110+08:00;True|2024-11-21T13:43:39.1385899+08:00;False|2024-11-21T13:43:19.9351488+08:00;True|2024-11-20T11:33:52.0324053+08:00;True|2024-11-20T11:20:58.4917889+08:00;True|2024-11-20T11:03:46.9552623+08:00;True|2024-11-20T10:45:10.9517109+08:00;False|2024-11-20T10:44:58.3221116+08:00;False|2024-11-19T15:39:27.3889104+08:00;True|2024-11-19T14:42:32.0854561+08:00;True|2024-11-19T14:19:19.6198070+08:00;True|2024-11-19T14:13:08.2003750+08:00;False|2024-11-19T14:12:15.5442850+08:00;True|2024-11-18T13:05:41.0455534+08:00;True|2024-11-18T11:05:30.2819404+08:00;True|2024-11-18T10:51:07.1852818+08:00;False|2024-11-18T10:50:21.5098527+08:00;True|2024-11-18T10:15:38.5429366+08:00;True|2024-11-18T10:00:51.0847524+08:00;True|2024-11-18T09:34:52.1772715+08:00;True|2024-11-18T09:27:23.6013754+08:00;False|2024-11-18T09:26:00.9323551+08:00;True|2024-11-15T11:20:51.7576376+08:00;True|2024-11-15T11:11:17.5580168+08:00;True|2024-11-15T11:03:58.4142996+08:00;True|2024-11-15T10:44:50.5207827+08:00;True|2024-11-15T10:10:05.5550418+08:00;True|2024-11-15T09:49:30.6631382+08:00;False|2024-11-15T09:47:05.3973379+08:00;True|2024-11-14T18:31:54.8247681+08:00;True|2024-11-14T17:14:56.3660185+08:00;True|2024-11-14T16:49:44.7526912+08:00;True|2024-11-14T16:49:09.3427608+08:00;True|2024-11-14T15:59:00.2572264+08:00;True|2024-11-14T11:21:03.5110818+08:00;True|2024-11-14T10:51:10.7864658+08:00;False|2024-11-14T10:50:55.5384248+08:00;True|2024-11-14T10:29:13.6760158+08:00;False|2024-11-14T10:28:09.8622863+08:00;True|2024-11-13T17:48:46.4827219+08:00;True|2024-11-13T17:45:13.0659280+08:00;True|2024-11-13T16:01:55.2278671+08:00;False|2024-11-13T16:01:03.0040446+08:00;True|2024-11-12T17:24:06.3763535+08:00;True|2024-11-12T17:21:51.8459552+08:00;True|2024-11-12T17:11:57.9239909+08:00;True|2024-11-12T17:09:04.4322824+08:00;True|2024-11-12T17:07:12.1839548+08:00;True|2024-11-12T17:04:27.4579152+08:00;True|2024-11-12T17:03:59.6843282+08:00;True|2024-11-12T16:40:44.0714862+08:00;True|2024-11-12T16:36:27.7792764+08:00;True|2024-11-12T16:32:36.5262040+08:00;False|2024-11-12T16:32:23.9550194+08:00;True|2024-11-12T10:58:16.1987697+08:00;False|2024-11-12T10:58:04.8469631+08:00;True|2024-11-11T13:40:53.2582255+08:00;True|2024-11-11T13:37:45.0401833+08:00;True|2024-11-11T12:35:13.2429166+08:00;True|2024-11-11T11:27:29.0530688+08:00;False|2024-11-11T11:27:12.2765506+08:00;True|2024-11-08T15:52:17.1278870+08:00;False|2024-11-08T15:52:04.4379380+08:00;True|2024-11-07T18:27:41.8163960+08:00;False|2024-11-07T18:27:30.6037983+08:00;True|2024-11-06T15:55:27.6450488+08:00;True|2024-11-06T15:54:13.5957004+08:00;True|2024-11-06T15:25:33.3862531+08:00;True|2024-11-06T13:33:57.8502278+08:00;False|2024-11-06T13:33:39.2337086+08:00;True|2024-11-06T11:33:12.6755239+08:00;True|2024-11-05T18:34:17.7048247+08:00;True|2024-11-05T18:30:08.5724471+08:00;True|2024-11-05T18:24:35.5372980+08:00;True|2024-11-05T18:06:29.7644779+08:00;True|2024-11-05T17:53:50.9554703+08:00;True|2024-11-05T17:50:05.6376900+08:00;True|2024-11-05T11:13:46.2906508+08:00;True|2024-11-05T10:35:55.5423834+08:00;False|2024-11-05T10:35:20.4104039+08:00;True|2024-11-01T10:22:05.7636122+08:00;False|2024-11-01T10:21:33.2954398+08:00;True|2024-10-31T20:03:37.9075888+08:00;True|2024-10-31T18:35:31.6618415+08:00;True|2024-10-31T18:34:56.2479021+08:00;True|2024-10-31T09:43:29.0841188+08:00;False|2024-10-31T09:43:04.8780818+08:00;True|2024-10-30T18:42:11.0523067+08:00;True|2024-10-30T18:07:05.5603627+08:00;True|2024-10-30T18:03:15.3516621+08:00;True|2024-10-30T17:58:14.3276504+08:00;False|2024-10-30T17:57:44.5353118+08:00;True|2024-10-30T17:47:41.2889491+08:00;True|2024-10-30T17:19:36.6172721+08:00;True|2024-10-30T17:10:00.4399703+08:00;False|2024-10-30T17:08:57.6500450+08:00;True|2024-10-29T16:58:15.6006676+08:00;True|2024-10-29T16:51:56.8406649+08:00;True|2024-10-29T16:05:48.4297695+08:00;True|2024-10-29T15:12:15.1522377+08:00;True|2024-10-29T15:10:51.8431754+08:00;True|2024-10-29T11:21:01.5660940+08:00;False|2024-10-29T11:20:33.3958980+08:00;True|2024-10-28T17:51:26.7156861+08:00;False|2024-10-28T17:50:41.4388196+08:00;True|2024-10-28T13:34:14.8764262+08:00;True|2024-10-28T12:44:27.2083620+08:00;False|2024-10-28T12:43:57.5942717+08:00;True|2024-10-25T11:49:47.9817458+08:00;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
+>>>>>>> b67a44dcc2871d3e4866be1fe63da74b7912deaf
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="bin/AlibabaCloud.EndpointUtil.dll">
<publishTime>04/07/2020 16:33:48</publishTime>
@@ -45,28 +49,49 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
+<<<<<<< HEAD
<publishTime>11/20/2025 11:29:45</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>11/20/2025 11:29:45</publishTime>
+=======
+ <publishTime>11/11/2025 12:27:01</publishTime>
+ </File>
+ <File Include="bin/BLL.pdb">
+ <publishTime>11/11/2025 12:27:01</publishTime>
+>>>>>>> b67a44dcc2871d3e4866be1fe63da74b7912deaf
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
+<<<<<<< HEAD
<publishTime>11/05/2025 15:39:21</publishTime>
</File>
<File Include="bin/DAL.pdb">
<publishTime>11/05/2025 15:39:21</publishTime>
+=======
+ <publishTime>11/11/2025 12:26:56</publishTime>
+ </File>
+ <File Include="bin/DAL.pdb">
+ <publishTime>11/11/2025 12:26:56</publishTime>
+>>>>>>> b67a44dcc2871d3e4866be1fe63da74b7912deaf
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
+<<<<<<< HEAD
<publishTime>11/05/2025 15:39:16</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
<publishTime>11/05/2025 15:39:16</publishTime>
+=======
+ <publishTime>11/05/2025 13:33:01</publishTime>
+ </File>
+ <File Include="bin/DBUtility.pdb">
+ <publishTime>11/05/2025 13:33:01</publishTime>
+>>>>>>> b67a44dcc2871d3e4866be1fe63da74b7912deaf
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -93,7 +118,7 @@
<publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="bin/libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -111,13 +136,20 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
+<<<<<<< HEAD
<publishTime>11/05/2025 15:39:19</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>11/05/2025 15:39:19</publishTime>
+=======
+ <publishTime>11/11/2025 12:26:51</publishTime>
+ </File>
+ <File Include="bin/Model.pdb">
+ <publishTime>11/11/2025 12:26:51</publishTime>
+>>>>>>> b67a44dcc2871d3e4866be1fe63da74b7912deaf
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/08/2023 15:09:56</publishTime>
@@ -147,6 +179,7 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
+<<<<<<< HEAD
<publishTime>11/05/2025 15:39:11</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
@@ -157,24 +190,43 @@
</File>
<File Include="bin/Pub_Control.pdb">
<publishTime>11/05/2025 15:39:13</publishTime>
+=======
+ <publishTime>11/05/2025 13:32:57</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.pdb">
+ <publishTime>11/05/2025 13:32:57</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.dll">
+ <publishTime>11/05/2025 13:32:59</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.pdb">
+ <publishTime>11/05/2025 13:32:59</publishTime>
+>>>>>>> b67a44dcc2871d3e4866be1fe63da74b7912deaf
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
+<<<<<<< HEAD
<publishTime>11/05/2025 15:39:13</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
<publishTime>11/05/2025 15:39:13</publishTime>
+=======
+ <publishTime>11/05/2025 13:32:59</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.pdb">
+ <publishTime>11/05/2025 13:32:59</publishTime>
+>>>>>>> b67a44dcc2871d3e4866be1fe63da74b7912deaf
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>10/17/2025 10:41:26</publishTime>
+ <publishTime>10/20/2025 09:25:27</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>10/17/2025 10:41:26</publishTime>
+ <publishTime>10/20/2025 09:25:27</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -252,7 +304,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>07/08/2025 13:46:38</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -285,19 +337,33 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
+<<<<<<< HEAD
<publishTime>11/20/2025 11:25:58</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
<publishTime>11/20/2025 11:25:58</publishTime>
+=======
+ <publishTime>11/11/2025 08:56:22</publishTime>
+ </File>
+ <File Include="bin/TopSdk.pdb">
+ <publishTime>11/11/2025 08:56:22</publishTime>
+>>>>>>> b67a44dcc2871d3e4866be1fe63da74b7912deaf
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
+<<<<<<< HEAD
<publishTime>11/20/2025 15:19:10</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>11/20/2025 15:19:10</publishTime>
+=======
+ <publishTime>11/17/2025 11:28:34</publishTime>
+ </File>
+ <File Include="bin/WebAPI.pdb">
+ <publishTime>11/17/2025 11:28:34</publishTime>
+>>>>>>> b67a44dcc2871d3e4866be1fe63da74b7912deaf
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -309,58 +375,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:37</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:37</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:37</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:37</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:37</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:37</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -369,7 +435,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -378,124 +444,128 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="packages.config">
- <publishTime>10/13/2025 14:50:13</publishTime>
+ <publishTime>07/16/2025 10:35:08</publishTime>
</File>
<File Include="Template/barCodeTemplateStorage.json">
- <publishTime>09/05/2025 16:16:48</publishTime>
+ <publishTime>09/02/2025 13:42:43</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>05/23/2025 10:00:25</publishTime>
+ <publishTime>07/08/2025 13:46:38</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>08/21/2025 15:39:36</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>08/21/2025 15:39:36</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>08/21/2025 15:39:36</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>08/21/2025 15:39:36</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>08/21/2025 15:39:36</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>08/21/2025 15:39:36</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>08/21/2025 15:39:37</publishTime>
+ <publishTime>07/08/2025 13:55:36</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web.config">
+<<<<<<< HEAD
<publishTime>11/06/2025 10:59:44</publishTime>
+=======
+ <publishTime>11/16/2025 16:14:51</publishTime>
+>>>>>>> b67a44dcc2871d3e4866be1fe63da74b7912deaf
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index e88839f..ecc0b48 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -441,6 +441,7 @@
<Compile Include="Controllers\CJGL\Cj_ComplementGoodsBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" />
<Compile Include="Controllers\CJGL\Cj_SendGoodsBillController.cs" />
+ <Compile Include="Controllers\CJGL\Cj_CheckBarcodeController.cs" />
<Compile Include="Controllers\CJGL\Mes_OrderProcFlowAllReportController.cs" />
<Compile Include="Controllers\CJGL\Gy_MaterPreventErrMouldBillController.cs" />
<Compile Include="Controllers\CJGL\ReportController.cs" />
@@ -448,6 +449,8 @@
<Compile Include="Controllers\CJGL\Sc_OEEReportController.cs" />
<Compile Include="Controllers\CKGL\TMZD\Gy_BarCodeBillListController.cs" />
<Compile Include="Controllers\JHGL\Gy_SourceMouldBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldMoveStockRequestBillController.cs" />
+ <Compile Include="Controllers\MJGL\Gy_MaterialPackingRelationController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckRuleBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckPlanBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckBillController.cs" />
@@ -643,6 +646,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionListBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DisposeWayController.cs" />
<Compile Include="Controllers\鍗庤繙datamapping\Gy_PNLInfoController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MultipleCode_ReportController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PlanImplementation_ReportController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PNLInfoTypeLevelController.cs" />
<Compile Include="Controllers\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBill_WorkController.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 7310707..791e6cc 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -5,12 +5,12 @@
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
- <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\JFAPI.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WorkM/bin/Release/BLL.dll b/WorkM/bin/Release/BLL.dll
index ecd7a62..b824932 100644
--- a/WorkM/bin/Release/BLL.dll
+++ b/WorkM/bin/Release/BLL.dll
Binary files differ
diff --git a/WorkM/bin/Release/BLL.pdb b/WorkM/bin/Release/BLL.pdb
index 7b5778a..f7d385d 100644
--- a/WorkM/bin/Release/BLL.pdb
+++ b/WorkM/bin/Release/BLL.pdb
Binary files differ
diff --git a/WorkM/bin/Release/DAL.dll b/WorkM/bin/Release/DAL.dll
index ccfc945..a285c62 100644
--- a/WorkM/bin/Release/DAL.dll
+++ b/WorkM/bin/Release/DAL.dll
Binary files differ
diff --git a/WorkM/bin/Release/DAL.pdb b/WorkM/bin/Release/DAL.pdb
index e35b94a..68197f6 100644
--- a/WorkM/bin/Release/DAL.pdb
+++ b/WorkM/bin/Release/DAL.pdb
Binary files differ
diff --git a/WorkM/bin/Release/DBUtility.dll b/WorkM/bin/Release/DBUtility.dll
index 30d0908..cda9b46 100644
--- a/WorkM/bin/Release/DBUtility.dll
+++ b/WorkM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/WorkM/bin/Release/DBUtility.pdb b/WorkM/bin/Release/DBUtility.pdb
index 005852f..549937e 100644
--- a/WorkM/bin/Release/DBUtility.pdb
+++ b/WorkM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/WorkM/bin/Release/Model.dll b/WorkM/bin/Release/Model.dll
index d6a3af8..0edb04d 100644
--- a/WorkM/bin/Release/Model.dll
+++ b/WorkM/bin/Release/Model.dll
Binary files differ
diff --git a/WorkM/bin/Release/Model.pdb b/WorkM/bin/Release/Model.pdb
index be1faf0..0b04106 100644
--- a/WorkM/bin/Release/Model.pdb
+++ b/WorkM/bin/Release/Model.pdb
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Class.dll b/WorkM/bin/Release/Pub_Class.dll
index 76b8835..d8c5d3d 100644
--- a/WorkM/bin/Release/Pub_Class.dll
+++ b/WorkM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Class.pdb b/WorkM/bin/Release/Pub_Class.pdb
index 927f7ae..aed801f 100644
--- a/WorkM/bin/Release/Pub_Class.pdb
+++ b/WorkM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Control.dll b/WorkM/bin/Release/Pub_Control.dll
index cd84ffb..e87f9b4 100644
--- a/WorkM/bin/Release/Pub_Control.dll
+++ b/WorkM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Control.pdb b/WorkM/bin/Release/Pub_Control.pdb
index 20c6c24..bbea18d 100644
--- a/WorkM/bin/Release/Pub_Control.pdb
+++ b/WorkM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/WorkM/bin/Release/SQLHelper.dll b/WorkM/bin/Release/SQLHelper.dll
index e5fde45..dc89991 100644
--- a/WorkM/bin/Release/SQLHelper.dll
+++ b/WorkM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/WorkM/bin/Release/SQLHelper.pdb b/WorkM/bin/Release/SQLHelper.pdb
index 3e5309a..8695262 100644
--- a/WorkM/bin/Release/SQLHelper.pdb
+++ b/WorkM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/WorkM/bin/Release/WorkM.dll b/WorkM/bin/Release/WorkM.dll
index 4c03d6b..eb3ec3c 100644
--- a/WorkM/bin/Release/WorkM.dll
+++ b/WorkM/bin/Release/WorkM.dll
Binary files differ
diff --git a/WorkM/bin/Release/WorkM.pdb b/WorkM/bin/Release/WorkM.pdb
index 11f9da4..2c08597 100644
--- a/WorkM/bin/Release/WorkM.pdb
+++ b/WorkM/bin/Release/WorkM.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
index 52df4c0..725ce44 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 7154a49..7db743f 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.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index fde29ea..edda27f 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,8 +1,11 @@
-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
+<<<<<<< HEAD
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+=======
D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\GitHub\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
@@ -15,10 +18,19 @@
D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\WMES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\WMES\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.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
C:\Users\19858\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+<<<<<<< HEAD
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
+=======
+>>>>>>> 7141e956ca8488f6feb082828cd60653382b6c89
+>>>>>>> b67a44dcc2871d3e4866be1fe63da74b7912deaf
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..f6c481e
--- /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 e11a207..2b9b4dd 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -1,5 +1,14 @@
+<<<<<<< HEAD
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
+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
+>>>>>>> 7141e956ca8488f6feb082828cd60653382b6c89
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
index 52df4c0..725ce44 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 7154a49..7db743f 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1