From 5d7ba2518694f6694794bebb7389f9a85374720b Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 20 五月 2025 19:02:17 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
PayM/obj/Release/PayM.Pay_PayMentPrintReportDlg.resources | 0
ProM/bin/Release/DBUtility.dll | 0
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 16
PayM/obj/Release/CostM.Pay_AccPayMentDayBill.resources | 0
ProM/bin/Release/DBUtility.pdb | 0
BaseSet/bin/Release/DBUtility.pdb | 0
DAL/生产管理/模具管理/ClsSc_MouldMaintainBill.cs | 6
Model/bin/Release/Pub_Control.pdb | 0
PayM/obj/Release/PayM.Pay_PayMentYearReport.resources | 0
PayM/obj/Release/PayM.Pay_MonthExpenseEntryBillList.resources | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.dll | 0
PayM/obj/Release/PayM.Pay_OutApplyBillList.resources | 0
OAM/bin/Release/BaseSet.pdb | 0
APSM/bin/Release/DAL.dll | 0
PayM/bin/Debug/Pub_Class.dll | 0
OAM/bin/Release/BaseSet.dll | 0
Model/bin/Release/Pub_Control.dll | 0
Pub_Control/bin/Release/Pub_Class.pdb | 0
PayM/obj/Release/PayM.Pay_PayMentBillList.resources | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
PayM/obj/Debug/PayM.dll | 0
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | 2
Pub_Control/bin/Release/Pub_Class.dll | 0
APSM/bin/Release/DAL.pdb | 0
PayM/obj/Debug/AxInterop.gregn6Lib.dll | 0
LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache | 0
PayM/obj/Release/BaseSet.Gy_DataInTmp_DuSubsidyItem.resources | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
APSM/bin/Release/DBUtility.pdb | 0
PayM/obj/Debug/PayM.pdb | 0
PayM/obj/Release/PayM.Pay_PayMentDeptSendListDlg.resources | 0
PayM/obj/Debug/PayM.csproj.ResolveComReference.cache | 0
PayM/obj/Release/PayM.HR_EmpDimissionBill.resources | 0
SelM/bin/Release/DBUtility.pdb | 0
OAM/bin/Release/SQLHelper.dll | 0
SQLHelper/bin/Release/SQLHelper.pdb | 0
OAM/bin/Release/SQLHelper.pdb | 0
APSM/bin/Release/DBUtility.dll | 0
PayM/bin/Debug/Pub_Class.pdb | 0
BLL/bin/Release/Pub_Class.dll | 0
WorkM/bin/Release/DBUtility.pdb | 0
WorkM/bin/Release/DBUtility.dll | 0
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
APSM/bin/Release/Model.dll | 0
BLL/bin/Release/Pub_Class.pdb | 0
SelM/bin/Release/DBUtility.dll | 0
APSM/bin/Release/Model.pdb | 0
BLL/bin/Release/SQLHelper.pdb | 0
BaseSet/bin/Release/Pub_Control.pdb | 0
PayM/obj/Release/PayM.Pay_ProdWorkQtySumReportDlg.resources | 0
APSM/bin/Release/BaseSet.dll | 0
BLL/bin/Release/SQLHelper.dll | 0
DAL/bin/Release/Model.dll | 0
BaseSet/bin/Release/Pub_Control.dll | 0
APSM/bin/Release/BaseSet.pdb | 0
OAM/bin/Release/Model.dll | 0
SelM/bin/Release/Pub_Control.pdb | 0
PayM/obj/Release/PayM.Pay_OtherMoney_Dlg.resources | 0
PayM/bin/Release/SQLHelper.dll | 0
PayM/obj/Release/PayM.Pay_DuSubsidyItemBillList.resources | 0
PayM/obj/Release/PayM.Pay_EmpPayMentSumReport.resources | 0
SelM/bin/Release/Pub_Control.dll | 0
DAL/bin/Release/Model.pdb | 0
WorkM/bin/Release/BLL.dll | 0
DBUtility/bin/Release/DBUtility.pdb | 0
DBUtility/bin/Release/DBUtility.dll | 0
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
WorkM/bin/Release/BLL.pdb | 0
ProM/bin/Release/Pub_Control.dll | 0
WarM/bin/Release/Pub_Class.dll | 0
PlanM/bin/Release/Model.pdb | 0
LMES/XiaoZhuGe_autoGetData.cs | 89
WarM/bin/Release/Pub_Class.pdb | 0
PlanM/bin/Release/Model.dll | 0
ProM/bin/Release/Pub_Control.pdb | 0
OAM/bin/Release/Pub_Class.pdb | 0
PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill5.resources | 0
PayM/obj/Release/PayM.Pay_EmpWorkQtyEntryReportDlg.resources | 0
PayM/bin/Debug/BLL.pdb | 0
PayM/obj/Release/PayM.csproj.ResolveComReference.cache | 0
SQLHelper/bin/Release/Pub_Class.pdb | 0
PayM/obj/Debug/PayM.csproj.GenerateResource.Cache | 0
PayM/bin/Release/DBUtility.dll | 0
PayM/bin/Release/DBUtility.pdb | 0
PayM/obj/Release/PayM.Pay_WorkTimesBill.resources | 0
SQLHelper/bin/Release/Pub_Class.dll | 0
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs | 7
PayM/bin/Debug/BLL.dll | 0
OAM/bin/Release/Pub_Class.dll | 0
PayM/obj/Release/PayM.Pay_WorkTimesCardBill2.resources | 0
PayM/obj/Release/CostM.Pay_AccPayMentDayBill2.resources | 0
PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew4.resources | 0
OAM/bin/Release/BLL.dll | 0
PayM/obj/Release/PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resources | 0
OAM/bin/Release/BLL.pdb | 0
PayM/obj/Release/PayM.Pay_ProcPriceRequestBill.resources | 0
LMES/LMES.csproj | 9
APSM/bin/Release/SQLHelper.dll | 0
BaseSet/bin/Release/BLL.pdb | 0
DBUtility/bin/Release/Pub_Class.dll | 0
PlanM/bin/Release/Pub_Control.pdb | 0
WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs | 9
PayM/obj/Release/PayM.Pay_PayMentPrintReport.resources | 0
BaseSet/bin/Release/BLL.dll | 0
PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew1.resources | 0
PayM/obj/Debug/Interop.gregn6Lib.dll | 0
APSM/bin/Release/WarM.pdb | 0
OAM/bin/Release/DAL.pdb | 0
PayM/obj/Release/PayM.Pay_SingleBalBillList.resources | 0
PayM/obj/Release/PayM.Pay_SubsidyChangeBill.resources | 0
APSM/bin/Release/WarM.dll | 0
OAM/bin/Release/DAL.dll | 0
PayM/obj/Release/PayM.Pay_GroupBalBillList.resources | 0
PayM/obj/Release/PayM.Pay_PayMentBill.resources | 0
PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillReport.resources | 0
PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew2.resources | 0
PayM/obj/Release/PayM.Pay_PayMentDayBillList.resources | 0
PayM/bin/Debug/Pub_Control.pdb | 0
ProM/bin/Release/SQLHelper.dll | 0
PayM/obj/Release/PayM.Pay_SingleBalBillDlg.resources | 0
PlanM/bin/Release/DAL.dll | 0
PayM/obj/Release/PayM.Pay_CarOutApplyBillList.resources | 0
Model/bin/Release/DBUtility.pdb | 0
PayM/obj/Release/PayM.Pay_NoWorkTimesReport.resources | 0
PayM/bin/Debug/Pub_Control.dll | 0
ProM/bin/Release/SQLHelper.pdb | 0
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | 58
PayM/bin/Debug/AxInterop.gregn6Lib.dll | 0
Model/bin/Release/DBUtility.dll | 0
PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew3.resources | 0
ProM/bin/Release/BLL.dll | 0
PayM/obj/Release/PayM.Pay_PayMentYearReportDlg.resources | 0
PlanM/bin/Release/DAL.pdb | 0
WorkM/bin/Release/Pub_Control.pdb | 0
PayM/bin/Debug/Model.dll | 0
PlanM/bin/Release/Pub_Control.dll | 0
PayM/bin/Debug/Model.pdb | 0
PayM/bin/Release/SQLHelper.pdb | 0
ProM/bin/Release/BLL.pdb | 0
OAM/bin/Release/Model.pdb | 0
WebAPI/Controllers/SCGL/日计划管理/Sc_JIT_ComplementGoodBillController.cs | 2
LMES/XiaoZhuGe_autoGetData.Designer.cs | 73
PayM/obj/Release/PayM.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache | 0
WorkM/bin/Release/DAL.pdb | 0
PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillAdd.resources | 0
WorkM/bin/Release/Pub_Control.dll | 0
PayM/obj/Release/PayM.pdb | 0
APSM/bin/Release/Pub_Class.dll | 0
WorkM/bin/Release/DAL.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 13
APSM/bin/Release/BLL.dll | 0
OAM/bin/Release/Pub_Control.pdb | 0
SelM/bin/Release/WarM.pdb | 0
SelM/bin/Release/DAL.pdb | 0
APSM/bin/Release/BLL.pdb | 0
APSM/bin/Release/Pub_Class.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user | 46
PayM/obj/Release/PayM.Pay_WorkTimesCardBill4.resources | 0
Model/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/DAL.pdb | 0
SelM/bin/Release/WarM.dll | 0
SQLHelper/obj/Release/SQLHelper.dll | 0
BaseSet/bin/Release/Model.pdb | 0
WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs | 1567 +++++++++++++++
BLL/bin/Release/Model.dll | 0
PayM/bin/Release/Model.dll | 0
BaseSet/bin/Release/Model.dll | 0
OAM/bin/Release/Pub_Control.dll | 0
BLL/bin/Release/Model.pdb | 0
DAL/bin/Release/DAL.dll | 0
PayM/bin/Release/Model.pdb | 0
PayM/obj/Release/PayM.Pay_NoWorkTimesReportDlg.resources | 0
WorkM/bin/Release/WorkM.pdb | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
PayM/obj/Release/PayM.HR_EmpChangeBill.resources | 0
PayM/bin/Debug/PayM.dll | 0
SelM/bin/Release/Pub_Class.dll | 0
PayM/obj/Release/PayM.Pay_WorkTimesCardBill5.resources | 0
SelM/bin/Release/Pub_Class.pdb | 0
PayM/obj/Release/PayM.Pay_WorkTimesListDlg.resources | 0
PayM/obj/Release/PayM.Pay_ProdWorkQtyEntryReport.resources | 0
WarM/bin/Release/SQLHelper.pdb | 0
WorkM/bin/Release/WorkM.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 19
PayM/obj/Release/PayM.HR_EmpDimissionBillList.resources | 0
PayM/bin/Debug/PayM.pdb | 0
PayM/obj/Release/PayM.Pay_ProcPriceRequestBillList.resources | 0
WarM/bin/Release/SQLHelper.dll | 0
WarM/bin/Release/DAL.dll | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
WarM/bin/Release/DAL.pdb | 0
WorkM/bin/Release/WarM.pdb | 0
PayM/obj/Release/PayM.Pay_SingleBalBill.resources | 0
PayM/obj/Release/PayM.Pay_OutApplyBill.resources | 0
WorkM/bin/Release/WarM.dll | 0
PayM/bin/Release/DAL.dll | 0
PayM/obj/Release/PayM.Pay_ProdWorkQtyEntryReportDlg.resources | 0
SelM/bin/Release/SelM.pdb | 0
DBUtility/bin/Release/Pub_Class.pdb | 0
Model/bin/Release/SQLHelper.dll | 0
PayM/obj/Release/PayM.Pay_OverApplyBillList.resources | 0
OAM/bin/Release/DBUtility.dll | 0
PayM/bin/Release/DAL.pdb | 0
PayM/obj/Release/PayM.Pay_ProdWorkQtySumReport.resources | 0
SelM/bin/Release/SelM.dll | 0
OAM/bin/Release/DBUtility.pdb | 0
ProM/bin/Release/DAL.pdb | 0
PlanM/bin/Release/PlanM.dll | 0
PayM/obj/Release/PayM.Pay_MonthWriteBillReportMX.resources | 0
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormImportController.cs | 410 ++++
WarM/bin/Release/DBUtility.dll | 0
PayM/obj/Release/CostM.Pay_AccPayMentDayBillList.resources | 0
WarM/bin/Release/DBUtility.pdb | 0
ProM/bin/Release/DAL.dll | 0
PayM/obj/Release/PayM.Pay_OverApplyBill.resources | 0
Model/obj/Release/Model.pdb | 0
PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew.resources | 0
SelM/bin/Release/BLL.pdb | 0
PayM/obj/Release/PayM.Pay_OtherBalBillList.resources | 0
SelM/bin/Release/BLL.dll | 0
PayM/obj/Release/PayM.Pay_OtherBalBill.resources | 0
PayM/obj/Release/PayM.Pay_WorkTimesCardBill1.resources | 0
PayM/obj/Release/PayM.Pay_ErrWorkTimesSendBill.resources | 0
PayM/obj/Release/PayM.Pay_MonthExpenseEntryBillReportDlg.resources | 0
Pub_Control/bin/Release/Pub_Control.dll | 0
BLL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/SQLHelper.dll | 0
PayM/obj/Release/CostM.Pay_AccPayMentDayBill3.resources | 0
SelM/bin/Release/WorkM.pdb | 0
WorkM/bin/Release/Pub_Class.dll | 0
DAL/bin/Release/SQLHelper.pdb | 0
PayM/obj/Release/OAM.HR_EmpEngageRequestBillList.resources | 0
SelM/bin/Release/WorkM.dll | 0
DBUtility/obj/Release/DBUtility.pdb | 0
BLL/bin/Release/DBUtility.dll | 0
WarM/bin/Release/BLL.pdb | 0
WorkM/bin/Release/Pub_Class.pdb | 0
Pub_Control/bin/Release/Pub_Control.pdb | 0
PayM/obj/Release/PayM.Pay_SubsidyChangeBillList.resources | 0
DBUtility/obj/Release/DBUtility.dll | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
Model/obj/Release/Model.dll | 0
PayM/obj/Release/PayM.Pay_WorkTimesCardBill3.resources | 0
PayM/obj/Release/PayM.Pay_DuSubsidyItemBill.resources | 0
WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs | 3
LMES/XiaoZhuGe_autoGetData.resx | 455 ++++
PayM/obj/Release/PayM.Pay_OuterScrapDlg.resources | 0
PlanM/bin/Release/PlanM.pdb | 0
PayM/obj/Release/PayM.Err_MonthExpenseEntryBill.resources | 0
PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillReportDlg.resources | 0
SelM/bin/Release/DAL.dll | 0
BLL/bin/Release/DAL.dll | 0
PlanM/bin/Release/SQLHelper.dll | 0
WarM/bin/Release/Pub_Control.pdb | 0
DBUtility/bin/Release/Pub_Control.pdb | 0
OAM/bin/Release/OAM.pdb | 0
PayM/bin/Debug/DBUtility.dll | 0
DBUtility/bin/Release/Pub_Control.dll | 0
OAM/bin/Release/OAM.dll | 0
BaseSet/bin/Release/Pub_Class.dll | 0
BLL/bin/Release/DAL.pdb | 0
PlanM/bin/Release/BLL.dll | 0
WebAPI/Controllers/数据同步/小诸葛同步/XZG_DataSynchronizationController.cs | 2106 +++++++++++++++++++++
PayM/obj/Release/PayM.Pay_InnerScrapDlg.resources | 0
BaseSet/bin/Release/Pub_Class.pdb | 0
WarM/bin/Release/BLL.dll | 0
PlanM/bin/Release/BLL.pdb | 0
WebAPI/Controllers/WebAPIController.cs | 519 +++-
WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs | 221 ++
WarM/bin/Release/Pub_Control.dll | 0
PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew5.resources | 0
PayM/bin/Release/BLL.pdb | 0
PlanM/bin/Release/SQLHelper.pdb | 0
PayM/obj/Release/PayM.Pay_ErrWorkTimesRequestBill.resources | 0
PayM/bin/Debug/DBUtility.pdb | 0
PayM/obj/Release/PayM.Pay_PayMentSendList.resources | 0
PayM/bin/Release/BLL.dll | 0
PayM/obj/Release/PayM.Pay_WorkTimesCardBillList.resources | 0
ProM/bin/Release/ProM.dll | 0
DAL/生产管理/设备管理/ClsSb_EquipMaintainBill.cs | 7
ProM/bin/Release/ProM.pdb | 0
PayM/bin/Release/PayM.pdb | 0
ProM/bin/Release/Model.pdb | 0
DAL/bin/Release/Pub_Class.pdb | 0
ProM/bin/Release/Model.dll | 0
BaseSet/bin/Release/DAL.pdb | 0
PayM/bin/Release/PayM.dll | 0
BaseSet/bin/Release/DAL.dll | 0
DAL/bin/Release/Pub_Class.dll | 0
ProM/bin/Release/Pub_Class.dll | 0
APSM/bin/Release/APSM.pdb | 0
PayM/obj/Release/PayM.Pay_ErrWorkTimesRequestBillList.resources | 0
ProM/bin/Release/Pub_Class.pdb | 0
PayM/obj/Release/PayM.KQ_sourceReport.resources | 0
APSM/bin/Release/APSM.dll | 0
APSM/bin/Release/SQLHelper.pdb | 0
PayM/bin/Release/Pub_Class.pdb | 0
PayM/obj/Release/PayM.Pay_WorkTimesList.resources | 0
PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill3.resources | 0
PayM/obj/Release/PayM.Pay_MonthExpenseEntryBillReport.resources | 0
SelM/bin/Release/SQLHelper.pdb | 0
PayM/bin/Debug/Interop.gregn6Lib.dll | 0
PayM/bin/Release/Pub_Class.dll | 0
LMES/Frm_Show.cs | 4
PayM/obj/Release/PayM.Pay_PayMentSendListDlg.resources | 0
PayM/obj/Release/PayM.KQ_sourceReportDlg.resources | 0
SelM/bin/Release/SQLHelper.dll | 0
Model/bin/Release/Pub_Class.pdb | 0
PayM/bin/Debug/DAL.pdb | 0
PayM/obj/Release/PayM.Properties.Resources.resources | 0
BaseSet/bin/Release/BaseSet.dll | 0
PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill4.resources | 0
BaseSet/bin/Release/BaseSet.pdb | 0
BLL/bin/Release/BLL.pdb | 0
APSM/bin/Release/PlanM.dll | 0
APSM/bin/Release/PlanM.pdb | 0
PayM/obj/Release/OAM.HR_EmpEngageRequestBill.resources | 0
PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill2.resources | 0
PayM/obj/Release/PayM.HR_EmpChangeBillList.resources | 0
PayM/obj/Release/PayM.Pay_PayMentDeptYearReport.resources | 0
PayM/obj/Release/PayM.Pay_GroupBalBill.resources | 0
PlanM/bin/Release/Pub_Class.dll | 0
WebAPI/WebAPI.csproj | 1
PlanM/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/Pub_Control.pdb | 0
PayM/obj/Release/PayM.Pay_InnerScrap.resources | 0
APSM/bin/Release/Pub_Control.pdb | 0
PayM/obj/Release/PayM.Pay_PayMentDeptSendList.resources | 0
PayM/obj/Release/PayM.Pay_MonthWriteBillReportDlg.resources | 0
BLL/bin/Release/Pub_Control.dll | 0
DAL/生产管理/ClsSc_ShiftsBeginInfoBill.cs | 4
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New.cs | 7
BaseSet/bin/Release/SQLHelper.pdb | 0
BLL/bin/Release/BLL.dll | 0
PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillReportMX.resources | 0
PayM/bin/Release/Pub_Control.dll | 0
BaseSet/bin/Release/SQLHelper.dll | 0
DBUtility/bin/Release/SQLHelper.dll | 0
PayM/obj/Release/PayM.Pay_PayMentDayBill.resources | 0
DBUtility/bin/Release/SQLHelper.pdb | 0
PayM/bin/Release/Pub_Control.pdb | 0
Model/bin/Release/Pub_Class.dll | 0
PayM/bin/Debug/DAL.dll | 0
PayM/obj/Release/PayM.Pay_OuterScrap.resources | 0
WebAPI/Controllers/基础资料/基础资料/Gy_ScrapReasonController.cs | 129 +
APSM/bin/Release/Pub_Control.dll | 0
WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user | 42
DAL/bin/Release/DBUtility.dll | 0
DAL/bin/Release/Pub_Control.dll | 0
PayM/obj/Release/PayM.Pay_PayMentDeptYearReportDlg.resources | 0
DAL/bin/Release/DBUtility.pdb | 0
APSM/bin/Release/WorkM.dll | 0
WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs | 29
DAL/bin/Release/Pub_Control.pdb | 0
Model/生产管理/ClsSc_ShiftsBeginInfoBillMain.cs | 1
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
PayM/obj/Release/CostM.Pay_AccPayMentDayBill4.resources | 0
WarM/bin/Release/WarM.pdb | 0
PayM/obj/Release/PayM.Pay_ErrWorkTimesSendBillList.resources | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
WarM/bin/Release/WarM.dll | 0
PayM/obj/Release/PayM.Err_MonthExpenseEntryBillDlg.resources | 0
WorkM/bin/Release/Model.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
WarM/bin/Release/Model.pdb | 0
PayM/obj/Release/PayM.Pay_MonthWriteBillReport.resources | 0
WarM/bin/Release/Model.dll | 0
PayM/obj/Release/PayM.Pay_WorkTimesBillList.resources | 0
PayM/bin/Debug/SQLHelper.dll | 0
Pub_Class/bin/Release/Pub_Class.pdb | 0
PlanM/bin/Release/DBUtility.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 44
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 12
PayM/bin/Debug/SQLHelper.pdb | 0
WorkM/bin/Release/Model.pdb | 0
Pub_Class/bin/Release/Pub_Class.dll | 0
PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill1.resources | 0
SelM/bin/Release/Model.pdb | 0
LMES/Program.cs | 5
PayM/obj/Release/PayM.csproj.GenerateResource.Cache | 0
SelM/bin/Release/Model.dll | 0
PlanM/bin/Release/DBUtility.pdb | 0
PayM/obj/Release/PayM.Pay_EmpWorkQtyEntryReport.resources | 0
WorkM/bin/Release/SQLHelper.pdb | 0
Model/bin/Release/Model.pdb | 0
PayM/obj/Release/PayM.Pay_CarOutApplyBill.resources | 0
Model/bin/Release/Model.dll | 0
PayM/obj/Release/PayM.Pay_EmpPayMentSumReportDlg.resources | 0
/dev/null | 0
APSM/bin/Release/WorkM.pdb | 0
BaseSet/bin/Release/DBUtility.dll | 0
WorkM/bin/Release/SQLHelper.dll | 0
PayM/obj/Release/CostM.Pay_AccPayMentDayBill5.resources | 0
394 files changed, 5,616 insertions(+), 299 deletions(-)
diff --git a/APSM/bin/Release/APSM.dll b/APSM/bin/Release/APSM.dll
index a76bd42..60e2645 100644
--- a/APSM/bin/Release/APSM.dll
+++ b/APSM/bin/Release/APSM.dll
Binary files differ
diff --git a/APSM/bin/Release/APSM.pdb b/APSM/bin/Release/APSM.pdb
index cec6eea..39234b5 100644
--- a/APSM/bin/Release/APSM.pdb
+++ b/APSM/bin/Release/APSM.pdb
Binary files differ
diff --git a/APSM/bin/Release/BLL.dll b/APSM/bin/Release/BLL.dll
index 322fe1e..ce7f44c 100644
--- a/APSM/bin/Release/BLL.dll
+++ b/APSM/bin/Release/BLL.dll
Binary files differ
diff --git a/APSM/bin/Release/BLL.pdb b/APSM/bin/Release/BLL.pdb
index c59eea2..806e387 100644
--- a/APSM/bin/Release/BLL.pdb
+++ b/APSM/bin/Release/BLL.pdb
Binary files differ
diff --git a/APSM/bin/Release/BaseSet.dll b/APSM/bin/Release/BaseSet.dll
index 8e76fb4..e9491f6 100644
--- a/APSM/bin/Release/BaseSet.dll
+++ b/APSM/bin/Release/BaseSet.dll
Binary files differ
diff --git a/APSM/bin/Release/BaseSet.pdb b/APSM/bin/Release/BaseSet.pdb
index 344b923..d7065ee 100644
--- a/APSM/bin/Release/BaseSet.pdb
+++ b/APSM/bin/Release/BaseSet.pdb
Binary files differ
diff --git a/APSM/bin/Release/DAL.dll b/APSM/bin/Release/DAL.dll
index 28f26de..6722401 100644
--- a/APSM/bin/Release/DAL.dll
+++ b/APSM/bin/Release/DAL.dll
Binary files differ
diff --git a/APSM/bin/Release/DAL.pdb b/APSM/bin/Release/DAL.pdb
index a7b3ed9..00df416 100644
--- a/APSM/bin/Release/DAL.pdb
+++ b/APSM/bin/Release/DAL.pdb
Binary files differ
diff --git a/APSM/bin/Release/DBUtility.dll b/APSM/bin/Release/DBUtility.dll
index 45d4353..dc782c4 100644
--- a/APSM/bin/Release/DBUtility.dll
+++ b/APSM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/APSM/bin/Release/DBUtility.pdb b/APSM/bin/Release/DBUtility.pdb
index ef67b9b..d4ae4d5 100644
--- a/APSM/bin/Release/DBUtility.pdb
+++ b/APSM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/APSM/bin/Release/Model.dll b/APSM/bin/Release/Model.dll
index 9f8b23d..cb94a58 100644
--- a/APSM/bin/Release/Model.dll
+++ b/APSM/bin/Release/Model.dll
Binary files differ
diff --git a/APSM/bin/Release/Model.pdb b/APSM/bin/Release/Model.pdb
index 32810b7..d33cc1c 100644
--- a/APSM/bin/Release/Model.pdb
+++ b/APSM/bin/Release/Model.pdb
Binary files differ
diff --git a/APSM/bin/Release/PlanM.dll b/APSM/bin/Release/PlanM.dll
index adb52fb..6e0ae65 100644
--- a/APSM/bin/Release/PlanM.dll
+++ b/APSM/bin/Release/PlanM.dll
Binary files differ
diff --git a/APSM/bin/Release/PlanM.pdb b/APSM/bin/Release/PlanM.pdb
index bdf53a5..8365bee 100644
--- a/APSM/bin/Release/PlanM.pdb
+++ b/APSM/bin/Release/PlanM.pdb
Binary files differ
diff --git a/APSM/bin/Release/Pub_Class.dll b/APSM/bin/Release/Pub_Class.dll
index 6c41ee2..0782b0a 100644
--- a/APSM/bin/Release/Pub_Class.dll
+++ b/APSM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/APSM/bin/Release/Pub_Class.pdb b/APSM/bin/Release/Pub_Class.pdb
index ef676f7..9ce9a59 100644
--- a/APSM/bin/Release/Pub_Class.pdb
+++ b/APSM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/APSM/bin/Release/Pub_Control.dll b/APSM/bin/Release/Pub_Control.dll
index 3ea2b96..a1fcd8d 100644
--- a/APSM/bin/Release/Pub_Control.dll
+++ b/APSM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/APSM/bin/Release/Pub_Control.pdb b/APSM/bin/Release/Pub_Control.pdb
index ab08c90..feb6d4d 100644
--- a/APSM/bin/Release/Pub_Control.pdb
+++ b/APSM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/APSM/bin/Release/SQLHelper.dll b/APSM/bin/Release/SQLHelper.dll
index 34d8892..965e083 100644
--- a/APSM/bin/Release/SQLHelper.dll
+++ b/APSM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/APSM/bin/Release/SQLHelper.pdb b/APSM/bin/Release/SQLHelper.pdb
index 6fe9783..60e8ba8 100644
--- a/APSM/bin/Release/SQLHelper.pdb
+++ b/APSM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/APSM/bin/Release/WarM.dll b/APSM/bin/Release/WarM.dll
index 4ceec24..ea41e3a 100644
--- a/APSM/bin/Release/WarM.dll
+++ b/APSM/bin/Release/WarM.dll
Binary files differ
diff --git a/APSM/bin/Release/WarM.pdb b/APSM/bin/Release/WarM.pdb
index e48d6bc..7611ce1 100644
--- a/APSM/bin/Release/WarM.pdb
+++ b/APSM/bin/Release/WarM.pdb
Binary files differ
diff --git a/APSM/bin/Release/WorkM.dll b/APSM/bin/Release/WorkM.dll
index 147d579..32fcbdf 100644
--- a/APSM/bin/Release/WorkM.dll
+++ b/APSM/bin/Release/WorkM.dll
Binary files differ
diff --git a/APSM/bin/Release/WorkM.pdb b/APSM/bin/Release/WorkM.pdb
index e2d4cd0..522f767 100644
--- a/APSM/bin/Release/WorkM.pdb
+++ b/APSM/bin/Release/WorkM.pdb
Binary files differ
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index 4c6da0f..cdda356 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 daeb23f..aed8b49 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 ed34961..20219d0 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 05b4e4f..adb3236 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 e65e2d0..dc782c4 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 9109dbc..d4ae4d5 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 9538c89..badca3e 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 af00a66..c86227b 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 aac1355..0782b0a 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 a119cc1..9ce9a59 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 ebe40ac..a1fcd8d 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 3cb83f0..feb6d4d 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 85dd23f..965e083 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 14e3cba..60e8ba8 100644
--- a/BLL/bin/Release/SQLHelper.pdb
+++ b/BLL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/BLL.dll b/BaseSet/bin/Release/BLL.dll
index 322fe1e..ce7f44c 100644
--- a/BaseSet/bin/Release/BLL.dll
+++ b/BaseSet/bin/Release/BLL.dll
Binary files differ
diff --git a/BaseSet/bin/Release/BLL.pdb b/BaseSet/bin/Release/BLL.pdb
index c59eea2..806e387 100644
--- a/BaseSet/bin/Release/BLL.pdb
+++ b/BaseSet/bin/Release/BLL.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/BaseSet.dll b/BaseSet/bin/Release/BaseSet.dll
index 8e76fb4..e9491f6 100644
--- a/BaseSet/bin/Release/BaseSet.dll
+++ b/BaseSet/bin/Release/BaseSet.dll
Binary files differ
diff --git a/BaseSet/bin/Release/BaseSet.pdb b/BaseSet/bin/Release/BaseSet.pdb
index 344b923..d7065ee 100644
--- a/BaseSet/bin/Release/BaseSet.pdb
+++ b/BaseSet/bin/Release/BaseSet.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/DAL.dll b/BaseSet/bin/Release/DAL.dll
index 28f26de..6722401 100644
--- a/BaseSet/bin/Release/DAL.dll
+++ b/BaseSet/bin/Release/DAL.dll
Binary files differ
diff --git a/BaseSet/bin/Release/DAL.pdb b/BaseSet/bin/Release/DAL.pdb
index a7b3ed9..00df416 100644
--- a/BaseSet/bin/Release/DAL.pdb
+++ b/BaseSet/bin/Release/DAL.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/DBUtility.dll b/BaseSet/bin/Release/DBUtility.dll
index 45d4353..dc782c4 100644
--- a/BaseSet/bin/Release/DBUtility.dll
+++ b/BaseSet/bin/Release/DBUtility.dll
Binary files differ
diff --git a/BaseSet/bin/Release/DBUtility.pdb b/BaseSet/bin/Release/DBUtility.pdb
index ef67b9b..d4ae4d5 100644
--- a/BaseSet/bin/Release/DBUtility.pdb
+++ b/BaseSet/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/Model.dll b/BaseSet/bin/Release/Model.dll
index 9f8b23d..cb94a58 100644
--- a/BaseSet/bin/Release/Model.dll
+++ b/BaseSet/bin/Release/Model.dll
Binary files differ
diff --git a/BaseSet/bin/Release/Model.pdb b/BaseSet/bin/Release/Model.pdb
index 32810b7..d33cc1c 100644
--- a/BaseSet/bin/Release/Model.pdb
+++ b/BaseSet/bin/Release/Model.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Class.dll b/BaseSet/bin/Release/Pub_Class.dll
index 6c41ee2..0782b0a 100644
--- a/BaseSet/bin/Release/Pub_Class.dll
+++ b/BaseSet/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Class.pdb b/BaseSet/bin/Release/Pub_Class.pdb
index ef676f7..9ce9a59 100644
--- a/BaseSet/bin/Release/Pub_Class.pdb
+++ b/BaseSet/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Control.dll b/BaseSet/bin/Release/Pub_Control.dll
index 3ea2b96..a1fcd8d 100644
--- a/BaseSet/bin/Release/Pub_Control.dll
+++ b/BaseSet/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/BaseSet/bin/Release/Pub_Control.pdb b/BaseSet/bin/Release/Pub_Control.pdb
index ab08c90..feb6d4d 100644
--- a/BaseSet/bin/Release/Pub_Control.pdb
+++ b/BaseSet/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/BaseSet/bin/Release/SQLHelper.dll b/BaseSet/bin/Release/SQLHelper.dll
index 34d8892..965e083 100644
--- a/BaseSet/bin/Release/SQLHelper.dll
+++ b/BaseSet/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/BaseSet/bin/Release/SQLHelper.pdb b/BaseSet/bin/Release/SQLHelper.pdb
index 6fe9783..60e8ba8 100644
--- a/BaseSet/bin/Release/SQLHelper.pdb
+++ b/BaseSet/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index ed34961..20219d0 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 05b4e4f..adb3236 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 e65e2d0..dc782c4 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 9109dbc..d4ae4d5 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 9538c89..badca3e 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 af00a66..c86227b 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 aac1355..0782b0a 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 a119cc1..9ce9a59 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 ebe40ac..a1fcd8d 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 3cb83f0..feb6d4d 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 85dd23f..965e083 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 14e3cba..60e8ba8 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ShiftsBeginInfoBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ShiftsBeginInfoBill.cs"
index dc95f8e..965ba81 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ShiftsBeginInfoBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ShiftsBeginInfoBill.cs"
@@ -72,6 +72,7 @@
",HGroupID =" + omodel.HGroupID.ToString() +
",HGroupLeaderID =" + omodel.HGroupLeaderID.ToString() +
",HStdEmpQty =" + omodel.HStdEmpQty.ToString() +
+ ",HRelEmpQty = " + omodel.HRelEmpQty.ToString() +
",HPlanShutdownTimes =" + omodel.HPlanShutdownTimes.ToString() +
" where HInterID=" + lngBillKey.ToString());
@@ -170,7 +171,7 @@
//涓昏〃
string mainSql = "insert into Sc_ShiftsBeginInfoBillMain" +
"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" +
- ",HDeptID,HWorkCenterID,HShiftsID,HSourceID,HGroupID,HGroupLeaderID,HStdEmpQty,HPlanShutdownTimes) " +
+ ",HDeptID,HWorkCenterID,HShiftsID,HSourceID,HGroupID,HGroupLeaderID,HStdEmpQty,HRelEmpQty,HPlanShutdownTimes) " +
"values(" +
"" + (omodel.HYear.ToString() != "0" ? omodel.HYear.ToString() : DateTime.Now.Year.ToString()) +
"," + omodel.HPeriod.ToString() +
@@ -189,6 +190,7 @@
"','" + omodel.HGroupID +
"','" + omodel.HGroupLeaderID +
"','" + omodel.HStdEmpQty +
+ "','" + omodel.HRelEmpQty +
"','" + omodel.HPlanShutdownTimes +
"')";
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs"
index 0868824..337b6e6 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs"
@@ -212,14 +212,14 @@
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark" +
",HPlanNo,HPlanInterID,HMouldID,HBeginDate"+
- ",HEndDate"+
+ ",HEndDate,HMainSourceBillNo,HMainSourceInterID,HMainSourceEntryID" +
",HInnerBillNo,HExplanation,HMouldMaintainRuleInterID,HMaintainLevID,HLastResult" +
",HRequestComDate,HRecentMainModule,HCumulativeModule,HProductionModule" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'"+
- ",'" + omodel.HPlanNo + "'," + omodel.HPlanInterID.ToString() + "," + omodel.HMouldID.ToString() + ",'" + omodel.HBeginDate + "'" +
- ",'" + omodel.HEndDate + "'"+
+ ",'" + omodel.HPlanNo + "','" + omodel.HPlanInterID.ToString() + "','" + omodel.HMouldID.ToString() + "','" + omodel.HBeginDate + "'" +
+ ",'" + omodel.HEndDate + "','" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceInterID + "','" + omodel.HMainSourceEntryID + "'" +
",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'," +omodel.HMouldMaintainRuleInterID.ToString() + "," + omodel.HMaintainLevID +
",'" + omodel.HLastResult + "'" +
",'"+ omodel.HRequestComDate + "'," + omodel.HRecentMainModule + "," + omodel.HCumulativeModule + "," + omodel.HProductionModule + ") ");
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_EquipMaintainBill.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_EquipMaintainBill.cs"
index 83d34f4..268b1d8 100644
--- "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_EquipMaintainBill.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_EquipMaintainBill.cs"
@@ -176,12 +176,13 @@
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark,HEquipID" +
",HBeginDate,HEndDate,HPlanNo,HExplanation,HInnerBillNo,HEquipMaintainRuleInterID" +
- ",HDeptID,HMaintainLevID,HLastResult" +
+ ",HDeptID,HMaintainLevID,HLastResult,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() +
- ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," +omodel.HEquipMaintainRuleInterID.ToString() + "," + omodel.HDeptID + "," + omodel.HMaintainLevID + ",'" + omodel.HLastResult + "'" +
- ") ");
+ ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "','" +omodel.HEquipMaintainRuleInterID.ToString() + "'" +
+ ",'" + omodel.HDeptID + "','" + omodel.HMaintainLevID + "','" + omodel.HLastResult + "'" +
+ ",'" + omodel.HMainSourceInterID + "','" + omodel.HMainSourceEntryID + "','" + omodel.HMainSourceBillNo + "') ");
//鎻掑叆閰嶄欢瀛愯〃
foreach (Model.ClsSb_EquipMaintainBillSub oSub in DetailColl)
{
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index e65e2d0..dc782c4 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 9109dbc..d4ae4d5 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 aac1355..0782b0a 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 a119cc1..9ce9a59 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 ebe40ac..a1fcd8d 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 3cb83f0..feb6d4d 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 85dd23f..965e083 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 14e3cba..60e8ba8 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 6ecdde9..e184a46 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 e65e2d0..dc782c4 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 9109dbc..d4ae4d5 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git a/LMES/Frm_Show.cs b/LMES/Frm_Show.cs
index ad77fea..c883f2a 100644
--- a/LMES/Frm_Show.cs
+++ b/LMES/Frm_Show.cs
@@ -185,7 +185,7 @@
{
DataSet oDs;
Pub_Class.ClsSqlHelper oCn = new Pub_Class.ClsSqlHelper();
- oDs = oCn.RunProcReturn("h_p_OA_EmpMinMessageList " + DBUtility.ClsPub.CurUserName.ToString(), "xt_xtgnb");
+ oDs = oCn.RunProcReturn("h_p_OA_EmpMinMessageList '" + DBUtility.ClsPub.CurUserName.ToString()+"'", "h_p_OA_EmpMinMessageList");
if (oDs != null)
{
grdList1.DataSource = oDs.Tables[0].DefaultView;
@@ -196,7 +196,7 @@
}
//
- oDs = oCn.RunProcReturn("exec h_p_OA_WorkBillList " + DBUtility.ClsPub.CurUserName.ToString(), "xt_xtgnb");
+ oDs = oCn.RunProcReturn("exec h_p_OA_WorkBillList '" + DBUtility.ClsPub.CurUserName.ToString() + "'", "h_p_OA_WorkBillList");
if (oDs == null)
{
return;
diff --git a/LMES/LMES.csproj b/LMES/LMES.csproj
index 82a0261..aa86cff 100644
--- a/LMES/LMES.csproj
+++ b/LMES/LMES.csproj
@@ -126,6 +126,12 @@
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="XiaoZhuGe_autoGetData.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="XiaoZhuGe_autoGetData.Designer.cs">
+ <DependentUpon>XiaoZhuGe_autoGetData.cs</DependentUpon>
+ </Compile>
<Compile Include="Xt_Wait.cs">
<SubType>Form</SubType>
</Compile>
@@ -160,6 +166,9 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
+ <EmbeddedResource Include="XiaoZhuGe_autoGetData.resx">
+ <DependentUpon>XiaoZhuGe_autoGetData.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="Xt_Wait.resx">
<DependentUpon>Xt_Wait.cs</DependentUpon>
<SubType>Designer</SubType>
diff --git a/LMES/Program.cs b/LMES/Program.cs
index 81a7262..a123ba2 100644
--- a/LMES/Program.cs
+++ b/LMES/Program.cs
@@ -15,7 +15,8 @@
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
- //Application.Run(new DingDing_autoGetData());
+ //Application.Run(new DingDing_autoGetData()); //鏂帿灏斻�愰拤閽�-MES銆戝悓姝ユ彃浠�
+ //Application.Run(new XiaoZhuGe_autoGetData()); //涓夊崌銆愬皬璇歌憶-閲戣澏浜戙�戝悓姝ユ彃浠�
DBUtility.ClsPub.AppPath = System.Environment.CurrentDirectory;
@@ -24,7 +25,7 @@
DBUtility.ClsPub.SetIPAddress();
DBUtility.ClsPub.VersionNum = "12.1";
Pub_Class.ClsPub.VersionNum = "12.1";//
- //===================================================================
+ //===================================================================
try
{
if (DBUtility.ClsPub.CheckUpdate())
diff --git a/LMES/XiaoZhuGe_autoGetData.Designer.cs b/LMES/XiaoZhuGe_autoGetData.Designer.cs
new file mode 100644
index 0000000..e572c42
--- /dev/null
+++ b/LMES/XiaoZhuGe_autoGetData.Designer.cs
@@ -0,0 +1,73 @@
+锘�
+namespace LMES
+{
+ partial class XiaoZhuGe_autoGetData
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(XiaoZhuGe_autoGetData));
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.timer2 = new System.Windows.Forms.Timer(this.components);
+ this.notifyIcon_Icon = new System.Windows.Forms.NotifyIcon(this.components);
+ this.SuspendLayout();
+ //
+ // timer1
+ //
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // timer2
+ //
+ this.timer2.Enabled = true;
+ this.timer2.Interval = 300000;
+ this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
+ //
+ // notifyIcon_Icon
+ //
+ this.notifyIcon_Icon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon_Icon.Icon")));
+ this.notifyIcon_Icon.Text = "LMES";
+ this.notifyIcon_Icon.Visible = true;
+ this.notifyIcon_Icon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_Icon_MouseDoubleClick);
+ //
+ // XiaoZhuGe_autoGetData
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(800, 450);
+ this.Name = "XiaoZhuGe_autoGetData";
+ this.Text = "XiaoZhuGe_autoGetData";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.NotifyIcon notifyIcon_Icon;
+ private System.Windows.Forms.Timer timer2;
+ }
+}
\ No newline at end of file
diff --git a/LMES/XiaoZhuGe_autoGetData.cs b/LMES/XiaoZhuGe_autoGetData.cs
new file mode 100644
index 0000000..096dacc
--- /dev/null
+++ b/LMES/XiaoZhuGe_autoGetData.cs
@@ -0,0 +1,89 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using WebAPI.Controllers;
+namespace LMES
+{
+ public partial class XiaoZhuGe_autoGetData : Form
+ {
+ public XiaoZhuGe_autoGetData()
+ {
+ InitializeComponent();
+
+ //涓虹郴缁熸墭鐩樺浘鏍囧鍔� 鍙冲嚮鑿滃崟椤�
+ ContextMenu contextMenu = new ContextMenu();
+ MenuItem exitMenuItem = new MenuItem("閫�鍑�");
+ exitMenuItem.Click += ExitMenuItem_Click;
+ contextMenu.MenuItems.Add(exitMenuItem);
+ notifyIcon_Icon.ContextMenu = contextMenu;
+
+ //椤甸潰鍒濆鍖�
+ set_initPage();
+ }
+
+ #region 椤甸潰鍒濆鍖�
+ public void set_initPage()
+ {
+ timer1.Enabled = true;
+ }
+ #endregion
+
+ #region 瀹氭椂鍣�1锛氱敤浜庨殣钘忛〉闈笌浠诲姟鏍忓浘鏍�
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ //绯荤粺鎵樼洏鏄剧ず杞欢鍥炬爣
+ this.notifyIcon_Icon.Visible = true;
+ // 闅愯棌涓荤獥浣�
+ this.Hide();
+ // 闅愯棌浠诲姟鏍忚蒋浠跺浘鏍�
+ this.ShowInTaskbar = false;
+
+ timer1.Enabled = false;
+ }
+ #endregion
+
+ #region 瀹氭椂鍣�2锛氱敤浜庡畾鏃跺悓姝ユ暟鎹�
+ private void timer2_Tick(object sender, EventArgs e)
+ {
+ try
+ {
+ XZG_DataSynchronizationController t = new XZG_DataSynchronizationController();
+ t.dataAnsy();
+ }catch(Exception e1)
+ {
+ string sErrMsg = "";
+ }
+ }
+ #endregion
+
+ #region 绯荤粺鎵樼洏鐐瑰嚮鍥炬爣鍚庡浘鏍囦粛瀛樺湪
+ private void notifyIcon_Icon_MouseDoubleClick(object sender, MouseEventArgs e)
+ {
+
+
+ if (e.Button == MouseButtons.Left && e.Clicks == 2) // 鍙屽嚮宸﹂敭浜嬩欢绀轰緥
+ {
+ // 澶勭悊鍙屽嚮浜嬩欢锛屼緥濡傛樉绀烘垨闅愯棌涓荤獥浣撶瓑銆�
+ //this.Show(); // 绀轰緥锛氭樉绀轰富绐椾綋锛堝鏋滀箣鍓嶆槸闅愯棌鐨勶級
+ //this.WindowState = FormWindowState.Normal; // 纭繚绐楀彛澶勪簬姝ｅ父鐘舵�侊紙闈炴渶灏忓寲锛�
+
+ //绯荤粺鎵樼洏鏄剧ず杞欢鍥炬爣
+ this.notifyIcon_Icon.Visible = true; //淇濊瘉绯荤粺鎵樼洏鍥炬爣浠嶆棫瀛樺湪
+ }
+ }
+ #endregion
+
+ #region 绯荤粺鎵樼洏鍥炬爣 鍙冲嚮鍔熻兘鑿滃崟閫�鍑烘寜閽簨浠�
+ private void ExitMenuItem_Click(object sender, EventArgs e)
+ {
+ Application.Exit(); // 杩欏皢鍏抽棴鏁翠釜搴旂敤绋嬪簭
+ }
+ #endregion
+ }
+}
diff --git a/LMES/XiaoZhuGe_autoGetData.resx b/LMES/XiaoZhuGe_autoGetData.resx
new file mode 100644
index 0000000..356ab97
--- /dev/null
+++ b/LMES/XiaoZhuGe_autoGetData.resx
@@ -0,0 +1,455 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>136, 17</value>
+ </metadata>
+ <metadata name="notifyIcon_Icon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>246, 21</value>
+ </metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="notifyIcon_Icon.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAABAAUAICAAAAEAGACoDAAAVgAAABAQAAABABgAaAMAAP4MAAAwMAAAAQAgAKglAABmEAAAICAAAAEA
+ IACoEAAADjYAABAQAAABACAAaAQAALZGAAAoAAAAIAAAAEAAAAABABgAAAAAAAAMAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXYSURH+XVYuh
+ a5mrhaGrAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQIOeXIudAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ L4erAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAood1wZ2C17KS4a+G5bua4MKpy6KDrYBhknZkAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAh6u5PImpAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ wqGN98qn/+3K///x///////9///////////3//fm/8yn15Njl3NaAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAfLHGN4anAAAAAAAAAAAAAAAAAAAArJJ48ruI/+vF///z///7//7w//La/+vP/+7T//bm
+ //TZ//rj///w//HY/b6RyI5pinhpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfLbNLoaoAAAAAAAAAAAA
+ AAAAvpVv+8KO/9qw/+nG/+vP/+DB/9++/sKa/rKE/bWH/8ij/LuP/cKW/tCm/+K//+bJ/9Gx2Y9bj3BX
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAhLPFKo+4AAAAAAAAAAAAt41u6K15+MWZ/9Co/8ai/sup/8Kc/76W
+ /8Ca/sGa/rOF/7+Z+66C+Kl79at997CD+7uQ/86u77qa2JFcjHBaAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ MJ7MdY2XAAAAj29Yz5dw4KZ99bqR+bmS/ryV/82q/82n/7qM/7iI/8GX/8qk/9Cv/7qN/q59+K1+8qp6
+ 7qV387OL7rKM2ZtxyotYi351AAAAAAAAAAAAAAAAAAAAAAAAOaPPVYqge2xjjlo2u4lp4aaA87OL/L6V
+ /8ie/9iz/82k/7uL/7+S/7yM/7yL/86m/9Ct/8GX/rSE+a5+8ql47ayB6auB2ZVkxoFKp3FDAAAAAAAA
+ AAAAAAAAAAAAAAAAOZjASaLKaVVGhFg6uIho5qyE+72S/8ui/9Kp/9Wu/8+m/8GR/8eX/8aX/8KQ/8uf
+ /8ui/8WZ/8qi/r6V+LCA86+C662C35poxIFPvXQ1iW1TAAAAAAAAAAAAAAAAAAAARpKwXcLsVmhqiF5B
+ u5J467OR/cab/9Ko/8uf/8eZ/9ev/8WU/8ma/8mZ/8aV/8+j/9Sq/72J/76N/8OY/cOb+sCb87WM5J1p
+ zopXunQ6oGc0AAAAAAAAAAAAAAAAAAAAZZqwZL7gXpipg1s/vI5y58Gl/Ni3/9Os/8SU/8SV/9qy/8qZ
+ /8yc/82d/8ya/9Cg/9qx/8ST/8CO/7yI/riH/b+U+sOf8LKH25lou3Y+r2cojX9yAAAAAAAAAAAAAAAA
+ AAAAT569ernLe3htvoll3rGP98GZ/9ay/+G9/9+6/+XC/9Wo/9Cg/8+d/8+b/9Cd/+C2/8uY/8aT/8OR
+ /7yK/rqL+b6U8q+A5ql+xo1gsW81jG9WAAAAAAAAAAAAAAAAAAAAToCOf7C9f5aUvIFb26SB87GD/b6N
+ /8ud/9ar/+vI/+7L/+7I/+nC/+G1/9mr/+K5/82a/8aT/8WT/7+M/8CR/MGZ9a176KJty4tYsnVCk2xN
+ AAAAAAAAAAAAAAAAAAAAbGpcdJaglaejsopu36R+7bOJ+b2O/siW/8qV/9yv/9ut/9el/+Cx/+W6/+nA
+ //DN/+S8/9ao/8uZ/8CM/8GQ/cWd+LKA7Kl10pBbtHAzmGc+AAAAAAAAAAAAAAAAAAAAj1stcYWJqa6m
+ sJ2I3KB66LGJ9bqL/cmY/86b/9yt/+C0/9Kf/9Wh/9Og/9Oe/+S4/92v/9ms/9qx/9Ko/8yh/cmh+LN/
+ 7al01JVftXU6mmc9AAAAAAAAAAAAAAAAAAAAo1kegnRipKafwbemh61mgaBM77WF+8WT/suY/9io/+K4
+ /9Wi/9im/9im/9ai/+K3/9mo/8qV/8qW/8mZ/82h/tSv/cWa8LSF0ZJfs3I1mGU5AAAAAAAAAAAAAAAA
+ AAAAnlsnoW5GmY19e615VbQmW6kAXZhmY5ShVK3cWLHfgbTM/9Of/9Wj/9ak/9Wg/+O1/96u/9CZ/8uY
+ /8eS/8SS/c6j+7yK77WJ0J1ytnlGlmpIAAAAAAAAAAAAAAAAAAAAm2c7rm09ia2VZr91XMJXYrEkSKV4
+ JsDgHdL+Jc71NsPqi7vI/9io/9Wj/9Gb/96w/9ut/82V/8uX/8eU/8OT/s+m+LiE5aZxxoZQt2ovl3lk
+ AAAAAAAAAAAAAAAAAAAAo31erG49c7BpXLQ6YLc4ipVSW6a0E832CND4Ds30C9X1RMPZ/+W8/+e7/+a5
+ /+nA/+O1/9Kd/8uU/8WO/8KO/82k97iF4KBrwnQ8tmIhAAAAAAAAAAAAAAAAAAAAAAAAAAAArKiFap8Z
+ S6QAaZMApWxOdJTDM7n3LKjwKJfrEqzuH8Xf/9Gc/9Wg/9mm/+W5/+m9/+Cx/92x/9an/8ub/82j76t2
+ 1oZQw28xqWc0AAAAAAAAAAAAAAAAAAAAAAAAzbKe1rBwd5oNUKQAhXkSo2ZpcJjUTqj4SpDtQ3LmNGzm
+ K57X+cmX/c6Z/82X/9in/9ur/8uS/82Y/9Ge/c2g/MWj66mCzIVXyHM3o4h1AAAAAAAAAAAAAAAAAAAA
+ x7Gb5LeN2KZunJkecpMCnWsvk3qaW6nsSK74Q5ztOobpNmjlOmnMg5Om8sSS+ceS/NKi/tmq/8qT/8mT
+ /rqE96h187CI25JizYNPuoFbAAAAAAAAAAAAAAAAAAAAAAAA262A2KJt2JlhwpIyqXwPpWtTcpLHTrX5
+ SrD0RJ3uOYjpL23lNlXQcXik3K+A4bOC7MSW9cyg+7uG+7B++Kd29qd27K2Hz35Gy3MyAAAAAAAAAAAA
+ AAAAAAAAAAAA06d91JthzZFPyIg7yoIgw3UukoGNUqPtRKv4RJrtOoXpMWzlK1rhLlXbXXGv3KV51pxx
+ 0Jx31Z5535Rl6p9x9qt/8KV43592134/spyMAAAAAAAAhqWzAAAAAAAA0bebz5RVyYo+w38mv4AaxJRM
+ AAAAoai1TqTuOJPxNHfmLF/iKVPhKlThKlfhWG+4k5uYs5WAxpl9v56EvZ+E0a2Q36SE04pa0I1jsp2O
+ AAAAAAAAAAAAAAAAdI6ZAAAAzJlbxYUvwYAbxYwxAAAAAAAAAAAAAAAAd7DhO5DuMnTmKl3jKVThKlbh
+ KlfhXnfBaLTRUaPBY5qqmq2lxauNwI9utXtZpHVYAAAAAAAAAAAAAAAAAAAAAAAAZYaSAAAA0qpvzqBU
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAZqLiNnfjK1/jKlbhKlfhKlfgboXLu9HKebLGP6TPMJjFU4SWfGNM
+ lHpoAAAAAAAAAAAAAAAAAAAAAAAAX4eYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ dZvcM2ThKVbgKlfhOGHez4pa15FgzIpcqpJ9faOyS5/DKI22QYKefZWgAAAAAAAAAAAAAAAAWoSUcpyu
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAT3LdLFjgboneAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAdKvDZpisZ5KkZpWpdqK0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAA/////+D////P////3/AH/5/AAf+fAAB/ngAAP5wAAB/IAAAPwAAAD8AA
+ AAfAAAAHwAAAA+AAAAPgAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPgAAAH8AAAB+AAAAfAAAAPwAAAH4AA
+ ABsCAAA9DwAA/T+AAfv/wADz//H+D/////8oAAAAEAAAACAAAAABABgAAAAAAAADAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAd3d3YWFhW1tbXFxcaGhoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgoKCbm5u
+ iIiI3dzc29rafX19WFdYSkpKAAAAAAAAAAAAAAAAAAAAAAAAAAAAgICAh4WE1tPP5ODb8/Dt8e3q3tfS
+ ycTAnZmYRUVFAAAAAAAAAAAAAAAAAAAAmJiYwsHB2M7G2biQ2LmW8Onj7uXd1LKI1LGCy761pKOjSUlJ
+ AAAAAAAAAAAAAAAAiIiI2NfX7+3r6+LZ38qx8+/q7ujh3b6S5tjF6ebjzc3NWVlZAAAAAAAAAAAAAAAA
+ trW24eHh8fHw8vHv49PC49nN4NC84MSa7urm7ezr29vbr6+vWFhYAAAAAAAAnZ2duLi43dzd5+fn6uno
+ 5ODc1r6f2LeG4NXG6Ofl5eXl2tratbS1VlZWAAAAAAAAnZydtLO01tXW39/f4ODg3dnU1L2b1LeF3NjS
+ 4N/e3t7e1NTUsrKyW1tbAAAAAAAAAAAAq6qr0NDQ3d3d3t3c1M3F2LR90beW19LO3t7d3d3dz8/Pqamp
+ Z2dnAAAAAAAAAAAAj4+PycnJ4ODg39zY2MGh2MCb2c7C1cWy4d/c4ODgx8fHampqlJSUAAAAAAAAAAAA
+ lpaWuLi4397d2tDE3ryI3tbO5ODa2MOo2M/E3dvatLOzbGxsAAAAAAAAAAAAAAAAAAAAjYyNycbD28q2
+ 4tG45NbH6eLc3Mar2MWuwrq1cnFyAAAAAAAAAAAAAAAAAAAAAAAAAAAAlJSTqaen2tjV5uTj5uTh2dbU
+ lZORgoKCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApqammpqamJeYn5+fAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//8AAPwf
+ AADwDwAA4AcAAMADAADAAwAAwAEAAIABAACAAQAAwAEAAMABAADAAwAA4AcAAPAPAAD8PwAA//8AACgA
+ AAAwAAAAYAAAAAEAIAAAAAAAgCUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAA
+ ABQAAAAVAAAAEwAAAA8AAAAMAAAACwAAAA8AAAAVAAAAFAAAAA8AAAALAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAIAAAACQAAAAoAAAALAAAACwAAAAsAAAALAAAACgAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAFAMMEUgIJC9yDDZGig06S48LNUR5ByIsSwMMECAAAAAAAAAACAAAABIAAAARAAAADgAA
+ AAsAAAAMAAAADwAAABUAAAAbAAAAHwAAACMAAAAlAAAAJgAAACYAAAAlAAAAIQAAAB0AAAAZAAAAEgAA
+ AA0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAACBwoXDj1QlhlvkucbdZrpGW6Q0hlrjL0bdJiyGGaEsBRadaEOQFNuBhoiLQED
+ BAoAAAAPAAAAEwAAABYAAAAbAAAAIwAAAC0AAAA0AAAAOwAAAD8AAABCAAAARAAAAEUAAABDAAAAQAAA
+ ADkAAAAyAAAAKAAAAB4AAAATAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIGCAoRS2KjH4Su+xRYcqoJJjNeBRMYMAUXHg8RRl4JEkdbFhx4
+ mzsVXHhfEERZagsxQEoCDhIkAAEBIQAAAC0AAAA0AAAAOQAAAEAAAABIAAAATwAAAFYCAABZAAAAWgAA
+ AFgAAABUAAAAUQAAAE4AAABMAAAARQAAADsAAAAvAAAAJAAAABoAAAARAAAACQAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsuPVAfh7D/Fl17swADAzEAAAAqAAAAFgAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAgkMFAYcJTwCGCFFAAAAOwAAAEQEAgFYJxoRc0QvII1gRDGkcEcusYJN
+ LbqIVDa+hmFQu3FTQ7NYNyOmOh8LkR8QBnoAAABmAAAAXAAAAFkAAABTAAAARwAAADcAAAAmAAAAFwAA
+ AAsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABJOZokhj7v/Dj1PfwAA
+ ADIAAAA7AAAAIAAAAAkAAAAAAAAAAAAAAAoAAAAWAAAAHQAAACUAAABBIxoTbmVHMqShcVPS0Zt07e27
+ lPr7063//8+i///NoP//0qj//+bL///bu//4yqT/4qV5+cN8S+qSVi7QVTAXqRULA38AAABlAAAAXAAA
+ AFEAAABBAAAALgAAABwAAAAPAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVa
+ dqghjLj8DjlKdAAAADgAAAA7AAAAHwAAAAkAAAAAAAAADAAAABkAAAAmAAAANyYcFWd/YFCu0qKH7Pe/
+ lP//167//+/P///86P////X////x////9v////n/////////8////+r///7t///jyf//v5T/6Ztn/7Rw
+ QOlhOhy1GA4FfgAAAF8AAABYAAAASwAAADYAAAAjAAAAEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAFVhzDBlpiboii7f8DjhJdAAAADwAAAA/AAAAIgAAAAwAAAALAAAAGgAAACIRDAhIak8yoMyb
+ bOn9yaT//+PL///z3f///Or////3///////////////2////9/////b////9/////v////X////0////
+ +///+/L//+TI//2+kv/nl2H/rnFG5lA3JqcGAwBtAAAAXAAAAFIAAAA7AAAAIgAAABEAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAG3edEBx5nsMhjLj/DjxPfQAAAEAAAABEAAAAJwAAABYAAAAYAAAAIywg
+ FGCheE7K7LN+//3Imf/+4Lb///vh////+P////v////u///64v//8NL//+bA///kv///47v//+7T///0
+ 3P//7Mj///HP///21P//++H////v///13f/9zan/9K+D/9iZbfx/TCPLGQ4EfgAAAF4AAABTAAAAOwAA
+ ACQAAAARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG3uhERx6oMMhj7v/D0BUjwAAAEQAAABLAAAAMAAA
+ ACAAAAAhQC4db76LW+Pvtn//98SX///bsf//68P///LV///w1v//6cz//+vP///jw//+yJ///riM//65
+ jv/9tor//sWd///Qrv/+wJT//sWa///OpP//1q3//+C6///szf//79P//te6//O+nf/ajlf/nFwr3yUV
+ CIcAAABdAAAAVAAAADsAAAAhAAAADQAAAAAAAAAAAAAAAAAAAAAAAAAAHX6lEBx6n78lk7//E09mqAAA
+ AEkAAABRAAAAPAAAACpALiByxY5b7OWsd//tuY7//s+l///ctP//17L//9a1///Wtv/+x6D//sei///L
+ qf//xKL//biR//2ufv/9q3r//rWL//7CoP/6roH/+Kt9//qvgv/7tIj//LyQ///Emf//zqj//9i2//3X
+ vf/nsI7/2Y1V/6ViK+gpFgiKAAAAXQAAAFAAAAAzAAAAGwAAAAwAAAAAAAAAAAAAAAAAAAAAFmSCDRpr
+ jLUsmsj/GmiJxQEFB1UAAABVAAAAQjEjGHG2gmDr259t/+GqfP/2wpX//82i//7Jo///wZz//sOe//7M
+ q///w5z//8Oc//+5jf//u5L//8up///Hov//tor//7WJ///HpP/9s4f/+6x9//erff/0q3v/86p9//au
+ gf/5tIj/+7iM//7Lqv/1xKb/3qiE/9WRXf+fYS7mHhAFggAAAFgAAABGAAAALAAAABUAAAAIAAAAAAAA
+ AAAAAAAADkJXCBVad6Ywm8n/IoCm3gMRF2kAAABUEwwGbIteO9zKk27/0Jlx/+asgf/0u5L/+LyV//m7
+ lP/9vJX//sGa///Qr///zqj//8Wd//+3iv//t4b//7uO///Hof//zqr//8mj///Orv//uIz//699//2w
+ gf/4rn//9Kt8//Coef/uqHv/8Kl7//a7l//yt5H/4KJ4/9CZc//Sk2L/iFo11QsHBW0AAABSAAAAPgAA
+ ACIAAAAMAAAAAAAAAAAAAAAAAAAAABNbeI8zmMP/MZvH+gQlNIYBAABeUzMew59nQP+1hGT/0Jl3/+Sm
+ gf/vsov/9LWP//q6kv//wZn//8ef///XtP//1bD//76S//+6i///vY7//7uM//+5if//v5P//8ym///Z
+ uv//yqT//7aI//+zgP/9sYH/+q+A//Wtff/wqXr/66R1/+6wiv/uso3/459v/9KPX//GhVL/xYZU/1s/
+ KrIAAAFfAAAATwAAAC8AAAATAAAAAAAAAAAAAAAAAAAAABBVcXIvkbr/Ra/d/wtLZq4iEQiUeksr+41b
+ OP+vgGD/1J9+/+WngP/xs4r/+rqS///Dmv//yqH//82j///buP//0qz//7yM//+/kP//wJP//7+S//+/
+ j///vIz//7uH///PqP//1rT//82o///FnP//tof//a9///muf//1rX3/8Kd3/+2uhP/qrof/4p9u/9mW
+ Zv/Ef0z/uXI3/6VnMPMoGQuLAAAAVwAAAD0AAAAdAAAACgAAAAAAAAAAAAAAAAo9UFUmiLD7Vrjl/yqC
+ qOZXRjbifFE0/4RXOP+vfl7/1aKB/+irgv/3uI7//sKa///Lov//0Kf//9Or///ZtP//1K7//8CQ///E
+ lP//xZb//8aW///Elf//w5T//7+O///Opf//zab//8CS///Np///zaj//8GY//yzhf/4rXv/9Kp5//Gy
+ hv/tsYr/455t/9uYZ//Kh1X/tXI8/7hwMf9zRRzNBAIBYwAAAEYAAAAoAAAAEwAAAAAAAAAAAAAAAAw8
+ TjMbeZ7jWbfg/0mt2f9WYmD/fVU8/4hlTP+uf2L/1aOE/+ywh//7v5T//8mg///RqP//1Kz//8yh///L
+ n///2rb//8SV///Flf//yJn//8mZ///ImP//x5f//8WT///Sqf//1rL//72K//+8iv//wpX//8uj///J
+ p//8v5n/97KD//azh//xtpH/6KFu/96aaf/Pi1v/vHlD/7VvNP+mZSr3LBoLiwAAAEkAAAA0AAAAGwAA
+ AAkAAAAAAAAAAA01RhIUZ4jASKnS/2rI7v1AeIz/dk4x/45sU/+xjHP/2KqO/++2lP/7wpn//s6k///V
+ q///zqL//8KR///Hmf//3rr//8qa///Glf//yZr//8qa///Jmf//yJj//8aV///Spf//3Lf//8WT///A
+ j///vIr//7uK//++kP/+xZv//cWg//vDof/2vZj/7KVz/+Ocaf/UkF7/w39L/7BtNP+zbC3/YjoXvAIB
+ AFMAAAA8AAAAJAAAAAwAAAAAAAAAAAAAAAATXnyTMZS+/33M5/1SpMD/Y1lL/5RiQf+wh2z/1qyS/+7H
+ qf/507H//tSv///Knf//v4///8CQ///GmP//37r//9Kk///JmP//zJ3//8yc///Lm///y5r//8mX///Q
+ of//3rn//8ma///Dkv//wZD//76M//+6h///toT//biK//zDm//7yKj/9LmS/+qqe//blmP/yYRP/7Jv
+ Nf+waiz/jFMh4xIKA2gAAABAAAAAKwAAAA8AAAAAAAAAAAAAAAAMP1NWJoeu922zzv98w9f/VXmB/5do
+ SP+xgWD/z6WI/+jEpP/30rL//du+///buf//1az//82h///ImP//3LX//9aq///Hlf//zZ3//8+f///Q
+ oP//0Z7//86b///RoP//473//9Cg///Fkv//xZP//8OP///Ajf//u4z//7aD//y5if/6wpz/9riN//O5
+ kf/mrIP/1JVn/7h1P/+qZSf/omAk9y4cDocAAABDAAAAMQAAABIAAAAAAAAAAAAAAAADFRwiInCP1Fic
+ uP+Iv83/ZZ2s/4h2ZP+6hWL/zJ9//+OwjP/zsob//MSa///Xsv//48H//+jH///lxP//6sv//+K8///T
+ pP//0qL//8+d///Om///0Zz//8+c///Rnf//5b7//9ap///Jlf//yJb//8aT///CkP//v4z//7qI//+8
+ kP/7xZ7/8698//CqeP/pp3r/26R5/8OMYv+rcD//qmgt/1AyGqkAAABJAAAANAAAABQAAAAAAAAAAAAA
+ AAAMCAUUNVZew02Npv9+rLr/grK6/3mDfv+7f1f/zZJt/+Ctiv/xroH/+reH///Aj///yZr//9Ko///d
+ tv//7Mr///bW///x0P//8c3//+rF///gtv//2an//9Sg///Omf//4rj//9iq///Jlf//ypj//8eW///E
+ k///wY3//7yI//+/kf/9yKL/97KE//Otev/qo2//25Zh/8WHVf+udkj/r3NE/2dDJsEBAQFQAAAANQAA
+ ABQAAAAAAAAAAAAAAAAgDAAebFM40U19i/9vlaL/lLCw/4CWlf+vgWL/05Fo/96tjf/usYf/97iK//zA
+ kf/+xZP//8iV///Jlf//2av//+rE///cr///5bn//+7H///yzf//8s7///HL///pw///7cr//+C1///M
+ mP//yJX//8eU///Fk///wo///72L///Ck//+yaT/+bSG//Wxfv/uqnX/35pn/8iFT/+ubDL/rGkv/3hN
+ KdEJBwVZAAAAMwAAABUAAAAAAAAAAAAAAAAjDwApi0wa3mBvbP9kiJT/maai/5mppP+hjXz/1pJn/96q
+ if/osYn/87WH//nAkP/9xpb//82b///Nmf//1aX//+fA///ToP//0Zz//9ah///XpP//2qv//+G0///m
+ vP//8c3///LT///owf//37T//9Ok///Ilv//wo7//76I///Ckf/+zKj/+reI//eyf//vrHj/4aBs/8+O
+ WP+0dDz/rmkq/4FQKNoQCgdfAAAAMAAAABQAAAAAAAAAAAAAAAAjEgIskkkQ4n5iQ/9jgIj/lJ2c/66w
+ o/+hnpD/zJNu/+Gqg//lsYr/8LGE//i+j//8x5b//82b///Pnf//1aL//+rC///aq///06D//9aj///U
+ of//06D//9Og///RnP//4bP//+i////aqf//37T//+G6///dt///1Kr//8mZ///Elf/+zaf/+riG//ez
+ fv/wrXr/4qNu/9CRW/+0dj//r2wv/4RSK90RCwhfAAAALgAAABQAAAAAAAAAAAAAAAAjEgMokUwV4Jha
+ Jv9wdGv/i5eX/7ayp/+0r53/vJd7/+KlgP/lso//7LCB//W+jv/7xZX//sqY///OnP//0qD//+jA///e
+ sf//1KH//9mn///Xpf//16X//9ak///ToP//3bH//+W8///Omv//y5b//8yZ///QoP//0qj//9Wt///V
+ rv//1rL//MKV//i1gv/vrHf/4qBq/8yNV/+ydD3/rmwv/4NOJtsQCgVaAAAAKwAAABMAAAAAAAAAAAAA
+ AAAkEwQgjE0Y16NbI/+Ma07/goZ9/7Crof/IwLD/vKya/9imgv/msov/6Kp9//G5iv/4w5H//cmX//7N
+ m///0J3//+S7///gtf//05///9im///Xpf//2Kb//9im///Wof//3q///+rB///Sn///z5r//8yY///I
+ lP//xZH//8SQ///Imf//17T//c+p//3In//1vZL/4qV2/8qKVv+xcjn/rWop/3xIHdMNBwZPAAAAJwAA
+ ABEAAAAAAAAAAAAAAABSLA4Xf0cZyKJdJ/+la0H/jHtm/6GXiP/ItaH/zL6t/8q1n//mupj/57KI/+y1
+ h//zu4v/+cOQ//7Kl///z5v//+K3///it///0p7//9ak///VpP//1qT//9aj///VoP//3az//+vD///W
+ of//0Zv//86a//7Jlv/9x5T/+cCN//K6iv/nv5v/2KZ8/8yacf/Dl3T/to1t/6Z9W/+TZT7/lFYi/1sx
+ EccBAQFKAAAAKwAAAA4AAAAAAAAAAAAAAABsPBYJhUscppxcJ/+pajv/p3lT/5qNfP+7ppD/1Leb/8iz
+ nf/Yu6L/6MKc/+fFof/uyKH/9sme//vMm//9zJj//9yw///kuv//0Z3//9Wi///Vo///1aL//9Wj///T
+ nv//26r//+rE///Wov//0Zr//8+b//3Klv/5xJH/8rqI/+Wvg//SrYz/tZNr/4SQM/97hyP/gHRI/4Ne
+ Pf9yYFD/eGVa/0UuHroAAABGAAAALQAAAAoAAAAAAAAAAAAAAAAAAAAAZjsWeKBfKv+laTv/t3ZF/6iH
+ av+tnIn/0LOX/9e5nP/ItJ7/5bCE/+i3i//ow5z/8M+p//fZtP/63rj//ubC///qxP//263//9mr///X
+ pv//1aH//9Kf///Rmv//16T//+rE///Uof//zpf//syY//rGk//zvo3/5rCC/9Kfdv+zmnv/epxb/1W0
+ Jv5bqQD/VIJG/1BrZ/9Ilbr/Tp7F/zhaZs0DDRBRAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAWDQTSJxd
+ KfOlbD3/s3JB/8CFWP+slHr/wKeR/9y7n//Twq3/z62M/+qrev/osYP/6riI//HClP/2zaD//N20//7r
+ xv//5r7//+rC///qxP//6L///+a6///hsv//3rH//+vD///Vof//zZb/+8iS//XAjP/ptYX/1qV4/7qN
+ af+JnHX/Yr1x91zCV/9isST+P6Fy8yC/4Pgd0v7/Jc71/yvA6fEQVWeKAAAAOAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAPCMOFYVQJMurbz//qm47/8WBTP/Ekmr/tJuE/82xl//gybH/zLmi/9iqg//tsYD/6LKE/+y4
+ if/xvYz/98ye//vetv/9z53//9Sh///bq///36///+e6///rwf//7cb///XP///pvP//4bL/99Kj/+zA
+ jv/aq3z/wJJo/6SDYf9zq2D/XLQ6/2C3OP+KlVL/W6a0/xPN9v8I0Pj/Ds30/wvV9f8Ll6/IAxwhQwAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGtCHH6rcD3/p2w4/7d3Qv/Tj1v/xJhz/7mhi//YwKr/4Mir/8ew
+ lf/crYT/7bOB/+i0hf/quYn/8MWY//XZsv/6zJr//c2X//7Qmv//zpj//9Ga///Rmv//16P//+zE///g
+ sv//3q3/79Os/+DFof/Iro3/sJJ1/6ydb/9pnxj9S6QA/2mTAP+lbE7/dJTD/zO59/8sqPD/KJfr/xKs
+ 7v8ArMfhAFlgZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEksFCWeaTzgqGw2/61uOf/Gh1L/15hm/8Kb
+ ev/DsJ7/3cSq/9m/of/HsJb/366E/+yygf/ns4T/6r6R/+/Sqv/0x5f/+ciV//vOm//9z5r//9Gc///Q
+ mv//0Zz//+a9///UoP//ypH/5beF/9Gofv+4mHX/zaiL/9awcP93mg3/UKQA/4V5Ev+jZmn/cJjU/06o
+ +P9KkO3/Q3Lm/zRs5v8Rh8LlAlhkegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABzUDZ6s3pM/6pw
+ O/+3eUP/0Y9c/92cav/JqY3/xbOf/9y+nv/XwKP/xrCV/92vhf/rsID/5rWJ/+fKpP/rwJP/8L+O//TF
+ lf/4yZf//M2Z//7MmP/+zpr//+S6///Vov//ypT/2qx+/8SYb//Hnnf/5LeN/9imbv+cmR7/cpMC/51r
+ L/+Tepr/W6ns/0iu+P9DnO3/Oobp/zZo5f8hUbfmBx46hwAAAAkAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AABFMCEZnW5Iy7iFW/+2g1n/xY5g/9ubaP/mroL/y62P/8Opjf/bvZ//1b6j/8Ovlv/Zq4T/6rOD/+fC
+ nf/kuIv/5raH/+q8jP/uwI7/88SR//fFkv/5x5T/+921//3Rn//+yJH/0KR5/8accv/aqnv12KJt/9iZ
+ Yf/CkjL/qXwP/6VrU/9yksf/TrX5/0qw9P9Ene7/OYjp/y9t5f8mRb/wEBhQpAAAABEAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAYz8fTa51QfC4hlj/wJJq/9Kkfv/puZP/7byT/8urif/BrpX/17uf/9O8
+ of+/rZT/zq2J/+bAmv/otIb/4a19/96wgv/gsoX/47aG/+i5h//uv4z/9Nau//jLmv/8wo3/ypht/9Kd
+ bP/Um2H/zZFP/8iIO//Jfxv5wG0i/417iPNSo+3+RKv4/0Sa7f86hen/MWzl/yta4f8qUtv6FSpwvgAA
+ ABcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHhMI3u5djr9t31E/8CNWf/ar4f/8sSf//TF
+ nP/avqP/w7em/83BsP/QxK//urem/7q2pf/Uroj/5Kp5/9+nd//Wpnj/1Kd6/9ipe//er4D/5MKe/+u0
+ iP/wqHf/zI9e/8+UVf/Jij7/w38m/r57Ev+/fCn/p21D/4prXv9Kmt//OJPx/zR35v8sX+L/KVPh/ypU
+ 4f8qV+H/GDGBxQAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACOUCKNuG4v/7l0
+ OP/JkWT/4a+F//C2hf/7w5L/576X/8e4ov++vbD/xsi7/7bEvv+jsar/r6mV/82rif/eqX//2KB4/86V
+ bf/Jj2n/y5x+/9GSa//XjmL/yItH/8SDK/m+ehDzw30a/8SDOv+/iWP/uHdK/6piLf9NaobXOI/u+zJ0
+ 5v8qXeP/KVTh/ypW4f8qV+H/GTWIvgAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AABwOxcJjEscj71kJ/vBeEv/zY9p/+Kdb//5tor//8GT//a+kv/VsZH/t6uc/7O7t/+ut7X/lqqs/4ee
+ of+am5T/wJ2I/9Kbff/JlXf/upeB/7iSeP+/lHb/voU+/8GELP/LjU3/zYtc/8B7Sv/HiWT/w3tL/0op
+ D40VL0VGM4TZvzN14/srX+P/Klbh/ypX4f8qV+D+GDOFsQAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAHtBGHS0bUDqxn1S/858TP/pn3b//7+Z///Rq///1a7/7s+u/8bN
+ wv+itrX/mbG0/5Czu/9zprT/YZWj/3qQkP+mm4r/w7Of/8O2n/+7spz/tauX/76ljf/Cl4D/uYNk/7t3
+ Sv+ocU/nPykcdwEAABkAAAAbDyhDPyZUpKwrXuD1KVbg/ipX4f8fVa37FS1zkQAAABkAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACFUTFErGk9xMFqLv/Qfkj/5ptv//m9
+ mP//2rf///LQ////8v/m8+T/stfU/4bC0v93vNX/arnX/0+nyf9Bk7D/Xpiq/5mrov/FrI3/w5Fw/7B4
+ Vv+mbEr/pG1K/3FPOsseFhFgAAAAHwAAAB4AAAAeAAAAHwAAACsULWxwIki90CpX4PwbVJrtBxAmSAAA
+ ABYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaEInF4pK
+ G3yxYynZx3M5/92KVP/wpXj/+sSf///t2v//+uL///rl/+Dw5v+j0df/cbfP/1ex2P9Hrdn/MZfE/yyG
+ rP9Ufo3/hm5b/5taL/uCQRfPRCILiwoFAkoAAAAvAAAALQAAACYAAAAdAAAAGgAAABwULGoSFjB/RxtY
+ l9gYUom4AAICGAAAABMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAACKTR8mpVslc6JaJsDCbDPr0n5I/+6viP/1r4H/+7SC///Flv//ypn/67eO/6qa
+ hf9skpr/TaDD/zyl0v8rmMj/KYWq/zttfPkfOUCUAAkQNAAAABoAAAAYAAAAFwAAABMAAAAQAAAADAAA
+ AAsBBQYaDThLkRtzmOIKKDVFAAAACAAAAA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHtEHRRiNRM5qF4ncaVvTJyrZDe7rV0pzbFk
+ Mde0ZjPZu2o01r9pL8yyZzO4d2RTlydccYcfeqCrKY222iKSwfkdh7P1G22O3xJIXp8JKzlkBhoiQQQR
+ FjsHHSZLCCYyaQw5TJAWX3vPG3KW2w8/U1MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AABqQSUOYjQUIGY5FipnOhgsZzkaKWU4GR5ZMBUMAAAAAAAAAAAAAAAAE157KhVZdVQdcZOBH3uitCCC
+ rNUbd5vaF2eH0hVefM4YaInUGW6S1Rhqi74VXXiEEkpfKwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAGGOCCBVVcRYOPE8pD0JXOQ9FWj0QRFo2Dj9SIhFGXAsAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAADwAPgD//8AAPAIAAB//wAA4AAAAB//AADAAAAAA/8AAMD4AAAB/wAAwGAAAAD/
+ AADAQAAAAH8AAIAAAAAAPwAAgAAAAAAfAACAAAAAAA8AAIAAAAAABwAAgAAAAAADAACAAAAAAAMAAMAA
+ AAAAAwAAwAAAAAABAADAAAAAAAEAAMAAAAAAAAAAwAAAAAAAAADgAAAAAAAAAOAAAAAAAAAA4AAAAAAA
+ AADgAAAAAAAAAOAAAAAAAAAA4AAAAAAAAADgAAAAAAAAAOAAAAAAAAAA4AAAAAAAAADgAAAAAAAAAOAA
+ AAAAAAAA8AAAAAABAADwAAAAAAEAAPAAAAAAAQAA+AAAAAABAAD4AAAAAAEAAPwAAAAAAAAA/AAAAAAA
+ AAD+AAAAAAAAAP8AAAAAAAAA/4AAAAAAAAD/gAAAAAAAAP/gAAAAAAAA//AAAAAAAAD/+AAAAAAAAP/+
+ AAAAAAAA//+AAAAHAAD///gOAA8AAP/////APwAA////////AAAoAAAAIAAAAEAAAAABACAAAAAAAIAQ
+ AAAAAAAAAAAAAAAAAAAAAAAANDQ0ATQ0NAg0NDQcICAgSyMlJoEkKCmOJCcofyQkJGYiIiJRHh4ePxwc
+ HCg0NDQZNDQ0Gx0dHSYdHR0yHh4ePh8fH0YfHx9IICAgSSAgIEQfHx87NDQ0LTQ0NCI0NDQWNDQ0DDQ0
+ NAY0NDQDNDQ0AQAAAAAAAAAAAAAAAAAAAAA0NDQDNDQ0DxwhI0gfQk+uIFBivB9QZa0eUWOZHD9NgB0s
+ MlgeICI6Hh4eNh0dHTkeHh5EHx8fWCAgIGogICB3ISEhfyEhIYQhISGBISEheiAgIG0gICBbICAgRjQ0
+ NDE0NDQiNDQ0FTQ0NAk0NDQFNDQ0AgAAAAAAAAAAAAAAADQ0NAUcIyUmH1pyuCFHV7MfKCx3HyYoQyQ+
+ SSUnVmgyIElZTRwuNVcdIiRTICAgaCEhIYQkIyKbKSYkrCwmI7UuKCa4LCgnuSckI7YkJCSwJCQkpiMj
+ I5giIiKEISEhaiAgIE00NDQvNDQ0HDQ0NA40NDQFNDQ0AgAAAAAAAAAANDQ0BR9CUGEiaYfGIiUniSAg
+ IGQeHh41NDQ0GDQ0NBQeJSgpHh4eUiAiI4g2LimxVUQ5xXNfT8yEcF7Pim9Z0OS4lcbTtZzRemNTz2FJ
+ OM1CMijKKyckwyUlJbYjIyOjIiIigyEhIV4gICA+NDQ0IjQ0NBA0NDQFNDQ0AgAAAAA0NDQGH05gfSJi
+ fMAjJSaOHx8fbR8fHz00NDQjHBwcNx4eHmQ6MiundWFVyffKp9H/7crR///x0f///9H///3R////0f//
+ /9H///fR//fm0f/Mp9HWkF7JTjstzSsoJ8QlJSWzIyMjliEhIWsgICBENDQ0IzQ0NA80NDQENDQ0ATQ0
+ NAYjY3yII2J8wyMmJ5YfHx94Hx8fTh8fH0MmIyFzYk88vvK7iM//68XR///z0f//+9H//vDR//La0f/r
+ z9H/7tPR//bm0f/02dH/+uPR///w0f/x2NH9vpHRu4Fc0TkvJ8slJSW8JCQknSEhIW0gICBDNDQ0HzQ0
+ NAs0NDQENDQ0BiNphYgiaIPIIiYooCAgIIghISFlKygkgHtgRsf7wo7R/9qw0f/pxtH/68/R/+DB0f/f
+ vtH+wprR/rKE0f21h9H/yKPR/LuP0f3CltH+0KbR/+K/0f/mydH/0bHR2Y9b0VY3H9EmJia+IyMjnSEh
+ IWc0NDQ0NDQ0GTQ0NAk0NDQFIl51fyaNt8wiKy6qIyMjlygmJJF4XEfI6K150fjFmdH/0KjR/8ai0f7L
+ qdH/wpzR/76W0f/AmtH+wZrR/rOF0f+/mdH7roLR+Kl70fWrfdH3sIPR+7uQ0f/OrtHvuprR2JFc0VI2
+ INEmJia6IyMjkCEhIVg0NDQpNDQ0EjQ0NAUeSVptMJ7M0SE0PLUlJCStVUExx8+XcNHgpn3R9bqR0fm5
+ ktH+vJXR/82q0f/Np9H/uozR/7iI0f/Bl9H/yqTR/9Cv0f+6jdH+rn3R+K1+0fKqetHupXfR87OL0e6y
+ jNHZm3HRyotY0TgxLMomJiawIiIieyAgIEE0NDQeNDQ0Ax1FVVU5o8/RJEpZvzEoIsWOWjbRu4lp0eGm
+ gNHzs4vR/L6V0f/IntH/2LPR/82k0f+7i9H/v5LR/7yM0f+8i9H/zqbR/9Ct0f/Bl9H+tITR+a5+0fKp
+ eNHtrIHR6auB0dmVZNHGgUrRmWM00SknJsIkJCSbISEhWjQ0NCw0NDQCGjhDODaXv81BnsjHYk09x4RY
+ OtG4iGjR5qyE0fu9ktH/y6LR/9Kp0f/VrtH/z6bR/8GR0f/Hl9H/xpfR/8KQ0f/Ln9H/y6LR/8WZ0f/K
+ otH+vpXR+LCA0fOvgtHrrYLR35po0cSBT9G9dDXRRTUnzCYmJq8iIiJ0ICAgPwAAAAAeND0XKHGOuF3C
+ 7NFWaGrRiF5B0buSeNHrs5HR/cab0f/SqNH/y5/R/8eZ0f/Xr9H/xZTR/8ma0f/JmdH/xpXR/8+j0f/U
+ qtH/vYnR/76N0f/DmNH9w5vR+sCb0fO1jNHknWnRzopX0bp0OtGTWibRKigmvSQkJIogICBQAAAAADQ0
+ NAYcWHGUZL7g0V6YqdGDWz/RvI5y0efBpdH82LfR/9Os0f/ElNH/xJXR/9qy0f/KmdH/zJzR/82d0f/M
+ mtH/0KDR/9qx0f/Ek9H/wI7R/7yI0f64h9H9v5TR+sOf0fCyh9HbmWjRu3Y+0a9nKNE3LibGJSUlmiEh
+ IV8AAAAANDQ0BBk3Q2FPnr3RernL0Xt4bdG+iWXR3rGP0ffBmdH/1rLR/+G90f/futH/5cLR/9Wo0f/Q
+ oNH/z53R/8+b0f/QndH/4LbR/8uY0f/Gk9H/w5HR/7yK0f66i9H5vpTR8q+A0eapftHGjWDRsW810Ug3
+ KcwmJiakIiIiagAAAAA0NDQFKSYiTkl2g813pK/Rd4yK0a14VtLGlnfT2qF41OOrgdTkt4/U5MGb1ObU
+ tdPm17nT6Ni30unVstLqz6jR68mf0f/iudH/zZrR/8aT0f/Fk9H/v4zR/8CR0fzBmdH1rXvR6KJt0cuL
+ WNGydULRVkEwziYmJqsjIyNvAAAAADQ0NAU7Kx5eZmRX0W2LlNKImJXTnn1l1r+PcNnGmHfbzJ553dGn
+ gNzVq4Hb1ruW2tq8ltnevZLX48ig1OfQqtLq1rLR//DN0f/kvNH/1qjR/8uZ0f/AjNH/wZDR/cWd0fiy
+ gNHsqXXR0pBb0bRwM9FeRC7OJyYmrSMjI24AAAAAJiYmBTQiFmKBUirTY3R31oyQitqJe2vgnHRb55h3
+ X+2del/vp4hq7K6PbumwmXvotqGE5sOjfeDSsIba4ryR1enBktL/5LjR/92v0f/ZrNH/2rHR/9Ko0f/M
+ odH9yaHR+LN/0e2pdNHUlV/RtXU60WFFLs8oJiWqIyMjZwAAAAAmJiYGMCMYX45PHdZtYlPafoB64YWC
+ c+uAfE/4iHtK/IVyVfqNc1r3koFs9pSLefeZjHfzqZBw7MGlgeHcu5LY58OU0//it9H/2ajR/8qV0f/K
+ ltH/yZnR/82h0f7Ur9H9xZrR8LSF0dGSX9GzcjXRXkIpzSclJaAhISFZGRkZASUlJQs5KRxWgUsg1n1X
+ OuBtaFzqfopr+VW0Jv5bqQD/MlI3+ytGTvg0Zn/7OmyF/DJRX/KUgGb2rZNz6tOzjNzkwJHU/+O10f/e
+ rtH/0JnR/8uY0f/HktH/xJLR/c6j0fu8itHvtYnR0J1y0bZ5RtFWPSnLJCQkjR8fH0YZGRkGJSUlFDQo
+ HkljPyLTe1Aw6HJvVfZivXH3XMJX/2KxJP4/oXLzIL/g+B3S/v8lzvX/K8Dp8YiJePudiG3xyquG4OG6
+ jNX/3rDR/9ut0f/NldH/y5fR/8eU0f/Dk9H+z6bR+LiE0eWmcdHGhlDRt2ov0Uo2KcMjIyNxHR0dMBkZ
+ GQ0ZGRkkIyMjSkszH8t3VTfyT3dJ91y0Ov9gtzj/ipVS/1umtP8Tzfb/CND4/w7N9P8L1fX/Iml1+pSK
+ dfXCsZLj3smj1//pwNH/47XR/9Kd0f/LlNH/xY7R/8KO0f/NpNH3uIXR4KBr0cJ0PNG2YiHRNywjsSEh
+ IVE0NDQaGBgYGBkZGTkhISFpQTUqyYZpRftpnxj9S6QA/2mTAP+lbE7/dJTD/zO59/8sqPD/KJfr/xKs
+ 7v8bdIL9jIVs+L2hfebcvJLY/+W50f/pvdH/4LHR/92x0f/Wp9H/y5vR/82j0e+rdtHWhlDRw28x0W9I
+ Kc0oJSKINDQ0MDQ0NBIYGBgmGRkZUjQwLJR8aFrq1rBw/3eaDf9QpAD/hXkS/6Nmaf9wmNT/Tqj4/0qQ
+ 7f9Dcub/NGzm/xaIwv+Gf2r5uZp359qxhNn/2KfR/9ur0f/LktH/zZjR/9Ge0f3NoNH8xaPR66mC0cyF
+ V9HIczfRSTQmtiEhIVEcHBwmNDQ0FRgYGDYlIyByemdU2OS3jf/Ypm7/nJke/3KTAv+day//k3qa/1up
+ 7P9Irvj/Q5zt/zqG6f82aOX/JVW4/35vYPqukHDp06t/2vzSotH+2arR/8qT0f/Jk9H+uoTR96h10fOw
+ iNHbkmLRzYNP0XtWPssoJSNvNDQ0LxwcHDIcHBwuGBgYSWZWRa3aqnv12KJt/9iZYf/CkjL/qXwP/6Vr
+ U/9yksf/TrX5/0qw9P9Ene7/OYjp/y9t5f8pSMP/eWRe/JyAY+u+mXLa7MSW0fXMoNH7u4bR+7B+0fin
+ dtH2p3bR7K2H0c9+RtHLcS/NOi0jjTQ0NC0dLDBEHx8fSh4eHk88Myllm3lY7dSbYf/NkU//yIg7/8l/
+ G/mLVST3jXuI81Kj7f5Eq/j/RJrt/zqF6f8xbOX/K1rh/ypS2/opNVr1mnle7LSGZNvQnHfR1Z550d+U
+ ZdHqn3HR9qt/0fCleNHfn3bR134/0U03J5w0NDQuNDQ0Gh1GWHodJyxtIiIiaIZnRKLPlFX/yYo+/8N/
+ Jv6KXxr5dU8W1001IaFnT0LgPYXD8jiT8f80d+b/LF/i/ylT4f8qVOH/Klfh/yk4Y/Vuc3HrmYFw2saZ
+ fdG/noTRvZ+E0dGtkNHfpITR04pa0c+KX8tNOCibNDQ0NzQ0NB80NDQYHT1LbRw4RJYlJSVvsH0/4cSD
+ K/m+ehDzjl8S5G9PFaI/MBpbIyMjQjIoI1VRZ33dOI/u+zJ05v8qXeP/KVTh/ypW4f8qV+H/Kjpn8lSF
+ mOlLjabZY5qq0ZqtpdHFq43RwI9u0bV7WdFwUj/LOjAqliAgIFAdHR07HBwcMjQ0NCYbLjZyHTxIpCIi
+ IluYZx6ll2QOuXlUE4VPOxlMGhoaKxoaGh4ZGRkaJCQkIiw9SlA8ZpPXM3Xj+ytf4/8qVuH/Klfh/ypX
+ 4P6Gi5v6kaCb5G2drtc/pM/RMJjF0VOEltF8Y0zRRDAitygkI5EjIyNtICAgWB8fH0gfHx9BICAgSB5E
+ VKcdND2FHh4eMT4xHRQ8LxgZIh8ZFBoaGhEZGRkMGRkZCBkZGQgYGBgNGBgYGSo5SkYvVJO2K17g9SlW
+ 4P4qV+H/LEic+WpSV+6SY0LQkF89wnhiTa46YnOcIXOXryKKtMocWHG1HTdCkx4pLnceJCZoHiYqbRws
+ M34cRVSmH05ikx4nKiY0NDQSAAAABBkZGQQZGRkDGRkZAhkZGQIAAAABAAAAAhkZGQQZGRkJGBgYExgY
+ GCIqPGlwKUmr1ypX4PwuQofMMSsxckA0Kj9BNCoqNDQ0DTQ0NAwfQE0SIktdNiRfd2QiZYGKHVZtkxtN
+ YZIcUWiUHlNpiCJRYlc0NDQTNDQ0CjQ0NAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAANDQ0Ai9JigYtR5g/LUqkbi5GkT80NDQSNDQ0CjQ0NAM0NDQBAAAAADQ0NAE0NDQCNDQ0BDQ0
+ NAQ0NDQGITtFDjQ0NAk0NDQINDQ0BTQ0NAU0NDQDNDQ0AQAAAA8AAAAHAAAAAwAAAAEAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/wBAAKAAAABAAAAAgAAAAAQAgAAAA
+ AABABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANDQ0AjQ0NAc0NDQSNDQ0KFVVVUVRUVFjTU1NdUxM
+ THQ0NDRfNDQ0QzQ0NCY0NDQSNDQ0BzQ0NAEAAAAANDQ0ATQ0NAckJCQWKCgoOC0tLW4yMjKoOTk5yzg4
+ ONEyMjLKMDAwuS0tLZUoKCheNDQ0MTQ0NBU0NDQHAAAAADQ0NAQcHBwTIiIiPzQzM5xhYWHqh4eH/Nzb
+ 2/Pa2dnzfHx8/VNSU/cxMTHfLCwstyQkJG40NDQxNDQ0EjQ0NAEjIyMKISEhNEJCQquFg4L61tLO+eTg
+ 2/3z8O3+8e3q/t7X0v3Iw7/5nZmY/zc3N+wsLCy4KioqYTQ0NCk0NDQDJycnGTg4OIO/vr7x2M7G/Nm4
+ kP7YuZb/8Onj/+7l3f/Usoj/1LGC/su9tPuko6P/MzMz4y4uLp00NDRIYGBgBSsrKzF4eHjg2NfX+u/t
+ 6/7r4tn/38qx//Pv6v/u6OH/3b6S/+bYxf/p5uP+zczM+lVVVfkwMDC/VlZWa2FhYQg8Ozxls7Kz8+Hh
+ 4f7x8fD/8vHv/+PTwv/j2c3/4NC8/+DEmv/u6ub/7ezr/9vb2/2rq6vxNjY201FRUYVjY2MLTU1Ni7a2
+ tvbd3N3/5+fn/+rp6P/k4Nz/1r6f/9i3hv/g1cb/6Ofl/+Xl5f/a2tr+srGy9T4+Pt5RUVGJZGRkC1FQ
+ UY+ysbL21tXW/9/f3//g4OD/3dnU/9S9m//Ut4X/3NjS/+Df3v/e3t7/1NTU/6+vr/VAQEDaVlZWeGJi
+ YgZCQkJpqKeo9NDQ0P7d3d3/3t3c/9TNxf/YtH3/0beW/9fSzv/e3t3/3d3d/8/Pz/6lpaXzOjo6xF1d
+ XVRhYWEBLi4uKoaGhuzJycn84ODg/9/c2P/YwaH/2MCb/9nOwv/VxbL/4d/c/+Dg4P/Hx8f8ZmZm+DAw
+ MINkZGQxAAAAACcnJw1NTU2Vtra29t/e3f3a0MT/3ryI/97Wzv/k4Nr/2MOo/9jPxP/d29r9srGx9kBA
+ QMMrKytCNDQ0GAAAAAAkJCQDIiIiHWppasPIxcL328q2/OLRuP7k1sf/6eLc/9zGq/7Yxa78wLiz9lhX
+ WNckJCRLJycnHTQ0NAkAAAAAAAAAABsbGwUkJCQgWFhXo6Wjo/LZ19T25uTj+ebk4fnY1dP2kY+N9U5N
+ TbMlJSVAHR0dGjQ0NAk0NDQDAAAAAAAAAAAAAAAAJiYmBCoqKg45OTk7V1dXhmxrbK5qaWqwVFRUjzc3
+ N00qKioiJiYmDjQ0NAY0NDQCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcHBwBHJycgp0dHQOc3JzEHBw
+ cA1ubm4INDQ0BDQ0NAIAAAAAAAAAAAAAAADAAAAAgAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAIAAAACAAAAAwAAAAOABAAD4BwAA
+</value>
+ </data>
+</root>
\ No newline at end of file
diff --git a/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache b/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
index e455d8c..67abecf 100644
--- a/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
+++ b/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index e65e2d0..dc782c4 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 9109dbc..d4ae4d5 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 9538c89..badca3e 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 af00a66..c86227b 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 aac1355..0782b0a 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 a119cc1..9ce9a59 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 ebe40ac..a1fcd8d 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 3cb83f0..feb6d4d 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 85dd23f..965e083 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 14e3cba..60e8ba8 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 321d06c..c8d74d5 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 9538c89..badca3e 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 af00a66..c86227b 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ShiftsBeginInfoBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ShiftsBeginInfoBillMain.cs"
index c8e44c2..281f31f 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ShiftsBeginInfoBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/ClsSc_ShiftsBeginInfoBillMain.cs"
@@ -14,6 +14,7 @@
public Int64 HGroupID; // int --生产班组（gy_Group）
public Int64 HGroupLeaderID; // int --班组长（gy_Employee）
public Int64 HStdEmpQty; // int 应到岗人数
+ public Int64 HRelEmpQty; // int 实到岗人数
public decimal HPlanShutdownTimes;
diff --git a/OAM/bin/Release/BLL.dll b/OAM/bin/Release/BLL.dll
index 6f5fe90..ce7f44c 100644
--- a/OAM/bin/Release/BLL.dll
+++ b/OAM/bin/Release/BLL.dll
Binary files differ
diff --git a/OAM/bin/Release/BLL.pdb b/OAM/bin/Release/BLL.pdb
index ff491af..806e387 100644
--- a/OAM/bin/Release/BLL.pdb
+++ b/OAM/bin/Release/BLL.pdb
Binary files differ
diff --git a/OAM/bin/Release/BaseSet.dll b/OAM/bin/Release/BaseSet.dll
index 1c4ff16..e9491f6 100644
--- a/OAM/bin/Release/BaseSet.dll
+++ b/OAM/bin/Release/BaseSet.dll
Binary files differ
diff --git a/OAM/bin/Release/BaseSet.pdb b/OAM/bin/Release/BaseSet.pdb
index d890252..d7065ee 100644
--- a/OAM/bin/Release/BaseSet.pdb
+++ b/OAM/bin/Release/BaseSet.pdb
Binary files differ
diff --git a/OAM/bin/Release/DAL.dll b/OAM/bin/Release/DAL.dll
index d2ca7bb..6722401 100644
--- a/OAM/bin/Release/DAL.dll
+++ b/OAM/bin/Release/DAL.dll
Binary files differ
diff --git a/OAM/bin/Release/DAL.pdb b/OAM/bin/Release/DAL.pdb
index 9445526..00df416 100644
--- a/OAM/bin/Release/DAL.pdb
+++ b/OAM/bin/Release/DAL.pdb
Binary files differ
diff --git a/OAM/bin/Release/DBUtility.dll b/OAM/bin/Release/DBUtility.dll
index cefc8d8..dc782c4 100644
--- a/OAM/bin/Release/DBUtility.dll
+++ b/OAM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/OAM/bin/Release/DBUtility.pdb b/OAM/bin/Release/DBUtility.pdb
index f43463e..d4ae4d5 100644
--- a/OAM/bin/Release/DBUtility.pdb
+++ b/OAM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/OAM/bin/Release/Model.dll b/OAM/bin/Release/Model.dll
index f101700..cb94a58 100644
--- a/OAM/bin/Release/Model.dll
+++ b/OAM/bin/Release/Model.dll
Binary files differ
diff --git a/OAM/bin/Release/Model.pdb b/OAM/bin/Release/Model.pdb
index 55a5dca..d33cc1c 100644
--- a/OAM/bin/Release/Model.pdb
+++ b/OAM/bin/Release/Model.pdb
Binary files differ
diff --git a/OAM/bin/Release/OAM.dll b/OAM/bin/Release/OAM.dll
index 5fabd55..6c65c9f 100644
--- a/OAM/bin/Release/OAM.dll
+++ b/OAM/bin/Release/OAM.dll
Binary files differ
diff --git a/OAM/bin/Release/OAM.pdb b/OAM/bin/Release/OAM.pdb
index ed14e13..71236af 100644
--- a/OAM/bin/Release/OAM.pdb
+++ b/OAM/bin/Release/OAM.pdb
Binary files differ
diff --git a/OAM/bin/Release/Pub_Class.dll b/OAM/bin/Release/Pub_Class.dll
index 81c2807..0782b0a 100644
--- a/OAM/bin/Release/Pub_Class.dll
+++ b/OAM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/OAM/bin/Release/Pub_Class.pdb b/OAM/bin/Release/Pub_Class.pdb
index ed9a4e7..9ce9a59 100644
--- a/OAM/bin/Release/Pub_Class.pdb
+++ b/OAM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/OAM/bin/Release/Pub_Control.dll b/OAM/bin/Release/Pub_Control.dll
index d61866b..a1fcd8d 100644
--- a/OAM/bin/Release/Pub_Control.dll
+++ b/OAM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/OAM/bin/Release/Pub_Control.pdb b/OAM/bin/Release/Pub_Control.pdb
index a3856a6..feb6d4d 100644
--- a/OAM/bin/Release/Pub_Control.pdb
+++ b/OAM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/OAM/bin/Release/SQLHelper.dll b/OAM/bin/Release/SQLHelper.dll
index 7d4eea1..965e083 100644
--- a/OAM/bin/Release/SQLHelper.dll
+++ b/OAM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/OAM/bin/Release/SQLHelper.pdb b/OAM/bin/Release/SQLHelper.pdb
index ab1f540..60e8ba8 100644
--- a/OAM/bin/Release/SQLHelper.pdb
+++ b/OAM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/PayM/bin/Debug/AxInterop.gregn6Lib.dll b/PayM/bin/Debug/AxInterop.gregn6Lib.dll
index 877dc5c..f5057c9 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..0e8e853 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..b8c7295 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..b10abfd 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..69c8b2d 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..34f271e 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..ac59fe6 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..29cb35a 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..ef23603 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..18523d1 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..837444d 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..ea248df 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..71f6794 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..e582226 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..07012bf 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..c60cd55 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..4f36fca 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..04929ed 100644
--- a/PayM/bin/Debug/SQLHelper.pdb
+++ b/PayM/bin/Debug/SQLHelper.pdb
Binary files differ
diff --git a/PayM/bin/Release/BLL.dll b/PayM/bin/Release/BLL.dll
index 6f5fe90..ce7f44c 100644
--- a/PayM/bin/Release/BLL.dll
+++ b/PayM/bin/Release/BLL.dll
Binary files differ
diff --git a/PayM/bin/Release/BLL.pdb b/PayM/bin/Release/BLL.pdb
index ff491af..806e387 100644
--- a/PayM/bin/Release/BLL.pdb
+++ b/PayM/bin/Release/BLL.pdb
Binary files differ
diff --git a/PayM/bin/Release/DAL.dll b/PayM/bin/Release/DAL.dll
index d2ca7bb..6722401 100644
--- a/PayM/bin/Release/DAL.dll
+++ b/PayM/bin/Release/DAL.dll
Binary files differ
diff --git a/PayM/bin/Release/DAL.pdb b/PayM/bin/Release/DAL.pdb
index 9445526..00df416 100644
--- a/PayM/bin/Release/DAL.pdb
+++ b/PayM/bin/Release/DAL.pdb
Binary files differ
diff --git a/PayM/bin/Release/DBUtility.dll b/PayM/bin/Release/DBUtility.dll
index cefc8d8..dc782c4 100644
--- a/PayM/bin/Release/DBUtility.dll
+++ b/PayM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/PayM/bin/Release/DBUtility.pdb b/PayM/bin/Release/DBUtility.pdb
index f43463e..d4ae4d5 100644
--- a/PayM/bin/Release/DBUtility.pdb
+++ b/PayM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/PayM/bin/Release/Model.dll b/PayM/bin/Release/Model.dll
index f101700..cb94a58 100644
--- a/PayM/bin/Release/Model.dll
+++ b/PayM/bin/Release/Model.dll
Binary files differ
diff --git a/PayM/bin/Release/Model.pdb b/PayM/bin/Release/Model.pdb
index 55a5dca..d33cc1c 100644
--- a/PayM/bin/Release/Model.pdb
+++ b/PayM/bin/Release/Model.pdb
Binary files differ
diff --git a/PayM/bin/Release/PayM.dll b/PayM/bin/Release/PayM.dll
index a89f98f..194a2f6 100644
--- a/PayM/bin/Release/PayM.dll
+++ b/PayM/bin/Release/PayM.dll
Binary files differ
diff --git a/PayM/bin/Release/PayM.pdb b/PayM/bin/Release/PayM.pdb
index eb6e31d..f012325 100644
--- a/PayM/bin/Release/PayM.pdb
+++ b/PayM/bin/Release/PayM.pdb
Binary files differ
diff --git a/PayM/bin/Release/Pub_Class.dll b/PayM/bin/Release/Pub_Class.dll
index 81c2807..0782b0a 100644
--- a/PayM/bin/Release/Pub_Class.dll
+++ b/PayM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/PayM/bin/Release/Pub_Class.pdb b/PayM/bin/Release/Pub_Class.pdb
index ed9a4e7..9ce9a59 100644
--- a/PayM/bin/Release/Pub_Class.pdb
+++ b/PayM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/PayM/bin/Release/Pub_Control.dll b/PayM/bin/Release/Pub_Control.dll
index d61866b..a1fcd8d 100644
--- a/PayM/bin/Release/Pub_Control.dll
+++ b/PayM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/PayM/bin/Release/Pub_Control.pdb b/PayM/bin/Release/Pub_Control.pdb
index a3856a6..feb6d4d 100644
--- a/PayM/bin/Release/Pub_Control.pdb
+++ b/PayM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/PayM/bin/Release/SQLHelper.dll b/PayM/bin/Release/SQLHelper.dll
index 7d4eea1..965e083 100644
--- a/PayM/bin/Release/SQLHelper.dll
+++ b/PayM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/PayM/bin/Release/SQLHelper.pdb b/PayM/bin/Release/SQLHelper.pdb
index ab1f540..60e8ba8 100644
--- a/PayM/bin/Release/SQLHelper.pdb
+++ b/PayM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/PayM/obj/Debug/AxInterop.gregn6Lib.dll b/PayM/obj/Debug/AxInterop.gregn6Lib.dll
index 877dc5c..f5057c9 100644
--- a/PayM/obj/Debug/AxInterop.gregn6Lib.dll
+++ b/PayM/obj/Debug/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/obj/Debug/Interop.gregn6Lib.dll b/PayM/obj/Debug/Interop.gregn6Lib.dll
index f4472d8..29cb35a 100644
--- a/PayM/obj/Debug/Interop.gregn6Lib.dll
+++ b/PayM/obj/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/obj/Debug/PayM.csproj.GenerateResource.Cache b/PayM/obj/Debug/PayM.csproj.GenerateResource.Cache
index 75c6a0f..07e70f2 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..74c4161 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..837444d 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..ea248df 100644
--- a/PayM/obj/Debug/PayM.pdb
+++ b/PayM/obj/Debug/PayM.pdb
Binary files differ
diff --git a/PayM/obj/Release/BaseSet.Gy_DataInTmp_DuSubsidyItem.resources b/PayM/obj/Release/BaseSet.Gy_DataInTmp_DuSubsidyItem.resources
index 12e59a0..1eec1a9 100644
--- a/PayM/obj/Release/BaseSet.Gy_DataInTmp_DuSubsidyItem.resources
+++ b/PayM/obj/Release/BaseSet.Gy_DataInTmp_DuSubsidyItem.resources
Binary files differ
diff --git a/PayM/obj/Release/CostM.Pay_AccPayMentDayBill.resources b/PayM/obj/Release/CostM.Pay_AccPayMentDayBill.resources
index 6555d82..6a89d65 100644
--- a/PayM/obj/Release/CostM.Pay_AccPayMentDayBill.resources
+++ b/PayM/obj/Release/CostM.Pay_AccPayMentDayBill.resources
Binary files differ
diff --git a/PayM/obj/Release/CostM.Pay_AccPayMentDayBill2.resources b/PayM/obj/Release/CostM.Pay_AccPayMentDayBill2.resources
index 8493b50..0351517 100644
--- a/PayM/obj/Release/CostM.Pay_AccPayMentDayBill2.resources
+++ b/PayM/obj/Release/CostM.Pay_AccPayMentDayBill2.resources
Binary files differ
diff --git a/PayM/obj/Release/CostM.Pay_AccPayMentDayBill3.resources b/PayM/obj/Release/CostM.Pay_AccPayMentDayBill3.resources
index 6555d82..6a89d65 100644
--- a/PayM/obj/Release/CostM.Pay_AccPayMentDayBill3.resources
+++ b/PayM/obj/Release/CostM.Pay_AccPayMentDayBill3.resources
Binary files differ
diff --git a/PayM/obj/Release/CostM.Pay_AccPayMentDayBill4.resources b/PayM/obj/Release/CostM.Pay_AccPayMentDayBill4.resources
index 6555d82..6a89d65 100644
--- a/PayM/obj/Release/CostM.Pay_AccPayMentDayBill4.resources
+++ b/PayM/obj/Release/CostM.Pay_AccPayMentDayBill4.resources
Binary files differ
diff --git a/PayM/obj/Release/CostM.Pay_AccPayMentDayBill5.resources b/PayM/obj/Release/CostM.Pay_AccPayMentDayBill5.resources
index 6555d82..6a89d65 100644
--- a/PayM/obj/Release/CostM.Pay_AccPayMentDayBill5.resources
+++ b/PayM/obj/Release/CostM.Pay_AccPayMentDayBill5.resources
Binary files differ
diff --git a/PayM/obj/Release/CostM.Pay_AccPayMentDayBillList.resources b/PayM/obj/Release/CostM.Pay_AccPayMentDayBillList.resources
index 7da45e9..f753f0d 100644
--- a/PayM/obj/Release/CostM.Pay_AccPayMentDayBillList.resources
+++ b/PayM/obj/Release/CostM.Pay_AccPayMentDayBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew.resources b/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew.resources
index fdd084e..f753f0d 100644
--- a/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew.resources
+++ b/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew.resources
Binary files differ
diff --git a/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew1.resources b/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew1.resources
index 6555d82..6a89d65 100644
--- a/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew1.resources
+++ b/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew1.resources
Binary files differ
diff --git a/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew2.resources b/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew2.resources
index 5b8acf2..21db791 100644
--- a/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew2.resources
+++ b/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew2.resources
Binary files differ
diff --git a/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew3.resources b/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew3.resources
index 6555d82..6a89d65 100644
--- a/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew3.resources
+++ b/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew3.resources
Binary files differ
diff --git a/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew4.resources b/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew4.resources
index 6555d82..6a89d65 100644
--- a/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew4.resources
+++ b/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew4.resources
Binary files differ
diff --git a/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew5.resources b/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew5.resources
index 6555d82..6a89d65 100644
--- a/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew5.resources
+++ b/PayM/obj/Release/CostM.Pay_PayMentBillAutoAddnew5.resources
Binary files differ
diff --git a/PayM/obj/Release/OAM.HR_EmpEngageRequestBill.resources b/PayM/obj/Release/OAM.HR_EmpEngageRequestBill.resources
index 925652c..fe67101 100644
--- a/PayM/obj/Release/OAM.HR_EmpEngageRequestBill.resources
+++ b/PayM/obj/Release/OAM.HR_EmpEngageRequestBill.resources
Binary files differ
diff --git a/PayM/obj/Release/OAM.HR_EmpEngageRequestBillList.resources b/PayM/obj/Release/OAM.HR_EmpEngageRequestBillList.resources
index e62461d..9db27ad 100644
--- a/PayM/obj/Release/OAM.HR_EmpEngageRequestBillList.resources
+++ b/PayM/obj/Release/OAM.HR_EmpEngageRequestBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Err_MonthExpenseEntryBill.resources b/PayM/obj/Release/PayM.Err_MonthExpenseEntryBill.resources
index c7c71dd..01c9556 100644
--- a/PayM/obj/Release/PayM.Err_MonthExpenseEntryBill.resources
+++ b/PayM/obj/Release/PayM.Err_MonthExpenseEntryBill.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Err_MonthExpenseEntryBillDlg.resources b/PayM/obj/Release/PayM.Err_MonthExpenseEntryBillDlg.resources
index 06c24d0..6c05a97 100644
--- a/PayM/obj/Release/PayM.Err_MonthExpenseEntryBillDlg.resources
+++ b/PayM/obj/Release/PayM.Err_MonthExpenseEntryBillDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.HR_EmpChangeBill.resources b/PayM/obj/Release/PayM.HR_EmpChangeBill.resources
index 77d5942..8243501 100644
--- a/PayM/obj/Release/PayM.HR_EmpChangeBill.resources
+++ b/PayM/obj/Release/PayM.HR_EmpChangeBill.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.HR_EmpChangeBillList.resources b/PayM/obj/Release/PayM.HR_EmpChangeBillList.resources
index 65506c3..26509ac 100644
--- a/PayM/obj/Release/PayM.HR_EmpChangeBillList.resources
+++ b/PayM/obj/Release/PayM.HR_EmpChangeBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.HR_EmpDimissionBill.resources b/PayM/obj/Release/PayM.HR_EmpDimissionBill.resources
index f1308ea..c9652fd 100644
--- a/PayM/obj/Release/PayM.HR_EmpDimissionBill.resources
+++ b/PayM/obj/Release/PayM.HR_EmpDimissionBill.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.HR_EmpDimissionBillList.resources b/PayM/obj/Release/PayM.HR_EmpDimissionBillList.resources
index c22351a..0831b84 100644
--- a/PayM/obj/Release/PayM.HR_EmpDimissionBillList.resources
+++ b/PayM/obj/Release/PayM.HR_EmpDimissionBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.KQ_sourceReport.resources b/PayM/obj/Release/PayM.KQ_sourceReport.resources
index 07000ad..01c9556 100644
--- a/PayM/obj/Release/PayM.KQ_sourceReport.resources
+++ b/PayM/obj/Release/PayM.KQ_sourceReport.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.KQ_sourceReportDlg.resources b/PayM/obj/Release/PayM.KQ_sourceReportDlg.resources
index 06c24d0..6c05a97 100644
--- a/PayM/obj/Release/PayM.KQ_sourceReportDlg.resources
+++ b/PayM/obj/Release/PayM.KQ_sourceReportDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_CarOutApplyBill.resources b/PayM/obj/Release/PayM.Pay_CarOutApplyBill.resources
index a18ec41..e620e33 100644
--- a/PayM/obj/Release/PayM.Pay_CarOutApplyBill.resources
+++ b/PayM/obj/Release/PayM.Pay_CarOutApplyBill.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_CarOutApplyBillList.resources b/PayM/obj/Release/PayM.Pay_CarOutApplyBillList.resources
index e62461d..a70b498 100644
--- a/PayM/obj/Release/PayM.Pay_CarOutApplyBillList.resources
+++ b/PayM/obj/Release/PayM.Pay_CarOutApplyBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_DuSubsidyItemBill.resources b/PayM/obj/Release/PayM.Pay_DuSubsidyItemBill.resources
index f420dac..89f3885 100644
--- a/PayM/obj/Release/PayM.Pay_DuSubsidyItemBill.resources
+++ b/PayM/obj/Release/PayM.Pay_DuSubsidyItemBill.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_DuSubsidyItemBillList.resources b/PayM/obj/Release/PayM.Pay_DuSubsidyItemBillList.resources
index e62461d..a70b498 100644
--- a/PayM/obj/Release/PayM.Pay_DuSubsidyItemBillList.resources
+++ b/PayM/obj/Release/PayM.Pay_DuSubsidyItemBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_EmpPayMentSumReport.resources b/PayM/obj/Release/PayM.Pay_EmpPayMentSumReport.resources
index c7c71dd..01c9556 100644
--- a/PayM/obj/Release/PayM.Pay_EmpPayMentSumReport.resources
+++ b/PayM/obj/Release/PayM.Pay_EmpPayMentSumReport.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_EmpPayMentSumReportDlg.resources b/PayM/obj/Release/PayM.Pay_EmpPayMentSumReportDlg.resources
index 6aea529..79c7741 100644
--- a/PayM/obj/Release/PayM.Pay_EmpPayMentSumReportDlg.resources
+++ b/PayM/obj/Release/PayM.Pay_EmpPayMentSumReportDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_EmpWorkQtyEntryReport.resources b/PayM/obj/Release/PayM.Pay_EmpWorkQtyEntryReport.resources
index de5825e..01c9556 100644
--- a/PayM/obj/Release/PayM.Pay_EmpWorkQtyEntryReport.resources
+++ b/PayM/obj/Release/PayM.Pay_EmpWorkQtyEntryReport.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_EmpWorkQtyEntryReportDlg.resources b/PayM/obj/Release/PayM.Pay_EmpWorkQtyEntryReportDlg.resources
index 20fc539..15ce6e2 100644
--- a/PayM/obj/Release/PayM.Pay_EmpWorkQtyEntryReportDlg.resources
+++ b/PayM/obj/Release/PayM.Pay_EmpWorkQtyEntryReportDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_ErrWorkTimesRequestBill.resources b/PayM/obj/Release/PayM.Pay_ErrWorkTimesRequestBill.resources
index 04f862f..9e00c6e 100644
--- a/PayM/obj/Release/PayM.Pay_ErrWorkTimesRequestBill.resources
+++ b/PayM/obj/Release/PayM.Pay_ErrWorkTimesRequestBill.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_ErrWorkTimesRequestBillList.resources b/PayM/obj/Release/PayM.Pay_ErrWorkTimesRequestBillList.resources
index e62461d..a70b498 100644
--- a/PayM/obj/Release/PayM.Pay_ErrWorkTimesRequestBillList.resources
+++ b/PayM/obj/Release/PayM.Pay_ErrWorkTimesRequestBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_ErrWorkTimesSendBill.resources b/PayM/obj/Release/PayM.Pay_ErrWorkTimesSendBill.resources
index 774d4d2..592d8c1 100644
--- a/PayM/obj/Release/PayM.Pay_ErrWorkTimesSendBill.resources
+++ b/PayM/obj/Release/PayM.Pay_ErrWorkTimesSendBill.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_ErrWorkTimesSendBillList.resources b/PayM/obj/Release/PayM.Pay_ErrWorkTimesSendBillList.resources
index e62461d..5003e21 100644
--- a/PayM/obj/Release/PayM.Pay_ErrWorkTimesSendBillList.resources
+++ b/PayM/obj/Release/PayM.Pay_ErrWorkTimesSendBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resources b/PayM/obj/Release/PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resources
index cafddfa..63c32a2 100644
--- a/PayM/obj/Release/PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resources
+++ b/PayM/obj/Release/PayM.Pay_GetNeedCheckErrWorkTimesSendBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_GroupBalBill.resources b/PayM/obj/Release/PayM.Pay_GroupBalBill.resources
index a48f38f..cd05a9f 100644
--- a/PayM/obj/Release/PayM.Pay_GroupBalBill.resources
+++ b/PayM/obj/Release/PayM.Pay_GroupBalBill.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_GroupBalBillList.resources b/PayM/obj/Release/PayM.Pay_GroupBalBillList.resources
index 9b9d508..96bd928 100644
--- a/PayM/obj/Release/PayM.Pay_GroupBalBillList.resources
+++ b/PayM/obj/Release/PayM.Pay_GroupBalBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_InnerScrap.resources b/PayM/obj/Release/PayM.Pay_InnerScrap.resources
index 07000ad..01c9556 100644
--- a/PayM/obj/Release/PayM.Pay_InnerScrap.resources
+++ b/PayM/obj/Release/PayM.Pay_InnerScrap.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_InnerScrapDlg.resources b/PayM/obj/Release/PayM.Pay_InnerScrapDlg.resources
index c4f8119..780f787 100644
--- a/PayM/obj/Release/PayM.Pay_InnerScrapDlg.resources
+++ b/PayM/obj/Release/PayM.Pay_InnerScrapDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill1.resources b/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill1.resources
index 6555d82..6a89d65 100644
--- a/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill1.resources
+++ b/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill1.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill2.resources b/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill2.resources
index 5b8acf2..21db791 100644
--- a/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill2.resources
+++ b/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill2.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill3.resources b/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill3.resources
index 6555d82..6a89d65 100644
--- a/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill3.resources
+++ b/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill3.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill4.resources b/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill4.resources
index 6555d82..6a89d65 100644
--- a/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill4.resources
+++ b/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill4.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill5.resources b/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill5.resources
index 6555d82..6a89d65 100644
--- a/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill5.resources
+++ b/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBill5.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBillList.resources b/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBillList.resources
index 31638b8..f753f0d 100644
--- a/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBillList.resources
+++ b/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBillReport.resources b/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBillReport.resources
index 167760e..01c9556 100644
--- a/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBillReport.resources
+++ b/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBillReport.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBillReportDlg.resources b/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBillReportDlg.resources
index 6aea529..79c7741 100644
--- a/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBillReportDlg.resources
+++ b/PayM/obj/Release/PayM.Pay_MonthExpenseEntryBillReportDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillAdd.resources b/PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillAdd.resources
index 783c28a..4121e55 100644
--- a/PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillAdd.resources
+++ b/PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillAdd.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillReport.resources b/PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillReport.resources
index d475337..8b7dfec 100644
--- a/PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillReport.resources
+++ b/PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillReport.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillReportDlg.resources b/PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillReportDlg.resources
index 6aea529..79c7741 100644
--- a/PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillReportDlg.resources
+++ b/PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillReportDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillReportMX.resources b/PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillReportMX.resources
index 167760e..01c9556 100644
--- a/PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillReportMX.resources
+++ b/PayM/obj/Release/PayM.Pay_MonthSubsidyEntryBillReportMX.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_MonthWriteBillReport.resources b/PayM/obj/Release/PayM.Pay_MonthWriteBillReport.resources
index e41a0dc..833c5f6 100644
--- a/PayM/obj/Release/PayM.Pay_MonthWriteBillReport.resources
+++ b/PayM/obj/Release/PayM.Pay_MonthWriteBillReport.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_MonthWriteBillReportDlg.resources b/PayM/obj/Release/PayM.Pay_MonthWriteBillReportDlg.resources
index 6aea529..79c7741 100644
--- a/PayM/obj/Release/PayM.Pay_MonthWriteBillReportDlg.resources
+++ b/PayM/obj/Release/PayM.Pay_MonthWriteBillReportDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_MonthWriteBillReportMX.resources b/PayM/obj/Release/PayM.Pay_MonthWriteBillReportMX.resources
index 07000ad..01c9556 100644
--- a/PayM/obj/Release/PayM.Pay_MonthWriteBillReportMX.resources
+++ b/PayM/obj/Release/PayM.Pay_MonthWriteBillReportMX.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_NoWorkTimesReport.resources b/PayM/obj/Release/PayM.Pay_NoWorkTimesReport.resources
index c7c71dd..01c9556 100644
--- a/PayM/obj/Release/PayM.Pay_NoWorkTimesReport.resources
+++ b/PayM/obj/Release/PayM.Pay_NoWorkTimesReport.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_NoWorkTimesReportDlg.resources b/PayM/obj/Release/PayM.Pay_NoWorkTimesReportDlg.resources
index c4f8119..780f787 100644
--- a/PayM/obj/Release/PayM.Pay_NoWorkTimesReportDlg.resources
+++ b/PayM/obj/Release/PayM.Pay_NoWorkTimesReportDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_OtherBalBill.resources b/PayM/obj/Release/PayM.Pay_OtherBalBill.resources
index 9c5a3d0..9f5486e 100644
--- a/PayM/obj/Release/PayM.Pay_OtherBalBill.resources
+++ b/PayM/obj/Release/PayM.Pay_OtherBalBill.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_OtherBalBillList.resources b/PayM/obj/Release/PayM.Pay_OtherBalBillList.resources
index 8084841..26509ac 100644
--- a/PayM/obj/Release/PayM.Pay_OtherBalBillList.resources
+++ b/PayM/obj/Release/PayM.Pay_OtherBalBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_OtherMoney_Dlg.resources b/PayM/obj/Release/PayM.Pay_OtherMoney_Dlg.resources
index cc7d822..2e88a39 100644
--- a/PayM/obj/Release/PayM.Pay_OtherMoney_Dlg.resources
+++ b/PayM/obj/Release/PayM.Pay_OtherMoney_Dlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_OutApplyBill.resources b/PayM/obj/Release/PayM.Pay_OutApplyBill.resources
index e5f6229..47c1be3 100644
--- a/PayM/obj/Release/PayM.Pay_OutApplyBill.resources
+++ b/PayM/obj/Release/PayM.Pay_OutApplyBill.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_OutApplyBillList.resources b/PayM/obj/Release/PayM.Pay_OutApplyBillList.resources
index 8cad2be..96b3e13 100644
--- a/PayM/obj/Release/PayM.Pay_OutApplyBillList.resources
+++ b/PayM/obj/Release/PayM.Pay_OutApplyBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_OuterScrap.resources b/PayM/obj/Release/PayM.Pay_OuterScrap.resources
index c7c71dd..01c9556 100644
--- a/PayM/obj/Release/PayM.Pay_OuterScrap.resources
+++ b/PayM/obj/Release/PayM.Pay_OuterScrap.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_OuterScrapDlg.resources b/PayM/obj/Release/PayM.Pay_OuterScrapDlg.resources
index c4f8119..780f787 100644
--- a/PayM/obj/Release/PayM.Pay_OuterScrapDlg.resources
+++ b/PayM/obj/Release/PayM.Pay_OuterScrapDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_OverApplyBill.resources b/PayM/obj/Release/PayM.Pay_OverApplyBill.resources
index a72129e..4fcbbac 100644
--- a/PayM/obj/Release/PayM.Pay_OverApplyBill.resources
+++ b/PayM/obj/Release/PayM.Pay_OverApplyBill.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_OverApplyBillList.resources b/PayM/obj/Release/PayM.Pay_OverApplyBillList.resources
index 384e07e..26509ac 100644
--- a/PayM/obj/Release/PayM.Pay_OverApplyBillList.resources
+++ b/PayM/obj/Release/PayM.Pay_OverApplyBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_PayMentBill.resources b/PayM/obj/Release/PayM.Pay_PayMentBill.resources
index 07f6fc7..a44b342 100644
--- a/PayM/obj/Release/PayM.Pay_PayMentBill.resources
+++ b/PayM/obj/Release/PayM.Pay_PayMentBill.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_PayMentBillList.resources b/PayM/obj/Release/PayM.Pay_PayMentBillList.resources
index 65506c3..430f1cc4 100644
--- a/PayM/obj/Release/PayM.Pay_PayMentBillList.resources
+++ b/PayM/obj/Release/PayM.Pay_PayMentBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_PayMentDayBill.resources b/PayM/obj/Release/PayM.Pay_PayMentDayBill.resources
index 2547a67..2ca7d0f 100644
--- a/PayM/obj/Release/PayM.Pay_PayMentDayBill.resources
+++ b/PayM/obj/Release/PayM.Pay_PayMentDayBill.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_PayMentDayBillList.resources b/PayM/obj/Release/PayM.Pay_PayMentDayBillList.resources
index 384e07e..26509ac 100644
--- a/PayM/obj/Release/PayM.Pay_PayMentDayBillList.resources
+++ b/PayM/obj/Release/PayM.Pay_PayMentDayBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_PayMentDeptSendList.resources b/PayM/obj/Release/PayM.Pay_PayMentDeptSendList.resources
index c7c71dd..01c9556 100644
--- a/PayM/obj/Release/PayM.Pay_PayMentDeptSendList.resources
+++ b/PayM/obj/Release/PayM.Pay_PayMentDeptSendList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_PayMentDeptSendListDlg.resources b/PayM/obj/Release/PayM.Pay_PayMentDeptSendListDlg.resources
index bf344ca..24688c3 100644
--- a/PayM/obj/Release/PayM.Pay_PayMentDeptSendListDlg.resources
+++ b/PayM/obj/Release/PayM.Pay_PayMentDeptSendListDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_PayMentDeptYearReport.resources b/PayM/obj/Release/PayM.Pay_PayMentDeptYearReport.resources
index de5825e..01c9556 100644
--- a/PayM/obj/Release/PayM.Pay_PayMentDeptYearReport.resources
+++ b/PayM/obj/Release/PayM.Pay_PayMentDeptYearReport.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_PayMentDeptYearReportDlg.resources b/PayM/obj/Release/PayM.Pay_PayMentDeptYearReportDlg.resources
index 7f599ad..ec17503 100644
--- a/PayM/obj/Release/PayM.Pay_PayMentDeptYearReportDlg.resources
+++ b/PayM/obj/Release/PayM.Pay_PayMentDeptYearReportDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_PayMentPrintReport.resources b/PayM/obj/Release/PayM.Pay_PayMentPrintReport.resources
index c7c71dd..01c9556 100644
--- a/PayM/obj/Release/PayM.Pay_PayMentPrintReport.resources
+++ b/PayM/obj/Release/PayM.Pay_PayMentPrintReport.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_PayMentPrintReportDlg.resources b/PayM/obj/Release/PayM.Pay_PayMentPrintReportDlg.resources
index 06c24d0..6c05a97 100644
--- a/PayM/obj/Release/PayM.Pay_PayMentPrintReportDlg.resources
+++ b/PayM/obj/Release/PayM.Pay_PayMentPrintReportDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_PayMentSendList.resources b/PayM/obj/Release/PayM.Pay_PayMentSendList.resources
index de5825e..01c9556 100644
--- a/PayM/obj/Release/PayM.Pay_PayMentSendList.resources
+++ b/PayM/obj/Release/PayM.Pay_PayMentSendList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_PayMentSendListDlg.resources b/PayM/obj/Release/PayM.Pay_PayMentSendListDlg.resources
index bf344ca..24688c3 100644
--- a/PayM/obj/Release/PayM.Pay_PayMentSendListDlg.resources
+++ b/PayM/obj/Release/PayM.Pay_PayMentSendListDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_PayMentYearReport.resources b/PayM/obj/Release/PayM.Pay_PayMentYearReport.resources
index de5825e..01c9556 100644
--- a/PayM/obj/Release/PayM.Pay_PayMentYearReport.resources
+++ b/PayM/obj/Release/PayM.Pay_PayMentYearReport.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_PayMentYearReportDlg.resources b/PayM/obj/Release/PayM.Pay_PayMentYearReportDlg.resources
index 7f599ad..ec17503 100644
--- a/PayM/obj/Release/PayM.Pay_PayMentYearReportDlg.resources
+++ b/PayM/obj/Release/PayM.Pay_PayMentYearReportDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_ProcPriceRequestBill.resources b/PayM/obj/Release/PayM.Pay_ProcPriceRequestBill.resources
index 77d5942..8243501 100644
--- a/PayM/obj/Release/PayM.Pay_ProcPriceRequestBill.resources
+++ b/PayM/obj/Release/PayM.Pay_ProcPriceRequestBill.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_ProcPriceRequestBillList.resources b/PayM/obj/Release/PayM.Pay_ProcPriceRequestBillList.resources
index e944c71..26509ac 100644
--- a/PayM/obj/Release/PayM.Pay_ProcPriceRequestBillList.resources
+++ b/PayM/obj/Release/PayM.Pay_ProcPriceRequestBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_ProdWorkQtyEntryReport.resources b/PayM/obj/Release/PayM.Pay_ProdWorkQtyEntryReport.resources
index 133f66e..01c9556 100644
--- a/PayM/obj/Release/PayM.Pay_ProdWorkQtyEntryReport.resources
+++ b/PayM/obj/Release/PayM.Pay_ProdWorkQtyEntryReport.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_ProdWorkQtyEntryReportDlg.resources b/PayM/obj/Release/PayM.Pay_ProdWorkQtyEntryReportDlg.resources
index c4f8119..780f787 100644
--- a/PayM/obj/Release/PayM.Pay_ProdWorkQtyEntryReportDlg.resources
+++ b/PayM/obj/Release/PayM.Pay_ProdWorkQtyEntryReportDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_ProdWorkQtySumReport.resources b/PayM/obj/Release/PayM.Pay_ProdWorkQtySumReport.resources
index 184274a..01c9556 100644
--- a/PayM/obj/Release/PayM.Pay_ProdWorkQtySumReport.resources
+++ b/PayM/obj/Release/PayM.Pay_ProdWorkQtySumReport.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_ProdWorkQtySumReportDlg.resources b/PayM/obj/Release/PayM.Pay_ProdWorkQtySumReportDlg.resources
index c4f8119..780f787 100644
--- a/PayM/obj/Release/PayM.Pay_ProdWorkQtySumReportDlg.resources
+++ b/PayM/obj/Release/PayM.Pay_ProdWorkQtySumReportDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_SingleBalBill.resources b/PayM/obj/Release/PayM.Pay_SingleBalBill.resources
index 67a6490..01f83ad 100644
--- a/PayM/obj/Release/PayM.Pay_SingleBalBill.resources
+++ b/PayM/obj/Release/PayM.Pay_SingleBalBill.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_SingleBalBillDlg.resources b/PayM/obj/Release/PayM.Pay_SingleBalBillDlg.resources
index 06c24d0..6c05a97 100644
--- a/PayM/obj/Release/PayM.Pay_SingleBalBillDlg.resources
+++ b/PayM/obj/Release/PayM.Pay_SingleBalBillDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_SingleBalBillList.resources b/PayM/obj/Release/PayM.Pay_SingleBalBillList.resources
index bd1a680..26509ac 100644
--- a/PayM/obj/Release/PayM.Pay_SingleBalBillList.resources
+++ b/PayM/obj/Release/PayM.Pay_SingleBalBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_SubsidyChangeBill.resources b/PayM/obj/Release/PayM.Pay_SubsidyChangeBill.resources
index 925652c..323dd9f 100644
--- a/PayM/obj/Release/PayM.Pay_SubsidyChangeBill.resources
+++ b/PayM/obj/Release/PayM.Pay_SubsidyChangeBill.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_SubsidyChangeBillList.resources b/PayM/obj/Release/PayM.Pay_SubsidyChangeBillList.resources
index 230d6dd..a70b498 100644
--- a/PayM/obj/Release/PayM.Pay_SubsidyChangeBillList.resources
+++ b/PayM/obj/Release/PayM.Pay_SubsidyChangeBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_WorkTimesBill.resources b/PayM/obj/Release/PayM.Pay_WorkTimesBill.resources
index 59db82a..06ccee7 100644
--- a/PayM/obj/Release/PayM.Pay_WorkTimesBill.resources
+++ b/PayM/obj/Release/PayM.Pay_WorkTimesBill.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_WorkTimesBillList.resources b/PayM/obj/Release/PayM.Pay_WorkTimesBillList.resources
index b872a90..26509ac 100644
--- a/PayM/obj/Release/PayM.Pay_WorkTimesBillList.resources
+++ b/PayM/obj/Release/PayM.Pay_WorkTimesBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_WorkTimesCardBill1.resources b/PayM/obj/Release/PayM.Pay_WorkTimesCardBill1.resources
index 6555d82..6a89d65 100644
--- a/PayM/obj/Release/PayM.Pay_WorkTimesCardBill1.resources
+++ b/PayM/obj/Release/PayM.Pay_WorkTimesCardBill1.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_WorkTimesCardBill2.resources b/PayM/obj/Release/PayM.Pay_WorkTimesCardBill2.resources
index 5b8acf2..21db791 100644
--- a/PayM/obj/Release/PayM.Pay_WorkTimesCardBill2.resources
+++ b/PayM/obj/Release/PayM.Pay_WorkTimesCardBill2.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_WorkTimesCardBill3.resources b/PayM/obj/Release/PayM.Pay_WorkTimesCardBill3.resources
index 6555d82..6a89d65 100644
--- a/PayM/obj/Release/PayM.Pay_WorkTimesCardBill3.resources
+++ b/PayM/obj/Release/PayM.Pay_WorkTimesCardBill3.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_WorkTimesCardBill4.resources b/PayM/obj/Release/PayM.Pay_WorkTimesCardBill4.resources
index 6555d82..6a89d65 100644
--- a/PayM/obj/Release/PayM.Pay_WorkTimesCardBill4.resources
+++ b/PayM/obj/Release/PayM.Pay_WorkTimesCardBill4.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_WorkTimesCardBill5.resources b/PayM/obj/Release/PayM.Pay_WorkTimesCardBill5.resources
index 6555d82..6a89d65 100644
--- a/PayM/obj/Release/PayM.Pay_WorkTimesCardBill5.resources
+++ b/PayM/obj/Release/PayM.Pay_WorkTimesCardBill5.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_WorkTimesCardBillList.resources b/PayM/obj/Release/PayM.Pay_WorkTimesCardBillList.resources
index 7da45e9..f753f0d 100644
--- a/PayM/obj/Release/PayM.Pay_WorkTimesCardBillList.resources
+++ b/PayM/obj/Release/PayM.Pay_WorkTimesCardBillList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_WorkTimesList.resources b/PayM/obj/Release/PayM.Pay_WorkTimesList.resources
index de5825e..01c9556 100644
--- a/PayM/obj/Release/PayM.Pay_WorkTimesList.resources
+++ b/PayM/obj/Release/PayM.Pay_WorkTimesList.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Pay_WorkTimesListDlg.resources b/PayM/obj/Release/PayM.Pay_WorkTimesListDlg.resources
index bf344ca..24688c3 100644
--- a/PayM/obj/Release/PayM.Pay_WorkTimesListDlg.resources
+++ b/PayM/obj/Release/PayM.Pay_WorkTimesListDlg.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.Properties.Resources.resources b/PayM/obj/Release/PayM.Properties.Resources.resources
index 06c24d0..6c05a97 100644
--- a/PayM/obj/Release/PayM.Properties.Resources.resources
+++ b/PayM/obj/Release/PayM.Properties.Resources.resources
Binary files differ
diff --git a/PayM/obj/Release/PayM.csproj.GenerateResource.Cache b/PayM/obj/Release/PayM.csproj.GenerateResource.Cache
index a917a13..07e70f2 100644
--- a/PayM/obj/Release/PayM.csproj.GenerateResource.Cache
+++ b/PayM/obj/Release/PayM.csproj.GenerateResource.Cache
Binary files differ
diff --git a/PayM/obj/Release/PayM.csproj.ResolveComReference.cache b/PayM/obj/Release/PayM.csproj.ResolveComReference.cache
index ff162a2..74c4161 100644
--- a/PayM/obj/Release/PayM.csproj.ResolveComReference.cache
+++ b/PayM/obj/Release/PayM.csproj.ResolveComReference.cache
Binary files differ
diff --git a/PayM/obj/Release/PayM.dll b/PayM/obj/Release/PayM.dll
index a89f98f..194a2f6 100644
--- a/PayM/obj/Release/PayM.dll
+++ b/PayM/obj/Release/PayM.dll
Binary files differ
diff --git a/PayM/obj/Release/PayM.pdb b/PayM/obj/Release/PayM.pdb
index eb6e31d..f012325 100644
--- a/PayM/obj/Release/PayM.pdb
+++ b/PayM/obj/Release/PayM.pdb
Binary files differ
diff --git a/PlanM/bin/Release/BLL.dll b/PlanM/bin/Release/BLL.dll
index 322fe1e..ce7f44c 100644
--- a/PlanM/bin/Release/BLL.dll
+++ b/PlanM/bin/Release/BLL.dll
Binary files differ
diff --git a/PlanM/bin/Release/BLL.pdb b/PlanM/bin/Release/BLL.pdb
index c59eea2..806e387 100644
--- a/PlanM/bin/Release/BLL.pdb
+++ b/PlanM/bin/Release/BLL.pdb
Binary files differ
diff --git a/PlanM/bin/Release/DAL.dll b/PlanM/bin/Release/DAL.dll
index 28f26de..6722401 100644
--- a/PlanM/bin/Release/DAL.dll
+++ b/PlanM/bin/Release/DAL.dll
Binary files differ
diff --git a/PlanM/bin/Release/DAL.pdb b/PlanM/bin/Release/DAL.pdb
index a7b3ed9..00df416 100644
--- a/PlanM/bin/Release/DAL.pdb
+++ b/PlanM/bin/Release/DAL.pdb
Binary files differ
diff --git a/PlanM/bin/Release/DBUtility.dll b/PlanM/bin/Release/DBUtility.dll
index 45d4353..dc782c4 100644
--- a/PlanM/bin/Release/DBUtility.dll
+++ b/PlanM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/PlanM/bin/Release/DBUtility.pdb b/PlanM/bin/Release/DBUtility.pdb
index ef67b9b..d4ae4d5 100644
--- a/PlanM/bin/Release/DBUtility.pdb
+++ b/PlanM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/PlanM/bin/Release/Model.dll b/PlanM/bin/Release/Model.dll
index 9f8b23d..cb94a58 100644
--- a/PlanM/bin/Release/Model.dll
+++ b/PlanM/bin/Release/Model.dll
Binary files differ
diff --git a/PlanM/bin/Release/Model.pdb b/PlanM/bin/Release/Model.pdb
index 32810b7..d33cc1c 100644
--- a/PlanM/bin/Release/Model.pdb
+++ b/PlanM/bin/Release/Model.pdb
Binary files differ
diff --git a/PlanM/bin/Release/PlanM.dll b/PlanM/bin/Release/PlanM.dll
index adb52fb..6e0ae65 100644
--- a/PlanM/bin/Release/PlanM.dll
+++ b/PlanM/bin/Release/PlanM.dll
Binary files differ
diff --git a/PlanM/bin/Release/PlanM.pdb b/PlanM/bin/Release/PlanM.pdb
index bdf53a5..8365bee 100644
--- a/PlanM/bin/Release/PlanM.pdb
+++ b/PlanM/bin/Release/PlanM.pdb
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Class.dll b/PlanM/bin/Release/Pub_Class.dll
index 6c41ee2..0782b0a 100644
--- a/PlanM/bin/Release/Pub_Class.dll
+++ b/PlanM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Class.pdb b/PlanM/bin/Release/Pub_Class.pdb
index ef676f7..9ce9a59 100644
--- a/PlanM/bin/Release/Pub_Class.pdb
+++ b/PlanM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Control.dll b/PlanM/bin/Release/Pub_Control.dll
index 3ea2b96..a1fcd8d 100644
--- a/PlanM/bin/Release/Pub_Control.dll
+++ b/PlanM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/PlanM/bin/Release/Pub_Control.pdb b/PlanM/bin/Release/Pub_Control.pdb
index ab08c90..feb6d4d 100644
--- a/PlanM/bin/Release/Pub_Control.pdb
+++ b/PlanM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/PlanM/bin/Release/SQLHelper.dll b/PlanM/bin/Release/SQLHelper.dll
index 34d8892..965e083 100644
--- a/PlanM/bin/Release/SQLHelper.dll
+++ b/PlanM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/PlanM/bin/Release/SQLHelper.pdb b/PlanM/bin/Release/SQLHelper.pdb
index 6fe9783..60e8ba8 100644
--- a/PlanM/bin/Release/SQLHelper.pdb
+++ b/PlanM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/ProM/bin/Release/BLL.dll b/ProM/bin/Release/BLL.dll
index 6f5fe90..ce7f44c 100644
--- a/ProM/bin/Release/BLL.dll
+++ b/ProM/bin/Release/BLL.dll
Binary files differ
diff --git a/ProM/bin/Release/BLL.pdb b/ProM/bin/Release/BLL.pdb
index ff491af..806e387 100644
--- a/ProM/bin/Release/BLL.pdb
+++ b/ProM/bin/Release/BLL.pdb
Binary files differ
diff --git a/ProM/bin/Release/DAL.dll b/ProM/bin/Release/DAL.dll
index d2ca7bb..6722401 100644
--- a/ProM/bin/Release/DAL.dll
+++ b/ProM/bin/Release/DAL.dll
Binary files differ
diff --git a/ProM/bin/Release/DAL.pdb b/ProM/bin/Release/DAL.pdb
index 9445526..00df416 100644
--- a/ProM/bin/Release/DAL.pdb
+++ b/ProM/bin/Release/DAL.pdb
Binary files differ
diff --git a/ProM/bin/Release/DBUtility.dll b/ProM/bin/Release/DBUtility.dll
index cefc8d8..dc782c4 100644
--- a/ProM/bin/Release/DBUtility.dll
+++ b/ProM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/ProM/bin/Release/DBUtility.pdb b/ProM/bin/Release/DBUtility.pdb
index f43463e..d4ae4d5 100644
--- a/ProM/bin/Release/DBUtility.pdb
+++ b/ProM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/ProM/bin/Release/Model.dll b/ProM/bin/Release/Model.dll
index f101700..cb94a58 100644
--- a/ProM/bin/Release/Model.dll
+++ b/ProM/bin/Release/Model.dll
Binary files differ
diff --git a/ProM/bin/Release/Model.pdb b/ProM/bin/Release/Model.pdb
index 55a5dca..d33cc1c 100644
--- a/ProM/bin/Release/Model.pdb
+++ b/ProM/bin/Release/Model.pdb
Binary files differ
diff --git a/ProM/bin/Release/ProM.dll b/ProM/bin/Release/ProM.dll
index 5d05567..eae0b8a 100644
--- a/ProM/bin/Release/ProM.dll
+++ b/ProM/bin/Release/ProM.dll
Binary files differ
diff --git a/ProM/bin/Release/ProM.pdb b/ProM/bin/Release/ProM.pdb
index dd2e0ce..605320c 100644
--- a/ProM/bin/Release/ProM.pdb
+++ b/ProM/bin/Release/ProM.pdb
Binary files differ
diff --git a/ProM/bin/Release/Pub_Class.dll b/ProM/bin/Release/Pub_Class.dll
index 81c2807..0782b0a 100644
--- a/ProM/bin/Release/Pub_Class.dll
+++ b/ProM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/ProM/bin/Release/Pub_Class.pdb b/ProM/bin/Release/Pub_Class.pdb
index ed9a4e7..9ce9a59 100644
--- a/ProM/bin/Release/Pub_Class.pdb
+++ b/ProM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/ProM/bin/Release/Pub_Control.dll b/ProM/bin/Release/Pub_Control.dll
index d61866b..a1fcd8d 100644
--- a/ProM/bin/Release/Pub_Control.dll
+++ b/ProM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/ProM/bin/Release/Pub_Control.pdb b/ProM/bin/Release/Pub_Control.pdb
index a3856a6..feb6d4d 100644
--- a/ProM/bin/Release/Pub_Control.pdb
+++ b/ProM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/ProM/bin/Release/SQLHelper.dll b/ProM/bin/Release/SQLHelper.dll
index 7d4eea1..965e083 100644
--- a/ProM/bin/Release/SQLHelper.dll
+++ b/ProM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/ProM/bin/Release/SQLHelper.pdb b/ProM/bin/Release/SQLHelper.pdb
index ab1f540..60e8ba8 100644
--- a/ProM/bin/Release/SQLHelper.pdb
+++ b/ProM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index aac1355..0782b0a 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 a119cc1..9ce9a59 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 aac1355..0782b0a 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 a119cc1..9ce9a59 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 ebe40ac..a1fcd8d 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 3cb83f0..feb6d4d 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 aac1355..0782b0a 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 a119cc1..9ce9a59 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 85dd23f..965e083 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 14e3cba..60e8ba8 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 7ba5a9d..a949af0 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 85dd23f..965e083 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 14e3cba..60e8ba8 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/SelM/bin/Release/BLL.dll b/SelM/bin/Release/BLL.dll
index 6f5fe90..ce7f44c 100644
--- a/SelM/bin/Release/BLL.dll
+++ b/SelM/bin/Release/BLL.dll
Binary files differ
diff --git a/SelM/bin/Release/BLL.pdb b/SelM/bin/Release/BLL.pdb
index ff491af..806e387 100644
--- a/SelM/bin/Release/BLL.pdb
+++ b/SelM/bin/Release/BLL.pdb
Binary files differ
diff --git a/SelM/bin/Release/DAL.dll b/SelM/bin/Release/DAL.dll
index d2ca7bb..6722401 100644
--- a/SelM/bin/Release/DAL.dll
+++ b/SelM/bin/Release/DAL.dll
Binary files differ
diff --git a/SelM/bin/Release/DAL.pdb b/SelM/bin/Release/DAL.pdb
index 9445526..00df416 100644
--- a/SelM/bin/Release/DAL.pdb
+++ b/SelM/bin/Release/DAL.pdb
Binary files differ
diff --git a/SelM/bin/Release/DBUtility.dll b/SelM/bin/Release/DBUtility.dll
index cefc8d8..dc782c4 100644
--- a/SelM/bin/Release/DBUtility.dll
+++ b/SelM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/SelM/bin/Release/DBUtility.pdb b/SelM/bin/Release/DBUtility.pdb
index f43463e..d4ae4d5 100644
--- a/SelM/bin/Release/DBUtility.pdb
+++ b/SelM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/SelM/bin/Release/Model.dll b/SelM/bin/Release/Model.dll
index f101700..cb94a58 100644
--- a/SelM/bin/Release/Model.dll
+++ b/SelM/bin/Release/Model.dll
Binary files differ
diff --git a/SelM/bin/Release/Model.pdb b/SelM/bin/Release/Model.pdb
index 55a5dca..d33cc1c 100644
--- a/SelM/bin/Release/Model.pdb
+++ b/SelM/bin/Release/Model.pdb
Binary files differ
diff --git a/SelM/bin/Release/Pub_Class.dll b/SelM/bin/Release/Pub_Class.dll
index 81c2807..0782b0a 100644
--- a/SelM/bin/Release/Pub_Class.dll
+++ b/SelM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/SelM/bin/Release/Pub_Class.pdb b/SelM/bin/Release/Pub_Class.pdb
index ed9a4e7..9ce9a59 100644
--- a/SelM/bin/Release/Pub_Class.pdb
+++ b/SelM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/SelM/bin/Release/Pub_Control.dll b/SelM/bin/Release/Pub_Control.dll
index d61866b..a1fcd8d 100644
--- a/SelM/bin/Release/Pub_Control.dll
+++ b/SelM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/SelM/bin/Release/Pub_Control.pdb b/SelM/bin/Release/Pub_Control.pdb
index a3856a6..feb6d4d 100644
--- a/SelM/bin/Release/Pub_Control.pdb
+++ b/SelM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/SelM/bin/Release/SQLHelper.dll b/SelM/bin/Release/SQLHelper.dll
index 7d4eea1..965e083 100644
--- a/SelM/bin/Release/SQLHelper.dll
+++ b/SelM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/SelM/bin/Release/SQLHelper.pdb b/SelM/bin/Release/SQLHelper.pdb
index ab1f540..60e8ba8 100644
--- a/SelM/bin/Release/SQLHelper.pdb
+++ b/SelM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/SelM/bin/Release/SelM.dll b/SelM/bin/Release/SelM.dll
index 1cbdc2d..3db20c8 100644
--- a/SelM/bin/Release/SelM.dll
+++ b/SelM/bin/Release/SelM.dll
Binary files differ
diff --git a/SelM/bin/Release/SelM.pdb b/SelM/bin/Release/SelM.pdb
index 3f95903..b741825 100644
--- a/SelM/bin/Release/SelM.pdb
+++ b/SelM/bin/Release/SelM.pdb
Binary files differ
diff --git a/SelM/bin/Release/WarM.dll b/SelM/bin/Release/WarM.dll
index a7f7373..ea41e3a 100644
--- a/SelM/bin/Release/WarM.dll
+++ b/SelM/bin/Release/WarM.dll
Binary files differ
diff --git a/SelM/bin/Release/WarM.pdb b/SelM/bin/Release/WarM.pdb
index 2257290..7611ce1 100644
--- a/SelM/bin/Release/WarM.pdb
+++ b/SelM/bin/Release/WarM.pdb
Binary files differ
diff --git a/SelM/bin/Release/WorkM.dll b/SelM/bin/Release/WorkM.dll
index a87a7d5..32fcbdf 100644
--- a/SelM/bin/Release/WorkM.dll
+++ b/SelM/bin/Release/WorkM.dll
Binary files differ
diff --git a/SelM/bin/Release/WorkM.pdb b/SelM/bin/Release/WorkM.pdb
index 9c0158b..522f767 100644
--- a/SelM/bin/Release/WorkM.pdb
+++ b/SelM/bin/Release/WorkM.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index cccadf8..0000000
--- a/SyntacticSugar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
index fea44e6..b04aad7 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index 88c42fb..058b657 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,18 +1,5 @@
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
-E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
-E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
-E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
-E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
-E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb.BASE.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb.BASE.pdb
deleted file mode 100644
index be6ecd0..0000000
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb.BASE.pdb
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb.LOCAL.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb.LOCAL.pdb
deleted file mode 100644
index d4f984c..0000000
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb.LOCAL.pdb
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb.REMOTE.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb.REMOTE.pdb
deleted file mode 100644
index be6ecd0..0000000
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb.REMOTE.pdb
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs
deleted file mode 100644
index e5dc9b8..0000000
--- a/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")]
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
deleted file mode 100644
index f5e894a..0000000
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
deleted file mode 100644
index bfb772c..0000000
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-5dd9c82feb12f833c78ecebea7d9a46c99f29e3f
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
deleted file mode 100644
index 00e2be1..0000000
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.dll b/SyntacticSugar/obj/Release/SyntacticSugar.dll
deleted file mode 100644
index c0635b3..0000000
--- a/SyntacticSugar/obj/Release/SyntacticSugar.dll
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.pdb b/SyntacticSugar/obj/Release/SyntacticSugar.pdb
deleted file mode 100644
index ca3eca3..0000000
--- a/SyntacticSugar/obj/Release/SyntacticSugar.pdb
+++ /dev/null
Binary files differ
diff --git a/WarM/bin/Release/BLL.dll b/WarM/bin/Release/BLL.dll
index 322fe1e..ce7f44c 100644
--- a/WarM/bin/Release/BLL.dll
+++ b/WarM/bin/Release/BLL.dll
Binary files differ
diff --git a/WarM/bin/Release/BLL.pdb b/WarM/bin/Release/BLL.pdb
index c59eea2..806e387 100644
--- a/WarM/bin/Release/BLL.pdb
+++ b/WarM/bin/Release/BLL.pdb
Binary files differ
diff --git a/WarM/bin/Release/DAL.dll b/WarM/bin/Release/DAL.dll
index 28f26de..6722401 100644
--- a/WarM/bin/Release/DAL.dll
+++ b/WarM/bin/Release/DAL.dll
Binary files differ
diff --git a/WarM/bin/Release/DAL.pdb b/WarM/bin/Release/DAL.pdb
index a7b3ed9..00df416 100644
--- a/WarM/bin/Release/DAL.pdb
+++ b/WarM/bin/Release/DAL.pdb
Binary files differ
diff --git a/WarM/bin/Release/DBUtility.dll b/WarM/bin/Release/DBUtility.dll
index 45d4353..dc782c4 100644
--- a/WarM/bin/Release/DBUtility.dll
+++ b/WarM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/WarM/bin/Release/DBUtility.pdb b/WarM/bin/Release/DBUtility.pdb
index ef67b9b..d4ae4d5 100644
--- a/WarM/bin/Release/DBUtility.pdb
+++ b/WarM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/WarM/bin/Release/Model.dll b/WarM/bin/Release/Model.dll
index 9f8b23d..cb94a58 100644
--- a/WarM/bin/Release/Model.dll
+++ b/WarM/bin/Release/Model.dll
Binary files differ
diff --git a/WarM/bin/Release/Model.pdb b/WarM/bin/Release/Model.pdb
index 32810b7..d33cc1c 100644
--- a/WarM/bin/Release/Model.pdb
+++ b/WarM/bin/Release/Model.pdb
Binary files differ
diff --git a/WarM/bin/Release/Pub_Class.dll b/WarM/bin/Release/Pub_Class.dll
index 6c41ee2..0782b0a 100644
--- a/WarM/bin/Release/Pub_Class.dll
+++ b/WarM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/WarM/bin/Release/Pub_Class.pdb b/WarM/bin/Release/Pub_Class.pdb
index ef676f7..9ce9a59 100644
--- a/WarM/bin/Release/Pub_Class.pdb
+++ b/WarM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/WarM/bin/Release/Pub_Control.dll b/WarM/bin/Release/Pub_Control.dll
index 3ea2b96..a1fcd8d 100644
--- a/WarM/bin/Release/Pub_Control.dll
+++ b/WarM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/WarM/bin/Release/Pub_Control.pdb b/WarM/bin/Release/Pub_Control.pdb
index ab08c90..feb6d4d 100644
--- a/WarM/bin/Release/Pub_Control.pdb
+++ b/WarM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/WarM/bin/Release/SQLHelper.dll b/WarM/bin/Release/SQLHelper.dll
index 34d8892..965e083 100644
--- a/WarM/bin/Release/SQLHelper.dll
+++ b/WarM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/WarM/bin/Release/SQLHelper.pdb b/WarM/bin/Release/SQLHelper.pdb
index 6fe9783..60e8ba8 100644
--- a/WarM/bin/Release/SQLHelper.pdb
+++ b/WarM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/WarM/bin/Release/WarM.dll b/WarM/bin/Release/WarM.dll
index 4ceec24..ea41e3a 100644
--- a/WarM/bin/Release/WarM.dll
+++ b/WarM/bin/Release/WarM.dll
Binary files differ
diff --git a/WarM/bin/Release/WarM.pdb b/WarM/bin/Release/WarM.pdb
index e48d6bc..7611ce1 100644
--- a/WarM/bin/Release/WarM.pdb
+++ b/WarM/bin/Release/WarM.pdb
Binary files differ
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
index dae024a..daf7c8f 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New.cs"
@@ -846,6 +846,7 @@
HWhID = ClsPub.isLong(grdSub.Rows[i].Cells[HWhID2Col].Value);
HSPID = ClsPub.isLong(grdSub.Rows[i].Cells[HSPID2Col].Value);
HRemark = ClsPub.isStrNull(grdSub.Rows[i].Cells[HRemark2Col].Value);
+ HRemark = "PLC鑷姩鐢熸垚";
HMaterName = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterName2Col].Value);
HMaterModel = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterModel2Col].Value);
HPinfan = ClsPub.isStrNull(grdSub.Rows[i].Cells[HPinfan2Col].Value);
@@ -952,14 +953,14 @@
string LIU = "";
int LEN = 4;
DataSet ds;
- string sql = "select * from h_v_IF_BarCodeBillList Where HMaterID = " + grdMain.Rows[0].Cells[HMaterIDCol].Value + " and HSTOCKORGID = " + HOrgID + " and CONVERT(varchar(100),鏉＄爜鏃ユ湡, 23) = '" + HDate + "' order by 鎵瑰彿 desc";
+ string sql = "select * from h_v_IF_BarCodeBillList Where HMaterID = " + grdMain.Rows[0].Cells[HMaterIDCol].Value + " and HSTOCKORGID = " + HOrgID + " and CONVERT(varchar(100),鏉＄爜鏃ユ湡, 23) = '" + HDate + "' and 澶囨敞 = 'PLC鑷姩鐢熸垚' order by 鎵瑰彿 desc";
ds = oCn.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
if (ds != null)
{
long count = 0;
if (ds.Tables[0].Rows.Count > 0)
{
- count = ClsPub.isLong(ds.Tables[0].Rows[0]["鎵瑰彿"].ToString().Replace(sYear + sPeriod + sDay, ""));
+ count = ClsPub.isLong(ds.Tables[0].Rows[0]["鎵瑰彿"].ToString().Replace(sYear + sPeriod + sDay+" ", ""));
}
LIU += count + 1;
while (LIU.Length < LEN) //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
@@ -973,7 +974,7 @@
}
//鎷兼帴鎵瑰彿
- HBatchNo = sYear + sPeriod + sDay + LIU;
+ HBatchNo = sYear + sPeriod + sDay+" " + LIU;
}
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs"
index 93c7d97..b132f92 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs"
@@ -851,6 +851,7 @@
HWhID = ClsPub.isLong(grdSub.Rows[i].Cells[HWhID2Col].Value);
HSPID = ClsPub.isLong(grdSub.Rows[i].Cells[HSPID2Col].Value);
HRemark = ClsPub.isStrNull(grdSub.Rows[i].Cells[HRemark2Col].Value);
+ HRemark = "PLC鑷姩鐢熸垚";
HMaterName = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterName2Col].Value);
HMaterModel = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterModel2Col].Value);
HPinfan = ClsPub.isStrNull(grdSub.Rows[i].Cells[HPinfan2Col].Value);
@@ -957,14 +958,14 @@
string LIU = "";
int LEN = 4;
DataSet ds;
- string sql = "select * from h_v_IF_BarCodeBillList Where HMaterID = " + grdMain.Rows[0].Cells[HMaterIDCol].Value + " and HSTOCKORGID = " + HOrgID + " and CONVERT(varchar(100),鏉＄爜鏃ユ湡, 23) = '" + HDate + "' order by 鎵瑰彿 desc";
+ string sql = "select * from h_v_IF_BarCodeBillList Where HMaterID = " + grdMain.Rows[0].Cells[HMaterIDCol].Value + " and HSTOCKORGID = " + HOrgID + " and CONVERT(varchar(100),鏉＄爜鏃ユ湡, 23) = '" + HDate + "' and 澶囨敞 = 'PLC鑷姩鐢熸垚' order by 鎵瑰彿 desc";
ds = oCn.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
if (ds != null)
{
long count = 0;
if (ds.Tables[0].Rows.Count > 0)
{
- count = ClsPub.isLong(ds.Tables[0].Rows[0]["鎵瑰彿"].ToString().Replace(sYear + sPeriod + sDay, ""));
+ count = ClsPub.isLong(ds.Tables[0].Rows[0]["鎵瑰彿"].ToString().Replace(sYear + sPeriod + sDay + " ", ""));
}
LIU += count + 1;
while (LIU.Length < LEN) //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
@@ -978,7 +979,7 @@
}
//鎷兼帴鎵瑰彿
- HBatchNo = sYear + sPeriod + sDay + LIU;
+ HBatchNo = sYear + sPeriod + sDay + " " + LIU;
}
diff --git a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
index fa2e4b8..c9a3aa8 100644
--- a/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -90,9 +90,6 @@
}
}
-
-
-
#region 涓嶈壇鍘熷洜瀹℃牳銆佸弽瀹℃牳
/// <summary>
///
@@ -271,6 +268,197 @@
//==================================================================================
+
+ 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;
+ }
+ }
+
+ [Route("Gy_BadReason/AuditGy_BadReason_BT")]
+ [HttpGet]
+ public object AuditGy_BadReason_BT(string HNumber, int IsAudit, string CurUserName, string HOrgID)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_BadReason_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_BadReason where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'", "Gy_BadReason");
+ 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) //瀹℃牳鍒ゆ柇
+ {
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_BadReason_BeforeCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_BadReason_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;
+ }
+ //==================================================================================
+
+
+ oCN.RunProc("update Gy_BadReason set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+
+ //瀹℃牳鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_BadReason_AfterCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_BadReason_AfterCheckCtrl");
+ 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;
+ }
+ //==================================================================================
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+
+
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ string sql1 = "exec h_p_Gy_BadReason_BeforeUnCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_BadReason_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;
+ }
+ //==================================================================================
+
+
+ oCN.RunProc("update Gy_BadReason set HCheckEmp='',HCheckTime=null where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+
+ //鍙嶅鏍稿悗鎺у埗=========================================
+ string sql2 = "exec h_p_Gy_BadReason_AfterUnCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_BadReason_AfterCheckCtrl");
+ 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;
+ }
+ //==================================================================================
+
+
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -744,6 +932,191 @@
}
+ [Route("Gy_BadReason/AuditGy_BadResult_BT")]
+ [HttpGet]
+ public object AuditGy_BadResult_BT(string HNumber, int IsAudit, string CurUserName, string HOrgID)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_BadResult_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_BadResult where HNumber='"+ HNumber + "' and HUSEORGID='"+ HOrgID + "'", "Gy_BadResult");
+ 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) //瀹℃牳鍒ゆ柇
+ {
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_BadResult_BeforeCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_BadResult_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;
+ }
+ //==================================================================================
+
+
+ oCN.RunProc("update Gy_BadResult set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+ //瀹℃牳鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_BadResult_AfterCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_BadResult_AfterCheckCtrl");
+ 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;
+ }
+ //==================================================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ string sql1 = "exec h_p_Gy_BadResult_BeforeUnCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_BadResult_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;
+ }
+ //==================================================================================
+
+
+ oCN.RunProc("update Gy_BadResult set HCheckEmp='',HCheckTime=null where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+
+ //鍙嶅鏍稿悗鎺у埗=========================================
+ string sql2 = "exec h_p_Gy_BadResult_AfterUnCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_BadResult_AfterCheckCtrl");
+ 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;
+ }
+ //==================================================================================
+
+ 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;
+ }
+ }
/// <summary>
/// 涓嶈壇鍚庢灉绂佺敤銆佸弽绂佺敤
@@ -1172,6 +1545,181 @@
}
}
+ [Route("Gy_BadReason/AuditGy_InspectValue_BT")]
+ [HttpGet]
+ public object AuditGy_InspectValue_BT(string HNumber, int IsAudit, string CurUserName, string HOrgID)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_InspectValue_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_InspectValue where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'", "Gy_InspectValue");
+ 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_InspectValue_BeforeCheckCtrl " + HNumber + ",'" + CurUserName + "'", "h_p_Gy_InspectValue_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_InspectValue set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+
+ //瀹℃牳鍚庢帶鍒�=========================================
+ DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_InspectValue_AfterCheckCtrl " + HNumber + ",'" + CurUserName + "'", "h_p_Gy_InspectValue_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_InspectValue_BeforeUnCheckCtrl " + HNumber + ",'" + CurUserName + "'", "h_p_Gy_InspectValue_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_InspectValue set HCheckEmp='',HCheckTime=null where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+ //鍙嶅鏍稿悗鎺у埗=========================================
+ DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_InspectValue_AfterUnCheckCtrl " + HNumber + ",'" + CurUserName + "'", "h_p_Gy_InspectValue_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;
+ }
+ }
+
/// <summary>
@@ -1502,6 +2050,92 @@
}
}
+ /// <returns></returns>
+ [Route("Gy_BadReason/AuditGy_InspectMethod_BT")]
+ [HttpGet]
+ public object AuditGy_InspectMethod_BT(string HNumber, int IsAudit, string CurUserName, string HOrgID)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_InspectMethod_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_InspectMethod where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'", "Gy_InspectMethod");
+ 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) //瀹℃牳鍒ゆ柇
+ {
+ oCN.RunProc("update Gy_InspectMethod set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ oCN.RunProc("update Gy_InspectMethod set HCheckEmp='',HCheckTime=null where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+ 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;
+ }
+ }
/// <summary>
@@ -1945,6 +2579,92 @@
}
}
+ [Route("Gy_BadReason/AuditGy_QualityStd_BT")]
+ [HttpGet]
+ public object AuditGy_QualityStd_BT(string HNumber, int IsAudit, string CurUserName,string HOrgID)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_QualityStd_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_QualityStd where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'", "Gy_QualityStd");
+ 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) //瀹℃牳鍒ゆ柇
+ {
+ oCN.RunProc("update Gy_QualityStd set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ oCN.RunProc("update Gy_QualityStd set HCheckEmp='',HCheckTime=null where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+ 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;
+ }
+ }
+
/// <summary>
@@ -2067,9 +2787,9 @@
return objJsonResult;
}
- string sql1 = "select * from h_v_gy_BadTypeList where 1 = 1";
+ string sql1 = "select * from h_v_Gy_BadTypeList where 1 = 1";
string sql = sql1 + sWhere + " order by 涓嶈壇绫诲瀷浠ｇ爜 ";
- ds = oCN.RunProcReturn(sql, "h_v_gy_BadTypeList");
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_BadTypeList");
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
@@ -2288,6 +3008,194 @@
return objJsonResult;
}
}
+
+
+ [Route("Gy_BadReason/AuditGy_BadType_BT")]
+ [HttpGet]
+ public object AuditGy_BadType_BT(string HNumber, int IsAudit, string CurUserName,string HOrgID)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_BadType_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_BadType where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'", "Gy_BadType");
+ 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) //瀹℃牳鍒ゆ柇
+ {
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_BadType_BeforeCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_BadType_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;
+ }
+ //==================================================================================
+
+
+ oCN.RunProc("update Gy_BadType set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+ //瀹℃牳鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_BadType_AfterCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_BadType_AfterCheckCtrl");
+ 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;
+ }
+ //==================================================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ string sql1 = "exec h_p_Gy_BadType_BeforeUnCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_BadType_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;
+ }
+ //==================================================================================
+
+
+ oCN.RunProc("update Gy_BadType set HCheckEmp='',HCheckTime=null where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+
+ //鍙嶅鏍稿悗鎺у埗=========================================
+ string sql2 = "exec h_p_Gy_BadType_AfterUnCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_BadType_AfterCheckCtrl");
+ 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;
+ }
+ //==================================================================================
+
+
+ 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;
+ }
+ }
+
/// <summary>
/// 涓嶈壇绫诲瀷 绂佺敤銆佸弽绂佺敤
@@ -2717,6 +3625,181 @@
}
}
+ [Route("Gy_BadReason/AuditGy_InspectInstruMent_BT")]
+ [HttpGet]
+ public object AuditGy_InspectInstruMent_BT(string HNumber, int IsAudit, string CurUserName, string HOrgID)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_InspectInstruMent_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_InspectInstruMent where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'", "Gy_InspectInstruMent");
+ 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_InspectInstruMent_BeforeCheckCtrl " + HNumber + ",'" + CurUserName + "'", "h_p_Gy_InspectInstruMent_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_InspectInstruMent set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+ //瀹℃牳鍚庢帶鍒�=========================================
+ DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_InspectInstruMent_AfterCheckCtrl " + HNumber + ",'" + CurUserName + "'", "h_p_Gy_InspectInstruMent_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_InspectInstruMent_BeforeUnCheckCtrl " + HNumber + ",'" + CurUserName + "'", "h_p_Gy_InspectInstruMent_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_InspectInstruMent set HCheckEmp='',HCheckTime=null where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+ //鍙嶅鏍稿悗鎺у埗=========================================
+ DataSet ds2 = oCN.RunProcReturn("Exec h_p_Gy_InspectInstruMent_AfterUnCheckCtrl " + HNumber + ",'" + CurUserName + "'", "h_p_Gy_InspectInstruMent_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;
+ }
+ }
+
+
/// <summary>
@@ -3026,6 +4109,92 @@
if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
{
oCN.RunProc("update Gy_InspectBasis set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
+
+ 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;
+ }
+ }
+
+ [Route("Gy_BadReason/AuditGy_InspectBasis_BT")]
+ [HttpGet]
+ public object AuditGy_InspectBasis_BT(string HNumber, int IsAudit, string CurUserName, string HOrgID)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_InspectBasis_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_InspectBasis where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'", "Gy_InspectBasis");
+ 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) //瀹℃牳鍒ゆ柇
+ {
+ oCN.RunProc("update Gy_InspectBasis set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ oCN.RunProc("update Gy_InspectBasis set HCheckEmp='',HCheckTime=null where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -8510,6 +9679,195 @@
}
}
+ [Route("Gy_BadReason/AuditGy_BadPhenomena_BT")]
+ [HttpGet]
+ public object AuditGy_BadPhenomena_BT(string HNumber, int IsAudit, string CurUserName,string HOrgID)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_BadPhenomena_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_BadPhenomena where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'", "Gy_BadPhenomena");
+ 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) //瀹℃牳鍒ゆ柇
+ {
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_BadPhenomena_BeforeCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_BadPhenomena_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;
+ }
+ //==================================================================================
+
+
+ oCN.RunProc("update Gy_BadPhenomena set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+
+ //瀹℃牳鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_BadPhenomena_AfterCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_BadPhenomena_AfterCheckCtrl");
+ 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;
+ }
+ //==================================================================================
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ string sql1 = "exec h_p_Gy_BadPhenomena_BeforeUnCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_BadPhenomena_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;
+ }
+ //==================================================================================
+
+
+
+ oCN.RunProc("update Gy_BadPhenomena set HCheckEmp='',HCheckTime=null where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+
+ //鍙嶅鏍稿悗鎺у埗=========================================
+ string sql2 = "exec h_p_Gy_BadPhenomena_AfterUnCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_BadPhenomena_AfterCheckCtrl");
+ 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;
+ }
+ //==================================================================================
+
+
+ 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;
+ }
+ }
/// <summary>
@@ -10780,9 +12138,9 @@
}
#endregion
- #region 鐜妫�娴嬪崟 鏌ヨ,瀹℃牳锛屽弽瀹℃牳锛岀鐢紝鍙嶇鐢�
+ #region 鐜妫�娴嬮」鐩� 鏌ヨ,瀹℃牳锛屽弽瀹℃牳锛岀鐢紝鍙嶇鐢�
/// <summary>
- /// 鐜妫�娴嬪崟 鏌ヨ
+ /// 鐜妫�娴嬮」鐩� 鏌ヨ
/// </summary>
/// <param name="sWhere"></param>
/// <param name="user"></param>
@@ -10805,7 +12163,7 @@
}
string sql1 = "select * from h_v_Gy_EnvironmentTestItem where 1 = 1";
- string sql = sql1 + sWhere + " order by 妫�娴嬩唬鐮� ";
+ string sql = sql1 + sWhere + " order by 鐜妫�娴嬮」鐩唬鐮� ";
ds = oCN.RunProcReturn(sql, "h_v_Gy_EnvironmentTestItem");
//娣诲姞鍒楀悕
@@ -10833,8 +12191,8 @@
}
}
- /// <summary>
- /// 鐜妫�娴嬪崟瀹℃牳銆佸弽瀹℃牳
+ /// <summary>
+ /// 鐜妫�娴嬮」鐩� 瀹℃牳銆佸弽瀹℃牳
/// </summary>
/// <param name="HInterID">鍗曟嵁ID</param>
/// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
@@ -11027,10 +12385,197 @@
}
}
+ [Route("Gy_BadReason/AuditGy_EnvironmentTestItem_BT")]
+ [HttpGet]
+ public object AuditGy_EnvironmentTestItem_BT(string HNumber, int IsAudit, string CurUserName,string HOrgID)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_EnvironmentTestItem_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_EnvironmentTestItem where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'", "Gy_EnvironmentTestItem");
+ 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) //瀹℃牳鍒ゆ柇
+ {
+
+ //瀹℃牳鍓嶆帶鍒�=========================================
+ string sql1 = "exec h_p_Gy_EnvironmentTestItem_BeforeCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_EnvironmentTestItem_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;
+ }
+ //==================================================================================
+
+
+ oCN.RunProc("update Gy_EnvironmentTestItem set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+
+ //瀹℃牳鍚庢帶鍒�=========================================
+ string sql2 = "exec h_p_Gy_EnvironmentTestItem_AfterCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_EnvironmentTestItem_AfterCheckCtrl");
+ 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;
+ }
+ //==================================================================================
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ //鍙嶅鏍稿墠鎺у埗=========================================
+ string sql1 = "exec h_p_Gy_EnvironmentTestItem_BeforeUnCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql1, "h_p_Gy_EnvironmentTestItem_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;
+ }
+ //==================================================================================
+
+
+ oCN.RunProc("update Gy_EnvironmentTestItem set HCheckEmp='',HCheckTime=null where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+
+ //鍙嶅鏍稿悗鎺у埗=========================================
+ string sql2 = "exec h_p_Gy_EnvironmentTestItem_AfterUnCheckCtrl " + HNumber + ",'" + CurUserName + "'";
+ ds = oCN.RunProcReturn(sql2, "h_p_Gy_EnvironmentTestItem_AfterCheckCtrl");
+ 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;
+ }
+ //==================================================================================
+
+ 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;
+ }
+ }
+
/// <summary>
- /// 鐜妫�娴嬪崟绂佺敤銆佸弽绂佺敤
+ /// 鐜妫�娴嬮」鐩� 绂佺敤銆佸弽绂佺敤
/// </summary>
/// <param name="HInterID">鍗曟嵁ID</param>
/// <param name="IsStop">绂佺敤(0),鍙嶇鐢�(1)</param>
diff --git a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
index 434a27f..4224555 100644
--- a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
@@ -428,6 +428,17 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ ds = oCN.RunProcReturn("Select HItemID from Gy_Employee Where HItemID<>" + HItemID + " and HNumber='" + HNumber + "' and HUSEORGID=" + HUSEORGID, "Gy_Warehouse");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
if (HItemID == 0)
@@ -450,7 +461,7 @@
",HEmpType,HPayType,HOverType,HNoBrushFlag,HShiftFlag,HStopwagesFlag" +
",HPostalCode,HBank,HBasePay,HExamLevPostMoney,HBSTDeptID" +
",HOtherDeduct3,HInsurance,HMedicare,HDrydock" +
- ",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HUSEORGID,HAddress" +
+ ",HBankAccount,HGroupID,HDeptID,HWorkTypeID,HCTPrjID,HUSEORGID,HAddress,HMakeEmp" +
") " +
" Values('" + HNumber + "','" + HName + "','" + HShortNumber + "','" + HEmpRate.ToString() + "','" + HExamRate.ToString() +
"','" + HLevel + "','" + HParentID + "','" + Convert.ToString(HEndFlag ? 1 : 0) + "','" + HHighestPay.ToString() + "','" + HOverPayRate.ToString() +
@@ -468,15 +479,29 @@
"','" + HEmpType + "'" + ",'" + HPayType + "'" + ",'" + DBUtility.ClsPub.BoolToString(HOverType) + "','" + DBUtility.ClsPub.BoolToString(HNoBrushFlag) + "','" + DBUtility.ClsPub.BoolToString(HShiftFlag) + "','" + DBUtility.ClsPub.BoolToString(HStopwagesFlag) +
"','" + HPostalCode + "','" + HBank + "','" + HBasePay.ToString() + "','" + HExamLevPostMoney.ToString() + "','" + HBSTDeptID + "'" +
",'" + HOtherDeduct3.ToString() + "','" + HInsurance.ToString() + "','" + HMedicare.ToString() + "','" + HDrydock.ToString() +
- "','" + HBankAccount + "'" + ",'" + HGroupID.ToString() + "','" + HDeptID.ToString() + "','" + HWorkTypeID.ToString() + "','" + HCTPrjID.ToString() + "','" + HUSEORGID + "','" + HAddress + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ "','" + HBankAccount + "'" + ",'" + HGroupID.ToString() + "','" + HDeptID.ToString() + "','" + HWorkTypeID.ToString() + "','" + HCTPrjID.ToString() + "','" + HUSEORGID + "','" + HAddress + "','"+ msg3 + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Employee set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
}
else
{
+
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_Employee where HItemID=" + HItemID, "Gy_Employee");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.RunProc("Update Gy_Employee set " +
" HNumber='" + HNumber + "'" +
",HName='" + HName + "'" +
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index caeec5c..161a2af 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -583,6 +583,18 @@
}
else
{
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_Material where HItemID=" + oBill.oModel.HItemID, "Gy_Material");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
bResult = oBill.ModifyByID(oBill.oModel.HItemID);
}
if (bResult)
diff --git a/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs b/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
index c7ebf85..63a59f7 100644
--- a/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
@@ -253,6 +253,17 @@
// objJsonResult.data = null;
// return objJsonResult;
//}
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ ds = oCN.RunProcReturn("Select HItemID from Xt_ORGANIZATIONS Where HItemID<>" + HItemID + " and HNumber='" + HNumber.Trim()+"'", "Xt_ORGANIZATIONS");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
if (AddOrEdit == "1")
@@ -261,10 +272,10 @@
oCN.RunProc("Insert into Xt_ORGANIZATIONS " +
" (HNumber,HName,HParentID" +
",HStopflag,HMakeTime,HItemID" +
- ",HRemark) " +
+ ",HRemark,HMakeEmp) " +
" Values('" + HNumber + "','" + HName + "','" + HParentID.ToString() +
"','" + ChangeHStopflag + "'," + "getdate()" + ",'" + HItemID + "'" +
- ",'" + HRemark + "')", ref DBUtility.ClsPub.sExeReturnInfo);
+ ",'" + HRemark + "','"+ msg3 + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Xt_ORGANIZATIONS set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -272,6 +283,19 @@
}
else if(AddOrEdit == "3")
{
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HItemID=" + HItemID, "Xt_ORGANIZATIONS");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
int Stopflag;
if (HStopflag)
{
@@ -287,7 +311,9 @@
" HNumber='" + HNumber + "'" +
",HName='" + HName + "'" +
",HParentID='" + HParentID + "'" +
- ",HMakeTime='" + HMakeTime + "'" +
+ //",HMakeTime='" + HMakeTime + "'" +
+ ",HModifyEmp='" + msg3 + "'" +
+ ",HModifyTime=getdate()" +
",HStopflag='" + Stopflag + "'" +
",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.RunProc("Update Xt_ORGANIZATIONS set HStopflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
@@ -413,6 +439,195 @@
}
}
+ #region 缁勭粐瀹℃牳銆佸弽瀹℃牳
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Xt_ORGANIZATIONS/AuditXt_ORGANIZATIONS")]
+ [HttpGet]
+ public object AuditXt_ORGANIZATIONS(int HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Xt_ORGANIZATIONS_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HItemID=" + HInterID, "Xt_ORGANIZATIONS");
+ 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) //瀹℃牳鍒ゆ柇
+ {
+ oCN.RunProc("update Xt_ORGANIZATIONS set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ oCN.RunProc("update Xt_ORGANIZATIONS set HCheckEmp='',HCheckTime=null where HItemID=" + HInterID);
+
+ 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("Xt_ORGANIZATIONS/StopXt_ORGANIZATIONS")]
+ [HttpGet]
+ public object StopXt_ORGANIZATIONS(int HInterID, int IsStop, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Xt_ORGANIZATIONS_Stop", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绂佺敤澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HItemID=" + HInterID, "Xt_ORGANIZATIONS");
+ 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) //绂佺敤鍒ゆ柇
+ {
+ oCN.RunProc("update Xt_ORGANIZATIONS set HStopEmp='" + CurUserName + "',HStopTime=getdate(),HStopflag=1 where HItemID=" + HInterID);
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "绂佺敤鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsStop == 1) //鍙嶇鐢ㄥ垽鏂�
+ {
+ oCN.RunProc("update Xt_ORGANIZATIONS set HStopEmp='',HStopTime=null,HStopflag=0 where HItemID=" + HInterID);
+
+ 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/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index d8103d3..d8ef724 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -536,7 +536,7 @@
foreach (Gy_RoutingBillSub oSub in DetailColl)
{
i++;
- if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤" && oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧" && oSystemParameter.omodel.WMS_CampanyName != "瀹濆伐")
+ if (oSystemParameter.omodel.WMS_CampanyName != "榫欏北姹介厤" && oSystemParameter.omodel.WMS_CampanyName != "娣诲悍绉戞妧" && oSystemParameter.omodel.WMS_CampanyName != "瀹濆伐" && oSystemParameter.omodel.WMS_CampanyName != "涓夊崌")
{
if (oSub.HWorkQty <= 0)
{
@@ -1822,7 +1822,7 @@
{
for(int i=0;i< dsMain.Tables[0].Rows.Count; i++)
{
- string HMaterNumber = DBUtility.ClsPub.isStrNull(dsMain.Tables[0].Rows[0]["浜у搧浠ｇ爜"]);
+ string HMaterNumber = DBUtility.ClsPub.isStrNull(dsMain.Tables[0].Rows[i]["浜у搧浠ｇ爜"]);
if (!oMaterHlp.GetInfoByNumber(HMaterNumber))
{
string sMsg = "鐗╂枡銆�" + HMaterNumber + "銆戜笉瀛樺湪锛�";
@@ -1910,14 +1910,14 @@
DataSet dsSub = oCN.RunProcReturn("select * from diyipi_WorkQty where 浜у搧浠ｇ爜 = '" + HMaterNumber + "' order by 宸ュ簭搴忓彿", "diyipi_WorkQty");
for(int j = 0; j < dsSub.Tables[0].Rows.Count; j++)
{
- string HProcNumber = DBUtility.ClsPub.isStrNull(dsSub.Tables[0].Rows[j]["宸ュ簭浠ｇ爜"]);
+ string HProcName = DBUtility.ClsPub.isStrNull(dsSub.Tables[0].Rows[j]["宸ュ簭"]);
//寰楀埌宸ュ簭鍐呯爜
- if (!oProcHlp.GetInfoByNumber(HProcNumber))
+ if (!oProcHlp.GetInfoByName(HProcName))
{
- string sMsg = "宸ュ簭銆�" + HProcNumber + "銆戜笉瀛樺湪锛�";
+ string sMsg = "宸ュ簭銆�" + HProcName + "銆戜笉瀛樺湪锛�";
if (finalErrMsg.Contains(sMsg) == false)
{
- finalErrMsg = finalErrMsg + "宸ュ簭銆�" + HProcNumber + "銆戜笉瀛樺湪锛乗r\n";
+ finalErrMsg = finalErrMsg + "宸ュ簭銆�" + HProcName + "銆戜笉瀛樺湪锛乗r\n";
}
continue;
}
@@ -1948,10 +1948,10 @@
//寰楀埌鐢熶骇璧勬簮鍐呯爜
if (!oSourceHlp.GetInfoByNumber(sHNumberSourceList[t]))
{
- string sMsg = "鐢熶骇璧勬簮銆�" + HProcNumber + "銆戜笉瀛樺湪锛�";
+ string sMsg = "鐢熶骇璧勬簮銆�" + sHNumberSourceList[t] + "銆戜笉瀛樺湪锛�";
if (finalErrMsg.Contains(sMsg) == false)
{
- finalErrMsg = finalErrMsg + "鐢熶骇璧勬簮銆�" + HProcNumber + "銆戜笉瀛樺湪锛乗r\n";
+ finalErrMsg = finalErrMsg + "鐢熶骇璧勬簮銆�" + sHNumberSourceList[t] + "銆戜笉瀛樺湪锛乗r\n";
}
continue;
}
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
index 8941308..4cda8d2 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
@@ -691,8 +691,7 @@
DBUtility.ClsPub.CurUserName = oItem.HMaker; //鍒跺崟浜�
oItem.HBillType = "3901";
oItem.HBillSubType = "3901";
-
- //oItem.HInterID =0;
+
//oItem.HBillNo = "";
oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
diff --git a/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs
index bfe1069..bd5c944 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs
@@ -697,6 +697,15 @@
{
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ if(!bResult)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
}
ds = oCN.RunProcReturn("select * from Sc_MESEndWorkBillMain where HBillNo='" + oBill.omodel.HBillNo + "'", "Sc_MESEndWorkBillMain");
diff --git a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
index 0e564eb..2e51ec0 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -7534,6 +7534,22 @@
concatenatedNames = string.Join(",", HNames);
HDescription = HDescription + "--宸插鐞�";
}
+ else if (HHandleEmpID == 4)//鎶ュ伐鍙� 寮傚父楠屾敹 椹冲洖鎸夐挳 灏嗘秷鎭� 鍙戦�佺粰 鍙戦�佷汉锛屾帴鏀朵汉
+ {
+ //鑾峰彇鍙戦�佷汉 鎺ユ敹浜�
+ string HReceiveMan = HCopyMan;
+ string sql1 = "select HDingDingUserID 閽夐拤id from Gy_Czygl where Czymc in ('" + HSendMan + "','" + HReceiveMan + "')";
+ ds = oCN.RunProcReturn(sql1, "Gy_Czygl");
+ List<string> HNames = new List<string>();
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ string HName = ds.Tables[0].Rows[i]["閽夐拤id"].ToString();
+ HNames.Add(HName);
+
+ }
+ concatenatedNames = string.Join(",", HNames);
+ HDescription = HDescription + "--'"+ HSendMan + "'宸查┏鍥炴湰娆″鐞嗭紝璇�'"+ HReceiveMan + "'閲嶆柊澶勭悊";
+ }
else
{
//鏌ヨ鎸囨淳澶勭悊浜�
@@ -7642,7 +7658,14 @@
string sql = "select a.HSourceBillNo 娴佽浆鍗″彿,a.HSourceBillType 娴佽浆鍗＄被鍨�,a.HSourceInterID 娴佽浆鍗′富鍐呯爜,a.HSourceEntryID 娴佽浆鍗″瓙鍐呯爜,b.HNumber 鐗╂枡浠ｇ爜,b.HName 鐗╂枡鍚嶇О,b.HModel 瑙勬牸鍨嬪彿,a.HDatePlanQty 璁″垝鏁伴噺,a.HSourceID,c.HName 鐢熶骇璧勬簮 from Sc_ICMOBillStatus_Tmp a " +
"left join Gy_Material b on a.HMaterID=b.HItemID left join Gy_Source c on a.HSourceID=c.HItemID where HSourceBillNo='" + HSourceBill + "' and a.HICMOStatus=1";
ds = oCN.RunProcReturn(sql, "Sc_ICMOBillStatus_Tmp");
-
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲搴旀纭姸鎬佸伐鍗曚俊鎭�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//娣诲姞鍒楀悕
foreach (DataColumn col in ds.Tables[0].Columns)
{
@@ -7917,5 +7940,38 @@
}
}
#endregion
+
+ #region 鎶ュ伐鍙� 寮傚父楠屾敹 椹冲洖澶勭悊鍗曞姛鑳�
+ [Route("Sc_MESTransFerWorkBill/BHOA_ErrMsgBackHandleBillDismiss")]
+ [HttpGet]
+ public object BHOA_ErrMsgBackHandleBillDismiss(string HInterID, string user)
+ {
+ try
+ {
+ string sql = "select HErrMsgBackInterID,HErrMsgBackEntryID,HSendMan,HDescription,HReceiveMan from OA_ErrMsgBackHandleBillMain where HInterID=" + HInterID;
+ //鏇存柊寮傚父鍙嶉澶勭悊鍗曚綔搴�
+ oCN.RunProc("update OA_ErrMsgBackHandleBillMain set HBillStatus=4, HDeleteDate=GETDATE(),HDeleteMan='" + user + "' where HInterID="+ HInterID);
+ DataSet dt = oCN.RunProcReturn(sql, "OA_ErrMsgBackHandleBillMain");
+
+ //鍙嶉澶勭悊鍗曚繚瀛樺悗,鏇存柊寮傚父鍙嶉鍗曠殑鐘舵��
+ string sql1 = "update OA_ErrMsgBackBillMain set HBillStatus='9' where HInterID='" + dt.Tables[0].Rows[0]["HErrMsgBackInterID"].ToString() + "' ";
+ oCN.RunProc(sql1);
+ _ = SendDingDingAsync(dt.Tables[0].Rows[0]["HSendMan"].ToString(), 4, dt.Tables[0].Rows[0]["HDescription"].ToString(), dt.Tables[0].Rows[0]["HReceiveMan"].ToString());
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ 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 3b363f1..f7543e4 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"
@@ -518,7 +518,7 @@
for (int j = 0; j < SumDay; j++)
{
//涓昏〃瀛愯〃閮芥湁鏁版嵁
- if (list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString() != "")
+ if (list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString() != ""&& Math.Round(double.Parse(list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString()),1)>0)
{
SumCount += 1;
////淇濆瓨瀛愯〃
diff --git "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
index e14a89d..aae6b3d 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/JIT_DayPlanPlatFormImportController.cs"
@@ -504,7 +504,7 @@
}
#endregion
- #region 鐢熶骇鏃ヨ鍒�(涓夊崌瀵煎叆) 鏂囦欢涓婁紶
+ #region 鐢熶骇鏃ヨ鍒掍氦鏈�(涓夊崌瀵煎叆) 鏂囦欢涓婁紶
[Route("JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_SS")]
[HttpPost]
public object JIT_DayPlanPlatFormImport_SS()
@@ -633,7 +633,7 @@
}
#endregion
- #region 鐢熶骇鏃ヨ鍒掍笁鍗� 瀵煎叆(淇濆瓨)
+ #region 鐢熶骇鏃ヨ鍒掍笁鍗囦氦鏈� 瀵煎叆(淇濆瓨)
[Route("JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_btnSave_SS")]
[HttpPost]
public object JIT_DayPlanPlatFormImport_btnSave_SS([FromBody] JObject sMainSub)
@@ -759,8 +759,11 @@
{
var hmainid = list[i]["hmainid"].ToString();
var HPlanEndDate = list[i]["璁″垝缁撴潫鏃ユ湡"].ToString();
- //涓昏〃
- oCN.RunProc($"update Sc_WorkBillSortBillMain set HPlanEndDate = '{HPlanEndDate}' where HInterID ={hmainid}" );
+ //鏇存柊浜ゆ湡
+ if (HPlanEndDate != "" )
+ {
+ oCN.RunProc($"update Sc_WorkBillSortBillMain set HPlanEndDate = '{HPlanEndDate}' where HInterID ={hmainid}");
+ }
}
}
@@ -784,5 +787,404 @@
}
#endregion
+ #region 鐢熶骇鏃ヨ鍒�(涓夊崌瀵煎叆) 鏂囦欢涓婁紶
+ [Route("JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_SS_Sec")]
+ [HttpPost]
+ public object JIT_DayPlanPlatFormImport_SS_Sec()
+ {
+ 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("hmainid", typeof(Int32));//璁″垝鍗昳d
+ tb2.Columns.Add("HMaterID", typeof(Int32));
+ tb2.Columns.Add("HSourceID", typeof(Int32));//鐢熶骇璧勬簮
+ tb2.Columns.Add("ICMOBillHInterID", typeof(Int32));
+ tb2.Columns.Add("ICMOBillHEntryID", typeof(Int32));
+ //鑾峰彇绯荤粺鍙傛暟
+ string Ret = "";
+ oSystemParameter.ShowBill(ref Ret);
+
+ LogService.Write("excel鍊硷細" + ExcelDs.Tables[0].Rows[1][5].ToString());//2024-11-26
+ //娣诲姞鏁版嵁
+ 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
+ if (ExcelDs.Tables[0].Rows[i][0].ToString() == "" && ExcelDs.Tables[0].Rows[i][1].ToString() == "")
+ {
+ continue;
+ }
+
+ else
+ {
+ tb2.Rows.Add(row);
+ }
+ }
+
+ var error = "";
+ var ErrorResult = "";
+
+ //鏌ヨ鐢熶骇璁㈠崟琛ㄥ垽鏂湁娌℃湁鐢熶骇璁㈠崟淇℃伅
+ for (int i = 0; i < tb2.Rows.Count; i++)
+ {
+ //if (tb2.Rows[i]["璁″垝缁撴潫鏃ユ湡"].ToString() == "")
+ // error += "璁″垝缁撴潫鏃ユ湡涓嶈兘涓虹┖;";
+ if (tb2.Rows[i]["瀹㈡埛璁㈠崟鍙�"].ToString() == "")
+ error += "瀹㈡埛璁㈠崟鍙蜂笉鑳戒负绌�;";
+ if (tb2.Rows[i]["鐗╂枡缂栫爜"].ToString() == "")
+ error += "鐗╂枡缂栫爜涓嶈兘涓虹┖;";
+
+ if (error.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ErrorResult += $"Excel妯℃澘瀛樺湪閿欒锛岃鏁皗i + 1}:{error}\r\n"; ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //璁剧疆瀵瑰簲鐢熶骇璧勬簮
+ if (tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜"].ToString() != "")
+ {
+ //鐢熶骇璧勬簮
+ ds = oCN.RunProcReturn($"select * from Gy_Source with(nolock) where HNumber='{tb2.Rows[i]["鐢熶骇璧勬簮缂栫爜*"].ToString()}'", "Gy_Source");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ tb2.Rows[i]["HSourceID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"绗瑊i + 1}琛�,鐢熶骇璧勬簮鏌ユ棤鏁版嵁!";
+ objJsonResult.data = tb2;
+ return objJsonResult;
+ }
+ }
+
+ //鏌ユ壘鏄惁瀛樺湪瀵瑰簲鐢熶骇璁㈠崟
+ string sql1 = string.Format("select * from h_v_IF_ICMOBillList where 瀹㈡埛璁㈠崟鍙�='{0}' and 浜у搧浠ｇ爜='{1}' and 鐘舵�� in ('璁″垝纭','寮�宸�')",
+ tb2.Rows[i]["瀹㈡埛璁㈠崟鍙�"].ToString(), tb2.Rows[i]["鐗╂枡缂栫爜"].ToString());
+ ds = oCN.RunProcReturn(sql1, "h_v_IF_ICMOBillList");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ error += $"娌℃湁绗﹀悎鏉′欢寰楃敓浜ц鍗曚俊鎭紝瀹㈡埛璁㈠崟鍙�:{ tb2.Rows[i]["瀹㈡埛璁㈠崟鍙�"].ToString()},浜у搧浠ｇ爜:{tb2.Rows[i]["鐗╂枡缂栫爜"].ToString()}";
+ }
+
+ if (error.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = ErrorResult += $"Excel妯℃澘瀛樺湪閿欒锛岃鏁皗i + 1}:{error}\r\n"; ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HMaterID"] = ds.Tables[0].Rows[0]["HMaterID"].ToString();
+ tb2.Rows[i]["ICMOBillHInterID"] = ds.Tables[0].Rows[0]["hmainid"].ToString();//鐢熶骇璁㈠崟涓籭d
+ tb2.Rows[i]["ICMOBillHEntryID"] = ds.Tables[0].Rows[0]["HEntryID"].ToString();//鐢熶骇璁㈠崟瀛恑d
+ }
+ //鏌ユ壘鏄惁瀛樺湪瀵瑰簲鏃ヨ鍒掑伐鍗�
+ var dt = oCN.RunProcReturn($"select * from h_v_JIT_Sc_WorkBillSortBillList where 婧愬崟涓诲唴鐮� in({ds.Tables[0].Rows[0]["hmainid"].ToString()}) and 婧愬崟瀛愬唴鐮� in({ds.Tables[0].Rows[0]["HEntryID"].ToString()})", "h_v_JIT_Sc_WorkBillSortBillList");
+ if (dt.Tables[0].Rows.Count > 0)
+ {
+ tb2.Rows[i]["hmainid"] = dt.Tables[0].Rows[0]["hmainid"].ToString();
+ }
+
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = ErrorResult;
+ 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("JIT_DayPlanPlatFormImport/JIT_DayPlanPlatFormImport_btnSave_SS_Sec")]
+ [HttpPost]
+ public object JIT_DayPlanPlatFormImport_btnSave_SS_Sec([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ oCN.BeginTran();
+ //淇濆瓨涓昏〃
+ objJsonResult = AddBillMain_SS_Sec(msg1);
+ if (objJsonResult.code == "0")
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = objJsonResult.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍗曟嵁淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ public json AddBillMain_SS_Sec(string msg1)
+ {
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string user = sArray[2].ToString();
+
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_WorkBillSortBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //琛ㄥご瀛楁
+ omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(msg2);
+
+ //JSON搴忓垪鍖栬浆鎹㈠瓧鍏搁泦鍚�
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+ List<object> jb = JsonConvert.DeserializeObject<List<object>>(msg3);
+ foreach (JObject item in jb)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+
+
+
+ for (int i = 0; i < list.Count; i++)
+ {
+ int TrueCount = 0, SumCount = 0;//璁℃暟鍣ㄥ垽鏂瓙琛ㄥ鍏ユ暟閲忓拰瀹為檯鏁伴噺鏄惁鏈夊嚭鍏�
+ long HInterID = 0;
+ var HBillNo = "";
+ if (list[i]["hmainid"].ToString() == "")
+ {
+ HBillNo = DBUtility.ClsPub.CreateBillCode_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);//鑾峰緱涓�涓柊鐨勫崟鎹彿
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//鑾峰緱涓�涓柊鐨刬d
+ var HMainSourceInterID = list[i]["ICMOBillHInterID"].ToString();
+ var HMainSourceEntryID = list[i]["ICMOBillHEntryID"].ToString();
+ //鑾峰彇瀵瑰簲璁㈠崟淇℃伅
+ ds = oCN.RunProcReturn($"exec h_p_ICMOBillList_PrimarySubTable '{HMainSourceInterID}','{HMainSourceEntryID}'", "h_p_ICMOBillList_PrimarySubTable");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = $"娌℃壘鍒板搴旂鍚堟潯浠跺緱璁㈠崟淇℃伅锛岃鏁皗i + 1}\r\n"; ;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ var HICMOBillNo = ds.Tables[0].Rows[0]["鐢熶骇璁㈠崟鍙�"].ToString();
+ var HICMOEntrySEQ = ds.Tables[0].Rows[0]["鐢熶骇璁㈠崟鏄庣粏琛屽彿"].ToString();
+ var HProdORGID = ds.Tables[0].Rows[0]["HProdORGID"].ToString();
+ var HWorkShopID = ds.Tables[0].Rows[0]["HWorkShopID"].ToString();
+ var HSourceID = (list[i]["HSourceID"].ToString() != "0" && list[i]["HSourceID"].ToString() != "") ? list[i]["HSourceID"].ToString() : ds.Tables[0].Rows[0]["HSourceID"].ToString();//鐢熶骇璧勬簮
+ var HWorkQty = DBUtility.ClsPub.isDoule((list[i]["灏忔椂浜ц兘"].ToString() != "0" && list[i]["灏忔椂浜ц兘"].ToString() != "") ? list[i]["灏忔椂浜ц兘"].ToString(): ds.Tables[0].Rows[0]["灏忔椂浜ц兘"].ToString());//灏忔椂浜ц兘
+ var HYX = (list[i]["浼樺厛绾�"].ToString()!="0" && list[i]["浼樺厛绾�"].ToString() != "")? list[i]["浼樺厛绾�"].ToString():(i+1).ToString();//璁剧疆浼樺厛绾�
+ var HEmpID = ds.Tables[0].Rows[0]["鎿嶄綔宸�"].ToString();
+ var HMaterID = ds.Tables[0].Rows[0]["HMaterID"].ToString();
+ var HMaterName = ds.Tables[0].Rows[0]["鐗╂枡鍚嶇О"].ToString();
+ var HMaterModel = ds.Tables[0].Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+ var HUnitID = ds.Tables[0].Rows[0]["HUnitID"].ToString();
+ var HBatchNo = "";//鎵规鍙�
+ var HSeOrderBillQty = ds.Tables[0].Rows[0]["閿�鍞鍗曟暟閲�"].ToString();
+ var HPlanQty = ds.Tables[0].Rows[0]["璁″垝鏁伴噺"].ToString();
+ var HCompleteQty = "";//鎬婚綈濂楁暟閲�
+ var HOrderType = omdelMian.HOrderType;
+ var HDate = omdelMian.HDate;
+ var HSeOrderBillNo = ds.Tables[0].Rows[0]["閿�鍞鍗曞彿"].ToString();
+ var HPlanEndDate = list[i]["璁″垝缁撴潫鏃ユ湡"].ToString() != "" ? list[i]["璁″垝缁撴潫鏃ユ湡"].ToString():ds.Tables[0].Rows[0]["璁″垝缁撴潫鏃ユ湡"].ToString();
+ var HLockOrder = 1;//閿佸畾宸ュ崟
+ //涓昏〃
+ oCN.RunProc("insert into Sc_WorkBillSortBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType," +
+ "HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HICMOBillNo,HOrderType," +
+ "HICMOEntrySEQ,HWorkShopID,HSourceID, HYX,HWorkQty, HEmpID," +
+ " HMaterID, HMaterName, HMaterModel, HUnitID, HBatchNo," +
+ " HSeOrderBillQty, HPlanQty, HCompleteQty,HPreparatDate," +
+ "HMainSourceInterID,HMainSourceEntryID,HICMOInterID,HICMOEntryID,HProdORGID,HICMOInterID_Sec,HICMOEntryID_Sec" +
+ ",HSeOrderBillNo,HPlanEndDate,HLockOrder)values" +
+ $"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
+ $"'{BillType}',GETDATE(),1,'{user}','{HDate}','{HICMOBillNo}','{HOrderType}'," +
+ $"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)},{(HWorkQty)}, {(HEmpID == "" ? 0.ToString() : HEmpID)}," +
+ $" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, '{HBatchNo}'," +
+ $" {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}, {(HPlanQty == "" ? 0.ToString() : HPlanQty)}, {(HCompleteQty == "" ? 0.ToString() : HCompleteQty)},getdate()," +
+ $" {HMainSourceInterID},{HMainSourceEntryID},{HMainSourceInterID},{HMainSourceEntryID},{HProdORGID}, {HMainSourceInterID},{HMainSourceEntryID}" +
+ $",'{HSeOrderBillNo}','{HPlanEndDate}',{HLockOrder})");
+ //鎻掑叆瀛愯〃鏁版嵁
+ objJsonResult = AddBillSub(HInterID.ToString(), HBillNo, DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0);
+ }//濡傛灉宸插瓨鍦ㄦ棩璁″垝宸ュ崟鏇存柊瀵瑰簲鐢熶骇璧勬簮灏忔椂浜ц兘
+ else
+ {
+ var hmainid = list[i]["hmainid"].ToString();
+ var HWorkQty = list[i]["灏忔椂浜ц兘"].ToString();
+ var HSourceID = list[i]["HSourceID"].ToString();
+ var HYX = list[i]["浼樺厛绾�"].ToString();
+ var HPlanEndDate = list[i]["璁″垝缁撴潫鏃ユ湡"].ToString();
+ //鏇存柊灏忔椂浜ц兘
+ if (HWorkQty != ""&& HWorkQty != "0")
+ {
+ oCN.RunProc($"update Sc_WorkBillSortBillMain set HWorkQty = '{HWorkQty}' where HInterID ={hmainid}");
+ }
+ //鏇存柊鐢熶骇璧勬簮
+ if (HSourceID != "" && HSourceID != "0")
+ {
+ oCN.RunProc($"update Sc_WorkBillSortBillMain set HSourceID = '{HSourceID}' where HInterID ={hmainid}");
+ }
+ //鏇存柊浼樺厛绾�
+ if (HYX != "" && HYX != "0")
+ {
+ oCN.RunProc($"update Sc_WorkBillSortBillMain set HYX = '{HYX}' where HInterID ={hmainid}");
+ }
+ //鏇存柊璁″垝缁撴潫鏃ユ湡
+ if (HPlanEndDate != "")
+ {
+ oCN.RunProc($"update Sc_WorkBillSortBillMain set HPlanEndDate = '{HPlanEndDate}' where HInterID ={hmainid}");
+ }
+
+ }
+ int SumDay = 31; //鍔ㄦ�佷袱鏈堜箣宸� DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;
+
+ // 缁熻鎬诲ぉ鏁�
+ HashSet<DateTime> uniqueDates = new HashSet<DateTime>();
+
+ foreach (var key in list[i].Keys)
+ {
+ if (DateTime.TryParseExact(key, "yyyy-M-d", CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime date))
+ {
+ uniqueDates.Add(date);
+ }
+ }
+
+ SumDay = uniqueDates.Count;
+
+ //娣诲姞瀛愯〃
+ for (int j = 0; j < SumDay; j++)
+ {
+ LogService.Write("1:" + list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString());
+ LogService.Write("2:" + DateTime.Now.AddDays(j).ToString("yyyy-MM-dd"));
+ //涓昏〃瀛愯〃閮芥湁鏁版嵁
+ if (list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString() != "")
+ {
+ SumCount += 1;
+ ////淇濆瓨瀛愯〃
+ objJsonResult = AddBillSub_SS(HInterID == 0 ? list[i]["hmainid"].ToString() : HInterID.ToString()
+ , DateTime.Parse(DateTime.Now.AddDays(j).ToString("yyyy-MM-dd").ToString())
+ , int.Parse(list[i][DateTime.Now.AddDays(j).ToString("yyyy-MM-dd")].ToString()));
+
+ if (objJsonResult.count == 1)
+ {
+ TrueCount += 1;
+ }
+ }
+ //涓昏〃鏈夋暟鎹� 瀛愯〃鏃犳暟鎹�
+ if (j == SumDay - 1 && SumCount == 0 && HInterID != 0 && HBillNo != "")
+ {
+ objJsonResult = AddBillSub_SS(HInterID.ToString(),DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd").ToString()), 0);
+ }
+ }
+
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //瀵煎叆瀛愯〃(涓夊崌)
+ public json AddBillSub_SS(string HInterID,DateTime date, int HQTY)
+ {
+ //鑾峰彇琛ㄦ牸鏁版嵁
+ ds = oCN.RunProcReturn($"select * from h_v_JIT_Sc_WorkBillSortBillList where hmainid='{HInterID}'", "h_v_JIT_Sc_WorkBillSortBillList");
+ int count = 0;
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ //鍒ゆ柇瀛愯〃鏄惁鏈夊綋鏃ョ殑鏃ユ湡浠ュ強鏃ユ湡鎵�瀵瑰簲鐨勬暟閲�
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ if (DateTime.Parse(ds.Tables[0].Rows[i]["鏃ヨ鍒掔敓浜ф棩鏈�"].ToString()) == date)
+ {
+ oCN.RunProc($"update Sc_WorkBillSortBillSub set HMasterDate='{date}',HQty={HQTY}" +
+ $" where HInterID={HInterID} and HEntryID={ds.Tables[0].Rows[i]["hsubid"].ToString()}");
+ count += 1;
+ }
+ }
+ }
+
+ if (count != 1)
+ {
+ //鎻掑叆瀛愯〃
+ oCN.RunProc("insert into Sc_WorkBillSortBillSub(HInterID,HSEQ," +
+ "HMasterDate,HQty)" +
+ $"values({HInterID}, {(ds.Tables[0].Rows.Count + 1)}," +
+ $" '{date}', {HQTY})");
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = null;
+ 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/Sc_JIT_ComplementGoodBillController.cs" "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs"
index 5630795..0eaaec0 100644
--- "a/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs"
+++ "b/WebAPI/Controllers/SCGL/\346\227\245\350\256\241\345\210\222\347\256\241\347\220\206/Sc_JIT_ComplementGoodBillController.cs"
@@ -1508,7 +1508,7 @@
string msg = "";
oSystemParameter.ShowBill(ref msg);
- if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐")
+ if (oSystemParameter.omodel.WMS_CampanyName == "瀹濆伐"|| oSystemParameter.omodel.WMS_CampanyName == "涓夊崌")
{
//JIT渚涜揣鎻愬墠鏈燂紙澶╋級
if (JISLT == "")
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index d49b1f7..88e08d2 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -2684,7 +2684,7 @@
}
//鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
- ds = oCN.RunProcReturn("select * from Gy_BadReason where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_BadReason");
+ ds = oCN.RunProcReturn("select * from Gy_BadReason where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID='" + oItem.HUSEORGID + "'", "Gy_BadReason");
if (oItem.HNumber.Trim() == "")
{
objJsonResult.code = "0";
@@ -2692,7 +2692,7 @@
objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷负绌猴紒";
objJsonResult.data = 1;
return objJsonResult;
- }
+ }
//鏂板鏃跺垽鏂�
if (oItem.HItemID == 0)
{
@@ -2704,7 +2704,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺浉鍚屼娇鐢ㄧ粍缁囦笅浠ｇ爜涓嶈兘閲嶅锛�";
objJsonResult.data = 1;
return objJsonResult;
}
@@ -2755,6 +2755,23 @@
return objJsonResult;
}
}
+ if (ds.Tables[0].Rows.Count > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺浉鍚屼娇鐢ㄧ粍缁囦笅浠ｇ爜涓嶈兘閲嶅锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ //宸插鏍哥殑涓嶅厑璁镐繚瀛�
+ if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜淇濆瓨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
}
//寰楀埌鐭唬鐮�
string sShortNumber;
@@ -2865,18 +2882,22 @@
objJsonResult.data = null;
return objJsonResult; ;
}
- //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
- //if (HStopflag)
- //{
- // oCN.RollBack();//鍥炴粴浜嬪姟
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
-
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鍒犻櫎鍓嶆帶鍒�=========================================
string sql1 = "exec h_p_Gy_BadReason_BeforeDelCtrl " + HItemID + ",'" + user + "'";
ds = oCN.RunProcReturn(sql1, "h_p_Gy_BadReason_BeforeDelCtrl");
@@ -3360,7 +3381,7 @@
}
//鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
- ds = oCN.RunProcReturn("select * from Gy_BadType where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_BadType");
+ ds = oCN.RunProcReturn("select * from Gy_BadType where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID= '" + oItem.HUSEORGID + "' ", "Gy_BadType");
if (oItem.HNumber.Trim() == "")
{
objJsonResult.code = "0";
@@ -3368,7 +3389,7 @@
objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮佷负绌猴紒";
objJsonResult.data = 1;
return objJsonResult;
- }
+ }
//鏂板鏃跺垽鏂�
if (oItem.HItemID == 0)
{
@@ -3380,7 +3401,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺浉鍚屼娇鐢ㄧ粍缁囦笅浠ｇ爜涓嶈兘閲嶅锛�";
objJsonResult.data = 1;
return objJsonResult;
}
@@ -3431,7 +3452,26 @@
return objJsonResult;
}
}
+ if (ds.Tables[0].Rows.Count > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺浉鍚屼娇鐢ㄧ粍缁囦笅浠ｇ爜涓嶈兘閲嶅锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
}
+
+ //宸插鏍哥殑涓嶅厑璁镐繚瀛�
+ if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜淇濆瓨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//寰楀埌鐭唬鐮�
string sShortNumber;
sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
@@ -3510,8 +3550,7 @@
[HttpGet]
public object DeltetGy_BadType(string HItemID, string user)
{
- DataSet ds;
- //string ModRightNameCheck = "Sc_ProcessReport_check";
+ DataSet ds;
try
{
//鍒犻櫎鏉冮檺
@@ -3543,17 +3582,22 @@
objJsonResult.data = null;
return objJsonResult; ;
}
- //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
- //if (HStopflag)
- //{
- // oCN.RollBack();//鍥炴粴浜嬪姟
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
-
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鍒犻櫎鍓嶆帶鍒�=========================================
string sql1 = "exec h_p_Gy_BadType_BeforeDelCtrl " + HItemID + ",'" + user + "'";
ds = oCN.RunProcReturn(sql1, "h_p_Gy_BadType_BeforeDelCtrl");
@@ -4080,6 +4124,17 @@
}
}
}
+
+ //宸插鏍哥殑涓嶅厑璁镐繚瀛�
+ if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜淇濆瓨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//寰楀埌鐭唬鐮�
string sShortNumber;
sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
@@ -4115,7 +4170,6 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
}
@@ -4650,7 +4704,7 @@
}
//鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
- ds = oCN.RunProcReturn("select * from Gy_BadResult where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_BadResult");
+ ds = oCN.RunProcReturn("select * from Gy_BadResult where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID= '" + oItem.HUSEORGID + "' ", "Gy_BadResult");
if (oItem.HNumber.Trim() == "")
{
objJsonResult.code = "0";
@@ -4659,6 +4713,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
+
//鏂板鏃跺垽鏂�
if (oItem.HItemID == 0)
{
@@ -4670,7 +4725,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺浉鍚屼娇鐢ㄧ粍缁囦笅浠ｇ爜涓嶈兘閲嶅锛�";
objJsonResult.data = 1;
return objJsonResult;
}
@@ -4721,7 +4776,26 @@
return objJsonResult;
}
}
+ if (ds.Tables[0].Rows.Count > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺浉鍚屼娇鐢ㄧ粍缁囦笅浠ｇ爜涓嶈兘閲嶅锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
}
+
+ //宸插鏍哥殑涓嶅厑璁镐繚瀛�
+ if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜淇濆瓨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//寰楀埌鐭唬鐮�
string sShortNumber;
sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
@@ -4757,7 +4831,6 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
}
@@ -4832,16 +4905,23 @@
objJsonResult.data = null;
return objJsonResult; ;
}
- //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
- //if (HStopflag)
- //{
- // oCN.RollBack();//鍥炴粴浜嬪姟
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鍒犻櫎鍓嶆帶鍒�=========================================
string sql1 = "exec h_p_Gy_BadResult_BeforeDelCtrl " + HItemID + ",'" + user + "'";
@@ -5259,7 +5339,7 @@
}
//鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
- ds = oCN.RunProcReturn("select * from Gy_InspectValue where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_InspectValue");
+ ds = oCN.RunProcReturn("select * from Gy_InspectValue where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID='" + oItem.HUSEORGID + "'", "Gy_InspectValue");
if (oItem.HNumber.Trim() == "")
{
objJsonResult.code = "0";
@@ -5279,7 +5359,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺浉鍚屼娇鐢ㄧ粍缁囦笅浠ｇ爜涓嶈兘閲嶅锛�";
objJsonResult.data = 1;
return objJsonResult;
}
@@ -5331,6 +5411,14 @@
}
}
}
+ if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佸凡瀹℃牳涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
//寰楀埌鐭唬鐮�
string sShortNumber;
sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
@@ -5356,7 +5444,6 @@
string sExeReturnInfo = "";
if (oBill.oModel.HItemID == 0)
{
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddNew(ref sExeReturnInfo);
}
else
@@ -5368,7 +5455,6 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
}
@@ -5444,16 +5530,22 @@
objJsonResult.data = null;
return objJsonResult; ;
}
- //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
- //if (HStopflag)
- //{
- // oCN.RollBack();//鍥炴粴浜嬪姟
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍩虹璧勬枡宸插鏍�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍩虹璧勬枡宸茬鐢�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鍒犻櫎鍓嶆帶鍒�=========================================
@@ -5798,7 +5890,7 @@
}
//鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
- ds = oCN.RunProcReturn("select * from Gy_InspectMethod where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_InspectMethod");
+ ds = oCN.RunProcReturn("select * from Gy_InspectMethod where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID='" + oItem.HUSEORGID + "'", "Gy_InspectMethod");
if (oItem.HNumber.Trim() == "")
{
objJsonResult.code = "0";
@@ -5818,7 +5910,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺浉鍚屼娇鐢ㄧ粍缁囦笅浠ｇ爜涓嶈兘閲嶅锛�";
objJsonResult.data = 1;
return objJsonResult;
}
@@ -5870,6 +5962,14 @@
}
}
}
+ if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佸凡瀹℃牳涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
//寰楀埌鐭唬鐮�
string sShortNumber;
sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
@@ -5894,7 +5994,6 @@
bool bResult;
if (oBill.oModel.HItemID == 0)
{
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddNew();
}
else
@@ -5906,7 +6005,6 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
}
@@ -5982,16 +6080,22 @@
objJsonResult.data = null;
return objJsonResult; ;
}
- //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
- //if (HStopflag)
- //{
- // oCN.RollBack();//鍥炴粴浜嬪姟
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍩虹璧勬枡宸插鏍�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍩虹璧勬枡宸茬鐢�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.RunProc("delete Gy_InspectMethod where HItemID=" + HItemID);
oCN.Commit();//鎻愪氦浜嬪姟
@@ -6087,7 +6191,7 @@
}
//鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
- ds = oCN.RunProcReturn("select * from Gy_QualityStd where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_QualityStd");
+ ds = oCN.RunProcReturn("select * from Gy_QualityStd where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID='" + oItem.HUSEORGID + "'", "Gy_QualityStd");
if (oItem.HNumber.Trim() == "")
{
objJsonResult.code = "0";
@@ -6107,7 +6211,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺浉鍚岀粍缁囦笅浠ｇ爜涓嶈兘閲嶅锛�";
objJsonResult.data = 1;
return objJsonResult;
}
@@ -6159,6 +6263,16 @@
}
}
}
+
+ //宸插鏍镐笉鍏佽淇濆瓨
+ if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佸凡瀹℃牳涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
//寰楀埌鐭唬鐮�
string sShortNumber;
sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
@@ -6176,7 +6290,7 @@
oItem.HMakeEmp = msg2; //鍒涘缓浜�
oBill.oModel = oItem;
- }
+ }
//淇濆瓨
//淇濆瓨瀹屾瘯鍚庡鐞�
@@ -6271,16 +6385,22 @@
objJsonResult.data = null;
return objJsonResult; ;
}
- //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
- //if (HStopflag)
- //{
- // oCN.RollBack();//鍥炴粴浜嬪姟
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍩虹璧勬枡宸插鏍�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍩虹璧勬枡宸茬鐢�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.RunProc("delete Gy_QualityStd where HItemID=" + HItemID);
oCN.Commit();//鎻愪氦浜嬪姟
@@ -6376,7 +6496,7 @@
}
//鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
- ds = oCN.RunProcReturn("select * from Gy_InspectInstruMent where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_InspectInstruMent");
+ ds = oCN.RunProcReturn("select * from Gy_InspectInstruMent where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID='" + oItem.HUSEORGID + "'", "Gy_InspectInstruMent");
if (oItem.HNumber.Trim() == "")
{
objJsonResult.code = "0";
@@ -6396,7 +6516,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺浉鍚屼娇鐢ㄧ粍缁囦笅浠ｇ爜涓嶈兘閲嶅锛�";
objJsonResult.data = 1;
return objJsonResult;
}
@@ -6448,6 +6568,16 @@
}
}
}
+
+ if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佸凡瀹℃牳涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
//寰楀埌鐭唬鐮�
string sShortNumber;
sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
@@ -6473,7 +6603,6 @@
string sExeReturnInfo = "";
if (oBill.oModel.HItemID == 0)
{
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddNew(ref sExeReturnInfo);
}
else
@@ -6485,7 +6614,6 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
}
@@ -6561,16 +6689,22 @@
objJsonResult.data = null;
return objJsonResult; ;
}
- //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
- //if (HStopflag)
- //{
- // oCN.RollBack();//鍥炴粴浜嬪姟
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍩虹璧勬枡宸插鏍�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍩虹璧勬枡宸茬鐢�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鍒犻櫎鍓嶆帶鍒�=========================================
ds = oCN.RunProcReturn("Exec h_p_Gy_InspectInstruMent_BeforeDelCtrl " + HItemID + ",'" + User + "'", "h_p_Gy_InspectInstruMent_BeforeDelCtrl");
@@ -6896,7 +7030,7 @@
}
//鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
- ds = oCN.RunProcReturn("select * from Gy_InspectBasis where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_InspectBasis");
+ ds = oCN.RunProcReturn("select * from Gy_InspectBasis where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID='" + oItem.HUSEORGID + "'", "Gy_InspectBasis");
if (oItem.HNumber.Trim() == "")
{
objJsonResult.code = "0";
@@ -6916,7 +7050,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺浉鍚岀粍缁囦笅浠ｇ爜涓嶈兘閲嶅锛�";
objJsonResult.data = 1;
return objJsonResult;
}
@@ -6968,6 +7102,14 @@
}
}
}
+ if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佸凡瀹℃牳涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
//寰楀埌鐭唬鐮�
string sShortNumber;
sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
@@ -6992,7 +7134,7 @@
bool bResult;
if (oBill.oModel.HItemID == 0)
{
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+
bResult = oBill.AddNew();
}
else
@@ -7004,7 +7146,6 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
}
@@ -7080,16 +7221,22 @@
objJsonResult.data = null;
return objJsonResult; ;
}
- //var HStopflag = Convert.ToBoolean(ds.Tables[0].Rows[0]["HStopflag"]);
- //if (HStopflag)
- //{
- // oCN.RollBack();//鍥炴粴浜嬪姟
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏁版嵁宸插垹闄ゆ棤娉曞啀娆″垹闄わ紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍩虹璧勬枡宸插鏍�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍩虹璧勬枡宸茬鐢�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
oCN.RunProc("delete Gy_InspectBasis where HItemID=" + HItemID);
oCN.Commit();//鎻愪氦浜嬪姟
@@ -13142,7 +13289,7 @@
}
//鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
- ds = oCN.RunProcReturn("select * from Gy_BadPhenomena where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_BadPhenomena");
+ ds = oCN.RunProcReturn("select * from Gy_BadPhenomena where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID= '" + oItem.HUSEORGID + "' ", "Gy_BadPhenomena");
if (oItem.HNumber.Trim() == "")
{
objJsonResult.code = "0";
@@ -13151,6 +13298,7 @@
objJsonResult.data = 1;
return objJsonResult;
}
+
//鏂板鏃跺垽鏂�
if (oItem.HItemID == 0)
{
@@ -13162,7 +13310,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺浉鍚屼娇鐢ㄧ粍缁囦笅浠ｇ爜涓嶈兘閲嶅锛�";
objJsonResult.data = 1;
return objJsonResult;
}
@@ -13213,7 +13361,27 @@
return objJsonResult;
}
}
+
+ if (ds.Tables[0].Rows.Count > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺浉鍚屼娇鐢ㄧ粍缁囦笅浠ｇ爜涓嶈兘閲嶅锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
}
+
+ //宸插鏍哥殑涓嶅厑璁镐繚瀛�
+ if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜淇濆瓨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//寰楀埌鐭唬鐮�
string sShortNumber;
sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
@@ -13238,7 +13406,6 @@
bool bResult;
if (oBill.oModel.HItemID == 0)
{
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddNew(ref DBUtility.ClsPub.sExeReturnInfo);
}
else
@@ -13250,7 +13417,6 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
}
@@ -14637,7 +14803,7 @@
}
//鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
- ds = oCN.RunProcReturn("select * from Gy_PreventErrMould where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_PreventErrMould");
+ //ds = oCN.RunProcReturn("select * from Gy_PreventErrMould where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_PreventErrMould");
if (oItem.HNumber.Trim() == "")
{
objJsonResult.code = "0";
@@ -14646,21 +14812,32 @@
objJsonResult.data = 1;
return objJsonResult;
}
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ ds = oCN.RunProcReturn("Select HItemID from Gy_PreventErrMould Where HItemID<>" + oItem.HItemID + " and HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID=" + oItem.HUSEORGID, "Gy_PreventErrMould");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
//鏂板鏃跺垽鏂�
if (oItem.HItemID == 0)
{
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
+ //if (ds == null || ds.Tables[0].Rows.Count == 0)
+ //{
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
- objJsonResult.data = 1;
- return objJsonResult;
- }
+ //}
+ //else
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ // objJsonResult.data = 1;
+ // return objJsonResult;
+ //}
//妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
string sParent;
sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
@@ -14686,6 +14863,18 @@
}
else//缂栬緫鏃跺垽鏂�
{
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_PreventErrMould where HItemID=" + oItem.HItemID, "Gy_PreventErrMould");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
string sParent;
sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
@@ -15275,7 +15464,7 @@
}
//鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
- ds = oCN.RunProcReturn("select * from Gy_CheckNoteItem where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_CheckNoteItem");
+ //ds = oCN.RunProcReturn("select * from Gy_CheckNoteItem where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_CheckNoteItem");
if (oItem.HNumber.Trim() == "")
{
objJsonResult.code = "0";
@@ -15284,21 +15473,21 @@
objJsonResult.data = 1;
return objJsonResult;
}
+ //鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
+ ds = oCN.RunProcReturn("Select HItemID from Gy_CheckNoteItem Where HItemID<>" + oItem.HItemID + " and HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID=" + oItem.HUSEORGID, "Gy_CheckNoteItem");
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
//鏂板鏃跺垽鏂�
if (oItem.HItemID == 0)
{
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
-
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
- objJsonResult.data = 1;
- return objJsonResult;
- }
+
//妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
string sParent;
sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
@@ -15324,6 +15513,18 @@
}
else//缂栬緫鏃跺垽鏂�
{
+ //宸插鏍镐笉鍏佽淇敼
+ DataSet dss;
+ dss = oCN.RunProcReturn("select * from Gy_CheckNoteItem where HItemID=" + oItem.HItemID, "Gy_CheckNoteItem");
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹姸鎬佸凡缁忓鏍革紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//妫�鏌ョ埗绾ф槸鍚﹀瓨鍦�
string sParent;
sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
@@ -16954,7 +17155,7 @@
}
//鏌ヨ鏁版嵁涓槸鍚﹀瓨鍦ㄩ噸澶嶄唬鐮�
- ds = oCN.RunProcReturn("select * from Gy_EnvironmentTestItem where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_EnvironmentTestItem");
+ ds = oCN.RunProcReturn("select * from Gy_EnvironmentTestItem where HNumber='" + oItem.HNumber.Trim() + "' and HUSEORGID='" + oItem.HUSEORGID + "'", "Gy_EnvironmentTestItem");
if (oItem.HNumber.Trim() == "")
{
objJsonResult.code = "0";
@@ -16974,7 +17175,7 @@
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "淇濆瓨澶辫触锛佷唬鐮侀噸澶嶏紒";
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺浉鍚岀粍缁囦笅浠ｇ爜涓嶈兘閲嶅锛�";
objJsonResult.data = 1;
return objJsonResult;
}
@@ -17026,6 +17227,16 @@
}
}
}
+ //宸插鏍镐笉鍏佽淇敼
+ if (ds.Tables[0].Rows.Count > 0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佸凡瀹℃牳涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+
//寰楀埌鐭唬鐮�
string sShortNumber;
sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
@@ -17135,6 +17346,24 @@
objJsonResult.data = null;
return objJsonResult; ;
}
+
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍩虹璧勬枡宸插鏍�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍩虹璧勬枡宸茬鐢�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍒犻櫎鍓嶆帶鍒�=========================================
string sql1 = "exec h_p_Gy_EnvironmentTestItem_BeforeDelCtrl " + HItemID + ",'" + user + "'";
ds = oCN.RunProcReturn(sql1, "h_p_Gy_EnvironmentTestItem_BeforeDelCtrl");
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_ScrapReasonController.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_ScrapReasonController.cs"
index 96d3f5d..06cc63d 100644
--- "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_ScrapReasonController.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_ScrapReasonController.cs"
@@ -121,10 +121,6 @@
objJsonResult.data = null;
return objJsonResult;
}
-
- //string msg3 = sArray[1].ToString();
- //string msg4 = sArray[2].ToString();
- //string msg5 = sArray[3].ToString();
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
List<Model.ClsGy_ScrapReason_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ScrapReason_Model>>(msg2);
@@ -133,6 +129,26 @@
foreach (Model.ClsGy_ScrapReason_Model oItem in list)
{
oBill.oModel = oItem;
+ }
+
+ ds = oCN.RunProcReturn("select * from Gy_ScrapReason where HNumber='" + oBill.oModel.HNumber+ "' and HUSEORGID='" + oBill.oModel.HUSEORGID + "'", "Gy_ScrapReason");
+
+ if (ds.Tables[0].Rows.Count>0 && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜淇濆瓨锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows.Count > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佺浉鍚屼娇鐢ㄧ粍缁囦笅浠ｇ爜涓嶈兘閲嶅锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
}
//淇濆瓨
@@ -151,7 +167,6 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
}
@@ -184,7 +199,6 @@
public object DeltetGy_ScrapReason(string HItemID, string user)
{
DataSet ds;
- DataSet ds1;
try
{
//鍒犻櫎鏉冮檺
@@ -223,6 +237,23 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "姝ら」鐩凡浣跨敤锛屼笉鑳藉垹闄わ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HStopEmp"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬鐢�!涓嶈兘杩涜鍒犻櫎锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -339,6 +370,92 @@
return objJsonResult;
}
}
+
+ [Route("Gy_ScrapReason/AuditGy_ScrapReason_BT")]
+ [HttpGet]
+ public object AuditGy_ScrapReason_BT(string HNumber, int IsAudit, string CurUserName,string HOrgID)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_ScrapReason_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from Gy_ScrapReason where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'", "Gy_ScrapReason");
+ 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) //瀹℃牳鍒ゆ柇
+ {
+ oCN.RunProc("update Gy_ScrapReason set HCheckEmp='" + CurUserName + "',HCheckTime=getdate() where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ oCN.RunProc("update Gy_ScrapReason set HCheckEmp='',HCheckTime=null where HNumber='" + HNumber + "' and HUSEORGID='" + HOrgID + "'");
+
+ 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 鎶ュ簾鍘熷洜绂佺敤銆佸弽绂佺敤
diff --git "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\345\260\217\350\257\270\350\221\233\345\220\214\346\255\245/XZG_DataSynchronizationController.cs" "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\345\260\217\350\257\270\350\221\233\345\220\214\346\255\245/XZG_DataSynchronizationController.cs"
new file mode 100644
index 0000000..2ddf598
--- /dev/null
+++ "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\345\260\217\350\257\270\350\221\233\345\220\214\346\255\245/XZG_DataSynchronizationController.cs"
@@ -0,0 +1,2106 @@
+锘縰sing Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Pub_Class;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Web.Http;
+using WebAPI.Models;
+using Tea;
+using AlibabaCloud.SDK.Dingtalkyida_1_0.Models;
+using AlibabaCloud.SDK.Dingtalkoauth2_1_0.Models;
+using DingTalk.Api.Request;
+using DingTalk.Api;
+using DingTalk.Api.Response;
+using System.Globalization;
+using System.Linq;
+using AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models;
+using System.Text.RegularExpressions;
+using System.Net.Http;
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading.Tasks;
+using System.Text;
+using System.Security.Cryptography;
+using System.Net.Http.Headers;
+using System.Web;
+using Kingdee.BOS.WebApi.Client;
+
+namespace WebAPI.Controllers
+{
+ #region 妯″瀷绫�
+ #region 鏈嶅姟鍦板潃杩斿洖绫�
+ public class ServerAddressResponse
+ {
+ public string res;
+ public string msg;
+ public ServerAddressResponse_Data data;
+ }
+ public class ServerAddressResponse_Data
+ {
+ public string gofServerAdd;
+ }
+ #endregion
+
+ #region 楠岃瘉鐮佽繑鍥炵被
+ public class VerificationCodeResponse
+ {
+ public string res;
+ public string msg;
+ public VerificationCodeResponse_Data data;
+ }
+ public class VerificationCodeResponse_Data
+ {
+ public string VerificationCode;
+ }
+ #endregion
+
+ #region Token杩斿洖绫�
+ public class TokenResponse
+ {
+ public string res;
+ public string msg;
+ public TokenResponse_Data data;
+ }
+ public class TokenResponse_Data
+ {
+ public string key;
+ }
+ #endregion
+
+ #region 浜у搧妗ｆ
+ #region 鐗╂枡鍒楄〃
+ public class MaterListResponse
+ {
+ public string code;
+ public string msg;
+ public MaterListResponse_Data data;
+ }
+ public class MaterListResponse_Data
+ {
+ public MaterListResponse_Data_Product[] product;
+ public string updateTime;
+ public string totalNumber;
+ public string totalPage;
+ public string pageIndex;
+ }
+ public class MaterListResponse_Data_Product
+ {
+ public string productName; //浜у搧鍚嶇О
+ public string productId; //浜у搧ID
+ public string partnum; //浜у搧缂栧彿
+ public string cycleTime; //寰幆鍛ㄦ湡
+ public string spec; //瑙勬牸鍨嬪彿
+ public string weight; //浜у搧閲嶉噺
+ public string headWeight; //鏂欏ご閲嶉噺
+ public string colorName; //棰滆壊鍚嶇О
+ public string comments; // 澶囨敞
+ public string lastUpdateTime; //淇敼鏃ユ湡
+ }
+ #endregion
+
+ #region 鐗╂枡璇︾粏淇℃伅
+ public class MaterDetailResponse
+ {
+ public string code;
+ public string msg;
+ public MaterDetailResponse_Data data;
+ }
+ public class MaterDetailResponse_Data
+ {
+ public MaterDetailResponse_Data_Detail details;
+ public string updateTime; //鏇存柊鏃堕棿
+ public string totalNumber;
+ public string totalPage;
+ public string pageIndex;
+ }
+ public class MaterDetailResponse_Data_Detail
+ {
+ public string productName; //浜у搧鍚嶇О
+ public string partNum; //浜у搧缂栧彿
+ public string weight; //浜у搧閲嶉噺
+ public string headWeight; //鏂欏ご閲嶉噺
+ public string cycleTime; //寰幆鍛ㄦ湡
+ public string comments; // 澶囨敞
+ public string materialNo; //鏉愭枡缂栧彿
+ public string cpNo; //鑹茬矇缂栧彿
+ public string cpName; //鑹茬矇鍚嶇О
+ public string color; //棰滆壊ID
+ public string colorName; //棰滆壊鍚嶇О
+ public string unit; //鍗曚綅
+ public string partId; //浜у搧ID
+ public string productType; //浜у搧绫诲瀷
+ public string processWay; //鐢熶骇杩涘害缁熻鏂瑰紡:0:鏁伴噺 1:鏃堕暱
+ public string spec; //瑙勬牸鍨嬪彿
+ public string option1; //鑷畾涔夊瓧娈�1锛氱敤浜庤褰曢噾铦朵簯 淇敼鏃堕棿
+ }
+ #endregion
+
+ #region 鏂板浜у搧淇℃伅
+ public class MaterialResponse
+ {
+ public string code;
+ public string msg;
+ public MaterialResponse_Data data;
+ public string productId;
+ }
+ public class MaterialResponse_Data
+ {
+ public string partId; //浜у搧ID
+ public string productName; //浜у搧鍚嶇О
+ public string partNum; //浜у搧缂栫爜
+ public string sepc; //瑙勬牸鍨嬪彿
+ public string weight; //浜у搧閲嶉噺
+ public string comments; //澶囨敞
+ public string cycleTime; //鍛ㄦ湡
+ public string headWeight; //鏂欏ご閲嶉噺
+ public string createDate; //鍒涘缓鏃ユ湡
+ public string color; //棰滆壊ID
+ public string colorName; //棰滆壊鍚嶇О
+ public string pieceWage; //鍗曚环
+ }
+
+
+ public class Material
+ {
+ public string key; //瀵嗛挜
+ public string productName; //浜у搧鍚嶇О
+ public string partNum; //浜у搧缂栫爜
+ public string sepc; //瑙勬牸鍨嬪彿
+ public string weight; //浜у搧閲嶉噺
+ public string headWeight; //鏂欏ご閲嶉噺
+ public string cycleTime; //鍛ㄦ湡
+ public string flightsPartnum;
+ public string comments; //澶囨敞
+ public string colorName; //棰滆壊鍚嶇О
+ public string pieceWage; //鍗曚环
+ public string unit; //鍗曚綅
+ public string systemType; //绯荤粺绫诲瀷(IMM:娉ㄥ ,CNC:绮惧姞宸�),涓嶄紶榛樿娉ㄥ
+ public string tdDocNo; //宸ヨ壓璺嚎缂栧彿,澶氫釜浣跨敤,杩涜鍒嗗紑(CNC)
+ public string progressWay; //鐢熶骇杩涘害缁熻鏂瑰紡:0:鏁伴噺 1:鏃堕暱(CNC)
+ public string groupId; //鍒嗙粍id
+
+ public string option1; //鑷畾涔夊瓧娈�1锛氱敤浜庤褰曢噾铦朵簯 淇敼鏃堕棿
+ }
+
+ #endregion
+
+ #region 缂栬緫浜у搧淇℃伅
+ public class MaterialEditResponse
+ {
+ public string code;
+ public string msg;
+ public MaterialEditReponse_Data data;
+ public string productId;
+ }
+ public class MaterialEditReponse_Data
+ {
+ public string partId; //浜у搧ID
+ public string partNum; //浜у搧缂栫爜
+ public string productName; //浜у搧鍚嶇О
+ public string sepc; //瑙勬牸鍨嬪彿
+ public string weight; //浜у搧閲嶉噺
+ public string comments; //澶囨敞
+ public string cycleTime; //鍛ㄦ湡
+ public string headWeight; //鏂欏ご閲嶉噺
+ public string lastUpdateTime; //鏈�鍚庢洿鏂版椂闂�
+ public string productType; //浜у搧绫诲瀷
+ public string createDate; //鍒涘缓鏃ユ湡
+ public string colorName; //棰滆壊鍚嶇О
+ public string unit; //鍗曚綅
+ public string systemType; //绯荤粺绫诲瀷
+ }
+
+
+ public class MaterialEdit
+ {
+ public string key; //瀵嗛挜
+ public string productId; //浜у搧ID
+ public string productName; //浜у搧鍚嶇О
+ public string partNum; //浜у搧缂栫爜
+ public string sepc; //瑙勬牸鍨嬪彿
+ public string weight; //浜у搧閲嶉噺
+ public string headWeight; //鏂欏ご閲嶉噺
+ public string cycleTime; //鍛ㄦ湡
+ public string flightsPartnum;
+ public string comments; //澶囨敞
+ public string colorName; //棰滆壊鍚嶇О
+ public string pieceWage; //鍗曚环
+ public string unit; //鍗曚綅
+ public string systemType; //绯荤粺绫诲瀷(IMM:娉ㄥ ,CNC:绮惧姞宸�),涓嶄紶榛樿娉ㄥ
+ public string tdDocNo; //宸ヨ壓璺嚎缂栧彿,澶氫釜浣跨敤,杩涜鍒嗗紑(CNC)
+ public string progressWay; //鐢熶骇杩涘害缁熻鏂瑰紡:0:鏁伴噺 1:鏃堕暱(CNC)
+ public string groupId; //鍒嗙粍id
+
+ public string option1; //鑷畾涔夊瓧娈�1锛氱敤浜庤褰曢噾铦朵簯 淇敼鏃堕棿
+ }
+
+ #endregion
+ #endregion
+
+ #region 鐢熶骇璁㈠崟
+ #region 鐢熶骇璁㈠崟鍒楄〃
+ public class ICMOListResponse
+ {
+ public string code;
+ public string msg;
+ public ICMOListResponse_Data data;
+ }
+ public class ICMOListResponse_Data
+ {
+ public ICMOListResponse_Data_Plan[] plan;
+ public string pageIndex;
+ public string pageCount;
+ }
+ public class ICMOListResponse_Data_Plan
+ {
+ public string planId; //璁″垝鍗旾D
+ public string leave_qty; //鍓╀綑鏁伴噺
+ public string productName; //浜у搧鍚嶇О
+ public string planNumber; //璁″垝鍗曞彿
+ public string planQty; //璁″垝鏁伴噺
+ public string taskNo; //浠诲姟鍗曞彿
+ public string materialId; //鏉愭枡缂栧彿
+ public string materialName; //鏉愭枡鍚嶇О
+ public string cpId; //鑹茬矇缂栧彿
+ public string cpName; //鑹茬矇鍚嶇О
+ public string partId; //浜у搧id
+ public string partNum; //浜у搧缂栧彿
+ public string qty; //鏁伴噺
+ public string allotQty; //鍒嗛厤鏁伴噺
+ public string planStartDate; //璁″垝寮�濮嬫椂闂�
+ public string planFinishDate; //璁″垝瀹屾垚鏃堕棿
+ public string comments; //澶囨敞
+ public string createDate; //鍒涘缓鏃ユ湡
+ public string spec; //瑙勬牸鍨嬪彿
+ public string urgent; //鏄惁绱ф��
+
+ public string partnum; //浜у搧缂栧彿
+ public string cycleTime; //寰幆鍛ㄦ湡
+ }
+ #endregion
+
+ #region 鐢熶骇璁㈠崟璇︾粏淇℃伅
+ public class ICMODetailResponse
+ {
+ public string code;
+ public string msg;
+ public ICMODetailResponse_Data[] data;
+ }
+ public class ICMODetailResponse_Data
+ {
+ public string planProductName; //浜у搧鍚嶇О
+ public string planNumber; //璁″垝鍗曞彿
+ public string planQty; //璁″垝鏁伴噺
+ public string planStartTime; //璁″垝寮�濮嬫椂闂�
+ public string planEndTime; //璁″垝瀹屾垚鏃堕棿
+ public string allottedQty; //鍒嗛厤鏁伴噺
+ public string planProductId; //浜у搧id
+ public string finishPercentage; //瀹屾垚杩涘害
+ public string colorName; //棰滆壊
+ public string color; //棰滆壊id
+ public string levQty; //鍓╀綑鏁伴噺
+ public string planId; //璁″垝鍗昳d
+ public string createUserId; //鍒涘缓浜�
+ public string createUserName; //鍒涘缓浜哄悕绉�
+ public string customerName; //瀹㈡埛鍚嶇О
+ public string comments; //澶囨敞
+ public string productName; //浜у搧鍚嶇О
+ public string partNum; //浜у搧缂栧彿(partNum鎴栬�卲roductId浜岄�変竴)
+ public string urgent; //鏄惁绱ф�� 1:绱ф��
+ public string productRemark; //浜у搧澶囨敞
+ public string option1; //鑷畾涔夊瓧娈�1锛氱敤浜庤褰曢噾铦朵簯 淇敼鏃堕棿
+ }
+ #endregion
+
+ #region 鏂板鐢熶骇璁㈠崟淇℃伅
+ public class ICMOResponse
+ {
+ public string code;
+ public string msg;
+ public ICMOResponse_Data data;
+ }
+ public class ICMOResponse_Data
+ {
+ public string planId; //璁″垝鍗昳d
+ public string companyId; //鍏徃鐨刬d
+ public string planNo; //璁″垝鍗曞彿
+ public string partId; //浜у搧ID
+ public string qty; //璁″垝鏁伴噺
+ public string customerName; //瀹㈡埛鍚嶇О
+ public string planStartTime; //璁″垝寮�濮嬫椂闂�
+ public string planFinishDate; //璁″垝瀹屾垚鏃堕棿
+ public string allotQty; //鍒嗛厤鏁伴噺
+ public string finishQty; //瀹屾垚鏁伴噺
+ public string comments; //澶囨敞
+ public string createDate; //鍒涘缓鏃ユ湡
+ public string createUserId; //鍒涘缓浜�
+ public string createUserName; //鍒涘缓浜哄悕绉�
+ public string colorName; //棰滆壊
+ public string color; //棰滆壊id
+ public string productName; //浜у搧鍚嶇О
+ public string partNum; //浜у搧缂栧彿
+ public string status; //鐘舵��
+ public string urgent; //鏄惁绱ф�� 1:绱ф��
+ public string option1; //鑷畾涔夊瓧娈�1锛氱敤浜庤褰曢噾铦朵簯 淇敼鏃堕棿
+ }
+ public class ICMO
+ {
+ public string key; //瀵嗛挜
+ public string planNumber; //璁″垝鍗曞彿
+ public string planQty; //璁″垝鏁伴噺
+ public string partNum; //浜у搧缂栧彿
+ public string planStartDate; //璁″垝寮�濮嬫椂闂�
+ public string planEndDate; //璁″垝缁撴潫鏃堕棿
+ public string comments; //澶囨敞
+ public string customerName; //瀹㈡埛鍚嶇О
+ public string colorName; //棰滆壊鍚嶇О
+ public string spec; //鍨嬪彿瑙勬牸
+ public string cpNo; //鑹茬矇缂栧彿
+ public string cpName; //鑹茬矇鍚嶇О
+ public string materialNo; //鏉愭枡缂栧彿
+ public string materialName; //鏉愭枡鍚嶇О
+ public string orderNumber; //璁㈠崟缂栧彿
+
+ public string option1; //鑷畾涔夊瓧娈�1锛氱敤浜庤褰曢噾铦朵簯 淇敼鏃堕棿
+ }
+
+ #endregion
+
+ #region 缂栬緫鐢熶骇璁㈠崟淇℃伅
+ public class ICMOEditResponse
+ {
+ public string code;
+ public string msg;
+ public ICMOEditReponse_Data data;
+ }
+ public class ICMOEditReponse_Data
+ {
+ public string planId; //璁″垝鍗昳d
+ //public string companyId; //鍏徃鐨刬d
+ public string planNo; //璁″垝鍗曞彿
+ public string partId; //浜у搧ID
+ public string qty; //璁″垝鏁伴噺
+ public string customerName; //瀹㈡埛鍚嶇О
+ public string planStartTime; //璁″垝寮�濮嬫椂闂�
+ public string planFinishDate; //璁″垝瀹屾垚鏃堕棿
+ public string allotQty; //鍒嗛厤鏁伴噺
+ public string finishQty; //瀹屾垚鏁伴噺
+ public string comments; //澶囨敞
+ public string createDate; //鍒涘缓鏃ユ湡
+ public string createUserId; //鍒涘缓浜�
+ public string createUserName; //鍒涘缓浜哄悕绉�
+ public string colorName; //棰滆壊
+ public string color; //棰滆壊id
+ public string productName; //浜у搧鍚嶇О
+ public string partNum; //浜у搧缂栧彿
+ public string status; //鐘舵��
+ public string urgent; //鏄惁绱ф�� 1:绱ф��
+ public string option1; //鑷畾涔夊瓧娈�1锛氱敤浜庤褰曢噾铦朵簯 淇敼鏃堕棿
+ }
+
+
+ public class ICMOEdit
+ {
+ public string key; //瀵嗛挜
+ public string planId; //璁″垝鍗旾D
+ public string planNumber; //璁″垝鍗曞彿
+ public string planQty; //璁″垝鏁伴噺
+ public string partNum; //浜у搧缂栧彿
+ public string planStartDate; //璁″垝寮�濮嬫椂闂�
+ public string planEndDate; //璁″垝缁撴潫鏃堕棿
+ public string comments; //澶囨敞
+ public string customerName; //瀹㈡埛鍚嶇О
+ public string colorName; //棰滆壊鍚嶇О
+ public string spec; //鍨嬪彿瑙勬牸
+ public string cpNo; //鑹茬矇缂栧彿
+ public string cpName; //鑹茬矇鍚嶇О
+ public string materialNo; //鏉愭枡缂栧彿
+ public string materialName; //鏉愭枡鍚嶇О
+ public string orderNumber; //璁㈠崟缂栧彿
+
+ public string option1; //鑷畾涔夊瓧娈�1锛氱敤浜庤褰曢噾铦朵簯 淇敼鏃堕棿
+ }
+
+ #endregion
+ #endregion
+
+ #region 鐢熶骇姹囨姤
+ #region 宸插鏍哥殑鎶ュ伐璁板綍淇℃伅鍒楄〃
+ public class ICMOReportListResponse
+ {
+ public string code;
+ public string msg;
+ public List<ICMOReportListResponse_Data> data;
+ }
+ public class ICMOReportListResponse_Data
+ {
+ public List<ICMOReportListResponse_Data_Data> data;
+ public string pageIndex;
+ public string pageCount;
+ }
+ public class ICMOReportListResponse_Data_Data
+ {
+ public string produceReportId; //鎶ュ伐璁板綍id
+ public string machineName; //璁惧鍚嶇О
+ public string macId; //璁惧id
+ public string productName; //浜у搧鍚嶇О
+ public string partId; //浜у搧id
+ public string workTime; //宸ヤ綔鏃堕棿
+ public string tour; //鐝
+ public string productNum; //鐢熶骇鏁版嵁
+ public string standardNum; //鎶ュ悎鏍兼暟閲�
+ public string defectiveNum; //娆″搧鏁伴噺
+ public string remark; //澶囨敞
+ public string materialId; //
+ public string materialName; //鏉愭枡鍚嶇О
+ public string materialNo; //鏉愭枡缂栧彿
+ public string producePerson; //鐢熶骇浜哄憳
+ public string producePersonId; //鐢熶骇浜哄憳id
+ public string producePersonCode; //鐢熶骇浜哄憳code
+ public string planNo; //璁″垝鍗曞彿
+ public string taskNo; //浠诲姟鍗曞彿
+
+ public string partNum; //浜у搧缂栧彿
+ public string produceRecordId; //鐢熶骇璁板綍鐨刬d
+ public string moldNo; //妯″叿缂栧彿
+ public string reportDate; //鎶ュ伐鏃ユ湡
+ public string reportUser; //鎶ュ伐浜哄憳
+ public string reportUserCode; //鎶ュ伐浜哄憳缂栫爜
+ public string auditUser; //瀹℃牳浜�
+ public string auditUserCode; //瀹℃牳浜哄憳缂栧彿
+ public string auditDate; //瀹℃牳鏃ユ湡
+ public string moldName; //妯″叿鍚嶇О
+ public string defectiveReasonName; //娆″搧鏄庣粏淇℃伅
+ public string boxCodes; //绠辩爜
+ public string tourGroupName; //鐝粍
+
+ }
+ #endregion
+
+ #region 鐢熶骇姹囨姤璇︾粏淇℃伅
+ public class ICMOReportDetailResponse
+ {
+ public string code;
+ public string msg;
+ public List<ICMOReportDetailResponse_Data> data;
+ }
+ public class ICMOReportDetailResponse_Data
+ {
+ public string produceReportId; //鎶ュ伐璁板綍id
+ public string machineName; //璁惧鍚嶇О
+ public string macId; //璁惧id
+ public string productName; //浜у搧鍚嶇О
+ public string partId; //浜у搧id
+ public string workTime; //宸ヤ綔鏃堕棿
+ public string tour; //鐝
+ public string productNum; //鐢熶骇鏁版嵁
+ public string standardNum; //鎶ュ悎鏍兼暟閲�
+ public string defectiveNum; //娆″搧鏁伴噺
+ public string stockInputNum;
+ public string remark; //澶囨敞
+/* public string materialId; */ //
+ public string materialName; //鏉愭枡鍚嶇О
+ public string materialNo; //鏉愭枡缂栧彿
+ public string producePerson; //鐢熶骇浜哄憳
+ public string producePersonId; //鐢熶骇浜哄憳id
+ public string producePersonCode; //鐢熶骇浜哄憳code
+ public string planNo; //璁″垝鍗曞彿
+ public string taskNo; //浠诲姟鍗曞彿
+
+ public string partNum; //浜у搧缂栧彿
+ public string produceRecordId; //鐢熶骇璁板綍鐨刬d
+ public string moldNo; //妯″叿缂栧彿
+ public string reportDate; //鎶ュ伐鏃ユ湡
+ public string reportUser; //鎶ュ伐浜哄憳
+ public string reportUserCode; //鎶ュ伐浜哄憳缂栫爜
+ public string auditUser; //瀹℃牳浜�
+ public string auditUserCode; //瀹℃牳浜哄憳缂栧彿
+ public string auditDate; //瀹℃牳鏃ユ湡
+
+
+ public string piceWage; //鍗曚环
+ public string moldName; //妯″叿鍚嶇О
+
+ public List<string> defectiveReasonNameList;
+ public List<string> defectiveNumList;
+
+ public string tourGroupName; //鐝粍
+ public List<ICMOReportDetailResponse_Data_Box> boxs;
+ }
+
+ public class ICMOReportDetailResponse_Data_Box
+ {
+ public string boxCode; //绠辩爜
+ public string boxActQty; //鏁伴噺
+ }
+ #endregion
+ #endregion
+ #endregion
+
+ #region 灏忚钁涙暟鎹悓姝�
+ public class XZG_DataSynchronizationController : ApiController
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+
+ #region 灏忚钁涙暟鎹悓姝ュ瘑閽�
+ string APPID = "1f2e019a-ff51-f115-ce59-205606c72853";
+ string APPPWD = "YYLM01A";
+ #endregion
+
+ #region erp鏁版嵁搴撳悕绉�
+ //string erpDatabaseName = "AIS20210811135644.."; //47閲戣澏浜戞暟鎹簱鍚嶇О
+ string erpDatabaseName = "AIS20201117213251.."; //涓夊崌閲戣澏浜戞暟鎹簱鍚嶇О
+ #endregion
+
+ #region 鑾峰彇鏈嶅姟鍦板潃
+ public async Task<string> getServerAddressAsync()
+ {
+ //璇锋眰鍦板潃
+ string url = "https://js1.gomake.cn/kq_highnet_gof_connect/gof1.0/authorize";
+ //璇锋眰鍙傛暟
+ Dictionary<string, string> queryParams = new Dictionary<string, string>
+ {
+ {"appid", APPID},
+ {"ver", "1.0"},
+ {"seq",DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc) + "" }
+ };
+
+ //杩斿洖缁撴灉
+ string responseBody = await DefinedRequestSendMethod.GetDataAsyncByGetRequest(url, queryParams);
+
+ //灏嗗瓧绗︿覆杞崲涓哄璞�
+ ServerAddressResponse serverAddressResponse = Newtonsoft.Json.JsonConvert.DeserializeObject<ServerAddressResponse>(responseBody);
+
+ //鑾峰彇瀵硅薄涓殑鏁版嵁
+ string res = serverAddressResponse.data.gofServerAdd;
+
+ return res;
+ }
+ #endregion
+
+ #region 鑾峰彇楠岃瘉鐮�
+ public async Task<string> getVerificationCodeAsync()
+ {
+ //璇锋眰鍦板潃
+ string url = await getServerAddressAsync() + "/gof1.0/verify";
+ //璇锋眰鍙傛暟
+ Dictionary<string, string> queryParams = new Dictionary<string, string>
+ {
+ {"appid", APPID},
+ {"ver", "1.0"},
+ {"seq",DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc) + "" }
+ };
+
+ //杩斿洖缁撴灉
+ string responseBody = await DefinedRequestSendMethod.GetDataAsyncByGetRequest(url, queryParams);
+
+ //灏嗗瓧绗︿覆杞崲涓哄璞�
+ VerificationCodeResponse verificationCodeResponse = Newtonsoft.Json.JsonConvert.DeserializeObject<VerificationCodeResponse>(responseBody);
+
+ //鑾峰彇瀵硅薄涓殑鏁版嵁
+ string res = verificationCodeResponse.data.VerificationCode;
+
+ return res;
+ }
+ #endregion
+
+ #region 鑾峰彇Token
+ public async Task<string> getTokenAsync()
+ {
+ //璇锋眰鍦板潃
+ string url = await getServerAddressAsync() + "/gof1.0/key";
+ string verificationCode = await getVerificationCodeAsync();
+ //璇锋眰鍙傛暟
+ Dictionary<string, string> queryParams = new Dictionary<string, string>
+ {
+ {"appid", APPID},
+ {"ver", "1.0"},
+ {"seq",DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc) + "" },
+ {"pwd", DefinedRequestSendMethod.GetMD5( DefinedRequestSendMethod.GetMD5(verificationCode) + DefinedRequestSendMethod.GetMD5(APPPWD))}
+ };
+
+ //杩斿洖缁撴灉
+ string responseBody = await DefinedRequestSendMethod.GetDataAsyncByGetRequest(url, queryParams);
+
+ //灏嗗瓧绗︿覆杞崲涓哄璞�
+ TokenResponse tokenResponse = Newtonsoft.Json.JsonConvert.DeserializeObject<TokenResponse>(responseBody);
+
+ //鑾峰彇瀵硅薄涓殑鏁版嵁
+ string res = tokenResponse.data.key;
+
+ return res;
+ }
+ #endregion
+
+ #region 鏁版嵁鍚屾
+ #region 鏁版嵁鍚屾-姹囨�诲叏閮ㄥ悓姝�
+ public async Task<json> dataAnsy()
+ {
+ try
+ {
+ //浜у搧妗ｆ鍚屾锛坋rp->灏忚钁涳級
+ await productInfoSyncFromERPToXZG();
+ //鐢熶骇璁㈠崟鍚屾锛坋rp->灏忚钁涳級
+ await icmoInfoSyncFromERPToXZG();
+ //鐢熶骇姹囨姤鍗曞悓姝�(灏忚钁�->erp)
+ //await icmoReportInfoSyncFromXZGToERP();
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍚屾鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch(Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍚屾澶辫触!" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ #endregion
+
+ #region 浜у搧妗ｆ
+ #region 鑾峰彇浜у搧鍒楄〃淇℃伅
+ public async Task<MaterListResponse> getMaterListAsync()
+ {
+ //璇锋眰鍦板潃
+ string url = await getServerAddressAsync() + "/v2/GET/getProductAll";
+ string token = await getTokenAsync();
+ //璇锋眰鍙傛暟
+ Dictionary<string, string> queryParams = new Dictionary<string, string>
+ {
+ {"key", token},
+ {"page", "1"},
+ {"sidx", "lastUpdateTime"},
+ {"sord", "desc"},
+ {"systemType","IMM" }
+ };
+
+ //杩斿洖缁撴灉
+ string responseBody = await DefinedRequestSendMethod.GetDataAsyncByGetRequest(url, queryParams);
+
+ //灏嗗瓧绗︿覆杞崲涓哄璞�
+ MaterListResponse materListResponse = Newtonsoft.Json.JsonConvert.DeserializeObject<MaterListResponse>(responseBody);
+
+ return materListResponse;
+ }
+ #endregion
+
+ #region 鑾峰彇浜у搧璇︾粏淇℃伅
+ public async Task<MaterDetailResponse> getMaterDetailAsync(string url, string key, string partNum)
+ {
+ //璇锋眰鍦板潃
+ url = url + "/v2/GET/getProductDetails";
+ //璇锋眰鍙傛暟
+ Dictionary<string, string> queryParams = new Dictionary<string, string>
+ {
+ {"key", key},
+ {"partNum",partNum }
+ };
+
+ //杩斿洖缁撴灉
+ string responseBody = await DefinedRequestSendMethod.GetDataAsyncByGetRequest(url, queryParams);
+
+ //灏嗗瓧绗︿覆杞崲涓哄璞�
+ MaterDetailResponse materDetailResponse = Newtonsoft.Json.JsonConvert.DeserializeObject<MaterDetailResponse>(responseBody);
+
+ return materDetailResponse;
+ }
+ #endregion
+
+ #region 鏂板浜у搧
+ public async Task<MaterialResponse> getAddMaterAsync(string url, Material material)
+ {
+
+ //璇锋眰鍦板潃
+ url = url + "/v2/POST/AddProduct";
+
+ //POST璇锋眰鍙傛暟
+ Dictionary<string, string> queryParams = new Dictionary<string, string>
+ {
+ {"key", DBUtility.ClsPub.isStrNull(material.key)},
+ {"productName", DBUtility.ClsPub.isStrNull(material.productName)},
+ {"partNum",DBUtility.ClsPub.isStrNull(material.partNum)},
+ {"Spec", DBUtility.ClsPub.isStrNull(material.sepc)},
+ {"weight", DBUtility.ClsPub.isStrNull(material.weight)},
+ {"headWeight", DBUtility.ClsPub.isStrNull(material.headWeight)},
+ {"cycletime", DBUtility.ClsPub.isStrNull(material.cycleTime)},
+ {"fightsPartnum", DBUtility.ClsPub.isStrNull(material.flightsPartnum)},
+ {"comments", DBUtility.ClsPub.isStrNull(material.comments)},
+ {"colorName", DBUtility.ClsPub.isStrNull(material.colorName)},
+ {"pieceWage", DBUtility.ClsPub.isStrNull(material.pieceWage)},
+ {"unit", DBUtility.ClsPub.isStrNull(material.unit)},
+ {"systemType", DBUtility.ClsPub.isStrNull(material.systemType)},
+ {"tdDocNo", DBUtility.ClsPub.isStrNull(material.tdDocNo)},
+ {"progressWay", DBUtility.ClsPub.isStrNull(material.progressWay)},
+ {"groupId", DBUtility.ClsPub.isStrNull(material.groupId)},
+
+ {"option1", DBUtility.ClsPub.isStrNull(material.option1)}
+ };
+
+ //POST璇锋眰Body鏁版嵁
+ var postData = new { };
+ string json = Newtonsoft.Json.JsonConvert.SerializeObject(postData);
+
+ //杩斿洖缁撴灉
+ string responseBody = await DefinedRequestSendMethod.GetDataAsyncByPOSTRequest(url, queryParams, json);
+
+ //灏嗗瓧绗︿覆杞崲涓哄璞�
+ MaterialResponse materialResponse = Newtonsoft.Json.JsonConvert.DeserializeObject<MaterialResponse>(responseBody);
+
+ return materialResponse;
+ }
+ #endregion
+
+ #region 缂栬緫浜у搧
+ public async Task<MaterialEditResponse> getAddMaterEditAsync(string url, MaterialEdit material)
+ {
+
+ //璇锋眰鍦板潃
+ url = url + "/v2/POST/UpdateProduct";
+
+ //POST璇锋眰鍙傛暟
+ Dictionary<string, string> queryParams = new Dictionary<string, string>
+ {
+ {"key", DBUtility.ClsPub.isStrNull(material.key)},
+ {"productId", DBUtility.ClsPub.isStrNull(material.productId)},
+ {"productName", DBUtility.ClsPub.isStrNull(material.productName)},
+ {"partNum",DBUtility.ClsPub.isStrNull(material.partNum)},
+ {"cycletime", DBUtility.ClsPub.isStrNull(material.cycleTime)},
+ {"Spec", DBUtility.ClsPub.isStrNull(material.sepc)},
+ {"weight", DBUtility.ClsPub.isStrNull(material.weight)},
+ {"headWeight", DBUtility.ClsPub.isStrNull(material.headWeight)},
+ {"fightsPartnum", DBUtility.ClsPub.isStrNull(material.flightsPartnum)},
+ {"comments", DBUtility.ClsPub.isStrNull(material.comments)},
+ {"colorName", DBUtility.ClsPub.isStrNull(material.colorName)},
+ {"unit", DBUtility.ClsPub.isStrNull(material.unit)},
+ {"systemType", DBUtility.ClsPub.isStrNull(material.systemType)},
+ {"tdDocNo", DBUtility.ClsPub.isStrNull(material.tdDocNo)},
+ {"progressWay", DBUtility.ClsPub.isStrNull(material.progressWay)},
+ {"groupId", DBUtility.ClsPub.isStrNull(material.groupId)},
+
+ {"option1", DBUtility.ClsPub.isStrNull(material.option1)}
+ };
+
+ //POST璇锋眰Body鏁版嵁
+ var postData = new { };
+ string json = Newtonsoft.Json.JsonConvert.SerializeObject(postData);
+
+ //杩斿洖缁撴灉
+ string responseBody = await DefinedRequestSendMethod.GetDataAsyncByPOSTRequest(url, queryParams, json);
+
+ //灏嗗瓧绗︿覆杞崲涓哄璞�
+ MaterialEditResponse materialEditResponse = Newtonsoft.Json.JsonConvert.DeserializeObject<MaterialEditResponse>(responseBody);
+
+ return materialEditResponse;
+ }
+ #endregion
+
+ #region 浜у搧妗ｆ瀹氭椂鍚屾_浠嶦RP鍒板皬璇歌憶
+ public async Task<json> productInfoSyncFromERPToXZG()
+ {
+ try
+ {
+ //璇锋眰鍦板潃
+ string url = await getServerAddressAsync();
+ string token = await getTokenAsync();
+
+ //鑾峰彇閲戣澏浜戠墿鏂欐暟鎹�
+ List<Material> materials = new List<Material>();
+ string sql = @"select
+ a.FNUMBER HNumber
+ ,l.FNAME HName
+ ,isnull(l.FSPECIFICATION,'') HModel
+ ,'CLD-ERP瀵煎叆' HRemark
+ ,unit.FNAME HUnitName
+ ,convert(varchar(100),a.FMODIFYDATE,20) HUpdateDate
+ from " + erpDatabaseName + @"T_BD_MATERIAL a with(nolock)
+ inner join " + erpDatabaseName + @"T_BD_MATERIAL_L l with(nolock) on a.FMATERIALID=l.FMATERIALID
+ inner join " + erpDatabaseName + @"T_BD_MATERIALBASE b with(nolock) on a.FMATERIALID=b.FMATERIALID
+ inner join " + erpDatabaseName + @"T_BD_MATERIALSTOCK s with(nolock) on a.FMATERIALID=s.FMATERIALID
+ inner join " + erpDatabaseName + @"T_BD_MATERIALPRODUCE proce with(nolock) on a.FMATERIALID = proce.FMATERIALID
+ inner join " + erpDatabaseName + @"T_BD_Unit_L unit with(nolock) on isnull(s.FSTOREUNITID,0) = unit.FUNITID
+ Where l.FLOCALEID=2052
+ and unit.FLOCALEID = 2052
+ and a.FFORBIDSTATUS='A'
+ and a.FUSEORGID = 1
+ and proce.FWORKSHOPID = 477069 --鐢熶骇杞﹂棿(477069锛氭敞濉戣溅闂�)
+ and b.FErpClsID = 2 --鐗╂枡灞炴��(2锛氳嚜鍒�)
+ and
+ (
+ convert(varchar(100),a.FCREATEDATE,23) >= convert(varchar(100),DATEADD(day,-1,getdate()),23)
+ or
+ convert(varchar(100),a.FMODIFYDATE,23) >= convert(varchar(100),DATEADD(day,-1,getdate()),23)
+ )";
+ DataSet ds = oCN.RunProcReturn(sql, "" + erpDatabaseName + @"T_BD_MATERIAL");
+ if (ds != null && ds.Tables.Count > 0)
+ {
+ for(int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ Material material = new Material();
+ material.key = token;
+ material.productName = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HName"]);
+ material.partNum = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HNumber"]);
+ material.sepc = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HModel"]);
+ //material.weight = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i][""]);
+ //material.headWeight = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i][""]);
+ material.cycleTime = "1";
+ //material.flightsPartnum = "";
+ material.comments = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HRemark"]);
+ //material.colorName = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i][""]);
+ //material.pieceWage = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i][""]);
+ material.unit = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HUnitName"]);
+ material.systemType = "IMM";
+ material.tdDocNo = "";
+ //material.progressWay = "0";
+ //material.groupId = "";
+
+ material.option1 = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HUpdateDate"]);
+
+ materials.Add(material);
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閲戣澏浜戠墿鏂欐暟鎹幏鍙栧け璐�!";
+ objJsonResult.data = null;
+ }
+
+ //鍒ゆ柇鐗╂枡鍒楄〃涓殑鏁版嵁鏄惁鍦ㄥ皬璇歌憶涓凡缁忓瓨鍦ㄤ笖宸茬粡鏄渶鏂版暟鎹�傚鏋滃皬璇歌憶涓笉瀛樺湪鍒欏悓姝ュ埌灏忚钁涖�傚鏋滃皬璇歌憶涓瓨鍦紝鍒欒鐩栨暟鎹��
+ string errMsg = "";
+ List<Material> materials_waitSync = new List<Material>();
+ for(int i = 0; i < materials.Count; i++)
+ {
+ string HMaterNumber = materials[i].partNum;
+ MaterDetailResponse materDetailResponse = await getMaterDetailAsync(url, token, HMaterNumber);
+ if (materDetailResponse.code == "1")
+ {
+ if (materDetailResponse.data.details.option1 != materials[i].option1)
+ {
+ MaterialEdit materialEdit = new MaterialEdit();
+ materialEdit.key = token;
+ materialEdit.productId = materDetailResponse.data.details.partId;
+ materialEdit.productName = DBUtility.ClsPub.isStrNull(materials[i].productName);
+ materialEdit.partNum = DBUtility.ClsPub.isStrNull(materials[i].partNum);
+ materialEdit.sepc = DBUtility.ClsPub.isStrNull(materials[i].sepc);
+ //materialEdit.weight = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i][""]);
+ //materialEdit.headWeight = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i][""]);
+ materialEdit.cycleTime = "1";
+ //materialEdit.flightsPartnum = "";
+ materialEdit.comments = DBUtility.ClsPub.isStrNull(materials[i].comments);
+ //materialEdit.colorName = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i][""]);
+ //materialEdit.pieceWage = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i][""]);
+ materialEdit.unit = DBUtility.ClsPub.isStrNull(materials[i].unit);
+ materialEdit.systemType = "IMM";
+ materialEdit.tdDocNo = "";
+ //materialEdit.progressWay = "";
+ //materialEdit.groupId = "";
+
+ materialEdit.option1 = DBUtility.ClsPub.isStrNull(materials[i].option1);
+ MaterialEditResponse materialEditResponse = await getAddMaterEditAsync(url, materialEdit);
+ if (materialEditResponse.code == "0")
+ {
+ errMsg += "銆�" + HMaterNumber + "銆�" + materialEditResponse.msg + "锛�";
+ }
+ }
+ }
+ else
+ {
+ MaterialResponse materialResponse = await getAddMaterAsync(url, materials[i]);
+ if (materialResponse.code == "0")
+ {
+ errMsg += "銆�" + HMaterNumber + "銆�" + materialResponse.msg + "锛�";
+ }
+ }
+ }
+
+ if (errMsg.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍚屾澶辫触!" + errMsg;
+ objJsonResult.data = null;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍚屾鎴愬姛!" + errMsg;
+ objJsonResult.data = null;
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍚屾澶辫触!" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ #endregion
+
+ #region 鐢熶骇璁㈠崟
+ #region 鑾峰彇鐢熶骇璁㈠崟鍒楄〃淇℃伅
+ public async Task<ICMOListResponse> getICMOListAsync()
+ {
+ //璇锋眰鍦板潃
+ string url = await getServerAddressAsync() + "/v2/GET/getPlanOrder";
+ string token = await getTokenAsync();
+ //璇锋眰鍙傛暟
+ Dictionary<string, string> queryParams = new Dictionary<string, string>
+ {
+ {"key", token},
+ {"indexPage", "1"},
+ {"planStartDate", DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd")},
+ {"planEndDate", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}
+ };
+
+ //杩斿洖缁撴灉
+ string responseBody = await DefinedRequestSendMethod.GetDataAsyncByGetRequest(url, queryParams);
+
+ //灏嗗瓧绗︿覆杞崲涓哄璞�
+ ICMOListResponse icmoListResponse = Newtonsoft.Json.JsonConvert.DeserializeObject<ICMOListResponse>(responseBody);
+
+ return icmoListResponse;
+ }
+ #endregion
+
+ #region 鑾峰彇鐢熶骇璁㈠崟璇︾粏淇℃伅
+ public async Task<ICMODetailResponse> getICMODetailAsync(string url, string key, string planNum)
+ {
+ //璇锋眰鍦板潃
+ url = url + "/v2/GET/getPlanOrderDetail";
+ //璇锋眰鍙傛暟
+ Dictionary<string, string> queryParams = new Dictionary<string, string>
+ {
+ {"key", key},
+ {"planNum",planNum }
+ };
+
+ //杩斿洖缁撴灉
+ string responseBody = await DefinedRequestSendMethod.GetDataAsyncByGetRequest(url, queryParams);
+
+ //灏嗗瓧绗︿覆杞崲涓哄璞�
+ ICMODetailResponse icmoDetailResponse = Newtonsoft.Json.JsonConvert.DeserializeObject<ICMODetailResponse>(responseBody);
+
+ return icmoDetailResponse;
+ }
+ #endregion
+
+ #region 鏂板鐢熶骇璁㈠崟
+ public async Task<ICMOResponse> getAddICMOAsync(string url, ICMO icmo)
+ {
+
+ //璇锋眰鍦板潃
+ url = url + "/v2/POST/addPlan";
+
+ //POST璇锋眰鍙傛暟
+ Dictionary<string, string> queryParams = new Dictionary<string, string>
+ {
+ {"key", DBUtility.ClsPub.isStrNull(icmo.key)},
+ {"planNumber", DBUtility.ClsPub.isStrNull(icmo.planNumber)},
+ {"planQty",DBUtility.ClsPub.isStrNull(icmo.planQty)},
+ {"partNum", DBUtility.ClsPub.isStrNull(icmo.partNum)},
+ {"planStartDate", DBUtility.ClsPub.isStrNull(icmo.planStartDate)},
+ {"planEndDate", DBUtility.ClsPub.isStrNull(icmo.planEndDate)},
+ {"comments", DBUtility.ClsPub.isStrNull(icmo.comments)},
+ {"customerName", DBUtility.ClsPub.isStrNull(icmo.customerName)},
+ {"colorName", DBUtility.ClsPub.isStrNull(icmo.colorName)},
+ {"spec", DBUtility.ClsPub.isStrNull(icmo.spec)},
+ {"cpNo", DBUtility.ClsPub.isStrNull(icmo.cpNo)},
+ {"cpName", DBUtility.ClsPub.isStrNull(icmo.cpName)},
+ {"materialNo", DBUtility.ClsPub.isStrNull(icmo.materialNo)},
+ {"materialName", DBUtility.ClsPub.isStrNull(icmo.materialName)},
+ {"orderNumber", DBUtility.ClsPub.isStrNull(icmo.orderNumber)},
+ {"option1", DBUtility.ClsPub.isStrNull(icmo.option1)}
+ };
+
+ //POST璇锋眰Body鏁版嵁
+ var postData = new { };
+ string json = Newtonsoft.Json.JsonConvert.SerializeObject(postData);
+
+ //杩斿洖缁撴灉
+ string responseBody = await DefinedRequestSendMethod.GetDataAsyncByPOSTRequest(url, queryParams, json);
+
+ //灏嗗瓧绗︿覆杞崲涓哄璞�
+ ICMOResponse icmoResponse = Newtonsoft.Json.JsonConvert.DeserializeObject<ICMOResponse>(responseBody);
+
+ return icmoResponse;
+ }
+ #endregion
+
+ #region 缂栬緫鐢熶骇璁㈠崟
+ public async Task<ICMOEditResponse> getAddICMOEditAsync(string url, ICMOEdit icmo)
+ {
+
+ //璇锋眰鍦板潃
+ url = url + "/v2/POST/updatePlanInfo";
+
+ //POST璇锋眰鍙傛暟
+ Dictionary<string, string> queryParams = new Dictionary<string, string>
+ {
+ {"key", DBUtility.ClsPub.isStrNull(icmo.key)},
+ {"planId", DBUtility.ClsPub.isStrNull(icmo.planId)},
+ {"planNumber", DBUtility.ClsPub.isStrNull(icmo.planNumber)},
+ {"planQty",DBUtility.ClsPub.isStrNull(icmo.planQty)},
+ {"partNum", DBUtility.ClsPub.isStrNull(icmo.partNum)},
+ {"planStartDate", DBUtility.ClsPub.isStrNull(icmo.planStartDate)},
+ {"planEndDate", DBUtility.ClsPub.isStrNull(icmo.planEndDate)},
+ {"comments", DBUtility.ClsPub.isStrNull(icmo.comments)},
+ {"customerName", DBUtility.ClsPub.isStrNull(icmo.customerName)},
+ {"colorName", DBUtility.ClsPub.isStrNull(icmo.colorName)},
+ {"spec", DBUtility.ClsPub.isStrNull(icmo.spec)},
+ {"cpNo", DBUtility.ClsPub.isStrNull(icmo.cpNo)},
+ {"cpName", DBUtility.ClsPub.isStrNull(icmo.cpName)},
+ {"materialNo", DBUtility.ClsPub.isStrNull(icmo.materialNo)},
+ {"materialName", DBUtility.ClsPub.isStrNull(icmo.materialName)},
+ {"orderNumber", DBUtility.ClsPub.isStrNull(icmo.orderNumber)},
+ {"option1", DBUtility.ClsPub.isStrNull(icmo.option1)}
+ };
+
+ //POST璇锋眰Body鏁版嵁
+ var postData = new { };
+ string json = Newtonsoft.Json.JsonConvert.SerializeObject(postData);
+
+ //杩斿洖缁撴灉
+ string responseBody = await DefinedRequestSendMethod.GetDataAsyncByPOSTRequest(url, queryParams, json);
+
+ //灏嗗瓧绗︿覆杞崲涓哄璞�
+ ICMOEditResponse icmoEditResponse = Newtonsoft.Json.JsonConvert.DeserializeObject<ICMOEditResponse>(responseBody);
+
+ return icmoEditResponse;
+ }
+ #endregion
+
+ #region 鐢熶骇璁㈠崟瀹氭椂鍚屾_浠嶦RP鍒板皬璇歌憶
+ public async Task<json> icmoInfoSyncFromERPToXZG()
+ {
+ try
+ {
+ //璇锋眰鍦板潃
+ string url = await getServerAddressAsync();
+ string token = await getTokenAsync();
+
+ //鑾峰彇閲戣澏浜戠敓浜ц鍗曟暟鎹�
+ List<ICMO> icmos = new List<ICMO>();
+ string sql = @"select
+ cast(a.FBILLNO as varchar(100)) + '_' + cast(b.FSEQ as varchar(10)) + '_' + cast(b.FENTRYID as varchar(10)) 璁″垝鍗曞彿
+ ,cast(b.FQTY as int) - cast(c.FSTOCKINQUAAUXQTY as int) 璁″垝鏁伴噺
+ ,m.FNUMBER 浜у搧缂栧彿
+ ,convert(varchar(100),b.FPLANSTARTDATE,20) 璁″垝寮�宸ユ棩鏈�
+ ,convert(varchar(100),b.FPLANFINISHDATE,20) 璁″垝瀹屽伐鏃ユ湡
+ ,'ERP瀵煎叆' 澶囨敞
+ ,'' 瀹㈡埛鍚嶇О
+ ,'' 棰滆壊
+ ,isnull(m_l.FSPECIFICATION,'') 鍨嬪彿瑙勬牸
+ ,'' 鑹茬矇缂栧彿
+ ,'' 鑹茬矇鍚嶇О
+ ,'' 鏉愭枡缂栧彿
+ ,'' 鏉愭枡鍚嶇О
+ ,ISNULL(b.F_sans_Text,'') 璁㈠崟缂栧彿
+ ,ISNULL(convert(varchar(100),c.FSTARTDATE ,20),'') 寮�宸ユ棩鏈�
+ ,convert(varchar(100),a.FMODIFYDATE,20) 淇敼鏃ユ湡
+ from " + erpDatabaseName + @"T_PRD_MO as a
+ inner join " + erpDatabaseName + @"T_PRD_MOENTRY as b with(nolock) on a.FID = b.FID
+ inner join " + erpDatabaseName + @"T_PRD_MOENTRY_A as c with(nolock) on b.FID = c.FID and b.FEntryID = c.FEntryID
+ inner join " + erpDatabaseName + @"T_BD_MATERIAL as m with(nolock) on b.FMATERIALID = m.FMATERIALID
+ inner join " + erpDatabaseName + @"T_BD_MATERIAL_L as m_l with(nolock) on m.FMATERIALID=m_l.FMATERIALID
+ where m_l.FLOCALEID=2052
+ and isnull(a.FAPPROVERID,0)<> 0 --宸茬粡瀹℃牳
+ and isnull(c.fstatus,0) in (4) --涓氬姟鐘舵�侊紙1:璁″垝锛�2:璁″垝纭锛�3:涓嬭揪锛�4:寮�宸ワ紱5:瀹屽伐锛�6:缁撴锛�
+ and b.FWORKSHOPID in (477069) --鐢熶骇杞﹂棿(477069锛氭敞濉戣溅闂�)
+ --and a.FBillNo = 'MO233207'
+ and
+ (
+ convert(varchar(100),a.fmodifydate,23) >= convert(varchar(100),dateadd(day,-1,getdate()),23)
+ or
+ convert(varchar(100),c.fstartdate ,23) >= convert(varchar(100),dateadd(day,-1,getdate()),23)
+ )
+ --and cast(a.FBILLNO as varchar(100)) + '_' + cast(b.FSEQ as varchar(10)) = 'MO000269_1'";
+ DataSet ds = oCN.RunProcReturn(sql, "" + erpDatabaseName + @"T_PRD_MO");
+ if (ds != null && ds.Tables.Count > 0)
+ {
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ ICMO icmo = new ICMO();
+ icmo.key = token;
+ icmo.planNumber = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["璁″垝鍗曞彿"]);
+ icmo.planQty = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["璁″垝鏁伴噺"]);
+ icmo.partNum = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["浜у搧缂栧彿"]);
+ icmo.planStartDate = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["璁″垝寮�宸ユ棩鏈�"]);
+ icmo.planEndDate = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["璁″垝瀹屽伐鏃ユ湡"]);
+ icmo.comments = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["澶囨敞"]);
+ icmo.customerName = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["瀹㈡埛鍚嶇О"]);
+ icmo.colorName = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["棰滆壊"]);
+ icmo.spec = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["鍨嬪彿瑙勬牸"]);
+ icmo.cpNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["鑹茬矇缂栧彿"]);
+ icmo.cpName = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["鑹茬矇鍚嶇О"]);
+ icmo.materialNo = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["鏉愭枡缂栧彿"]);
+ icmo.materialName = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["鏉愭枡鍚嶇О"]);
+ icmo.orderNumber = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["璁㈠崟缂栧彿"]);
+ icmo.option1 = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["淇敼鏃ユ湡"]);
+
+ icmos.Add(icmo);
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "閲戣澏浜戠敓浜ц鍗曟暟鎹幏鍙栧け璐�!";
+ objJsonResult.data = null;
+ }
+
+ //鍒ゆ柇鐢熶骇璁㈠崟鍒楄〃涓殑鏁版嵁鏄惁鍦ㄥ皬璇歌憶涓凡缁忓瓨鍦ㄤ笖宸茬粡鏄渶鏂版暟鎹�傚鏋滃皬璇歌憶涓笉瀛樺湪鍒欏悓姝ュ埌灏忚钁涖�傚鏋滃皬璇歌憶涓瓨鍦紝鍒欒鐩栨暟鎹��
+ string errMsg = "";
+ for (int i = 0; i < icmos.Count; i++)
+ {
+ string HPlanNumber = icmos[i].planNumber;
+ ICMODetailResponse icmoDetailResponse = await getICMODetailAsync(url, token, HPlanNumber);
+ if (icmoDetailResponse.code == "1")
+ {
+ if (icmoDetailResponse.data[0].option1 != icmos[i].option1)
+ {
+ ICMOEdit icmoEdit = new ICMOEdit();
+ icmoEdit.key = token;
+ icmoEdit.planId = icmoDetailResponse.data[0].planId;
+ icmoEdit.planNumber = DBUtility.ClsPub.isStrNull(icmos[i].planNumber);
+ icmoEdit.planQty = DBUtility.ClsPub.isStrNull(icmos[i].planQty);
+ icmoEdit.partNum = DBUtility.ClsPub.isStrNull(icmos[i].partNum);
+ icmoEdit.planStartDate = DBUtility.ClsPub.isStrNull(icmos[i].planStartDate);
+ icmoEdit.planEndDate = DBUtility.ClsPub.isStrNull(icmos[i].planEndDate);
+ icmoEdit.comments = DBUtility.ClsPub.isStrNull(icmos[i].comments);
+ icmoEdit.customerName = DBUtility.ClsPub.isStrNull(icmos[i].customerName);
+ icmoEdit.colorName = DBUtility.ClsPub.isStrNull(icmos[i].colorName);
+ icmoEdit.spec = DBUtility.ClsPub.isStrNull(icmos[i].spec);
+ icmoEdit.cpName = DBUtility.ClsPub.isStrNull(icmos[i].cpName);
+ icmoEdit.materialNo = DBUtility.ClsPub.isStrNull(icmos[i].materialNo);
+ icmoEdit.materialName = DBUtility.ClsPub.isStrNull(icmos[i].materialName);
+ icmoEdit.orderNumber = DBUtility.ClsPub.isStrNull(icmos[i].orderNumber);
+ icmoEdit.option1 = DBUtility.ClsPub.isStrNull(icmos[i].option1);
+ ICMOEditResponse icmoEditResponse = await getAddICMOEditAsync(url, icmoEdit);
+ if (icmoEditResponse.code == "0")
+ {
+ errMsg += "銆�" + HPlanNumber + "銆�" + icmoEditResponse.msg + "锛�";
+ }
+ }
+ }
+ else
+ {
+ ICMOResponse icmoResponse = await getAddICMOAsync(url, icmos[i]);
+ if (icmoResponse.code == "0")
+ {
+ errMsg += "銆�" + HPlanNumber + "銆�" + icmoResponse.msg + "锛�";
+ }
+ }
+ }
+
+ if (errMsg.Length > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍚屾澶辫触!" + errMsg;
+ objJsonResult.data = null;
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍚屾鎴愬姛!" + errMsg;
+ objJsonResult.data = null;
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍚屾澶辫触!" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ #endregion
+
+ #region 鐢熶骇姹囨姤
+ #region 鑾峰彇宸插鏍哥殑鎶ュ伐璁板綍淇℃伅鍒楄〃淇℃伅
+ public async Task<ICMOReportListResponse> getICMOReportListAsync()
+ {
+ //璇锋眰鍦板潃
+ string url = await getServerAddressAsync() + "/v2/GET/getAuditedProduceReportList";
+ string token = await getTokenAsync();
+ //璇锋眰鍙傛暟
+ Dictionary<string, string> queryParams = new Dictionary<string, string>
+ {
+ {"key", token},
+ {"indexPage", "1"},
+ //{"startDate", DateTime.Now.AddDays(-30).ToString("yyyy-MM-dd")},
+ //{"endDate", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")},
+ {"sidx", "reportDate"},
+ {"sord", "desc"},
+ //{"tour", "鐧界彮"},
+ {"type", "1"},
+ {"reportStartDate", DateTime.Now.AddDays(-30).ToString("yyyy-MM-dd HH:mm:ss")},
+ {"reportEndDate", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}
+ };
+
+ //杩斿洖缁撴灉
+ string responseBody = await DefinedRequestSendMethod.GetDataAsyncByGetRequest(url, queryParams);
+
+ //灏嗗瓧绗︿覆杞崲涓哄璞�
+ ICMOReportListResponse icmoReportListResponse = Newtonsoft.Json.JsonConvert.DeserializeObject<ICMOReportListResponse>(responseBody);
+
+ return icmoReportListResponse;
+ }
+ #endregion
+
+ #region 鑾峰彇鐢熶骇姹囨姤璇︾粏淇℃伅
+ public async Task<ICMOReportDetailResponse> getICMOReportDetailAsync(string url, string key, string reportId)
+ {
+ //璇锋眰鍦板潃
+ url = url + "/v2/GET/getProduceRecordReport";
+ //璇锋眰鍙傛暟
+ Dictionary<string, string> queryParams = new Dictionary<string, string>
+ {
+ {"key", key},
+ {"reportId",reportId }
+ };
+
+ //杩斿洖缁撴灉
+ string responseBody = await DefinedRequestSendMethod.GetDataAsyncByGetRequest(url, queryParams);
+
+ //灏嗗瓧绗︿覆杞崲涓哄璞�
+ ICMOReportDetailResponse icmoReportDetailResponse = Newtonsoft.Json.JsonConvert.DeserializeObject<ICMOReportDetailResponse>(responseBody);
+
+ return icmoReportDetailResponse;
+ }
+ #endregion
+
+ #region 鐢熶骇姹囨姤瀹氭椂鍚屾_浠庡皬璇歌憶鍒癊RP
+ public async Task<json> icmoReportInfoSyncFromXZGToERP()
+ {
+ string sErrMsg = "";
+ try
+ {
+ //璇锋眰鍦板潃
+ string url = await getServerAddressAsync();
+ string token = await getTokenAsync();
+
+ ICMOReportListResponse iCMOReportListResponse = await getICMOReportListAsync();
+ List<ICMOReportListResponse_Data_Data> iCMOReportList = new List<ICMOReportListResponse_Data_Data>();
+ for(int i = 0; i < iCMOReportListResponse.data.Count; i++)
+ {
+ for(int j=0;j< iCMOReportListResponse.data[i].data.Count; j++)
+ {
+ string sql = "select * from " + erpDatabaseName + @"T_PRD_MORPT where FBillNo = '" + iCMOReportListResponse.data[i].data[j].produceReportId + "'";
+ DataSet ds_erp = oCN.RunProcReturn(sql, "" + erpDatabaseName + @"T_PRD_MORPT");
+ if(ds_erp!=null&ds_erp.Tables[0].Rows.Count == 0)
+ {
+ iCMOReportList.Add(iCMOReportListResponse.data[i].data[j]);
+ }
+ }
+ }
+
+ ////閲戣澏浜戠敓浜ф眹鎶ュ崟锛氭壒閲忓悓姝�
+ //ICMOReportListResponse_Data_Data data = new ICMOReportListResponse_Data_Data();
+ //data.planNo = "MO000269_1_100483";
+ //data.reportDate = "2025-04-27 00:00:00";
+ //data.standardNum = "1";
+ //data.produceReportId = "1234321";
+ //iCMOReportList.Add(data);
+
+ objJsonResult = set_SaveICMOReportBillList(iCMOReportList);
+
+ //objJsonResult.code = "1";
+ //objJsonResult.count = 1;
+ //objJsonResult.Message = "鍚屾鎴愬姛!";
+ //objJsonResult.data = null;
+
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍚屾澶辫触!" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鐢熶骇姹囨姤 鎵归噺鏂板
+ public json set_SaveICMOReportBillList(List<ICMOReportListResponse_Data_Data> iCMOReportList)
+ {
+ string sErrMsg = "";
+ string sRemark = "";
+ string sRemark_errAudit = "";
+
+ try
+ {
+ for (int i = 0; i < iCMOReportList.Count; i++)
+ {
+ objJsonResult = set_SaveICMOReportBill(iCMOReportList[i]);
+ if (objJsonResult.code == "1" && objJsonResult.count == 1)
+ {
+ sRemark += objJsonResult.Message;
+ }else if(objJsonResult.code == "1" && objJsonResult.count == 0)
+ {
+ sRemark_errAudit += objJsonResult.Message;
+ }
+ else
+ {
+ sErrMsg += objJsonResult.Message;
+ }
+ }
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "銆愬悓姝ュ苟瀹℃牳鎴愬姛淇℃伅銆戯細" + sRemark + "锛涖�愬悓姝ユ垚鍔熶絾瀹℃牳澶辫触淇℃伅銆戯細" + sRemark_errAudit + "锛涖�愬悓姝ュけ璐ヤ俊鎭細銆戯細" + sErrMsg ; //鎴愬姛锛�
+ 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 鐢熶骇姹囨姤 鏂板
+ public json set_SaveICMOReportBill(ICMOReportListResponse_Data_Data data)
+ {
+ string sErrMsg = "";
+
+ //鐢ㄤ簬璁板綍杩囩▼鏁版嵁锛屼綔涓烘棩璁版暟鎹�
+ string sRemark = "";
+ try
+ {
+ try
+ {
+ #region 浠庨厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
+ //鐧诲綍
+ string HReturn;
+ bool bLogin = false;
+ var loginRet = InvokeHelper.LoginUser(data.reportUser);
+ string dbId = Pub_Class.ClsPub.sCLOUDAcc; //AotuTest117
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ if (isSuccess <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = loginRet;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ bLogin = true;
+ sRemark = sRemark + " 锛涜幏鍙栭獙璇丆LOUD璐﹀彿瀵嗙爜" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+ }
+ #endregion
+
+ #region 鍒ゆ柇鐢熶骇璁㈠崟鐘舵�� 鏄惁涓� 瀹屽伐 鎴栫粨妗�
+ string[] planNoSplit = data.planNo.Split('_');
+ string HICMOBillNo = planNoSplit[0];
+ string HICMOSEQ = planNoSplit[1];
+ string HICMOEntryID = planNoSplit[2];
+
+ string sql_judgeICMOStatus = @"select distinct
+ mo.FBILLNO
+ from " + erpDatabaseName + @"T_PRD_MO mo
+ inner join " + erpDatabaseName + @"T_PRD_MOENTRY_A a on mo.FID=a.FID
+ where a.FSTATUS in (5,6)
+ and mo.FBILLNO = '" + HICMOBillNo + "' " +
+ "and a.FENTRYID = " + HICMOEntryID;
+ DataSet Ds2;
+ Ds2 = oCN.RunProcReturn(sql_judgeICMOStatus, "" + erpDatabaseName + @"T_PRD_MO");
+ if (Ds2 != null && Ds2.Tables[0].Rows.Count > 0)
+ {
+ sErrMsg = "鐢熶骇璁㈠崟銆� " + HICMOBillNo + "銆戜笟鍔＄姸鎬佸凡瀹屽伐涓嶅厑璁告眹鎶ワ紒";
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ #endregion
+
+ #region 鑾峰彇閲戣澏浜戠敓鎴愬崟鎹甹son
+ string json = getErpJSON(data);
+ sRemark = sRemark + " 锛涜幏鍙朇LOUD鍗曟嵁API閫掑叆鍊�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+ #endregion
+
+ #region 鐢熸垚閲戣澏浜戝崟鎹�
+ if (bLogin)
+ {
+ var result = InvokeHelper.Save("PRD_MORPT", json);
+ sRemark = sRemark + " 锛涚敓鎴怌LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
+ //鑾峰彇閲戣澏浜戝崟鎹敓鎴愯繑鍥炰俊鎭�
+ HReturn = result.ToString();
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ sErrMsg = "鐢熸垚鐢熶骇姹囨姤鍗曞け璐ワ紒" + HReturn;
+ LogService.Write("鐢熸垚鐢熶骇姹囨姤鍗曪紙婧愬崟锛氱敓浜ц鍗曪級澶辫触锛�" + HReturn + json); //鍐欏叆txt鏂囨湰
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = sErrMsg; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ sRemark = sRemark + json;
+ }
+ }
+ else
+ {
+ sErrMsg = "鐢熸垚鐢熶骇姹囨姤鍗曞け璐ワ紒閲戣澏浜戠櫥褰曞け璐ワ紒";
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = sErrMsg; //鎴愬姛锛�
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ #endregion
+
+ }
+ catch (Exception e)
+ {
+ sErrMsg = "鐢熸垚鐢熶骇姹囨姤鍗曞け璐ワ紒" + e.Message;
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ #region 瀹℃牳鍗曟嵁
+ try
+ {
+ //鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
+ #region 浠庨厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
+ //鐧诲綍
+ string HReturn = "";
+ bool bLogin = false;
+ var loginRet = InvokeHelper.LoginUser(data.auditUser);
+ string dbId = Pub_Class.ClsPub.sCLOUDAcc; //AotuTest117
+ var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
+ if (isSuccess <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = loginRet;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ bLogin = true;
+ sRemark = sRemark + " 锛涜幏鍙栭獙璇丆LOUD璐﹀彿瀵嗙爜" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+ }
+ #endregion
+
+ if (bLogin)
+ {
+ ////鎻愪氦鍗曟嵁
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + data.produceReportId + "\"]}";
+ var result2 = InvokeHelper.Submit("PRD_MORPT", sJson2);
+
+ //瀹℃牳鍗曟嵁
+ string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + data.produceReportId + "\"]}";
+ var result3 = InvokeHelper.Audit("PRD_MORPT", sJson3);
+
+ HReturn = result2.ToString() + "," + result3.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ LogService.Write("瀹℃牳鍗曟嵁澶辫触" + sRemark);
+ sErrMsg = "鐢熸垚鐢熶骇姹囨姤鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 0;
+ objJsonResult.Message = sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ LogService.Write("鐢熸垚骞跺鏍哥敓浜ф眹鎶ュ崟锛堟簮鍗曪細鐢熶骇璁㈠崟锛夋垚鍔燂紒" + sRemark);
+ sErrMsg = "鐢熸垚骞跺鏍哥敓浜ф眹鎶ュ崟鎴愬姛锛佸崟鎹彿涓猴細" + data.produceReportId;
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ sErrMsg = "瀹℃牳鐢熶骇姹囨姤鍗曞け璐ワ紒閲戣澏浜戠櫥褰曞け璐ワ紒";
+ objJsonResult.code = "1";
+ objJsonResult.count = 0;
+ objJsonResult.Message = sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ sErrMsg = "瀹℃牳鐢熶骇姹囨姤鍗曞け璐ワ紒" + e.Message;
+ objJsonResult.code = "1";
+ objJsonResult.count = 0;
+ objJsonResult.Message = sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ #endregion
+ }catch(Exception e0)
+ {
+ sErrMsg = "鐢熸垚鐢熶骇姹囨姤鍗曞け璐ワ紒" + e0.Message;
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 鏍规嵁鑾峰彇鐨勬姤宸ヤ俊鎭紝鎷兼帴json璇彞
+ public string getErpJSON(ICMOReportListResponse_Data_Data data)
+ {
+ //try
+ //{
+ //data.planNo = "MO000269_1_100483";
+ //data.reportDate = "2025-04-27 00:00:00";
+ //data.standardNum = "1";
+ //data.produceReportId = "1234321";
+
+ // 鑾峰彇鐢熶骇姹囨姤鐨勬簮鍗曚俊鎭�
+ string[] planNoSplit = data.planNo.Split('_');
+ string HICMOBillNo = planNoSplit[0];
+ string HICMOSEQ = planNoSplit[1];
+ string HICMOEntryID = planNoSplit[2];
+
+ //鏍规嵁鎶ュ伐淇℃伅锛岃幏鍙栫浉鍏充俊鎭�
+ string sql1 = @"select
+ isnull(org1.hnumber,'') FPRDORGIDNumber
+ ,ISNULL(org1.HItemID,0) FPRDORGID
+ ,isnull(moSub.FPRODUCTTYPE,'1') FPRODUCTTYPE
+ ,ISNULL(pr.HNumber,'') FAUXPROPNumber
+ ,ISNULL(unit.HNumber,'') FUNITNumber
+ ,ISNULL(dept.HNumber,'') FWORKSHOPNumber
+ ,isnull(moSub.FMTONO,'') FMTONO
+ ,isnull(moSubA.FCHECKPRODUCT,'false') FCHECKPRODUCT
+ ,isnull(mo.FISENTRUST,'false') FISENTRUST
+ ,isnull(moSub.FPROJECTNO,'') FPROJECTNO
+ ,isnull(mp.FPERUNITSTANDHOUR,0) FSTDMANHOUR
+ ,isnull(mp.FSTDLABORPREPARETIME,0) FHRPREPARETIME
+ ,isnull(mp.FSTDMACHINEPREPARETIME,0) FMACPREPARETIME
+ ,isnull(mo.FID,0) FSRCINTERID
+ ,isnull(moSub.FSEQ,0) FSRCENTRYSEQ
+ ,isnull(mo.FID,0) FMOID
+ ,isnull(moSub.FENTRYID,0) FMOENTRYID
+ ,isnull(unit1.HNumber,'') FBASEUNITID
+ ,isnull(org1.HNumber,'') FSTOCKINORGID
+ ,isnull(moSubA.FINSTOCKOWNERTYPEID,'') FOWNERTYPEID
+ ,isnull(org2.HNumber,'') FOWNERID
+ ,isnull(moSub.FCOSTRATE,0) FCOSTRATE
+ ,isnull('','') FSTOCKID
+ ,isnull(moSubA.FISBACKFLUSH,'false') FISBACKFLUSH
+ ,isnull(moSub.FENTRYID,0) FMOMAINENTRYID
+ ,isnull(moSubA.FQAIP,'') FQAIP
+
+ ,isnull(moSubA.FREQSRC,'') FREQSRC
+ ,isnull(moSub.FSALEORDERNO,'') FREQBILLNO
+ ,isnull(moSub.FSALEORDERID,0) FREQBILLID
+ ,isnull(moSub.FSALEORDERENTRYSEQ,0) FREQENTRYSEQ
+ ,isnull(moSub.FSALEORDERENTRYID,0) FREQENTRYID
+ ,isnull(moSubA.FINSTOCKTYPE,'1') FINSTOCKTYPE
+ from " + erpDatabaseName + @"T_PRD_MO mo with(nolock)
+ left join " + erpDatabaseName + @"T_PRD_MOENTRY moSub with(nolock) on mo.FID=moSub.FID
+ left join " + erpDatabaseName + @"T_PRD_MOENTRY_A moSubA with(nolock) on moSubA.FID=moSub.FID and moSubA.FENTRYID=moSub.FENTRYID
+ left join Xt_ORGANIZATIONS org1 with(nolock) on mo.FPRDORGID=org1.HItemID --鐢熶骇缁勭粐
+ left join xt_ORGANIZATIONS org2 with(nolock) on moSubA.FINSTOCKOWNERID=org2.HItemID --鍏ュ簱璐т富
+ left join " + erpDatabaseName + @"t_BD_MaterialProduce mp with(nolock) on moSub.FMATERIALID=mp.FMATERIALID --鐗╂枡鐢熶骇淇℃伅
+ left join Gy_Unit as unit with(nolock) on moSub.FUNITID = unit.HItemID
+ left join Gy_Unit as unit1 with(nolock) on moSub.FBASEUNITID = unit1.HItemID
+ left join Gy_Property pr on moSub.FAUXPROPID = pr.HItemID
+ left join Gy_Department dept on moSub.FWORKSHOPID = dept.HItemID
+ where
+ mo.FBillNo = '" + HICMOBillNo + "' " +
+ " and moSub.FENTRYID = " + HICMOEntryID;
+ DataSet jsonData = oCN.RunProcReturn(sql1, "" + erpDatabaseName + @"T_PRD_MO");
+ if (jsonData == null || jsonData.Tables[0].Rows.Count == 0)
+ {
+ return "";
+ }
+
+ string FBillType = "SCHBD01_SYS"; //鍗曟嵁绫诲瀷
+ string FPRDORGIDNumber = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FPRDORGIDNumber"]); //鐢熶骇缁勭粐缂栫爜
+ string FPRDORGID = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FPRDORGID"]); //鐢熶骇缁勭粐缂栫爜
+ string FAUXPROPNumber = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FAUXPROPNumber"]); //杈呭姪灞炴��
+ string FIsNew = "false"; //鏄惁鏂板琛�
+ string FPRODUCTTYPE = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FPRODUCTTYPE"]); //浜у搧绫诲瀷
+ string FREPORTTYPE = ""; //鐢熶骇姹囨姤绫诲瀷
+ string FUNITNumber = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FUNITNumber"]); //鍗曚綅缂栫爜
+ string FWORKSHOPNumber = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FWORKSHOPNumber"]); //閮ㄩ棬
+ string FMTONO = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FMTONO"]); //璁″垝璺熻釜鍙�
+ string FCHECKPRODUCT = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FCHECKPRODUCT"]); //浜у搧妫�楠�
+ string FISENTRUST = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FISENTRUST"]); //缁勭粐濮旀墭鍔犲伐
+ string FSRCBILLTYPE = "PRD_MO"; //婧愬崟绫诲瀷
+ string FPROJECTNO = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FPROJECTNO"]); //椤圭洰缂栧彿
+ string FSTDMANHOUR = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FSTDMANHOUR"]); //鍗曚綅鏍囧噯宸ユ椂
+ string FHRPREPARETIME = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FHRPREPARETIME"]); //浜哄憳鍑嗗宸ユ椂
+ string FMACPREPARETIME = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FMACPREPARETIME"]); //鏈哄櫒鍑嗗宸ユ椂
+ string FSRCINTERID = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FSRCINTERID"]); //婧愬崟鍐呯爜
+ string FSRCENTRYSEQ = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FSRCENTRYSEQ"]); //婧愬崟琛屽彿
+ string FMOID = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FMOID"]); //鐢熶骇璁㈠崟鍐呯爜
+ string FMOENTRYID = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FMOENTRYID"]); //鐢熶骇璁㈠崟鍒嗗綍鍙�
+ string FBASEUNITID = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FBASEUNITID"]); //鍩烘湰鍗曚綅
+ string FSTOCKINORGID = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FSTOCKINORGID"]); //鍏ュ簱缁勭粐
+ string FBOMID = ""; //BOM鐗堟湰
+ string FOWNERTYPEID = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FOWNERTYPEID"]); //璐т富绫诲瀷
+ string FOWNERID = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FOWNERID"]); //璐т富
+ string FSTOCKID = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FSTOCKID"]); //浠撳簱
+ string FCOSTRATE = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FCOSTRATE"]); //鎴愭湰鏉冮噸
+ string FSNUNITID = ""; //搴忓垪鍙峰崟浣�
+ string FISBACKFLUSH = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FISBACKFLUSH"]); //鍊掑啿棰嗘枡
+ string FMOMAINENTRYID = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FMOMAINENTRYID"]); //鐢熶骇璁㈠崟涓讳骇鍝佸垎褰�
+ string FQAIP = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FQAIP"]); //绱ф�ユ斁琛�
+ string FREQSRC = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FREQSRC"]); //闇�姹傛潵婧�
+ string FREQBILLNO = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FREQBILLNO"]); //闇�姹傚崟鎹�
+ string FREQBILLID = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FREQBILLID"]); //闇�姹傚崟鎹唴鐮�
+ string FREQENTRYSEQ = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FREQENTRYSEQ"]); //闇�姹傚崟鎹鍙�
+ string FREQENTRYID = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FREQENTRYID"]); //闇�姹傚崟鎹垎褰曞唴鐮�
+ string FINSTOCKTYPE = Pub_Class.ClsPub.isStrNull(jsonData.Tables[0].Rows[0]["FINSTOCKTYPE"]); //渚涗笅鎺ㄥ叆搴撳崟浣跨敤-鍏ュ簱绫诲瀷
+ string FEntity_Link_FFlowId = "f6e6eec3-5267-4f02-8593-b633da508a72"; //涓氬姟娴佺▼鍥�
+ string FEntity_Link_FFlowLineId = "3"; //鎺ㄨ繘璺嚎
+ string FEntity_Link_FRuleId = "PRD_MO2MORPT"; //杞崲瑙勫垯
+ string FEntity_Link_FSTableName = "T_PRD_MOENTRY"; //婧愬崟琛�
+ string FBFLOWID = "f6e6eec3-5267-4f02-8593-b633da508a72"; //涓氬姟娴佺▼
+
+ //鑾峰彇鐢熶骇姹囨姤绫诲瀷
+ string sql2 = @"select top(1)
+ FNUMBER FREPORTTYPE
+ from " + erpDatabaseName + @"T_PRD_REPORTTYPE with(nolock)
+ Where FUSEORGID = " + FPRDORGID +
+ " and FISDEFREPTYPE=1";
+ DataSet jsonData2 = oCN.RunProcReturn(sql2, "T_PRD_REPORTTYPE");
+ if (jsonData2 != null && jsonData2.Tables[0].Rows.Count > 0)
+ {
+ FREPORTTYPE = Pub_Class.ClsPub.isStrNull(jsonData2.Tables[0].Rows[0]["FREPORTTYPE"]);
+ }
+
+
+
+
+ //鏈�缁堣鍙�
+ string json = "";
+
+ string sJson_ZYMESFLAG = ""; //鐢熶骇姹囨姤鍗曞悓姝ES鏍囪
+ string sJson_MainCustom = ""; //涓昏〃鑷畾涔夊瓧娈�
+ string sJson_Date = ""; //鍗曟嵁鏃ユ湡
+
+ //sJson_MainCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["MainCustom"]);
+ //鍗曟嵁鏃ユ湡
+ sJson_Date = ",\"FDATE\":\"" + data.reportDate + "\"";
+ sJson_ZYMESFLAG = "";
+
+
+ string sJson_Main =
+ "{" +
+ "\"Creator\":\"\"" +
+ ",\"NeedUpDateFields\":[]" +
+ ",\"NeedReturnFields\":[]" +
+ ",\"IsDeleteEntry\":\"True\"" +
+ ",\"SubSystemId\":\"\"" +
+ ",\"IsVerifyBaseDataField\":\"false\"" +
+ ",\"IsEntryBatchFill\":\"false\"" +
+ ",\"ValidateFlag\":\"True\"" +
+ ",\"NumberSearch\":\"True\"" +
+ ",\"InterationFlags\":\"\"" +
+ ",\"Model\": " +
+ "{ " +
+ "\"FBILLNO\":\"" + data.produceReportId + "\"" +
+ //",\"FID\":\"" + oMain.HInterID.ToString() + "\"" +
+ ",\"FBillType\":" +
+ "{" +
+ "\"FNumber\":\"" + FBillType + "\"" +
+ "}" +
+ ",\"FDocumentStatus\":\"\"" +
+ sJson_Date +
+ ",\"FPRDORGID\":" +
+ "{" +
+ "\"FNumber\":\"" + FPRDORGIDNumber + "\"" +
+ "}" +
+ //",\"FWorkshipIdH\":" +
+ // "{" +
+ // "\"FNumber\":\"\"" +
+ // "}" +
+ //",\"FDescription\":\"\"" +
+ sJson_ZYMESFLAG +
+ sJson_MainCustom +
+ ",\"FEntity\": [ ";
+
+ string sJson_Entry = "";
+
+ string sJson_BatchNo = "";
+ string sJson_StockPlace = "";
+ string sJson_FProduceDate = ""; //鐢熶骇鏃ユ湡
+ string sJson_FExpiryDate = ""; //鏈夋晥鏈熻嚦
+ string sJson_EntryCustom = "";
+ string sJson_FAUXPROPID = "";
+ string sJson_SubCustom = ""; //瀛愯〃鑷畾涔夊瓧娈�
+
+ //瀛愯〃鑷畾涔夊瓧娈�
+ //sJson_SubCustom = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["SubCustom"]);
+
+ ////鏄惁鍚敤鎵规绠＄悊
+ //if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["HISBATCHMANAGE"]) == "1")
+ //{
+ // sJson_BatchNo = " \"FLOT\": {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\"}, \"FLOT_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\" , ";
+ //}
+ //else
+ //{
+ // sJson_BatchNo = "";
+ //}
+
+ ////鏄惁鍚敤淇濊川鏈熸帶鍒�
+ //if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FISKFPERIOD"]) == "1")
+ //{
+ // sJson_FProduceDate = " \"FProduceDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FProduceDate"]) + "\",";
+ // sJson_FExpiryDate = " \"FExpiryDate\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FExpiryDate"]) + "\",";
+ //}
+ //else
+ //{
+ // sJson_FProduceDate = "";
+ // sJson_FExpiryDate = "";
+ //}
+
+ //杈呭姪灞炴��
+ sJson_FAUXPROPID = ", \"FAUXPROPID\":" +
+ "{" +
+ "\"FAUXPROPID__FF100002\":" +
+ "{" +
+ "\"FNumber\":\"" + FAUXPROPNumber + "\"" +
+ "}" +
+ "}";
+
+
+ ////浠撲綅
+ //if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSTOCKLOCID"]) == "")
+ //{
+ // sJson_StockPlace = "";
+ //}
+ //else
+ //{
+ // sJson_StockPlace = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSTOCKLOCID"]) + "\"}},";
+ //}
+
+ //鑷畾涔夊瓧娈靛鐞�
+ sJson_EntryCustom = "";
+
+ sJson_Entry = sJson_Entry +
+ " {" +
+ //"\"FEntryID\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["HEntryID"]) + "," +
+ " \"FSRCENTRYID\":" + HICMOEntryID + "" +
+ ", \"FIsNew\":" + FIsNew + "" +
+ ", \"FMATERIALID\":" +
+ "{" +
+ "\"FNumber\":\"" + data.partNum + "\"" +
+ "}" +
+ ", \"FPRODUCTTYPE\":\"" + FPRODUCTTYPE + "\"" +
+ ", \"FREPORTTYPE\":" +
+ "{" +
+ "\"FNumber\":\"" + FREPORTTYPE + "\"" +
+ "}" +
+ ", \"FUNITID\":" +
+ "{" +
+ "\"FNumber\":\"" + FUNITNumber + "\"" +
+ "}" +
+ ", \"FWORKSHIPID\":" +
+ "{" +
+ "\"FNumber\":\"" + FWORKSHOPNumber + "\"" +
+ "}" +
+ //", \"FShiftGroupId\":{\"FNumber\":\"\"}" +
+ sJson_BatchNo +
+ //\"FDeptId\":{\"FNumber\":\"\"},
+ //sJson_StockPlace + //浠撲綅绉诲埌涓嬫柟
+ ", \"FMTONO\":\"" + FMTONO + "\"" +
+ ", \"FCHECKPRODUCT\":" + FCHECKPRODUCT + "" +
+ ", \"FISENTRUST\":" + FISENTRUST + "" +
+ ", \"FSRCBILLTYPE\":\"" + FSRCBILLTYPE + "\"" +
+ ", \"FMOBILLNO\":\"" + HICMOBillNo + "\"" +
+ //", \"FAUXPROPID\":" +
+ // "{" +
+ // "\"FAUXPROPID__FF100002\":" +
+ // "{" +
+ // "\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FAUXPROPID"]) + "\"" +
+ // "}" +
+ // "}" +
+ sJson_FAUXPROPID +
+ //", \"FHumanQty\":\"0\"" +
+ ", \"FSRCBILLNO\":\"" + HICMOBillNo + "\"" +
+ //", \"FMachineQty\":\"0\"" +
+ //", \"FMaterialUnitID\":" +
+ // "{" +
+ // "\"FNumber\":\"\"" +
+ // "}" +
+ //", \"FStartTime\":\"1900-01-01\"" +
+ //", \"FEndTime\":\"1900-01-01\"" +
+ //", \"FTimeUnitId\":\"\"" +
+ ", \"FMOENTRYSEQ\":" + HICMOSEQ + "" +
+ //", \"FSTANDHOURUNITID\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSTANDHOURUNITID"]) + "\"" +
+ ", \"FPROJECTNO\":\"" + FPROJECTNO + "\"" +
+ ", \"FSTDMANHOUR\":" + FSTDMANHOUR + "" +
+ ", \"FHRPREPARETIME\":" + FHRPREPARETIME + "" +
+ //", \"FHrWorkTime\":\"0\"" +
+ ", \"FMACPREPARETIME\":" + FMACPREPARETIME + "" +
+ //",\"FMacWorkTime\":\"0\"" +
+ //",\"FDescriptionE\":\"\"" +
+ ", \"FSRCINTERID\":" + FSRCINTERID + "" +
+ ", \"FSRCENTRYSEQ\":" + FSRCENTRYSEQ + "" +
+ ", \"FMOID\":" + FMOID + "" +
+ ", \"FMOENTRYID\":" + FMOENTRYID + "" +
+ ", \"FBASEUNITID\":" +
+ "{" +
+ "\"FNumber\":\"" + FBASEUNITID + "\"" +
+ "}" +
+ ", \"FSTOCKINORGID\":" +
+ "{" +
+ "\"FNumber\":\"" + FSTOCKINORGID + "\"" +
+ "}" +
+ ", \"FBOMID\":" +
+ "{" +
+ "\"FNumber\":\"" + FBOMID + "\"" +
+ "}" +
+ ", \"FOWNERTYPEID\":\"" + FOWNERTYPEID + "\"" +
+ ", \"FOWNERID\":" +
+ "{" +
+ "\"FNumber\":\"" + FOWNERID + "\"" +
+ "}" +
+ ", \"FSTOCKID\":" +
+ "{" +
+ "\"FNumber\":\"" + FSTOCKID + "\"" +
+ "}" +
+ ", \"FCOSTRATE\":" + FCOSTRATE + "" +
+ ", \"FSNUNITID\":" +
+ "{" +
+ "\"FNumber\":\"" + FSNUNITID + "\"" +
+ "}" +
+ //", \"FSNQty\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FSNQty"]) + "" +
+ sJson_FProduceDate +
+ sJson_FExpiryDate +
+ ", \"FISBACKFLUSH\":" + FISBACKFLUSH + "" +
+ ", \"FMOMAINENTRYID\":" + FMOMAINENTRYID + "" +
+ ", \"FQAIP\":\"" + FQAIP + "\"" +
+ ", \"FREQSRC\":\"" + FREQSRC + "\"" +
+ ", \"FREQBILLNO\":\"" + FREQBILLNO + "\"" +
+ ", \"FREQBILLID\":" + FREQBILLID + "" +
+ ", \"FREQENTRYSEQ\":" + FREQENTRYSEQ + "" +
+ ", \"FREQENTRYID\":" + FREQENTRYID + "" +
+ ", \"FBASEQUAQTY\":" + data.standardNum + "" +
+ ", \"FQUAQTY\":" + data.standardNum + "" +
+ ", \"FBASEFINISHQTY\":" + data.standardNum + "" +
+ ", \"FFINISHQTY\":" + data.standardNum + "" +
+ ", \"FInStockType\":\"" + FINSTOCKTYPE + "\"" +
+ sJson_StockPlace +
+ sJson_EntryCustom +
+ sJson_SubCustom +
+
+ //",\"FSerialSubEntity\":" +
+ // "[" +
+ // "{" +
+ // "\"FDetailID\":\"0\"" +
+ // ",\"FQCMaterialId\":" +
+ // "{" +
+ // "\"FNUMBER\":\"\"" +
+ // "}" +
+ // ",\"FInspectResult\":\"\"" +
+ // ",\"FQcAuxPropId\":" +
+ // "{" +
+ // "\"FQCAUXPROPID__FF100002\":" +
+ // "{" +
+ // "\"FNumber\":\"\"" +
+ // "}" +
+ // "}" +
+ // ",\"FQCQty\":\"0\"" +
+ // ",\"FSerialNo\":\"\"" +
+ // ",\"FSerialId\":" +
+ // "{" +
+ // "\"FNUMBER\":\"\"" +
+ // "}" +
+ // ",\"FQCStockInSelQty\":\"0\"" +
+ // ",\"FSerialNote\":\"\"" +
+ // ",\"FBaseQCQty\":\"0\"" +
+ // ",\"FBaseQCStockInSelQty\":\"0\"" +
+ // "}" +
+ // "]"
+
+ ", \"FEntity_Link\": " +
+ "[" +
+ "{" +
+ " \"FEntity_Link_FFlowId\":\"" + FEntity_Link_FFlowId + "\"" +
+ ", \"FEntity_Link_FFlowLineId\":\"" + FEntity_Link_FFlowLineId + "\"" +
+ ", \"FEntity_Link_FRuleId\":\"" + FEntity_Link_FRuleId + "\"" +
+ ", \"FEntity_Link_FSTableName\":\"" + FEntity_Link_FSTableName + "\"" +
+ ", \"FEntity_Link_FSBillId\":\"" + FMOID + "\"" +
+ ", \"FEntity_Link_FSId\":\"" + FMOENTRYID + "\"" +
+ " }" +
+ " ]" +
+ ", \"FBFLOWID\":" +
+ "{" +
+ "\"FID\":\"" + FBFLOWID + "\"" +
+ "}" +
+ "}";
+
+
+ string sJson_End = " ] }}";
+
+
+ json = sJson_Main + sJson_Entry + sJson_End;
+
+
+ return json;
+ //}catch(Exception e)
+ //{
+ // return e.Message;
+ //}
+ }
+ #endregion
+ #endregion
+ }
+ #endregion
+
+
+}
+
+
+
+
+#region HTTP璇锋眰绫�
+class DefinedRequestSendMethod
+{
+
+ #region Get璇锋眰
+ public static async Task<string> GetDataAsyncByGetRequest(string url, Dictionary<string, string> queryParams)
+ {
+ //杩斿洖瀛楃涓�
+ string responseBody = "";
+
+ using (HttpClient client = new HttpClient())
+ {
+ string apiUrl = url + ToQueryString(queryParams);
+
+ HttpResponseMessage response = await client.GetAsync(apiUrl);
+ response.EnsureSuccessStatusCode();
+
+ responseBody = await response.Content.ReadAsStringAsync();
+ }
+
+ return responseBody;
+ }
+ #endregion
+
+ #region POST璇锋眰
+ public static async Task<string> GetDataAsyncByPOSTRequest(string url, Dictionary<string, string> queryParams, string json)
+ {
+ //杩斿洖瀛楃涓�
+ string responseBody = "";
+
+ using (HttpClient client = new HttpClient())
+ {
+ //鍑嗗閾炬帴
+ url = url + ToQueryString(queryParams);
+
+ // 鍑嗗POST鏁版嵁
+ var content = new StringContent(json, Encoding.UTF8, "application/json");
+
+ // 鍙戦�丳OST璇锋眰
+ HttpResponseMessage response = await client.PostAsync(url, content);
+ response.EnsureSuccessStatusCode();
+
+ responseBody = await response.Content.ReadAsStringAsync();
+ }
+
+ return responseBody;
+ }
+ #endregion
+
+ #region 鍙傛暟澶勭悊
+ static string ToQueryString(Dictionary<string, string> parameters)
+ {
+ string paramsStr = "";
+ foreach (var param in parameters)
+ {
+ if (paramsStr.Length == 0)
+ {
+ paramsStr += param.Key + "=" + param.Value;
+ }
+ else
+ {
+ paramsStr += "&" + param.Key + "=" + param.Value;
+ }
+ }
+ return "?" + paramsStr;
+
+ //var query = System.Web.HttpUtility.ParseQueryString(string.Empty);
+ //foreach (var param in parameters)
+ //{
+ // query[param.Key] = param.Value;
+ //}
+ //return "?" + query.ToString();
+ }
+ #endregion
+
+ #region MD5鍔犲瘑
+ public static string GetMD5(string input)
+ {
+ using (MD5 md5 = MD5.Create())
+ {
+ byte[] inputBytes = Encoding.UTF8.GetBytes(input);
+ byte[] hashBytes = md5.ComputeHash(inputBytes);
+
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < hashBytes.Length; i++)
+ {
+ sb.Append(hashBytes[i].ToString("x2")); // "x2"琛ㄧず灏忓啓鐨�16杩涘埗鏍煎紡
+ }
+ return sb.ToString();
+ }
+ }
+ #endregion
+}
+#endregion
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
index efd2c76..af89843 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-24T00:41:47.8043737Z;False|2025-04-24T08:41:22.1944360+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>
+ <History>True|2025-05-08T00:33:00.5573071Z;False|2025-05-08T08:32:20.5353159+08:00;True|2025-04-23T15:11:05.1490455+08:00;True|2025-04-23T14:22:24.5406543+08:00;False|2025-04-23T14:21:47.8685695+08:00;True|2025-04-18T13:54:27.4746888+08:00;False|2025-04-18T13:53:45.2296528+08:00;False|2025-04-18T13:53:29.7890054+08:00;False|2025-04-18T13:53:23.5770264+08:00;False|2025-04-18T13:53:18.0054565+08:00;True|2025-04-18T13:51:28.8449212+08:00;True|2025-04-18T13:24:50.1548645+08:00;True|2025-04-18T13:17:41.8781012+08:00;True|2025-04-18T13:07:11.4243777+08:00;True|2025-04-18T13:03:51.8972162+08:00;True|2025-04-18T12:59:24.3674835+08:00;True|2025-04-18T12:54:51.7546338+08:00;True|2025-04-18T12:51:54.3531129+08:00;False|2025-04-18T12:51:42.0198325+08:00;True|2025-04-18T09:11:06.5087174+08:00;False|2025-04-18T09:10:56.3178793+08:00;True|2025-04-17T11:20:10.9926709+08:00;True|2025-04-17T11:01:50.8902725+08:00;True|2025-04-17T10:53:40.1335186+08:00;True|2025-04-17T10:50:33.6109824+08:00;True|2025-04-17T10:31:35.1972930+08:00;True|2025-04-17T10:27:13.0718237+08:00;False|2025-04-17T10:27:05.4243104+08:00;True|2025-04-17T10:21:17.1039399+08:00;True|2025-04-17T10:17:30.5257362+08:00;True|2025-04-17T09:04:16.5959099+08:00;False|2025-04-17T09:04:08.5643163+08:00;True|2025-04-16T16:50:10.4001088+08:00;True|2025-04-16T16:37:30.0492166+08:00;False|2025-04-16T16:37:20.9070255+08:00;True|2025-04-15T14:55:05.4396103+08:00;True|2025-04-15T14:48:11.6729078+08:00;True|2025-04-15T14:18:53.0805178+08:00;True|2025-04-15T13:48:11.5252569+08:00;True|2025-04-15T13:37:14.4720847+08:00;True|2025-04-15T11:19:10.1766439+08:00;True|2025-04-15T11:16:15.9677953+08:00;True|2025-04-15T11:01:18.4337723+08:00;False|2025-04-15T11:01:06.9132978+08:00;True|2025-04-15T10:55:53.9650790+08:00;False|2025-04-15T10:55:45.2763971+08:00;True|2025-04-09T11:24:21.9466324+08:00;True|2025-04-09T11:14:25.0603792+08:00;True|2025-04-09T11:03:10.0252216+08:00;False|2025-04-09T11:03:01.0837419+08:00;True|2025-04-08T15:00:39.6673341+08:00;True|2025-04-08T14:55:20.5714659+08:00;True|2025-04-08T14:41:57.1855163+08:00;True|2025-04-08T13:31:03.4382266+08:00;True|2025-04-08T11:20:45.0300955+08:00;True|2025-04-08T10:59:59.6997668+08:00;False|2025-04-08T10:59:53.2827828+08:00;True|2025-04-08T10:48:17.4232977+08:00;False|2025-04-08T10:48:09.5363986+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/24/2025 08:41:37</publishTime>
+ <publishTime>05/08/2025 08:32:41</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>04/24/2025 08:41:37</publishTime>
+ <publishTime>05/08/2025 08:32:41</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>04/24/2025 08:41:35</publishTime>
+ <publishTime>05/08/2025 08:32:38</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>04/24/2025 08:41:35</publishTime>
+ <publishTime>05/08/2025 08:32:38</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>04/24/2025 08:41:32</publishTime>
+ <publishTime>04/21/2025 20:28:21</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>04/24/2025 08:41:32</publishTime>
+ <publishTime>04/21/2025 20:28:21</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/24/2025 08:41:33</publishTime>
+ <publishTime>05/08/2025 08:32:33</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>04/24/2025 08:41:33</publishTime>
+ <publishTime>05/08/2025 08:32:33</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>03/15/2022 10:06:42</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>04/24/2025 08:41:31</publishTime>
+ <publishTime>04/21/2025 20:28:18</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>04/24/2025 08:41:31</publishTime>
+ <publishTime>04/21/2025 20:28:18</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>04/24/2025 08:41:31</publishTime>
+ <publishTime>04/21/2025 20:28:19</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>04/24/2025 08:41:31</publishTime>
+ <publishTime>04/21/2025 20:28:19</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>04/24/2025 08:41:31</publishTime>
+ <publishTime>04/21/2025 20:28:20</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>04/24/2025 08:41:31</publishTime>
+ <publishTime>04/21/2025 20:28:20</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>04/24/2025 08:39:27</publishTime>
+ <publishTime>04/21/2025 20:28:15</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>04/24/2025 08:39:27</publishTime>
+ <publishTime>04/21/2025 20:28:15</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,22 +285,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>04/24/2025 08:39:27</publishTime>
+ <publishTime>04/21/2025 20:28:21</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>04/24/2025 08:39:27</publishTime>
+ <publishTime>04/21/2025 20:28:21</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>04/24/2025 08:41:42</publishTime>
+ <publishTime>05/08/2025 08:32:51</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>04/24/2025 08:41:42</publishTime>
+ <publishTime>05/08/2025 08:32:51</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>04/24/2025 08:41:46</publishTime>
+ <publishTime>05/08/2025 08:32:59</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -495,7 +495,7 @@
<publishTime>05/06/2024 13:47:57</publishTime>
</File>
<File Include="Web.config">
- <publishTime>04/24/2025 08:41:47</publishTime>
+ <publishTime>04/23/2025 14:22:22</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
index b1b2ef0..6c7932c 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user
@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <History>True|2025-05-12T07:58:42.3279365Z;True|2025-05-12T14:46:40.4175974+08:00;True|2025-05-12T14:25:17.7975975+08:00;True|2025-05-12T14:15:03.6854114+08:00;True|2025-05-12T13:20:39.4575875+08:00;True|2025-05-12T13:04:59.2637345+08:00;True|2025-05-12T11:05:39.1423146+08:00;True|2025-05-12T11:04:52.2191892+08:00;True|2025-05-12T11:00:33.9329101+08:00;False|2025-05-12T11:00:26.8429710+08:00;True|2025-05-12T10:24:55.6169026+08:00;False|2025-05-12T10:24:26.9432217+08:00;True|2025-05-09T15:17:47.6968997+08:00;False|2025-05-09T15:17:41.5165040+08:00;True|2025-05-08T15:55:24.8437328+08:00;True|2025-05-08T15:49:52.1982131+08:00;True|2025-05-08T14:30:58.6658233+08:00;True|2025-05-08T13:57:47.2409635+08:00;True|2025-05-08T13:49:25.7927065+08:00;True|2025-05-08T10:56:53.9086795+08:00;True|2025-05-08T10:47:04.1369521+08:00;True|2025-05-07T11:19:22.7005176+08:00;True|2025-05-07T11:12:33.5037815+08:00;True|2025-05-07T11:08:26.5089483+08:00;True|2025-05-06T09:56:16.4670446+08:00;True|2025-05-06T09:53:13.1199697+08:00;False|2025-05-06T09:53:05.2692896+08:00;True|2025-04-30T10:16:44.1151152+08:00;True|2025-04-30T10:00:47.3410363+08:00;True|2025-04-30T09:39:12.0356027+08:00;True|2025-04-30T08:45:37.0637703+08:00;True|2025-04-30T08:18:50.0996148+08:00;False|2025-04-30T08:18:21.1738369+08:00;True|2025-04-30T08:09:22.0615915+08:00;False|2025-04-30T08:09:12.5664882+08:00;True|2025-04-29T16:21:28.2743192+08:00;True|2025-04-29T14:10:09.9848859+08:00;True|2025-04-28T11:01:44.6987411+08:00;False|2025-04-28T11:01:34.7062558+08:00;True|2025-04-27T16:12:37.4743910+08:00;False|2025-04-27T16:12:24.8989765+08:00;True|2025-04-24T11:13:25.0763421+08:00;True|2025-04-24T10:49:10.1323679+08:00;True|2025-04-23T11:12:58.7127237+08:00;True|2025-04-22T17:15:39.9949091+08:00;False|2025-04-22T17:15:33.9335391+08:00;True|2025-04-21T16:13:12.9842708+08:00;True|2025-04-21T16:11:03.4262306+08:00;True|2025-04-21T16:06:02.5167412+08:00;True|2025-04-21T16:03:57.2299958+08:00;False|2025-04-21T16:03:44.4356436+08:00;True|2025-04-21T15:28:15.2307697+08:00;True|2025-04-21T15:17:17.5682286+08:00;True|2025-04-21T15:12:16.8982275+08:00;True|2025-04-21T14:53:26.4605418+08:00;True|2025-04-21T14:49:48.8960696+08:00;True|2025-04-21T14:35:59.4591551+08:00;False|2025-04-21T14:35:46.2281772+08:00;True|2025-04-08T13:10:52.8749775+08:00;True|2025-04-08T09:10:05.3755564+08:00;True|2025-04-07T09:32:09.4220262+08:00;True|2025-04-02T10:07:49.7129656+08:00;True|2025-04-02T09:28:18.3104138+08:00;False|2025-04-02T09:28:06.8644783+08:00;True|2025-04-02T09:03:43.1765932+08:00;False|2025-04-02T09:03:36.6874678+08:00;True|2025-03-26T08:15:22.1038130+08:00;True|2025-03-25T17:13:07.6600191+08:00;True|2025-03-25T16:53:58.9214849+08:00;False|2025-03-25T16:53:46.3315797+08:00;True|2025-03-24T15:53:51.6757690+08:00;True|2025-03-24T14:18:37.5668299+08:00;True|2025-03-21T15:06:33.1307351+08:00;True|2025-03-21T15:04:11.9681650+08:00;True|2025-03-21T14:14:59.1591046+08:00;True|2025-03-21T10:25:57.3452453+08:00;True|2025-03-21T09:07:23.5814841+08:00;True|2025-03-20T16:42:24.9342284+08:00;False|2025-03-20T16:42:17.5165982+08:00;True|2025-03-20T16:34:56.3337544+08:00;True|2025-03-20T16:29:15.1683525+08:00;True|2025-03-20T16:23:42.5038047+08:00;True|2025-03-19T20:24:10.0975063+08:00;True|2025-03-18T09:34:22.6164243+08:00;True|2025-03-17T21:47:20.2930413+08:00;True|2025-03-17T19:41:02.3815065+08:00;False|2025-03-17T19:40:55.9908892+08:00;True|2025-03-17T19:19:49.8872115+08:00;True|2025-03-17T18:58:03.6903198+08:00;True|2025-03-17T14:26:34.9258043+08:00;True|2025-03-14T15:40:57.9378742+08:00;False|2025-03-14T15:40:46.0132033+08:00;False|2025-03-14T12:34:38.6551944+08:00;True|2025-03-05T14:35:44.7812995+08:00;True|2025-03-05T12:57:06.2539555+08:00;True|2025-03-05T11:19:01.3450138+08:00;True|2025-03-04T15:25:38.6174966+08:00;True|2025-03-04T14:54:41.4026832+08:00;True|2025-03-04T11:08:16.5619007+08:00;True|2025-03-04T10:01:43.5782535+08:00;True|2025-03-04T08:42:48.4526420+08:00;False|2025-03-04T08:42:42.2828130+08:00;True|2025-02-27T15:13:52.3469275+08:00;True|2025-02-27T10:59:33.6194212+08:00;False|2025-02-27T10:59:25.0394841+08:00;True|2025-02-27T10:44:18.9014583+08:00;True|2025-02-26T14:27:14.6049136+08:00;False|2025-02-26T14:27:02.9843524+08:00;True|2025-02-25T15:20:23.1640745+08:00;True|2025-02-25T14:48:55.2842125+08:00;False|2025-02-25T14:48:42.2715748+08:00;True|2025-02-11T10:10:05.6068846+08:00;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
+ <History>True|2025-05-19T07:06:53.2645411Z;True|2025-05-16T16:32:02.9818718+08:00;True|2025-05-16T16:30:33.9588010+08:00;True|2025-05-16T15:44:32.5318879+08:00;True|2025-05-16T15:10:54.6822997+08:00;True|2025-05-16T15:01:00.7569816+08:00;True|2025-05-16T13:50:40.0040164+08:00;True|2025-05-16T13:01:14.5388124+08:00;True|2025-05-16T10:38:20.4876566+08:00;True|2025-05-16T10:23:09.0484073+08:00;True|2025-05-16T10:14:49.6622040+08:00;False|2025-05-16T10:14:36.5792240+08:00;True|2025-05-15T14:29:05.4556596+08:00;True|2025-05-15T14:00:45.9974491+08:00;True|2025-05-15T13:58:06.3825427+08:00;True|2025-05-15T08:35:55.0404130+08:00;True|2025-05-15T08:35:27.5658528+08:00;True|2025-05-14T16:08:41.1106680+08:00;True|2025-05-14T15:43:29.5573491+08:00;True|2025-05-14T15:34:13.5272127+08:00;True|2025-05-13T15:19:29.7660222+08:00;True|2025-05-12T15:58:42.3279365+08:00;True|2025-05-12T14:46:40.4175974+08:00;True|2025-05-12T14:25:17.7975975+08:00;True|2025-05-12T14:15:03.6854114+08:00;True|2025-05-12T13:20:39.4575875+08:00;True|2025-05-12T13:04:59.2637345+08:00;True|2025-05-12T11:05:39.1423146+08:00;True|2025-05-12T11:04:52.2191892+08:00;True|2025-05-12T11:00:33.9329101+08:00;False|2025-05-12T11:00:26.8429710+08:00;True|2025-05-12T10:24:55.6169026+08:00;False|2025-05-12T10:24:26.9432217+08:00;True|2025-05-09T15:17:47.6968997+08:00;False|2025-05-09T15:17:41.5165040+08:00;True|2025-05-08T15:55:24.8437328+08:00;True|2025-05-08T15:49:52.1982131+08:00;True|2025-05-08T14:30:58.6658233+08:00;True|2025-05-08T13:57:47.2409635+08:00;True|2025-05-08T13:49:25.7927065+08:00;True|2025-05-08T10:56:53.9086795+08:00;True|2025-05-08T10:47:04.1369521+08:00;True|2025-05-07T11:19:22.7005176+08:00;True|2025-05-07T11:12:33.5037815+08:00;True|2025-05-07T11:08:26.5089483+08:00;True|2025-05-06T09:56:16.4670446+08:00;True|2025-05-06T09:53:13.1199697+08:00;False|2025-05-06T09:53:05.2692896+08:00;True|2025-04-30T10:16:44.1151152+08:00;True|2025-04-30T10:00:47.3410363+08:00;True|2025-04-30T09:39:12.0356027+08:00;True|2025-04-30T08:45:37.0637703+08:00;True|2025-04-30T08:18:50.0996148+08:00;False|2025-04-30T08:18:21.1738369+08:00;True|2025-04-30T08:09:22.0615915+08:00;False|2025-04-30T08:09:12.5664882+08:00;True|2025-04-29T16:21:28.2743192+08:00;True|2025-04-29T14:10:09.9848859+08:00;True|2025-04-28T11:01:44.6987411+08:00;False|2025-04-28T11:01:34.7062558+08:00;True|2025-04-27T16:12:37.4743910+08:00;False|2025-04-27T16:12:24.8989765+08:00;True|2025-04-24T11:13:25.0763421+08:00;True|2025-04-24T10:49:10.1323679+08:00;True|2025-04-23T11:12:58.7127237+08:00;True|2025-04-22T17:15:39.9949091+08:00;False|2025-04-22T17:15:33.9335391+08:00;True|2025-04-21T16:13:12.9842708+08:00;True|2025-04-21T16:11:03.4262306+08:00;True|2025-04-21T16:06:02.5167412+08:00;True|2025-04-21T16:03:57.2299958+08:00;False|2025-04-21T16:03:44.4356436+08:00;True|2025-04-21T15:28:15.2307697+08:00;True|2025-04-21T15:17:17.5682286+08:00;True|2025-04-21T15:12:16.8982275+08:00;True|2025-04-21T14:53:26.4605418+08:00;True|2025-04-21T14:49:48.8960696+08:00;True|2025-04-21T14:35:59.4591551+08:00;False|2025-04-21T14:35:46.2281772+08:00;True|2025-04-08T13:10:52.8749775+08:00;True|2025-04-08T09:10:05.3755564+08:00;True|2025-04-07T09:32:09.4220262+08:00;True|2025-04-02T10:07:49.7129656+08:00;True|2025-04-02T09:28:18.3104138+08:00;False|2025-04-02T09:28:06.8644783+08:00;True|2025-04-02T09:03:43.1765932+08:00;False|2025-04-02T09:03:36.6874678+08:00;True|2025-03-26T08:15:22.1038130+08:00;True|2025-03-25T17:13:07.6600191+08:00;True|2025-03-25T16:53:58.9214849+08:00;False|2025-03-25T16:53:46.3315797+08:00;True|2025-03-24T15:53:51.6757690+08:00;True|2025-03-24T14:18:37.5668299+08:00;True|2025-03-21T15:06:33.1307351+08:00;True|2025-03-21T15:04:11.9681650+08:00;True|2025-03-21T14:14:59.1591046+08:00;True|2025-03-21T10:25:57.3452453+08:00;True|2025-03-21T09:07:23.5814841+08:00;True|2025-03-20T16:42:24.9342284+08:00;False|2025-03-20T16:42:17.5165982+08:00;True|2025-03-20T16:34:56.3337544+08:00;True|2025-03-20T16:29:15.1683525+08:00;True|2025-03-20T16:23:42.5038047+08:00;True|2025-03-19T20:24:10.0975063+08:00;True|2025-03-18T09:34:22.6164243+08:00;True|2025-03-17T21:47:20.2930413+08:00;True|2025-03-17T19:41:02.3815065+08:00;False|2025-03-17T19:40:55.9908892+08:00;True|2025-03-17T19:19:49.8872115+08:00;True|2025-03-17T18:58:03.6903198+08:00;True|2025-03-17T14:26:34.9258043+08:00;True|2025-03-14T15:40:57.9378742+08:00;False|2025-03-14T15:40:46.0132033+08:00;False|2025-03-14T12:34:38.6551944+08:00;True|2025-03-05T14:35:44.7812995+08:00;True|2025-03-05T12:57:06.2539555+08:00;True|2025-03-05T11:19:01.3450138+08:00;True|2025-03-04T15:25:38.6174966+08:00;True|2025-03-04T14:54:41.4026832+08:00;True|2025-03-04T11:08:16.5619007+08:00;True|2025-03-04T10:01:43.5782535+08:00;True|2025-03-04T08:42:48.4526420+08:00;False|2025-03-04T08:42:42.2828130+08:00;True|2025-02-27T15:13:52.3469275+08:00;True|2025-02-27T10:59:33.6194212+08:00;False|2025-02-27T10:59:25.0394841+08:00;True|2025-02-27T10:44:18.9014583+08:00;True|2025-02-26T14:27:14.6049136+08:00;False|2025-02-26T14:27:02.9843524+08:00;True|2025-02-25T15:20:23.1640745+08:00;True|2025-02-25T14:48:55.2842125+08:00;False|2025-02-25T14:48:42.2715748+08:00;True|2025-02-11T10:10:05.6068846+08:00;True|2025-02-11T09:45:52.5312134+08:00;False|2025-02-11T09:42:54.6560039+08:00;False|2025-02-11T09:42:44.7260867+08:00;True|2025-02-10T15:18:16.8537767+08:00;True|2025-02-10T15:11:21.0436532+08:00;True|2025-02-10T13:51:35.4452640+08:00;True|2025-02-10T13:22:03.2907876+08:00;True|2025-02-10T11:04:24.1824725+08:00;True|2025-02-10T10:28:28.1308553+08:00;False|2025-02-10T10:25:56.3141700+08:00;True|2025-02-10T10:20:23.8683188+08:00;False|2025-02-10T10:20:11.3293731+08:00;True|2025-01-10T16:40:52.1666611+08:00;False|2025-01-10T16:40:46.4916510+08:00;True|2025-01-07T14:28:51.8669083+08:00;True|2025-01-07T13:07:29.9052541+08:00;True|2025-01-07T12:56:00.2870613+08:00;True|2025-01-07T12:43:45.7885867+08:00;True|2025-01-07T11:09:19.5063011+08:00;True|2025-01-07T11:00:06.9697471+08:00;True|2025-01-07T09:56:02.2879532+08:00;True|2025-01-07T09:45:19.5462835+08:00;True|2025-01-07T09:42:50.9089289+08:00;False|2025-01-07T09:42:40.4271324+08:00;True|2025-01-04T15:46:13.8527906+08:00;True|2025-01-04T15:39:45.2037219+08:00;False|2025-01-04T15:39:22.4930686+08:00;True|2025-01-04T13:31:08.6975632+08:00;True|2025-01-04T13:29:16.6440831+08:00;True|2025-01-04T13:13:10.1452466+08:00;True|2025-01-03T14:15:46.7252901+08:00;True|2025-01-03T10:09:32.6319841+08:00;False|2025-01-03T10:09:25.9409250+08:00;True|2024-12-31T15:30:13.0841451+08:00;True|2024-12-31T15:20:44.4779893+08:00;False|2024-12-31T15:20:38.3464087+08:00;True|2024-12-30T19:31:50.5186513+08:00;True|2024-12-30T19:26:51.9369903+08:00;True|2024-12-30T19:03:43.0165721+08:00;True|2024-12-30T17:03:44.6035503+08:00;True|2024-12-30T16:59:37.4694911+08:00;True|2024-12-30T15:14:16.7657186+08:00;False|2024-12-30T15:14:09.9136437+08:00;True|2024-12-28T14:22:43.5822832+08:00;True|2024-12-28T14:10:54.9885289+08:00;True|2024-12-28T13:56:42.0405943+08:00;True|2024-12-28T13:18:42.1604585+08:00;True|2024-12-28T10:48:49.0559287+08:00;False|2024-12-28T10:48:41.8813560+08:00;True|2024-12-27T16:41:50.4368711+08:00;True|2024-12-27T14:31:25.7129706+08:00;True|2024-12-27T11:24:16.6524093+08:00;False|2024-12-27T11:23:25.9617516+08:00;True|2024-12-18T08:34:56.1537647+08:00;True|2024-12-17T13:56:47.7915112+08:00;True|2024-12-17T11:13:27.2665832+08:00;True|2024-12-16T16:01:15.5110052+08:00;True|2024-12-16T15:53:18.1111331+08:00;True|2024-12-16T15:13:43.9719840+08:00;True|2024-12-16T15:08:49.2287341+08:00;True|2024-12-16T14:59:21.3003410+08:00;True|2024-12-16T10:16:34.6636364+08:00;True|2024-12-16T10:12:38.1827164+08:00;False|2024-12-16T10:12:16.1621752+08:00;True|2024-12-13T15:44:29.9921182+08:00;False|2024-12-13T15:43:36.1775569+08:00;True|2024-12-11T09:06:23.2065068+08:00;True|2024-12-11T09:02:10.9767948+08:00;True|2024-12-11T08:26:16.2292105+08:00;True|2024-12-10T16:17:47.2702447+08:00;True|2024-12-10T14:47:18.4352590+08:00;True|2024-12-10T14:10:37.0165625+08:00;True|2024-12-10T13:59:25.4712057+08:00;True|2024-12-10T13:46:02.3070111+08:00;True|2024-12-10T13:39:19.2434918+08:00;True|2024-12-10T10:42:47.3763447+08:00;True|2024-12-10T10:28:20.0524748+08:00;True|2024-12-09T11:01:35.7691980+08:00;True|2024-12-09T09:20:22.9742701+08:00;True|2024-12-09T08:47:26.0470083+08:00;True|2024-12-06T13:13:33.9776030+08:00;True|2024-12-05T14:33:41.1542437+08:00;True|2024-12-05T14:21:02.3120095+08:00;True|2024-12-05T14:13:09.2733831+08:00;True|2024-12-05T13:27:25.9831554+08:00;True|2024-12-05T13:23:25.4183580+08:00;True|2024-12-05T11:27:26.9609695+08:00;True|2024-12-05T09:20:29.4596887+08:00;True|2024-12-05T08:47:57.2553570+08:00;True|2024-12-05T08:41:06.4860297+08:00;True|2024-12-05T08:32:16.9785572+08:00;True|2024-12-04T15:54:19.4995372+08:00;True|2024-12-04T11:10:12.2273624+08:00;True|2024-12-04T10:21:44.8769236+08:00;False|2024-12-04T10:20:59.8206595+08:00;True|2024-12-04T09:52:03.8506923+08:00;True|2024-12-03T15:09:48.8710712+08:00;False|2024-12-03T15:08:46.8904626+08:00;True|2024-11-28T10:42:45.3823067+08:00;True|2024-11-28T09:58:38.0983021+08:00;True|2024-11-27T16:16:28.4276838+08:00;True|2024-11-27T16:09:08.0834912+08:00;True|2024-11-27T14:32:21.1684294+08:00;True|2024-11-27T13:24:51.2115157+08:00;True|2024-11-27T13:16:51.5888615+08:00;True|2024-11-26T10:47:18.1958719+08:00;False|2024-11-26T10:46:22.2016963+08:00;False|2024-11-25T10:22:55.3420353+08:00;True|2024-11-20T09:08:48.6293480+08:00;True|2024-11-19T17:01:27.8454996+08:00;True|2024-11-19T08:20:49.6371464+08:00;True|2024-11-18T15:27:25.3419580+08:00;True|2024-11-18T15:19:07.4691728+08:00;True|2024-11-18T14:57:25.8637252+08:00;True|2024-11-18T14:52:10.6158576+08:00;True|2024-11-18T14:46:03.5051743+08:00;True|2024-11-18T13:42:14.5146469+08:00;True|2024-11-18T13:27:53.4498275+08:00;True|2024-11-18T11:26:05.8168670+08:00;True|2024-11-18T11:04:00.4711300+08:00;True|2024-11-18T10:54:15.6267907+08:00;True|2024-11-18T10:45:29.5275370+08:00;True|2024-11-15T16:58:39.1926238+08:00;True|2024-11-15T16:45:12.0168760+08:00;True|2024-11-15T16:37:11.8513587+08:00;True|2024-11-15T16:31:13.0430714+08:00;True|2024-11-15T16:27:45.3575015+08:00;False|2024-11-15T16:26:49.5306586+08:00;True|2024-11-15T16:16:54.0542122+08:00;True|2024-11-15T15:51:41.6920560+08:00;False|2024-11-15T15:50:37.8798414+08:00;True|2024-11-06T14:13:46.3129972+08:00;False|2024-11-06T14:12:47.9022879+08:00;False|2024-11-05T20:45:28.3960353+08:00;True|2024-11-05T19:04:11.0417788+08:00;False|2024-11-05T19:03:03.9263878+08:00;True|2024-11-05T15:54:24.8374699+08:00;False|2024-11-05T15:53:24.4214141+08:00;True|2024-10-25T16:51:46.3066612+08:00;True|2024-10-25T12:16:27.8737941+08:00;True|2024-10-25T10:12:38.8056269+08:00;False|2024-10-25T10:11:44.1117608+08:00;True|2024-10-25T09:54:06.8572059+08:00;True|2024-10-25T08:21:42.6333993+08:00;True|2024-10-24T17:56:19.5319332+08:00;True|2024-10-24T17:50:10.0801119+08:00;False|2024-10-24T17:49:21.0726954+08:00;True|2024-10-24T17:40:46.0577697+08:00;False|2024-10-24T17:39:53.3743103+08:00;True|2024-10-24T14:57:00.6752320+08:00;True|2024-10-24T10:08:39.8269595+08:00;False|2024-10-24T10:07:47.3834032+08:00;True|2024-10-22T10:33:10.1961964+08:00;True|2024-10-21T08:43:54.1422810+08:00;False|2024-10-21T08:43:00.6574201+08:00;True|2024-10-18T14:56:55.6749850+08:00;True|2024-10-18T14:47:05.1073813+08:00;True|2024-10-18T11:24:23.9069952+08:00;True|2024-10-18T11:14:57.8486575+08:00;False|2024-10-18T11:14:07.5289704+08:00;True|2024-10-18T10:57:00.2425175+08:00;False|2024-10-18T10:56:04.8949960+08:00;True|2024-10-15T16:44:32.6189434+08:00;True|2024-10-15T14:38:49.8658311+08:00;True|2024-10-15T09:49:55.2197004+08:00;False|2024-10-15T09:49:14.8790668+08:00;False|2024-10-12T15:28:24.1303695+08:00;True|2024-10-10T10:59:36.7878419+08:00;False|2024-10-10T10:58:40.9900315+08:00;True|2024-10-03T10:57:02.9299524+08:00;True|2024-10-03T10:02:10.1156720+08:00;True|2024-09-30T11:07:22.5376794+08:00;True|2024-09-30T10:15:40.3990343+08:00;True|2024-09-30T10:04:38.1942221+08:00;True|2024-09-29T19:22:01.5340857+08:00;False|2024-09-29T19:21:12.2387012+08:00;True|2024-09-26T09:50:22.2637977+08:00;True|2024-09-25T20:44:33.3994634+08:00;True|2024-09-25T16:07:23.2747063+08:00;True|2024-09-25T14:55:37.9194143+08:00;True|2024-09-24T20:03:43.9841995+08:00;True|2024-09-24T19:42:48.7479102+08:00;True|2024-09-24T19:38:31.5777012+08:00;True|2024-09-24T16:26:58.5969765+08:00;True|2024-09-24T15:31:00.7140362+08:00;True|2024-09-24T10:17:46.7830753+08:00;True|2024-09-24T09:40:19.5788062+08:00;False|2024-09-24T09:39:27.4521802+08:00;True|2024-09-23T19:35:55.3572583+08:00;True|2024-09-23T18:53:15.4480118+08:00;False|2024-09-23T18:52:22.0135173+08:00;True|2024-09-20T09:59:12.9943442+08:00;False|2024-09-20T09:58:18.6945854+08:00;True|2024-09-12T20:40:58.7161451+08:00;False|2024-09-12T20:40:00.0672966+08:00;True|2024-09-12T16:47:22.7671323+08:00;True|2024-09-12T16:34:18.5850144+08:00;True|2024-09-12T16:13:32.1929032+08:00;True|2024-09-12T09:12:54.4456999+08:00;False|2024-09-12T09:12:06.1002866+08:00;False|2024-09-11T21:06:15.4423786+08:00;True|2024-09-10T15:26:48.7055081+08:00;True|2024-09-10T09:26:36.8509916+08:00;True|2024-09-09T19:51:32.6059511+08:00;True|2024-09-09T19:05:47.5349922+08:00;True|2024-09-09T09:26:23.2022383+08:00;False|2024-09-09T09:25:27.3736749+08:00;True|2024-09-06T15:32:52.1865278+08:00;True|2024-09-06T15:16:01.1405794+08:00;True|2024-09-06T14:21:05.7482343+08:00;True|2024-09-06T14:09:17.1494566+08:00;True|2024-09-06T13:49:56.4128481+08:00;True|2024-09-06T13:11:53.0863947+08:00;True|2024-09-06T09:34:54.5934463+08:00;True|2024-09-06T08:47:19.9744092+08:00;True|2024-09-05T15:01:38.6968629+08:00;True|2024-09-05T14:56:09.3505818+08:00;True|2024-09-05T14:49:56.8774757+08:00;True|2024-09-05T08:14:13.2359921+08:00;False|2024-09-05T08:13:11.8797534+08:00;True|2024-09-03T16:52:02.8227375+08:00;False|2024-09-03T16:51:32.4250926+08:00;True|2024-09-03T16:33:05.7269609+08:00;True|2024-09-03T16:00:15.0288548+08:00;True|2024-08-29T08:06:32.4732067+08:00;False|2024-08-29T08:06:02.4801886+08:00;True|2024-08-26T10:17:08.7733750+08:00;False|2024-08-26T10:11:05.1864217+08:00;False|2024-08-26T09:50:31.1539306+08:00;False|2024-08-26T09:47:37.4351309+08:00;True|2024-08-16T16:55:32.0918962+08:00;True|2024-08-16T16:53:23.3505641+08:00;False|2024-08-16T16:49:30.4579212+08:00;False|2024-08-16T16:47:01.9799743+08:00;</History>
<_PublishTargetUrl>G:\issWeb\缃戠珯鍙戝竷\API</_PublishTargetUrl>
</PropertyGroup>
<ItemGroup>
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>05/12/2025 15:58:22</publishTime>
+ <publishTime>05/19/2025 15:05:40</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>05/12/2025 15:58:22</publishTime>
+ <publishTime>05/19/2025 15:05:40</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>05/12/2025 15:58:19</publishTime>
+ <publishTime>05/19/2025 15:05:37</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>05/12/2025 15:58:19</publishTime>
+ <publishTime>05/19/2025 15:05:37</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>05/12/2025 15:58:12</publishTime>
+ <publishTime>05/19/2025 15:05:32</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>05/12/2025 15:58:12</publishTime>
+ <publishTime>05/19/2025 15:05:32</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>05/12/2025 15:58:14</publishTime>
+ <publishTime>05/19/2025 15:05:33</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>05/12/2025 15:58:14</publishTime>
+ <publishTime>05/19/2025 15:05:33</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/15/2024 12:55:45</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>05/12/2025 15:58:10</publishTime>
+ <publishTime>05/19/2025 15:05:28</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>05/12/2025 15:58:10</publishTime>
+ <publishTime>05/19/2025 15:05:28</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>05/12/2025 15:58:12</publishTime>
+ <publishTime>05/19/2025 15:05:30</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>05/12/2025 15:58:12</publishTime>
+ <publishTime>05/19/2025 15:05:30</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>05/12/2025 15:58:10</publishTime>
+ <publishTime>05/19/2025 15:05:30</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>05/12/2025 15:58:10</publishTime>
+ <publishTime>05/19/2025 15:05:30</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>05/12/2025 15:58:09</publishTime>
+ <publishTime>05/19/2025 15:05:27</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>05/12/2025 15:58:09</publishTime>
+ <publishTime>05/19/2025 15:05:27</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>04/25/2025 13:15:32</publishTime>
+ <publishTime>05/19/2025 15:05:34</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>04/25/2025 13:15:32</publishTime>
+ <publishTime>05/19/2025 15:05:34</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>05/12/2025 15:58:31</publishTime>
+ <publishTime>05/19/2025 15:05:48</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>05/12/2025 15:58:31</publishTime>
+ <publishTime>05/19/2025 15:05:48</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>08/16/2024 16:55:28</publishTime>
@@ -495,7 +495,7 @@
<publishTime>04/29/2024 08:30:03</publishTime>
</File>
<File Include="Web.config">
- <publishTime>05/12/2025 15:58:40</publishTime>
+ <publishTime>05/19/2025 15:06:52</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
index 6b043b6..c8b1b67 100644
--- a/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
- <History>True|2025-04-15T05:47:43.0319806Z;False|2025-04-15T13:43:39.5193511+08:00;True|2025-04-14T16:55:07.6035477+08:00;True|2025-04-14T16:10:02.4925200+08:00;True|2025-04-14T15:59:48.1256324+08:00;True|2025-04-14T15:35:58.3739263+08:00;True|2025-04-14T15:18:20.0231874+08:00;True|2025-04-14T15:15:48.1937642+08:00;True|2025-04-14T15:06:18.1485320+08:00;True|2025-04-14T13:58:54.9488220+08:00;True|2025-04-14T13:45:21.9528067+08:00;True|2025-04-14T13:32:41.8026503+08:00;True|2025-04-14T13:24:25.1609026+08:00;False|2025-04-14T13:21:46.7999422+08:00;True|2025-04-14T11:22:02.0084668+08:00;False|2025-04-14T11:16:39.7668266+08:00;True|2025-04-11T16:42:49.2287375+08:00;True|2025-04-11T15:21:50.9239660+08:00;False|2025-04-11T15:18:52.8043694+08:00;True|2025-04-09T17:30:38.2292747+08:00;True|2025-04-09T17:26:46.2681749+08:00;False|2025-04-09T17:24:55.8631858+08:00;True|2025-04-09T14:49:05.0786518+08:00;False|2025-04-09T14:47:08.0080072+08:00;True|2025-04-09T14:07:09.5914371+08:00;False|2025-04-09T14:03:54.1549615+08:00;True|2025-04-09T10:47:08.9478457+08:00;False|2025-04-09T10:42:24.4815543+08:00;True|2025-04-08T13:55:42.3999925+08:00;True|2025-04-08T13:03:18.1047211+08:00;False|2025-04-08T13:01:24.7284945+08:00;True|2025-04-08T12:45:45.9591473+08:00;True|2025-04-08T10:37:46.2486194+08:00;True|2025-04-08T10:19:41.4391162+08:00;True|2025-04-08T09:03:06.3555124+08:00;False|2025-04-08T09:00:24.5011547+08:00;True|2025-04-03T13:30:58.8690712+08:00;True|2025-04-03T11:11:58.9675862+08:00;True|2025-04-03T08:26:57.1183260+08:00;False|2025-04-03T08:24:15.5585637+08:00;True|2025-04-02T17:22:56.3662600+08:00;True|2025-04-02T16:34:30.3902014+08:00;False|2025-04-02T16:31:03.2711601+08:00;True|2025-04-02T08:53:58.9022912+08:00;False|2025-04-02T08:49:36.2482604+08:00;True|2025-04-01T14:11:15.6665093+08:00;True|2025-04-01T13:59:03.5182641+08:00;True|2025-04-01T11:34:01.0473928+08:00;False|2025-04-01T11:27:06.6219808+08:00;True|2025-03-31T11:32:14.3010437+08:00;False|2025-03-31T11:28:54.7180398+08:00;True|2025-03-28T16:33:00.1667734+08:00;True|2025-03-28T15:59:08.0311042+08:00;True|2025-03-28T14:24:00.8058555+08:00;True|2025-03-28T11:20:49.2519130+08:00;True|2025-03-28T09:46:40.2335440+08:00;True|2025-03-28T09:44:23.8324494+08:00;False|2025-03-28T09:39:07.0797562+08:00;True|2025-03-27T17:42:12.3457479+08:00;True|2025-03-27T16:53:40.2462518+08:00;True|2025-03-27T15:41:05.4036532+08:00;True|2025-03-27T14:20:24.3597261+08:00;True|2025-03-27T10:51:24.2799353+08:00;False|2025-03-27T10:45:28.9126200+08:00;True|2025-03-26T13:49:06.9257931+08:00;False|2025-03-26T13:44:48.7676302+08:00;True|2025-03-25T15:17:55.4790872+08:00;False|2025-03-25T15:14:39.3949477+08:00;True|2025-03-25T14:23:34.4515442+08:00;True|2025-03-24T16:49:42.0663422+08:00;True|2025-03-24T13:12:18.9244375+08:00;False|2025-03-24T13:07:19.8409939+08:00;False|2025-03-24T12:48:52.4860847+08:00;False|2025-03-24T11:39:21.1805195+08:00;False|2025-03-24T11:37:43.6802081+08:00;False|2025-03-24T11:33:57.1454920+08:00;False|2025-03-24T11:30:14.3844034+08:00;False|2025-03-24T11:28:02.5067052+08:00;False|2025-03-21T12:21:29.9136433+08:00;True|2025-03-20T16:39:21.8390481+08:00;True|2025-03-20T14:41:37.0419379+08:00;False|2025-03-20T14:37:15.3728461+08:00;True|2025-03-20T12:27:20.0312759+08:00;True|2025-03-20T10:42:53.0161637+08:00;True|2025-03-20T09:30:05.5790815+08:00;False|2025-03-20T09:25:15.2327164+08:00;True|2025-03-19T17:06:57.7672924+08:00;True|2025-03-19T15:46:30.3411577+08:00;True|2025-03-19T13:45:31.7138375+08:00;True|2025-03-19T11:09:17.0875638+08:00;False|2025-03-19T11:05:00.7852430+08:00;True|2025-03-18T17:07:26.8842323+08:00;False|2025-03-18T17:02:33.5857720+08:00;False|2025-03-17T11:09:34.0681444+08:00;True|2025-03-17T10:50:21.9158331+08:00;True|2025-03-17T09:42:47.9252167+08:00;False|2025-03-17T09:31:53.1872136+08:00;True|2025-03-14T17:46:56.2806627+08:00;True|2025-03-14T16:26:15.6828252+08:00;True|2025-03-14T16:14:53.0710942+08:00;True|2025-03-14T16:08:09.5365263+08:00;True|2025-03-14T15:59:01.3358337+08:00;True|2025-03-14T14:22:42.7725023+08:00;True|2025-03-14T09:54:22.0848434+08:00;False|2025-03-14T09:51:59.6649411+08:00;True|2025-03-14T09:36:17.1134782+08:00;False|2025-03-14T09:31:58.5198805+08:00;True|2025-03-13T13:08:01.9024847+08:00;False|2025-03-13T13:03:35.7160929+08:00;True|2025-03-12T15:37:13.4111189+08:00;True|2025-03-12T15:23:55.5422176+08:00;True|2025-03-12T15:16:21.2123980+08:00;True|2025-03-12T14:49:24.9895017+08:00;True|2025-03-12T14:41:41.5663090+08:00;False|2025-03-12T14:39:27.3156286+08:00;True|2025-03-12T14:10:23.4204108+08:00;False|2025-03-12T14:08:08.4985635+08:00;True|2025-03-12T13:34:39.8492928+08:00;False|2025-03-12T13:31:34.8359622+08:00;True|2025-03-12T11:39:34.2976894+08:00;False|2025-03-12T09:22:45.9334513+08:00;True|2025-03-10T15:59:42.1283263+08:00;False|2025-03-10T15:53:57.2115226+08:00;True|2025-03-07T16:23:25.1589274+08:00;True|2025-03-07T16:18:46.0202723+08:00;True|2025-03-07T15:59:34.8313474+08:00;True|2025-03-07T15:37:59.1693363+08:00;True|2025-03-07T14:05:40.7253978+08:00;True|2025-03-07T11:21:14.9610137+08:00;False|2025-03-07T11:15:41.4171028+08:00;True|2025-03-07T10:23:24.0437379+08:00;True|2025-03-07T10:07:03.4231550+08:00;False|2025-03-07T10:04:32.6854924+08:00;True|2025-03-06T16:32:23.7096239+08:00;True|2025-03-06T15:45:46.0345284+08:00;True|2025-03-06T15:40:00.7026164+08:00;True|2025-03-06T15:20:20.3523488+08:00;True|2025-03-06T14:19:37.2403331+08:00;True|2025-03-06T13:49:03.6420821+08:00;False|2025-03-06T13:46:35.7037619+08:00;True|2025-03-06T11:03:29.5882789+08:00;True|2025-03-06T09:59:53.3080173+08:00;True|2025-03-06T09:43:48.4337079+08:00;False|2025-03-06T09:35:05.3462434+08:00;True|2025-03-05T18:25:35.2595591+08:00;True|2025-03-05T18:03:37.5687895+08:00;True|2025-03-05T17:48:08.3418269+08:00;False|2025-03-05T17:44:40.0721881+08:00;True|2025-03-05T17:23:30.5871011+08:00;True|2025-03-05T16:31:12.2285816+08:00;True|2025-03-05T16:00:25.5496303+08:00;True|2025-03-05T15:11:30.9434230+08:00;True|2025-03-05T14:22:08.4650724+08:00;True|2025-03-05T13:29:42.9306833+08:00;True|2025-03-05T11:28:17.5541196+08:00;True|2025-03-05T11:10:22.3318023+08:00;True|2025-03-05T10:55:33.6796527+08:00;True|2025-03-05T10:08:26.7761472+08:00;True|2025-03-05T10:02:32.8701262+08:00;False|2025-03-05T09:59:55.0044057+08:00;True|2025-03-04T17:48:24.6869079+08:00;True|2025-03-04T17:42:05.0276293+08:00;False|2025-03-04T17:39:53.6208557+08:00;False|2025-03-04T17:39:30.0759309+08:00;False|2025-03-04T17:05:37.2163588+08:00;True|2025-03-04T16:51:15.6884461+08:00;True|2025-03-04T16:49:03.3836181+08:00;True|2025-03-04T16:31:36.5847402+08:00;True|2025-03-04T15:52:09.1977151+08:00;True|2025-03-04T15:24:25.0194954+08:00;True|2025-03-04T15:12:44.1606138+08:00;False|2025-03-04T15:10:47.3915404+08:00;True|2025-03-04T14:31:42.7483906+08:00;True|2025-03-04T11:28:36.6001869+08:00;False|2025-02-27T19:55:43.0462466+08:00;True|2025-02-24T16:03:00.5507258+08:00;False|2025-02-24T16:00:00.9104160+08:00;True|2025-02-19T16:55:31.8966125+08:00;True|2025-02-19T14:51:19.5866770+08:00;False|2025-02-19T14:49:16.2857645+08:00;True|2025-02-19T14:11:03.8109482+08:00;False|2025-02-19T14:08:17.7243950+08:00;True|2025-02-19T11:16:48.1875981+08:00;False|2025-02-19T11:14:24.0571589+08:00;True|2025-02-19T10:17:34.3257301+08:00;False|2025-02-19T10:14:49.0730325+08:00;True|2025-02-18T09:38:54.9616937+08:00;True|2025-02-18T09:16:03.1196071+08:00;False|2025-02-18T09:13:52.5022130+08:00;True|2025-02-17T17:28:38.1103164+08:00;True|2025-02-17T17:06:19.1494960+08:00;True|2025-02-17T16:58:21.8893871+08:00;False|2025-02-17T16:56:34.0012780+08:00;True|2025-02-17T15:56:45.9560949+08:00;False|2025-02-17T15:29:32.9323141+08:00;False|2025-02-17T15:27:54.6615301+08:00;False|2025-02-17T15:25:42.7179137+08:00;True|2025-02-12T10:48:39.4029671+08:00;True|2025-02-12T10:45:09.8138793+08:00;False|2025-02-12T10:43:37.5751112+08:00;False|2025-02-12T10:43:24.8201898+08:00;False|2025-02-12T10:42:58.2736984+08:00;False|2025-02-12T10:42:46.1482594+08:00;False|2025-02-12T10:42:01.5427330+08:00;False|2025-02-12T10:41:48.3761346+08:00;False|2025-02-12T10:41:29.3367142+08:00;True|2025-02-11T15:41:34.0746843+08:00;True|2025-02-11T15:39:37.3374891+08:00;False|2025-02-11T15:39:27.0449176+08:00;False|2025-02-11T15:08:35.2970100+08:00;True|2025-02-11T14:59:59.6539416+08:00;True|2025-02-11T14:56:20.5954601+08:00;False|2025-02-11T14:55:35.6700921+08:00;True|2025-02-10T09:39:38.7399451+08:00;False|2025-02-10T09:39:10.1358642+08:00;True|2025-02-08T16:00:23.1136903+08:00;False|2025-02-08T15:59:50.0414065+08:00;True|2025-01-17T10:17:41.6850215+08:00;False|2025-01-17T10:16:20.3202054+08:00;True|2025-01-17T09:00:26.6966310+08:00;False|2025-01-17T08:59:59.9527727+08:00;True|2025-01-16T11:06:57.1014257+08:00;True|2025-01-16T10:27:57.2742426+08:00;False|2025-01-16T10:27:27.5197746+08:00;True|2025-01-15T11:05:17.5523582+08:00;True|2025-01-15T09:37:34.6118980+08:00;False|2025-01-15T09:36:27.7987949+08:00;True|2025-01-14T12:52:06.2234405+08:00;True|2025-01-14T12:50:08.8487446+08:00;False|2025-01-14T12:49:45.2743330+08:00;True|2025-01-14T10:31:18.6477403+08:00;False|2025-01-14T10:29:30.1534049+08:00;True|2025-01-13T15:27:00.4497527+08:00;True|2025-01-13T15:01:33.6142160+08:00;True|2025-01-13T10:29:49.4772980+08:00;True|2025-01-13T10:11:15.7993265+08:00;True|2025-01-13T10:08:58.9378828+08:00;False|2025-01-13T10:08:44.9869073+08:00;True|2025-01-13T10:02:17.5175561+08:00;False|2025-01-13T10:02:00.9991870+08:00;True|2025-01-08T17:50:21.7468469+08:00;True|2025-01-08T16:38:48.8592252+08:00;True|2025-01-08T10:44:42.9161086+08:00;False|2025-01-08T10:44:09.4840640+08:00;True|2025-01-08T10:34:31.5982265+08:00;False|2025-01-08T10:33:57.3576390+08:00;True|2025-01-03T17:19:09.1765100+08:00;True|2025-01-03T17:10:41.8794009+08:00;True|2025-01-03T17:10:11.4245485+08:00;True|2025-01-03T15:54:22.3387906+08:00;True|2025-01-03T15:41:44.9897120+08:00;False|2025-01-03T15:40:42.1357112+08:00;False|2025-01-03T15:39:09.0564197+08:00;True|2025-01-03T14:58:31.5701467+08:00;True|2025-01-03T14:29:13.4456304+08:00;False|2025-01-03T14:27:18.9925263+08:00;True|2025-01-02T16:08:24.1819376+08:00;True|2025-01-02T16:07:01.1636705+08:00;True|2025-01-02T16:03:02.6520904+08:00;True|2025-01-02T10:03:56.0551738+08:00;False|2025-01-02T10:03:34.8632732+08:00;True|2024-12-31T15:27:01.3180960+08:00;True|2024-12-31T11:17:12.2977529+08:00;True|2024-12-31T10:48:14.7205535+08:00;True|2024-12-31T10:18:45.6669875+08:00;False|2024-12-31T10:18:21.6706557+08:00;True|2024-12-30T09:32:44.3898729+08:00;True|2024-12-30T09:31:24.5771941+08:00;False|2024-12-30T09:30:52.4031391+08:00;True|2024-12-27T16:12:20.2836752+08:00;False|2024-12-27T16:11:04.6614343+08:00;True|2024-12-27T15:07:23.0750147+08:00;True|2024-12-27T15:04:52.7876532+08:00;True|2024-12-27T14:37:54.3154829+08:00;False|2024-12-27T14:37:26.9546174+08:00;True|2024-12-26T16:33:56.0452167+08:00;True|2024-12-26T16:29:21.4115458+08:00;True|2024-12-26T16:29:02.0242815+08:00;True|2024-12-26T15:17:24.7390981+08:00;False|2024-12-26T15:13:26.8863189+08:00;True|2024-12-26T15:06:35.4541902+08:00;True|2024-12-26T11:35:42.2760106+08:00;False|2024-12-26T11:35:08.9255789+08:00;True|2024-12-26T10:10:29.7487991+08:00;True|2024-12-26T09:27:40.2637311+08:00;False|2024-12-26T09:25:52.1339136+08:00;True|2024-12-24T15:11:48.9968778+08:00;True|2024-12-24T15:06:55.0283993+08:00;True|2024-12-24T14:36:29.6466740+08:00;True|2024-12-24T10:28:42.7489880+08:00;False|2024-12-24T10:28:08.6809715+08:00;True|2024-12-24T10:06:05.9449103+08:00;False|2024-12-24T10:05:32.8409161+08:00;True|2024-12-23T14:56:40.3416256+08:00;True|2024-12-23T14:50:50.2677378+08:00;True|2024-12-23T14:48:27.8169391+08:00;True|2024-12-23T14:45:25.5341474+08:00;True|2024-12-23T14:42:23.7825087+08:00;True|2024-12-23T14:35:53.8876449+08:00;True|2024-12-23T14:14:00.4257926+08:00;True|2024-12-23T11:10:54.5874876+08:00;True|2024-12-23T11:08:44.0250304+08:00;False|2024-12-23T11:08:18.5757850+08:00;True|2024-12-20T12:51:29.2354841+08:00;True|2024-12-20T12:46:13.7636932+08:00;False|2024-12-20T12:44:21.1473486+08:00;False|2024-12-20T12:44:06.5427106+08:00;True|2024-12-20T12:29:33.9971940+08:00;False|2024-12-20T12:29:01.0285205+08:00;True|2024-12-19T15:49:19.9906264+08:00;True|2024-12-19T14:55:54.3323405+08:00;True|2024-12-19T14:17:50.5086161+08:00;True|2024-12-19T14:08:16.0919011+08:00;True|2024-12-19T14:02:50.3092759+08:00;True|2024-12-19T13:54:41.2332165+08:00;False|2024-12-19T13:54:07.6973483+08:00;True|2024-12-19T09:34:54.5332110+08:00;True|2024-12-19T08:49:05.5690428+08:00;False|2024-12-19T08:48:51.0618113+08:00;True|2024-12-18T15:45:34.7174246+08:00;False|2024-12-18T15:45:10.3226822+08:00;True|2024-12-18T15:32:03.5983267+08:00;True|2024-12-18T15:31:20.1219502+08:00;True|2024-12-18T11:57:09.1595607+08:00;True|2024-12-18T11:13:37.4765697+08:00;True|2024-12-18T10:07:54.1294714+08:00;True|2024-12-18T10:04:16.0967342+08:00;False|2024-12-18T10:04:04.1561560+08:00;True|2024-12-16T17:07:07.3386872+08:00;True|2024-12-16T16:34:59.1101964+08:00;True|2024-12-16T16:19:07.9287470+08:00;False|2024-12-16T16:18:46.4617432+08:00;True|2024-12-13T18:06:11.0778539+08:00;True|2024-12-13T16:53:52.2283177+08:00;True|2024-12-13T16:23:15.9531944+08:00;True|2024-12-13T13:58:03.7464045+08:00;True|2024-12-13T10:40:33.9285602+08:00;True|2024-12-13T10:38:03.8494063+08:00;False|2024-12-13T10:37:52.4251132+08:00;True|2024-12-13T10:31:07.4994631+08:00;False|2024-12-13T10:30:40.8021885+08:00;True|2024-12-12T10:01:42.4944750+08:00;False|2024-12-12T10:01:15.7147977+08:00;True|2024-12-11T17:21:58.0453583+08:00;True|2024-12-11T10:59:15.3836831+08:00;True|2024-12-11T09:49:19.4060272+08:00;False|2024-12-11T09:48:51.7603525+08:00;True|2024-12-11T08:58:41.4567855+08:00;False|2024-12-11T08:58:09.2160433+08:00;True|2024-12-10T17:25:49.3068154+08:00;True|2024-12-10T17:21:30.0155027+08:00;True|2024-12-10T17:16:56.7587487+08:00;False|2024-12-10T17:16:34.7816611+08:00;True|2024-12-10T16:55:40.3777585+08:00;False|2024-12-10T16:55:13.2621448+08:00;False|2024-12-09T13:59:27.6362265+08:00;True|2024-12-06T16:55:30.6422980+08:00;True|2024-12-06T15:08:49.5834939+08:00;True|2024-12-06T14:31:56.0968616+08:00;False|2024-12-06T14:31:44.2264009+08:00;True|2024-12-06T13:59:52.8150929+08:00;False|2024-12-06T13:48:22.6073939+08:00;True|2024-12-05T17:33:27.9247467+08:00;True|2024-12-05T17:30:23.1740838+08:00;False|2024-12-05T17:30:03.9977311+08:00;True|2024-12-04T15:18:41.4963816+08:00;True|2024-12-04T15:16:45.1121101+08:00;True|2024-12-04T15:14:33.5954776+08:00;True|2024-12-04T15:12:27.2913137+08:00;True|2024-12-04T14:10:19.6190673+08:00;False|2024-12-04T14:10:02.0319713+08:00;True|2024-12-03T16:08:46.6721098+08:00;True|2024-12-03T15:16:04.1754554+08:00;True|2024-12-03T15:13:25.4927626+08:00;True|2024-12-03T14:55:09.4413291+08:00;True|2024-12-03T14:43:11.8243897+08:00;True|2024-12-03T14:29:16.1511932+08:00;True|2024-12-03T14:24:07.9561838+08:00;False|2024-12-03T14:23:55.1293602+08:00;True|2024-12-02T16:31:22.0404862+08:00;False|2024-12-02T16:28:53.1721961+08:00;True|2024-12-02T15:41:24.9462025+08:00;True|2024-12-02T14:12:12.9356193+08:00;False|2024-12-02T14:11:35.7159488+08:00;True|2024-12-02T10:59:31.5582757+08:00;True|2024-11-29T12:08:55.4868083+08:00;False|2024-11-29T12:08:37.0353185+08:00;True|2024-11-28T10:47:27.2071355+08:00;False|2024-11-28T10:47:13.6670955+08:00;True|2024-11-27T15:21:57.6747082+08:00;False|2024-11-27T15:20:07.2403056+08:00;True|2024-11-27T15:13:36.1461091+08:00;True|2024-11-27T14:34:35.5908753+08:00;False|2024-11-27T14:33:30.7118923+08:00;True|2024-11-26T15:16:44.1854927+08:00;True|2024-11-26T15:14:33.4021067+08:00;False|2024-11-26T15:14:07.9955135+08:00;True|2024-11-26T14:48:35.6408418+08:00;True|2024-11-26T14:45:00.7251556+08:00;True|2024-11-26T14:04:58.4232988+08:00;False|2024-11-26T14:04:28.1286675+08:00;True|2024-11-25T13:45:07.6935933+08:00;True|2024-11-25T13:43:59.0788650+08:00;False|2024-11-25T13:43:44.2225194+08:00;True|2024-11-25T08:54:05.5144014+08:00;False|2024-11-25T08:53:49.2284063+08:00;False|2024-11-22T09:53:13.7879664+08:00;True|2024-11-21T13:48:31.7056264+08:00;True|2024-11-21T13:46:55.0891551+08:00;True|2024-11-21T13:44:05.5221110+08:00;True|2024-11-21T13:43:39.1385899+08:00;False|2024-11-21T13:43:19.9351488+08:00;True|2024-11-20T11:33:52.0324053+08:00;True|2024-11-20T11:20:58.4917889+08:00;True|2024-11-20T11:03:46.9552623+08:00;True|2024-11-20T10:45:10.9517109+08:00;False|2024-11-20T10:44:58.3221116+08:00;False|2024-11-19T15:39:27.3889104+08:00;True|2024-11-19T14:42:32.0854561+08:00;True|2024-11-19T14:19:19.6198070+08:00;True|2024-11-19T14:13:08.2003750+08:00;False|2024-11-19T14:12:15.5442850+08:00;True|2024-11-18T13:05:41.0455534+08:00;True|2024-11-18T11:05:30.2819404+08:00;True|2024-11-18T10:51:07.1852818+08:00;False|2024-11-18T10:50:21.5098527+08:00;True|2024-11-18T10:15:38.5429366+08:00;True|2024-11-18T10:00:51.0847524+08:00;True|2024-11-18T09:34:52.1772715+08:00;True|2024-11-18T09:27:23.6013754+08:00;False|2024-11-18T09:26:00.9323551+08:00;True|2024-11-15T11:20:51.7576376+08:00;True|2024-11-15T11:11:17.5580168+08:00;True|2024-11-15T11:03:58.4142996+08:00;True|2024-11-15T10:44:50.5207827+08:00;True|2024-11-15T10:10:05.5550418+08:00;True|2024-11-15T09:49:30.6631382+08:00;False|2024-11-15T09:47:05.3973379+08:00;True|2024-11-14T18:31:54.8247681+08:00;True|2024-11-14T17:14:56.3660185+08:00;True|2024-11-14T16:49:44.7526912+08:00;True|2024-11-14T16:49:09.3427608+08:00;True|2024-11-14T15:59:00.2572264+08:00;True|2024-11-14T11:21:03.5110818+08:00;True|2024-11-14T10:51:10.7864658+08:00;False|2024-11-14T10:50:55.5384248+08:00;True|2024-11-14T10:29:13.6760158+08:00;False|2024-11-14T10:28:09.8622863+08:00;True|2024-11-13T17:48:46.4827219+08:00;True|2024-11-13T17:45:13.0659280+08:00;True|2024-11-13T16:01:55.2278671+08:00;False|2024-11-13T16:01:03.0040446+08:00;True|2024-11-12T17:24:06.3763535+08:00;True|2024-11-12T17:21:51.8459552+08:00;True|2024-11-12T17:11:57.9239909+08:00;True|2024-11-12T17:09:04.4322824+08:00;True|2024-11-12T17:07:12.1839548+08:00;True|2024-11-12T17:04:27.4579152+08:00;True|2024-11-12T17:03:59.6843282+08:00;True|2024-11-12T16:40:44.0714862+08:00;True|2024-11-12T16:36:27.7792764+08:00;True|2024-11-12T16:32:36.5262040+08:00;False|2024-11-12T16:32:23.9550194+08:00;True|2024-11-12T10:58:16.1987697+08:00;False|2024-11-12T10:58:04.8469631+08:00;True|2024-11-11T13:40:53.2582255+08:00;True|2024-11-11T13:37:45.0401833+08:00;True|2024-11-11T12:35:13.2429166+08:00;True|2024-11-11T11:27:29.0530688+08:00;False|2024-11-11T11:27:12.2765506+08:00;True|2024-11-08T15:52:17.1278870+08:00;False|2024-11-08T15:52:04.4379380+08:00;True|2024-11-07T18:27:41.8163960+08:00;False|2024-11-07T18:27:30.6037983+08:00;True|2024-11-06T15:55:27.6450488+08:00;True|2024-11-06T15:54:13.5957004+08:00;True|2024-11-06T15:25:33.3862531+08:00;True|2024-11-06T13:33:57.8502278+08:00;False|2024-11-06T13:33:39.2337086+08:00;True|2024-11-06T11:33:12.6755239+08:00;True|2024-11-05T18:34:17.7048247+08:00;True|2024-11-05T18:30:08.5724471+08:00;True|2024-11-05T18:24:35.5372980+08:00;True|2024-11-05T18:06:29.7644779+08:00;True|2024-11-05T17:53:50.9554703+08:00;True|2024-11-05T17:50:05.6376900+08:00;True|2024-11-05T11:13:46.2906508+08:00;True|2024-11-05T10:35:55.5423834+08:00;False|2024-11-05T10:35:20.4104039+08:00;True|2024-11-01T10:22:05.7636122+08:00;False|2024-11-01T10:21:33.2954398+08:00;True|2024-10-31T20:03:37.9075888+08:00;True|2024-10-31T18:35:31.6618415+08:00;True|2024-10-31T18:34:56.2479021+08:00;True|2024-10-31T09:43:29.0841188+08:00;False|2024-10-31T09:43:04.8780818+08:00;True|2024-10-30T18:42:11.0523067+08:00;True|2024-10-30T18:07:05.5603627+08:00;True|2024-10-30T18:03:15.3516621+08:00;True|2024-10-30T17:58:14.3276504+08:00;False|2024-10-30T17:57:44.5353118+08:00;True|2024-10-30T17:47:41.2889491+08:00;True|2024-10-30T17:19:36.6172721+08:00;True|2024-10-30T17:10:00.4399703+08:00;False|2024-10-30T17:08:57.6500450+08:00;True|2024-10-29T16:58:15.6006676+08:00;True|2024-10-29T16:51:56.8406649+08:00;True|2024-10-29T16:05:48.4297695+08:00;True|2024-10-29T15:12:15.1522377+08:00;True|2024-10-29T15:10:51.8431754+08:00;True|2024-10-29T11:21:01.5660940+08:00;False|2024-10-29T11:20:33.3958980+08:00;True|2024-10-28T17:51:26.7156861+08:00;False|2024-10-28T17:50:41.4388196+08:00;True|2024-10-28T13:34:14.8764262+08:00;True|2024-10-28T12:44:27.2083620+08:00;False|2024-10-28T12:43:57.5942717+08:00;True|2024-10-25T11:49:47.9817458+08:00;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
+ <History>True|2025-05-17T06:14:12.0279596Z;True|2025-05-17T13:44:20.1547573+08:00;True|2025-05-17T13:09:56.7254199+08:00;True|2025-05-17T12:22:45.9766542+08:00;True|2025-05-17T11:49:56.8647669+08:00;False|2025-05-17T11:46:23.8688151+08:00;True|2025-05-16T14:56:34.3445988+08:00;True|2025-05-16T13:09:24.9723517+08:00;False|2025-05-16T12:53:18.5385817+08:00;True|2025-05-15T17:17:23.2057769+08:00;True|2025-05-15T16:28:03.1493226+08:00;True|2025-05-15T16:09:34.5928723+08:00;True|2025-05-15T15:50:13.7185578+08:00;True|2025-05-15T15:43:43.9742646+08:00;True|2025-05-15T15:02:16.5848076+08:00;True|2025-05-15T14:28:35.2194847+08:00;False|2025-05-15T14:26:02.0933523+08:00;False|2025-05-15T14:25:16.4746523+08:00;False|2025-05-15T14:23:37.0444052+08:00;False|2025-05-15T14:22:38.2549781+08:00;True|2025-05-15T14:08:47.9908883+08:00;True|2025-05-15T13:30:28.6027783+08:00;False|2025-05-15T13:27:35.2019769+08:00;True|2025-05-14T14:33:50.7542669+08:00;False|2025-05-14T12:58:34.3790659+08:00;True|2025-05-06T18:16:13.1825659+08:00;False|2025-05-06T18:13:36.1768928+08:00;False|2025-04-30T10:51:25.6190120+08:00;True|2025-04-15T13:47:43.0319806+08:00;False|2025-04-15T13:43:39.5193511+08:00;True|2025-04-14T16:55:07.6035477+08:00;True|2025-04-14T16:10:02.4925200+08:00;True|2025-04-14T15:59:48.1256324+08:00;True|2025-04-14T15:35:58.3739263+08:00;True|2025-04-14T15:18:20.0231874+08:00;True|2025-04-14T15:15:48.1937642+08:00;True|2025-04-14T15:06:18.1485320+08:00;True|2025-04-14T13:58:54.9488220+08:00;True|2025-04-14T13:45:21.9528067+08:00;True|2025-04-14T13:32:41.8026503+08:00;True|2025-04-14T13:24:25.1609026+08:00;False|2025-04-14T13:21:46.7999422+08:00;True|2025-04-14T11:22:02.0084668+08:00;False|2025-04-14T11:16:39.7668266+08:00;True|2025-04-11T16:42:49.2287375+08:00;True|2025-04-11T15:21:50.9239660+08:00;False|2025-04-11T15:18:52.8043694+08:00;True|2025-04-09T17:30:38.2292747+08:00;True|2025-04-09T17:26:46.2681749+08:00;False|2025-04-09T17:24:55.8631858+08:00;True|2025-04-09T14:49:05.0786518+08:00;False|2025-04-09T14:47:08.0080072+08:00;True|2025-04-09T14:07:09.5914371+08:00;False|2025-04-09T14:03:54.1549615+08:00;True|2025-04-09T10:47:08.9478457+08:00;False|2025-04-09T10:42:24.4815543+08:00;True|2025-04-08T13:55:42.3999925+08:00;True|2025-04-08T13:03:18.1047211+08:00;False|2025-04-08T13:01:24.7284945+08:00;True|2025-04-08T12:45:45.9591473+08:00;True|2025-04-08T10:37:46.2486194+08:00;True|2025-04-08T10:19:41.4391162+08:00;True|2025-04-08T09:03:06.3555124+08:00;False|2025-04-08T09:00:24.5011547+08:00;True|2025-04-03T13:30:58.8690712+08:00;True|2025-04-03T11:11:58.9675862+08:00;True|2025-04-03T08:26:57.1183260+08:00;False|2025-04-03T08:24:15.5585637+08:00;True|2025-04-02T17:22:56.3662600+08:00;True|2025-04-02T16:34:30.3902014+08:00;False|2025-04-02T16:31:03.2711601+08:00;True|2025-04-02T08:53:58.9022912+08:00;False|2025-04-02T08:49:36.2482604+08:00;True|2025-04-01T14:11:15.6665093+08:00;True|2025-04-01T13:59:03.5182641+08:00;True|2025-04-01T11:34:01.0473928+08:00;False|2025-04-01T11:27:06.6219808+08:00;True|2025-03-31T11:32:14.3010437+08:00;False|2025-03-31T11:28:54.7180398+08:00;True|2025-03-28T16:33:00.1667734+08:00;True|2025-03-28T15:59:08.0311042+08:00;True|2025-03-28T14:24:00.8058555+08:00;True|2025-03-28T11:20:49.2519130+08:00;True|2025-03-28T09:46:40.2335440+08:00;True|2025-03-28T09:44:23.8324494+08:00;False|2025-03-28T09:39:07.0797562+08:00;True|2025-03-27T17:42:12.3457479+08:00;True|2025-03-27T16:53:40.2462518+08:00;True|2025-03-27T15:41:05.4036532+08:00;True|2025-03-27T14:20:24.3597261+08:00;True|2025-03-27T10:51:24.2799353+08:00;False|2025-03-27T10:45:28.9126200+08:00;True|2025-03-26T13:49:06.9257931+08:00;False|2025-03-26T13:44:48.7676302+08:00;True|2025-03-25T15:17:55.4790872+08:00;False|2025-03-25T15:14:39.3949477+08:00;True|2025-03-25T14:23:34.4515442+08:00;True|2025-03-24T16:49:42.0663422+08:00;True|2025-03-24T13:12:18.9244375+08:00;False|2025-03-24T13:07:19.8409939+08:00;False|2025-03-24T12:48:52.4860847+08:00;False|2025-03-24T11:39:21.1805195+08:00;False|2025-03-24T11:37:43.6802081+08:00;False|2025-03-24T11:33:57.1454920+08:00;False|2025-03-24T11:30:14.3844034+08:00;False|2025-03-24T11:28:02.5067052+08:00;False|2025-03-21T12:21:29.9136433+08:00;True|2025-03-20T16:39:21.8390481+08:00;True|2025-03-20T14:41:37.0419379+08:00;False|2025-03-20T14:37:15.3728461+08:00;True|2025-03-20T12:27:20.0312759+08:00;True|2025-03-20T10:42:53.0161637+08:00;True|2025-03-20T09:30:05.5790815+08:00;False|2025-03-20T09:25:15.2327164+08:00;True|2025-03-19T17:06:57.7672924+08:00;True|2025-03-19T15:46:30.3411577+08:00;True|2025-03-19T13:45:31.7138375+08:00;True|2025-03-19T11:09:17.0875638+08:00;False|2025-03-19T11:05:00.7852430+08:00;True|2025-03-18T17:07:26.8842323+08:00;False|2025-03-18T17:02:33.5857720+08:00;False|2025-03-17T11:09:34.0681444+08:00;True|2025-03-17T10:50:21.9158331+08:00;True|2025-03-17T09:42:47.9252167+08:00;False|2025-03-17T09:31:53.1872136+08:00;True|2025-03-14T17:46:56.2806627+08:00;True|2025-03-14T16:26:15.6828252+08:00;True|2025-03-14T16:14:53.0710942+08:00;True|2025-03-14T16:08:09.5365263+08:00;True|2025-03-14T15:59:01.3358337+08:00;True|2025-03-14T14:22:42.7725023+08:00;True|2025-03-14T09:54:22.0848434+08:00;False|2025-03-14T09:51:59.6649411+08:00;True|2025-03-14T09:36:17.1134782+08:00;False|2025-03-14T09:31:58.5198805+08:00;True|2025-03-13T13:08:01.9024847+08:00;False|2025-03-13T13:03:35.7160929+08:00;True|2025-03-12T15:37:13.4111189+08:00;True|2025-03-12T15:23:55.5422176+08:00;True|2025-03-12T15:16:21.2123980+08:00;True|2025-03-12T14:49:24.9895017+08:00;True|2025-03-12T14:41:41.5663090+08:00;False|2025-03-12T14:39:27.3156286+08:00;True|2025-03-12T14:10:23.4204108+08:00;False|2025-03-12T14:08:08.4985635+08:00;True|2025-03-12T13:34:39.8492928+08:00;False|2025-03-12T13:31:34.8359622+08:00;True|2025-03-12T11:39:34.2976894+08:00;False|2025-03-12T09:22:45.9334513+08:00;True|2025-03-10T15:59:42.1283263+08:00;False|2025-03-10T15:53:57.2115226+08:00;True|2025-03-07T16:23:25.1589274+08:00;True|2025-03-07T16:18:46.0202723+08:00;True|2025-03-07T15:59:34.8313474+08:00;True|2025-03-07T15:37:59.1693363+08:00;True|2025-03-07T14:05:40.7253978+08:00;True|2025-03-07T11:21:14.9610137+08:00;False|2025-03-07T11:15:41.4171028+08:00;True|2025-03-07T10:23:24.0437379+08:00;True|2025-03-07T10:07:03.4231550+08:00;False|2025-03-07T10:04:32.6854924+08:00;True|2025-03-06T16:32:23.7096239+08:00;True|2025-03-06T15:45:46.0345284+08:00;True|2025-03-06T15:40:00.7026164+08:00;True|2025-03-06T15:20:20.3523488+08:00;True|2025-03-06T14:19:37.2403331+08:00;True|2025-03-06T13:49:03.6420821+08:00;False|2025-03-06T13:46:35.7037619+08:00;True|2025-03-06T11:03:29.5882789+08:00;True|2025-03-06T09:59:53.3080173+08:00;True|2025-03-06T09:43:48.4337079+08:00;False|2025-03-06T09:35:05.3462434+08:00;True|2025-03-05T18:25:35.2595591+08:00;True|2025-03-05T18:03:37.5687895+08:00;True|2025-03-05T17:48:08.3418269+08:00;False|2025-03-05T17:44:40.0721881+08:00;True|2025-03-05T17:23:30.5871011+08:00;True|2025-03-05T16:31:12.2285816+08:00;True|2025-03-05T16:00:25.5496303+08:00;True|2025-03-05T15:11:30.9434230+08:00;True|2025-03-05T14:22:08.4650724+08:00;True|2025-03-05T13:29:42.9306833+08:00;True|2025-03-05T11:28:17.5541196+08:00;True|2025-03-05T11:10:22.3318023+08:00;True|2025-03-05T10:55:33.6796527+08:00;True|2025-03-05T10:08:26.7761472+08:00;True|2025-03-05T10:02:32.8701262+08:00;False|2025-03-05T09:59:55.0044057+08:00;True|2025-03-04T17:48:24.6869079+08:00;True|2025-03-04T17:42:05.0276293+08:00;False|2025-03-04T17:39:53.6208557+08:00;False|2025-03-04T17:39:30.0759309+08:00;False|2025-03-04T17:05:37.2163588+08:00;True|2025-03-04T16:51:15.6884461+08:00;True|2025-03-04T16:49:03.3836181+08:00;True|2025-03-04T16:31:36.5847402+08:00;True|2025-03-04T15:52:09.1977151+08:00;True|2025-03-04T15:24:25.0194954+08:00;True|2025-03-04T15:12:44.1606138+08:00;False|2025-03-04T15:10:47.3915404+08:00;True|2025-03-04T14:31:42.7483906+08:00;True|2025-03-04T11:28:36.6001869+08:00;False|2025-02-27T19:55:43.0462466+08:00;True|2025-02-24T16:03:00.5507258+08:00;False|2025-02-24T16:00:00.9104160+08:00;True|2025-02-19T16:55:31.8966125+08:00;True|2025-02-19T14:51:19.5866770+08:00;False|2025-02-19T14:49:16.2857645+08:00;True|2025-02-19T14:11:03.8109482+08:00;False|2025-02-19T14:08:17.7243950+08:00;True|2025-02-19T11:16:48.1875981+08:00;False|2025-02-19T11:14:24.0571589+08:00;True|2025-02-19T10:17:34.3257301+08:00;False|2025-02-19T10:14:49.0730325+08:00;True|2025-02-18T09:38:54.9616937+08:00;True|2025-02-18T09:16:03.1196071+08:00;False|2025-02-18T09:13:52.5022130+08:00;True|2025-02-17T17:28:38.1103164+08:00;True|2025-02-17T17:06:19.1494960+08:00;True|2025-02-17T16:58:21.8893871+08:00;False|2025-02-17T16:56:34.0012780+08:00;True|2025-02-17T15:56:45.9560949+08:00;False|2025-02-17T15:29:32.9323141+08:00;False|2025-02-17T15:27:54.6615301+08:00;False|2025-02-17T15:25:42.7179137+08:00;True|2025-02-12T10:48:39.4029671+08:00;True|2025-02-12T10:45:09.8138793+08:00;False|2025-02-12T10:43:37.5751112+08:00;False|2025-02-12T10:43:24.8201898+08:00;False|2025-02-12T10:42:58.2736984+08:00;False|2025-02-12T10:42:46.1482594+08:00;False|2025-02-12T10:42:01.5427330+08:00;False|2025-02-12T10:41:48.3761346+08:00;False|2025-02-12T10:41:29.3367142+08:00;True|2025-02-11T15:41:34.0746843+08:00;True|2025-02-11T15:39:37.3374891+08:00;False|2025-02-11T15:39:27.0449176+08:00;False|2025-02-11T15:08:35.2970100+08:00;True|2025-02-11T14:59:59.6539416+08:00;True|2025-02-11T14:56:20.5954601+08:00;False|2025-02-11T14:55:35.6700921+08:00;True|2025-02-10T09:39:38.7399451+08:00;False|2025-02-10T09:39:10.1358642+08:00;True|2025-02-08T16:00:23.1136903+08:00;False|2025-02-08T15:59:50.0414065+08:00;True|2025-01-17T10:17:41.6850215+08:00;False|2025-01-17T10:16:20.3202054+08:00;True|2025-01-17T09:00:26.6966310+08:00;False|2025-01-17T08:59:59.9527727+08:00;True|2025-01-16T11:06:57.1014257+08:00;True|2025-01-16T10:27:57.2742426+08:00;False|2025-01-16T10:27:27.5197746+08:00;True|2025-01-15T11:05:17.5523582+08:00;True|2025-01-15T09:37:34.6118980+08:00;False|2025-01-15T09:36:27.7987949+08:00;True|2025-01-14T12:52:06.2234405+08:00;True|2025-01-14T12:50:08.8487446+08:00;False|2025-01-14T12:49:45.2743330+08:00;True|2025-01-14T10:31:18.6477403+08:00;False|2025-01-14T10:29:30.1534049+08:00;True|2025-01-13T15:27:00.4497527+08:00;True|2025-01-13T15:01:33.6142160+08:00;True|2025-01-13T10:29:49.4772980+08:00;True|2025-01-13T10:11:15.7993265+08:00;True|2025-01-13T10:08:58.9378828+08:00;False|2025-01-13T10:08:44.9869073+08:00;True|2025-01-13T10:02:17.5175561+08:00;False|2025-01-13T10:02:00.9991870+08:00;True|2025-01-08T17:50:21.7468469+08:00;True|2025-01-08T16:38:48.8592252+08:00;True|2025-01-08T10:44:42.9161086+08:00;False|2025-01-08T10:44:09.4840640+08:00;True|2025-01-08T10:34:31.5982265+08:00;False|2025-01-08T10:33:57.3576390+08:00;True|2025-01-03T17:19:09.1765100+08:00;True|2025-01-03T17:10:41.8794009+08:00;True|2025-01-03T17:10:11.4245485+08:00;True|2025-01-03T15:54:22.3387906+08:00;True|2025-01-03T15:41:44.9897120+08:00;False|2025-01-03T15:40:42.1357112+08:00;False|2025-01-03T15:39:09.0564197+08:00;True|2025-01-03T14:58:31.5701467+08:00;True|2025-01-03T14:29:13.4456304+08:00;False|2025-01-03T14:27:18.9925263+08:00;True|2025-01-02T16:08:24.1819376+08:00;True|2025-01-02T16:07:01.1636705+08:00;True|2025-01-02T16:03:02.6520904+08:00;True|2025-01-02T10:03:56.0551738+08:00;False|2025-01-02T10:03:34.8632732+08:00;True|2024-12-31T15:27:01.3180960+08:00;True|2024-12-31T11:17:12.2977529+08:00;True|2024-12-31T10:48:14.7205535+08:00;True|2024-12-31T10:18:45.6669875+08:00;False|2024-12-31T10:18:21.6706557+08:00;True|2024-12-30T09:32:44.3898729+08:00;True|2024-12-30T09:31:24.5771941+08:00;False|2024-12-30T09:30:52.4031391+08:00;True|2024-12-27T16:12:20.2836752+08:00;False|2024-12-27T16:11:04.6614343+08:00;True|2024-12-27T15:07:23.0750147+08:00;True|2024-12-27T15:04:52.7876532+08:00;True|2024-12-27T14:37:54.3154829+08:00;False|2024-12-27T14:37:26.9546174+08:00;True|2024-12-26T16:33:56.0452167+08:00;True|2024-12-26T16:29:21.4115458+08:00;True|2024-12-26T16:29:02.0242815+08:00;True|2024-12-26T15:17:24.7390981+08:00;False|2024-12-26T15:13:26.8863189+08:00;True|2024-12-26T15:06:35.4541902+08:00;True|2024-12-26T11:35:42.2760106+08:00;False|2024-12-26T11:35:08.9255789+08:00;True|2024-12-26T10:10:29.7487991+08:00;True|2024-12-26T09:27:40.2637311+08:00;False|2024-12-26T09:25:52.1339136+08:00;True|2024-12-24T15:11:48.9968778+08:00;True|2024-12-24T15:06:55.0283993+08:00;True|2024-12-24T14:36:29.6466740+08:00;True|2024-12-24T10:28:42.7489880+08:00;False|2024-12-24T10:28:08.6809715+08:00;True|2024-12-24T10:06:05.9449103+08:00;False|2024-12-24T10:05:32.8409161+08:00;True|2024-12-23T14:56:40.3416256+08:00;True|2024-12-23T14:50:50.2677378+08:00;True|2024-12-23T14:48:27.8169391+08:00;True|2024-12-23T14:45:25.5341474+08:00;True|2024-12-23T14:42:23.7825087+08:00;True|2024-12-23T14:35:53.8876449+08:00;True|2024-12-23T14:14:00.4257926+08:00;True|2024-12-23T11:10:54.5874876+08:00;True|2024-12-23T11:08:44.0250304+08:00;False|2024-12-23T11:08:18.5757850+08:00;True|2024-12-20T12:51:29.2354841+08:00;True|2024-12-20T12:46:13.7636932+08:00;False|2024-12-20T12:44:21.1473486+08:00;False|2024-12-20T12:44:06.5427106+08:00;True|2024-12-20T12:29:33.9971940+08:00;False|2024-12-20T12:29:01.0285205+08:00;True|2024-12-19T15:49:19.9906264+08:00;True|2024-12-19T14:55:54.3323405+08:00;True|2024-12-19T14:17:50.5086161+08:00;True|2024-12-19T14:08:16.0919011+08:00;True|2024-12-19T14:02:50.3092759+08:00;True|2024-12-19T13:54:41.2332165+08:00;False|2024-12-19T13:54:07.6973483+08:00;True|2024-12-19T09:34:54.5332110+08:00;True|2024-12-19T08:49:05.5690428+08:00;False|2024-12-19T08:48:51.0618113+08:00;True|2024-12-18T15:45:34.7174246+08:00;False|2024-12-18T15:45:10.3226822+08:00;True|2024-12-18T15:32:03.5983267+08:00;True|2024-12-18T15:31:20.1219502+08:00;True|2024-12-18T11:57:09.1595607+08:00;True|2024-12-18T11:13:37.4765697+08:00;True|2024-12-18T10:07:54.1294714+08:00;True|2024-12-18T10:04:16.0967342+08:00;False|2024-12-18T10:04:04.1561560+08:00;True|2024-12-16T17:07:07.3386872+08:00;True|2024-12-16T16:34:59.1101964+08:00;True|2024-12-16T16:19:07.9287470+08:00;False|2024-12-16T16:18:46.4617432+08:00;True|2024-12-13T18:06:11.0778539+08:00;True|2024-12-13T16:53:52.2283177+08:00;True|2024-12-13T16:23:15.9531944+08:00;True|2024-12-13T13:58:03.7464045+08:00;True|2024-12-13T10:40:33.9285602+08:00;True|2024-12-13T10:38:03.8494063+08:00;False|2024-12-13T10:37:52.4251132+08:00;True|2024-12-13T10:31:07.4994631+08:00;False|2024-12-13T10:30:40.8021885+08:00;True|2024-12-12T10:01:42.4944750+08:00;False|2024-12-12T10:01:15.7147977+08:00;True|2024-12-11T17:21:58.0453583+08:00;True|2024-12-11T10:59:15.3836831+08:00;True|2024-12-11T09:49:19.4060272+08:00;False|2024-12-11T09:48:51.7603525+08:00;True|2024-12-11T08:58:41.4567855+08:00;False|2024-12-11T08:58:09.2160433+08:00;True|2024-12-10T17:25:49.3068154+08:00;True|2024-12-10T17:21:30.0155027+08:00;True|2024-12-10T17:16:56.7587487+08:00;False|2024-12-10T17:16:34.7816611+08:00;True|2024-12-10T16:55:40.3777585+08:00;False|2024-12-10T16:55:13.2621448+08:00;False|2024-12-09T13:59:27.6362265+08:00;True|2024-12-06T16:55:30.6422980+08:00;True|2024-12-06T15:08:49.5834939+08:00;True|2024-12-06T14:31:56.0968616+08:00;False|2024-12-06T14:31:44.2264009+08:00;True|2024-12-06T13:59:52.8150929+08:00;False|2024-12-06T13:48:22.6073939+08:00;True|2024-12-05T17:33:27.9247467+08:00;True|2024-12-05T17:30:23.1740838+08:00;False|2024-12-05T17:30:03.9977311+08:00;True|2024-12-04T15:18:41.4963816+08:00;True|2024-12-04T15:16:45.1121101+08:00;True|2024-12-04T15:14:33.5954776+08:00;True|2024-12-04T15:12:27.2913137+08:00;True|2024-12-04T14:10:19.6190673+08:00;False|2024-12-04T14:10:02.0319713+08:00;True|2024-12-03T16:08:46.6721098+08:00;True|2024-12-03T15:16:04.1754554+08:00;True|2024-12-03T15:13:25.4927626+08:00;True|2024-12-03T14:55:09.4413291+08:00;True|2024-12-03T14:43:11.8243897+08:00;True|2024-12-03T14:29:16.1511932+08:00;True|2024-12-03T14:24:07.9561838+08:00;False|2024-12-03T14:23:55.1293602+08:00;True|2024-12-02T16:31:22.0404862+08:00;False|2024-12-02T16:28:53.1721961+08:00;True|2024-12-02T15:41:24.9462025+08:00;True|2024-12-02T14:12:12.9356193+08:00;False|2024-12-02T14:11:35.7159488+08:00;True|2024-12-02T10:59:31.5582757+08:00;True|2024-11-29T12:08:55.4868083+08:00;False|2024-11-29T12:08:37.0353185+08:00;True|2024-11-28T10:47:27.2071355+08:00;False|2024-11-28T10:47:13.6670955+08:00;True|2024-11-27T15:21:57.6747082+08:00;False|2024-11-27T15:20:07.2403056+08:00;True|2024-11-27T15:13:36.1461091+08:00;True|2024-11-27T14:34:35.5908753+08:00;False|2024-11-27T14:33:30.7118923+08:00;True|2024-11-26T15:16:44.1854927+08:00;True|2024-11-26T15:14:33.4021067+08:00;False|2024-11-26T15:14:07.9955135+08:00;True|2024-11-26T14:48:35.6408418+08:00;True|2024-11-26T14:45:00.7251556+08:00;True|2024-11-26T14:04:58.4232988+08:00;False|2024-11-26T14:04:28.1286675+08:00;True|2024-11-25T13:45:07.6935933+08:00;True|2024-11-25T13:43:59.0788650+08:00;False|2024-11-25T13:43:44.2225194+08:00;True|2024-11-25T08:54:05.5144014+08:00;False|2024-11-25T08:53:49.2284063+08:00;False|2024-11-22T09:53:13.7879664+08:00;True|2024-11-21T13:48:31.7056264+08:00;True|2024-11-21T13:46:55.0891551+08:00;True|2024-11-21T13:44:05.5221110+08:00;True|2024-11-21T13:43:39.1385899+08:00;False|2024-11-21T13:43:19.9351488+08:00;True|2024-11-20T11:33:52.0324053+08:00;True|2024-11-20T11:20:58.4917889+08:00;True|2024-11-20T11:03:46.9552623+08:00;True|2024-11-20T10:45:10.9517109+08:00;False|2024-11-20T10:44:58.3221116+08:00;False|2024-11-19T15:39:27.3889104+08:00;True|2024-11-19T14:42:32.0854561+08:00;True|2024-11-19T14:19:19.6198070+08:00;True|2024-11-19T14:13:08.2003750+08:00;False|2024-11-19T14:12:15.5442850+08:00;True|2024-11-18T13:05:41.0455534+08:00;True|2024-11-18T11:05:30.2819404+08:00;True|2024-11-18T10:51:07.1852818+08:00;False|2024-11-18T10:50:21.5098527+08:00;True|2024-11-18T10:15:38.5429366+08:00;True|2024-11-18T10:00:51.0847524+08:00;True|2024-11-18T09:34:52.1772715+08:00;True|2024-11-18T09:27:23.6013754+08:00;False|2024-11-18T09:26:00.9323551+08:00;True|2024-11-15T11:20:51.7576376+08:00;True|2024-11-15T11:11:17.5580168+08:00;True|2024-11-15T11:03:58.4142996+08:00;True|2024-11-15T10:44:50.5207827+08:00;True|2024-11-15T10:10:05.5550418+08:00;True|2024-11-15T09:49:30.6631382+08:00;False|2024-11-15T09:47:05.3973379+08:00;True|2024-11-14T18:31:54.8247681+08:00;True|2024-11-14T17:14:56.3660185+08:00;True|2024-11-14T16:49:44.7526912+08:00;True|2024-11-14T16:49:09.3427608+08:00;True|2024-11-14T15:59:00.2572264+08:00;True|2024-11-14T11:21:03.5110818+08:00;True|2024-11-14T10:51:10.7864658+08:00;False|2024-11-14T10:50:55.5384248+08:00;True|2024-11-14T10:29:13.6760158+08:00;False|2024-11-14T10:28:09.8622863+08:00;True|2024-11-13T17:48:46.4827219+08:00;True|2024-11-13T17:45:13.0659280+08:00;True|2024-11-13T16:01:55.2278671+08:00;False|2024-11-13T16:01:03.0040446+08:00;True|2024-11-12T17:24:06.3763535+08:00;True|2024-11-12T17:21:51.8459552+08:00;True|2024-11-12T17:11:57.9239909+08:00;True|2024-11-12T17:09:04.4322824+08:00;True|2024-11-12T17:07:12.1839548+08:00;True|2024-11-12T17:04:27.4579152+08:00;True|2024-11-12T17:03:59.6843282+08:00;True|2024-11-12T16:40:44.0714862+08:00;True|2024-11-12T16:36:27.7792764+08:00;True|2024-11-12T16:32:36.5262040+08:00;False|2024-11-12T16:32:23.9550194+08:00;True|2024-11-12T10:58:16.1987697+08:00;False|2024-11-12T10:58:04.8469631+08:00;True|2024-11-11T13:40:53.2582255+08:00;True|2024-11-11T13:37:45.0401833+08:00;True|2024-11-11T12:35:13.2429166+08:00;True|2024-11-11T11:27:29.0530688+08:00;False|2024-11-11T11:27:12.2765506+08:00;True|2024-11-08T15:52:17.1278870+08:00;False|2024-11-08T15:52:04.4379380+08:00;True|2024-11-07T18:27:41.8163960+08:00;False|2024-11-07T18:27:30.6037983+08:00;True|2024-11-06T15:55:27.6450488+08:00;True|2024-11-06T15:54:13.5957004+08:00;True|2024-11-06T15:25:33.3862531+08:00;True|2024-11-06T13:33:57.8502278+08:00;False|2024-11-06T13:33:39.2337086+08:00;True|2024-11-06T11:33:12.6755239+08:00;True|2024-11-05T18:34:17.7048247+08:00;True|2024-11-05T18:30:08.5724471+08:00;True|2024-11-05T18:24:35.5372980+08:00;True|2024-11-05T18:06:29.7644779+08:00;True|2024-11-05T17:53:50.9554703+08:00;True|2024-11-05T17:50:05.6376900+08:00;True|2024-11-05T11:13:46.2906508+08:00;True|2024-11-05T10:35:55.5423834+08:00;False|2024-11-05T10:35:20.4104039+08:00;True|2024-11-01T10:22:05.7636122+08:00;False|2024-11-01T10:21:33.2954398+08:00;True|2024-10-31T20:03:37.9075888+08:00;True|2024-10-31T18:35:31.6618415+08:00;True|2024-10-31T18:34:56.2479021+08:00;True|2024-10-31T09:43:29.0841188+08:00;False|2024-10-31T09:43:04.8780818+08:00;True|2024-10-30T18:42:11.0523067+08:00;True|2024-10-30T18:07:05.5603627+08:00;True|2024-10-30T18:03:15.3516621+08:00;True|2024-10-30T17:58:14.3276504+08:00;False|2024-10-30T17:57:44.5353118+08:00;True|2024-10-30T17:47:41.2889491+08:00;True|2024-10-30T17:19:36.6172721+08:00;True|2024-10-30T17:10:00.4399703+08:00;False|2024-10-30T17:08:57.6500450+08:00;True|2024-10-29T16:58:15.6006676+08:00;True|2024-10-29T16:51:56.8406649+08:00;True|2024-10-29T16:05:48.4297695+08:00;True|2024-10-29T15:12:15.1522377+08:00;True|2024-10-29T15:10:51.8431754+08:00;True|2024-10-29T11:21:01.5660940+08:00;False|2024-10-29T11:20:33.3958980+08:00;True|2024-10-28T17:51:26.7156861+08:00;False|2024-10-28T17:50:41.4388196+08:00;True|2024-10-28T13:34:14.8764262+08:00;True|2024-10-28T12:44:27.2083620+08:00;False|2024-10-28T12:43:57.5942717+08:00;True|2024-10-25T11:49:47.9817458+08:00;True|2024-10-25T11:49:34.4754546+08:00;True|2024-10-25T09:59:35.6471379+08:00;True|2024-10-25T09:47:46.8035540+08:00;True|2024-10-25T09:25:57.7872618+08:00;False|2024-10-25T09:25:30.0950732+08:00;True|2024-10-24T20:39:06.1992535+08:00;False|2024-10-24T20:38:33.1009731+08:00;True|2024-10-24T11:17:46.9974483+08:00;False|2024-10-24T11:17:17.0925356+08:00;True|2024-10-23T19:16:25.5189930+08:00;True|2024-10-23T17:10:44.4267777+08:00;False|2024-10-23T17:10:10.2947971+08:00;True|2024-10-23T14:13:22.6901287+08:00;False|2024-10-23T14:12:24.3997100+08:00;True|2024-10-22T16:25:12.9514711+08:00;False|2024-10-22T16:24:42.9025167+08:00;True|2024-10-22T10:22:33.9932601+08:00;False|2024-10-22T10:22:05.3030308+08:00;True|2024-10-21T17:53:29.9552741+08:00;True|2024-10-21T16:37:31.4159544+08:00;True|2024-10-21T16:35:43.6207036+08:00;True|2024-10-21T16:00:05.5040651+08:00;False|2024-10-21T15:59:35.9279259+08:00;True|2024-10-21T12:06:42.5768961+08:00;False|2024-10-21T12:06:16.6344662+08:00;True|2024-10-18T10:44:02.6495536+08:00;True|2024-10-18T09:55:47.9769914+08:00;True|2024-10-18T09:47:46.6365831+08:00;True|2024-10-18T09:46:40.4036657+08:00;True|2024-10-18T09:44:25.4598960+08:00;True|2024-10-18T09:30:07.6972377+08:00;False|2024-10-18T09:28:18.9251743+08:00;True|2024-10-17T12:13:34.8639685+08:00;True|2024-10-17T12:02:26.5251711+08:00;False|2024-10-17T12:01:31.3822430+08:00;True|2024-10-17T11:49:09.2395208+08:00;False|2024-10-17T11:48:38.0189241+08:00;True|2024-10-16T19:35:29.2047484+08:00;False|2024-10-16T19:32:43.0637947+08:00;True|2024-10-16T11:27:13.1263407+08:00;False|2024-10-16T11:25:49.8688677+08:00;True|2024-10-15T18:26:50.9948482+08:00;False|2024-10-15T18:26:23.6998750+08:00;True|2024-08-26T14:17:37.8502046+08:00;False|2024-08-26T14:16:09.8501361+08:00;True|2024-08-22T11:12:48.4249984+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,28 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>04/15/2025 13:44:40</publishTime>
+ <publishTime>05/17/2025 13:08:20</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>04/15/2025 13:44:40</publishTime>
+ <publishTime>05/17/2025 13:08:20</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>04/15/2025 13:44:29</publishTime>
+ <publishTime>05/17/2025 13:08:15</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>04/15/2025 13:44:29</publishTime>
+ <publishTime>05/17/2025 13:08:15</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>04/15/2025 13:44:21</publishTime>
+ <publishTime>05/17/2025 13:08:09</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>04/15/2025 13:44:21</publishTime>
+ <publishTime>05/17/2025 13:08:09</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/15/2025 13:44:26</publishTime>
+ <publishTime>05/17/2025 13:08:12</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>04/15/2025 13:44:26</publishTime>
+ <publishTime>05/17/2025 13:08:12</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>02/12/2025 09:59:05</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>04/15/2025 13:44:17</publishTime>
+ <publishTime>05/17/2025 13:08:06</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>04/15/2025 13:44:17</publishTime>
+ <publishTime>05/17/2025 13:08:06</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>04/15/2025 13:44:19</publishTime>
+ <publishTime>05/17/2025 13:08:08</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>04/15/2025 13:44:19</publishTime>
+ <publishTime>05/17/2025 13:08:08</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>04/15/2025 13:44:19</publishTime>
+ <publishTime>05/17/2025 13:08:08</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>04/15/2025 13:44:19</publishTime>
+ <publishTime>05/17/2025 13:08:08</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>04/15/2025 13:36:54</publishTime>
+ <publishTime>05/17/2025 13:06:07</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>04/15/2025 13:36:54</publishTime>
+ <publishTime>05/17/2025 13:06:07</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,19 +285,19 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>04/15/2025 13:36:56</publishTime>
+ <publishTime>05/17/2025 13:06:11</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>04/15/2025 13:36:56</publishTime>
+ <publishTime>05/17/2025 13:06:11</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>04/15/2025 13:44:49</publishTime>
+ <publishTime>05/17/2025 14:12:00</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>04/15/2025 13:44:49</publishTime>
+ <publishTime>05/17/2025 14:12:00</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 026ea12..e6daa8b 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -722,6 +722,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceController.cs" />
<Compile Include="Controllers\搴旀敹绠＄悊\YS_ReceiveReportController.cs" />
+ <Compile Include="Controllers\鏁版嵁鍚屾\灏忚钁涘悓姝XZG_DataSynchronizationController.cs" />
<Compile Include="Controllers\鏁版嵁鍚屾\閽夐拤鍚屾\DD_DataSynchronizationController.cs" />
<Compile Include="Controllers\鏉＄爜绠＄悊\MouldController.cs" />
<Compile Include="Controllers\鏉＄爜绠＄悊\WEBSController.cs" />
diff --git a/WorkM/bin/Release/BLL.dll b/WorkM/bin/Release/BLL.dll
index 322fe1e..ce7f44c 100644
--- a/WorkM/bin/Release/BLL.dll
+++ b/WorkM/bin/Release/BLL.dll
Binary files differ
diff --git a/WorkM/bin/Release/BLL.pdb b/WorkM/bin/Release/BLL.pdb
index c59eea2..806e387 100644
--- a/WorkM/bin/Release/BLL.pdb
+++ b/WorkM/bin/Release/BLL.pdb
Binary files differ
diff --git a/WorkM/bin/Release/DAL.dll b/WorkM/bin/Release/DAL.dll
index 28f26de..6722401 100644
--- a/WorkM/bin/Release/DAL.dll
+++ b/WorkM/bin/Release/DAL.dll
Binary files differ
diff --git a/WorkM/bin/Release/DAL.pdb b/WorkM/bin/Release/DAL.pdb
index a7b3ed9..00df416 100644
--- a/WorkM/bin/Release/DAL.pdb
+++ b/WorkM/bin/Release/DAL.pdb
Binary files differ
diff --git a/WorkM/bin/Release/DBUtility.dll b/WorkM/bin/Release/DBUtility.dll
index 45d4353..dc782c4 100644
--- a/WorkM/bin/Release/DBUtility.dll
+++ b/WorkM/bin/Release/DBUtility.dll
Binary files differ
diff --git a/WorkM/bin/Release/DBUtility.pdb b/WorkM/bin/Release/DBUtility.pdb
index ef67b9b..d4ae4d5 100644
--- a/WorkM/bin/Release/DBUtility.pdb
+++ b/WorkM/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/WorkM/bin/Release/Model.dll b/WorkM/bin/Release/Model.dll
index 9f8b23d..cb94a58 100644
--- a/WorkM/bin/Release/Model.dll
+++ b/WorkM/bin/Release/Model.dll
Binary files differ
diff --git a/WorkM/bin/Release/Model.pdb b/WorkM/bin/Release/Model.pdb
index 32810b7..d33cc1c 100644
--- a/WorkM/bin/Release/Model.pdb
+++ b/WorkM/bin/Release/Model.pdb
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Class.dll b/WorkM/bin/Release/Pub_Class.dll
index 6c41ee2..0782b0a 100644
--- a/WorkM/bin/Release/Pub_Class.dll
+++ b/WorkM/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Class.pdb b/WorkM/bin/Release/Pub_Class.pdb
index ef676f7..9ce9a59 100644
--- a/WorkM/bin/Release/Pub_Class.pdb
+++ b/WorkM/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Control.dll b/WorkM/bin/Release/Pub_Control.dll
index 3ea2b96..a1fcd8d 100644
--- a/WorkM/bin/Release/Pub_Control.dll
+++ b/WorkM/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/WorkM/bin/Release/Pub_Control.pdb b/WorkM/bin/Release/Pub_Control.pdb
index ab08c90..feb6d4d 100644
--- a/WorkM/bin/Release/Pub_Control.pdb
+++ b/WorkM/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/WorkM/bin/Release/SQLHelper.dll b/WorkM/bin/Release/SQLHelper.dll
index 34d8892..965e083 100644
--- a/WorkM/bin/Release/SQLHelper.dll
+++ b/WorkM/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/WorkM/bin/Release/SQLHelper.pdb b/WorkM/bin/Release/SQLHelper.pdb
index 6fe9783..60e8ba8 100644
--- a/WorkM/bin/Release/SQLHelper.pdb
+++ b/WorkM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/WorkM/bin/Release/WarM.dll b/WorkM/bin/Release/WarM.dll
index 4ceec24..ea41e3a 100644
--- a/WorkM/bin/Release/WarM.dll
+++ b/WorkM/bin/Release/WarM.dll
Binary files differ
diff --git a/WorkM/bin/Release/WarM.pdb b/WorkM/bin/Release/WarM.pdb
index e48d6bc..7611ce1 100644
--- a/WorkM/bin/Release/WarM.pdb
+++ b/WorkM/bin/Release/WarM.pdb
Binary files differ
diff --git a/WorkM/bin/Release/WorkM.dll b/WorkM/bin/Release/WorkM.dll
index 147d579..32fcbdf 100644
--- a/WorkM/bin/Release/WorkM.dll
+++ b/WorkM/bin/Release/WorkM.dll
Binary files differ
diff --git a/WorkM/bin/Release/WorkM.pdb b/WorkM/bin/Release/WorkM.pdb
index e2d4cd0..522f767 100644
--- a/WorkM/bin/Release/WorkM.pdb
+++ b/WorkM/bin/Release/WorkM.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll b/sdk_dingding/TopSdk/bin/Debug/TopSdk.dll
index 7168556..602ee0b 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 89ad873..b931263 100644
--- a/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
index ad4e58d..a5efc83 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
index e7c2836..aafb96f 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 1b397c4..0000000
--- a/sdk_dingding/TopSdk/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
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
deleted file mode 100644
index b45cbe2..0000000
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
index 6947389..202a177 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,24 +1,5 @@
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-D:\宸ヤ綔浠ｇ爜\鏅轰簯杩堟�漒MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
-E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
-E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
-E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
-E:\鏅轰簯mes\mes\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
-=======
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
->>>>>>> 23dbc5b616dfa1a2bcb1fa4302637b8df701f43c
->>>>>>> ebb5a4cabce43b6eff66a1f46f9adecb337ed820
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 7168556..602ee0b 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 89ad873..b931263 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
deleted file mode 100644
index 87085ee..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 0312216..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-eb64bc61f5da8fdd8ad56e04c391e3a377d8ca59
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
deleted file mode 100644
index 35ce590..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Release\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
deleted file mode 100644
index ad4e58d..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
+++ /dev/null
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
deleted file mode 100644
index e7c2836..0000000
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ /dev/null
Binary files differ
--
Gitblit v1.9.1