From 6121dbfe132dccdb947404363d1100b2be143701 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 05 九月 2024 12:45:29 +0800
Subject: [PATCH] 1
---
PlanM/bin/Release/PlanM.dll | 0
BaseSet/bin/Release/DBUtility.pdb | 0
WarM/bin/Release/DBUtility.dll | 0
WarM/bin/Release/DBUtility.pdb | 0
Model/bin/Release/Pub_Control.pdb | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache | 0
WebAPI/Models/ClsGy_Material_Model.cs | 2
sdk_dingding/TopSdk/obj/Release/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.dll | 0
Model/obj/Release/Model.pdb | 0
APSM/bin/Release/DAL.dll | 0
Model/bin/Release/Pub_Control.dll | 0
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 17
Pub_Control/bin/Release/Pub_Class.pdb | 0
WebAPI/Controllers/POStockInBillController.cs | 4
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs | 25 +
Pub_Control/bin/Release/Pub_Class.dll | 0
APSM/bin/Release/DAL.pdb | 0
Pub_Control/bin/Release/Pub_Control.dll | 0
BLL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/SQLHelper.dll | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
APSM/bin/Release/DBUtility.pdb | 0
WorkM/bin/Release/Pub_Class.dll | 0
DAL/bin/Release/SQLHelper.pdb | 0
SQLHelper/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.pdb | 0
BLL/bin/Release/DBUtility.dll | 0
WebAPI/Web.config | 4
WarM/bin/Release/BLL.pdb | 0
WorkM/bin/Release/Pub_Class.pdb | 0
Pub_Control/bin/Release/Pub_Control.pdb | 0
DBUtility/obj/Release/DBUtility.dll | 0
APSM/bin/Release/DBUtility.dll | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
Model/obj/Release/Model.dll | 0
BLL/bin/Release/Pub_Class.dll | 0
WorkM/bin/Release/DBUtility.pdb | 0
Class1.cs | 8
WorkM/bin/Release/DBUtility.dll | 0
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 484 ++++++++++++----------
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache | 1
APSM/bin/Release/Model.dll | 0
PlanM/bin/Release/PlanM.pdb | 0
WebAPI/Controllers/CGGL/YF_PayMentBillController.cs | 25 +
BLL/bin/Release/Pub_Class.pdb | 0
APSM/bin/Release/Model.pdb | 0
BLL/bin/Release/DAL.dll | 0
BLL/bin/Release/SQLHelper.pdb | 0
PlanM/bin/Release/SQLHelper.dll | 0
BaseSet/bin/Release/Pub_Control.pdb | 0
WarM/bin/Release/Pub_Control.pdb | 0
DBUtility/bin/Release/Pub_Control.pdb | 0
APSM/bin/Release/BaseSet.dll | 0
SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0
BLL/bin/Release/SQLHelper.dll | 0
DAL/bin/Release/Model.dll | 0
BaseSet/bin/Release/Pub_Control.dll | 0
SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs | 4
APSM/bin/Release/BaseSet.pdb | 0
DAL/车间管理/ClsSc_ProcessExchangeBill.cs | 35 +
SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0
DBUtility/bin/Release/Pub_Control.dll | 0
BaseSet/bin/Release/Pub_Class.dll | 0
BLL/bin/Release/DAL.pdb | 0
PlanM/bin/Release/BLL.dll | 0
SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0
DAL/bin/Release/Model.pdb | 0
BaseSet/bin/Release/Pub_Class.pdb | 0
WarM/bin/Release/BLL.dll | 0
WorkM/bin/Release/BLL.dll | 0
DBUtility/bin/Release/DBUtility.pdb | 0
PlanM/bin/Release/BLL.pdb | 0
DBUtility/bin/Release/DBUtility.dll | 0
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
WorkM/bin/Release/BLL.pdb | 0
WebAPI.sln | 14
WarM/bin/Release/Pub_Class.dll | 0
WarM/bin/Release/Pub_Control.dll | 0
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 25 +
PlanM/bin/Release/SQLHelper.pdb | 0
PlanM/bin/Release/Model.pdb | 0
SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0
WarM/bin/Release/Pub_Class.pdb | 0
PlanM/bin/Release/Model.dll | 0
SyntacticSugar/constant/TimeConstant.cs | 20
SQLHelper/bin/Release/Pub_Class.pdb | 0
SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
SQLHelper/bin/Release/Pub_Class.dll | 0
DAL/bin/Release/Pub_Class.pdb | 0
SyntacticSugar/SyntacticSugar.csproj | 54 ++
BaseSet/bin/Release/DAL.pdb | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache | 1
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 47 ++
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 5
BaseSet/bin/Release/DAL.dll | 0
DAL/bin/Release/Pub_Class.dll | 0
APSM/bin/Release/APSM.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user | 46 +
APSM/bin/Release/APSM.dll | 0
APSM/bin/Release/SQLHelper.pdb | 0
Pub_Class/CustomerCls/ClsPub.cs | 22
WebAPI/DLL/ClsGy_Material_Ctl.cs | 4
APSM/bin/Release/SQLHelper.dll | 0
BaseSet/bin/Release/BLL.pdb | 0
SyntacticSugar/bin/Release/SyntacticSugar.dll | 0
DBUtility/bin/Release/Pub_Class.dll | 0
SyntacticSugar/bin/Release/SyntacticSugar.pdb | 0
PlanM/bin/Release/Pub_Control.pdb | 0
Model/bin/Release/Pub_Class.pdb | 0
BaseSet/bin/Release/BLL.dll | 0
BaseSet/bin/Release/BaseSet.dll | 0
SyntacticSugar/constant/CodeConstant.cs | 17
APSM/bin/Release/WarM.pdb | 0
BaseSet/bin/Release/BaseSet.pdb | 0
BLL/bin/Release/BLL.pdb | 0
APSM/bin/Release/PlanM.dll | 0
APSM/bin/Release/WarM.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt | 6
APSM/bin/Release/PlanM.pdb | 0
PlanM/bin/Release/Pub_Class.dll | 0
WebAPI/WebAPI.csproj | 4
SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache | 0
PlanM/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/Pub_Control.pdb | 0
PlanM/bin/Release/DAL.dll | 0
Model/bin/Release/DBUtility.pdb | 0
APSM/bin/Release/Pub_Control.pdb | 0
BLL/bin/Release/Pub_Control.dll | 0
Model/bin/Release/DBUtility.dll | 0
BaseSet/bin/Release/SQLHelper.pdb | 0
BLL/bin/Release/BLL.dll | 0
BaseSet/bin/Release/SQLHelper.dll | 0
PlanM/bin/Release/DAL.pdb | 0
WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs | 26 +
WorkM/bin/Release/Pub_Control.pdb | 0
PlanM/bin/Release/Pub_Control.dll | 0
DBUtility/bin/Release/SQLHelper.dll | 0
DBUtility/bin/Release/SQLHelper.pdb | 0
Model/bin/Release/Pub_Class.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache | 0
WorkM/bin/Release/DAL.pdb | 0
WorkM/bin/Release/Pub_Control.dll | 0
APSM/bin/Release/Pub_Class.dll | 0
APSM/bin/Release/Pub_Control.dll | 0
WorkM/bin/Release/DAL.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 12
APSM/bin/Release/BLL.dll | 0
DAL/bin/Release/DBUtility.dll | 0
DAL/bin/Release/Pub_Control.dll | 0
WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs | 25 +
DAL/bin/Release/DBUtility.pdb | 0
SyntacticSugar/constant/CountConstant.cs | 17
APSM/bin/Release/BLL.pdb | 0
APSM/bin/Release/Pub_Class.pdb | 0
APSM/bin/Release/WorkM.dll | 0
Model/bin/Release/SQLHelper.pdb | 0
SyntacticSugar/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs | 4
DAL/bin/Release/Pub_Control.pdb | 0
DAL/bin/Release/DAL.pdb | 0
SQLHelper/obj/Release/SQLHelper.dll | 0
BaseSet/bin/Release/Model.pdb | 0
BLL/bin/Release/Model.dll | 0
BaseSet/bin/Release/Model.dll | 0
BLL/bin/Release/Model.pdb | 0
DAL/bin/Release/DAL.dll | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs | 23 +
WorkM/bin/Release/WorkM.pdb | 0
Pub_Class/bin/Release/SyntacticSugar.pdb | 0
WarM/bin/Release/WarM.pdb | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
WebAPI/Controllers/CGGL/Cg_PayableBillController.cs | 25 +
WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs | 24 +
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
Pub_Class/bin/Release/SyntacticSugar.dll | 0
WarM/bin/Release/WarM.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache | 1
SyntacticSugar/Properties/AssemblyInfo.cs | 36 +
WarM/bin/Release/SQLHelper.pdb | 0
WebAPI/Controllers/品质管理/库存检验单/QC_StockCheckBillController.cs | 40 +
WorkM/bin/Release/Model.dll | 0
WorkM/bin/Release/WorkM.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 12
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
WarM/bin/Release/Model.pdb | 0
Pub_Class/Pub_Class.csproj | 6
WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs | 24 +
WarM/bin/Release/Model.dll | 0
Pub_Class/bin/Release/Pub_Class.pdb | 0
PlanM/bin/Release/DBUtility.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 46 +
SyntacticSugar/obj/Release/SyntacticSugar.dll | 0
WarM/bin/Release/SQLHelper.dll | 0
WorkM/bin/Release/Model.pdb | 0
SyntacticSugar/constant/TypeConstant.cs | 36 +
Pub_Class/bin/Release/Pub_Class.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.pdb | 0
WarM/bin/Release/DAL.dll | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
WarM/bin/Release/DAL.pdb | 0
WorkM/bin/Release/WarM.pdb | 0
PlanM/bin/Release/DBUtility.pdb | 0
WorkM/bin/Release/WarM.dll | 0
WorkM/bin/Release/SQLHelper.pdb | 0
Model/bin/Release/Model.pdb | 0
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 21 +
Model/bin/Release/Model.dll | 0
DBUtility/bin/Release/Pub_Class.pdb | 0
APSM/bin/Release/WorkM.pdb | 0
Model/bin/Release/SQLHelper.dll | 0
BaseSet/bin/Release/DBUtility.dll | 0
WorkM/bin/Release/SQLHelper.dll | 0
Model/车间管理/ClsSc_ProcessExchangeBillSub_BatchSplit.cs | 3
217 files changed, 963 insertions(+), 292 deletions(-)
diff --git a/APSM/bin/Release/APSM.dll b/APSM/bin/Release/APSM.dll
index 855b87f..9928db3 100644
--- a/APSM/bin/Release/APSM.dll
+++ b/APSM/bin/Release/APSM.dll
Binary files differ
diff --git a/APSM/bin/Release/APSM.pdb b/APSM/bin/Release/APSM.pdb
index c201fe3..8f09a12 100644
--- a/APSM/bin/Release/APSM.pdb
+++ b/APSM/bin/Release/APSM.pdb
Binary files differ
diff --git a/APSM/bin/Release/BLL.dll b/APSM/bin/Release/BLL.dll
index 6f5fe90..e040529 100644
--- a/APSM/bin/Release/BLL.dll
+++ b/APSM/bin/Release/BLL.dll
Binary files differ
diff --git a/APSM/bin/Release/BLL.pdb b/APSM/bin/Release/BLL.pdb
index ff491af..44e26bc 100644
--- a/APSM/bin/Release/BLL.pdb
+++ b/APSM/bin/Release/BLL.pdb
Binary files differ
diff --git a/APSM/bin/Release/BaseSet.dll b/APSM/bin/Release/BaseSet.dll
index 1c4ff16..45002b0 100644
--- a/APSM/bin/Release/BaseSet.dll
+++ b/APSM/bin/Release/BaseSet.dll
Binary files differ
diff --git a/APSM/bin/Release/BaseSet.pdb b/APSM/bin/Release/BaseSet.pdb
index d890252..a73477c 100644
--- a/APSM/bin/Release/BaseSet.pdb
+++ b/APSM/bin/Release/BaseSet.pdb
Binary files differ
diff --git a/APSM/bin/Release/DAL.dll b/APSM/bin/Release/DAL.dll
index d2ca7bb..8f700e4 100644
--- a/APSM/bin/Release/DAL.dll
+++ b/APSM/bin/Release/DAL.dll
Binary files differ
diff --git a/APSM/bin/Release/DAL.pdb b/APSM/bin/Release/DAL.pdb
index 9445526..6d1ccd1 100644
--- a/APSM/bin/Release/DAL.pdb
+++ b/APSM/bin/Release/DAL.pdb
Binary files differ
diff --git a/APSM/bin/Release/DBUtility.dll b/APSM/bin/Release/DBUtility.dll
index cefc8d8..5b87731 100644
--- a/APSM/bin/Release/DBUtility.dll
+++ b/APSM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/APSM/bin/Release/DBUtility.pdb b/APSM/bin/Release/DBUtility.pdb
index f43463e..518c835 100644
--- a/APSM/bin/Release/DBUtility.pdb
+++ b/APSM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/APSM/bin/Release/Model.dll b/APSM/bin/Release/Model.dll
index f101700..4a23b0f 100644
--- a/APSM/bin/Release/Model.dll
+++ b/APSM/bin/Release/Model.dll
Binary files differ
diff --git a/APSM/bin/Release/Model.pdb b/APSM/bin/Release/Model.pdb
index 55a5dca..8953e00 100644
--- a/APSM/bin/Release/Model.pdb
+++ b/APSM/bin/Release/Model.pdb
Binary files differ
diff --git a/APSM/bin/Release/PlanM.dll b/APSM/bin/Release/PlanM.dll
index 8e59ab3..a11a4ee 100644
--- a/APSM/bin/Release/PlanM.dll
+++ b/APSM/bin/Release/PlanM.dll
Binary files differ
diff --git a/APSM/bin/Release/PlanM.pdb b/APSM/bin/Release/PlanM.pdb
index b37f06a..daec3e7 100644
--- a/APSM/bin/Release/PlanM.pdb
+++ b/APSM/bin/Release/PlanM.pdb
Binary files differ
diff --git a/APSM/bin/Release/Pub_Class.dll b/APSM/bin/Release/Pub_Class.dll
index 81c2807..5997e36 100644
--- a/APSM/bin/Release/Pub_Class.dll
+++ b/APSM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/APSM/bin/Release/Pub_Class.pdb b/APSM/bin/Release/Pub_Class.pdb
index ed9a4e7..d89d437 100644
--- a/APSM/bin/Release/Pub_Class.pdb
+++ b/APSM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/APSM/bin/Release/Pub_Control.dll b/APSM/bin/Release/Pub_Control.dll
index d61866b..f248499 100644
--- a/APSM/bin/Release/Pub_Control.dll
+++ b/APSM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/APSM/bin/Release/Pub_Control.pdb b/APSM/bin/Release/Pub_Control.pdb
index a3856a6..2cea39d 100644
--- a/APSM/bin/Release/Pub_Control.pdb
+++ b/APSM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/APSM/bin/Release/SQLHelper.dll b/APSM/bin/Release/SQLHelper.dll
index 7d4eea1..62d34b5 100644
--- a/APSM/bin/Release/SQLHelper.dll
+++ b/APSM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/APSM/bin/Release/SQLHelper.pdb b/APSM/bin/Release/SQLHelper.pdb
index ab1f540..103d9f2 100644
--- a/APSM/bin/Release/SQLHelper.pdb
+++ b/APSM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/APSM/bin/Release/WarM.dll b/APSM/bin/Release/WarM.dll
index a7f7373..5984e38 100644
--- a/APSM/bin/Release/WarM.dll
+++ b/APSM/bin/Release/WarM.dll
Binary files differ
diff --git a/APSM/bin/Release/WarM.pdb b/APSM/bin/Release/WarM.pdb
index 2257290..04facf2 100644
--- a/APSM/bin/Release/WarM.pdb
+++ b/APSM/bin/Release/WarM.pdb
Binary files differ
diff --git a/APSM/bin/Release/WorkM.dll b/APSM/bin/Release/WorkM.dll
index a87a7d5..6e45f3f 100644
--- a/APSM/bin/Release/WorkM.dll
+++ b/APSM/bin/Release/WorkM.dll
Binary files differ
diff --git a/APSM/bin/Release/WorkM.pdb b/APSM/bin/Release/WorkM.pdb
index 9c0158b..4a1a574 100644
--- a/APSM/bin/Release/WorkM.pdb
+++ b/APSM/bin/Release/WorkM.pdb
Binary files differ
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index 19e3705..e040529 100644
--- a/BLL/bin/Release/BLL.dll
+++ b/BLL/bin/Release/BLL.dll
Binary files differ
diff --git a/BLL/bin/Release/BLL.pdb b/BLL/bin/Release/BLL.pdb
index 8d4a81a..44e26bc 100644
--- a/BLL/bin/Release/BLL.pdb
+++ b/BLL/bin/Release/BLL.pdb
Binary files differ
diff --git a/BLL/bin/Release/DAL.dll b/BLL/bin/Release/DAL.dll
index 96ab31f..8f700e4 100644
--- a/BLL/bin/Release/DAL.dll
+++ b/BLL/bin/Release/DAL.dll
Binary files differ
diff --git a/BLL/bin/Release/DAL.pdb b/BLL/bin/Release/DAL.pdb
index 084e842..6d1ccd1 100644
--- a/BLL/bin/Release/DAL.pdb
+++ b/BLL/bin/Release/DAL.pdb
Binary files differ
diff --git a/BLL/bin/Release/DBUtility.dll b/BLL/bin/Release/DBUtility.dll
index e2f3d13..5b87731 100644
--- a/BLL/bin/Release/DBUtility.dll
+++ b/BLL/bin/Release/DBUtility.dll
Binary files differ
diff --git a/BLL/bin/Release/DBUtility.pdb b/BLL/bin/Release/DBUtility.pdb
index 2e70ba7..518c835 100644
--- a/BLL/bin/Release/DBUtility.pdb
+++ b/BLL/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/BLL/bin/Release/Model.dll b/BLL/bin/Release/Model.dll
index 9d99395..4a23b0f 100644
--- a/BLL/bin/Release/Model.dll
+++ b/BLL/bin/Release/Model.dll
Binary files differ
diff --git a/BLL/bin/Release/Model.pdb b/BLL/bin/Release/Model.pdb
index d34c26f..8953e00 100644
--- a/BLL/bin/Release/Model.pdb
+++ b/BLL/bin/Release/Model.pdb
Binary files differ
diff --git a/BLL/bin/Release/Pub_Class.dll b/BLL/bin/Release/Pub_Class.dll
index 6c3c851..5997e36 100644
--- a/BLL/bin/Release/Pub_Class.dll
+++ b/BLL/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/BLL/bin/Release/Pub_Class.pdb b/BLL/bin/Release/Pub_Class.pdb
index 85f204f..d89d437 100644
--- a/BLL/bin/Release/Pub_Class.pdb
+++ b/BLL/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/BLL/bin/Release/Pub_Control.dll b/BLL/bin/Release/Pub_Control.dll
index 7627107..f248499 100644
--- a/BLL/bin/Release/Pub_Control.dll
+++ b/BLL/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/BLL/bin/Release/Pub_Control.pdb b/BLL/bin/Release/Pub_Control.pdb
index 1594144..2cea39d 100644
--- a/BLL/bin/Release/Pub_Control.pdb
+++ b/BLL/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/BLL/bin/Release/SQLHelper.dll b/BLL/bin/Release/SQLHelper.dll
index 8d80856..62d34b5 100644
--- a/BLL/bin/Release/SQLHelper.dll
+++ b/BLL/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/BLL/bin/Release/SQLHelper.pdb b/BLL/bin/Release/SQLHelper.pdb
index cd19676..103d9f2 100644
--- a/BLL/bin/Release/SQLHelper.pdb
+++ b/BLL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/BLL.dll b/BaseSet/bin/Release/BLL.dll
index 6f5fe90..e040529 100644
--- a/BaseSet/bin/Release/BLL.dll
+++ b/BaseSet/bin/Release/BLL.dll
Binary files differ
diff --git a/BaseSet/bin/Release/BLL.pdb b/BaseSet/bin/Release/BLL.pdb
index ff491af..44e26bc 100644
--- a/BaseSet/bin/Release/BLL.pdb
+++ b/BaseSet/bin/Release/BLL.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/BaseSet.dll b/BaseSet/bin/Release/BaseSet.dll
index 1c4ff16..45002b0 100644
--- a/BaseSet/bin/Release/BaseSet.dll
+++ b/BaseSet/bin/Release/BaseSet.dll
Binary files differ
diff --git a/BaseSet/bin/Release/BaseSet.pdb b/BaseSet/bin/Release/BaseSet.pdb
index d890252..a73477c 100644
--- a/BaseSet/bin/Release/BaseSet.pdb
+++ b/BaseSet/bin/Release/BaseSet.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/DAL.dll b/BaseSet/bin/Release/DAL.dll
index d2ca7bb..8f700e4 100644
--- a/BaseSet/bin/Release/DAL.dll
+++ b/BaseSet/bin/Release/DAL.dll
Binary files differ
diff --git a/BaseSet/bin/Release/DAL.pdb b/BaseSet/bin/Release/DAL.pdb
index 9445526..6d1ccd1 100644
--- a/BaseSet/bin/Release/DAL.pdb
+++ b/BaseSet/bin/Release/DAL.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/DBUtility.dll b/BaseSet/bin/Release/DBUtility.dll
index cefc8d8..5b87731 100644
--- a/BaseSet/bin/Release/DBUtility.dll
+++ b/BaseSet/bin/Release/DBUtility.dll
Binary files differ
diff --git a/BaseSet/bin/Release/DBUtility.pdb b/BaseSet/bin/Release/DBUtility.pdb
index f43463e..518c835 100644
--- a/BaseSet/bin/Release/DBUtility.pdb
+++ b/BaseSet/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/Model.dll b/BaseSet/bin/Release/Model.dll
index f101700..4a23b0f 100644
--- a/BaseSet/bin/Release/Model.dll
+++ b/BaseSet/bin/Release/Model.dll
Binary files differ
diff --git a/BaseSet/bin/Release/Model.pdb b/BaseSet/bin/Release/Model.pdb
index 55a5dca..8953e00 100644
--- a/BaseSet/bin/Release/Model.pdb
+++ b/BaseSet/bin/Release/Model.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Class.dll b/BaseSet/bin/Release/Pub_Class.dll
index 81c2807..5997e36 100644
--- a/BaseSet/bin/Release/Pub_Class.dll
+++ b/BaseSet/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Class.pdb b/BaseSet/bin/Release/Pub_Class.pdb
index ed9a4e7..d89d437 100644
--- a/BaseSet/bin/Release/Pub_Class.pdb
+++ b/BaseSet/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Control.dll b/BaseSet/bin/Release/Pub_Control.dll
index d61866b..f248499 100644
--- a/BaseSet/bin/Release/Pub_Control.dll
+++ b/BaseSet/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Control.pdb b/BaseSet/bin/Release/Pub_Control.pdb
index a3856a6..2cea39d 100644
--- a/BaseSet/bin/Release/Pub_Control.pdb
+++ b/BaseSet/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/SQLHelper.dll b/BaseSet/bin/Release/SQLHelper.dll
index 7d4eea1..62d34b5 100644
--- a/BaseSet/bin/Release/SQLHelper.dll
+++ b/BaseSet/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/BaseSet/bin/Release/SQLHelper.pdb b/BaseSet/bin/Release/SQLHelper.pdb
index ab1f540..103d9f2 100644
--- a/BaseSet/bin/Release/SQLHelper.pdb
+++ b/BaseSet/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Class1.cs b/Class1.cs
new file mode 100644
index 0000000..d555ecb
--- /dev/null
+++ b/Class1.cs
@@ -0,0 +1,8 @@
+锘縰sing System;
+
+public class Class1
+{
+ public Class1()
+ {
+ }
+}
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index 96ab31f..8f700e4 100644
--- a/DAL/bin/Release/DAL.dll
+++ b/DAL/bin/Release/DAL.dll
Binary files differ
diff --git a/DAL/bin/Release/DAL.pdb b/DAL/bin/Release/DAL.pdb
index 084e842..6d1ccd1 100644
--- a/DAL/bin/Release/DAL.pdb
+++ b/DAL/bin/Release/DAL.pdb
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.dll b/DAL/bin/Release/DBUtility.dll
index e2f3d13..5b87731 100644
--- a/DAL/bin/Release/DBUtility.dll
+++ b/DAL/bin/Release/DBUtility.dll
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.pdb b/DAL/bin/Release/DBUtility.pdb
index 2e70ba7..518c835 100644
--- a/DAL/bin/Release/DBUtility.pdb
+++ b/DAL/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/DAL/bin/Release/Model.dll b/DAL/bin/Release/Model.dll
index 9d99395..4a23b0f 100644
--- a/DAL/bin/Release/Model.dll
+++ b/DAL/bin/Release/Model.dll
Binary files differ
diff --git a/DAL/bin/Release/Model.pdb b/DAL/bin/Release/Model.pdb
index d34c26f..8953e00 100644
--- a/DAL/bin/Release/Model.pdb
+++ b/DAL/bin/Release/Model.pdb
Binary files differ
diff --git a/DAL/bin/Release/Pub_Class.dll b/DAL/bin/Release/Pub_Class.dll
index 6c3c851..5997e36 100644
--- a/DAL/bin/Release/Pub_Class.dll
+++ b/DAL/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/DAL/bin/Release/Pub_Class.pdb b/DAL/bin/Release/Pub_Class.pdb
index 85f204f..d89d437 100644
--- a/DAL/bin/Release/Pub_Class.pdb
+++ b/DAL/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/DAL/bin/Release/Pub_Control.dll b/DAL/bin/Release/Pub_Control.dll
index 7627107..f248499 100644
--- a/DAL/bin/Release/Pub_Control.dll
+++ b/DAL/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/DAL/bin/Release/Pub_Control.pdb b/DAL/bin/Release/Pub_Control.pdb
index 1594144..2cea39d 100644
--- a/DAL/bin/Release/Pub_Control.pdb
+++ b/DAL/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.dll b/DAL/bin/Release/SQLHelper.dll
index 8d80856..62d34b5 100644
--- a/DAL/bin/Release/SQLHelper.dll
+++ b/DAL/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.pdb b/DAL/bin/Release/SQLHelper.pdb
index cd19676..103d9f2 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
index cfebe96..0bc28d5 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
@@ -342,7 +342,11 @@
try
{
//寰楀埌mainid
- omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (omodel.HInterID == 0 || omodel.HInterID.ToString() == null || omodel.HInterID.ToString() == "undefined")
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
//淇濆瓨鍓嶆帶鍒�=========================================
@@ -496,12 +500,34 @@
{
if (oSystemParameter.omodel.Sc_ProcessExchangeBill_AutoBarCode == "Y") //绯荤粺鍙傛暟 宸ュ簭娴佽浆鍗′繚瀛樻椂鑷姩鍚屾鏉＄爜淇℃伅鑷虫潯鐮佹。妗�
{
- oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+ Int64 HBarCodeInterID = DBUtility.ClsPub.CreateBillID_Prod("85", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ if (oSystemParameter.omodel.WMS_CampanyName == "娣诲悍绉戞妧")
+ {
+ oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty" +
",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark" +
",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate" +
- ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HGiveAwayFlag" +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID,HGiveAwayFlag" +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
+ ") values ("
+ + "'" + omodel.HBillNo + "','鍞竴鏉＄爜'," + omodel.HMaterID.ToString() + "," + omodel.HUnitID.ToString() + "," + omodel.HQty.ToString()
+ + ",'" + omodel.HBatchNo + "'," + omodel.HSupID.ToString() + ",0,'" + omodel.HMaker + "',getdate(),0," + omodel.HQty.ToString()
+ + ", " + omodel.HICMOInterID.ToString() + "," + omodel.HICMOEntryID + ",'" + omodel.HICMOBillNo + "','3710',''"
+ + ",1,1,0,0,0,'宸ュ簭娴佽浆鍗′繚瀛樿嚜鍔ㄥ悓姝�'"
+ + ",0,'',getdate(),'',getdate()"
+ + ", " + omodel.HPRDORGID + "," + omodel.HPRDORGID + ",''," + HBarCodeInterID + ",1,0"
+ + ",'','','',0,'','')");
+ }
+ else
+ {
+ oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+ ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty" +
+ ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark" +
+ ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate" +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID,HGiveAwayFlag" +
",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
") values ("
+ "'" + omodel.HBillNo + "','鍞竴鏉＄爜'," + omodel.HMaterID.ToString() + "," + omodel.HUnitID.ToString() + "," + omodel.HQty.ToString()
@@ -509,8 +535,9 @@
+ ", " + omodel.HInterID.ToString() + ",1,'" + omodel.HBillNo + "','3772',''"
+ ",1,1,0,0,0,'宸ュ簭娴佽浆鍗′繚瀛樿嚜鍔ㄥ悓姝�'"
+ ",0,'',getdate(),'',getdate()"
- + ", " + omodel.HPRDORGID + "," + omodel.HPRDORGID + ",'',0,0"
+ + ", " + omodel.HPRDORGID + "," + omodel.HPRDORGID + ",''," + HBarCodeInterID + ",1,0"
+ ",'','','',0,'','')");
+ }
}
}
else
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index e2f3d13..5b87731 100644
--- a/DBUtility/bin/Release/DBUtility.dll
+++ b/DBUtility/bin/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/bin/Release/DBUtility.pdb b/DBUtility/bin/Release/DBUtility.pdb
index 2e70ba7..518c835 100644
--- a/DBUtility/bin/Release/DBUtility.pdb
+++ b/DBUtility/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Class.dll b/DBUtility/bin/Release/Pub_Class.dll
index 6c3c851..5997e36 100644
--- a/DBUtility/bin/Release/Pub_Class.dll
+++ b/DBUtility/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Class.pdb b/DBUtility/bin/Release/Pub_Class.pdb
index 85f204f..d89d437 100644
--- a/DBUtility/bin/Release/Pub_Class.pdb
+++ b/DBUtility/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Control.dll b/DBUtility/bin/Release/Pub_Control.dll
index 7627107..f248499 100644
--- a/DBUtility/bin/Release/Pub_Control.dll
+++ b/DBUtility/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Control.pdb b/DBUtility/bin/Release/Pub_Control.pdb
index 1594144..2cea39d 100644
--- a/DBUtility/bin/Release/Pub_Control.pdb
+++ b/DBUtility/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.dll b/DBUtility/bin/Release/SQLHelper.dll
index 8d80856..62d34b5 100644
--- a/DBUtility/bin/Release/SQLHelper.dll
+++ b/DBUtility/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.pdb b/DBUtility/bin/Release/SQLHelper.pdb
index cd19676..103d9f2 100644
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index c3344a0..5a71c6d 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.dll b/DBUtility/obj/Release/DBUtility.dll
index e2f3d13..5b87731 100644
--- a/DBUtility/obj/Release/DBUtility.dll
+++ b/DBUtility/obj/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.pdb b/DBUtility/obj/Release/DBUtility.pdb
index 2e70ba7..518c835 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index e2f3d13..5b87731 100644
--- a/Model/bin/Release/DBUtility.dll
+++ b/Model/bin/Release/DBUtility.dll
Binary files differ
diff --git a/Model/bin/Release/DBUtility.pdb b/Model/bin/Release/DBUtility.pdb
index 2e70ba7..518c835 100644
--- a/Model/bin/Release/DBUtility.pdb
+++ b/Model/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/Release/Model.dll b/Model/bin/Release/Model.dll
index 9d99395..4a23b0f 100644
--- a/Model/bin/Release/Model.dll
+++ b/Model/bin/Release/Model.dll
Binary files differ
diff --git a/Model/bin/Release/Model.pdb b/Model/bin/Release/Model.pdb
index d34c26f..8953e00 100644
--- a/Model/bin/Release/Model.pdb
+++ b/Model/bin/Release/Model.pdb
Binary files differ
diff --git a/Model/bin/Release/Pub_Class.dll b/Model/bin/Release/Pub_Class.dll
index 6c3c851..5997e36 100644
--- a/Model/bin/Release/Pub_Class.dll
+++ b/Model/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Model/bin/Release/Pub_Class.pdb b/Model/bin/Release/Pub_Class.pdb
index 85f204f..d89d437 100644
--- a/Model/bin/Release/Pub_Class.pdb
+++ b/Model/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Model/bin/Release/Pub_Control.dll b/Model/bin/Release/Pub_Control.dll
index 7627107..f248499 100644
--- a/Model/bin/Release/Pub_Control.dll
+++ b/Model/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/Model/bin/Release/Pub_Control.pdb b/Model/bin/Release/Pub_Control.pdb
index 1594144..2cea39d 100644
--- a/Model/bin/Release/Pub_Control.pdb
+++ b/Model/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.dll b/Model/bin/Release/SQLHelper.dll
index 8d80856..62d34b5 100644
--- a/Model/bin/Release/SQLHelper.dll
+++ b/Model/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.pdb b/Model/bin/Release/SQLHelper.pdb
index cd19676..103d9f2 100644
--- a/Model/bin/Release/SQLHelper.pdb
+++ b/Model/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache
index cfd2794..e5971e7 100644
--- a/Model/obj/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/obj/Release/Model.dll b/Model/obj/Release/Model.dll
index 9d99395..4a23b0f 100644
--- a/Model/obj/Release/Model.dll
+++ b/Model/obj/Release/Model.dll
Binary files differ
diff --git a/Model/obj/Release/Model.pdb b/Model/obj/Release/Model.pdb
index d34c26f..8953e00 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub_BatchSplit.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub_BatchSplit.cs"
index 547ada3..af1f432 100644
--- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub_BatchSplit.cs"
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub_BatchSplit.cs"
@@ -16,6 +16,9 @@
public double HProQty;//流转卡数量
public Int64 HRoutingInterID;//工艺路线内码
public DateTime HDate;//流转卡日期
+ public Int64 HInterID;//流转卡内码
+ public string HBillNo;//流转卡号
+ public string HBatchNo;//批次
}
}
diff --git a/PlanM/bin/Release/BLL.dll b/PlanM/bin/Release/BLL.dll
index 6f5fe90..e040529 100644
--- a/PlanM/bin/Release/BLL.dll
+++ b/PlanM/bin/Release/BLL.dll
Binary files differ
diff --git a/PlanM/bin/Release/BLL.pdb b/PlanM/bin/Release/BLL.pdb
index ff491af..44e26bc 100644
--- a/PlanM/bin/Release/BLL.pdb
+++ b/PlanM/bin/Release/BLL.pdb
Binary files differ
diff --git a/PlanM/bin/Release/DAL.dll b/PlanM/bin/Release/DAL.dll
index d2ca7bb..8f700e4 100644
--- a/PlanM/bin/Release/DAL.dll
+++ b/PlanM/bin/Release/DAL.dll
Binary files differ
diff --git a/PlanM/bin/Release/DAL.pdb b/PlanM/bin/Release/DAL.pdb
index 9445526..6d1ccd1 100644
--- a/PlanM/bin/Release/DAL.pdb
+++ b/PlanM/bin/Release/DAL.pdb
Binary files differ
diff --git a/PlanM/bin/Release/DBUtility.dll b/PlanM/bin/Release/DBUtility.dll
index cefc8d8..5b87731 100644
--- a/PlanM/bin/Release/DBUtility.dll
+++ b/PlanM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/PlanM/bin/Release/DBUtility.pdb b/PlanM/bin/Release/DBUtility.pdb
index f43463e..518c835 100644
--- a/PlanM/bin/Release/DBUtility.pdb
+++ b/PlanM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/PlanM/bin/Release/Model.dll b/PlanM/bin/Release/Model.dll
index f101700..4a23b0f 100644
--- a/PlanM/bin/Release/Model.dll
+++ b/PlanM/bin/Release/Model.dll
Binary files differ
diff --git a/PlanM/bin/Release/Model.pdb b/PlanM/bin/Release/Model.pdb
index 55a5dca..8953e00 100644
--- a/PlanM/bin/Release/Model.pdb
+++ b/PlanM/bin/Release/Model.pdb
Binary files differ
diff --git a/PlanM/bin/Release/PlanM.dll b/PlanM/bin/Release/PlanM.dll
index 8e59ab3..a11a4ee 100644
--- a/PlanM/bin/Release/PlanM.dll
+++ b/PlanM/bin/Release/PlanM.dll
Binary files differ
diff --git a/PlanM/bin/Release/PlanM.pdb b/PlanM/bin/Release/PlanM.pdb
index b37f06a..daec3e7 100644
--- a/PlanM/bin/Release/PlanM.pdb
+++ b/PlanM/bin/Release/PlanM.pdb
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Class.dll b/PlanM/bin/Release/Pub_Class.dll
index 81c2807..5997e36 100644
--- a/PlanM/bin/Release/Pub_Class.dll
+++ b/PlanM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Class.pdb b/PlanM/bin/Release/Pub_Class.pdb
index ed9a4e7..d89d437 100644
--- a/PlanM/bin/Release/Pub_Class.pdb
+++ b/PlanM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Control.dll b/PlanM/bin/Release/Pub_Control.dll
index d61866b..f248499 100644
--- a/PlanM/bin/Release/Pub_Control.dll
+++ b/PlanM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Control.pdb b/PlanM/bin/Release/Pub_Control.pdb
index a3856a6..2cea39d 100644
--- a/PlanM/bin/Release/Pub_Control.pdb
+++ b/PlanM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/PlanM/bin/Release/SQLHelper.dll b/PlanM/bin/Release/SQLHelper.dll
index 7d4eea1..62d34b5 100644
--- a/PlanM/bin/Release/SQLHelper.dll
+++ b/PlanM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/PlanM/bin/Release/SQLHelper.pdb b/PlanM/bin/Release/SQLHelper.pdb
index ab1f540..103d9f2 100644
--- a/PlanM/bin/Release/SQLHelper.pdb
+++ b/PlanM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Pub_Class/CustomerCls/ClsPub.cs b/Pub_Class/CustomerCls/ClsPub.cs
index f324392..b242eab 100644
--- a/Pub_Class/CustomerCls/ClsPub.cs
+++ b/Pub_Class/CustomerCls/ClsPub.cs
@@ -1,12 +1,11 @@
锘縰sing System;
-using System.Collections.Generic;
using System.Text;
using System.Data;
using System.Windows.Forms;
using System.Drawing;
-using System.Data.SqlClient;
using System.Net.Sockets;
using System.Net;
+using SyntacticSugar.constant;
namespace Pub_Class
{
@@ -59,11 +58,12 @@
public static DateTime XFCurEDate;
public static DateTime KQCurBDate;
public static DateTime KQCurEDate;
-
public static bool check;
public static int HCheckStatus;
public static string sSQLInfo;
public static string sErrInfo;
+
+
public enum Enum_BillStatus : int
{
@@ -1397,16 +1397,17 @@
{
ClsSqlHelper oCn = new ClsSqlHelper();
DataSet Ds = new DataSet();
+
try
{
Ds = oCn.RunProcReturn("Select GetDate() as CurDate", "xt_xtgnb");
switch (iType)
{
- case 0:
+ case TimeConstant.TIME_OF_THE_MONTH:
return Convert.ToDateTime(Ds.Tables[0].Rows[0]["CurDate"]).ToString("yyyy-MM-dd");
- case 1:
+ case TimeConstant.TIME_OF_THE_HOUR:
return Convert.ToDateTime(Ds.Tables[0].Rows[0]["CurDate"]).ToString("HH:mm:ss");
- case -1:
+ case TimeConstant.PRECISE_TIME:
return Convert.ToDateTime(Ds.Tables[0].Rows[0]["CurDate"]).ToString("yyyy-MM-dd HH:mm:ss");
default:
return "1900-01-01";
@@ -1427,11 +1428,13 @@
Ds = oCn.RunProcReturn("Select GetDate() as CurDate", "xt_xtgnb");
switch (iType)
{
- case 0:
+ case TimeConstant.TIME_OF_THE_MONTH:
return Convert.ToDateTime(Ds.Tables[0].Rows[0]["CurDate"]).ToString("yyyy-MM-dd");
- case 1:
+
+ case TimeConstant.TIME_OF_THE_HOUR:
return Convert.ToDateTime(Ds.Tables[0].Rows[0]["CurDate"]).ToString("hh:mm:ss");
- case -1:
+
+ case TimeConstant.PRECISE_TIME:
return Convert.ToDateTime(Ds.Tables[0].Rows[0]["CurDate"]).ToString("yyyy-MM-dd HH:mm:ss");
default:
return "1900-01-01";
@@ -1585,7 +1588,6 @@
}
}
}
-
// 璇诲彇鍒楀datagridview
public static void GetGridView(DataGridView oGrd, string KeyItem, string AppPath)
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 6eed621..4367dd5 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -1956,7 +1956,54 @@
{
omodel.Kf_StockInRequestBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //=========采购订单
+ //自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Cg_POOrderBill_AutoCheck")
+ {
+ omodel.Cg_POOrderBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //=========应付单
+ //自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Cg_PayableBill_AutoCheck")
+ {
+ omodel.Cg_PayableBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========付款单
+ //自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "YF_PayMentBill_AutoCheck")
+ {
+ omodel.YF_PayMentBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========销售订单
+ //自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Xs_SeOrderBill_AutoCheck")
+ {
+ omodel.Xs_SeOrderBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========发货通知单
+ //自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Xs_SeOutStockBill_AutoCheck")
+ {
+ omodel.Xs_SeOutStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========应收单
+ //自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Xs_ReceivableBill_AutoCheck")
+ {
+ omodel.Xs_ReceivableBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
+ //=========收款单
+ //自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "YS_ReceiveBill_AutoCheck")
+ {
+ omodel.YS_ReceiveBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
////=========工序进站单
////自动匹配流水号
//if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationBill_ProcNo")
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index a1993bd..a9fea06 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -638,6 +638,27 @@
//入库申请
public string Kf_StockInRequestBill_AutoCheck; //保存后是否自动审核
+ //采购订单
+ public string Cg_POOrderBill_AutoCheck; //保存后是否自动审核
+
+ //应付单
+ public string Cg_PayableBill_AutoCheck; //保存后是否自动审核
+
+ //付款单
+ public string YF_PayMentBill_AutoCheck; //保存后是否自动审核
+
+ //销售订单
+ public string Xs_SeOrderBill_AutoCheck; //保存后是否自动审核
+
+ //发货通知单
+ public string Xs_SeOutStockBill_AutoCheck; //保存后是否自动审核
+
+ //应收单
+ public string Xs_ReceivableBill_AutoCheck; //保存后是否自动审核
+
+ //收款单
+ public string YS_ReceiveBill_AutoCheck; //保存后是否自动审核
+
}
}
diff --git a/Pub_Class/Pub_Class.csproj b/Pub_Class/Pub_Class.csproj
index 528bed7..1adad4b 100644
--- a/Pub_Class/Pub_Class.csproj
+++ b/Pub_Class/Pub_Class.csproj
@@ -115,6 +115,12 @@
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\SyntacticSugar\SyntacticSugar.csproj">
+ <Project>{AFD44036-A391-4A68-BD73-37BABFC1605E}</Project>
+ <Name>SyntacticSugar</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index 6c3c851..5997e36 100644
--- a/Pub_Class/bin/Release/Pub_Class.dll
+++ b/Pub_Class/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.pdb b/Pub_Class/bin/Release/Pub_Class.pdb
index 85f204f..d89d437 100644
--- a/Pub_Class/bin/Release/Pub_Class.pdb
+++ b/Pub_Class/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.dll b/Pub_Class/bin/Release/SyntacticSugar.dll
new file mode 100644
index 0000000..0ea8f5d
--- /dev/null
+++ b/Pub_Class/bin/Release/SyntacticSugar.dll
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.pdb b/Pub_Class/bin/Release/SyntacticSugar.pdb
new file mode 100644
index 0000000..77611d6
--- /dev/null
+++ b/Pub_Class/bin/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.dll b/Pub_Control/bin/Release/Pub_Class.dll
index 6c3c851..5997e36 100644
--- a/Pub_Control/bin/Release/Pub_Class.dll
+++ b/Pub_Control/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.pdb b/Pub_Control/bin/Release/Pub_Class.pdb
index 85f204f..d89d437 100644
--- a/Pub_Control/bin/Release/Pub_Class.pdb
+++ b/Pub_Control/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Control.dll b/Pub_Control/bin/Release/Pub_Control.dll
index 7627107..f248499 100644
--- a/Pub_Control/bin/Release/Pub_Control.dll
+++ b/Pub_Control/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Control.pdb b/Pub_Control/bin/Release/Pub_Control.pdb
index 1594144..2cea39d 100644
--- a/Pub_Control/bin/Release/Pub_Control.pdb
+++ b/Pub_Control/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.dll b/SQLHelper/bin/Release/Pub_Class.dll
index 6c3c851..5997e36 100644
--- a/SQLHelper/bin/Release/Pub_Class.dll
+++ b/SQLHelper/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.pdb b/SQLHelper/bin/Release/Pub_Class.pdb
index 85f204f..d89d437 100644
--- a/SQLHelper/bin/Release/Pub_Class.pdb
+++ b/SQLHelper/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.dll b/SQLHelper/bin/Release/SQLHelper.dll
index 8d80856..62d34b5 100644
--- a/SQLHelper/bin/Release/SQLHelper.dll
+++ b/SQLHelper/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.pdb b/SQLHelper/bin/Release/SQLHelper.pdb
index cd19676..103d9f2 100644
--- a/SQLHelper/bin/Release/SQLHelper.pdb
+++ b/SQLHelper/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
index f6a06ef..cb510d1 100644
--- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.dll b/SQLHelper/obj/Release/SQLHelper.dll
index 8d80856..62d34b5 100644
--- a/SQLHelper/obj/Release/SQLHelper.dll
+++ b/SQLHelper/obj/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.pdb b/SQLHelper/obj/Release/SQLHelper.pdb
index cd19676..103d9f2 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/SyntacticSugar/Properties/AssemblyInfo.cs b/SyntacticSugar/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..b20d3f8
--- /dev/null
+++ b/SyntacticSugar/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+锘縰sing System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 鏈夊叧绋嬪簭闆嗙殑涓�鑸俊鎭敱浠ヤ笅
+// 鎺у埗銆傛洿鏀硅繖浜涚壒鎬у�煎彲淇敼
+// 涓庣▼搴忛泦鍏宠仈鐨勪俊鎭��
+[assembly: AssemblyTitle("SyntacticSugar")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("SyntacticSugar")]
+[assembly: AssemblyCopyright("Copyright 漏 2024")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 灏� ComVisible 璁剧疆涓� false 浼氫娇姝ょ▼搴忛泦涓殑绫诲瀷
+//瀵� COM 缁勪欢涓嶅彲瑙併�傚鏋滈渶瑕佷粠 COM 璁块棶姝ょ▼搴忛泦涓殑绫诲瀷
+//璇峰皢姝ょ被鍨嬬殑 ComVisible 鐗规�ц缃负 true銆�
+[assembly: ComVisible(false)]
+
+// 濡傛灉姝ら」鐩悜 COM 鍏紑锛屽垯涓嬪垪 GUID 鐢ㄤ簬绫诲瀷搴撶殑 ID
+[assembly: Guid("afd44036-a391-4a68-bd73-37babfc1605e")]
+
+// 绋嬪簭闆嗙殑鐗堟湰淇℃伅鐢变笅鍒楀洓涓�肩粍鎴�:
+//
+// 涓荤増鏈�
+// 娆＄増鏈�
+// 鐢熸垚鍙�
+// 淇鍙�
+//
+//鍙互鎸囧畾鎵�鏈夎繖浜涘�硷紝涔熷彲浠ヤ娇鐢ㄢ�滅敓鎴愬彿鈥濆拰鈥滀慨璁㈠彿鈥濈殑榛樿鍊�
+//閫氳繃浣跨敤 "*"锛屽涓嬫墍绀�:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/SyntacticSugar/SyntacticSugar.csproj b/SyntacticSugar/SyntacticSugar.csproj
new file mode 100644
index 0000000..654816b
--- /dev/null
+++ b/SyntacticSugar/SyntacticSugar.csproj
@@ -0,0 +1,54 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{AFD44036-A391-4A68-BD73-37BABFC1605E}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>SyntacticSugar</RootNamespace>
+ <AssemblyName>SyntacticSugar</AssemblyName>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <Deterministic>true</Deterministic>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Net.Http" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="constant\TypeConstant.cs" />
+ <Compile Include="constant\CodeConstant.cs" />
+ <Compile Include="constant\CountConstant.cs" />
+ <Compile Include="constant\TimeConstant.cs" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="enums\" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
new file mode 100644
index 0000000..c790b1a
--- /dev/null
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
new file mode 100644
index 0000000..a78c960
--- /dev/null
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.dll b/SyntacticSugar/bin/Release/SyntacticSugar.dll
new file mode 100644
index 0000000..0ea8f5d
--- /dev/null
+++ b/SyntacticSugar/bin/Release/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.pdb b/SyntacticSugar/bin/Release/SyntacticSugar.pdb
new file mode 100644
index 0000000..77611d6
--- /dev/null
+++ b/SyntacticSugar/bin/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/constant/CodeConstant.cs b/SyntacticSugar/constant/CodeConstant.cs
new file mode 100644
index 0000000..a445fe5
--- /dev/null
+++ b/SyntacticSugar/constant/CodeConstant.cs
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SyntacticSugar.constant
+{
+ public static class CodeConstant
+ {
+ //鎴愬姛缂栫爜
+ public const string SUCCEED = "1";
+
+ //澶辫触缂栫爜
+ public const string FAIL = "0";
+ }
+}
diff --git a/SyntacticSugar/constant/CountConstant.cs b/SyntacticSugar/constant/CountConstant.cs
new file mode 100644
index 0000000..67537b4
--- /dev/null
+++ b/SyntacticSugar/constant/CountConstant.cs
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SyntacticSugar.constant
+{
+ public static class CountConstant
+ {
+ //鎴愬姛缂栫爜
+ public const int SUCCEED = 1;
+
+ //澶辫触缂栫爜
+ public const int FAIL = 0;
+ }
+}
diff --git a/SyntacticSugar/constant/TimeConstant.cs b/SyntacticSugar/constant/TimeConstant.cs
new file mode 100644
index 0000000..aa0ba0a
--- /dev/null
+++ b/SyntacticSugar/constant/TimeConstant.cs
@@ -0,0 +1,20 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SyntacticSugar.constant
+{
+ public static class TimeConstant
+ {
+ //鏈堜唤鏃堕棿 yyyy-MM-dd
+ public const int TIME_OF_THE_MONTH = 0;
+
+ //閽熷垎绉� HH:mm:ss
+ public const int TIME_OF_THE_HOUR = 1;
+
+ //绮剧‘鏃堕棿 yyyy-MM-dd HH:mm:ss
+ public const int PRECISE_TIME = -1;
+ }
+}
diff --git a/SyntacticSugar/constant/TypeConstant.cs b/SyntacticSugar/constant/TypeConstant.cs
new file mode 100644
index 0000000..5b11c89
--- /dev/null
+++ b/SyntacticSugar/constant/TypeConstant.cs
@@ -0,0 +1,36 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SyntacticSugar.constant
+{
+ public static class TypeConstant
+ {
+ //瀹℃牳
+ public const int AUDIT = 0;
+
+ //鍙栨秷瀹℃牳
+ public const int REVERSE_AUDIT = 1;
+
+ //鍏抽棴
+ public const int CLOSED = 1;
+
+ //鍙嶅叧闂�
+ public const int REVERSE_CLOSED = 2;
+
+ //琛屽叧闂�
+ public const int LINE_CLOSED = 0;
+
+ //琛屽弽鍏抽棴
+ public const int REVERSE_LINE_CLOSED = 1;
+
+ //浣滃簾
+ public const int INVALID = 1;
+
+ //鍙嶄綔搴�
+ public const int REVERSE_INVALID = 2;
+
+ }
+}
diff --git a/SyntacticSugar/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/SyntacticSugar/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs
new file mode 100644
index 0000000..e5dc9b8
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs
@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")]
diff --git a/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..44894ab
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..f5e894a
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..0817991
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+3e9fe1906cfd5d4b0e3019a2e1d28212fc924bb1
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..ae67eee
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -0,0 +1,12 @@
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
new file mode 100644
index 0000000..c790b1a
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
new file mode 100644
index 0000000..a78c960
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs
new file mode 100644
index 0000000..e5dc9b8
--- /dev/null
+++ b/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs
@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")]
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..f5e894a
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..6bd9617
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+892d1badfdd66f6f74ffd2a9f1f8c13944567a12
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..35490b3
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -0,0 +1,6 @@
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.dll b/SyntacticSugar/obj/Release/SyntacticSugar.dll
new file mode 100644
index 0000000..0ea8f5d
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.pdb b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
new file mode 100644
index 0000000..77611d6
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/WarM/bin/Release/BLL.dll b/WarM/bin/Release/BLL.dll
index 6f5fe90..e040529 100644
--- a/WarM/bin/Release/BLL.dll
+++ b/WarM/bin/Release/BLL.dll
Binary files differ
diff --git a/WarM/bin/Release/BLL.pdb b/WarM/bin/Release/BLL.pdb
index ff491af..44e26bc 100644
--- a/WarM/bin/Release/BLL.pdb
+++ b/WarM/bin/Release/BLL.pdb
Binary files differ
diff --git a/WarM/bin/Release/DAL.dll b/WarM/bin/Release/DAL.dll
index d2ca7bb..8f700e4 100644
--- a/WarM/bin/Release/DAL.dll
+++ b/WarM/bin/Release/DAL.dll
Binary files differ
diff --git a/WarM/bin/Release/DAL.pdb b/WarM/bin/Release/DAL.pdb
index 9445526..6d1ccd1 100644
--- a/WarM/bin/Release/DAL.pdb
+++ b/WarM/bin/Release/DAL.pdb
Binary files differ
diff --git a/WarM/bin/Release/DBUtility.dll b/WarM/bin/Release/DBUtility.dll
index cefc8d8..5b87731 100644
--- a/WarM/bin/Release/DBUtility.dll
+++ b/WarM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/WarM/bin/Release/DBUtility.pdb b/WarM/bin/Release/DBUtility.pdb
index f43463e..518c835 100644
--- a/WarM/bin/Release/DBUtility.pdb
+++ b/WarM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/WarM/bin/Release/Model.dll b/WarM/bin/Release/Model.dll
index f101700..4a23b0f 100644
--- a/WarM/bin/Release/Model.dll
+++ b/WarM/bin/Release/Model.dll
Binary files differ
diff --git a/WarM/bin/Release/Model.pdb b/WarM/bin/Release/Model.pdb
index 55a5dca..8953e00 100644
--- a/WarM/bin/Release/Model.pdb
+++ b/WarM/bin/Release/Model.pdb
Binary files differ
diff --git a/WarM/bin/Release/Pub_Class.dll b/WarM/bin/Release/Pub_Class.dll
index 81c2807..5997e36 100644
--- a/WarM/bin/Release/Pub_Class.dll
+++ b/WarM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/WarM/bin/Release/Pub_Class.pdb b/WarM/bin/Release/Pub_Class.pdb
index ed9a4e7..d89d437 100644
--- a/WarM/bin/Release/Pub_Class.pdb
+++ b/WarM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/WarM/bin/Release/Pub_Control.dll b/WarM/bin/Release/Pub_Control.dll
index d61866b..f248499 100644
--- a/WarM/bin/Release/Pub_Control.dll
+++ b/WarM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/WarM/bin/Release/Pub_Control.pdb b/WarM/bin/Release/Pub_Control.pdb
index a3856a6..2cea39d 100644
--- a/WarM/bin/Release/Pub_Control.pdb
+++ b/WarM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/WarM/bin/Release/SQLHelper.dll b/WarM/bin/Release/SQLHelper.dll
index 7d4eea1..62d34b5 100644
--- a/WarM/bin/Release/SQLHelper.dll
+++ b/WarM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/WarM/bin/Release/SQLHelper.pdb b/WarM/bin/Release/SQLHelper.pdb
index ab1f540..103d9f2 100644
--- a/WarM/bin/Release/SQLHelper.pdb
+++ b/WarM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/WarM/bin/Release/WarM.dll b/WarM/bin/Release/WarM.dll
index a7f7373..5984e38 100644
--- a/WarM/bin/Release/WarM.dll
+++ b/WarM/bin/Release/WarM.dll
Binary files differ
diff --git a/WarM/bin/Release/WarM.pdb b/WarM/bin/Release/WarM.pdb
index 2257290..04facf2 100644
--- a/WarM/bin/Release/WarM.pdb
+++ b/WarM/bin/Release/WarM.pdb
Binary files differ
diff --git a/WebAPI.sln b/WebAPI.sln
index d41c6ff..a998249 100644
--- a/WebAPI.sln
+++ b/WebAPI.sln
@@ -4,6 +4,10 @@
VisualStudioVersion = 16.0.30907.101
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebAPI", "WebAPI\WebAPI.csproj", "{5B60CE0C-963C-4DC2-91B3-0B471AAC5438}"
+ ProjectSection(ProjectDependencies) = postProject
+ {0844CD97-FFAB-445F-A473-1380387E9A12} = {0844CD97-FFAB-445F-A473-1380387E9A12}
+ {59DA489D-C83F-4584-8F1E-0BE1DC9710D4} = {59DA489D-C83F-4584-8F1E-0BE1DC9710D4}
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "APSM", "APSM\APSM.csproj", "{59DA489D-C83F-4584-8F1E-0BE1DC9710D4}"
EndProject
@@ -50,6 +54,8 @@
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PayM", "PayM\PayM.csproj", "{36A0CF08-E176-4A58-B406-D187943804EE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TopSdk", "sdk_dingding\TopSdk\TopSdk.csproj", "{9C11CAE5-5188-4E71-825B-68FC3135728A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SyntacticSugar", "SyntacticSugar\SyntacticSugar.csproj", "{AFD44036-A391-4A68-BD73-37BABFC1605E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -249,6 +255,14 @@
{9C11CAE5-5188-4E71-825B-68FC3135728A}.Release|Any CPU.Build.0 = Release|Any CPU
{9C11CAE5-5188-4E71-825B-68FC3135728A}.Release|x86.ActiveCfg = Release|Any CPU
{9C11CAE5-5188-4E71-825B-68FC3135728A}.Release|x86.Build.0 = Release|Any CPU
+ {AFD44036-A391-4A68-BD73-37BABFC1605E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AFD44036-A391-4A68-BD73-37BABFC1605E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AFD44036-A391-4A68-BD73-37BABFC1605E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {AFD44036-A391-4A68-BD73-37BABFC1605E}.Debug|x86.Build.0 = Debug|Any CPU
+ {AFD44036-A391-4A68-BD73-37BABFC1605E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AFD44036-A391-4A68-BD73-37BABFC1605E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AFD44036-A391-4A68-BD73-37BABFC1605E}.Release|x86.ActiveCfg = Release|Any CPU
+ {AFD44036-A391-4A68-BD73-37BABFC1605E}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
index 5222645..10e249c 100644
--- a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
@@ -607,6 +607,29 @@
//鏀舵枡閫氱煡鍗曟柊澧炲洖濉噰璐鍗曞叧鑱旀暟閲�
oCN.RunProc("exec h_p_Cg_UpDatePOOrderRelation_Add " + HInterID);
+ //鑷姩瀹℃牳璁剧疆
+ if ((OperationType == 1 || OperationType == 2 || OperationType == 4))
+ {
+ objJsonResult.HInterID = HInterID.ToString(); //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Cg_POInStockBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+ else if (OperationType == 3 )
+ {
+ objJsonResult.HInterID = HInterID.ToString(); //杩斿洖涓籌D
+ objJsonResult.Verify = "N";
+ }
if (objJsonResult.code == "0")
{
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 2c0a528..4eeca6c 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -2,6 +2,7 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
+using SyntacticSugar.constant;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -9,6 +10,7 @@
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Models;
+
namespace WebAPI.Controllers
{
@@ -200,7 +202,7 @@
{
try
{
- string sql = $"update銆�Cg_POOrderBillMain銆� set HBusinessStatus = 2 ,HEmpID ={HSupplierId} where HInterID in ({Hmainid})";
+ string sql = $"update銆�Cg_POOrderBillMain銆�set HBusinessStatus = 2 ,HEmpID ={HSupplierId} where HInterID in ({Hmainid})";
oCN.RunProc(sql);
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -228,7 +230,7 @@
{
try
{
- string sql = $"update銆�Cg_POOrderBillMain銆� set HBusinessStatus = 3 where HInterID in ({Hmainid})";
+ string sql = $"update銆�Cg_POOrderBillMain set HBusinessStatus = 3 where HInterID in ({Hmainid})";
oCN.RunProc(sql);
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -867,7 +869,29 @@
}
//淇濆瓨瀛愯〃
objJsonResult = AddBillSub(msg3, HInterID, OperationType);
-
+ //鑷姩瀹℃牳璁剧疆
+ if ((OperationType == 1 || OperationType == 2))
+ {
+ objJsonResult.HInterID = HInterID.ToString(); //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Cg_POOrderBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+ else if (OperationType == 3)
+ {
+ objJsonResult.HInterID = HInterID.ToString(); //杩斿洖涓籌D
+ objJsonResult.Verify = "N";
+ }
if (objJsonResult.code == "0")
{
objJsonResult.code = "0";
@@ -1345,37 +1369,37 @@
{
if (oBill.omodel.HCloseMan.Trim() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
objJsonResult.data = null;
return objJsonResult;
}
if (oBill.omodel.HDeleteMan.Trim() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
objJsonResult.data = null;
return objJsonResult;
}
- if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ if (IsAudit == TypeConstant.AUDIT) //瀹℃牳鍒ゆ柇
{
if (oBill.omodel.HChecker.Trim() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
objJsonResult.data = null;
return objJsonResult;
}
}
- if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ if (IsAudit == TypeConstant.REVERSE_AUDIT) //鍙嶅鏍稿垽鏂�
{
if (oBill.omodel.HChecker.Trim() == "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
objJsonResult.data = null;
return objJsonResult;
@@ -1384,8 +1408,8 @@
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -1393,7 +1417,7 @@
//杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
- if (IsAudit == 0) //瀹℃牳鎻愪氦
+ if (IsAudit == TypeConstant.AUDIT) //瀹℃牳鎻愪氦
{
//瀹℃牳鍓嶆帶鍒�=========================================
@@ -1401,8 +1425,8 @@
ds = oCN.RunProcReturn(sql1, "h_p_Cg_POOrderBill_BeforeCheckCtrl");
if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
objJsonResult.data = null;
return objJsonResult;
@@ -1410,8 +1434,8 @@
if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
{
- objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
objJsonResult.data = null;
return objJsonResult;
@@ -1432,37 +1456,37 @@
//瀹℃牳鎻愪氦
if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Cg_POOrderBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "瀹℃牳鎴愬姛";
objJsonResult.data = null;
return objJsonResult;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
}
- if (IsAudit == 1) //鍙嶅鏍告彁浜�
+ if (IsAudit == TypeConstant.REVERSE_AUDIT) //鍙嶅鏍告彁浜�
{
//鍙嶅鏍稿墠鎺у埗=========================================
DataSet ds = oCN.RunProcReturn("Exec h_p_Cg_POOrderBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'", "h_p_Cg_POOrderBill_BeforeUnCheckCtrl");
if (ds == null)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + "鍙嶅鏍稿墠鍒ゆ柇澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
}
if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
objJsonResult.data = null;
return objJsonResult;
@@ -1484,16 +1508,16 @@
//鍙嶅鏍告彁浜bandonCheck
if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Cg_POOrderBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鍙嶅鏍告垚鍔�";
objJsonResult.data = null;
return objJsonResult;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -1503,8 +1527,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -1523,8 +1547,8 @@
//鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBill_Close", 1, false, user))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
objJsonResult.data = null;
return objJsonResult;
@@ -1532,8 +1556,8 @@
if (string.IsNullOrWhiteSpace(HInterID))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "HInterID涓虹┖锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -1544,7 +1568,7 @@
oCN.BeginTran();//寮�濮嬩簨鍔�
//Type 1 鍏抽棴 2 鍙嶅叧闂�
- if (Type == 1)
+ if (Type == TypeConstant.CLOSED)
{
//鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍏抽棴
DataSet ds;
@@ -1552,8 +1576,8 @@
ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
objJsonResult.data = null;
return objJsonResult;
@@ -1562,16 +1586,16 @@
{
if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
objJsonResult.data = null;
return objJsonResult;
}
if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴!";
objJsonResult.data = null;
return objJsonResult;
@@ -1579,8 +1603,8 @@
if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴!";
objJsonResult.data = null;
return objJsonResult;
@@ -1588,8 +1612,8 @@
//鍏抽棴鍗曟嵁
if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
{
- objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -1606,24 +1630,24 @@
{
if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
objJsonResult.data = null;
return objJsonResult;
}
if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜鍏抽棴!";
objJsonResult.data = null;
return objJsonResult;
}
if (ds.Tables[0].Rows[0]["HCloseMan"] == null || ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸啀鍙嶅叧闂�!";
objJsonResult.data = null;
return objJsonResult;
@@ -1631,8 +1655,8 @@
//鍙嶅叧闂崟鎹�
if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
{
- objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -1642,8 +1666,8 @@
oCN.Commit();//鎻愪氦浜嬪姟
- objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鎵ц鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult; ;
@@ -1651,8 +1675,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -1680,8 +1704,8 @@
//妫�鏌ユ潈闄�
if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "琛屽叧闂け璐ワ紒鏃犳潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
@@ -1689,8 +1713,8 @@
//HInterID鏁版嵁鍒ゆ柇
if (HInterID <= 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "HInterID灏忎簬0锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -1705,24 +1729,26 @@
{
if (oBill.omodel.HDeleteMan.Trim() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜琛屽叧闂紒";
objJsonResult.data = null;
return objJsonResult;
}
+
if (oBill.omodel.HCloseMan.Trim() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘杩涜琛屽叧闂紒";
objJsonResult.data = null;
return objJsonResult;
}
+
if (oBill.omodel.HChecker.Trim() == "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶈兘杩涜琛屽叧闂紒";
objJsonResult.data = null;
return objJsonResult;
@@ -1732,29 +1758,29 @@
ds = oCN.RunProcReturn(sql, "Cg_POOrderBillSub");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "璇ヨ鏁版嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
- if (IsAudit == 0) //琛屽叧闂垽鏂�
+ if (IsAudit == TypeConstant.LINE_CLOSED) //琛屽叧闂垽鏂�
{
if (ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "琛屽凡鍏抽棴!涓嶈兘鍐嶆琛屽叧闂紒";
objJsonResult.data = null;
return objJsonResult;
}
}
- if (IsAudit == 1) //琛屽弽鍏抽棴鍒ゆ柇
+ if (IsAudit == TypeConstant.REVERSE_LINE_CLOSED) //琛屽弽鍏抽棴鍒ゆ柇
{
if (ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim() == "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "琛屾湭鍏抽棴!涓嶉渶瑕佸啀琛屽弽鍏抽棴锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -1764,8 +1790,8 @@
string temp = ds.Tables[0].Rows[0]["HCloseType"].ToString();
if (ds.Tables[0].Rows[0]["HCloseType"].ToString() == "False")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "琛屽弽鍏抽棴澶辫触!琛屼负鑷姩鍏抽棴锛屼笉鑳借繘琛屾墜鍔ㄥ弽鍏抽棴锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -1774,8 +1800,8 @@
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -1783,41 +1809,41 @@
//杩涜闇�瑕佽繘琛岀殑琛屽叧闂�/琛屽弽鍏抽棴鎿嶄綔
- if (IsAudit == 0) //琛屽叧闂彁浜�
+ if (IsAudit == TypeConstant.LINE_CLOSED) //琛屽叧闂彁浜�
{
//琛屽叧闂彁浜�
if (oBill.CloseRow(lngBillKey, HEntryID, oBill.omodel.HBillNo, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "琛屽叧闂垚鍔�";
objJsonResult.data = null;
return objJsonResult;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "琛屽叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
}
}
- if (IsAudit == 1) //琛屽弽鍏抽棴鎻愪氦
+ if (IsAudit == TypeConstant.REVERSE_LINE_CLOSED) //琛屽弽鍏抽棴鎻愪氦
{
//琛屽弽鍏抽棴鎻愪氦
if (oBill.CancelRow(lngBillKey, HEntryID, oBill.omodel.HBillNo, CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鍙嶅叧闂垚鍔�";
objJsonResult.data = null;
return objJsonResult;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -1827,8 +1853,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍏抽棴澶辫触鎴栬�呭弽鍏抽棴澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -1846,8 +1872,8 @@
//鍒ゆ柇鏄惁鏈変綔搴熸潈闄�
if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBill_Drop", 1, false, user))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鏃犳潈闄愪綔搴�!";
objJsonResult.data = null;
return objJsonResult;
@@ -1855,8 +1881,8 @@
if (string.IsNullOrWhiteSpace(HInterID))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "HInterID涓虹┖锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -1867,7 +1893,7 @@
oCN.BeginTran();//寮�濮嬩簨鍔�
//Type 1 浣滃簾 2 鍙嶄綔搴�
- if (Type == 1)
+ if (Type == TypeConstant.INVALID)
{
//鍒ゆ柇鍗曟嵁鏄惁宸茬粡浣滃簾
DataSet ds;
@@ -1875,8 +1901,8 @@
ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
objJsonResult.data = null;
return objJsonResult;
@@ -1885,24 +1911,24 @@
{
if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
objJsonResult.data = null;
return objJsonResult;
}
if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶉渶瑕佸啀浣滃簾!";
objJsonResult.data = null;
return objJsonResult;
}
if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() == "6" )
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鍦ㄥ鏍镐腑!涓嶈兘杩涜浣滃簾!";
objJsonResult.data = null;
return objJsonResult;
@@ -1910,8 +1936,8 @@
//浣滃簾鍗曟嵁
if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
{
- objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -1928,24 +1954,24 @@
{
if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
objJsonResult.data = null;
return objJsonResult;
}
if (ds.Tables[0].Rows[0]["HDeleteMan"] == null || ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸啀鍙嶄綔搴�!";
objJsonResult.data = null;
return objJsonResult;
}
if (ds.Tables[0].Rows[0]["HBillStatus"].ToString() == "6")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鍦ㄥ鏍镐腑!涓嶈兘杩涜浣滃簾!";
objJsonResult.data = null;
return objJsonResult;
@@ -1953,8 +1979,8 @@
//鍙嶄綔搴熷崟鎹�
if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
{
- objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -1964,8 +1990,8 @@
oCN.Commit();//鎻愪氦浜嬪姟
- objJsonResult.code = "0";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鎵ц鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult; ;
@@ -1973,8 +1999,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -2002,8 +2028,8 @@
DataSet DS = oCn.RunProcReturn("exec h_p_WMS_ERPSourceBillToLocal '" + BillNo + "','" + BillType + "'", "h_p_WMS_ERPSourceBillToLocal");
if (DS == null)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鍚屾澶辫触";
objJsonResult.data = null;
return objJsonResult;
@@ -2012,16 +2038,16 @@
{
if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HBack"]) == "2")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "ERP涓笉瀛樺湪璇ュ崟鎹彿";
objJsonResult.data = null;
return objJsonResult;
}
else
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鍗曟嵁鍚屾鎴愬姛";
objJsonResult.data = null;
return objJsonResult;
@@ -2031,8 +2057,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -2055,8 +2081,8 @@
//鍒ゆ柇鏄惁鐧诲綍鎴愬姛
if (isSuccess < 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = loginRet;
objJsonResult.data = null;
return objJsonResult;
@@ -2067,8 +2093,8 @@
//鍒ゆ柇鏁版嵁鏄惁鑾峰彇鎴愬姛
if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "閲戣澏閲囪喘璁㈠崟鍚屾澶辫触jsonRoot锛�" + _result;
objJsonResult.data = null;
return objJsonResult;
@@ -2276,8 +2302,8 @@
}
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鍗曟嵁鍚屾鎴愬姛锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -2287,8 +2313,8 @@
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁璇诲彇澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -2307,16 +2333,16 @@
ds = oCN.RunProcReturn("select * from h_v_IF_POOrderBillList where hmainid =" + HInterID + " and hsubid = " + HSubID, "h_v_IF_POOrderBillList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鏈煡璇㈠埌婧愬崟淇℃伅锛�";
objJsonResult.data = null;
return objJsonResult;
}
else
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
@@ -2324,8 +2350,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -2345,8 +2371,8 @@
if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
objJsonResult.data = null;
return objJsonResult;
@@ -2366,8 +2392,8 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
@@ -2375,8 +2401,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -2397,8 +2423,8 @@
if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
objJsonResult.data = null;
return objJsonResult;
@@ -2416,8 +2442,8 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
@@ -2425,8 +2451,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -2449,8 +2475,8 @@
{
if (oBill.omodel.HBillStatus != 6)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁鏈湪瀹℃牳涓笉鑳介┏鍥�";
objJsonResult.data = null;
return objJsonResult;
@@ -2458,16 +2484,16 @@
//鍙戣捣椹冲洖
if (oBill.RejectCheckFlowProgress(lngBillKey, oBill.omodel.HBillNo,CurUserID, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "椹冲洖鎴愬姛";
objJsonResult.data = null;
return objJsonResult;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "椹冲洖澶辫触澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -2475,8 +2501,8 @@
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -2486,8 +2512,8 @@
catch (Exception e)
{
oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -2516,8 +2542,8 @@
//HInterID鏁版嵁鍒ゆ柇
if (HInterID <= 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "HInterID灏忎簬0锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -2531,16 +2557,16 @@
//鍙戣捣瀹℃壒
if (oBill.startCheckFlow(lngBillKey,ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鍙戣捣瀹℃壒鎴愬姛";
objJsonResult.data = null;
return objJsonResult;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙戣捣瀹℃壒澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -2548,8 +2574,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙戣捣瀹℃壒澶辫触澶辫触锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -2586,8 +2612,8 @@
//HInterID鏁版嵁鍒ゆ柇
if (HInterID <= 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "HInterID灏忎簬0锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -2603,30 +2629,30 @@
{
if (oBill.omodel.HCloseMan.Trim() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
objJsonResult.data = null;
return objJsonResult;
}
if (oBill.omodel.HDeleteMan.Trim() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
objJsonResult.data = null;
return objJsonResult;
}
- if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ if (IsAudit == TypeConstant.AUDIT) //瀹℃牳鍒ゆ柇
{
//鍒ゆ柇鏄惁宸茬粡鍙戣捣瀹℃壒
string sql0 = "select * from Xt_BillCheckFlowStatus where HBillInterID = " + lngBillKey + " and HBillTypeID = '" + oBill.BillType + "'";
DataSet ds0 = oCN.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
if (ds0 != null && ds0.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:鍗曟嵁鏈彂璧峰鎵癸紒";
objJsonResult.data = null;
return objJsonResult;
@@ -2635,22 +2661,22 @@
//鍒ゆ柇鍗曟嵁褰撳墠鐘舵��
if (oBill.omodel.HChecker.Trim() != "")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:鍗曟嵁宸插畬鎴愬鏍�!涓嶈兘缁х画瀹℃牳锛�";
objJsonResult.data = null;
return objJsonResult;
}
}
- if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ if (IsAudit == TypeConstant.REVERSE_AUDIT) //鍙嶅鏍稿垽鏂�
{
//鍒ゆ柇鏄惁瀛樺湪瀹℃牳杩囩殑椤圭洰
string sql0 = "select * from Xt_BillCheckFlowStatus where HBillInterID = " + lngBillKey + " and HBillTypeID = '" + oBill.BillType + "' and ISNULL(HChecker,'') <> ''";
DataSet ds0 = oCN.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
if (ds0 != null && ds0.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍗曟嵁涓嶅瓨鍦ㄥ凡缁忓鏍哥殑椤圭洰锛侊紒";
objJsonResult.data = null;
return objJsonResult;
@@ -2659,8 +2685,8 @@
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
return objJsonResult;
@@ -2669,7 +2695,7 @@
oCN.BeginTran();
//杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣�
- if (IsAudit == 0) //瀹℃牳鎻愪氦
+ if (IsAudit == TypeConstant.AUDIT) //瀹℃牳鎻愪氦
{
#region 瀹℃牳鍓嶇殑鐩稿叧鍒ゆ柇
//瀹℃牳鍓嶆帶鍒�=========================================
@@ -2719,8 +2745,8 @@
DataSet ds01 = oCN.RunProcReturn(sql01, "Xt_CheckUserRight");
if (ds01.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:鐢ㄦ埛鏃犲綋鍓嶅鏍搁」鐩殑瀹℃牳鏉冮檺锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -2764,8 +2790,8 @@
oCN.RunProc(sql04);
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "瀹℃牳鎴愬姛";
objJsonResult.data = null;
}
@@ -2781,15 +2807,15 @@
//鏇存柊鍗曟嵁鐨勫崟鎹姸鎬�
if (oBill.CheckBill(oCN, oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Cg_POOrderBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true)
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "瀹℃牳鎴愬姛";
objJsonResult.data = null;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
@@ -2798,23 +2824,23 @@
}
}
}
- if (IsAudit == 1) //鍙嶅鏍告彁浜�
+ if (IsAudit == TypeConstant.REVERSE_AUDIT) //鍙嶅鏍告彁浜�
{
#region 鍙嶅鏍稿墠鐨勭浉鍏冲垽鏂�
//鍙嶅鏍稿墠鎺у埗=========================================
DataSet ds = oCN.RunProcReturn("Exec h_p_Cg_POOrderBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'", "h_p_Cg_POOrderBill_BeforeUnCheckCtrl");
if (ds == null)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + "鍙嶅鏍稿墠鍒ゆ柇澶辫触锛�";
objJsonResult.data = null;
return objJsonResult;
}
if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
objJsonResult.data = null;
return objJsonResult;
@@ -2842,8 +2868,8 @@
DataSet ds0 = oCN.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
if (ds0 == null || ds0.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鏈彂璧峰鎵癸紒";
objJsonResult.data = null;
return objJsonResult;
@@ -2883,8 +2909,8 @@
DataSet ds01 = oCN.RunProcReturn(sql01, "Xt_CheckUserRight");
if (ds01.Tables[0].Rows.Count == 0)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鐢ㄦ埛鏃犲綋鍓嶅鏍搁」鐩殑瀹℃牳鏉冮檺锛�";
objJsonResult.data = null;
return objJsonResult;
@@ -2903,8 +2929,8 @@
oCN.RunProc(sql04);
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "瀹℃牳鎴愬姛";
objJsonResult.data = null;
}
@@ -2917,15 +2943,15 @@
//鏇存柊鍗曟嵁涓昏〃鐨勫鎵规祦鏁版嵁
string sql04 = "update " + oBill.MvarItemKey + " set HCheckItemNowID=" + HCheckItemNowID + ",HCheckItemNextID=" + HCheckItemNextID + ",HBillStatus=6 "+" where HInterID = " + lngBillKey;
oCN.RunProc(sql04);
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "鍙嶅鏍告垚鍔�";
objJsonResult.data = null;
}
else
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
objJsonResult.data = null;
@@ -2940,8 +2966,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
objJsonResult.data = null;
@@ -2963,8 +2989,8 @@
if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
objJsonResult.data = null;
return objJsonResult;
@@ -2989,8 +3015,8 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
@@ -2998,8 +3024,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
@@ -3019,8 +3045,8 @@
if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
objJsonResult.data = null;
return objJsonResult;
@@ -3037,8 +3063,8 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- objJsonResult.code = "1";
- objJsonResult.count = 1;
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = columnNameList;
@@ -3046,8 +3072,8 @@
}
catch (Exception e)
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
diff --git a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
index 5aa6438..cca61bc 100644
--- a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
@@ -239,6 +239,31 @@
{
bResult = false;
}
+
+ //鑷姩瀹℃牳璁剧疆
+ if (refSav == "Add")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Cg_PayableBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+ else if (refSav == "Update")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ objJsonResult.Verify = "N";
+ }
+
if (bResult)
{
objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
index 450b8b3..57f802d 100644
--- a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
+++ b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
@@ -15,6 +15,8 @@
//閲囪喘鍏ュ簱鍗旵ontroller
public class Kf_POStockInBillController : ApiController
{
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
//public DAL.ClsCg_POInStockBill BillOld = new DAL.ClsCg_POInStockBill();
public DAL.ClsKf_POStockInBill BillOld = new DAL.ClsKf_POStockInBill();
@@ -277,6 +279,30 @@
//閲囪喘鍏ュ簱鍗曟柊澧炲洖濉敹鏂欓�氱煡鍗曞叧鑱旀暟閲�
oCN.RunProc("exec h_p_Cg_UpDateRelation_POInStockToPOStockIn_Add " + HInterID);
+ //鑷姩瀹℃牳璁剧疆
+ if ((OperationType == 1 || OperationType == 2 || OperationType == 4))
+ {
+ objJsonResult.HInterID = HInterID.ToString(); //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Kf_POStockInBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+ else if (OperationType == 3)
+ {
+ objJsonResult.HInterID = HInterID.ToString(); //杩斿洖涓籌D
+ objJsonResult.Verify = "N";
+ }
+
if (objJsonResult.code == "0")
{
diff --git a/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs b/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
index 9267506..e707ccb 100644
--- a/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
+++ b/WebAPI/Controllers/CGGL/YF_PayMentBillController.cs
@@ -284,6 +284,31 @@
{
bResult = false;
}
+
+ //鑷姩瀹℃牳璁剧疆
+ if (refSav == "Add")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.YF_PayMentBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+ else if (refSav == "Update")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ objJsonResult.Verify = "N";
+ }
+
if (bResult)
{
objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
index 5cdf611..28e33cc 100644
--- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
+++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -1065,7 +1065,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
string sql = string.Format(@"exec h_p_Sc_GetProcessExchangeBillSubTech ");
- ds = oCN.RunProcReturn(sql + HInterID, "h_p_Sc_GetProcessExchangeBillSubTech");
+ ds = oCN.RunProcReturn(sql + " '" + HInterID + "'", "h_p_Sc_GetProcessExchangeBillSubTech");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -2083,18 +2083,24 @@
DateTime dt = DateTime.Now;
string sql = "";
+ Int64 HInterID = 0;
string HBillNo = "";
Int64 HICMOInterID = 0;
Int64 HICMOEntryID = 0;
string HICMOBillNo = "";
double HQty = 0;
+ double HProQty = 0;
+
foreach (Model.ClsSc_ProcessExchangeBillSub_BatchSplit oItemSub in ls)
{
- HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("3772", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("3772", ref DBUtility.ClsPub.sExeReturnInfo, true);
+ HInterID = oItemSub.HInterID;
+ HBillNo = oItemSub.HBillNo;
HICMOInterID = oItemSub.HICMOInterID;
HICMOEntryID = oItemSub.HICMOEntryID;
HICMOBillNo = oItemSub.HICMOBillNo;
HQty = oItemSub.HQty;
+ HProQty = oItemSub.HProQty;
sql = "select * from h_v_Sc_ProcessExchangeBill_BatchSplit where hmainid = " + oItemSub.HICMOInterID + " and hentryid = "
+ oItemSub.HICMOEntryID;
@@ -2102,6 +2108,7 @@
//涓昏〃璧嬪��
if (ds.Tables[0].Rows.Count > 0 && ds != null)
{
+ oBill.omodel.HInterID = HInterID;
oBill.omodel.HBillNo = HBillNo;
oBill.omodel.HBillSubType = "3772";
oBill.omodel.HMainSourceBillSubType = "3710";
@@ -2112,7 +2119,7 @@
oBill.omodel.HYear = DBUtility.ClsPub.isLong(oItemSub.HDate.Year);
oBill.omodel.HPeriod = DBUtility.ClsPub.isLong(oItemSub.HDate.Month);
oBill.omodel.HRemark = "";
- oBill.omodel.HBatchNo = "";
+ oBill.omodel.HBatchNo = oItemSub.HBatchNo;
oBill.omodel.HMainMaterID = 0;
oBill.omodel.HKeyMaterID = 0;
oBill.omodel.HNo = 0;
@@ -2205,7 +2212,7 @@
oBill.omodel.HRemark_New = "";
oBill.omodel.HWeight_New = 0;
oBill.omodel.HPlanOrderProcNo = ds.Tables[0].Rows[0]["HPlanOrderProcNo"].ToString();
- oBill.omodel.HMouldNum = "0";
+ oBill.omodel.HMouldNum = "0";
}
//瀛愯〃璧嬪��
for(int i = 0; i < ds.Tables[0].Rows.Count; i++)
@@ -2239,7 +2246,7 @@
oItemSubs.HWorkerID = 0;
oItemSubs.HWorkerNumber = "";
oItemSubs.HSourceID = 0;
- oItemSubs.HQty = HQty;
+ oItemSubs.HQty = HProQty;
oItemSubs.HTimeUnit = "";
oItemSubs.HPlanWorkTimes = 0;
oItemSubs.HPlanBeginDate = Convert.ToDateTime(dt.ToShortDateString().ToString());
diff --git a/WebAPI/Controllers/POStockInBillController.cs b/WebAPI/Controllers/POStockInBillController.cs
index 8c671f1..9dcce14 100644
--- a/WebAPI/Controllers/POStockInBillController.cs
+++ b/WebAPI/Controllers/POStockInBillController.cs
@@ -5335,9 +5335,11 @@
string sql = string.Empty;
if (FCusName.Contains("瀹夌憺"))
sql = $"select top 1 HItemID,HSourceBillNo,HQty,HSourceInterID,HSourceEntryID from Gy_BarCodeBill where HSourceInterID =(select distinct HSourceInterID from Cg_POInStockBillSub where HInterID ={HInterID}) and HBarCode = '{HBarcode}' and HBarCodeType ='绠卞彿鍐呮潯鐮�'";
+ else if(FCusName.Contains("娣诲悍绉戞妧"))
+ sql = $"select top 1 HItemID,HSourceBillNo,HQty,HSourceInterID,HSourceEntryID,HMaterID,HBatchNo,HProduceDate,HExpiryDate from Gy_BarCodeBill where HSourceInterID = {HInterID} and HBarCode = '{HBarcode}' and HBarCodeType ='绠卞彿鍐呮潯鐮�'";
else
sql = $"select HItemID,HSourceBillNo,HQty,HSourceInterID,HSourceEntryID from Gy_BarCodeBill where HSourceInterID ={HInterID} and HBarCode = '{HBarcode.Split('#')[0]}' and HQty = {HBarcode.Split('#')[1]}";
- DataSet ds = oCn.RunProcReturn(sql, "H_v_SRM_POOrderBillList");
+ DataSet ds = oCn.RunProcReturn(sql, "Gy_BarCodeBill");
if (ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
index e966cf1..d66ac75 100644
--- a/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
+++ b/WebAPI/Controllers/XSGL/Kf_SellOutBillController.cs
@@ -387,6 +387,30 @@
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
}
+ //鑷姩瀹℃牳璁剧疆
+ if (Convert.ToInt32(OperationType) == 1 || Convert.ToInt32(OperationType) == 4)
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Kf_SellOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ objJsonResult.Verify = "N";
+ }
+
if (bResult)
{
objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs b/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
index 6c85f51..207a01f 100644
--- a/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
@@ -257,6 +257,31 @@
{
bResult = false;
}
+
+ //鑷姩瀹℃牳璁剧疆
+ if (refSav == "Add")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Xs_ReceivableBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+ else if (refSav == "Update")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ objJsonResult.Verify = "N";
+ }
+
if (bResult)
{
objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index 5c5ebd7..b8b96a0 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -1336,6 +1336,31 @@
{
bResult = false;
}
+
+ //鑷姩瀹℃牳璁剧疆
+ if (refSav == "Add")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Xs_SeOrderBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+ else if (refSav == "Update")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ objJsonResult.Verify = "N";
+ }
+
if (bResult)
{
objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
index 3edc204..c0695ec 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
@@ -430,6 +430,30 @@
//鍙戣揣閫氱煡鐨� 鍙嶅啓 鏁伴噺鍒� 閿�鍞鍗� 鍏宠仈鏁伴噺
oCN.RunProcReturn("exec h_p_Xs_SeOutStockBillMain " + HInterID, "h_p_Xs_SeOutStockBillMain");
+ //鑷姩瀹℃牳璁剧疆
+ if ((OperationType == 1 || OperationType == 2))
+ {
+ objJsonResult.HInterID = HInterID.ToString(); //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Xs_SeOutStockBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+ else if (OperationType == 3)
+ {
+ objJsonResult.HInterID = HInterID.ToString(); //杩斿洖涓籌D
+ objJsonResult.Verify = "N";
+ }
+
//淇濆瓨鍚庢帶鍒�=========================================
ds = oCN.RunProcReturn("Exec h_p_Xs_SeOutStockBill_AfterSaveCtrl " + HInterID.ToString() + ", '" + HBillNo + "',1 ", "h_p_Xs_SeOutStockBill_AfterSaveCtrl");
diff --git a/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs b/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
index be4b46e..23437b0 100644
--- a/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
+++ b/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
@@ -244,6 +244,31 @@
{
bResult = false;
}
+
+ //鑷姩瀹℃牳璁剧疆
+ if (refSav == "Add")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.YS_ReceiveBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+ else if (refSav == "Update")
+ {
+ objJsonResult.HInterID = oBill.omodel.HInterID.ToString(); //杩斿洖涓籌D
+ objJsonResult.Verify = "N";
+ }
+
if (bResult)
{
objJsonResult.code = "0";
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_StockCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_StockCheckBillController.cs"
index 545f8e5..f42f5ca 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_StockCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\345\272\223\345\255\230\346\243\200\351\252\214\345\215\225/QC_StockCheckBillController.cs"
@@ -24,6 +24,46 @@
//鑾峰彇绯荤粺鍙傛暟
Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+
+ #region 搴撳瓨妫�楠屽崟鍒楄〃鏌ヨ 鍙樉绀轰富琛�
+ [Route("QC_StockCheckBill/QC_StockCheckBillListMain")]
+ [HttpGet]
+ public object QC_StockCheckBillListMain(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ string sql1 = "select * from h_v_QC_StockCheckBillList where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_QC_StockCheckBillList");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 搴撳瓨妫�楠屽崟鍒楄〃 涓� 缂栬緫鍥炴樉
[Route("QC_StockCheckBill/QC_StockCheckBillList")]
[HttpGet]
diff --git a/WebAPI/DLL/ClsGy_Material_Ctl.cs b/WebAPI/DLL/ClsGy_Material_Ctl.cs
index 35045bb..850658e 100644
--- a/WebAPI/DLL/ClsGy_Material_Ctl.cs
+++ b/WebAPI/DLL/ClsGy_Material_Ctl.cs
@@ -28,7 +28,9 @@
",HSALEUNITID,HSALEPRICEUNITID,HBASEUNITID,HSTOREUNITID,HCHECKINCOMING,HCHECKPRODUCT,HPERUNITSTANDHOUR" +
",HSTDLABORPREPARETIME,HSTDMACHINEPREPARETIME,HWidth,HWeight,HColorRemark,HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol" +
",HMaterRuleType,HColorNo,HPieceMaxQty,HCommonUseFlag,HAvgStockPrice,HFootPrice,HTaxCost,HNoTaxCost,HOnceRightRate" +
- ",HHeight_M,HInches_M,HAl1Long_M,HDensity_M,HTela_M,HUnderTela_M,HSizing_M,HQtyDec,HPriceDec,HMoneyDec,HTaxRate,HProfitRate,HProjectBillMainID,HDivisionID" +
+ ",HHeight_M,HInches_M,HAl1Long_M,HDensity_M,HTela_M,HUnderTela_M,HSizing_M,HQtyDec,HPriceDec,HMoneyDec,HTaxRate,HProfitRate" +
+ ",HLotcardQty" +
+ ",HProjectBillMainID,HDivisionID" +
") " +
" Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
diff --git a/WebAPI/Models/ClsGy_Material_Model.cs b/WebAPI/Models/ClsGy_Material_Model.cs
index 8aad191..74094c4 100644
--- a/WebAPI/Models/ClsGy_Material_Model.cs
+++ b/WebAPI/Models/ClsGy_Material_Model.cs
@@ -105,6 +105,8 @@
public double HProfitRate; // 榛樿鍒╂鼎鐜囷紙榛樿0锛�
public int HProjectBillMainID; //椤圭洰鍙�
+
+ public double HLotcardQty; //鍗曚釜娴佽浆鍗℃暟閲�
public int HDivisionID; //浜嬩笟閮�
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user
index 3c9172a..f7b2698 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile4.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2024-08-29T06:09:50.8550254Z;True|2024-08-29T13:49:07.5650071+08:00;False|2024-08-29T13:48:47.9488618+08:00;True|2024-08-28T14:22:07.6272011+08:00;True|2024-08-28T14:17:25.6731515+08:00;False|2024-08-28T14:16:54.5301670+08:00;</History>
+ <History>True|2024-09-03T03:23:27.0281234Z;False|2024-09-03T11:22:44.5753752+08:00;True|2024-08-29T14:09:50.8550254+08:00;True|2024-08-29T13:49:07.5650071+08:00;False|2024-08-29T13:48:47.9488618+08:00;True|2024-08-28T14:22:07.6272011+08:00;True|2024-08-28T14:17:25.6731515+08:00;False|2024-08-28T14:16:54.5301670+08:00;</History>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>08/28/2024 14:17:08</publishTime>
+ <publishTime>09/03/2024 11:22:58</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/28/2024 14:17:08</publishTime>
+ <publishTime>09/03/2024 11:22:58</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/28/2024 14:17:06</publishTime>
+ <publishTime>09/03/2024 11:22:56</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/28/2024 14:17:06</publishTime>
+ <publishTime>09/03/2024 11:22:56</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/23/2024 14:37:15</publishTime>
+ <publishTime>09/03/2024 11:22:53</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/23/2024 14:37:15</publishTime>
+ <publishTime>09/03/2024 11:22:53</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>08/23/2024 14:37:16</publishTime>
+ <publishTime>09/03/2024 11:22:54</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/23/2024 14:37:16</publishTime>
+ <publishTime>09/03/2024 11:22:54</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/06/2023 15:57:04</publishTime>
@@ -147,28 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>08/23/2024 14:37:13</publishTime>
+ <publishTime>09/03/2024 11:22:51</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/23/2024 14:37:13</publishTime>
+ <publishTime>09/03/2024 11:22:51</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/23/2024 14:37:14</publishTime>
+ <publishTime>09/03/2024 11:22:52</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/23/2024 14:37:14</publishTime>
+ <publishTime>09/03/2024 11:22:52</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/23/2024 14:37:14</publishTime>
+ <publishTime>09/03/2024 11:22:52</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/23/2024 14:37:14</publishTime>
+ <publishTime>09/03/2024 11:22:52</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.dll">
+ <publishTime>09/03/2024 11:22:50</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.pdb">
+ <publishTime>09/03/2024 11:22:50</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -279,22 +285,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>08/23/2024 10:42:15</publishTime>
+ <publishTime>09/03/2024 11:22:53</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>08/23/2024 10:42:15</publishTime>
+ <publishTime>09/03/2024 11:22:53</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/29/2024 13:49:02</publishTime>
+ <publishTime>09/03/2024 11:23:20</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/29/2024 13:49:02</publishTime>
+ <publishTime>09/03/2024 11:23:20</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>08/29/2024 13:49:06</publishTime>
+ <publishTime>09/03/2024 11:23:24</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index a76a891..196112c 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2024-08-26T02:17:08.7733750Z;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
+ <History>True|2024-09-05T00:14:13.2359921Z;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
<_PublishTargetUrl>G:\issWeb\缃戠珯鍙戝竷\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>08/26/2024 10:16:57</publishTime>
+ <publishTime>09/05/2024 08:13:34</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/26/2024 10:16:57</publishTime>
+ <publishTime>09/05/2024 08:13:34</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/26/2024 10:16:54</publishTime>
+ <publishTime>09/05/2024 08:13:30</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/26/2024 10:16:54</publishTime>
+ <publishTime>09/05/2024 08:13:30</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/26/2024 10:16:44</publishTime>
+ <publishTime>09/05/2024 08:13:23</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/26/2024 10:16:44</publishTime>
+ <publishTime>09/05/2024 08:13:23</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>08/26/2024 10:16:47</publishTime>
+ <publishTime>09/05/2024 08:13:25</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/26/2024 10:16:47</publishTime>
+ <publishTime>09/05/2024 08:13:25</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,28 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>08/26/2024 10:16:41</publishTime>
+ <publishTime>09/05/2024 08:13:21</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/26/2024 10:16:41</publishTime>
+ <publishTime>09/05/2024 08:13:21</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/26/2024 10:16:43</publishTime>
+ <publishTime>09/05/2024 08:13:22</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/26/2024 10:16:43</publishTime>
+ <publishTime>09/05/2024 08:13:22</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/26/2024 10:16:43</publishTime>
+ <publishTime>09/05/2024 08:13:22</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/26/2024 10:16:43</publishTime>
+ <publishTime>09/05/2024 08:13:22</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.dll">
+ <publishTime>09/05/2024 08:09:41</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.pdb">
+ <publishTime>09/05/2024 08:09:41</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -279,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>08/26/2024 10:09:15</publishTime>
+ <publishTime>09/05/2024 08:10:10</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>08/26/2024 10:09:15</publishTime>
+ <publishTime>09/05/2024 08:10:15</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/26/2024 10:17:06</publishTime>
+ <publishTime>09/05/2024 08:14:11</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/26/2024 10:17:06</publishTime>
+ <publishTime>09/05/2024 08:14:11</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
@@ -489,7 +495,7 @@
<publishTime>04/29/2024 08:30:03</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/26/2024 10:17:07</publishTime>
+ <publishTime>08/29/2024 08:06:26</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 0b0c1a7..0910a4e 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -22,7 +22,7 @@
<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
<!--<add key="FileIP" value="http://localhost:8080/" />-->
<!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/> -->
- <add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx" /><!--棰滃彴寮忔満-->
+ <!--<add key="sUrl" value="http://192.168.0.11/WEBS-WMS/WebService1.asmx" />--><!--棰滃彴寮忔満-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> 澶忓疂-->
<!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->
<!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/> 鍗氭棩绉戞妧-->
@@ -35,7 +35,7 @@
<!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--娴嬭瘯鏈嶅姟鍣�-->
<!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> 鏈湴-->
<!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�-->
- <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx"/>--> <!--缈佹稕娑涙湰鍦伴厤缃�-->
+ <add key="surl" value="http://localhost/webs-web/webservice1.asmx"/> <!--缈佹稕娑涙湰鍦伴厤缃�-->
<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵-->
<!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--鏂帿灏�-->
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 6e75247..2534a00 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -1246,6 +1246,10 @@
<Project>{0a4ef483-d8d3-49a5-8378-974ef7993365}</Project>
<Name>SQLHelper</Name>
</ProjectReference>
+ <ProjectReference Include="..\SyntacticSugar\SyntacticSugar.csproj">
+ <Project>{AFD44036-A391-4A68-BD73-37BABFC1605E}</Project>
+ <Name>SyntacticSugar</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<WebReferenceUrl Include="http://192.168.0.81/WEBS-WMS/WebService1.asmx">
diff --git a/WorkM/bin/Release/BLL.dll b/WorkM/bin/Release/BLL.dll
index 6f5fe90..e040529 100644
--- a/WorkM/bin/Release/BLL.dll
+++ b/WorkM/bin/Release/BLL.dll
Binary files differ
diff --git a/WorkM/bin/Release/BLL.pdb b/WorkM/bin/Release/BLL.pdb
index ff491af..44e26bc 100644
--- a/WorkM/bin/Release/BLL.pdb
+++ b/WorkM/bin/Release/BLL.pdb
Binary files differ
diff --git a/WorkM/bin/Release/DAL.dll b/WorkM/bin/Release/DAL.dll
index d2ca7bb..8f700e4 100644
--- a/WorkM/bin/Release/DAL.dll
+++ b/WorkM/bin/Release/DAL.dll
Binary files differ
diff --git a/WorkM/bin/Release/DAL.pdb b/WorkM/bin/Release/DAL.pdb
index 9445526..6d1ccd1 100644
--- a/WorkM/bin/Release/DAL.pdb
+++ b/WorkM/bin/Release/DAL.pdb
Binary files differ
diff --git a/WorkM/bin/Release/DBUtility.dll b/WorkM/bin/Release/DBUtility.dll
index cefc8d8..5b87731 100644
--- a/WorkM/bin/Release/DBUtility.dll
+++ b/WorkM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/WorkM/bin/Release/DBUtility.pdb b/WorkM/bin/Release/DBUtility.pdb
index f43463e..518c835 100644
--- a/WorkM/bin/Release/DBUtility.pdb
+++ b/WorkM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/WorkM/bin/Release/Model.dll b/WorkM/bin/Release/Model.dll
index f101700..4a23b0f 100644
--- a/WorkM/bin/Release/Model.dll
+++ b/WorkM/bin/Release/Model.dll
Binary files differ
diff --git a/WorkM/bin/Release/Model.pdb b/WorkM/bin/Release/Model.pdb
index 55a5dca..8953e00 100644
--- a/WorkM/bin/Release/Model.pdb
+++ b/WorkM/bin/Release/Model.pdb
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Class.dll b/WorkM/bin/Release/Pub_Class.dll
index 81c2807..5997e36 100644
--- a/WorkM/bin/Release/Pub_Class.dll
+++ b/WorkM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Class.pdb b/WorkM/bin/Release/Pub_Class.pdb
index ed9a4e7..d89d437 100644
--- a/WorkM/bin/Release/Pub_Class.pdb
+++ b/WorkM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Control.dll b/WorkM/bin/Release/Pub_Control.dll
index d61866b..f248499 100644
--- a/WorkM/bin/Release/Pub_Control.dll
+++ b/WorkM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Control.pdb b/WorkM/bin/Release/Pub_Control.pdb
index a3856a6..2cea39d 100644
--- a/WorkM/bin/Release/Pub_Control.pdb
+++ b/WorkM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/WorkM/bin/Release/SQLHelper.dll b/WorkM/bin/Release/SQLHelper.dll
index 7d4eea1..62d34b5 100644
--- a/WorkM/bin/Release/SQLHelper.dll
+++ b/WorkM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/WorkM/bin/Release/SQLHelper.pdb b/WorkM/bin/Release/SQLHelper.pdb
index ab1f540..103d9f2 100644
--- a/WorkM/bin/Release/SQLHelper.pdb
+++ b/WorkM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/WorkM/bin/Release/WarM.dll b/WorkM/bin/Release/WarM.dll
index a7f7373..5984e38 100644
--- a/WorkM/bin/Release/WarM.dll
+++ b/WorkM/bin/Release/WarM.dll
Binary files differ
diff --git a/WorkM/bin/Release/WarM.pdb b/WorkM/bin/Release/WarM.pdb
index 2257290..04facf2 100644
--- a/WorkM/bin/Release/WarM.pdb
+++ b/WorkM/bin/Release/WarM.pdb
Binary files differ
diff --git a/WorkM/bin/Release/WorkM.dll b/WorkM/bin/Release/WorkM.dll
index a87a7d5..6e45f3f 100644
--- a/WorkM/bin/Release/WorkM.dll
+++ b/WorkM/bin/Release/WorkM.dll
Binary files differ
diff --git a/WorkM/bin/Release/WorkM.pdb b/WorkM/bin/Release/WorkM.pdb
index 9c0158b..4a1a574 100644
--- a/WorkM/bin/Release/WorkM.pdb
+++ b/WorkM/bin/Release/WorkM.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 7641e45..e0d88d2 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
index ab63026..dbc5280 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
index 2982c4e..1f9fd0c 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
index 4e59507..c2f91de 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index 2d0fc15..559e9aa 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -4,3 +4,15 @@
D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache
new file mode 100644
index 0000000..6bd410c
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 7641e45..e0d88d2 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
index ab63026..dbc5280 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..0312216
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..6e32aa3
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -0,0 +1,5 @@
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
new file mode 100644
index 0000000..1f9fd0c
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
new file mode 100644
index 0000000..c2f91de
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1