From 30a00c8bc8b9412b8088bc4f4c1519ed767f09d2 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 29 四月 2025 16:54:24 +0800
Subject: [PATCH] 2025/4/29 提交
---
NETERPNoWin/bin/Debug/DBUtility.dll | 0
PayM/obj/Debug/PayM.Pay_OutApplyBillList.resources | 0
PayM/obj/Debug/PayM.Pay_OverApplyBill.resources | 0
NETERPNoWin/bin/Debug/NETERPNoWin.pdb | 0
PayM/obj/Debug/PayM.Pay_OutApplyBill.resources | 0
WebAPI/WebAPI.csproj.user | 8
PayM/obj/Debug/PayM.Pay_PayMentYearReport.resources | 0
WebAPI/Controllers/SBGL/Sb_EquipPatrolCheckBillController.cs | 1196 +++++++++++++++
Model/bin/Release/Pub_Control.pdb | 0
NETERPNoWin/bin/Debug/DBUtility.pdb | 0
PayM/obj/Debug/PayM.Pay_ErrWorkTimesSendBillList.resources | 0
Model/obj/Release/Model.pdb | 0
PayM/bin/Debug/Pub_Class.dll | 0
DAL/基础资料/公用基础资料/ClsGy_PatrolCheckItemMethod_Ctl.cs | 98 +
Model/bin/Release/Pub_Control.dll | 0
PayM/obj/Debug/PayM.Pay_PayMentDeptYearReport.resources | 0
Pub_Control/bin/Release/Pub_Class.pdb | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.CoreCompileInputs.cache | 1
PayM/obj/Debug/PayM.HR_WorkStoryBillList.resources | 0
PayM/obj/Debug/PayM.Pay_OtherBalBillList.resources | 0
PayM/obj/Debug/PayM.dll | 0
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 48
Pub_Control/bin/Release/Pub_Class.dll | 0
WebAPI/Models/Sc_WorkBillSortBillMain.cs | 1
PayM/obj/Debug/AxInterop.gregn6Lib.dll | 0
PayM/obj/Debug/PayM.HR_InsuranceBookBillList.resources | 0
Pub_Control/bin/Release/Pub_Control.dll | 0
BLL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/SQLHelper.dll | 0
PayM/obj/Debug/PayM.HR_PaperPhotoBill.resources | 0
PayM/obj/Debug/PayM.HR_WorkInjuryBillList.resources | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
PayM/obj/Debug/PayM.pdb | 0
NETERPNoWin/bin/Debug/BLL.dll | 0
PayM/obj/Debug/PayM.HR_WorkSkillBillList.resources | 0
PayM/obj/Debug/PayM.Pay_OverApplyBillList.resources | 0
DAL/bin/Release/SQLHelper.pdb | 0
PayM/obj/Debug/PayM.csproj.ResolveComReference.cache | 0
SQLHelper/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.pdb | 0
BLL/bin/Release/DBUtility.dll | 0
NETERPNoWin/bin/Debug/OAM.pdb | 0
Pub_Control/bin/Release/Pub_Control.pdb | 0
NETERPNoWin/bin/Debug/OAM.dll | 0
PayM/obj/Debug/PayM.HR_EmpDimissionBill.resources | 0
DBUtility/obj/Release/DBUtility.dll | 0
PayM/bin/Debug/Pub_Class.pdb | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
Model/obj/Release/Model.dll | 0
PayM/obj/Debug/PayM.Pay_MonthSubsidyYearReport.resources | 0
PayM/obj/Debug/PayM.Pay_OtherBalBill.resources | 0
BLL/bin/Release/Pub_Class.dll | 0
PayM/obj/Debug/PayM.Pay_ErrWorkTimesRequestBill.resources | 0
PayM/obj/Debug/PayM.Pay_SingleBalBill.resources | 0
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache | 1
Model/生产管理/设备管理/ClsSb_EquipPatrolCheckBillMain.cs | 29
PayM/obj/Debug/PayM.HR_WorkSkillBill.resources | 0
BLL/bin/Release/Pub_Class.pdb | 0
NETERPNoWin/bin/Debug/BLL.pdb | 0
PayM/obj/Debug/PayM.HR_LearnHistoryBill.resources | 0
NETERPNoWin/bin/Debug/Interop.gregn6Lib.dll | 0
NETERPNoWin/obj/Debug/NETERPNoWin.csproj.GenerateResource.Cache | 0
PayM/obj/Debug/PayM.HR_FamilyMemberBillList.resources | 0
NETERPNoWin/obj/Debug/Interop.gregn6Lib.dll | 0
BLL/bin/Release/DAL.dll | 0
BLL/bin/Release/SQLHelper.pdb | 0
PayM/obj/Debug/PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resources | 0
DBUtility/bin/Release/Pub_Control.pdb | 0
SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0
BLL/bin/Release/SQLHelper.dll | 0
DAL/bin/Release/Model.dll | 0
DAL/生产管理/设备管理/ClsSb_EquipPatrolCheckBill.cs | 348 ++++
NETERPNoWin/bin/Debug/DAL.pdb | 0
PayM/bin/Debug/DBUtility.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0
DBUtility/bin/Release/Pub_Control.dll | 0
PayM/obj/Debug/PayM.Pay_MonthSubsidyEntryBillReportMX.resources | 0
PayM/obj/Debug/PayM.HR_PaperPhotoBillList.resources | 0
PayM/obj/Debug/PayM.Pay_SubsidyChangeBillList.resources | 0
BLL/bin/Release/DAL.pdb | 0
PayM/obj/Debug/PayM.HR_FamilyMemberBill.resources | 0
SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0
DAL/bin/Release/Model.pdb | 0
NETERPNoWin/bin/Debug/DAL.dll | 0
PayM/obj/Debug/PayM.Pay_ProdWorkQtySumReport.resources | 0
Model/基础资料/基础资料/ClsGy_DotCheckItemClass_Model.cs | 1
NETERPNoWin/bin/Debug/WorkM.pdb | 0
DBUtility/bin/Release/DBUtility.pdb | 0
PayM/obj/Debug/PayM.Pay_WorkTimesBillList.resources | 0
DBUtility/bin/Release/DBUtility.dll | 0
WebAPI/Controllers/WebAPIController.cs | 45
PayM/obj/Debug/PayM.Pay_WorkTimesCardBillList.resources | 0
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
NETERPNoWin/bin/Debug/WorkM.dll | 0
PayM/obj/Debug/PayM.HR_RewardsPunishBill.resources | 0
PayM/obj/Debug/PayM.Pay_SingleBalBill_KS.resources | 0
SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0
DAL/DAL.csproj | 3
PayM/bin/Debug/DBUtility.pdb | 0
PayM/obj/Debug/PayM.Pay_PayMentBillList.resources | 0
WebAPI/Models/ClsGy_PatrolCheck.cs | 27
PayM/obj/Debug/PayM.Pay_MonthWriteBillReportMX.resources | 0
NETERPNoWin/bin/Debug/WarM.dll | 0
PayM/bin/Debug/BLL.pdb | 0
SQLHelper/bin/Release/Pub_Class.pdb | 0
Model/生产管理/设备管理/ClsSb_EquipPatrolCheckBillSub.cs | 34
PayM/obj/Debug/PayM.HR_EmpChangeBill.resources | 0
PayM/obj/Debug/PayM.csproj.GenerateResource.Cache | 0
SQLHelper/bin/Release/Pub_Class.dll | 0
DAL/bin/Release/Pub_Class.pdb | 0
PayM/obj/Debug/PayM.Pay_GroupBalBillList.resources | 0
PayM/obj/Debug/PayM.Pay_PayMentDayBill.resources | 0
PayM/bin/Debug/BLL.dll | 0
PayM/obj/Debug/PayM.Pay_MonthWriteBillReport.resources | 0
PayM/obj/Debug/PayM.HR_InsuranceBookBill.resources | 0
WebAPI/Controllers/基础资料/基础资料/Gy_PatrolCheckBillController.cs | 1224 +++++++++++++++
NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache | 0
PayM/obj/Debug/PayM.Pay_CarOutApplyBill.resources | 0
PayM/obj/Debug/OAM.HR_EmpEngageRequestBill.resources | 0
DAL/bin/Release/Pub_Class.dll | 0
NETERPNoWin/obj/Debug/NETERPNoWin.pdb | 0
PayM/obj/Debug/PayM.HR_WorkInjuryBill.resources | 0
NETERPNoWin/obj/Debug/NETERPNoWin.Frm_Show.resources | 0
NETERPNoWin/bin/Debug/WarM.pdb | 0
PayM/bin/Debug/Interop.gregn6Lib.dll | 0
NETERPNoWin/bin/Debug/PlanM.pdb | 0
DBUtility/bin/Release/Pub_Class.dll | 0
PayM/obj/Debug/PayM.HR_RewardsPunishBillList.resources | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache | 0
PayM/obj/Debug/PayM.Pay_SingleBalBill_Enter.resources | 0
PayM/obj/Debug/PayM.Pay_PayMentDayBillList.resources | 0
Model/bin/Release/Pub_Class.pdb | 0
PayM/bin/Debug/DAL.pdb | 0
PayM/obj/Debug/PayM.HR_ContractBookBill.resources | 0
PayM/obj/Debug/PayM.Pay_SubsidyChangeBill.resources | 0
PayM/obj/Debug/Interop.gregn6Lib.dll | 0
NETERPNoWin/obj/Debug/NETERPNoWin.MESMain.resources | 0
PayM/obj/Debug/PayM.Pay_ProcPriceRequestBill.resources | 0
PayM/obj/Debug/PayM.Pay_ProdWorkQtyEntryReport.resources | 0
NETERPNoWin/bin/Debug/Pub_Control.dll | 0
BLL/bin/Release/BLL.pdb | 0
NETERPNoWin/bin/Debug/Pub_Control.pdb | 0
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs | 2
WebAPI/ListModels.cs | 24
PayM/obj/Debug/PayM.HR_EmpChangeBillList.resources | 0
PayM/obj/Debug/PayM.Pay_OuterScrap.resources | 0
PayM/obj/Debug/PayM.Pay_NoWorkTimesReport.resources | 0
WebAPI/WebAPI.csproj | 5
BLL/bin/Release/Pub_Control.pdb | 0
PayM/bin/Debug/Pub_Control.pdb | 0
Model/bin/Release/DBUtility.pdb | 0
NETERPNoWin/bin/Debug/SQLHelper.dll | 0
PayM/obj/Debug/PayM.Pay_WorkTimesBill.resources | 0
Model/Model.csproj | 4
BLL/bin/Release/Pub_Control.dll | 0
NETERPNoWin/bin/Debug/SQLHelper.pdb | 0
PayM/obj/Debug/PayM.Pay_SingleBalBillList.resources | 0
PayM/obj/Debug/PayM.Pay_MonthExpenseEntryBillList.resources | 0
PayM/bin/Debug/Pub_Control.dll | 0
PayM/bin/Debug/AxInterop.gregn6Lib.dll | 0
Model/bin/Release/DBUtility.dll | 0
BLL/bin/Release/BLL.dll | 0
PayM/obj/Debug/PayM.Pay_GroupBalBill.resources | 0
PayM/obj/Debug/PayM.HR_LearnHistoryBillList.resources | 0
PayM/bin/Debug/Model.dll | 0
PayM/obj/Debug/BaseSet.Gy_DataInTmp_DuSubsidyItem.resources | 0
DBUtility/bin/Release/SQLHelper.dll | 0
NETERPNoWin/bin/Debug/NETERPNoWin.exe | 0
PayM/bin/Debug/Model.pdb | 0
DBUtility/bin/Release/SQLHelper.pdb | 0
Model/bin/Release/Pub_Class.dll | 0
PayM/bin/Debug/DAL.dll | 0
NETERPNoWin/bin/Debug/Kanban.dll | 0
PayM/obj/Debug/PayM.HR_EmpDimissionBillList.resources | 0
WebAPI/Controllers/基础资料/基础资料/Gy_PatrolCheckItemClassController.cs | 653 ++++++++
NETERPNoWin/bin/Debug/Kanban.pdb | 0
PayM/obj/Debug/PayM.HR_ContractBookBillList.resources | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache | 0
PayM/obj/Debug/OAM.HR_EmpEngageRequestBillList.resources | 0
PayM/obj/Debug/PayM.Pay_YearToCashBillReport.resources | 0
PayM/obj/Debug/PayM.Pay_OtherMoney_Dlg.resources | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 6
DAL/bin/Release/DBUtility.dll | 0
NETERPNoWin/bin/Debug/BaseSet.dll | 0
PayM/obj/Debug/PayM.Pay_InnerScrap.resources | 0
DAL/bin/Release/Pub_Control.dll | 0
NETERPNoWin/bin/Debug/Model.pdb | 0
DAL/bin/Release/DBUtility.pdb | 0
PayM/obj/Debug/PayM.Pay_DuSubsidyItemBillList.resources | 0
PayM/obj/Debug/CostM.Pay_AccPayMentDayBillList.resources | 0
PayM/obj/Debug/PayM.KQ_sourceReport.resources | 0
WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user | 40
Model/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/Pub_Control.pdb | 0
NETERPNoWin/bin/Debug/Model.dll | 0
DAL/bin/Release/DAL.pdb | 0
SQLHelper/obj/Release/SQLHelper.dll | 0
Model/ClsGy_PatrolCheckItemMethod_Model.cs | 13
BLL/bin/Release/Model.dll | 0
NETERPNoWin/bin/Debug/BaseSet.pdb | 0
PayM/obj/Debug/PayM.Pay_ErrWorkTimesSendBill.resources | 0
WebAPI/Dapper/SqlHelper.cs | 2
BLL/bin/Release/Model.pdb | 0
DAL/bin/Release/DAL.dll | 0
NETERPNoWin/obj/Debug/NETERPNoWin.MDIMain.resources | 0
NETERPNoWin/obj/Debug/NETERPNoWin.exe | 0
PayM/obj/Debug/PayM.Pay_EmpPayMentSumReport.resources | 0
PayM/obj/Debug/CostM.Pay_PayMentBillAutoAddnew.resources | 0
PayM/obj/Debug/PayM.Pay_PayMentBill.resources | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
PayM/obj/Debug/PayM.Pay_EmpWorkQtyEntryReport.resources | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
PayM/bin/Debug/PayM.dll | 0
PayM/obj/Debug/PayM.Pay_CarOutApplyBillList.resources | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
PayM/obj/Debug/PayM.HR_WorkStoryBill.resources | 0
Model/基础资料/基础资料/ClsGy_PatrolCheckItemClass_Model.cs | 11
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 6
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
PayM/obj/Debug/PayM.Pay_MonthWriteBillReportMX2.resources | 0
PayM/bin/Debug/PayM.pdb | 0
PayM/obj/Debug/PayM.Pay_ErrWorkTimesRequestBillList.resources | 0
PayM/bin/Debug/SQLHelper.dll | 0
Pub_Class/bin/Release/Pub_Class.pdb | 0
DAL/基础资料/公用基础资料/ClsGy_PatrolCheckItemClass_Ctl.cs | 97 +
PayM/bin/Debug/SQLHelper.pdb | 0
PayM/obj/Debug/PayM.Pay_ProcPriceRequestBillList.resources | 0
PayM/obj/Debug/PayM.Pay_MonthSubsidyEntryBillReport.resources | 0
PayM/obj/Debug/PayM.Pay_PayMentSendList.resources | 0
Pub_Class/bin/Release/Pub_Class.dll | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
PayM/obj/Debug/PayM.Pay_MonthExpenseEntryBillReport.resources | 0
WebAPI/Controllers/基础资料/基础资料/Gy_PatrolCheckItemMethodController.cs | 654 ++++++++
PayM/obj/Debug/PayM.Err_MonthExpenseEntryBill.resources | 0
PayM/obj/Debug/PayM.Pay_PayMentDeptSendList.resources | 0
Model/bin/Release/Model.pdb | 0
PayM/obj/Debug/PayM.Pay_WorkTimesList.resources | 0
NETERPNoWin/bin/Debug/Pub_Class.dll | 0
Model/bin/Release/Model.dll | 0
PayM/obj/Debug/PayM.Pay_DuSubsidyItemBill.resources | 0
DBUtility/bin/Release/Pub_Class.pdb | 0
PayM/obj/Debug/PayM.Pay_PayMentPrintReport.resources | 0
Model/bin/Release/SQLHelper.dll | 0
NETERPNoWin/bin/Debug/PlanM.dll | 0
NETERPNoWin/bin/Debug/Pub_Class.pdb | 0
246 files changed, 4,555 insertions(+), 26 deletions(-)
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index e8e5a12..aa1931f 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 56aec37..58360c7 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 abb639e..07d197b 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 768f238..95963f1 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 f2a9204..5f51ca0 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 5d74b7f..fea8b61 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 3198e57..c0df88f 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 c52d4db..e15aba4 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 88e8857..39742c7 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 3aa0cf6..75a64a4 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 d6a08ba..89d99bb 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 cabb1cf..962fcbb 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 32d8b85..e497353 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 cfbbb50..812977d 100644
--- a/BLL/bin/Release/SQLHelper.pdb
+++ b/BLL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj
index 7a7f1c5..d6b4f6b 100644
--- a/DAL/DAL.csproj
+++ b/DAL/DAL.csproj
@@ -80,6 +80,8 @@
<ItemGroup>
<Compile Include="APS\ClsSc_WorkBillMonthSortBill.cs" />
<Compile Include="APS\ClsSc_ICMOChangeBill.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_PatrolCheckItemMethod_Ctl.cs" />
+ <Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_PatrolCheckItemClass_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_MaintainClass_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RepairClass_Ctl.cs" />
<Compile Include="鍩虹璧勬枡\鍏敤鍩虹璧勬枡\ClsGy_RepairCheckClass_Ctl.cs" />
@@ -100,6 +102,7 @@
<Compile Include="婧愬崟\InterFace婧愬崟\Cls_S_IF_ICMOReportBillList_CusBarCodeBill.cs" />
<Compile Include="鐢熶骇绠＄悊\鎺掍骇瑙ｉ攣鐢宠鍗昞ClsJIT_UnLockRequestBill.cs" />
<Compile Include="鐢熶骇绠＄悊\鎺掍骇閿佸畾鐢宠鍗昞ClsJIT_LockRequestBill.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipPatrolCheckBill.cs" />
<Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSet.cs" />
<Compile Include="璁″垝绠＄悊\ClsGy_SourceMouldBillMain.cs" />
<Compile Include="璐ㄦ绠＄悊\ClsQC_EnvironmentTestDotCheckBillMain.cs" />
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index abb639e..07d197b 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 768f238..95963f1 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 f2a9204..5f51ca0 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 5d74b7f..fea8b61 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 3198e57..c0df88f 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 c52d4db..e15aba4 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 88e8857..39742c7 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 3aa0cf6..75a64a4 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 d6a08ba..89d99bb 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 cabb1cf..962fcbb 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 32d8b85..e497353 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 cfbbb50..812977d 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_PatrolCheckItemClass_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_PatrolCheckItemClass_Ctl.cs"
new file mode 100644
index 0000000..81cf3a1
--- /dev/null
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_PatrolCheckItemClass_Ctl.cs"
@@ -0,0 +1,97 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_PatrolCheckItemClass_Ctl:DBUtility.ClsGy_Base_Ctl
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ public string HOldNumber;
+ public Model.ClsGy_PatrolCheckItemClass_Model oModel = new Model.ClsGy_PatrolCheckItemClass_Model();
+ //鏂板
+ public override bool AddNew()
+ {
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Insert into Gy_PatrolCheckItemClass (" +
+ "HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark" +
+ ",HMakeTime,HMakeEmp,HCREATEORGID,HUSEORGID) " +
+ " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
+ ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "',getdate()" + ",'" + oModel.HMakeEmp + "'," + oModel.HCREATEORGID + "," + oModel.HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼
+ public override bool ModifyByID(Int64 sItemID)
+ {
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Update " + MvarItemKey + " set " +
+ " HNumber='" + oModel.HNumber + "'" +
+ ",HName='" + oModel.HName + "'" +
+ ",HShortNumber='" + oModel.HShortNumber + "'" +
+ ",HParentID=" + oModel.HParentID.ToString() +
+ ",HLevel=" + oModel.HLevel.ToString() +
+ ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+ ",HRemark= '" + oModel.HRemark + "'" +
+ ",HHelpCode='" + oModel.HHelpCode + "'" +
+ " Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏍规嵁浠ｇ爜鍒ゆ柇淇℃伅
+ public override bool HavParentCode(string sCode, Int64 sItemID)
+ {
+ DataSet DS;
+ try
+ {
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return false;
+ else
+ {
+ oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //鏋勯�犲嚱鏁�
+ public ClsGy_PatrolCheckItemClass_Ctl()
+ {
+ MvarItemKey = "Gy_PatrolCheckItemClass";
+ MvarReportTitle = "宸℃椤圭洰鍒嗙被";
+ oModel = new Model.ClsGy_PatrolCheckItemClass_Model();
+ }
+ }
+}
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_PatrolCheckItemMethod_Ctl.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_PatrolCheckItemMethod_Ctl.cs"
new file mode 100644
index 0000000..c644052
--- /dev/null
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_PatrolCheckItemMethod_Ctl.cs"
@@ -0,0 +1,98 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsGy_PatrolCheckItemMethod_Ctl:DBUtility.ClsGy_Base_Ctl
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ //鍘熶唬鐮� 鐢ㄤ簬 鏇挎崲瀛愰」鐩�
+ public string HOldNumber;
+ public Model.ClsGy_PatrolCheckItemMethod_Model oModel = new Model.ClsGy_PatrolCheckItemMethod_Model();
+ //鏂板
+ public override bool AddNew()
+ {
+
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Insert into Gy_PatrolCheckItemMethod (" +
+ "HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark" +
+ ",HMakeTime,HMakeEmp,HCREATEORGID,HUSEORGID) " +
+ " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
+ ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "','" + oModel.HMakeTime + "','" + oModel.HMakeEmp + "'," + oModel.HCREATEORGID + "," + oModel.HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
+ //淇敼
+ public override bool ModifyByID(Int64 sItemID)
+ {
+ try
+ {
+ oCn.BeginTran();
+ oCn.RunProc("Update " + MvarItemKey + " set " +
+ " HNumber='" + oModel.HNumber + "'" +
+ ",HName='" + oModel.HName + "'" +
+ ",HShortNumber='" + oModel.HShortNumber + "'" +
+ ",HParentID=" + oModel.HParentID.ToString() +
+ ",HLevel=" + oModel.HLevel.ToString() +
+ ",HEndflag=" + Convert.ToString(oModel.HEndFlag ? 1 : 0) +
+ ",HStopflag=" + Convert.ToString(oModel.HStopflag ? 1 : 0) +
+ ",HRemark= '" + oModel.HRemark + "'" +
+ ",HHelpCode='" + oModel.HHelpCode + "'" +
+ " Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏍规嵁浠ｇ爜鍒ゆ柇淇℃伅
+ public override bool HavParentCode(string sCode, Int64 sItemID)
+ {
+ DataSet DS;
+ try
+ {
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HStopflag=0 and HNumber='" + sCode + "' and HItemID<>" + sItemID, MvarItemKey, ref Pub_Class.ClsPub.sExeReturnInfo);
+ if (DS.Tables[0].Rows.Count == 0)
+ return false;
+ else
+ {
+ oModel.HItemID = Convert.ToInt64(DS.Tables[0].Rows[0]["HItemID"]);
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+ //鏋勯�犲嚱鏁�
+ public ClsGy_PatrolCheckItemMethod_Ctl()
+ {
+ MvarItemKey = "Gy_PatrolCheckItemMethod";
+ MvarReportTitle = "宸℃鏂规硶";
+ oModel = new Model.ClsGy_PatrolCheckItemMethod_Model();
+ }
+ }
+}
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipPatrolCheckBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipPatrolCheckBill.cs"
new file mode 100644
index 0000000..50b54a3
--- /dev/null
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipPatrolCheckBill.cs"
@@ -0,0 +1,348 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+using System.Data;
+
+namespace DAL
+{
+ public class ClsSb_EquipPatrolCheckBill:DBUtility.ClsXt_BaseBill
+ {
+ public Model.ClsSb_EquipPatrolCheckBillMain omodel = new Model.ClsSb_EquipPatrolCheckBillMain();
+ public List<Model.ClsSb_EquipPatrolCheckBillSub> DetailColl = new List<Model.ClsSb_EquipPatrolCheckBillSub>();
+
+ public ClsSb_EquipPatrolCheckBill()
+ {
+ base.MvarItemKeySub = "Sb_EquipPatrolCheckBillSub";
+ base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub3 = "";
+ base.MvarItemKeySub4 = "";
+ base.MvarItemKey="Sb_EquipPatrolCheckBillMain";
+ base.MvarReportTitle="璁惧宸℃璁板綍";
+ base.BillType = "3903";
+ base.HBillSubType = "3903";
+
+ }
+
+ #region 鍥哄畾浠ｇ爜
+
+ ~ClsSb_EquipPatrolCheckBill()
+ {
+ DetailColl = null;
+ }
+
+ #endregion 鑷畾涔夋柟娉�
+ //淇敼鍗曟嵁
+ public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Sb_EquipPatrolCheckBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Sb_EquipPatrolCheckBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+ oCn.BeginTran();
+ //鏇存柊涓昏〃
+ oCn.RunProc("UpDate Sb_EquipPatrolCheckBillMain set " +
+ " HBillNo='" + omodel.HBillNo + "'" + //鍥哄畾璧嬪��===============
+ //",HDate='" + omodel.HDate + "'" +
+ ",HYear='" + omodel.HYear.ToString() + "'" +
+ ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
+ ",HRemark='" + omodel.HRemark + "'" +
+ ",HUpDater='" + omodel.HMaker + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HEquipID=" + omodel.HEquipID.ToString() +
+ ",HBeginDate='" + omodel.HBeginDate + "'" +
+ ",HEndDate='" + omodel.HEndDate+"'" +
+ ",HPlanNo='" + omodel.HPlanNo + "'" +
+ ",HExplanation='" + omodel.HExplanation+"'" +
+ ",HInnerBillNo='" + omodel.HInnerBillNo+"'" +
+ ",HEquipPatrolCheckRuleInterID="+omodel.HEquipPatrolCheckRuleInterID+
+ ",HLastResult='" + omodel.HLastResult + "'" +
+ ",HErrNote='" + omodel.HErrNote + "'" +
+ ",HBigSafeNote='" + omodel.HBigSafeNote + "'" +
+ ",HShiftsID=" + omodel.HShiftsID +
+ ",HPatrolCheckNote='" + omodel.HPatrolCheckNote + "'" +
+ " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎鍏宠仈
+ DeleteRelation(ref sReturn, lngBillKey);
+ //鍒犻櫎瀛愯〃
+ DeleteBillSub(lngBillKey);
+ //鎻掑叆瀛愯〃
+ omodel.HInterID = lngBillKey;
+ foreach (Model.ClsSb_EquipPatrolCheckBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sb_EquipPatrolCheckBillSub " +
+ " (HInterID,HEntryID," +
+ "HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
+ "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
+ "HPatrolCheckItemID,HPatrolCheckItem,HPatrolCheckPart,HClaim," +
+ "HManagerID,HManagerNumber,HPatrolCheckItemClassID,HPatrolCheckItemMethodID,HPatrolCheckResult" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
+ ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + 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.HPatrolCheckItemID + "','" + oSub.HPatrolCheckItem + "','" + oSub.HPatrolCheckPart + "','" + oSub.HClaim +
+ "'," + oSub.HManagerID.ToString() + ",'" + oSub.HManagerNumber + "'," + oSub.HPatrolCheckItemClassID + "," + oSub.HPatrolCheckItemMethodID + ",'" + oSub.HPatrolCheckResult + "'" +
+ ") ");
+ }
+ //
+ //foreach (Model.ClsSb_EquipPatrolCheckBillSub oSub in DetailColl)
+ //{
+ // Ds = oCn.RunProcReturn("exec h_p_Sb_EquipPatrolCheckBill_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;
+ // }
+ //}
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sb_EquipPatrolCheckBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Sb_EquipPatrolCheckBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+
+ sReturn = "淇敼鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏂板鍗曟嵁
+ public override bool AddBill(ref string sReturn)
+ {
+ try
+ {
+ //寰楀埌mainid
+ omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ string HBillNote = "";
+ DataSet ds = oCn.RunProcReturn("Exec h_p_Sb_EquipPatrolCheckBill_BeforeSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "','" + HBillNote + "',1 ", "h_p_Sb_EquipPatrolCheckBill_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ sReturn = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+ //=========================================================
+
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCn.BeginTran();
+ //涓昏〃
+ oCn.RunProc("Insert Into Sb_EquipPatrolCheckBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HRemark,HEquipID" +
+ ",HBeginDate,HEndDate,HPlanNo,HExplanation,HInnerBillNo,HEquipPatrolCheckRuleInterID" +
+ ",HLastResult,HErrNote,HBigSafeNote,HShiftsID,HPatrolCheckNote" +
+ ") "+
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()" +
+ "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() +
+ ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," +omodel.HEquipPatrolCheckRuleInterID.ToString() + ",'" + omodel.HLastResult + "','" + omodel.HErrNote + "','" + omodel.HBigSafeNote + "'," + omodel.HShiftsID + ",'" + omodel.HPatrolCheckNote + "'" +
+ ") ");
+ //鎻掑叆瀛愯〃
+ foreach (Model.ClsSb_EquipPatrolCheckBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sb_EquipPatrolCheckBillSub " +
+ " (HInterID,HEntryID," +
+ "HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
+ "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
+ "HPatrolCheckItemID,HPatrolCheckItem,HPatrolCheckPart,HClaim," +
+ "HManagerID,HManagerNumber,HPatrolCheckItemClassID,HPatrolCheckItemMethodID,HPatrolCheckResult" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
+ ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + 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.HPatrolCheckItemID+"','"+oSub.HPatrolCheckItem + "','" + oSub.HPatrolCheckPart + "','" + oSub.HClaim +
+ "'," + oSub.HManagerID.ToString() + ",'" + oSub.HManagerNumber + "'," + oSub.HPatrolCheckItemClassID + "," + oSub.HPatrolCheckItemMethodID + ",'" + oSub.HPatrolCheckResult + "'" +
+ ") ");
+ }
+ //鐐规瀹屾垚锛屽弽鍐欒澶囩偣妫�璁″垝鍗曞瓙琛ㄦ槸鍚︾偣妫�鏍囪
+ oCn.RunProc("exec h_p_Sb_EquipPatrolCheck_AfterSaveCtrl " + omodel.HEquipPatrolCheckPlanInterID + "," + omodel.HEquipPatrolCheckPlanEntryID);
+
+ //
+ //foreach (Model.ClsSb_EquipPatrolCheckBillSub oSub in DetailColl)
+ //{
+ // Ds = oCn.RunProcReturn("exec h_p_Sb_EquipPatrolCheckBill_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;
+ // }
+ //}
+
+ //=========================淇濆瓨鍚庢帶鍒�
+ DataSet ds2 = oCn.RunProcReturn("Exec h_p_Sb_EquipPatrolCheckBill_AfterSaveCtrl " + omodel.HInterID.ToString() + ", '" + omodel.HBillNo + "',1 ", "h_p_Sb_EquipPatrolCheckBill_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ sReturn = "淇濆瓨鍚庢帶鍒跺垽鏂け璐ワ紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ sReturn = "淇濆瓨澶辫触2锛�" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ //============================
+
+ sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+ //鏄剧ず鍗曟嵁
+ public override bool ShowBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ //鏌ヨ涓昏〃
+ DataSet Ds ;
+ Ds = oCn.RunProcReturn("Select * from Sb_EquipPatrolCheckBillMain Where HInterID=" + lngBillKey.ToString(), "Sb_EquipPatrolCheckBillMain");
+ if(Ds.Tables[0].Rows.Count==0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ //鍥哄畾璧嬪��===========================================
+ omodel.HInterID =DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]);
+ omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim();
+ omodel.HDate =DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]);
+ omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]);
+ omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]);
+ omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]);
+ omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]);
+ omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]);
+ omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim();
+ omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]);
+ omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]);
+ omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]);
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+ //========================================================
+ //==
+ omodel.HEquipID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEquipID"]);
+ omodel.HBeginDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HBeginDate"]);
+ omodel.HEndDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HEndDate"]);
+ omodel.HPlanNo = Ds.Tables[0].Rows[0]["HPlanNo"].ToString().Trim();
+ omodel.HExplanation = Ds.Tables[0].Rows[0]["HExplanation"].ToString().Trim();
+ omodel.HInnerBillNo = Ds.Tables[0].Rows[0]["HInnerBillNo"].ToString().Trim();
+ //
+
+ //寰幆
+ DataSet DsSub ;
+ DsSub = oCn.RunProcReturn("Select * from Sb_EquipPatrolCheckBillSub Where HInterID=" + lngBillKey.ToString() + " order by HEntryID ", "Sb_EquipPatrolCheckBillSub");
+ DetailColl.Clear();//娓呯┖
+ for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++)
+ {
+ Model.ClsSb_EquipPatrolCheckBillSub oSub = new Model.ClsSb_EquipPatrolCheckBillSub();
+ // 鍥哄畾璧嬪��===============================================
+ oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]);
+ oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]);
+ oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]);
+ oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]);
+ oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim();
+ oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim();
+ oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]);
+ oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]);
+ oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]);
+ oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]);
+ oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]);
+ oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim();
+ //===================================================
+ //oSub.HWorkerID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWorkerID"]);
+ //oSub.HWorkerNumber = DsSub.Tables[0].Rows[i]["HWorkerNumber"].ToString().Trim();
+ //oSub.HSourceID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceID"]);
+ //oSub.HMaterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HMaterID"]);
+ //oSub.HMaterNumber = DsSub.Tables[0].Rows[i]["HMaterNumber"].ToString().Trim();
+ //oSub.HMaterName = DsSub.Tables[0].Rows[i]["HMaterName"].ToString().Trim();
+ //oSub.HMaterModel = DsSub.Tables[0].Rows[i]["HMaterModel"].ToString().Trim();
+ oSub.HPatrolCheckItem = DsSub.Tables[0].Rows[i]["HPatrolCheckItem"].ToString().Trim();
+ oSub.HPatrolCheckPart = DsSub.Tables[0].Rows[i]["HPatrolCheckPart"].ToString().Trim();
+ //oSub.HBeginDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HBeginDate"]);
+ //oSub.HEndDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEndDate"]);
+ //oSub.HTimes = DBUtility.ClsPub.isSingle(DsSub.Tables[0].Rows[i]["HTimes"]);
+ oSub.HClaim = DsSub.Tables[0].Rows[i]["HClaim"].ToString().Trim();
+ //oSub.HQtyMust = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HQtyMust"]);
+ //oSub.HBadCount = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HBadCount"]);
+ //oSub.HWasterQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HWasterQty"]);
+ //oSub.HUnitID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HUnitID"]);
+ //oSub.HUnitNumber = DsSub.Tables[0].Rows[i]["HUnitNumber"].ToString().Trim();
+ //oSub.HUnitName = DsSub.Tables[0].Rows[i]["HUnitName"].ToString().Trim();
+ //oSub.HSeOrderBillNo = DsSub.Tables[0].Rows[i]["HSeOrderBillNo"].ToString().Trim();
+ oSub.HManagerID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HManagerID"]);
+ oSub.HManagerNumber = DsSub.Tables[0].Rows[i]["HManagerNumber"].ToString().Trim();
+ //oSub.HManagerName = DsSub.Tables[0].Rows[i]["HManagerName"].ToString().Trim();
+ //oSub.HICMOBillNo = DsSub.Tables[0].Rows[i]["HICMOBillNo"].ToString().Trim();
+
+ DetailColl.Add(oSub);
+ }
+ sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+
+ }
+
+}
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index 4274cd5..5f51ca0 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 5d74b7f..fea8b61 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 88e8857..39742c7 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 3aa0cf6..75a64a4 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 d6a08ba..89d99bb 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 cabb1cf..962fcbb 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 32d8b85..e497353 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 cfbbb50..812977d 100644
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index 05b7a1b..4111cb7 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.dll b/DBUtility/obj/Release/DBUtility.dll
index f2a9204..5f51ca0 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 5d74b7f..fea8b61 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/ClsGy_PatrolCheckItemMethod_Model.cs b/Model/ClsGy_PatrolCheckItemMethod_Model.cs
new file mode 100644
index 0000000..ad4b7e4
--- /dev/null
+++ b/Model/ClsGy_PatrolCheckItemMethod_Model.cs
@@ -0,0 +1,13 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+ public class ClsGy_PatrolCheckItemMethod_Model : DBUtility.ClsGy_Base_Model
+ {
+ //
+ }
+}
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 39d53b1..2840dcd 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -96,6 +96,8 @@
<Compile Include="APS\ClsSc_WorkBillMonthSortBillSub.cs" />
<Compile Include="APS\ClsSc_ICMOChangeBillMain.cs" />
<Compile Include="APS\ClsSc_ICMOChangeBillSub.cs" />
+ <Compile Include="ClsGy_PatrolCheckItemMethod_Model.cs" />
+ <Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_PatrolCheckItemClass_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_MaintainClass_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_PiPeMaterial_Model.cs" />
<Compile Include="鍩虹璧勬枡\鍩虹璧勬枡\ClsGy_PiPe_Model.cs" />
@@ -166,6 +168,8 @@
<Compile Include="鐢熶骇绠＄悊\妯″叿绠＄悊\ClsSc_MouldMaintainPlanBillSub_Plan.cs" />
<Compile Include="鐢熶骇绠＄悊\鐢熶骇棰嗘枡\ClsKf_ProductReceiveMaterialBillMain.cs" />
<Compile Include="鐢熶骇绠＄悊\鐢熶骇棰嗘枡\ClsKf_ProductReceiveMaterialBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipPatrolCheckBillSub.cs" />
+ <Compile Include="鐢熶骇绠＄悊\璁惧绠＄悊\ClsSb_EquipPatrolCheckBillMain.cs" />
<Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSetSub.cs" />
<Compile Include="绯荤粺鍏敤\ClsXt_DefineBillMainSetMain.cs" />
<Compile Include="璁″垝绠＄悊\ClsGy_SourceMouldBillMain.cs" />
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index f2a9204..5f51ca0 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 5d74b7f..fea8b61 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 3198e57..c0df88f 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 c52d4db..e15aba4 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 88e8857..39742c7 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 3aa0cf6..75a64a4 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 d6a08ba..89d99bb 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 cabb1cf..962fcbb 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 32d8b85..e497353 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 cfbbb50..812977d 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 cf28a20..9d9f12c 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 3198e57..c0df88f 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 c52d4db..e15aba4 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_DotCheckItemClass_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_DotCheckItemClass_Model.cs"
index d644a4f..810b570 100644
--- "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_DotCheckItemClass_Model.cs"
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_DotCheckItemClass_Model.cs"
@@ -1,4 +1,5 @@
using System;
+using System;
using System.Collections.Generic;
using System.Text;
diff --git "a/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_PatrolCheckItemClass_Model.cs" "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_PatrolCheckItemClass_Model.cs"
new file mode 100644
index 0000000..66cbf88
--- /dev/null
+++ "b/Model/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/ClsGy_PatrolCheckItemClass_Model.cs"
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsGy_PatrolCheckItemClass_Model : DBUtility.ClsGy_Base_Model
+ {
+ //
+ }
+}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipPatrolCheckBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipPatrolCheckBillMain.cs"
new file mode 100644
index 0000000..a861672
--- /dev/null
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipPatrolCheckBillMain.cs"
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSb_EquipPatrolCheckBillMain:DBUtility.ClsXt_BaseBillMain
+ {
+ public Int64 HEquipID;
+ public DateTime HBeginDate;
+ public DateTime HEndDate;
+ public string HPlanNo;
+ public string HExplanation;
+ public string HInnerBillNo;
+ public Int64 HDeptID;
+ public int HEquipMaintainRuleInterID;
+ public int HEquipPatrolCheckRuleInterID;
+
+ public int HEquipPatrolCheckPlanInterID; //设备巡检计划单（Sb_EquipPatrolCheckPlanBillSub_Plan）主内码
+ public int HEquipPatrolCheckPlanEntryID; //设备巡检计划单（Sb_EquipPatrolCheckPlanBillSub_Plan）子内码
+
+ public string HLastResult;// 最终结论（OK，NG）
+ public string HErrNote;// 异常情况记录
+ public string HBigSafeNote;// 重大安全隐患记录
+ public Int64 HShiftsID;// 生产班次（Gy_Shifts）
+ public string HPatrolCheckNote;// 巡检数据
+
+ }
+}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipPatrolCheckBillSub.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipPatrolCheckBillSub.cs"
new file mode 100644
index 0000000..a20ef5a
--- /dev/null
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipPatrolCheckBillSub.cs"
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model
+{
+ public class ClsSb_EquipPatrolCheckBillSub:DBUtility.ClsXt_BaseBillSub
+ {
+
+ public string HRemark;
+ public string HCloseMan;
+ public DateTime HEntryCloseDate;
+ public bool HCloseType;
+ //
+ public Int64 HMaterID;
+ public string HMaterNumber;
+ public string HMaterName;
+ public string HMaterModel;
+ public Int64 HPatrolCheckItemID;
+ public string HPatrolCheckItem;
+ public string HPatrolCheckPart;
+ public string HClaim;
+ public Int64 HUnitID;
+ public string HUnitNumber;
+ public string HUnitName;
+ public Int64 HManagerID;
+ public string HManagerNumber;
+ public string HManagerName;
+
+ public Int64 HPatrolCheckItemClassID;// 巡检项目分类(gy_PatrolCheckItemClass)
+ public Int64 HPatrolCheckItemMethodID;// 巡检方法(gy_PatrolCheckItemMethod)
+ public string HPatrolCheckResult;// 巡检结果（OK，X）
+ }
+}
diff --git a/NETERPNoWin/bin/Debug/BLL.dll b/NETERPNoWin/bin/Debug/BLL.dll
index fa3da21..482d99d 100644
--- a/NETERPNoWin/bin/Debug/BLL.dll
+++ b/NETERPNoWin/bin/Debug/BLL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/BLL.pdb b/NETERPNoWin/bin/Debug/BLL.pdb
index 78c8104..404d5ec 100644
--- a/NETERPNoWin/bin/Debug/BLL.pdb
+++ b/NETERPNoWin/bin/Debug/BLL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/BaseSet.dll b/NETERPNoWin/bin/Debug/BaseSet.dll
index 842f788..c379e8d 100644
--- a/NETERPNoWin/bin/Debug/BaseSet.dll
+++ b/NETERPNoWin/bin/Debug/BaseSet.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/BaseSet.pdb b/NETERPNoWin/bin/Debug/BaseSet.pdb
index e79fce3..1e5fe52 100644
--- a/NETERPNoWin/bin/Debug/BaseSet.pdb
+++ b/NETERPNoWin/bin/Debug/BaseSet.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/DAL.dll b/NETERPNoWin/bin/Debug/DAL.dll
index 727f902..d72fcd6 100644
--- a/NETERPNoWin/bin/Debug/DAL.dll
+++ b/NETERPNoWin/bin/Debug/DAL.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/DAL.pdb b/NETERPNoWin/bin/Debug/DAL.pdb
index e73f3b3..0b5840e 100644
--- a/NETERPNoWin/bin/Debug/DAL.pdb
+++ b/NETERPNoWin/bin/Debug/DAL.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/DBUtility.dll b/NETERPNoWin/bin/Debug/DBUtility.dll
index 26dab8f..42ffcc7 100644
--- a/NETERPNoWin/bin/Debug/DBUtility.dll
+++ b/NETERPNoWin/bin/Debug/DBUtility.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/DBUtility.pdb b/NETERPNoWin/bin/Debug/DBUtility.pdb
index 6a63813..90cc673 100644
--- a/NETERPNoWin/bin/Debug/DBUtility.pdb
+++ b/NETERPNoWin/bin/Debug/DBUtility.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/bin/Debug/Interop.gregn6Lib.dll
index 7380510..ec1e07d 100644
--- a/NETERPNoWin/bin/Debug/Interop.gregn6Lib.dll
+++ b/NETERPNoWin/bin/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/Kanban.dll b/NETERPNoWin/bin/Debug/Kanban.dll
index 0dba53d..5f3b31f 100644
--- a/NETERPNoWin/bin/Debug/Kanban.dll
+++ b/NETERPNoWin/bin/Debug/Kanban.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/Kanban.pdb b/NETERPNoWin/bin/Debug/Kanban.pdb
index f0f0d68..116fb69 100644
--- a/NETERPNoWin/bin/Debug/Kanban.pdb
+++ b/NETERPNoWin/bin/Debug/Kanban.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/Model.dll b/NETERPNoWin/bin/Debug/Model.dll
index 7476821..fb494be 100644
--- a/NETERPNoWin/bin/Debug/Model.dll
+++ b/NETERPNoWin/bin/Debug/Model.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/Model.pdb b/NETERPNoWin/bin/Debug/Model.pdb
index 2883c5b..faf9ed8 100644
--- a/NETERPNoWin/bin/Debug/Model.pdb
+++ b/NETERPNoWin/bin/Debug/Model.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/NETERPNoWin.exe b/NETERPNoWin/bin/Debug/NETERPNoWin.exe
index a503e92..549ee2f 100644
--- a/NETERPNoWin/bin/Debug/NETERPNoWin.exe
+++ b/NETERPNoWin/bin/Debug/NETERPNoWin.exe
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/NETERPNoWin.pdb b/NETERPNoWin/bin/Debug/NETERPNoWin.pdb
index 28f8c17..bf319d7 100644
--- a/NETERPNoWin/bin/Debug/NETERPNoWin.pdb
+++ b/NETERPNoWin/bin/Debug/NETERPNoWin.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/OAM.dll b/NETERPNoWin/bin/Debug/OAM.dll
index 3daa0f5..9eec334 100644
--- a/NETERPNoWin/bin/Debug/OAM.dll
+++ b/NETERPNoWin/bin/Debug/OAM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/OAM.pdb b/NETERPNoWin/bin/Debug/OAM.pdb
index 9fcbc10..305650d 100644
--- a/NETERPNoWin/bin/Debug/OAM.pdb
+++ b/NETERPNoWin/bin/Debug/OAM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/PlanM.dll b/NETERPNoWin/bin/Debug/PlanM.dll
index 651e5a1..b81b5ed 100644
--- a/NETERPNoWin/bin/Debug/PlanM.dll
+++ b/NETERPNoWin/bin/Debug/PlanM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/PlanM.pdb b/NETERPNoWin/bin/Debug/PlanM.pdb
index 39e7b05..cb8390d 100644
--- a/NETERPNoWin/bin/Debug/PlanM.pdb
+++ b/NETERPNoWin/bin/Debug/PlanM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/Pub_Class.dll b/NETERPNoWin/bin/Debug/Pub_Class.dll
index f8dea4c..c0b569e 100644
--- a/NETERPNoWin/bin/Debug/Pub_Class.dll
+++ b/NETERPNoWin/bin/Debug/Pub_Class.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/Pub_Class.pdb b/NETERPNoWin/bin/Debug/Pub_Class.pdb
index 7202bac..abf890f 100644
--- a/NETERPNoWin/bin/Debug/Pub_Class.pdb
+++ b/NETERPNoWin/bin/Debug/Pub_Class.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/Pub_Control.dll b/NETERPNoWin/bin/Debug/Pub_Control.dll
index 89cc5c2..88f55ae 100644
--- a/NETERPNoWin/bin/Debug/Pub_Control.dll
+++ b/NETERPNoWin/bin/Debug/Pub_Control.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/Pub_Control.pdb b/NETERPNoWin/bin/Debug/Pub_Control.pdb
index 9891ba1..62dabc3 100644
--- a/NETERPNoWin/bin/Debug/Pub_Control.pdb
+++ b/NETERPNoWin/bin/Debug/Pub_Control.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/SQLHelper.dll b/NETERPNoWin/bin/Debug/SQLHelper.dll
index de4c686..719e581 100644
--- a/NETERPNoWin/bin/Debug/SQLHelper.dll
+++ b/NETERPNoWin/bin/Debug/SQLHelper.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/SQLHelper.pdb b/NETERPNoWin/bin/Debug/SQLHelper.pdb
index 90ec041..f6cbc41 100644
--- a/NETERPNoWin/bin/Debug/SQLHelper.pdb
+++ b/NETERPNoWin/bin/Debug/SQLHelper.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/WarM.dll b/NETERPNoWin/bin/Debug/WarM.dll
index 04aa7e0..b6553e0 100644
--- a/NETERPNoWin/bin/Debug/WarM.dll
+++ b/NETERPNoWin/bin/Debug/WarM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/WarM.pdb b/NETERPNoWin/bin/Debug/WarM.pdb
index 115afe1..c73d537 100644
--- a/NETERPNoWin/bin/Debug/WarM.pdb
+++ b/NETERPNoWin/bin/Debug/WarM.pdb
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/WorkM.dll b/NETERPNoWin/bin/Debug/WorkM.dll
index 66e964f..c2d5912 100644
--- a/NETERPNoWin/bin/Debug/WorkM.dll
+++ b/NETERPNoWin/bin/Debug/WorkM.dll
Binary files differ
diff --git a/NETERPNoWin/bin/Debug/WorkM.pdb b/NETERPNoWin/bin/Debug/WorkM.pdb
index a9ae927..fbb1e24 100644
--- a/NETERPNoWin/bin/Debug/WorkM.pdb
+++ b/NETERPNoWin/bin/Debug/WorkM.pdb
Binary files differ
diff --git a/NETERPNoWin/obj/Debug/Interop.gregn6Lib.dll b/NETERPNoWin/obj/Debug/Interop.gregn6Lib.dll
index b1a10d4..ec1e07d 100644
--- a/NETERPNoWin/obj/Debug/Interop.gregn6Lib.dll
+++ b/NETERPNoWin/obj/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/NETERPNoWin/obj/Debug/NETERPNoWin.Frm_Show.resources b/NETERPNoWin/obj/Debug/NETERPNoWin.Frm_Show.resources
index ad18340..06cd064 100644
--- a/NETERPNoWin/obj/Debug/NETERPNoWin.Frm_Show.resources
+++ b/NETERPNoWin/obj/Debug/NETERPNoWin.Frm_Show.resources
Binary files differ
diff --git a/NETERPNoWin/obj/Debug/NETERPNoWin.MDIMain.resources b/NETERPNoWin/obj/Debug/NETERPNoWin.MDIMain.resources
index 759d25b..5a3af05 100644
--- a/NETERPNoWin/obj/Debug/NETERPNoWin.MDIMain.resources
+++ b/NETERPNoWin/obj/Debug/NETERPNoWin.MDIMain.resources
Binary files differ
diff --git a/NETERPNoWin/obj/Debug/NETERPNoWin.MESMain.resources b/NETERPNoWin/obj/Debug/NETERPNoWin.MESMain.resources
index c2586c0..e60f9a2 100644
--- a/NETERPNoWin/obj/Debug/NETERPNoWin.MESMain.resources
+++ b/NETERPNoWin/obj/Debug/NETERPNoWin.MESMain.resources
Binary files differ
diff --git a/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.GenerateResource.Cache b/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.GenerateResource.Cache
index 64d6a92..4d6ff9f 100644
--- a/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.GenerateResource.Cache
+++ b/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.GenerateResource.Cache
Binary files differ
diff --git a/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache b/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
index f758837..1aae529 100644
--- a/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
+++ b/NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cache
Binary files differ
diff --git a/NETERPNoWin/obj/Debug/NETERPNoWin.exe b/NETERPNoWin/obj/Debug/NETERPNoWin.exe
index a503e92..549ee2f 100644
--- a/NETERPNoWin/obj/Debug/NETERPNoWin.exe
+++ b/NETERPNoWin/obj/Debug/NETERPNoWin.exe
Binary files differ
diff --git a/NETERPNoWin/obj/Debug/NETERPNoWin.pdb b/NETERPNoWin/obj/Debug/NETERPNoWin.pdb
index 28f8c17..bf319d7 100644
--- a/NETERPNoWin/obj/Debug/NETERPNoWin.pdb
+++ b/NETERPNoWin/obj/Debug/NETERPNoWin.pdb
Binary files differ
diff --git a/PayM/bin/Debug/AxInterop.gregn6Lib.dll b/PayM/bin/Debug/AxInterop.gregn6Lib.dll
index 877dc5c..76d2ac4 100644
--- a/PayM/bin/Debug/AxInterop.gregn6Lib.dll
+++ b/PayM/bin/Debug/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/Debug/BLL.dll b/PayM/bin/Debug/BLL.dll
index af53e2f..482d99d 100644
--- a/PayM/bin/Debug/BLL.dll
+++ b/PayM/bin/Debug/BLL.dll
Binary files differ
diff --git a/PayM/bin/Debug/BLL.pdb b/PayM/bin/Debug/BLL.pdb
index ae09a58..404d5ec 100644
--- a/PayM/bin/Debug/BLL.pdb
+++ b/PayM/bin/Debug/BLL.pdb
Binary files differ
diff --git a/PayM/bin/Debug/DAL.dll b/PayM/bin/Debug/DAL.dll
index c5d17c1..d72fcd6 100644
--- a/PayM/bin/Debug/DAL.dll
+++ b/PayM/bin/Debug/DAL.dll
Binary files differ
diff --git a/PayM/bin/Debug/DAL.pdb b/PayM/bin/Debug/DAL.pdb
index 44ab790..0b5840e 100644
--- a/PayM/bin/Debug/DAL.pdb
+++ b/PayM/bin/Debug/DAL.pdb
Binary files differ
diff --git a/PayM/bin/Debug/DBUtility.dll b/PayM/bin/Debug/DBUtility.dll
index 9c66da0..42ffcc7 100644
--- a/PayM/bin/Debug/DBUtility.dll
+++ b/PayM/bin/Debug/DBUtility.dll
Binary files differ
diff --git a/PayM/bin/Debug/DBUtility.pdb b/PayM/bin/Debug/DBUtility.pdb
index 1eddf52..90cc673 100644
--- a/PayM/bin/Debug/DBUtility.pdb
+++ b/PayM/bin/Debug/DBUtility.pdb
Binary files differ
diff --git a/PayM/bin/Debug/Interop.gregn6Lib.dll b/PayM/bin/Debug/Interop.gregn6Lib.dll
index 11dd1e5..5b11934 100644
--- a/PayM/bin/Debug/Interop.gregn6Lib.dll
+++ b/PayM/bin/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/Debug/Model.dll b/PayM/bin/Debug/Model.dll
index 520ecc3..fb494be 100644
--- a/PayM/bin/Debug/Model.dll
+++ b/PayM/bin/Debug/Model.dll
Binary files differ
diff --git a/PayM/bin/Debug/Model.pdb b/PayM/bin/Debug/Model.pdb
index 7706039..faf9ed8 100644
--- a/PayM/bin/Debug/Model.pdb
+++ b/PayM/bin/Debug/Model.pdb
Binary files differ
diff --git a/PayM/bin/Debug/PayM.dll b/PayM/bin/Debug/PayM.dll
index 58ec913..dda57db 100644
--- a/PayM/bin/Debug/PayM.dll
+++ b/PayM/bin/Debug/PayM.dll
Binary files differ
diff --git a/PayM/bin/Debug/PayM.pdb b/PayM/bin/Debug/PayM.pdb
index 267460b..6183d31 100644
--- a/PayM/bin/Debug/PayM.pdb
+++ b/PayM/bin/Debug/PayM.pdb
Binary files differ
diff --git a/PayM/bin/Debug/Pub_Class.dll b/PayM/bin/Debug/Pub_Class.dll
index 10d76c8..c0b569e 100644
--- a/PayM/bin/Debug/Pub_Class.dll
+++ b/PayM/bin/Debug/Pub_Class.dll
Binary files differ
diff --git a/PayM/bin/Debug/Pub_Class.pdb b/PayM/bin/Debug/Pub_Class.pdb
index e33fe98..abf890f 100644
--- a/PayM/bin/Debug/Pub_Class.pdb
+++ b/PayM/bin/Debug/Pub_Class.pdb
Binary files differ
diff --git a/PayM/bin/Debug/Pub_Control.dll b/PayM/bin/Debug/Pub_Control.dll
index e700db9..88f55ae 100644
--- a/PayM/bin/Debug/Pub_Control.dll
+++ b/PayM/bin/Debug/Pub_Control.dll
Binary files differ
diff --git a/PayM/bin/Debug/Pub_Control.pdb b/PayM/bin/Debug/Pub_Control.pdb
index 07ba22e..62dabc3 100644
--- a/PayM/bin/Debug/Pub_Control.pdb
+++ b/PayM/bin/Debug/Pub_Control.pdb
Binary files differ
diff --git a/PayM/bin/Debug/SQLHelper.dll b/PayM/bin/Debug/SQLHelper.dll
index 0d27b9a..719e581 100644
--- a/PayM/bin/Debug/SQLHelper.dll
+++ b/PayM/bin/Debug/SQLHelper.dll
Binary files differ
diff --git a/PayM/bin/Debug/SQLHelper.pdb b/PayM/bin/Debug/SQLHelper.pdb
index b1854ba..f6cbc41 100644
--- a/PayM/bin/Debug/SQLHelper.pdb
+++ b/PayM/bin/Debug/SQLHelper.pdb
Binary files differ
diff --git a/PayM/obj/Debug/AxInterop.gregn6Lib.dll b/PayM/obj/Debug/AxInterop.gregn6Lib.dll
index 877dc5c..76d2ac4 100644
--- a/PayM/obj/Debug/AxInterop.gregn6Lib.dll
+++ b/PayM/obj/Debug/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/obj/Debug/BaseSet.Gy_DataInTmp_DuSubsidyItem.resources b/PayM/obj/Debug/BaseSet.Gy_DataInTmp_DuSubsidyItem.resources
index 1eec1a9..7a91613 100644
--- a/PayM/obj/Debug/BaseSet.Gy_DataInTmp_DuSubsidyItem.resources
+++ b/PayM/obj/Debug/BaseSet.Gy_DataInTmp_DuSubsidyItem.resources
Binary files differ
diff --git a/PayM/obj/Debug/CostM.Pay_AccPayMentDayBillList.resources b/PayM/obj/Debug/CostM.Pay_AccPayMentDayBillList.resources
index f753f0d..4926be8 100644
--- a/PayM/obj/Debug/CostM.Pay_AccPayMentDayBillList.resources
+++ b/PayM/obj/Debug/CostM.Pay_AccPayMentDayBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/CostM.Pay_PayMentBillAutoAddnew.resources b/PayM/obj/Debug/CostM.Pay_PayMentBillAutoAddnew.resources
index f753f0d..4926be8 100644
--- a/PayM/obj/Debug/CostM.Pay_PayMentBillAutoAddnew.resources
+++ b/PayM/obj/Debug/CostM.Pay_PayMentBillAutoAddnew.resources
Binary files differ
diff --git a/PayM/obj/Debug/Interop.gregn6Lib.dll b/PayM/obj/Debug/Interop.gregn6Lib.dll
index f4472d8..5b11934 100644
--- a/PayM/obj/Debug/Interop.gregn6Lib.dll
+++ b/PayM/obj/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/obj/Debug/OAM.HR_EmpEngageRequestBill.resources b/PayM/obj/Debug/OAM.HR_EmpEngageRequestBill.resources
index fe67101..a68b102 100644
--- a/PayM/obj/Debug/OAM.HR_EmpEngageRequestBill.resources
+++ b/PayM/obj/Debug/OAM.HR_EmpEngageRequestBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/OAM.HR_EmpEngageRequestBillList.resources b/PayM/obj/Debug/OAM.HR_EmpEngageRequestBillList.resources
index 9db27ad..1dbc48e 100644
--- a/PayM/obj/Debug/OAM.HR_EmpEngageRequestBillList.resources
+++ b/PayM/obj/Debug/OAM.HR_EmpEngageRequestBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Err_MonthExpenseEntryBill.resources b/PayM/obj/Debug/PayM.Err_MonthExpenseEntryBill.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Err_MonthExpenseEntryBill.resources
+++ b/PayM/obj/Debug/PayM.Err_MonthExpenseEntryBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_ContractBookBill.resources b/PayM/obj/Debug/PayM.HR_ContractBookBill.resources
index 787985c..a3de895 100644
--- a/PayM/obj/Debug/PayM.HR_ContractBookBill.resources
+++ b/PayM/obj/Debug/PayM.HR_ContractBookBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_ContractBookBillList.resources b/PayM/obj/Debug/PayM.HR_ContractBookBillList.resources
index 26509ac..56f6827 100644
--- a/PayM/obj/Debug/PayM.HR_ContractBookBillList.resources
+++ b/PayM/obj/Debug/PayM.HR_ContractBookBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_EmpChangeBill.resources b/PayM/obj/Debug/PayM.HR_EmpChangeBill.resources
index 8243501..fcdd7b7 100644
--- a/PayM/obj/Debug/PayM.HR_EmpChangeBill.resources
+++ b/PayM/obj/Debug/PayM.HR_EmpChangeBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_EmpChangeBillList.resources b/PayM/obj/Debug/PayM.HR_EmpChangeBillList.resources
index 26509ac..56f6827 100644
--- a/PayM/obj/Debug/PayM.HR_EmpChangeBillList.resources
+++ b/PayM/obj/Debug/PayM.HR_EmpChangeBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_EmpDimissionBill.resources b/PayM/obj/Debug/PayM.HR_EmpDimissionBill.resources
index c9652fd..4f48a28 100644
--- a/PayM/obj/Debug/PayM.HR_EmpDimissionBill.resources
+++ b/PayM/obj/Debug/PayM.HR_EmpDimissionBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_EmpDimissionBillList.resources b/PayM/obj/Debug/PayM.HR_EmpDimissionBillList.resources
index 0831b84..a4289b5 100644
--- a/PayM/obj/Debug/PayM.HR_EmpDimissionBillList.resources
+++ b/PayM/obj/Debug/PayM.HR_EmpDimissionBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_FamilyMemberBill.resources b/PayM/obj/Debug/PayM.HR_FamilyMemberBill.resources
index 787985c..a3de895 100644
--- a/PayM/obj/Debug/PayM.HR_FamilyMemberBill.resources
+++ b/PayM/obj/Debug/PayM.HR_FamilyMemberBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_FamilyMemberBillList.resources b/PayM/obj/Debug/PayM.HR_FamilyMemberBillList.resources
index 26509ac..56f6827 100644
--- a/PayM/obj/Debug/PayM.HR_FamilyMemberBillList.resources
+++ b/PayM/obj/Debug/PayM.HR_FamilyMemberBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_InsuranceBookBill.resources b/PayM/obj/Debug/PayM.HR_InsuranceBookBill.resources
index 787985c..a3de895 100644
--- a/PayM/obj/Debug/PayM.HR_InsuranceBookBill.resources
+++ b/PayM/obj/Debug/PayM.HR_InsuranceBookBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_InsuranceBookBillList.resources b/PayM/obj/Debug/PayM.HR_InsuranceBookBillList.resources
index 26509ac..56f6827 100644
--- a/PayM/obj/Debug/PayM.HR_InsuranceBookBillList.resources
+++ b/PayM/obj/Debug/PayM.HR_InsuranceBookBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_LearnHistoryBill.resources b/PayM/obj/Debug/PayM.HR_LearnHistoryBill.resources
index 787985c..a3de895 100644
--- a/PayM/obj/Debug/PayM.HR_LearnHistoryBill.resources
+++ b/PayM/obj/Debug/PayM.HR_LearnHistoryBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_LearnHistoryBillList.resources b/PayM/obj/Debug/PayM.HR_LearnHistoryBillList.resources
index 26509ac..56f6827 100644
--- a/PayM/obj/Debug/PayM.HR_LearnHistoryBillList.resources
+++ b/PayM/obj/Debug/PayM.HR_LearnHistoryBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_PaperPhotoBill.resources b/PayM/obj/Debug/PayM.HR_PaperPhotoBill.resources
index 787985c..a3de895 100644
--- a/PayM/obj/Debug/PayM.HR_PaperPhotoBill.resources
+++ b/PayM/obj/Debug/PayM.HR_PaperPhotoBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_PaperPhotoBillList.resources b/PayM/obj/Debug/PayM.HR_PaperPhotoBillList.resources
index 26509ac..56f6827 100644
--- a/PayM/obj/Debug/PayM.HR_PaperPhotoBillList.resources
+++ b/PayM/obj/Debug/PayM.HR_PaperPhotoBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_RewardsPunishBill.resources b/PayM/obj/Debug/PayM.HR_RewardsPunishBill.resources
index 787985c..a3de895 100644
--- a/PayM/obj/Debug/PayM.HR_RewardsPunishBill.resources
+++ b/PayM/obj/Debug/PayM.HR_RewardsPunishBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_RewardsPunishBillList.resources b/PayM/obj/Debug/PayM.HR_RewardsPunishBillList.resources
index 26509ac..56f6827 100644
--- a/PayM/obj/Debug/PayM.HR_RewardsPunishBillList.resources
+++ b/PayM/obj/Debug/PayM.HR_RewardsPunishBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_WorkInjuryBill.resources b/PayM/obj/Debug/PayM.HR_WorkInjuryBill.resources
index 787985c..a3de895 100644
--- a/PayM/obj/Debug/PayM.HR_WorkInjuryBill.resources
+++ b/PayM/obj/Debug/PayM.HR_WorkInjuryBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_WorkInjuryBillList.resources b/PayM/obj/Debug/PayM.HR_WorkInjuryBillList.resources
index 26509ac..56f6827 100644
--- a/PayM/obj/Debug/PayM.HR_WorkInjuryBillList.resources
+++ b/PayM/obj/Debug/PayM.HR_WorkInjuryBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_WorkSkillBill.resources b/PayM/obj/Debug/PayM.HR_WorkSkillBill.resources
index 787985c..a3de895 100644
--- a/PayM/obj/Debug/PayM.HR_WorkSkillBill.resources
+++ b/PayM/obj/Debug/PayM.HR_WorkSkillBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_WorkSkillBillList.resources b/PayM/obj/Debug/PayM.HR_WorkSkillBillList.resources
index 26509ac..56f6827 100644
--- a/PayM/obj/Debug/PayM.HR_WorkSkillBillList.resources
+++ b/PayM/obj/Debug/PayM.HR_WorkSkillBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_WorkStoryBill.resources b/PayM/obj/Debug/PayM.HR_WorkStoryBill.resources
index 787985c..a3de895 100644
--- a/PayM/obj/Debug/PayM.HR_WorkStoryBill.resources
+++ b/PayM/obj/Debug/PayM.HR_WorkStoryBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.HR_WorkStoryBillList.resources b/PayM/obj/Debug/PayM.HR_WorkStoryBillList.resources
index 26509ac..56f6827 100644
--- a/PayM/obj/Debug/PayM.HR_WorkStoryBillList.resources
+++ b/PayM/obj/Debug/PayM.HR_WorkStoryBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.KQ_sourceReport.resources b/PayM/obj/Debug/PayM.KQ_sourceReport.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.KQ_sourceReport.resources
+++ b/PayM/obj/Debug/PayM.KQ_sourceReport.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_CarOutApplyBill.resources b/PayM/obj/Debug/PayM.Pay_CarOutApplyBill.resources
index e620e33..045481d 100644
--- a/PayM/obj/Debug/PayM.Pay_CarOutApplyBill.resources
+++ b/PayM/obj/Debug/PayM.Pay_CarOutApplyBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_CarOutApplyBillList.resources b/PayM/obj/Debug/PayM.Pay_CarOutApplyBillList.resources
index a70b498..33aa710 100644
--- a/PayM/obj/Debug/PayM.Pay_CarOutApplyBillList.resources
+++ b/PayM/obj/Debug/PayM.Pay_CarOutApplyBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_DuSubsidyItemBill.resources b/PayM/obj/Debug/PayM.Pay_DuSubsidyItemBill.resources
index 89f3885..20033d7 100644
--- a/PayM/obj/Debug/PayM.Pay_DuSubsidyItemBill.resources
+++ b/PayM/obj/Debug/PayM.Pay_DuSubsidyItemBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_DuSubsidyItemBillList.resources b/PayM/obj/Debug/PayM.Pay_DuSubsidyItemBillList.resources
index a70b498..33aa710 100644
--- a/PayM/obj/Debug/PayM.Pay_DuSubsidyItemBillList.resources
+++ b/PayM/obj/Debug/PayM.Pay_DuSubsidyItemBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_EmpPayMentSumReport.resources b/PayM/obj/Debug/PayM.Pay_EmpPayMentSumReport.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Pay_EmpPayMentSumReport.resources
+++ b/PayM/obj/Debug/PayM.Pay_EmpPayMentSumReport.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_EmpWorkQtyEntryReport.resources b/PayM/obj/Debug/PayM.Pay_EmpWorkQtyEntryReport.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Pay_EmpWorkQtyEntryReport.resources
+++ b/PayM/obj/Debug/PayM.Pay_EmpWorkQtyEntryReport.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_ErrWorkTimesRequestBill.resources b/PayM/obj/Debug/PayM.Pay_ErrWorkTimesRequestBill.resources
index 9e00c6e..d53e593 100644
--- a/PayM/obj/Debug/PayM.Pay_ErrWorkTimesRequestBill.resources
+++ b/PayM/obj/Debug/PayM.Pay_ErrWorkTimesRequestBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_ErrWorkTimesRequestBillList.resources b/PayM/obj/Debug/PayM.Pay_ErrWorkTimesRequestBillList.resources
index a70b498..33aa710 100644
--- a/PayM/obj/Debug/PayM.Pay_ErrWorkTimesRequestBillList.resources
+++ b/PayM/obj/Debug/PayM.Pay_ErrWorkTimesRequestBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_ErrWorkTimesSendBill.resources b/PayM/obj/Debug/PayM.Pay_ErrWorkTimesSendBill.resources
index 592d8c1..cbda7df 100644
--- a/PayM/obj/Debug/PayM.Pay_ErrWorkTimesSendBill.resources
+++ b/PayM/obj/Debug/PayM.Pay_ErrWorkTimesSendBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_ErrWorkTimesSendBillList.resources b/PayM/obj/Debug/PayM.Pay_ErrWorkTimesSendBillList.resources
index 5003e21..a9538a4 100644
--- a/PayM/obj/Debug/PayM.Pay_ErrWorkTimesSendBillList.resources
+++ b/PayM/obj/Debug/PayM.Pay_ErrWorkTimesSendBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resources b/PayM/obj/Debug/PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resources
index 63c32a2..dfd7f3a 100644
--- a/PayM/obj/Debug/PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resources
+++ b/PayM/obj/Debug/PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_GroupBalBill.resources b/PayM/obj/Debug/PayM.Pay_GroupBalBill.resources
index cd05a9f..f52c7db 100644
--- a/PayM/obj/Debug/PayM.Pay_GroupBalBill.resources
+++ b/PayM/obj/Debug/PayM.Pay_GroupBalBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_GroupBalBillList.resources b/PayM/obj/Debug/PayM.Pay_GroupBalBillList.resources
index 96bd928..d5d80e9 100644
--- a/PayM/obj/Debug/PayM.Pay_GroupBalBillList.resources
+++ b/PayM/obj/Debug/PayM.Pay_GroupBalBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_InnerScrap.resources b/PayM/obj/Debug/PayM.Pay_InnerScrap.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Pay_InnerScrap.resources
+++ b/PayM/obj/Debug/PayM.Pay_InnerScrap.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_MonthExpenseEntryBillList.resources b/PayM/obj/Debug/PayM.Pay_MonthExpenseEntryBillList.resources
index f753f0d..4926be8 100644
--- a/PayM/obj/Debug/PayM.Pay_MonthExpenseEntryBillList.resources
+++ b/PayM/obj/Debug/PayM.Pay_MonthExpenseEntryBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_MonthExpenseEntryBillReport.resources b/PayM/obj/Debug/PayM.Pay_MonthExpenseEntryBillReport.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Pay_MonthExpenseEntryBillReport.resources
+++ b/PayM/obj/Debug/PayM.Pay_MonthExpenseEntryBillReport.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_MonthSubsidyEntryBillReport.resources b/PayM/obj/Debug/PayM.Pay_MonthSubsidyEntryBillReport.resources
index 8b7dfec..ca96b35 100644
--- a/PayM/obj/Debug/PayM.Pay_MonthSubsidyEntryBillReport.resources
+++ b/PayM/obj/Debug/PayM.Pay_MonthSubsidyEntryBillReport.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_MonthSubsidyEntryBillReportMX.resources b/PayM/obj/Debug/PayM.Pay_MonthSubsidyEntryBillReportMX.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Pay_MonthSubsidyEntryBillReportMX.resources
+++ b/PayM/obj/Debug/PayM.Pay_MonthSubsidyEntryBillReportMX.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_MonthSubsidyYearReport.resources b/PayM/obj/Debug/PayM.Pay_MonthSubsidyYearReport.resources
index e267dbd..46adb52 100644
--- a/PayM/obj/Debug/PayM.Pay_MonthSubsidyYearReport.resources
+++ b/PayM/obj/Debug/PayM.Pay_MonthSubsidyYearReport.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_MonthWriteBillReport.resources b/PayM/obj/Debug/PayM.Pay_MonthWriteBillReport.resources
index 833c5f6..f8f95bb 100644
--- a/PayM/obj/Debug/PayM.Pay_MonthWriteBillReport.resources
+++ b/PayM/obj/Debug/PayM.Pay_MonthWriteBillReport.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_MonthWriteBillReportMX.resources b/PayM/obj/Debug/PayM.Pay_MonthWriteBillReportMX.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Pay_MonthWriteBillReportMX.resources
+++ b/PayM/obj/Debug/PayM.Pay_MonthWriteBillReportMX.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_MonthWriteBillReportMX2.resources b/PayM/obj/Debug/PayM.Pay_MonthWriteBillReportMX2.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Pay_MonthWriteBillReportMX2.resources
+++ b/PayM/obj/Debug/PayM.Pay_MonthWriteBillReportMX2.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_NoWorkTimesReport.resources b/PayM/obj/Debug/PayM.Pay_NoWorkTimesReport.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Pay_NoWorkTimesReport.resources
+++ b/PayM/obj/Debug/PayM.Pay_NoWorkTimesReport.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_OtherBalBill.resources b/PayM/obj/Debug/PayM.Pay_OtherBalBill.resources
index 9f5486e..7daa6bb 100644
--- a/PayM/obj/Debug/PayM.Pay_OtherBalBill.resources
+++ b/PayM/obj/Debug/PayM.Pay_OtherBalBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_OtherBalBillList.resources b/PayM/obj/Debug/PayM.Pay_OtherBalBillList.resources
index 26509ac..56f6827 100644
--- a/PayM/obj/Debug/PayM.Pay_OtherBalBillList.resources
+++ b/PayM/obj/Debug/PayM.Pay_OtherBalBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_OtherMoney_Dlg.resources b/PayM/obj/Debug/PayM.Pay_OtherMoney_Dlg.resources
index 2e88a39..9757d1c 100644
--- a/PayM/obj/Debug/PayM.Pay_OtherMoney_Dlg.resources
+++ b/PayM/obj/Debug/PayM.Pay_OtherMoney_Dlg.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_OutApplyBill.resources b/PayM/obj/Debug/PayM.Pay_OutApplyBill.resources
index 47c1be3..62809bc 100644
--- a/PayM/obj/Debug/PayM.Pay_OutApplyBill.resources
+++ b/PayM/obj/Debug/PayM.Pay_OutApplyBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_OutApplyBillList.resources b/PayM/obj/Debug/PayM.Pay_OutApplyBillList.resources
index 96b3e13..8401c3b 100644
--- a/PayM/obj/Debug/PayM.Pay_OutApplyBillList.resources
+++ b/PayM/obj/Debug/PayM.Pay_OutApplyBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_OuterScrap.resources b/PayM/obj/Debug/PayM.Pay_OuterScrap.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Pay_OuterScrap.resources
+++ b/PayM/obj/Debug/PayM.Pay_OuterScrap.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_OverApplyBill.resources b/PayM/obj/Debug/PayM.Pay_OverApplyBill.resources
index 4fcbbac..1ab538b 100644
--- a/PayM/obj/Debug/PayM.Pay_OverApplyBill.resources
+++ b/PayM/obj/Debug/PayM.Pay_OverApplyBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_OverApplyBillList.resources b/PayM/obj/Debug/PayM.Pay_OverApplyBillList.resources
index 26509ac..56f6827 100644
--- a/PayM/obj/Debug/PayM.Pay_OverApplyBillList.resources
+++ b/PayM/obj/Debug/PayM.Pay_OverApplyBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_PayMentBill.resources b/PayM/obj/Debug/PayM.Pay_PayMentBill.resources
index a44b342..ad43aa7 100644
--- a/PayM/obj/Debug/PayM.Pay_PayMentBill.resources
+++ b/PayM/obj/Debug/PayM.Pay_PayMentBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_PayMentBillList.resources b/PayM/obj/Debug/PayM.Pay_PayMentBillList.resources
index 430f1cc4..44d858b 100644
--- a/PayM/obj/Debug/PayM.Pay_PayMentBillList.resources
+++ b/PayM/obj/Debug/PayM.Pay_PayMentBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_PayMentDayBill.resources b/PayM/obj/Debug/PayM.Pay_PayMentDayBill.resources
index 2ca7d0f..3ea56f7 100644
--- a/PayM/obj/Debug/PayM.Pay_PayMentDayBill.resources
+++ b/PayM/obj/Debug/PayM.Pay_PayMentDayBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_PayMentDayBillList.resources b/PayM/obj/Debug/PayM.Pay_PayMentDayBillList.resources
index 26509ac..56f6827 100644
--- a/PayM/obj/Debug/PayM.Pay_PayMentDayBillList.resources
+++ b/PayM/obj/Debug/PayM.Pay_PayMentDayBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_PayMentDeptSendList.resources b/PayM/obj/Debug/PayM.Pay_PayMentDeptSendList.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Pay_PayMentDeptSendList.resources
+++ b/PayM/obj/Debug/PayM.Pay_PayMentDeptSendList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_PayMentDeptYearReport.resources b/PayM/obj/Debug/PayM.Pay_PayMentDeptYearReport.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Pay_PayMentDeptYearReport.resources
+++ b/PayM/obj/Debug/PayM.Pay_PayMentDeptYearReport.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_PayMentPrintReport.resources b/PayM/obj/Debug/PayM.Pay_PayMentPrintReport.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Pay_PayMentPrintReport.resources
+++ b/PayM/obj/Debug/PayM.Pay_PayMentPrintReport.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_PayMentSendList.resources b/PayM/obj/Debug/PayM.Pay_PayMentSendList.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Pay_PayMentSendList.resources
+++ b/PayM/obj/Debug/PayM.Pay_PayMentSendList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_PayMentYearReport.resources b/PayM/obj/Debug/PayM.Pay_PayMentYearReport.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Pay_PayMentYearReport.resources
+++ b/PayM/obj/Debug/PayM.Pay_PayMentYearReport.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_ProcPriceRequestBill.resources b/PayM/obj/Debug/PayM.Pay_ProcPriceRequestBill.resources
index 8243501..fcdd7b7 100644
--- a/PayM/obj/Debug/PayM.Pay_ProcPriceRequestBill.resources
+++ b/PayM/obj/Debug/PayM.Pay_ProcPriceRequestBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_ProcPriceRequestBillList.resources b/PayM/obj/Debug/PayM.Pay_ProcPriceRequestBillList.resources
index 26509ac..56f6827 100644
--- a/PayM/obj/Debug/PayM.Pay_ProcPriceRequestBillList.resources
+++ b/PayM/obj/Debug/PayM.Pay_ProcPriceRequestBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_ProdWorkQtyEntryReport.resources b/PayM/obj/Debug/PayM.Pay_ProdWorkQtyEntryReport.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Pay_ProdWorkQtyEntryReport.resources
+++ b/PayM/obj/Debug/PayM.Pay_ProdWorkQtyEntryReport.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_ProdWorkQtySumReport.resources b/PayM/obj/Debug/PayM.Pay_ProdWorkQtySumReport.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Pay_ProdWorkQtySumReport.resources
+++ b/PayM/obj/Debug/PayM.Pay_ProdWorkQtySumReport.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_SingleBalBill.resources b/PayM/obj/Debug/PayM.Pay_SingleBalBill.resources
index 01f83ad..a2e737e 100644
--- a/PayM/obj/Debug/PayM.Pay_SingleBalBill.resources
+++ b/PayM/obj/Debug/PayM.Pay_SingleBalBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_SingleBalBillList.resources b/PayM/obj/Debug/PayM.Pay_SingleBalBillList.resources
index 26509ac..56f6827 100644
--- a/PayM/obj/Debug/PayM.Pay_SingleBalBillList.resources
+++ b/PayM/obj/Debug/PayM.Pay_SingleBalBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_SingleBalBill_Enter.resources b/PayM/obj/Debug/PayM.Pay_SingleBalBill_Enter.resources
index 0edfd4b..849ebc4 100644
--- a/PayM/obj/Debug/PayM.Pay_SingleBalBill_Enter.resources
+++ b/PayM/obj/Debug/PayM.Pay_SingleBalBill_Enter.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_SingleBalBill_KS.resources b/PayM/obj/Debug/PayM.Pay_SingleBalBill_KS.resources
index 66d7d86..9fa8e59 100644
--- a/PayM/obj/Debug/PayM.Pay_SingleBalBill_KS.resources
+++ b/PayM/obj/Debug/PayM.Pay_SingleBalBill_KS.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_SubsidyChangeBill.resources b/PayM/obj/Debug/PayM.Pay_SubsidyChangeBill.resources
index 323dd9f..6927ebb 100644
--- a/PayM/obj/Debug/PayM.Pay_SubsidyChangeBill.resources
+++ b/PayM/obj/Debug/PayM.Pay_SubsidyChangeBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_SubsidyChangeBillList.resources b/PayM/obj/Debug/PayM.Pay_SubsidyChangeBillList.resources
index a70b498..33aa710 100644
--- a/PayM/obj/Debug/PayM.Pay_SubsidyChangeBillList.resources
+++ b/PayM/obj/Debug/PayM.Pay_SubsidyChangeBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_WorkTimesBill.resources b/PayM/obj/Debug/PayM.Pay_WorkTimesBill.resources
index 06ccee7..7cc7ca0 100644
--- a/PayM/obj/Debug/PayM.Pay_WorkTimesBill.resources
+++ b/PayM/obj/Debug/PayM.Pay_WorkTimesBill.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_WorkTimesBillList.resources b/PayM/obj/Debug/PayM.Pay_WorkTimesBillList.resources
index 26509ac..56f6827 100644
--- a/PayM/obj/Debug/PayM.Pay_WorkTimesBillList.resources
+++ b/PayM/obj/Debug/PayM.Pay_WorkTimesBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_WorkTimesCardBillList.resources b/PayM/obj/Debug/PayM.Pay_WorkTimesCardBillList.resources
index f753f0d..4926be8 100644
--- a/PayM/obj/Debug/PayM.Pay_WorkTimesCardBillList.resources
+++ b/PayM/obj/Debug/PayM.Pay_WorkTimesCardBillList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_WorkTimesList.resources b/PayM/obj/Debug/PayM.Pay_WorkTimesList.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Pay_WorkTimesList.resources
+++ b/PayM/obj/Debug/PayM.Pay_WorkTimesList.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.Pay_YearToCashBillReport.resources b/PayM/obj/Debug/PayM.Pay_YearToCashBillReport.resources
index 01c9556..e5a0aed 100644
--- a/PayM/obj/Debug/PayM.Pay_YearToCashBillReport.resources
+++ b/PayM/obj/Debug/PayM.Pay_YearToCashBillReport.resources
Binary files differ
diff --git a/PayM/obj/Debug/PayM.csproj.GenerateResource.Cache b/PayM/obj/Debug/PayM.csproj.GenerateResource.Cache
index 75c6a0f..39c970c 100644
--- a/PayM/obj/Debug/PayM.csproj.GenerateResource.Cache
+++ b/PayM/obj/Debug/PayM.csproj.GenerateResource.Cache
Binary files differ
diff --git a/PayM/obj/Debug/PayM.csproj.ResolveComReference.cache b/PayM/obj/Debug/PayM.csproj.ResolveComReference.cache
index a20718f..1aae529 100644
--- a/PayM/obj/Debug/PayM.csproj.ResolveComReference.cache
+++ b/PayM/obj/Debug/PayM.csproj.ResolveComReference.cache
Binary files differ
diff --git a/PayM/obj/Debug/PayM.dll b/PayM/obj/Debug/PayM.dll
index 58ec913..dda57db 100644
--- a/PayM/obj/Debug/PayM.dll
+++ b/PayM/obj/Debug/PayM.dll
Binary files differ
diff --git a/PayM/obj/Debug/PayM.pdb b/PayM/obj/Debug/PayM.pdb
index 267460b..6183d31 100644
--- a/PayM/obj/Debug/PayM.pdb
+++ b/PayM/obj/Debug/PayM.pdb
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index 88e8857..39742c7 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 3aa0cf6..75a64a4 100644
--- a/Pub_Class/bin/Release/Pub_Class.pdb
+++ b/Pub_Class/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.dll b/Pub_Control/bin/Release/Pub_Class.dll
index 88e8857..39742c7 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 3aa0cf6..75a64a4 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 d6a08ba..89d99bb 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 cabb1cf..962fcbb 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 88e8857..39742c7 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 3aa0cf6..75a64a4 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 32d8b85..e497353 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 cfbbb50..812977d 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 f5567d5..42fb0c2 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 32d8b85..e497353 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 cfbbb50..812977d 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
index 95849dc..c1cb681 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
new file mode 100644
index 0000000..d4f984c
--- /dev/null
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..b04aad7
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..48caaab
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+f95e56b5f9755e3380309c272e92c6c4a10dd4c5
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index 4194e9d..5a3a400 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -9,3 +9,9 @@
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\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
+D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
+D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
+D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index 95849dc..c1cb681 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
new file mode 100644
index 0000000..d4f984c
--- /dev/null
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipPatrolCheckBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipPatrolCheckBillController.cs
new file mode 100644
index 0000000..04456ae
--- /dev/null
+++ b/WebAPI/Controllers/SBGL/Sb_EquipPatrolCheckBillController.cs
@@ -0,0 +1,1196 @@
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.IO;
+using System.Web;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers
+{
+ public class Sb_EquipPatrolCheckBillController : ApiController
+ {
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ public DAL.ClsSb_EquipDotCheckBill BillNew = new DAL.ClsSb_EquipDotCheckBill(); //瀵瑰簲鍗曟嵁绫�
+ public DAL.ClsSb_EquipDotCheckBill BillOld = new DAL.ClsSb_EquipDotCheckBill(); //瀵瑰簲鍗曟嵁绫�
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); //鑾峰彇绯荤粺鍙傛暟
+ string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];
+
+ #region 璁惧宸℃璁板綍琛�
+
+ /// <summary>
+ /// 璁惧宸℃璁板綍琛ㄥ垪琛� list鍒楄〃鏁版嵁鍔犺浇
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sb_EquipPatrolCheckBill/GetEquipPatrolCheckBillList")]
+ [HttpGet]
+ public object GetEquipPatrolCheckBillList(string sWhere,string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipPatrolCheckBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ string sReturn = "";
+ string HViewName = "h_v_Sb_EquipPatrolCheckBillList";//瑙嗗浘鍛藉悕
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ /*
+ if (oSystemParameter.omodel.WMS_CampanyName == "涔濊彵")
+ {
+ HViewName = "h_v_Sb_EquipPatrolCheckBillMainList";
+ }
+ */
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁璇诲彇澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from " + HViewName + " " + sWhere + " order by hmainid desc", HViewName);
+ }
+ else
+ {
+ string sql1 = "select * from " + HViewName + " " + " where 1 = 1";
+ string sql = sql1 + sWhere + " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, HViewName);
+ }
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #region 璁惧鐐规璁板綍鍒嗛〉鏌ヨ
+ [Route("Sb_EquipDotCheckBill/GetEquipDotCheckBillListPage")]
+ [HttpGet]
+ public object GetEquipDotCheckBillListPage(string sWhere, string user, int page, int size)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipDotCheckBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Sb_EquipDotCheckBillListPage " + page + "," + size + ",''", "h_p_Sb_EquipDotCheckBillListPage");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Sb_EquipDotCheckBillListPage " + page + "," + size + ",'" + sWhere + "'", "h_p_Sb_EquipDotCheckBillListPage");
+ }
+
+ //娣诲姞鍒楀悕
+ 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 sql璇彞
+
+
+ public static DataSet Sb_EquipDotCheckBillList_s(string sWhere)
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sb_EquipDotCheckBillList ", "h_v_Sb_EquipDotCheckBillList");
+ }
+ #endregion
+
+ #region 璁惧鐐规璁板綍琛� 淇濆瓨/缂栬緫
+ /// <summary>
+ /// 鐐规璁板綍琛� 淇濆瓨
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Sb_EquipDotCheckBill/SaveEquipDotCheckBillList")]
+ [HttpPost]
+ public object SaveEquipDotCheckBillList([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();
+
+
+ string UserName = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsSb_EquipDotCheckBill oBill = new DAL.ClsSb_EquipDotCheckBill();
+ List<Model.ClsSb_EquipDotCheckBillMain> lsmain = new List<Model.ClsSb_EquipDotCheckBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Sb_EquipDotCheckBillMain(msg2);
+ foreach (Model.ClsSb_EquipDotCheckBillMain oItem in lsmain)
+ {
+ //oItem.HMaker = "";
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3903";
+ oItem.HBillSubType = "3903";
+ DBUtility.ClsPub.CurUserName = UserName;
+ //oItem.HInterID =0;
+ //oItem.HBillNo = "";
+ oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ //oItem.HMakeDate = "";
+ //oItem.HYear = "";
+ //oItem.HPeriod = "";
+ //oItem.HRemark = "";
+ //oItem.HCycleUnit = "";
+ //oItem.HCheckCycle = "";
+ //oItem.HBeginDate = "";
+ //oItem.HEndDate = "";
+ //oItem.HInnerBillNo = "";
+ //oItem.HExplanation = "";
+
+ //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ 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.ClsSb_EquipDotCheckBillSub> ls = new List<Model.ClsSb_EquipDotCheckBillSub>();
+ ls = oListModels.getObjectByJson_Sb_EquipDotCheckBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsSb_EquipDotCheckBillSub oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //HMaterID = "";//閰嶄欢浠ｇ爜
+ //HUnitID = "";//鍗曚綅浠ｇ爜
+ //HQty = "";//瀹為檯鐢ㄩ噺
+ //HQtyMust = "";//鍗曚綅鐢ㄩ噺
+ //HRemark = "";//澶囨敞
+
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ 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 = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region [璁惧鐐规璁板綍琛ㄥ垹闄ゅ姛鑳絔
+ /// <summary>
+ /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sb_EquipDotCheckBill/DeltetEquipDotCheckBillList")]
+ [HttpGet]
+ public object DeltetEquipDotCheckBillList(string HInterID,string user)
+ {
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Sb_EquipDotCheckBill_Delete", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DAL.ClsSb_EquipDotCheckBill oBill = new DAL.ClsSb_EquipDotCheckBill();
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍒犻櫎鍓嶆帶鍒�
+ DataSet BeforeDs = oCN.RunProcReturn("Exec h_p_Sb_EquipDotCheckBill_BeforeDelCtrl " + HInterID.ToString() + ",'" + user + "'", "h_p_Sb_EquipDotCheckBill_BeforeDelCtrl");
+ if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Sb_EquipDotCheckBill_AfterDelCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (IsDete)
+ {
+ 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;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region[璁惧鐐规璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
+ [Route("Sb_EquipDotCheckBill/Sb_EquipDotCheckBillListCheckDetai")]
+ [HttpGet]
+ public ApiResult<DataSet> Sb_EquipDotCheckBillListCheckDetai(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sb_EquipDotCheckBill_Edit2 where hmainid= " + HID + " ", "h_v_Sb_EquipDotCheckBill_Edit2");
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ偣妫�璁板綍琛�" };
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+
+ #region[璁惧鐐规璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄩ鏁版嵁]
+ [Route("Sb_EquipDotCheckBill/Sb_EquipDotCheckBillListProjectDetai")]
+ [HttpGet]
+ public object Sb_EquipDotCheckBillListProjectDetai(string sqlWhere)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if (sqlWhere == null || sqlWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Sb_EquipDotCheckBill_Edit", "h_v_Sb_EquipDotCheckBill_Edit");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sb_EquipDotCheckBill_Edit where 1 = 1 ";
+ string sql = sql1 + sqlWhere;
+ ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckBill_Edit");
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁″垝锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+
+ #endregion
+
+
+ #region 鏍规嵁璁惧鏉＄爜鏌ユ壘璁惧妗ｆ淇℃伅PDA
+ [Route("Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown")]
+ [HttpGet]
+ public object txtHBarCode_KeyDown(string HBarCode)
+ {
+ try
+ {
+ if (HBarCode == null || HBarCode.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉″舰鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select top 1 * from Gy_EquipFileBillMain where HEquipFileNumber= '" + HBarCode + "'", "Gy_EquipFileBillMain");
+ //鍐欏叆淇℃伅
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璁惧淇℃伅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍规嵁璁惧鏉＄爜鏌ユ壘璁惧妗ｆ淇℃伅PDA 鏌ヨ鏉＄爜妗ｆ鍒楄〃
+ [Route("Sb_PDA_EquipDotCheckBill/txtHBarCode_KeyDown_List")]
+ [HttpGet]
+ public object txtHBarCode_KeyDown_List(string HBarCode)
+ {
+ try
+ {
+ if (HBarCode == null || HBarCode.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏉″舰鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //寰楀埌淇℃伅
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_EquipFileMainList where 鏉″舰鐮�= '" + HBarCode + "'", "h_v_Gy_EquipFileMainList");
+ //鍐欏叆淇℃伅
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏈煡璇㈠埌璁惧淇℃伅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧鐐规璁板綍鎻愪氦PDA
+
+ [Route("Sb_PDA_EquipDotCheckBill/SaveGetEquipDotCheckBillList")]
+ [HttpPost]
+ public object SaveGetEquipDotCheckBillList([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 UserName = "";
+
+ ListModels oListModels = new ListModels();
+ try
+ {
+ DLL.ClsSb_EquipDotCheckBill oBill = new DLL.ClsSb_EquipDotCheckBill();
+ List<Models.ClsSb_EquipDotCheckBillMain> lsmain = new List<Models.ClsSb_EquipDotCheckBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Sb_EquipDotCheckBillMainPDA(msg2);
+ foreach (Models.ClsSb_EquipDotCheckBillMain oItem in lsmain)
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ //oItem.HMaker = "";
+ UserName = oItem.HMaker; //鍒跺崟浜�
+ oItem.HBillType = "3903";
+ oItem.HBillSubType = "3903";
+ //oItem.HBillNo = ""; //鍗曟嵁鍙�
+ //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ //oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
+ //oItem.HPeriod = 0;
+ //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
+ //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝ｅ父锛屽紓甯�)
+ //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee)
+ //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee)
+ //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
+ //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
+ //oItem.HRemark = ""; //澶囨敞
+
+ //oItem.HMainSourceInterID = oItem.HInterID;
+
+ //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
+ 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
+ List<Models.ClsSb_EquipDotCheckBillSub> ls = new List<Models.ClsSb_EquipDotCheckBillSub>();
+ ls = oListModels.getObjectByJson_Sb_EquipDotCheckBillSubPDA(msg3);
+ int i = 0;
+ foreach (Models.ClsSb_EquipDotCheckBillSub oItemSub in ls)
+ {
+
+ i++;
+ oItemSub.HEntryID = i;
+
+ //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID
+ //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭
+ //oItemSub.HManagerID = 0; //璐熻矗浜篒D
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ //oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ //oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
+ //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
+ //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
+ //oItemSub.HMoney = 0; //缁翠慨璐圭敤
+ oBill.DetailColl.Add(oItemSub);
+
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ 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 = "淇濆瓨鎴愬姛锛�";
+ //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧鐐规璁板綍鍗曞鏍�/鍙嶅鏍稿姛鑳�
+ [Route("Sb_EquipDotCheckBill/CheckSb_EquipDotCheckBill")]
+ [HttpGet]
+ public object CheckSb_EquipDotCheckBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬鏍�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Sb_EquipDotCheckBill_BeforeCheckCtrl " + HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Sb_EquipDotCheckBill_BeforeCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ oCN.RollBack();
+ return objJsonResult;
+ }
+ //==================================================================================
+
+ if (!BillOld.CheckBill(int.Parse(HInterID), BillOld.omodel.HBillNo, "h_p_Sb_EquipDotCheckBill_AfterCheckCtrl", user, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ string sql1 = "exec h_p_Sb_EquipDotCheckBill_BeforeUnCheckCtrl " + HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Sb_EquipDotCheckBill_BeforeUnCheckCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //===========================================================
+
+ if (!BillOld.AbandonCheck(int.Parse(HInterID), BillOld.omodel.HBillNo, "h_p_Sb_EquipDotCheckBill_AfterUnCheckCtrl", user, ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ 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
+
+ #region 璁惧鐐规璁板綍鍗曞叧闂�/鍙嶅叧闂姛鑳�
+ [Route("Sb_EquipDotCheckBill/CloseSb_EquipDotCheckBill")]
+ [HttpGet]
+ public object CloseSb_EquipDotCheckBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ string sql = "";
+ //鍏抽棴鍓嶆帶鍒�===============================================Begin===================================================================
+ sql = "exec h_p_Sb_EquipDotCheckBill_BeforeCloseCtrl " + HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_Sb_EquipDotCheckBill_BeforeCloseCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:鍏抽棴鍓嶅墠鍒ゆ柇澶辫触锛屾棤杩斿洖淇℃伅锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍏抽棴鍓嶆帶鍒�===============================================End===================================================================
+
+ //鍏抽棴鎻愪氦
+ if (BillOld.CloseBill(Convert.ToInt32(HInterID), BillOld.omodel.HBillNo, "h_p_Sb_EquipDotCheckBill_AfterCloseCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ string sql = "";
+ //鍙嶅叧闂墠鎺у埗===============================================Begin===================================================================
+ sql = "exec h_p_Sb_EquipDotCheckBill_BeforeUnCloseCtrl " + HInterID + ",'" + BillOld.omodel.HBillNo + "','" + user + "'";
+ ds = oCN.RunProcReturn(sql, "h_p_Sb_EquipDotCheckBill_BeforeUnCloseCtrl");
+ if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:鍙嶅叧闂墠鍓嶅垽鏂け璐ワ紝鏃犺繑鍥炰俊鎭紝璇蜂笌缃戠粶绠＄悊浜哄憳鑱旂郴";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅叧闂墠鎺у埗===============================================End===================================================================
+
+ //鍙嶅叧闂彁浜�
+ if (BillOld.CancelClose(Convert.ToInt32(HInterID), BillOld.omodel.HBillNo, "h_p_Sb_EquipDotCheckBill_AfterUnCloseCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ 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
+
+ #region 璁惧鐐规閫炬湡棰勮鎶ヨ〃
+
+ [Route("Sb_EquipDotCheckWarning/Report")]
+ [HttpGet]
+ public object Report(string HYear,string HMonth,string HEquipTypeID, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //if (!DBUtility.ClsPub.Security_Log("Gy_EquipFileList", 1, false, user))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ if (HYear == null || HYear.Equals("") || HMonth == null || HMonth.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨鏈夋晥骞翠唤锛屾湀浠�";
+ objJsonResult.data = "";
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ string sql = "exec h_p_Sb_EquipDotCheckWarningReport " + HYear + "," + HMonth + "," + HEquipTypeID;
+ ds = oCN.RunProcReturn(sql, "h_p_Sb_EquipDotCheckWarningReport");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧鐐规璁板綍鎷嶇収涓婁紶
+ [Route("Sb_EquipDotCheckBill/UploadFile")]
+ [HttpPost]
+ public object UploadFile()
+ {
+
+ string HBillNo = HttpContext.Current.Request.Params["HBillNo"]; //鍗曟嵁鍙�
+ string HRemark = HttpContext.Current.Request.Params["HRemark"]; //澶囨敞
+ string HUserName = HttpContext.Current.Request.Params["HUserName"]; //鍒涘缓浜�
+ HttpPostedFile files = HttpContext.Current.Request.Files["file"];
+ string path = HttpContext.Current.Server.MapPath("~/../Files/EquipFolder/" + HBillNo);
+ //string path = @"D:\\Files\\"+ HBillNo;
+ dynamic dyResult = UpLoadFile(files, path, HBillNo, HRemark, HUserName);
+ if (dyResult != null && dyResult.result == 1)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "涓婁紶鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = dyResult.returnval;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+ public dynamic UpLoadFile(HttpPostedFile files, string path, string HBillNo, string HRemark, string HUserName)
+ {
+ dynamic Result_Ob = new { result = 1, returnval = "涓婁紶鎴愬姛锛�" };
+ string filePath = Path.GetFullPath(files.FileName);//鏂囦欢涓婁紶璺緞
+ string fileExtension = Path.GetExtension(files.FileName);// 鏂囦欢鎵╁睍鍚�
+ string filename = files.FileName;//鏂囦欢鍚�
+ string fileSavePath = path;// 涓婁紶淇濆瓨璺緞
+ int filesize = files.ContentLength;//鑾峰彇涓婁紶鏂囦欢鐨勫ぇ灏忓崟浣嶄负瀛楄妭byte
+ int Maxsize = 40000 * 1024;//瀹氫箟涓婁紶鏂囦欢鐨勬渶澶х┖闂村ぇ灏忎负40M
+ try
+ {
+ if (files == null || files.ContentLength <= 0)
+ {
+ Result_Ob = new { result = 0, returnval = "鏂囦欢涓嶈兘涓虹┖!" };
+ return Result_Ob;
+ }
+ if (filesize >= Maxsize)
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶鏂囦欢瓒呰繃40M锛屼笉鑳戒笂浼狅紒" };
+ return Result_Ob;
+ }
+
+ string fileurl = Path.Combine(fileSavePath, filename);
+ if (Directory.Exists(fileurl) == true) //濡傛灉瀛樺湪閲嶅悕鏂囦欢灏辨彁绀�
+ {
+ Result_Ob = new { result = 0, returnval = "瀛樺湪鍚屽悕鏂囦欢锛�" };
+ return Result_Ob;
+ }
+ //鍒犻櫎鏁版嵁琛ㄦ暟鎹�
+ ds = oCN.RunProcReturn("delete from MES_AccessoriesList where HSourceBillNo ='" + HBillNo + "' and HFileName='" + filename + "'", "MES_AccessoriesList");
+ if (Directory.Exists(path))
+ {
+ File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
+ files.SaveAs(fileurl);
+ string StrPath = "/files/EquipFolder/" + HBillNo + "/" + filename;
+ if (File.Exists(fileurl))
+ {
+ //杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
+ //鍐欏叆鏁版嵁琛�
+ oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
+ ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
+ ",HFileClsID,HSourceBillNo" +
+ ") values('"
+ + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+ ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
+ "','" + 0 + "','" + HBillNo +
+ "') ");
+ }
+ else
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+ }
+ }
+ else
+ {
+ Directory.CreateDirectory(fileSavePath); //娣诲姞鏂囦欢澶�
+ files.SaveAs(fileurl);
+ string StrPath = "/files/EquipFolder/" + HBillNo + "/" + filename;
+ if (File.Exists(fileurl))
+ {
+ //杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
+ //鍐欏叆鏁版嵁琛�
+ oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
+ ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
+ ",HFileClsID,HSourceBillNo" +
+ ") values('"
+ + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+ ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
+ "','" + 0 + "','" + HBillNo +
+ "') ");
+ }
+ else
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ Result_Ob = new { result = 0, returnval = e.Message };
+ }
+ return Result_Ob;
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍗曟嵁鍙锋煡鎵句笂浼犳枃浠跺垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("Sb_EquipDotCheckBill/Filelist")]
+ [HttpGet]
+ public object Filelist(string HBillNo)
+ {
+ var url = fileip + "/files/EquipFolder/" + HBillNo + "/";
+ //@"C:\\files\\"
+ try
+ {
+ ds = oCN.RunProcReturn("select *,'" + url + "'+CAST(HFileName as varchar(200))as url from MES_AccessoriesList where HSourceBillNo='" + HBillNo + "'", "MES_AccessoriesList");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁ID,鍗曟嵁鍙�,鏂囦欢鍚� 鍒犻櫎鏂囦欢
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("Sb_EquipDotCheckBill/DeleteFilelist")]
+ [HttpGet]
+ public object DeleteFilelist(string HItemID, string HSourceBillNo, string HFileName)
+ {
+ try
+ {
+
+ oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);
+ string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/EquipFolder/" + HSourceBillNo), HFileName);
+ File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
index 3725e1f..51d3fcb 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormBillController.cs"
@@ -62,6 +62,54 @@
}
}
+ [Route("JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillListExtendMakeDate")]
+ [HttpGet]
+ public object JIT_DayPlanPlatFormBillListExtendMakeDate(string sWhere, string user)
+ {
+ try
+ {
+ //鏌ョ湅鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_WorkBillSortBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<object> columnNameList = new List<object>(); //瀹氫箟澹版槑鍙橀噺 锛屾妸閫氳繃 new List<object>()鍒涘缓鐨� 瀹炰緥锛岃祴鍊肩粰鍙橀噺
+ omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere);
+
+ ds = oCN.RunProcReturn($"exec h_p_JIT_Sc_WorkBillSortBill_Query_ExtendMakeDate '{omdelMian.HPlanBeginDate}',{(omdelMian.HProdORGID == null ? 0 : omdelMian.HProdORGID)},'{omdelMian.HSeOrderBillNo}'" +
+ $",'{omdelMian.HPlanEndDate.AddDays(1)}',{omdelMian.HMaterID},'{omdelMian.HICMOBillNo}',{omdelMian.HWorkShopID}" +
+ $",'{omdelMian.HMastersDate}','{ omdelMian.HMakeDate }','{omdelMian.sWheres}'", "h_p_JIT_Sc_WorkBillSortBill_QueryExtendMakeDate");
+
+
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
/// <summary>
/// 鏍规嵁ID鏌ヨ 榻愬鐘舵�� 鍜� 閿佸畾鐘舵��
/// </summary>
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
index c4ed243..52df4ba 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
@@ -190,7 +190,7 @@
// try
// {
- // ds = Sc_MouldMaintainBillList_s(sWhere);
+ // ds = Sc_MouldMaintainBillList_s(sWhere);
// if (ds == null || ds.Tables[0].Rows.Count <= 0)
// {
// objJsonResult.code = "0";
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 7e43c66..f894687 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -19080,6 +19080,51 @@
}
/// <summary>
+ /// 鑾峰彇宸℃椤圭洰鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetPatrolCheckItemList_Json")]
+ [HttpGet]
+ public object GetPatrolCheckItemList_Json(string CheckItem)
+ {
+ DataSet ds;
+ try
+ {
+ sWhere = " Where HStopFlag=0 and HEndFlag=1";
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ if(CheckItem != "" && CheckItem != null)
+ {
+ sWhere = sWhere + " and ( HNumber like '%" + CheckItem + "%' or HName like '%" + CheckItem + "%' ) ";
+ }
+ ds = oCN.RunProcReturn("Select HItemID,HNumber,HName from Gy_PatrolCheck " + sWhere + " Order by HItemID ", "Gy_DotCheck");
+ if(ds == null )
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch(Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ /// <summary>
/// 鑾峰彇鐢熶骇浠诲姟鍗曞垪琛�
/// </summary>
/// <returns></returns>
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckBillController.cs"
new file mode 100644
index 0000000..5bc9ca0
--- /dev/null
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckBillController.cs"
@@ -0,0 +1,1224 @@
+锘縰sing DBUtility;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+using System.Web;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
+using System.IO;
+
+namespace WebAPI.Controllers.鍩虹璧勬枡.鍩虹璧勬枡
+{
+ public class Gy_PatrolCheckBillController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+ Models.ClsGy_PatrolCheck oDept = new Models.ClsGy_PatrolCheck();
+ Models.ClsGy_PatrolCheck oDeptHlp = new Models.ClsGy_PatrolCheck();
+
+ #region 宸℃椤圭洰鍒楄〃鏁版嵁
+ [Route("Gy_PatrolCheck/GetPatrolCheckList")]
+ [HttpGet]
+ public object GetPatrolCheckList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (!DBUtility.ClsPub.Security_Log("Gy_PatrolCheck", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCN.RunProcReturn("select * from h_v_Gy_PatrolCheckList where 1=1 " + sWhere+ " order by HItemID", "h_v_Gy_PatrolCheckList");
+
+ //娣诲姞鍒楀悕
+ 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鍒楀璞＄殑鍒楀悕
+ }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //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_PatrolCheck/DeletePatrolCheck")]
+ [HttpGet]
+ public object DeletePatrolCheck(long HItemID, string User)
+ {
+
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_PatrolCheck_Delete", 1, false, User))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("Select * from Gy_PatrolCheck Where HItemID='" + HItemID + "'", "Gy_PatrolCheck", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ oCN.BeginTran();
+
+ //鍒犻櫎鍓嶆帶鍒�=========================================
+ ds = oCN.RunProcReturn("Exec h_p_Gy_PatrolCheck_BeforeDelCtrl " + HItemID + ",'" + User + "'", "h_p_Gy_PatrolCheck_BeforeDelCtrl");
+ if (ds == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ ds = oCN.RunProcReturn("Delete from Gy_PatrolCheck Where HItemID='" + HItemID + "'", "Gy_PatrolCheck", ref DBUtility.ClsPub.sExeReturnInfo);
+
+
+ //鍒犻櫎鍚庢帶鍒�=========================================
+ DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_PatrolCheck_AfterDelCtrl " + HItemID + ",'" + User + "'", "h_p_Gy_PatrolCheck_AfterDelCtrl");
+ if (ds2 == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎鍚庡垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ oCN.Commit();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 淇敼宸℃椤圭洰鑾峰彇缁戝畾鏁版嵁
+ [Route("Gy_PatrolCheck/EditPatrolCheck")]
+ [HttpGet]
+ public object EditPatrolCheck(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_PatrolCheck_Edit where HItemID=" + HInterID, "h_v_Gy_PatrolCheck_Edit");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ 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_PatrolCheck/EditBill")]
+ [HttpPost]
+ public object EditBill([FromBody] JObject oMain)
+ {
+
+ try
+ {
+ var _value = oMain["oMain"].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();//褰撳墠浜�
+
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Models.ClsGy_PatrolCheck> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_PatrolCheck>>(msg2);
+
+ long HItemID = int.Parse(msg4);
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HNumber;
+ long HLevel = list[0].HLevel;
+ long HUSEORGID = list[0].HUSEORGID;
+ string HHelpCode = list[0].HHelpCode;
+ string HRemark = list[0].HRemark;
+ bool HStopflag = list[0].HStopflag;
+ string HModifyEmp = msg3;
+ string HPatrolCheckType = list[0].HPatrolCheckType;
+ bool HEndFlag = list[0].HEndFlag;
+ Int64 HPatrolCheckItemClassID = list[0].HPatrolCheckItemClassID;
+
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log("Gy_PatrolCheck_Edit", 1, false, msg3))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //if (oDept.HavSameNumber(HItemID, HNumber))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "浠ｇ爜閲嶅锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ DataSet ds = oCN.RunProcReturn("Exec h_p_Gy_PatrolCheck_BeforeSaveCtrl " + msg3 + ",'1'", "h_p_Gy_PatrolCheck_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ //涓昏〃
+ oCN.RunProc("Update Gy_PatrolCheck set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HModifyEmp='" + HModifyEmp + "'" +
+ ",HModifyTime=getdate()" +
+ ",HShortNumber='" + HShortNumber + "'" +
+ ",HUSEORGID=" + HUSEORGID +
+ ",HHelpCode='" + HHelpCode + "'" +
+ ",HStopflag='" + HStopflag + "'" +
+ ",HPatrolCheckType='" + HPatrolCheckType + "'" +
+ ",HPatrolCheckItemClassID=" + HPatrolCheckItemClassID +
+ ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //淇濆瓨鍚庢帶鍒�=========================================
+ DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_PatrolCheck_AfterSaveCtrl " + msg3 + ",'1'", "h_p_Gy_PatrolCheck_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨鍚庡垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇敼鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸℃椤圭洰鏂板淇濆瓨
+ [Route("GetPatrolCheck/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject oMain)
+ {
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();//褰撳墠浜�
+
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+
+ List<Models.ClsGy_PatrolCheck> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_PatrolCheck>>(msg2);
+
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HNumber;
+ long HLevel = list[0].HLevel;
+ long HUSEORGID = list[0].HUSEORGID;
+ long HCREATEORGID = list[0].HCREATEORGID;
+ string HHelpCode = list[0].HHelpCode;
+ string HRemark = list[0].HRemark;
+ bool HStopflag = list[0].HStopflag;
+ string HUseFlag = list[0].HUseFlag;
+ string HMakeEmp = list[0].HMakeEmp;
+ bool HEndFlag = list[0].HEndFlag;
+ string HPatrolCheckType = list[0].HPatrolCheckType;
+ Int64 HPatrolCheckItemClassID = list[0].HPatrolCheckItemClassID;
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log("Gy_PatrolCheck_Edit", 1, false, msg3))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+
+ //淇濆瓨鍓嶆帶鍒�=========================================
+ DataSet ds = oCN.RunProcReturn("Exec h_p_Gy_PatrolCheck_BeforeSaveCtrl " + msg3 + ",'1'", "h_p_Gy_PatrolCheck_BeforeSaveCtrl");
+ if (ds == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ //涓昏〃
+ oCN.RunProc("Insert into Gy_PatrolCheck " +
+ " (HNumber,HName,HHelpCode,HShortNumber" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HParentID,HPatrolCheckItemClassID" +
+ ",HMakeEmp,HMakeTime,HUSEORGID,HCREATEORGID,HUseFlag,HPatrolCheckType" +
+ " ) " +
+ " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," +
+ +HLevel + ",1," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',0," + HPatrolCheckItemClassID + "" +
+ ",'" + HMakeEmp + "',getdate()," + HUSEORGID + "," + HCREATEORGID + ",'" + HUseFlag + "','"+ HPatrolCheckType + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ //oCN.RunProc("Update Gy_MouldType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+
+ //淇濆瓨鍚庢帶鍒�=========================================
+ DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_PatrolCheck_AfterSaveCtrl " + msg3 + ",'1'", "h_p_Gy_PatrolCheck_AfterSaveCtrl");
+ if (ds2 == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨鍚庡垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "" + DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸℃椤圭洰鍒楄〃 鏍戠姸鍥� 鐐瑰嚮鍒嗙被鏌ヨ
+ public class TreeModel
+ {
+ public string id { get; set; }
+ public string title { get; set; }
+ public List<TreeModel> children = new List<TreeModel>();
+ }
+ [Route("Gy_PatrolCheckBill/TreeGetList")]
+ [HttpGet]
+ public object TreeGetList(string sWhere, string user)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn("select HItemID,HNumber,HName from gy_PatrolCheckItemClass", "gy_PatrolCheckItemClass");
+
+ List<TreeModel> treeModels = new List<TreeModel>();
+ TreeModel first = new TreeModel();
+ first.id = "0";
+ first.title = "宸℃椤圭洰鍒嗙被璁剧疆";
+ treeModels.Add(first);
+
+ foreach (DataRow row in ds.Tables[0].Rows)
+ {
+ var strLen = row["hitemid"].ToString().Split('.');
+ if (strLen.Length == 1)
+ {
+ TreeModel tree = new TreeModel();
+ tree.id = row["HItemID"].ToString();
+ tree.title = row["HName"].ToString();
+ treeModels[0].children.Add(tree);
+ }
+ }
+ digui(ds.Tables[0], treeModels[0].children, 2);
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(treeModels);
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ /// <summary>
+ /// 閫掑綊鍑芥暟
+ /// </summary>
+ public void digui(DataTable dt, List<TreeModel> tree, int num)
+ {
+ for (int m = 0; m < tree.Count; m++)
+ {
+ tree[m].children = new List<TreeModel>();
+ for (int i = 0; i < dt.Rows.Count; i++)//绗竴娆″惊鐜紝寰楀埌鎵�鏈夋牴鑺傜偣鐨勫瓙闆�
+ {
+ var strLen = dt.Rows[i]["HNumber"].ToString().Split('.');
+ if (strLen.Length == num && dt.Rows[i]["HNumber"].ToString().Contains(tree[m].id + "."))
+ {
+ TreeModel tbjson = new TreeModel();
+ tbjson.id = dt.Rows[i]["HItemID"].ToString();
+ tbjson.title = dt.Rows[i]["HName"].ToString();
+ tree[m].children.Add(tbjson);
+ }
+ }
+ var strLens = tree[m].id.Split('.');
+ for (int i = 0; i < tree[m].children.Count; i++)
+ {
+ digui(dt, tree[m].children, strLens.Length + 2);//鍐嶆鐢ㄥ瓙闆嗗幓寰幆锛屾嬁鍑哄瓙闆嗙殑瀛愰泦
+ }
+ }
+
+ }
+ #endregion
+
+ #region 宸℃椤圭洰鏂囦欢涓婁紶
+ [Route("Gy_PatrolCheck/Gy_PatrolCheck_Excel")]
+ [HttpPost]
+ public object Gy_PatrolCheck_Excel()
+ {
+ 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 tb2 = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
+ tb2.Columns.Add("HOrgID", typeof(Int32));//缁勭粐ID
+ tb2.Columns.Add("HPatrolCheckItemClassID", typeof(Int32));//宸℃椤圭洰鍒嗙被ID
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = tb2.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ tb2.Rows.Add(row);
+ }
+
+
+ var error = "";
+
+ //鏌ヨ宸ヤ綔涓績娌℃湁鐨勫垪
+ if (!tb2.Columns.Contains("缁勭粐浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囦唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("缁勭粐鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囧悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸℃椤圭洰浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愬贰妫�椤圭洰浠ｇ爜銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸℃椤圭洰鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愬贰妫�椤圭洰鍚嶇О銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸℃椤圭洰鍒嗙被浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愬贰妫�椤圭洰鍒嗙被浠ｇ爜銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸℃椤圭洰鍒嗙被鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愬贰妫�椤圭洰鍒嗙被鍚嶇О銆戠殑鏍囬,";
+
+
+ if (error.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ for (int i = 0; i <= tb2.Rows.Count - 1; i++)
+ {
+
+ string HORGNumber = "";
+ string HORGName = "";
+ string HPatrolCheckNum = "";
+ string HPatrolCheckName = "";
+ string HPatrolCheckItemClassNum = "";
+ string HPatrolCheckItemClassName = "";
+
+ HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐浠ｇ爜"].ToString());
+ HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐鍚嶇О"].ToString());
+ HPatrolCheckNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["宸℃椤圭洰浠ｇ爜"].ToString());
+ HPatrolCheckName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["宸℃椤圭洰鍚嶇О"].ToString());
+ HPatrolCheckItemClassNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["宸℃椤圭洰鍒嗙被浠ｇ爜"].ToString());
+ HPatrolCheckItemClassName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["宸℃椤圭洰鍒嗙被鍚嶇О"].ToString());
+
+ //妫�鏌ョ粍缁�
+ int index = i + 1;
+
+ if (HORGNumber != "")
+ {
+
+
+ //鏌ヨ缁勭粐
+ ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,缁勭粐涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();
+
+
+ //鏌ヨ宸℃椤圭洰鍒嗙被
+ ds = oCN.RunProcReturn("select * from Gy_PatrolCheckItemClass where HNumber='" + HPatrolCheckItemClassNum + "' and HUSEORGID=" + HORGid + "", "Gy_Department");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,璇�" + HORGName + "缁勭粐,宸℃椤圭洰鍒嗙被:" + HPatrolCheckItemClassName + ",涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HPatrolCheckItemClassID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+
+ //宸℃椤圭洰鍚嶇О
+ if (HPatrolCheckName == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,宸℃椤圭洰鍚嶇О涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //宸℃椤圭洰浠ｇ爜
+ if (HPatrolCheckNum == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + index + "琛�,宸℃椤圭洰浠ｇ爜涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绗�" + index + "琛�,缁勭粐浠ｇ爜涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = error;
+ objJsonResult.data = tb2;
+ 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_PatrolCheck/Gy_PatrolCheck_btnSave")]
+ [HttpPost]
+ public object Gy_PatrolCheck_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_PatrolCheck_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 HOrgID = item["HOrgID"].ToString();//缁勭粐ID
+ string HPatrolCheckItemClassID = item["HPatrolCheckItemClassID"].ToString();//宸℃椤圭洰鍒嗙被ID
+ string HPatrolCheckItemClassName = item["宸℃椤圭洰鍒嗙被浠ｇ爜"].ToString();
+ string HPatrolCheckItemClassNum = item["宸℃椤圭洰鍒嗙被鍚嶇О"].ToString();
+ string HPatrolCheckName = item["宸℃椤圭洰鍚嶇О"].ToString();
+ string HPatrolCheckNum = item["宸℃椤圭洰浠ｇ爜"].ToString();
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(HPatrolCheckNum);//鐭唬鐮�
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ int HEndFlag = 1;//鏈骇鏍囧織
+ int HLevel = DBUtility.ClsPub.GetLevel(HPatrolCheckNum); //绛夌骇
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HPatrolCheckNum.Trim()))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_PatrolCheck where HNumber='" + HPatrolCheckNum + "'", "Gy_PatrolCheck");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+
+ string sql = "insert into Gy_PatrolCheck(HName,HNumber,HPatrolCheckItemClassID,HUSEORGID,HCREATEORGID,HShortNumber,HEndFlag,HLevel,HParentID,HStopflag,HRemark,HHelpCode)" +
+ $"values('{HPatrolCheckName}', '{HPatrolCheckNum}',{HPatrolCheckItemClassID}, {HOrgID},{HOrgID}, '{sShortNumber}', {HEndFlag},{HLevel},0,0,'','')";
+ oCN.RunProc(sql);
+ }
+ else
+ {
+ oCN.RunProc(" update Gy_PatrolCheck set HPatrolCheckItemClassID=" + HPatrolCheckItemClassID + " where HNumber='" + HPatrolCheckNum + "'");
+ }
+
+ 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>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_PatrolCheck/AuditGy_PatrolCheck")]
+ [HttpGet]
+ public object AuditGy_PatrolCheck(int HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_PatrolCheck_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_PatrolCheck where HItemID=" + HInterID, "Gy_PatrolCheck ");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+
+ oCN.BeginTran();
+
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ ds = oCN.RunProcReturn("Exec h_p_Gy_PatrolCheck_BeforeCheckCtrl " + HInterID + ",'" + CurUserName + "'", "h_p_Gy_PatrolCheck_BeforeCheckCtrl");
+ if (ds == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ oCN.RunProc("update Gy_PatrolCheck set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);
+
+ //瀹℃牳鍚庢帶鍒�=========================================
+ DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_PatrolCheck_AfterCheckCtrl " + HInterID + ",'" + CurUserName + "'", "h_p_Gy_PatrolCheck_AfterCheckCtrl");
+ if (ds2 == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鍚庡垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ ds = oCN.RunProcReturn("Exec h_p_Gy_PatrolCheck_BeforeUnCheckCtrl " + HInterID + ",'" + CurUserName + "'", "h_p_Gy_PatrolCheck_BeforeUnCheckCtrl");
+ if (ds == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ oCN.RunProc("update Gy_PatrolCheck set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
+
+
+ //鍙嶅鏍稿悗鎺у埗=========================================
+ DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_PatrolCheck_AfterUnCheckCtrl " + HInterID + ",'" + CurUserName + "'", "h_p_Gy_PatrolCheck_AfterUnCheckCtrl");
+ if (ds2 == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鍚庡垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ }
+
+
+
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸℃椤圭洰绂佺敤銆佸弽绂佺敤
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsStop">绂佺敤(0),鍙嶇鐢�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_PatrolCheck/StopGy_PatrolCheck")]
+ [HttpGet]
+ public object StopGy_PatrolCheck(int HInterID, int IsStop, string CurUserName)
+ {
+ try
+ {
+ //绂佺敤鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_PatrolCheck_Stop", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_PatrolCheck where HItemID=" + HInterID, "Gy_Material");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsStop == 0) //绂佺敤鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘鍐嶆绂佺敤锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鐢�!涓嶉渶瑕佸弽绂佺敤!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsStop == 0) //绂佺敤鍒ゆ柇
+ {
+ //绂佺敤鍓嶆帶鍒�=========================================
+ ds = oCN.RunProcReturn("Exec h_p_Gy_PatrolCheck_BeforeStopCtrl " + HInterID + ",'" + CurUserName + "'", "h_p_Gy_PatrolCheck_BeforeStopCtrl");
+ if (ds == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ oCN.RunProc("update Gy_PatrolCheck set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);
+
+ //绂佺敤鍚庢帶鍒�=========================================
+ DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_PatrolCheck_AfterStopCtrl " + HInterID + ",'" + CurUserName + "'", "h_p_Gy_PatrolCheck_AfterStopCtrl");
+ if (ds2 == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤鍚庡垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+ //鍙嶇鐢ㄥ墠鎺у埗=========================================
+ ds = oCN.RunProcReturn("Exec h_p_Gy_PatrolCheck_BeforeUnStopCtrl " + HInterID + ",'" + CurUserName + "'", "h_p_Gy_PatrolCheck_BeforeUnStopCtrl");
+ if (ds == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤鍓嶅垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ oCN.RunProc("update Gy_PatrolCheck set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);
+
+
+ //鍙嶇鐢ㄥ悗鎺у埗=========================================
+ DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_PatrolCheck_AfterUnStopCtrl " + HInterID + ",'" + CurUserName + "'", "h_p_Gy_PatrolCheck_AfterUnStopCtrl");
+ if (ds2 == null)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤鍚庡垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds2.Tables[0].Rows[0]["HBack"]) != "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触锛�" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //=========================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶇鐢ㄦ垚鍔�";
+ objJsonResult.data = null;
+ }
+ oCN.Commit();
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触鎴栬�呭弽绂佺敤澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemClassController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemClassController.cs"
new file mode 100644
index 0000000..0b8ee30
--- /dev/null
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemClassController.cs"
@@ -0,0 +1,653 @@
+锘縰sing DBUtility;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+using System.Web;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
+using System.IO;
+using SyntacticSugar.constant;
+
+namespace WebAPI.Controllers.鍩虹璧勬枡.鍩虹璧勬枡
+{
+ public class Gy_PatrolCheckItemClassController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+ public DAL.ClsGy_PatrolCheckItemClass_Ctl BillOld = new DAL.ClsGy_PatrolCheckItemClass_Ctl();
+
+ #region 宸℃椤圭洰鍒嗙被鍒楄〃鏁版嵁
+ [Route("Gy_PatrolCheckItemClass/GetPatrolCheckItemClassList")]
+ [HttpGet]
+ public object GetPatrolCheckItemClassList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (!DBUtility.ClsPub.Security_Log("Gy_PatrolCheckItemClass_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCN.RunProcReturn("select * from h_v_Gy_PatrolCheckItemClassList where 1=1 " + sWhere + " order by HItemID", "h_v_Gy_PatrolCheckItemClassList");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 淇敼宸℃椤圭洰鍒嗙被鑾峰彇缁戝畾鏁版嵁
+ [Route("Gy_PatrolCheckItemClass/EditPatrolCheckItemClass")]
+ [HttpGet]
+ public object EditPatrolCheck(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_PatrolCheckItemClass_Edit where HItemID=" + HInterID, "h_v_Gy_PatrolCheckItemClass_Edit");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ 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_PatrolCheckItemClass/SaveGy_PatrolCheckItemClassList")]
+ [HttpPost]
+ public object SaveGy_PatrolCheckItemClassList([FromBody] JObject msg)
+ {
+ DataSet ds;
+ var _value = msg["msg"].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg_HUserName = sArray[1].ToString();
+ string msg_HCreateORGID = sArray[2].ToString();
+ string msg_OperationType = sArray[3].ToString();
+
+ Int64 HItemID = 0;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ //缂栬緫鏉冮檺
+ if(!DBUtility.ClsPub.Security_Log_second("Gy_PatrolCheckItemClass_Edit", 1, false, msg_HUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鑾峰彇鏈�澶D鍊艰祴鍊�
+ DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_PatrolCheckItemClass ", "Gy_PatrolCheckItemClass");
+ if ((Maxds != null || Maxds.Tables[0].Rows.Count > 0) && ( Maxds.Tables[0].Rows[0]["HItemID"] != null && Maxds.Tables[0].Rows[0]["HItemID"].ToString() != "" && Maxds.Tables[0].Rows[0]["HItemID"].ToString() != "undefined") )
+ {
+ var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
+ maxid += 1;
+ HItemID = maxid;
+ }
+ else
+ {
+ HItemID = 1;
+ }
+ ListModels oListModels = new ListModels();
+
+ try
+ {
+ DAL.ClsGy_PatrolCheckItemClass_Ctl oBill = new DAL.ClsGy_PatrolCheckItemClass_Ctl();
+ List<Model.ClsGy_PatrolCheckItemClass_Model> lsmain = new List<Model.ClsGy_PatrolCheckItemClass_Model>();
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_PatrolCheckItemClass(msg1);
+ foreach (Model.ClsGy_PatrolCheckItemClass_Model oItem in lsmain)
+ {
+ if (oItem.HNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (oItem.HName.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ ds = oCN.RunProcReturn("select * from Gy_PatrolCheckItemClass where HStopflag = 0 and HNumber = '" + oItem.HNumber.Trim() + "'", "Gy_PatrolCheckItemClass");
+
+ //寰楀埌鐭唬鐮�
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oItem.HUSEORGID = Convert.ToInt32(msg_HCreateORGID); //缁勭粐id
+ oItem.HShortNumber = sShortNumber;//鐭唬鐮�
+ oItem.HEndFlag = true;//鏈骇鏍囧織
+ oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
+ oItem.HMakeEmp = msg_HUserName; //鍒跺崟浜�
+ oItem.HCREATEORGID = Convert.ToInt32(msg_HCreateORGID); //鍒涘缓缁勭粐
+ oBill.oModel = oItem;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (msg_OperationType == 1.ToString() || msg_OperationType == 2.ToString())
+ {
+ bResult = oBill.AddNew();
+ }
+ else
+ {
+ bResult = oBill.ModifyByID(oBill.oModel.HItemID);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸℃椤圭洰鍒嗙被鍒犻櫎
+ [Route("Gy_PatrolCheckItemClass/DeletePatrolCheckItemClass")]
+ [HttpGet]
+ public object DeletePatrolCheckItemClass(long HItemID, string User)
+ {
+
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_PatrolCheckItemClass_Delete", 1, false, User))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("Select * from Gy_PatrolCheckItemClass Where HItemID='" + HItemID + "'", "Gy_PatrolCheckItemClass", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ ds = oCN.RunProcReturn("Delete from Gy_PatrolCheckItemClass Where HItemID='" + HItemID + "'", "Gy_PatrolCheckItemClass", ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸℃椤圭洰鍒嗙被瀹℃牳銆佸弽瀹℃牳
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_PatrolCheckItemClass/AuditGy_PatrolCheckItemClass")]
+ [HttpGet]
+ public object AuditGy_PatrolCheckItemClass(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_PatrolCheckItemClass_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀹℃牳
+ DataSet ds;
+ string sql = "select * from Gy_PatrolCheckItemClass where HItemID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0].Rows[0]["HCheckEmp"] != null && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //瀹℃牳鍗曟嵁
+ if (!BillOld.AuditByID2(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅鏍�
+ DataSet ds;
+ string sql = "select * from Gy_PatrolCheckItemClass where HItemID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"] == null || ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅鏍稿崟鎹�
+ if (!BillOld.DeAuditByID2(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸℃椤圭洰鍒嗙被 鏂囦欢瀵煎叆淇濆瓨
+ #region 宸℃椤圭洰鍒嗙被 鏂囦欢涓婁紶
+ [Route("Gy_PatrolCheckItemClass/Gy_PatrolCheckItemClass_Excel")]
+ [HttpPost]
+ public object Gy_PatrolCheckItemClass_Excel()
+ {
+ 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 tb2 = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
+ tb2.Columns.Add("HOrgID", typeof(Int32));//缁勭粐ID
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = tb2.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ tb2.Rows.Add(row);
+ }
+
+
+ var error = "";
+
+ //鏌ヨ娌℃湁鐨勫垪
+ if (!tb2.Columns.Contains("缁勭粐浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囦唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("缁勭粐鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囧悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸℃椤圭洰鍒嗙被浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愬贰妫�椤圭洰鍒嗙被浠ｇ爜銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸℃椤圭洰鍒嗙被"))
+ error += "娌℃湁鎵惧埌銆愬贰妫�椤圭洰鍒嗙被銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("澶囨敞"))
+ error += "娌℃湁鎵惧埌銆愬娉ㄣ�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鍔╄鐮�"))
+ error += "娌℃湁鎵惧埌銆愬姪璁扮爜銆戠殑鏍囬,";
+
+ if (error.Length > 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ for (int i = 0; i <= tb2.Rows.Count - 1; i++)
+ {
+ string HName = "";
+ string HNum = "";
+ string HORGNumber = "";
+ string HORGName = "";
+
+
+ HName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["宸℃椤圭洰鍒嗙被"].ToString());
+ HNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["宸℃椤圭洰鍒嗙被浠ｇ爜"].ToString());
+ HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐浠ｇ爜"].ToString());
+ HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐鍚嶇О"].ToString());
+
+ //妫�鏌ョ墿鏂�
+ int index = i + 1;
+
+ if (HORGNumber != "")
+ {
+
+ //鏌ヨ缁勭粐
+ ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,缁勭粐涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+
+ //宸℃椤圭洰鍒嗙被鍚嶇О
+ if (HName == "")
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,宸℃椤圭洰鍒嗙被鍚嶇О涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //宸℃椤圭洰鍒嗙被浠ｇ爜
+ if (HNum == "")
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,宸℃椤圭洰鍒嗙被浠ｇ爜涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,缁勭粐浠ｇ爜涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = error;
+ objJsonResult.data = tb2;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸℃椤圭洰鍒嗙被椤圭洰 瀵煎叆(淇濆瓨)
+ [Route("Gy_PatrolCheckItemClass/Gy_PatrolCheckItemClass_btnSave")]
+ [HttpPost]
+ public object Gy_PatrolCheckItemClass_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_PatrolCheckItemClass_Edit", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ 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 HOrgID = item["HOrgID"].ToString();//缁勭粐ID
+ string HName = item["宸℃椤圭洰鍒嗙被"].ToString();
+ string HNumber = item["宸℃椤圭洰鍒嗙被浠ｇ爜"].ToString();
+ string HRemark = item["澶囨敞"].ToString();
+ string HHelpCode = item["鍔╄鐮�"].ToString();
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//鐭唬鐮�
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ int HEndFlag = 1;//鏈骇鏍囧織
+ int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //绛夌骇
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_PatrolCheckItemClass where HNumber='" + HNumber + "'", "Gy_PatrolCheckItemClass");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ oCN.RunProc("Insert into Gy_PatrolCheckItemClass (" +
+ "HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark" +
+ ",HMakeTime,HMakeEmp,HCREATEORGID,HUSEORGID) " +
+ " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + sShortNumber + "'," + 0 +
+ ", " + HLevel.ToString() + "," + HEndFlag + "," + 0 + ",'" + HRemark + "',getdate()" + ",'" + user + "'," + HOrgID + "," + HOrgID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ oCN.RunProc("Update " + "Gy_PatrolCheckItemClass " + " set " +
+ "HName='" + HName + "'" +
+ ",HShortNumber='" + sShortNumber + "'" +
+ ",HHelpCode='" + HHelpCode + "'" +
+ ",HRemark= '" + HRemark + "'" +
+ ",HModifyEmp= '" + user + "'" +
+ ",HModifyTime=getdate()" +
+ ",HUSEORGID=" + HOrgID +
+ " where HNumber='" + HNumber + "'");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "瀵煎叆鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ #endregion
+
+ }
+}
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemMethodController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemMethodController.cs"
new file mode 100644
index 0000000..d46a4c4
--- /dev/null
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PatrolCheckItemMethodController.cs"
@@ -0,0 +1,654 @@
+锘縰sing DBUtility;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+using System.Web;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
+using System.IO;
+using SyntacticSugar.constant;
+
+
+namespace WebAPI.Controllers.鍩虹璧勬枡.鍩虹璧勬枡
+{
+ public class Gy_PatrolCheckItemMethodController : ApiController
+ {
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+ public DAL.ClsGy_PatrolCheckItemMethod_Ctl BillOld = new DAL.ClsGy_PatrolCheckItemMethod_Ctl();
+
+ #region 宸℃鏂规硶鍒楄〃鏁版嵁
+ [Route("Gy_PatrolCheckItemMethod/GetPatrolCheckItemMethodList")]
+ [HttpGet]
+ public object GetPatrolCheckItemMethodList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+
+ if (!DBUtility.ClsPub.Security_Log("Gy_PatrolCheckItemMethod_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from h_v_Gy_PatrolCheckItemMethodList where 1=1 " + sWhere + " order by HItemID", "h_v_Gy_PatrolCheckItemMethodList");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 淇敼宸℃鏂规硶鑾峰彇缁戝畾鏁版嵁
+ [Route("Gy_PatrolCheckItemMethod/EditPatrolCheckItemMethod")]
+ [HttpGet]
+ public object EditPatrolCheckItemMethod(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from h_v_Gy_PatrolCheckItemMethod_Edit where HItemID=" + HInterID, "h_v_Gy_PatrolCheckItemMethod_Edit");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ 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_PatrolCheckItemMethod/SaveGy_PatrolCheckItemMethodList")]
+ [HttpPost]
+ public object SaveGy_PatrolCheckItemMethodList([FromBody] JObject msg)
+ {
+ DataSet ds;
+ var _value = msg["msg"].ToString();
+ string msg3 = _value.ToString();
+ string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg1 = sArray[0].ToString();
+ string msg_HUserName = sArray[1].ToString();
+ string msg_HCreateORGID = sArray[2].ToString();
+ string msg_OperationType = sArray[3].ToString();
+
+ Int64 HItemID = 0;
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_PatrolCheckItemMethod_Edit", 1, false, msg_HUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鑾峰彇鏈�澶D鍊艰祴鍊�
+ DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_PatrolCheckItemMethod ", "Gy_PatrolCheckItemMethod");
+ if ((Maxds != null || Maxds.Tables[0].Rows.Count > 0) && (Maxds.Tables[0].Rows[0]["HItemID"] != null && Maxds.Tables[0].Rows[0]["HItemID"].ToString() != "" && Maxds.Tables[0].Rows[0]["HItemID"].ToString() != "undefined"))
+ {
+ var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
+ maxid += 1;
+ HItemID = maxid;
+ }
+ else
+ {
+ HItemID = 1;
+ }
+ ListModels oListModels = new ListModels();
+
+ try
+ {
+ DAL.ClsGy_PatrolCheckItemMethod_Ctl oBill = new DAL.ClsGy_PatrolCheckItemMethod_Ctl();
+ List<Model.ClsGy_PatrolCheckItemMethod_Model> lsmain = new List<Model.ClsGy_PatrolCheckItemMethod_Model>();
+ msg1 = msg1.Replace("\\", "");
+ msg1 = msg1.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_PatrolCheckItemMethod(msg1);
+ foreach (Model.ClsGy_PatrolCheckItemMethod_Model oItem in lsmain)
+ {
+ if (oItem.HNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (oItem.HName.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佸悕绉颁笉鑳戒负绌猴紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ ds = oCN.RunProcReturn("select * from Gy_PatrolCheckItemMethod where HStopflag =0 and HNumber = '" + oItem.HNumber.Trim() + "'", "Gy_PatrolCheckItemMethod");
+
+ //寰楀埌鐭唬鐮�
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oItem.HUSEORGID = Convert.ToInt32(msg_HCreateORGID); //缁勭粐id
+ oItem.HShortNumber = sShortNumber;//鐭唬鐮�
+ oItem.HEndFlag = true;//鏈骇鏍囧織
+ oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //绛夌骇
+ oItem.HMakeEmp = msg_HUserName; //鍒跺崟浜�
+ oItem.HCREATEORGID = Convert.ToInt32(msg_HCreateORGID); //鍒涘缓缁勭粐
+ oBill.oModel = oItem;
+ }
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (msg_OperationType == 1.ToString() || msg_OperationType == 2.ToString())
+ {
+ bResult = oBill.AddNew();
+ }
+ else
+ {
+ bResult = oBill.ModifyByID(oBill.oModel.HItemID);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = "";
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸℃鏂规硶鍒犻櫎
+ [Route("Gy_PatrolCheckItemMethod/DeletePatrolCheckItemMethod")]
+ [HttpGet]
+ public object DeletePatrolCheckItemMethod(long HItemID, string User)
+ {
+
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Gy_PatrolCheckItemMethod_Delete", 1, false, User))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("Select * from Gy_PatrolCheckItemMethod Where HItemID='" + HItemID + "'", "Gy_PatrolCheckItemMethod", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (ds.Tables[0].Rows.Count != 0)
+ {
+ ds = oCN.RunProcReturn("Delete from Gy_PatrolCheckItemMethod Where HItemID='" + HItemID + "'", "Gy_PatrolCheckItemMethod", ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸℃鏂规硶瀹℃牳銆佸弽瀹℃牳
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Gy_PatrolCheckItemMethod/AuditGy_PatrolCheckItemMethod")]
+ [HttpGet]
+ public object AuditGy_PatrolCheckItemMethod(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_PatrolCheckItemMethod_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 瀹℃牳 2 鍙嶅鏍�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡瀹℃牳
+ DataSet ds;
+ string sql = "select * from Gy_PatrolCheckItemMethod where HItemID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0].Rows[0]["HCheckEmp"] != null && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //瀹℃牳鍗曟嵁
+ if (!BillOld.AuditByID2(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅鏍�
+ DataSet ds;
+ string sql = "select * from Gy_PatrolCheckItemMethod where HItemID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HCheckEmp"] == null || ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅鏍稿崟鎹�
+ if (!BillOld.DeAuditByID2(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸℃鏂规硶 鏂囦欢瀵煎叆淇濆瓨
+ #region 宸℃鏂规硶 鏂囦欢涓婁紶
+ [Route("Gy_PatrolCheckItemMethod/Gy_PatrolCheckItemMethod_Excel")]
+ [HttpPost]
+ public object Gy_PatrolCheckItemMethod_Excel()
+ {
+ 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 tb2 = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
+ tb2.Columns.Add("HOrgID", typeof(Int32));//缁勭粐ID
+
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = tb2.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ tb2.Rows.Add(row);
+ }
+
+
+ var error = "";
+
+ //鏌ヨ娌℃湁鐨勫垪
+ if (!tb2.Columns.Contains("缁勭粐浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囦唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("缁勭粐鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囧悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸℃鏂规硶浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愬贰妫�鏂规硶浠ｇ爜銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("宸℃鏂规硶"))
+ error += "娌℃湁鎵惧埌銆愬贰妫�鏂规硶銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("澶囨敞"))
+ error += "娌℃湁鎵惧埌銆愬娉ㄣ�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鍔╄鐮�"))
+ error += "娌℃湁鎵惧埌銆愬姪璁扮爜銆戠殑鏍囬,";
+
+ if (error.Length > 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ for (int i = 0; i <= tb2.Rows.Count - 1; i++)
+ {
+ string HName = "";
+ string HNum = "";
+ string HORGNumber = "";
+ string HORGName = "";
+
+
+ HName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["宸℃鏂规硶"].ToString());
+ HNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["宸℃鏂规硶浠ｇ爜"].ToString());
+ HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐浠ｇ爜"].ToString());
+ HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐鍚嶇О"].ToString());
+
+ //妫�鏌ョ墿鏂�
+ int index = i + 1;
+
+ if (HORGNumber != "")
+ {
+
+ //鏌ヨ缁勭粐
+ ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,缁勭粐涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+
+ //宸℃鏂规硶鍚嶇О
+ if (HName == "")
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,宸℃鏂规硶鍚嶇О涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //宸℃鏂规硶浠ｇ爜
+ if (HNum == "")
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,宸℃鏂规硶浠ｇ爜涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,缁勭粐浠ｇ爜涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = error;
+ objJsonResult.data = tb2;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 宸℃鏂规硶椤圭洰 瀵煎叆(淇濆瓨)
+ [Route("Gy_PatrolCheckItemMethod/Gy_PatrolCheckItemMethod_btnSave")]
+ [HttpPost]
+ public object Gy_PatrolCheckItemMethod_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_PatrolCheckItemMethod_Edit", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ 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 HOrgID = item["HOrgID"].ToString();//缁勭粐ID
+ string HName = item["宸℃鏂规硶"].ToString();
+ string HNumber = item["宸℃鏂规硶浠ｇ爜"].ToString();
+ string HRemark = item["澶囨敞"].ToString();
+ string HHelpCode = item["鍔╄鐮�"].ToString();
+ string sShortNumber;
+ sShortNumber = DBUtility.ClsPub.GetShortNumber(HNumber);//鐭唬鐮�
+ if (sShortNumber.Trim() == "")
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺煭浠ｇ爜涓虹┖锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ int HEndFlag = 1;//鏈骇鏍囧織
+ int HLevel = DBUtility.ClsPub.GetLevel(HNumber); //绛夌骇
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber.Trim()))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷腑涓嶈兘鍑虹幇杩炵画鈥�.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_PatrolCheckItemMethod where HNumber='" + HNumber + "'", "Gy_PatrolCheckItemMethod");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ oCN.RunProc("Insert into Gy_PatrolCheckItemMethod (" +
+ "HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark" +
+ ",HMakeTime,HMakeEmp,HCREATEORGID,HUSEORGID) " +
+ " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + sShortNumber + "'," + 0 +
+ ", " + HLevel.ToString() + "," + HEndFlag + "," + 0 + ",'" + HRemark + "',getdate()" + ",'" + user + "'," + HOrgID + "," + HOrgID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ oCN.RunProc("Update " + "Gy_PatrolCheckItemMethod " + " set " +
+ "HName='" + HName + "'" +
+ ",HShortNumber='" + sShortNumber + "'" +
+ ",HHelpCode='" + HHelpCode + "'" +
+ ",HRemark= '" + HRemark + "'" +
+ ",HModifyEmp= '" + user + "'" +
+ ",HModifyTime=getdate()" +
+ ",HUSEORGID=" + HOrgID +
+ " where HNumber='" + HNumber + "'");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "瀵煎叆鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ #endregion
+ }
+}
diff --git a/WebAPI/Dapper/SqlHelper.cs b/WebAPI/Dapper/SqlHelper.cs
index 60b0c3a..eb28516 100644
--- a/WebAPI/Dapper/SqlHelper.cs
+++ b/WebAPI/Dapper/SqlHelper.cs
@@ -126,7 +126,7 @@
/// <param name="commandTimeout"></param>
/// <param name="commandType"></param>
/// <returns></returns>
-
+
public List<T> GetMultModelList<T>(string sql, Type[] types, Func<object[], T> map, object param = null, bool buffered = true, string splitOn = "Id", int? commandTimeout = null, CommandType? commandType = null)
{
using (var connection = GetConnection())
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index a30b31d..d57ff34 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -2160,6 +2160,18 @@
}
/// <summary>
+ /// 澶勭悊鏂板宸℃椤圭洰鍒嗙被琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_PatrolCheckItemClass_Model> getObjectByJson_Gy_PatrolCheckItemClass(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_PatrolCheckItemClass_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_PatrolCheckItemClass_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板鐐规鏂规硶琛ㄧ殑json
/// </summary>
/// <param name="jsonString"></param>
@@ -2172,6 +2184,18 @@
}
/// <summary>
+ /// 澶勭悊鏂板宸℃鏂规硶琛ㄧ殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsGy_PatrolCheckItemMethod_Model> getObjectByJson_Gy_PatrolCheckItemMethod(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsGy_PatrolCheckItemMethod_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_PatrolCheckItemMethod_Model>>(jsonString);
+ return list;
+ }
+
+ /// <summary>
/// 澶勭悊鏂板鏉＄爜鎷嗙爜鐨刯son
/// </summary>
/// <param name="jsonString"></param>
diff --git a/WebAPI/Models/ClsGy_PatrolCheck.cs b/WebAPI/Models/ClsGy_PatrolCheck.cs
new file mode 100644
index 0000000..c463965
--- /dev/null
+++ b/WebAPI/Models/ClsGy_PatrolCheck.cs
@@ -0,0 +1,27 @@
+锘縰sing System;
+
+namespace WebAPI.Models
+{
+
+ public class ClsGy_PatrolCheck : DBUtility.ClsGy_Base_Ctl
+ {
+ public int HItemID;
+ public string HNumber; //浠ｇ爜
+ public string HName; //鍚嶇О
+ public string HHelpCode; //鍔╄鐮�
+ public string HShortNumber; //鐭唬鐮�
+ public int HParentID; //鐖剁骇
+ public int HLevel; //绛夌骇
+ public int HCREATEORGID;
+ public int HUSEORGID;
+ public bool HEndFlag; //鏈骇鏍囧織
+ public bool HStopflag; //绂佺敤鏍囧織
+ public string HRemark; //澶囨敞
+ public string HMakeEmp;
+ public string HPatrolCheckType;
+ public string HUseFlag = "鏈娇鐢�";
+
+ public Int64 HPatrolCheckItemClassID; //宸℃椤圭洰鍒嗙被
+ }
+
+}
\ No newline at end of file
diff --git a/WebAPI/Models/Sc_WorkBillSortBillMain.cs b/WebAPI/Models/Sc_WorkBillSortBillMain.cs
index 5cc7bff..d8fec29 100644
--- a/WebAPI/Models/Sc_WorkBillSortBillMain.cs
+++ b/WebAPI/Models/Sc_WorkBillSortBillMain.cs
@@ -68,6 +68,7 @@
public string HOrderType { get; set; }
public string HMonthPlanFlag { get; set; }
public string HMastersDate { get; set; }
+ public DateTime? HMakeDate { get; set; }
public string sWheres { get; set; }
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
index 89e51c3..f4051f4 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2025-04-21T08:51:11.0234671Z;False|2025-04-21T16:50:27.9924375+08:00;True|2025-04-21T16:28:02.4554241+08:00;True|2025-04-21T16:26:45.7389516+08:00;True|2025-04-21T16:17:59.3641418+08:00;True|2025-04-21T16:11:42.4953735+08:00;False|2025-04-21T16:10:57.0902986+08:00;False|2025-04-21T16:08:30.7814654+08:00;False|2025-04-21T16:06:31.1495468+08:00;False|2025-04-21T15:32:02.6951071+08:00;False|2025-04-21T15:31:03.0207208+08:00;False|2025-04-21T15:27:46.3232315+08:00;False|2025-04-21T15:26:04.3356811+08:00;False|2025-04-21T15:24:39.2075383+08:00;True|2025-04-03T13:53:30.6471699+08:00;False|2025-04-03T13:53:22.8762999+08:00;True|2025-04-02T12:47:31.3375226+08:00;False|2025-04-02T12:47:24.2095072+08:00;True|2025-04-01T16:29:52.7465502+08:00;False|2025-04-01T16:29:33.7844649+08:00;True|2025-03-28T16:22:29.8664470+08:00;True|2025-03-28T15:53:12.1106288+08:00;False|2025-03-28T15:53:01.4674242+08:00;True|2025-03-28T13:34:17.5506822+08:00;False|2025-03-28T13:34:09.5853308+08:00;True|2025-03-26T12:42:08.9630741+08:00;True|2025-03-26T12:40:07.7144561+08:00;True|2025-03-26T12:30:37.3503331+08:00;True|2025-03-26T12:26:47.5061658+08:00;True|2025-03-26T10:54:47.2556717+08:00;True|2025-03-26T10:49:59.7897145+08:00;True|2025-03-26T10:47:02.6195828+08:00;False|2025-03-26T10:46:54.9421244+08:00;True|2025-03-26T01:10:19.1227462+08:00;True|2025-03-26T01:00:04.3583740+08:00;True|2025-03-26T00:38:57.4757071+08:00;True|2025-03-26T00:28:24.9370188+08:00;True|2025-03-26T00:04:05.4507425+08:00;True|2025-03-25T23:06:56.2284828+08:00;False|2025-03-25T23:06:46.7023339+08:00;True|2025-03-25T22:57:08.3127897+08:00;False|2025-03-25T22:55:05.8028873+08:00;False|2025-03-25T22:54:51.2053101+08:00;False|2025-03-04T11:23:36.7757604+08:00;True|2025-02-12T14:05:06.1068587+08:00;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
+ <History>True|2025-04-29T08:32:47.7145278Z;True|2025-04-29T15:41:44.7116258+08:00;True|2025-04-29T15:32:49.4490248+08:00;False|2025-04-29T15:25:51.5282600+08:00;False|2025-04-29T15:23:33.1022530+08:00;True|2025-04-29T14:39:42.0427387+08:00;True|2025-04-29T14:14:37.1424704+08:00;True|2025-04-29T13:53:06.8818046+08:00;True|2025-04-29T13:38:29.5948294+08:00;True|2025-04-29T08:50:02.3834885+08:00;True|2025-04-29T08:45:53.9723523+08:00;True|2025-04-29T08:41:10.0539041+08:00;True|2025-04-29T08:40:36.8094165+08:00;True|2025-04-29T08:36:14.3169515+08:00;True|2025-04-29T08:18:50.9294272+08:00;True|2025-04-29T08:13:21.0111785+08:00;True|2025-04-29T08:08:41.1470031+08:00;False|2025-04-29T08:08:00.8674071+08:00;True|2025-04-24T14:03:47.0390589+08:00;True|2025-04-24T13:08:57.8491077+08:00;True|2025-04-24T11:15:53.7224800+08:00;True|2025-04-24T11:12:55.2113887+08:00;False|2025-04-24T11:09:59.9499198+08:00;True|2025-04-21T16:51:11.0234671+08:00;False|2025-04-21T16:50:27.9924375+08:00;True|2025-04-21T16:28:02.4554241+08:00;True|2025-04-21T16:26:45.7389516+08:00;True|2025-04-21T16:17:59.3641418+08:00;True|2025-04-21T16:11:42.4953735+08:00;False|2025-04-21T16:10:57.0902986+08:00;False|2025-04-21T16:08:30.7814654+08:00;False|2025-04-21T16:06:31.1495468+08:00;False|2025-04-21T15:32:02.6951071+08:00;False|2025-04-21T15:31:03.0207208+08:00;False|2025-04-21T15:27:46.3232315+08:00;False|2025-04-21T15:26:04.3356811+08:00;False|2025-04-21T15:24:39.2075383+08:00;True|2025-04-03T13:53:30.6471699+08:00;False|2025-04-03T13:53:22.8762999+08:00;True|2025-04-02T12:47:31.3375226+08:00;False|2025-04-02T12:47:24.2095072+08:00;True|2025-04-01T16:29:52.7465502+08:00;False|2025-04-01T16:29:33.7844649+08:00;True|2025-03-28T16:22:29.8664470+08:00;True|2025-03-28T15:53:12.1106288+08:00;False|2025-03-28T15:53:01.4674242+08:00;True|2025-03-28T13:34:17.5506822+08:00;False|2025-03-28T13:34:09.5853308+08:00;True|2025-03-26T12:42:08.9630741+08:00;True|2025-03-26T12:40:07.7144561+08:00;True|2025-03-26T12:30:37.3503331+08:00;True|2025-03-26T12:26:47.5061658+08:00;True|2025-03-26T10:54:47.2556717+08:00;True|2025-03-26T10:49:59.7897145+08:00;True|2025-03-26T10:47:02.6195828+08:00;False|2025-03-26T10:46:54.9421244+08:00;True|2025-03-26T01:10:19.1227462+08:00;True|2025-03-26T01:00:04.3583740+08:00;True|2025-03-26T00:38:57.4757071+08:00;True|2025-03-26T00:28:24.9370188+08:00;True|2025-03-26T00:04:05.4507425+08:00;True|2025-03-25T23:06:56.2284828+08:00;False|2025-03-25T23:06:46.7023339+08:00;True|2025-03-25T22:57:08.3127897+08:00;False|2025-03-25T22:55:05.8028873+08:00;False|2025-03-25T22:54:51.2053101+08:00;False|2025-03-04T11:23:36.7757604+08:00;True|2025-02-12T14:05:06.1068587+08:00;False|2025-02-12T14:03:43.3961038+08:00;True|2025-01-18T09:42:50.3629397+08:00;True|2025-01-18T09:39:16.1773412+08:00;True|2025-01-17T11:15:39.4147082+08:00;False|2025-01-17T11:15:09.0033498+08:00;True|2025-01-14T10:20:31.1504093+08:00;False|2025-01-14T10:19:59.1429931+08:00;True|2025-01-10T16:29:54.8671377+08:00;False|2025-01-10T16:29:05.0650370+08:00;True|2025-01-04T14:30:56.5041884+08:00;True|2025-01-04T14:26:52.7448761+08:00;True|2025-01-04T14:23:27.9956967+08:00;True|2025-01-04T14:12:46.2410106+08:00;True|2025-01-04T14:09:33.1727375+08:00;True|2025-01-04T14:07:16.3373347+08:00;False|2025-01-04T14:06:33.4982458+08:00;True|2024-12-31T13:36:55.7394582+08:00;False|2024-12-31T13:35:58.6205647+08:00;True|2024-12-28T15:59:32.1394796+08:00;True|2024-12-28T13:48:20.4283118+08:00;True|2024-12-28T13:43:39.8159616+08:00;True|2024-12-28T13:23:58.4183285+08:00;True|2024-12-28T13:19:13.0583263+08:00;True|2024-12-28T13:12:03.2648502+08:00;True|2024-12-28T13:04:22.6803754+08:00;False|2024-12-28T13:03:56.5993252+08:00;True|2024-12-28T10:50:06.1597154+08:00;True|2024-12-28T10:27:58.7075320+08:00;False|2024-12-28T10:27:09.9450571+08:00;True|2024-12-24T10:52:25.3403292+08:00;False|2024-12-24T10:51:41.8017370+08:00;True|2024-12-23T15:45:21.7729300+08:00;True|2024-12-23T15:31:38.8549407+08:00;True|2024-12-23T15:20:26.2361671+08:00;True|2024-12-23T13:40:03.2774116+08:00;False|2024-12-23T13:39:39.8510770+08:00;True|2024-12-23T13:11:15.3232454+08:00;True|2024-12-23T13:05:43.3057458+08:00;True|2024-12-16T10:57:23.0694936+08:00;True|2024-12-16T10:03:48.1938775+08:00;True|2024-12-16T09:38:57.3052219+08:00;False|2024-12-16T09:38:31.7097388+08:00;True|2024-12-16T09:25:38.3751534+08:00;False|2024-12-16T09:24:19.3952981+08:00;True|2024-12-11T22:41:13.2881405+08:00;False|2024-12-11T22:40:26.3239379+08:00;True|2024-12-11T22:14:41.4392948+08:00;True|2024-12-11T22:03:03.6823866+08:00;True|2024-12-11T21:48:51.7423044+08:00;False|2024-12-11T21:47:55.6236616+08:00;True|2024-12-02T14:57:10.0773563+08:00;False|2024-12-02T14:56:35.6440156+08:00;True|2024-11-26T08:55:53.9125170+08:00;True|2024-11-26T08:24:31.3112433+08:00;False|2024-11-26T08:23:46.0894924+08:00;True|2024-11-20T10:16:03.7893118+08:00;False|2024-11-20T10:15:23.2632533+08:00;True|2024-11-20T09:06:55.2799108+08:00;False|2024-11-20T09:05:45.8751214+08:00;True|2024-11-15T10:50:02.2079520+08:00;False|2024-11-15T10:49:22.4156447+08:00;True|2024-11-11T16:53:33.6615343+08:00;False|2024-11-11T16:52:17.7499691+08:00;False|2024-11-06T11:32:23.8339166+08:00;True|2024-10-24T20:08:16.1196372+08:00;True|2024-10-24T14:53:21.0804405+08:00;False|2024-10-24T14:50:14.4659302+08:00;</History>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>04/21/2025 13:33:44</publishTime>
+ <publishTime>04/29/2025 16:32:24</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>04/21/2025 13:33:44</publishTime>
+ <publishTime>04/29/2025 16:32:24</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>04/21/2025 13:33:31</publishTime>
+ <publishTime>04/29/2025 16:32:14</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>04/21/2025 13:33:31</publishTime>
+ <publishTime>04/29/2025 16:32:14</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>04/21/2025 13:33:20</publishTime>
+ <publishTime>04/29/2025 13:52:29</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>04/21/2025 13:33:20</publishTime>
+ <publishTime>04/29/2025 13:52:29</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>04/21/2025 13:33:25</publishTime>
+ <publishTime>04/29/2025 16:32:10</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>04/21/2025 13:33:25</publishTime>
+ <publishTime>04/29/2025 16:32:10</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/21/2025 11:46:16</publishTime>
@@ -147,25 +147,25 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>04/21/2025 13:33:10</publishTime>
+ <publishTime>04/29/2025 13:52:23</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>04/21/2025 13:33:10</publishTime>
+ <publishTime>04/29/2025 13:52:23</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>04/21/2025 13:33:15</publishTime>
+ <publishTime>04/29/2025 13:52:26</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>04/21/2025 13:33:15</publishTime>
+ <publishTime>04/29/2025 13:52:26</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>04/21/2025 13:33:15</publishTime>
+ <publishTime>04/29/2025 13:52:26</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>04/21/2025 13:33:15</publishTime>
+ <publishTime>04/29/2025 13:52:26</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
@@ -285,22 +285,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>04/21/2025 11:46:21</publishTime>
+ <publishTime>04/22/2025 08:46:39</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>04/21/2025 11:46:21</publishTime>
+ <publishTime>04/22/2025 08:46:40</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>04/21/2025 16:51:02</publishTime>
+ <publishTime>04/29/2025 16:32:38</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>04/21/2025 16:51:02</publishTime>
+ <publishTime>04/29/2025 16:32:38</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>04/21/2025 16:51:08</publishTime>
+ <publishTime>04/29/2025 16:32:45</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index de0e705..6649127 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -446,6 +446,7 @@
<Compile Include="Controllers\CJGL\Sc_OEEReportController.cs" />
<Compile Include="Controllers\CKGL\TMZD\Gy_BarCodeBillListController.cs" />
<Compile Include="Controllers\JHGL\Gy_SourceMouldBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckBillController.cs" />
<Compile Include="Controllers\XSGL\Crm_ComplainVisitBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SellOutBillList_SecController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeQuotationBillController.cs" />
@@ -606,6 +607,9 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardTypeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheckBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheckItemMethodController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PatrolCheckItemClassController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MateNumRelationController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassController.cs" />
@@ -835,6 +839,7 @@
<Compile Include="HttpClient.cs" />
<Compile Include="InvokeHelper.cs" />
<Compile Include="Log.cs" />
+ <Compile Include="Models\ClsGy_PatrolCheck.cs" />
<Compile Include="Models\ClsGy_Supplier_Link.cs" />
<Compile Include="Models\ClsGy_Supplier_PayPlan.cs" />
<Compile Include="Models\ClsGy_MouldFileBillSub_DotCheckRule.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 7b1a31b..22da63c 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -1,11 +1,11 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
- <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
- <NameOfLastUsedPublishProfile>D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\JFAPI.pubxml</NameOfLastUsedPublishProfile>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
- <Use64BitIISExpress />
+ <Use64BitIISExpress>
+ </Use64BitIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication>enabled</IISExpressAnonymousAuthentication>
<IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 15803f5..ec5b29a 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 349d684..a766f61 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/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
new file mode 100644
index 0000000..655b91e
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.CoreCompileInputs.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.CoreCompileInputs.cache
new file mode 100644
index 0000000..c12cb71
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.CoreCompileInputs.cache
@@ -0,0 +1 @@
+b7766d0cccdf2c98a5ed7c86257ed2f2c0c84c8a
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index 5821135..a70c137 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -9,3 +9,9 @@
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
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 15803f5..ec5b29a 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 349d684..a766f61 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1