From b96af6124ac752f85a6bbf17eee2287e059d249d Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期六, 12 十月 2024 15:24:54 +0800
Subject: [PATCH] 1
---
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 5
PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache | 0
PlanM/bin/Release/PlanM.dll | 0
WebAPI/WebAPI.csproj.user | 4
PayM/bin/x86/Debug/Pub_Control.pdb | 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
PayM/bin/x86/Debug/Pub_Control.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.dll | 0
Model/obj/Release/Model.pdb | 0
DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources | 0
APSM/bin/Release/DAL.dll | 0
Model/bin/Release/Pub_Control.dll | 0
PayM/obj/x86/Debug/AxInterop.gregn6Lib.dll | 0
Pub_Control/bin/Release/Pub_Class.pdb | 0
PayM/obj/x86/Debug/PayM.csproj.AssemblyReference.cache | 0
WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user | 81 ++
WebAPI/Controllers/项目管理/工作任务/PM_WorkTaskBillController.cs | 40 +
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs | 60 ++
Pub_Control/bin/Release/Pub_Class.dll | 0
APSM/bin/Release/DAL.pdb | 0
DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources | 0
Pub_Control/bin/Release/Pub_Control.dll | 0
BLL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/SQLHelper.dll | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
APSM/bin/Release/DBUtility.pdb | 0
WorkM/bin/Release/Pub_Class.dll | 0
PayM/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
DAL/bin/Release/SQLHelper.pdb | 0
PayM/obj/x86/Debug/Interop.gregn6Lib.dll | 0
SQLHelper/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.pdb | 0
BLL/bin/Release/DBUtility.dll | 0
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache | 0
WebAPI/Web.config | 8
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
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs | 42 +
Model/obj/Release/Model.dll | 0
BLL/bin/Release/Pub_Class.dll | 0
WorkM/bin/Release/DBUtility.pdb | 0
WebAPI/Controllers/BaseSet/Gy_GroupController.cs | 5
WorkM/bin/Release/DBUtility.dll | 0
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
APSM/bin/Release/Model.dll | 0
PlanM/bin/Release/PlanM.pdb | 0
BLL/bin/Release/Pub_Class.pdb | 0
APSM/bin/Release/Model.pdb | 0
PayM/bin/x86/Debug/SQLHelper.dll | 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 | 17
SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0
DBUtility/bin/Release/Pub_Control.dll | 0
DAL/应收管理/ClsYS_ReceiveBill.cs | 4
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
PayM/bin/x86/Debug/SQLHelper.pdb | 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
PayM/bin/x86/Debug/BLL.dll | 0
DBUtility/bin/Release/DBUtility.pdb | 0
PlanM/bin/Release/BLL.pdb | 0
DBUtility/bin/Release/DBUtility.dll | 0
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 60 ++
WebAPI/Controllers/WebAPIController.cs | 46 +
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
WorkM/bin/Release/BLL.pdb | 0
PayM/bin/x86/Debug/BLL.pdb | 0
WarM/bin/Release/Pub_Class.dll | 0
WarM/bin/Release/Pub_Control.dll | 0
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | 105 +++
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
PayM/obj/Release/PayM.csproj.ResolveComReference.cache | 0
SQLHelper/bin/Release/Pub_Class.pdb | 0
WebAPI/Controllers/LMESController.cs | 306 +++++++++
SQLHelper/bin/Release/Pub_Class.dll | 0
DAL/bin/Release/Pub_Class.pdb | 0
PayM/obj/x86/Debug/PayM.pdb | 0
BaseSet/bin/Release/DAL.pdb | 0
PayM/obj/x86/Debug/PayM.dll | 0
WarM/WarM.csproj | 1
SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache | 1
PayM/bin/x86/Debug/Interop.gregn6Lib.dll | 0
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 9
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 6
BaseSet/bin/Release/DAL.dll | 0
DAL/bin/Release/Pub_Class.dll | 0
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 71 ++
APSM/bin/Release/APSM.pdb | 0
DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources | 0
PayM/bin/x86/Debug/PayM.dll | 0
PayM/bin/x86/Debug/PayM.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user | 497 ++++++++++++++++
APSM/bin/Release/APSM.dll | 0
APSM/bin/Release/SQLHelper.pdb | 0
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
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
PlanM/bin/Release/Pub_Control.pdb | 0
PayM/bin/x86/Debug/Pub_Class.pdb | 0
Model/bin/Release/Pub_Class.pdb | 0
BaseSet/bin/Release/BLL.dll | 0
PayM/bin/x86/Debug/Pub_Class.dll | 0
BaseSet/bin/Release/BaseSet.dll | 0
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 | 1
PayM/bin/x86/Debug/DBUtility.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache | 0
PlanM/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/Pub_Control.pdb | 0
DAL/工资管理/ClsPay_WorkTimesBill.cs | 63 +
PlanM/bin/Release/DAL.dll | 0
Model/bin/Release/DBUtility.pdb | 0
PayM/bin/x86/Debug/DAL.dll | 0
APSM/bin/Release/Pub_Control.pdb | 0
PayM/bin/x86/Debug/DBUtility.pdb | 0
BLL/bin/Release/Pub_Control.dll | 0
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache | 0
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New.cs | 98 ++
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
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
DBUtility/obj/Release/DBUtility.Xt_BillType.resources | 0
Model/bin/Release/Pub_Class.dll | 0
PayM/bin/x86/Debug/DAL.pdb | 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 | 27
APSM/bin/Release/BLL.dll | 0
DAL/bin/Release/DBUtility.dll | 0
PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache | 0
DAL/bin/Release/Pub_Control.dll | 0
WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs | 63 ++
DAL/bin/Release/DBUtility.pdb | 0
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
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
WorkM/bin/Release/WorkM.pdb | 0
Pub_Class/bin/Release/SyntacticSugar.pdb | 0
WarM/bin/Release/WarM.pdb | 0
PayM/bin/x86/Debug/Model.pdb | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 96 ++
Pub_Class/bin/Release/SyntacticSugar.dll | 0
WarM/bin/Release/WarM.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache | 1
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache | 0
WarM/bin/Release/SQLHelper.pdb | 0
WorkM/bin/Release/Model.dll | 0
WorkM/bin/Release/WorkM.dll | 0
WebAPI/Controllers/工资管理/Pay_WorkTimesBillController.cs | 9
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 6
WarM/bin/Release/Model.pdb | 0
WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs | 57 +
WarM/bin/Release/Model.dll | 0
Pub_Class/bin/Release/Pub_Class.pdb | 0
PlanM/bin/Release/DBUtility.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.dll | 0
WarM/bin/Release/SQLHelper.dll | 0
WorkM/bin/Release/Model.pdb | 0
Pub_Class/bin/Release/Pub_Class.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.pdb | 0
WarM/bin/Release/DAL.dll | 0
DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources | 0
WarM/bin/Release/DAL.pdb | 0
PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll | 0
WorkM/bin/Release/WarM.pdb | 0
PlanM/bin/Release/DBUtility.pdb | 0
PayM/bin/x86/Debug/Model.dll | 0
WorkM/bin/Release/WarM.dll | 0
WorkM/bin/Release/SQLHelper.pdb | 0
Model/bin/Release/Model.pdb | 0
Model/bin/Release/Model.dll | 0
DBUtility/bin/Release/Pub_Class.pdb | 0
APSM/bin/Release/WorkM.pdb | 0
Model/bin/Release/SQLHelper.dll | 0
BaseSet/bin/Release/DBUtility.dll | 0
WorkM/bin/Release/SQLHelper.dll | 0
238 files changed, 1,686 insertions(+), 113 deletions(-)
diff --git a/APSM/bin/Release/APSM.dll b/APSM/bin/Release/APSM.dll
index 2e9ba05..e4b16be 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 400fcf0..9fa341d 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 547dd7a..d527af4 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 8f2040f..3cd3d4f 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 9dda84b..7100fdd 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 ebb8b20..fd0f4c8 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 b6ba414..035e49e 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 5cd5bf7..4605e8b 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 f2cdd0d..e78bdb7 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 a669f85..1049ca1 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 796b802..ef97a6c 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 7cdb005..1270e49 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 ad6e978..68e5efb 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 cf6baa2..c590eb1 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 75a651a..c1c6c58 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 b645562..4b00db2 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 18bc956..f257e83 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 da0c974..bad06d8 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 7303155..5101ffe 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 466673a..1e71889 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 c5ec251..521e315 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 351238d..38afaea 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 e588ef3..c715704 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 fef4835..d29c979 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 547dd7a..d527af4 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 8f2040f..3cd3d4f 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 b6ba414..035e49e 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 5cd5bf7..4605e8b 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 f2cdd0d..e78bdb7 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 a669f85..1049ca1 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 796b802..ef97a6c 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 7cdb005..1270e49 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 75a651a..c1c6c58 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 b645562..4b00db2 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 18bc956..f257e83 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 da0c974..bad06d8 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 7303155..5101ffe 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 466673a..1e71889 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 547dd7a..d527af4 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 8f2040f..3cd3d4f 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 9dda84b..7100fdd 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 ebb8b20..fd0f4c8 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 b6ba414..035e49e 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 5cd5bf7..4605e8b 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 f2cdd0d..e78bdb7 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 a669f85..1049ca1 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 796b802..ef97a6c 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 7cdb005..1270e49 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 75a651a..c1c6c58 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 b645562..4b00db2 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 18bc956..f257e83 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 da0c974..bad06d8 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 7303155..5101ffe 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 466673a..1e71889 100644
--- a/BaseSet/bin/Release/SQLHelper.pdb
+++ b/BaseSet/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index b6ba414..035e49e 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 5cd5bf7..4605e8b 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 f2cdd0d..e78bdb7 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 a669f85..1049ca1 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 796b802..ef97a6c 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 7cdb005..1270e49 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 75a651a..c1c6c58 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 b645562..4b00db2 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 18bc956..f257e83 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 da0c974..bad06d8 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 7303155..5101ffe 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 466673a..1e71889 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git "a/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_WorkTimesBill.cs" "b/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_WorkTimesBill.cs"
index 59ebf7f..4f536c7 100644
--- "a/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_WorkTimesBill.cs"
+++ "b/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_WorkTimesBill.cs"
@@ -146,9 +146,7 @@
oCn.RollBack();
return false;
}
- sReturn = "鍗曟嵁鍙凤細"+ omodel.HBillNo+ " 淇敼鎴愬姛锛�";
oCn.Commit();
- return true;
}
catch (Exception e)
{
@@ -156,7 +154,37 @@
oCn.RollBack();
throw (e);
}
+
+ //瀹℃牳鍗曟嵁
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ if (oSystemParameter.ShowBillByOrgID(omodel.HSTOCKORGID, ref sReturn) == false)
+ {
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 淇敼鎴愬姛锛屽垽鏂槸鍚﹁嚜鍔ㄥ鏍告椂鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sReturn;
+ return true;
+ }
+
+ if (oSystemParameter.omodel.Pay_WorkTimesBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ //瀹℃牳鍗曟嵁
+ if (!CheckBill(omodel.HInterID, omodel.HBillNo, "h_p_Pay_WorkTimesBill_AfterCheckCtrl", DBUtility.ClsPub.CurUserName, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 淇敼鎴愬姛锛屽鏍稿け璐ワ紒";
+ return true;
+ }
+ else
+ {
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 淇敼瀹℃牳鎴愬姛锛�";
+ return true;
+ }
+ }
+ else
+ {
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 淇敼鎴愬姛锛�";
+ return true;
+ }
}
+
//鏂板鍗曟嵁
public override bool AddBill(ref string sReturn)
{
@@ -211,9 +239,7 @@
oCn.RollBack();
return false;
}
- sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 鏂板鎴愬姛锛�";
oCn.Commit();
- return true;
}
catch (Exception e)
{
@@ -221,6 +247,35 @@
oCn.RollBack();
throw (e);
}
+
+ //瀹℃牳鍗曟嵁
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ if (oSystemParameter.ShowBillByOrgID(omodel.HSTOCKORGID, ref sReturn) == false)
+ {
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 鏂板鎴愬姛锛屽垽鏂槸鍚﹁嚜鍔ㄥ鏍告椂鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sReturn;
+ return true;
+ }
+
+ if (oSystemParameter.omodel.Pay_WorkTimesBill_AutoCheck.ToUpper() == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ //瀹℃牳鍗曟嵁
+ if (!CheckBill(omodel.HInterID, omodel.HBillNo, "h_p_Pay_WorkTimesBill_AfterCheckCtrl", DBUtility.ClsPub.CurUserName, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 鏂板鎴愬姛锛屽鏍稿け璐ワ紒";
+ return true;
+ }
+ else
+ {
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 鏂板瀹℃牳鎴愬姛锛�";
+ return true;
+ }
+ }
+ else
+ {
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 鏂板鎴愬姛锛�";
+ return true;
+ }
}
//鏄剧ず鍗曟嵁
public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
diff --git "a/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs" "b/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs"
index 8c0ee97..beba459 100644
--- "a/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs"
+++ "b/DAL/\345\272\224\346\224\266\347\256\241\347\220\206/ClsYS_ReceiveBill.cs"
@@ -104,7 +104,7 @@
",HYear='" + omodel.HYear.ToString() + "'" +
",HPeriod='" + omodel.HPeriod.ToString() + "'" +
",HRemark='" + omodel.HRemark + "'" +
- ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDater='" + omodel.HUpDater + "'" +
",HUpDateDate=getdate()" +
//========================================
",HAccDate='" + omodel.HAccDate + "'" +
@@ -261,7 +261,7 @@
", " + omodel.HYear.ToString() + "" +
"," + omodel.HPeriod.ToString() + "" +
",'" + omodel.HRemark + "'" +
- ",'" + DBUtility.ClsPub.CurUserName + "'" +
+ ",'" + omodel.HMaker + "'" +
",getdate()" + "";
mainSql +=
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 0bc28d5..55f7e03 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"
@@ -346,7 +346,22 @@
{
omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
}
-
+
+ //妫�鏌ヤ富琛ㄥ唴鐮佹槸鍚﹂噸澶嶏紝鑻ラ噸澶嶅垯閲嶆柊鐢熸垚骞剁户缁鏌ワ紝鐩村埌涓嶅啀閲嶅
+ DataSet ds_repeat;
+ while (true)
+ {
+ ds_repeat = oCn.RunProcReturn("select * from Sc_ProcessExchangeBillMain where HInterID = " + omodel.HInterID, "Sc_ProcessExchangeBillMain");
+ if (ds_repeat != null && ds_repeat.Tables[0].Rows.Count > 0)
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ break;
+ }
+ }
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
//淇濆瓨鍓嶆帶鍒�=========================================
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index f2cdd0d..e78bdb7 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 a669f85..1049ca1 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 75a651a..c1c6c58 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 b645562..4b00db2 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 18bc956..f257e83 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 da0c974..bad06d8 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 7303155..5101ffe 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 466673a..1e71889 100644
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources b/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
index fa7e783..552e300 100644
--- a/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
+++ b/DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_BillType.resources b/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
index edcca36..561c1c7 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_BillType.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
index 859bca4..9103b7d 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
index 1234b05..fe71e8f 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
index 270f077..ae4f855 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources b/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
index 3f81c08..89f77dc 100644
--- a/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
+++ b/DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index 486ff2c..0f15254 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
index ab65e84..d4f0c96 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
index 8c217ee..59940f0 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.dll b/DBUtility/obj/Release/DBUtility.dll
index f2cdd0d..e78bdb7 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 a669f85..1049ca1 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 f2cdd0d..e78bdb7 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 a669f85..1049ca1 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 796b802..ef97a6c 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 7cdb005..1270e49 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 75a651a..c1c6c58 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 b645562..4b00db2 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 18bc956..f257e83 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 da0c974..bad06d8 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 7303155..5101ffe 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 466673a..1e71889 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 f2f1252..c17771a 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 796b802..ef97a6c 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 7cdb005..1270e49 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll b/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
index 170ae76..0d05fac 100644
--- a/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
+++ b/PayM/bin/x86/Debug/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.dll b/PayM/bin/x86/Debug/BLL.dll
index 596987b..f1f5f95 100644
--- a/PayM/bin/x86/Debug/BLL.dll
+++ b/PayM/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.pdb b/PayM/bin/x86/Debug/BLL.pdb
index f8aa6b9..5918ab2 100644
--- a/PayM/bin/x86/Debug/BLL.pdb
+++ b/PayM/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.dll b/PayM/bin/x86/Debug/DAL.dll
index b71e170..d7ea9ff 100644
--- a/PayM/bin/x86/Debug/DAL.dll
+++ b/PayM/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.pdb b/PayM/bin/x86/Debug/DAL.pdb
index 082a502..3947ac0 100644
--- a/PayM/bin/x86/Debug/DAL.pdb
+++ b/PayM/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.dll b/PayM/bin/x86/Debug/DBUtility.dll
index c759aa1..4c11bc3 100644
--- a/PayM/bin/x86/Debug/DBUtility.dll
+++ b/PayM/bin/x86/Debug/DBUtility.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.pdb b/PayM/bin/x86/Debug/DBUtility.pdb
index fb87bd4..74eb128 100644
--- a/PayM/bin/x86/Debug/DBUtility.pdb
+++ b/PayM/bin/x86/Debug/DBUtility.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Interop.gregn6Lib.dll b/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
index 4dcdcd2..c07a582 100644
--- a/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
+++ b/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.dll b/PayM/bin/x86/Debug/Model.dll
index 69f34d6..fa85edd 100644
--- a/PayM/bin/x86/Debug/Model.dll
+++ b/PayM/bin/x86/Debug/Model.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.pdb b/PayM/bin/x86/Debug/Model.pdb
index 32ca40b..6996dbc 100644
--- a/PayM/bin/x86/Debug/Model.pdb
+++ b/PayM/bin/x86/Debug/Model.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.dll b/PayM/bin/x86/Debug/PayM.dll
index 1c6d1df..0fcae3a 100644
--- a/PayM/bin/x86/Debug/PayM.dll
+++ b/PayM/bin/x86/Debug/PayM.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.pdb b/PayM/bin/x86/Debug/PayM.pdb
index 2f04f36..01048e3 100644
--- a/PayM/bin/x86/Debug/PayM.pdb
+++ b/PayM/bin/x86/Debug/PayM.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Class.dll b/PayM/bin/x86/Debug/Pub_Class.dll
index cca09bf..8b5503e 100644
--- a/PayM/bin/x86/Debug/Pub_Class.dll
+++ b/PayM/bin/x86/Debug/Pub_Class.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Class.pdb b/PayM/bin/x86/Debug/Pub_Class.pdb
index d4859ca..5f5bd65 100644
--- a/PayM/bin/x86/Debug/Pub_Class.pdb
+++ b/PayM/bin/x86/Debug/Pub_Class.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Control.dll b/PayM/bin/x86/Debug/Pub_Control.dll
index 2482bf4..70a9e3d 100644
--- a/PayM/bin/x86/Debug/Pub_Control.dll
+++ b/PayM/bin/x86/Debug/Pub_Control.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Control.pdb b/PayM/bin/x86/Debug/Pub_Control.pdb
index 8404990..1ada836 100644
--- a/PayM/bin/x86/Debug/Pub_Control.pdb
+++ b/PayM/bin/x86/Debug/Pub_Control.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/SQLHelper.dll b/PayM/bin/x86/Debug/SQLHelper.dll
index ac88659..d7120b6 100644
--- a/PayM/bin/x86/Debug/SQLHelper.dll
+++ b/PayM/bin/x86/Debug/SQLHelper.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/SQLHelper.pdb b/PayM/bin/x86/Debug/SQLHelper.pdb
index c57f334..8924c5d 100644
--- a/PayM/bin/x86/Debug/SQLHelper.pdb
+++ b/PayM/bin/x86/Debug/SQLHelper.pdb
Binary files differ
diff --git a/PayM/obj/Release/PayM.csproj.ResolveComReference.cache b/PayM/obj/Release/PayM.csproj.ResolveComReference.cache
index 0263c89..74c4161 100644
--- a/PayM/obj/Release/PayM.csproj.ResolveComReference.cache
+++ b/PayM/obj/Release/PayM.csproj.ResolveComReference.cache
Binary files differ
diff --git a/PayM/obj/x86/Debug/AxInterop.gregn6Lib.dll b/PayM/obj/x86/Debug/AxInterop.gregn6Lib.dll
index 170ae76..0d05fac 100644
--- a/PayM/obj/x86/Debug/AxInterop.gregn6Lib.dll
+++ b/PayM/obj/x86/Debug/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/PayM/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f36af01..e7d2350 100644
--- a/PayM/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/PayM/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/PayM/obj/x86/Debug/Interop.gregn6Lib.dll b/PayM/obj/x86/Debug/Interop.gregn6Lib.dll
index 4dcdcd2..c07a582 100644
--- a/PayM/obj/x86/Debug/Interop.gregn6Lib.dll
+++ b/PayM/obj/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.csproj.AssemblyReference.cache b/PayM/obj/x86/Debug/PayM.csproj.AssemblyReference.cache
index 943e49f..25b3ae6 100644
--- a/PayM/obj/x86/Debug/PayM.csproj.AssemblyReference.cache
+++ b/PayM/obj/x86/Debug/PayM.csproj.AssemblyReference.cache
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache b/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache
index 4b865a8..07e70f2 100644
--- a/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache
+++ b/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache b/PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache
index f7bed52..95fdb21 100644
--- a/PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache
+++ b/PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.dll b/PayM/obj/x86/Debug/PayM.dll
index 1c6d1df..0fcae3a 100644
--- a/PayM/obj/x86/Debug/PayM.dll
+++ b/PayM/obj/x86/Debug/PayM.dll
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.pdb b/PayM/obj/x86/Debug/PayM.pdb
index 2f04f36..01048e3 100644
--- a/PayM/obj/x86/Debug/PayM.pdb
+++ b/PayM/obj/x86/Debug/PayM.pdb
Binary files differ
diff --git a/PlanM/bin/Release/BLL.dll b/PlanM/bin/Release/BLL.dll
index 547dd7a..d527af4 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 8f2040f..3cd3d4f 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 b6ba414..035e49e 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 5cd5bf7..4605e8b 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 f2cdd0d..e78bdb7 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 a669f85..1049ca1 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 796b802..ef97a6c 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 7cdb005..1270e49 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 ad6e978..68e5efb 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 cf6baa2..c590eb1 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 75a651a..c1c6c58 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 b645562..4b00db2 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 18bc956..f257e83 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 da0c974..bad06d8 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 7303155..5101ffe 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 466673a..1e71889 100644
--- a/PlanM/bin/Release/SQLHelper.pdb
+++ b/PlanM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 2cd4637..b6f478a 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -3759,7 +3759,14 @@
omodel.MES_StationEntrustOutBill_DeleteCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
-
+
+
+ //工资系统参数
+ //==============================考勤汇报单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Pay_WorkTimesBill_AutoCheck")
+ {
+ omodel.Pay_WorkTimesBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//=======JIT系统参数
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index 75a651a..c1c6c58 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 b645562..4b00db2 100644
--- a/Pub_Class/bin/Release/Pub_Class.pdb
+++ b/Pub_Class/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.dll b/Pub_Class/bin/Release/SyntacticSugar.dll
index 50183ae..9a5be6e 100644
--- a/Pub_Class/bin/Release/SyntacticSugar.dll
+++ b/Pub_Class/bin/Release/SyntacticSugar.dll
Binary files differ
diff --git a/Pub_Class/bin/Release/SyntacticSugar.pdb b/Pub_Class/bin/Release/SyntacticSugar.pdb
index 9cb9e37..310ad83 100644
--- a/Pub_Class/bin/Release/SyntacticSugar.pdb
+++ b/Pub_Class/bin/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.dll b/Pub_Control/bin/Release/Pub_Class.dll
index 75a651a..c1c6c58 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 b645562..4b00db2 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 18bc956..f257e83 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 da0c974..bad06d8 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 75a651a..c1c6c58 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 b645562..4b00db2 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 7303155..5101ffe 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 466673a..1e71889 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 d313d59..3840c7f 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 7303155..5101ffe 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 466673a..1e71889 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
index 95849dc..55b6c53 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
index be6ecd0..ceb9ba6 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.dll b/SyntacticSugar/bin/Release/SyntacticSugar.dll
index 50183ae..9a5be6e 100644
--- a/SyntacticSugar/bin/Release/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Release/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Release/SyntacticSugar.pdb b/SyntacticSugar/bin/Release/SyntacticSugar.pdb
index 9cb9e37..310ad83 100644
--- a/SyntacticSugar/bin/Release/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
index b04aad7..fea44e6 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index a35b5bc..7143ce1 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,21 +1,6 @@
-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
-E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-<<<<<<< HEAD
-E:\鏅轰簯mes\mes\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.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
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
->>>>>>> 9ebf0d1329b78732aa2f8d0ae0ebaf03d13ccb26
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index 95849dc..55b6c53 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
index be6ecd0..ceb9ba6 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ 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..bfb772c
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+5dd9c82feb12f833c78ecebea7d9a46c99f29e3f
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
new file mode 100644
index 0000000..243e34e
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -0,0 +1,6 @@
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.dll b/SyntacticSugar/obj/Release/SyntacticSugar.dll
new file mode 100644
index 0000000..9a5be6e
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.pdb b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
new file mode 100644
index 0000000..310ad83
--- /dev/null
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 329be51..0bdfff6 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -100,6 +100,7 @@
<Reference Include="System.Drawing" />
<Reference Include="System.EnterpriseServices" />
<Reference Include="System.Management" />
+ <Reference Include="System.Printing" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
diff --git a/WarM/bin/Release/BLL.dll b/WarM/bin/Release/BLL.dll
index 547dd7a..d527af4 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 8f2040f..3cd3d4f 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 b6ba414..035e49e 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 5cd5bf7..4605e8b 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 f2cdd0d..e78bdb7 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 a669f85..1049ca1 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 796b802..ef97a6c 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 7cdb005..1270e49 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 75a651a..c1c6c58 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 b645562..4b00db2 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 18bc956..f257e83 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 da0c974..bad06d8 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 7303155..5101ffe 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 466673a..1e71889 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 c5ec251..521e315 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 351238d..38afaea 100644
--- a/WarM/bin/Release/WarM.pdb
+++ b/WarM/bin/Release/WarM.pdb
Binary files differ
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
index eeab9df..4e94d9e 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
@@ -14,6 +14,7 @@
using System.IO;
using System.Management;
using System.Net.NetworkInformation;
+using System.Printing;
namespace WarM
{
@@ -407,22 +408,40 @@
#region 鐢熸垚鎸夐挳
private void bc_Click(object sender, EventArgs e)
{
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_BarCodeBill_automaticallyByPLC_ProduceByHand", 1, false, DBUtility.ClsPub.CurUserName))
+ {
+ MessageBox.Show("鐢熸垚澶辫触锛屾棤鏉冮檺锛�");
+ return;
+ }
+
+ //娓呴櫎鎵撳嵃浠诲姟
+ string msg = "";
+ if (!clearPrinterTask(ref msg))
+ {
+ MessageBox.Show(msg);
+ return;
+ }
+
this.Sub_SaveBill();
Display();
- //璁剧疆鎵撳嵃妯℃澘锛屾墦鍗�
- grdList.Rows[0].Cells[0].Value = "*";
- Report = new GridppReport();
- Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + textBox_PrintModelParams.Text + ".grf"); //here .
- Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
- Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
- Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
- if (comboBox_PrinterParams.Text != "")
+ if (radioButton_IsPrint_Yes.Checked == true)
{
- Report.Printer.PrinterName = comboBox_PrinterParams.Text.Replace("(榛樿)", "");
+ //璁剧疆鎵撳嵃妯℃澘锛屾墦鍗�
+ grdList.Rows[0].Cells[0].Value = "*";
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + textBox_PrintModelParams.Text + ".grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
+ if (comboBox_PrinterParams.Text != "")
+ {
+ Report.Printer.PrinterName = comboBox_PrinterParams.Text.Replace("(榛樿)", "");
+ }
+ Report.Print(false);
}
- Report.Print(false);
-
+
Display4();
}
//淇濆瓨鍗曟嵁
@@ -1156,9 +1175,43 @@
return false;
}
+ //娓呴櫎鎸囧畾鎵撳嵃鏈轰换鍔�
+ private bool clearPrinterTask(ref string msg)
+ {
+ try
+ {
+ PrintServer localPrintServer = new LocalPrintServer();
+ PrintQueue pq = localPrintServer.GetPrintQueue(comboBox_PrinterParams.Text.Replace("(榛樿)", "").ToLower());
+ pq.Refresh();
+ PrintJobInfoCollection allPrintJobs = pq.GetPrintJobInfoCollection();
+ foreach (PrintSystemJobInfo printJob in allPrintJobs)
+ {
+ printJob.Cancel();
+
+ }
+ return true;
+ }
+ catch(Exception ex)
+ {
+ msg = ex.Message;
+ return false;
+ }
+ }
+
//鏍规嵁閫氳淇℃伅鐢熸垚鏉＄爜骞舵墦鍗�
private void timer2_Tick(object sender, EventArgs e)
{
+ if (produceQty > 0)
+ {
+ //娓呴櫎鎵撳嵃浠诲姟
+ string msg = "";
+ if (!clearPrinterTask(ref msg))
+ {
+ MessageBox.Show(msg);
+ produceQty = 0;
+ }
+ }
+
for (int i = 0; i < produceQty; i++)
{
//鐢熸垚鏉＄爜
@@ -1167,18 +1220,21 @@
//鑾峰彇闇�瑕佹墦鍗扮殑鏁版嵁
Display();
- //璁剧疆鎵撳嵃妯℃澘锛屾墦鍗�
- grdList.Rows[0].Cells[0].Value = "*";
- Report = new GridppReport();
- Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + textBox_PrintModelParams.Text + ".grf"); //here .
- Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
- Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
- Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
- if (comboBox_PrinterParams.Text != "")
+ if (radioButton_IsPrint_Yes.Checked == true)
{
- Report.Printer.PrinterName = comboBox_PrinterParams.Text.Replace("(榛樿)", "");
+ //璁剧疆鎵撳嵃妯℃澘锛屾墦鍗�
+ grdList.Rows[0].Cells[0].Value = "*";
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + textBox_PrintModelParams.Text + ".grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
+ if (comboBox_PrinterParams.Text != "")
+ {
+ Report.Printer.PrinterName = comboBox_PrinterParams.Text.Replace("(榛樿)", "");
+ }
+ Report.Print(false);
}
- Report.Print(false);
if (i == produceQty - 1)
{
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs"
index 6cf2200..70981a6 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.designer.cs"
@@ -148,6 +148,9 @@
this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog();
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.timer3 = new System.Windows.Forms.Timer(this.components);
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.radioButton_IsPrint_Yes = new System.Windows.Forms.RadioButton();
+ this.radioButton_IsPrint_No = new System.Windows.Forms.RadioButton();
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
this.tabControl_MainInfo.SuspendLayout();
@@ -168,6 +171,7 @@
this.tabControl1.SuspendLayout();
this.tabPage4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdBillBarCodeList)).BeginInit();
+ this.groupBox1.SuspendLayout();
this.SuspendLayout();
//
// Tool
@@ -556,6 +560,7 @@
// gbUp
//
this.gbUp.BackColor = System.Drawing.Color.Transparent;
+ this.gbUp.Controls.Add(this.groupBox1);
this.gbUp.Controls.Add(this.cmdSourceBillNo);
this.gbUp.Controls.Add(this.cmbHWorksNumber);
this.gbUp.Controls.Add(this.label4);
@@ -1503,6 +1508,38 @@
this.timer3.Interval = 5000;
this.timer3.Tick += new System.EventHandler(this.timer3_Tick);
//
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.radioButton_IsPrint_No);
+ this.groupBox1.Controls.Add(this.radioButton_IsPrint_Yes);
+ this.groupBox1.Location = new System.Drawing.Point(24, 162);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(200, 100);
+ this.groupBox1.TabIndex = 45;
+ this.groupBox1.TabStop = false;
+ //
+ // radioButton_IsPrint_Yes
+ //
+ this.radioButton_IsPrint_Yes.AutoSize = true;
+ this.radioButton_IsPrint_Yes.Checked = true;
+ this.radioButton_IsPrint_Yes.Location = new System.Drawing.Point(7, 13);
+ this.radioButton_IsPrint_Yes.Name = "radioButton_IsPrint_Yes";
+ this.radioButton_IsPrint_Yes.Size = new System.Drawing.Size(69, 22);
+ this.radioButton_IsPrint_Yes.TabIndex = 0;
+ this.radioButton_IsPrint_Yes.TabStop = true;
+ this.radioButton_IsPrint_Yes.Text = "鎵撳嵃";
+ this.radioButton_IsPrint_Yes.UseVisualStyleBackColor = true;
+ //
+ // radioButton_IsPrint_No
+ //
+ this.radioButton_IsPrint_No.AutoSize = true;
+ this.radioButton_IsPrint_No.Location = new System.Drawing.Point(6, 68);
+ this.radioButton_IsPrint_No.Name = "radioButton_IsPrint_No";
+ this.radioButton_IsPrint_No.Size = new System.Drawing.Size(87, 22);
+ this.radioButton_IsPrint_No.TabIndex = 1;
+ this.radioButton_IsPrint_No.Text = "涓嶆墦鍗�";
+ this.radioButton_IsPrint_No.UseVisualStyleBackColor = true;
+ //
// Gy_BarCodeBill_automaticallyByPLC_New
//
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
@@ -1552,6 +1589,8 @@
this.tabControl1.ResumeLayout(false);
this.tabPage4.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.grdBillBarCodeList)).EndInit();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
this.ResumeLayout(false);
}
@@ -1676,5 +1715,8 @@
private System.Windows.Forms.PrintPreviewDialog printPreviewDialog1;
private System.Windows.Forms.Timer timer2;
private System.Windows.Forms.Timer timer3;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.RadioButton radioButton_IsPrint_No;
+ private System.Windows.Forms.RadioButton radioButton_IsPrint_Yes;
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
index fe210eb..8aec9bf 100644
--- a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
@@ -46,6 +46,11 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ //鏍规嵁鐢ㄦ埛瀵瑰簲鐝粍鐨勫叧绯伙紝杩囨护鏉′欢涓鍔犲彧鏄剧ず瀵瑰簲鐨勭彮缁�
+ DataSet dsHitemID = oCN.RunProcReturn("exec h_p_Gy_GetSQLGroupByUser '" + user + "'", "h_p_Gy_GetSQLGroupByUser");
+ sWhere = sWhere + DBUtility.ClsPub.isStrNull(dsHitemID.Tables[0].Rows[0]["HBack"]);
+
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_GroupList " + sWhere+ " order by 鐝粍浠ｇ爜 ", "h_v_GroupList");
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index d0636a7..6a5c68d 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -817,6 +817,77 @@
}
#endregion
+ #region 杩斿洖宸ュ簭杩涚珯鎺ユ敹鍗曞垪琛�-鍒嗛〉
+ [Route("Cj_StationInBill/get_Display_ByPage")]
+ [HttpGet]
+ public object get_Display_ByPage(string sWhere, string user, string Organization, int page, int size, string HBillSubType)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ if (HBillSubType == "SUB")
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Sub_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "寮�宸ュ崟鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationInBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩涚珯鍗曟棤鏌ヨ鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_MES_StationInBillList " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_MES_StationInBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_MES_StationInBillList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_MES_StationInBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ヨ鏁版嵁寮傚父锛岃涓庣鐞嗗憳鑱旂郴锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 缂栬緫鍓嶅垽鏂�
[Route("Cj_StationInBill/set_ShowBillJudge")]
[HttpGet]
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 44ee0f8..997ba74 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -1721,31 +1721,74 @@
}
#endregion
- #region 宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�
- [Route("Cj_StationOutBill/page")]
+ #region 杩斿洖宸ュ簭鍑虹珯姹囨姤鍗曞垪琛�-鍒嗛〉
+ [Route("Cj_StationOutBill/get_Display_byPage")]
[HttpGet]
- public json page(string sWhere, string user, int page, int size)
+ public object get_Display_byPage(string sWhere, string user, string Organization, int page, int size, string HBillSubType)
{
- json res = new json();
try
{
List<object> columnNameList = new List<object>();
- //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
- if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
- {
- res.code = "0";
- res.count = 0;
- res.Message = "鍑虹珯鍗曟棤鏌ヨ鏉冮檺!";
- res.data = null;
- return res;
- }
- if (sWhere == null || sWhere.Equals(""))
+ if (HBillSubType == "SUB")
{
- ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",''", "h_p_MES_StationOutBillList");
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Sub_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹屽伐鍗曟棤鏌ヨ鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
}
else
{
- ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_MES_StationOutBillList");
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍑虹珯鍗曟棤鏌ヨ鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ //鑾峰彇绯荤粺鍙傛暟
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ //鍒ゆ柇瀹㈡埛涓洪緳灞辨苯閰�
+ if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤")
+ {
+ //鑾峰彇闇�瑕佹嫾鎺ョ殑瀛楃涓�
+ string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "宸ュ簭姹囨姤鍗曞垪琛�");
+
+ if (sql_splice == "娌℃湁鏌ヨ鍒扮浉鍏崇敤鎴蜂俊鎭�")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ヨ鍒扮浉鍏崇敤鎴蜂俊鎭�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ sWhere += sql_splice;
+ }
+ }
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_MES_StationOutBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_MES_StationOutBillList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_MES_StationOutBillList");
}
//娣诲姞鍒楀悕
@@ -1756,23 +1799,24 @@
columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
}
- res.code = CodeConstant.SUCCEED;
- res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
- res.Message = "Sucess锛�";
- res.list = columnNameList;
- res.data = ds.Tables[0];
- return res;
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
catch (Exception e)
{
- res.code = CodeConstant.FAIL;
- res.count = CountConstant.FAIL;
- res.Message = "Exception锛�" + e.ToString();
- res.data = null;
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
return objJsonResult;
}
}
#endregion
+
#region 宸ュ簭鍑虹珯姹囨姤鍗� 瀛愯〃鏌ヨ
[Route("Cj_StationOutBill/get_SubDisplay")]
[HttpGet]
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index 64052b9..0926d33 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -1258,7 +1258,10 @@
if (IsAudit == 0) //瀹℃牳鍒ゆ柇
{
- oCN.RunProc("update Gy_RoutingBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() where HInterID=" + HInterID);
+ oCN.RunProc("update Gy_RoutingBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate(),HBillStatus=2 where HInterID=" + HInterID);
+
+ //鍒锋柊榛樿宸ヨ壓璺嚎
+ //oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID);
objJsonResult.code = "1";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index 028c518..dfe2672 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -192,7 +192,7 @@
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList_Query where 1 = 1 " + sWhere + " order by 鏃ユ湡 desc ", "h_v_Sc_ProcessExchangeBillList_Query");
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList_Query where 1 = 1 " + sWhere + " order by 鍗曟嵁鍙� desc ", "h_v_Sc_ProcessExchangeBillList_Query");
//娣诲姞鍒楀悕
@@ -205,6 +205,98 @@
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 = "寮傚父锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ュ簭娴佽浆鍗＄淮鎶�-鏌ヨ-鍒嗛〉
+ /// <summary>
+ /// 杩斿洖宸ュ簭娴佽浆鍗＄淮鎶ゅ垪琛ㄤ富琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("LEMS/Sc_ProcessExchangeBillList_Query_byPage")]
+ [HttpGet]
+ public object Sc_ProcessExchangeBillList_Query_byPage(string sWhere, string user, string Organization, int page, int size, string HBillSubType)
+ {
+ DataSet ds;
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (HBillSubType == "SUB")
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_SubQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎸囧紩鍗℃棤鏌ヨ鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ProcessExchangeBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃棤鏌ヨ鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ //鑾峰彇绯荤粺鍙傛暟
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ //鍒ゆ柇瀹㈡埛涓洪緳灞辨苯閰�
+ if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤")
+ {
+ //鑾峰彇闇�瑕佹嫾鎺ョ殑瀛楃涓�
+ string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "宸ュ簭娲惧伐鍗曞垪琛�");
+
+ sWhere += sql_splice;
+ }
+ }
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Sc_ProcessExchangeBillList_Query " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_Sc_ProcessExchangeBillList_Query");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Sc_ProcessExchangeBillList_Query " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_Sc_ProcessExchangeBillList_Query");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
objJsonResult.Message = "Sucess锛�";
objJsonResult.list = columnNameList;
objJsonResult.data = ds.Tables[0];
@@ -1731,31 +1823,49 @@
return GetObjectJson(ds);
}
- #region 鐢熶骇璁㈠崟鍒嗛〉鍒楄〃
- [Route("LEMS/MES_IF_ICMOBillListPage")]
+
+ #region 鐢熶骇璁㈠崟鍒楄〃-鍒嗛〉
+ [Route("LEMS/MES_IF_ICMOBillList_Json_byPage")]
[HttpGet]
- public object MES_IF_ICMOBillListPage(string sWhere, string user, int page, int size)
+ public object MES_IF_ICMOBillList_Json_byPage(string sWhere, string user, string Organization, int page, int size)
{
DataSet ds;
try
{
- List<object> columnNameList = new List<object>();
- //缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Sc_ICMOBillQuery", 1, false, user))
+ List<object> columnNameList = new List<object>()
+; //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sc_ICMOBillQuery", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
objJsonResult.data = null;
return objJsonResult;
}
+
+ //鑾峰彇绯荤粺鍙傛暟
+ string Ret = "";
+ if (oSystemParameter.ShowBill(ref Ret))
+ {
+ //鍒ゆ柇瀹㈡埛涓洪緳灞辨苯閰�
+ if (oSystemParameter.omodel.WMS_CampanyName == "榫欏北姹介厤")
+ {
+ //鑾峰彇闇�瑕佹嫾鎺ョ殑瀛楃涓�
+ string sql_splice = DBUtility.ClsPub.SpliceSQL(user, "鐢熶骇璁㈠崟鍒楄〃");
+
+ sWhere += sql_splice;
+ }
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("exec h_p_IF_ICMOBillList " + page + "," + size + ",''", "h_p_IF_ICMOBillList");
+ ds = oCN.RunProcReturn("exec h_p_IF_ICMOBillList " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_IF_ICMOBillList");
}
else
{
- ds = oCN.RunProcReturn("exec h_p_IF_ICMOBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_IF_ICMOBillList");
+ ds = oCN.RunProcReturn("exec h_p_IF_ICMOBillList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_IF_ICMOBillList");
}
//娣诲姞鍒楀悕
@@ -1777,10 +1887,11 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
objJsonResult.data = null;
return objJsonResult;
}
+ return GetObjectJson(ds);
}
#endregion
@@ -3259,6 +3370,152 @@
}
+ #region 宸ヨ壓璺嚎鍒楄〃 鍚敤榛樿_鏉冮檺鍒ゆ柇
+ [Route("Gy_RoutingBill/set_defaultRoute_CheckRight")]
+ [HttpGet]
+ public object set_defaultRoute_CheckRight(string user, string HBillSubType)
+ {
+ try
+ {
+ if (HBillSubType == "SUB")
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Sub_SetDefaultRoute", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀛愬伐鑹鸿矾绾挎棤鏉冮檺鍚敤榛樿宸ヨ壓璺嚎!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_SetDefaultRoute", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ヨ壓璺嚎鏃犳潈闄愬惎鐢ㄩ粯璁�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ヨ壓璺嚎鍒楄〃 鍚敤榛樿
+ [Route("Gy_RoutingBill/set_defaultRoute")]
+ [HttpGet]
+ public object set_defaultRoute(string HInterID, string user, string HBillSubType)
+ {
+ try
+ {
+ if (HBillSubType == "SUB")
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Sub_SetDefaultRoute", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀛愬伐鑹鸿矾绾挎棤鏉冮檺鍚敤榛樿宸ヨ壓璺嚎!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_SetDefaultRoute", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ヨ壓璺嚎鏃犳潈闄愬惎鐢ㄩ粯璁�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ BillOld.MvarItemKey = "Gy_RoutingBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀹℃牳
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (!(ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != ""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶅彲浠ヨ鍚敤涓鸿鐗╂枡鐨勯粯璁ゅ伐鑹鸿矾绾�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紝妫�鏌ヨ鍗曟嵁鏄惁宸茬粡琚垹闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒锋柊榛樿宸ヨ壓璺嚎
+ oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID+",'" + user + "'");
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 宸ヨ壓璺嚎瀹℃牳/鍙嶅鏍稿姛鑳�
[Route("Gy_RoutingBill/CheckGy_RoutingBill")]
[HttpGet]
@@ -3323,15 +3580,22 @@
return objJsonResult;
}
}
- //瀹℃牳鍗曟嵁
- if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
- objJsonResult.data = null;
- return objJsonResult;
- }
+
+ //瀹℃牳宸ヨ壓璺嚎
+ oCN.RunProc(" Update Gy_RoutingBillMain set HChecker='" + user + "',HCheckDate=getdate(),HBillStatus=2 Where HInterID=" + HInterID.ToString());
+
+ ////鍒锋柊榛樿宸ヨ壓璺嚎
+ //oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID);
+
+ ////瀹℃牳鍗曟嵁
+ //if (!BillOld.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
}
else
{
@@ -3403,6 +3667,8 @@
}
catch (Exception e)
{
+ oCN.RollBack();
+
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index 9b1d803..081f353 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -1871,6 +1871,66 @@
return objJsonResult;
}
}
+
+ #region 閿�鍞嚭搴撳崟鍒楄〃-鍒嗛〉
+ /// <summary>
+ /// 閿�鍞嚭搴撳崟鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Kf_SellOutBill/GetSellOutBillList_byPage")]
+ [HttpGet]
+ public object GetSellOutBillList_byPage(string sWhere, string user, string Organization, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Kf_SellOutBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ヨ鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_IF_SellOutBillList " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_IF_SellOutBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_IF_SellOutBillList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_IF_SellOutBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
/// <summary>
///閿�鍞嚭搴撳崟鍒犻櫎鍔熻兘
/// </summary>
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 953bd54..c6db297 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1537,6 +1537,52 @@
}
/// <summary>
+ /// 鑾峰彇鐝粍鍒楄〃 鏍规嵁鐢ㄦ埛瀵瑰簲鐝粍鍏崇郴锛岃幏鍙栫敤鎴峰搴旂殑鐝粍
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Web/GetGroupListByUser_Json")]
+ [HttpGet]
+ public object GetGroupListByUser_Json(string sWhere, string user)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ //鏍规嵁鐢ㄦ埛瀵瑰簲鐝粍鐨勫叧绯伙紝杩囨护鏉′欢涓鍔犲彧鏄剧ず瀵瑰簲鐨勭彮缁�
+ DataSet dsHitemID = oCN.RunProcReturn("exec h_p_Gy_GetSQLGroupByUser '" + user + "'", "h_p_Gy_GetSQLGroupByUser");
+ sWhere = sWhere + DBUtility.ClsPub.isStrNull(dsHitemID.Tables[0].Rows[0]["HBack"]);
+
+ DataSet ds = oCN.RunProcReturn("Select HItemID,鐝粍浠ｇ爜 鐝粍浠ｇ爜,鐝粍鍚嶇О 鐝粍 from h_v_GroupList where 1=1 " + sWhere + " Order by HItemID ", "h_v_GroupList");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触";
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + e.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ /// <summary>
/// 鑾峰彇閮ㄩ棬鍒楄〃
/// </summary>
/// <returns></returns>
diff --git a/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs b/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
index bf7fca2..ac34b4f 100644
--- a/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_ReceivableBillController.cs
@@ -85,6 +85,66 @@
}
#endregion
+ #region 搴旀敹鍗曞垪琛� 鏌ヨ-鍒嗛〉
+ /// <summary>
+ /// 杩斿洖搴旀敹鍗曞垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xs_ReceivableBill/list_byPage")]
+ [HttpGet]
+ public object getXs_ReceivableBill_byPage(string sWhere, string user, string Organization, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Xs_ReceivableBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Xs_ReceivableBillList_Query " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_Xs_ReceivableBillList_Query");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Xs_ReceivableBillList_Query " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_Xs_ReceivableBillList_Query");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 搴旀敹鍗曚繚瀛� 鏂板/缂栬緫
[Route("Xs_ReceivableBill/SaveXs_ReceivableBill")]
[HttpPost]
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
index 31035fa..144f767 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -1164,6 +1164,58 @@
+ #region 閿�鍞鍗� 鍒嗛〉鏌ヨ
+ [Route("Xs_SeOrderBill/list_ByPage")]
+ [HttpGet]
+ public object list_ByPage(string sWhere, string user, string Organization, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Xs_SeOrderBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Xs_SeOrderBillList_Query " + page + "," + size + ",'" + Organization + "'," + "'',1", "h_p_Xs_SeOrderBillList_Query");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Xs_SeOrderBillList_Query " + page + "," + size + ",'" + Organization + "','" + sWhere + "',1", "h_p_Xs_SeOrderBillList_Query");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 閿�鍞鍗曚繚瀛� 鏂板/缂栬緫
[Route("Xs_SeOrderBill/SaveXs_SeOrderBill")]
[HttpPost]
@@ -3317,6 +3369,59 @@
}
#endregion
+ #region 閿�鍞鍗� 鑾峰彇鎺掑簭鍚庣殑鏁版嵁-鍒嗛〉
+ [Route("Xs_SeOrderBill/sortList__ByPage")]
+ [HttpGet]
+ public object sortList_ByPage(string sWhere, string user, string Organization, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏌ヨ鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Xs_SeOrderBillList_Query " + page + "," + size + ",'" + Organization + "'," + "'',2", "h_p_Xs_SeOrderBillList_Query");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Xs_SeOrderBillList_Query " + page + "," + size + ",'" + Organization + "','" + sWhere + "',2", "h_p_Xs_SeOrderBillList_Query");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 閿�鍞鍗曚笅鎺ㄦ煡璇㈠垪琛�
[Route("Xs_SeOrderBill/PushList")]
[HttpGet]
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
index b34571b..6206011 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
@@ -132,6 +132,63 @@
return objJsonResult;
}
}
+
+ #region 鍙戣揣閫氱煡鍗� 鏌ヨ-鍒嗛〉
+ [Route("Xs_SeOutStockBill/list_byPage")]
+ [HttpGet]
+ public object list_byPag(string sWhere, string user, string Organization, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOutStockBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_IF_SeOutStockBillList " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_IF_SeOutStockBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_IF_SeOutStockBillList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_IF_SeOutStockBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
/// <summary>
///鍒犻櫎鍔熻兘
/// </summary>
diff --git a/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs b/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
index 1c9978b..b634a84 100644
--- a/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
+++ b/WebAPI/Controllers/XSGL/YS_ReceiveBillController.cs
@@ -85,6 +85,67 @@
}
#endregion
+ #region 鏀舵鍗曞垪琛� 鏌ヨ-鍒嗛〉
+ /// <summary>
+ /// 杩斿洖椤圭洰闃舵鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("YS_ReceiveBill/list_byPage")]
+ [HttpGet]
+ public object getYS_ReceiveBill_byPage(string sWhere, string user, string Organization, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("YS_ReceiveBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_YS_ReceiveBillList_Query " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_YS_ReceiveBillList_Query");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_YS_ReceiveBillList_Query " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_YS_ReceiveBillList_Query");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
#region 鏀舵鍗曚繚瀛� 鏂板/缂栬緫
[Route("YS_ReceiveBill/SaveYS_ReceiveBill")]
[HttpPost]
@@ -170,6 +231,8 @@
return objJsonResult;
}
}
+ oItem.HMaker = msg4;
+ oItem.HUpDater = msg4;
UserName = oItem.HMaker; //鍒跺崟浜�
oItem.HBillType = "2003";
oItem.HBillSubType = "2003";
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs"
index 4521752..3553906 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_WorkTimesBillController.cs"
@@ -14,7 +14,6 @@
public class Pay_WorkTimesBillController : ApiController
{
- Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();//绯荤粺鍙橀噺
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
public const string ModName = "2203"; //鍗曟嵁绫诲瀷
public const string ModCaption = "鑰冨嫟姹囨姤鍗�"; //鍗曟嵁鍚嶇О
@@ -749,14 +748,6 @@
if (bResult)
{
- string sReturn = "";
- if (oSystemParameter.ShowBill(ref sReturn) == true)
- {
- if (oSystemParameter.omodel.MES_StationOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
- {
- object objResult = GetPay_WorkTimesBill_Check_Json(lsmain[0].HInterID,1, HMaker);
- }
- }
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; //鎴愬姛锛�
diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs"
index b4c3aab..0b2c077 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs"
@@ -4094,5 +4094,45 @@
return response;
}
#endregion
+
+
+
+ #region 鑷姩鍔犺浇椤甸潰琛ㄥご
+ /// <summary>
+ /// 杩斿洖椤圭洰闃舵鍒楄〃
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Xt_DefineBillMainSet/getDefineBillMainSet")]
+ [HttpGet]
+ public object getDefineBillMainSet(string HModName, string user)
+ {
+ try
+ {
+ string sql = "select b.* from Xt_DefineBillMainSetMain as a inner join Xt_DefineBillMainSetSub as b on a.HInterID = b.HInterID where a.HModName ='" + HModName + "' and a.HUser ='" + user + "' order by b.HArrangeOrder,b.HArrangeOrderSub";
+ ds = oCN.RunProcReturn(sql, "Xt_DefineBillMainSet");
+
+ if(ds!=null && ds.Tables[0].Rows.Count == 0)
+ {
+ sql = "select b.* from Xt_DefineBillMainSetMain as a inner join Xt_DefineBillMainSetSub as b on a.HInterID = b.HInterID where a.HModName ='" + HModName + "' and a.HUser ='admin' order by b.HArrangeOrder,b.HArrangeOrderSub";
+ ds = oCN.RunProcReturn(sql, "Xt_DefineBillMainSet");
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
index d1dd4b4..11fe073 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
@@ -4,7 +4,11 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
+<<<<<<< HEAD
+ <History>True|2024-10-10T01:20:57.7783364Z;False|2024-10-10T09:20:10.8221644+08:00;True|2024-10-09T08:49:22.1848893+08:00;False|2024-10-09T08:48:40.5932270+08:00;True|2024-10-09T08:40:29.9989815+08:00;False|2024-10-09T08:39:45.7279311+08:00;True|2024-09-29T10:44:45.8122563+08:00;True|2024-09-29T10:37:04.9148934+08:00;False|2024-09-29T10:36:08.2864165+08:00;True|2024-09-26T20:54:30.2118641+08:00;True|2024-09-26T20:42:07.9287721+08:00;True|2024-09-26T20:22:41.4824127+08:00;True|2024-09-26T16:31:50.6152466+08:00;True|2024-09-26T15:53:40.7117538+08:00;True|2024-09-26T15:13:00.9866970+08:00;True|2024-09-26T14:35:36.7604454+08:00;True|2024-09-26T11:11:47.9891891+08:00;False|2024-09-26T11:11:01.5036268+08:00;True|2024-09-26T10:45:07.1552480+08:00;False|2024-09-26T10:44:06.6593537+08:00;True|2024-09-25T16:07:11.4134593+08:00;False|2024-09-25T16:06:08.0731439+08:00;True|2024-09-25T14:39:10.0505260+08:00;True|2024-09-25T13:18:18.1313831+08:00;True|2024-09-25T10:37:26.6757003+08:00;False|2024-09-25T10:36:48.1910470+08:00;True|2024-09-24T20:10:41.0520259+08:00;False|2024-09-24T20:09:45.7807962+08:00;True|2024-09-19T16:42:08.0598619+08:00;True|2024-09-19T16:32:26.7785955+08:00;False|2024-09-19T16:31:43.4990851+08:00;True|2024-09-19T15:36:45.2033244+08:00;False|2024-09-19T15:35:51.1927491+08:00;True|2024-09-18T16:52:00.1148169+08:00;True|2024-09-18T15:38:57.9090829+08:00;True|2024-09-18T14:31:35.3097924+08:00;True|2024-09-18T14:14:45.1332631+08:00;True|2024-09-18T10:03:32.4149929+08:00;True|2024-09-18T09:59:34.6584259+08:00;False|2024-09-18T09:59:28.1320018+08:00;True|2024-09-16T09:25:02.1321635+08:00;False|2024-09-16T09:24:52.9179557+08:00;True|2024-09-14T16:00:39.9413222+08:00;True|2024-09-14T15:57:04.7663346+08:00;True|2024-09-14T15:53:17.2804503+08:00;False|2024-09-14T15:53:10.3529010+08:00;True|2024-09-14T11:12:47.6871531+08:00;True|2024-09-14T11:09:14.5541471+08:00;True|2024-09-14T11:04:01.8286675+08:00;False|2024-09-14T11:03:52.5770773+08:00;True|2024-09-13T14:33:50.5043085+08:00;False|2024-09-13T14:33:44.9903004+08:00;True|2024-09-13T13:37:51.1937510+08:00;True|2024-09-13T10:20:53.2644847+08:00;False|2024-09-13T10:19:33.7686753+08:00;True|2024-09-12T19:15:21.9135805+08:00;False|2024-09-12T19:15:07.2717017+08:00;True|2024-09-12T17:25:26.5527019+08:00;True|2024-09-12T17:20:42.2498355+08:00;True|2024-09-12T17:16:44.8817635+08:00;True|2024-09-12T17:16:02.4132675+08:00;True|2024-09-12T17:08:14.2819047+08:00;True|2024-09-12T16:07:15.3675281+08:00;True|2024-09-12T16:06:23.8568906+08:00;True|2024-09-12T15:48:45.1455315+08:00;True|2024-09-12T14:59:30.0679595+08:00;True|2024-09-12T14:18:21.9534092+08:00;True|2024-09-12T14:07:35.2885035+08:00;False|2024-09-12T14:06:30.5732168+08:00;False|2024-09-12T14:06:17.1404767+08:00;True|2024-09-12T14:03:12.8150228+08:00;True|2024-09-12T13:53:20.7537798+08:00;True|2024-09-12T13:48:43.2408012+08:00;False|2024-09-12T13:48:36.5217018+08:00;True|2024-09-11T20:20:57.7845361+08:00;False|2024-09-11T20:20:38.9732855+08:00;True|2024-09-10T15:15:04.6204983+08:00;True|2024-09-10T11:33:55.3963324+08:00;True|2024-09-10T11:10:10.3836571+08:00;True|2024-09-10T10:39:06.5850395+08:00;True|2024-09-10T10:27:33.2463582+08:00;False|2024-09-10T10:26:05.4608008+08:00;True|2024-09-09T19:14:08.0718627+08:00;True|2024-09-09T19:08:42.5709780+08:00;False|2024-09-09T19:08:33.7817129+08:00;True|2024-09-06T17:00:13.2484828+08:00;False|2024-09-06T17:00:06.1281061+08:00;True|2024-09-05T11:39:53.4537518+08:00;False|2024-09-05T11:39:04.6111418+08:00;True|2024-09-04T12:39:24.8111127+08:00;True|2024-09-04T12:12:57.9411095+08:00;False|2024-09-04T12:12:28.6748628+08:00;True|2024-09-03T14:45:30.8259459+08:00;False|2024-09-03T14:45:19.1997455+08:00;True|2024-08-30T16:08:31.2415230+08:00;True|2024-08-30T15:18:36.6727666+08:00;True|2024-08-28T09:49:18.1543721+08:00;False|2024-08-28T09:49:11.7260337+08:00;True|2024-08-27T13:18:40.6234335+08:00;False|2024-08-27T13:18:33.9730040+08:00;True|2024-08-26T17:40:29.9158973+08:00;True|2024-08-26T17:21:30.8800173+08:00;True|2024-08-26T17:19:23.9260010+08:00;True|2024-08-26T14:27:20.8154004+08:00;True|2024-08-26T14:16:14.4482284+08:00;True|2024-08-26T13:12:42.9574127+08:00;True|2024-08-26T12:48:31.2107630+08:00;True|2024-08-26T11:07:15.1181342+08:00;False|2024-08-26T11:07:09.9429791+08:00;True|2024-08-26T10:49:20.8494484+08:00;True|2024-08-26T10:13:11.5222607+08:00;False|2024-08-26T10:12:59.1146882+08:00;True|2024-08-23T15:39:39.9842990+08:00;False|2024-08-23T15:39:33.9824708+08:00;True|2024-08-22T16:55:46.4689463+08:00;True|2024-08-22T16:44:25.0981764+08:00;True|2024-08-22T16:19:29.9801909+08:00;True|2024-08-22T14:25:13.5120259+08:00;True|2024-08-22T09:48:50.0760398+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
+=======
<History>True|2024-10-09T08:29:57.1468906Z;True|2024-10-09T14:03:09.2281786+08:00;True|2024-10-09T13:21:06.6101996+08:00;True|2024-10-09T13:02:11.2267277+08:00;True|2024-10-09T12:55:32.8160247+08:00;True|2024-10-09T11:43:26.9890355+08:00;True|2024-10-09T10:24:01.6949058+08:00;True|2024-10-09T10:11:25.4766977+08:00;False|2024-10-09T10:11:19.1851145+08:00;True|2024-10-08T20:15:35.4234814+08:00;True|2024-10-08T20:06:06.2945727+08:00;True|2024-10-08T19:49:49.1754103+08:00;True|2024-10-08T17:34:17.5322468+08:00;True|2024-10-08T17:12:12.3620840+08:00;False|2024-10-08T17:12:04.5176642+08:00;True|2024-10-08T12:14:49.3930712+08:00;True|2024-10-08T11:02:49.9540132+08:00;False|2024-10-08T11:02:39.1418793+08:00;True|2024-09-27T15:00:21.0482043+08:00;True|2024-09-27T14:57:07.0747471+08:00;True|2024-09-27T14:53:52.8423718+08:00;True|2024-09-27T13:29:58.8925618+08:00;False|2024-09-27T13:29:52.7163123+08:00;True|2024-09-26T20:27:04.5201970+08:00;True|2024-09-26T19:16:26.6734751+08:00;True|2024-09-26T19:13:46.3429211+08:00;True|2024-09-26T18:50:55.3033341+08:00;True|2024-09-26T18:35:44.3607797+08:00;True|2024-09-26T18:33:11.2986890+08:00;True|2024-09-26T18:08:00.5018121+08:00;True|2024-09-26T17:57:04.3987105+08:00;False|2024-09-26T17:55:37.3316215+08:00;True|2024-09-26T17:53:52.1377436+08:00;False|2024-09-26T17:53:46.2067050+08:00;True|2024-09-25T17:21:24.1078881+08:00;True|2024-09-25T17:04:17.9619045+08:00;True|2024-09-23T10:58:34.6129284+08:00;True|2024-09-23T10:58:28.2863739+08:00;True|2024-09-23T10:46:39.8062504+08:00;False|2024-09-23T10:46:28.2127212+08:00;True|2024-09-23T10:41:36.7887633+08:00;False|2024-09-23T10:41:31.1693720+08:00;True|2024-09-20T14:36:35.1508292+08:00;True|2024-09-20T14:23:14.7828767+08:00;True|2024-09-20T10:20:42.4614808+08:00;False|2024-09-20T10:20:30.9842799+08:00;True|2024-09-19T14:20:56.6643781+08:00;True|2024-09-19T09:54:32.7563188+08:00;False|2024-09-19T09:54:16.5345071+08:00;True|2024-09-19T09:07:11.2182586+08:00;False|2024-09-19T09:07:00.2356340+08:00;True|2024-09-18T16:52:00.1148169+08:00;True|2024-09-18T15:38:57.9090829+08:00;True|2024-09-18T14:31:35.3097924+08:00;True|2024-09-18T14:14:45.1332631+08:00;True|2024-09-18T10:03:32.4149929+08:00;True|2024-09-18T09:59:34.6584259+08:00;False|2024-09-18T09:59:28.1320018+08:00;True|2024-09-16T09:25:02.1321635+08:00;False|2024-09-16T09:24:52.9179557+08:00;True|2024-09-14T16:00:39.9413222+08:00;True|2024-09-14T15:57:04.7663346+08:00;True|2024-09-14T15:53:17.2804503+08:00;False|2024-09-14T15:53:10.3529010+08:00;True|2024-09-14T11:12:47.6871531+08:00;True|2024-09-14T11:09:14.5541471+08:00;True|2024-09-14T11:04:01.8286675+08:00;False|2024-09-14T11:03:52.5770773+08:00;True|2024-09-13T14:33:50.5043085+08:00;False|2024-09-13T14:33:44.9903004+08:00;True|2024-09-13T13:37:51.1937510+08:00;True|2024-09-13T10:20:53.2644847+08:00;False|2024-09-13T10:19:33.7686753+08:00;True|2024-09-12T19:15:21.9135805+08:00;False|2024-09-12T19:15:07.2717017+08:00;True|2024-09-12T17:25:26.5527019+08:00;True|2024-09-12T17:20:42.2498355+08:00;True|2024-09-12T17:16:44.8817635+08:00;True|2024-09-12T17:16:02.4132675+08:00;True|2024-09-12T17:08:14.2819047+08:00;True|2024-09-12T16:07:15.3675281+08:00;True|2024-09-12T16:06:23.8568906+08:00;True|2024-09-12T15:48:45.1455315+08:00;True|2024-09-12T14:59:30.0679595+08:00;True|2024-09-12T14:18:21.9534092+08:00;True|2024-09-12T14:07:35.2885035+08:00;False|2024-09-12T14:06:30.5732168+08:00;False|2024-09-12T14:06:17.1404767+08:00;True|2024-09-12T14:03:12.8150228+08:00;True|2024-09-12T13:53:20.7537798+08:00;True|2024-09-12T13:48:43.2408012+08:00;False|2024-09-12T13:48:36.5217018+08:00;True|2024-09-11T20:20:57.7845361+08:00;False|2024-09-11T20:20:38.9732855+08:00;True|2024-09-10T15:15:04.6204983+08:00;True|2024-09-10T11:33:55.3963324+08:00;True|2024-09-10T11:10:10.3836571+08:00;True|2024-09-10T10:39:06.5850395+08:00;True|2024-09-10T10:27:33.2463582+08:00;False|2024-09-10T10:26:05.4608008+08:00;True|2024-09-09T19:14:08.0718627+08:00;True|2024-09-09T19:08:42.5709780+08:00;False|2024-09-09T19:08:33.7817129+08:00;True|2024-09-06T17:00:13.2484828+08:00;False|2024-09-06T17:00:06.1281061+08:00;True|2024-09-05T11:39:53.4537518+08:00;False|2024-09-05T11:39:04.6111418+08:00;True|2024-09-04T12:39:24.8111127+08:00;True|2024-09-04T12:12:57.9411095+08:00;False|2024-09-04T12:12:28.6748628+08:00;True|2024-09-03T14:45:30.8259459+08:00;False|2024-09-03T14:45:19.1997455+08:00;True|2024-08-30T16:08:31.2415230+08:00;True|2024-08-30T15:18:36.6727666+08:00;True|2024-08-28T09:49:18.1543721+08:00;False|2024-08-28T09:49:11.7260337+08:00;True|2024-08-27T13:18:40.6234335+08:00;False|2024-08-27T13:18:33.9730040+08:00;True|2024-08-26T17:40:29.9158973+08:00;True|2024-08-26T17:21:30.8800173+08:00;True|2024-08-26T17:19:23.9260010+08:00;True|2024-08-26T14:27:20.8154004+08:00;True|2024-08-26T14:16:14.4482284+08:00;True|2024-08-26T13:12:42.9574127+08:00;True|2024-08-26T12:48:31.2107630+08:00;True|2024-08-26T11:07:15.1181342+08:00;False|2024-08-26T11:07:09.9429791+08:00;True|2024-08-26T10:49:20.8494484+08:00;True|2024-08-26T10:13:11.5222607+08:00;False|2024-08-26T10:12:59.1146882+08:00;True|2024-08-23T15:39:39.9842990+08:00;False|2024-08-23T15:39:33.9824708+08:00;True|2024-08-22T16:55:46.4689463+08:00;True|2024-08-22T16:44:25.0981764+08:00;True|2024-08-22T16:19:29.9801909+08:00;True|2024-08-22T14:25:13.5120259+08:00;True|2024-08-22T09:48:50.0760398+08:00;True|2024-08-21T16:09:41.0487181+08:00;True|2024-08-21T15:42:13.7474317+08:00;True|2024-08-21T15:10:24.6912112+08:00;True|2024-08-21T14:56:51.3255866+08:00;True|2024-08-21T14:50:12.3359730+08:00;True|2024-08-19T15:43:16.1549663+08:00;True|2024-08-19T15:27:26.4219971+08:00;True|2024-08-19T09:41:45.7449029+08:00;True|2024-06-08T12:38:30.4153773+08:00;True|2024-06-07T21:22:19.4545597+08:00;True|2024-06-07T21:05:53.1963741+08:00;True|2024-06-07T21:00:57.2568708+08:00;True|2024-06-07T14:39:19.6618679+08:00;True|2024-06-07T14:21:51.5169962+08:00;True|2024-06-07T11:29:08.0690999+08:00;True|2024-06-07T11:26:29.1494329+08:00;True|2024-06-07T11:20:41.2024309+08:00;True|2024-06-07T10:12:26.5905597+08:00;False|2024-06-07T10:11:35.3679434+08:00;</History>
+>>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +49,49 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
+<<<<<<< HEAD
+ <publishTime>10/10/2024 09:20:24</publishTime>
+ </File>
+ <File Include="bin/BLL.pdb">
+ <publishTime>10/10/2024 09:20:24</publishTime>
+=======
<publishTime>10/09/2024 16:29:38</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>10/09/2024 16:29:38</publishTime>
+>>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
+<<<<<<< HEAD
+ <publishTime>10/10/2024 09:20:23</publishTime>
+ </File>
+ <File Include="bin/DAL.pdb">
+ <publishTime>10/10/2024 09:20:23</publishTime>
+=======
<publishTime>10/09/2024 16:29:37</publishTime>
</File>
<File Include="bin/DAL.pdb">
<publishTime>10/09/2024 16:29:37</publishTime>
+>>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
+<<<<<<< HEAD
+ <publishTime>10/10/2024 09:20:18</publishTime>
+ </File>
+ <File Include="bin/DBUtility.pdb">
+ <publishTime>10/10/2024 09:20:18</publishTime>
+=======
<publishTime>10/09/2024 16:29:34</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
<publishTime>10/09/2024 16:29:34</publishTime>
+>>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +136,17 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
+<<<<<<< HEAD
+ <publishTime>10/10/2024 09:20:19</publishTime>
+ </File>
+ <File Include="bin/Model.pdb">
+ <publishTime>10/10/2024 09:20:19</publishTime>
+=======
<publishTime>10/09/2024 16:29:35</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>10/09/2024 16:29:35</publishTime>
+>>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/25/2024 09:46:41</publishTime>
@@ -147,6 +179,18 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
+<<<<<<< HEAD
+ <publishTime>10/10/2024 09:20:17</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.pdb">
+ <publishTime>10/10/2024 09:20:17</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.dll">
+ <publishTime>10/10/2024 09:20:18</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.pdb">
+ <publishTime>10/10/2024 09:20:18</publishTime>
+=======
<publishTime>10/09/2024 16:29:33</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
@@ -157,24 +201,39 @@
</File>
<File Include="bin/Pub_Control.pdb">
<publishTime>10/09/2024 16:29:34</publishTime>
+>>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
+<<<<<<< HEAD
+ <publishTime>10/10/2024 09:20:18</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.pdb">
+ <publishTime>10/10/2024 09:20:18</publishTime>
+=======
<publishTime>10/09/2024 16:29:34</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
<publishTime>10/09/2024 16:29:34</publishTime>
+>>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
+<<<<<<< HEAD
+ <publishTime>10/10/2024 09:17:57</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.pdb">
+ <publishTime>10/10/2024 09:17:57</publishTime>
+=======
<publishTime>10/09/2024 16:29:27</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
<publishTime>10/09/2024 16:29:27</publishTime>
+>>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +344,33 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
+<<<<<<< HEAD
+ <publishTime>10/10/2024 09:18:03</publishTime>
+ </File>
+ <File Include="bin/TopSdk.pdb">
+ <publishTime>10/10/2024 09:18:03</publishTime>
+=======
<publishTime>10/09/2024 16:29:24</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
<publishTime>10/09/2024 16:29:24</publishTime>
+>>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
+<<<<<<< HEAD
+ <publishTime>10/10/2024 09:20:55</publishTime>
+ </File>
+ <File Include="bin/WebAPI.pdb">
+ <publishTime>10/10/2024 09:20:55</publishTime>
+=======
<publishTime>10/09/2024 16:29:55</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>10/09/2024 16:29:55</publishTime>
+>>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -384,7 +457,11 @@
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="packages.config">
+<<<<<<< HEAD
+ <publishTime>09/19/2024 10:10:46</publishTime>
+=======
<publishTime>09/19/2024 09:05:04</publishTime>
+>>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629
</File>
<File Include="Views/Scripts/bootstrap.js">
<publishTime>05/25/2024 09:46:41</publishTime>
@@ -492,7 +569,11 @@
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web.config">
+<<<<<<< HEAD
+ <publishTime>09/19/2024 15:36:40</publishTime>
+=======
<publishTime>10/09/2024 16:29:56</publishTime>
+>>>>>>> fa997fd4354db116cfae04f1232779ce0b38f629
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
index a32fee2..ab6aa0a 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user
@@ -3,4 +3,499 @@
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
+ <PropertyGroup>
+ <History>True|2024-10-11T08:49:55.1188159Z;True|2024-10-11T16:11:04.2021026+08:00;True|2024-10-11T15:48:50.7687290+08:00;True|2024-10-11T15:33:27.8527915+08:00;True|2024-10-11T14:49:01.6142514+08:00;False|2024-10-11T14:48:33.6149374+08:00;True|2024-10-11T13:50:33.4424142+08:00;False|2024-10-11T13:41:53.6580199+08:00;False|2024-10-11T13:41:39.5167380+08:00;False|2024-10-11T13:37:52.6531605+08:00;False|2024-10-11T13:37:11.7263329+08:00;</History>
+ <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
+ </PropertyGroup>
+ <ItemGroup>
+ <File Include="apiapp.json">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.EndpointUtil.dll">
+ <publishTime>04/07/2020 16:33:48</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewayDingTalk.dll">
+ <publishTime>04/25/2023 17:49:04</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.GatewaySpi.dll">
+ <publishTime>07/31/2024 20:50:30</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiClient.dll">
+ <publishTime>08/06/2024 18:07:52</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.OpenApiUtil.dll">
+ <publishTime>11/22/2022 11:24:18</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.SDK.Dingtalk.dll">
+ <publishTime>08/08/2024 19:43:22</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaUtil.dll">
+ <publishTime>07/15/2024 20:25:56</publishTime>
+ </File>
+ <File Include="bin/AlibabaCloud.TeaXML.dll">
+ <publishTime>08/03/2022 21:46:08</publishTime>
+ </File>
+ <File Include="bin/Aliyun.Credentials.dll">
+ <publishTime>07/24/2024 10:36:58</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.dll">
+ <publishTime>02/22/2013 16:43:40</publishTime>
+ </File>
+ <File Include="bin/Antlr3.Runtime.pdb">
+ <publishTime>02/22/2013 16:43:40</publishTime>
+ </File>
+ <File Include="bin/BLL.dll">
+ <publishTime>10/11/2024 13:37:29</publishTime>
+ </File>
+ <File Include="bin/BLL.pdb">
+ <publishTime>10/11/2024 13:37:29</publishTime>
+ </File>
+ <File Include="bin/BouncyCastle.Crypto.dll">
+ <publishTime>12/18/2020 05:32:28</publishTime>
+ </File>
+ <File Include="bin/DAL.dll">
+ <publishTime>10/11/2024 13:37:28</publishTime>
+ </File>
+ <File Include="bin/DAL.pdb">
+ <publishTime>10/11/2024 13:37:28</publishTime>
+ </File>
+ <File Include="bin/Dapper.dll">
+ <publishTime>07/22/2016 22:52:40</publishTime>
+ </File>
+ <File Include="bin/DBUtility.dll">
+ <publishTime>10/11/2024 13:37:23</publishTime>
+ </File>
+ <File Include="bin/DBUtility.pdb">
+ <publishTime>10/11/2024 13:37:23</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.Api.dll">
+ <publishTime>03/22/2022 13:17:26</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.Api.pdb">
+ <publishTime>03/19/2022 07:39:42</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.dll">
+ <publishTime>03/22/2022 13:17:20</publishTime>
+ </File>
+ <File Include="bin/Grpc.Core.pdb">
+ <publishTime>03/19/2022 07:39:48</publishTime>
+ </File>
+ <File Include="bin/grpc_csharp_ext.x64.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="bin/grpc_csharp_ext.x86.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="bin/ICSharpCode.SharpZipLib.dll">
+ <publishTime>05/09/2021 01:08:30</publishTime>
+ </File>
+ <File Include="bin/ICSharpCode.SharpZipLib.pdb">
+ <publishTime>05/09/2021 01:08:30</publishTime>
+ </File>
+ <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="bin/libgrpc_csharp_ext.x64.dylib">
+ <publishTime>03/19/2022 07:38:44</publishTime>
+ </File>
+ <File Include="bin/libgrpc_csharp_ext.x64.so">
+ <publishTime>03/19/2022 07:38:42</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll">
+ <publishTime>03/19/2015 01:02:50</publishTime>
+ </File>
+ <File Include="bin/Microsoft.CSharp.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/Microsoft.Web.Infrastructure.dll">
+ <publishTime>07/25/2012 19:48:56</publishTime>
+ </File>
+ <File Include="bin/Model.dll">
+ <publishTime>10/11/2024 13:37:24</publishTime>
+ </File>
+ <File Include="bin/Model.pdb">
+ <publishTime>10/11/2024 13:37:24</publishTime>
+ </File>
+ <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="bin/Newtonsoft.Json.dll">
+ <publishTime>03/08/2023 15:09:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.dll">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OOXML.dll">
+ <publishTime>10/23/2021 09:07:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.OOXML.pdb">
+ <publishTime>10/23/2021 17:07:56</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXml4Net.dll">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXml4Net.pdb">
+ <publishTime>10/23/2021 17:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXmlFormats.dll">
+ <publishTime>10/23/2021 09:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.OpenXmlFormats.pdb">
+ <publishTime>10/23/2021 17:07:54</publishTime>
+ </File>
+ <File Include="bin/NPOI.pdb">
+ <publishTime>10/23/2021 17:07:54</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.dll">
+ <publishTime>10/11/2024 13:37:21</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.pdb">
+ <publishTime>10/11/2024 13:37:21</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.dll">
+ <publishTime>10/11/2024 13:37:22</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.pdb">
+ <publishTime>10/11/2024 13:37:22</publishTime>
+ </File>
+ <File Include="bin/RestSharp.dll">
+ <publishTime>08/31/2012 06:22:50</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.dll">
+ <publishTime>10/11/2024 13:37:22</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.pdb">
+ <publishTime>10/11/2024 13:37:22</publishTime>
+ </File>
+ <File Include="bin/Swashbuckle.Core.dll">
+ <publishTime>02/16/2015 01:57:08</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.dll">
+ <publishTime>10/11/2024 13:37:19</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.pdb">
+ <publishTime>10/11/2024 13:37:19</publishTime>
+ </File>
+ <File Include="bin/System.Buffers.dll">
+ <publishTime>07/19/2017 18:01:28</publishTime>
+ </File>
+ <File Include="bin/System.ComponentModel.DataAnnotations.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Configuration.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.DataSetExtensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Data.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Drawing.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.EnterpriseServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.IdentityModel.Tokens.Jwt.dll">
+ <publishTime>08/19/2014 18:03:34</publishTime>
+ </File>
+ <File Include="bin/System.Memory.dll">
+ <publishTime>04/18/2019 00:24:34</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Extensions.dll">
+ <publishTime>02/20/2015 04:10:46</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Formatting.dll">
+ <publishTime>11/28/2018 21:00:36</publishTime>
+ </File>
+ <File Include="bin/System.Net.Http.Primitives.dll">
+ <publishTime>02/20/2015 04:10:46</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
+ <publishTime>09/19/2018 03:38:10</publishTime>
+ </File>
+ <File Include="bin/System.Runtime.Serialization.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.ApplicationServices.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Cors.dll">
+ <publishTime>11/28/2018 20:58:44</publishTime>
+ </File>
+ <File Include="bin/System.Web.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.DynamicData.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Entity.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Extensions.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.Helpers.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.Cors.dll">
+ <publishTime>11/28/2018 21:01:26</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.dll">
+ <publishTime>11/28/2018 21:01:00</publishTime>
+ </File>
+ <File Include="bin/System.Web.Http.WebHost.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="bin/System.Web.Mvc.dll">
+ <publishTime>01/28/2015 12:02:18</publishTime>
+ </File>
+ <File Include="bin/System.Web.Optimization.dll">
+ <publishTime>02/11/2014 23:26:04</publishTime>
+ </File>
+ <File Include="bin/System.Web.Razor.dll">
+ <publishTime>01/28/2015 12:02:32</publishTime>
+ </File>
+ <File Include="bin/System.Web.Services.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Deployment.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Web.WebPages.Razor.dll">
+ <publishTime>01/28/2015 12:04:30</publishTime>
+ </File>
+ <File Include="bin/System.Xml.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/System.Xml.Linq.dll">
+ <publishTime>09/26/2012 03:16:08</publishTime>
+ </File>
+ <File Include="bin/Tea.dll">
+ <publishTime>05/09/2023 10:43:40</publishTime>
+ </File>
+ <File Include="bin/TopSdk.dll">
+ <publishTime>10/11/2024 13:37:24</publishTime>
+ </File>
+ <File Include="bin/TopSdk.pdb">
+ <publishTime>10/11/2024 13:37:24</publishTime>
+ </File>
+ <File Include="bin/WebActivatorEx.dll">
+ <publishTime>11/24/2014 19:18:48</publishTime>
+ </File>
+ <File Include="bin/WebAPI.dll">
+ <publishTime>10/11/2024 16:49:47</publishTime>
+ </File>
+ <File Include="bin/WebAPI.pdb">
+ <publishTime>10/11/2024 16:49:47</publishTime>
+ </File>
+ <File Include="bin/WebAPI.XmlSerializers.dll">
+ <publishTime>10/11/2024 16:49:54</publishTime>
+ </File>
+ <File Include="bin/WebGrease.dll">
+ <publishTime>07/18/2013 01:03:52</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
+ <publishTime>11/29/2018 21:26:02</publishTime>
+ </File>
+ <File Include="bin/zh-Hans/System.Web.Http.resources.dll">
+ <publishTime>11/29/2018 21:26:30</publishTime>
+ </File>
+ <File Include="Config/kdapi.config">
+ <publishTime>04/06/2023 15:57:01</publishTime>
+ </File>
+ <File Include="Content/bootstrap.css">
+ <publishTime>04/06/2023 15:57:01</publishTime>
+ </File>
+ <File Include="Content/bootstrap.min.css">
+ <publishTime>04/06/2023 15:57:01</publishTime>
+ </File>
+ <File Include="Content/Site.css">
+ <publishTime>04/06/2023 15:57:01</publishTime>
+ </File>
+ <File Include="DLL/BLL.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="DLL/DAL.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="DLL/DBUtility.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="DLL/Model.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="DLL/Newtonsoft.Json.Net35.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="DLL/Pub_Class.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="DLL/Pub_Control.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="DLL/SQLHelper.dll">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.eot">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.svg">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.ttf">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="fonts/glyphicons-halflings-regular.woff">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Global.asax">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="grpc_csharp_ext.x64.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="grpc_csharp_ext.x86.dll">
+ <publishTime>03/22/2022 13:17:22</publishTime>
+ </File>
+ <File Include="Index.html">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="libgrpc_csharp_ext.x64.dylib">
+ <publishTime>03/19/2022 07:38:44</publishTime>
+ </File>
+ <File Include="libgrpc_csharp_ext.x64.so">
+ <publishTime>03/19/2022 07:38:42</publishTime>
+ </File>
+ <File Include="libman.json">
+ <publishTime>07/12/2023 08:14:21</publishTime>
+ </File>
+ <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="packages.config">
+ <publishTime>09/19/2024 10:10:46</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.js">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Scripts/bootstrap.min.js">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.js">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.js">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery-1.10.2.min.map">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.js">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.min.js">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Scripts/modernizr-2.6.2.js">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Shared/Error.cshtml">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/Shared/_Layout.cshtml">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/web.config">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Views/_ViewStart.cshtml">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
+ <publishTime>04/06/2023 15:57:02</publishTime>
+ </File>
+ <File Include="Web References/WebS/Reference.map">
+ <publishTime>05/06/2024 13:47:57</publishTime>
+ </File>
+ <File Include="Web.config">
+ <publishTime>10/11/2024 13:50:30</publishTime>
+ </File>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 319b778..ad764f1 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"/>--><!--鏂帿灏�-->
@@ -106,13 +106,13 @@
</basicHttpBinding>
</bindings>
<client>
- <endpoint address="http://localhost/webs-web/webservice1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
+ <endpoint address="http://192.168.0.11/WEBS-WMS/WebService1.asmx" binding="basicHttpBinding" bindingConfiguration="WebService1Soap" contract="Webs1.WebService1Soap" name="WebService1Soap" />
</client>
</system.serviceModel>
<applicationSettings>
<WebAPI.Properties.Settings>
<setting name="WebAPI_WebS_WebService1" serializeAs="String">
- <value>http://localhost/webs-web/webservice1.asmx</value>
+ <value>http://192.168.0.11/WEBS-WMS/WebService1.asmx</value>
</setting>
</WebAPI.Properties.Settings>
</applicationSettings>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 6aa1e71..a86231e 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -432,6 +432,7 @@
<Compile Include="Controllers\CGGL\Cg_PayableBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_CallGoodsBillBackController.cs" />
<Compile Include="Controllers\CJGL\Cj_CallGoodsBillMainController.cs" />
+ <Compile Include="Controllers\CJGL\Cj_CenterCheckBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_ComplementGoodsBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" />
<Compile Include="Controllers\CJGL\Cj_SendGoodsBillController.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index c591c4e..732feca 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -9,8 +9,8 @@
<WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile10.pubxml</NameOfLastUsedPublishProfile>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <NameOfLastUsedPublishProfile>D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile6.pubxml</NameOfLastUsedPublishProfile>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/WorkM/bin/Release/BLL.dll b/WorkM/bin/Release/BLL.dll
index 547dd7a..d527af4 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 8f2040f..3cd3d4f 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 b6ba414..035e49e 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 5cd5bf7..4605e8b 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 f2cdd0d..e78bdb7 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 a669f85..1049ca1 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 796b802..ef97a6c 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 7cdb005..1270e49 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 75a651a..c1c6c58 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 b645562..4b00db2 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 18bc956..f257e83 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 da0c974..bad06d8 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 7303155..5101ffe 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 466673a..1e71889 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 c5ec251..521e315 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 351238d..38afaea 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 e588ef3..c715704 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 fef4835..d29c979 100644
--- a/WorkM/bin/Release/WorkM.pdb
+++ b/WorkM/bin/Release/WorkM.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
index 90d22f2..bfdb1a1 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 5cbab97..e26e240 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
index d6e21aa..b3a6f35 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index 5cbbb34..716910b 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -16,3 +16,9 @@
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
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..f5e894a
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.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..f67032a
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -0,0 +1,6 @@
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
+D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
new file mode 100644
index 0000000..bfdb1a1
--- /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..e26e240
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1