From 26f7f6ab2c121534ea5b05c31cc13e10ef058dd7 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 19 九月 2024 09:05:46 +0800
Subject: [PATCH] 1
---
DAL/车间管理/ClsSc_AssemblyBill.cs | 14
PlanM/bin/Release/PlanM.dll | 0
BaseSet/bin/Release/DBUtility.pdb | 0
WarM/bin/Release/DBUtility.dll | 0
WarM/bin/Release/DBUtility.pdb | 0
Model/bin/Release/Pub_Control.pdb | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb | 0
WebAPI/Controllers/数据同步/钉钉同步/DD_DataSynchronizationController.cs | 770 ++++++++++
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
Pub_Control/bin/Release/Pub_Class.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user | 122
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
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
DAL/bin/Release/SQLHelper.pdb | 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 | 14
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
WebAPI/Controllers/工资管理/Pay_GroupBalBillController.cs | 204 ++
BLL/bin/Release/Pub_Class.dll | 0
WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs | 12
WorkM/bin/Release/DBUtility.pdb | 0
WebAPI/Controllers/BaseSet/Gy_GroupController.cs | 318 ++++
WorkM/bin/Release/DBUtility.dll | 0
LMES/app.config | 25
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
APSM/bin/Release/Model.dll | 0
PlanM/bin/Release/PlanM.pdb | 0
WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs | 205 ++
BLL/bin/Release/Pub_Class.pdb | 0
APSM/bin/Release/Model.pdb | 0
WebAPI/Controllers/仓存管理/领料发货/Kf_MateOutBillController.cs | 69
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
WebAPI/Controllers/ZLGL/BaseSet/Gy_InspectInstruMentController.cs | 225 +++
APSM/bin/Release/BaseSet.pdb | 0
SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0
DBUtility/bin/Release/Pub_Control.dll | 0
BaseSet/bin/Release/Pub_Class.dll | 0
BLL/bin/Release/DAL.pdb | 0
PlanM/bin/Release/BLL.dll | 0
SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0
DAL/bin/Release/Model.pdb | 0
BaseSet/bin/Release/Pub_Class.pdb | 0
Model/Exceptions/Gy_GroupException.cs | 19
WarM/bin/Release/BLL.dll | 0
WorkM/bin/Release/BLL.dll | 0
DBUtility/bin/Release/DBUtility.pdb | 0
PlanM/bin/Release/BLL.pdb | 0
DBUtility/bin/Release/DBUtility.dll | 0
WebAPI/Controllers/WebAPIController.cs | 205 ++
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
WorkM/bin/Release/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
SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0
WarM/bin/Release/Pub_Class.pdb | 0
WebAPI/HttpClient.cs | 37
PlanM/bin/Release/Model.dll | 0
PayM/obj/Release/PayM.csproj.ResolveComReference.cache | 0
SQLHelper/bin/Release/Pub_Class.pdb | 0
WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs | 341 ++++
SQLHelper/bin/Release/Pub_Class.dll | 0
DAL/bin/Release/Pub_Class.pdb | 0
BaseSet/bin/Release/DAL.pdb | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache | 2
WarM/条码打印/Gy_CusBarCodeBill_KaiBei_LangChao.cs | 49
BaseSet/bin/Release/DAL.dll | 0
DAL/bin/Release/Pub_Class.dll | 0
APSM/bin/Release/APSM.pdb | 0
DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources | 0
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
Model/bin/Release/Pub_Class.pdb | 0
BaseSet/bin/Release/BLL.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
WebAPI/packages.config | 1
APSM/bin/Release/WarM.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt | 1
APSM/bin/Release/PlanM.pdb | 0
DAL/工资管理/ClsPay_GroupBalBill.cs | 228 +-
WebAPI/ListModels.cs | 24
PlanM/bin/Release/Pub_Class.dll | 0
BLL/.vs/BLL.csproj.dtbcache.json | 1
WebAPI/WebAPI.csproj | 6
SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache | 0
PlanM/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/Pub_Control.pdb | 0
PlanM/bin/Release/DAL.dll | 0
Model/bin/Release/DBUtility.pdb | 0
APSM/bin/Release/Pub_Control.pdb | 0
Model/Model.csproj | 1
BLL/bin/Release/Pub_Control.dll | 0
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache | 0
Model/bin/Release/DBUtility.dll | 0
BaseSet/bin/Release/SQLHelper.pdb | 0
BLL/BLL.csproj | 7
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
WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs | 254 +++
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
WebAPI/Controllers/ZLGL/BaseSet/Gy_InspectBasisController.cs | 226 +++
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 8
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
WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs | 206 ++
BLL/bin/Release/Model.dll | 0
WebAPI/.vs/WebAPI.csproj.dtbcache.json | 1
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
SyntacticSugar/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache | 0
WorkM/bin/Release/WorkM.pdb | 0
Pub_Class/bin/Release/SyntacticSugar.pdb | 0
WarM/bin/Release/WarM.pdb | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
Pub_Class/bin/Release/SyntacticSugar.dll | 0
WarM/bin/Release/WarM.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache | 1
WebAPI/Controllers/BaseSet/Gy_RoutingGroupController.cs | 183 ++
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
WebAPI/Controllers/ZLGL/BaseSet/Gy_QualityController.cs | 226 +++
Pub_Class/bin/Release/Pub_Class.pdb | 0
PlanM/bin/Release/DBUtility.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 44
WebAPI/Controllers/ZLGL/BaseSet/Gy_InspectMethodController.cs | 226 +++
SyntacticSugar/obj/Release/SyntacticSugar.dll | 0
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 52
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
sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources | 0
WarM/bin/Release/DAL.pdb | 0
WorkM/bin/Release/WarM.pdb | 0
PlanM/bin/Release/DBUtility.pdb | 0
Model/工资管理/ClsPay_GroupBalBillSub.cs | 1
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 | 6
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
WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml.user | 49
224 files changed, 4,140 insertions(+), 264 deletions(-)
diff --git a/APSM/bin/Release/APSM.dll b/APSM/bin/Release/APSM.dll
index a88368f..2e9ba05 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 420044d..400fcf0 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 b13f1dc..547dd7a 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 4246417..8f2040f 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 962d0c0..9dda84b 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 27d89a3..ebb8b20 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 faadee0..b6ba414 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 6ed5dcb..5cd5bf7 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 ed584d7..f2cdd0d 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 d45a2fd..a669f85 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 e81ce45..796b802 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 8cdd9d2..7cdb005 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 5508c1c..ad6e978 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 b6d4a73..cf6baa2 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 98682bd..75a651a 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 141946c..b645562 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 b4f7f78..18bc956 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 febc335..da0c974 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 10328d8..7303155 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 9d3bd71..466673a 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 40f0392..c5ec251 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 82ca4c4..351238d 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 f3f8ceb..e588ef3 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 1fafc1d..fef4835 100644
--- a/APSM/bin/Release/WorkM.pdb
+++ b/APSM/bin/Release/WorkM.pdb
Binary files differ
diff --git a/BLL/.vs/BLL.csproj.dtbcache.json b/BLL/.vs/BLL.csproj.dtbcache.json
new file mode 100644
index 0000000..3d1c780
--- /dev/null
+++ b/BLL/.vs/BLL.csproj.dtbcache.json
@@ -0,0 +1 @@
+{"RootPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\BLL","ProjectFileName":"BLL.csproj","Configuration":"Release|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"ClsBaseShow.cs"},{"SourceFile":"JHGL\\Gy_GroupService.cs"},{"SourceFile":"JHGL\\IMPL\\Gy_GroupImpl.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Xt_SystemParameterForOrg.cs"},{"SourceFile":"Xt_SystemParameterForOrg.Designer.cs"},{"SourceFile":"绯荤粺绠＄悊\\鐢ㄦ埛绠＄悊\\Gy_UserByOrgRelation.cs"},{"SourceFile":"绯荤粺绠＄悊\\鐢ㄦ埛绠＄悊\\Gy_UserByOrgRelation.designer.cs"},{"SourceFile":"绯荤粺绠＄悊\\鐢ㄦ埛绠＄悊\\Xt_UserNew.cs"},{"SourceFile":"绯荤粺绠＄悊\\鐢ㄦ埛绠＄悊\\Xt_UserNew.designer.cs"},{"SourceFile":"杞﹂棿绠＄悊\\ClsSc_PackUnionBill.cs"},{"SourceFile":"杞﹂棿绠＄悊\\ClsSc_PackDoubleBill.cs"},{"SourceFile":"杞﹂棿绠＄悊\\ClsSc_PackSplitBill.cs"},{"SourceFile":"鍩虹璧勬枡\\ClsIF_Process_View.cs"},{"SourceFile":"鍩虹璧勬枡\\ClsIF_Group_View.cs"},{"SourceFile":"鍩虹璧勬枡\\ClsIF_Customer_View.cs"},{"SourceFile":"鍩虹璧勬枡\\ClsIF_Supplier_View.cs"},{"SourceFile":"WMS\\ClsGy_BarCodeBill_View.cs"},{"SourceFile":"KB_KanbanPlaySet.cs"},{"SourceFile":"KB_KanbanPlaySet.Designer.cs"},{"SourceFile":"WMS\\ClsKF_PonderationBillMain_Temp.cs"},{"SourceFile":"WMS\\ClsKF_PublicFun.cs"},{"SourceFile":"浠撳簱绠＄悊\\ClsKF_ChangeBoxBill.cs"},{"SourceFile":"浠撳簱绠＄悊\\ClsKf_EntrustInBackBill.cs"},{"SourceFile":"浠撳簱绠＄悊\\ClsKf_EntrustInBill.cs"},{"SourceFile":"浠撳簱绠＄悊\\ClsKf_EntrustOutBackBill.cs"},{"SourceFile":"浠撳簱绠＄悊\\ClsKf_EntrustOutBill.cs"},{"SourceFile":"浠撳簱绠＄悊\\ClsKf_MateOutBackBill.cs"},{"SourceFile":"浠撳簱绠＄悊\\ClsKf_MateOutBill.cs"},{"SourceFile":"浠撳簱绠＄悊\\ClsKf_MoveStockBill.cs"},{"SourceFile":"浠撳簱绠＄悊\\ClsKf_OtherInBackBill.cs"},{"SourceFile":"浠撳簱绠＄悊\\ClsKf_OtherInBill.cs"},{"SourceFile":"浠撳簱绠＄悊\\ClsKf_OtherOutBackBill.cs"},{"SourceFile":"浠撳簱绠＄悊\\ClsKf_OtherOutBill.cs"},{"SourceFile":"浠撳簱绠＄悊\\ClsKf_POStockInBackBill.cs"},{"SourceFile":"浠撳簱绠＄悊\\ClsKf_POStockInBill.cs"},{"SourceFile":"浠撳簱绠＄悊\\ClsKf_ProductInBackBill.cs"},{"SourceFile":"浠撳簱绠＄悊\\ClsKf_ProductInBill.cs"},{"SourceFile":"浠撳簱绠＄悊\\ClsKf_SellOutBackBill.cs"},{"SourceFile":"浠撳簱绠＄悊\\ClsKf_SellOutBill.cs"},{"SourceFile":"鍏敤妯″潡\\Gy_BarCodeRuleBill.cs"},{"SourceFile":"鍏敤妯″潡\\Gy_BarCodeRuleBill.designer.cs"},{"SourceFile":"鍏敤妯″潡\\Gy_BillNumber.cs"},{"SourceFile":"鍏敤妯″潡\\Gy_BillNumber.designer.cs"},{"SourceFile":"鍏敤妯″潡\\Gy_MaxNum.cs"},{"SourceFile":"鍏敤妯″潡\\Gy_MaxNum.designer.cs"},{"SourceFile":"鍏敤妯″潡\\KF_ICInventoryList_IF.cs"},{"SourceFile":"鍏敤妯″潡\\KF_ICInventoryList_IF.designer.cs"},{"SourceFile":"鍩虹璧勬枡\\ClsIF_BadReason_View.cs"},{"SourceFile":"鍩虹璧勬枡\\ClsIF_Department_View.cs"},{"SourceFile":"鍩虹璧勬枡\\ClsIF_Employee_View.cs"},{"SourceFile":"鍩虹璧勬枡\\ClsIF_Material_View.cs"},{"SourceFile":"鍩虹璧勬枡\\ClsIF_ORGANIZATIONS_View.cs"},{"SourceFile":"鍩虹璧勬枡\\ClsIF_Source_View.cs"},{"SourceFile":"鍩虹璧勬枡\\ClsIF_StockPlace_View.cs"},{"SourceFile":"鍩虹璧勬枡\\ClsIF_Warehouse_View.cs"},{"SourceFile":"鍩虹璧勬枡鏂板\\Gy_Material_Add.cs"},{"SourceFile":"鍩虹璧勬枡鏂板\\Gy_Material_Add.designer.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsBaseDownSelect_InterFace.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsGy_BarCodeRuleBill_Ctl.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsGy_BarCodeRuleBill_Model.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsGy_BarCodeRuleBill_View.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsGy_BillNumber_Ctl.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsGy_BillNumber_Model.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsGy_BillNumber_View.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsGy_MaxNum_Ctl.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsGy_MaxNum_Model.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsGy_MaxNum_View.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsXt_SystemParameter.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsXt_SystemParameterHlp.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsXt_SystemParameterSub.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsXt_SystemParameter_Model.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\Cls_S_K3_ICInventoryList.cs"},{"SourceFile":"Frm_SQLInfo.cs"},{"SourceFile":"Frm_SQLInfo.Designer.cs"},{"SourceFile":"Gy_GridView_HideToBase.cs"},{"SourceFile":"Gy_GridView_HideToBase.designer.cs"},{"SourceFile":"鍏敤妯″潡\\FrmAutoSQL.cs"},{"SourceFile":"鍏敤妯″潡\\FrmAutoSQL.Designer.cs"},{"SourceFile":"IReport.cs"},{"SourceFile":"鍏敤妯″潡\\Gy_ReportQuery.cs"},{"SourceFile":"鍏敤妯″潡\\Gy_ReportQuery.designer.cs"},{"SourceFile":"鍏敤妯″潡\\KF_ICInventoryList.cs"},{"SourceFile":"鍏敤妯″潡\\KF_ICInventoryList.designer.cs"},{"SourceFile":"鍏敤妯″潡\\KF_ICInventoryList_K3.cs"},{"SourceFile":"鍏敤妯″潡\\KF_ICInventoryList_K3.designer.cs"},{"SourceFile":"鍏敤妯″潡\\KF_ICInventoryList_Mould_BLL.cs"},{"SourceFile":"鍏敤妯″潡\\KF_ICInventoryList_Mould_BLL.designer.cs"},{"SourceFile":"鍏敤妯″潡\\OA_EmpMessageBill.cs"},{"SourceFile":"鍏敤妯″潡\\OA_EmpMessageBill.designer.cs"},{"SourceFile":"鍏敤妯″潡\\Xt_ICInventoryDlg.cs"},{"SourceFile":"鍏敤妯″潡\\Xt_ICInventoryDlg.designer.cs"},{"SourceFile":"鍏敤妯″潡\\Gy_GridView_Hide.cs"},{"SourceFile":"鍏敤妯″潡\\Gy_GridView_Hide.designer.cs"},{"SourceFile":"鍏敤妯″潡\\Xt_SystemLog_K3.cs"},{"SourceFile":"鍏敤妯″潡\\Xt_SystemLog_K3.designer.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsBaseDownSelect.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsBaseSelect_InterFace.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsDateToNongli.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsGy_UserGroup_Model.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsGy_UserGroup_View.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsK3Pub_BLL.cs"},{"SourceFile":"鍏敤妯″潡\\FrmSelectDate.cs"},{"SourceFile":"鍏敤妯″潡\\FrmSelectDate.designer.cs"},{"SourceFile":"鍏敤妯″潡\\Gy_DataInTmp.cs"},{"SourceFile":"鍏敤妯″潡\\Gy_DataInTmp.designer.cs"},{"SourceFile":"鍏敤妯″潡\\Xt_File.cs"},{"SourceFile":"鍏敤妯″潡\\Xt_File.designer.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsBaseSelect.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsCheckGridView.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsFile.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsPub_BLL.cs"},{"SourceFile":"鍏敤妯″潡\\AboutBox1.cs"},{"SourceFile":"鍏敤妯″潡\\AboutBox1.Designer.cs"},{"SourceFile":"鍏敤妯″潡\\FrmMonthCalendar.cs"},{"SourceFile":"鍏敤妯″潡\\FrmMonthCalendar.Designer.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsXt_CheckExtend_Ctl.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsXt_CheckExtend_Model.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsXt_FileCtrl.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\Cls_S_KF_ICInventoryList.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\Cls_S_KF_ICInventoryList_IF.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\Cls_S_KF_ICInventoryList_K3.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\Cls_S_KF_ICInventoryList_Mould.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ReportBase.cs"},{"SourceFile":"绯荤粺绠＄悊\\Xt_SystemParameter.cs"},{"SourceFile":"绯荤粺绠＄悊\\Xt_SystemParameter.designer.cs"},{"SourceFile":"绯荤粺绠＄悊\\浼氳鏈熼棿\\ClsXt_AccountPeriod.cs"},{"SourceFile":"绯荤粺绠＄悊\\浼氳鏈熼棿\\ClsXt_AccountPeriodHlp.cs"},{"SourceFile":"绯荤粺绠＄悊\\鏃ュ織绠＄悊\\ClsXt_SystemLog.cs"},{"SourceFile":"绯荤粺绠＄悊\\鏃ュ織绠＄悊\\ClsXt_SystemLogHlp.cs"},{"SourceFile":"绯荤粺绠＄悊\\妯″潡绠＄悊\\ClsXt_Xtgnb.cs"},{"SourceFile":"绯荤粺绠＄悊\\妯″潡绠＄悊\\ClsXt_XtgnbHlp.cs"},{"SourceFile":"绯荤粺绠＄悊\\浼氳鏈熼棿\\Xt_AccountPeriod.cs"},{"SourceFile":"绯荤粺绠＄悊\\浼氳鏈熼棿\\Xt_AccountPeriod.designer.cs"},{"SourceFile":"绯荤粺绠＄悊\\鏃ュ織绠＄悊\\Xt_SystemLog.cs"},{"SourceFile":"绯荤粺绠＄悊\\鏃ュ織绠＄悊\\Xt_SystemLog.designer.cs"},{"SourceFile":"鍏敤妯″潡\\Xt_UpDownBillList.cs"},{"SourceFile":"鍏敤妯″潡\\Xt_UpDownBillList.designer.cs"},{"SourceFile":"绯荤粺绠＄悊\\妯″潡绠＄悊\\Xt_Xtgnb.cs"},{"SourceFile":"绯荤粺绠＄悊\\妯″潡绠＄悊\\Xt_Xtgnb.designer.cs"},{"SourceFile":"绯荤粺绠＄悊\\鐢ㄦ埛绠＄悊\\Xt_Authorization.cs"},{"SourceFile":"绯荤粺绠＄悊\\鐢ㄦ埛绠＄悊\\Xt_Authorization.designer.cs"},{"SourceFile":"绯荤粺绠＄悊\\鐢ㄦ埛绠＄悊\\Xt_Password.cs"},{"SourceFile":"绯荤粺绠＄悊\\鐢ㄦ埛绠＄悊\\Xt_Password.designer.cs"},{"SourceFile":"绯荤粺绠＄悊\\鐢ㄦ埛绠＄悊\\Xt_User.cs"},{"SourceFile":"绯荤粺绠＄悊\\鐢ㄦ埛绠＄悊\\Xt_User.designer.cs"},{"SourceFile":"绯荤粺绠＄悊\\鐢ㄦ埛绠＄悊\\Xt_UserGroup.cs"},{"SourceFile":"绯荤粺绠＄悊\\鐢ㄦ埛绠＄悊\\Xt_UserGroup.designer.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsGy_OpenTmp_Ctl.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsGy_OpenTmp_Model.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ClsGy_OpenTmp_View.cs"},{"SourceFile":"绯荤粺绠＄悊\\鐢ㄦ埛绠＄悊\\FrmChangePsd.cs"},{"SourceFile":"绯荤粺绠＄悊\\鐢ㄦ埛绠＄悊\\FrmChangePsd.designer.cs"},{"SourceFile":"鍏敤妯″潡\\FrmLogin.cs"},{"SourceFile":"鍏敤妯″潡\\FrmLogin.designer.cs"},{"SourceFile":"鍏敤妯″潡\\FrmSetServer.cs"},{"SourceFile":"鍏敤妯″潡\\FrmSetServer.designer.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\GridppReport.cs"},{"SourceFile":"鍏敤妯″潡\\Gy_OpenTmp.cs"},{"SourceFile":"鍏敤妯″潡\\Gy_OpenTmp.designer.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"绯荤粺鍏敤CLS\\ReportCls.cs"},{"SourceFile":"杞﹂棿绠＄悊\\ClsSc_AssemblyBill.cs"},{"SourceFile":"obj\\Release\\.NETFramework,Version=v4.5.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\OCX\\AxInterop.gregn6Lib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\DAL\\bin\\Release\\DAL.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\DAL\\bin\\Release\\DAL.dll"},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\DBUtility\\bin\\Release\\DBUtility.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\DBUtility\\bin\\Release\\DBUtility.dll"},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\OCX\\Interop.gregn6Lib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\OCX\\Kingdee.BOS.WebApi.Client.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\OCX\\Kingdee.BOS.WebApi.FormService.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\OCX\\Kingdee.BOS.WebApi.ServicesStub.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\Model\\bin\\Release\\Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\Model\\bin\\Release\\Model.dll"},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\OCX\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\Pub_Class\\bin\\Release\\Pub_Class.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\Pub_Class\\bin\\Release\\Pub_Class.dll"},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\Pub_Control\\bin\\Release\\Pub_Control.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\Pub_Control\\bin\\Release\\Pub_Control.dll"},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\SQLHelper\\bin\\Release\\SQLHelper.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\SQLHelper\\bin\\Release\\SQLHelper.dll"},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Design.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\sdk_dingding\\TopSdk\\bin\\Release\\TopSdk.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\sdk_dingding\\TopSdk\\bin\\Release\\TopSdk.dll"}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\BLL\\bin\\Release\\BLL.dll","OutputItemRelativePath":"BLL.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/BLL/BLL.csproj b/BLL/BLL.csproj
index 5414dc2..585dd66 100644
--- a/BLL/BLL.csproj
+++ b/BLL/BLL.csproj
@@ -624,6 +624,10 @@
<Project>{f7838319-779c-4ad9-a59f-5dcb5757f335}</Project>
<Name>Pub_Control</Name>
</ProjectReference>
+ <ProjectReference Include="..\sdk_dingding\TopSdk\TopSdk.csproj">
+ <Project>{9C11CAE5-5188-4E71-825B-68FC3135728A}</Project>
+ <Name>TopSdk</Name>
+ </ProjectReference>
<ProjectReference Include="..\SQLHelper\SQLHelper.csproj">
<Project>{0a4ef483-d8d3-49a5-8378-974ef7993365}</Project>
<Name>SQLHelper</Name>
@@ -632,6 +636,9 @@
<ItemGroup>
<Folder Include="SBGL\SBBB\impl\" />
</ItemGroup>
+ <ItemGroup>
+ <WCFMetadata Include="Connected Services\" />
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index b13f1dc..547dd7a 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 4246417..8f2040f 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 faadee0..b6ba414 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 6ed5dcb..5cd5bf7 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 ed584d7..f2cdd0d 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 d45a2fd..a669f85 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 e81ce45..796b802 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 8cdd9d2..7cdb005 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 98682bd..75a651a 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 141946c..b645562 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 b4f7f78..18bc956 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 febc335..da0c974 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 10328d8..7303155 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 9d3bd71..466673a 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 b13f1dc..547dd7a 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 4246417..8f2040f 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 962d0c0..9dda84b 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 27d89a3..ebb8b20 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 faadee0..b6ba414 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 6ed5dcb..5cd5bf7 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 ed584d7..f2cdd0d 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 d45a2fd..a669f85 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 e81ce45..796b802 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 8cdd9d2..7cdb005 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 98682bd..75a651a 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 141946c..b645562 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 b4f7f78..18bc956 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 febc335..da0c974 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 10328d8..7303155 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 9d3bd71..466673a 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 faadee0..b6ba414 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 6ed5dcb..5cd5bf7 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 ed584d7..f2cdd0d 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 d45a2fd..a669f85 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 e81ce45..796b802 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 8cdd9d2..7cdb005 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 98682bd..75a651a 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 141946c..b645562 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 b4f7f78..18bc956 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 febc335..da0c974 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 10328d8..7303155 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 9d3bd71..466673a 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_GroupBalBill.cs" "b/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_GroupBalBill.cs"
index 7214ef3..d442146 100644
--- "a/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_GroupBalBill.cs"
+++ "b/DAL/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_GroupBalBill.cs"
@@ -30,15 +30,75 @@
{
DetailColl = null;
}
-
+
#endregion 鑷畾涔夋柟娉�
+
+ //淇濆瓨鍓嶆帶鍒�
+ public bool BeforeSave(Int64 HInterID, string HBillNo, Int64 OperationType, ref string sReturn)
+ {
+ try
+ {
+ DataSet Ds = oCn.RunProcReturn("Exec h_p_Pay_GroupBalBill_BeforeSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + OperationType.ToString(), "h_p_Pay_GroupBalBill_BeforeSaveCtrl");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ }
+ return true;
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+ //淇濆瓨鍚庢帶鍒�
+ public bool AfterSave(Int64 HInterID, string HBillNo, Int64 OperationType, ref string sReturn)
+ {
+ try
+ {
+ DataSet Ds = oCn.RunProcReturn("Exec h_p_Pay_GroupBalBill_AfterSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + OperationType.ToString(), "h_p_Pay_GroupBalBill_AfterSaveCtrl");
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "淇濆瓨鍚庡垽鏂け璐ワ紒";
+ return false;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
+ return false;
+ }
+ }
+ return true;
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
//淇敼鍗曟嵁
public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
{
try
{
- //
oCn.BeginTran();
+ //淇濆瓨鍓嶆帶鍒�
+ if (!BeforeSave(lngBillKey, omodel.HBillNo, 2, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
//鏇存柊涓昏〃
oCn.RunProc("UpDate Pay_GroupBalBillMain set " +
" HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
@@ -51,13 +111,14 @@
//========================================
",HGroupID=" + omodel.HGroupID.ToString() +
",HDeptID=" + omodel.HDeptID.ToString() +
+ ",HPayType=" + omodel.HPayType.ToString() +
",HOtherSubsidy=" + omodel.HOtherSubsidy.ToString() +
",HOtherDeduct=" + omodel.HOtherDeduct.ToString() +
",HSumMoney=" + omodel.HSumMoney.ToString() +
",HPayMoney=" + omodel.HPayMoney.ToString() +
- ",HPayType=" + omodel.HPayType.ToString() +
",HExplanation='" + omodel.HExplanation + "'" +
",HInnerBillNo='" + omodel.HInnerBillNo + "'" +
+ ",HStockOrgID=" + omodel.HSTOCKORGID.ToString() +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -69,17 +130,19 @@
foreach (Model.ClsPay_GroupBalBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into Pay_GroupBalBillSub " +
- " (HInterID,HEntryID,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HMaterID,HUnitID,HProcID,HTimes,HQty,HPrice,HSourceID" +
- ",HMoney,HICMOInterID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
- ",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HSqty" +
+ " (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HMaterID,HUnitID,HProcID,HSourceID" +
+ ",HTimes,HQty,HPrice,HMoney,HSqty" +
+ ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
+ ",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo" +
") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
- "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HSourceID.ToString() +
- "," + oSub.HMoney.ToString() + "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" +
- "," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'," + oSub.HSqty.ToString() +
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
+ "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HSourceID.ToString() +
+ "," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HSqty.ToString() +
+ "," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" +
+ "," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'" +
") ");
}
//
@@ -87,33 +150,26 @@
foreach (Model.ClsPay_GroupBalBillEmp oSubSec in DetailEmpColl)
{
oCn.RunProc("Insert into Pay_GroupBalBillEmp " +
- " (HInterID,HEntryID,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HEmpID,HEmpRate" +
- ",HBaseTimes,HOverTimes,HLeaveTimes,HCTPrjID" +
- ",HBaseDays,HOverDays,HLeaveDays,HYf" +
- ",HMoney,HOtherSubsidy,HOtherDeduct,HIsPay,HAvgFlag" +
- ")" +
- " values("
- + omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() + ",'" + oSubSec.HRemark + "'" +
- "," + oSubSec.HSourceInterID.ToString() + "," + oSubSec.HSourceEntryID.ToString() + ",'" + oSubSec.HSourceBillNo + "','" + oSubSec.HSourceBillType + "'," + oSubSec.HRelationQty.ToString() + "," + oSubSec.HRelationMoney.ToString() +
- "," + oSubSec.HEmpID.ToString() + "," + oSubSec.HEmpRate.ToString() +
- "," + oSubSec.HBaseTimes.ToString() + "," + oSubSec.HOverTimes.ToString() + "," + oSubSec.HLeaveTimes.ToString() + "," + oSubSec.HCTPrjID.ToString() +
- "," + oSubSec.HBaseDays.ToString() + "," + oSubSec.HOverDays.ToString() + "," + oSubSec.HLeaveDays.ToString() + "," + oSubSec.HYf.ToString() +
- "," + oSubSec.HMoney.ToString() + "," + oSubSec.HOtherSubsidy.ToString() + "," + oSubSec.HOtherDeduct.ToString() + "," + Convert.ToString(oSubSec.HIsPay ? 1 : 0) + "," + Convert.ToString(oSubSec.HAvgFlag ? 1 : 0) + ") ");
+ " (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HEmpID,HEmpRate,HCTPrjID,HMoney,HOtherSubsidy,HOtherDeduct" +
+ ",HBaseDays,HBaseTimes,HOverDays,HOverTimes,HLeaveDays,HLeaveTimes" +
+ ",HIsPay,HAvgFlag,HYF" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() + ",'" + oSubSec.HRemark + "'," + oSubSec.HRelationQty.ToString() + "," + oSubSec.HRelationMoney.ToString() +
+ "," + oSubSec.HSourceInterID.ToString() + "," + oSubSec.HSourceEntryID.ToString() + ",'" + oSubSec.HSourceBillNo + "','" + oSubSec.HSourceBillType + "'" +
+ "," + oSubSec.HEmpID.ToString() + "," + oSubSec.HEmpRate.ToString() + "," + oSubSec.HCTPrjID.ToString() + "," + oSubSec.HMoney.ToString() + "," + oSubSec.HOtherSubsidy.ToString() + "," + oSubSec.HOtherDeduct.ToString() +
+ "," + oSubSec.HBaseDays.ToString() + "," + oSubSec.HBaseTimes.ToString() + "," + oSubSec.HOverDays.ToString() + "," + oSubSec.HOverTimes.ToString() + "," + oSubSec.HLeaveDays.ToString() + "," + oSubSec.HLeaveTimes.ToString() +
+ "," + Convert.ToString(oSubSec.HIsPay ? 1 : 0) + "," + Convert.ToString(oSubSec.HAvgFlag ? 1 : 0) + "," + oSubSec.HYf.ToString() +
+ ") ");
}
- //foreach (Model.ClsPay_GroupBalBillSub oSub in DetailColl)
- //{
- // Ds = oCn.RunProcReturn("exec h_p_Pay_GroupBalBill_Qty " + oSub.HICMOInterID, "");
- // if (Ds.Tables[0].Rows.Count == 0)
- // return;
- // if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y")
- // {
- // sReturn = "姹囨姤鏁伴噺瓒呰繃璁″垝鏁伴噺锛佷笉鍏佽淇濆瓨";
- // return false;
- // }
- //}
- sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ //淇濆瓨鍚庢帶鍒�
+ if (!AfterSave(lngBillKey, omodel.HBillNo, 2, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 淇敼鎴愬姛锛�";
oCn.Commit();
return true;
}
@@ -124,6 +180,7 @@
throw (e);
}
}
+
//鏂板鍗曟嵁
public override bool AddBill(ref string sReturn)
{
@@ -133,36 +190,43 @@
omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCn.BeginTran();
+ //淇濆瓨鍓嶆帶鍒�
+ if (!BeforeSave(omodel.HInterID, omodel.HBillNo, 1, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
//涓昏〃
oCn.RunProc("Insert Into Pay_GroupBalBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
- ",HGroupID,HDeptID,HPayType,HOtherSubsidy" +
- ",HOtherDeduct,HSumMoney,HPayMoney" +
- ",HExplanation,HInnerBillNo" +
+ ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
+ ",HGroupID,HDeptID,HPayType,HOtherSubsidy,HOtherDeduct" +
+ ",HSumMoney,HPayMoney,HExplanation,HInnerBillNo,HStockOrgID" +
") " +
- " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
- ", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
- ", " + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HPayType.ToString() + "," + omodel.HOtherSubsidy.ToString() +
- "," + omodel.HOtherDeduct.ToString() + "," + omodel.HSumMoney.ToString() + "," + omodel.HPayMoney.ToString() +
- ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate.ToShortDateString() + "'" +
+ "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ "," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'" +
+ "," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HPayType.ToString() + "," + omodel.HOtherSubsidy.ToString() + "," + omodel.HOtherDeduct.ToString() +
+ "," + omodel.HSumMoney.ToString() + "," + omodel.HPayMoney.ToString() + ",'" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," + omodel.HSTOCKORGID.ToString() +
") ");
- //
//鎻掑叆瀛愯〃
foreach (Model.ClsPay_GroupBalBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into Pay_GroupBalBillSub " +
- " (HInterID,HEntryID,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HMaterID,HUnitID,HProcID,HTimes,HQty,HPrice,HSourceID" +
- ",HMoney,HICMOInterID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
- ",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo,HSqty" +
+ " (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HMaterID,HUnitID,HProcID,HSourceID" +
+ ",HTimes,HQty,HPrice,HMoney,HSqty" +
+ ",HICMOInterID,HICMOEntryID,HICMOBillNo,HProcReportInterID,HProcReportEntryID,HProcReportBillNo" +
+ ",HProcPlanInterID,HProcPlanEntryID,HProcPlanBillNo" +
") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
- "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HSourceID.ToString() +
- "," + oSub.HMoney.ToString() + "," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" +
- "," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'," + oSub.HSqty.ToString() +
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HRemark + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'" +
+ "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HSourceID.ToString() +
+ "," + oSub.HTimes.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HPrice.ToString() + "," + oSub.HMoney.ToString() + "," + oSub.HSqty.ToString() +
+ "," + oSub.HICMOInterID.ToString() + "," + oSub.HICMOEntryID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HProcReportInterID.ToString() + "," + oSub.HProcReportEntryID.ToString() + ",'" + oSub.HProcReportBillNo + "'" +
+ "," + oSub.HProcPlanInterID.ToString() + "," + oSub.HProcPlanEntryID.ToString() + ",'" + oSub.HProcPlanBillNo + "'" +
") ");
}
//
@@ -170,35 +234,26 @@
foreach (Model.ClsPay_GroupBalBillEmp oSubSec in DetailEmpColl)
{
oCn.RunProc("Insert into Pay_GroupBalBillEmp " +
- " (HInterID,HEntryID,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HEmpID,HEmpRate" +
- ",HBaseTimes,HOverTimes,HLeaveTimes,HCTPrjID" +
- ",HBaseDays,HOverDays,HLeaveDays,HYf" +
- ",HMoney,HOtherSubsidy,HOtherDeduct,HIsPay,HAvgFlag" +
- ")" +
- " values("
- + omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() + ",'" + oSubSec.HRemark + "'" +
- "," + oSubSec.HSourceInterID.ToString() + "," + oSubSec.HSourceEntryID.ToString() + ",'" + oSubSec.HSourceBillNo + "','" + oSubSec.HSourceBillType + "'," + oSubSec.HRelationQty.ToString() + "," + oSubSec.HRelationMoney.ToString() +
- "," + oSubSec.HEmpID.ToString() + "," + oSubSec.HEmpRate.ToString() +
- "," + oSubSec.HBaseTimes.ToString() + "," + oSubSec.HOverTimes.ToString() + "," + oSubSec.HLeaveTimes.ToString() + "," + oSubSec.HCTPrjID.ToString() +
- "," + oSubSec.HBaseDays.ToString() + "," + oSubSec.HOverDays.ToString() + "," + oSubSec.HLeaveDays.ToString() + "," + oSubSec.HYf.ToString() +
- "," + oSubSec.HMoney.ToString() + "," + oSubSec.HOtherSubsidy.ToString() + "," + oSubSec.HOtherDeduct.ToString() + "," + Convert.ToString(oSubSec.HIsPay ? 1 : 0) + "," + Convert.ToString(oSubSec.HAvgFlag ? 1 : 0) + ") ");
+ " (HInterID,HEntryID,HRemark,HRelationQty,HRelationMoney" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" +
+ ",HEmpID,HEmpRate,HCTPrjID,HMoney,HOtherSubsidy,HOtherDeduct" +
+ ",HBaseDays,HBaseTimes,HOverDays,HOverTimes,HLeaveDays,HLeaveTimes" +
+ ",HIsPay,HAvgFlag,HYF" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSubSec.HEntryID.ToString() + ",'" + oSubSec.HRemark + "'," + oSubSec.HRelationQty.ToString() + "," + oSubSec.HRelationMoney.ToString() +
+ "," + oSubSec.HSourceInterID.ToString() + "," + oSubSec.HSourceEntryID.ToString() + ",'" + oSubSec.HSourceBillNo + "','" + oSubSec.HSourceBillType + "'" +
+ "," + oSubSec.HEmpID.ToString() + "," + oSubSec.HEmpRate.ToString() + "," + oSubSec.HCTPrjID.ToString() + "," + oSubSec.HMoney.ToString() + "," + oSubSec.HOtherSubsidy.ToString() + "," + oSubSec.HOtherDeduct.ToString() +
+ "," + oSubSec.HBaseDays.ToString() + "," + oSubSec.HBaseTimes.ToString() + "," + oSubSec.HOverDays.ToString() + "," + oSubSec.HOverTimes.ToString() + "," + oSubSec.HLeaveDays.ToString() + "," + oSubSec.HLeaveTimes.ToString() +
+ "," + Convert.ToString(oSubSec.HIsPay ? 1 : 0) + "," + Convert.ToString(oSubSec.HAvgFlag ? 1 : 0) + "," + oSubSec.HYf.ToString() +
+ ") ");
}
- //
- //foreach (Model.ClsPay_GroupBalBillSub oSub in DetailColl)
- //{
- // Ds = oCn.RunProcReturn("exec h_p_Pay_GroupBalBill_Qty " + oSub.HICMOInterID, "");
- // if (Ds.Tables[0].Rows.Count == 0)
- // return;
- // if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y")
- // {
- // sReturn = "姹囨姤鏁伴噺瓒呰繃璁″垝鏁伴噺锛佷笉鍏佽淇濆瓨";
- // return false;
- // }
- //}
- //
- sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ //淇濆瓨鍚庢帶鍒�
+ if (!AfterSave(omodel.HInterID, omodel.HBillNo, 1, ref sReturn))
+ {
+ oCn.RollBack();
+ return false;
+ }
+ sReturn = "鍗曟嵁鍙凤細" + omodel.HBillNo + " 鏂板鎴愬姛锛�";
oCn.Commit();
return true;
}
@@ -209,6 +264,7 @@
throw (e);
}
}
+
//鏄剧ず鍗曟嵁
public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
{
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_AssemblyBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_AssemblyBill.cs"
index bd6f57e..dc410b9 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_AssemblyBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_AssemblyBill.cs"
@@ -86,7 +86,11 @@
try
{
//寰楀埌mainid
- omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (omodel.HInterID == 0 || omodel.HInterID.ToString() == null || omodel.HInterID.ToString() == "undefined")
+ {
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCn.BeginTran();
//涓昏〃
@@ -94,12 +98,12 @@
"(HYear,HPeriod,HBillType,HInterID" +
",HDate,HBillNo,HBillStatus,HRemark,HICMOInterID" +
",HICMOBillNo,HBarCode_P,HMaterID,HUnitID" +
- ",HMaker,HMakeDate" +
+ ",HMaker,HMakeDate,HBillSubType" +
") " +
" values(" + omodel.HYear + "," + omodel.HPeriod + ",'" + this.BillType + "'," + omodel.HInterID + "" +
",'" + omodel.HDate + "','" + omodel.HBillNo.ToString() + "'," + omodel.HBillStatus + ",'" + omodel.HRemark + "'," + omodel.HICMOInterID + "" +
",'" + omodel.HICMOBillNo.ToString() + "','" + omodel.HBarCode_P.ToString() + "'," + omodel.HMaterID + "," + omodel.HUnitID + "" +
- ",'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.GetServerDate(-1) + "'" +
+ ",'" + DBUtility.ClsPub.CurUserName + "','" + DBUtility.ClsPub.GetServerDate(-1) + "','" + this.BillType + "'" +
") ");
////鎻掑叆瀛愯〃
foreach (Model.ClsSc_AssemblyBillSub oSub in DetailColl)
@@ -108,12 +112,12 @@
" (HInterID,HEntryID,HMaterID,HUnitID,HQty,HSourceID" +
",HEquipID,HGroupID,HWorkerID,HScanDate,HBarCode,HBarCode_P" +
",HCloseMan,HCloseType,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney)" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HBillNo_bak)" +
" values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HSourceID.ToString() + "" +
"," + oSub.HEquipID.ToString() + "," + oSub.HGroupID.ToString() + "," + oSub.HWorkerID.ToString() + ",'" + oSub.HScanDate.ToShortDateString() + "','" + oSub.HBarCode + "','" + oSub.HBarCode_P + "'" +
",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + ",'" + omodel.HBillNo + "'" +
") ");
}
sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index ed584d7..f2cdd0d 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 d45a2fd..a669f85 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 98682bd..75a651a 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 141946c..b645562 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 b4f7f78..18bc956 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 febc335..da0c974 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 10328d8..7303155 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 9d3bd71..466673a 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 552e300..fa7e783 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 561c1c7..edcca36 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 9103b7d..859bca4 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 fe71e8f..1234b05 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 ae4f855..270f077 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 89f77dc..3f81c08 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 3833180..486ff2c 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 dad8b2f..ab65e84 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 c9f8b73..8c217ee 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 ed584d7..f2cdd0d 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 d45a2fd..a669f85 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git a/LMES/app.config b/LMES/app.config
index 51278a4..8b8fb46 100644
--- a/LMES/app.config
+++ b/LMES/app.config
@@ -1,3 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
+锘�<?xml version="1.0" encoding="utf-8"?>
<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.3.2.10" newVersion="1.3.2.10" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
diff --git a/Model/Exceptions/Gy_GroupException.cs b/Model/Exceptions/Gy_GroupException.cs
new file mode 100644
index 0000000..a24178c
--- /dev/null
+++ b/Model/Exceptions/Gy_GroupException.cs
@@ -0,0 +1,19 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model.Exceptions
+{
+ /// <summary>
+ /// 鐢熶骇鐝粍鎶ラ敊寮傚父
+ /// </summary>
+ internal class Gy_GroupException : Exception
+ {
+ public Gy_GroupException(string message) : base(message)
+ {
+
+ }
+ }
+}
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 4680d32..25b9b39 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -142,6 +142,7 @@
<Compile Include="CRM\ClsSec_ProductRepairBillMain.cs" />
<Compile Include="CRM\ClsSec_ProductRepairBillSub.cs" />
<Compile Include="CRM\ClsSec_ProductRepairBillSub1.cs" />
+ <Compile Include="Exceptions\Gy_GroupException.cs" />
<Compile Include="MES\ClsSc_MESBeginWorkBillSub_RelationBill.cs" />
<Compile Include="WMS\ClsWMS_CusBarCodeCheckBillMain.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_TechnologyParameterType_Model .cs" />
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index ed584d7..f2cdd0d 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 d45a2fd..a669f85 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 e81ce45..796b802 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 8cdd9d2..7cdb005 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 98682bd..75a651a 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 141946c..b645562 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 b4f7f78..18bc956 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 febc335..da0c974 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 10328d8..7303155 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 9d3bd71..466673a 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 ba8d14d..6fefcd1 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 e81ce45..796b802 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 8cdd9d2..7cdb005 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git "a/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_GroupBalBillSub.cs" "b/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_GroupBalBillSub.cs"
index fa8beea..9c8e54e 100644
--- "a/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_GroupBalBillSub.cs"
+++ "b/Model/\345\267\245\350\265\204\347\256\241\347\220\206/ClsPay_GroupBalBillSub.cs"
@@ -16,6 +16,7 @@
public double HPrice;// decimal(18,8) --工价
public double HMoney;// decimal(18,8) --金额
public Int64 HICMOInterID;// int --生产任务单ID
+ public Int64 HICMOEntryID;// int --生产任务单子ID
public string HICMOBillNo;// varchar(50) --生产任务单号
public Int64 HProcReportInterID;// int --工序汇报单ID
public Int64 HProcReportEntryID;// int --工序汇报单子ID
diff --git a/PayM/obj/Release/PayM.csproj.ResolveComReference.cache b/PayM/obj/Release/PayM.csproj.ResolveComReference.cache
index 9fb69bc..0263c89 100644
--- a/PayM/obj/Release/PayM.csproj.ResolveComReference.cache
+++ b/PayM/obj/Release/PayM.csproj.ResolveComReference.cache
Binary files differ
diff --git a/PlanM/bin/Release/BLL.dll b/PlanM/bin/Release/BLL.dll
index b13f1dc..547dd7a 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 4246417..8f2040f 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 faadee0..b6ba414 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 6ed5dcb..5cd5bf7 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 ed584d7..f2cdd0d 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 d45a2fd..a669f85 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 e81ce45..796b802 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 8cdd9d2..7cdb005 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 5508c1c..ad6e978 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 b6d4a73..cf6baa2 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 98682bd..75a651a 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 141946c..b645562 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 b4f7f78..18bc956 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 febc335..da0c974 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 10328d8..7303155 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 9d3bd71..466673a 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 98682bd..75a651a 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 141946c..b645562 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 08befab..50183ae 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 70e314f..9cb9e37 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 98682bd..75a651a 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 141946c..b645562 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 b4f7f78..18bc956 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 febc335..da0c974 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 98682bd..75a651a 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 141946c..b645562 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 10328d8..7303155 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 9d3bd71..466673a 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 d897b67..d313d59 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 10328d8..7303155 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 9d3bd71..466673a 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 8c60c24..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 8366b4d..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 08befab..50183ae 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 70e314f..9cb9e37 100644
--- a/SyntacticSugar/bin/Release/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Release/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index 28ef761..e67c5c8 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -6,13 +6,7 @@
D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+C:\Users\86130\Desktop\鏅轰簯杩堟�漒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 8c60c24..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 8366b4d..ceb9ba6 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/SyntacticSugar/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
index 3b5f4ca..5b8f43b 100644
--- a/SyntacticSugar/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/SyntacticSugar/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
index f5e894a..7a33952 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
+++ 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
index bfb772c..ef71615 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-5dd9c82feb12f833c78ecebea7d9a46c99f29e3f
+ebba85c1baaf628c0afa612ea676c9e3de2b6fa1c6f341c19042c3220637a7c3
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
index 2f25cff..631be78 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -3,3 +3,4 @@
D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
+D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.dll b/SyntacticSugar/obj/Release/SyntacticSugar.dll
index 08befab..50183ae 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 70e314f..9cb9e37 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 b13f1dc..547dd7a 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 4246417..8f2040f 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 faadee0..b6ba414 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 6ed5dcb..5cd5bf7 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 ed584d7..f2cdd0d 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 d45a2fd..a669f85 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 e81ce45..796b802 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 8cdd9d2..7cdb005 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 98682bd..75a651a 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 141946c..b645562 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 b4f7f78..18bc956 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 febc335..da0c974 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 10328d8..7303155 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 9d3bd71..466673a 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 40f0392..c5ec251 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 82ca4c4..351238d 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_CusBarCodeBill_KaiBei_LangChao.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
index a4bb4a3..99f13fa 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_CusBarCodeBill_KaiBei_LangChao.cs"
@@ -589,9 +589,9 @@
}
else
{
- grdMain.Rows[j].Cells[HBaNoCol].Value = HCode2;
- grdMain.Rows[j].Cells[HBatchNoCol].Value = DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HBatchNo"]);
- grdMain.Rows[j].Cells[HCode2Col].Value = DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HCode2"]);
+ //grdMain.Rows[j].Cells[HBaNoCol].Value = HCode2;
+ //grdMain.Rows[j].Cells[HBatchNoCol].Value = DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HBatchNo"]);
+ //grdMain.Rows[j].Cells[HCode2Col].Value = DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HCode2"]);
if (DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HExpiryDateCol].Value) == "")
{
@@ -712,6 +712,39 @@
{
if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
{
+ string sHSourceBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value); // 婧愬崟鍗曞彿
+ long sHMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value); // 鐗╂枡鍐呯爜
+ string sHMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNumberCol].Value); // 鐗╂枡浠ｇ爜
+ string sHCusModelName = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusModelNameCol].Value); // 瀹㈡埛鏂欏彿
+ string sHCode1 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode1Col].Value); // 鐗╂枡绫诲埆
+ string sHCode2 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode2Col].Value); // 鎵规浣�
+ sHCode2 = sHCode2.ToUpper();
+ string HBatchNoNumber = sHCode1 + sYear + sPeriod + sDay + HCusModel; // 鎵规鐢熸垚鍓嶇紑
+ HBatchNoNumber = HBatchNoNumber.ToUpper();
+
+ DataSet oDsBatchNo = oCn.RunProcReturn("exec h_p_Gy_CusBarCodeBill_KaiBeiLC_GetBatchNo '" + sHSourceBillNo + "'," + sHMaterID.ToString() + ",'" + sHMaterNumber + "','" + sHCusModelName + "','" + sHCode2 + "','" + HBatchNoNumber + "'", "h_p_Gy_CusBarCodeBill_KaiBeiLC_GetBatchNo");
+ //
+ if (oDsBatchNo == null && oDsBatchNo.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鑾峰彇鎵规澶辫触锛�");
+ bc.Enabled = true;
+ oCn.RollBack();
+ return;
+ }
+ else if (DBUtility.ClsPub.isStrNull(oDsBatchNo.Tables[0].Rows[0][0]) == "1")
+ {
+ MessageBox.Show(DBUtility.ClsPub.isStrNull(oDsBatchNo.Tables[0].Rows[0]["HRemark"]));
+ bc.Enabled = true;
+ oCn.RollBack();
+ return;
+ }
+ else
+ {
+ grdMain.Rows[j].Cells[HBaNoCol].Value = sHCode2;
+ grdMain.Rows[j].Cells[HBatchNoCol].Value = DBUtility.ClsPub.isStrNull(oDsBatchNo.Tables[0].Rows[0]["HBatchNo"]);
+ grdMain.Rows[j].Cells[HCode2Col].Value = DBUtility.ClsPub.isStrNull(oDsBatchNo.Tables[0].Rows[0]["HCode2"]);
+ }
+
HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
HCode3 = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCode3Col].Value);
//鑾峰彇鏈�澶ф祦姘村彿
@@ -1076,12 +1109,12 @@
string sAllowCol = HQtyCol.ToString()+
"," + HMinQtyCol.ToString() +
"," + HWMinQtyCol.ToString() +
- "," + HMaterNumberCol.ToString() +
+ //"," + HMaterNumberCol.ToString() +
"," + HAuxPropNumberCol.ToString() +
"," + HUnitNumberCol.ToString() +
- "," + HCode1Col.ToString() +
+ //"," + HCode1Col.ToString() +
//"," + HCode2Col.ToString() +
- "," + HCode3Col.ToString() +
+ //"," + HCode3Col.ToString() +
"," + HInnerBillNoCol.ToString() +
"," + HRemarkCol.ToString();
@@ -1506,9 +1539,9 @@
"," + HMinQtyCol.ToString() +
"," + HWMinQtyCol.ToString() +
"," + HAuxPropNumberCol.ToString() +
- "," + HCode1Col.ToString() +
+ //"," + HCode1Col.ToString() +
//"," + HCode2Col.ToString() +
- "," + HCode3Col.ToString() +
+ //"," + HCode3Col.ToString() +
"," + HInnerBillNoCol.ToString() +
"," + HRemarkCol.ToString();
grdMain.Columns[HBillNoCol].ReadOnly = true;
diff --git a/WebAPI/.vs/WebAPI.csproj.dtbcache.json b/WebAPI/.vs/WebAPI.csproj.dtbcache.json
new file mode 100644
index 0000000..2ea6454
--- /dev/null
+++ b/WebAPI/.vs/WebAPI.csproj.dtbcache.json
@@ -0,0 +1 @@
+{"RootPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\WebAPI","ProjectFileName":"WebAPI.csproj","Configuration":"Release|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"App_Start\\BundleConfig.cs"},{"SourceFile":"App_Start\\FilterConfig.cs"},{"SourceFile":"App_Start\\RouteConfig.cs"},{"SourceFile":"App_Start\\SwaggerConfig.cs"},{"SourceFile":"App_Start\\WebApiConfig.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_BarCodeBillController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_ConkTypeController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_ColorClassController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_ICBomBillController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_WorkDayController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_PackTypeController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_RoutingGroupController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_TechnologyController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_TechnologyParUnitController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_TechParamByProcController.cs"},{"SourceFile":"Controllers\\BaseSet\\Pay_PeriodInfoSetController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_OrderBackInfoController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_OrderLevController.cs"},{"SourceFile":"Controllers\\BaseSet\\Xt_DataDictionary_ProcController.cs"},{"SourceFile":"Controllers\\BaseSet\\Xt_DataDictionary_TableController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_ModelTypeController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_QCCheckClassController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_CheckItemController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_MaintenanceAcceptItemController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_MaintenanceItemController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_MaintenanceModeController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_StockPlaceController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_EquipMentController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_WorkCenterController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_CurrencyController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_UnitController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_BadReasonController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_CustomerController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_DepartmentController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_EmployeeController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_GroupController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_MaterialController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_ProcessController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_SourceController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_SupplierController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_PropertyController.cs"},{"SourceFile":"Controllers\\BaseSet\\Gy_WarehouseController.cs"},{"SourceFile":"Controllers\\BaseSet\\Xt_DataDictionary_ViewController.cs"},{"SourceFile":"Controllers\\BaseSet\\Xt_grdAlignment_WMESController.cs"},{"SourceFile":"Controllers\\BaseSet\\Xt_ORGANIZATIONSController.cs"},{"SourceFile":"Controllers\\BLL\\Xt_AccountPeriodController.cs"},{"SourceFile":"Controllers\\BLL\\Xt_BillSubTypeController.cs"},{"SourceFile":"Controllers\\BLL\\Xt_BillTypeController.cs"},{"SourceFile":"Controllers\\BLL\\Xt_UserGroupController.cs"},{"SourceFile":"Controllers\\BLL\\Xt_XtgnbController.cs"},{"SourceFile":"Controllers\\BLL\\Xt_SystemParameterController.cs"},{"SourceFile":"Controllers\\BLL\\Xt_UserController.cs"},{"SourceFile":"Controllers\\BLL\\Xt_SystemLogController.cs"},{"SourceFile":"Controllers\\CellWidthController.cs"},{"SourceFile":"Controllers\\CGGL\\Cg_ContractBillController.cs"},{"SourceFile":"Controllers\\CGGL\\Cg_PORequestBillController.cs"},{"SourceFile":"Controllers\\CGGL\\Cg_PurchaseReturnController.cs"},{"SourceFile":"Controllers\\CGGL\\Kf_POStockInBackBillController.cs"},{"SourceFile":"Controllers\\CGGL\\Kf_POStockInBillController.cs"},{"SourceFile":"Controllers\\CGGL\\Cg_POOrderBillController.cs"},{"SourceFile":"Controllers\\CGGL\\Sup_AskPriceBillController.cs"},{"SourceFile":"Controllers\\CGGL\\Sup_QuotePriceBillController.cs"},{"SourceFile":"Controllers\\CGGL\\WW_EntrustOrderBillController.cs"},{"SourceFile":"Controllers\\CGGL\\Cg_POInStockBillController.cs"},{"SourceFile":"Controllers\\CGGL\\Cg_POInStockBackBillController.cs"},{"SourceFile":"Controllers\\CGGL\\Cg_PayableBillController.cs"},{"SourceFile":"Controllers\\CJGL\\Cj_CallGoodsBillBackController.cs"},{"SourceFile":"Controllers\\CJGL\\Cj_CallGoodsBillMainController.cs"},{"SourceFile":"Controllers\\CJGL\\Cj_ComplementGoodsBillController.cs"},{"SourceFile":"Controllers\\CJGL\\Cj_NoPassProcController.cs"},{"SourceFile":"Controllers\\CJGL\\Cj_SendGoodsBillController.cs"},{"SourceFile":"Controllers\\CJGL\\Mes_OrderProcFlowAllReportController.cs"},{"SourceFile":"Controllers\\CJGL\\Gy_MaterPreventErrMouldBillController.cs"},{"SourceFile":"Controllers\\SBGL\\SBBB\\Sb_EquipMentCollectionTechParamController.cs"},{"SourceFile":"Controllers\\SBGL\\SBBB\\Sb_EquipMentCollectionTechParam_TempController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_ProductionReportsController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\Kf_MoveStockBillController.cs"},{"SourceFile":"Controllers\\鍝佽川绠＄悊\\璐ㄩ噺鏈堝害鐩爣鍗昞\QC_MonthTarGetBillController.cs"},{"SourceFile":"Controllers\\CJGL\\Qc_PreventErrMouldCheckBillController.cs"},{"SourceFile":"Controllers\\CJGL\\Sc_WorkBeginDotCheckBillController.cs"},{"SourceFile":"Controllers\\CJGL\\ProductionPlanReportController.cs"},{"SourceFile":"Controllers\\CJGL\\Sc_ProcessExchangeBillController.cs"},{"SourceFile":"Controllers\\CJGL\\Cj_StationOutBillController.cs"},{"SourceFile":"Controllers\\CJGL\\Cj_StationInBillController.cs"},{"SourceFile":"Controllers\\CJGL\\Cj_StationEntrustOutBillController.cs"},{"SourceFile":"Controllers\\CJGL\\Sc_ProcExchRecordBackBillController.cs"},{"SourceFile":"Controllers\\CJGL\\Sc_ProcessSendWorkController.cs"},{"SourceFile":"Controllers\\CJGL\\Sc_ProcExchSendWorkBillController.cs"},{"SourceFile":"Controllers\\CJGL\\Sc_ProcExchWorkBackBillController.cs"},{"SourceFile":"Controllers\\CJGL\\Sc_ProcExchWWSendWorkBillController.cs"},{"SourceFile":"Controllers\\CJGL\\Sc_WorkBillAutoSortBillMainController.cs"},{"SourceFile":"Controllers\\CJGL\\Cj_SingleStationController.cs"},{"SourceFile":"Controllers\\Gy_MateMouldController.cs"},{"SourceFile":"Controllers\\Gy_StdMinPickQtyController.cs"},{"SourceFile":"Controllers\\JHGL\\Gy_MaterialTechParamBillController.cs"},{"SourceFile":"Controllers\\MJGL\\Sc_MouldinventoryBillController.cs"},{"SourceFile":"Controllers\\MJGL\\Sc_MouldDotCheckRuleBillController.cs"},{"SourceFile":"Controllers\\MJGL\\Sc_MouldLifeUseBillController.cs"},{"SourceFile":"Controllers\\MJGL\\Sc_MouldReportController.cs"},{"SourceFile":"Controllers\\MJGL\\Sc_MouldScrapRequestBillController.cs"},{"SourceFile":"Controllers\\MJGL\\Sc_MouldStatusChangeBillController.cs"},{"SourceFile":"Controllers\\MJGL\\Sc_MouldUpperBillController.cs"},{"SourceFile":"Controllers\\Pay_ReportController.cs"},{"SourceFile":"Controllers\\PlateBindingController.cs"},{"SourceFile":"Controllers\\SBGL\\Gy_FixCardChangeBillController.cs"},{"SourceFile":"Controllers\\SBGL\\Gy_FixCardBillController.cs"},{"SourceFile":"Controllers\\SBGL\\SB_EquipICMOTechParamBillController.cs"},{"SourceFile":"Controllers\\SBGL\\Sb_EquipBeginBillController.cs"},{"SourceFile":"Controllers\\SBGL\\Sb_EquipReportController.cs"},{"SourceFile":"Controllers\\SBGL\\Sb_EquipStopBillController.cs"},{"SourceFile":"Controllers\\SBGL\\Sb_EquipConkBookBillController.cs"},{"SourceFile":"Controllers\\SBGL\\Sb_EquipSparepartsBillController.cs"},{"SourceFile":"Controllers\\SBGL\\Sb_EquipSparepartsChangeBillController.cs"},{"SourceFile":"Controllers\\SBGL\\Sb_EquipStatusChangeBillController.cs"},{"SourceFile":"Controllers\\SBGL\\SBTC\\Sb_EquipStockInCheckBillController.cs"},{"SourceFile":"Controllers\\SBGL\\SBTC\\Sb_EquipWorkBeforeCheckBillController.cs"},{"SourceFile":"Controllers\\SBGL\\Sb_EquipWorkBeforeCheckSBillController.cs"},{"SourceFile":"Controllers\\SBGL\\Sb_EquipStockInCheckBillSController.cs"},{"SourceFile":"Controllers\\SCGL\\Gy_SourceWorkStationSetController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_ComplementGoodBill_ZXBZController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_CurrentTicketController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_ICMOBillWorkQtyStatus_TmpController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_ICMOChangeBillController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_MyTicketController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_WorkBillMonthPlanController.cs"},{"SourceFile":"Controllers\\SCGL\\鏃ヨ鍒掔鐞哱\DataHelper.cs"},{"SourceFile":"Controllers\\SCGL\\鏃ヨ鍒掔鐞哱\JIT_Cg_PODemandPlanBillController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_CallGoodsBackRequestBillController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_ComplementGoodBillController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_ComplementGoodsController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_ICBomBillController.cs"},{"SourceFile":"Controllers\\SCGL\\鏃ヨ鍒掔鐞哱\JIT_DayPlanPlatFormBillController.cs"},{"SourceFile":"Controllers\\SCGL\\鏃ヨ鍒掔鐞哱\JIT_DayPlanPlatFormImportController.cs"},{"SourceFile":"Controllers\\SCGL\\鏃ヨ鍒掔鐞哱\JIT_ICMOSortBillController.cs"},{"SourceFile":"Controllers\\SCGL\\鏃ヨ鍒掔鐞哱\NpoiHelper.cs"},{"SourceFile":"Controllers\\SCGL\\鏃ヨ鍒掔鐞哱\Sc_JIT_ComplementGoodBillController.cs"},{"SourceFile":"Controllers\\SCGL\\鏃ヨ鍒掔鐞哱\JIT_CompleteController..cs"},{"SourceFile":"Controllers\\SCGL\\鏃ヨ鍒掔鐞哱\Sc_WorkBillSortBillController.cs"},{"SourceFile":"Controllers\\SCGL\\鏃ヨ鍒掔鐞哱\Sc_WorkDemandPlanBillController.cs"},{"SourceFile":"Controllers\\Sc_PckSplitBillController.cs"},{"SourceFile":"Controllers\\GZGL\\Gy_DuSubsidyItemBillController.cs"},{"SourceFile":"Controllers\\JHGL\\Gy_RoutingBillController.cs"},{"SourceFile":"Controllers\\Kf_ICStockBillMainController.cs"},{"SourceFile":"Controllers\\MateOutController.cs"},{"SourceFile":"Controllers\\MJGL\\Sc_MouldMaintainRuleBillController.cs"},{"SourceFile":"Controllers\\MJGL\\Sc_MouldMoveStockStepInBillListController .cs"},{"SourceFile":"Controllers\\MJGL\\Sc_MouldProdMoveBillListController.cs"},{"SourceFile":"Controllers\\MJGL\\Sc_MouldMoveStockStepOutBillController.cs"},{"SourceFile":"Controllers\\MJGL\\Sc_MouldProdInBillController.cs"},{"SourceFile":"Controllers\\MJGL\\Sc_MouldRepairChangeBillController.cs"},{"SourceFile":"Controllers\\MJGL\\Sc_MouldRepairOutBillController.cs"},{"SourceFile":"Controllers\\MJGL\\Sc_MouldScrapInBillController.cs"},{"SourceFile":"Controllers\\MJGL\\Sc_MouldOtherOutBillController.cs"},{"SourceFile":"Controllers\\MJJY\\Mj_PDA_MoudlCheckController.cs"},{"SourceFile":"Controllers\\MoveStockBillController.cs"},{"SourceFile":"Controllers\\Open_PrintTemController.cs"},{"SourceFile":"Controllers\\ReportStepPlatFormController.cs"},{"SourceFile":"Controllers\\SBGL\\Sb_EquipRepairSendWorkBillController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_ProductionReturnBillController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_PackUnionBillController.cs"},{"SourceFile":"Controllers\\Sc_MouldRepairSendWorkBillController.cs"},{"SourceFile":"Controllers\\Sc_ProcessMangementController.cs"},{"SourceFile":"Controllers\\Sc_ProcessReportController.cs"},{"SourceFile":"Controllers\\XSGL\\Kf_ICStockBackBillController.cs"},{"SourceFile":"Controllers\\XSGL\\Kf_SellOutEntryReportController.cs"},{"SourceFile":"Controllers\\XSGL\\Xs_OutDoorCheckBillController.cs"},{"SourceFile":"Controllers\\XSGL\\Xs_SellOutChangeBillController.cs"},{"SourceFile":"Controllers\\XSGL\\Xs_CusBalanceReportController.cs"},{"SourceFile":"Controllers\\XSGL\\Xs_ReceivableBillController.cs"},{"SourceFile":"Controllers\\XSGL\\Xs_ContractBillController.cs"},{"SourceFile":"Controllers\\XSGL\\YS_ContactBalController.cs"},{"SourceFile":"Controllers\\XSGL\\Xs_SeOrderChangeBillController.cs"},{"SourceFile":"Controllers\\XSGL\\Xs_ExceptiveCheckRequestBillController.cs"},{"SourceFile":"Controllers\\XSGL\\Xs_CusRatingChangeBillController.cs"},{"SourceFile":"Controllers\\CGGL\\YF_PayMentBackBillController.cs"},{"SourceFile":"Controllers\\CGGL\\YF_PayMentBillController.cs"},{"SourceFile":"Controllers\\XSGL\\YS_ReceiveBackBillController.cs"},{"SourceFile":"Controllers\\CGGL\\YF_PayMentOtherBillController.cs"},{"SourceFile":"Controllers\\XSGL\\Xs_SeReportController.cs"},{"SourceFile":"Controllers\\XSGL\\YS_ReceiveOtherBillController.cs"},{"SourceFile":"Controllers\\XSGL\\YS_ReceiveBillController.cs"},{"SourceFile":"Controllers\\XSGL\\Kf_SellOutBillController.cs"},{"SourceFile":"Controllers\\浜轰簨绠＄悊\\鍏ヨ亴鐢宠\\HR_EmpEngageRequestBillController.cs"},{"SourceFile":"Controllers\\浜轰簨绠＄悊\\寮傚父鍙嶉鍗昞\OA_ErrMsgBackBillController.cs"},{"SourceFile":"Controllers\\浜轰簨绠＄悊\\绂昏亴鐢宠\\HR_EmpDimissionBillController.cs"},{"SourceFile":"Controllers\\浜轰簨绠＄悊\\鑱屽憳寮傚姩鍗昞\HR_EmpChangeBillController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\涓夌偣鐓у悎鎵爜璁板綍鍗昞\WMS_CusBarCodeCheckBillController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\濮斿鐢ㄦ枡\\WW_PPBomBillController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\鎵爜寮傚父璁板綍\\KF_PonderationBillController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\鏉＄爜鍑哄叆搴撹褰昞\Kf_ICStockInOutBillController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\鏉＄爜搴撳瓨\\KF_ICInventoryList_WMSBillController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\鏉＄爜鐢熸垚\\Gy_BarCodeBill_OutController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\鏉＄爜鐢熸垚\\Gy_SplitBarCodeController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\鏉＄爜鐢熸垚\\KF_BarCodeStatusChangeBillController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\鏉＄爜鐢熸垚\\Sc_BarCodeController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\璋冩嫧鐩樼偣\\Kf_MoveStockRequestBillController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\棰嗘枡鍙戣揣\\apiController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\棰嗘枡鍙戣揣\\Kf_StepFoldOutBillController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\棰嗘枡鍙戣揣\\Kf_StockOutRequestBillController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\棰嗘枡鍙戣揣\\Kf_MateOutRequestBillController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\楠屾敹鍏ュ簱\\Kf_StepFoldinBillController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\楠屾敹鍏ュ簱\\Kf_ProductInBillController.cs"},{"SourceFile":"Controllers\\鍗氭棩鑷姩鎵爜绾縗\ScanlineAPIController.cs"},{"SourceFile":"Controllers\\鍝佽川绠＄悊\\浜х嚎璐ㄦ骞冲彴\\Sc_ICMOBillQualityStatus_TmpController.cs"},{"SourceFile":"Controllers\\鍝佽川绠＄悊\\浜х嚎杩斾慨骞冲彴\\Sc_SourceLineRepairBillController.cs"},{"SourceFile":"Controllers\\鍝佽川绠＄悊\\瀹㈣瘔澶勭悊鍗昞\Crm_CustomerAppealBillController.cs"},{"SourceFile":"Controllers\\鍝佽川绠＄悊\\宸℃鍗昞\QC_PatrolProcCheckBillController.cs"},{"SourceFile":"Controllers\\鍝佽川绠＄悊\\宸℃鍗昞\QC_PatrolProcCheckOtherBillController.cs"},{"SourceFile":"Controllers\\鍝佽川绠＄悊\\宸ュ簭妫�楠屽崟\\MES_ProcessCheckBill_PDAController.cs"},{"SourceFile":"Controllers\\鍝佽川绠＄悊\\搴撳瓨妫�楠屽崟\\QC_StockCheckBillController.cs"},{"SourceFile":"Controllers\\鍝佽川绠＄悊\\妫�楠屽彇鏍疯繕鏍峰崟\\QC_TakeSampleCheckBillController.cs"},{"SourceFile":"Controllers\\鍝佽川绠＄悊\\璐ㄩ噺鎶ヨ〃\\QC_QualityReportsController.cs"},{"SourceFile":"Controllers\\CJGL\\CJ_WIPBeginStockBillController.cs"},{"SourceFile":"Controllers\\鍝佽川绠＄悊\\杞﹂棿鑷鍗昞\QC_WorkSelfCheckBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_CardChangeTypeController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_CardStatusController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_CardAddressController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_CardTypeController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_COMMONCONTACTBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_CustLocationController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_DotCheckItemMethodController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_DotCheckItemClassController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_DutyBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_EquipStatusController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_MatePriceSupController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_MaterTypeBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_MouldStatusController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_OperatorController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_PaymentConditionListBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_DisposeWayController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_ScrapReasonController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_TemporaryAreaController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_RateTypeController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_RecConditionBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_SettleStyleController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_SOPBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_SOPBillEditController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_SOPBillListController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_StaffController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_StockCheckItemBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_StockPlace_Controller.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_StockStatusBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_SupplierContactBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_TaxMIXController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_TaxRateBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_WorkController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_WorkStationBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_UnitConvertRateController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Xt_CheckFlowBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Xt_CheckFlowProgressBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Xt_CheckItemBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Xt_FastICSchemeController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\宸ヨ祫鍩虹璧勬枡\\Gy_ProcCommPriceController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\宸ヨ祫鍩虹璧勬枡\\Gy_WorkTypeController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\宸ヨ祫鍩虹璧勬枡\\Gy_WorkPayTypeController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\宸ヨ祫鍩虹璧勬枡\\Gy_ClassTimePrjGroupController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鐢熶骇鍩虹璧勬枡\\Gy_ShiftsController.cs"},{"SourceFile":"Controllers\\澶忓疂鍞悗鎺ュ彛\\ASSController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\HR_EmployeeSkillBillController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\HR_EmployeeSkillExamBillController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\Pay_OutApplyBillController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\Pay_OverApplyBillController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\Pay_PayMentBillController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\Pay_SalaryCalculateController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\Pay_DuSubsidyItemBillController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\Pay_ErrWorkTimesRequestBillController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\Pay_ProcPriceRequestBillController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\Pay_MonthlySalaryReportController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\Pay_PieceRateWageReportController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\宸ヨ祫鍩虹璧勬枡\\Gy_ClassTimePrjController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\Gy_ClassTimePrjSubController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\Pay_OtherBalBillController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\Pay_GroupBalBillController.cs"},{"SourceFile":"Controllers\\PurchaseOrderController.cs"},{"SourceFile":"Controllers\\QC_POStockInCheckBillController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\Gy_GroupEmpBillController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\Pay_PurchaseWallclothBillController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\HR_PostSkillBillController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\Pay_WorkTimesBillController.cs"},{"SourceFile":"Controllers\\宸ヨ祫绠＄悊\\Pay_SingleBalBillController.cs"},{"SourceFile":"Controllers\\ProductionOrderController.cs"},{"SourceFile":"Controllers\\PublicPageMethodController.cs"},{"SourceFile":"Controllers\\ReportFromController.cs"},{"SourceFile":"Controllers\\GG_NoticeController.cs"},{"SourceFile":"Controllers\\ReportPlatFormController.cs"},{"SourceFile":"Controllers\\SBGL\\Gy_EquipFileMainController.cs"},{"SourceFile":"Controllers\\SBGL\\Gy_EquipTypeController.cs"},{"SourceFile":"Controllers\\SBGL\\Sb_EquipDotCheckRuleBillController.cs"},{"SourceFile":"Controllers\\SBGL\\Sb_EquipMaintainRuleBillController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_MESProductReportBillController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_MESTransFerWorkBillController.cs"},{"SourceFile":"Controllers\\Sc_MouldRepairOutBillController.cs"},{"SourceFile":"Controllers\\Sc_MouldRepairInBillListController.cs"},{"SourceFile":"Controllers\\Sc_MouldController.cs"},{"SourceFile":"Controllers\\Sc_GroupOrderBillController.cs"},{"SourceFile":"Controllers\\QC_ManagementController.cs"},{"SourceFile":"Controllers\\SBGL\\Sb_EquipDotCheckBillController.cs"},{"SourceFile":"Controllers\\SBGL\\Sb_EquipMaintainBillController.cs"},{"SourceFile":"Controllers\\SBGL\\Sb_EquipMaintainPlanBillController.cs"},{"SourceFile":"Controllers\\SBGL\\Sb_EquipDotCheckPlanBillController.cs"},{"SourceFile":"Controllers\\Sb_CheckEqpRepairWorkBillController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_MaterToSourceBillController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_MESEndWorkBillController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_MESStopWorkBillController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_MESBeginWorkBillController.cs"},{"SourceFile":"Controllers\\SCGL\\QC_LastPieceCheckBillController.cs"},{"SourceFile":"Controllers\\SCGL\\QC_OutCompCheckBillController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_ICMOReportBillController.cs"},{"SourceFile":"Controllers\\Sc_MouldOtherInBillController.cs"},{"SourceFile":"Controllers\\CJGL\\Cj_StationEntrustInBillController.cs"},{"SourceFile":"Controllers\\LMESController.cs"},{"SourceFile":"Controllers\\LookingForBillController.cs"},{"SourceFile":"Controllers\\NewApiController.cs"},{"SourceFile":"Controllers\\SCGL\\Sc_PPBomBillController.cs"},{"SourceFile":"Controllers\\Sc_CheckToolsRepairWorkBillListController.cs"},{"SourceFile":"Controllers\\XSGL\\Xs_SeOutStockBackBillController.cs"},{"SourceFile":"Controllers\\XSGL\\Xs_SeOutStockBillController.cs"},{"SourceFile":"Controllers\\XSGL\\Xs_SeOrderBillController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\棰嗘枡鍙戣揣\\Kf_MateOutBackBillController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\棰嗘枡鍙戣揣\\Kf_MateOutBillController.cs"},{"SourceFile":"Controllers\\浠撳瓨绠＄悊\\楠屾敹鍏ュ簱\\Kf_EntrustOutBackBillController.cs"},{"SourceFile":"Controllers\\鍝佽川绠＄悊\\宸ュ簭妫�楠屽崟\\QC_ProcessCheckBillController.cs"},{"SourceFile":"Controllers\\鍝佽川绠＄悊\\棣栦欢妫�楠屽崟\\QC_FirstPieceCheckBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_ConkReasonBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_DotCheckBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_MaintainBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_RepairBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\鍩虹璧勬枡\\Gy_RepairCheckBillController.cs"},{"SourceFile":"Controllers\\鍩虹璧勬枡\\宸ヨ祫鍩虹璧勬枡\\Gy_ProcPriceController.cs"},{"SourceFile":"Controllers\\搴旀敹绠＄悊\\YS_ReceiveReportController.cs"},{"SourceFile":"Controllers\\鏁版嵁鍚屾\\閽夐拤鍚屾\\DD_DataSynchronizationController.cs"},{"SourceFile":"Controllers\\鏉＄爜绠＄悊\\MouldController.cs"},{"SourceFile":"Controllers\\鏉＄爜绠＄悊\\WEBSController.cs"},{"SourceFile":"Controllers\\鐢熶骇绠＄悊\\鎶ュ伐鍙板伐搴廫\Sc_MaterToSourceStepBillController.cs"},{"SourceFile":"Controllers\\鐢熶骇绠＄悊\\鎶ュ伐鍙板伐搴廫\Sc_MESBeginStepWorkBillController.cs"},{"SourceFile":"Controllers\\鐢熶骇绠＄悊\\鎶ュ伐鍙板伐搴廫\Sc_MESEndStepWorkBillController.cs"},{"SourceFile":"Controllers\\鐢熶骇绠＄悊\\鎶ュ伐鍙板伐搴廫\Sc_MESProductReportStepBillController.cs"},{"SourceFile":"Controllers\\鐢熶骇绠＄悊\\鎶ュ伐鍙板伐搴廫\Sc_MESReturnStepWorkBillController.cs"},{"SourceFile":"Controllers\\鐢熶骇绠＄悊\\鎶ュ伐鍙板伐搴廫\Sc_MESStopStepWorkBillController.cs"},{"SourceFile":"Controllers\\鐢熶骇绠＄悊\\鎶ュ伐鍙板伐搴廫\Sc_QualityReportStepBillController.cs"},{"SourceFile":"Controllers\\鐢熶骇绠＄悊\\鐢熶骇浠诲姟鍗昞\Sc_ICMOBillController.cs"},{"SourceFile":"Controllers\\鐢熶骇绠＄悊\\鐢熶骇鎶ヨ〃\\Sc_ProductReportController.cs"},{"SourceFile":"Controllers\\鐢熶骇绠＄悊\\璐ㄩ噺姹囨姤鍗昞\Sc_QualityReportBillController.cs"},{"SourceFile":"Controllers\\鐪嬫澘绠＄悊\\KB_CSGLController.cs"},{"SourceFile":"Controllers\\鐪嬫澘绠＄悊\\Kf_XSFHController.cs"},{"SourceFile":"Controllers\\椤圭洰绠＄悊\\涓氱哗鎸囨爣\\PM_YearEmployeeMoneyBillController.cs"},{"SourceFile":"Controllers\\PM_CustomerProInfoBillController.cs"},{"SourceFile":"Controllers\\椤圭洰绠＄悊\\宸ヤ綔浠诲姟\\PM_WorkTaskBillController.cs"},{"SourceFile":"Controllers\\椤圭洰绠＄悊\\宸ヤ綔鍛ㄨ鍒抃\PM_WorkTaskWeekBillController.cs"},{"SourceFile":"Controllers\\椤圭洰绠＄悊\\宸ョ▼椤圭洰\\PM_ProjectBillController.cs"},{"SourceFile":"Controllers\\椤圭洰绠＄悊\\鎶ヨ〃鍒嗘瀽\\PM_ReportController.cs"},{"SourceFile":"Controllers\\椤圭洰绠＄悊\\椤圭洰闃舵\\Gy_ProjectStageController.cs"},{"SourceFile":"Dapper\\SqlHelper.cs"},{"SourceFile":"Dapper\\SqlPools.cs"},{"SourceFile":"DbUntil\\DataFormatUntil.cs"},{"SourceFile":"DLL\\ClsGy_BadPhenomena_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_TechnologyParameterType_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_InspectInstruMent_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_InspectBasis_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_CheckNoteItem_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_PoStockStyle_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_AreaSet_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_CusType_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_ErrMsgBackType_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_MaintainLev_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_RestDay_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_PreventErrMould_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_TaskClass_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_ProjectClass_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_StockCheckItem_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_ProjectMoney_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_SupType_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_SellStyle_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_PostSkill_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_StockOutStyle_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_StockInStyle_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_StockMoveStyle_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_Post_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_QualityStd_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_InspectMethod_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_InspectValue_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_BadResult_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_BadReason_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_DuSubsidyItemBill.cs"},{"SourceFile":"DLL\\ClsGy_EquipFileMain.cs"},{"SourceFile":"DLL\\ClsGy_EquipTypeBill.cs"},{"SourceFile":"DLL\\ClsGy_Material_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_Source_Ctl.cs"},{"SourceFile":"DLL\\ClsGy_WorkPayTypeBill.cs"},{"SourceFile":"DLL\\ClsGy_WorkTypeBill.cs"},{"SourceFile":"DLL\\ClsKf_MateOutBackBill.cs"},{"SourceFile":"DLL\\ClsKf_MateOutBill.cs"},{"SourceFile":"DLL\\ClsKf_SellOutBackBill.cs"},{"SourceFile":"DLL\\ClsOA_ErrMsgBackBill.cs"},{"SourceFile":"DLL\\ClsOA_InformBill.cs"},{"SourceFile":"DLL\\ClsQC_NoPassProdCheckBill.cs"},{"SourceFile":"DLL\\ClsQC_PatrolProcCheckBill.cs"},{"SourceFile":"DLL\\ClsSb_EquipConkBookBill.cs"},{"SourceFile":"DLL\\ClsSb_EquipDotCheckBill.cs"},{"SourceFile":"DLL\\ClsSb_EquipMaintainBill.cs"},{"SourceFile":"DLL\\ClsSb_EquipMaintainRuleBill.cs"},{"SourceFile":"DLL\\ClsSb_EquipRepairCheckBill.cs"},{"SourceFile":"DLL\\ClsSb_EquipRepairSendWorkBill.cs"},{"SourceFile":"DLL\\ClsSb_EquipRepairSignBill.cs"},{"SourceFile":"DLL\\ClsSb_EquipRepairWorkBill.cs"},{"SourceFile":"DLL\\ClsSb_MouldRepairWorkBill.cs"},{"SourceFile":"DLL\\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs"},{"SourceFile":"DLL\\ClsSc_ICMOReportBill.cs"},{"SourceFile":"DLL\\ClsSc_ICMOStepBillWorkQtyStatus_Tmp.cs"},{"SourceFile":"DLL\\ClsSc_MESBeginWorkBill.cs"},{"SourceFile":"DLL\\ClsSc_MESEndWorkBill.cs"},{"SourceFile":"DLL\\ClsSc_MESReturnStepWorkBill.cs"},{"SourceFile":"DLL\\ClsSc_MESStopWorkBill.cs"},{"SourceFile":"DLL\\ClsSc_MouldDotCheckBill.cs"},{"SourceFile":"DLL\\ClsSc_MouldLifeChangeBill.cs"},{"SourceFile":"DLL\\ClsSc_MouldMaintainBill.cs"},{"SourceFile":"DLL\\ClsSc_MouldOtherOutBill.cs"},{"SourceFile":"DLL\\ClsSc_MouldOtherInBill.cs"},{"SourceFile":"DLL\\ClsSc_MouldMoveStockStepOutBill.cs"},{"SourceFile":"DLL\\ClsSc_PackUnionBill.cs"},{"SourceFile":"DLL\\ClsSc_PHPCruxBillBill.cs"},{"SourceFile":"DLL\\ClsSc_ProcessPlan.cs"},{"SourceFile":"DLL\\ClsWW_PPBomBill.cs"},{"SourceFile":"DLL\\SBGL\\SBBB\\Sb_EquipMentCollectionTechParam_Ctl.cs"},{"SourceFile":"DLL\\宸ヨ祫绠＄悊\\ClsPay_GroupBalBill.cs"},{"SourceFile":"DLL\\宸ヨ祫绠＄悊\\ClsGy_GroupEmpBill.cs"},{"SourceFile":"DLL\\宸ヨ祫绠＄悊\\ClsPay_WorkTimesBill.cs"},{"SourceFile":"DLL\\閽夐拤娑堟伅\\Cls_DDMsg.cs"},{"SourceFile":"DLL\\椤圭洰绠＄悊\\椤圭洰闃舵\\ClsPM_CustomerProInfoBill_Ctl.cs"},{"SourceFile":"HttpClient.cs"},{"SourceFile":"InvokeHelper.cs"},{"SourceFile":"Log.cs"},{"SourceFile":"Models\\ClsGy_Supplier_PayPlan.cs"},{"SourceFile":"Models\\ClsGy_MouldFileBillSub_DotCheckRule.cs"},{"SourceFile":"Models\\ClsGy_MouldFileBillSub_MaintainRule.cs"},{"SourceFile":"Models\\ClsGy_MateMould.cs"},{"SourceFile":"Models\\ClsGy_SupMaterial.cs"},{"SourceFile":"Models\\ClsGy_EquipFileBillSub_DotCheckRule.cs"},{"SourceFile":"Models\\ClsGy_EquipFileBillSub_MaintainRule.cs"},{"SourceFile":"Models\\ClsSb_EquipRepairSignBillMain.cs"},{"SourceFile":"Models\\ClsSb_EquipRepairSignBillSub.cs"},{"SourceFile":"Models\\ClsSc_AssemblyBillMain.cs"},{"SourceFile":"Models\\ClsSc_AssemblyBillSub.cs"},{"SourceFile":"Models\\ClsSc_MESBeginWorkBillSub_RelationBill.cs"},{"SourceFile":"Models\\Gy_MouldFileSub_SubMater.cs"},{"SourceFile":"Models\\SBGL\\SBBB\\Sb_EquipMentCollectionTechParam_Temp.cs"},{"SourceFile":"Models\\SBGL\\SBBB\\Sb_EquipMentCollectionTechParam.cs"},{"SourceFile":"Models\\鍩虹璧勬枡\\Gy_ColorClass.cs"},{"SourceFile":"Models\\Employee.cs"},{"SourceFile":"Models\\Gy_UserCustomer.cs"},{"SourceFile":"Models\\Gy_UserMater.cs"},{"SourceFile":"Models\\Gy_UserProcess.cs"},{"SourceFile":"Models\\Gy_UserUser.cs"},{"SourceFile":"Models\\JIT_Cg_PODemandPlanBillMain.cs"},{"SourceFile":"Models\\JIT_Cg_PODemandPlanBillSub.cs"},{"SourceFile":"Models\\Cg_PODemandPlanConfigBillSub.cs"},{"SourceFile":"Models\\ClsGy_StockCheckItemBill.cs"},{"SourceFile":"Models\\ClsQK_PackingBill.cs"},{"SourceFile":"Models\\ClsSb_EquipRepairSendWorkBillMain.cs"},{"SourceFile":"Models\\ClsSb_EquipRepairSendWorkBillSub.cs"},{"SourceFile":"Models\\ClsSb_MouldRepairWorkBillMain.cs"},{"SourceFile":"Models\\ClsSb_MouldRepairWorkBillSub.cs"},{"SourceFile":"Models\\ClsSc_PackUnionBillMain.cs"},{"SourceFile":"Models\\ClsSc_PackUnionBillSub.cs"},{"SourceFile":"Models\\ClsSc_ProcessPlanMain.cs"},{"SourceFile":"Models\\ClsSc_ProcessPlanSub.cs"},{"SourceFile":"Models\\ClsSc_ProcessReportMain.cs"},{"SourceFile":"Models\\ClsSc_ProcessReportSub.cs"},{"SourceFile":"Models\\ClsWW_PPBomBillMain.cs"},{"SourceFile":"Models\\ClsWW_PPBomBillSub.cs"},{"SourceFile":"Models\\Cls_InventoryAnalysisList.cs"},{"SourceFile":"Models\\GetWeekList.cs"},{"SourceFile":"Models\\Gy_WorkWarehouseBillMainSub.cs"},{"SourceFile":"Models\\HBarCodeList.cs"},{"SourceFile":"Models\\HSouceOrderList.cs"},{"SourceFile":"Models\\JIT_NeedMaterPlanConfigBillSub.cs"},{"SourceFile":"Models\\jsonScanline.cs"},{"SourceFile":"Models\\ScanLineCode.cs"},{"SourceFile":"Models\\Sc_WorkBillSortBillMain.cs"},{"SourceFile":"Models\\Sc_WorkBillSortBillSub.cs"},{"SourceFile":"Models\\Sc_WorkDemandPlanBillMain.cs"},{"SourceFile":"Models\\Sc_WorkDemandPlanBillSub.cs"},{"SourceFile":"Models\\SOPBill.cs"},{"SourceFile":"Models\\SOPBillSub.cs"},{"SourceFile":"Models\\TechnologyParameter.cs"},{"SourceFile":"Models\\TechnologyParameterUnit.cs"},{"SourceFile":"Models\\TechParamByProc.cs"},{"SourceFile":"Models\\WorkCenter.cs"},{"SourceFile":"Models\\Xt_CheckFlowMain.cs"},{"SourceFile":"Models\\Xt_CheckFlowSub.cs"},{"SourceFile":"Models\\Xt_CheckItem.cs"},{"SourceFile":"Models\\鍏跺畠\\ReciveBill_FastModel.cs"},{"SourceFile":"Models\\鍔ㄦ�佸垪\\OptionListModel.cs"},{"SourceFile":"Models\\鍩虹璧勬枡\\ConkType.cs"},{"SourceFile":"Models\\鍩虹璧勬枡\\Gy_ClassTimePrj.cs"},{"SourceFile":"Models\\鍩虹璧勬枡\\Gy_Duty.cs"},{"SourceFile":"Models\\鍩虹璧勬枡\\Gy_TemporaryArea.cs"},{"SourceFile":"Models\\鍩虹璧勬枡\\Gy_StockPlace.cs"},{"SourceFile":"Models\\鍩虹璧勬枡\\WorkDay.cs"},{"SourceFile":"Models\\鍩虹璧勬枡\\PackType.cs"},{"SourceFile":"Models\\鍩虹璧勬枡\\WorkStation.cs"},{"SourceFile":"Models\\宸ヨ祫绠＄悊\\ClsGy_ClassTimePrj_Model.cs"},{"SourceFile":"Models\\宸ヨ祫绠＄悊\\ClsPay_GroupBalBillEmp.cs"},{"SourceFile":"Models\\宸ヨ祫绠＄悊\\ClsPay_GroupBalBillMain.cs"},{"SourceFile":"Models\\宸ヨ祫绠＄悊\\ClsPay_GroupBalBillSub.cs"},{"SourceFile":"DLL\\宸ヨ祫绠＄悊\\ClsPay_SingleBalBill.cs"},{"SourceFile":"DLL\\ClsSc_MouldProdBackBill.cs"},{"SourceFile":"DLL\\宸ヨ祫绠＄悊\\ClsPay_OtherBalBill.cs"},{"SourceFile":"DLL\\ClsSc_MouldProdInBill.cs"},{"SourceFile":"DLL\\ClsSc_MouldMoveStockStepInBill.cs"},{"SourceFile":"DLL\\ClsSc_MouldProdMoveBill.cs"},{"SourceFile":"DLL\\ClsSc_MouldProdOutBill.cs"},{"SourceFile":"DLL\\ClsSc_MouldRepairChangeBill.cs"},{"SourceFile":"DLL\\ClsSc_MouldRepairCheckBill.cs"},{"SourceFile":"DLL\\ClsSc_MouldRepairInBill.cs"},{"SourceFile":"DLL\\ClsSc_MouldRepairOutBill.cs"},{"SourceFile":"DLL\\ClsSc_MouldScrapInBill.cs"},{"SourceFile":"DLL\\ClsSc_MouldScrapOutBill.cs"},{"SourceFile":"DLL\\ClsSc_ProcessReport.cs"},{"SourceFile":"DLL\\ClsSc_ProcessSendWork.cs"},{"SourceFile":"DLL\\ClsWW_EntrustProcessReportBill.cs"},{"SourceFile":"DLL\\ClsWW_EntrustProcessSendOutBill.cs"},{"SourceFile":"DLL\\ClsWW_EntrustWorkOrderBill.cs"},{"SourceFile":"DLL\\ClsSb_EquipDotCheckRuleBill.cs"},{"SourceFile":"LogService.cs"},{"SourceFile":"Models\\ApiConfig.cs"},{"SourceFile":"Models\\ApiResult.cs"},{"SourceFile":"Models\\CheckItem.cs"},{"SourceFile":"Models\\ClsGy_DotCheck.cs"},{"SourceFile":"Models\\ClsGy_Maintain.cs"},{"SourceFile":"Models\\ClsGy_Repair.cs"},{"SourceFile":"Models\\ClsGy_RepairCheck.cs"},{"SourceFile":"Models\\ClsKf_ICStockBillMain.cs"},{"SourceFile":"Models\\ClsKf_ICStockBillScheme.cs"},{"SourceFile":"Models\\ClsKf_ICStockBillSub.cs"},{"SourceFile":"Models\\ClsKf_MateOutBillMain.cs"},{"SourceFile":"Models\\ClsKf_MateOutBillScheme.cs"},{"SourceFile":"Models\\ClsKf_MateOutBillSub.cs"},{"SourceFile":"Models\\ClsOA_ErrMsgBackBillMain.cs"},{"SourceFile":"Models\\ClsOA_ErrMsgBackBillSub.cs"},{"SourceFile":"Models\\ClsOA_ErrMsgBackBillSub2.cs"},{"SourceFile":"Models\\ClsOA_InformBillMain.cs"},{"SourceFile":"Models\\ClsOA_InformBillSub.cs"},{"SourceFile":"Models\\宸ヨ祫绠＄悊\\ClsPay_OtherBalBillMain.cs"},{"SourceFile":"Models\\宸ヨ祫绠＄悊\\ClsPay_OtherBalBillSub.cs"},{"SourceFile":"Models\\宸ヨ祫绠＄悊\\ClsGy_GroupEmpListMain.cs"},{"SourceFile":"Models\\宸ヨ祫绠＄悊\\ClsPay_SingleBalBillMain.cs"},{"SourceFile":"Models\\宸ヨ祫绠＄悊\\ClsGy_GroupEmpListSub.cs"},{"SourceFile":"Models\\宸ヨ祫绠＄悊\\ClsPay_SingleBalBillSub.cs"},{"SourceFile":"Models\\ClsSb_EquipDotCheckRuleBillMain.cs"},{"SourceFile":"Models\\ClsSb_EquipDotCheckRuleBillSub.cs"},{"SourceFile":"Models\\ClsSb_EquipMaintainRuleBillMain.cs"},{"SourceFile":"Models\\ClsSb_EquipMaintainRuleBillSub.cs"},{"SourceFile":"Models\\ClsSb_EquipMaintainRuleBillSub_Item.cs"},{"SourceFile":"Models\\Pay_PeriodInfoSet.cs"},{"SourceFile":"Models\\Gy_OrderBackInfo.cs"},{"SourceFile":"Models\\Gy_OrderLevList.cs"},{"SourceFile":"Models\\ClsGy_EquipFileMain.cs"},{"SourceFile":"Models\\ClsGy_EquipFileType.cs"},{"SourceFile":"Models\\ClsGy_Material_Model.cs"},{"SourceFile":"Models\\ClsSb_EquipDotCheckBillMain.cs"},{"SourceFile":"Models\\ClsSb_EquipDotCheckBillSub.cs"},{"SourceFile":"Models\\ClsSb_EquipMaintainBillMain.cs"},{"SourceFile":"Models\\ClsSb_EquipMaintainBillSub.cs"},{"SourceFile":"Models\\ClsSb_EquipRepairWorkBillMain.cs"},{"SourceFile":"Models\\ClsSc_MouldProdBillMain.cs"},{"SourceFile":"Models\\ClsSc_MouldProdBillSub.cs"},{"SourceFile":"Models\\ClsSc_MouldRepairChangeBillMain.cs"},{"SourceFile":"Models\\ClsSc_MouldRepairChangeBillSub.cs"},{"SourceFile":"Models\\ClsSc_MouldRepairInBillMain.cs"},{"SourceFile":"Models\\ClsSc_MouldRepairInBillSub.cs"},{"SourceFile":"Models\\ClsSc_MouldRepairOutBillMain.cs"},{"SourceFile":"Models\\ClsSc_MouldRepairOutBillSub.cs"},{"SourceFile":"Models\\ClsGy_ProcPrice.cs"},{"SourceFile":"Models\\Gy_WorkType.cs"},{"SourceFile":"Models\\Gy_WorkPayType.cs"},{"SourceFile":"Models\\QC_POStockInCheckBillSub.cs"},{"SourceFile":"Models\\QC_POStockInCheckBill.cs"},{"SourceFile":"Models\\UserPower.cs"},{"SourceFile":"Models\\Xt_DataDictionary_Proc.cs"},{"SourceFile":"Models\\Xt_DataDictionary_View.cs"},{"SourceFile":"Models\\Xt_DataDictionary_Table.cs"},{"SourceFile":"Models\\Gy_User.cs"},{"SourceFile":"Models\\Gy_UserSupper.cs"},{"SourceFile":"Models\\Menu.cs"},{"SourceFile":"Models\\ModelConvertHelper.cs"},{"SourceFile":"Models\\Pay_OtherBalBill.cs"},{"SourceFile":"Models\\Pay_GroupBalBill.cs"},{"SourceFile":"Models\\Pay_GroupBalBillSub.cs"},{"SourceFile":"Models\\Pay_WorkTimesBillSub.cs"},{"SourceFile":"Models\\Pay_WorkTimesBill.cs"},{"SourceFile":"Models\\Pay_SingleBalBill.cs"},{"SourceFile":"Models\\Pay_OtherBalBillSub.cs"},{"SourceFile":"Models\\Pay_SingleBalBillSub.cs"},{"SourceFile":"Models\\ToHierarchy.cs"},{"SourceFile":"Models\\Xt_ORGANIZATIONS.cs"},{"SourceFile":"Models\\ClsSb_EquipRepairWorkBillSub.cs"},{"SourceFile":"Models\\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs"},{"SourceFile":"Models\\ClsSc_ICMOReportBillMain.cs"},{"SourceFile":"Models\\ClsSc_ICMOReportBillSub.cs"},{"SourceFile":"Models\\ClsSc_MESBeginWorkBillMain.cs"},{"SourceFile":"Models\\ClsSc_MESBeginWorkBillSub.cs"},{"SourceFile":"Models\\ClsSc_MESEndWorkBillMain.cs"},{"SourceFile":"Models\\ClsSc_MESEndWorkBillSub.cs"},{"SourceFile":"Models\\ClsSc_MESStopWorkBillMain.cs"},{"SourceFile":"Models\\ClsSc_MESStopWorkBillSub.cs"},{"SourceFile":"Models\\ClsSc_MouldScrapOutBillMain.cs"},{"SourceFile":"Models\\ClsSc_MouldDotCheckBillMain.cs"},{"SourceFile":"Models\\ClsSc_MouldDotCheckBillSub.cs"},{"SourceFile":"Models\\ClsSc_MouldMaintainBillMain.cs"},{"SourceFile":"Models\\ClsSc_MouldMaintainBillSub.cs"},{"SourceFile":"Models\\ClsSc_MouldStockBillMain.cs"},{"SourceFile":"Models\\ClsSc_MouldStockBillSub.cs"},{"SourceFile":"Models\\EquipMent.cs"},{"SourceFile":"Models\\Gy_Mould.cs"},{"SourceFile":"Models\\Gy_MouldSub.cs"},{"SourceFile":"Models\\Sc_MouldStockBillMain.cs"},{"SourceFile":"Models\\Sc_ICMOBillQualityStatus_Tmp.cs"},{"SourceFile":"Models\\Sc_MouldStockBillSub.cs"},{"SourceFile":"Models\\Xt_AccountPeriod.cs"},{"SourceFile":"Models\\xtgnb.cs"},{"SourceFile":"Models\\SystemParameter.cs"},{"SourceFile":"Models\\ClsSc_ProcessSendWorkMain.cs"},{"SourceFile":"Models\\ClsWW_EntrustProcessReportBillMain.cs"},{"SourceFile":"Models\\ClsWW_EntrustProcessReportBillSub.cs"},{"SourceFile":"Models\\ClsWW_EntrustProcessSendOutBillMain.cs"},{"SourceFile":"Models\\ClsWW_EntrustProcessSendOutBillSub.cs"},{"SourceFile":"Models\\ClsWW_EntrustWorkOrderBillMain.cs"},{"SourceFile":"Models\\ClsWW_EntrustWorkOrderBillSub.cs"},{"SourceFile":"Models\\Customer.cs"},{"SourceFile":"Models\\BillType.cs"},{"SourceFile":"Models\\QC_OutCompCheckBillMain.cs"},{"SourceFile":"Models\\QC_OutCompCheckBillSub.cs"},{"SourceFile":"Models\\Supplier.cs"},{"SourceFile":"Models\\DocumentsView.cs"},{"SourceFile":"Models\\Gy_Group.cs"},{"SourceFile":"Models\\Gy_WorkCenter.cs"},{"SourceFile":"Models\\MaintenanceAcceptItem.cs"},{"SourceFile":"Models\\MaintenanceMode.cs"},{"SourceFile":"Models\\QC_LastPieceCheckBillSub.cs"},{"SourceFile":"Models\\QC_LastPieceCheckBillMain.cs"},{"SourceFile":"Models\\QC_ProcessCheckBillSub.cs"},{"SourceFile":"Models\\QC_ProcessCheckBillMain.cs"},{"SourceFile":"Models\\Gy_RoutingBillSub.cs"},{"SourceFile":"Models\\LookingForBill.cs"},{"SourceFile":"Models\\M_Department.cs"},{"SourceFile":"Models\\M_ProcMul.cs"},{"SourceFile":"Models\\M_StationBillMail.cs"},{"SourceFile":"Models\\M_Process.cs"},{"SourceFile":"Models\\Sc_ProcessPlanViewModel.cs"},{"SourceFile":"Models\\Sc_ProcessReportViewModel.cs"},{"SourceFile":"Models\\Sc_ProcessSendWorkViewModel.cs"},{"SourceFile":"Models\\Department.cs"},{"SourceFile":"Models\\Gy_RoutingBill.cs"},{"SourceFile":"Models\\StationBill.cs"},{"SourceFile":"Models\\StationOutBillView.cs"},{"SourceFile":"Models\\WWReportViewModel.cs"},{"SourceFile":"Models\\WWSendOutBillViewModel.cs"},{"SourceFile":"Models\\WW_EntrustProcSendWorkViewModel.cs"},{"SourceFile":"Models\\WW_EntrustWorkOrderViewModel.cs"},{"SourceFile":"Models\\鍩虹璧勬枡\\Gy_ClassTimePrjSub.cs"},{"SourceFile":"Models\\鍩虹璧勬枡\\Gy_Employee.cs"},{"SourceFile":"Models\\鍩虹璧勬枡\\Gy_Process.cs"},{"SourceFile":"Models\\鍩虹璧勬枡\\Warehouse.cs"},{"SourceFile":"Models\\宸ヨ祫绠＄悊\\ClsPay_PurchaseWallclothBillMain.cs"},{"SourceFile":"Models\\宸ヨ祫绠＄悊\\ClsPay_WorkTimesBillMain.cs"},{"SourceFile":"Models\\宸ヨ祫绠＄悊\\ClsPay_PurchaseWallclothBillSub.cs"},{"SourceFile":"Models\\宸ヨ祫绠＄悊\\ClsPay_WorkTimesBillSub.cs"},{"SourceFile":"Models\\椤圭洰绠＄悊\\椤圭洰闃舵\\ClsPM_CustomerProInfoBillSub.cs"},{"SourceFile":"Models\\椤圭洰绠＄悊\\椤圭洰闃舵\\ClsPM_CustomerProInfoBillMain.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.5.AssemblyAttributes.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"Service\\LuBaoSevice.cs"},{"SourceFile":"Service\\ProcessDal.cs"},{"SourceFile":"Service\\YqnDal.cs"},{"SourceFile":"Service\\YqnQbService.cs"},{"SourceFile":"Utility\\Util.cs"},{"SourceFile":"Code\\Common.cs"},{"SourceFile":"Code\\Test2.cs"},{"SourceFile":"Code\\TestDAL.cs"},{"SourceFile":"Controllers\\EntrustOutBackController.cs"},{"SourceFile":"Controllers\\EntrustOutController.cs"},{"SourceFile":"Controllers\\Kf_EntrustInBillController.cs"},{"SourceFile":"Controllers\\OtherOutBillController.cs"},{"SourceFile":"Controllers\\OtherInStockController.cs"},{"SourceFile":"Controllers\\POStockInBackBillController.cs"},{"SourceFile":"Controllers\\POStockInBillController.cs"},{"SourceFile":"Controllers\\ProductInBackController.cs"},{"SourceFile":"Controllers\\ProductInController.cs"},{"SourceFile":"Controllers\\Sc_AssemblyBillController.cs"},{"SourceFile":"Controllers\\SellOutBackController.cs"},{"SourceFile":"Controllers\\SellOutController.cs"},{"SourceFile":"ListModels.cs"},{"SourceFile":"Models\\ClsCg_POInStockBill.cs"},{"SourceFile":"Models\\json.cs"},{"SourceFile":"Controllers\\WebAPIController.cs"},{"SourceFile":"Global.asax.cs"},{"SourceFile":"Models\\JsonResult.cs"},{"SourceFile":"Models\\Pensen.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Web References\\WebS\\Reference.cs"},{"SourceFile":"WebServer.cs"},{"SourceFile":"obj\\Release\\.NETFramework,Version=v4.5.AssemblyAttributes.cs"}],"References":[{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\AlibabaCloud.EndpointUtil.0.1.1\\lib\\net45\\AlibabaCloud.EndpointUtil.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\AlibabaCloud.GatewayDingTalk.1.0.2\\lib\\net45\\AlibabaCloud.GatewayDingTalk.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\AlibabaCloud.GatewaySpi.0.0.3\\lib\\net45\\AlibabaCloud.GatewaySpi.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\AlibabaCloud.OpenApiClient.0.1.11\\lib\\net45\\AlibabaCloud.OpenApiClient.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\AlibabaCloud.OpenApiUtil.1.1.1\\lib\\net45\\AlibabaCloud.OpenApiUtil.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\AlibabaCloud.SDK.Dingtalk.2.1.37\\lib\\net45\\AlibabaCloud.SDK.Dingtalk.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\AlibabaCloud.TeaUtil.0.1.19\\lib\\net45\\AlibabaCloud.TeaUtil.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\AlibabaCloud.TeaXML.0.0.5\\lib\\net45\\AlibabaCloud.TeaXML.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Aliyun.Credentials.1.4.0\\lib\\net45\\Aliyun.Credentials.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Antlr.3.4.1.9004\\lib\\Antlr3.Runtime.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\BLL\\bin\\Release\\BLL.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\BLL\\bin\\Release\\BLL.dll"},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Portable.BouncyCastle.1.8.9\\lib\\net40\\BouncyCastle.Crypto.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\DAL\\bin\\Release\\DAL.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\DAL\\bin\\Release\\DAL.dll"},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Dapper.1.50.2\\lib\\net45\\Dapper.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\DBUtility\\bin\\Release\\DBUtility.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\DBUtility\\bin\\Release\\DBUtility.dll"},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Grpc.Core.Api.2.45.0\\lib\\net45\\Grpc.Core.Api.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Grpc.Core.2.45.0\\lib\\net45\\Grpc.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\SharpZipLib.1.3.2\\lib\\net45\\ICSharpCode.SharpZipLib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\WebAPI\\DLL\\Kingdee.BOS.WebApi.Client.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Microsoft.Azure.AppService.ApiApps.Service.0.9.16\\lib\\net45\\Microsoft.Azure.AppService.ApiApps.Service.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Microsoft.Web.Infrastructure.1.0.0.0\\lib\\net40\\Microsoft.Web.Infrastructure.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\Model\\bin\\Release\\Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\Model\\bin\\Release\\Model.dll"},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\NPOI.2.5.5\\lib\\net45\\NPOI.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\NPOI.2.5.5\\lib\\net45\\NPOI.OOXML.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\NPOI.2.5.5\\lib\\net45\\NPOI.OpenXml4Net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\NPOI.2.5.5\\lib\\net45\\NPOI.OpenXmlFormats.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\Pub_Class\\bin\\Release\\Pub_Class.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\Pub_Class\\bin\\Release\\Pub_Class.dll"},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\Pub_Control\\bin\\Release\\Pub_Control.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\Pub_Control\\bin\\Release\\Pub_Control.dll"},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\RestSharp.104.0\\lib\\net4\\RestSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\SQLHelper\\bin\\Release\\SQLHelper.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\SQLHelper\\bin\\Release\\SQLHelper.dll"},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Swashbuckle.Core.5.0.0\\lib\\net40\\Swashbuckle.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\SyntacticSugar\\bin\\Release\\SyntacticSugar.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\SyntacticSugar\\bin\\Release\\SyntacticSugar.dll"},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\System.Buffers.4.4.0\\lib\\netstandard1.1\\System.Buffers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.ComponentModel.Composition.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.ComponentModel.DataAnnotations.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.EnterpriseServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\System.IdentityModel.Tokens.Jwt.4.0.0\\lib\\net45\\System.IdentityModel.Tokens.Jwt.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\System.Memory.4.5.3\\lib\\netstandard1.1\\System.Memory.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Microsoft.Net.Http.2.2.29\\lib\\net45\\System.Net.Http.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Microsoft.AspNet.WebApi.Client.5.2.7\\lib\\net45\\System.Net.Http.Formatting.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Microsoft.Net.Http.2.2.29\\lib\\net45\\System.Net.Http.Primitives.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Net.Http.WebRequest.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\System.Runtime.CompilerServices.Unsafe.4.5.2\\lib\\netstandard1.0\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Runtime.Serialization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Security.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.ServiceModel.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Web.ApplicationServices.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Microsoft.AspNet.Cors.5.2.7\\lib\\net45\\System.Web.Cors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Web.DynamicData.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Web.Entity.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Web.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Microsoft.AspNet.WebPages.3.2.3\\lib\\net45\\System.Web.Helpers.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Microsoft.AspNet.WebApi.Cors.5.2.7\\lib\\net45\\System.Web.Http.Cors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Microsoft.AspNet.WebApi.Core.5.2.7\\lib\\net45\\System.Web.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\WebAPI\\DLL\\System.Web.Http.WebHost.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Microsoft.AspNet.Mvc.5.2.3\\lib\\net45\\System.Web.Mvc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Microsoft.AspNet.Web.Optimization.1.1.3\\lib\\net40\\System.Web.Optimization.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Microsoft.AspNet.Razor.3.2.3\\lib\\net45\\System.Web.Razor.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Web.Services.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Microsoft.AspNet.WebPages.3.2.3\\lib\\net45\\System.Web.WebPages.Deployment.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Microsoft.AspNet.WebPages.3.2.3\\lib\\net45\\System.Web.WebPages.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Microsoft.AspNet.WebPages.3.2.3\\lib\\net45\\System.Web.WebPages.Razor.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\Tea.1.1.3\\lib\\net45\\Tea.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\sdk_dingding\\TopSdk\\bin\\Release\\TopSdk.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\sdk_dingding\\TopSdk\\bin\\Release\\TopSdk.dll"},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\WebActivatorEx.2.0.6\\lib\\net40\\WebActivatorEx.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\packages\\WebGrease.1.5.2\\lib\\WebGrease.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"D:\\vs\\椤圭洰浠ｇ爜\\MES-WEB-API\\MES-WEB-API\\WebAPI\\bin\\WebAPI.dll","OutputItemRelativePath":"WebAPI.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
index 7dd097a..6a8549e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -6,7 +6,10 @@
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
+using System.IO;
+using System.Web;
using System.Web.Http;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
using WebAPI.Models;
namespace WebAPI.Controllers
{
@@ -1054,6 +1057,207 @@
return objJsonResult;
}
}
+
+ #region 鏍￠獙椤圭洰鍒楄〃 鏂囦欢涓婁紶
+ [Route("Gy_InspectMethod/Gy_Process_Excel")]
+ [HttpPost]
+ public json Gy_InspectMethod_Excel()
+ {
+ json res = new json();
+ try
+ {
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable provisional = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = provisional.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ provisional.Rows.Add(row);
+ }
+
+ //鍒ゆ柇鍒�
+ string error = JudgmentGy_InspectMethodColumns(provisional);
+ if (error.Length > 0)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ res.data = null;
+ return res;
+ }
+
+ for (int i = 0; i <= provisional.Rows.Count - 1; i++)
+ {
+ string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�楠屾柟娉曚唬鐮�"].ToString());
+ string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�楠屾柟娉曞悕绉�"].ToString());
+ string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
+ string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["澶囨敞"].ToString());
+ //鑾峰彇鐪熷疄琛屾暟
+ int line = i + 1;
+ }
+
+ res.code = "1";
+ res.count = 1;
+ res.Message = error;
+ res.data = provisional;
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇妫�楠屾柟娉曞垪
+ /// </summary>
+ /// <param name="provisional"></param>
+ /// <returns></returns>
+ private static string JudgmentGy_InspectMethodColumns(DataTable provisional)
+ {
+ var error = "";
+
+ //鏌ヨ娌℃湁鐨勫垪
+ if (!provisional.Columns.Contains("妫�楠屾柟娉曚唬鐮�"))
+ error += "娌℃湁鎵惧埌銆愭楠屾柟娉曚唬鐮併�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("妫�楠屾柟娉曞悕绉�"))
+ error += "娌℃湁鎵惧埌銆愭楠屾柟娉曞悕绉般�戠殑鏍囬,";
+ return error;
+ }
+ #endregion
+
+ #region 妫�楠屾柟娉曞垪琛� 瀵煎叆(淇濆瓨)
+ [Route("Gy_InspectMethod/Gy_Process_btnSave")]
+ [HttpPost]
+ public object Gy_InspectMethod_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ string organ = sArray[2].ToString();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HNumber = item["妫�楠屾柟娉曚唬鐮�"].ToString();
+ string HName = item["妫�楠屾柟娉曞悕绉�"].ToString();
+ string HHelpCode = item["鍔╄鐮�"];
+ string HRemark = item["澶囨敞"].ToString();
+
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//鐭唬鐮�
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ int HEndFlag = 1;//鏈骇鏍囧織
+ int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //绛夌骇
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_InspectMethod where HNumber='" + HNumber + "'", "Gy_InspectMethod");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+
+ string sql = "insert into Gy_InspectMethod (HName,HNumber,HShortNumber,HLevel,HHelpCode,HParentID,HStopflag,HEndFlag,HRemark,HUseFlag, HUSEORGID, HCREATEORGID, HMakeTime,HMakeEmp)" +
+ $"values('{HName}', '{HNumber}', '{sShortNumber}',{HLevel},'',0,'0','0','{HRemark}', '鏈娇鐢�', '{organ}', '{organ}', '{System.DateTime.Now.ToString("G")}', '{user}')";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ oCN.RunProc("update Gy_InspectMethod set HName='" + HName + "', HHelpCode= '" + HHelpCode + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "' where HNumber= '" + HNumber + "'");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀵煎叆鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
#endregion
#region 璐ㄩ噺鏍囧噯 鏌ヨ,瀹℃牳锛屽弽瀹℃牳锛岀鐢紝鍙嶇鐢�
@@ -1296,6 +1500,8 @@
return objJsonResult;
}
}
+
+
#endregion
#region 涓嶈壇绫诲瀷瀹℃牳銆佸弽瀹℃牳
diff --git a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
index f62fb7d..b5e70f5 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
@@ -1,13 +1,17 @@
锘縰sing DBUtility;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using SyntacticSugar.constant;
using System;
using System.Collections.Generic;
using System.Data;
+using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
+using System.Web;
using System.Web.Http;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
using WebAPI.Models;
namespace WebAPI.Controllers.BaseSet
@@ -638,5 +642,255 @@
}
#endregion
+ #region 鏍￠獙椤圭洰鍒楄〃 鏂囦欢涓婁紶
+ [Route("Gy_CheckItem/Gy_Process_Excel")]
+ [HttpPost]
+ public json Gy_Process_Excel()
+ {
+ json res = new json();
+ try
+ {
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable provisional = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
+ provisional.Columns.Add("HOrgID", typeof(Int32));//缁勭粐ID
+ provisional.Columns.Add("HDeptID", typeof(Int32));//閮ㄩ棬ID
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = provisional.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ provisional.Rows.Add(row);
+ }
+
+ //鍒ゆ柇鍒�
+ string error = JudgmentColumns(provisional);
+ if (error.Length > 0)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ res.data = null;
+ return res;
+ }
+
+ for (int i = 0; i <= provisional.Rows.Count - 1; i++)
+ {
+ string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["浠ｇ爜"].ToString());
+ string HUSEORGID = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["缁勭粐浠ｇ爜"].ToString());
+ string HQCCheckClassID = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�楠岄」鐩被鍒唬鐮�"].ToString());
+ string HQCCheckClassName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�楠岄」鐩被鍒悕绉�"].ToString());
+ string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍚嶇О"].ToString());
+ string HORGName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["缁勭粐鍚嶇О"].ToString());
+ string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
+ string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["澶囨敞"].ToString());
+
+ //鑾峰彇鐪熷疄琛屾暟
+ int line = i + 1;
+
+ if (HUSEORGID != "")
+ {
+ //鏌ヨ缁勭粐
+ ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HUSEORGID + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "绗�" + line + "琛�,缁勭粐涓嶅瓨鍦紒";
+ res.data = null;
+ return res;
+ }
+ else
+ {
+ provisional.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();
+
+ //鏌ヨ妫�楠岄」鐩槸鍚﹀瓨鍦�
+ DataSet checkClass = oCN.RunProcReturn("select * from Gy_QCCheckClass where HNumber = '" + HQCCheckClassID + "' and HName = '" + HQCCheckClassName + "'", "Gy_QCCheckClass");
+ if (checkClass.Tables[0].Rows.Count == 0)
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "绗�" + line + "琛�,妫�楠岄」鐩笉瀛樺湪锛�";
+ res.data = null;
+ return res;
+ }
+ }
+ else
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "绗�" + line + "琛�,缁勭粐浠ｇ爜涓虹┖";
+ res.data = null;
+ return res;
+ }
+ }
+
+ res.code = "1";
+ res.count = 1;
+ res.Message = error;
+ res.data = provisional;
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇鍒�
+ /// </summary>
+ /// <param name="provisional"></param>
+ /// <returns></returns>
+ private static string JudgmentColumns(DataTable provisional)
+ {
+ var error = "";
+
+ //鏌ヨ娌℃湁鐨勫垪
+ if (!provisional.Columns.Contains("缁勭粐浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囦唬鐮併�戠殑鏍囬,";
+
+ if(!provisional.Columns.Contains("妫�楠岄」鐩被鍒悕绉�"))
+ error += "娌℃湁鎵惧埌銆愭楠岄」鐩被鍒悕绉般�戠殑鏍囬,";
+ return error;
+ }
+ #endregion
+
+ #region 鏍￠獙椤圭洰鍒楄〃 瀵煎叆(淇濆瓨)
+ [Route("Gy_CheckItem/Gy_Process_btnSave")]
+ [HttpPost]
+ public object Gy_Group_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HNumber = item["浠ｇ爜"].ToString();
+ string HUSEORGID = item["缁勭粐浠ｇ爜"].ToString();
+ string HName = item["鍚嶇О"].ToString();
+ string HORGName = item["缁勭粐鍚嶇О"].ToString();
+ string HHelpCode = item["鍔╄鐮�"];
+ string HQCCheckClassID = item["妫�楠岄」鐩被鍒唬鐮�"];
+ string HRemark = item["澶囨敞"].ToString();
+
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//鐭唬鐮�
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ int HEndFlag = 1;//鏈骇鏍囧織
+ int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //绛夌骇
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_QCCheckItem where HNumber='" + HNumber + "'", "Gy_QCCheckItem");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+
+ string sql = "insert into Gy_QCCheckItem (HName,HNumber,HUSEORGID,HCREATEORGID,HShortNumber,HQCCheckClassID,HLevel,HHelpCode,HParentID,HStopflag,HUseFlag,HRemark, HMakeTime,HMakeEmp)" +
+ $"values('{HName}', '{HNumber}', {HUSEORGID}, {HUSEORGID}, '{sShortNumber}','{HQCCheckClassID}',{HLevel},'',0,0,'鏈娇鐢�','{HRemark}', '{System.DateTime.Now.ToString("G")}', '{user}')";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ oCN.RunProc("update Gy_QCCheckItem set HName='" + HName + "', HHelpCode='" + HHelpCode + "', HQCCheckClassID = '" + HQCCheckClassID + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "' where HNumber='" + HNumber + "'");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀵煎叆鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
diff --git a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
index f141bbc..d84dd94 100644
--- a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
@@ -1,12 +1,17 @@
锘縰sing Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
+using SyntacticSugar.constant;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
+using System.IO;
+using System.Threading.Tasks;
+using System.Web;
using System.Web.Http;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
using WebAPI.Models;
namespace WebAPI.Controllers
{
@@ -569,8 +574,6 @@
}
}
-
-
#region 鐢熶骇鐝粍瀹℃牳銆佸弽瀹℃牳
/// <summary>
///
@@ -761,8 +764,319 @@
}
#endregion
+ #region 鐢熶骇鐝粍 鏂囦欢涓婁紶
+ [Route("Gy_Group/Gy_Process_Excel")]
+ [HttpPost]
+ public json Gy_Process_Excel()
+ {
+ json res = new json();
+ try
+ {
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable provisional = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
+ provisional.Columns.Add("HOrgID", typeof(Int32));//缁勭粐ID
+ provisional.Columns.Add("HDeptID", typeof(Int32));//閮ㄩ棬ID
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = provisional.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ provisional.Rows.Add(row);
+ }
+
+ //鍒ゆ柇鍒�
+ string error = JudgmentColumns(provisional);
+ if (error.Length > 0)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ res.data = null;
+ return res;
+ }
+
+ for (int i = 0; i <= provisional.Rows.Count - 1; i++)
+ {
+ string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鐝粍浠ｇ爜"].ToString());
+ string HUSEORGID = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["缁勭粐浠ｇ爜"].ToString());
+ string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鐝粍"].ToString());
+ string HORGName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["缁勭粐鍚嶇О"].ToString());
+ string HDeptID = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["閮ㄩ棬浠ｇ爜"].ToString());
+ string HDeptNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鎵�灞為儴闂�"].ToString());
+ string HEmpQty = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鐝粍鎬讳汉鏁�"].ToString());
+ string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
+ string HCompName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔冲姟鍗曚綅"]).ToString();
+ string HProcID = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["宸ュ簭"].ToString());
+ string HProcName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["宸ュ簭鍚嶇О"].ToString());
+ string HBarCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鏉″舰鐮�"].ToString());
+ string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["澶囨敞"].ToString());
+
+ //鑾峰彇鐪熷疄琛屾暟
+ int line = i + 1;
+
+ if (HUSEORGID != "")
+ {
+ //鏌ヨ缁勭粐
+ ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HUSEORGID + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "绗�" + line + "琛�,缁勭粐涓嶅瓨鍦紒";
+ res.data = null;
+ return res;
+ }
+ else
+ {
+ provisional.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();
+
+ if(String.IsNullOrEmpty(HProcID) || String.IsNullOrEmpty(HProcName))
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "绗�" + line + "琛�,宸ュ簭鍚嶇О涓嶈兘涓虹┖锛�";
+ res.data = null;
+ return res;
+ }
+
+ //閮ㄩ棬鏌ヨ
+ //鏌ヨ閮ㄩ棬
+ ds = oCN.RunProcReturn("select * from Gy_Department where HNumber='" + HDeptID + "' and HUSEORGID=" + HORGid + "", "Gy_Department");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "绗�" + line + "琛�,璇�" + HORGName + "缁勭粐,閮ㄩ棬:" + HDeptNumber + ",涓嶅瓨鍦紒";
+ res.data = null;
+ }
+ else
+ {
+ provisional.Rows[i]["HDeptID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+
+ //宸ュ簭鏌ヨ
+ //鏌ヨ宸ュ簭鏄惁瀛樺湪
+ ds = oCN.RunProcReturn("select * from Gy_Process where HNumber ='" + HProcID + "' and HUSEORGID=" + HORGid + "", "Gy_Process");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "绗�" + line + "琛�,璇�" + HORGName + "缁勭粐,宸ュ簭:" + HProcName + ",涓嶅瓨鍦紒";
+ res.data = null;
+ }
+ else
+ {
+ provisional.Rows[i]["HProcID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+
+ }
+ else
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "绗�" + line + "琛�,缁勭粐浠ｇ爜涓虹┖";
+ res.data = null;
+ return res;
+ }
+ }
+
+ res.code = "1";
+ res.count = 1;
+ res.Message = error;
+ res.data = provisional;
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇鍒�
+ /// </summary>
+ /// <param name="provisional"></param>
+ /// <returns></returns>
+ private static string JudgmentColumns(DataTable provisional)
+ {
+ var error = "";
+
+ //鏌ヨ宸ヨ壓璺嚎娌℃湁鐨勫垪
+ if (!provisional.Columns.Contains("缁勭粐浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囦唬鐮併�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("鐝粍浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愮彮缁勪唬鐮併�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("鐝粍"))
+ error += "娌℃湁鎵惧埌銆愮彮缁勩�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("閮ㄩ棬浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愰儴闂ㄤ唬鐮併�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("鎵�灞為儴闂�"))
+ error += "娌℃湁鎵惧埌銆愭墍灞為儴闂ㄣ�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("鐝粍鎬讳汉鏁�"))
+ error += "娌℃湁鎵惧埌銆愮彮缁勬�讳汉鏁般�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("宸ュ簭"))
+ error += "娌℃湁鎵惧埌銆愬伐搴忋�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("宸ュ簭"))
+ error += "娌℃湁鎵惧埌銆愬伐搴忋�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("鍔冲姟鍗曚綅"))
+ error += "娌℃湁鎵惧埌銆愬姵鍔″崟浣嶃�戠殑鏍囬,";
+ return error;
+ }
+ #endregion
+
+ #region 宸ュ簭椤圭洰 瀵煎叆(淇濆瓨)
+ [Route("Gy_Group/Gy_Process_btnSave")]
+ [HttpPost]
+ public object Gy_Group_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HNumber = item["鐝粍浠ｇ爜"].ToString();
+ string HUSEORGID = item["缁勭粐浠ｇ爜"].ToString();
+ string HName = item["鐝粍"].ToString();
+ string HORGName = item["缁勭粐鍚嶇О"].ToString();
+ string HDeptID = item["閮ㄩ棬浠ｇ爜"].ToString();
+ string HDeptNumber = item["鎵�灞為儴闂�"].ToString();
+ string HEmpQty = item["鐝粍鎬讳汉鏁�"].ToString();
+ string HHelpCode = item["鍔╄鐮�"];
+ string HCompName = item["鍔冲姟鍗曚綅"].ToString();
+ string HProcID = item["宸ュ簭"].ToString();
+ string HProcName = item["宸ュ簭鍚嶇О"].ToString();
+ string HRemark = item["澶囨敞"].ToString();
+ string HBarCodeForBase = item["鏉″舰鐮�"].ToString();
+
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//鐭唬鐮�
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ int HEndFlag = 1;//鏈骇鏍囧織
+ int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //绛夌骇
+ if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_Group where HNumber='" + HNumber + "'", "Gy_Group");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+
+ string sql = "insert into Gy_Group(HName,HNumber,HDeptID,HUSEORGID,HCREATEORGID,HEmpQty,HShortNumber,HBarCodeForBase,HCompName,HProcID,HLevel,HHelpCode,HParentID,HStopflag,HRemark)" +
+ $"values('{HName}', '{HNumber}',{HDeptID}, {HUSEORGID}, {HUSEORGID}, {HEmpQty}, '{sShortNumber}','{HBarCodeForBase}','{HCompName}',{HProcID},{HLevel},'',0,0,'{HRemark}')";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ oCN.RunProc("update Gy_Group set HBarCodeForBase='" + HBarCodeForBase + "',HDeptID=" + HDeptID + ",HName='" + HName + "', HHelpCode='" + HHelpCode + "' where HNumber='" + HNumber + "'");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀵煎叆鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
/// <summary>
/// 缁翠慨鍒楄〃淇敼鎸夐挳鏂规硶
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 8372a99..c4222fd 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -115,6 +115,58 @@
}
}
+ #region 鐗╂枡鍒嗛〉鍒楄〃
+ [Route("Gy_Material/page")]
+ [HttpGet]
+ public object page(string sWhere, string user, string Organization,int page,int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Material", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Gy_MaterialList " + page + "," + size + ",'" + Organization +"'," + "''", "h_p_Gy_MaterialList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Gy_MaterialList " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_Gy_MaterialList");
+ }
+
+ //娣诲姞鍒楀悕
+ 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("Gy_Material/getMaxNum")]
[HttpGet]
diff --git a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
index 48220d8..bec08dd 100644
--- a/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_QCCheckClassController.cs
@@ -1,13 +1,17 @@
锘縰sing DBUtility;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using SyntacticSugar.constant;
using System;
using System.Collections.Generic;
using System.Data;
+using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
+using System.Web;
using System.Web.Http;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
using WebAPI.Models;
namespace WebAPI.Controllers.BaseSet
@@ -458,5 +462,206 @@
return objJsonResult;
}
#endregion
+
+ #region 鏍￠獙椤圭洰鍒楄〃 鏂囦欢涓婁紶
+ [Route("Gy_QCCheckClass/Gy_Process_Excel")]
+ [HttpPost]
+ public json Gy_Process_Excel()
+ {
+ json res = new json();
+ try
+ {
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable provisional = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = provisional.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ provisional.Rows.Add(row);
+ }
+
+ //鍒ゆ柇鍒�
+ string error = JudgmentColumns(provisional);
+ if (error.Length > 0)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ res.data = null;
+ return res;
+ }
+
+ for (int i = 0; i <= provisional.Rows.Count - 1; i++)
+ {
+ string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["浠ｇ爜"].ToString());
+ string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍚嶇О"].ToString());
+ string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
+ string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["澶囨敞"].ToString());
+ //鑾峰彇鐪熷疄琛屾暟
+ int line = i + 1;
+ }
+
+ res.code = "1";
+ res.count = 1;
+ res.Message = error;
+ res.data = provisional;
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇鍒�
+ /// </summary>
+ /// <param name="provisional"></param>
+ /// <returns></returns>
+ private static string JudgmentColumns(DataTable provisional)
+ {
+ var error = "";
+
+ //鏌ヨ娌℃湁鐨勫垪
+ if (!provisional.Columns.Contains("浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愪唬鐮併�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愬悕绉般�戠殑鏍囬,";
+ return error;
+ }
+ #endregion
+
+ #region 鏍￠獙椤圭洰鍒楄〃 瀵煎叆(淇濆瓨)
+ [Route("Gy_QCCheckClass/Gy_Process_btnSave")]
+ [HttpPost]
+ public object Gy_Group_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ string organ = sArray[2].ToString();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HNumber = item["浠ｇ爜"].ToString();
+ string HName = item["鍚嶇О"].ToString();
+ string HHelpCode = item["鍔╄鐮�"];
+ string HRemark = item["澶囨敞"].ToString();
+
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//鐭唬鐮�
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ int HEndFlag = 1;//鏈骇鏍囧織
+ int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //绛夌骇
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_QCCheckClass where HNumber='" + HNumber + "'", "Gy_QCCheckClass");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+
+ string sql = "insert into Gy_QCCheckClass (HName,HNumber,HShortNumber,HLevel,HHelpCode,HParentID,HStopflag,HEndFlag,HRemark,HUseFlag, HUSEORGID, HCREATEORGID, HMakeTime,HMakeEmp)" +
+ $"values('{HName}', '{HNumber}', '{sShortNumber}',{HLevel},'',0,'0','0','{HRemark}', '鏈娇鐢�', '{organ}', '{organ}', '{System.DateTime.Now.ToString("G")}', '{user}')";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ oCN.RunProc("update Gy_QCCheckClass set HName='" + HName + "', HHelpCode='" + HHelpCode + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "'where HNumber='" + HNumber + "'");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀵煎叆鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
diff --git a/WebAPI/Controllers/BaseSet/Gy_RoutingGroupController.cs b/WebAPI/Controllers/BaseSet/Gy_RoutingGroupController.cs
index 6691b80..de1472d 100644
--- a/WebAPI/Controllers/BaseSet/Gy_RoutingGroupController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_RoutingGroupController.cs
@@ -1,9 +1,13 @@
-锘縰sing System;
+锘縰sing Newtonsoft.Json.Linq;
+using SyntacticSugar.constant;
+using System;
using System.Collections.Generic;
using System.Data;
+using System.IO;
using System.Linq;
using System.Web;
using System.Web.Http;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
using WebAPI.Models;
namespace WebAPI.Controllers.BaseSet
@@ -61,5 +65,182 @@
}
}
#endregion
+
+ #region 宸ヨ壓璺嚎澶х被 鏂囦欢涓婁紶
+ [Route("Gy_RoutingGroup/Gy_Process_Excel")]
+ [HttpPost]
+ public json Gy_RoutingGroup_Excel()
+ {
+ json res = new json();
+ try
+ {
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable provisional = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
+ provisional.Columns.Add("HOrgID", typeof(Int32));//缁勭粐ID
+ provisional.Columns.Add("HDeptID", typeof(Int32));//閮ㄩ棬ID
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = provisional.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ provisional.Rows.Add(row);
+ }
+
+ for (int i = 0; i <= provisional.Rows.Count - 1; i++)
+ {
+ string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["浠ｇ爜"].ToString());
+ string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍚嶇О"].ToString());
+ string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
+ string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["澶囨敞"].ToString());
+
+ //鑾峰彇鐪熷疄琛屾暟
+ int line = i + 1;
+ }
+
+ res.code = "1";
+ res.count = 1;
+ res.data = provisional;
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+ #endregion
+
+ #region
+ #region 宸ヨ壓璺嚎 瀵煎叆(淇濆瓨)
+ [Route("Gy_RoutingGroup/Gy_Process_btnSave")]
+ [HttpPost]
+ public object Gy_Group_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HNumber = item["浠ｇ爜"].ToString();
+ string HName = item["鍚嶇О"].ToString();
+ string HHelpCode = item["鍔╄鐮�"];
+ string HRemark = item["澶囨敞"].ToString();
+
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//鐭唬鐮�
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ int HEndFlag = 1;//鏈骇鏍囧織
+ int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //绛夌骇
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_RoutingGroup where HNumber='" + HNumber + "'", " Gy_RoutingGroup");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+
+ string sql = "insert into Gy_RoutingGroup(HName,HNumber,HShortNumber,HLevel,HHelpCode,HParentID,HStopflag,HEndFlag,HRemark)" +
+ $"values('{HName}', '{HNumber}', '{sShortNumber}',0,'',0,0,0,'{HRemark}')";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ oCN.RunProc("update Gy_RoutingGroup set HName='" + HName + "', HHelpCode='" + HHelpCode + "' where HNumber='" + HNumber + "'");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀵煎叆鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
index dcc98b9..1e0a616 100644
--- a/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs
@@ -309,10 +309,10 @@
{
try
{
- ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + HUserName + "'", "Xt_ModuleButtonSet");
+ ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + HUserName + "' order by HOrder", "Xt_ModuleButtonSet");
if (ds.Tables[0].Rows.Count == 0)
{
- ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + "admin" + "'", "Xt_ModuleButtonSet");
+ ds = oCN.RunProcReturn("select * from Xt_ModuleButtonSet where HModuleName='" + HModName + "' and HBillType='" + HBillType + "' and HUserName='" + "admin" + "' order by HOrder", "Xt_ModuleButtonSet");
if (ds.Tables[0].Rows.Count != 0)
{
@@ -346,6 +346,7 @@
public string BtnID;
public string BtnName;
public bool IsHide;
+ public string HOtherName;
}
public class noEditList
{
@@ -356,6 +357,7 @@
public int HOrder;
public bool HHideFlag;
public bool HEditFlag;
+ public string HOtherName;
}
[Route("Xt_ModuleButtonSet_WMES/AddModuleButtonSetWMES")]
@@ -417,6 +419,7 @@
string HButtonID = HButtonIDLists[j].ToString();
string HButtonName = HButtonNameLists[j].ToString();
int HOrder = HOrderLists[j];
+ string HOtherName = button[i].HOtherName;
if (button[i].IsHide)
{
HHideFlag = 1;
@@ -426,7 +429,7 @@
HEditFlag = 0;
HHideFlag = 0;
}
- string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "'";
+ string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "','" + HOtherName + "'";
oCN.RunProc(sql);
}
}
@@ -444,7 +447,8 @@
string HButtonID = noEditLists[i].HButtonID;
string HButtonName = noEditLists[i].HButtonName;
int HOrder = HOrderLists[j];
- string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "'";
+ string HOtherName = noEditLists[i].HOtherName;
+ string sql = "exec h_p_Xt_ModuleButtonSet '" + HBillType + "','" + HModuleName + "','" + HButtonID + "','" + HButtonName + "'," + HOrder + "," + HHideFlag + "," + HEditFlag + ",'" + HUserName + "','" + HOtherName + "'";
oCN.RunProc(sql);
}
}
diff --git a/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs b/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs
new file mode 100644
index 0000000..0c2d8d3
--- /dev/null
+++ b/WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs
@@ -0,0 +1,341 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class Sc_KeyElementBindingController : ApiController
+ {
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 宸ュ簭娴佽浆鍗＄淮鎶�-鏌ヨ
+ /// <summary>
+ /// 杩斿洖宸ュ簭娴佽浆鍗＄淮鎶ゅ垪琛ㄤ富琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sc_KeyElementBinding/GetProcessExchangeList")]
+ [HttpGet]
+ public object GetProcessExchangeList(string HBillNo, string user)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeInfo_ForKeyBind where 娴佽浆鍗″彿 = '" + HBillNo + "'", "h_v_Sc_ProcessExchangeInfo_ForKeyBind");
+
+ if (ds.Tables[0].Rows.Count > 0 && ds != null)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏌ユ棤姝ゆ祦杞崱淇℃伅锛岃鏍稿鏀规祦杞崱鏄惁宸茶鍒犻櫎";
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "寮傚父锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍏抽敭浠剁粦瀹� 浜у搧鏉＄爜瑙ｆ瀽
+ [Route("Sc_KeyElementBinding/ProductBardCode_JX")]
+ [HttpGet]
+ public object ProductBardCode_JX(string HBarCode, string HProcExchBillNo, string HBillNo, string user, int HOrgID)
+ {
+ try
+ {
+ //鍒ゆ柇鎵�鎵潯鐮佹槸鍚﹀瓨鍦ㄦ潯鐮佹。妗堝綋涓�
+ ds = oCN.RunProcReturn(@"select 1 from Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ //鏉＄爜妗ｆ涓病鏈夋湰娆℃壂鎻忕殑鏉＄爜锛屽垯鏍规嵁瑙勫垯瑙ｆ瀽鐢熸垚鏉＄爜
+ ds = oCN.RunProcReturn(@"exec h_p_Sc_BarCode_JX '" + HBarCode + "','" + HProcExchBillNo + "','" + HOrgID + "'", "h_p_Sc_BarCode_JX");
+
+ if (ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瑙ｆ瀽鏉＄爜澶辫触锛岃涓庣鐞嗚仈绯伙紒" + ds.Tables[0].Rows[0]["HBackRemark"] + "==exec h_p_Sc_BarCode_JX '" +HBarCode + "','" + HProcExchBillNo + "','" + HOrgID + "'";
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ }
+
+ //鏉＄爜妗ｆ涓凡鏈夋湰娆℃壂鎻忕殑鏉＄爜锛屽尮閰嶇敤鏂欐竻鍗曪紙鎵爜鏁版嵁鍐欏叆涓存椂琛級
+ ds = oCN.RunProcReturn(@"exec h_p_Sc_PPBomBill_Matching '" + HBarCode + "','" + HProcExchBillNo + "','" + HBillNo + "','" + HOrgID + "'", "h_p_Sc_PPBomBill_Matching");
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "";
+ objJsonResult.data = "娌℃湁鏌ヨ鍒版暟鎹�";
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "ERROR锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍏抽敭浠剁粦瀹� 閰嶄欢鏉＄爜瑙ｆ瀽
+ [Route("Sc_KeyElementBinding/PartsBardCode_JX")]
+ [HttpGet]
+ public object PartsBardCode_JX(string HBarCode, string HProcExchBillNo, string HBillNo, string user, int HOrgID)
+ {
+ try
+ {
+ //鍒ゆ柇鎵�鎵潯鐮佹槸鍚﹀瓨鍦ㄦ潯鐮佹。妗堝綋涓�
+ ds = oCN.RunProcReturn(@"select 1 from Gy_BarCodeBill WITH(NOLOCK) where HBarCode='" + HBarCode + "'", "Gy_BarCodeBill");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ //鏉＄爜妗ｆ涓病鏈夋湰娆℃壂鎻忕殑鏉＄爜锛屽垯鏍规嵁瑙勫垯瑙ｆ瀽鐢熸垚鏉＄爜
+ ds = oCN.RunProcReturn(@"exec h_p_Sc_BarCode_JX '" + HBarCode + "','" + HProcExchBillNo + "','" + HOrgID + "'", "h_p_Sc_BarCode_JX");
+ if (ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瑙ｆ瀽鏉＄爜澶辫触锛岃涓庣鐞嗚仈绯伙紒" + ds.Tables[0].Rows[0]["HBackRemark"] + "==exec h_p_Sc_BarCode_JX '" + HBarCode + "','" + HProcExchBillNo + "','" + HOrgID + "'";
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ }
+
+ //鏉＄爜妗ｆ涓凡鏈夋湰娆℃壂鎻忕殑鏉＄爜锛屾煡璇㈤厤浠朵俊鎭紙鎵弿鏉＄爜淇℃伅鍐欏叆涓存椂琛級
+ ds = oCN.RunProcReturn(@"exec h_p_Gy_BarCodeBill_Bind '" + HBarCode + "','" + HProcExchBillNo + "','" + HBillNo + "','" + HOrgID + "'", "h_p_Gy_BarCodeBill_Bind");
+
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "";
+ objJsonResult.data = "娌℃湁鏌ヨ鍒版暟鎹�";
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "ERROR锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍏抽敭浠剁粦瀹氫繚瀛� 鏂板/缂栬緫
+ [Route("Sc_KeyElementBinding/Save")]
+ [HttpPost]
+ public object Save([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString(); //琛ㄥご鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ string msg4 = sArray[2].ToString(); //鐢ㄦ埛
+
+ DBUtility.ClsPub.CurUserName = msg4;
+
+ string UserName = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+
+
+ DAL.ClsSc_AssemblyBill oBill = new DAL.ClsSc_AssemblyBill();
+ List<Model.ClsSc_AssemblyBillMain> lsmain = new List<Model.ClsSc_AssemblyBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Sc_AssemblyBillMain2(msg2);
+ foreach (Model.ClsSc_AssemblyBillMain oItem in lsmain)
+ {
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3727";
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ oItem.HBillStatus = 1;
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsSc_AssemblyBillSub> ls = new List<Model.ClsSc_AssemblyBillSub>();
+ ls = oListModels.getObjectByJson_Sc_AssemblyBillSub2(msg3);
+ int i = 0;
+ foreach (Model.ClsSc_AssemblyBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ oItemSub.HUnitID = 0;
+ oItemSub.HQty = 1;
+
+ oBill.DetailColl.Add(oItemSub);
+ }
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+
+
+ if (bResult)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 0;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [鍒犻櫎涓存椂琛ㄦ暟鎹甝
+ [Route("Deltet_Sc_AssemblyBill_BindBarCodeTemp")]
+ [HttpGet]
+ public object Deltet_Sc_AssemblyBill_BindBarCodeTemp(string HBillNo, string HBarCode, string user)
+ {
+ DataSet ds;
+ try
+ {
+ if (string.IsNullOrWhiteSpace(HBillNo) || string.IsNullOrWhiteSpace(HBarCode))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩芥函鍗曞彿鎴栭厤浠舵潯鐮佷负绌猴紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+ ds = oCN.RunProcReturn("select * from Sc_AssemblyBill_BindBarCodeTemp where HBillNo_bak = '" + HBillNo + "' and HBarCode = '" + HBarCode + "'", "Sc_AssemblyBill_BindBarCodeTemp");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏁版嵁锛屾棤娉曞垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+
+
+ oCN.RunProc("delete from Sc_AssemblyBill_BindBarCodeTemp where HBillNo_bak = '" + HBillNo + "' and HBarCode = '" + HBarCode + "'");
+ oCN.Commit();//鎻愪氦浜嬪姟
+ 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
+ }
+}
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 12a31a5..cb6c853 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -8,11 +8,14 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
+using System.Web;
using System.Web.Http;
using WebAPI;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
using WebAPI.Models;
using WebAPI.Service;
@@ -3843,6 +3846,208 @@
}
#endregion
+ #region 妫�娴嬪�煎垪琛� 鏂囦欢涓婁紶
+ [Route("Gy_Inspect/Gy_Process_Excel")]
+ [HttpPost]
+ public json Gy_Inspect_Excel()
+ {
+ json res = new json();
+ try
+ {
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable provisional = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = provisional.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ provisional.Rows.Add(row);
+ }
+
+ //鍒ゆ柇鍒�
+ string error = JudgmentColumns(provisional);
+ if (error.Length > 0)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ res.data = null;
+ return res;
+ }
+
+ for (int i = 0; i <= provisional.Rows.Count - 1; i++)
+ {
+ string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�娴嬪�间唬鐮�"].ToString());
+ string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�娴嬪�煎悕绉�"].ToString());
+ string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
+ string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["澶囨敞"].ToString());
+ //鑾峰彇鐪熷疄琛屾暟
+ int line = i + 1;
+ }
+
+ res.code = "1";
+ res.count = 1;
+ res.Message = error;
+ res.data = provisional;
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇鍒�
+ /// </summary>
+ /// <param name="provisional"></param>
+ /// <returns></returns>
+ private static string JudgmentColumns(DataTable provisional)
+ {
+ var error = "";
+
+ //鏌ヨ娌℃湁鐨勫垪
+ if (!provisional.Columns.Contains("妫�娴嬪�间唬鐮�"))
+ error += "娌℃湁鎵惧埌銆愭娴嬪�间唬鐮併�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("妫�娴嬪�煎悕绉�"))
+ error += "娌℃湁鎵惧埌銆愭娴嬪�煎悕绉般�戠殑鏍囬,";
+ return error;
+ }
+ #endregion
+
+ #region 妫�娴嬪�煎垪琛� 瀵煎叆(淇濆瓨)
+ [Route("Gy_Inspect/Gy_Process_btnSave")]
+ [HttpPost]
+ public object Gy_Inspect_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ string organ = sArray[2].ToString();
+
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HNumber = item["妫�娴嬪�间唬鐮�"].ToString();
+ string HName = item["妫�娴嬪�煎悕绉�"].ToString();
+ string HHelpCode = item["鍔╄鐮�"];
+ string HRemark = item["澶囨敞"].ToString();
+
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//鐭唬鐮�
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ int HEndFlag = 1;//鏈骇鏍囧織
+ int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //绛夌骇
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_InspectValue where HNumber='" + HNumber + "'", "Gy_InspectValue");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+
+ string sql = "insert into Gy_InspectValue (HName,HNumber,HShortNumber,HLevel,HHelpCode,HParentID,HStopflag,HEndFlag,HRemark,HUseFlag, HUSEORGID, HCREATEORGID, HMakeTime,HMakeEmp)" +
+ $"values('{HName}', '{HNumber}', '{sShortNumber}',{HLevel},'',0,'0','0','{HRemark}', '鏈娇鐢�', '{organ}', '{organ}', '{System.DateTime.Now.ToString("G")}', '{user}')";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ oCN.RunProc("update Gy_InspectValue set HName='" + HName + "', HHelpCode='" + HHelpCode + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "'where HNumber='" + HNumber + "'");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀵煎叆鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 妫�楠屾柟娉� 璁剧疆鍒楄〃/淇濆瓨/缂栬緫/鍒犻櫎鏂规硶
/// <summary>
/// 淇濆瓨妫�楠屾柟娉�
diff --git a/WebAPI/Controllers/ZLGL/BaseSet/Gy_InspectBasisController.cs b/WebAPI/Controllers/ZLGL/BaseSet/Gy_InspectBasisController.cs
new file mode 100644
index 0000000..45a8012
--- /dev/null
+++ b/WebAPI/Controllers/ZLGL/BaseSet/Gy_InspectBasisController.cs
@@ -0,0 +1,226 @@
+锘縰sing Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.ZLGL.BaseSet
+{
+ public class Gy_InspectBasisController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ #region 妫�楠屼緷鎹垪琛� 鏂囦欢涓婁紶
+ [Route("Gy_InspectBasis/Gy_Process_Excel")]
+ [HttpPost]
+ public json Gy_InspectBasis_Excel()
+ {
+ json res = new json();
+ try
+ {
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable provisional = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = provisional.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ provisional.Rows.Add(row);
+ }
+
+ //鍒ゆ柇鍒�
+ string error = JudgmentColumns(provisional);
+ if (error.Length > 0)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ res.data = null;
+ return res;
+ }
+
+ for (int i = 0; i <= provisional.Rows.Count - 1; i++)
+ {
+ string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�楠屼緷鎹唬鐮�"].ToString());
+ string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�楠屼緷鎹悕绉�"].ToString());
+ string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
+ string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["澶囨敞"].ToString());
+ //鑾峰彇鐪熷疄琛屾暟
+ int line = i + 1;
+ }
+
+ res.code = "1";
+ res.count = 1;
+ res.Message = error;
+ res.data = provisional;
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇鍒�
+ /// </summary>
+ /// <param name="provisional"></param>
+ /// <returns></returns>
+ private static string JudgmentColumns(DataTable provisional)
+ {
+ var error = "";
+
+ //鏌ヨ娌℃湁鐨勫垪
+ if (!provisional.Columns.Contains("妫�楠屼緷鎹唬鐮�"))
+ error += "娌℃湁鎵惧埌銆愭楠屼緷鎹唬鐮併�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("妫�楠屼緷鎹悕绉�"))
+ error += "娌℃湁鎵惧埌銆愭楠屼緷鎹悕绉般�戠殑鏍囬,";
+ return error;
+ }
+ #endregion
+
+ #region 妫�楠屼緷鎹垪琛� 瀵煎叆(淇濆瓨)
+ [Route("Gy_InspectBasis/Gy_Process_btnSave")]
+ [HttpPost]
+ public object Gy_InspectBasis_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ string organ = sArray[2].ToString();
+ json res = new json();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "鏃犱繚瀛樻潈闄愶紒";
+ res.data = null;
+ return res;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HNumber = item["妫�楠屼緷鎹唬鐮�"].ToString();
+ string HName = item["妫�楠屼緷鎹悕绉�"].ToString();
+ string HHelpCode = item["鍔╄鐮�"];
+ string HRemark = item["澶囨敞"].ToString();
+
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//鐭唬鐮�
+ if (sShortNumber.Trim() == "")
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ res.data = 1;
+ return res;
+ }
+ int HEndFlag = 1;//鏈骇鏍囧織
+ int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //绛夌骇
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ res.data = 1;
+ return res;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_InspectBasis where HNumber='" + HNumber + "'", "Gy_InspectInstruMent");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+
+ string sql = "insert into Gy_InspectBasis (HName,HNumber,HShortNumber,HLevel,HHelpCode,HParentID,HStopflag,HEndFlag,HRemark,HUseFlag, HUSEORGID, HCREATEORGID, HMakeTime,HMakeEmp)" +
+ $"values('{HName}', '{HNumber}', '{sShortNumber}',{HLevel},'',0,'0','0','{HRemark}', '鏈娇鐢�', '{organ}', '{organ}', '{System.DateTime.Now.ToString("G")}', '{user}')";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ oCN.RunProc("update Gy_InspectBasis set HName='" + HName + "', HHelpCode= '" + HHelpCode + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "' where HNumber= '" + HNumber + "'");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ res.code = "1";
+ res.count = 1;
+ res.Message = "瀵煎叆鎴愬姛!";
+ res.data = null;
+ return res;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ res.code = "0";
+ res.count = 0;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/ZLGL/BaseSet/Gy_InspectInstruMentController.cs b/WebAPI/Controllers/ZLGL/BaseSet/Gy_InspectInstruMentController.cs
new file mode 100644
index 0000000..994559d
--- /dev/null
+++ b/WebAPI/Controllers/ZLGL/BaseSet/Gy_InspectInstruMentController.cs
@@ -0,0 +1,225 @@
+锘縰sing Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.ZLGL.BaseSet
+{
+ public class Gy_InspectInstruMentController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ #region 鏍￠獙椤圭洰鍒楄〃 鏂囦欢涓婁紶
+ [Route("Gy_Quality/Gy_Process_Excel")]
+ [HttpPost]
+ public json Gy_Quality_Excel()
+ {
+ json res = new json();
+ try
+ {
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable provisional = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = provisional.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ provisional.Rows.Add(row);
+ }
+
+ //鍒ゆ柇鍒�
+ string error = JudgmentColumns(provisional);
+ if (error.Length > 0)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ res.data = null;
+ return res;
+ }
+
+ for (int i = 0; i <= provisional.Rows.Count - 1; i++)
+ {
+ string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["璐ㄩ噺鏍囧噯浠ｇ爜"].ToString());
+ string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["璐ㄩ噺鏍囧噯鍚嶇О"].ToString());
+ string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
+ string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["澶囨敞"].ToString());
+ //鑾峰彇鐪熷疄琛屾暟
+ int line = i + 1;
+ }
+
+ res.code = "1";
+ res.count = 1;
+ res.Message = error;
+ res.data = provisional;
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇鍒�
+ /// </summary>
+ /// <param name="provisional"></param>
+ /// <returns></returns>
+ private static string JudgmentColumns(DataTable provisional)
+ {
+ var error = "";
+
+ //鏌ヨ娌℃湁鐨勫垪
+ if (!provisional.Columns.Contains("璐ㄩ噺鏍囧噯浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愯川閲忔爣鍑嗕唬鐮併�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("璐ㄩ噺鏍囧噯鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愯川閲忔爣鍑嗗悕绉般�戠殑鏍囬,";
+ return error;
+ }
+ #endregion
+
+ #region 妫�楠屾柟娉曞垪琛� 瀵煎叆(淇濆瓨)
+ [Route("Gy_Quality/Gy_Process_btnSave")]
+ [HttpPost]
+ public object Gy_Quality_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ json res = new json();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "鏃犱繚瀛樻潈闄愶紒";
+ res.data = null;
+ return res;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HNumber = item["璐ㄩ噺鏍囧噯浠ｇ爜"].ToString();
+ string HName = item["璐ㄩ噺鏍囧噯鍚嶇О"].ToString();
+ string HHelpCode = item["鍔╄鐮�"];
+ string HRemark = item["澶囨敞"].ToString();
+
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//鐭唬鐮�
+ if (sShortNumber.Trim() == "")
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ res.data = 1;
+ return res;
+ }
+ int HEndFlag = 1;//鏈骇鏍囧織
+ int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //绛夌骇
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ res.data = 1;
+ return res;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_QualityStd where HNumber='" + HNumber + "'", "Gy_InspectMethod");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+
+ string sql = "insert into Gy_QualityStd (HName,HNumber,HShortNumber,HLevel,HHelpCode,HParentID,HStopflag,HEndFlag,HRemark,HUseFlag, HMakeTime,HMakeEmp)" +
+ $"values('{HName}', '{HNumber}', '{sShortNumber}',{HLevel},'',0,'0','0','{HRemark}', '鏈娇鐢�', '{System.DateTime.Now.ToString("G")}', '{user}')";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ oCN.RunProc("update Gy_QualityStd set HName='" + HName + "', HHelpCode= '" + HHelpCode + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "' where HNumber= '" + HNumber + "'");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ res.code = "1";
+ res.count = 1;
+ res.Message = "瀵煎叆鎴愬姛!";
+ res.data = null;
+ return res;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ res.code = "0";
+ res.count = 0;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/ZLGL/BaseSet/Gy_InspectMethodController.cs b/WebAPI/Controllers/ZLGL/BaseSet/Gy_InspectMethodController.cs
new file mode 100644
index 0000000..d8edfdb
--- /dev/null
+++ b/WebAPI/Controllers/ZLGL/BaseSet/Gy_InspectMethodController.cs
@@ -0,0 +1,226 @@
+锘縰sing Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.ZLGL.BaseSet
+{
+ public class Gy_InspectInstruMentController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+
+ #region 鏍￠獙椤圭洰鍒楄〃 鏂囦欢涓婁紶
+ [Route("Gy_InspectInstruMent/Gy_Process_Excel")]
+ [HttpPost]
+ public json Gy_InspectInstruMent_Excel()
+ {
+ json res = new json();
+ try
+ {
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable provisional = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = provisional.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ provisional.Rows.Add(row);
+ }
+
+ //鍒ゆ柇鍒�
+ string error = JudgmentColumns(provisional);
+ if (error.Length > 0)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ res.data = null;
+ return res;
+ }
+
+ for (int i = 0; i <= provisional.Rows.Count - 1; i++)
+ {
+ string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�楠屼华鍣ㄤ唬鐮�"].ToString());
+ string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["妫�楠屼华鍣ㄥ悕绉�"].ToString());
+ string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
+ string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["澶囨敞"].ToString());
+ //鑾峰彇鐪熷疄琛屾暟
+ int line = i + 1;
+ }
+
+ res.code = "1";
+ res.count = 1;
+ res.Message = error;
+ res.data = provisional;
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇鍒�
+ /// </summary>
+ /// <param name="provisional"></param>
+ /// <returns></returns>
+ private static string JudgmentColumns(DataTable provisional)
+ {
+ var error = "";
+
+ //鏌ヨ娌℃湁鐨勫垪
+ if (!provisional.Columns.Contains("妫�楠屼华鍣ㄤ唬鐮�"))
+ error += "娌℃湁鎵惧埌銆愭楠屼华鍣ㄤ唬鐮併�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("妫�楠屼华鍣ㄥ悕绉�"))
+ error += "娌℃湁鎵惧埌銆愭楠屼华鍣ㄥ悕绉般�戠殑鏍囬,";
+ return error;
+ }
+ #endregion
+
+ #region 妫�楠屾柟娉曞垪琛� 瀵煎叆(淇濆瓨)
+ [Route("Gy_InspectInstruMent/Gy_Process_btnSave")]
+ [HttpPost]
+ public object Gy_InspectInstruMent_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ string organ = sArray[2].ToString();
+ json res = new json();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "鏃犱繚瀛樻潈闄愶紒";
+ res.data = null;
+ return res;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HNumber = item["妫�楠屼华鍣ㄤ唬鐮�"].ToString();
+ string HName = item["妫�楠屼华鍣ㄥ悕绉�"].ToString();
+ string HHelpCode = item["鍔╄鐮�"];
+ string HRemark = item["澶囨敞"].ToString();
+
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//鐭唬鐮�
+ if (sShortNumber.Trim() == "")
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ res.data = 1;
+ return res;
+ }
+ int HEndFlag = 1;//鏈骇鏍囧織
+ int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //绛夌骇
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ res.data = 1;
+ return res;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_InspectInstruMent where HNumber='" + HNumber + "'", "Gy_InspectInstruMent");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+
+ string sql = "insert into Gy_InspectInstruMent (HName,HNumber,HShortNumber,HLevel,HHelpCode,HParentID,HStopflag,HEndFlag,HRemark,HUseFlag, HUSEORGID, HCREATEORGID, HMakeTime,HMakeEmp)" +
+ $"values('{HName}', '{HNumber}', '{sShortNumber}',{HLevel},'',0,'0','0','{HRemark}', '鏈娇鐢�', '{organ}', '{organ}', '{System.DateTime.Now.ToString("G")}', '{user}')";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ oCN.RunProc("update Gy_InspectInstruMent set HName='" + HName + "', HHelpCode= '" + HHelpCode + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "' where HNumber= '" + HNumber + "'");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ res.code = "1";
+ res.count = 1;
+ res.Message = "瀵煎叆鎴愬姛!";
+ res.data = null;
+ return res;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ res.code = "0";
+ res.count = 0;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Controllers/ZLGL/BaseSet/Gy_QualityController.cs b/WebAPI/Controllers/ZLGL/BaseSet/Gy_QualityController.cs
new file mode 100644
index 0000000..38caa7d
--- /dev/null
+++ b/WebAPI/Controllers/ZLGL/BaseSet/Gy_QualityController.cs
@@ -0,0 +1,226 @@
+锘縰sing Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.ZLGL
+{
+ public class Gy_QualityController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 鏍￠獙椤圭洰鍒楄〃 鏂囦欢涓婁紶
+ [Route("Gy_Quality/Gy_Process_Excel")]
+ [HttpPost]
+ public json Gy_Quality_Excel()
+ {
+ json res = new json();
+ try
+ {
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable provisional = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ provisional.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = provisional.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ provisional.Rows.Add(row);
+ }
+
+ //鍒ゆ柇鍒�
+ string error = JudgmentColumns(provisional);
+ if (error.Length > 0)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ res.data = null;
+ return res;
+ }
+
+ for (int i = 0; i <= provisional.Rows.Count - 1; i++)
+ {
+ string HNumber = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["璐ㄩ噺鏍囧噯浠ｇ爜"].ToString());
+ string HName = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["璐ㄩ噺鏍囧噯鍚嶇О"].ToString());
+ string HHelpCode = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["鍔╄鐮�"]);
+ string HRemark = DBUtility.ClsPub.isStrNull(provisional.Rows[i]["澶囨敞"].ToString());
+ //鑾峰彇鐪熷疄琛屾暟
+ int line = i + 1;
+ }
+
+ res.code = "1";
+ res.count = 1;
+ res.Message = error;
+ res.data = provisional;
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+
+ /// <summary>
+ /// 鍒ゆ柇鍒�
+ /// </summary>
+ /// <param name="provisional"></param>
+ /// <returns></returns>
+ private static string JudgmentColumns(DataTable provisional)
+ {
+ var error = "";
+
+ //鏌ヨ娌℃湁鐨勫垪
+ if (!provisional.Columns.Contains("璐ㄩ噺鏍囧噯浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愯川閲忔爣鍑嗕唬鐮併�戠殑鏍囬,";
+
+ if (!provisional.Columns.Contains("璐ㄩ噺鏍囧噯鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愯川閲忔爣鍑嗗悕绉般�戠殑鏍囬,";
+ return error;
+ }
+ #endregion
+
+ #region 妫�楠屾柟娉曞垪琛� 瀵煎叆(淇濆瓨)
+ [Route("Gy_Quality/Gy_Process_btnSave")]
+ [HttpPost]
+ public object Gy_Quality_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ string organ = sArray[2].ToString();
+ json res = new json();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "鏃犱繚瀛樻潈闄愶紒";
+ res.data = null;
+ return res;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HNumber = item["璐ㄩ噺鏍囧噯浠ｇ爜"].ToString();
+ string HName = item["璐ㄩ噺鏍囧噯鍚嶇О"].ToString();
+ string HHelpCode = item["鍔╄鐮�"];
+ string HRemark = item["澶囨敞"].ToString();
+
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//鐭唬鐮�
+ if (sShortNumber.Trim() == "")
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ res.data = 1;
+ return res;
+ }
+ int HEndFlag = 1;//鏈骇鏍囧織
+ int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //绛夌骇
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
+ {
+ res.code = "0";
+ res.count = 0;
+ res.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ res.data = 1;
+ return res;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_QualityStd where HNumber='" + HNumber + "'", "Gy_InspectMethod");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+
+ string sql = "insert into Gy_QualityStd (HName,HNumber,HShortNumber,HLevel,HHelpCode,HParentID,HStopflag,HEndFlag,HRemark,HUseFlag, HUSEORGID, HCREATEORGID, HMakeTime,HMakeEmp)" +
+ $"values('{HName}', '{HNumber}', '{sShortNumber}',{HLevel},'',0,'0','0','{HRemark}', '鏈娇鐢�', '{organ}', '{organ}', '{System.DateTime.Now.ToString("G")}', '{user}')";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ oCN.RunProc("update Gy_QualityStd set HName='" + HName + "', HHelpCode= '" + HHelpCode + "', HModifyEmp = '" + user + "', HModifyTime = '" + System.DateTime.Now.ToString("G") + "' where HNumber= '" + HNumber + "'");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ res.code = "1";
+ res.count = 1;
+ res.Message = "瀵煎叆鎴愬姛!";
+ res.data = null;
+ return res;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ res.code = "0";
+ res.count = 0;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
+ }
+ #endregion
+
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
index b861fd2..9d51f56 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
@@ -1515,5 +1515,74 @@
}
#endregion
+ #region 鏉＄爜鏄庣粏
+ /// <summary>
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <returns></returns>
+ [Route("Kf_MateOutBillController/BarCodeNote")]
+ [HttpGet]
+ public object SellOutBill_BarCodeNote(int HInterID)
+ {
+ try
+ {
+ List<object> columnNameListSum = new List<object>();
+ List<object> columnNameList0 = new List<object>();
+ List<object> columnNameList1 = new List<object>();
+ List<object> columnNameList2 = new List<object>();
+
+ string sql = "exec h_p_IFCLD_ERPSourceBillToLocal_MateOut " + HInterID;
+ ds = oCn.RunProcReturn(sql, " h_p_IFCLD_ERPSourceBillToLocal_MateOut");
+
+ //娣诲姞 鍩烘湰淇℃伅 鍒楀悕
+ foreach (DataColumn col in ds.Tables[1].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList0.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ //娣诲姞 鐮佸崟淇℃伅 鍒楀悕
+ foreach (DataColumn col in ds.Tables[2].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList1.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ //娣诲姞 鏉＄爜鏄庣粏 鍒楀悕
+ foreach (DataColumn col in ds.Tables[3].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList2.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ columnNameListSum.Add(columnNameList0);
+ columnNameListSum.Add(columnNameList1);
+ columnNameListSum.Add(columnNameList2);
+
+ List<DataTable> tableList = new List<DataTable>();
+ tableList.Add(ds.Tables[1]);
+ tableList.Add(ds.Tables[2]);
+ tableList.Add(ds.Tables[3]);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = tableList;
+ objJsonResult.list = columnNameListSum;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs"
index a1c9f76..c5ecf76 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs"
@@ -590,6 +590,210 @@
}
#endregion
+ #region 宸ヨ祫缁撶畻鍗�(闆嗕綋)妯″潡 浠庡垪琛ㄩ�変腑鎵撳紑鍗曟嵁锛岃繑鍥炲崟鎹俊鎭椂璋冪敤
+ /// <summary>
+ /// 宸ヨ祫缁撶畻鍗�(闆嗕綋)缂栬緫鏃讹紝鏍规嵁鍗曟嵁ID鑾峰彇鍗曟嵁淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("Pay_GroupBalBillController/GetPay_GroupBalBill_Json")]
+ [HttpGet]
+ public object GetPay_GroupBalBill_Json(Int64 HInterID, string HMaker)
+ {
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 3, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡缂栬緫鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //杩斿洖鍒楄〃淇℃伅
+ ds = oCn.RunProcReturn("exec h_p_Pay_GroupBalBill_EditInit " + HInterID, "h_p_Pay_GroupBalBill_EditInit");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璇ュ伐璧勭粨绠楀崟(闆嗕綋)锛岃鍒锋柊鏁版嵁鍚庨噸鏂伴�夋嫨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = new
+ {
+ Mainlist = ds.Tables[0], //杩斿洖涓昏〃淇℃伅锛�0锛�
+ Sublist = ds.Tables[1], //杩斿洖瀛愯〃1淇℃伅锛�1锛�
+ Emplist = ds.Tables[2], //杩斿洖瀛愯〃2淇℃伅锛�2锛�
+ };
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖宸ヨ祫缁撶畻鍗�(闆嗕綋)淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸ヨ祫缁撶畻鍗�(闆嗕綋)淇濆瓨
+ /// <summary>
+ /// 宸ヨ祫缁撶畻鍗�(闆嗕綋)淇濆瓨
+ /// </summary>
+ [Route("Pay_GroupBalBillController/GetPay_GroupBalBill_Save_Json")]
+ [HttpPost]
+ public object GetPay_GroupBalBill_Save_Json([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string sMainStr = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string sSubStr = sArray[1].ToString(); //瀛愯〃鏁版嵁
+ string sSubStr2 = sArray[2].ToString(); //瀛愯〃鏁版嵁2
+ string OperationType = sArray[3].ToString(); //鎿嶄綔绫诲瀷锛�1鏂板銆�2缂栬緫锛�
+ string HMaker = sArray[4].ToString(); //鍒跺崟浜�
+ try
+ {
+ //鍒ゆ柇鏉冮檺
+ if (OperationType == "1")
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ //鍒ゆ柇鏂板鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightName, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏂板鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify;
+ //鍒ゆ柇缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, false, HMaker))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡缂栬緫鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //琛ㄥご璧嬪��
+ sMainStr = sMainStr.Replace("\\", "");
+ sMainStr = sMainStr.Replace("\n", "");
+ sMainStr = "[" + sMainStr.ToString() + "]";
+ List<Model.ClsPay_GroupBalBillMain> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_GroupBalBillMain>>(sMainStr);
+ foreach (Model.ClsPay_GroupBalBillMain oItem in lsmain)
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (oBill.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, oItem.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod_Pay(oItem.HDate, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oItem.HYear = sYear;
+ oItem.HPeriod = sPeriod;
+ DBUtility.ClsPub.CurUserName = oItem.HMaker;
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋璧嬪��
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ sSubStr = sSubStr.Substring(1, sSubStr.Length - 2);
+ sSubStr = sSubStr.Replace("\\", "");
+ sSubStr = sSubStr.Replace("\n", "");
+ sSubStr = "[" + sSubStr.ToString() + "]";
+ List<Model.ClsPay_GroupBalBillSub> ls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_GroupBalBillSub>>(sSubStr);
+ int i = 0;
+ foreach (Model.ClsPay_GroupBalBillSub oItemSub in ls)
+ {
+ i++;
+ oItemSub.HEntryID = i;
+ oBill.DetailColl.Add(oItemSub);
+ }
+ //琛ㄤ綋璧嬪��2
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ sSubStr2 = sSubStr2.Substring(1, sSubStr2.Length - 2);
+ sSubStr2 = sSubStr2.Replace("\\", "");
+ sSubStr2 = sSubStr2.Replace("\n", "");
+ sSubStr2 = "[" + sSubStr2.ToString() + "]";
+ List<Model.ClsPay_GroupBalBillEmp> ls2 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_GroupBalBillEmp>>(sSubStr2);
+ int j = 0;
+ foreach (Model.ClsPay_GroupBalBillEmp oItemSub2 in ls2)
+ {
+ j++;
+ oItemSub2.HEntryID = j;
+ oBill.DetailEmpColl.Add(oItemSub2);
+ }
+
+ //淇濆瓨
+ bool bResult;
+ if (OperationType == "1") //鏂板淇濆瓨
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else //缂栬緫淇濆瓨
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
diff --git "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs" "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
index 93ec4aa..44f4ba3 100644
--- "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
+++ "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
@@ -239,6 +239,111 @@
}
#endregion
+
+ #region 妯″叿淇濆吇缁翠慨琛�
+ public class MouldFileWeiXiuBaoYang
+ {
+ //ClsSb_MouldRepairWorkBillSub
+ //鍗曟嵁淇℃伅
+ public string HMakerID; //鍒涘缓浜篒D
+ public string HMaker; //鍒涘缓浜哄悕绉�
+ public string HMakeDate; //鍒涘缓鏃ユ湡
+ public string HUpdaterID; //淇敼浜篒D
+ public string HUpdater; //淇敼浜哄悕绉�
+ public string HUpdateDate; //淇敼鏃ユ湡
+ public string HInstanceID; //鍗曟嵁瀹炰緥ID
+ public string HOriginator; //鍙戣捣浜�
+ public string HTitle; //鍗曟嵁鏍囬
+ public Int64 HEquipID;// --璁惧ID(Gy_EquipMent)
+ public Int64 HRepairID;// --缁翠慨椤圭洰(Gy_Repair)
+ public DateTime HRepairBeginDate;// --缁翠慨寮�濮嬫棩鏈�
+ public DateTime HRepairEndDate;// --缁翠慨缁撴潫鏃ユ湡
+ public string HRepairContent;// --缁翠慨鍐呭
+ public string HCycleUnit;// varchar(10) --鏃堕棿鍗曚綅(灏忔椂锛屽ぉ)
+ public double HPlanTimes;// money --璁″垝缁翠慨宸ユ椂
+ public double HTimes;// money --瀹為檯缁翠慨宸ユ椂
+ public Int64 HEmpID;// int --缁翠慨浜�(Gy_Employee)
+ public Int64 HManagerID;// int --璐熻矗浜�(Gy_Employee)
+ public Int64 HDeptID;// int --缁翠慨閮ㄩ棬(Gy_Department)
+ public string HExplanation;// varchar(500) --缁翠慨瑕佹眰
+ public string HInnerBillNo;// varchar(50) --鍐呴儴鍗曟嵁鍙�
+ public Int64 HMouldID;
+ public Int64 HSupID;// int --渚涘簲鍟嗭紙Gy_Supplier锛� addnew
+ public string HRepairType;// varchar(10) --缁翠慨绫诲瀷锛堝唴閮ㄧ淮淇紝濮斿缁翠慨锛� addnew
+ public string HNewModel;// varchar(100) --缁翠慨鍚庢柊瑙勬牸 addnew
+ public Single HNewDesignLife;// money --鏂拌璁″鍛�
+ public string HRemark;
+
+
+
+ //鍗曟嵁鍐呭
+ public string HDate; //鏃ユ湡
+ public string HCheckLevel; //瀹℃牳绛夌骇
+ public string HArea; //鍖哄煙
+ public string HEmployeeID; //鎴愬憳ID
+ public string HEmplpyee; //鎴愬憳鍚嶇О
+
+ public List<Sc_MouldRepairWorkBillSub> DetailColMouldRepair = new List<Sc_MouldRepairWorkBillSub>();
+ public List<Sc_MouldMaintainBillSub> DetailColMouldMaintain = new List<Sc_MouldMaintainBillSub>();
+ }
+
+ //缁翠慨瀛愯〃
+ public class Sc_MouldRepairWorkBillSub
+ {
+ public string HRepairExplanation;
+ public string HRemark;
+ }
+
+ //淇濆吇瀛愯〃
+ public class Sc_MouldMaintainBillSub
+ {
+ public string HClaim;
+ public string HMaintainResult;
+ }
+ #endregion
+
+ #region 璁惧缁翠慨璁板綍琛�
+ public class EquipRepairWeiXiu
+ {
+ //鍗曟嵁淇℃伅
+ public string HMakerID; //鍒涘缓浜篒D
+ public string HMaker; //鍒涘缓浜哄悕绉�
+ public string HMakeDate; //鍒涘缓鏃ユ湡
+ public string HUpdaterID; //淇敼浜篒D
+ public string HUpdater; //淇敼浜哄悕绉�
+ public string HUpdateDate; //淇敼鏃ユ湡
+ public string HInstanceID; //鍗曟嵁瀹炰緥ID
+ public string HOriginator; //鍙戣捣浜�
+ public string HTitle; //鍗曟嵁鏍囬
+ public Int64 HEmpID;// int --缁翠慨浜�
+ public Int64 HManagerID;// int --璐熻矗浜�
+ public Int64 HSecManagerID;// int --楠屾敹
+ public Int64 HDeptID;// int --缁翠慨閮ㄩ棬
+ public string HExplanation;// varchar(200) --缁翠慨瑕佹眰
+ public string HInnerBillNo;// varchar(50) --鍐呴儴鍗曟嵁鍙�
+ public string HRemark; //鍔犲伐瑕佹眰
+
+ public Int64 HEquipID;// int --璁惧ID(Gy_EquipMent)
+ public Int64 HRepairID;//int --缁翠慨椤圭洰(Gy_Repair)
+ public DateTime HRepairBeginDate;// datetime --缁翠慨寮�濮嬫棩鏈�
+ public DateTime HRepairEndDate;//datetime --缁翠慨缁撴潫鏃ユ湡
+ public string HRepairContent;//varchar(500) --缁翠慨鍐呭
+ public string HCycleUnit;//varchar(10) --鏃堕棿鍗曚綅(灏忔椂锛屽ぉ)
+ public Single HPlanTimes;// money --璁″垝缁翠慨宸ユ椂
+ public Single HTimes;// money --瀹為檯缁翠慨宸ユ椂
+ public string HRemark2;//澶囨敞
+
+ //鍗曟嵁鍐呭
+ public string HDate; //鏃ユ湡
+ public string HCheckLevel; //瀹℃牳绛夌骇
+ public string HArea; //鍖哄煙
+ public string HEmployeeID; //鎴愬憳ID
+ public string HEmplpyee; //鎴愬憳鍚嶇О
+
+ public List<Sc_MouldRepairWorkBillSub> DetailColMouldRepair = new List<Sc_MouldRepairWorkBillSub>();
+ }
+
+ #endregion
#endregion
#region 閽夐拤 閫氱敤鎿嶄綔鏂规硶
@@ -405,8 +510,10 @@
//OriginatorId = "12", //鏍规嵁娴佺▼鍙戣捣浜哄伐鍙锋煡璇€��
//TaskId = "12", //浠诲姟ID銆�
- CreateFromTimeGMT = DateTime.Now.ToString("dd") == "01" ? "2022-01-01" : DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"), //鍒涘缓鏃堕棿璧峰鍊笺��
- CreateToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), //鍒涘缓鏃堕棿缁堟鍊笺��
+ //CreateFromTimeGMT = DateTime.Now.ToString("dd") == "01" ? "2022-01-01" : DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"), //鍒涘缓鏃堕棿璧峰鍊笺��
+ //CreateToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), //鍒涘缓鏃堕棿缁堟鍊笺��
+ ModifiedFromTimeGMT = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"), //淇敼鏃堕棿璧峰鍊笺��
+ ModifiedToTimeGMT = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"), //淇敼鏃堕棿缁堟鍊笺��
PageSize = pageSize, //鍒嗛〉澶у皬銆�
PageNumber = pageNumber, //鍒嗛〉椤电爜
@@ -1895,6 +2002,665 @@
}
#endregion
#endregion
+
+ #region 鏁版嵁鍚屾-妯″叿缁翠慨淇濆吇鍗�
+ #region 鑾峰彇 瀹滄惌-妯″叿缁翠慨淇濆吇鍗� 瀹炰緥ID鍒楄〃瀵瑰簲鐨勫疄渚嬭鎯�
+ public bool getInstanceDetailList___MouldFileWeiXiuBaoYang_YiDa(string appType, string systemToken, string userID, string formUuid, List<string> IDList, ref List<MouldFileWeiXiuBaoYang> lsmain, ref string msg, int size = 500)
+ {
+
+ try
+ {
+ int startIndex = 0;
+ int endIndex = startIndex + size;
+ if (endIndex > IDList.Count)
+ {
+ endIndex = IDList.Count;
+ }
+
+ while (startIndex < endIndex && endIndex <= IDList.Count)
+ {
+ List<string> IDList_temp = new List<string>();
+ for (int i = startIndex; i < endIndex; i++)
+ {
+ IDList_temp.Add(IDList[i]);
+ }
+
+ BatchGetFormDataByIdListResponse response = new BatchGetFormDataByIdListResponse();
+ if (getInstanceDetailListByInstanceIDList_YiDa(appType, systemToken, formUuid, userID, IDList_temp, ref response, ref msg) == false)
+ {
+ return false;
+ }
+
+
+ for (int i = 0; i < response.Body.Result.Count; i++)
+ {
+ try
+ {
+
+
+ List<string> keys = new List<string>(response.Body.Result[i].FormData.Keys);
+
+ MouldFileWeiXiuBaoYang oItem = new MouldFileWeiXiuBaoYang();
+ oItem.HMakerID = response.Body.Result[i].CreatorUserId.Replace("'", "");
+ oItem.HMaker = response.Body.Result[i].CreatorUserId.Replace("'", "");
+ oItem.HMakeDate = response.Body.Result[i].CreateTimeGMT.Replace("T", " ").Replace("Z", "").Replace("'", "");
+ oItem.HUpdaterID = response.Body.Result[i].ModifyUser.UserId.Replace("'", "");
+ oItem.HUpdater = response.Body.Result[i].ModifyUser.Name.NameInChinese.Replace("'", "");
+ oItem.HUpdateDate = response.Body.Result[i].ModifiedTimeGMT.Replace("T", " ").Replace("Z", "").Replace("'", "");
+ oItem.HInstanceID = response.Body.Result[i].FormInstanceId.Replace("'", "");
+ oItem.HOriginator = response.Body.Result[i].Originator.Name.NameInChinese.Replace("'", "");
+
+ GetInstanceByIdResponse getInstanceByIdResponse = new GetInstanceByIdResponse(); ;
+ if (!getInstanceStatusByInstanceID__YiDa(appType, systemToken, userID, oItem.HInstanceID, ref getInstanceByIdResponse, ref msg))
+ {
+ continue;
+ }
+
+ if (getInstanceByIdResponse.Body.InstanceStatus != "COMPLETED")
+ {
+ continue;
+ }
+
+ //淇ā寮�濮嬫椂闂�
+ if (keys.Contains("dateField_lq4gf2ih"))
+ {
+ double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq4gf2ih"].ToString());
+ oItem.HRepairBeginDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm"));
+ }
+
+ //淇ā缁撴潫鏃堕棿
+ if (keys.Contains("dateField_lq4gf2ii"))
+ {
+ double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lq4gf2ii"].ToString());
+ oItem.HRepairEndDate = DateTime.Parse(convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd HH:mm"));
+ }
+
+ //妯″叿鎵规鍙�
+ if (keys.Contains("serialNumberField_lqaak4ts"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["serialNumberField_lqaak4ts"].ToString();
+ oItem.HRemark = HDate_Temp;
+ }
+
+ //妯″叿缂栫爜
+ if (keys.Contains("dateField_lq4gf2ii"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["dateField_lq4gf2ii"].ToString();
+ DataSet ds = oCN.RunProcReturn("select * from Gy_MouldFileMain with(nolock) where HNumber='" + HDate_Temp + "'", "Gy_MouldFileMain");
+ string HMouldID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ HMouldID = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ }
+ oItem.HMouldID = long.Parse(HMouldID);
+ }
+
+
+ //缁翠慨閮ㄩ棬
+ if (keys.Contains("selectField_lq3idkva"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["selectField_lq3idkva"].ToString();
+ DataSet ds = oCN.RunProcReturn("select * from Gy_Department with(nolock) where HName='" + HDate_Temp + "'", "Gy_Department");
+ string HDeptID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ HDeptID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ oItem.HDeptID = long.Parse(HDeptID);
+ }
+
+ //鏂拌璁″鍛�
+ oItem.HNewDesignLife = 30000;
+
+ //缁翠慨浜�
+ if (keys.Contains("employeeField_lq3idkvh"))
+ {
+ string[] HDate_Temp = JsonConvert.DeserializeObject<string[]>(JsonConvert.SerializeObject(response.Body.Result[i].FormData["employeeField_lq3idkvh"]));
+ DataSet ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock) where HNumber='" + HDate_Temp[0] + "'", "Gy_Employee");
+ string HEmpID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ HEmpID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ oItem.HEmpID = long.Parse(HEmpID);
+ }
+
+ //缁翠慨鏃堕棿
+ if (keys.Contains("numberField_lq3ixr9j"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["numberField_lq3ixr9j"].ToString();
+
+ oItem.HTimes = long.Parse(HDate_Temp);
+ oItem.HPlanTimes = long.Parse(HDate_Temp);
+ }
+
+ //瀛愯〃 缁翠慨瑕佹眰 缁翠慨澶囨敞(闂鎻忚堪)
+ if (keys.Contains("tableField_lq3ixr9b"))
+ {
+ List<Dictionary<string, object>> dic = JsonConvert.DeserializeObject<List<Dictionary<string, object>>>(JsonConvert.SerializeObject(response.Body.Result[i].FormData["tableField_lq3ixr9b"]));
+ for (int ij = 0; ij < dic.Count; ij++)
+ {
+ Sc_MouldRepairWorkBillSub oItemSub = new Sc_MouldRepairWorkBillSub();
+
+ List<string> keys_Sub = new List<string>(dic[ij].Keys);
+
+ //缁翠慨瑕佹眰
+ if (keys_Sub.Contains("textareaField_lq3ixr9e"))
+ {
+ oItemSub.HRepairExplanation = dic[ij]["textareaField_lq3ixr9e"].ToString();
+ }
+
+ //澶囨敞
+ if (keys_Sub.Contains("textField_lq3ixr9d"))
+ {
+ oItemSub.HRemark = dic[ij]["textField_lq3ixr9d"].ToString();
+ }
+ oItem.DetailColMouldRepair.Add(oItemSub);
+ }
+ }
+
+ string HRemark = "";
+ //瀛愯〃 淇濆吇澶囨敞(闂鎻忚堪)
+ if (keys.Contains("textareaField_ltpf2wiw"))
+ {
+ HRemark = response.Body.Result[i].FormData["textareaField_ltpf2wiw"].ToString();
+
+ }
+
+ //瀛愯〃 鍏蜂綋瑕佹眰 淇濆吇椤圭洰
+ if (keys.Contains("checkboxField_ltpf2wif"))
+ {
+ string[] HDate_Temp = JsonConvert.DeserializeObject<string[]>(JsonConvert.SerializeObject(response.Body.Result[i].FormData["checkboxField_ltpf2wif"]));
+
+ for (int ij = 0; ij < HDate_Temp.Length; ij++)
+ {
+ Sc_MouldMaintainBillSub oItemSub = new Sc_MouldMaintainBillSub();
+
+ oItemSub.HClaim = HDate_Temp[ij];
+ oItemSub.HMaintainResult = HRemark;
+ oItem.DetailColMouldMaintain.Add(oItemSub);
+ }
+
+ }
+
+ int startindex = response.Body.Result[i].Title.IndexOf("zh_CN") + 8;
+ oItem.HTitle = startIndex + response.Body.Result[i].Title.Substring(startindex).Replace("\"}", "").Replace("'", "");
+
+ if (keys.Contains("dateField_lo6w37hk"))
+ {
+ double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lo6w37hk"].ToString());
+ oItem.HDate = convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd");
+ }
+
+ if (keys.Contains("selectField_lockncvh_id"))
+ {
+ oItem.HArea = response.Body.Result[i].FormData["selectField_lockncvh_id"].ToString().Replace("'", "");
+ }
+
+ if (keys.Contains("selectField_lockncvg_id"))
+ {
+ oItem.HCheckLevel = response.Body.Result[i].FormData["selectField_lockncvg_id"].ToString().Replace("'", "");
+ }
+
+ if (keys.Contains("employeeField_lo6w37hf"))
+ {
+ oItem.HEmplpyee = ((List<object>)response.Body.Result[i].FormData["employeeField_lo6w37hf"])[0].ToString().Replace("'", "");
+ }
+
+ if (keys.Contains("employeeField_lo6w37hf_id"))
+ {
+ oItem.HEmployeeID = ((List<object>)response.Body.Result[i].FormData["employeeField_lo6w37hf_id"])[0].ToString().Replace("'", "");
+ }
+
+ lsmain.Add(oItem);
+ }
+ catch (Exception e)
+ {
+ continue;
+ }
+ }
+
+ startIndex = endIndex;
+ endIndex += size;
+ if (endIndex > IDList.Count)
+ {
+ endIndex = IDList.Count;
+ }
+ }
+
+
+ return true;
+ }
+ catch (Exception e)
+ {
+ msg = e.Message;
+ return false;
+ }
+
+ }
+ #endregion
+
+ #region 鏁版嵁鍚屾
+ public bool getData_MouldFileWeiXiuBaoYang(ref string msg)
+ {
+ //鑾峰彇 鍒嗗眰瀹℃牳琛� 瀹炰緥ID鍒楄〃
+ string appType = "APP_CSD7RLFJ3CTU330N3SCV";
+ string systemToken = "9T566BD1NWMGH17C93CKA9M4AS0D233TNU0QL82";
+ string userID = "011113050243860353";
+ string formUuid = "FORM-30C78F46E77E46A9AA8778214CEFE6B5J0AN";
+ int pageNumber = 1;
+ int pageSize = 100;
+
+ //鑾峰彇妯″叿缁翠慨淇濆吇琛ㄧ殑瀹炰緥ID鍒楄〃
+ List<string> IDList = new List<string>();
+ if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
+ {
+ return false;
+ }
+
+ //鑾峰彇璇︾粏淇℃伅骞堕檮鍔犲埌鍒楄〃lsmain涓�
+ List<MouldFileWeiXiuBaoYang> lsmain = new List<MouldFileWeiXiuBaoYang>();
+ if (getInstanceDetailList___MouldFileWeiXiuBaoYang_YiDa(appType, systemToken, userID, formUuid, IDList, ref lsmain, ref msg) == false)
+ {
+ return false;
+ }
+
+ try
+ {
+ oCN.BeginTran();
+ foreach (MouldFileWeiXiuBaoYang oItem in lsmain)
+ {
+ //淇濆吇璁板綍
+ if (oItem.DetailColMouldMaintain.Count != 0)
+ {
+ string BillType = "3819";
+ string sql = $@"select HInnerBillNo from Sc_MouldMaintainBillMain
+ where HInnerBillNo = '{oItem.HInstanceID}'";
+ DataSet ds = oCN.RunProcReturn(sql, "Sc_MouldMaintainBillMain");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //long HInterID = 0;
+ //string HBillNo = "";
+ string sql_main = "Insert Into Sc_MouldMaintainBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HRemark,HUpDateDate" +
+ ",HPlanNo,HPlanInterID,HMouldID,HBeginDate" +
+ ",HEndDate" +
+ ",HInnerBillNo,HExplanation,HMouldMaintainRuleInterID,HMaintainLevID,HLastResult" +
+ ")values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "',getdate(),'" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
+ ",'" + DateTime.Now.Year + "','" + DateTime.Now.Month + "','"+ oItem.HRemark + "','" + oItem.HUpdateDate + "'" +
+ ",'','0','" + oItem.HMouldID + "','" + oItem.HRepairBeginDate + "'" +
+ ",'" + oItem.HRepairEndDate + "'" +
+ ",'" + oItem.HInstanceID + "','',0,0,'OK')";
+ oCN.RunProc(sql_main);
+ int i = 1;
+ foreach (Sc_MouldMaintainBillSub oItem_Detail in oItem.DetailColMouldMaintain)
+ {
+ string sql_sub = "Insert into Sc_MouldMaintainBillSub_Item" +
+ " (HInterID,HEntryID,HMaintainItemID,HMaintainItem" +
+ ",HMaintainPart,HClaim" +
+ ",HManagerID" +
+ ",HCloseMan,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaintainResult" +
+ ") values('" + HInterID + "'," + i + ",0,'" + oItem_Detail.HClaim + "'" +
+ ",'','" + oItem_Detail.HClaim + "'" +
+ ",'" + oItem.HEmpID + "'" +
+ ",'','','" + oItem_Detail.HMaintainResult + "'" +
+ ",'0','0','','',0,0,'')";
+ oCN.RunProc(sql_sub);
+ i += 1;
+ }
+
+ }
+ }
+
+ //缁翠慨璁板綍
+ if (oItem.DetailColMouldRepair.Count != 0)
+ {
+ string BillType = "3807";
+ string sql = $@"select HInnerBillNo from Sc_MouldRepairWorkBillMain
+ where HInnerBillNo = '{oItem.HInstanceID}'";
+ DataSet ds = oCN.RunProcReturn(sql, "Sc_MouldRepairWorkBillMain");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //long HInterID = 0;
+ //string HBillNo = "";
+ string sql_main = "Insert Into Sc_MouldRepairWorkBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HEquipID,HRepairID,HRepairBeginDate,HRepairEndDate,HRepairContent" +
+ ",HCycleUnit,HPlanTimes,HTimes,HEmpID,HManagerID" +
+ ",HDeptID,HExplanation,HInnerBillNo,HMouldID" +
+ ",HSupID,HRepairType,HNewModel,HNewDesignLife,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID" +
+ ")values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "',getdate()" +
+ ",'" + DateTime.Now.Year + "','" + DateTime.Now.Month + "','','" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
+ ",'0','0','" + oItem.HRepairBeginDate + "','" + oItem.HUpdateDate + "',''" +
+ ",'灏忔椂','" + oItem.HPlanTimes + "','" + oItem.HTimes + "','" + oItem.HEmpID + "',0" +
+ ",'" + oItem.HDeptID + "','','" + oItem.HInstanceID + "','" + oItem.HMouldID + "'" +
+ ",'0','鍐呴儴缁翠慨','','" + oItem.HNewDesignLife + "','',0,0)";
+
+ oCN.RunProc(sql_main);
+ int i = 1;
+ foreach (Sc_MouldRepairWorkBillSub oItem_Detail in oItem.DetailColMouldRepair)
+ {
+ string sql_sub = "Insert into Sc_MouldRepairWorkBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HRepairID,HRepairExplanation,HManagerID,HMoney) values" +
+ "('" + HInterID + "'," + i + ",'','','','" + oItem_Detail.HRemark + "'" +
+ ",0,0,'','',0,0" +
+ ",0,'" + oItem_Detail.HRepairExplanation + "','" + oItem.HEmpID + "',0)";
+ oCN.RunProc(sql_sub);
+ i += 1;
+ }
+
+ }
+ }
+
+
+ }
+ oCN.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ msg = e.Message;
+ oCN.RollBack();
+ return false;
+ }
+ }
+ #endregion
+ #endregion
+
+ #region 鏁版嵁鍚屾-璁惧缁翠慨璁板綍鍗�
+ #region 鑾峰彇 瀹滄惌-璁惧缁翠慨璁板綍鍗� 瀹炰緥ID鍒楄〃瀵瑰簲鐨勫疄渚嬭鎯�
+ public bool getInstanceDetailList___EquipRepairWeiXiu_YiDa(string appType, string systemToken, string userID, string formUuid, List<string> IDList, ref List<EquipRepairWeiXiu> lsmain, ref string msg, int size = 500)
+ {
+
+ try
+ {
+ int startIndex = 0;
+ int endIndex = startIndex + size;
+ if (endIndex > IDList.Count)
+ {
+ endIndex = IDList.Count;
+ }
+
+ while (startIndex < endIndex && endIndex <= IDList.Count)
+ {
+ List<string> IDList_temp = new List<string>();
+ for (int i = startIndex; i < endIndex; i++)
+ {
+ IDList_temp.Add(IDList[i]);
+ }
+
+ BatchGetFormDataByIdListResponse response = new BatchGetFormDataByIdListResponse();
+ if (getInstanceDetailListByInstanceIDList_YiDa(appType, systemToken, formUuid, userID, IDList_temp, ref response, ref msg) == false)
+ {
+ return false;
+ }
+
+
+ for (int i = 0; i < response.Body.Result.Count; i++)
+ {
+ try
+ {
+ List<string> keys = new List<string>(response.Body.Result[i].FormData.Keys);
+
+ EquipRepairWeiXiu oItem = new EquipRepairWeiXiu();
+ oItem.HMakerID = response.Body.Result[i].CreatorUserId.Replace("'", "");
+ oItem.HMaker = response.Body.Result[i].CreatorUserId.Replace("'", "");
+ oItem.HMakeDate = response.Body.Result[i].CreateTimeGMT.Replace("T", " ").Replace("Z", "").Replace("'", "");
+ oItem.HUpdaterID = response.Body.Result[i].ModifyUser.UserId.Replace("'", "");
+ oItem.HUpdater = response.Body.Result[i].ModifyUser.Name.NameInChinese.Replace("'", "");
+ oItem.HUpdateDate = response.Body.Result[i].ModifiedTimeGMT.Replace("T", " ").Replace("Z", "").Replace("'", "");
+ oItem.HInstanceID = response.Body.Result[i].FormInstanceId.Replace("'", "");
+ oItem.HOriginator = response.Body.Result[i].Originator.Name.NameInChinese.Replace("'", "");
+
+ GetInstanceByIdResponse getInstanceByIdResponse = new GetInstanceByIdResponse(); ;
+ if (!getInstanceStatusByInstanceID__YiDa(appType, systemToken, userID, oItem.HInstanceID, ref getInstanceByIdResponse, ref msg))
+ {
+ continue;
+ }
+
+ if (getInstanceByIdResponse.Body.InstanceStatus != "COMPLETED")
+ {
+ continue;
+ }
+
+ //璁惧缂栫爜
+ if (keys.Contains("textField_lfg9hgys"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["textField_lfg9hgys"].ToString();
+ DataSet ds = oCN.RunProcReturn("select * from Gy_MouldFileMain with(nolock) where HNumber='" + HDate_Temp + "'", "Gy_MouldFileMain");
+ string HEquipID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ HEquipID = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ }
+ oItem.HEquipID = long.Parse(HEquipID);
+ oItem.HRemark2 = HDate_Temp;
+ }
+
+
+ //缁翠慨閮ㄩ棬
+ if (keys.Contains("selectField_kzgkw10a"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["selectField_kzgkw10a"].ToString();
+ DataSet ds = oCN.RunProcReturn("select * from Gy_Department with(nolock) where HName='" + HDate_Temp + "'", "Gy_Department");
+ string HDeptID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ HDeptID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ oItem.HDeptID = long.Parse(HDeptID);
+ }
+
+
+ //缁翠慨浜�
+ if (keys.Contains("employeeField_lthwkdh2"))
+ {
+ string[] HDate_Temp = JsonConvert.DeserializeObject<string[]>(JsonConvert.SerializeObject(response.Body.Result[i].FormData["employeeField_lthwkdh2"]));
+ DataSet ds = oCN.RunProcReturn("select * from Gy_Employee with(nolock) where HNumber='" + HDate_Temp[0] + "'", "Gy_Employee");
+ string HEmpID = "0";
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ HEmpID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ oItem.HEmpID = long.Parse(HEmpID);
+ }
+
+ //缁翠慨鏃堕棿
+ if (keys.Contains("textField_l2r95oo2"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["textField_l2r95oo2"].ToString();
+
+ oItem.HTimes = long.Parse(HDate_Temp);
+ oItem.HPlanTimes = long.Parse(HDate_Temp);
+ }
+
+ //缁翠慨鍐呭
+ if (keys.Contains("textField_l2r9bvwk"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["textField_l2r9bvwk"].ToString();
+
+ oItem.HRepairContent = HDate_Temp;
+ }
+
+
+ //瀛愯〃 缁翠慨瑕佹眰 缁翠慨澶囨敞(闂鎻忚堪)
+
+ Sc_MouldRepairWorkBillSub sub = new Sc_MouldRepairWorkBillSub();
+
+ //缁翠慨瑕佹眰
+ if (keys.Contains("textareaField_lthwo99r"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["textareaField_lthwo99r"].ToString();
+
+ sub.HRepairExplanation = HDate_Temp;
+ }
+
+ //澶囨敞
+ if (keys.Contains("textField_l2r95oo0"))
+ {
+ string HDate_Temp = response.Body.Result[i].FormData["textField_l2r95oo0"].ToString();
+
+ sub.HRemark = HDate_Temp;
+ }
+ oItem.DetailColMouldRepair.Add(sub);
+
+ int startindex = response.Body.Result[i].Title.IndexOf("zh_CN") + 8;
+ oItem.HTitle = startIndex + response.Body.Result[i].Title.Substring(startindex).Replace("\"}", "").Replace("'", "");
+
+ if (keys.Contains("dateField_lo6w37hk"))
+ {
+ double HDate_Temp = double.Parse(response.Body.Result[i].FormData["dateField_lo6w37hk"].ToString());
+ oItem.HDate = convertFromMillisecondsToDateString(HDate_Temp, "yyyy-MM-dd");
+ }
+
+ if (keys.Contains("selectField_lockncvh_id"))
+ {
+ oItem.HArea = response.Body.Result[i].FormData["selectField_lockncvh_id"].ToString().Replace("'", "");
+ }
+
+ if (keys.Contains("selectField_lockncvg_id"))
+ {
+ oItem.HCheckLevel = response.Body.Result[i].FormData["selectField_lockncvg_id"].ToString().Replace("'", "");
+ }
+
+ if (keys.Contains("employeeField_lo6w37hf"))
+ {
+ oItem.HEmplpyee = ((List<object>)response.Body.Result[i].FormData["employeeField_lo6w37hf"])[0].ToString().Replace("'", "");
+ }
+
+ if (keys.Contains("employeeField_lo6w37hf_id"))
+ {
+ oItem.HEmployeeID = ((List<object>)response.Body.Result[i].FormData["employeeField_lo6w37hf_id"])[0].ToString().Replace("'", "");
+ }
+
+ lsmain.Add(oItem);
+ }
+ catch (Exception e)
+ {
+ continue;
+ }
+ }
+
+ startIndex = endIndex;
+ endIndex += size;
+ if (endIndex > IDList.Count)
+ {
+ endIndex = IDList.Count;
+ }
+ }
+
+
+ return true;
+ }
+ catch (Exception e)
+ {
+ msg = e.Message;
+ return false;
+ }
+
+ }
+ #endregion
+
+ #region 鏁版嵁鍚屾
+ public bool getData_EquipRepairWeiXiu(ref string msg)
+ {
+ //鑾峰彇 鍒嗗眰瀹℃牳琛� 瀹炰緥ID鍒楄〃
+ string appType = "APP_E2A54CQBDX3TZN51JGBI";
+ string systemToken = "YKB660C1ZPNW58JDZKAP318W5VQE2RRMQL2YKZK";
+ string userID = "011113050243860353";
+ string formUuid = "FORM-OM566O7177LW0ARJ5IMFF63NTFKA34G9RL2YKN1";
+ int pageNumber = 1;
+ int pageSize = 100;
+
+ //鑾峰彇妯″叿缁翠慨淇濆吇琛ㄧ殑瀹炰緥ID鍒楄〃
+ List<string> IDList = new List<string>();
+ if (getInstanceIDList_YiDa(appType, systemToken, userID, formUuid, pageNumber, pageSize, ref IDList, ref msg) == false)
+ {
+ return false;
+ }
+
+ //鑾峰彇璇︾粏淇℃伅骞堕檮鍔犲埌鍒楄〃lsmain涓�
+ List<EquipRepairWeiXiu> lsmain = new List<EquipRepairWeiXiu>();
+ if (getInstanceDetailList___EquipRepairWeiXiu_YiDa(appType, systemToken, userID, formUuid, IDList, ref lsmain, ref msg) == false)
+ {
+ return false;
+ }
+
+ try
+ {
+ oCN.BeginTran();
+ foreach (EquipRepairWeiXiu oItem in lsmain)
+ {
+ //缁翠慨璁板綍
+ if (oItem.DetailColMouldRepair.Count != 0)
+ {
+ string BillType = "3910";
+ string sql = $@"select HInnerBillNo from Sb_EquipRepairWorkBillMain
+ where HInnerBillNo = '{oItem.HInstanceID}'";
+ DataSet ds = oCN.RunProcReturn(sql, "Sb_EquipRepairWorkBillMain");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
+ //long HInterID = 0;
+ //string HBillNo = "";
+ string sql_main = "Insert Into Sb_EquipRepairWorkBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HEquipID,HRepairID,HPlanTimes,HEmpID,HManagerID,HTimes" +
+ ",HDeptID,HExplanation,HInnerBillNo,HRepairBeginDate,HRepairEndDate" +
+ ",HRepairContent,HCycleUnit,HMainSourceBillType,HMainSourceInterID,HMainSourceEntryID" +
+ ")values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "',getdate()" +
+ ",'" + DateTime.Now.Year + "','" + DateTime.Now.Month + "','"+ oItem.HRemark2 + "','" + oItem.HOriginator + "','" + oItem.HMakeDate + "'" +
+ ",'" + oItem.HEquipID + "','0','" + oItem.HTimes + "','" + oItem.HEmpID + "','" + oItem.HEmpID + "','" + oItem.HTimes + "'" +
+ ",'" + oItem.HDeptID + "','" + oItem.HExplanation + "','" + oItem.HInstanceID + "','',''" +
+ ",'" + oItem.HRepairContent + "','灏忔椂','','0',0)";
+
+ oCN.RunProc(sql_main);
+ int i = 1;
+ foreach (Sc_MouldRepairWorkBillSub oItem_Detail in oItem.DetailColMouldRepair)
+ {
+ string sql_sub = "Insert into Sb_EquipRepairWorkBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HRepairID,HManagerID,HRepairExplanation,HEmpID)" +
+ "values('" + HInterID + "'," + i + ",'','','','" + oItem_Detail.HRemark + "'" +
+ ",0,0,'','',0,0" +
+ ",0,'" + oItem.HEmpID + "','" + oItem_Detail.HRepairExplanation + "','" + oItem.HEmpID + "')";
+ oCN.RunProc(sql_sub);
+ i += 1;
+ }
+
+ }
+ }
+
+
+ }
+ oCN.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ msg = e.Message;
+ oCN.RollBack();
+ return false;
+ }
+ }
+ #endregion
+ #endregion
+
#endregion
diff --git a/WebAPI/HttpClient.cs b/WebAPI/HttpClient.cs
index 609f1b6..08b888b 100644
--- a/WebAPI/HttpClient.cs
+++ b/WebAPI/HttpClient.cs
@@ -59,7 +59,6 @@
}
}
-
public async Task<string> AsyncRequest()
{
HttpWebRequest httpRequest = WebRequest.Create(Url) as HttpWebRequest;
@@ -99,5 +98,41 @@
}
return responseText;
}
+
+
+ /// <summary>
+ /// 寮傛Get
+ /// </summary>
+ /// <returns></returns>
+ public async Task<string> AsyncGetRequest()
+ {
+ HttpWebRequest httpRequest = WebRequest.Create(Url) as HttpWebRequest;
+ httpRequest.Method = "GET";
+ httpRequest.ContentType = "application/json";
+ httpRequest.CookieContainer = Cookie;
+ httpRequest.Timeout = 1000 * 60 * 10;//10min
+
+ using (Stream reqStream = await httpRequest.GetRequestStreamAsync())
+ {
+ JObject jObj = new JObject();
+ jObj.Add("format", 1);
+ jObj.Add("useragent", "ApiClient");
+ jObj.Add("rid", Guid.NewGuid().ToString().GetHashCode().ToString());
+ jObj.Add("parameters", Content);
+ jObj.Add("timestamp", DateTime.Now);
+ jObj.Add("v", "1.0");
+ string content = jObj.ToString();
+ var bytes = Encoding.UTF8.GetBytes(content);
+ reqStream.Write(bytes, 0, bytes.Length);
+ reqStream.Flush();
+ }
+ using (var repStream = (await httpRequest.GetResponseAsync()).GetResponseStream())
+ {
+ using (var reader = new StreamReader(repStream))
+ {
+ return ValidateResult(await reader.ReadToEndAsync());
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 3511795..a1b3896 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -4313,6 +4313,30 @@
return list;
}
+ /// <summary>
+ /// 缁勮杩芥函-涓�2
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_AssemblyBillMain> getObjectByJson_Sc_AssemblyBillMain2(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_AssemblyBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_AssemblyBillMain>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
+ /// 缁勮杩芥函-瀛�2
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_AssemblyBillSub> getObjectByJson_Sc_AssemblyBillSub2(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_AssemblyBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_AssemblyBillSub>>(jsonString);
+ return list;
+ }
+
///棣栦欢妫�楠屽崟 瀛欒〃
///ClsQC_FirstPieceCheckBillSub_ValueGrid
public List<Model.ClsQC_FirstPieceCheckBillSub_ValueGrid> getObjectByJson_ClsQC_FirstPieceCheckBillSub_ValueGrid(string jsonString)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
index 6d31ac7..30fb257 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile10.pubxml.user
@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/AlibabaCloud.EndpointUtil.dll">
<publishTime>04/07/2020 16:33:48</publishTime>
@@ -93,7 +93,7 @@
<publishTime>05/09/2021 01:08:30</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <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>
@@ -117,7 +117,7 @@
<publishTime>09/18/2024 16:51:16</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>03/08/2023 15:09:56</publishTime>
@@ -252,7 +252,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -309,58 +309,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:01</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -369,7 +369,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -378,118 +378,118 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>07/12/2023 08:14:21</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="packages.config">
- <publishTime>08/16/2024 09:07:08</publishTime>
+ <publishTime>08/12/2024 15:14:33</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/06/2023 15:57:02</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>05/06/2024 13:47:57</publishTime>
</File>
<File Include="Web.config">
<publishTime>09/18/2024 16:51:59</publishTime>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml.user
index 4952f09..63c86fc 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile5.pubxml.user
@@ -4,8 +4,9 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2024-09-05T06:59:02.4637651Z;True|2024-09-05T14:52:04.4072884+08:00;True|2024-09-05T14:48:15.2042900+08:00;True|2024-09-05T14:45:32.2817484+08:00;False|2024-09-05T14:45:25.7565030+08:00;True|2024-09-05T14:40:51.8140875+08:00;False|2024-09-05T14:40:45.6052089+08:00;True|2024-09-05T09:23:04.7414662+08:00;True|2024-09-05T09:12:54.5377316+08:00;True|2024-09-05T09:04:03.3588953+08:00;False|2024-09-05T09:03:40.8987917+08:00;True|2024-09-05T08:11:18.7704659+08:00;True|2024-09-05T07:58:55.5963855+08:00;False|2024-09-05T07:57:19.7601173+08:00;True|2024-09-04T23:28:44.8318977+08:00;False|2024-09-04T23:28:01.8338334+08:00;True|2024-09-04T23:06:31.9122421+08:00;False|2024-09-04T23:05:48.8555641+08:00;True|2024-09-04T22:00:33.8177303+08:00;False|2024-09-04T22:00:05.0138975+08:00;True|2024-09-04T16:54:24.5480572+08:00;True|2024-09-04T16:47:34.9796627+08:00;True|2024-09-04T14:56:00.7832720+08:00;True|2024-09-04T11:02:05.0143079+08:00;False|2024-09-04T11:01:19.4966083+08:00;</History>
+ <History>True|2024-09-18T01:59:49.4732999Z||;True|2024-09-18T09:55:29.5670514+08:00||;True|2024-09-18T09:36:47.5337922+08:00||;True|2024-09-18T09:26:58.8753832+08:00||;False|2024-09-18T09:26:52.8360655+08:00||;True|2024-09-18T09:16:41.2697236+08:00||;True|2024-09-18T09:14:48.0665918+08:00||;True|2024-09-18T09:12:28.1309823+08:00||;True|2024-09-18T09:03:35.6415021+08:00||;True|2024-09-18T08:57:20.6887202+08:00||;True|2024-09-18T08:46:26.7501710+08:00||;True|2024-09-18T08:39:46.8385418+08:00||;False|2024-09-18T08:39:40.1539838+08:00||;True|2024-09-16T23:46:37.8243963+08:00||;True|2024-09-16T23:44:05.9219259+08:00||;True|2024-09-16T23:37:31.8738992+08:00||;True|2024-09-16T23:31:04.8735139+08:00||;True|2024-09-16T23:28:45.7341066+08:00||;True|2024-09-16T23:24:42.2972302+08:00||;False|2024-09-16T23:24:33.6235146+08:00||;True|2024-09-16T20:15:11.3521994+08:00||;True|2024-09-16T20:11:07.3997097+08:00||;True|2024-09-16T19:43:59.3755792+08:00||;True|2024-09-16T19:40:47.6540402+08:00||;True|2024-09-16T19:36:43.9422051+08:00||;True|2024-09-16T19:33:50.9737780+08:00||;True|2024-09-16T19:27:21.9355404+08:00||;False|2024-09-16T19:27:07.3189769+08:00||;True|2024-09-16T16:28:39.8922761+08:00||;True|2024-09-16T16:25:34.5196479+08:00||;True|2024-09-16T16:16:26.5717402+08:00||;True|2024-09-16T16:13:24.5037750+08:00||;True|2024-09-16T16:11:00.6826075+08:00||;True|2024-09-16T16:03:45.1007693+08:00||;True|2024-09-16T16:00:51.3931717+08:00||;True|2024-09-16T15:58:02.4574272+08:00||;True|2024-09-16T15:50:20.5714044+08:00||;True|2024-09-16T15:41:36.0473548+08:00||;True|2024-09-16T15:10:21.9307950+08:00||;True|2024-09-16T15:07:12.6672324+08:00||;True|2024-09-16T15:04:18.3797906+08:00||;True|2024-09-16T15:01:22.4141871+08:00||;True|2024-09-16T14:51:51.8688040+08:00||;True|2024-09-16T14:46:25.1459280+08:00||;True|2024-09-16T14:15:15.6716865+08:00||;True|2024-09-16T14:13:33.3427684+08:00||;True|2024-09-16T14:09:45.9506569+08:00||;True|2024-09-16T14:04:23.7651281+08:00||;True|2024-09-16T13:53:45.8403076+08:00||;True|2024-09-16T13:47:23.8874441+08:00||;True|2024-09-16T13:40:00.0114172+08:00||;False|2024-09-16T13:39:49.5487841+08:00||;True|2024-09-14T16:25:40.7803045+08:00||;True|2024-09-14T16:16:19.6227567+08:00||;False|2024-09-14T16:14:38.4415948+08:00||;False|2024-09-14T16:06:21.1344091+08:00||;False|2024-09-14T16:06:05.9492937+08:00||;False|2024-09-14T16:05:54.0646752+08:00||;False|2024-09-14T16:05:28.6903761+08:00||;True|2024-09-10T13:05:01.4971255+08:00||;False|2024-09-10T13:04:55.4597252+08:00||;True|2024-09-05T14:59:02.4637651+08:00||;True|2024-09-05T14:52:04.4072884+08:00||;True|2024-09-05T14:48:15.2042900+08:00||;True|2024-09-05T14:45:32.2817484+08:00||;False|2024-09-05T14:45:25.7565030+08:00||;True|2024-09-05T14:40:51.8140875+08:00||;False|2024-09-05T14:40:45.6052089+08:00||;True|2024-09-05T09:23:04.7414662+08:00||;True|2024-09-05T09:12:54.5377316+08:00||;True|2024-09-05T09:04:03.3588953+08:00||;False|2024-09-05T09:03:40.8987917+08:00||;True|2024-09-05T08:11:18.7704659+08:00||;True|2024-09-05T07:58:55.5963855+08:00||;False|2024-09-05T07:57:19.7601173+08:00||;True|2024-09-04T23:28:44.8318977+08:00||;False|2024-09-04T23:28:01.8338334+08:00||;True|2024-09-04T23:06:31.9122421+08:00||;False|2024-09-04T23:05:48.8555641+08:00||;True|2024-09-04T22:00:33.8177303+08:00||;False|2024-09-04T22:00:05.0138975+08:00||;True|2024-09-04T16:54:24.5480572+08:00||;True|2024-09-04T16:47:34.9796627+08:00||;True|2024-09-04T14:56:00.7832720+08:00||;True|2024-09-04T11:02:05.0143079+08:00||;False|2024-09-04T11:01:19.4966083+08:00||;</History>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\API</_PublishTargetUrl>
+ <LastFailureDetails />
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,28 +46,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>09/05/2024 14:58:23</publishTime>
+ <publishTime>09/18/2024 09:54:46</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>09/05/2024 14:58:23</publishTime>
+ <publishTime>09/18/2024 09:54:46</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>09/05/2024 14:58:22</publishTime>
+ <publishTime>09/18/2024 09:54:44</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>09/05/2024 14:58:22</publishTime>
+ <publishTime>09/18/2024 09:54:44</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>09/05/2024 14:58:19</publishTime>
+ <publishTime>09/18/2024 09:54:40</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>09/05/2024 14:58:19</publishTime>
+ <publishTime>09/18/2024 09:54:40</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +112,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>09/05/2024 14:58:19</publishTime>
+ <publishTime>09/18/2024 09:54:41</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>09/05/2024 14:58:19</publishTime>
+ <publishTime>09/18/2024 09:54:41</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/06/2023 15:57:04</publishTime>
@@ -147,34 +148,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>09/05/2024 14:58:17</publishTime>
+ <publishTime>09/18/2024 09:54:38</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>09/05/2024 14:58:17</publishTime>
+ <publishTime>09/18/2024 09:54:38</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>09/05/2024 14:58:18</publishTime>
+ <publishTime>09/18/2024 09:54:40</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>09/05/2024 14:58:18</publishTime>
+ <publishTime>09/18/2024 09:54:40</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>09/05/2024 14:58:18</publishTime>
+ <publishTime>09/18/2024 09:54:38</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>09/05/2024 14:58:18</publishTime>
+ <publishTime>09/18/2024 09:54:38</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>09/05/2024 14:58:16</publishTime>
+ <publishTime>09/18/2024 09:54:36</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>09/05/2024 14:58:16</publishTime>
+ <publishTime>09/18/2024 09:54:36</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,22 +286,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>09/05/2024 14:58:20</publishTime>
+ <publishTime>09/18/2024 09:54:39</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>09/05/2024 14:58:20</publishTime>
+ <publishTime>09/18/2024 09:54:39</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>09/05/2024 14:58:45</publishTime>
+ <publishTime>09/18/2024 09:55:12</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>09/05/2024 14:58:45</publishTime>
+ <publishTime>09/18/2024 09:55:12</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>09/05/2024 14:58:50</publishTime>
+ <publishTime>09/18/2024 09:55:16</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -387,7 +388,7 @@
<publishTime>04/06/2023 15:57:04</publishTime>
</File>
<File Include="packages.config">
- <publishTime>08/15/2024 16:27:01</publishTime>
+ <publishTime>09/14/2024 10:58:19</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
<publishTime>04/06/2023 15:57:04</publishTime>
@@ -495,7 +496,7 @@
<publishTime>05/06/2024 13:47:58</publishTime>
</File>
<File Include="Web.config">
- <publishTime>09/05/2024 14:59:01</publishTime>
+ <publishTime>09/18/2024 09:55:28</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index c75ef2a..af6ed9a 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>False|2024-09-11T13:06:15.4423786Z;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
+ <History>True|2024-09-12T12:40:58.7161451Z;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
<_PublishTargetUrl>G:\issWeb\缃戠珯鍙戝竷\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>09/11/2024 21:06:39</publishTime>
+ <publishTime>09/13/2024 15:10:57</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>09/11/2024 21:06:39</publishTime>
+ <publishTime>09/13/2024 15:10:57</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>09/11/2024 21:06:35</publishTime>
+ <publishTime>09/13/2024 15:10:55</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>09/11/2024 21:06:35</publishTime>
+ <publishTime>09/13/2024 15:10:55</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>09/11/2024 21:06:25</publishTime>
+ <publishTime>09/13/2024 15:10:49</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>09/11/2024 21:06:25</publishTime>
+ <publishTime>09/13/2024 15:10:49</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>09/11/2024 21:06:28</publishTime>
+ <publishTime>09/13/2024 15:10:50</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>09/11/2024 21:06:28</publishTime>
+ <publishTime>09/13/2024 15:10:50</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>09/11/2024 21:06:23</publishTime>
+ <publishTime>09/13/2024 15:10:47</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>09/11/2024 21:06:23</publishTime>
+ <publishTime>09/13/2024 15:10:47</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>09/11/2024 21:06:24</publishTime>
+ <publishTime>09/13/2024 15:10:48</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>09/11/2024 21:06:24</publishTime>
+ <publishTime>09/13/2024 15:10:48</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>09/11/2024 21:06:24</publishTime>
+ <publishTime>09/13/2024 15:10:48</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>09/11/2024 21:06:24</publishTime>
+ <publishTime>09/13/2024 15:10:48</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>09/11/2024 21:04:14</publishTime>
+ <publishTime>09/13/2024 15:08:19</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>09/11/2024 21:04:14</publishTime>
+ <publishTime>09/13/2024 15:08:19</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>09/11/2024 21:04:23</publishTime>
+ <publishTime>09/11/2024 21:15:43</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>09/11/2024 21:04:23</publishTime>
+ <publishTime>09/11/2024 21:15:51</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>09/11/2024 21:07:20</publishTime>
+ <publishTime>09/13/2024 15:11:26</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>09/11/2024 21:07:20</publishTime>
+ <publishTime>09/13/2024 15:11:26</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
@@ -495,7 +495,7 @@
<publishTime>04/29/2024 08:30:03</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/29/2024 08:06:26</publishTime>
+ <publishTime>09/12/2024 09:12:52</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 152209b..1a295c0 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -37,17 +37,11 @@
<!--<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://192.168.110.57:81/WEBS/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"/>-->
- <!--鏂帿灏�-->
- <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx" />-->
- <!--涔斾竴-->
- <add key="sUrl" value="http://10.10.1.2:8090/WEBS-WMS/WebService1.asmx" />
-
+ <!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--鏂帿灏�-->
+
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index c3a8ce0..cbcccdc 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -132,6 +132,7 @@
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
</Reference>
+ <Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Data.DataSetExtensions">
<Private>True</Private>
</Reference>
@@ -436,10 +437,13 @@
<Compile Include="Controllers\CJGL\Cj_SendGoodsBillController.cs" />
<Compile Include="Controllers\CJGL\Mes_OrderProcFlowAllReportController.cs" />
<Compile Include="Controllers\CJGL\Gy_MaterPreventErrMouldBillController.cs" />
+ <Compile Include="Controllers\CJGL\Sc_KeyElementBindingController.cs" />
<Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParamController.cs" />
<Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParam_TempController.cs" />
<Compile Include="Controllers\SCGL\Sc_ProductionReportsController.cs" />
- <Compile Include="Controllers\CJGL\Cj_CenterCheckBillController.cs" />
+ <Compile Include="Controllers\ZLGL\BaseSet\Gy_InspectBasisController.cs" />
+ <Compile Include="Controllers\ZLGL\BaseSet\Gy_InspectMethodController.cs" />
+ <Compile Include="Controllers\ZLGL\BaseSet\Gy_QualityController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\Kf_MoveStockBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBillController.cs" />
<Compile Include="Controllers\CJGL\Qc_PreventErrMouldCheckBillController.cs" />
diff --git a/WebAPI/packages.config b/WebAPI/packages.config
index 7552f7b..9e9c836 100644
--- a/WebAPI/packages.config
+++ b/WebAPI/packages.config
@@ -46,6 +46,7 @@
<package id="System.Buffers" version="4.4.0" targetFramework="net45" />
<package id="System.IdentityModel.Tokens.Jwt" version="4.0.0" targetFramework="net45" />
<package id="System.Memory" version="4.5.3" targetFramework="net45" />
+ <package id="System.Runtime" version="4.3.1" targetFramework="net45" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net45" />
<package id="Tea" version="1.1.3" targetFramework="net45" />
<package id="WebActivatorEx" version="2.0.6" targetFramework="net45" />
diff --git a/WorkM/bin/Release/BLL.dll b/WorkM/bin/Release/BLL.dll
index b13f1dc..547dd7a 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 4246417..8f2040f 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 faadee0..b6ba414 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 6ed5dcb..5cd5bf7 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 ed584d7..f2cdd0d 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 d45a2fd..a669f85 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 e81ce45..796b802 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 8cdd9d2..7cdb005 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 98682bd..75a651a 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 141946c..b645562 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 b4f7f78..18bc956 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 febc335..da0c974 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 10328d8..7303155 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 9d3bd71..466673a 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 40f0392..c5ec251 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 82ca4c4..351238d 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 f3f8ceb..e588ef3 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 1fafc1d..fef4835 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 6693de6..98d4a8d 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 6d8d81e..b23d27f 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 f399989..90d22f2 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 04102ba..5cbab97 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/DesignTimeResolveAssemblyReferencesInput.cache b/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
new file mode 100644
index 0000000..d7d8856
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
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 b3a6f35..9b560a3 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 33dbb7c..cc295df 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,27 +1,6 @@
-<<<<<<< HEAD
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.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
-=======
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
->>>>>>> 5c89a888203ea10438854942e3fba9c6c24b480a
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache
deleted file mode 100644
index 6bd410c..0000000
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 6693de6..98d4a8d 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 6d8d81e..b23d27f 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.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
deleted file mode 100644
index d6e21aa..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
+++ /dev/null
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..8d92211
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+95b844bca438eeedc97b9071d4f77d77549b3f29e8c2ab391f1243fa58b84136
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
deleted file mode 100644
index 5354f72..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
-D:\vs\椤圭洰浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
index f399989..90d22f2 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 04102ba..5cbab97 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1