From a0586edd1c53e6c7065fd2a90809ecb4fa293922 Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期二, 12 十一月 2024 17:43:02 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 16 +- PlanM/bin/Release/PlanM.dll | 0 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 APSM/bin/Release/DAL.dll | 0 Model/bin/Release/Pub_Control.dll | 0 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs | 40 +++++ Pub_Control/bin/Release/Pub_Class.pdb | 0 PayM/obj/x86/Debug/PayM.csproj.AssemblyReference.cache | 0 sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0 Pub_Control/bin/Release/Pub_Class.dll | 0 APSM/bin/Release/DAL.pdb | 0 Pub_Control/bin/Release/Pub_Control.dll | 0 BLL/bin/Release/DBUtility.pdb | 0 DAL/bin/Release/SQLHelper.dll | 0 SQLHelper/bin/Release/SQLHelper.dll | 0 APSM/bin/Release/DBUtility.pdb | 0 WorkM/bin/Release/Pub_Class.dll | 0 DAL/bin/Release/SQLHelper.pdb | 0 SQLHelper/bin/Release/SQLHelper.pdb | 0 DBUtility/obj/Release/DBUtility.pdb | 0 BLL/bin/Release/DBUtility.dll | 0 WarM/bin/Release/BLL.pdb | 0 WorkM/bin/Release/Pub_Class.pdb | 0 Pub_Control/bin/Release/Pub_Control.pdb | 0 DBUtility/obj/Release/DBUtility.dll | 0 APSM/bin/Release/DBUtility.dll | 0 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0 Model/obj/Release/Model.dll | 0 BLL/bin/Release/Pub_Class.dll | 0 WorkM/bin/Release/DBUtility.pdb | 0 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 BLL/bin/Release/SQLHelper.dll | 0 DAL/bin/Release/Model.dll | 0 BaseSet/bin/Release/Pub_Control.dll | 0 APSM/bin/Release/BaseSet.pdb | 0 DBUtility/bin/Release/Pub_Control.dll | 0 BaseSet/bin/Release/Pub_Class.dll | 0 BLL/bin/Release/DAL.pdb | 0 PlanM/bin/Release/BLL.dll | 0 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 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 PlanM/bin/Release/SQLHelper.pdb | 0 PlanM/bin/Release/Model.pdb | 0 WarM/bin/Release/Pub_Class.pdb | 0 PlanM/bin/Release/Model.dll | 0 SQLHelper/bin/Release/Pub_Class.pdb | 0 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 sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 10 BaseSet/bin/Release/DAL.dll | 0 DAL/bin/Release/Pub_Class.dll | 0 WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 20 ++ APSM/bin/Release/APSM.pdb | 0 PayM/bin/x86/Debug/PayM.dll | 0 PayM/bin/x86/Debug/PayM.pdb | 0 WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user | 46 +++--- APSM/bin/Release/APSM.dll | 0 APSM/bin/Release/SQLHelper.pdb | 0 APSM/bin/Release/SQLHelper.dll | 0 BaseSet/bin/Release/BLL.pdb | 0 DBUtility/bin/Release/Pub_Class.dll | 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 | 11 APSM/bin/Release/PlanM.pdb | 0 PlanM/bin/Release/Pub_Class.dll | 0 PayM/bin/x86/Debug/DBUtility.dll | 0 PlanM/bin/Release/Pub_Class.pdb | 0 BLL/bin/Release/Pub_Control.pdb | 0 PlanM/bin/Release/DAL.dll | 0 Model/bin/Release/DBUtility.pdb | 0 PayM/bin/x86/Debug/DAL.dll | 0 APSM/bin/Release/Pub_Control.pdb | 0 PayM/bin/x86/Debug/DBUtility.pdb | 0 WebAPI/Controllers/XSGL/Xs_CusBalanceReportController.cs | 59 ++++++++ BLL/bin/Release/Pub_Control.dll | 0 WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New.cs | 24 +++ 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 Model/bin/Release/Pub_Class.dll | 0 PayM/bin/x86/Debug/DAL.pdb | 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 | 19 -- APSM/bin/Release/BLL.dll | 0 DAL/bin/Release/DBUtility.dll | 0 DAL/bin/Release/Pub_Control.dll | 0 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 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0 WorkM/bin/Release/WorkM.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 | 21 +++ sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0 WarM/bin/Release/WarM.dll | 0 WarM/bin/Release/SQLHelper.pdb | 0 WorkM/bin/Release/Model.dll | 0 WorkM/bin/Release/WorkM.dll | 0 sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 21 -- sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0 WarM/bin/Release/Model.pdb | 0 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 SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0 WarM/bin/Release/DAL.pdb | 0 WorkM/bin/Release/WarM.pdb | 0 PlanM/bin/Release/DBUtility.pdb | 0 WebAPI/Controllers/项目管理/工程项目/PM_ProjectBillController.cs | 107 +++++++++++++++ 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 /dev/null | 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 195 files changed, 310 insertions(+), 84 deletions(-) diff --git a/APSM/bin/Release/APSM.dll b/APSM/bin/Release/APSM.dll index 98c0cb2..5715d46 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 8ea53be..ad658d0 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 05895a0..8d3c489 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 50392c9..0c4ae8a 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 07633a4..21ebc5c 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 67ab425..df9332c 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 ad5eced..e9b895b 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 9d19248..164070d 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 565cb76..34f2aa5 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 7ab3cfb..cb834fd 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 1a980fb..003658e 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 19bafd7..32a1f32 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 97eb112..beea5e4 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 1c365a2..9ddcc2a 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 4558bf9..a3f647c 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 0ebdbcf..c848ab3 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 98d143f..733450b 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 4ad6284..481d87d 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 ffa9fcc..8d9aba7 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 d1a13e7..f1f8e10 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 1ebeb4d..f8d2307 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 3b0af42..db43201 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 3073d45..f54cd2d 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 895d945..e56eb8e 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 05895a0..8d3c489 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 50392c9..0c4ae8a 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 ad5eced..e9b895b 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 9d19248..164070d 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 565cb76..34f2aa5 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 7ab3cfb..cb834fd 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 1a980fb..003658e 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 19bafd7..32a1f32 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 4558bf9..a3f647c 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 0ebdbcf..c848ab3 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 98d143f..733450b 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 4ad6284..481d87d 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 ffa9fcc..8d9aba7 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 d1a13e7..f1f8e10 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 05895a0..8d3c489 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 50392c9..0c4ae8a 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 07633a4..21ebc5c 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 67ab425..df9332c 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 ad5eced..e9b895b 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 9d19248..164070d 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 565cb76..34f2aa5 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 7ab3cfb..cb834fd 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 1a980fb..003658e 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 19bafd7..32a1f32 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 4558bf9..a3f647c 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 0ebdbcf..c848ab3 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 98d143f..733450b 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 4ad6284..481d87d 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 ffa9fcc..8d9aba7 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 d1a13e7..f1f8e10 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 ad5eced..e9b895b 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 9d19248..164070d 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 565cb76..34f2aa5 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 7ab3cfb..cb834fd 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 1a980fb..003658e 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 19bafd7..32a1f32 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 4558bf9..a3f647c 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 0ebdbcf..c848ab3 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 98d143f..733450b 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 4ad6284..481d87d 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 ffa9fcc..8d9aba7 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 d1a13e7..f1f8e10 100644 --- a/DAL/bin/Release/SQLHelper.pdb +++ b/DAL/bin/Release/SQLHelper.pdb Binary files differ diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll index 565cb76..34f2aa5 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 7ab3cfb..cb834fd 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 4558bf9..a3f647c 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 0ebdbcf..c848ab3 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 98d143f..733450b 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 4ad6284..481d87d 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 ffa9fcc..8d9aba7 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 d1a13e7..f1f8e10 100644 --- a/DBUtility/bin/Release/SQLHelper.pdb +++ b/DBUtility/bin/Release/SQLHelper.pdb Binary files differ diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache index 5d3381e..f5e894a 100644 --- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache +++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache Binary files differ diff --git a/DBUtility/obj/Release/DBUtility.dll b/DBUtility/obj/Release/DBUtility.dll index 565cb76..34f2aa5 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 7ab3cfb..cb834fd 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 565cb76..34f2aa5 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 7ab3cfb..cb834fd 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 1a980fb..003658e 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 19bafd7..32a1f32 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 4558bf9..a3f647c 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 0ebdbcf..c848ab3 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 98d143f..733450b 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 4ad6284..481d87d 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 ffa9fcc..8d9aba7 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 d1a13e7..f1f8e10 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 b8c0a65..f2f1252 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 1a980fb..003658e 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 19bafd7..32a1f32 100644 --- a/Model/obj/Release/Model.pdb +++ b/Model/obj/Release/Model.pdb Binary files differ diff --git a/PayM/bin/x86/Debug/BLL.dll b/PayM/bin/x86/Debug/BLL.dll index 91539cf..d5a884b 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 0f65fa6..4ec9ceb 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 a7037c9..2a3bb45 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 2dfa012..308c2f6 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 f189d22..78ef412 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 ebde9f4..4d9c4ef 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/Model.dll b/PayM/bin/x86/Debug/Model.dll index 1f33780..b86a004 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 7c05012..582934b 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 09328be..7e5f08f 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 daf184b..b92a56a 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 84067ea..b3fa0b3 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 0b7da37..4a6ca49 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 5cf4138..9279b82 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 6261a58..58eb840 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 c29f1c5..f9484c3 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 1d1d0c7..bfbd2f3 100644 --- a/PayM/bin/x86/Debug/SQLHelper.pdb +++ b/PayM/bin/x86/Debug/SQLHelper.pdb Binary files differ diff --git a/PayM/obj/x86/Debug/PayM.csproj.AssemblyReference.cache b/PayM/obj/x86/Debug/PayM.csproj.AssemblyReference.cache index 6fff4e8..a83f4b8 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.dll b/PayM/obj/x86/Debug/PayM.dll index 09328be..7e5f08f 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 daf184b..b92a56a 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 05895a0..8d3c489 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 50392c9..0c4ae8a 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 ad5eced..e9b895b 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 9d19248..164070d 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 565cb76..34f2aa5 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 7ab3cfb..cb834fd 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 1a980fb..003658e 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 19bafd7..32a1f32 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 97eb112..beea5e4 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 1c365a2..9ddcc2a 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 4558bf9..a3f647c 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 0ebdbcf..c848ab3 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 98d143f..733450b 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 4ad6284..481d87d 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 ffa9fcc..8d9aba7 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 d1a13e7..f1f8e10 100644 --- a/PlanM/bin/Release/SQLHelper.pdb +++ b/PlanM/bin/Release/SQLHelper.pdb Binary files differ diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll index 4558bf9..a3f647c 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 0ebdbcf..c848ab3 100644 --- a/Pub_Class/bin/Release/Pub_Class.pdb +++ b/Pub_Class/bin/Release/Pub_Class.pdb Binary files differ diff --git a/Pub_Control/bin/Release/Pub_Class.dll b/Pub_Control/bin/Release/Pub_Class.dll index 4558bf9..a3f647c 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 0ebdbcf..c848ab3 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 98d143f..733450b 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 4ad6284..481d87d 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 4558bf9..a3f647c 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 0ebdbcf..c848ab3 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 ffa9fcc..8d9aba7 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 d1a13e7..f1f8e10 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 a52e0dc..f5e894a 100644 --- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache +++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache Binary files differ diff --git a/SQLHelper/obj/Release/SQLHelper.dll b/SQLHelper/obj/Release/SQLHelper.dll index ffa9fcc..8d9aba7 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 d1a13e7..f1f8e10 100644 --- a/SQLHelper/obj/Release/SQLHelper.pdb +++ b/SQLHelper/obj/Release/SQLHelper.pdb Binary files differ diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache deleted file mode 100644 index fea44e6..0000000 --- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache +++ /dev/null Binary files differ diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt index a9bcd2e..a84a65c 100644 --- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt +++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt @@ -1,24 +1,5 @@ -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 -D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll -D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb -D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache -D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll -D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb -<<<<<<< HEAD -D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache -======= -C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache -<<<<<<< HEAD D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb -D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache -======= ->>>>>>> df8354d552a8658d5919d801ad307489c039eb02 ->>>>>>> e15856e05e8c9f2bf787dca73c6178e0326e3d6c diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache deleted file mode 100644 index f5e894a..0000000 --- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache +++ /dev/null Binary files differ diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt index 4a9376d..97979d2 100644 --- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt +++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt @@ -1,6 +1,5 @@ -E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll -E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb -E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache -E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache -E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll -E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb +D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll +D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb +D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache +D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll +D:\缃戠珯鍙戝竷\鍚庣浠g爜\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 index 609cfaf..9a5be6e 100644 --- a/SyntacticSugar/obj/Release/SyntacticSugar.dll +++ b/SyntacticSugar/obj/Release/SyntacticSugar.dll Binary files differ diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.pdb b/SyntacticSugar/obj/Release/SyntacticSugar.pdb index f3f20ec..310ad83 100644 --- a/SyntacticSugar/obj/Release/SyntacticSugar.pdb +++ b/SyntacticSugar/obj/Release/SyntacticSugar.pdb Binary files differ diff --git a/WarM/bin/Release/BLL.dll b/WarM/bin/Release/BLL.dll index 05895a0..8d3c489 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 50392c9..0c4ae8a 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 ad5eced..e9b895b 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 9d19248..164070d 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 565cb76..34f2aa5 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 7ab3cfb..cb834fd 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 1a980fb..003658e 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 19bafd7..32a1f32 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 4558bf9..a3f647c 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 0ebdbcf..c848ab3 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 98d143f..733450b 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 4ad6284..481d87d 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 ffa9fcc..8d9aba7 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 d1a13e7..f1f8e10 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 1ebeb4d..f8d2307 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 3b0af42..db43201 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 1ad2c42..6627b0f 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" @@ -1038,7 +1038,29 @@ //鎷兼帴鎵瑰彿 HBarCode_MaxNo = sYear + sPeriod + sDay + LIU; - return HBarCode_MaxNo; + long HBarCode_MaxNo_long = long.Parse(HBarCode_MaxNo); + + while (true) + { + int HCount_BarCodeBillList = 0; + int HCount_SubBarCodeBill = 0; + string sql_confirm = "select * from h_v_IF_BarCodeBillList where 鏉$爜缂栧彿 = '" + (ClsPub.isStrNull(grdSub.Rows[0].Cells[HMaterModel2Col].Value) + HBarCode_MaxNo_long.ToString()) + "' and 鏉$爜绫诲瀷 = '鍞竴鏉$爜'" + " and CONVERT(varchar(100),鏉$爜鏃ユ湡, 23) = '" + HDate + "'"; + ds = oCn.RunProcReturn(sql_confirm, "h_v_IF_BarCodeBillList"); + HCount_BarCodeBillList = ds.Tables[0].Rows.Count; + sql_confirm = "select * from Gy_BarCodeBill_SWELL_SubBarCodeBill Where HBarCode = '" + (ClsPub.isStrNull(grdSub.Rows[0].Cells[HMaterModel2Col].Value) + HBarCode_MaxNo_long.ToString()) + "' and HBarCodeType = '鍞竴鏉$爜'" + " and CONVERT(varchar(100),HMakeDate, 23) = '" + HDate + "'"; + ds = oCn.RunProcReturn(sql_confirm, "Gy_BarCodeBill_SWELL_SubBarCodeBill"); + HCount_SubBarCodeBill = ds.Tables[0].Rows.Count; + if (HCount_BarCodeBillList + HCount_SubBarCodeBill > 0) + { + HBarCode_MaxNo_long += 1; + } + else + { + break; + } + } + + return HBarCode_MaxNo_long.ToString(); } #endregion diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs index 6a5c68d..bda557a 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs @@ -422,6 +422,26 @@ objJsonResult.Verify = "N"; } } + + //娴嬭瘯璇彞=========================================================================================================== + string msg_str = ""; + string sql_str = "select a.HQty HQty_Main,b.HQty HQty_Sub " + + "from Sc_ProcessExchangeBillMain as a " + + "inner join Sc_ProcessExchangeBillSub as b on a.HInterID = b.HInterID " + + "where a.HInterID = " + HProcExchInterID; + DataSet ds_str = oCN.RunProcReturn(sql_str, "Sc_ProcessExchangeBillMain"); + if (ds_str.Tables[0].Rows.Count > 0) + { + msg_str = "HQty_Main:" + ds_str.Tables[0].Rows[0]["HQty_Main"].ToString() + ";HQty_Sub:"; + for (int j = 0; j < ds_str.Tables[0].Rows.Count; j++) + { + msg_str += ds_str.Tables[0].Rows[j]["HQty_Sub"].ToString() + ","; + } + } + + oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "淇敼宸ュ簭杩涚珯鍗曟嵁锛�" + HBillNo + "[宸ュ簭娴佽浆鍗″彿锛�" + HProcExchBillNo + "]" + msg_str + "','LMES-宸ュ簭鍑虹珯妯″潡','" + DBUtility.ClsPub.IPAddress + "','鏂板鎴栦慨鏀瑰崟鎹�'", ref DBUtility.ClsPub.sExeReturnInfo); + //============================================================================================================== + objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�"; diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs index 4c5b8b3..2580f9c 100644 --- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs +++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs @@ -628,6 +628,27 @@ sw.Stop();//缁撴潫璁℃椂 LogService.Write($"11.鍙傛暟鏌ヨ缁撴潫,鏂板缁撴潫锛岀敤鏃�" + sw.Elapsed); LogService.Write("END--鍑虹珯鍗曟嵁淇濆瓨缁撴潫锛屽嚭绔欏崟鍙凤細" + HBillNo); + + //娴嬭瘯璇彞=========================================================================================================== + string msg_str = ""; + string sql_str = "select a.HQty HQty_Main,b.HQty HQty_Sub " + + "from Sc_ProcessExchangeBillMain as a " + + "inner join Sc_ProcessExchangeBillSub as b on a.HInterID = b.HInterID " + + "where a.HInterID = " + HProcExchInterID; + DataSet ds_str = oCN.RunProcReturn(sql_str, "Sc_ProcessExchangeBillMain"); + if (ds_str.Tables[0].Rows.Count > 0) + { + msg_str = "HQty_Main:" + ds_str.Tables[0].Rows[0]["HQty_Main"].ToString() + ";HQty_Sub:"; + for (int j = 0; j < ds_str.Tables[0].Rows.Count; j++) + { + msg_str += ds_str.Tables[0].Rows[j]["HQty_Sub"].ToString() + ","; + } + } + + oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "淇敼宸ュ簭鍑虹珯鍗曟嵁锛�" + HBillNo + "[宸ュ簭娴佽浆鍗″彿锛�" + HProcExchBillNo + "]" + msg_str + "','LMES-宸ュ簭鍑虹珯妯″潡','" + DBUtility.ClsPub.IPAddress + "','鏂板鎴栦慨鏀瑰崟鎹�'", ref DBUtility.ClsPub.sExeReturnInfo); + //============================================================================================================== + + objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�"; diff --git a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs index ddc965c..4d73021 100644 --- a/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs +++ b/WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs @@ -132,14 +132,50 @@ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); - oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "鏂板宸ュ簭娴佽浆鍗″崟鎹細" + oBill.omodel.HBillNo + "','LMES-宸ュ簭娴佽浆鍗℃ā鍧�','" + DBUtility.ClsPub.IPAddress + "','鏂板鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo); + + //娴嬭瘯璇彞=========================================================================================================== + string msg_str = ""; + string sql_str = "select a.HQty HQty_Main,b.HQty HQty_Sub " + + "from Sc_ProcessExchangeBillMain as a " + + "inner join Sc_ProcessExchangeBillSub as b on a.HInterID = b.HInterID " + + "where a.HInterID = " + oBill.omodel.HInterID; + DataSet ds_str = oCN.RunProcReturn(sql_str, "Sc_ProcessExchangeBillMain"); + if (ds_str.Tables[0].Rows.Count > 0) + { + msg_str = "HQty_Main:" + ds_str.Tables[0].Rows[0]["HQty_Main"].ToString() + ";HQty_Sub:"; + for (int j = 0; j < ds_str.Tables[0].Rows.Count; j++) + { + msg_str += ds_str.Tables[0].Rows[j]["HQty_Sub"].ToString() + ","; + } + } + //============================================================================================================== + + + oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "鏂板宸ュ簭娴佽浆鍗″崟鎹細" + oBill.omodel.HBillNo + msg_str + "','LMES-宸ュ簭娴佽浆鍗℃ā鍧�','" + DBUtility.ClsPub.IPAddress + "','鏂板鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo); } else { LogService.Write("鐢ㄦ埛:" + msg4 + ",鏃ユ湡:" + DateTime.Now + ",淇敼宸ュ簭娴佽浆鍗″崟鎹�:" + oBill.omodel.HBillNo); bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo); - oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "淇敼宸ュ簭娴佽浆鍗″崟鎹細" + oBill.omodel.HBillNo + "','LMES-宸ュ簭娴佽浆鍗℃ā鍧�','" + DBUtility.ClsPub.IPAddress + "','淇敼鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo); + //娴嬭瘯璇彞=========================================================================================================== + string msg_str = ""; + string sql_str = "select a.HQty HQty_Main,b.HQty HQty_Sub " + + "from Sc_ProcessExchangeBillMain as a " + + "inner join Sc_ProcessExchangeBillSub as b on a.HInterID = b.HInterID " + + "where a.HInterID = " + oBill.omodel.HInterID; + DataSet ds_str = oCN.RunProcReturn(sql_str, "Sc_ProcessExchangeBillMain"); + if (ds_str.Tables[0].Rows.Count > 0) + { + msg_str = "HQty_Main:" + ds_str.Tables[0].Rows[0]["HQty_Main"].ToString() + ";HQty_Sub:"; + for (int j = 0; j < ds_str.Tables[0].Rows.Count; j++) + { + msg_str += ds_str.Tables[0].Rows[j]["HQty_Sub"].ToString() + ","; + } + } + //============================================================================================================== + + oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + msg4 + "','" + HComputerName + "','" + "淇敼宸ュ簭娴佽浆鍗″崟鎹細" + oBill.omodel.HBillNo + msg_str + "','LMES-宸ュ簭娴佽浆鍗℃ā鍧�','" + DBUtility.ClsPub.IPAddress + "','淇敼鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo); } if (bResult) { diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs index 5104501..9ae39e8 100644 --- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs +++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs @@ -379,14 +379,16 @@ } + if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴") + { + //鏄惁鍕鹃�夐粯璁ゅ伐鑹鸿矾绾� + if (HStandard) + { + //璁剧疆榛樿宸ヨ壓璺嚎 + oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + user + "'"); + } + } - //鏄惁鍕鹃�夐粯璁ゅ伐鑹鸿矾绾� - //if (HStandard) - //{ - // //璁剧疆榛樿宸ヨ壓璺嚎 - // oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID + ",'" + user + "'"); - //} - //鍒ゆ柇鏄惁閲嶅宸ュ簭鍙� ds = oCN.RunProcReturn("exec h_p_Gy_RoutingCtrl " + HInterID, "h_p_Gy_RoutingCtrl"); diff --git a/WebAPI/Controllers/XSGL/Xs_CusBalanceReportController.cs b/WebAPI/Controllers/XSGL/Xs_CusBalanceReportController.cs index 5ffec76..061d45f 100644 --- a/WebAPI/Controllers/XSGL/Xs_CusBalanceReportController.cs +++ b/WebAPI/Controllers/XSGL/Xs_CusBalanceReportController.cs @@ -145,5 +145,64 @@ } } #endregion + + #region 鍑哄簱鏉$爜鏄庣粏鎶ヨ〃 鏌ヨ + /// <summary> + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("Xs_SellOutCompareToProductReport/list")] + [HttpGet] + public object getXs_SellOutCompareToProductReport(string sWhere, string user) + { + try + { + List<object> columnNameList = new List<object>(); + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("Xs_SellOutCompareToProductReport", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_Xs_SellOutCompareToProductReport order by 鐢熶骇鍗曞彿 desc", "h_v_Xs_SellOutCompareToProductReport"); + } + else + { + string sql1 = "select * from h_v_Xs_SellOutCompareToProductReport where 1 = 1 "; + string sql = sql1 + sWhere + " order by 鐢熶骇鍗曞彿 desc"; + ds = oCN.RunProcReturn(sql, "h_v_Xs_SellOutCompareToProductReport"); + } + + //娣诲姞鍒楀悕 + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion } } \ No newline at end of file diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs" index 59fb125..26184fa 100644 --- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs" +++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs" @@ -101,6 +101,31 @@ public string HContacts; public string HContactNumber; + public int HSupplierID; //鍒嗗寘鍗曚綅锛坓y_supllier锛� + public int HMangerEmpID; //绠$悊鍛橈紙gy_Employee锛� + public string HMaterPlanDate; //鏉愭枡璁″垝 + public int HWorkerID; //鏂藉伐鍛橈紙gy_Employee锛� + public double HPlanWorkTimes; //璁″垝宸ユ湡 + public double HRelWorkTimes; //瀹為檯宸ユ湡 + public string HTestDate; //璇曞帇鏃ユ湡 + public int HTestCheckerID; //璇曞帇楠屾敹浜猴紙gy_Employee锛� + public string HTestNote; //璇曞帇璁板綍锛堝瘜鏂囨湰锛� + public string HSewageDate; //鎺掓薄鏃ユ湡 + public string HWaterSupplyDate; //閫氭按鏃ユ湡 + public string HWorkNote; //绔e伐璧勬枡锛堝瘜鏂囨湰锛� + public string HWorkProcNote; //鏂藉伐瀹屾垚鎯呭喌锛堝瘜鏂囨湰锛� + + public double HYuSuanMoney; //棰勭畻閫犱环 + public double HHeTongMoney; //鍚堝悓閫犱环 + public double HJieSuanMoney; //缁撶畻閫犱环 + public double HShenJiMoney; //瀹¤閫犱环 + public double HCaiLiaoMoney; //鏉愭枡璐� + public double HAnZhuangMoney; //瀹夎璐� + public double HBanZuMoney; //鐝粍宸ヨ垂 + public double HYuShouKuanMoney; //棰勬敹娆� + public double HGongFeiMoney; //宸ヨ垂缁撹处 + public double HJieZhangMoney; //缁撶畻缁撹处 + } #endregion #region 宸ョ▼椤圭洰 椤圭洰闃舵琛ㄤ綋鏁版嵁 @@ -254,6 +279,34 @@ string HProjectNote = mainList[0].HProjectNote; string HContacts = mainList[0].HContacts; string HContactNumber = mainList[0].HContactNumber; + + + int HSupplierID = mainList[0].HSupplierID; //鍒嗗寘鍗曚綅锛坓y_supllier锛� + int HMangerEmpID = mainList[0].HMangerEmpID; //绠$悊鍛橈紙gy_Employee锛� + string HMaterPlanDate = mainList[0].HMaterPlanDate; //鏉愭枡璁″垝 + int HWorkerID = mainList[0].HWorkerID; //鏂藉伐鍛橈紙gy_Employee锛� + double HPlanWorkTimes = mainList[0].HPlanWorkTimes; //璁″垝宸ユ湡 + double HRelWorkTimes = mainList[0].HRelWorkTimes; //瀹為檯宸ユ湡 + string HTestDate = mainList[0].HTestDate; //璇曞帇鏃ユ湡 + int HTestCheckerID = mainList[0].HTestCheckerID; //璇曞帇楠屾敹浜猴紙gy_Employee锛� + string HTestNote = mainList[0].HTestNote; //璇曞帇璁板綍锛堝瘜鏂囨湰锛� + string HSewageDate = mainList[0].HSewageDate; //鎺掓薄鏃ユ湡 + string HWaterSupplyDate = mainList[0].HWaterSupplyDate; //閫氭按鏃ユ湡 + string HWorkNote = mainList[0].HWorkNote; //绔e伐璧勬枡锛堝瘜鏂囨湰锛� + string HWorkProcNote = mainList[0].HWorkProcNote; //鏂藉伐瀹屾垚鎯呭喌锛堝瘜鏂囨湰锛� + + double HYuSuanMoney = mainList[0].HYuSuanMoney; //棰勭畻閫犱环 + double HHeTongMoney = mainList[0].HHeTongMoney; //鍚堝悓閫犱环 + double HJieSuanMoney = mainList[0].HJieSuanMoney; //缁撶畻閫犱环 + double HShenJiMoney = mainList[0].HShenJiMoney; //瀹¤閫犱环 + double HCaiLiaoMoney = mainList[0].HCaiLiaoMoney; //鏉愭枡璐� + double HAnZhuangMoney = mainList[0].HAnZhuangMoney; //瀹夎璐� + double HBanZuMoney = mainList[0].HBanZuMoney; //鐝粍宸ヨ垂 + double HYuShouKuanMoney = mainList[0].HYuShouKuanMoney; //棰勬敹娆� + double HGongFeiMoney = mainList[0].HGongFeiMoney; //宸ヨ垂缁撹处 + double HJieZhangMoney = mainList[0].HJieZhangMoney; //缁撶畻缁撹处 + + if (OperationType == 2) { ds = oCN.RunProcReturn("select * from PM_ProjectBillMain where HBillNo ='" + HBillNo + "'", "PM_ProjectBillMain"); @@ -273,7 +326,8 @@ { string sql = "insert into PM_ProjectBillMain" + "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HBillStatus,HRemark,HMaker,HMakeDate,HProNumber,HProName,HCusID,HBeginDate,HEndDate,HSumMoney," + - "HProMoney,HWorkMoney,HOtherMoney,HProType,HPMEmpID,HWorkEmpID,HDepEmpID,HConWorkDays,HDepDays,HLastMoney,HPayCusID,HOrgID,HMaterID,HProjectClassID,HBuildComp,HBuildAddress,HWorkNo,HReDate,HPicNo,HWorkTask,HProjectNote,HContacts,HContactNumber) " + + "HProMoney,HWorkMoney,HOtherMoney,HProType,HPMEmpID,HWorkEmpID,HDepEmpID,HConWorkDays,HDepDays,HLastMoney,HPayCusID,HOrgID,HMaterID,HProjectClassID,HBuildComp,HBuildAddress,HWorkNo,HReDate,HPicNo,HWorkTask,HProjectNote,HContacts,HContactNumber" + + ",HSupplierID,HMangerEmpID,HMaterPlanDate,HWorkerID,HPlanWorkTimes,HRelWorkTimes,HTestDate,HTestCheckerID,HTestNote,HSewageDate,HWaterSupplyDate,HWorkNote,HWorkProcNote,HYuSuanMoney,HHeTongMoney,HJieSuanMoney,HShenJiMoney,HCaiLiaoMoney,HAnZhuangMoney,HBanZuMoney,HYuShouKuanMoney,HGongFeiMoney,HJieZhangMoney) " + "values(" + "" + HYear + "," + HPeriod + @@ -315,7 +369,30 @@ "','" + HProjectNote + "','" + HContacts + "','" + HContactNumber + - "')"; + "','" + HSupplierID + "'" + + ",'" + HMangerEmpID + "'" + + ",'" + HMaterPlanDate + "'" + + ",'" + HWorkerID + "'" + + ",'" + HPlanWorkTimes + "'" + + ",'" + HRelWorkTimes + "'" + + ",'" + HTestDate + "'" + + ",'" + HTestCheckerID + "'" + + ",'" + HTestNote + "'" + + ",'" + HSewageDate + "'" + + ",'" + HWaterSupplyDate + "'" + + ",'" + HWorkNote + "'" + + ",'" + HWorkProcNote + "'" + + ",'" + HYuSuanMoney + "'" + + ",'" + HHeTongMoney + "'" + + ",'" + HJieSuanMoney + "'" + + ",'" + HShenJiMoney + "'" + + ",'" + HCaiLiaoMoney + "'" + + ",'" + HAnZhuangMoney + "'" + + ",'" + HBanZuMoney + "'" + + ",'" + HYuShouKuanMoney + "'" + + ",'" + HGongFeiMoney + "'" + + ",'" + HJieZhangMoney + "'" + + ")"; //涓昏〃 oCN.RunProc(sql); @@ -364,6 +441,32 @@ "',HProjectNote ='" + HProjectNote + "',HContacts ='" + HContacts + "',HContactNumber ='" + HContactNumber + + + "',HSupplierID = '" + HSupplierID + + "',HMangerEmpID = '" + HMangerEmpID + + "',HMaterPlanDate = '" + HMaterPlanDate + + "',HWorkerID = '" + HWorkerID + + "',HPlanWorkTimes = '" + HPlanWorkTimes + + "',HRelWorkTimes = '" + HRelWorkTimes + + "',HTestDate = '" + HTestDate + + "',HTestCheckerID = '" + HTestCheckerID + + "',HTestNote = '" + HTestNote + + "',HSewageDate = '" + HSewageDate + + "',HWaterSupplyDate = '" + HWaterSupplyDate + + "',HWorkNote = '" + HWorkNote + + "',HWorkProcNote = '" + HWorkProcNote + + "',HYuSuanMoney = '" + HYuSuanMoney + + "',HHeTongMoney = '" + HHeTongMoney + + "',HJieSuanMoney = '" + HJieSuanMoney + + "',HShenJiMoney = '" + HShenJiMoney + + "',HCaiLiaoMoney = '" + HCaiLiaoMoney + + "',HAnZhuangMoney = '" + HAnZhuangMoney + + "',HBanZuMoney = '" + HBanZuMoney + + "',HYuShouKuanMoney = '" + HYuShouKuanMoney + + "',HGongFeiMoney = '" + HGongFeiMoney + + "',HJieZhangMoney = '" + HJieZhangMoney + + + "' where HInterID = " + HInterID; oCN.RunProc(sql); diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user index fe4232b..b12385b 100644 --- a/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user +++ b/WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user @@ -4,7 +4,7 @@ --> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> - <History>True|2024-10-31T08:00:46.6075171Z;True|2024-10-31T15:22:22.3369744+08:00;True|2024-10-31T12:51:43.2180719+08:00;False|2024-10-31T12:50:50.6521635+08:00;True|2024-10-31T12:14:45.2826348+08:00;True|2024-10-31T09:58:20.1772497+08:00;False|2024-10-31T09:57:06.4220474+08:00;True|2024-10-29T08:23:40.1187027+08:00;False|2024-10-29T08:22:57.5875931+08:00;True|2024-10-28T16:59:15.9197469+08:00;True|2024-10-28T14:29:39.0107178+08:00;False|2024-10-28T14:28:48.1635009+08:00;True|2024-10-25T13:45:33.6424342+08:00;True|2024-10-25T09:58:38.8392001+08:00;False|2024-10-25T09:57:49.7417333+08:00;True|2024-10-18T16:43:35.1364495+08:00;False|2024-10-18T16:42:59.5332813+08:00;True|2024-10-18T11:56:15.8267584+08:00;False|2024-10-18T11:55:41.7667883+08:00;True|2024-10-17T16:35:21.5250546+08:00;True|2024-10-17T15:39:45.6140281+08:00;True|2024-10-17T15:13:04.7104524+08:00;True|2024-10-17T14:54:20.5672206+08:00;True|2024-10-17T13:03:49.0562978+08:00;True|2024-10-16T11:57:09.2205029+08:00;True|2024-10-16T11:47:09.1175797+08:00;True|2024-10-16T11:12:45.2631759+08:00;False|2024-10-16T11:11:57.2236500+08:00;True|2024-10-15T16:20:02.9116206+08:00;True|2024-10-15T15:58:43.2926050+08:00;True|2024-10-15T15:42:21.7936803+08:00;True|2024-10-15T15:08:43.2300880+08:00;True|2024-10-15T14:57:53.1025144+08:00;True|2024-10-15T14:49:52.0203753+08:00;True|2024-10-15T13:43:28.4322672+08:00;True|2024-10-15T13:02:51.9833820+08:00;True|2024-10-15T10:35:13.3052884+08:00;True|2024-10-15T10:31:23.7280933+08:00;True|2024-10-15T10:16:45.0292893+08:00;True|2024-10-15T09:59:30.2256849+08:00;True|2024-10-15T09:53:37.7284098+08:00;True|2024-10-15T09:45:34.6928334+08:00;False|2024-10-15T09:45:08.0828173+08:00;True|2024-10-15T09:20:15.0444151+08:00;False|2024-10-15T09:18:15.4388995+08:00;True|2024-10-14T15:31:49.0978922+08:00;False|2024-10-14T15:31:08.3741419+08:00;True|2024-10-14T15:09:44.3508500+08:00;True|2024-10-14T14:45:34.5430843+08:00;True|2024-10-14T14:04:11.8258435+08:00;True|2024-10-14T13:54:24.2353356+08:00;True|2024-10-14T13:48:16.0893349+08:00;False|2024-10-14T13:47:57.1909782+08:00;True|2024-10-14T11:12:14.9583385+08:00;False|2024-10-14T11:11:21.0058133+08:00;True|2024-10-11T16:49:55.1188159+08:00;True|2024-10-11T16:11:04.2021026+08:00;True|2024-10-11T15:48:50.7687290+08:00;True|2024-10-11T15:33:27.8527915+08:00;True|2024-10-11T14:49:01.6142514+08:00;False|2024-10-11T14:48:33.6149374+08:00;True|2024-10-11T13:50:33.4424142+08:00;False|2024-10-11T13:41:53.6580199+08:00;False|2024-10-11T13:41:39.5167380+08:00;False|2024-10-11T13:37:52.6531605+08:00;False|2024-10-11T13:37:11.7263329+08:00;</History> + <History>True|2024-11-11T07:03:29.1473573Z;True|2024-11-11T14:52:17.0201354+08:00;True|2024-11-11T14:16:53.8725631+08:00;True|2024-11-11T13:04:30.9909737+08:00;False|2024-11-11T13:04:04.3586012+08:00;True|2024-11-07T13:54:38.7153293+08:00;False|2024-11-07T13:54:23.0036881+08:00;False|2024-11-07T13:53:56.1173012+08:00;True|2024-11-07T10:03:15.6008864+08:00;True|2024-11-07T09:45:59.3293360+08:00;False|2024-11-07T09:45:15.0034274+08:00;True|2024-11-04T14:38:54.4763789+08:00;True|2024-10-31T16:00:46.6075171+08:00;True|2024-10-31T15:22:22.3369744+08:00;True|2024-10-31T12:51:43.2180719+08:00;False|2024-10-31T12:50:50.6521635+08:00;True|2024-10-31T12:14:45.2826348+08:00;True|2024-10-31T09:58:20.1772497+08:00;False|2024-10-31T09:57:06.4220474+08:00;True|2024-10-29T08:23:40.1187027+08:00;False|2024-10-29T08:22:57.5875931+08:00;True|2024-10-28T16:59:15.9197469+08:00;True|2024-10-28T14:29:39.0107178+08:00;False|2024-10-28T14:28:48.1635009+08:00;True|2024-10-25T13:45:33.6424342+08:00;True|2024-10-25T09:58:38.8392001+08:00;False|2024-10-25T09:57:49.7417333+08:00;True|2024-10-18T16:43:35.1364495+08:00;False|2024-10-18T16:42:59.5332813+08:00;True|2024-10-18T11:56:15.8267584+08:00;False|2024-10-18T11:55:41.7667883+08:00;True|2024-10-17T16:35:21.5250546+08:00;True|2024-10-17T15:39:45.6140281+08:00;True|2024-10-17T15:13:04.7104524+08:00;True|2024-10-17T14:54:20.5672206+08:00;True|2024-10-17T13:03:49.0562978+08:00;True|2024-10-16T11:57:09.2205029+08:00;True|2024-10-16T11:47:09.1175797+08:00;True|2024-10-16T11:12:45.2631759+08:00;False|2024-10-16T11:11:57.2236500+08:00;True|2024-10-15T16:20:02.9116206+08:00;True|2024-10-15T15:58:43.2926050+08:00;True|2024-10-15T15:42:21.7936803+08:00;True|2024-10-15T15:08:43.2300880+08:00;True|2024-10-15T14:57:53.1025144+08:00;True|2024-10-15T14:49:52.0203753+08:00;True|2024-10-15T13:43:28.4322672+08:00;True|2024-10-15T13:02:51.9833820+08:00;True|2024-10-15T10:35:13.3052884+08:00;True|2024-10-15T10:31:23.7280933+08:00;True|2024-10-15T10:16:45.0292893+08:00;True|2024-10-15T09:59:30.2256849+08:00;True|2024-10-15T09:53:37.7284098+08:00;True|2024-10-15T09:45:34.6928334+08:00;False|2024-10-15T09:45:08.0828173+08:00;True|2024-10-15T09:20:15.0444151+08:00;False|2024-10-15T09:18:15.4388995+08:00;True|2024-10-14T15:31:49.0978922+08:00;False|2024-10-14T15:31:08.3741419+08:00;True|2024-10-14T15:09:44.3508500+08:00;True|2024-10-14T14:45:34.5430843+08:00;True|2024-10-14T14:04:11.8258435+08:00;True|2024-10-14T13:54:24.2353356+08:00;True|2024-10-14T13:48:16.0893349+08:00;False|2024-10-14T13:47:57.1909782+08:00;True|2024-10-14T11:12:14.9583385+08:00;False|2024-10-14T11:11:21.0058133+08:00;True|2024-10-11T16:49:55.1188159+08:00;True|2024-10-11T16:11:04.2021026+08:00;True|2024-10-11T15:48:50.7687290+08:00;True|2024-10-11T15:33:27.8527915+08:00;True|2024-10-11T14:49:01.6142514+08:00;False|2024-10-11T14:48:33.6149374+08:00;True|2024-10-11T13:50:33.4424142+08:00;False|2024-10-11T13:41:53.6580199+08:00;False|2024-10-11T13:41:39.5167380+08:00;False|2024-10-11T13:37:52.6531605+08:00;False|2024-10-11T13:37:11.7263329+08:00;</History> <_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl> </PropertyGroup> <ItemGroup> @@ -45,28 +45,28 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> - <publishTime>10/31/2024 15:21:30</publishTime> + <publishTime>11/04/2024 14:38:17</publishTime> </File> <File Include="bin/BLL.pdb"> - <publishTime>10/31/2024 15:21:30</publishTime> + <publishTime>11/04/2024 14:38:17</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> - <publishTime>10/31/2024 15:21:26</publishTime> + <publishTime>11/04/2024 14:38:14</publishTime> </File> <File Include="bin/DAL.pdb"> - <publishTime>10/31/2024 15:21:26</publishTime> + <publishTime>11/04/2024 14:38:14</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> - <publishTime>10/25/2024 09:57:56</publishTime> + <publishTime>11/04/2024 14:38:08</publishTime> </File> <File Include="bin/DBUtility.pdb"> - <publishTime>10/25/2024 09:57:56</publishTime> + <publishTime>11/04/2024 14:38:08</publishTime> </File> <File Include="bin/Grpc.Core.Api.dll"> <publishTime>03/22/2022 13:17:26</publishTime> @@ -111,10 +111,10 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> - <publishTime>10/31/2024 12:13:16</publishTime> + <publishTime>11/04/2024 14:38:08</publishTime> </File> <File Include="bin/Model.pdb"> - <publishTime>10/31/2024 12:13:16</publishTime> + <publishTime>11/04/2024 14:38:08</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>04/06/2023 15:57:02</publishTime> @@ -147,34 +147,34 @@ <publishTime>10/23/2021 17:07:54</publishTime> </File> <File Include="bin/Pub_Class.dll"> - <publishTime>10/25/2024 09:57:55</publishTime> + <publishTime>11/04/2024 14:38:05</publishTime> </File> <File Include="bin/Pub_Class.pdb"> - <publishTime>10/25/2024 09:57:55</publishTime> + <publishTime>11/04/2024 14:38:05</publishTime> </File> <File Include="bin/Pub_Control.dll"> - <publishTime>10/25/2024 09:57:56</publishTime> + <publishTime>11/04/2024 14:38:07</publishTime> </File> <File Include="bin/Pub_Control.pdb"> - <publishTime>10/25/2024 09:57:56</publishTime> + <publishTime>11/04/2024 14:38:07</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> - <publishTime>10/25/2024 09:57:56</publishTime> + <publishTime>11/04/2024 14:38:07</publishTime> </File> <File Include="bin/SQLHelper.pdb"> - <publishTime>10/25/2024 09:57:56</publishTime> + <publishTime>11/04/2024 14:38:07</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> + <publishTime>11/04/2024 14:38:03</publishTime> </File> <File Include="bin/SyntacticSugar.pdb"> - <publishTime>10/11/2024 13:37:19</publishTime> + <publishTime>11/04/2024 14:38:03</publishTime> </File> <File Include="bin/System.Buffers.dll"> <publishTime>07/19/2017 18:01:28</publishTime> @@ -285,22 +285,22 @@ <publishTime>05/09/2023 10:43:40</publishTime> </File> <File Include="bin/TopSdk.dll"> - <publishTime>10/11/2024 13:37:24</publishTime> + <publishTime>11/04/2024 14:38:09</publishTime> </File> <File Include="bin/TopSdk.pdb"> - <publishTime>10/11/2024 13:37:24</publishTime> + <publishTime>11/04/2024 14:38:09</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> - <publishTime>10/31/2024 16:00:39</publishTime> + <publishTime>11/11/2024 15:03:20</publishTime> </File> <File Include="bin/WebAPI.pdb"> - <publishTime>10/31/2024 16:00:39</publishTime> + <publishTime>11/11/2024 15:03:20</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> - <publishTime>10/31/2024 16:00:45</publishTime> + <publishTime>11/11/2024 15:03:28</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> @@ -495,7 +495,7 @@ <publishTime>05/06/2024 13:47:57</publishTime> </File> <File Include="Web.config"> - <publishTime>10/25/2024 09:58:38</publishTime> + <publishTime>11/04/2024 13:35:46</publishTime> </File> </ItemGroup> </Project> \ No newline at end of file diff --git a/WorkM/bin/Release/BLL.dll b/WorkM/bin/Release/BLL.dll index 05895a0..8d3c489 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 50392c9..0c4ae8a 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 ad5eced..e9b895b 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 9d19248..164070d 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 565cb76..34f2aa5 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 7ab3cfb..cb834fd 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 1a980fb..003658e 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 19bafd7..32a1f32 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 4558bf9..a3f647c 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 0ebdbcf..c848ab3 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 98d143f..733450b 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 4ad6284..481d87d 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 ffa9fcc..8d9aba7 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 d1a13e7..f1f8e10 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 1ebeb4d..f8d2307 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 3b0af42..db43201 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 3073d45..f54cd2d 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 895d945..e56eb8e 100644 --- a/WorkM/bin/Release/WorkM.pdb +++ b/WorkM/bin/Release/WorkM.pdb Binary files differ diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll index a269bdb..562aa55 100644 --- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll +++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll Binary files differ diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb index c02bc7a..ae47d52 100644 --- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb +++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb Binary files differ diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll index bfdb1a1..b66bfdb 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 e26e240..8e5f4d1 100644 --- a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb +++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb Binary files differ diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt index 10bf745..cff459a 100644 --- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt +++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt @@ -1,28 +1,11 @@ -E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll -E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb -E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache -E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll -E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb -E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache -D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll -D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb -D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache -D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll -D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb -C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll -C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb -C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache -C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll -C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb -C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb -D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb +D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache <<<<<<< HEAD ======= -D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache >>>>>>> e15856e05e8c9f2bf787dca73c6178e0326e3d6c +>>>>>>> a2bdf7e18d34fba0ef0d701faf4f277cef4f142a diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll index a269bdb..562aa55 100644 --- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll +++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll Binary files differ diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb index c02bc7a..ae47d52 100644 --- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb +++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb Binary files differ diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt index d41f91f..dd9e641 100644 --- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt +++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt @@ -1,5 +1,5 @@ -E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll -E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb -E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache -E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll -E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb +D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll +D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb +D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache +D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll +D:\缃戠珯鍙戝竷\鍚庣浠g爜\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 index 86681a7..b66bfdb 100644 --- a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll +++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll Binary files differ diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb index 1aa59b5..8e5f4d1 100644 --- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb +++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb Binary files differ -- Gitblit v1.9.1