From 94323a38801dee4c9320edd33698208c5f760d55 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期三, 12 一月 2022 16:50:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BLL/bin/x86/Release/BLL.pdb | 0
Pub_Control/bin/x86/Release/Pub_Control.dll | 0
DAL/bin/x86/Release/DBUtility.dll | 0
DAL/bin/x86/Release/DAL.dll | 0
SQLHelper/obj/x86/Release/SQLHelper.dll | 0
WebAPI/WebAPI.csproj.user | 2
Model/obj/x86/Release/Model.csproj.AssemblyReference.cache | 0
BLL/bin/x86/Release/BLL.dll | 0
BLL/bin/x86/Release/SQLHelper.pdb | 0
DBUtility/bin/x86/Release/DBUtility.pdb | 0
Model/bin/x86/Release/Pub_Class.pdb | 0
WarM/条码打印/Gy_BarCodeBill.cs | 227 +++++++++---
Pub_Control/bin/x86/Release/Pub_Control.pdb | 0
SQLHelper/obj/x86/Release/SQLHelper.pdb | 0
SQLHelper/obj/x86/Release/SQLHelper.csproj.FileListAbsolute.txt | 9
BLL/bin/x86/Release/Kingdee.BOS.WebApi.FormService.dll | 0
DAL/bin/x86/Release/Model.dll | 0
BLL/bin/x86/Release/Pub_Class.pdb | 0
Model/obj/x86/Release/Model.csproj.CopyComplete | 0
Model/bin/x86/Release/Pub_Control.dll | 0
BLL/bin/x86/Release/Newtonsoft.Json.dll | 0
DBUtility/bin/x86/Release/Pub_Class.pdb | 0
SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache | 0
DBUtility/bin/x86/Release/Pub_Class.dll | 0
Model/obj/x86/Release/Model.csproj.CoreCompileInputs.cache | 1
WebAPI/Controllers/基础资料/基础资料/Gy_StockCheckItemBillController.cs | 298 +++++++++--------
WebAPI/Controllers/WebAPIController.cs | 4
BLL/bin/x86/Release/Pub_Class.dll | 0
Model/bin/x86/Release/Pub_Control.pdb | 0
BLL/bin/x86/Release/DBUtility.dll | 0
BLL/bin/x86/Release/Pub_Control.pdb | 0
DAL/bin/x86/Release/Model.pdb | 0
BLL/bin/x86/Release/SQLHelper.dll | 0
Model/obj/x86/Release/Model.dll | 0
Model/bin/x86/Release/Pub_Class.dll | 0
Model/bin/x86/Release/SQLHelper.pdb | 0
WebAPI/Controllers/博日自动扫码线/ScanlineAPIController.cs | 3
Model/bin/x86/Release/SQLHelper.dll | 0
BLL/bin/x86/Release/DBUtility.pdb | 0
DAL/bin/x86/Release/DBUtility.pdb | 0
Model/obj/x86/Release/Model.pdb | 0
WebAPI/WebAPI.csproj | 1
BLL/bin/x86/Release/Kingdee.BOS.WebApi.Client.dll | 0
DAL/bin/x86/Release/SQLHelper.dll | 0
BLL/bin/x86/Release/Model.dll | 0
LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache | 0
Model/bin/x86/Release/Model.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 148 ++++----
Model/bin/x86/Release/DBUtility.dll | 0
Pub_Class/bin/x86/Release/Pub_Class.pdb | 0
DBUtility/bin/x86/Release/Pub_Control.pdb | 0
DBUtility/bin/x86/Release/SQLHelper.pdb | 0
Model/bin/x86/Release/Model.pdb | 0
WebAPI/Log.cs | 91 +++++
SQLHelper/bin/x86/Release/SQLHelper.pdb | 0
DAL/bin/x86/Release/Pub_Control.pdb | 0
Model/bin/x86/Release/DBUtility.pdb | 0
DBUtility/bin/x86/Release/Pub_Control.dll | 0
DBUtility/bin/x86/Release/SQLHelper.dll | 0
DAL/bin/x86/Release/Pub_Control.dll | 0
DAL/bin/x86/Release/Pub_Class.pdb | 0
WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs | 85 ++++
Pub_Class/bin/x86/Release/Pub_Class.dll | 0
DAL/bin/x86/Release/Pub_Class.dll | 0
SQLHelper/obj/x86/Release/SQLHelper.csproj.CoreCompileInputs.cache | 1
DAL/bin/x86/Release/SQLHelper.pdb | 0
BLL/bin/x86/Release/Model.pdb | 0
BLL/bin/x86/Release/Pub_Control.dll | 0
BLL/bin/x86/Release/AxInterop.gregn6Lib.dll | 0
BLL/bin/x86/Release/DAL.dll | 0
SQLHelper/bin/x86/Release/Pub_Class.pdb | 0
WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs | 86 ++--
Model/obj/x86/Release/Model.csproj.FileListAbsolute.txt | 15
BLL/bin/x86/Release/Kingdee.BOS.WebApi.ServicesStub.dll | 0
Pub_Control/bin/x86/Release/Pub_Class.dll | 0
SQLHelper/bin/x86/Release/Pub_Class.dll | 0
DAL/源单/InterFace源单/Cls_S_IF_POInStockBillList.cs | 2
DBUtility/bin/x86/Release/DBUtility.dll | 0
BLL/bin/x86/Release/DAL.pdb | 0
Model/obj/Release/build.force | 0
SQLHelper/obj/x86/Release/SQLHelper.csproj.CopyComplete | 0
WebAPI/DLL/ClsSc_PackUnionBill.cs | 2
Pub_Control/bin/x86/Release/Pub_Class.pdb | 0
SQLHelper/bin/x86/Release/SQLHelper.dll | 0
DAL/bin/x86/Release/DAL.pdb | 0
85 files changed, 627 insertions(+), 348 deletions(-)
diff --git a/BLL/bin/x86/Release/AxInterop.gregn6Lib.dll b/BLL/bin/x86/Release/AxInterop.gregn6Lib.dll
new file mode 100644
index 0000000..f33f9ae
--- /dev/null
+++ b/BLL/bin/x86/Release/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/BLL.dll b/BLL/bin/x86/Release/BLL.dll
new file mode 100644
index 0000000..4f552e7
--- /dev/null
+++ b/BLL/bin/x86/Release/BLL.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/BLL.pdb b/BLL/bin/x86/Release/BLL.pdb
new file mode 100644
index 0000000..072e630
--- /dev/null
+++ b/BLL/bin/x86/Release/BLL.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/DAL.dll b/BLL/bin/x86/Release/DAL.dll
new file mode 100644
index 0000000..31a92a4
--- /dev/null
+++ b/BLL/bin/x86/Release/DAL.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/DAL.pdb b/BLL/bin/x86/Release/DAL.pdb
new file mode 100644
index 0000000..67c63cb
--- /dev/null
+++ b/BLL/bin/x86/Release/DAL.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/DBUtility.dll b/BLL/bin/x86/Release/DBUtility.dll
new file mode 100644
index 0000000..3b372a3
--- /dev/null
+++ b/BLL/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/DBUtility.pdb b/BLL/bin/x86/Release/DBUtility.pdb
new file mode 100644
index 0000000..f28e3d7
--- /dev/null
+++ b/BLL/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/Kingdee.BOS.WebApi.Client.dll b/BLL/bin/x86/Release/Kingdee.BOS.WebApi.Client.dll
new file mode 100644
index 0000000..25dd347
--- /dev/null
+++ b/BLL/bin/x86/Release/Kingdee.BOS.WebApi.Client.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Kingdee.BOS.WebApi.FormService.dll b/BLL/bin/x86/Release/Kingdee.BOS.WebApi.FormService.dll
new file mode 100644
index 0000000..2117fef
--- /dev/null
+++ b/BLL/bin/x86/Release/Kingdee.BOS.WebApi.FormService.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Kingdee.BOS.WebApi.ServicesStub.dll b/BLL/bin/x86/Release/Kingdee.BOS.WebApi.ServicesStub.dll
new file mode 100644
index 0000000..8db034f
--- /dev/null
+++ b/BLL/bin/x86/Release/Kingdee.BOS.WebApi.ServicesStub.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Model.dll b/BLL/bin/x86/Release/Model.dll
new file mode 100644
index 0000000..400f7a4
--- /dev/null
+++ b/BLL/bin/x86/Release/Model.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Model.pdb b/BLL/bin/x86/Release/Model.pdb
new file mode 100644
index 0000000..ba3a81a
--- /dev/null
+++ b/BLL/bin/x86/Release/Model.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/Newtonsoft.Json.dll b/BLL/bin/x86/Release/Newtonsoft.Json.dll
new file mode 100644
index 0000000..416bd37
--- /dev/null
+++ b/BLL/bin/x86/Release/Newtonsoft.Json.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Class.dll b/BLL/bin/x86/Release/Pub_Class.dll
new file mode 100644
index 0000000..854fa89
--- /dev/null
+++ b/BLL/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Class.pdb b/BLL/bin/x86/Release/Pub_Class.pdb
new file mode 100644
index 0000000..38d47a6
--- /dev/null
+++ b/BLL/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Control.dll b/BLL/bin/x86/Release/Pub_Control.dll
new file mode 100644
index 0000000..2dd1155
--- /dev/null
+++ b/BLL/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/Pub_Control.pdb b/BLL/bin/x86/Release/Pub_Control.pdb
new file mode 100644
index 0000000..938cc49
--- /dev/null
+++ b/BLL/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/BLL/bin/x86/Release/SQLHelper.dll b/BLL/bin/x86/Release/SQLHelper.dll
new file mode 100644
index 0000000..f1d9645
--- /dev/null
+++ b/BLL/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/BLL/bin/x86/Release/SQLHelper.pdb b/BLL/bin/x86/Release/SQLHelper.pdb
new file mode 100644
index 0000000..4d6bd2d
--- /dev/null
+++ b/BLL/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/DAL.dll b/DAL/bin/x86/Release/DAL.dll
new file mode 100644
index 0000000..31a92a4
--- /dev/null
+++ b/DAL/bin/x86/Release/DAL.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/DAL.pdb b/DAL/bin/x86/Release/DAL.pdb
new file mode 100644
index 0000000..67c63cb
--- /dev/null
+++ b/DAL/bin/x86/Release/DAL.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/DBUtility.dll b/DAL/bin/x86/Release/DBUtility.dll
new file mode 100644
index 0000000..3b372a3
--- /dev/null
+++ b/DAL/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/DBUtility.pdb b/DAL/bin/x86/Release/DBUtility.pdb
new file mode 100644
index 0000000..f28e3d7
--- /dev/null
+++ b/DAL/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/Model.dll b/DAL/bin/x86/Release/Model.dll
new file mode 100644
index 0000000..400f7a4
--- /dev/null
+++ b/DAL/bin/x86/Release/Model.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/Model.pdb b/DAL/bin/x86/Release/Model.pdb
new file mode 100644
index 0000000..ba3a81a
--- /dev/null
+++ b/DAL/bin/x86/Release/Model.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Class.dll b/DAL/bin/x86/Release/Pub_Class.dll
new file mode 100644
index 0000000..854fa89
--- /dev/null
+++ b/DAL/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Class.pdb b/DAL/bin/x86/Release/Pub_Class.pdb
new file mode 100644
index 0000000..38d47a6
--- /dev/null
+++ b/DAL/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Control.dll b/DAL/bin/x86/Release/Pub_Control.dll
new file mode 100644
index 0000000..2dd1155
--- /dev/null
+++ b/DAL/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/Pub_Control.pdb b/DAL/bin/x86/Release/Pub_Control.pdb
new file mode 100644
index 0000000..938cc49
--- /dev/null
+++ b/DAL/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/DAL/bin/x86/Release/SQLHelper.dll b/DAL/bin/x86/Release/SQLHelper.dll
new file mode 100644
index 0000000..f1d9645
--- /dev/null
+++ b/DAL/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/DAL/bin/x86/Release/SQLHelper.pdb b/DAL/bin/x86/Release/SQLHelper.pdb
new file mode 100644
index 0000000..4d6bd2d
--- /dev/null
+++ b/DAL/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git "a/DAL/\346\272\220\345\215\225/InterFace\346\272\220\345\215\225/Cls_S_IF_POInStockBillList.cs" "b/DAL/\346\272\220\345\215\225/InterFace\346\272\220\345\215\225/Cls_S_IF_POInStockBillList.cs"
index da7e944..fb62b82 100644
--- "a/DAL/\346\272\220\345\215\225/InterFace\346\272\220\345\215\225/Cls_S_IF_POInStockBillList.cs"
+++ "b/DAL/\346\272\220\345\215\225/InterFace\346\272\220\345\215\225/Cls_S_IF_POInStockBillList.cs"
@@ -16,7 +16,7 @@
base.mvarItemKey = "1103";
base.sCondtion = " ";
base.sOrderSql = " order by 鍗曟嵁鍙� desc,hsubid ";
- base.sKeyCol = "渚涘簲鍟�";
+ base.sKeyCol = "HOrgID";
}
}
diff --git a/DBUtility/bin/x86/Release/DBUtility.dll b/DBUtility/bin/x86/Release/DBUtility.dll
new file mode 100644
index 0000000..3b372a3
--- /dev/null
+++ b/DBUtility/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/DBUtility.pdb b/DBUtility/bin/x86/Release/DBUtility.pdb
new file mode 100644
index 0000000..f28e3d7
--- /dev/null
+++ b/DBUtility/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Class.dll b/DBUtility/bin/x86/Release/Pub_Class.dll
new file mode 100644
index 0000000..854fa89
--- /dev/null
+++ b/DBUtility/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Class.pdb b/DBUtility/bin/x86/Release/Pub_Class.pdb
new file mode 100644
index 0000000..38d47a6
--- /dev/null
+++ b/DBUtility/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Control.dll b/DBUtility/bin/x86/Release/Pub_Control.dll
new file mode 100644
index 0000000..2dd1155
--- /dev/null
+++ b/DBUtility/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/Pub_Control.pdb b/DBUtility/bin/x86/Release/Pub_Control.pdb
new file mode 100644
index 0000000..938cc49
--- /dev/null
+++ b/DBUtility/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/DBUtility/bin/x86/Release/SQLHelper.dll b/DBUtility/bin/x86/Release/SQLHelper.dll
new file mode 100644
index 0000000..f1d9645
--- /dev/null
+++ b/DBUtility/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/DBUtility/bin/x86/Release/SQLHelper.pdb b/DBUtility/bin/x86/Release/SQLHelper.pdb
new file mode 100644
index 0000000..4d6bd2d
--- /dev/null
+++ b/DBUtility/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache b/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..a845d5d
--- /dev/null
+++ b/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/bin/x86/Release/DBUtility.dll b/Model/bin/x86/Release/DBUtility.dll
new file mode 100644
index 0000000..3b372a3
--- /dev/null
+++ b/Model/bin/x86/Release/DBUtility.dll
Binary files differ
diff --git a/Model/bin/x86/Release/DBUtility.pdb b/Model/bin/x86/Release/DBUtility.pdb
new file mode 100644
index 0000000..f28e3d7
--- /dev/null
+++ b/Model/bin/x86/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/Model.dll b/Model/bin/x86/Release/Model.dll
new file mode 100644
index 0000000..400f7a4
--- /dev/null
+++ b/Model/bin/x86/Release/Model.dll
Binary files differ
diff --git a/Model/bin/x86/Release/Model.pdb b/Model/bin/x86/Release/Model.pdb
new file mode 100644
index 0000000..ba3a81a
--- /dev/null
+++ b/Model/bin/x86/Release/Model.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Class.dll b/Model/bin/x86/Release/Pub_Class.dll
new file mode 100644
index 0000000..854fa89
--- /dev/null
+++ b/Model/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Class.pdb b/Model/bin/x86/Release/Pub_Class.pdb
new file mode 100644
index 0000000..38d47a6
--- /dev/null
+++ b/Model/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Control.dll b/Model/bin/x86/Release/Pub_Control.dll
new file mode 100644
index 0000000..2dd1155
--- /dev/null
+++ b/Model/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/Model/bin/x86/Release/Pub_Control.pdb b/Model/bin/x86/Release/Pub_Control.pdb
new file mode 100644
index 0000000..938cc49
--- /dev/null
+++ b/Model/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/Model/bin/x86/Release/SQLHelper.dll b/Model/bin/x86/Release/SQLHelper.dll
new file mode 100644
index 0000000..f1d9645
--- /dev/null
+++ b/Model/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/Model/bin/x86/Release/SQLHelper.pdb b/Model/bin/x86/Release/SQLHelper.pdb
new file mode 100644
index 0000000..4d6bd2d
--- /dev/null
+++ b/Model/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/Model/obj/Release/build.force b/Model/obj/Release/build.force
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Model/obj/Release/build.force
diff --git a/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..f5e894a
--- /dev/null
+++ b/Model/obj/x86/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/obj/x86/Release/Model.csproj.CopyComplete b/Model/obj/x86/Release/Model.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Model/obj/x86/Release/Model.csproj.CopyComplete
diff --git a/Model/obj/x86/Release/Model.csproj.CoreCompileInputs.cache b/Model/obj/x86/Release/Model.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..f84a48a
--- /dev/null
+++ b/Model/obj/x86/Release/Model.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+29d66df13f513c5744a8e9d673bb15ebcf022cba
diff --git a/Model/obj/x86/Release/Model.csproj.FileListAbsolute.txt b/Model/obj/x86/Release/Model.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..466dfe1
--- /dev/null
+++ b/Model/obj/x86/Release/Model.csproj.FileListAbsolute.txt
@@ -0,0 +1,15 @@
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\Model.dll
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\Model.pdb
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\DBUtility.dll
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\Pub_Class.dll
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\SQLHelper.dll
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\Pub_Control.dll
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\DBUtility.pdb
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\Pub_Class.pdb
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\SQLHelper.pdb
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\Model\bin\x86\Release\Pub_Control.pdb
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\Model\obj\x86\Release\Model.csproj.AssemblyReference.cache
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\Model\obj\x86\Release\Model.csproj.CoreCompileInputs.cache
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\Model\obj\x86\Release\Model.csproj.CopyComplete
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\Model\obj\x86\Release\Model.dll
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\Model\obj\x86\Release\Model.pdb
diff --git a/Model/obj/x86/Release/Model.dll b/Model/obj/x86/Release/Model.dll
new file mode 100644
index 0000000..400f7a4
--- /dev/null
+++ b/Model/obj/x86/Release/Model.dll
Binary files differ
diff --git a/Model/obj/x86/Release/Model.pdb b/Model/obj/x86/Release/Model.pdb
new file mode 100644
index 0000000..ba3a81a
--- /dev/null
+++ b/Model/obj/x86/Release/Model.pdb
Binary files differ
diff --git a/Pub_Class/bin/x86/Release/Pub_Class.dll b/Pub_Class/bin/x86/Release/Pub_Class.dll
new file mode 100644
index 0000000..854fa89
--- /dev/null
+++ b/Pub_Class/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Class/bin/x86/Release/Pub_Class.pdb b/Pub_Class/bin/x86/Release/Pub_Class.pdb
new file mode 100644
index 0000000..38d47a6
--- /dev/null
+++ b/Pub_Class/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Class.dll b/Pub_Control/bin/x86/Release/Pub_Class.dll
new file mode 100644
index 0000000..854fa89
--- /dev/null
+++ b/Pub_Control/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Class.pdb b/Pub_Control/bin/x86/Release/Pub_Class.pdb
new file mode 100644
index 0000000..38d47a6
--- /dev/null
+++ b/Pub_Control/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Control.dll b/Pub_Control/bin/x86/Release/Pub_Control.dll
new file mode 100644
index 0000000..2dd1155
--- /dev/null
+++ b/Pub_Control/bin/x86/Release/Pub_Control.dll
Binary files differ
diff --git a/Pub_Control/bin/x86/Release/Pub_Control.pdb b/Pub_Control/bin/x86/Release/Pub_Control.pdb
new file mode 100644
index 0000000..938cc49
--- /dev/null
+++ b/Pub_Control/bin/x86/Release/Pub_Control.pdb
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/Pub_Class.dll b/SQLHelper/bin/x86/Release/Pub_Class.dll
new file mode 100644
index 0000000..854fa89
--- /dev/null
+++ b/SQLHelper/bin/x86/Release/Pub_Class.dll
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/Pub_Class.pdb b/SQLHelper/bin/x86/Release/Pub_Class.pdb
new file mode 100644
index 0000000..38d47a6
--- /dev/null
+++ b/SQLHelper/bin/x86/Release/Pub_Class.pdb
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/SQLHelper.dll b/SQLHelper/bin/x86/Release/SQLHelper.dll
new file mode 100644
index 0000000..f1d9645
--- /dev/null
+++ b/SQLHelper/bin/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/bin/x86/Release/SQLHelper.pdb b/SQLHelper/bin/x86/Release/SQLHelper.pdb
new file mode 100644
index 0000000..4d6bd2d
--- /dev/null
+++ b/SQLHelper/bin/x86/Release/SQLHelper.pdb
Binary files differ
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..f5e894a
--- /dev/null
+++ b/SQLHelper/obj/x86/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.csproj.CopyComplete b/SQLHelper/obj/x86/Release/SQLHelper.csproj.CopyComplete
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/SQLHelper/obj/x86/Release/SQLHelper.csproj.CopyComplete
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.csproj.CoreCompileInputs.cache b/SQLHelper/obj/x86/Release/SQLHelper.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..c3910bc
--- /dev/null
+++ b/SQLHelper/obj/x86/Release/SQLHelper.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+e8ec5326fcce7dca1a8665f7df1eeeb575e7a0a1
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.csproj.FileListAbsolute.txt b/SQLHelper/obj/x86/Release/SQLHelper.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..d10c2c4
--- /dev/null
+++ b/SQLHelper/obj/x86/Release/SQLHelper.csproj.FileListAbsolute.txt
@@ -0,0 +1,9 @@
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\SQLHelper\bin\x86\Release\SQLHelper.dll
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\SQLHelper\bin\x86\Release\SQLHelper.pdb
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\SQLHelper\bin\x86\Release\Pub_Class.dll
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\SQLHelper\bin\x86\Release\Pub_Class.pdb
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.csproj.AssemblyReference.cache
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.csproj.CoreCompileInputs.cache
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.csproj.CopyComplete
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.dll
+D:\鏅轰簯MES\Lay-Api\MES-WEB-API\SQLHelper\obj\x86\Release\SQLHelper.pdb
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.dll b/SQLHelper/obj/x86/Release/SQLHelper.dll
new file mode 100644
index 0000000..f1d9645
--- /dev/null
+++ b/SQLHelper/obj/x86/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/obj/x86/Release/SQLHelper.pdb b/SQLHelper/obj/x86/Release/SQLHelper.pdb
new file mode 100644
index 0000000..4d6bd2d
--- /dev/null
+++ b/SQLHelper/obj/x86/Release/SQLHelper.pdb
Binary files differ
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index ebc3560..c6b008e 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -43,42 +43,43 @@
public const Int16 HQtyCol = 22;
public const Int16 HMinQtyCol = 23;
public const Int16 HBQtyCol = 24;
- public const Int16 HDeptIDCol = 25;
- public const Int16 HDeptNumberCol = 26;
- public const Int16 HDeptNameCol = 27;
- public const Int16 HSourceIDCol = 28;
- public const Int16 HSourceNumberCol = 29;
- public const Int16 HSourceNameCol = 30;
- public const Int16 HDateCol = 31;
- public const Int16 HEndDateCol = 32;
- public const Int16 HSupIDCol = 33;
- public const Int16 HSupNumberCol = 34;
- public const Int16 HSupNameCol = 35;
- public const Int16 HCusIDCol = 36;
- public const Int16 HCusNumberCol = 37;
- public const Int16 HCusNameCol = 38;
- public const Int16 HCusTypeCol = 39;
- public const Int16 HSourceInterIDCol = 40;
- public const Int16 HSourceEntryIDCol = 41;
- public const Int16 HSourceBillNoCol = 42;
- public const Int16 HSourceBillTypeCol = 43;
- public const Int16 HInstructIDCol = 44;
- public const Int16 HInstructNoCol = 45;
- public const Int16 HSeOrderBillIDCol = 46;
- public const Int16 HSeOrderBillNoCol = 47;
- public const Int16 HWhIDCol = 48;
- public const Int16 HWhNumberCol = 49;
- public const Int16 HWhNameCol = 50;
- public const Int16 HSPIDCol = 51;
- public const Int16 HSPNumberCol = 52;
- public const Int16 HSPNameCol = 53;
- public const Int16 HinitQtyCol = 54;
- public const Int16 HRemarkCol = 55;
- public const Int16 HPinfanBarCodeCol = 56;
- public const Int16 HMTONoCol = 57;
- public const Int16 HShowDateCol = 58;
- public const Int16 HInnerBillNoCol = 59;
- public const Int16 HMakerCol = 60;
+ public const Int16 HPackQtyCol = 25;
+ public const Int16 HDeptIDCol = 26;
+ public const Int16 HDeptNumberCol = 27;
+ public const Int16 HDeptNameCol = 28;
+ public const Int16 HSourceIDCol = 29;
+ public const Int16 HSourceNumberCol = 30;
+ public const Int16 HSourceNameCol = 31;
+ public const Int16 HDateCol = 32;
+ public const Int16 HEndDateCol = 33;
+ public const Int16 HSupIDCol = 34;
+ public const Int16 HSupNumberCol = 35;
+ public const Int16 HSupNameCol = 36;
+ public const Int16 HCusIDCol = 37;
+ public const Int16 HCusNumberCol = 38;
+ public const Int16 HCusNameCol = 39;
+ public const Int16 HCusTypeCol = 40;
+ public const Int16 HSourceInterIDCol = 41;
+ public const Int16 HSourceEntryIDCol = 42;
+ public const Int16 HSourceBillNoCol = 43;
+ public const Int16 HSourceBillTypeCol = 44;
+ public const Int16 HInstructIDCol = 45;
+ public const Int16 HInstructNoCol = 46;
+ public const Int16 HSeOrderBillIDCol = 47;
+ public const Int16 HSeOrderBillNoCol = 48;
+ public const Int16 HWhIDCol = 49;
+ public const Int16 HWhNumberCol = 50;
+ public const Int16 HWhNameCol = 51;
+ public const Int16 HSPIDCol = 52;
+ public const Int16 HSPNumberCol = 53;
+ public const Int16 HSPNameCol = 54;
+ public const Int16 HinitQtyCol = 55;
+ public const Int16 HRemarkCol = 56;
+ public const Int16 HPinfanBarCodeCol = 57;
+ public const Int16 HMTONoCol = 58;
+ public const Int16 HShowDateCol = 59;
+ public const Int16 HInnerBillNoCol = 60;
+ public const Int16 HMakerCol = 61;
public Int16 HSelectCol = 0;
public Int16 HSno2Col = 1;
@@ -137,7 +138,8 @@
public Int16 HMTONo2Col = 54;
public Int16 HShowDate2Col = 55;
public Int16 HInnerBillNo2Col = 56;
- public Int16 HMaker2Col = 57;
+ public Int16 HMaker2Col = 57;
+ public Int16 HEntryID2Col = 58;
//
public string ModName = "85";
public string ModCaption = "鏉＄爜鐢熸垚";
@@ -911,6 +913,7 @@
return;
}
grdSub.Rows[i].Cells[HTMCol].Value = TM;
+ grdSub.Rows[i].Cells[HEntryID2Col].Value = j + 1;
grdSub.Rows[i].Cells[HMaterID2Col].Value = grdMain.Rows[j].Cells[HMaterIDCol].Value;
grdSub.Rows[i].Cells[HMaterNumber2Col].Value = grdMain.Rows[j].Cells[HMaterNumberCol].Value;
grdSub.Rows[i].Cells[HMaterName2Col].Value = grdMain.Rows[j].Cells[HMaterNameCol].Value;
@@ -1008,6 +1011,7 @@
string HSeOrderBillNo = "";
string HInnerBillNo = "";
bool HGiveAwayFlag = false;
+ Int64 HEntryID = 0;
try
{
oCn.BeginTran();
@@ -1025,6 +1029,7 @@
}
//
HMaterID = ClsPub.isLong(grdSub.Rows[i].Cells[HMaterID2Col].Value);
+ HEntryID = ClsPub.isLong(grdSub.Rows[i].Cells[HEntryID2Col].Value);
HAuxPropID = ClsPub.isLong(grdSub.Rows[i].Cells[HAuxPropID2Col].Value);
HUnitID = ClsPub.isLong(grdSub.Rows[i].Cells[HUnitID2Col].Value);
HQty2 = ClsPub.isDoule(grdSub.Rows[i].Cells[HQty2Col].Value);
@@ -1056,7 +1061,7 @@
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
- ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
",HGiveAwayFlag " +
",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo " +
") values ("
@@ -1065,7 +1070,7 @@
+ ", " + 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()
+ + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
+ ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)
+ ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "')");
@@ -1473,7 +1478,7 @@
//
grdMain.RowCount = 0;
grdSub.RowCount = 0;
- grdMain.ColumnCount = 61; //鎬诲垪鏁�
+ grdMain.ColumnCount = 62; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
@@ -1499,6 +1504,7 @@
grdMain.Columns[HGiveAwayFlagCol].HeaderText = "鏄惁璧犲搧";
grdMain.Columns[HQtyCol].HeaderText = "鏁伴噺";
grdMain.Columns[HMinQtyCol].HeaderText = "鏈�灏忓寘瑁呮暟";
+ grdMain.Columns[HPackQtyCol].HeaderText = "澶栫鏁�";
grdMain.Columns[HBQtyCol].HeaderText = "绠辨暟";
grdMain.Columns[HSupIDCol].HeaderText = "渚涘簲鍟咺D";
grdMain.Columns[HSupNumberCol].HeaderText = "渚涘簲鍟嗕唬鐮�";
@@ -1585,6 +1591,7 @@
"," + HSeOrderBillNoCol.ToString() +
"," + HBatchNoCol.ToString() +
"," + HCusNumberCol.ToString() +
+ "," + HPackQtyCol.ToString() +
"," + HRemarkCol.ToString();
//璁剧疆鍚堣鍒�
string sTotalCol = HQtyCol.ToString();
@@ -1604,7 +1611,7 @@
DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol,oSumGrid);
//----------------------------
- grdSub.ColumnCount = 58; //鎬诲垪鏁�
+ grdSub.ColumnCount = 59; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdSub, this.Name);
grdSub.Columns[HSelectCol].HeaderText = "閫夋嫨";
grdSub.Columns[HTMCol].HeaderText = "鏉＄爜缂栧彿";
@@ -1662,6 +1669,7 @@
grdSub.Columns[HShowDate2Col].HeaderText = "鏃ユ湡";
grdSub.Columns[HInnerBillNo2Col].HeaderText = "鍐呴儴閲囪喘璁㈠崟鍙�";
grdSub.Columns[HMaker2Col].HeaderText = "鍒跺崟浜�";
+ grdSub.Columns[HEntryID2Col].HeaderText = "琛屽彿";
//鏍煎紡鍖�
grdSub.Columns[HMaterID2Col].Visible = false;
grdSub.Columns[HModel2Col].Visible = false;
@@ -2377,6 +2385,7 @@
"," + HMinQtyCol.ToString() +
"," + HAuxPropNumberCol.ToString() +
"," + HBatchNoCol.ToString() +
+ "," + HPackQtyCol.ToString() +
"," + HRemarkCol.ToString();
grdMain.Columns[HBillNoCol].ReadOnly = true;
//璁剧疆鍚堣鍒�
@@ -3213,30 +3222,122 @@
//鐢熸垚澶栫鐮�
private void wxm_Click(object sender, EventArgs e)
{
- //蹇呴』鏉＄爜鐢熸垚鎸夐挳鏄伆搴︽墠鍙互鐢熸垚绠辨潯鐮�
- if(bc.Enabled != false)
+ try
{
- MessageBox.Show("璇峰厛鐢熸垚鏉″舰鐮侊紝鍐嶇敓鎴愮鏉＄爜");
- return;
- }
- //-------------------鏍规嵁HINTERID鐢熸垚绠辨潯鐮�
+ Int64 iInterID = 0;
+ Int64 dPackQty = 0; //澶栫鏁伴噺
+ Int64 dPackLeftQty = 0; //澶栫鍓╀綑鏁伴噺
+ Int64 dLabelQty = 0; //灏忕鏁伴噺
+ Int64 dQty = 0; //鎬绘暟閲�
+ Int64 dEntryID = 0; //琛屽彿
+ string sPackBarCode = ""; //澶栫鐮�
+ string sBarCode = ""; //鍞竴鐮�
+ Int64 LSH = 0;
+ DataSet Ds;
+ string sYear = DateTime.Today.Year.ToString().Substring(2, 2);
+ string sPeriod = "0" + DateTime.Today.Month.ToString();
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ string sDay = "0" + DateTime.Today.Day.ToString();
+ sDay = sDay.Substring(sDay.Length - 2, 2);
+ //
+ string sPackStr = "ZXM" + sYear + sPeriod + sDay; //澶栫鐮� 鍓嶇紑
- //鐢熸垚鍓嶅垽鏂紝寰幆鐗╂枡缃戞牸锛屽垽鏂� 鏄惁璁剧疆浜嗗悎鐞嗙殑 澶栫鏁伴噺銆� 澶栫鏁伴噺 蹇呴』鏄� 鏈�灏忓寘瑁呮暟鐨� 鍊嶆暟 骞跺繀椤诲ぇ浜�0鍜屽ぇ浜庣瓑浜庢渶灏忓寘瑁呮暟閲忋��
-
-
-
- //浠�0琛岃繘琛屽惊鐜� 鐗╂枡缃戞牸锛岃幏鍙栧绠辨暟閲�
-
- //瀛愬惊鐜� 鏉＄爜缃戞牸
-
- //鏍规嵁澶栫鏁伴噺 鎵ｅ噺锛岀洿鍒� 澶栫鏁伴噺鎵ｅ噺瀹岋紝鐢熸垚 澶栫鏉＄爜鍜岀粍鎵樺崟
-
-
- //缁撴潫寰幆
-
- //鍒锋柊鎵撳嵃椤电锛�-S 鐨� 铏氭嫙鏉＄爜涓嶆樉绀� 锛�
-
-
+ //蹇呴』鏉＄爜鐢熸垚鎸夐挳鏄伆搴︽墠鍙互鐢熸垚绠辨潯鐮�
+ if (bc.Enabled != false)
+ {
+ MessageBox.Show("璇峰厛鐢熸垚鏉″舰鐮侊紝鍐嶇敓鎴愮鏉＄爜");
+ return;
+ }
+ //-------------------鏍规嵁HINTERID鐢熸垚绠辨潯鐮�
+ //鐢熸垚鍓嶅垽鏂紝寰幆鐗╂枡缃戞牸锛屽垽鏂� 鏄惁璁剧疆浜嗗悎鐞嗙殑 澶栫鏁伴噺銆� 澶栫鏁伴噺 蹇呴』鏄� 鏈�灏忓寘瑁呮暟鐨� 鍊嶆暟 骞跺繀椤诲ぇ浜�0鍜屽ぇ浜庣瓑浜庢渶灏忓寘瑁呮暟閲忋��
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ if (DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0)
+ {
+ if (DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPackQtyCol].Value) <= 0)
+ {
+ MessageBox.Show("璇峰綍鍏ュ悎鐞嗙殑澶栫鏁伴噺锛岀" + Convert.ToString(i + 1) + "琛�");
+ return;
+ }
+ if (DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPackQtyCol].Value)
+ % DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HMinQtyCol].Value) != 0
+ || DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPackQtyCol].Value)
+ < DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HMinQtyCol].Value))
+ {
+ MessageBox.Show("澶栫鏁伴噺蹇呴』鏄渶灏忓寘瑁呮暟鐨勫�嶆暟锛屼笖澶т簬绛変簬鏈�灏忓寘瑁呮暟锛岀" + Convert.ToString(i + 1) + "琛�");
+ return;
+ }
+ }
+ }
+ //oCn.BeginTran();
+ //浠�0琛岃繘琛屽惊鐜� 鐗╂枡缃戞牸锛岃幏鍙栧绠辨暟閲�
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ if (DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value) != 0)
+ {
+ //鑾峰彇鎬绘暟閲忋�佸绠辨暟閲�
+ dPackQty = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPackQtyCol].Value);
+ dQty = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HQtyCol].Value);
+ dEntryID = i + 1;
+ dPackLeftQty = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPackQtyCol].Value);
+ //鐢熸垚涓�涓绠辩爜
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]) + 1;
+ sPackBarCode = sPackStr + LSH.ToString();
+ oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
+ //瀛愬惊鐜� 鏉＄爜缃戞牸
+ for (int j = 0; j < grdSub.Rows.Count; j++)
+ {
+ if (dEntryID == DBUtility.ClsPub.isLong(grdSub.Rows[j].Cells[HEntryID2Col].Value))
+ {
+ if (dQty <= 0)
+ {
+ continue;
+ }
+ if (dPackLeftQty > 0) //褰撳墿浣欏绠辨暟閲忓皬浜庣瓑浜�0鏃讹紝閲嶆柊鐢熸垚澶栫鐮�
+ {
+ }
+ else
+ {
+ //鐢熸垚涓�涓绠辩爜
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sPackStr + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿 //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]) + 1;
+ sPackBarCode = sPackStr + LSH.ToString();
+ oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sPackStr + "'");
+ dPackLeftQty = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HPackQtyCol].Value);
+ }
+ sBarCode = DBUtility.ClsPub.isStrNull(grdSub.Rows[j].Cells[HTMCol].Value); // 鏉＄爜
+ dLabelQty = DBUtility.ClsPub.isLong(grdSub.Rows[j].Cells[HQty2Col].Value); // 灏忕鏁伴噺
+ oCn.RunProc("update Gy_BarCodebill set HInnerBillNo= '" + sPackBarCode + "' Where HbarCode='" + sBarCode + "'");
+ dPackLeftQty = dPackLeftQty - dLabelQty;
+ dQty = dQty - dLabelQty;
+ if (dPackLeftQty <= 0)//褰撶鍓╀綑鏁伴噺灏忎簬绛変簬0鏃� 鎵ц 缁勬墭鍗�
+ {
+ //鑾峰彇缁勬墭鍗曞唴鐮�
+ iInterID = DBUtility.ClsPub.CreateBillID("3783", ref DBUtility.ClsPub.sExeReturnInfo); ;//寰楀埌鏂板崟鍙�;
+ //鏍规嵁澶栫鐮� 鍐欏叆 缁勬墭鍗曚富琛紝缁勬墭鍗曞瓙琛紝SUM锛屽绠辩爜妗ｆ锛孲UM妗ｆ
+ oCn.RunProc("exec h_p_WMS_PackUnionBill_AddNew '" + sPackBarCode + "'," + iInterID.ToString() + ",'" + DBUtility.ClsPub.CurUserName + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 涓昏〃锛屽瓙琛� 锛岀鏉＄爜妗ｆ
+ oCn.RunProc("exec h_p_WMS_PackUnionBill_SumSubBill " + iInterID.ToString() + ",'" + sPackBarCode + "','3783','" + DBUtility.ClsPub.CurUserName + "'," + HInterID.ToString()); //鏍规嵁绠辨潯鐮侊紝鍐欏叆 SUM琛紝SUM鏉＄爜妗ｆ
+ }
+ }
+ else
+ {
+ continue;
+ }
+ }
+ }
+ }
+ wxm.Enabled = false;
+ //oCn.Commit();
+ MessageBox.Show("鐢熸垚绠辩爜瀹屾瘯锛�");
+ //鍒锋柊鏁版嵁
+ Display();
+ }
+ catch(Exception e1)
+ {
+ //oCn.RollBack();
+ MessageBox.Show("鐢熸垚绠辩爜澶辫触锛�" + e1.Message );
+ }
}
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
index ed7c21c..eef42ac 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
@@ -438,7 +438,7 @@
return objJsonResult;
}
//寰楀埌淇℃伅
- ds = oCN.RunProcReturn("select top 1 * from Gy_EquipMent where HNumber= '" + HBarCode + "'", "Gy_EquipMent");
+ ds = oCN.RunProcReturn("select top 1 * from Gy_EquipFileBillMain where HEquipFileNumber= '" + HBarCode + "'", "Gy_EquipFileBillMain");
//鍐欏叆淇℃伅
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -475,49 +475,39 @@
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
string UserName = "";
ListModels oListModels = new ListModels();
try
{
- DLL.ClsSb_EquipMaintainBill oBill = new DLL.ClsSb_EquipMaintainBill();
- List<Models.ClsSb_EquipMaintainBillMain> lsmain = new List<Models.ClsSb_EquipMaintainBillMain>();
+ DAL.ClsSb_EquipMaintainBill oBill = new DAL.ClsSb_EquipMaintainBill();
+ List<Model.ClsSb_EquipMaintainBillMain> lsmain = new List<Model.ClsSb_EquipMaintainBillMain>();
msg2 = msg2.Replace("\\", "");
msg2 = msg2.Replace("\n", ""); //\n
- lsmain = oListModels.getObjectByJson_Sb_EquipMaintainBillMainPDA(msg2);
- foreach (Models.ClsSb_EquipMaintainBillMain oItem in lsmain)
+ lsmain = oListModels.getObjectByJson_Sb_EquipMaintainBillMain(msg2);
+ foreach (Model.ClsSb_EquipMaintainBillMain oItem in lsmain)
{
- //鍗曟嵁鍙锋槸鍚﹂噸澶�
- if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
- objJsonResult.data = 1;
- return objJsonResult;
- }
-
//oItem.HMaker = "";
UserName = oItem.HMaker; //鍒跺崟浜�
oItem.HBillType = "3901";
oItem.HBillSubType = "3901";
- //oItem.HBillNo = ""; //鍗曟嵁鍙�
- //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
- //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
- oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
- oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
- //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
- //oItem.HPeriod = 0;
- //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
- //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝ｅ父锛屽紓甯�)
- //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee)
- //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee)
- //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
- //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
- //oItem.HRemark = ""; //澶囨敞
- //oItem.HMainSourceInterID = oItem.HInterID;
+ //oItem.HInterID =0;
+ //oItem.HBillNo = "";
+ oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ //oItem.HMakeDate = "";
+ //oItem.HYear = "";
+ //oItem.HPeriod = "";
+ //oItem.HRemark = "";
+ //oItem.HCycleUnit = "";
+ //oItem.HCheckCycle = "";
+ //oItem.HBeginDate = "";
+ //oItem.HEndDate = "";
+ //oItem.HInnerBillNo = "";
+ //oItem.HExplanation = "";
//oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
@@ -530,34 +520,30 @@
}
oBill.omodel = oItem;
}
- //瀛愯〃浣撴暟鎹�
-
- List<Models.ClsSb_EquipMaintainBillSub> ls = new List<Models.ClsSb_EquipMaintainBillSub>();
- ls = oListModels.getObjectByJson_Sb_EquipMaintainBillSubPDA(msg2);
+ //淇濆吇椤硅〃浣撴暟鎹�
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsSc_EquipMaintainBillSub_Item> ls = new List<Model.ClsSc_EquipMaintainBillSub_Item>();
+ ls = oListModels.getObjectByJson_Sc_EquipMaintainBillSub_Item(msg3);
int i = 0;
- foreach (Models.ClsSb_EquipMaintainBillSub oItemSub in ls)
+ foreach (Model.ClsSc_EquipMaintainBillSub_Item item in ls)
{
i++;
- oItemSub.HEntryID = i;
-
- //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID
- //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭
- //oItemSub.HManagerID = 0; //璐熻矗浜篒D
+ item.HEntryID = i;
//oItemSub.HCloseMan = ""; //琛屽叧闂�
- oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
- oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ item.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ item.HCloseType = false; //鍏抽棴绫诲瀷
//oItemSub.HRemark = ""; //澶囨敞
- oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
- oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ item.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ item.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
//oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
//oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
- //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
- //oItemSub.HMoney = 0; //缁翠慨璐圭敤
- oBill.DetailColl.Add(oItemSub);
+ item.HRelationQty = 0; //鍏宠仈鏁伴噺
+ oBill.DetailCol.Add(item);
}
//淇濆瓨
diff --git a/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs b/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
index 54a7fcb..c7ede8d 100644
--- a/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_PackUnionBillController.cs
@@ -75,7 +75,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- DLL.ClsKf_MateOutBackBill oBill = new DLL.ClsKf_MateOutBackBill();
+ DAL.ClsSc_PackUnionBill oBill = new DAL.ClsSc_PackUnionBill();
if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
{
if (oBill.omodel.HBillStatus > 1)
@@ -102,23 +102,57 @@
objJsonResult.data = null;
return objJsonResult;
}
- bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
- if (IsDete)
+ ds = oCn.RunProcReturn("Select * from Sc_PackUnionBillMain where HinterID='" + lngBillKey, "Sc_PackUnionBillMain");
+ var HBarCode_Pack = ds.Tables[0].Rows[0]["HBarCode_Pack"].ToString();
+ if (ds.Tables.Count < 1)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ 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;
+ //鍒ゆ柇鏄惁鍏ュ簱
+ ds = oCn.RunProcReturn("select * from Sc_ScanLineInStock where HBarCode_Pack='" + HBarCode_Pack + "'", "Sc_ScanLineInStock");
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "-1";
+ objJsonResult.Message = "璇ョ鏉＄爜宸插叆搴撲笉鍏佽鍙栨秷!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCn.RunProcReturn("Select 1 from Gy_BarCodeBill where HBarCode='" + HBarCode_Pack + "'", "Gy_BarCodeBill");
+ if (ds == null && ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "-1";
+ objJsonResult.Message = "鏃犳晥绠辨潯鐮�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCn.RunProcReturn("Select 1 from Gy_BarCodeBill where HBarCode='" + HBarCode_Pack + "' and HStopflag='1'", "Gy_BarCodeBill");
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "-1";
+ objJsonResult.Message = "姝ょ鏉＄爜宸蹭綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
+
+ oCn.BeginTran();
+ oCn.RunProc("Update Gy_BarCodeBill set HStopflag='1' where HBarCode='" + HBarCode_Pack + "'");
+ oCn.RunProc("Delete From Sc_PackUnionBillSub_Sum where HBarCode_Pack='" + HBarCode_Pack + "'");
+ oCn.RunProc("Delete From Sc_PackUnionBillSub where HInterID='" + lngBillKey + "'");
+ oCn.RunProc("Delete From Sc_PackUnionBillMain where HInterID='" + lngBillKey + "'");
+ oCn.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
}
else
{
@@ -148,5 +182,32 @@
return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
}
#endregion
+
+ #region 鏍囧噯宸ユ椂鍗曞垪琛�
+
+ [Route("Sc_PackUnionBill/GetSc_StationInBillList")]
+ [HttpGet]
+ public object GetSc_StationInBillList(string sWhere)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("select * from h_v_Sc_StationInBillListMain order by hmainid desc", "h_v_Sc_StationInBillListMain");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
}
-}
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index eec471f..e54049f 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -122,12 +122,12 @@
return objjson;
}
- catch (Exception)
+ catch (Exception e)
{
objjson.code = "0";
objjson.count = 0;
- objjson.Message = "鐧诲綍寮傚父锛�";
+ objjson.Message = "鐧诲綍寮傚父锛�"+e.Message;
objjson.data = null;
return objjson; ;
}
diff --git "a/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs" "b/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
index 94f0f7a..98467d9 100644
--- "a/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
+++ "b/WebAPI/Controllers/\345\215\232\346\227\245\350\207\252\345\212\250\346\211\253\347\240\201\347\272\277/ScanlineAPIController.cs"
@@ -9,6 +9,7 @@
using System.Net.Http;
using System.Web.Http;
using System.Web.Script.Serialization;
+using ViewAPI;
using WebAPI.Models;
namespace WebAPI.Controllers.鍗氭棩鑷姩鎵爜绾�
@@ -74,6 +75,7 @@
{
try
{
+ Log.LogInfo(msg.ToString()); //璁板綍鎻愪氦鏁版嵁
JavaScriptSerializer js = new JavaScriptSerializer(); //瀹炰緥鍖栦竴涓兘澶熷簭鍒楀寲鏁版嵁鐨勭被
ScanLineCode list = js.Deserialize<ScanLineCode>(msg.ToString()); //灏唈son鏁版嵁杞寲涓哄璞＄被鍨嬪苟璧嬪�肩粰list
if (list.billno != "" && list.billno != null) //浠诲姟鍗曞彿锛岄潪蹇呴』锛岄潪绌哄垯鏍￠獙barcodes閲宐arcode鏄惁鐢辨浠诲姟鍗曞埗浣滅敓鎴愮殑
@@ -200,6 +202,7 @@
objJsonResult.status = 0;
objJsonResult.msg = "success";
objJsonResult.data = null;
+ Log.LogSaveInfo("鎻愪氦鎴愬姛绠辨潯鐮侊細"+ list.packagebarcode); //璁板綍鎻愪氦鏁版嵁
return objJsonResult;
}
else
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_StockCheckItemBillController.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_StockCheckItemBillController.cs"
index 14262b3..56203f0 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockCheckItemBillController.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_StockCheckItemBillController.cs"
@@ -264,39 +264,11 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
if (sID == null || sID == "")
{
- sql = string.Format(@"select k.HBarCode 鏉＄爜,m.HBillNo 鍣ㄥ叿缂栧彿,s.HName 鐩樼偣鏂规,
- case when k.HCorrespondentTypeID=1 then '渚涘簲鍟�' when k.HCorrespondentTypeID=2 then '瀹㈡埛' when k.HCorrespondentTypeID=4 then '浠撳簱' end 瀹為檯浣嶇疆绫诲瀷,
- case when k.HCorrespondentTypeID=1 then p.HName when k.HCorrespondentTypeID=2 then c.HName when k.HCorrespondentTypeID=4 then w.HName end 瀹為檯浣嶇疆,
- case when m.HNowSupTypeID=1 then '渚涘簲鍟�' when m.HNowSupTypeID=2 then '瀹㈡埛' when m.HNowSupTypeID=4 then '浠撳簱' end 璐﹂潰浣嶇疆绫诲瀷,
- case when m.HNowSupTypeID=1 then p1.HName when m.HNowSupTypeID=2 then c1.HName when m.HNowSupTypeID=4 then w1.HName end 璐﹂潰浣嶇疆
- from Sc_MouldStockBillMain_Temp k
- left join Gy_MouldFileMain m on k.HBarCode=m.HBarCode
- left join Gy_StockCheckItem s on k.HSourceInterID=s.HItemID
- left join Gy_Supplier p on k.HCorrespondentID=p.HItemID
- left join Gy_Supplier p1 on m.HNowSupID=p1.HItemID
- left join Gy_Customer c on k.HCorrespondentID=c.HItemID
- left join Gy_Customer c1 on m.HNowSupID=c1.HItemID
- left join Gy_Warehouse w on k.HCorrespondentID=w.HItemID
- left join Gy_Warehouse w1 on m.HNowSupID=w1.HItemID
- where " + sWhere);
+ sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisList where " + sWhere);
}
else
{
- sql = string.Format(@"select k.HBarCode 鏉＄爜,m.HBillNo 鍣ㄥ叿缂栧彿,s.HName 鐩樼偣鏂规,
- case when k.HCorrespondentTypeID=1 then '渚涘簲鍟�' when k.HCorrespondentTypeID=2 then '瀹㈡埛' when k.HCorrespondentTypeID=4 then '浠撳簱' end 瀹為檯浣嶇疆绫诲瀷,
- case when k.HCorrespondentTypeID=1 then p.HName when k.HCorrespondentTypeID=2 then c.HName when k.HCorrespondentTypeID=4 then w.HName end 瀹為檯浣嶇疆,
- case when m.HNowSupTypeID=1 then '渚涘簲鍟�' when m.HNowSupTypeID=2 then '瀹㈡埛' when m.HNowSupTypeID=4 then '浠撳簱' end 璐﹂潰浣嶇疆绫诲瀷,
- case when m.HNowSupTypeID=1 then p1.HName when m.HNowSupTypeID=2 then c1.HName when m.HNowSupTypeID=4 then w1.HName end 璐﹂潰浣嶇疆
- from Sc_MouldStockBillMain_Temp k
- left join Gy_MouldFileMain m on k.HBarCode=m.HBarCode
- left join Gy_StockCheckItem s on k.HSourceInterID=s.HItemID
- left join Gy_Supplier p on k.HCorrespondentID=p.HItemID
- left join Gy_Supplier p1 on m.HNowSupID=p1.HItemID
- left join Gy_Customer c on k.HCorrespondentID=c.HItemID
- left join Gy_Customer c1 on m.HNowSupID=c1.HItemID
- left join Gy_Warehouse w on k.HCorrespondentID=w.HItemID
- left join Gy_Warehouse w1 on m.HNowSupID=w1.HItemID
- where " + sWhere + " and k.HSourceInterID=(select HItemID from Gy_StockCheckItem where HItemID=" + sID + ") and k.HMakeDate<=(select HEndDate from Gy_StockCheckItem where HItemID=" + sID + ")");
+ sql = string.Format(@"select * from h_v_Sc_MouldInventoryAnalysisList where " + sWhere + " and HSourceInterID=(select HItemID from Gy_StockCheckItem where HItemID=" + sID + ") and HMakeDate<=(select HEndDate from Gy_StockCheckItem where HItemID=" + sID + ")");
}
ds = oCN.RunProcReturn(sql, "Sc_MouldStockBillMain_Temp");
list.Add(ds.Tables[0]);
@@ -317,39 +289,130 @@
}
#endregion
+ #region 鐩樼偣璁板綍鍒楄〃
+ [Route("Gy_StockCheckItemBill/Get_MouldStockBillMainTemp")]
+ [HttpGet]
+ public object Get_MouldStockBillMainTemp(string sWhere)
+ {
+ try
+ {
+ ds = MouldStockBillMainTemp(sWhere);
+ if (ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public static DataSet MouldStockBillMainTemp(string sWhere)
+ {
+ string sql1 = string.Format(@"select * from h_v_Gy_MouldStockBillMainTempList where 1=1 ");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by 鍒跺崟鏃ユ湡 desc", "h_v_Gy_MouldStockBillMainTempList");
+ }
+ else
+ {
+ string sql = sql1 + sWhere + "order by 鍒跺崟鏃ユ湡 desc";
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Gy_MouldStockBillMainTempList");
+ }
+ }
+ #endregion
+
+ #region [鐩樼偣璁板綍鍒犻櫎鍔熻兘]
+ [Route("Gy_StockCheckItemBill/set_DeleteBill_Temp")]
+ [HttpGet]
+ public object set_DeleteBill_Temp(string HItemID)
+ {
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HItemID);
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCn.RunProcReturn("select * from Sc_MouldStockBillMain_Temp where HItemID=" + lngBillKey, "Sc_MouldStockBillMain_Temp");
+ if (ds != null)
+ {
+ oCn.RunProc("Delete from Sc_MouldStockBillMain_Temp where HItemID=" + lngBillKey);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹笉瀛樺湪锛岃鏌ョ湅鏄惁閲嶅鍒犻櫎";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+ #endregion
+
#region 鐩樼偣鍒嗘瀽瀹℃牳
#region 璋冩嫧鈥旂洿鎺ヨ皟鎷�
- [Route("Gy_StockCheckItemBill/MakeProdMove")]
+ [Route("Gy_StockCheckItemBill/MakeProdMove")]
[HttpGet]
- public object MakeProdMove(string HBarCode, string user, string userID)
+ public object MakeProdMove(string HBarCode, string user, string userID,string HItemID)
{
try
{
string HBillNo = "";
Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
+ DataSet ds1 = new DataSet();
ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
+ ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='"+ HItemID+"'", "Sc_MouldStockBillMain_Temp");
DataRow dr = ds.Tables[0].Rows[0];
+ DataRow dr1 = ds1.Tables[0].Rows[0];
HInterID = DBUtility.ClsPub.CreateBillID("3814", ref DBUtility.ClsPub.sExeReturnInfo);
HBillNo = DBUtility.ClsPub.CreateBillCode("3814", ref DBUtility.ClsPub.sExeReturnInfo, true);
+
string sql = "Insert Into Sc_MouldStockBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HMaker,HMakeDate" + /*"HYear, HPeriod,"*/
+ ",HMaker,HMakeDate" +
",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('3814','3814'," + HInterID + ",'" + HBillNo + "',getdate()" +
+ " values('3814','3814'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
", '" + user + "',getdate()" +
- ", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
+ ", " + dr["HSupID"].ToString() + ", 1," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",' ',0" +
-
") ";
string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
- "0,0," + dr["HInterID"].ToString() + ",0,0,0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr["HProdQty"].ToString() + ",0," +
- "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr["HWHID"].ToString() + ",0," + dr["HSPID"].ToString() + ",0,0"
- + ",0,0," + userID + ",0,0,'')");
+ "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
+ "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
+ + ",0,0,0," + userID + ",0,100005,'')");
//涓昏〃
oCn.RunProc(sql);
oCn.RunProc(sql1);
@@ -376,35 +439,37 @@
#region 鐩樼泩鈥斿叾浠栧叆搴撳崟
[Route("Gy_StockCheckItemBill/MakeOtherIn")]
[HttpGet]
- public object MakeOtherIn(string HBarCode, string user, string userID)
+ public object MakeOtherIn(string HBarCode, string user, string userID, string HItemID)
{
try
{
string HBillNo = "";
Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
+ DataSet ds1 = new DataSet();
ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
+ ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
DataRow dr = ds.Tables[0].Rows[0];
+ DataRow dr1 = ds1.Tables[0].Rows[0];
HInterID = DBUtility.ClsPub.CreateBillID("3827", ref DBUtility.ClsPub.sExeReturnInfo);
HBillNo = DBUtility.ClsPub.CreateBillCode("3827", ref DBUtility.ClsPub.sExeReturnInfo, true);
string sql = "Insert Into Sc_MouldStockBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HMaker,HMakeDate" + /*"HYear, HPeriod,"*/
+ ",HMaker,HMakeDate" +
",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('3827','3827'," + HInterID + ",'" + HBillNo + "',getdate()" +
+ " values('3827','3827'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
", '" + user + "',getdate()" +
- ", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
+ ", " + dr["HSupID"].ToString() + ", 1," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",' ',0" +
-
") ";
string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
- "0,0," + dr["HInterID"].ToString() + ",0,0,0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr["HProdQty"].ToString() + ",0," +
- "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr["HWHID"].ToString() + ",0," + dr["HSPID"].ToString() + ",0,0"
- + ",0,0," + userID + ",0,0,'')");
+ "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
+ "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + ",0,0,0"
+ + ",0,0,0," + userID + ",0,100005,'')");
//涓昏〃
oCn.RunProc(sql);
oCn.RunProc(sql1);
@@ -431,35 +496,39 @@
#region 鐩樹簭鈥斿鐞嗗嚭搴撳崟
[Route("Gy_StockCheckItemBill/MakeScrapOut")]
[HttpGet]
- public object MakeScrapOut(string HBarCode, string user, string userID)
+ public object MakeScrapOut(string HBarCode, string user, string userID, string HItemID)
{
try
{
string HBillNo = "";
Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
+ DataSet ds1 = new DataSet();
ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
+ ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
DataRow dr = ds.Tables[0].Rows[0];
+ DataRow dr1 = ds1.Tables[0].Rows[0];
HInterID = DBUtility.ClsPub.CreateBillID("3832", ref DBUtility.ClsPub.sExeReturnInfo);
HBillNo = DBUtility.ClsPub.CreateBillCode("3832", ref DBUtility.ClsPub.sExeReturnInfo, true);
+
string sql = "Insert Into Sc_MouldStockBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HMaker,HMakeDate" + /*"HYear, HPeriod,"*/
+ ",HMaker,HMakeDate" +
",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('3832','3832'," + HInterID + ",'" + HBillNo + "',getdate()" +
+ " values('3832','3832'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
", '" + user + "',getdate()" +
- ", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
+ ", " + dr["HSupID"].ToString() + ", 1," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",' ',0" +
-
") ";
string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
- "0,0," + dr["HInterID"].ToString() + ",0,0,0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr["HProdQty"].ToString() + ",0," +
- "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr["HWHID"].ToString() + ",0," + dr["HSPID"].ToString() + ",0,0"
- + ",0,0," + userID + ",0,0,'')");
+ "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
+ "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
+ + ",0,0,0," + userID + ",0,100005,'')");
+
//涓昏〃
oCn.RunProc(sql);
oCn.RunProc(sql1);
@@ -486,35 +555,38 @@
#region 鍑哄簱鈥旈鐢ㄥ嚭搴撳崟
[Route("Gy_StockCheckItemBill/MakeProdOut")]
[HttpGet]
- public object MakeProdOut(string HBarCode, string user, string userID)
+ public object MakeProdOut(string HBarCode, string user, string userID, string HItemID)
{
try
{
string HBillNo = "";
Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
+ DataSet ds1 = new DataSet();
ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
+ ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
DataRow dr = ds.Tables[0].Rows[0];
+ DataRow dr1 = ds1.Tables[0].Rows[0];
HInterID = DBUtility.ClsPub.CreateBillID("3802", ref DBUtility.ClsPub.sExeReturnInfo);
HBillNo = DBUtility.ClsPub.CreateBillCode("3802", ref DBUtility.ClsPub.sExeReturnInfo, true);
+
string sql = "Insert Into Sc_MouldStockBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HMaker,HMakeDate" + /*"HYear, HPeriod,"*/
+ ",HMaker,HMakeDate" +
",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('3802','3802'," + HInterID + ",'" + HBillNo + "',getdate()" +
+ " values('3802','3802'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
", '" + user + "',getdate()" +
- ", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
+ ", " + dr["HSupID"].ToString() + ", 1," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",' ',0" +
-
") ";
string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
- "0,0," + dr["HInterID"].ToString() + ",0,0,0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr["HProdQty"].ToString() + ",0," +
- "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr["HWHID"].ToString() + ",0," + dr["HSPID"].ToString() + ",0,0"
- + ",0,0," + userID + ",0,0,'')");
+ "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
+ "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
+ + ",0,0,0," + userID + ",0,100005,'')");
//涓昏〃
oCn.RunProc(sql);
oCn.RunProc(sql1);
@@ -541,35 +613,38 @@
#region 閫�搴撯�旈鐢ㄩ��搴撳崟
[Route("Gy_StockCheckItemBill/MakeProdBack")]
[HttpGet]
- public object MakeProdBack(string HBarCode, string user, string userID)
+ public object MakeProdBack(string HBarCode, string user, string userID, string HItemID)
{
try
{
string HBillNo = "";
Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
+ DataSet ds1 = new DataSet();
ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
+ ds1 = oCn.RunProcReturn("select top 1 * from Sc_MouldStockBillMain_Temp where HBarCode='" + HBarCode + "' and HItemID='" + HItemID + "'", "Sc_MouldStockBillMain_Temp");
DataRow dr = ds.Tables[0].Rows[0];
+ DataRow dr1 = ds1.Tables[0].Rows[0];
HInterID = DBUtility.ClsPub.CreateBillID("3803", ref DBUtility.ClsPub.sExeReturnInfo);
HBillNo = DBUtility.ClsPub.CreateBillCode("3803", ref DBUtility.ClsPub.sExeReturnInfo, true);
+
string sql = "Insert Into Sc_MouldStockBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HMaker,HMakeDate" + /*"HYear, HPeriod,"*/
+ ",HMaker,HMakeDate" +
",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
") " +
- " values('3803','3803'," + HInterID + ",'" + HBillNo + "',getdate()" +
+ " values('3803','3803'," + HInterID + ",'" + HBillNo + "','2022-01-02'" +
", '" + user + "',getdate()" +
- ", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
+ ", " + dr["HSupID"].ToString() + ", 1," + dr["HNowSupID"].ToString() + ",0,0,0,0" +
", 0," + dr["HDeptID"].ToString() + ",' ',0" +
-
") ";
string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
- "0,0," + dr["HInterID"].ToString() + ",0,0,0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr["HProdQty"].ToString() + ",0," +
- "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr["HWHID"].ToString() + ",0," + dr["HSPID"].ToString() + ",0,0"
- + ",0,0," + userID + ",0,0,'')");
+ "0,0," + dr["HInterID"].ToString() + ",0," + dr["HSecUnitRate"].ToString() + ",0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr1["HQty"].ToString() + ",0," +
+ "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr1["HCorrespondentID"].ToString() + "," + dr["HNowSupID"].ToString() + ",0,0"
+ + ",0,0,0," + userID + ",0,100005,'')");
//涓昏〃
oCn.RunProc(sql);
oCn.RunProc(sql1);
@@ -596,81 +671,16 @@
#region 鍏堥鐢ㄩ��搴撳啀棰嗙敤鍑哄簱
[Route("Gy_StockCheckItemBill/MakeProdOutBack")]
[HttpGet]
- public object MakeProdOutBack(string HBarCode, string user, string userID)
+ public object MakeProdOutBack(string HBarCode, string user, string userID, string HItemID)
{
- try
- {
- string HBillNo = "";
- Int64 HInterID = 0;//鏄剧ず鐨勫瓧娈�
- ds = oCn.RunProcReturn("select * from Gy_MouldFileMain where HBarCode='" + HBarCode + "'", "Gy_MouldFileMain");
- DataRow dr = ds.Tables[0].Rows[0];
- //鍑哄簱
- HInterID = DBUtility.ClsPub.CreateBillID("3802", ref DBUtility.ClsPub.sExeReturnInfo);
- HBillNo = DBUtility.ClsPub.CreateBillCode("3802", ref DBUtility.ClsPub.sExeReturnInfo, true);
- string sql = "Insert Into Sc_MouldStockBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HMaker,HMakeDate" + /*"HYear, HPeriod,"*/
- ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
- ",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
- ") " +
- " values('3802','3802'," + HInterID + ",'" + HBillNo + "',getdate()" +
- ", '" + user + "',getdate()" +
- ", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
- ", 0," + dr["HDeptID"].ToString() + ",' ',0" +
-
- ") ";
- string sql1 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
- HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
- HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
- HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
- "0,0," + dr["HInterID"].ToString() + ",0,0,0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr["HProdQty"].ToString() + ",0," +
- "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr["HWHID"].ToString() + ",0," + dr["HSPID"].ToString() + ",0,0"
- + ",0,0," + userID + ",0,0,'')");
-
- //閫�搴�
- HInterID = DBUtility.ClsPub.CreateBillID("3803", ref DBUtility.ClsPub.sExeReturnInfo);
- HBillNo = DBUtility.ClsPub.CreateBillCode("3803", ref DBUtility.ClsPub.sExeReturnInfo, true);
- string sql2 = "Insert Into Sc_MouldStockBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
- ",HMaker,HMakeDate" + /*"HYear, HPeriod,"*/
- ",HSupID,HSupTypeID,HWHID,HSCWHID,HEmpID,HManagerID,HSecManagerID" +
- ",HKeeperID,HDeptID,HInnerBillNo,HRedBlueFlag" +
- ") " +
- " values('3803','3803'," + HInterID + ",'" + HBillNo + "',getdate()" +
- ", '" + user + "',getdate()" +
- ", " + dr["HSupID"].ToString() + ", 1," + dr["HWhID"].ToString() + ",0,0,0,0" +
- ", 0," + dr["HDeptID"].ToString() + ",' ',0" +
-
- ") ";
- string sql3 = string.Format(@"Insert Into Sc_MouldStockBillSub (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,
- HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaterID,HPropertyID,HSecUnitRate,HSecUnitID,HUnitID,
- HBatchNo,HQtyMust,HQty,HPrice,HMoney,HDesignLife,HLeaveLife,HUseLife,HWHID,HSCWHID,HSPID,HSCSPID,HSPGroupID,HCorrespondentTypeID,HCorrespondentID,
- HStockOrgID,HOWNERID,HOtherOrgID,HOWNERTYPEID) values(" + HInterID + ",1,'',getdate(),0,'',0,0,'',''," +
- "0,0," + dr["HInterID"].ToString() + ",0,0,0," + dr["HUnitID"].ToString() + ",0," + dr["HProdQty"].ToString() + "," + dr["HProdQty"].ToString() + ",0," +
- "0," + dr["HDesignLife"].ToString() + "," + dr["HLeaveLife"].ToString() + "," + dr["HUseLife"].ToString() + "," + dr["HWHID"].ToString() + ",0," + dr["HSPID"].ToString() + ",0,0"
- + ",0,0," + userID + ",0,0,'')");
- //涓昏〃
- oCn.RunProc(sql);
- oCn.RunProc(sql1);
- oCn.RunProc(sql2);
- oCn.RunProc(sql3);
-
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
- objJsonResult.data = 1;
- return objJsonResult;
- }
- catch (Exception e)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鍒濆鍖栧け璐ワ紒";
- objJsonResult.data = null;
- }
+ MakeProdBack(HBarCode, user, userID, HItemID);
+ MakeProdOut(HBarCode, user, userID, HItemID);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
return objJsonResult;
-
}
#endregion
#endregion
diff --git a/WebAPI/DLL/ClsSc_PackUnionBill.cs b/WebAPI/DLL/ClsSc_PackUnionBill.cs
index 0f94328..384192d 100644
--- a/WebAPI/DLL/ClsSc_PackUnionBill.cs
+++ b/WebAPI/DLL/ClsSc_PackUnionBill.cs
@@ -147,7 +147,7 @@
{
sReturn = e.Message;
oCn.RollBack();
- throw (e);
+ return false;
}
}
//鏄剧ず鍗曟嵁
diff --git a/WebAPI/Log.cs b/WebAPI/Log.cs
new file mode 100644
index 0000000..4c134df
--- /dev/null
+++ b/WebAPI/Log.cs
@@ -0,0 +1,91 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Web;
+
+namespace ViewAPI
+{
+ public class Log
+ {
+ public static void WriteListToTextFile(List<string> list)
+ {
+ string uploadPath = System.Web.HttpContext.Current.Server.MapPath("./") + "Log\\";
+ if (!Directory.Exists(uploadPath))
+ {
+ Directory.CreateDirectory(uploadPath);
+ }
+ string fileName = DateTime.Now.ToString("yyyy-MM-dd") + "_sql.log";
+ string txtFile = uploadPath + fileName;
+ //鍒涘缓涓�涓枃浠舵祦锛岀敤浠ュ啓鍏ユ垨鑰呭垱寤轰竴涓猄treamWriter
+ FileStream fs = new FileStream(txtFile, FileMode.OpenOrCreate, FileAccess.Write);
+ StreamWriter sw = new StreamWriter(fs);
+ sw.Flush();
+ // 浣跨敤StreamWriter鏉ュ線鏂囦欢涓啓鍏ュ唴瀹�
+ sw.BaseStream.Seek(0, SeekOrigin.Begin);
+ for (int i = 0; i < list.Count; i++) sw.WriteLine(list[i]);
+ //鍏抽棴姝ゆ枃浠秚
+ sw.Flush();
+ sw.Close();
+ fs.Close();
+ }
+ public static void LogInfo(string msg)
+ {
+ string uploadPath = System.Web.HttpContext.Current.Server.MapPath("./") + "Log\\";
+
+ if (!Directory.Exists(uploadPath))
+ {
+ Directory.CreateDirectory(uploadPath);
+ }
+ string fileName = DateTime.Now.Ticks.ToString() + ".log";
+
+ FileStream fs;
+ StreamWriter sw;
+ string sFileName = uploadPath + fileName;
+ if (File.Exists(sFileName))
+ //楠岃瘉鏂囦欢鏄惁瀛樺湪锛屾湁鍒欒拷鍔狅紝鏃犲垯鍒涘缓
+ {
+ fs = new FileStream(sFileName, FileMode.Append, FileAccess.Write);
+ }
+ else
+ {
+ fs = new FileStream(sFileName, FileMode.Create, FileAccess.Write);
+ }
+ sw = new StreamWriter(fs);
+ msg = String.Format("------------------------{0}------------------------------\r\n", DateTime.Now) + msg;
+ msg += "\r\n";
+ sw.WriteLine(msg);
+ sw.Close();
+ fs.Close();
+ }
+ public static void LogSaveInfo(string msg)
+ {
+ string uploadPath = System.Web.HttpContext.Current.Server.MapPath("./") + "Log\\";
+
+ if (!Directory.Exists(uploadPath))
+ {
+ Directory.CreateDirectory(uploadPath);
+ }
+ string fileName = DateTime.Now.ToString("yyyy-MM-dd") + ".log";
+
+ FileStream fs;
+ StreamWriter sw;
+ string sFileName = uploadPath + fileName;
+ if (File.Exists(sFileName))
+ //楠岃瘉鏂囦欢鏄惁瀛樺湪锛屾湁鍒欒拷鍔狅紝鏃犲垯鍒涘缓
+ {
+ fs = new FileStream(sFileName, FileMode.Append, FileAccess.Write);
+ }
+ else
+ {
+ fs = new FileStream(sFileName, FileMode.Create, FileAccess.Write);
+ }
+ sw = new StreamWriter(fs);
+ msg = String.Format("------------------------{0}------------------------------\r\n", DateTime.Now) + msg;
+ msg += "\r\n";
+ sw.WriteLine(msg);
+ sw.Close();
+ fs.Close();
+ }
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index e5f010c..d3f2e8c 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,11 +5,11 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2021-12-30T06:41:56.8541015Z;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
+ <History>True|2022-01-11T10:07:30.9151356Z;True|2022-01-11T15:06:32.7301609+08:00;True|2022-01-11T09:27:00.1766442+08:00;True|2021-12-30T14:41:56.8541015+08:00;True|2021-12-30T13:45:00.6130694+08:00;True|2021-12-30T13:44:18.7370780+08:00;True|2021-12-30T13:36:52.8171136+08:00;True|2021-12-28T19:14:22.5979649+08:00;True|2021-12-28T13:13:39.3543252+08:00;True|2021-12-27T15:31:26.6037782+08:00;True|2021-12-27T15:28:54.4824480+08:00;True|2021-12-27T15:22:47.8436108+08:00;True|2021-12-27T15:04:37.0711590+08:00;True|2021-12-27T15:03:52.0932499+08:00;True|2021-12-27T15:03:33.0172733+08:00;True|2021-12-27T13:28:27.4252747+08:00;True|2021-12-25T19:38:33.6784042+08:00;True|2021-12-24T20:47:43.3471563+08:00;True|2021-12-24T20:14:57.6946814+08:00;True|2021-12-24T19:55:21.1843105+08:00;True|2021-12-24T19:49:54.6719726+08:00;True|2021-12-24T19:38:14.1180741+08:00;True|2021-12-22T13:51:37.1082523+08:00;True|2021-12-21T15:38:59.8015096+08:00;True|2021-12-21T15:29:54.8095063+08:00;False|2021-12-21T15:29:21.7006531+08:00;False|2021-12-21T15:16:18.2218025+08:00;False|2021-12-21T15:11:38.1215841+08:00;False|2021-12-21T15:08:27.0590078+08:00;True|2021-12-10T14:12:36.4065298+08:00;True|2021-12-10T13:54:03.4921778+08:00;True|2021-12-10T13:25:49.0439086+08:00;True|2021-12-10T13:19:58.9494477+08:00;True|2021-12-10T13:10:45.3929017+08:00;True|2021-12-10T11:06:53.2416794+08:00;True|2021-12-07T17:23:28.9380484+08:00;True|2021-12-07T17:13:52.4384814+08:00;True|2021-12-07T16:39:49.2020208+08:00;True|2021-12-07T15:18:20.9024533+08:00;True|2021-12-07T15:07:35.4428035+08:00;True|2021-12-07T15:01:02.0445043+08:00;True|2021-12-07T14:50:08.9019705+08:00;True|2021-12-07T14:34:50.4993666+08:00;False|2021-12-07T14:32:56.0408332+08:00;True|2021-12-06T17:11:41.4004606+08:00;True|2021-12-06T16:48:07.6029757+08:00;True|2021-12-06T13:46:35.9437718+08:00;True|2021-12-06T13:45:07.6622615+08:00;True|2021-12-06T11:25:04.3483155+08:00;True|2021-12-06T11:18:24.5804187+08:00;True|2021-11-22T16:27:05.4241947+08:00;True|2021-11-22T13:40:17.6768280+08:00;True|2021-11-19T16:15:19.9085104+08:00;True|2021-11-09T10:34:21.1623512+08:00;True|2021-11-07T16:57:59.7380254+08:00;True|2021-11-07T16:53:47.4198852+08:00;True|2021-11-07T16:42:05.5096826+08:00;True|2021-11-07T16:37:21.0729013+08:00;True|2021-11-05T20:51:17.6170717+08:00;True|2021-11-05T20:35:14.6250333+08:00;True|2021-11-05T19:30:19.8374158+08:00;True|2021-11-05T19:22:46.2276569+08:00;True|2021-11-05T19:20:30.8253213+08:00;True|2021-11-05T19:16:45.7553310+08:00;True|2021-11-05T19:16:00.4532689+08:00;True|2021-11-05T19:12:25.9022478+08:00;False|2021-11-05T19:11:26.5753529+08:00;True|2021-11-05T19:09:30.0085433+08:00;True|2021-11-05T18:48:19.9395153+08:00;True|2021-11-05T18:45:34.3437897+08:00;True|2021-11-05T18:43:43.4558159+08:00;True|2021-11-05T18:40:40.9948500+08:00;True|2021-11-05T18:34:18.4440455+08:00;True|2021-11-05T15:54:51.6037132+08:00;True|2021-10-28T16:27:53.9728270+08:00;True|2021-10-28T16:03:59.5629998+08:00;True|2021-10-28T08:51:04.2549186+08:00;True|2021-10-27T15:14:53.5506098+08:00;True|2021-10-27T15:00:44.9100320+08:00;True|2021-10-27T13:14:46.7921647+08:00;True|2021-10-27T11:24:49.4550753+08:00;True|2021-10-27T10:10:10.3545125+08:00;True|2021-10-27T10:02:24.9248610+08:00;True|2021-10-27T09:59:40.3795897+08:00;True|2021-10-27T09:56:30.6629207+08:00;True|2021-10-27T09:10:48.3883432+08:00;True|2021-10-27T09:03:31.9191991+08:00;True|2021-10-27T08:59:59.7651159+08:00;True|2021-10-27T08:36:11.8620997+08:00;True|2021-10-27T08:26:40.2533014+08:00;True|2021-10-26T09:19:35.5674748+08:00;True|2021-10-26T09:17:17.6900747+08:00;True|2021-10-26T09:14:32.3999220+08:00;True|2021-10-25T15:08:21.2581763+08:00;True|2021-10-25T10:01:57.8524903+08:00;True|2021-10-25T09:28:51.6294879+08:00;True|2021-10-25T09:25:50.3373336+08:00;True|2021-10-25T09:23:37.0203978+08:00;True|2021-10-25T09:18:23.3380608+08:00;True|2021-10-25T09:15:10.5292071+08:00;True|2021-10-25T08:56:30.4632027+08:00;True|2021-10-25T08:50:11.4697392+08:00;True|2021-10-22T13:46:49.7207066+08:00;True|2021-10-22T10:06:33.3130089+08:00;True|2021-10-20T14:32:10.1235516+08:00;True|2021-10-20T14:16:18.6496291+08:00;True|2021-10-20T14:08:49.2443715+08:00;True|2021-10-20T14:05:14.6847950+08:00;True|2021-10-20T13:30:21.6057636+08:00;True|2021-10-20T10:55:22.2151716+08:00;True|2021-10-19T10:42:13.4198267+08:00;True|2021-10-19T10:01:41.0018108+08:00;True|2021-10-19T09:59:11.2127619+08:00;True|2021-10-19T09:54:04.8472874+08:00;True|2021-10-15T11:19:15.5327495+08:00;True|2021-10-15T11:17:41.0686485+08:00;True|2021-10-15T11:12:11.8295042+08:00;True|2021-10-15T10:33:31.5670079+08:00;True|2021-10-15T10:27:45.0815146+08:00;True|2021-10-14T14:51:28.5331025+08:00;True|2021-10-14T14:37:28.3276051+08:00;True|2021-10-14T14:23:39.0606792+08:00;True|2021-10-14T14:21:03.8140347+08:00;True|2021-10-13T10:31:10.6628977+08:00;True|2021-10-13T10:12:24.4238027+08:00;True|2021-10-13T08:47:43.9314486+08:00;True|2021-10-12T14:07:18.6065183+08:00;True|2021-10-12T10:34:10.1682362+08:00;True|2021-10-12T10:27:14.3073332+08:00;True|2021-10-12T10:22:08.0004619+08:00;True|2021-10-12T10:21:03.0275378+08:00;True|2021-10-12T10:11:54.9812692+08:00;True|2021-10-11T16:59:07.3568342+08:00;True|2021-10-11T16:53:14.2016138+08:00;True|2021-10-11T16:21:35.0133775+08:00;True|2021-10-11T15:34:19.5731935+08:00;True|2021-10-11T15:31:07.5780983+08:00;True|2021-10-11T15:06:47.1145237+08:00;True|2021-10-11T15:03:25.5000280+08:00;True|2021-10-11T10:12:57.6416898+08:00;True|2021-10-09T10:15:17.9235165+08:00;True|2021-10-09T10:13:51.3318441+08:00;True|2021-10-09T10:01:21.6661542+08:00;True|2021-10-09T09:58:41.9225837+08:00;True|2021-10-08T14:56:49.7935800+08:00;True|2021-10-08T14:35:41.4490063+08:00;True|2021-10-08T14:02:42.6990656+08:00;True|2021-09-29T15:48:55.1547397+08:00;True|2021-09-29T15:48:23.5567191+08:00;True|2021-09-27T16:17:35.7180978+08:00;True|2021-09-27T15:51:50.4240134+08:00;True|2021-09-23T20:55:27.3554447+08:00;True|2021-09-23T14:14:44.0572017+08:00;True|2021-09-23T13:51:56.2344673+08:00;True|2021-09-23T10:46:16.7417007+08:00;True|2021-09-23T10:42:23.2117537+08:00;True|2021-09-22T15:21:22.9615672+08:00;True|2021-09-22T14:23:32.7907754+08:00;True|2021-09-22T13:48:03.4780947+08:00;True|2021-09-22T11:05:24.5249356+08:00;True|2021-09-22T10:00:19.0962943+08:00;True|2021-09-22T09:30:26.2686514+08:00;True|2021-09-17T11:22:34.5692792+08:00;True|2021-09-16T16:11:27.5372277+08:00;True|2021-09-16T14:53:40.8396557+08:00;True|2021-09-16T14:32:29.7905500+08:00;True|2021-09-16T14:26:46.2224219+08:00;True|2021-09-16T10:32:24.4244440+08:00;True|2021-09-15T11:10:35.3529360+08:00;True|2021-09-15T11:08:30.0857376+08:00;True|2021-09-15T11:05:56.7191571+08:00;True|2021-09-14T01:24:39.8041136+08:00;True|2021-09-14T01:05:01.1593327+08:00;True|2021-09-14T00:44:14.7233198+08:00;True|2021-09-13T23:48:19.4506233+08:00;True|2021-09-13T20:30:31.3243872+08:00;True|2021-09-13T19:45:35.9108911+08:00;False|2021-09-13T19:44:59.2779092+08:00;True|2021-09-13T18:09:22.4994381+08:00;True|2021-09-10T14:18:27.5788854+08:00;True|2021-09-09T15:57:01.7407207+08:00;True|2021-09-09T15:49:34.2598998+08:00;True|2021-09-09T11:32:10.7853024+08:00;True|2021-09-09T11:10:48.6840025+08:00;True|2021-09-09T10:35:37.3883078+08:00;True|2021-09-07T14:11:49.8497588+08:00;True|2021-09-07T13:34:48.4693349+08:00;True|2021-09-06T14:33:48.7549675+08:00;True|2021-09-03T16:27:51.1888520+08:00;True|2021-09-03T16:19:35.9003465+08:00;True|2021-09-03T15:46:28.1828032+08:00;True|2021-09-03T15:34:21.9362871+08:00;True|2021-09-03T11:24:49.8749819+08:00;True|2021-09-03T11:21:17.8373159+08:00;True|2021-09-03T11:16:53.2208136+08:00;True|2021-09-03T11:12:23.9063804+08:00;True|2021-09-03T09:11:09.2435721+08:00;True|2021-09-02T11:16:15.1370453+08:00;True|2021-09-02T10:35:39.1171879+08:00;True|2021-09-01T10:17:09.4536285+08:00;True|2021-09-01T09:46:28.4581776+08:00;True|2021-08-31T08:54:26.8588887+08:00;True|2021-08-31T08:39:08.3685693+08:00;True|2021-08-30T17:11:56.8438985+08:00;True|2021-08-30T15:59:42.0820292+08:00;True|2021-08-30T15:45:18.1868510+08:00;True|2021-08-30T14:56:08.3958863+08:00;True|2021-08-30T14:37:11.5379830+08:00;True|2021-08-30T14:35:34.8775934+08:00;True|2021-08-30T14:24:36.5111821+08:00;True|2021-08-30T10:05:49.6945200+08:00;True|2021-08-30T10:03:28.4064538+08:00;True|2021-08-30T10:00:16.8360929+08:00;True|2021-08-30T09:56:09.4434379+08:00;True|2021-08-30T09:55:36.1725334+08:00;True|2021-08-30T09:52:04.8600054+08:00;True|2021-08-30T09:47:46.4225655+08:00;True|2021-08-30T09:45:20.4894962+08:00;False|2021-08-27T17:17:34.2646751+08:00;False|2021-08-27T16:01:21.2791979+08:00;False|2021-08-27T15:58:06.9667160+08:00;False|2021-08-27T15:38:37.4818036+08:00;False|2021-08-27T15:21:02.8863114+08:00;False|2021-08-27T15:20:28.6828668+08:00;True|2021-08-26T16:00:44.3162145+08:00;True|2021-08-26T08:57:31.3842587+08:00;True|2021-08-23T08:43:41.1549775+08:00;True|2021-08-22T09:24:12.7210871+08:00;True|2021-08-22T09:19:53.8300229+08:00;True|2021-08-20T20:00:52.0140407+08:00;True|2021-08-20T19:40:14.7712765+08:00;True|2021-08-19T17:37:54.9748049+08:00;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>12/23/2021 16:19:08</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,31 +18,31 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>01/03/2022 13:39:53</publishTime>
+ <publishTime>01/11/2022 18:07:08</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>01/03/2022 13:39:53</publishTime>
+ <publishTime>01/11/2022 18:07:08</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>01/03/2022 13:39:52</publishTime>
+ <publishTime>01/11/2022 18:07:04</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>01/03/2022 13:39:52</publishTime>
+ <publishTime>01/11/2022 18:07:04</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>12/24/2021 09:26:56</publishTime>
+ <publishTime>01/11/2022 18:06:58</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>12/24/2021 09:26:56</publishTime>
+ <publishTime>01/11/2022 18:06:58</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>12/23/2021 16:19:02</publishTime>
+ <publishTime>08/16/2021 17:23:13</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -60,34 +60,34 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>12/29/2021 13:19:19</publishTime>
+ <publishTime>01/11/2022 18:06:59</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/29/2021 13:19:19</publishTime>
+ <publishTime>01/11/2022 18:06:59</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>12/24/2021 09:26:55</publishTime>
+ <publishTime>01/11/2022 18:06:54</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>12/24/2021 09:26:55</publishTime>
+ <publishTime>01/11/2022 18:06:54</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>12/24/2021 09:26:56</publishTime>
+ <publishTime>01/11/2022 18:06:55</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>12/24/2021 09:26:56</publishTime>
+ <publishTime>01/11/2022 18:06:55</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>12/24/2021 09:26:56</publishTime>
+ <publishTime>01/11/2022 18:06:56</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>12/24/2021 09:26:56</publishTime>
+ <publishTime>01/11/2022 18:06:56</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -156,7 +156,7 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 04:02:18</publishTime>
@@ -189,13 +189,13 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>01/07/2022 16:40:33</publishTime>
+ <publishTime>01/11/2022 18:07:15</publishTime>
</File>
<File Include="bin/WebAPI.dll.config">
<publishTime>12/15/2021 17:59:43</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>01/07/2022 16:40:33</publishTime>
+ <publishTime>01/11/2022 18:07:15</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -207,166 +207,166 @@
<publishTime>11/29/2018 13:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>12/23/2021 16:19:04</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>12/23/2021 16:19:04</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>12/23/2021 16:19:04</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>10/29/2021 19:50:53</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>12/23/2021 16:19:08</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>12/23/2021 16:19:08</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>12/23/2021 16:19:08</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>12/23/2021 16:19:08</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Index.html">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="packages.config">
- <publishTime>12/23/2021 16:19:08</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>12/23/2021 16:19:07</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>12/28/2021 22:26:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>12/28/2021 22:26:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>12/28/2021 22:26:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>12/28/2021 22:26:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>12/28/2021 22:26:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>12/28/2021 22:26:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>12/28/2021 22:26:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>12/28/2021 22:26:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>12/28/2021 22:26:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>12/28/2021 22:26:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>12/28/2021 22:26:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>12/28/2021 22:26:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>12/28/2021 22:26:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>12/28/2021 22:26:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>12/28/2021 22:26:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>12/28/2021 22:26:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>12/28/2021 22:26:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>12/28/2021 22:26:25</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>01/04/2022 14:06:50</publishTime>
+ <publishTime>01/11/2022 18:07:29</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 03d7da0..8dc3f78 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -472,6 +472,7 @@
<Compile Include="DLL\宸ヨ祫绠＄悊\ClsPay_WorkTimesBill.cs" />
<Compile Include="HttpClient.cs" />
<Compile Include="InvokeHelper.cs" />
+ <Compile Include="Log.cs" />
<Compile Include="Models\ClsGy_StockCheckItemBill.cs" />
<Compile Include="Models\ClsSb_MouldRepairWorkBillMain.cs" />
<Compile Include="Models\ClsSb_MouldRepairWorkBillSub.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 729b04f..ceaae00 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,7 +9,7 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯MES\Lay-Api\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress />
--
Gitblit v1.9.1