From 81c2a1c9635bdfb714d9a04b4bb08be6e060e99c Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 16 十二月 2024 09:49:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Models/QC_OutCompCheckBillSub.cs | 43
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 125
PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache | 0
PlanM/bin/Release/PlanM.dll | 0
WebAPI/WebAPI.csproj.user | 9
PayM/bin/x86/Debug/Pub_Control.pdb | 0
BaseSet/bin/Release/DBUtility.pdb | 0
WarM/bin/Release/DBUtility.dll | 0
WarM/bin/Release/DBUtility.pdb | 0
Model/bin/Release/Pub_Control.pdb | 0
PayM/bin/x86/Debug/Pub_Control.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb | 0
WebAPI/Controllers/数据同步/钉钉同步/DD_DataSynchronizationController.cs | 16
sdk_dingding/TopSdk/obj/Release/TopSdk.dll | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.dll | 0
Model/obj/Release/Model.pdb | 0
APSM/bin/Release/DAL.dll | 0
Model/bin/Release/Pub_Control.dll | 0
Pub_Control/bin/Release/Pub_Class.pdb | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
Pub_Control/bin/Release/Pub_Class.dll | 0
WebAPI/Controllers/人事管理/人员履历/HR_PersonnelResumeController.cs | 3
APSM/bin/Release/DAL.pdb | 0
Pub_Control/bin/Release/Pub_Control.dll | 0
BLL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/SQLHelper.dll | 0
LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache | 0
NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
APSM/bin/Release/DBUtility.pdb | 0
WorkM/bin/Release/Pub_Class.dll | 0
DAL/bin/Release/SQLHelper.pdb | 0
PayM/obj/x86/Debug/Interop.gregn6Lib.dll | 0
SQLHelper/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.pdb | 0
BLL/bin/Release/DBUtility.dll | 0
WebAPI/Web.config | 2
WarM/bin/Release/BLL.pdb | 0
WorkM/bin/Release/Pub_Class.pdb | 0
Pub_Control/bin/Release/Pub_Control.pdb | 0
WebAPI/Controllers/品质管理/首件检验单/QC_FirstPieceCheckBillController.cs | 2
DBUtility/obj/Release/DBUtility.dll | 0
APSM/bin/Release/DBUtility.dll | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb | 0
Model/obj/Release/Model.dll | 0
NETERPNoWin/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache | 0
BLL/bin/Release/Pub_Class.dll | 0
WorkM/bin/Release/DBUtility.pdb | 0
WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs | 772 ++++
WorkM/bin/Release/DBUtility.dll | 0
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 16
APSM/bin/Release/Model.dll | 0
PlanM/bin/Release/PlanM.pdb | 0
BLL/bin/Release/Pub_Class.pdb | 0
WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs | 383 ++
APSM/bin/Release/Model.pdb | 0
PayM/bin/x86/Debug/SQLHelper.dll | 0
BLL/bin/Release/DAL.dll | 0
BLL/bin/Release/SQLHelper.pdb | 0
PlanM/bin/Release/SQLHelper.dll | 0
BaseSet/bin/Release/Pub_Control.pdb | 0
WarM/bin/Release/Pub_Control.pdb | 0
DBUtility/bin/Release/Pub_Control.pdb | 0
APSM/bin/Release/BaseSet.dll | 0
SyntacticSugar/bin/Debug/SyntacticSugar.pdb | 0
BLL/bin/Release/SQLHelper.dll | 0
DAL/bin/Release/Model.dll | 0
BaseSet/bin/Release/Pub_Control.dll | 0
APSM/bin/Release/BaseSet.pdb | 0
SyntacticSugar/obj/Debug/SyntacticSugar.dll | 0
DBUtility/bin/Release/Pub_Control.dll | 0
WebAPI/Models/QC_OutCompCheckBillSub_ValueGrid.cs | 20
BaseSet/bin/Release/Pub_Class.dll | 0
BLL/bin/Release/DAL.pdb | 0
PlanM/bin/Release/BLL.dll | 0
SyntacticSugar/bin/Debug/SyntacticSugar.dll | 0
PayM/bin/x86/Debug/SQLHelper.pdb | 0
DAL/bin/Release/Model.pdb | 0
BaseSet/bin/Release/Pub_Class.pdb | 0
WarM/bin/Release/BLL.dll | 0
WorkM/bin/Release/BLL.dll | 0
PayM/bin/x86/Debug/BLL.dll | 0
DBUtility/bin/Release/DBUtility.pdb | 0
PlanM/bin/Release/BLL.pdb | 0
DBUtility/bin/Release/DBUtility.dll | 0
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 480 ++
WebAPI/Controllers/WebAPIController.cs | 140
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
WorkM/bin/Release/BLL.pdb | 0
PayM/bin/x86/Debug/BLL.pdb | 0
WarM/bin/Release/Pub_Class.dll | 0
WarM/bin/Release/Pub_Control.dll | 0
PlanM/bin/Release/SQLHelper.pdb | 0
PlanM/bin/Release/Model.pdb | 0
SyntacticSugar/obj/Debug/SyntacticSugar.pdb | 0
WebAPI/Controllers/MJGL/Sc_MouldDotCheckRuleBillController.cs | 418 ++
WarM/bin/Release/Pub_Class.pdb | 0
PlanM/bin/Release/Model.dll | 0
SQLHelper/bin/Release/Pub_Class.pdb | 0
WebAPI/Controllers/LMESController.cs | 46
SQLHelper/bin/Release/Pub_Class.dll | 0
DAL/bin/Release/Pub_Class.pdb | 0
PayM/obj/x86/Debug/PayM.pdb | 0
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs | 2639 ++++++++++++++++
BaseSet/bin/Release/DAL.pdb | 0
PayM/obj/x86/Debug/PayM.dll | 0
WarM/WarM.csproj | 18
WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs | 60
PayM/bin/x86/Debug/Interop.gregn6Lib.dll | 0
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 385 ++
WarM/dll/Newtonsoft.Json.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 5
BaseSet/bin/Release/DAL.dll | 0
DAL/bin/Release/Pub_Class.dll | 0
APSM/bin/Release/APSM.pdb | 0
PayM/bin/x86/Debug/PayM.dll | 0
PayM/bin/x86/Debug/PayM.pdb | 0
APSM/bin/Release/APSM.dll | 0
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New_Change.designer.cs | 1837 +++++++++++
APSM/bin/Release/SQLHelper.pdb | 0
APSM/bin/Release/SQLHelper.dll | 0
BaseSet/bin/Release/BLL.pdb | 0
PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache | 2
DBUtility/bin/Release/Pub_Class.dll | 0
PlanM/bin/Release/Pub_Control.pdb | 0
PayM/bin/x86/Debug/Pub_Class.pdb | 0
Model/bin/Release/Pub_Class.pdb | 0
BaseSet/bin/Release/BLL.dll | 0
PayM/bin/x86/Debug/Pub_Class.dll | 0
BaseSet/bin/Release/BaseSet.dll | 0
APSM/bin/Release/WarM.pdb | 0
BaseSet/bin/Release/BaseSet.pdb | 0
BLL/bin/Release/BLL.pdb | 0
APSM/bin/Release/PlanM.dll | 0
APSM/bin/Release/WarM.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt | 1
APSM/bin/Release/PlanM.pdb | 0
PlanM/bin/Release/Pub_Class.dll | 0
WebAPI/WebAPI.csproj | 1
PayM/bin/x86/Debug/DBUtility.dll | 0
PlanM/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/Pub_Control.pdb | 0
PlanM/bin/Release/DAL.dll | 0
LMES/ClsShowMod.cs | 7
Model/bin/Release/DBUtility.pdb | 0
PayM/bin/x86/Debug/DAL.dll | 0
WarM/条码打印/Gy_BarCodeBill_automaticallyByPLC_New_Change.resx | 769 ++++
APSM/bin/Release/Pub_Control.pdb | 0
PayM/bin/x86/Debug/DBUtility.pdb | 0
BLL/bin/Release/Pub_Control.dll | 0
WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs | 375 ++
Model/bin/Release/DBUtility.dll | 0
BaseSet/bin/Release/SQLHelper.pdb | 0
BLL/bin/Release/BLL.dll | 0
WebAPI/Models/QC_OutCompCheckBillMain.cs | 50
BaseSet/bin/Release/SQLHelper.dll | 0
PlanM/bin/Release/DAL.pdb | 0
WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs | 16
WorkM/bin/Release/Pub_Control.pdb | 0
WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs | 57
PlanM/bin/Release/Pub_Control.dll | 0
DBUtility/bin/Release/SQLHelper.dll | 0
DBUtility/bin/Release/SQLHelper.pdb | 0
Model/bin/Release/Pub_Class.dll | 0
PayM/bin/x86/Debug/DAL.pdb | 0
WorkM/bin/Release/DAL.pdb | 0
WorkM/bin/Release/Pub_Control.dll | 0
APSM/bin/Release/Pub_Class.dll | 0
APSM/bin/Release/Pub_Control.dll | 0
WorkM/bin/Release/DAL.dll | 0
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 4
WebAPI/Properties/PublishProfiles/JFAPI.pubxml.user | 44
APSM/bin/Release/BLL.dll | 0
DAL/bin/Release/DBUtility.dll | 0
PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache | 0
DAL/bin/Release/Pub_Control.dll | 0
DAL/bin/Release/DBUtility.pdb | 0
WarM/packages.config | 4
APSM/bin/Release/BLL.pdb | 0
APSM/bin/Release/Pub_Class.pdb | 0
WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user | 46
APSM/bin/Release/WorkM.dll | 0
WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs | 193 +
Model/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/Pub_Control.pdb | 0
DAL/bin/Release/DAL.pdb | 0
SQLHelper/obj/Release/SQLHelper.dll | 0
BaseSet/bin/Release/Model.pdb | 0
BLL/bin/Release/Model.dll | 0
BaseSet/bin/Release/Model.dll | 0
BLL/bin/Release/Model.pdb | 0
DAL/bin/Release/DAL.dll | 0
sdk_dingding/TopSdk/bin/Debug/TopSdk.dll | 0
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs | 16
WorkM/bin/Release/WorkM.pdb | 0
WarM/bin/Release/WarM.pdb | 0
PayM/bin/x86/Debug/Model.pdb | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
WebAPI/Controllers/CGGL/Cg_PayableBillController.cs | 193 +
WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs | 90
sdk_dingding/TopSdk/obj/Debug/TopSdk.dll | 0
WarM/bin/Release/WarM.dll | 0
WarM/bin/Release/SQLHelper.pdb | 0
WorkM/bin/Release/Model.dll | 0
WorkM/bin/Release/WorkM.dll | 0
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt | 3
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb | 0
WarM/bin/Release/Model.pdb | 0
WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs | 2
WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs | 39
WarM/bin/Release/Model.dll | 0
Pub_Class/bin/Release/Pub_Class.pdb | 0
PlanM/bin/Release/DBUtility.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfilewtt.pubxml.user | 44
WarM/bin/Release/SQLHelper.dll | 0
WorkM/bin/Release/Model.pdb | 0
Pub_Class/bin/Release/Pub_Class.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
PlanM/bin/Release/DBUtility.pdb | 0
WebAPI/Controllers/项目管理/工程项目/PM_ProjectBillController.cs | 90
PayM/bin/x86/Debug/Model.dll | 0
WorkM/bin/Release/WarM.dll | 0
WorkM/bin/Release/SQLHelper.pdb | 0
Model/bin/Release/Model.pdb | 0
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 98
Model/bin/Release/Model.dll | 0
/dev/null | 1
DBUtility/bin/Release/Pub_Class.pdb | 0
APSM/bin/Release/WorkM.pdb | 0
Model/bin/Release/SQLHelper.dll | 0
BaseSet/bin/Release/DBUtility.dll | 0
WorkM/bin/Release/SQLHelper.dll | 0
236 files changed, 9,137 insertions(+), 427 deletions(-)
diff --git a/APSM/bin/Release/APSM.dll b/APSM/bin/Release/APSM.dll
index ffce293..b4c183c 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 a65f91e..236ee80 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 c9e9569..8abad3e 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 45e9d10..9fa82ef 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 444aa7d..f3c2ffa 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 60eb718..2fdd3d7 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 d33ebe6..47cf6dd 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 7ef44ed..51b1670 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 87ed9f6..9f77883 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 dd56d66..8d03eea 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 86be651..720cf62 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 a7b61f6..3891935 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 b8b9dc0..a24d590 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 8c85466..c7bccc2 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 561a964..ed5cf2b 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 ad21151..fc1b742 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 e461506..a0906c3 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 ad14f15..9da7cc1 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 1e64426..dedb3fb 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 ffc0037..6897e5c 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 b9475fd..271f758 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 5c37dd3..c23f0e3 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 04f942a..c9951bb 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 864a3ec..5d0fefc 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 c9e9569..8abad3e 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 45e9d10..9fa82ef 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 d33ebe6..47cf6dd 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 7ef44ed..51b1670 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 87ed9f6..9f77883 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 dd56d66..8d03eea 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 86be651..720cf62 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 a7b61f6..3891935 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 561a964..ed5cf2b 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 ad21151..fc1b742 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 e461506..a0906c3 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 ad14f15..9da7cc1 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 1e64426..dedb3fb 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 ffc0037..6897e5c 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 c9e9569..8abad3e 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 45e9d10..9fa82ef 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 444aa7d..f3c2ffa 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 60eb718..2fdd3d7 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 d33ebe6..47cf6dd 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 7ef44ed..51b1670 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 87ed9f6..9f77883 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 dd56d66..8d03eea 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 86be651..720cf62 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 a7b61f6..3891935 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 561a964..ed5cf2b 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 ad21151..fc1b742 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 e461506..a0906c3 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 ad14f15..9da7cc1 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 1e64426..dedb3fb 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 ffc0037..6897e5c 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 d33ebe6..47cf6dd 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 7ef44ed..51b1670 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 87ed9f6..9f77883 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 dd56d66..8d03eea 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 86be651..720cf62 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 a7b61f6..3891935 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 561a964..ed5cf2b 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 ad21151..fc1b742 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 e461506..a0906c3 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 ad14f15..9da7cc1 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 1e64426..dedb3fb 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 ffc0037..6897e5c 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index 87ed9f6..9f77883 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 dd56d66..8d03eea 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 561a964..ed5cf2b 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 ad21151..fc1b742 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 e461506..a0906c3 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 ad14f15..9da7cc1 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 1e64426..dedb3fb 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 ffc0037..6897e5c 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 8a26783..9671396 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 87ed9f6..9f77883 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 dd56d66..8d03eea 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git a/LMES/ClsShowMod.cs b/LMES/ClsShowMod.cs
index d8797f5..49ef19e 100644
--- a/LMES/ClsShowMod.cs
+++ b/LMES/ClsShowMod.cs
@@ -4044,6 +4044,13 @@
oGy_PackBarCodeBill_automaticallyByPLC.Show();
oMainForm.AddTabPage(oGy_PackBarCodeBill_automaticallyByPLC);
break;
+ case "gy_barcodebill_automaticallybyplc_new_change":
+ //权限
+ Gy_BarCodeBill_automaticallyByPLC_New_Change oGy_BarCodeBill_automaticallyByPLC_New_Change = new Gy_BarCodeBill_automaticallyByPLC_New_Change();
+ oGy_BarCodeBill_automaticallyByPLC_New_Change.MdiParent = oMain;
+ oGy_BarCodeBill_automaticallyByPLC_New_Change.Show();
+ oMainForm.AddTabPage(oGy_BarCodeBill_automaticallyByPLC_New_Change);
+ break;
default:
break;
}
diff --git a/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache b/LMES/obj/x86/Release/LMES.csproj.AssemblyReference.cache
index 2d02d1d..aa79863 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 87ed9f6..9f77883 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 dd56d66..8d03eea 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 86be651..720cf62 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 a7b61f6..3891935 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 561a964..ed5cf2b 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 ad21151..fc1b742 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 e461506..a0906c3 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 ad14f15..9da7cc1 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 1e64426..dedb3fb 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 ffc0037..6897e5c 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 fed468a..06afe20 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 86be651..720cf62 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 a7b61f6..3891935 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/NETERPNoWin/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 3e9def8..1a738a1 100644
--- a/NETERPNoWin/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ b/NETERPNoWin/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Binary files differ
diff --git a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache
index 2ffa21f..c00e8f1 100644
--- a/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache
+++ b/NETERPNoWin/obj/x86/Debug/NETERPNoWin.csproj.AssemblyReference.cache
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.dll b/PayM/bin/x86/Debug/BLL.dll
index 4484c48..4aae9ff 100644
--- a/PayM/bin/x86/Debug/BLL.dll
+++ b/PayM/bin/x86/Debug/BLL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/BLL.pdb b/PayM/bin/x86/Debug/BLL.pdb
index f5f0985..40b29e5 100644
--- a/PayM/bin/x86/Debug/BLL.pdb
+++ b/PayM/bin/x86/Debug/BLL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.dll b/PayM/bin/x86/Debug/DAL.dll
index e6092cf..b6ef7a0 100644
--- a/PayM/bin/x86/Debug/DAL.dll
+++ b/PayM/bin/x86/Debug/DAL.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DAL.pdb b/PayM/bin/x86/Debug/DAL.pdb
index 34f7d1d..a168e19 100644
--- a/PayM/bin/x86/Debug/DAL.pdb
+++ b/PayM/bin/x86/Debug/DAL.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.dll b/PayM/bin/x86/Debug/DBUtility.dll
index 32b731b..aa58ede 100644
--- a/PayM/bin/x86/Debug/DBUtility.dll
+++ b/PayM/bin/x86/Debug/DBUtility.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/DBUtility.pdb b/PayM/bin/x86/Debug/DBUtility.pdb
index 8a85e32..83ad0cd 100644
--- a/PayM/bin/x86/Debug/DBUtility.pdb
+++ b/PayM/bin/x86/Debug/DBUtility.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Interop.gregn6Lib.dll b/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
index c78d0ae..ccb2e64 100644
--- a/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
+++ b/PayM/bin/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.dll b/PayM/bin/x86/Debug/Model.dll
index a0d3db6..31bd848 100644
--- a/PayM/bin/x86/Debug/Model.dll
+++ b/PayM/bin/x86/Debug/Model.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Model.pdb b/PayM/bin/x86/Debug/Model.pdb
index 5bcfab9..8c157fd 100644
--- a/PayM/bin/x86/Debug/Model.pdb
+++ b/PayM/bin/x86/Debug/Model.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.dll b/PayM/bin/x86/Debug/PayM.dll
index 969ff2f..be37781 100644
--- a/PayM/bin/x86/Debug/PayM.dll
+++ b/PayM/bin/x86/Debug/PayM.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/PayM.pdb b/PayM/bin/x86/Debug/PayM.pdb
index 73ac4b7..fae0448 100644
--- a/PayM/bin/x86/Debug/PayM.pdb
+++ b/PayM/bin/x86/Debug/PayM.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Class.dll b/PayM/bin/x86/Debug/Pub_Class.dll
index 33c892e..ec93df4 100644
--- a/PayM/bin/x86/Debug/Pub_Class.dll
+++ b/PayM/bin/x86/Debug/Pub_Class.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Class.pdb b/PayM/bin/x86/Debug/Pub_Class.pdb
index d62aaad..df51ad6 100644
--- a/PayM/bin/x86/Debug/Pub_Class.pdb
+++ b/PayM/bin/x86/Debug/Pub_Class.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Control.dll b/PayM/bin/x86/Debug/Pub_Control.dll
index bbdfb6c..116673f 100644
--- a/PayM/bin/x86/Debug/Pub_Control.dll
+++ b/PayM/bin/x86/Debug/Pub_Control.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/Pub_Control.pdb b/PayM/bin/x86/Debug/Pub_Control.pdb
index e1e3ada..dd7f668 100644
--- a/PayM/bin/x86/Debug/Pub_Control.pdb
+++ b/PayM/bin/x86/Debug/Pub_Control.pdb
Binary files differ
diff --git a/PayM/bin/x86/Debug/SQLHelper.dll b/PayM/bin/x86/Debug/SQLHelper.dll
index 6626b6b..d89ee30 100644
--- a/PayM/bin/x86/Debug/SQLHelper.dll
+++ b/PayM/bin/x86/Debug/SQLHelper.dll
Binary files differ
diff --git a/PayM/bin/x86/Debug/SQLHelper.pdb b/PayM/bin/x86/Debug/SQLHelper.pdb
index e6e4736..d69f371 100644
--- a/PayM/bin/x86/Debug/SQLHelper.pdb
+++ b/PayM/bin/x86/Debug/SQLHelper.pdb
Binary files differ
diff --git a/PayM/obj/x86/Debug/Interop.gregn6Lib.dll b/PayM/obj/x86/Debug/Interop.gregn6Lib.dll
index c78d0ae..ccb2e64 100644
--- a/PayM/obj/x86/Debug/Interop.gregn6Lib.dll
+++ b/PayM/obj/x86/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache b/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache
index 5f7efcb..3362526 100644
--- a/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache
+++ b/PayM/obj/x86/Debug/PayM.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-4af767f9af5d42f2c393c62e78567bbdb3e4f775
+76d6e649eaf418858fb80b047dbac5a1964f90f8
diff --git a/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache b/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache
index 0158f6a..e9384f8 100644
--- a/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache
+++ b/PayM/obj/x86/Debug/PayM.csproj.GenerateResource.cache
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache b/PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache
index 4c5dee8..9b052d7 100644
--- a/PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache
+++ b/PayM/obj/x86/Debug/PayM.csproj.ResolveComReference.cache
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.dll b/PayM/obj/x86/Debug/PayM.dll
index 969ff2f..be37781 100644
--- a/PayM/obj/x86/Debug/PayM.dll
+++ b/PayM/obj/x86/Debug/PayM.dll
Binary files differ
diff --git a/PayM/obj/x86/Debug/PayM.pdb b/PayM/obj/x86/Debug/PayM.pdb
index 73ac4b7..fae0448 100644
--- a/PayM/obj/x86/Debug/PayM.pdb
+++ b/PayM/obj/x86/Debug/PayM.pdb
Binary files differ
diff --git a/PlanM/bin/Release/BLL.dll b/PlanM/bin/Release/BLL.dll
index c9e9569..8abad3e 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 45e9d10..9fa82ef 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 d33ebe6..47cf6dd 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 7ef44ed..51b1670 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 87ed9f6..9f77883 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 dd56d66..8d03eea 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 86be651..720cf62 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 a7b61f6..3891935 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 b8b9dc0..a24d590 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 8c85466..c7bccc2 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 561a964..ed5cf2b 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 ad21151..fc1b742 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 e461506..a0906c3 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 ad14f15..9da7cc1 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 1e64426..dedb3fb 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 ffc0037..6897e5c 100644
--- a/PlanM/bin/Release/SQLHelper.pdb
+++ b/PlanM/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 07635be..d554905 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -89,6 +89,10 @@
{
//WMS条码 系统参数
//==============================生产汇报单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_AutoSubmit")
+ {
+ omodel.Sc_ICMOReportBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_AutoCheck")
{
omodel.Sc_ICMOReportBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -147,6 +151,10 @@
{
omodel.Sc_ICMOReportBill_ProcessCheckOut = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_BillDateMode")
+ {
+ omodel.Sc_ICMOReportBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//==========================================收料通知单(送货单、到货确认）
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Cg_POInStockBill_BarCodeCtl")
@@ -161,7 +169,12 @@
{
omodel.Cg_POInStockBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+
//===================================采购入库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_AutoSubmit")
+ {
+ omodel.Kf_POStockInBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_AutoCheck")
{
omodel.Kf_POStockInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -211,6 +224,11 @@
{
omodel.Kf_POStockInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_BillDateMode")
+ {
+ omodel.Kf_POStockInBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//============采购入库单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_MustQtyCtl")
{
@@ -230,6 +248,10 @@
}
//=======================================产品入库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_AutoSubmit")
+ {
+ omodel.Kf_ProductInBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_AutoCheck")
{
omodel.Kf_ProductInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -279,6 +301,11 @@
{
omodel.Kf_ProductInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_BillDateMode")
+ {
+ omodel.Kf_ProductInBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//============产品入库单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_MustQtyCtl")
{
@@ -298,6 +325,10 @@
}
//=======================================================其他入库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_AutoSubmit")
+ {
+ omodel.Kf_OtherInBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_AutoCheck")
{
omodel.Kf_OtherInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -343,6 +374,10 @@
{
omodel.Kf_OtherInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_BillDateMode")
+ {
+ omodel.Kf_OtherInBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//========================================其他入库单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_MustQtyCtl")
@@ -363,6 +398,10 @@
}
//==============================================委外入库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_AutoSubmit")
+ {
+ omodel.Kf_EntrustInBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_AutoCheck")
{
omodel.Kf_EntrustInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -408,10 +447,16 @@
{
omodel.Kf_EntrustInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
-
-
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_BillDateMode")
+ {
+ omodel.Kf_EntrustInBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//=========================================生产领料单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoSubmit")
+ {
+ omodel.Kf_MateOutBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoCheck")
{
omodel.Kf_MateOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -464,8 +509,10 @@
{
omodel.Kf_MateOutBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
-
-
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_BillDateMode")
+ {
+ omodel.Kf_MateOutBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//=========================================生产领料单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MustQtyCtl")
@@ -486,6 +533,10 @@
}
//=======================================销售出库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_AutoSubmit")
+ {
+ omodel.Kf_SellOutBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_AutoCheck")
{
omodel.Kf_SellOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -547,6 +598,10 @@
{
omodel.Kf_SellOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_BillDateMode")
+ {
+ omodel.Kf_SellOutBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//销售出库单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_MustQtyCtl")
@@ -566,7 +621,11 @@
omodel.Kf_SellOutBillCheck_SourceBarCodeCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
- //其他出库单
+ //========================================其他出库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_AutoSubmit")
+ {
+ omodel.Kf_OtherOutBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_AutoCheck")
{
omodel.Kf_OtherOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -616,7 +675,10 @@
{
omodel.Kf_OtherOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
-
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_BillDateMode")
+ {
+ omodel.Kf_OtherOutBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//========================================其他出库单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_MustQtyCtl")
@@ -637,6 +699,10 @@
}
//========================================委外出库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_AutoSubmit")
+ {
+ omodel.Kf_EntrustOutBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_AutoCheck")
{
omodel.Kf_EntrustOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -690,7 +756,10 @@
{
omodel.Kf_EntrustOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
-
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_BillDateMode")
+ {
+ omodel.Kf_EntrustOutBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========================委外领料单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_MustQtyCtl")
@@ -711,6 +780,10 @@
}
//=============================生产补料单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoSubmit")
+ {
+ omodel.Kf_MateReplenishOutBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
{
omodel.Kf_MateReplenishOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -760,6 +833,11 @@
{
omodel.Kf_MateReplenishOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_BillDateMode")
+ {
+ omodel.Kf_MateReplenishOutBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//==============================生产补料单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_MustQtyCtl")
{
@@ -779,6 +857,10 @@
}
//================================委外补料单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_AutoSubmit")
+ {
+ omodel.Kf_EntrustReplenishOutBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_AutoCheck")
{
omodel.Kf_EntrustReplenishOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -828,6 +910,11 @@
{
omodel.Kf_EntrustReplenishOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_BillDateMode")
+ {
+ omodel.Kf_EntrustReplenishOutBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//======================委外补料单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MustQtyCtl")
{
@@ -847,6 +934,10 @@
}
//==================直接调拨单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_AutoSubmit")
+ {
+ omodel.Kf_MoveStockBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_AutoCheck")
{
omodel.Kf_MoveStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -900,6 +991,11 @@
{
omodel.Kf_MoveStockBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_BillDateMode")
+ {
+ omodel.Kf_MoveStockBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//==========================================直接调拨单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MustQtyCtl")
{
@@ -919,6 +1015,10 @@
}
//==============================================分步式调出单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_AutoSubmit")
+ {
+ omodel.Kf_MoveStockStepOutBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_AutoCheck")
{
omodel.Kf_MoveStockStepOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -968,7 +1068,16 @@
{
omodel.Kf_MoveStockStepOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_BillDateMode")
+ {
+ omodel.Kf_MoveStockStepOutBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//=========================================分步式调入单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_AutoSubmit")
+ {
+ omodel.Kf_MoveStockStepInBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_AutoCheck")
{
omodel.Kf_MoveStockStepInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1022,8 +1131,16 @@
{
omodel.Kf_MoveStockStepInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_BillDateMode")
+ {
+ omodel.Kf_MoveStockStepInBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//=====================================采购退料单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_AutoSubmit")
+ {
+ omodel.Kf_POStockInBackBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_AutoCheck")
{
omodel.Kf_POStockInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1065,7 +1182,16 @@
{
omodel.Kf_POStockInBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_BillDateMode")
+ {
+ omodel.Kf_POStockInBackBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//==========================生产退库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_AutoSubmit")
+ {
+ omodel.Kf_ProductInBackBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_AutoCheck")
{
omodel.Kf_ProductInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1107,7 +1233,16 @@
{
omodel.Kf_ProductInBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_BillDateMode")
+ {
+ omodel.Kf_ProductInBackBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//==============================其他入库红字
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_AutoSubmit")
+ {
+ omodel.Kf_OtherInBackBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_AutoCheck")
{
omodel.Kf_OtherInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1149,7 +1284,16 @@
{
omodel.Kf_OtherInBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_BillDateMode")
+ {
+ omodel.Kf_OtherInBackBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//===================================委外退库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_AutoSubmit")
+ {
+ omodel.Kf_EntrustInBackBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_AutoCheck")
{
omodel.Kf_EntrustInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1191,7 +1335,16 @@
{
omodel.Kf_EntrustInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_BillDateMode")
+ {
+ omodel.Kf_EntrustInBackBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//====================================生产退料单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoSubmit")
+ {
+ omodel.Kf_MateOutBackBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck")
{
omodel.Kf_MateOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1237,8 +1390,16 @@
{
omodel.Kf_MateOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_BillDateMode")
+ {
+ omodel.Kf_MateOutBackBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========================销售退库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_AutoSubmit")
+ {
+ omodel.Kf_SellOutBackBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_AutoCheck")
{
omodel.Kf_SellOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1284,7 +1445,16 @@
{
omodel.Kf_SellOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_BillDateMode")
+ {
+ omodel.Kf_SellOutBackBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//==========================其他出库红字
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_AutoSubmit")
+ {
+ omodel.Kf_OtherOutBackBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_AutoCheck")
{
omodel.Kf_OtherOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1326,7 +1496,16 @@
{
omodel.Kf_OtherOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_BillDateMode")
+ {
+ omodel.Kf_OtherOutBackBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//======================================委外退料单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_AutoSubmit")
+ {
+ omodel.Kf_EntrustOutBackBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_AutoCheck")
{
omodel.Kf_EntrustOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -1371,6 +1550,10 @@
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_DeleterAndMakerMustSame")
{
omodel.Kf_EntrustOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_BillDateMode")
+ {
+ omodel.Kf_EntrustOutBackBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
//WMS 通用
@@ -2127,6 +2310,10 @@
{
//========================================================WMS条码 系统参数
//===========生产汇报单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_AutoSubmit")
+ {
+ omodel.Sc_ICMOReportBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_AutoCheck")
{
omodel.Sc_ICMOReportBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2185,6 +2372,11 @@
{
omodel.Sc_ICMOReportBill_ProcessCheckOut = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOReportBill_BillDateMode")
+ {
+ omodel.Sc_ICMOReportBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//========收料通知单(送货单、到货确认）
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Cg_POInStockBill_BarCodeCtl")
{
@@ -2198,7 +2390,12 @@
{
omodel.Cg_POInStockBill_ERPMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+
//===========采购入库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_AutoSubmit")
+ {
+ omodel.Kf_POStockInBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_AutoCheck")
{
omodel.Kf_POStockInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2248,6 +2445,11 @@
{
omodel.Kf_POStockInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBill_BillDateMode")
+ {
+ omodel.Kf_POStockInBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//============采购入库单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBillCheck_MustQtyCtl")
{
@@ -2267,6 +2469,10 @@
}
//===========产品入库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_AutoSubmit")
+ {
+ omodel.Kf_ProductInBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_AutoCheck")
{
omodel.Kf_ProductInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2316,6 +2522,11 @@
{
omodel.Kf_ProductInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBill_BillDateMode")
+ {
+ omodel.Kf_ProductInBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//============产品入库单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBillCheck_MustQtyCtl")
{
@@ -2335,6 +2546,10 @@
}
//=========其他入库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_AutoSubmit")
+ {
+ omodel.Kf_OtherInBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_AutoCheck")
{
omodel.Kf_OtherInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2380,6 +2595,11 @@
{
omodel.Kf_OtherInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBill_BillDateMode")
+ {
+ omodel.Kf_OtherInBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//============其他入库单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBillCheck_MustQtyCtl")
{
@@ -2399,6 +2619,10 @@
}
//=========委外入库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_AutoSubmit")
+ {
+ omodel.Kf_EntrustInBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_AutoCheck")
{
omodel.Kf_EntrustInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2444,8 +2668,16 @@
{
omodel.Kf_EntrustInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBill_BillDateMode")
+ {
+ omodel.Kf_EntrustInBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//==========生产领料单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoSubmit")
+ {
+ omodel.Kf_MateOutBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_AutoCheck")
{
omodel.Kf_MateOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2498,6 +2730,11 @@
{
omodel.Kf_MateOutBill_AutoBarCode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBill_BillDateMode")
+ {
+ omodel.Kf_MateOutBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//==========生产领料单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBillCheck_MustQtyCtl")
{
@@ -2517,6 +2754,10 @@
}
//============销售出库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_AutoSubmit")
+ {
+ omodel.Kf_SellOutBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_AutoCheck")
{
omodel.Kf_SellOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2578,6 +2819,11 @@
{
omodel.Kf_SellOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBill_BillDateMode")
+ {
+ omodel.Kf_SellOutBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//============销售出库单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBillCheck_MustQtyCtl")
{
@@ -2597,6 +2843,10 @@
}
//============其他出库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_AutoSubmit")
+ {
+ omodel.Kf_OtherOutBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_AutoCheck")
{
omodel.Kf_OtherOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2646,6 +2896,11 @@
{
omodel.Kf_OtherOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBill_BillDateMode")
+ {
+ omodel.Kf_OtherOutBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//===========其他出库单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBillCheck_MustQtyCtl")
{
@@ -2665,6 +2920,10 @@
}
//==========委外出库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_AutoSubmit")
+ {
+ omodel.Kf_EntrustOutBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_AutoCheck")
{
omodel.Kf_EntrustOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2718,6 +2977,11 @@
{
omodel.Kf_EntrustOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBill_BillDateMode")
+ {
+ omodel.Kf_EntrustOutBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//==========委外领料单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBillCheck_MustQtyCtl")
{
@@ -2737,6 +3001,10 @@
}
//===========生产补料单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoSubmit")
+ {
+ omodel.Kf_MateReplenishOutBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_AutoCheck")
{
omodel.Kf_MateReplenishOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2786,6 +3054,11 @@
{
omodel.Kf_MateReplenishOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBill_BillDateMode")
+ {
+ omodel.Kf_MateReplenishOutBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//==========生产补料单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateReplenishOutBillCheck_MustQtyCtl")
{
@@ -2805,6 +3078,10 @@
}
//===========委外补料单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_AutoSubmit")
+ {
+ omodel.Kf_EntrustReplenishOutBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_AutoCheck")
{
omodel.Kf_EntrustReplenishOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2854,6 +3131,11 @@
{
omodel.Kf_EntrustReplenishOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBill_BillDateMode")
+ {
+ omodel.Kf_EntrustReplenishOutBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//===========委外补料单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustReplenishOutBillCheck_MustQtyCtl")
{
@@ -2873,6 +3155,10 @@
}
//=========直接调拨单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_AutoSubmit")
+ {
+ omodel.Kf_MoveStockBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_AutoCheck")
{
omodel.Kf_MoveStockBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2926,6 +3212,11 @@
{
omodel.Kf_MoveStockBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBill_BillDateMode")
+ {
+ omodel.Kf_MoveStockBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
//==========直接调拨单 校验
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockBillCheck_MustQtyCtl")
{
@@ -2945,6 +3236,10 @@
}
//============分步式调出单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_AutoSubmit")
+ {
+ omodel.Kf_MoveStockStepOutBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_AutoCheck")
{
omodel.Kf_MoveStockStepOutBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -2994,8 +3289,16 @@
{
omodel.Kf_MoveStockStepOutBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepOutBill_BillDateMode")
+ {
+ omodel.Kf_MoveStockStepOutBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========分步式调入单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_AutoSubmit")
+ {
+ omodel.Kf_MoveStockStepInBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_AutoCheck")
{
omodel.Kf_MoveStockStepInBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -3049,8 +3352,16 @@
{
omodel.Kf_MoveStockStepInBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MoveStockStepInBill_BillDateMode")
+ {
+ omodel.Kf_MoveStockStepInBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===============采购退料单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_AutoSubmit")
+ {
+ omodel.Kf_POStockInBackBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_AutoCheck")
{
omodel.Kf_POStockInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -3092,8 +3403,16 @@
{
omodel.Kf_POStockInBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_POStockInBackBill_BillDateMode")
+ {
+ omodel.Kf_POStockInBackBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========生产退库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_AutoSubmit")
+ {
+ omodel.Kf_ProductInBackBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_AutoCheck")
{
omodel.Kf_ProductInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -3135,8 +3454,16 @@
{
omodel.Kf_ProductInBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_ProductInBackBill_BillDateMode")
+ {
+ omodel.Kf_ProductInBackBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========其他入库红字
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_AutoSubmit")
+ {
+ omodel.Kf_OtherInBackBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_AutoCheck")
{
omodel.Kf_OtherInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -3178,8 +3505,16 @@
{
omodel.Kf_OtherInBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherInBackBill_BillDateMode")
+ {
+ omodel.Kf_OtherInBackBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========委外退库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_AutoSubmit")
+ {
+ omodel.Kf_EntrustInBackBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_AutoCheck")
{
omodel.Kf_EntrustInBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -3221,8 +3556,16 @@
{
omodel.Kf_EntrustInBackBill_SourceWHSPCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustInBackBill_BillDateMode")
+ {
+ omodel.Kf_EntrustInBackBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//========生产退料单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoSubmit")
+ {
+ omodel.Kf_MateOutBackBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_AutoCheck")
{
omodel.Kf_MateOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -3268,8 +3611,16 @@
{
omodel.Kf_MateOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_MateOutBackBill_BillDateMode")
+ {
+ omodel.Kf_MateOutBackBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//==========销售退库单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_AutoSubmit")
+ {
+ omodel.Kf_SellOutBackBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_AutoCheck")
{
omodel.Kf_SellOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -3315,8 +3666,16 @@
{
omodel.Kf_SellOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_SellOutBackBill_BillDateMode")
+ {
+ omodel.Kf_SellOutBackBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//=========其他出库红字
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_AutoSubmit")
+ {
+ omodel.Kf_OtherOutBackBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_AutoCheck")
{
omodel.Kf_OtherOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -3358,8 +3717,16 @@
{
omodel.Kf_OtherOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_OtherOutBackBill_BillDateMode")
+ {
+ omodel.Kf_OtherOutBackBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========委外退料单
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_AutoSubmit")
+ {
+ omodel.Kf_EntrustOutBackBill_AutoSubmit = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_AutoCheck")
{
omodel.Kf_EntrustOutBackBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
@@ -3405,6 +3772,10 @@
{
omodel.Kf_EntrustOutBackBill_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Kf_EntrustOutBackBill_BillDateMode")
+ {
+ omodel.Kf_EntrustOutBackBill_BillDateMode = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
//===========生产组托单
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_PackUnionBill_SourceBillTypeCtl")
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index 225add6..e9801d6 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -9,8 +9,9 @@
//========================================================================================WMS条码 系统参数
//生产汇报单
+ public string Sc_ICMOReportBill_AutoSubmit; //保存后是否自动提交
public string Sc_ICMOReportBill_AutoCheck; //保存后是否自动审核
- public string Sc_ICMOReportBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Sc_ICMOReportBill_SaveAutoAddnew; //保存后变为新增状态
public string Sc_ICMOReportBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Sc_ICMOReportBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Sc_ICMOReportBill_MulSourceBill; //多源单模式
@@ -22,9 +23,10 @@
public string Sc_ICMOReportBill_SourceWHSPCtl; //是否取源单中仓库仓位（'Y'为是）
public string Sc_ICMOReportBill_UpdateSourceInterID; //上传后回填条码档案源单信息
public string Sc_ICMOReportBill_MESFlag; //生产汇报单同步MES标记，Y为同步
- public string Sc_ICMOReportBill_FirstCheckOut; //必须首件检验通过才能保存单据
- public string Sc_ICMOReportBill_ProcessCheckOut; //必须过程检验通过才能保存单据
- public string Sc_ICMOReportBill_DeleterAndMakerMustSame; //生产汇报单暂存删除人必须是制单人
+ public string Sc_ICMOReportBill_FirstCheckOut; //必须首件检验通过才能保存单据
+ public string Sc_ICMOReportBill_ProcessCheckOut; //必须过程检验通过才能保存单据
+ public string Sc_ICMOReportBill_DeleterAndMakerMustSame;//生产汇报单暂存删除人必须是制单人
+ public string Sc_ICMOReportBill_BillDateMode; //单据日期是否取界面递入日期
//收料通知单(送货单、到货确认）
public string Cg_POInStockBill_AutoCheck; //保存后是否自动审核
@@ -34,8 +36,9 @@
public string Cg_POInStockBill_DeleterAndMakerMustSame; //送货单（收料单）删除人必须是制单人
//采购入库
+ public string Kf_POStockInBill_AutoSubmit; //保存后是否自动提交
public string Kf_POStockInBill_AutoCheck; //保存后是否自动审核
- public string Kf_POStockInBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_POStockInBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_POStockInBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_POStockInBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_POStockInBill_MulSourceBill; //多源单模式
@@ -47,6 +50,7 @@
public string Kf_POStockInBill_SourceWHSPCtl; //是否取源单中仓库仓位（'Y'为是）
public string Kf_POStockInBill_AutoBarCode; //免扫码模式，条码类型为非唯一条码，上传时自动生成条码扫码记录
public string Kf_POStockInBill_DeleterAndMakerMustSame; //采购入库单暂存删除人必须是制单人
+ public string Kf_POStockInBill_BillDateMode; //单据日期是否取界面递入日期
//采购入库 校验
public string Kf_POStockInBillCheck_MustQtyCtl; //校验数量控制
public string Kf_POStockInBillCheck_WHSPCtl; //校验-是否校对仓库仓位
@@ -54,8 +58,9 @@
public string Kf_POStockInBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//产品入库
+ public string Kf_ProductInBill_AutoSubmit; //保存后是否自动提交
public string Kf_ProductInBill_AutoCheck; //保存后是否自动审核
- public string Kf_ProductInBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_ProductInBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_ProductInBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_ProductInBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_ProductInBill_MulSourceBill; //多源单模式
@@ -67,6 +72,7 @@
public string Kf_ProductInBill_SourceWHSPCtl; //是否取源单中仓库仓位（'Y'为是）
public string Kf_ProductInBill_Display; //扫描物料条码后是否自动刷新子表界面（'Y'为是）
public string Kf_ProductInBill_DeleterAndMakerMustSame; //产品入库单暂存删除人必须是制单人
+ public string Kf_ProductInBill_BillDateMode; //单据日期是否取界面递入日期
//产品入库 校验
public string Kf_ProductInBillCheck_MustQtyCtl; //校验数量控制
public string Kf_ProductInBillCheck_WHSPCtl; //校验-是否校对仓库仓位
@@ -74,8 +80,9 @@
public string Kf_ProductInBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//其他入库
+ public string Kf_OtherInBill_AutoSubmit; //保存后是否自动提交
public string Kf_OtherInBill_AutoCheck; //保存后是否自动审核
- public string Kf_OtherInBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_OtherInBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_OtherInBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_OtherInBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_OtherInBill_MulSourceBill; //多源单模式
@@ -86,6 +93,7 @@
public string Kf_OtherInBill_MaterWHSPCtl; //是否取物料默认仓库仓位（'Y'为是）
public string Kf_OtherInBill_SourceWHSPCtl; //是否取源单中仓库仓位（'Y'为是）
public string Kf_OtherInBill_DeleterAndMakerMustSame; //其他入库单暂存删除人必须是制单人
+ public string Kf_OtherInBill_BillDateMode; //单据日期是否取界面递入日期
//其他入库 校验
public string Kf_OtherInBillCheck_MustQtyCtl; //校验数量控制
public string Kf_OtherInBillCheck_WHSPCtl; //校验-是否校对仓库仓位
@@ -93,8 +101,9 @@
public string Kf_OtherInBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//委外入库
+ public string Kf_EntrustInBill_AutoSubmit; //保存后是否自动提交
public string Kf_EntrustInBill_AutoCheck; //保存后是否自动审核
- public string Kf_EntrustInBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_EntrustInBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_EntrustInBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_EntrustInBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_EntrustInBill_MulSourceBill; //多源单模式
@@ -105,10 +114,12 @@
public string Kf_EntrustInBill_MaterWHSPCtl; //是否取物料默认仓库仓位（'Y'为是）
public string Kf_EntrustInBill_SourceWHSPCtl; //是否取源单中仓库仓位（'Y'为是）
public string Kf_EntrustInBill_DeleterAndMakerMustSame; //委外入库单暂存删除人必须是制单人
+ public string Kf_EntrustInBill_BillDateMode; //单据日期是否取界面递入日期
//生产领料
+ public string Kf_MateOutBill_AutoSubmit; //保存后是否自动提交
public string Kf_MateOutBill_AutoCheck; //保存后是否自动审核
- public string Kf_MateOutBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_MateOutBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_MateOutBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_MateOutBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_MateOutBill_MulSourceBill; //多源单模式
@@ -122,6 +133,7 @@
public string Kf_MateOutBill_SimpleMode; //简洁模式（不显示源单列表，只显示扫码记录，但后台仍控制）
public string Kf_MateOutBill_AutoBarCode; //免扫码模式，条码类型为非唯一条码，上传时自动生成条码扫码记录
public string Kf_MateOutBill_DeleterAndMakerMustSame; //生产领料单暂存删除人必须是制单人
+ public string Kf_MateOutBill_BillDateMode; //单据日期是否取界面递入日期
//生产领料 校验
public string Kf_MateOutBillCheck_MustQtyCtl; //校验数量控制
public string Kf_MateOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位
@@ -129,8 +141,9 @@
public string Kf_MateOutBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//销售出库
+ public string Kf_SellOutBill_AutoSubmit; //保存后是否自动提交
public string Kf_SellOutBill_AutoCheck; //保存后是否自动审核
- public string Kf_SellOutBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_SellOutBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_SellOutBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_SellOutBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_SellOutBill_MulSourceBill; //多源单模式
@@ -145,6 +158,7 @@
public string Kf_SellOutBill_NoRefresh; //PDA不自动刷新
public string Kf_SellOutBill_Display; //扫描物料条码后是否自动刷新子表界面（'Y'为是）
public string Kf_SellOutBill_DeleterAndMakerMustSame; //销售出库单暂存删除人必须是制单人
+ public string Kf_SellOutBill_BillDateMode; //单据日期是否取界面递入日期
//销售出库 校验
public string Kf_SellOutBillCheck_MustQtyCtl; //校验数量控制
public string Kf_SellOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位
@@ -152,8 +166,9 @@
public string Kf_SellOutBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//其他出库
- public string Kf_OtherOutBill_AutoCheck; //保存后是否自动审核
- public string Kf_OtherOutBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_OtherOutBill_AutoSubmit; //保存后是否自动提交
+ public string Kf_OtherOutBill_AutoCheck; //保存后是否自动审核
+ public string Kf_OtherOutBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_OtherOutBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_OtherOutBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_OtherOutBill_MulSourceBill; //多源单模式
@@ -165,6 +180,7 @@
public string Kf_OtherOutBill_FIFOList; //先进先出下架清单
public string Kf_OtherOutBill_FIFOCtl; //先进先出控制
public string Kf_OtherOutBill_DeleterAndMakerMustSame; //其他出库单暂存删除人必须是制单人
+ public string Kf_OtherOutBill_BillDateMode; //单据日期是否取界面递入日期
//其他出库 校验
public string Kf_OtherOutBillCheck_MustQtyCtl; //校验数量控制
public string Kf_OtherOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位
@@ -172,8 +188,9 @@
public string Kf_OtherOutBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//委外出库
+ public string Kf_EntrustOutBill_AutoSubmit; //保存后是否自动提交
public string Kf_EntrustOutBill_AutoCheck; //保存后是否自动审核
- public string Kf_EntrustOutBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_EntrustOutBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_EntrustOutBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_EntrustOutBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_EntrustOutBill_MulSourceBill; //多源单模式
@@ -186,6 +203,7 @@
public string Kf_EntrustOutBill_FIFOCtl; //先进先出控制
public string Kf_EntrustOutBill_SimpleMode; //简洁模式（不显示源单列表，只显示扫码记录，但后台仍控制）
public string Kf_EntrustOutBill_DeleterAndMakerMustSame; //委外出库单暂存删除人必须是制单人
+ public string Kf_EntrustOutBill_BillDateMode; //单据日期是否取界面递入日期
//委外领料 校验
public string Kf_EntrustOutBillCheck_MustQtyCtl; //校验数量控制
public string Kf_EntrustOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位
@@ -193,8 +211,9 @@
public string Kf_EntrustOutBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//生产补料
+ public string Kf_MateReplenishOutBill_AutoSubmit; //保存后是否自动提交
public string Kf_MateReplenishOutBill_AutoCheck; //保存后是否自动审核
- public string Kf_MateReplenishOutBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_MateReplenishOutBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_MateReplenishOutBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_MateReplenishOutBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_MateReplenishOutBill_MulSourceBill; //多源单模式
@@ -206,6 +225,7 @@
public string Kf_MateReplenishOutBill_FIFOList; //先进先出下架清单
public string Kf_MateReplenishOutBill_FIFOCtl; //先进先出控制
public string Kf_MateReplenishOutBill_DeleterAndMakerMustSame; //生产补料单暂存删除人必须是制单人
+ public string Kf_MateReplenishOutBill_BillDateMode; //单据日期是否取界面递入日期
//生产补料 校验
public string Kf_MateReplenishOutBillCheck_MustQtyCtl; //校验数量控制
public string Kf_MateReplenishOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位
@@ -213,8 +233,9 @@
public string Kf_MateReplenishOutBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//委外补料
+ public string Kf_EntrustReplenishOutBill_AutoSubmit; //保存后是否自动提交
public string Kf_EntrustReplenishOutBill_AutoCheck; //保存后是否自动审核
- public string Kf_EntrustReplenishOutBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_EntrustReplenishOutBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_EntrustReplenishOutBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_EntrustReplenishOutBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_EntrustReplenishOutBill_MulSourceBill; //多源单模式
@@ -226,6 +247,7 @@
public string Kf_EntrustReplenishOutBill_FIFOList; //先进先出下架清单
public string Kf_EntrustReplenishOutBill_FIFOCtl; //先进先出控制
public string Kf_EntrustReplenishOutBill_DeleterAndMakerMustSame; //委外补料单暂存删除人必须是制单人
+ public string Kf_EntrustReplenishOutBill_BillDateMode; //单据日期是否取界面递入日期
//委外补料 校验
public string Kf_EntrustReplenishOutBillCheck_MustQtyCtl; //校验数量控制
public string Kf_EntrustReplenishOutBillCheck_WHSPCtl; //校验-是否校对仓库仓位
@@ -233,8 +255,9 @@
public string Kf_EntrustReplenishOutBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//直接调拨
+ public string Kf_MoveStockBill_AutoSubmit; //保存后是否自动提交
public string Kf_MoveStockBill_AutoCheck; //保存后是否自动审核
- public string Kf_MoveStockBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_MoveStockBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_MoveStockBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_MoveStockBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_MoveStockBill_MulSourceBill; //多源单模式
@@ -247,6 +270,7 @@
public string Kf_MoveStockBill_FIFOCtl; //先进先出控制
public string Kf_MoveStockBill_Display; //扫描物料条码后是否自动刷新子表界面（'Y'为是）
public string Kf_MoveStockBill_DeleterAndMakerMustSame; //直接调拨单暂存删除人必须是制单人
+ public string Kf_MoveStockBill_BillDateMode; //单据日期是否取界面递入日期
//直接调拨 校验
public string Kf_MoveStockBillCheck_MustQtyCtl; //校验数量控制
public string Kf_MoveStockBillCheck_WHSPCtl; //校验-是否校对仓库仓位
@@ -254,8 +278,9 @@
public string Kf_MoveStockBillCheck_SourceBarCodeCtl; //校验-是否进行源单对应条码核对（'Y'为核对）
//分步式调出单
+ public string Kf_MoveStockStepOutBill_AutoSubmit; //保存后是否自动提交
public string Kf_MoveStockStepOutBill_AutoCheck; //保存后是否自动审核
- public string Kf_MoveStockStepOutBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_MoveStockStepOutBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_MoveStockStepOutBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_MoveStockStepOutBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_MoveStockStepOutBill_MulSourceBill; //多源单模式
@@ -267,10 +292,12 @@
public string Kf_MoveStockStepOutBill_FIFOList; //先进先出下架清单
public string Kf_MoveStockStepOutBill_FIFOCtl; //先进先出控制
public string Kf_MoveStockStepOutBill_DeleterAndMakerMustSame; //分步式调出单暂存删除人必须是制单人
+ public string Kf_MoveStockStepOutBill_BillDateMode; //单据日期是否取界面递入日期
//分步式调入单
+ public string Kf_MoveStockStepInBill_AutoSubmit; //保存后是否自动提交
public string Kf_MoveStockStepInBill_AutoCheck; //保存后是否自动审核
- public string Kf_MoveStockStepInBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_MoveStockStepInBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_MoveStockStepInBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_MoveStockStepInBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_MoveStockStepInBill_MulSourceBill; //多源单模式
@@ -283,10 +310,12 @@
public string Kf_MoveStockStepInBill_FIFOCtl; //先进先出控制
public string Kf_MoveStockStepInBill_SourceBarCodeCtl; //是否进行源单对应条码核对（'Y'为核对）
public string Kf_MoveStockStepInBill_DeleterAndMakerMustSame; //分步式调入单暂存删除人必须是制单人
+ public string Kf_MoveStockStepInBill_BillDateMode; //单据日期是否取界面递入日期
//采购退料
+ public string Kf_POStockInBackBill_AutoSubmit; //保存后是否自动提交
public string Kf_POStockInBackBill_AutoCheck; //保存后是否自动审核
- public string Kf_POStockInBackBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_POStockInBackBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_POStockInBackBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_POStockInBackBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_POStockInBackBill_MulSourceBill; //多源单模式
@@ -296,10 +325,12 @@
public string Kf_POStockInBackBill_MaterWHSPCtl; //是否取物料默认仓库仓位（'Y'为是）
public string Kf_POStockInBackBill_SourceWHSPCtl; //是否取源单中仓库仓位（'Y'为是）
public string Kf_POStockInBackBill_DeleterAndMakerMustSame; //采购退料单暂存删除人必须是制单人
+ public string Kf_POStockInBackBill_BillDateMode; //单据日期是否取界面递入日期
//产品退库
+ public string Kf_ProductInBackBill_AutoSubmit; //保存后是否自动提交
public string Kf_ProductInBackBill_AutoCheck; //保存后是否自动审核
- public string Kf_ProductInBackBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_ProductInBackBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_ProductInBackBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_ProductInBackBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_ProductInBackBill_MulSourceBill; //多源单模式
@@ -309,10 +340,12 @@
public string Kf_ProductInBackBill_MaterWHSPCtl; //是否取物料默认仓库仓位（'Y'为是）
public string Kf_ProductInBackBill_SourceWHSPCtl; //是否取源单中仓库仓位（'Y'为是）
public string Kf_ProductInBackBill_DeleterAndMakerMustSame; //产品退库单暂存删除人必须是制单人
+ public string Kf_ProductInBackBill_BillDateMode; //单据日期是否取界面递入日期
//其他入库红字
+ public string Kf_OtherInBackBill_AutoSubmit; //保存后是否自动提交
public string Kf_OtherInBackBill_AutoCheck; //保存后是否自动审核
- public string Kf_OtherInBackBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_OtherInBackBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_OtherInBackBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_OtherInBackBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_OtherInBackBill_MulSourceBill; //多源单模式
@@ -322,10 +355,12 @@
public string Kf_OtherInBackBill_MaterWHSPCtl; //是否取物料默认仓库仓位（'Y'为是）
public string Kf_OtherInBackBill_SourceWHSPCtl; //是否取源单中仓库仓位（'Y'为是）
public string Kf_OtherInBackBill_DeleterAndMakerMustSame; //其他入库红字单暂存删除人必须是制单人
+ public string Kf_OtherInBackBill_BillDateMode; //单据日期是否取界面递入日期
//委外退库
+ public string Kf_EntrustInBackBill_AutoSubmit; //保存后是否自动提交
public string Kf_EntrustInBackBill_AutoCheck; //保存后是否自动审核
- public string Kf_EntrustInBackBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_EntrustInBackBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_EntrustInBackBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_EntrustInBackBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_EntrustInBackBill_MulSourceBill; //多源单模式
@@ -335,10 +370,12 @@
public string Kf_EntrustInBackBill_MaterWHSPCtl; //是否取物料默认仓库仓位（'Y'为是）
public string Kf_EntrustInBackBill_SourceWHSPCtl; //是否取源单中仓库仓位（'Y'为是）
public string Kf_EntrustInBackBill_DeleterAndMakerMustSame; //委外退库单暂存删除人必须是制单人
+ public string Kf_EntrustInBackBill_BillDateMode; //单据日期是否取界面递入日期
//生产退料
+ public string Kf_MateOutBackBill_AutoSubmit; //保存后是否自动提交
public string Kf_MateOutBackBill_AutoCheck; //保存后是否自动审核
- public string Kf_MateOutBackBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_MateOutBackBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_MateOutBackBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_MateOutBackBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_MateOutBackBill_MulSourceBill; //多源单模式
@@ -349,10 +386,12 @@
public string Kf_MateOutBackBill_SourceWHSPCtl; //是否取源单中仓库仓位（'Y'为是）
public string Kf_MateOutBackBill_SimpleMode; //简洁模式（不显示源单列表，只显示扫码记录，但后台仍控制）
public string Kf_MateOutBackBill_DeleterAndMakerMustSame; //生产退料单暂存删除人必须是制单人
+ public string Kf_MateOutBackBill_BillDateMode; //单据日期是否取界面递入日期
//销售退库
+ public string Kf_SellOutBackBill_AutoSubmit; //保存后是否自动提交
public string Kf_SellOutBackBill_AutoCheck; //保存后是否自动审核
- public string Kf_SellOutBackBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_SellOutBackBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_SellOutBackBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_SellOutBackBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_SellOutBackBill_MulSourceBill; //多源单模式
@@ -362,11 +401,13 @@
public string Kf_SellOutBackBill_MaterWHSPCtl; //是否取物料默认仓库仓位（'Y'为是）
public string Kf_SellOutBackBill_SourceWHSPCtl; //是否取源单中仓库仓位（'Y'为是）
public string Kf_SellOutBackBill_AutoSavePOStockInBackBill; //同步生成采购入库单红字
- public string Kf_SellOutBackBill_DeleterAndMakerMustSame; //销售退库单暂存删除人必须是制单人
+ public string Kf_SellOutBackBill_DeleterAndMakerMustSame; //销售退库单暂存删除人必须是制单人
+ public string Kf_SellOutBackBill_BillDateMode; //单据日期是否取界面递入日期
//其他出库红字
+ public string Kf_OtherOutBackBill_AutoSubmit; //保存后是否自动提交
public string Kf_OtherOutBackBill_AutoCheck; //保存后是否自动审核
- public string Kf_OtherOutBackBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_OtherOutBackBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_OtherOutBackBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_OtherOutBackBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_OtherOutBackBill_MulSourceBill; //多源单模式
@@ -376,10 +417,12 @@
public string Kf_OtherOutBackBill_MaterWHSPCtl; //是否取物料默认仓库仓位（'Y'为是）
public string Kf_OtherOutBackBill_SourceWHSPCtl; //是否取源单中仓库仓位（'Y'为是）
public string Kf_OtherOutBackBill_DeleterAndMakerMustSame; //其他出库红字单暂存删除人必须是制单人
+ public string Kf_OtherOutBackBill_BillDateMode; //单据日期是否取界面递入日期
//委外退料
+ public string Kf_EntrustOutBackBill_AutoSubmit; //保存后是否自动提交
public string Kf_EntrustOutBackBill_AutoCheck; //保存后是否自动审核
- public string Kf_EntrustOutBackBill_SaveAutoAddnew; //保存后变为新增状态
+ public string Kf_EntrustOutBackBill_SaveAutoAddnew; //保存后变为新增状态
public string Kf_EntrustOutBackBill_ERPMode; //WMS系统同步至ERP的类型（WISE、CLOUD、无）
public string Kf_EntrustOutBackBill_MustQtyCtl; //应收数量控制（小于等于应收、完全等于应收、不控制）
public string Kf_EntrustOutBackBill_MulSourceBill; //多源单模式
@@ -390,6 +433,7 @@
public string Kf_EntrustOutBackBill_SourceWHSPCtl; //是否取源单中仓库仓位（'Y'为是）
public string Kf_EntrustOutBackBill_SimpleMode; //简洁模式（不显示源单列表，只显示扫码记录，但后台仍控制）
public string Kf_EntrustOutBackBill_DeleterAndMakerMustSame; //委外退料单暂存删除人必须是制单人
+ public string Kf_EntrustOutBackBill_BillDateMode; //单据日期是否取界面递入日期
//生产组托
public string Sc_PackUnionBill_AutoCheck; //保存后是否自动审核
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index 561a964..ed5cf2b 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 ad21151..fc1b742 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 561a964..ed5cf2b 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 ad21151..fc1b742 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 e461506..a0906c3 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 ad14f15..9da7cc1 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 561a964..ed5cf2b 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 ad21151..fc1b742 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 1e64426..dedb3fb 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 ffc0037..6897e5c 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 a23709f..0ea9f33 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 1e64426..dedb3fb 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 ffc0037..6897e5c 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.dll b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
index 55b6c53..95849dc 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
index ceb9ba6..be6ecd0 100644
--- a/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/bin/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
deleted file mode 100644
index fea44e6..0000000
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
index c292047..d6cbc74 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -4,12 +4,10 @@
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
=======
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb
-C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache
->>>>>>> b75c484393ae95535edada81e805d05c56652931
+>>>>>>> afed30bef0f01fa5f8e9e6627a5604632eb3d37a
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.dll b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
index 55b6c53..95849dc 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.dll
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.dll
Binary files differ
diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
index ceb9ba6..be6ecd0 100644
--- a/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
+++ b/SyntacticSugar/obj/Debug/SyntacticSugar.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/SyntacticSugar/obj/Release/.NETFramework,Version=v4.5.AssemblyAttributes.cs
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
index 243e34e..97979d2 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,6 +1,5 @@
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.dll b/SyntacticSugar/obj/Release/SyntacticSugar.dll
deleted file mode 100644
index 9a5be6e..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 310ad83..0000000
--- a/SyntacticSugar/obj/Release/SyntacticSugar.pdb
+++ /dev/null
Binary files differ
diff --git a/WarM/WarM.csproj b/WarM/WarM.csproj
index 0bdfff6..fcb5a72 100644
--- a/WarM/WarM.csproj
+++ b/WarM/WarM.csproj
@@ -78,7 +78,14 @@
<HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
+ <Reference Include="M2Mqtt.Net, Version=4.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\M2Mqtt.4.3.0.0\lib\net45\M2Mqtt.Net.dll</HintPath>
+ </Reference>
<Reference Include="Microsoft.VisualBasic" />
+ <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>dll\Newtonsoft.Json.dll</HintPath>
+ </Reference>
<Reference Include="NPOI, Version=2.1.3.1, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\OCX\NPOI.dll</HintPath>
@@ -700,6 +707,12 @@
<Compile Include="鏉＄爜鎵撳嵃\Frm_Split.Designer.cs">
<DependentUpon>Frm_Split.cs</DependentUpon>
</Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New_Change.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New_Change.designer.cs">
+ <DependentUpon>Gy_BarCodeBill_automaticallyByPLC_New_Change.cs</DependentUpon>
+ </Compile>
<Compile Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBillList.cs">
<SubType>Form</SubType>
</Compile>
@@ -1181,6 +1194,10 @@
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Frm_Split.resx">
<DependentUpon>Frm_Split.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_BarCodeBill_automaticallyByPLC_New_Change.resx">
+ <DependentUpon>Gy_BarCodeBill_automaticallyByPLC_New_Change.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="鏉＄爜鎵撳嵃\Gy_CusBarCodeBillList.resx">
<DependentUpon>Gy_CusBarCodeBillList.cs</DependentUpon>
<SubType>Designer</SubType>
@@ -1238,6 +1255,7 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
+ <None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/WarM/bin/Release/BLL.dll b/WarM/bin/Release/BLL.dll
index c9e9569..8abad3e 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 45e9d10..9fa82ef 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 d33ebe6..47cf6dd 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 7ef44ed..51b1670 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 87ed9f6..9f77883 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 dd56d66..8d03eea 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 86be651..720cf62 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 a7b61f6..3891935 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 561a964..ed5cf2b 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 ad21151..fc1b742 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 e461506..a0906c3 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 ad14f15..9da7cc1 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 1e64426..dedb3fb 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 ffc0037..6897e5c 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 b9475fd..271f758 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 5c37dd3..c23f0e3 100644
--- a/WarM/bin/Release/WarM.pdb
+++ b/WarM/bin/Release/WarM.pdb
Binary files differ
diff --git a/WarM/dll/Newtonsoft.Json.dll b/WarM/dll/Newtonsoft.Json.dll
new file mode 100644
index 0000000..341d08f
--- /dev/null
+++ b/WarM/dll/Newtonsoft.Json.dll
Binary files differ
diff --git a/WarM/packages.config b/WarM/packages.config
new file mode 100644
index 0000000..b00e0c5
--- /dev/null
+++ b/WarM/packages.config
@@ -0,0 +1,4 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="M2Mqtt" version="4.3.0.0" targetFramework="net45" />
+</packages>
\ No newline at end of file
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"
new file mode 100644
index 0000000..37845bc
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.cs"
@@ -0,0 +1,2639 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+using gregn6Lib;
+using Pub_Class;
+using System.Threading;
+using System.Net.Sockets;
+using System.Net;
+using System.Drawing.Printing;
+using System.IO;
+using System.Management;
+using System.Net.NetworkInformation;
+using System.Printing;
+using uPLibrary.Networking.M2Mqtt;
+using uPLibrary.Networking.M2Mqtt.Messages;
+
+namespace WarM
+{
+ public partial class Gy_BarCodeBill_automaticallyByPLC_New_Change : Form
+ {
+ public Gy_BarCodeBill_automaticallyByPLC_New_Change()
+ {
+ InitializeComponent();
+ }
+ //瀹氫箟
+ public const Int16 HTagCol = 0;
+ public const Int16 HSnoCol = 1;
+ public const Int16 HMainIDCol = 2;
+ public const Int16 HSubIDCol = 3;
+ public const Int16 HBillNoCol = 4;
+ public const Int16 HBillTypeCol = 5;
+ public const Int16 HMaterIDCol = 6;
+ public const Int16 HMaterNumberCol = 7;
+ public const Int16 HMaterNameCol = 8;
+ public const Int16 HPinfanCol = 9;//
+ public const Int16 HMaterModelCol = 10;//
+ public const Int16 HModelCol = 11;
+ public const Int16 HAuxPropIDCol = 12;
+ public const Int16 HAuxPropNumberCol = 13;
+ public const Int16 HAuxPropNameCol = 14;
+ public const Int16 HUnitIDCol = 15;
+ public const Int16 HUnitNumberCol = 16;
+ public const Int16 HUnitNameCol = 17;
+ public const Int16 HBarCodeTypeCol = 18;
+ public const Int16 HBatchManagerCol = 19;
+ public const Int16 HBatchNoCol = 20;
+ public const Int16 HGiveAwayFlagCol = 21;
+ public const Int16 HQtyCol = 22;
+ public const Int16 HMinQtyCol = 23;
+ public const Int16 HBQtyCol = 24;
+ public const Int16 HPackQtyCol = 25;
+ public const Int16 HProduceDateCol = 26;
+ public const Int16 HExpiryDateCol = 27;
+ public const Int16 HDeptIDCol = 28;
+ public const Int16 HDeptNumberCol = 29;
+ public const Int16 HDeptNameCol = 30;
+ public const Int16 HSourceIDCol = 31;
+ public const Int16 HSourceNumberCol = 32;
+ public const Int16 HSourceNameCol = 33;
+ public const Int16 HDateCol = 34;
+ public const Int16 HEndDateCol = 35;
+ public const Int16 HSupIDCol = 36;
+ public const Int16 HSupNumberCol = 37;
+ public const Int16 HSupNameCol = 38;
+ public const Int16 HCusIDCol = 39;
+ public const Int16 HCusNumberCol = 40;
+ public const Int16 HCusNameCol = 41;
+ public const Int16 HCusTypeCol = 42;
+ public const Int16 HSourceInterIDCol = 43;
+ public const Int16 HSourceEntryIDCol = 44;
+ public const Int16 HSourceBillNoCol = 45;
+ public const Int16 HSourceBillTypeCol = 46;
+ public const Int16 HInstructIDCol = 47;
+ public const Int16 HInstructNoCol = 48;
+ public const Int16 HSeOrderBillIDCol = 49;
+ public const Int16 HSeOrderBillNoCol = 50;
+ public const Int16 HSeOrderSEQCol = 51;
+ public const Int16 HWhIDCol = 52;
+ public const Int16 HWhNumberCol = 53;
+ public const Int16 HWhNameCol = 54;
+ public const Int16 HSPIDCol = 55;
+ public const Int16 HSPNumberCol = 56;
+ public const Int16 HSPNameCol = 57;
+ public const Int16 HinitQtyCol = 58;
+ public const Int16 HRemarkCol = 59;
+ public const Int16 HPinfanBarCodeCol = 60;
+ public const Int16 HMTONoCol = 61;
+ public const Int16 HShowDateCol = 62;
+ public const Int16 HInnerBillNoCol = 63;
+ public const Int16 HMakerCol = 64;
+ public const Int16 HISKFPERIODCol = 65;
+ public const Int16 HEXPUNITCol = 66;
+ public const Int16 HEXPPERIODCol = 67;
+
+ public Int16 HSelectCol = 0;
+ public Int16 HSno2Col = 1;
+ public Int16 HTMCol = 2;
+ public Int16 HBarCodeType2Col = 3;
+ public Int16 HMaterID2Col = 4;
+ public Int16 HMaterNumber2Col = 5;
+ public Int16 HMaterName2Col = 6;
+ public Int16 HPinfan2Col = 7;
+ public Int16 HMaterModel2Col = 8;
+ public Int16 HModel2Col = 9;
+ public Int16 HAuxPropID2Col = 10;
+ public Int16 HAuxPropNumber2Col = 11;
+ public Int16 HAuxPropName2Col = 12;
+ public Int16 HBatchNo2Col = 13;
+ public Int16 HGiveAwayFlag2Col = 14;
+ public Int16 HUnitID2Col = 15;
+ public Int16 HUnitNumber2Col = 16;
+ public Int16 HUnitName2Col = 17;
+ public Int16 HQty2Col = 18;
+ public Int16 HWeiCol = 19;
+ public Int16 HPrintCol = 20;
+ public Int16 HDeptID2Col = 21;
+ public Int16 HDeptNumber2Col = 22;
+ public Int16 HDeptName2Col = 23;
+ public Int16 HSourceID2Col = 24;
+ public Int16 HSourceNumber2Col = 25;
+ public Int16 HSourceName2Col = 26;
+ public Int16 HDate2Col = 27;
+ public Int16 HEndDate2Col = 28;
+ public Int16 HBarcodeNoCol = 29;
+ public Int16 HBarcodeQtysCol = 30;
+ public Int16 HSupID2Col = 31;
+ public Int16 HSupNumber2Col = 32;
+ public Int16 HSupName2Col = 33;
+ public Int16 HCusID2Col = 34;
+ public Int16 HCusNumber2Col = 35;
+ public Int16 HCusName2Col = 36;
+ public Int16 HCusType2Col = 37;
+ public Int16 HSourceInterID2Col = 38;
+ public Int16 HSourceEntryID2Col = 39;
+ public Int16 HSourceBillNo2Col = 40;
+ public Int16 HSourceBillType2Col = 41;
+ public Int16 HInstructID2Col = 42;
+ public Int16 HInstructNo2Col = 43;
+ public Int16 HSeOrderBillID2Col = 44;
+ public Int16 HSeOrderBillNo2Col = 45;
+ public Int16 HSeOrderSEQ2Col = 46;
+ public Int16 HWhID2Col = 47;
+ public Int16 HWhNumber2Col = 48;
+ public Int16 HWhName2Col = 49;
+ public Int16 HSPID2Col = 50;
+ public Int16 HSPNumber2Col = 51;
+ public Int16 HSPName2Col = 52;
+ public Int16 HRemark2Col = 53;
+ public Int16 HPinfanBarCode2Col = 54;
+ public Int16 HMTONo2Col = 55;
+ public Int16 HShowDate2Col = 56;
+ public Int16 HInnerBillNo2Col = 57;
+ public Int16 HMaker2Col = 58;
+ public Int16 HEntryID2Col = 59;
+ public Int16 HProduceDate2Col = 60;
+ public Int16 HExpiryDate2Col = 61;
+ public Int16 HISKFPERIOD2Col = 62;
+ public Int16 HEXPUNIT2Col = 63;
+ public Int16 HEXPPERIOD2Col = 64;
+ //
+ public string ModName = "85";
+ public string ModCaption = "鏉＄爜鐢熸垚";
+ public const string ModRightName = "Gy_BarCodeBill";
+ public const string ModRightNameSourceQty = ModRightName + "_SourceQty"; //瓒呮簮鍗曟暟閲忔帶鍒�
+ public bool BillChange; //
+
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+ public DBUtility.ClsXt_BaseBill BaseBill;
+ //public WarM.WMSWeb.WebService1 oWeb = new WarM.WMSWeb.WebService1();
+ public Int64 KeyID;
+ public bool grdStatus;
+ //public DAL.ClsGy_BarCodeBill BillNew =new DAL.ClsGy_BarCodeBill();
+ //public DAL.ClsGy_BarCodeBill BillOld = new DAL.ClsGy_BarCodeBill();
+ public DAL.ClsGy_BarCodeBill_Ctl oBar = new DAL.ClsGy_BarCodeBill_Ctl();
+ ClsGridViewSum oSumGrid = new ClsGridViewSum();
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ public int selectRow = 0;
+ public int selectRow2 = 0;
+ public Int64 HInterID = 0; //鍐呯爜
+ public Int64 HOrgID = -1;
+ public string HOrgNumber = "";
+ public string ERPMode = ""; //ERP妯″紡锛圵ISE銆丆LOUD锛�
+ public string CampanyName = ""; //瀹㈡埛瀹氬埗鍖栧悕绉�
+ public string SourceQtyCtl = ""; //瓒呮簮鍗曟暟閲忔帶鍒�
+ public long PrintQty = 0; //鍏佽鏉＄爜鎵撳嵃娆℃暟
+ public string PrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鎺у埗
+ public string UpdatePrintQtyCtl = ""; //鏉＄爜鎵撳嵃娆℃暟鏇存柊
+ //-------------------------------------------------------------------------
+
+ //
+ //Socket閫氳
+ Socket socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+ long produceQty = 0; //鎺ユ敹閫氳锛岄渶瑕佺敓鎴愬嚑涓潯鐮�
+
+ //MQTT閫氳
+ public MqttClient client = null;
+
+ GridppReport Report;
+
+
+ #region 涓昏鏂规硶
+ #region 閫夋嫨婧愬崟
+ //閫夋嫨婧愬崟鎺т欢鐐瑰嚮鏂规硶
+ private void cmdSourceBillNo_Click_1(object sender, EventArgs e)
+ {
+ cmdSourceBillNo_Click(sender, e);
+ }
+
+ //閫夊師鍗�
+ private void cmdSourceBillNo_Click(object sender, EventArgs e)
+ {
+ DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+ if (oClsGy_ORGANIZATIONS_View.GetInfoByName(cmbHOrgID.Text))
+ {
+ HOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID;
+ }
+ if (HOrgID == -1)
+ {
+ MessageBox.Show("閫夋嫨缁勭粐鏈夐敊璇紒");
+ return;
+ }
+
+ if (cmbSourceBillType.Text.Trim() == "鐢熶骇璁㈠崟")
+ {
+ string sWhere = "";
+ //绯荤粺鍙傛暟锛岀敓鎴愭潯鐮佹暟閲忓彲鍚﹁秴婧愬崟鏁伴噺鎺у埗锛圢涓轰笉鍙秴婧愬崟鏁伴噺锛�
+ if (SourceQtyCtl == "N")
+ {
+ sWhere = " and HOrgID =" + HOrgID.ToString() + " and 浠诲姟鏁伴噺>0 and 鐘舵�� = '寮�宸�' and 鐢熶骇绾�='" + comboBox_SourceNameParams.Text + "' ";
+ }
+ else
+ {
+ sWhere = " and HOrgID =" + HOrgID.ToString() + " and 鐘舵�� = '寮�宸�' and 鐢熶骇绾�='" + comboBox_SourceNameParams.Text + "' "; ;
+ }
+
+ DAL.Cls_S_IFCLD_ICMOList1 oIFCLD_ICMOList = new DAL.Cls_S_IFCLD_ICMOList1();
+ if (oIFCLD_ICMOList.Refresh(sWhere)) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
+ }
+ }
+ else
+ {
+
+ }
+
+ //閫夋嫨婧愬崟鍚庯紝鍔犺浇璇ユ簮鍗曡褰曠墿鏂欏湪褰撳墠鏃ユ湡鐨勬潯鐮佸垪琛�
+ Display4();
+ }
+
+ //
+ private void FillSelectData(List<DBUtility.BillSelect> oList)
+ {
+ if (oList.Count != 1)
+ {
+ MessageBox.Show("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ return;
+ }
+
+
+ DataSet Ds;
+ oSumGrid.Changelock = true;
+ initGrid();
+ int i = -1;
+ foreach (DBUtility.BillSelect oSelectRow in oList)
+ {
+ i = i + 1;
+ //鐢熶骇璁㈠崟
+ if (oSelectRow.BillType == "3710")
+ {
+ grdMain.Rows.Add();
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ //寰楀埌淇℃伅
+ Ds = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_ICMOBillList " + oSelectRow.BillMainID.ToString() + "," + oSelectRow.BillSubID.ToString() + ",'" + SourceQtyCtl + "'", "h_p_Gy_BarCodeBill_ICMOBillList");
+ //Ds = oCn.RunProcReturn("select * from h_v_IFCLD_ICMOList where hmainid=" + oSelectRow.BillMainID + " and hsubid=" + oSelectRow.BillSubID, "h_v_IFCLD_ICMOList");
+ //鍐欏叆淇℃伅
+ Sub_WriteInForm(Ds.Tables[0], i);
+ }
+ }
+ //
+ oSumGrid.Changelock = false;
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+
+ if (grdMain.Rows.Count > 0)
+ {
+ //鏍规嵁婧愬崟璁剧疆琛ㄥご
+ textBox_HMaterNumber.Text = grdMain.Rows[0].Cells[HMaterNumberCol].Value.ToString();
+ textBox_HMaterName.Text = grdMain.Rows[0].Cells[HMaterNameCol].Value.ToString();
+ textBox_HMaterModel.Text = grdMain.Rows[0].Cells[HMaterModelCol].Value.ToString();
+ long HMaterID = ClsPub.isLong(grdMain.Rows[i].Cells[HMaterIDCol].Value.ToString());
+ Ds = oCn.RunProcReturn("select * from Gy_Material where HItemID = " + HMaterID + " and HUSEORGID =" + HOrgID, "Gy_Material");
+ if (Ds != null && Ds.Tables[0].Rows.Count > 0)
+ {
+ string HBatchManager = Ds.Tables[0].Rows[0]["HBatchManager"].ToString();
+ if (HBatchManager == "False")
+ {
+ radioButton_HIsUsingBatchNo.Checked = false;
+ }
+ else
+ {
+ radioButton_HIsUsingBatchNo.Checked = true;
+ }
+ }
+ //璁剧疆鎵瑰彿
+ if (radioButton_HIsUsingBatchNo.Checked)
+ {
+ grdMain.Rows[0].Cells[HBatchNoCol].Value = getBatchNo();
+ }
+ }
+ }
+
+ //鏍规嵁TABLE鍐欏叆鐣岄潰(鐢熶骇浠诲姟鍗�)
+ private void Sub_WriteInForm(DataTable oTable, int i)
+ {
+ ////鍔犺浇琛ㄥご
+ //this.txtHDeptID.Tag = oTable.Rows[0]["HDeptID"].ToString();
+ //this.txtHDeptID.Text = oTable.Rows[0]["閮ㄩ棬鍚嶇О"].ToString();
+ ////鍔犺浇琛ㄤ綋
+ grdMain.Rows[i].Cells[HTagCol].Value = "*";
+ grdMain.Rows[i].Cells[HQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+ grdMain.Rows[i].Cells[HinitQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+ //
+ grdMain.Rows[i].Cells[HMainIDCol].Value = oTable.Rows[0]["hmainid"].ToString();
+ grdMain.Rows[i].Cells[HSubIDCol].Value = oTable.Rows[0]["hsubid"].ToString();
+ grdMain.Rows[i].Cells[HBillNoCol].Value = oTable.Rows[0]["鍗曟嵁鍙�"].ToString();
+ grdMain.Rows[i].Cells[HSourceBillNoCol].Value = oTable.Rows[0]["鍗曟嵁鍙�"].ToString();
+ grdMain.Rows[i].Cells[HBillTypeCol].Value = oTable.Rows[0]["HBillType"].ToString();
+ grdMain.Rows[i].Cells[HDateCol].Value = oTable.Rows[0]["鏃ユ湡"].ToString(); //鍗氭棩 鏀舵枡鍗曟嵁鏃ユ湡
+ grdMain.Rows[i].Cells[HShowDateCol].Value = dtpHDate.Value.ToShortDateString();
+ grdMain.Rows[i].Cells[HSupIDCol].Value = oTable.Rows[0]["hsupid"].ToString();
+ grdMain.Rows[i].Cells[HSupNumberCol].Value = oTable.Rows[0]["渚涘簲鍟嗕唬鐮�"].ToString();
+ grdMain.Rows[i].Cells[HSupNameCol].Value = oTable.Rows[0]["渚涘簲鍟�"].ToString();
+ grdMain.Rows[i].Cells[HDeptIDCol].Value = oTable.Rows[0]["HDeptID"].ToString();
+ grdMain.Rows[i].Cells[HDeptNumberCol].Value = oTable.Rows[0]["閮ㄩ棬浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HDeptNameCol].Value = oTable.Rows[0]["閮ㄩ棬"].ToString();
+ grdMain.Rows[i].Cells[HMaterIDCol].Value = oTable.Rows[0]["HMaterID"].ToString();
+ grdMain.Rows[i].Cells[HMaterNumberCol].Value = oTable.Rows[0]["鐗╂枡浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HMaterNameCol].Value = oTable.Rows[0]["鐗╂枡鍚嶇О"].ToString();
+ grdMain.Rows[i].Cells[HMaterModelCol].Value = oTable.Rows[0]["瑙勬牸鍨嬪彿"].ToString();
+ //grdMain.Rows[i].Cells[HBatchManagerCol].Value = oTable.Rows[0]["鏄惁鍚敤鎵规"].ToString();
+ grdMain.Rows[i].Cells[HBatchNoCol].Value = oTable.Rows[0]["鎵规"].ToString();
+ grdMain.Rows[i].Cells[HUnitIDCol].Value = oTable.Rows[0]["HUnitID"].ToString();
+ grdMain.Rows[i].Cells[HUnitNumberCol].Value = oTable.Rows[0]["璁￠噺鍗曚綅浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HUnitNameCol].Value = oTable.Rows[0]["璁￠噺鍗曚綅"].ToString();
+ grdMain.Rows[i].Cells[HRemarkCol].Value = oTable.Rows[0]["澶囨敞"].ToString();
+ grdMain.Rows[i].Cells[HMTONoCol].Value = oTable.Rows[0]["璁″垝璺熻釜鍙�"].ToString();
+ grdMain.Rows[i].Cells[HCusIDCol].Value = oTable.Rows[0]["HCusID"].ToString();
+ grdMain.Rows[i].Cells[HCusNumberCol].Value = oTable.Rows[0]["瀹㈡埛浠ｇ爜"].ToString();
+ grdMain.Rows[i].Cells[HCusNameCol].Value = oTable.Rows[0]["瀹㈡埛"].ToString();
+ grdMain.Rows[i].Cells[HCusTypeCol].Value = oTable.Rows[0]["瀹㈡埛鍨嬪彿"].ToString();
+ grdMain.Rows[i].Cells[HPinfanBarCodeCol].Value = oTable.Rows[0]["HPinfanBarCode"].ToString();
+ grdMain.Rows[i].Cells[HPinfanCol].Value = oTable.Rows[0]["HPinfan"].ToString();
+ //grdMain.Rows[i].Cells[HSourceIDCol].Value = oTable.Rows[0]["HSourceID"].ToString();
+ //grdMain.Rows[i].Cells[HSourceNumberCol].Value = oTable.Rows[0]["鐢熶骇绾夸唬鐮�"].ToString();
+ grdMain.Rows[i].Cells[HSourceNameCol].Value = oTable.Rows[0]["鐢熶骇绾�"].ToString();
+ grdMain.Rows[i].Cells[HEndDateCol].Value = oTable.Rows[0]["璁″垝瀹屽伐鏃ユ湡"].ToString();//鍗氭棩 鐢熶骇璁㈠崟 澶辨晥鏃ユ湡
+
+ grdMain.Rows[i].Cells[HAuxPropIDCol].Value = oTable.Rows[0]["HAuxPropID"].ToString();
+
+ if (cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佸鍣ㄨ鍒�")
+ {
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = ClsPub.isDoule(oTable.Rows[0]["鏈敓鎴愭潯鐮佹暟閲�"]);
+ }
+ else if (cmbHBarCodeType.Text == "浠櫒澶栬喘浠舵潯鐮佹櫘閫氳鍒�"
+ || cmbHBarCodeType.Text == "浠櫒鎴愬搧鏉＄爜瑙勫垯"
+ || cmbHBarCodeType.Text == "璇曞墏鎴愬搧鏉＄爜瑙勫垯")
+ {
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = "1";
+ }
+ else
+ {
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+ }
+ grdMain.Rows[i].Cells[HProduceDateCol].Value = oTable.Rows[0]["HProduceDate"].ToString();
+ grdMain.Rows[i].Cells[HExpiryDateCol].Value = oTable.Rows[0]["HExpiryDate"].ToString();
+ grdMain.Rows[i].Cells[HISKFPERIODCol].Value = oTable.Rows[0]["HISKFPERIOD"].ToString();
+ grdMain.Rows[i].Cells[HEXPUNITCol].Value = oTable.Rows[0]["HEXPUNIT"].ToString();
+ grdMain.Rows[i].Cells[HEXPPERIODCol].Value = oTable.Rows[0]["HEXPPERIOD"].ToString();
+
+
+ //鑷姩鐢熸垚-璁剧疆鏁伴噺銆佹渶灏忓寘瑁呮暟銆佺鏁颁负1
+ grdMain.Rows[i].Cells[HQtyCol].Value = 1;
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = 1;
+ grdMain.Rows[i].Cells[HBQtyCol].Value = 1;
+
+
+
+
+ //--
+ //璁剧疆鍙紪杈戝垪
+ string sAllowCol = HQtyCol.ToString() +
+ "," + HMinQtyCol.ToString() +
+ "," + HAuxPropNumberCol.ToString() +
+ "," + HBatchNoCol.ToString() +
+ "," + HPackQtyCol.ToString() +
+ "," + HRemarkCol.ToString();
+ grdMain.Columns[HBillNoCol].ReadOnly = true;
+ //璁剧疆鍚堣鍒�
+ string sTotalCol = HQtyCol.ToString();
+ //
+ DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid);
+ tabControl1.SelectedIndex = 3;
+ bc.Enabled = true;
+ //
+ RowCount(i, 0);
+ }
+ #endregion
+
+ #region 鐢熸垚鎸夐挳
+ private void bc_Click(object sender, EventArgs e)
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_BarCodeBill_automaticallyByPLC_ProduceByHand", 1, false, DBUtility.ClsPub.CurUserName))
+ {
+ MessageBox.Show("鐢熸垚澶辫触锛屾棤鏉冮檺锛�");
+ return;
+ }
+
+ //娓呴櫎鎵撳嵃浠诲姟
+ string msg = "";
+ if (!clearPrinterTask(ref msg))
+ {
+ MessageBox.Show(msg);
+ return;
+ }
+
+ this.Sub_SaveBill();
+ Display();
+
+ if (radioButton_IsPrint_Yes.Checked == true)
+ {
+ //璁剧疆鎵撳嵃妯℃澘锛屾墦鍗�
+ grdList.Rows[0].Cells[0].Value = "*";
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + textBox_PrintModelParams.Text + ".grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
+ if (comboBox_PrinterParams.Text != "")
+ {
+ Report.Printer.PrinterName = comboBox_PrinterParams.Text.Replace("(榛樿)", "");
+ }
+ Report.Print(false);
+ }
+
+ Display4();
+ }
+ //淇濆瓨鍗曟嵁
+ private bool Sub_SaveBill()
+ {
+ //鑾峰彇鍐呯爜
+ HInterID = DBUtility.ClsPub.CreateBillID_Prod(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ ////鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ //if (BaseBill.IsExistMainID(ref DBUtility.ClsPub.sExeReturnInfo, HInterID, Pub_Class.ClsPub.Enum_BillStatus.BillStatus_AddNew))
+ //{
+ // HInterID = DBUtility.ClsPub.CreateBillID(ModName, ref DBUtility.ClsPub.sExeReturnInfo);
+ //}
+ //
+
+
+ DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+ HOrgNumber = "";
+ if (oClsGy_ORGANIZATIONS_View.GetInfoByName(cmbHOrgID.Text))
+ {
+ HOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID;
+ HOrgNumber = DBUtility.ClsPub.isStrNull(oClsGy_ORGANIZATIONS_View.omodel.HNumber);
+ }
+ if (HOrgID == -1)
+ {
+ MessageBox.Show("閫夋嫨缁勭粐鏈夐敊璇紒");
+ return false;
+ }
+
+
+ lblCaption.Focus();
+ if (!Sub_AllowSave())//鍗曟嵁瀹屾暣鎬у垽鏂�
+ {
+ return false;
+ }
+
+ SaveBarCode();
+ return true;
+ }
+
+ //鍗曟嵁瀹屾暣鎬у垽鏂� 鏈畬鎴�
+ private bool Sub_AllowSave()
+ {
+ //鏄庣粏琛ㄦ槸鍚︿负闆惰
+ bool b = false;
+ for (int i = 0; i < grdMain.RowCount; i++)
+ {
+ if (!IsNullRow(i))
+ {
+ b = true;
+ break;
+ }
+ }
+ if (b == false)
+ {
+ MessageBox.Show("鏄庣粏琛屼笉瀛樺湪锛�", "鎻愮ず");
+ return false;
+ }
+
+ string sHRemark = "";
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ long HSno = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HSnoCol].Value); // 搴忓彿
+ string HBarCodeType = cmbHBarCodeType.Text; // 鏉＄爜绫诲瀷
+ string HSourceBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBillNoCol].Value); // 婧愬崟鍗曞彿
+ long HMaterID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value); // 鐗╂枡鍐呯爜
+ string HBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value); // 鎵瑰彿
+ long HAuxPropID = DBUtility.ClsPub.isLong(grdMain.Rows[j].Cells[HAuxPropIDCol].Value); // 杈呭姪灞炴�D
+ double HSourceQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HinitQtyCol].Value); // 婧愬崟鏁伴噺
+ double HQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value); // 鏁伴噺
+ double HMinQty = DBUtility.ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value); // 鏈�灏忓寘瑁呮暟
+
+ if (HMaterID != 0)
+ {
+ DataSet oDsCheck = oCn.RunProcReturn("exec h_p_Gy_BarCodeBill_AddCheck " + HSno.ToString() + ",'" + HBarCodeType + "','" + HSourceBillNo + "'," + HMaterID.ToString() + ",'" + HBatchNo + "'," + HAuxPropID.ToString() + "," + HSourceQty.ToString() + "," + HQty.ToString() + "," + HMinQty.ToString() + "," + HOrgID.ToString() + ",'" + SourceQtyCtl + "'", "h_p_Gy_BarCodeBill_AddCheck");
+ //
+ if (oDsCheck == null && oDsCheck.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鏉＄爜鐢熸垚瀹屾暣鎬у垽鏂敊璇紒");
+ return false;
+ }
+ else if (DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0][0]) == "1")
+ {
+ sHRemark = sHRemark + DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HRemark"]);
+ }
+ else if (DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HExpiryDateCol].Value) == "")
+ {
+ if (DBUtility.ClsPub.isBool(oDsCheck.Tables[0].Rows[0]["HISKFPERIOD"]))
+ {
+ DateTime HProduceDate; //鐢熶骇鏃ユ湡
+ string HEXPUNIT; //淇濊川鏈熷崟浣�
+ int HEXPPERIOD; //淇濊川鏈�
+
+ HProduceDate = dtpHDate.Value;
+ HEXPUNIT = DBUtility.ClsPub.isStrNull(oDsCheck.Tables[0].Rows[0]["HEXPUNIT"]);
+ HEXPPERIOD = DBUtility.ClsPub.isInt(oDsCheck.Tables[0].Rows[0]["HEXPPERIOD"]);
+
+ grdMain.Rows[j].Cells[HISKFPERIODCol].Value = 1;
+ grdMain.Rows[j].Cells[HEXPUNITCol].Value = HEXPUNIT;
+ grdMain.Rows[j].Cells[HEXPPERIODCol].Value = HEXPPERIOD.ToString();
+ grdMain.Rows[j].Cells[HProduceDateCol].Value = HProduceDate.ToShortDateString();
+
+ if (HEXPUNIT == "Y")
+ {
+ grdMain.Rows[j].Cells[HExpiryDateCol].Value = HProduceDate.AddYears(HEXPPERIOD).ToShortDateString();
+ }
+ else if (HEXPUNIT == "M")
+ {
+ grdMain.Rows[j].Cells[HExpiryDateCol].Value = HProduceDate.AddMonths(HEXPPERIOD).ToShortDateString();
+ }
+ else
+ {
+ grdMain.Rows[j].Cells[HExpiryDateCol].Value = HProduceDate.AddDays(HEXPPERIOD).ToShortDateString();
+ }
+ }
+ else
+ {
+ grdMain.Rows[j].Cells[HISKFPERIODCol].Value = 0;
+ grdMain.Rows[j].Cells[HEXPUNITCol].Value = "";
+ grdMain.Rows[j].Cells[HEXPPERIODCol].Value = 0;
+ grdMain.Rows[j].Cells[HProduceDateCol].Value = "";
+ grdMain.Rows[j].Cells[HExpiryDateCol].Value = "";
+ }
+ }
+ }
+ }
+ if (sHRemark != "")
+ {
+ MessageBox.Show(sHRemark);
+ return false;
+ }
+ return true;
+ }
+
+ //鐢熸垚鏉＄爜
+ private void SaveBarCode()
+ {
+ grdSub.Rows.Clear();
+ int LSHlen = 6; //娴佹按鍙烽暱搴�
+ int SumLen = 10; //鎬婚暱搴�
+ string TM = ""; //鏉＄爜
+ string HNumber = ""; //鐗╂枡鍐呯爜
+ string HMaterNumber = ""; //鐗╂枡浠ｇ爜
+ double HSumQty = 0; //浜у搧鏁伴噺
+ double HMinQty = 0; //鏈�灏忓寘瑁呮暟
+ Int64 HBQty = 0; //绠辨暟
+ double HQty = 0; //鏁伴噺
+ string WeiShu = ""; //灏炬暟
+ Int64 LSH = 0; //娴佹按鍙�
+ string LSH2 = ""; //娴佹按鍙疯浆鎹㈡垚瀛楃
+ string sDate = ""; //鏃ユ湡
+ string sYear = ""; //骞�
+ string sPeriod = ""; //鏈�
+ string sDay = ""; //鏃�
+ string HBatchNo = ""; //鎵规
+ string HYasuoji = ""; //鍘嬬缉鏈�
+ string HModelName = ""; //鏈哄瀷
+ string HICMOBillNo = ""; //婧愬崟鍙�
+ string HBarCodeBatchNo = ""; //鏉＄爜鎵规鍙�
+ string HBarCodeDate = ""; //鏉＄爜鏃ユ湡
+ int k = 0;
+ Int64 n = 0; //鍚屼竴鎵圭敓鎴愭潯鐮佷腑鐨勭鍑犳潯
+ string sTMNumber = ""; //鏉＄爜鑷畾涔夊墠缂�
+ string sSourceBillNo = ""; //婧愬崟鍙�
+ string sSourceEntryID = ""; //琛屽彿锛堟簮鍗曞瓙ID锛�
+ DataSet Ds;
+ //Ds = oCn.RunProcReturn("exec GetLSH '" + ClsPub.GetServerDate(0) + "'", "GetLSH");
+ //LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
+ for (int j = 0; j < grdMain.Rows.Count; j++)
+ {
+ if (ClsPub.isLong(grdMain.Rows[j].Cells[HMaterIDCol].Value) != 0)
+ {
+ HNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterIDCol].Value);
+ HMaterNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HMaterNumberCol].Value);
+ HBatchNo = ClsPub.isStrNull(grdMain.Rows[j].Cells[HBatchNoCol].Value);
+ //鏃ユ湡鑾峰彇鏂瑰紡
+ sDate = dtpHDate.Value.ToShortDateString();
+
+ HYasuoji = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HPinfanCol].Value); //鍘嬬缉鏈轰唬鐮侊紙澶忓疂鐢靛櫒锛�
+ HModelName = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HCusTypeCol].Value); //鏈哄瀷锛堝瀹濈數鍣級
+ HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HSourceBillNoCol].Value); //鐢熶骇璁㈠崟鍙凤紙澶忓疂鐢靛櫒锛�
+ HBarCodeBatchNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HPinfanBarCodeCol].Value); //鏉＄爜鎵规鍙凤紙澶忓疂鐢靛櫒锛�
+ HBarCodeDate = DBUtility.ClsPub.isStrNull(grdMain.Rows[j].Cells[HSupNumberCol].Value); //鏉＄爜鏃ユ湡锛堝瀹濈數鍣級
+ //
+ sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+ sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+ sDay = sDay.Substring(sDay.Length - 2, 2);
+ //==================================
+ if (cmbHBarCodeType.Text == "鍞竴鏉＄爜")
+ {
+
+ //鏉＄爜鍓嶇紑 = 缁勭粐浠ｇ爜 + 鐗╂枡浠ｇ爜 + 骞� + 鏈� + 鏃�
+ sTMNumber = HOrgNumber + HNumber + sYear + sPeriod + sDay;
+ Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo"); //鑾峰彇鏈�澶ф祦姘村彿
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
+ }
+ else
+ {
+ MessageBox.Show("閿欒鐨勬潯鐮佺被鍨嬶紝涓嶈兘鐢熸垚鏉＄爜锛�");
+ return;
+ }
+
+ Int64 HBQty2 = 0; //绠辨暟
+ HBQty2 = ClsPub.isLong(grdMain.Rows[j].Cells[HBQtyCol].Value);
+ HBQty = HBQty + ClsPub.isLong(grdMain.Rows[j].Cells[HBQtyCol].Value);
+ HMinQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HMinQtyCol].Value);
+ HSumQty = ClsPub.isDoule(grdMain.Rows[j].Cells[HQtyCol].Value);
+ n = 0;
+ int nn = 0;
+ for (int i = k; i < HBQty; i++)
+ {
+ if (HSumQty - HMinQty > 0)
+ {
+ WeiShu = "";
+ HSumQty = HSumQty - HMinQty;
+ }
+ else
+ {
+ if (HSumQty == HMinQty)
+ {
+ WeiShu = "";
+ }
+ else
+ {
+ WeiShu = "灏炬暟";
+ }
+ HMinQty = HSumQty;
+ }
+ //
+ LSH = LSH + 1;
+ LSH2 = LSH.ToString();
+ while (LSH2.Length < LSHlen) //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
+ {
+ LSH2 = "0" + LSH2;
+ }
+ if (cmbHBarCodeType.Text == "鍞竴鏉＄爜")
+ {
+ //鏉＄爜缂栧彿 = 鏉＄爜鍓嶇紑 + 娴佹按鍙�
+ TM = sTMNumber + LSH2;
+ }
+
+ //
+ if (i + 1 > grdSub.Rows.Count)
+ {
+ grdSub.RowCount = grdSub.RowCount + 1;
+ }
+ grdSub.Rows[i].Cells[HSno2Col].Value = ClsPub.isStrNull(i + 1);
+ if (TM.Trim() == "")
+ {
+ MessageBox.Show("鏉″舰鐮佷笉鑳戒负绌猴紝涓嶈兘鐢熸垚鏉＄爜锛�");
+ return;
+ }
+ grdSub.Rows[i].Cells[HTMCol].Value = TM;
+ grdSub.Rows[i].Cells[HEntryID2Col].Value = j + 1;
+ grdSub.Rows[i].Cells[HMaterID2Col].Value = grdMain.Rows[j].Cells[HMaterIDCol].Value;
+ grdSub.Rows[i].Cells[HMaterNumber2Col].Value = grdMain.Rows[j].Cells[HMaterNumberCol].Value;
+ grdSub.Rows[i].Cells[HMaterName2Col].Value = grdMain.Rows[j].Cells[HMaterNameCol].Value;
+ grdSub.Rows[i].Cells[HMaterModel2Col].Value = grdMain.Rows[j].Cells[HMaterModelCol].Value;
+ grdSub.Rows[i].Cells[HPinfan2Col].Value = grdMain.Rows[j].Cells[HPinfanCol].Value;
+ grdSub.Rows[i].Cells[HPinfanBarCode2Col].Value = grdMain.Rows[j].Cells[HPinfanBarCodeCol].Value;
+
+ grdSub.Rows[i].Cells[HAuxPropID2Col].Value = grdMain.Rows[j].Cells[HAuxPropIDCol].Value;
+ grdSub.Rows[i].Cells[HAuxPropNumber2Col].Value = grdMain.Rows[j].Cells[HAuxPropNumberCol].Value;
+ grdSub.Rows[i].Cells[HAuxPropName2Col].Value = grdMain.Rows[j].Cells[HAuxPropNameCol].Value;
+
+ grdSub.Rows[i].Cells[HUnitID2Col].Value = grdMain.Rows[j].Cells[HUnitIDCol].Value;
+ grdSub.Rows[i].Cells[HUnitNumber2Col].Value = grdMain.Rows[j].Cells[HUnitNumberCol].Value;
+ grdSub.Rows[i].Cells[HUnitName2Col].Value = grdMain.Rows[j].Cells[HUnitNameCol].Value;
+
+ grdSub.Rows[i].Cells[HQty2Col].Value = HMinQty;
+ grdSub.Rows[i].Cells[HBatchNo2Col].Value = grdMain.Rows[j].Cells[HBatchNoCol].Value;
+ grdSub.Rows[i].Cells[HSourceInterID2Col].Value = grdMain.Rows[j].Cells[HMainIDCol].Value;
+ grdSub.Rows[i].Cells[HSourceEntryID2Col].Value = grdMain.Rows[j].Cells[HSubIDCol].Value;
+ grdSub.Rows[i].Cells[HSourceBillNo2Col].Value = grdMain.Rows[j].Cells[HBillNoCol].Value;
+ grdSub.Rows[i].Cells[HSourceBillType2Col].Value = grdMain.Rows[j].Cells[HBillTypeCol].Value;
+ grdSub.Rows[i].Cells[HPrintCol].Value = "0";
+ grdSub.Rows[i].Cells[HWeiCol].Value = WeiShu;
+ grdSub.Rows[i].Cells[HBarcodeNoCol].Value = n + 1;
+ grdSub.Rows[i].Cells[HBarcodeQtysCol].Value = grdMain.Rows[j].Cells[HBQtyCol].Value;
+ grdSub.Rows[i].Cells[HSupID2Col].Value = grdMain.Rows[j].Cells[HSupIDCol].Value;
+ grdSub.Rows[i].Cells[HSupNumber2Col].Value = grdMain.Rows[j].Cells[HSupNumberCol].Value;
+ grdSub.Rows[i].Cells[HSupName2Col].Value = grdMain.Rows[j].Cells[HSupNameCol].Value;
+ grdSub.Rows[i].Cells[HDeptID2Col].Value = grdMain.Rows[j].Cells[HDeptIDCol].Value;
+ grdSub.Rows[i].Cells[HDeptNumber2Col].Value = grdMain.Rows[j].Cells[HDeptNumberCol].Value;
+ grdSub.Rows[i].Cells[HDeptName2Col].Value = grdMain.Rows[j].Cells[HDeptNameCol].Value;
+ grdSub.Rows[i].Cells[HRemark2Col].Value = grdMain.Rows[j].Cells[HRemarkCol].Value;
+ grdSub.Rows[i].Cells[HDate2Col].Value = grdMain.Rows[j].Cells[HDateCol].Value;
+ grdSub.Rows[i].Cells[HShowDate2Col].Value = grdMain.Rows[j].Cells[HShowDateCol].Value;
+ grdSub.Rows[i].Cells[HWhID2Col].Value = grdMain.Rows[j].Cells[HWhIDCol].Value;
+ grdSub.Rows[i].Cells[HWhNumber2Col].Value = grdMain.Rows[j].Cells[HWhNumberCol].Value;
+ grdSub.Rows[i].Cells[HWhName2Col].Value = grdMain.Rows[j].Cells[HWhNameCol].Value;
+ grdSub.Rows[i].Cells[HSPID2Col].Value = grdMain.Rows[j].Cells[HSPIDCol].Value;
+ grdSub.Rows[i].Cells[HSPNumber2Col].Value = grdMain.Rows[j].Cells[HSPNumberCol].Value;
+ grdSub.Rows[i].Cells[HSPName2Col].Value = grdMain.Rows[j].Cells[HSPNameCol].Value;
+ grdSub.Rows[i].Cells[HMTONo2Col].Value = grdMain.Rows[j].Cells[HMTONoCol].Value;
+ grdSub.Rows[i].Cells[HCusID2Col].Value = grdMain.Rows[j].Cells[HCusIDCol].Value;
+ grdSub.Rows[i].Cells[HCusNumber2Col].Value = grdMain.Rows[j].Cells[HCusNumberCol].Value;
+ grdSub.Rows[i].Cells[HCusName2Col].Value = grdMain.Rows[j].Cells[HCusNameCol].Value;
+ grdSub.Rows[i].Cells[HCusType2Col].Value = grdMain.Rows[j].Cells[HCusTypeCol].Value;
+ grdSub.Rows[i].Cells[HSourceID2Col].Value = grdMain.Rows[j].Cells[HSourceIDCol].Value;
+ grdSub.Rows[i].Cells[HSourceNumber2Col].Value = grdMain.Rows[j].Cells[HSourceNumberCol].Value;
+ grdSub.Rows[i].Cells[HSourceName2Col].Value = grdMain.Rows[j].Cells[HSourceNameCol].Value;
+ grdSub.Rows[i].Cells[HEndDate2Col].Value = grdMain.Rows[j].Cells[HEndDateCol].Value;
+ grdSub.Rows[i].Cells[HSeOrderBillNo2Col].Value = grdMain.Rows[j].Cells[HSeOrderBillNoCol].Value;
+ grdSub.Rows[i].Cells[HSeOrderSEQ2Col].Value = grdMain.Rows[j].Cells[HSeOrderSEQCol].Value;
+ grdSub.Rows[i].Cells[HInnerBillNo2Col].Value = grdMain.Rows[j].Cells[HInnerBillNoCol].Value;
+ grdSub.Rows[i].Cells[HMaker2Col].Value = grdMain.Rows[j].Cells[HMakerCol].Value;
+ grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value = grdMain.Rows[j].Cells[HGiveAwayFlagCol].Value;
+ grdSub.Rows[i].Cells[HProduceDate2Col].Value = grdMain.Rows[j].Cells[HProduceDateCol].Value;
+ grdSub.Rows[i].Cells[HExpiryDate2Col].Value = grdMain.Rows[j].Cells[HExpiryDateCol].Value;
+ grdSub.Rows[i].Cells[HISKFPERIOD2Col].Value = grdMain.Rows[j].Cells[HISKFPERIODCol].Value;
+ grdSub.Rows[i].Cells[HEXPUNIT2Col].Value = grdMain.Rows[j].Cells[HEXPUNITCol].Value;
+ grdSub.Rows[i].Cells[HEXPPERIOD2Col].Value = grdMain.Rows[j].Cells[HEXPPERIODCol].Value;
+ //缃戞牸鎵撳嬀
+ //鏄惁璧犲搧
+ DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+ oCell.ThreeState = false;
+ oCell.Value = grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value;
+ oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdSub.Rows[i].Cells[HGiveAwayFlag2Col] = oCell;
+ //鏄惁鍚敤淇濊川鏈�
+ DataGridViewCheckBoxCell oCell2 = new DataGridViewCheckBoxCell();
+ oCell2.ThreeState = false;
+ oCell2.Value = grdSub.Rows[i].Cells[HISKFPERIOD2Col].Value;
+ oCell2.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdSub.Rows[i].Cells[HISKFPERIOD2Col] = oCell2;
+ k = k + 1;
+ n = n + 1;
+ //oCn.RunProc("exec h_p_WMS_SetMaxNo '" + sTMNumber + "'");
+ nn = nn + 1;
+ }
+ //鍚庡彴鎵归噺鎵ц璇彞
+ oCn.RunProc("exec h_p_WMS_SetMaxNo_QTY '" + sTMNumber + "'," + nn.ToString() + " ");
+ }
+ }
+ string HWei = ""; //灏炬暟
+ string HBarCode = "";
+ string HBarCodeType = "";
+ Int64 HMaterID = 0;
+ Int64 HAuxPropID = 0;
+ Int64 HUnitID = 0;
+ double HQty2 = 0;
+ string HBatchNo2 = "";
+ Int64 HSupID = 0;
+ Int64 HGroupID = 0;
+ int HPrintQty = 0;
+ Int64 HSourceInterID = 0;
+ Int64 HSourceEntryID = 0;
+ string HSourceBillNo = "";
+ string HSourceBillType = "";
+ Int64 HBarcodeNo = 0; //鎵樺彿
+ Int64 HBarcodeQtys = 0; //鎬绘墭鏁�
+ Int64 HDeptID = 0;
+ Int64 HWhID = 0;
+ Int64 HSPID = 0;
+ string HRemark = "";
+ string HMaterName = "";
+ string HMaterModel = "";
+ string HPinfan = "";
+ string HMTONo = "";
+ Int64 HCusID = 0;
+ string HCusType = "";
+ DateTime HEndDate;
+ string HWorkLineName = "";
+ string HSeOrderBillNo = "";
+ Int64 HSeOrderSEQ = 0;
+ string HInnerBillNo = "";
+ bool HGiveAwayFlag = false;
+ Int64 HEntryID = 0;
+ string HProduceDate;
+ string HExpiryDate;
+ bool HISKFPERIOD = false;
+ string HEXPUNIT = "";
+ double HEXPPERIOD = 0;
+ try
+ {
+ oCn.BeginTran();
+ for (int i = 0; i < grdSub.Rows.Count; i++)
+ {
+ if (ClsPub.isLong(grdSub.Rows[i].Cells[HMaterID2Col].Value) != 0)
+ {
+ HWei = ClsPub.isStrNull(grdSub.Rows[i].Cells[HWeiCol].Value);
+ HBarCode = ClsPub.isStrNull(grdSub.Rows[i].Cells[HTMCol].Value);
+ //
+ HBarCodeType = ClsPub.isStrNull(cmbHBarCodeType.Text);
+ HMaterID = ClsPub.isLong(grdSub.Rows[i].Cells[HMaterID2Col].Value);
+ HEntryID = ClsPub.isLong(grdSub.Rows[i].Cells[HEntryID2Col].Value);
+ HAuxPropID = ClsPub.isLong(grdSub.Rows[i].Cells[HAuxPropID2Col].Value);
+ HUnitID = ClsPub.isLong(grdSub.Rows[i].Cells[HUnitID2Col].Value);
+ HQty2 = ClsPub.isDoule(grdSub.Rows[i].Cells[HQty2Col].Value);
+ HBatchNo2 = ClsPub.isStrNull(grdSub.Rows[i].Cells[HBatchNo2Col].Value);
+ HSourceInterID = ClsPub.isLong(grdSub.Rows[i].Cells[HSourceInterID2Col].Value);
+ HSourceEntryID = ClsPub.isLong(grdSub.Rows[i].Cells[HSourceEntryID2Col].Value);
+ HSourceBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSourceBillNo2Col].Value);
+ HSourceBillType = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSourceBillType2Col].Value);
+ HBarcodeQtys = ClsPub.isLong(grdSub.Rows[i].Cells[HBarcodeQtysCol].Value);
+ HBarcodeNo = ClsPub.isLong(grdSub.Rows[i].Cells[HBarcodeNoCol].Value);
+ HSupID = ClsPub.isLong(grdSub.Rows[i].Cells[HSupID2Col].Value);
+ HDeptID = ClsPub.isLong(grdSub.Rows[i].Cells[HDeptID2Col].Value);
+ 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);
+ 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);
+ HMTONo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMTONo2Col].Value);
+ HCusID = ClsPub.isLong(grdSub.Rows[i].Cells[HCusID2Col].Value);
+ HCusType = ClsPub.isStrNull(grdSub.Rows[i].Cells[HCusType2Col].Value);
+ HEndDate = ClsPub.isDate(grdSub.Rows[i].Cells[HEndDate2Col].Value);
+ HWorkLineName = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSourceName2Col].Value);
+ HSeOrderBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HSeOrderBillNo2Col].Value);
+ HSeOrderSEQ = ClsPub.isLong(grdSub.Rows[i].Cells[HSeOrderSEQ2Col].Value);
+ HInnerBillNo = ClsPub.isStrNull(grdSub.Rows[i].Cells[HInnerBillNo2Col].Value);
+ HGiveAwayFlag = ClsPub.isBool(grdSub.Rows[i].Cells[HGiveAwayFlag2Col].Value);
+ if (ClsPub.isDate(grdSub.Rows[i].Cells[HProduceDate2Col].Value) < Convert.ToDateTime("1950-01-01"))
+ {
+ HProduceDate = "";
+ }
+ else
+ {
+ HProduceDate = ClsPub.isStrNull(grdSub.Rows[i].Cells[HProduceDate2Col].Value);
+ }
+ if (ClsPub.isDate(grdSub.Rows[i].Cells[HExpiryDate2Col].Value) < Convert.ToDateTime("1950-01-01"))
+ {
+ HExpiryDate = "";
+ }
+ else
+ {
+ HExpiryDate = ClsPub.isStrNull(grdSub.Rows[i].Cells[HExpiryDate2Col].Value);
+ }
+ HISKFPERIOD = ClsPub.isBool(grdSub.Rows[i].Cells[HISKFPERIOD2Col].Value);
+ HEXPUNIT = ClsPub.isStrNull(grdSub.Rows[i].Cells[HEXPUNIT2Col].Value);
+ HEXPPERIOD = ClsPub.isDoule(grdSub.Rows[i].Cells[HEXPPERIOD2Col].Value);
+
+ if (radioButton_HIsUsingBatchNo.Checked)
+ {
+ HBatchNo2 = getBatchNo();
+ }
+
+ HBarCode = ClsPub.isStrNull(grdSub.Rows[i].Cells[HMaterModel2Col].Value) + getHBarCode_MaxNo();
+
+ long HSourceID = 0;
+ string sql = "select * from Gy_Source where HName = '" + comboBox_SourceNameParams.Text + "' ";
+ DataSet ds = oCn.RunProcReturn(sql, "Gy_Source");
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ HSourceID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HItemID"].ToString());
+ }
+
+ oCn.RunProc("insert into Gy_BarCodeBill (HBarCode,HBarCodeType,HMaterID,HUnitID,HQty" +
+ ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HinitQty" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HEndQty " +
+ ",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
+ ",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
+ ",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
+ ",HGiveAwayFlag,HSeOrderSEQ,HInitSourceEntryID " +
+ ",HProduceDate,HExpiryDate " +
+ ",HISKFPERIOD,HEXPUNIT,HEXPPERIOD " +
+ ",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo,HSourceID " +
+ ") values ("
+ + "'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID.ToString() + "," + HUnitID.ToString() + "," + HQty2.ToString()
+ + ",'" + HBatchNo2 + "'," + HSupID.ToString() + "," + HGroupID.ToString() + ",'" + ClsPub.CurUserName + "',getdate()," + HPrintQty.ToString() + "," + HQty2.ToString()
+ + ", " + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HWei + "'"
+ + ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+ + ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
+ + ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString()
+ + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag) + "," + HSeOrderSEQ.ToString() + "," + HSourceEntryID.ToString()
+ + ", " + (HProduceDate == "" ? "NULL" : "'" + HProduceDate + "'") + "," + (HExpiryDate == "" ? "NULL" : "'" + HExpiryDate + "'")
+ + ", " + DBUtility.ClsPub.BoolToString(HISKFPERIOD) + ",'" + HEXPUNIT + "'," + HEXPPERIOD.ToString()
+ + ",'" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "'," + HSourceID +
+ ")");
+ }
+ }
+ //澧炲姞 鏉＄爜瓒呰繃鏈敓鎴愬姛鑳芥帶鍒�
+
+ //
+ oCn.Commit();
+ tabControl1.SelectedIndex = 3;
+ }
+ catch (Exception e)
+ {
+ oCn.RollBack();
+ MessageBox.Show("鏉＄爜鐢熸垚澶辫触锛�" + e.Message);
+ grdSub.RowCount = 0;
+ }
+ }
+
+ //鐢熸垚褰撳ぉ鐗╂枡鐨勬壒鍙�
+ private string getBatchNo()
+ {
+ string HBatchNo = "";
+
+ if (radioButton_HIsUsingBatchNo.Checked)
+ {
+ //鏃ユ湡鑾峰彇鏂瑰紡
+ string sDate = dtpHDate.Value.ToShortDateString(); //
+ string sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+ string sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ string sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+ sDay = sDay.Substring(sDay.Length - 2, 2);
+
+ string HDate = "20" + sYear + "-" + sPeriod + "-" + sDay;
+
+ //鑾峰彇娴佹按鍙凤細鍥涗綅锛岃鐗╂枡褰撳ぉ鐢熸垚鐨勬潯鐮佹暟
+ 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";
+ 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, ""));
+ }
+ LIU += count + 1;
+ while (LIU.Length < LEN) //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
+ {
+ LIU = "0" + LIU;
+ }
+ }
+ else
+ {
+ return "";
+ }
+
+ //鎷兼帴鎵瑰彿
+ HBatchNo = sYear + sPeriod + sDay + LIU;
+ }
+
+
+ return HBatchNo;
+ }
+
+ //鐢熸垚褰撳ぉ浜у搧鏉＄爜鐨勬祦姘村彿
+ private string getHBarCode_MaxNo()
+ {
+ string HBarCode_MaxNo = "";
+
+ //鏃ユ湡鑾峰彇鏂瑰紡
+ string sDate = dtpHDate.Value.ToShortDateString(); //
+ string sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+ string sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ string sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+ sDay = sDay.Substring(sDay.Length - 2, 2);
+
+ string HDate = "20" + sYear + "-" + sPeriod + "-" + sDay;
+
+ //鑾峰彇娴佹按鍙凤細鍥涗綅锛岃鐗╂枡褰撳ぉ鐢熸垚鐨勬潯鐮佹暟
+ string LIU = "";
+ int LEN = 4;
+
+ //鑾峰彇浜у搧鏉＄爜澶囦唤琛ㄤ腑褰撴棩鏈骇鍝佹潯鐮佺紪鍙锋渶澶х殑璁板綍
+ long HMaxNo_Bak = 0; //璁板綍浜у搧鏉＄爜澶囦唤琛ㄤ腑褰撴棩鏈骇鍝佹潯鐮佺紪鍙锋渶澶х殑璁板綍鐨勬潯鐮佺紪鍙风殑娴佹按鍙�
+ DataSet ds1;
+ string sql1 = "select * from Gy_BarCodeBill_SWELL_SubBarCodeBill Where HMaterID = " + grdMain.Rows[0].Cells[HMaterIDCol].Value + " and HSTOCKORGID = " + HOrgID + " and CONVERT(varchar(100),HBarCodeDate, 23) = '" + HDate + "' and HInterID <>0 order by HBarCode desc";
+ ds1 = oCn.RunProcReturn(sql1, "Gy_BarCodeBill_SWELL_SubBarCodeBill");
+ if (ds1 != null && ds1.Tables[0].Rows.Count>0)
+ {
+ string HBarCodeMaxNo = ds1.Tables[0].Rows[0]["HBarCode"].ToString();
+ HBarCodeMaxNo = HBarCodeMaxNo.Substring(HBarCodeMaxNo.Length - LEN, LEN);
+ HMaxNo_Bak = ClsPub.isLong(HBarCodeMaxNo);
+ }
+
+ ////鑾峰彇鏉＄爜妗ｆ涓綋鏃ユ湰浜у搧鏉＄爜缂栧彿鏈�澶х殑璁板綍
+ long HMaxNo = 0; //璁板綍鏉＄爜妗ｆ涓綋鏃ユ湰浜у搧鏉＄爜缂栧彿鏈�澶х殑璁板綍鐨勬潯鐮佺紪鍙风殑娴佹按鍙�
+ 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 + "' and HInterID <> 0 order by 鏉＄爜缂栧彿 desc";
+ ds = oCn.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
+ if (ds != null && ds.Tables[0].Rows.Count > 0)
+ {
+ string HBarCodeMaxNo = ds.Tables[0].Rows[0]["鏉＄爜缂栧彿"].ToString();
+ HBarCodeMaxNo = HBarCodeMaxNo.Substring(HBarCodeMaxNo.Length - LEN, LEN);
+ HMaxNo = ClsPub.isLong(HBarCodeMaxNo);
+ }
+
+
+ //鑾峰彇褰撴棩鏈骇鍝� 鍦ㄦ潯鐮佹。妗堝拰浜у搧鏉＄爜澶囦唤琛ㄤ腑 鏈�澶х殑娴佹按鍙�
+ long count = 0;
+ count = HMaxNo >= HMaxNo_Bak ? HMaxNo : HMaxNo_Bak;
+
+ //涓烘祦姘村彿鍓嶉潰琛ラ浂
+ LIU += count + 1;
+ while (LIU.Length < LEN) //濡傛灉娴佹按鍙峰皬浜�6浣嶆暟鍓嶉潰琛�0
+ {
+ LIU = "0" + LIU;
+ }
+
+ //鎷兼帴鎵瑰彿
+ HBarCode_MaxNo = sYear + sPeriod + sDay + LIU;
+
+ long HBarCode_MaxNo_long = long.Parse(HBarCode_MaxNo);
+
+ while (true)
+ {
+ int HCount_BarCodeBillList = 0;
+ int HCount_SubBarCodeBill = 0;
+ string sql_confirm = "select * from h_v_IF_BarCodeBillList where 鏉＄爜缂栧彿 = '" + (ClsPub.isStrNull(grdSub.Rows[0].Cells[HMaterModel2Col].Value) + HBarCode_MaxNo_long.ToString()) + "' and 鏉＄爜绫诲瀷 = '鍞竴鏉＄爜'" + " and CONVERT(varchar(100),鏉＄爜鏃ユ湡, 23) = '" + HDate + "'";
+ ds = oCn.RunProcReturn(sql_confirm, "h_v_IF_BarCodeBillList");
+ HCount_BarCodeBillList = ds.Tables[0].Rows.Count;
+ sql_confirm = "select * from Gy_BarCodeBill_SWELL_SubBarCodeBill Where HBarCode = '" + (ClsPub.isStrNull(grdSub.Rows[0].Cells[HMaterModel2Col].Value) + HBarCode_MaxNo_long.ToString()) + "' and HBarCodeType = '鍞竴鏉＄爜'" + " and CONVERT(varchar(100),HMakeDate, 23) = '" + HDate + "'";
+ ds = oCn.RunProcReturn(sql_confirm, "Gy_BarCodeBill_SWELL_SubBarCodeBill");
+ HCount_SubBarCodeBill = ds.Tables[0].Rows.Count;
+ if (HCount_BarCodeBillList + HCount_SubBarCodeBill > 0)
+ {
+ HBarCode_MaxNo_long += 1;
+ }
+ else
+ {
+ break;
+ }
+ }
+
+ return HBarCode_MaxNo_long.ToString();
+ }
+ #endregion
+
+ #endregion
+
+ #region 鐩戝惉閫氳
+ //寮�濮嬬洃鍚寜閽� 鐐瑰嚮浜嬩欢
+ private void button_startListen_Click(object sender, EventArgs e)
+ {
+ string msg = "";
+ if(connect(ref msg)==true)
+ {
+ MessageBox.Show(msg);
+ }
+ else
+ {
+ MessageBox.Show(msg);
+ }
+ }
+
+ //鍒ゆ柇鎵撳嵃鏈烘槸鍚﹀彲鐢�
+ private bool judgePrinterIsConnected()
+ {
+ //鑾峰彇鐢佃剳杩炴帴鐨勬墦鍗版満鍒楄〃
+ ManagementObjectSearcher searcher = new
+ ManagementObjectSearcher("SELECT * FROM Win32_Printer");
+
+ //鍖归厤璁剧疆鐨勬墦鍗版満锛屽苟鍒ゆ柇鏄惁鍙敤
+ string printerName = "";
+ foreach (ManagementObject printer in searcher.Get())
+ {
+ printerName = printer["Name"].ToString().ToLower();
+ if (printerName.Equals(comboBox_PrinterParams.Text.Replace("(榛樿)", "").ToLower()))
+ {
+ string HPrinterName = printer.Properties["Name"].Value.ToString(); //鑾峰彇鎵撳嵃鏈哄悕绉�
+ string HPrinterPort = printer.Properties["PortName"].Value.ToString(); //鑾峰彇鎵撳嵃鏈虹鍙ｅ彿
+ string HPrinterDefault = printer.Properties["Default"].Value.ToString(); //鑾峰彇鎵撳嵃鏈烘槸鍚︽槸榛樿鎵撳嵃鏈�
+ string HPrinterWorkStatus = printer.Properties["PrinterStatus"].Value.ToString(); //鑾峰彇鎵撳嵃鏈哄伐浣滅姸鎬�(1:鍏朵粬锛�2:鏈煡锛�3:绌洪棽锛�4:鎵撳嵃锛�5:棰勭儹锛�6:鍋滄鎵撳嵃锛�7:鑴辨満)
+ string HIsOffOnline = printer.Properties["WorkOffline"].Value.ToString(); //鑾峰彇鎵撳嵃鏈烘槸鍚︾绾�
+
+
+ string isConnected = printer["WorkOffline"].ToString().ToLower();
+
+ if (isConnected.Equals("true"))
+ {
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ //娓呴櫎鎸囧畾鎵撳嵃鏈轰换鍔�
+ private bool clearPrinterTask(ref string msg)
+ {
+ try
+ {
+ PrintServer localPrintServer = new LocalPrintServer();
+ PrintQueue pq = localPrintServer.GetPrintQueue(comboBox_PrinterParams.Text.Replace("(榛樿)", "").ToLower());
+ pq.Refresh();
+ PrintJobInfoCollection allPrintJobs = pq.GetPrintJobInfoCollection();
+ foreach (PrintSystemJobInfo printJob in allPrintJobs)
+ {
+ printJob.Cancel();
+
+ }
+ return true;
+ }
+ catch(Exception ex)
+ {
+ msg = ex.Message;
+ return false;
+ }
+ }
+
+ //鏍规嵁閫氳淇℃伅鐢熸垚鏉＄爜骞舵墦鍗�
+ private void timer2_Tick(object sender, EventArgs e)
+ {
+ if (produceQty > 0)
+ {
+ //娓呴櫎鎵撳嵃浠诲姟
+ string msg = "";
+ if (!clearPrinterTask(ref msg))
+ {
+ MessageBox.Show(msg);
+ produceQty = 0;
+ }
+ }
+
+ for (int i = 0; i < produceQty; i++)
+ {
+ //鐢熸垚鏉＄爜
+ this.Sub_SaveBill();
+
+ //鑾峰彇闇�瑕佹墦鍗扮殑鏁版嵁
+ Display();
+
+ if (radioButton_IsPrint_Yes.Checked == true)
+ {
+ //璁剧疆鎵撳嵃妯℃澘锛屾墦鍗�
+ grdList.Rows[0].Cells[0].Value = "*";
+ Report = new GridppReport();
+ Report.LoadFromFile(DBUtility.ClsPub.AppPath + @"\" + textBox_PrintModelParams.Text + ".grf"); //here .
+ Report.BeforePostRecord += new _IGridppReportEvents_BeforePostRecordEventHandler(ReportBeforePostRecord);
+ Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(ReportFetchRecordByDataTable);
+ Report.PrintEnd += new _IGridppReportEvents_PrintEndEventHandler(ReportPrintEnd);
+ if (comboBox_PrinterParams.Text != "")
+ {
+ Report.Printer.PrinterName = comboBox_PrinterParams.Text.Replace("(榛樿)", "");
+ }
+ Report.Print(false);
+ }
+
+ if (i == produceQty - 1)
+ {
+ //閲嶆柊鍔犺浇璇ョ墿鏂欏綋澶╃敓鎴愮殑鏉＄爜
+ Display4();
+ }
+ }
+
+ produceQty = 0;
+ }
+
+ //鑾峰彇闇�瑕佹墦鍗扮殑鏁版嵁骞跺瓨鏀惧湪瀛愯〃grdList
+ private void Display()
+ {
+ //璁剧疆妗ｆ鍒楄〃閫夐」鍗¤〃鏍兼暟鎹�
+ DataSet DSet = oCn.RunProcReturn("select * from h_v_IF_BarCodeBillList Where HinterID=" + HInterID.ToString() + " order by HItemID", "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DSet == null)
+ {
+ MessageBox.Show("娌℃湁杩斿洖浠讳綍缁撴灉,鏉＄爜涓嶅瓨鍦紒" + DBUtility.ClsPub.sExeReturnInfo);
+ return;
+ }
+ //
+ grdList.DataSource = DSet.Tables[0].DefaultView;
+ //鍐荤粨
+ int FrCol = 0;
+ string s = "鏄�";
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdList, this.Name + "grdList", s, FrCol);
+ //鐢荤嚎
+ //GraphLine();
+ }
+
+ //鑾峰彇宸ュ崟褰撳ぉ鐗╂枡鐢熸垚鐨勬潯鐮佽褰�
+ private void Display4()
+ {
+ if (grdMain.Rows.Count > 0)
+ {
+ //鏃ユ湡鑾峰彇鏂瑰紡
+ string sDate = dtpHDate.Value.ToShortDateString(); //
+ string sYear = ClsPub.isDate(sDate).Year.ToString().Substring(2, 2);
+ string sPeriod = "0" + ClsPub.isDate(sDate).Month.ToString();
+ sPeriod = sPeriod.Substring(sPeriod.Length - 2, 2);
+ string sDay = "0" + ClsPub.isDate(sDate).Day.ToString();
+ sDay = sDay.Substring(sDay.Length - 2, 2);
+
+ sDate = "20" + sYear + "-" + sPeriod + "-" + sDay;
+
+ //璁剧疆宸ュ崟鏉＄爜閫夐」鍗¤〃鏍兼暟鎹�
+ //string sql = "select * from h_v_IF_BarCodeBillList Where 婧愬崟鍗曞彿 = '" + grdMain.Rows[0].Cells[HBillNoCol].Value + "' and HMaterID = " + grdMain.Rows[0].Cells[HMaterIDCol].Value + " and HSTOCKORGID = " + HOrgID + " and CONVERT(varchar(100),鏉＄爜鏃ユ湡, 23) = '" + sDate + "' order by 鏉＄爜缂栧彿";
+ string sql = "select * from h_v_IF_BarCodeBillList Where 婧愬崟鍗曞彿 = '" + grdMain.Rows[0].Cells[HBillNoCol].Value + "' and HMaterID = " + grdMain.Rows[0].Cells[HMaterIDCol].Value + " and CONVERT(varchar(100),鏉＄爜鏃ユ湡, 23) = '" + sDate + "' order by 鏉＄爜缂栧彿";
+ DataSet DSet1 = oCn.RunProcReturn(sql, "h_v_IF_BarCodeBillList", ref DBUtility.ClsPub.sExeReturnInfo);
+ //鐢熸垚棣栬鏍囬
+ if (DSet1 == null)
+ {
+ return;
+ }
+ //
+ grdBillBarCodeList.DataSource = DSet1.Tables[0].DefaultView;
+ //鍐荤粨
+ int FrCol = 0;
+ string s = "鏄�";
+ DBUtility.Xt_BaseBillFun.DisplayGrid(grdBillBarCodeList, this.Name + "grdBillBarCodeList", s, FrCol);
+ //鐢荤嚎
+ //GraphLine();
+ //
+ }
+ }
+
+ #endregion
+
+ #region 鍋滄鐩戝惉
+ //鍋滄鐩戝惉鎸夐挳 鐐瑰嚮浜嬩欢
+ private void button_stopListen_Click(object sender, EventArgs e)
+ {
+ string msg = "";
+ if(disConnect(ref msg) == true)
+ {
+ MessageBox.Show(msg);
+ }
+ else
+ {
+ MessageBox.Show(msg);
+ }
+ }
+ #endregion
+
+ #region MQTT閫氳鐩稿叧鏂规硶
+ #region 寤虹珛杩炴帴
+ public bool connect(ref string err)
+ {
+
+ try
+ {
+ if (client != null && client.IsConnected)
+ {
+ err = "宸插缓绔嬭繛鎺ワ紝涓嶅彲閲嶅寤虹珛杩炴帴锛�";
+ return false;
+ }
+
+ if (grdMain.Rows.Count == 0 || grdMain.Rows[0].Cells[HMaterIDCol].Value == null || grdMain.Rows[0].Cells[HMaterIDCol].Value.ToString() == "" || grdMain.Rows[0].Cells[HMaterIDCol].Value.ToString() == "0")
+ {
+ err = "璇烽�夋嫨婧愬崟锛�";
+ return false;
+ }
+
+ if (textBox_IPParams.Text == "")
+ {
+ err = "璇疯缃甀P鍦板潃锛�";
+ return false;
+ }
+ //if (textBox_PortParams.Text == "")
+ //{
+ // err = "璇疯缃鍙ｅ彿锛�";
+ // return false;
+ //}
+
+ if (comboBox_PrinterParams.Text == "")
+ {
+ err = "璇烽�夋嫨鎵撳嵃鏈猴紒";
+ return false;
+ }
+
+ if (textBox_PrintModelParams.Text == "")
+ {
+ err = "璇疯缃墦鍗版ā鏉匡紒";
+ return false;
+ }
+
+ if (textBox_UserParams.Text == "")
+ {
+ err = "璇疯缃�怣QTT鐢ㄦ埛鍚嶃�戯紒";
+ return false;
+ }
+
+ if (textBox_PasswordParams.Text == "")
+ {
+ err = "璇疯缃�怣QTT瀵嗙爜銆戯紒";
+ return false;
+ }
+
+ if (!judgePrinterIsConnected())
+ {
+ err = "鎵撳嵃鏈哄浜庣绾跨姸鎬侊紝璇锋鏌ワ紒";
+ return false;
+ }
+
+ //寤虹珛杩炴帴
+ client = new MqttClient(textBox_IPParams.Text);
+ //璁剧疆鎺ユ敹鍒版秷鎭悗鐨勫洖璋冨嚱鏁�
+ client.MqttMsgPublishReceived += client_MqttMsgPublishReceived;
+ //璁剧疆杩炴帴鏂紑鐨勫洖璋冨嚱鏁�
+ client.ConnectionClosed += client_ConnectionClosed;
+ client.Connect(textBox_ClientIDParams.Text, textBox_UserParams.Text, textBox_PasswordParams.Text);
+ err = "杩炴帴鎴愬姛锛�";
+ // 璁㈤槄涓婚
+ client.Subscribe(new string[] { textBox_TopicParams.Text }, new byte[] { MqttMsgBase.QOS_LEVEL_EXACTLY_ONCE });
+
+ timer3.Enabled = true;
+ button_startListen.Enabled = false;
+ button_stopListen.Enabled = true;
+ return true;
+ }
+ catch (Exception ex)
+ {
+ err = "杩炴帴澶辫触锛�" + ex.Message;
+ if (client != null)
+ {
+ client = null;
+ }
+ return false;
+ }
+ }
+ #endregion
+
+ #region MQTT鎺ユ敹鍒颁俊鎭悗鐨勫洖璋冩柟娉�
+ public void client_MqttMsgPublishReceived(object sender, MqttMsgPublishEventArgs e)
+ {
+ try
+ {
+ string message = Encoding.UTF8.GetString(e.Message);
+ List<MQTT_MainEntity> mQTT_MainEntity = getObjectByJson_Xs_OutDoorBillMain(message);
+ for(int i = 0; i < mQTT_MainEntity[0].values.Count; i++)
+ {
+ if (mQTT_MainEntity[0].values[i].id == textBox_WorkPositionParams.Text && mQTT_MainEntity[0].values[i].v == true)
+ {
+ produceQty += 1;
+ }
+ }
+ }catch(Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+
+ string msg = "";
+ if (disConnect(ref msg) == true)
+ {
+ MessageBox.Show(msg);
+ }
+ else
+ {
+ MessageBox.Show(msg);
+ }
+ }
+ }
+ #endregion
+
+ #region MQTT杩炴帴鏂紑鍚庣殑鍥炶皟鏂规硶
+ public void client_ConnectionClosed(object sender, EventArgs e)
+ {
+ if (button_stopListen.Enabled == true)
+ {
+ timer3.Enabled = true;
+ }
+ }
+ #endregion
+
+ #region 鏂紑杩炴帴
+ public bool disConnect(ref string msg)
+ {
+ try
+ {
+ if (client != null && client.IsConnected == true)
+ {
+ client.Disconnect();
+ }
+ timer3.Enabled = false;
+ button_startListen.Enabled = true;
+ button_stopListen.Enabled = false;
+ msg = "杩炴帴宸茬粡鎴愬姛鏂紑锛�";
+ return true;
+ }catch(Exception e)
+ {
+ msg = "杩炴帴鏂紑澶辫触锛�" + e.Message;
+ return false;
+ }
+ }
+ #endregion
+ #endregion
+
+ #region 淇濆瓨閰嶇疆淇℃伅鎸夐挳
+ //閰嶇疆淇℃伅淇濆瓨鎸夐挳 鐐瑰嚮浜嬩欢
+ private void button_saveParams_Click(object sender, EventArgs e)
+ {
+ saveParams();
+ }
+
+ //鍐欏叆閰嶇疆鍙傛暟
+ private void saveParams()
+ {
+ //鍒ゆ柇鏂囦欢鏄惁瀛樺湪
+ if (!File.Exists(Application.StartupPath + "//Gy_BarCodeBill_automaticallyByPLC_New_Change.txt"))
+ {
+ FileStream fs1 = new FileStream(Application.StartupPath + "//Gy_BarCodeBill_automaticallyByPLC_New_Change.txt", FileMode.Create, FileAccess.Write);//鍒涘缓鍐欏叆鏂囦欢
+ StreamWriter sw = new StreamWriter(fs1);
+ sw.WriteLine(textBox_IPParams.Text);//寮�濮嬪啓鍏ュ��
+ sw.WriteLine(textBox_PortParams.Text);
+ sw.WriteLine(comboBox_SourceNameParams.Text);
+ sw.WriteLine(comboBox_PrinterParams.Text.Replace("(榛樿)", ""));
+ sw.WriteLine(textBox_PrintModelParams.Text);
+ sw.WriteLine(textBox_UserParams.Text);
+ sw.WriteLine(textBox_PasswordParams.Text);
+ sw.WriteLine(textBox_TopicParams.Text);
+ sw.WriteLine(textBox_ClientIDParams.Text);
+ sw.WriteLine(textBox_WorkPositionParams.Text);
+ sw.Close();
+ fs1.Close();
+ }
+ else
+ {
+ FileStream fs1 = new FileStream(Application.StartupPath + "//Gy_BarCodeBill_automaticallyByPLC_New_Change.txt", FileMode.Create, FileAccess.Write);//鍒涘缓鍐欏叆鏂囦欢
+ StreamWriter sw = new StreamWriter(fs1);
+ sw.WriteLine(textBox_IPParams.Text);//寮�濮嬪啓鍏ュ��
+ sw.WriteLine(textBox_PortParams.Text);
+ sw.WriteLine(comboBox_SourceNameParams.Text);
+ sw.WriteLine(comboBox_PrinterParams.Text);
+ sw.WriteLine(textBox_PrintModelParams.Text);
+ sw.WriteLine(textBox_UserParams.Text);
+ sw.WriteLine(textBox_PasswordParams.Text);
+ sw.WriteLine(textBox_TopicParams.Text);
+ sw.WriteLine(textBox_ClientIDParams.Text);
+ sw.WriteLine(textBox_WorkPositionParams.Text);
+ sw.Close();
+ fs1.Close();
+ }
+
+ MessageBox.Show("淇濆瓨鎴愬姛锛�");
+ }
+
+ #endregion
+
+ #region 閰嶇疆淇℃伅閲嶇疆
+ //閰嶇疆淇℃伅閲嶇疆鎸夐挳鐐瑰嚮 浜嬩欢
+ private void button_resetParams_Click(object sender, EventArgs e)
+ {
+
+ }
+ #endregion
+
+ #region 鐣岄潰鍒濆鍖栦唬鐮�
+ //娓呯┖鐣岄潰
+ public void Sub_ClearBill()
+ {
+ ////琛ㄤ綋娓呯┖
+ //grdMain.Rows.Clear();
+ //grdSub.Rows.Clear();
+
+ //璁剧疆鏉＄爜绫诲瀷 涓嬫媺鍒楄〃
+ cmbHBarCodeType.Items.Clear();
+ cmbHBarCodeType.Items.Add("鍞竴鏉＄爜");
+
+ //璁剧疆婧愬崟绫诲瀷 涓嬫媺鍒楄〃
+ cmbSourceBillType.Items.Clear();
+ cmbSourceBillType.Items.Add("鐢熶骇璁㈠崟");
+
+ //鍒濆鍖栨帶浠�
+ DBUtility.Xt_BaseBillFun.Sub_ClearBill(gbUp);
+
+ //璁剧疆缁勭粐 涓嬫媺鍒楄〃 骞惰缃��
+ DataSet Ds1 = oCn.RunProcReturn("select * from Xt_ORGANIZATIONS with(nolock) where HItemID=" + ClsPub.HOrgID, "Xt_ORGANIZATIONS", ref DBUtility.ClsPub.sExeReturnInfo);
+ if (Ds1.Tables[0].Rows.Count != 0)
+ {
+ cmbHOrgID.Text = DBUtility.ClsPub.isStrNull(Ds1.Tables[0].Rows[0]["HName"]);
+ }
+
+ //璁剧疆鎵撳嵃鏈� 涓嬫媺鍒楄〃
+ PrintDocument fPrintDocument = new PrintDocument();
+ string defaultPrinter = fPrintDocument.PrinterSettings.PrinterName;
+ comboBox_PrinterParams.Items.Clear();
+ for (int i = 0; i < PrinterSettings.InstalledPrinters.Count; i++)
+ {
+ string tmp = PrinterSettings.InstalledPrinters[i];
+ if (tmp == defaultPrinter)
+ {
+ //tmp = tmp + "(榛樿)";
+ }
+ comboBox_PrinterParams.Items.Add(tmp);
+ }
+
+
+ //璁剧疆浜х嚎 涓嬫媺鍒楄〃
+ DataSet DsSource = oCn.RunProcReturn("select * from Gy_Source", "Gy_Source");
+ comboBox_SourceNameParams.Items.Add("");
+ if (DsSource != null)
+ {
+ comboBox_SourceNameParams.Items.Clear();
+ comboBox_SourceNameParams.Items.Add("");
+ for (int i = 0; i < DsSource.Tables[0].Rows.Count; i++)
+ {
+ comboBox_SourceNameParams.Items.Add(DsSource.Tables[0].Rows[i]["HName"]);
+ }
+ }
+
+
+ //璇诲彇閰嶇疆鏂囦欢璁剧疆閰嶇疆
+ readParams();
+ //璁剧疆宸ュ崟淇℃伅
+ textBox_SourceName.Text = comboBox_SourceNameParams.Text;
+ //璁剧疆鍒跺崟淇℃伅
+ txtHMaker.Text = ClsPub.CurUserName;
+ txtHMakeDate.Text = "";
+ txtHChecker.Text = "";
+ txtHCheckDate.Text = "";
+ txtHCloseMan.Text = "";
+ txtHCloseDate.Text = "";
+ txtHDeleteMan.Text = "";
+ txtHDeleteDate.Text = "";
+ txtHUpDater.Text = "";
+ txtHUpDateDate.Text = "";
+
+ //璁剧疆瀛愯〃
+ initGrid();
+ grdList.DataSource = null;
+ grdBillBarCodeList.DataSource = null;
+ tabControl1.SelectedIndex = 3;
+ }
+
+ //璇诲彇閰嶇疆鏂囦欢
+ private void readParams()
+ {
+ if (File.Exists(Application.StartupPath + "//Gy_BarCodeBill_automaticallyByPLC_New_Change.txt"))
+ {
+ //璇诲彇鏂囦欢鍊煎苟鏄剧ず鍒扮獥浣�
+ FileStream fs = new FileStream(Application.StartupPath + "//Gy_BarCodeBill_automaticallyByPLC_New_Change.txt", FileMode.Open, FileAccess.ReadWrite);
+ StreamReader sr = new StreamReader(fs);
+ string line = sr.ReadLine();
+ int curLine = 0;
+ while (line != null)
+ {
+ if (++curLine == 1)
+ {
+ textBox_IPParams.Text = line;
+ }
+ else if (curLine == 2)
+ {
+ textBox_PortParams.Text = line;
+ }
+ else if (curLine == 3)
+ {
+ for (int i = 0; i < comboBox_SourceNameParams.Items.Count; i++)
+ {
+ if (comboBox_SourceNameParams.Items[i].ToString() == line)
+ {
+ comboBox_SourceNameParams.Text = line;
+ }
+ }
+
+ if (comboBox_SourceNameParams.Text == "")
+ {
+ comboBox_SourceNameParams.Items.Add(line);
+ comboBox_SourceNameParams.Text = line;
+ }
+ }
+ else if (curLine == 4)
+ {
+ for (int i = 0; i < comboBox_PrinterParams.Items.Count; i++)
+ {
+ if (comboBox_PrinterParams.Items[i].ToString() == line)
+ {
+ comboBox_PrinterParams.Text = line;
+ }
+ }
+ }
+ else if (curLine == 5)
+ {
+ textBox_PrintModelParams.Text = line;
+ }
+ else if(curLine == 6){
+ textBox_UserParams.Text = line;
+ }
+ else if (curLine == 7)
+ {
+ textBox_PasswordParams.Text = line;
+ }
+ else if (curLine == 8)
+ {
+ textBox_TopicParams.Text = line;
+ }
+ else if (curLine == 9)
+ {
+ textBox_ClientIDParams.Text = line;
+ }
+ else if (curLine == 10)
+ {
+ textBox_WorkPositionParams.Text = line;
+ }
+ else
+ {
+
+ }
+ line = sr.ReadLine();
+ }
+ sr.Close();
+ fs.Close();
+ }
+ }
+
+ //鍒濆鍖朑RID
+ private void initGrid()
+ {
+ //
+ grdMain.RowCount = 0;
+ grdSub.RowCount = 0;
+ grdMain.ColumnCount = 68; //鎬诲垪鏁�
+ DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
+ grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
+ grdMain.Columns[HMainIDCol].HeaderText = "婧愬崟涓籌D";
+ grdMain.Columns[HSubIDCol].HeaderText = "婧愬崟瀛怚D";
+ grdMain.Columns[HBillNoCol].HeaderText = "婧愬崟鍗曞彿";
+ grdMain.Columns[HBillTypeCol].HeaderText = "鍗曟嵁绫诲瀷";
+ grdMain.Columns[HMaterIDCol].HeaderText = "鐗╂枡ID";
+ grdMain.Columns[HMaterNumberCol].HeaderText = "鐗╂枡浠ｇ爜";
+ grdMain.Columns[HMaterNameCol].HeaderText = "鐗╂枡鍚嶇О";
+ grdMain.Columns[HMaterModelCol].HeaderText = "瑙勬牸鍨嬪彿";
+ grdMain.Columns[HModelCol].HeaderText = "鑷畾涔夎鏍�";
+ grdMain.Columns[HPinfanCol].HeaderText = "鍝佺暘";
+ grdMain.Columns[HPinfanBarCodeCol].HeaderText = "HPinfanBarCode";
+ grdMain.Columns[HAuxPropIDCol].HeaderText = "杈呭姪灞炴�D";
+ grdMain.Columns[HAuxPropNumberCol].HeaderText = "杈呭姪灞炴�т唬鐮�";
+ grdMain.Columns[HAuxPropNameCol].HeaderText = "杈呭姪灞炴�у悕绉�";
+ grdMain.Columns[HUnitIDCol].HeaderText = "璁￠噺鍗曚綅ID";
+ grdMain.Columns[HUnitNumberCol].HeaderText = "璁￠噺鍗曚綅浠ｇ爜";
+ grdMain.Columns[HUnitNameCol].HeaderText = "璁￠噺鍗曚綅鍚嶇О";
+ grdMain.Columns[HBarCodeTypeCol].HeaderText = "鏉＄爜绫诲瀷";
+ grdMain.Columns[HBatchManagerCol].HeaderText = "鏄惁鍚敤鎵规";
+ grdMain.Columns[HBatchNoCol].HeaderText = "鎵瑰彿";
+ grdMain.Columns[HGiveAwayFlagCol].HeaderText = "鏄惁璧犲搧";
+ grdMain.Columns[HQtyCol].HeaderText = "鏁伴噺";
+ grdMain.Columns[HMinQtyCol].HeaderText = "鏈�灏忓寘瑁呮暟";
+ grdMain.Columns[HPackQtyCol].HeaderText = "澶栫鏁�";
+ grdMain.Columns[HBQtyCol].HeaderText = "绠辨暟";
+ grdMain.Columns[HSupIDCol].HeaderText = "渚涘簲鍟咺D";
+ grdMain.Columns[HSupNumberCol].HeaderText = "渚涘簲鍟嗕唬鐮�";
+ grdMain.Columns[HSupNameCol].HeaderText = "渚涘簲鍟�";
+ grdMain.Columns[HDeptIDCol].HeaderText = "杞﹂棿ID";
+ grdMain.Columns[HDeptNumberCol].HeaderText = "杞﹂棿浠ｇ爜";
+ grdMain.Columns[HDeptNameCol].HeaderText = "杞﹂棿";
+ grdMain.Columns[HWhIDCol].HeaderText = "浠撳簱ID";
+ grdMain.Columns[HWhNumberCol].HeaderText = "浠撳簱浠ｇ爜";
+ grdMain.Columns[HWhNameCol].HeaderText = "浠撳簱";
+ grdMain.Columns[HSPIDCol].HeaderText = "浠撲綅ID";
+ grdMain.Columns[HSPNumberCol].HeaderText = "浠撲綅浠ｇ爜";
+ grdMain.Columns[HSPNameCol].HeaderText = "浠撲綅";
+ grdMain.Columns[HInstructNoCol].HeaderText = "鎸囦护鍗曞彿";
+ grdMain.Columns[HSeOrderBillNoCol].HeaderText = "閿�鍞鍗曞彿";
+ grdMain.Columns[HSeOrderSEQCol].HeaderText = "閿�鍞鍗曡鍙�";
+ grdMain.Columns[HDateCol].HeaderText = "杩涙枡鏃ユ湡";
+ grdMain.Columns[HRemarkCol].HeaderText = "澶囨敞";
+ grdMain.Columns[HMTONoCol].HeaderText = "璁″垝璺熻釜鍙�";
+ grdMain.Columns[HCusIDCol].HeaderText = "瀹㈡埛ID";
+ grdMain.Columns[HCusNumberCol].HeaderText = "瀹㈡埛浠ｇ爜";
+ grdMain.Columns[HCusNameCol].HeaderText = "瀹㈡埛";
+ grdMain.Columns[HCusTypeCol].HeaderText = "瀹㈡埛鍨嬪彿";
+ grdMain.Columns[HEndDateCol].HeaderText = "璁″垝瀹屽伐鏃ユ湡";
+ grdMain.Columns[HSourceIDCol].HeaderText = "鐢熶骇绾縄D";
+ grdMain.Columns[HSourceNumberCol].HeaderText = "鐢熶骇绾夸唬鐮�";
+ grdMain.Columns[HSourceNameCol].HeaderText = "鐢熶骇绾�";
+ grdMain.Columns[HShowDateCol].HeaderText = "鏃ユ湡";
+ grdMain.Columns[HInnerBillNoCol].HeaderText = "鍐呴儴閲囪喘璁㈠崟鍙�";
+ grdMain.Columns[HMakerCol].HeaderText = "鍒跺崟浜�";
+ grdMain.Columns[HProduceDateCol].HeaderText = "鐢熶骇鏃ユ湡";
+ grdMain.Columns[HExpiryDateCol].HeaderText = "鏈夋晥鏈熻嚦";
+ grdMain.Columns[HISKFPERIODCol].HeaderText = "鏄惁鍚敤淇濊川鏈�";
+ grdMain.Columns[HEXPUNITCol].HeaderText = "淇濊川鏈熷崟浣�";
+ grdMain.Columns[HEXPPERIODCol].HeaderText = "淇濊川鏈�";
+ ////
+ //鏍煎紡鍖�
+ grdMain.Columns[HTagCol].Visible = false; //闅愯棌鍒�
+ grdMain.Columns[HMainIDCol].Visible = false;
+ grdMain.Columns[HSubIDCol].Visible = false;
+ grdMain.Columns[HBillTypeCol].Visible = false;
+ grdMain.Columns[HMaterIDCol].Visible = false;
+ grdMain.Columns[HModelCol].Visible = false;
+ //grdMain.Columns[HBatchNoCol].Visible = false;
+ grdMain.Columns[HAuxPropIDCol].Visible = false;
+ //grdMain.Columns[HAuxPropNumberCol].Visible = false;
+ //grdMain.Columns[HAuxPropNameCol].Visible = false;
+ grdMain.Columns[HUnitIDCol].Visible = false;
+ grdMain.Columns[HinitQtyCol].Visible = false;
+ grdMain.Columns[HSupIDCol].Visible = false;
+ grdMain.Columns[HSupNumberCol].Visible = false;
+ grdMain.Columns[HSupNameCol].Visible = false;
+ grdMain.Columns[HDeptIDCol].Visible = false;
+ grdMain.Columns[HDeptNumberCol].Visible = false;
+ grdMain.Columns[HDeptNameCol].Visible = false;
+ grdMain.Columns[HWhIDCol].Visible = false;
+ grdMain.Columns[HWhNumberCol].Visible = false;
+ grdMain.Columns[HWhNameCol].Visible = false;
+ grdMain.Columns[HSPIDCol].Visible = false;
+ grdMain.Columns[HSPNumberCol].Visible = false;
+ grdMain.Columns[HSPNameCol].Visible = false;
+ grdMain.Columns[HSourceInterIDCol].Visible = false;
+ grdMain.Columns[HSourceEntryIDCol].Visible = false;
+ grdMain.Columns[HSourceBillNoCol].Visible = false;
+ grdMain.Columns[HSourceBillTypeCol].Visible = false;
+ grdMain.Columns[HInstructIDCol].Visible = false;
+ grdMain.Columns[HInstructNoCol].Visible = false;
+ grdMain.Columns[HSeOrderBillIDCol].Visible = false;
+ //grdMain.Columns[HSeOrderBillNoCol].Visible = false;
+ grdMain.Columns[HBarCodeTypeCol].Visible = false;
+ grdMain.Columns[HBatchManagerCol].Visible = false;
+ //grdMain.Columns[HDateCol].Visible = false;
+ grdMain.Columns[HPinfanCol].Visible = false;
+ grdMain.Columns[HPinfanBarCodeCol].Visible = false;
+ grdMain.Columns[HCusIDCol].Visible = false;
+ //grdMain.Columns[HCusNumberCol].Visible = false;
+ //grdMain.Columns[HCusNameCol].Visible = false;
+ grdMain.Columns[HCusTypeCol].Visible = false;
+ grdMain.Columns[HEndDateCol].Visible = false;
+ grdMain.Columns[HSourceIDCol].Visible = false;
+ grdMain.Columns[HSourceNumberCol].Visible = false;
+ grdMain.Columns[HSourceNameCol].Visible = false;
+ //grdMain.Columns[HProduceDateCol].Visible = false;
+ //grdMain.Columns[HExpiryDateCol].Visible = false;
+ grdMain.Columns[HISKFPERIODCol].Visible = false;
+ grdMain.Columns[HEXPUNITCol].Visible = false;
+ grdMain.Columns[HEXPPERIODCol].Visible = false;
+
+ //璁剧疆鍙紪杈戝垪
+ string sAllowCol = HQtyCol.ToString() +
+ "," + HMinQtyCol.ToString() +
+ "," + HMaterNumberCol.ToString() +
+ "," + HAuxPropNumberCol.ToString() +
+ "," + HUnitNumberCol.ToString() +
+ "," + HSeOrderBillNoCol.ToString() +
+ "," + HBatchNoCol.ToString() +
+ "," + HCusNumberCol.ToString() +
+ "," + HPackQtyCol.ToString() +
+ "," + HRemarkCol.ToString();
+ //璁剧疆鍚堣鍒�
+ string sTotalCol = HQtyCol.ToString();
+
+ //璁剧疆鐗规畩鍒�
+ for (int i = 0; i < grdMain.Rows.Count; i++)
+ {
+ //缃戞牸鎵撳嬀
+ DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+ oCell.ThreeState = false;
+ oCell.Value = 0;
+ oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdMain.Rows[i].Cells[HGiveAwayFlagCol] = oCell;
+ }
+ //
+
+ DBUtility.Xt_BaseBillFun.initGridLast(sAllowCol, sTotalCol, oSumGrid);
+ //----------------------------
+
+ grdSub.ColumnCount = 65; //鎬诲垪鏁�
+ DBUtility.Xt_BaseBillFun.initGridFst(grdSub, this.Name);
+ grdSub.Columns[HSelectCol].HeaderText = "閫夋嫨";
+ grdSub.Columns[HTMCol].HeaderText = "鏉＄爜缂栧彿";
+ grdSub.Columns[HBarCodeType2Col].HeaderText = "鏉＄爜绫诲瀷";
+ grdSub.Columns[HSno2Col].HeaderText = "搴忓彿";
+ grdSub.Columns[HMaterID2Col].HeaderText = "鐗╂枡ID";
+ grdSub.Columns[HMaterNumber2Col].HeaderText = "鐗╂枡浠ｇ爜";
+ grdSub.Columns[HMaterName2Col].HeaderText = "鐗╂枡鍚嶇О";
+ grdSub.Columns[HMaterModel2Col].HeaderText = "瑙勬牸鍨嬪彿";
+ grdSub.Columns[HModel2Col].HeaderText = "鑷畾涔夎鏍�";
+ grdSub.Columns[HAuxPropID2Col].HeaderText = "杈呭姪灞炴�D";
+ grdSub.Columns[HAuxPropNumber2Col].HeaderText = "杈呭姪灞炴�т唬鐮�";
+ grdSub.Columns[HAuxPropName2Col].HeaderText = "杈呭姪灞炴��";
+ grdSub.Columns[HPinfan2Col].HeaderText = "鍝佺暘";
+ grdSub.Columns[HPinfanBarCode2Col].HeaderText = "HPinfanBarCode";
+ grdSub.Columns[HBatchNo2Col].HeaderText = "鎵瑰彿";
+ grdSub.Columns[HGiveAwayFlag2Col].HeaderText = "鏄惁璧犲搧";
+ grdSub.Columns[HUnitID2Col].HeaderText = "璁￠噺鍗曚綅ID";
+ grdSub.Columns[HUnitNumber2Col].HeaderText = "璁￠噺鍗曚綅浠ｇ爜";
+ grdSub.Columns[HUnitName2Col].HeaderText = "璁￠噺鍗曚綅";
+ grdSub.Columns[HQty2Col].HeaderText = "鏁伴噺";
+ grdSub.Columns[HWeiCol].HeaderText = "灏炬暟";
+ grdSub.Columns[HPrintCol].HeaderText = "鎵撳嵃娆℃暟";
+ grdSub.Columns[HSourceInterID2Col].HeaderText = "婧愬崟涓籌D";
+ grdSub.Columns[HSourceEntryID2Col].HeaderText = "婧愬崟瀛怚D";
+ grdSub.Columns[HSourceBillNo2Col].HeaderText = "婧愬崟鍗曞彿";
+ grdSub.Columns[HSourceBillType2Col].HeaderText = "婧愬崟绫诲瀷";
+ grdSub.Columns[HSeOrderBillNo2Col].HeaderText = "閿�鍞鍗曞彿";
+ grdSub.Columns[HSeOrderSEQ2Col].HeaderText = "閿�鍞鍗曡鍙�";
+ grdSub.Columns[HBarcodeNoCol].HeaderText = "鎵樺彿";
+ grdSub.Columns[HBarcodeQtysCol].HeaderText = "鎬绘墭鏁�";
+ grdSub.Columns[HSupID2Col].HeaderText = "渚涘簲鍟咺D";
+ grdSub.Columns[HSupNumber2Col].HeaderText = "渚涘簲鍟嗕唬鐮�";
+ grdSub.Columns[HSupName2Col].HeaderText = "渚涘簲鍟�";
+ grdSub.Columns[HDeptID2Col].HeaderText = "杞﹂棿ID";
+ grdSub.Columns[HDeptNumber2Col].HeaderText = "杞﹂棿浠ｇ爜";
+ grdSub.Columns[HDeptName2Col].HeaderText = "杞﹂棿";
+ grdSub.Columns[HWhID2Col].HeaderText = "浠撳簱ID";
+ grdSub.Columns[HWhNumber2Col].HeaderText = "浠撳簱浠ｇ爜";
+ grdSub.Columns[HWhName2Col].HeaderText = "浠撳簱";
+ grdSub.Columns[HSPID2Col].HeaderText = "浠撲綅ID";
+ grdSub.Columns[HSPNumber2Col].HeaderText = "浠撲綅浠ｇ爜";
+ grdSub.Columns[HSPName2Col].HeaderText = "浠撲綅";
+ grdSub.Columns[HInstructNo2Col].HeaderText = "鎸囦护鍗曞彿";
+ grdSub.Columns[HDate2Col].HeaderText = "杩涙枡鏃ユ湡";
+ grdSub.Columns[HRemark2Col].HeaderText = "澶囨敞";
+ grdSub.Columns[HMTONo2Col].HeaderText = "璁″垝璺熻釜鍙�";
+ grdSub.Columns[HCusID2Col].HeaderText = "瀹㈡埛ID";
+ grdSub.Columns[HCusNumber2Col].HeaderText = "瀹㈡埛浠ｇ爜";
+ grdSub.Columns[HCusName2Col].HeaderText = "瀹㈡埛";
+ grdSub.Columns[HCusType2Col].HeaderText = "瀹㈡埛鍨嬪彿";
+ grdSub.Columns[HEndDate2Col].HeaderText = "璁″垝瀹屽伐鏃ユ湡";
+ grdSub.Columns[HSourceID2Col].HeaderText = "鐢熶骇绾縄D";
+ grdSub.Columns[HSourceNumber2Col].HeaderText = "鐢熶骇绾夸唬鐮�";
+ grdSub.Columns[HSourceName2Col].HeaderText = "鐢熶骇绾�";
+ grdSub.Columns[HShowDate2Col].HeaderText = "鏃ユ湡";
+ grdSub.Columns[HInnerBillNo2Col].HeaderText = "鍐呴儴閲囪喘璁㈠崟鍙�";
+ grdSub.Columns[HMaker2Col].HeaderText = "鍒跺崟浜�";
+ grdSub.Columns[HEntryID2Col].HeaderText = "琛屽彿";
+ grdSub.Columns[HProduceDate2Col].HeaderText = "鐢熶骇鏃ユ湡";
+ grdSub.Columns[HExpiryDate2Col].HeaderText = "鏈夋晥鏈熻嚦";
+ grdSub.Columns[HISKFPERIOD2Col].HeaderText = "鏄惁鍚敤淇濊川鏈�";
+ grdSub.Columns[HEXPUNIT2Col].HeaderText = "淇濊川鏈熷崟浣�";
+ grdSub.Columns[HEXPPERIOD2Col].HeaderText = "淇濊川鏈�";
+ //鏍煎紡鍖�
+ grdSub.Columns[HMaterID2Col].Visible = false;
+ grdSub.Columns[HModel2Col].Visible = false;
+ grdSub.Columns[HAuxPropID2Col].Visible = false;
+ //grdSub.Columns[HAuxPropNumber2Col].Visible = false;
+ //grdSub.Columns[HAuxPropName2Col].Visible = false;
+ grdSub.Columns[HUnitID2Col].Visible = false;
+ grdSub.Columns[HPrintCol].Visible = false;
+ grdSub.Columns[HSourceInterID2Col].Visible = false;
+ grdSub.Columns[HSourceEntryID2Col].Visible = false;
+ grdSub.Columns[HSourceBillType2Col].Visible = false;
+ grdSub.Columns[HDeptID2Col].Visible = false;
+ grdSub.Columns[HDeptNumber2Col].Visible = false;
+ grdSub.Columns[HDeptName2Col].Visible = false;
+ //grdSub.Columns[HDate2Col].Visible = false;
+ grdSub.Columns[HBarCodeType2Col].Visible = false;
+ //grdSub.Columns[HBatchNo2Col].Visible = false;
+ grdSub.Columns[HWeiCol].Visible = false;
+ grdSub.Columns[HBarcodeNoCol].Visible = false;
+ grdSub.Columns[HBarcodeQtysCol].Visible = false;
+ grdSub.Columns[HSupID2Col].Visible = false;
+ grdSub.Columns[HSupNumber2Col].Visible = false;
+ grdSub.Columns[HSupName2Col].Visible = false;
+ grdSub.Columns[HWhID2Col].Visible = false;
+ grdSub.Columns[HWhNumber2Col].Visible = false;
+ grdSub.Columns[HWhName2Col].Visible = false;
+ grdSub.Columns[HSPID2Col].Visible = false;
+ grdSub.Columns[HSPNumber2Col].Visible = false;
+ grdSub.Columns[HSPName2Col].Visible = false;
+ grdSub.Columns[HInstructID2Col].Visible = false;
+ grdSub.Columns[HInstructNo2Col].Visible = false;
+ grdSub.Columns[HSeOrderBillID2Col].Visible = false;
+ //grdSub.Columns[HSeOrderBillNo2Col].Visible = false;
+ grdSub.Columns[HPinfan2Col].Visible = false;
+ grdSub.Columns[HPinfanBarCode2Col].Visible = false;
+ grdSub.Columns[HCusID2Col].Visible = false;
+ //grdSub.Columns[HCusNumber2Col].Visible = false;
+ //grdSub.Columns[HCusName2Col].Visible = false;
+ grdSub.Columns[HCusType2Col].Visible = false;
+ grdSub.Columns[HEndDate2Col].Visible = false;
+ grdSub.Columns[HSourceID2Col].Visible = false;
+ grdSub.Columns[HSourceNumber2Col].Visible = false;
+ grdSub.Columns[HSourceName2Col].Visible = false;
+
+ //璁剧疆鐗规畩鍒�
+ for (int i = 0; i < grdSub.Rows.Count; i++)
+ {
+ //缃戞牸鎵撳嬀
+ //鏄惁璧犲搧
+ DataGridViewCheckBoxCell oCell = new DataGridViewCheckBoxCell();
+ oCell.ThreeState = false;
+ oCell.Value = 0;
+ oCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdSub.Rows[i].Cells[HGiveAwayFlag2Col] = oCell;
+ //鏄惁鍚敤淇濊川鏈�
+ DataGridViewCheckBoxCell oCell2 = new DataGridViewCheckBoxCell();
+ oCell2.ThreeState = false;
+ oCell2.Value = 0;
+ oCell2.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ grdSub.Rows[i].Cells[HISKFPERIOD2Col] = oCell2;
+ }
+
+ DBUtility.Xt_BaseBillFun.GetGrid(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.GetGrid(grdSub, this.Name + "grdSub");
+ grdSub.SelectionMode = DataGridViewSelectionMode.FullRowSelect; //閫夎妯″紡
+
+ ////
+ DBUtility.Xt_BaseBillFun.initGridList(grdList, this.Name + "grdList");
+ DBUtility.Xt_BaseBillFun.initGridList(grdBillBarCodeList, this.Name + "grdBillBarCodeList");
+ ////
+ }
+ #endregion
+
+ #region 鎵撳嵃鐩稿叧
+ //鎵撳嵃缁撴潫鍚庡洖濉潯鐮佹墦鍗版鏁�
+ private void ReportPrintEnd()
+ {
+ if (UpdatePrintQtyCtl == "Y")
+ {
+ oBar.Set_UpdatePrintQty_SD(HInterID);
+ }
+ }
+
+ //濉叆鍗曟嵁琛ㄥご淇℃伅
+ private void ReportBeforePostRecord()//
+ {
+ try
+ {
+ //Report.FieldByName("鐗╂枡浠ｇ爜").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HMaterNumber2Col].Value);
+ //Report.FieldByName("鐗╂枡鍚嶇О").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HMaterName2Col].Value);
+ //Report.FieldByName("瑙勬牸鍨嬪彿").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HMaterModel2Col].Value);
+ ////Report.FieldByName("鑷畾涔夎鏍�").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HModel2Col].Value);
+ //Report.FieldByName("鏉＄爜缂栧彿").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HTMCol].Value);
+ //Report.FieldByName("鏁伴噺").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HQty2Col].Value);
+ //Report.FieldByName("婧愬崟鍗曞彿").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HSourceBillNoCol].Value);
+ //Report.FieldByName("閿�鍞鍗曞彿").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HSeOrderBillNo2Col].Value);
+ //Report.FieldByName("鐢熶骇杞﹂棿").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HDeptName2Col].Value);
+ //Report.FieldByName("澶囨敞").AsString = ClsPub.isStrNull(grdSub.Rows[CurRows].Cells[HRemark2Col].Value);
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!琛ㄥご锛�" + e.Message);
+ }
+ }
+
+ //濉叆鍗曟嵁琛ㄤ綋淇℃伅
+ private void ReportFetchRecordByDataTable()
+ {
+ try
+ {
+ DataTable ds = new DataTable();
+ BLL.Utility.FillRecordToReport_Sel(Report, grdList, ds, Fun_GetCol("閫夋嫨"));
+ }
+ catch (Exception e)
+ {
+ MessageBox.Show("鎵撳嵃澶辫触!琛ㄤ綋锛�" + e.Message);
+ }
+ }
+
+ private Int32 Fun_GetCol(string sCol)
+ {
+ return DBUtility.Xt_BaseBillFun.Fun_GetCol(sCol, grdList);
+ }
+ #endregion
+
+ #region 鍥哄畾浠ｇ爜
+
+
+
+ //淇濆瓨鍒楀
+ private void bclk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdSub, this.Name + "grdSub");
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdList, this.Name + "grdList");
+ }
+
+ //榛樿鍒楀
+ private void mrlk_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdMain, this.Name);
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdSub, this.Name + "grdSub");
+ DBUtility.Xt_BaseBillFun.DefaultGridView(grdList, this.Name + "grdList");
+ }
+
+ //澧炶鎸夐挳
+ private void AddRow_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.AddRow(oSumGrid);
+ }
+
+ //鍒犺鎸夌航
+ private void DelRow_Click(object sender, EventArgs e)
+ {
+ DBUtility.Xt_BaseBillFun.DelRow(oSumGrid);
+ }
+
+
+
+ //閲嶇疆鎸夌航
+ private void cz_Click(object sender, EventArgs e)
+ {
+ if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew || BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
+ {
+ if (MessageBox.Show("纭畾瑕佹竻绌哄綋鍓嶇晫闈俊鎭紝閲嶇疆鐣岄潰锛�", "鎻愮ず", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.OK)
+ {
+ this.Sub_AddBill();
+ }
+ }
+ grdMain.Columns[HBillNoCol].ReadOnly = false;
+ tabControl1.SelectedIndex = 3;
+ }
+
+ //鏂板鍗曟嵁
+ private void Sub_AddBill()
+ {
+ this.BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ this.Sub_OperStatus();//璁剧疆TOOLBAR
+ this.Sub_ClearBill();//娓呯┖鐣岄潰
+ }
+
+ //閫�鍑烘寜閽�
+ private void tc_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ //绂诲紑鍗曞厓鏍�
+ private void grdMain_LeaveCell(object sender, EventArgs e)
+ {
+ oSumGrid.LeaveCell();
+ }
+
+ //缃戞牸鍗曞厓鏍煎彉鍖栦簨浠�
+ private void grdMain_RowColChange(object sender, EventArgs e)
+ {
+ if (!grdStatus)
+ {
+ return;
+ }
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ //
+ //if (oSumGrid.Changelock)
+ // return;
+ //if(oSumGrid.EditStatus)
+ //{
+ if (!CheckGridRow(oSumGrid.OldCell.Row))
+ return;
+ //}
+ }
+
+ private void Gy_BarCodeBill_Paint(object sender, PaintEventArgs e)//鐢荤嚎
+ {
+ Graphics g = this.panel2.CreateGraphics();
+ Pen p = new Pen(Color.Gray);
+ p.Width = 1;
+ g.DrawLine(p, new Point(txtHMaker.Left, txtHMaker.Top + txtHMaker.Height), new Point(txtHMaker.Left + txtHMaker.Width, txtHMaker.Top + txtHMaker.Height));
+ g.DrawLine(p, new Point(txtHMakeDate.Left, txtHMakeDate.Top + txtHMakeDate.Height), new Point(txtHMakeDate.Left + txtHMakeDate.Width, txtHMakeDate.Top + txtHMakeDate.Height));
+ //
+ g.DrawLine(p, new Point(txtHChecker.Left, txtHChecker.Top + txtHChecker.Height), new Point(txtHChecker.Left + txtHChecker.Width, txtHChecker.Top + txtHChecker.Height));
+ g.DrawLine(p, new Point(txtHCheckDate.Left, txtHCheckDate.Top + txtHCheckDate.Height), new Point(txtHCheckDate.Left + txtHCheckDate.Width, txtHCheckDate.Top + txtHCheckDate.Height));
+ //
+ g.DrawLine(p, new Point(txtHCloseMan.Left, txtHCloseMan.Top + txtHCloseMan.Height), new Point(txtHCloseMan.Left + txtHCloseMan.Width, txtHCloseMan.Top + txtHCloseMan.Height));
+ g.DrawLine(p, new Point(txtHCloseDate.Left, txtHCloseDate.Top + txtHCloseDate.Height), new Point(txtHCloseDate.Left + txtHCloseDate.Width, txtHCloseDate.Top + txtHCloseDate.Height));
+ //
+ g.DrawLine(p, new Point(this.txtHDeleteMan.Left, txtHDeleteMan.Top + txtHDeleteMan.Height), new Point(txtHDeleteMan.Left + txtHDeleteMan.Width, txtHDeleteMan.Top + txtHDeleteMan.Height));
+ g.DrawLine(p, new Point(txtHDeleteDate.Left, txtHDeleteDate.Top + txtHDeleteDate.Height), new Point(txtHDeleteDate.Left + txtHDeleteDate.Width, txtHDeleteDate.Top + txtHDeleteDate.Height));
+ //
+ g.DrawLine(p, new Point(this.txtHUpDater.Left, txtHUpDater.Top + txtHUpDater.Height), new Point(txtHUpDater.Left + txtHUpDater.Width, txtHUpDater.Top + txtHUpDater.Height));
+ g.DrawLine(p, new Point(txtHUpDateDate.Left, txtHUpDateDate.Top + txtHUpDateDate.Height), new Point(txtHUpDateDate.Left + txtHUpDateDate.Width, txtHUpDateDate.Top + txtHUpDateDate.Height));
+ //鎺т欢浣嶇疆璁剧疆
+
+ }
+
+ //鎺т欢浣嶇疆
+ private void Sub_ControlLocation()
+ {
+ //gbUp.Width = P1.Width - 20;
+ //gbUp.Left = 10;
+ //gbUp.Height = P1.Height - 35;
+ //gbUp.Top = 30;
+ }
+
+ //绐椾綋鍔犺浇
+ private void Gy_BarCodeBill_Load(object sender, EventArgs e)
+ {
+ //鎵撳嵃鍒濆鍖�
+ oSumGrid.NoCol = HSnoCol;
+ oSumGrid.ogrdMain = grdMain;
+ oSumGrid.oGridsum = grdSum;
+ this.Text = ModCaption;
+ this.lblCaption.Text = ModCaption;
+ //鍔犺浇缁勭粐淇℃伅
+ Sub_AddOrdList();
+ //鍔犺浇宸ュ巶浠ｇ爜淇℃伅
+ Sub_AddWorksNumberList();
+ }
+
+ //鍔犺浇缁勭粐淇℃伅
+ private void Sub_AddOrdList()
+ {
+ DataSet ds;
+ DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+ ds = oClsGy_ORGANIZATIONS_View.GetList();
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ MessageBox.Show("鑾峰彇缁勭粐澶辫触");
+ return;
+ }
+ cmbHOrgID.Items.Clear();
+ for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
+ {
+ cmbHOrgID.Items.Add(DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[i]["HName"]));
+ }
+ }
+
+ //鍔犺浇宸ュ巶浠ｇ爜淇℃伅
+ private void Sub_AddWorksNumberList()
+ {
+ //鑾峰彇绯荤粺鍙傛暟
+ ClsXt_SystemParameter oSystemParameter = new ClsXt_SystemParameter();
+ if (oSystemParameter.ShowBill(ref DBUtility.ClsPub.sExeReturnInfo) == false)
+ {
+ MessageBox.Show("鑾峰彇绯荤粺鍙傛暟澶辫触锛佸師鍥�:" + DBUtility.ClsPub.sExeReturnInfo, "鎻愮ず");
+ return;
+ }
+ else
+ {
+ ERPMode = oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode;
+ CampanyName = oSystemParameter.omodel.WMS_CampanyName;
+ SourceQtyCtl = oSystemParameter.omodel.BarCode_SourceQtyCtl;
+ PrintQty = oSystemParameter.omodel.BarCode_PrintQty;
+ PrintQtyCtl = oSystemParameter.omodel.BarCode_PrintQtyCtl;
+ UpdatePrintQtyCtl = oSystemParameter.omodel.BarCode_UpdatePrintQtyCtl;
+ }
+ //绯荤粺鍙傛暟锛屾湁婧愬崟鐢熸垚鏉＄爜锛岀敓鎴愭潯鐮佹暟閲忓彲鍚﹁秴婧愬崟鏁伴噺鎺у埗锛圢涓轰笉鍙秴婧愬崟鏁伴噺锛�
+ if (SourceQtyCtl == "N")
+ {
+ //绯荤粺鍙傛暟涓轰笉鍙秴婧愬崟鏁伴噺鏃讹紝鍐嶆鍒ゆ柇鐢ㄦ埛鏉冮檺鏄惁鍙秴婧愬崟鏁伴噺
+ //鍒ゆ柇鏉冮檺
+ if (ClsPub.Security_Log(ModRightNameSourceQty, 3, false, ClsPub.CurUserName))
+ {
+ SourceQtyCtl = "Y";
+ }
+ }
+
+ cmbHWorksNumber.Items.Clear();
+ if (CampanyName == "椋為緳") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉�
+ {
+ cmbHWorksNumber.Items.Add("ZL");
+ cmbHWorksNumber.Items.Add("ST");
+ cmbHWorksNumber.Items.Add("SQ");
+ cmbHWorksNumber.Items.Add("MQ");
+ }
+ else
+ {
+ cmbHWorksNumber.Items.Add("");
+ }
+ }
+
+ //绐椾綋灏哄鍙樺寲鏃�
+ private void Gy_BarCodeBill_Resize(object sender, EventArgs e)
+ {
+ //Sub_ControlLocation();
+ }
+
+ //鏍规嵁缂栬緫鐘舵�� 璁剧疆 鎺т欢鏄惁鍏佽褰曞叆
+ private void Sub_LrtextStatus(bool TextEnabled)
+ {
+ if (TextEnabled == true)
+ {
+ //鎺т欢鍏ㄩ儴鏈夋晥
+ gbUp.Enabled = true;
+ grdMain.BackColor = ClsPub.EditColor;
+ }
+ else
+ { //鎺т欢鍏ㄩ儴鏃犳晥
+ gbUp.Enabled = false;
+ grdMain.BackColor = ClsPub.ViewColor;
+ }
+ }
+
+ //timer
+ private void timer1_Tick(object sender, EventArgs e)
+ {
+ timer1.Enabled = false;
+ Sub_ControlLocation();
+ if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_View)
+ {
+ //this.Sub_ShowBill();
+ }
+ else
+ {
+ this.Sub_AddBill();
+ }
+ DBUtility.Xt_BaseBillFun.SetSumGrid(oSumGrid);
+ }
+
+ //绐椾綋鍗歌浇
+ private void Gy_BarCodeBill_FormClosing(object sender, FormClosingEventArgs e)
+ {
+ BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
+ DBUtility.Xt_BaseBillFun.SaveGrid(grdMain, this.Name);
+ }
+
+ //TOOLBAR鐘舵�� 鎸夐挳鏄惁鐏板害
+ public void Sub_OperStatus()
+ {
+ switch (BillStatus)
+ {
+ case DBUtility.ClsPub.Enum_BillStatus.BillStatus_View:
+ //娴忚鐘舵��
+ yl.Enabled = true;
+ AddRow.Enabled = false;
+ DelRow.Enabled = false;
+ bc.Enabled = false;
+ cz.Enabled = false;
+ tc.Enabled = true;
+ //鏈鏍�
+ if (txtHChecker.Text.Trim() == "")
+ {
+ //鏈鏍�
+ pic1.Visible = false;
+ pic1.Image = null;
+ //
+ }
+ else if (txtHCloseMan.Text.Trim() == "" && txtHChecker.Text.Trim() != "")//瀹℃牳鏈叧闂�
+ {
+ //
+ pic1.Visible = true;
+ pic1.Image = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/Pic/Checked.jpg");
+ //
+ }
+ else//宸插叧闂�
+ {
+ //
+ pic1.Visible = true;
+ pic1.Image = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/Pic/Closed.jpg");
+ //
+ }
+ if (txtHDeleteMan.Text.Trim() == "")
+ {
+ }
+ else //宸蹭綔搴�
+ {
+ AddRow.Enabled = false;
+ DelRow.Enabled = false;
+ bc.Enabled = false;
+ cz.Enabled = false;
+ //
+ pic1.Visible = true;
+ pic1.Image = System.Drawing.Image.FromFile(ClsPub.AppPath + @"/Pic/Deleted.jpg");
+ //
+ }
+ Sub_LrtextStatus(false);
+ grdStatus = false;
+ break;
+ case DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew:
+ //鏂板鐘舵��
+ yl.Enabled = true;
+ AddRow.Enabled = true;
+ DelRow.Enabled = true;
+ bc.Enabled = true;
+ cz.Enabled = true;
+ tc.Enabled = true;
+ Sub_LrtextStatus(true);
+ grdStatus = true;
+ //鏈鏍�
+ pic1.Visible = false;
+ pic1.Image = null;
+ //
+ break;
+ case DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify:
+ //淇敼鐘舵��
+ yl.Enabled = true;
+ AddRow.Enabled = true;
+ DelRow.Enabled = true;
+ bc.Enabled = true;
+ cz.Enabled = true;
+ tc.Enabled = true;
+ Sub_LrtextStatus(true);
+ grdStatus = true;
+ //鏈鏍�
+ pic1.Visible = false;
+ pic1.Image = null;
+ //
+ break;
+ }
+
+ }
+
+ #endregion
+
+ #region 绐椾綋澶勭悊鏂规硶
+
+
+ //鍏紡閲嶇畻
+ private void RowCount(int sRow, int sTag)
+ {
+ if (sTag == 0)
+ {
+ //绠辨暟鍒�=鏁伴噺/鏈�灏忓寘瑁呮暟
+ double sMoney = 0;
+ if (ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value) == 0)
+ {
+ sMoney = 0;
+ }
+ else
+ {
+ sMoney = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) / ClsPub.isDoule(grdMain.Rows[sRow].Cells[HMinQtyCol].Value);
+ }
+ sMoney = Math.Ceiling(sMoney);
+ grdMain.Rows[sRow].Cells[HBQtyCol].Value = sMoney;
+ }
+ else
+ {
+
+ }
+ //if (ClsPub.isDoule(grdMain.Rows[sRow].Cells[HQtyCol].Value) > ClsPub.isDoule(grdMain.Rows[sRow].Cells[HinitQtyCol].Value)
+ // && ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HBillNoCol].Value) != "")
+ //{
+ // MessageBox.Show("鎵�杈撳叆鐨勪骇鍝佹�绘暟閲忓ぇ浜庡墿浣欏彲鐢熸垚鏁伴噺" + ClsPub.isDoule(grdMain.Rows[sRow].Cells[HinitQtyCol].Value) + "锛岃閲嶆柊杈撳叆锛�");
+ // grdMain.Rows[sRow].Cells[HQtyCol].Value = ClsPub.isDoule(grdMain.Rows[sRow].Cells[HinitQtyCol].Value);
+ // return;
+ //}
+ }
+
+ //鏍稿閫夋嫨鐨勫唴瀹�
+ public bool CheckGridCell(Cell oCell)
+ {
+ int Row;
+ int Col;
+ Row = oCell.Row;
+ Col = oCell.Col;
+ //if (ClsPub.isStrNull(grdMain.get_TextMatrix(Row, HTagCol)) != "*")
+ //{
+ // return true;
+ //}
+ //grdMain.Redraw = VSFlex7.RedrawSettings.flexRDNone;
+ //鍒ゆ柇閫変腑鍒�
+ if (Col == HMaterNumberCol) //鐗╂枡浠ｇ爜鍒�
+ {
+ //ClsGy_MaterialHlp oMate = new ClsGy_MaterialHlp();
+ //if (oMate.GetInfoByID(ClsPub.isLong(grdMain.Rows[Row].Cells[HMaterIDCol].Value)))
+ //{
+ // grdMain.Rows[Row].Cells[HMaterIDCol].Value = oMate.HItemID.ToString();
+ // grdMain.Rows[Row].Cells[HMaterNumberCol].Value = oMate.HNumber;
+ // grdMain.Rows[Row].Cells[HMaterNameCol].Value = oMate.HName;
+ // //grdMain.Rows[Row].Cells[HMaterModelCol].Value = oMate.HModel;
+ //}
+ //else
+ //{
+ // grdMain.Rows[Row].Cells[HMaterIDCol].Value = "";
+ // grdMain.Rows[Row].Cells[HMaterNumberCol].Value = "";
+ // grdMain.Rows[Row].Cells[HMaterNameCol].Value = "";
+ // //grdMain.Rows[Row].Cells[HMaterModelCol].Value = "";
+ return false;
+ //}
+ }
+ else if (Col == HUnitIDCol) //鍗曚綅ID鍒�
+ {
+ //ClsGy_UnitHlp oUn = new ClsGy_UnitHlp();
+ //if (oUn.GetInfoByID(ClsPub.isLong(grdMain.Rows[Row].Cells[HUnitIDCol])))
+ //{
+ // grdMain.Rows[Row].Cells[HUnitIDCol].Value = oUn.HItemID.ToString();
+ // grdMain.Rows[Row].Cells[HUnitNameCol].Value = oUn.HName;
+ //}
+ //else
+ //{
+ // grdMain.Rows[Row].Cells[HUnitIDCol].Value = "";
+ // grdMain.Rows[Row].Cells[HUnitNameCol].Value = "";
+ return false;
+ //}
+ }
+ else //鍏朵粬鍒�
+ {
+ }
+ //
+ //
+ grdMain.Rows[Row].Cells[HTagCol].Value = "*";
+ oSumGrid.EditStatus = false;
+ return true;
+ }
+ //鏄惁鏄┖琛�
+ private bool IsNullRow(int Row)
+ {
+ return DBUtility.Xt_BaseBillFun.IsNullRow(Row, HMaterIDCol, grdMain);
+ }
+ //'鍒ゆ柇缃戞牸琛岀殑褰曞叆鏄惁姝ｇ‘
+ private bool CheckGridRow(int Row)
+ {
+ Cell oCell = new Cell();
+ int c = 0;
+ //if (ClsPub.isStrNull(grdMain.get_TextMatrix(Row, HTagCol)) != "*")
+ //{
+ // return true;
+ //}
+ //
+ for (c = 0; c < grdMain.ColumnCount; c++)
+ {
+ oCell.Row = Row;
+ oCell.Col = c;
+ //if (!CheckGridCell(oCell))
+ // return false;
+
+ }
+ return true;
+ }
+
+ DataGridViewTextBoxEditingControl EditingControl;
+
+
+ #endregion
+
+ private void txtHSourceBillNo_KeyPress(object sender, KeyPressEventArgs e)
+ {
+ if (e.KeyChar == (char)Keys.Return)//鍥炶溅甯﹀嚭婧愬崟淇℃伅
+ {
+ long sHOrgID = -1;
+ DAL.ClsGy_ORGANIZATIONS_View oClsGy_ORGANIZATIONS_View = new DAL.ClsGy_ORGANIZATIONS_View();
+ if (oClsGy_ORGANIZATIONS_View.GetInfoByName(cmbHOrgID.Text))
+ {
+ sHOrgID = oClsGy_ORGANIZATIONS_View.omodel.HItemID;
+ }
+
+ if (txtHSourceBillNo.Text.Length < 4)
+ {
+ MessageBox.Show("璇疯緭鍏�4浣嶄互涓婃暟鎹紒");
+ return;
+ }
+ //鏍规嵁婧愬崟绫诲瀷 鍜屾簮鍗曞彿 鑾峰彇淇℃伅
+ if (cmbSourceBillType.Text.Trim() == "鐢熶骇璁㈠崟")
+ {
+ DAL.Cls_S_IFCLD_ICMOList oIFCLD_ICMOList = new DAL.Cls_S_IFCLD_ICMOList();
+ //绯荤粺鍙傛暟锛岀敓鎴愭潯鐮佹暟閲忓彲鍚﹁秴婧愬崟鏁伴噺鎺у埗锛圢涓轰笉鍙秴婧愬崟鏁伴噺锛�
+ if (SourceQtyCtl == "N")
+ {
+ if (oIFCLD_ICMOList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + sHOrgID.ToString() + " and 浠诲姟鏁伴噺>0")) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else
+ {
+ if (oIFCLD_ICMOList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' and HOrgID =" + sHOrgID.ToString())) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIFCLD_ICMOList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ }
+ else if (cmbSourceBillType.Text.Trim() == "鐢熶骇姹囨姤鍗�")
+ {
+ DAL.Cls_S_IF_ICMOReportBillList oIF_ICMOReportBillList = new DAL.Cls_S_IF_ICMOReportBillList();
+ if (oIF_ICMOReportBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' ")) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_ICMOReportBillList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else if (cmbSourceBillType.Text.Trim() == "鏀舵枡閫氱煡鍗�")
+ {
+ DAL.Cls_S_IF_POInStockBillList oIF_POInStockBillList = new DAL.Cls_S_IF_POInStockBillList();
+ if (oIF_POInStockBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' ")) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_POInStockBillList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else if (cmbSourceBillType.Text.Trim() == "閲囪喘璁㈠崟")
+ {
+ DAL.Cls_S_IF_POOrderBillList oIF_POOrderBillList = new DAL.Cls_S_IF_POOrderBillList();
+ if (oIF_POOrderBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' ")) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_POOrderBillList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else if (cmbSourceBillType.Text.Trim() == "濮斿璁㈠崟")
+ {
+ DAL.Cls_S_IF_EntrustOrderBillList oIF_EntrustOrderBillList = new DAL.Cls_S_IF_EntrustOrderBillList();
+ if (oIF_EntrustOrderBillList.RefreshBySourceBillNo(" Where 鍗曟嵁鍙� like '%" + txtHSourceBillNo.Text + "' ")) //閫夋嫨鍘熷崟
+ {
+ FillSelectData(oIF_EntrustOrderBillList.oBillSelectColl);
+ txtHSourceBillNo.Text = "";
+ }
+ else
+ {
+ MessageBox.Show("鏈煡璇㈠埌浠诲姟鏁版嵁锛岃纭鎵�閫夌粍缁囥�佹簮鍗曠被鍨嬩笌婧愬崟鍗曞彿鏄惁姝ｇ‘锛�");
+ return;
+ }
+ }
+ else
+ {
+ MessageBox.Show("鎵�閫夋簮鍗曠被鍨嬶紝涓嶆敮鎸佹鍔熻兘锛�");
+ return;
+ }
+
+ }
+ }
+
+ #region 鏂嚎閲嶈繛
+ private int maxRepeatConnectTimes = 6;
+ private int currentRepeatConnectTimes = 0;
+
+ #region 瀹氭椂鍣ㄦ娴嬭繛鎺ョ姸鎬併�佹柇绾块噸杩�
+ private void timer3_Tick(object sender, EventArgs e)
+ {
+ string msg = "";
+ if (currentRepeatConnectTimes < maxRepeatConnectTimes)
+ {
+ if(connect(ref msg) == true)
+ {
+ timer3.Enabled = false;
+ }
+ else
+ {
+ currentRepeatConnectTimes += 1;
+ }
+ }
+ else
+ {
+ timer3.Enabled = false;
+
+ if (client.IsConnected == true)
+ {
+
+ }
+ else
+ {
+ button_startListen.Enabled = true;
+ button_stopListen.Enabled = false;
+ MessageBox.Show("杩炴帴宸叉柇寮�锛岃閲嶆柊杩炴帴锛�!");
+
+ }
+ currentRepeatConnectTimes = 0;
+ }
+ }
+ #endregion
+
+ #region 鑾峰彇鐩爣璁惧缃戠粶杩炴帴鐘舵��
+ private bool getTargetInternetStatus()
+ {
+ try
+ {
+ string targetIp = textBox_IPParams.Text; // 鏇挎崲涓虹洰鏍囩數鑴戠殑IP鍦板潃
+ Ping pingSender = new Ping();
+ PingOptions options = new PingOptions();
+ // 浣跨敤64瀛楄妭鐨勬暟鎹寘锛屸�屼綘鍙互鏍规嵁闇�瑕佽皟鏁磋繖涓��
+ string data = "Hello from Ping!";
+ byte[] buffer = Encoding.ASCII.GetBytes(data);
+ int timeout = 1200; // 瓒呮椂鏃堕棿锛屸�屽崟浣嶄负姣
+ PingReply reply = pingSender.Send(targetIp, timeout, buffer, options);
+
+ if (reply.Status == IPStatus.Success)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ catch (Exception ex)
+ {
+ return false;
+ }
+
+ }
+ #endregion
+ #endregion
+
+ #region 宸ュ叿鏂规硶
+ #region json杞负瀵硅薄
+ public List<MQTT_MainEntity> getObjectByJson_Xs_OutDoorBillMain(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<MQTT_MainEntity> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MQTT_MainEntity>>(jsonString);
+ return list;
+ }
+ #endregion
+ #endregion
+ }
+
+
+ #region MQTT鍙戦�佹暟鎹ā鍨�
+ public class MQTT_MainEntity
+ {
+ public string timestamp;
+ public List<MQTT_SubEntity> values;
+ }
+ public class MQTT_SubEntity
+ {
+ public string id; //宸ヤ綅
+ public bool v; //缁撴灉
+ public long t; //鏃堕棿鎴�
+ }
+ #endregion
+}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.designer.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.designer.cs"
new file mode 100644
index 0000000..47e7403
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.designer.cs"
@@ -0,0 +1,1837 @@
+锘縩amespace WarM
+{
+ partial class Gy_BarCodeBill_automaticallyByPLC_New_Change
+ {
+ /// <summary>
+ /// 蹇呴渶鐨勮璁″櫒鍙橀噺銆�
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// 娓呯悊鎵�鏈夋鍦ㄤ娇鐢ㄧ殑璧勬簮銆�
+ /// </summary>
+ /// <param name="disposing">濡傛灉搴旈噴鏀炬墭绠¤祫婧愶紝涓� true锛涘惁鍒欎负 false銆�</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows 绐椾綋璁捐鍣ㄧ敓鎴愮殑浠ｇ爜
+
+ /// <summary>
+ /// 璁捐鍣ㄦ敮鎸佹墍闇�鐨勬柟娉� - 涓嶈
+ /// 浣跨敤浠ｇ爜缂栬緫鍣ㄤ慨鏀规鏂规硶鐨勫唴瀹广��
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Gy_BarCodeBill_automaticallyByPLC_New_Change));
+ this.Tool = new System.Windows.Forms.ToolStrip();
+ this.dy = new System.Windows.Forms.ToolStripButton();
+ this.sdy = new System.Windows.Forms.ToolStripButton();
+ this.yl = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
+ this.AddRow = new System.Windows.Forms.ToolStripButton();
+ this.spRow = new System.Windows.Forms.ToolStripButton();
+ this.bc = new System.Windows.Forms.ToolStripButton();
+ this.DelRow = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
+ this.wxm = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
+ this.cz = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
+ this.kc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
+ this.mrlk = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
+ this.bclk = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
+ this.tb = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
+ this.gl = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
+ this.BatchNo = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+ this.tc = new System.Windows.Forms.ToolStripButton();
+ this.lblCaption = new System.Windows.Forms.Label();
+ this.P1 = new System.Windows.Forms.Panel();
+ this.tabControl_MainInfo = new System.Windows.Forms.TabControl();
+ this.tabPage_BillInfo = new System.Windows.Forms.TabPage();
+ this.gbUp = new System.Windows.Forms.GroupBox();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.radioButton_IsPrint_No = new System.Windows.Forms.RadioButton();
+ this.radioButton_IsPrint_Yes = new System.Windows.Forms.RadioButton();
+ this.cmdSourceBillNo = new System.Windows.Forms.Button();
+ this.cmbHWorksNumber = new System.Windows.Forms.ComboBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.cmbHOrgID = new System.Windows.Forms.ComboBox();
+ this.radioButton_HIsUsingBatchNo = new System.Windows.Forms.RadioButton();
+ this.label_SourceName = new System.Windows.Forms.Label();
+ this.button_stopListen = new System.Windows.Forms.Button();
+ this.textBox_SourceName = new System.Windows.Forms.TextBox();
+ this.dtpHDate = new System.Windows.Forms.DateTimePicker();
+ this.label_HMaterNumber = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.textBox_HMaterNumber = new System.Windows.Forms.TextBox();
+ this.button_startListen = new System.Windows.Forms.Button();
+ this.label_HMaterName = new System.Windows.Forms.Label();
+ this.cmbHBarCodeType = new System.Windows.Forms.ComboBox();
+ this.textBox_HMaterName = new System.Windows.Forms.TextBox();
+ this.label_HMaterModel = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.textBox_HMaterModel = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label_HPlanQty = new System.Windows.Forms.Label();
+ this.textBox_HQty = new System.Windows.Forms.TextBox();
+ this.textBox_HPlanQty = new System.Windows.Forms.TextBox();
+ this.label10 = new System.Windows.Forms.Label();
+ this.txtHSourceBillNo = new System.Windows.Forms.TextBox();
+ this.cmbSourceBillType = new System.Windows.Forms.ComboBox();
+ this.label14 = new System.Windows.Forms.Label();
+ this.label_HQty = new System.Windows.Forms.Label();
+ this.tabPage_ParamsInfo = new System.Windows.Forms.TabPage();
+ this.groupBox_ParamsInfo = new System.Windows.Forms.GroupBox();
+ this.textBox_TopicParams = new System.Windows.Forms.TextBox();
+ this.label_TopicParams = new System.Windows.Forms.Label();
+ this.textBox_ClientIDParams = new System.Windows.Forms.TextBox();
+ this.label_ClientIDParams = new System.Windows.Forms.Label();
+ this.textBox_PasswordParams = new System.Windows.Forms.TextBox();
+ this.label_PasswordParams = new System.Windows.Forms.Label();
+ this.textBox_UserParams = new System.Windows.Forms.TextBox();
+ this.label_UserParams = new System.Windows.Forms.Label();
+ this.button_resetParams = new System.Windows.Forms.Button();
+ this.button_saveParams = new System.Windows.Forms.Button();
+ this.textBox_PrintModelParams = new System.Windows.Forms.TextBox();
+ this.label_PrintModelParams = new System.Windows.Forms.Label();
+ this.comboBox_PrinterParams = new System.Windows.Forms.ComboBox();
+ this.label_PrinterParams = new System.Windows.Forms.Label();
+ this.comboBox_SourceNameParams = new System.Windows.Forms.ComboBox();
+ this.label_SourceNameParams = new System.Windows.Forms.Label();
+ this.textBox_PortParams = new System.Windows.Forms.TextBox();
+ this.label_PortParams = new System.Windows.Forms.Label();
+ this.textBox_IPParams = new System.Windows.Forms.TextBox();
+ this.label_IPParams = new System.Windows.Forms.Label();
+ this.pic1 = new System.Windows.Forms.PictureBox();
+ this.panel2 = new System.Windows.Forms.Panel();
+ this.txtHDeleteDate = new System.Windows.Forms.Label();
+ this.label25 = new System.Windows.Forms.Label();
+ this.txtHDeleteMan = new System.Windows.Forms.Label();
+ this.label27 = new System.Windows.Forms.Label();
+ this.txtHUpDateDate = new System.Windows.Forms.Label();
+ this.label23 = new System.Windows.Forms.Label();
+ this.txtHUpDater = new System.Windows.Forms.Label();
+ this.label21 = new System.Windows.Forms.Label();
+ this.txtHCloseDate = new System.Windows.Forms.Label();
+ this.label19 = new System.Windows.Forms.Label();
+ this.txtHCloseMan = new System.Windows.Forms.Label();
+ this.label17 = new System.Windows.Forms.Label();
+ this.txtHCheckDate = new System.Windows.Forms.Label();
+ this.label15 = new System.Windows.Forms.Label();
+ this.txtHChecker = new System.Windows.Forms.Label();
+ this.label13 = new System.Windows.Forms.Label();
+ this.txtHMakeDate = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
+ this.txtHMaker = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.timer1 = new System.Windows.Forms.Timer(this.components);
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.panel3 = new System.Windows.Forms.Panel();
+ this.grdSum = new System.Windows.Forms.DataGridView();
+ this.grdPrint = new System.Windows.Forms.DataGridView();
+ this.tabPage3 = new System.Windows.Forms.TabPage();
+ this.grdList = new System.Windows.Forms.DataGridView();
+ this.tabPage2 = new System.Windows.Forms.TabPage();
+ this.grdSub = new System.Windows.Forms.DataGridView();
+ this.tabPage1 = new System.Windows.Forms.TabPage();
+ this.grdMain = new System.Windows.Forms.DataGridView();
+ this.tabControl1 = new System.Windows.Forms.TabControl();
+ this.tabPage4 = new System.Windows.Forms.TabPage();
+ this.grdBillBarCodeList = new System.Windows.Forms.DataGridView();
+ this.pageSetupDialog1 = new System.Windows.Forms.PageSetupDialog();
+ this.printDocument1 = new System.Drawing.Printing.PrintDocument();
+ this.printDialog1 = new System.Windows.Forms.PrintDialog();
+ this.printPreviewDialog1 = new System.Windows.Forms.PrintPreviewDialog();
+ this.timer2 = new System.Windows.Forms.Timer(this.components);
+ this.timer3 = new System.Windows.Forms.Timer(this.components);
+ this.textBox_WorkPositionParams = new System.Windows.Forms.TextBox();
+ this.label_WorkPositionParams = new System.Windows.Forms.Label();
+ this.Tool.SuspendLayout();
+ this.P1.SuspendLayout();
+ this.tabControl_MainInfo.SuspendLayout();
+ this.tabPage_BillInfo.SuspendLayout();
+ this.gbUp.SuspendLayout();
+ this.groupBox1.SuspendLayout();
+ this.tabPage_ParamsInfo.SuspendLayout();
+ this.groupBox_ParamsInfo.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
+ this.panel2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).BeginInit();
+ this.tabPage3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdList)).BeginInit();
+ this.tabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSub)).BeginInit();
+ this.tabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
+ this.tabControl1.SuspendLayout();
+ this.tabPage4.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdBillBarCodeList)).BeginInit();
+ this.SuspendLayout();
+ //
+ // Tool
+ //
+ this.Tool.AutoSize = false;
+ this.Tool.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("Tool.BackgroundImage")));
+ this.Tool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+ this.Tool.ImageScalingSize = new System.Drawing.Size(22, 22);
+ this.Tool.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.dy,
+ this.sdy,
+ this.yl,
+ this.toolStripSeparator2,
+ this.AddRow,
+ this.spRow,
+ this.bc,
+ this.DelRow,
+ this.toolStripSeparator4,
+ this.toolStripSeparator8,
+ this.wxm,
+ this.toolStripSeparator9,
+ this.cz,
+ this.toolStripSeparator5,
+ this.kc,
+ this.toolStripSeparator1,
+ this.toolStripSeparator12,
+ this.mrlk,
+ this.toolStripSeparator11,
+ this.bclk,
+ this.toolStripSeparator10,
+ this.tb,
+ this.toolStripSeparator6,
+ this.gl,
+ this.toolStripSeparator7,
+ this.BatchNo,
+ this.toolStripSeparator3,
+ this.tc});
+ this.Tool.Location = new System.Drawing.Point(0, 0);
+ this.Tool.Name = "Tool";
+ this.Tool.Padding = new System.Windows.Forms.Padding(0);
+ this.Tool.Size = new System.Drawing.Size(1924, 75);
+ this.Tool.Stretch = true;
+ this.Tool.TabIndex = 17;
+ this.Tool.Text = "toolStrip1";
+ //
+ // dy
+ //
+ this.dy.AutoSize = false;
+ this.dy.Image = ((System.Drawing.Image)(resources.GetObject("dy.Image")));
+ this.dy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.dy.ImageTransparentColor = System.Drawing.Color.White;
+ this.dy.Name = "dy";
+ this.dy.Size = new System.Drawing.Size(35, 47);
+ this.dy.Text = "鎵撳嵃";
+ this.dy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.dy.Visible = false;
+ //
+ // sdy
+ //
+ this.sdy.AutoSize = false;
+ this.sdy.Image = ((System.Drawing.Image)(resources.GetObject("sdy.Image")));
+ this.sdy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sdy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.sdy.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.sdy.Name = "sdy";
+ this.sdy.Size = new System.Drawing.Size(35, 47);
+ this.sdy.Text = "娴忚";
+ this.sdy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sdy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.sdy.Visible = false;
+ //
+ // yl
+ //
+ this.yl.AutoSize = false;
+ this.yl.Image = ((System.Drawing.Image)(resources.GetObject("yl.Image")));
+ this.yl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.yl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.yl.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.yl.Name = "yl";
+ this.yl.Size = new System.Drawing.Size(35, 47);
+ this.yl.Text = "棰勮";
+ this.yl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.yl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.yl.Visible = false;
+ //
+ // toolStripSeparator2
+ //
+ this.toolStripSeparator2.Name = "toolStripSeparator2";
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 75);
+ //
+ // AddRow
+ //
+ this.AddRow.AutoSize = false;
+ this.AddRow.Image = ((System.Drawing.Image)(resources.GetObject("AddRow.Image")));
+ this.AddRow.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.AddRow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.AddRow.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.AddRow.Name = "AddRow";
+ this.AddRow.Size = new System.Drawing.Size(35, 47);
+ this.AddRow.Text = "澧炶";
+ this.AddRow.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.AddRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.AddRow.Visible = false;
+ this.AddRow.Click += new System.EventHandler(this.AddRow_Click);
+ //
+ // spRow
+ //
+ this.spRow.AutoSize = false;
+ this.spRow.Image = ((System.Drawing.Image)(resources.GetObject("spRow.Image")));
+ this.spRow.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.spRow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.spRow.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.spRow.Name = "spRow";
+ this.spRow.Size = new System.Drawing.Size(35, 47);
+ this.spRow.Text = "鎷嗚";
+ this.spRow.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.spRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.spRow.Visible = false;
+ //
+ // bc
+ //
+ this.bc.AutoSize = false;
+ this.bc.Image = ((System.Drawing.Image)(resources.GetObject("bc.Image")));
+ this.bc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.bc.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.bc.Name = "bc";
+ this.bc.Size = new System.Drawing.Size(60, 60);
+ this.bc.Text = "鐢熸垚";
+ this.bc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bc.Click += new System.EventHandler(this.bc_Click);
+ //
+ // DelRow
+ //
+ this.DelRow.AutoSize = false;
+ this.DelRow.Image = ((System.Drawing.Image)(resources.GetObject("DelRow.Image")));
+ this.DelRow.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.DelRow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.DelRow.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.DelRow.Name = "DelRow";
+ this.DelRow.Size = new System.Drawing.Size(35, 47);
+ this.DelRow.Text = "鍒犺";
+ this.DelRow.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.DelRow.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.DelRow.Visible = false;
+ this.DelRow.Click += new System.EventHandler(this.DelRow_Click);
+ //
+ // toolStripSeparator4
+ //
+ this.toolStripSeparator4.Name = "toolStripSeparator4";
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 75);
+ this.toolStripSeparator4.Visible = false;
+ //
+ // toolStripSeparator8
+ //
+ this.toolStripSeparator8.Name = "toolStripSeparator8";
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 75);
+ this.toolStripSeparator8.Visible = false;
+ //
+ // wxm
+ //
+ this.wxm.AutoSize = false;
+ this.wxm.Image = ((System.Drawing.Image)(resources.GetObject("wxm.Image")));
+ this.wxm.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.wxm.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.wxm.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.wxm.Name = "wxm";
+ this.wxm.Size = new System.Drawing.Size(50, 47);
+ this.wxm.Text = "澶栫鐮�";
+ this.wxm.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.wxm.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.wxm.Visible = false;
+ //
+ // toolStripSeparator9
+ //
+ this.toolStripSeparator9.Name = "toolStripSeparator9";
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 75);
+ //
+ // cz
+ //
+ this.cz.AutoSize = false;
+ this.cz.Image = ((System.Drawing.Image)(resources.GetObject("cz.Image")));
+ this.cz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.cz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.cz.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.cz.Name = "cz";
+ this.cz.Size = new System.Drawing.Size(35, 47);
+ this.cz.Text = "閲嶇疆";
+ this.cz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.cz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.cz.Visible = false;
+ this.cz.Click += new System.EventHandler(this.cz_Click);
+ //
+ // toolStripSeparator5
+ //
+ this.toolStripSeparator5.Name = "toolStripSeparator5";
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 75);
+ //
+ // kc
+ //
+ this.kc.AutoSize = false;
+ this.kc.Image = ((System.Drawing.Image)(resources.GetObject("kc.Image")));
+ this.kc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.kc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.kc.ImageTransparentColor = System.Drawing.Color.White;
+ this.kc.Name = "kc";
+ this.kc.Size = new System.Drawing.Size(35, 47);
+ this.kc.Text = "搴撳瓨";
+ this.kc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.kc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.kc.Visible = false;
+ //
+ // toolStripSeparator1
+ //
+ this.toolStripSeparator1.Name = "toolStripSeparator1";
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 75);
+ //
+ // toolStripSeparator12
+ //
+ this.toolStripSeparator12.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator12.Name = "toolStripSeparator12";
+ this.toolStripSeparator12.Size = new System.Drawing.Size(6, 75);
+ //
+ // mrlk
+ //
+ this.mrlk.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.mrlk.Image = ((System.Drawing.Image)(resources.GetObject("mrlk.Image")));
+ this.mrlk.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
+ this.mrlk.Name = "mrlk";
+ this.mrlk.Size = new System.Drawing.Size(86, 70);
+ this.mrlk.Text = "榛樿鍒楀";
+ this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.mrlk.Click += new System.EventHandler(this.mrlk_Click);
+ //
+ // toolStripSeparator11
+ //
+ this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator11.Name = "toolStripSeparator11";
+ this.toolStripSeparator11.Size = new System.Drawing.Size(6, 75);
+ //
+ // bclk
+ //
+ this.bclk.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.bclk.Image = ((System.Drawing.Image)(resources.GetObject("bclk.Image")));
+ this.bclk.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.bclk.ImageTransparentColor = System.Drawing.Color.White;
+ this.bclk.Name = "bclk";
+ this.bclk.Size = new System.Drawing.Size(86, 70);
+ this.bclk.Text = "淇濆瓨鍒楀";
+ this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.bclk.Click += new System.EventHandler(this.bclk_Click);
+ //
+ // toolStripSeparator10
+ //
+ this.toolStripSeparator10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripSeparator10.Name = "toolStripSeparator10";
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 75);
+ //
+ // tb
+ //
+ this.tb.AutoSize = false;
+ this.tb.Image = ((System.Drawing.Image)(resources.GetObject("tb.Image")));
+ this.tb.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tb.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.tb.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.tb.Name = "tb";
+ this.tb.Size = new System.Drawing.Size(80, 47);
+ this.tb.Text = "鍚屾璧勬枡";
+ this.tb.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tb.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.tb.ToolTipText = "鍚屾鍩虹璧勬枡";
+ this.tb.Visible = false;
+ //
+ // toolStripSeparator6
+ //
+ this.toolStripSeparator6.Name = "toolStripSeparator6";
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 75);
+ //
+ // gl
+ //
+ this.gl.AutoSize = false;
+ this.gl.Image = ((System.Drawing.Image)(resources.GetObject("gl.Image")));
+ this.gl.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.gl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.gl.ImageTransparentColor = System.Drawing.Color.White;
+ this.gl.Name = "gl";
+ this.gl.Size = new System.Drawing.Size(35, 47);
+ this.gl.Text = "鍏宠仈";
+ this.gl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.gl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.gl.Visible = false;
+ //
+ // toolStripSeparator7
+ //
+ this.toolStripSeparator7.Name = "toolStripSeparator7";
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 75);
+ //
+ // BatchNo
+ //
+ this.BatchNo.AutoSize = false;
+ this.BatchNo.Image = ((System.Drawing.Image)(resources.GetObject("BatchNo.Image")));
+ this.BatchNo.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.BatchNo.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.BatchNo.ImageTransparentColor = System.Drawing.Color.White;
+ this.BatchNo.Name = "BatchNo";
+ this.BatchNo.Size = new System.Drawing.Size(36, 47);
+ this.BatchNo.Text = "鎵规";
+ this.BatchNo.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.BatchNo.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.BatchNo.Visible = false;
+ //
+ // toolStripSeparator3
+ //
+ this.toolStripSeparator3.Name = "toolStripSeparator3";
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 75);
+ //
+ // tc
+ //
+ this.tc.AutoSize = false;
+ this.tc.Image = ((System.Drawing.Image)(resources.GetObject("tc.Image")));
+ this.tc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.tc.ImageTransparentColor = System.Drawing.Color.White;
+ this.tc.Margin = new System.Windows.Forms.Padding(100, 2, 0, 3);
+ this.tc.Name = "tc";
+ this.tc.Size = new System.Drawing.Size(60, 60);
+ this.tc.Text = "閫�鍑�";
+ this.tc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.tc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.tc.Click += new System.EventHandler(this.tc_Click);
+ //
+ // lblCaption
+ //
+ this.lblCaption.AutoSize = true;
+ this.lblCaption.Font = new System.Drawing.Font("瀹嬩綋", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.lblCaption.Location = new System.Drawing.Point(752, 18);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Name = "lblCaption";
+ this.lblCaption.Size = new System.Drawing.Size(133, 29);
+ this.lblCaption.TabIndex = 18;
+ this.lblCaption.Text = "鍗曟嵁缂栬緫";
+ this.lblCaption.Visible = false;
+ //
+ // P1
+ //
+ this.P1.BackColor = System.Drawing.Color.Lavender;
+ this.P1.Controls.Add(this.tabControl_MainInfo);
+ this.P1.Controls.Add(this.pic1);
+ this.P1.Controls.Add(this.lblCaption);
+ this.P1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.P1.Location = new System.Drawing.Point(62, 75);
+ this.P1.Margin = new System.Windows.Forms.Padding(4);
+ this.P1.Name = "P1";
+ this.P1.Size = new System.Drawing.Size(1804, 358);
+ this.P1.TabIndex = 31;
+ //
+ // tabControl_MainInfo
+ //
+ this.tabControl_MainInfo.Controls.Add(this.tabPage_BillInfo);
+ this.tabControl_MainInfo.Controls.Add(this.tabPage_ParamsInfo);
+ this.tabControl_MainInfo.Location = new System.Drawing.Point(3, 4);
+ this.tabControl_MainInfo.Name = "tabControl_MainInfo";
+ this.tabControl_MainInfo.SelectedIndex = 0;
+ this.tabControl_MainInfo.Size = new System.Drawing.Size(1794, 346);
+ this.tabControl_MainInfo.TabIndex = 38;
+ //
+ // tabPage_BillInfo
+ //
+ this.tabPage_BillInfo.BackColor = System.Drawing.Color.Lavender;
+ this.tabPage_BillInfo.Controls.Add(this.gbUp);
+ this.tabPage_BillInfo.Location = new System.Drawing.Point(4, 28);
+ this.tabPage_BillInfo.Name = "tabPage_BillInfo";
+ this.tabPage_BillInfo.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage_BillInfo.Size = new System.Drawing.Size(1786, 314);
+ this.tabPage_BillInfo.TabIndex = 0;
+ this.tabPage_BillInfo.Text = "宸ュ崟淇℃伅";
+ //
+ // gbUp
+ //
+ this.gbUp.BackColor = System.Drawing.Color.Transparent;
+ this.gbUp.Controls.Add(this.groupBox1);
+ this.gbUp.Controls.Add(this.cmdSourceBillNo);
+ this.gbUp.Controls.Add(this.cmbHWorksNumber);
+ this.gbUp.Controls.Add(this.label4);
+ this.gbUp.Controls.Add(this.cmbHOrgID);
+ this.gbUp.Controls.Add(this.radioButton_HIsUsingBatchNo);
+ this.gbUp.Controls.Add(this.label_SourceName);
+ this.gbUp.Controls.Add(this.button_stopListen);
+ this.gbUp.Controls.Add(this.textBox_SourceName);
+ this.gbUp.Controls.Add(this.dtpHDate);
+ this.gbUp.Controls.Add(this.label_HMaterNumber);
+ this.gbUp.Controls.Add(this.label2);
+ this.gbUp.Controls.Add(this.textBox_HMaterNumber);
+ this.gbUp.Controls.Add(this.button_startListen);
+ this.gbUp.Controls.Add(this.label_HMaterName);
+ this.gbUp.Controls.Add(this.cmbHBarCodeType);
+ this.gbUp.Controls.Add(this.textBox_HMaterName);
+ this.gbUp.Controls.Add(this.label_HMaterModel);
+ this.gbUp.Controls.Add(this.label1);
+ this.gbUp.Controls.Add(this.textBox_HMaterModel);
+ this.gbUp.Controls.Add(this.label3);
+ this.gbUp.Controls.Add(this.label_HPlanQty);
+ this.gbUp.Controls.Add(this.textBox_HQty);
+ this.gbUp.Controls.Add(this.textBox_HPlanQty);
+ this.gbUp.Controls.Add(this.label10);
+ this.gbUp.Controls.Add(this.txtHSourceBillNo);
+ this.gbUp.Controls.Add(this.cmbSourceBillType);
+ this.gbUp.Controls.Add(this.label14);
+ this.gbUp.Controls.Add(this.label_HQty);
+ this.gbUp.Location = new System.Drawing.Point(4, 4);
+ this.gbUp.Margin = new System.Windows.Forms.Padding(4);
+ this.gbUp.Name = "gbUp";
+ this.gbUp.Padding = new System.Windows.Forms.Padding(4);
+ this.gbUp.Size = new System.Drawing.Size(1775, 310);
+ this.gbUp.TabIndex = 33;
+ this.gbUp.TabStop = false;
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.radioButton_IsPrint_No);
+ this.groupBox1.Controls.Add(this.radioButton_IsPrint_Yes);
+ this.groupBox1.Location = new System.Drawing.Point(24, 162);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(200, 100);
+ this.groupBox1.TabIndex = 45;
+ this.groupBox1.TabStop = false;
+ //
+ // radioButton_IsPrint_No
+ //
+ this.radioButton_IsPrint_No.AutoSize = true;
+ this.radioButton_IsPrint_No.Location = new System.Drawing.Point(6, 68);
+ this.radioButton_IsPrint_No.Name = "radioButton_IsPrint_No";
+ this.radioButton_IsPrint_No.Size = new System.Drawing.Size(87, 22);
+ this.radioButton_IsPrint_No.TabIndex = 1;
+ this.radioButton_IsPrint_No.Text = "涓嶆墦鍗�";
+ this.radioButton_IsPrint_No.UseVisualStyleBackColor = true;
+ //
+ // radioButton_IsPrint_Yes
+ //
+ this.radioButton_IsPrint_Yes.AutoSize = true;
+ this.radioButton_IsPrint_Yes.Checked = true;
+ this.radioButton_IsPrint_Yes.Location = new System.Drawing.Point(7, 13);
+ this.radioButton_IsPrint_Yes.Name = "radioButton_IsPrint_Yes";
+ this.radioButton_IsPrint_Yes.Size = new System.Drawing.Size(69, 22);
+ this.radioButton_IsPrint_Yes.TabIndex = 0;
+ this.radioButton_IsPrint_Yes.TabStop = true;
+ this.radioButton_IsPrint_Yes.Text = "鎵撳嵃";
+ this.radioButton_IsPrint_Yes.UseVisualStyleBackColor = true;
+ //
+ // cmdSourceBillNo
+ //
+ this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
+ this.cmdSourceBillNo.Location = new System.Drawing.Point(1645, 0);
+ this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdSourceBillNo.Name = "cmdSourceBillNo";
+ this.cmdSourceBillNo.Size = new System.Drawing.Size(122, 70);
+ this.cmdSourceBillNo.TabIndex = 99;
+ this.cmdSourceBillNo.UseVisualStyleBackColor = true;
+ this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click_1);
+ //
+ // cmbHWorksNumber
+ //
+ this.cmbHWorksNumber.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbHWorksNumber.FormattingEnabled = true;
+ this.cmbHWorksNumber.Location = new System.Drawing.Point(122, 230);
+ this.cmbHWorksNumber.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbHWorksNumber.Name = "cmbHWorksNumber";
+ this.cmbHWorksNumber.Size = new System.Drawing.Size(280, 26);
+ this.cmbHWorksNumber.TabIndex = 98;
+ this.cmbHWorksNumber.Visible = false;
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.ForeColor = System.Drawing.Color.Black;
+ this.label4.Location = new System.Drawing.Point(21, 236);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(80, 18);
+ this.label4.TabIndex = 97;
+ this.label4.Text = "宸ュ巶浠ｇ爜";
+ this.label4.Visible = false;
+ //
+ // cmbHOrgID
+ //
+ this.cmbHOrgID.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbHOrgID.FormattingEnabled = true;
+ this.cmbHOrgID.Location = new System.Drawing.Point(121, 21);
+ this.cmbHOrgID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbHOrgID.Name = "cmbHOrgID";
+ this.cmbHOrgID.Size = new System.Drawing.Size(280, 26);
+ this.cmbHOrgID.TabIndex = 85;
+ //
+ // radioButton_HIsUsingBatchNo
+ //
+ this.radioButton_HIsUsingBatchNo.AutoSize = true;
+ this.radioButton_HIsUsingBatchNo.Enabled = false;
+ this.radioButton_HIsUsingBatchNo.Location = new System.Drawing.Point(600, 175);
+ this.radioButton_HIsUsingBatchNo.Name = "radioButton_HIsUsingBatchNo";
+ this.radioButton_HIsUsingBatchNo.Size = new System.Drawing.Size(141, 22);
+ this.radioButton_HIsUsingBatchNo.TabIndex = 98;
+ this.radioButton_HIsUsingBatchNo.TabStop = true;
+ this.radioButton_HIsUsingBatchNo.Text = "鏄惁鍚敤鎵规";
+ this.radioButton_HIsUsingBatchNo.UseVisualStyleBackColor = true;
+ //
+ // label_SourceName
+ //
+ this.label_SourceName.AutoSize = true;
+ this.label_SourceName.Location = new System.Drawing.Point(20, 84);
+ this.label_SourceName.Name = "label_SourceName";
+ this.label_SourceName.Size = new System.Drawing.Size(80, 18);
+ this.label_SourceName.TabIndex = 0;
+ this.label_SourceName.Text = "浜� 绾�";
+ //
+ // button_stopListen
+ //
+ this.button_stopListen.Location = new System.Drawing.Point(958, 203);
+ this.button_stopListen.Name = "button_stopListen";
+ this.button_stopListen.Size = new System.Drawing.Size(192, 101);
+ this.button_stopListen.TabIndex = 97;
+ this.button_stopListen.Text = "鍋滄鐩戝惉";
+ this.button_stopListen.UseVisualStyleBackColor = true;
+ this.button_stopListen.Click += new System.EventHandler(this.button_stopListen_Click);
+ //
+ // textBox_SourceName
+ //
+ this.textBox_SourceName.BackColor = System.Drawing.SystemColors.ScrollBar;
+ this.textBox_SourceName.Enabled = false;
+ this.textBox_SourceName.Location = new System.Drawing.Point(122, 81);
+ this.textBox_SourceName.Name = "textBox_SourceName";
+ this.textBox_SourceName.Size = new System.Drawing.Size(280, 28);
+ this.textBox_SourceName.TabIndex = 43;
+ //
+ // dtpHDate
+ //
+ this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
+ this.dtpHDate.Location = new System.Drawing.Point(697, 124);
+ this.dtpHDate.Name = "dtpHDate";
+ this.dtpHDate.Size = new System.Drawing.Size(280, 28);
+ this.dtpHDate.TabIndex = 96;
+ //
+ // label_HMaterNumber
+ //
+ this.label_HMaterNumber.AutoSize = true;
+ this.label_HMaterNumber.Location = new System.Drawing.Point(1178, 80);
+ this.label_HMaterNumber.Name = "label_HMaterNumber";
+ this.label_HMaterNumber.Size = new System.Drawing.Size(80, 18);
+ this.label_HMaterNumber.TabIndex = 86;
+ this.label_HMaterNumber.Text = "鐗╂枡浠ｇ爜";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(597, 130);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(80, 18);
+ this.label2.TabIndex = 95;
+ this.label2.Text = "鏃� 鏈�";
+ //
+ // textBox_HMaterNumber
+ //
+ this.textBox_HMaterNumber.BackColor = System.Drawing.SystemColors.ScrollBar;
+ this.textBox_HMaterNumber.Enabled = false;
+ this.textBox_HMaterNumber.Font = new System.Drawing.Font("瀹嬩綋", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.textBox_HMaterNumber.Location = new System.Drawing.Point(1280, 77);
+ this.textBox_HMaterNumber.Multiline = true;
+ this.textBox_HMaterNumber.Name = "textBox_HMaterNumber";
+ this.textBox_HMaterNumber.Size = new System.Drawing.Size(468, 48);
+ this.textBox_HMaterNumber.TabIndex = 87;
+ //
+ // button_startListen
+ //
+ this.button_startListen.Location = new System.Drawing.Point(521, 203);
+ this.button_startListen.Name = "button_startListen";
+ this.button_startListen.Size = new System.Drawing.Size(160, 100);
+ this.button_startListen.TabIndex = 96;
+ this.button_startListen.Text = "寮�濮嬬洃鍚�";
+ this.button_startListen.UseVisualStyleBackColor = true;
+ this.button_startListen.Click += new System.EventHandler(this.button_startListen_Click);
+ //
+ // label_HMaterName
+ //
+ this.label_HMaterName.AutoSize = true;
+ this.label_HMaterName.Location = new System.Drawing.Point(1175, 136);
+ this.label_HMaterName.Name = "label_HMaterName";
+ this.label_HMaterName.Size = new System.Drawing.Size(80, 18);
+ this.label_HMaterName.TabIndex = 88;
+ this.label_HMaterName.Text = "鐗╂枡鍚嶇О";
+ //
+ // cmbHBarCodeType
+ //
+ this.cmbHBarCodeType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbHBarCodeType.FormattingEnabled = true;
+ this.cmbHBarCodeType.Location = new System.Drawing.Point(697, 80);
+ this.cmbHBarCodeType.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbHBarCodeType.Name = "cmbHBarCodeType";
+ this.cmbHBarCodeType.Size = new System.Drawing.Size(280, 26);
+ this.cmbHBarCodeType.TabIndex = 81;
+ //
+ // textBox_HMaterName
+ //
+ this.textBox_HMaterName.BackColor = System.Drawing.SystemColors.ScrollBar;
+ this.textBox_HMaterName.Enabled = false;
+ this.textBox_HMaterName.Font = new System.Drawing.Font("瀹嬩綋", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.textBox_HMaterName.Location = new System.Drawing.Point(1280, 131);
+ this.textBox_HMaterName.Multiline = true;
+ this.textBox_HMaterName.Name = "textBox_HMaterName";
+ this.textBox_HMaterName.Size = new System.Drawing.Size(468, 57);
+ this.textBox_HMaterName.TabIndex = 89;
+ //
+ // label_HMaterModel
+ //
+ this.label_HMaterModel.AutoSize = true;
+ this.label_HMaterModel.Location = new System.Drawing.Point(1178, 197);
+ this.label_HMaterModel.Name = "label_HMaterModel";
+ this.label_HMaterModel.Size = new System.Drawing.Size(80, 18);
+ this.label_HMaterModel.TabIndex = 90;
+ this.label_HMaterModel.Text = "瑙勬牸鍨嬪彿";
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.ForeColor = System.Drawing.Color.Black;
+ this.label1.Location = new System.Drawing.Point(597, 86);
+ this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(80, 18);
+ this.label1.TabIndex = 80;
+ this.label1.Text = "鏉＄爜绫诲瀷";
+ //
+ // textBox_HMaterModel
+ //
+ this.textBox_HMaterModel.BackColor = System.Drawing.SystemColors.ScrollBar;
+ this.textBox_HMaterModel.Enabled = false;
+ this.textBox_HMaterModel.Font = new System.Drawing.Font("瀹嬩綋", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.textBox_HMaterModel.Location = new System.Drawing.Point(1280, 194);
+ this.textBox_HMaterModel.Multiline = true;
+ this.textBox_HMaterModel.Name = "textBox_HMaterModel";
+ this.textBox_HMaterModel.Size = new System.Drawing.Size(468, 60);
+ this.textBox_HMaterModel.TabIndex = 91;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.ForeColor = System.Drawing.Color.Black;
+ this.label3.Location = new System.Drawing.Point(21, 27);
+ this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(80, 18);
+ this.label3.TabIndex = 84;
+ this.label3.Text = "缁� 缁�";
+ //
+ // label_HPlanQty
+ //
+ this.label_HPlanQty.AutoSize = true;
+ this.label_HPlanQty.Location = new System.Drawing.Point(20, 131);
+ this.label_HPlanQty.Name = "label_HPlanQty";
+ this.label_HPlanQty.Size = new System.Drawing.Size(80, 18);
+ this.label_HPlanQty.TabIndex = 92;
+ this.label_HPlanQty.Text = "璁″垝鏁伴噺";
+ this.label_HPlanQty.Visible = false;
+ //
+ // textBox_HQty
+ //
+ this.textBox_HQty.BackColor = System.Drawing.SystemColors.ScrollBar;
+ this.textBox_HQty.Enabled = false;
+ this.textBox_HQty.Location = new System.Drawing.Point(126, 175);
+ this.textBox_HQty.Name = "textBox_HQty";
+ this.textBox_HQty.Size = new System.Drawing.Size(280, 28);
+ this.textBox_HQty.TabIndex = 95;
+ this.textBox_HQty.Visible = false;
+ this.textBox_HQty.WordWrap = false;
+ //
+ // textBox_HPlanQty
+ //
+ this.textBox_HPlanQty.BackColor = System.Drawing.SystemColors.ScrollBar;
+ this.textBox_HPlanQty.Enabled = false;
+ this.textBox_HPlanQty.Location = new System.Drawing.Point(122, 128);
+ this.textBox_HPlanQty.Name = "textBox_HPlanQty";
+ this.textBox_HPlanQty.Size = new System.Drawing.Size(280, 28);
+ this.textBox_HPlanQty.TabIndex = 93;
+ this.textBox_HPlanQty.Visible = false;
+ //
+ // label10
+ //
+ this.label10.AutoSize = true;
+ this.label10.ForeColor = System.Drawing.Color.Black;
+ this.label10.Location = new System.Drawing.Point(597, 25);
+ this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(80, 18);
+ this.label10.TabIndex = 35;
+ this.label10.Text = "婧愬崟绫诲瀷";
+ //
+ // txtHSourceBillNo
+ //
+ this.txtHSourceBillNo.Font = new System.Drawing.Font("瀹嬩綋", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.txtHSourceBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHSourceBillNo.Location = new System.Drawing.Point(1280, 6);
+ this.txtHSourceBillNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHSourceBillNo.Multiline = true;
+ this.txtHSourceBillNo.Name = "txtHSourceBillNo";
+ this.txtHSourceBillNo.Size = new System.Drawing.Size(364, 64);
+ this.txtHSourceBillNo.TabIndex = 41;
+ this.txtHSourceBillNo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtHSourceBillNo_KeyPress);
+ //
+ // cmbSourceBillType
+ //
+ this.cmbSourceBillType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.cmbSourceBillType.FormattingEnabled = true;
+ this.cmbSourceBillType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.cmbSourceBillType.Location = new System.Drawing.Point(697, 19);
+ this.cmbSourceBillType.Margin = new System.Windows.Forms.Padding(4);
+ this.cmbSourceBillType.Name = "cmbSourceBillType";
+ this.cmbSourceBillType.Size = new System.Drawing.Size(280, 26);
+ this.cmbSourceBillType.TabIndex = 36;
+ //
+ // label14
+ //
+ this.label14.AutoSize = true;
+ this.label14.ForeColor = System.Drawing.Color.Black;
+ this.label14.Location = new System.Drawing.Point(1179, 12);
+ this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label14.Name = "label14";
+ this.label14.Size = new System.Drawing.Size(80, 18);
+ this.label14.TabIndex = 40;
+ this.label14.Text = "閫� 鍗� 鍙�";
+ //
+ // label_HQty
+ //
+ this.label_HQty.AutoSize = true;
+ this.label_HQty.Location = new System.Drawing.Point(21, 180);
+ this.label_HQty.Name = "label_HQty";
+ this.label_HQty.Size = new System.Drawing.Size(80, 18);
+ this.label_HQty.TabIndex = 94;
+ this.label_HQty.Text = "鐢熸垚鏁伴噺";
+ this.label_HQty.Visible = false;
+ //
+ // tabPage_ParamsInfo
+ //
+ this.tabPage_ParamsInfo.BackColor = System.Drawing.Color.Lavender;
+ this.tabPage_ParamsInfo.Controls.Add(this.groupBox_ParamsInfo);
+ this.tabPage_ParamsInfo.Location = new System.Drawing.Point(4, 28);
+ this.tabPage_ParamsInfo.Name = "tabPage_ParamsInfo";
+ this.tabPage_ParamsInfo.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage_ParamsInfo.Size = new System.Drawing.Size(1786, 314);
+ this.tabPage_ParamsInfo.TabIndex = 1;
+ this.tabPage_ParamsInfo.Text = "閰嶇疆淇℃伅";
+ //
+ // groupBox_ParamsInfo
+ //
+ this.groupBox_ParamsInfo.Controls.Add(this.textBox_WorkPositionParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.label_WorkPositionParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.textBox_TopicParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.label_TopicParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.textBox_ClientIDParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.label_ClientIDParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.textBox_PasswordParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.label_PasswordParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.textBox_UserParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.label_UserParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.button_resetParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.button_saveParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.textBox_PrintModelParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.label_PrintModelParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.comboBox_PrinterParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.label_PrinterParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.comboBox_SourceNameParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.label_SourceNameParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.textBox_PortParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.label_PortParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.textBox_IPParams);
+ this.groupBox_ParamsInfo.Controls.Add(this.label_IPParams);
+ this.groupBox_ParamsInfo.Location = new System.Drawing.Point(6, 6);
+ this.groupBox_ParamsInfo.Name = "groupBox_ParamsInfo";
+ this.groupBox_ParamsInfo.Size = new System.Drawing.Size(1287, 320);
+ this.groupBox_ParamsInfo.TabIndex = 0;
+ this.groupBox_ParamsInfo.TabStop = false;
+ //
+ // textBox_TopicParams
+ //
+ this.textBox_TopicParams.BackColor = System.Drawing.SystemColors.Window;
+ this.textBox_TopicParams.Location = new System.Drawing.Point(973, 121);
+ this.textBox_TopicParams.Name = "textBox_TopicParams";
+ this.textBox_TopicParams.Size = new System.Drawing.Size(280, 28);
+ this.textBox_TopicParams.TabIndex = 113;
+ //
+ // label_TopicParams
+ //
+ this.label_TopicParams.AutoSize = true;
+ this.label_TopicParams.Location = new System.Drawing.Point(871, 124);
+ this.label_TopicParams.Name = "label_TopicParams";
+ this.label_TopicParams.Size = new System.Drawing.Size(80, 18);
+ this.label_TopicParams.TabIndex = 112;
+ this.label_TopicParams.Text = "MQTT璇濋";
+ //
+ // textBox_ClientIDParams
+ //
+ this.textBox_ClientIDParams.BackColor = System.Drawing.SystemColors.Window;
+ this.textBox_ClientIDParams.Location = new System.Drawing.Point(973, 80);
+ this.textBox_ClientIDParams.Name = "textBox_ClientIDParams";
+ this.textBox_ClientIDParams.Size = new System.Drawing.Size(280, 28);
+ this.textBox_ClientIDParams.TabIndex = 111;
+ //
+ // label_ClientIDParams
+ //
+ this.label_ClientIDParams.AutoSize = true;
+ this.label_ClientIDParams.Location = new System.Drawing.Point(871, 83);
+ this.label_ClientIDParams.Name = "label_ClientIDParams";
+ this.label_ClientIDParams.Size = new System.Drawing.Size(80, 18);
+ this.label_ClientIDParams.TabIndex = 110;
+ this.label_ClientIDParams.Text = "瀹� 鎴� ID";
+ //
+ // textBox_PasswordParams
+ //
+ this.textBox_PasswordParams.BackColor = System.Drawing.SystemColors.Window;
+ this.textBox_PasswordParams.Location = new System.Drawing.Point(558, 80);
+ this.textBox_PasswordParams.Name = "textBox_PasswordParams";
+ this.textBox_PasswordParams.Size = new System.Drawing.Size(280, 28);
+ this.textBox_PasswordParams.TabIndex = 109;
+ //
+ // label_PasswordParams
+ //
+ this.label_PasswordParams.AutoSize = true;
+ this.label_PasswordParams.Location = new System.Drawing.Point(456, 83);
+ this.label_PasswordParams.Name = "label_PasswordParams";
+ this.label_PasswordParams.Size = new System.Drawing.Size(80, 18);
+ this.label_PasswordParams.TabIndex = 108;
+ this.label_PasswordParams.Text = "MQTT瀵嗙爜";
+ //
+ // textBox_UserParams
+ //
+ this.textBox_UserParams.BackColor = System.Drawing.SystemColors.Window;
+ this.textBox_UserParams.Location = new System.Drawing.Point(113, 77);
+ this.textBox_UserParams.Name = "textBox_UserParams";
+ this.textBox_UserParams.Size = new System.Drawing.Size(280, 28);
+ this.textBox_UserParams.TabIndex = 107;
+ //
+ // label_UserParams
+ //
+ this.label_UserParams.AutoSize = true;
+ this.label_UserParams.Location = new System.Drawing.Point(11, 80);
+ this.label_UserParams.Name = "label_UserParams";
+ this.label_UserParams.Size = new System.Drawing.Size(98, 18);
+ this.label_UserParams.TabIndex = 106;
+ this.label_UserParams.Text = "MQTT鐢ㄦ埛鍚�";
+ //
+ // button_resetParams
+ //
+ this.button_resetParams.Location = new System.Drawing.Point(590, 173);
+ this.button_resetParams.Name = "button_resetParams";
+ this.button_resetParams.Size = new System.Drawing.Size(153, 75);
+ this.button_resetParams.TabIndex = 105;
+ this.button_resetParams.Text = "閲� 缃�";
+ this.button_resetParams.UseVisualStyleBackColor = true;
+ this.button_resetParams.Click += new System.EventHandler(this.button_resetParams_Click);
+ //
+ // button_saveParams
+ //
+ this.button_saveParams.Location = new System.Drawing.Point(311, 173);
+ this.button_saveParams.Name = "button_saveParams";
+ this.button_saveParams.Size = new System.Drawing.Size(155, 75);
+ this.button_saveParams.TabIndex = 104;
+ this.button_saveParams.Text = "淇� 瀛�";
+ this.button_saveParams.UseVisualStyleBackColor = true;
+ this.button_saveParams.Click += new System.EventHandler(this.button_saveParams_Click);
+ //
+ // textBox_PrintModelParams
+ //
+ this.textBox_PrintModelParams.BackColor = System.Drawing.SystemColors.Window;
+ this.textBox_PrintModelParams.Location = new System.Drawing.Point(554, 123);
+ this.textBox_PrintModelParams.Name = "textBox_PrintModelParams";
+ this.textBox_PrintModelParams.Size = new System.Drawing.Size(280, 28);
+ this.textBox_PrintModelParams.TabIndex = 103;
+ //
+ // label_PrintModelParams
+ //
+ this.label_PrintModelParams.AutoSize = true;
+ this.label_PrintModelParams.Location = new System.Drawing.Point(452, 126);
+ this.label_PrintModelParams.Name = "label_PrintModelParams";
+ this.label_PrintModelParams.Size = new System.Drawing.Size(80, 18);
+ this.label_PrintModelParams.TabIndex = 102;
+ this.label_PrintModelParams.Text = "鎵撳嵃妯℃澘";
+ //
+ // comboBox_PrinterParams
+ //
+ this.comboBox_PrinterParams.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBox_PrinterParams.FormattingEnabled = true;
+ this.comboBox_PrinterParams.Location = new System.Drawing.Point(113, 123);
+ this.comboBox_PrinterParams.Margin = new System.Windows.Forms.Padding(4);
+ this.comboBox_PrinterParams.Name = "comboBox_PrinterParams";
+ this.comboBox_PrinterParams.Size = new System.Drawing.Size(280, 26);
+ this.comboBox_PrinterParams.TabIndex = 101;
+ //
+ // label_PrinterParams
+ //
+ this.label_PrinterParams.AutoSize = true;
+ this.label_PrinterParams.ForeColor = System.Drawing.Color.Black;
+ this.label_PrinterParams.Location = new System.Drawing.Point(13, 129);
+ this.label_PrinterParams.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label_PrinterParams.Name = "label_PrinterParams";
+ this.label_PrinterParams.Size = new System.Drawing.Size(80, 18);
+ this.label_PrinterParams.TabIndex = 100;
+ this.label_PrinterParams.Text = "鎵� 鍗� 鏈�";
+ //
+ // comboBox_SourceNameParams
+ //
+ this.comboBox_SourceNameParams.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBox_SourceNameParams.FormattingEnabled = true;
+ this.comboBox_SourceNameParams.Location = new System.Drawing.Point(973, 31);
+ this.comboBox_SourceNameParams.Margin = new System.Windows.Forms.Padding(4);
+ this.comboBox_SourceNameParams.Name = "comboBox_SourceNameParams";
+ this.comboBox_SourceNameParams.Size = new System.Drawing.Size(280, 26);
+ this.comboBox_SourceNameParams.TabIndex = 99;
+ //
+ // label_SourceNameParams
+ //
+ this.label_SourceNameParams.AutoSize = true;
+ this.label_SourceNameParams.ForeColor = System.Drawing.Color.Black;
+ this.label_SourceNameParams.Location = new System.Drawing.Point(873, 37);
+ this.label_SourceNameParams.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label_SourceNameParams.Name = "label_SourceNameParams";
+ this.label_SourceNameParams.Size = new System.Drawing.Size(80, 18);
+ this.label_SourceNameParams.TabIndex = 98;
+ this.label_SourceNameParams.Text = "浜� 绾�";
+ //
+ // textBox_PortParams
+ //
+ this.textBox_PortParams.BackColor = System.Drawing.SystemColors.Window;
+ this.textBox_PortParams.Location = new System.Drawing.Point(558, 31);
+ this.textBox_PortParams.Name = "textBox_PortParams";
+ this.textBox_PortParams.Size = new System.Drawing.Size(280, 28);
+ this.textBox_PortParams.TabIndex = 97;
+ //
+ // label_PortParams
+ //
+ this.label_PortParams.AutoSize = true;
+ this.label_PortParams.Location = new System.Drawing.Point(456, 34);
+ this.label_PortParams.Name = "label_PortParams";
+ this.label_PortParams.Size = new System.Drawing.Size(80, 18);
+ this.label_PortParams.TabIndex = 96;
+ this.label_PortParams.Text = "绔� 鍙�";
+ //
+ // textBox_IPParams
+ //
+ this.textBox_IPParams.BackColor = System.Drawing.SystemColors.Window;
+ this.textBox_IPParams.Location = new System.Drawing.Point(113, 28);
+ this.textBox_IPParams.Name = "textBox_IPParams";
+ this.textBox_IPParams.Size = new System.Drawing.Size(280, 28);
+ this.textBox_IPParams.TabIndex = 95;
+ //
+ // label_IPParams
+ //
+ this.label_IPParams.AutoSize = true;
+ this.label_IPParams.Location = new System.Drawing.Point(11, 31);
+ this.label_IPParams.Name = "label_IPParams";
+ this.label_IPParams.Size = new System.Drawing.Size(71, 18);
+ this.label_IPParams.TabIndex = 94;
+ this.label_IPParams.Text = " IP";
+ //
+ // pic1
+ //
+ this.pic1.Location = new System.Drawing.Point(470, 4);
+ this.pic1.Margin = new System.Windows.Forms.Padding(4);
+ this.pic1.Name = "pic1";
+ this.pic1.Size = new System.Drawing.Size(117, 62);
+ this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pic1.TabIndex = 36;
+ this.pic1.TabStop = false;
+ this.pic1.Visible = false;
+ //
+ // panel2
+ //
+ this.panel2.BackColor = System.Drawing.Color.Lavender;
+ this.panel2.Controls.Add(this.txtHDeleteDate);
+ this.panel2.Controls.Add(this.label25);
+ this.panel2.Controls.Add(this.txtHDeleteMan);
+ this.panel2.Controls.Add(this.label27);
+ this.panel2.Controls.Add(this.txtHUpDateDate);
+ this.panel2.Controls.Add(this.label23);
+ this.panel2.Controls.Add(this.txtHUpDater);
+ this.panel2.Controls.Add(this.label21);
+ this.panel2.Controls.Add(this.txtHCloseDate);
+ this.panel2.Controls.Add(this.label19);
+ this.panel2.Controls.Add(this.txtHCloseMan);
+ this.panel2.Controls.Add(this.label17);
+ this.panel2.Controls.Add(this.txtHCheckDate);
+ this.panel2.Controls.Add(this.label15);
+ this.panel2.Controls.Add(this.txtHChecker);
+ this.panel2.Controls.Add(this.label13);
+ this.panel2.Controls.Add(this.txtHMakeDate);
+ this.panel2.Controls.Add(this.label11);
+ this.panel2.Controls.Add(this.txtHMaker);
+ this.panel2.Controls.Add(this.label8);
+ this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panel2.Location = new System.Drawing.Point(62, 758);
+ this.panel2.Margin = new System.Windows.Forms.Padding(4);
+ this.panel2.Name = "panel2";
+ this.panel2.Size = new System.Drawing.Size(1804, 140);
+ this.panel2.TabIndex = 32;
+ //
+ // txtHDeleteDate
+ //
+ this.txtHDeleteDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHDeleteDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHDeleteDate.Location = new System.Drawing.Point(1088, 70);
+ this.txtHDeleteDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHDeleteDate.Name = "txtHDeleteDate";
+ this.txtHDeleteDate.Size = new System.Drawing.Size(147, 22);
+ this.txtHDeleteDate.TabIndex = 19;
+ //
+ // label25
+ //
+ this.label25.AutoSize = true;
+ this.label25.BackColor = System.Drawing.Color.Transparent;
+ this.label25.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label25.Location = new System.Drawing.Point(999, 75);
+ this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label25.Name = "label25";
+ this.label25.Size = new System.Drawing.Size(80, 18);
+ this.label25.TabIndex = 18;
+ this.label25.Text = "浣滃簾鏃ユ湡";
+ //
+ // txtHDeleteMan
+ //
+ this.txtHDeleteMan.BackColor = System.Drawing.Color.Transparent;
+ this.txtHDeleteMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHDeleteMan.Location = new System.Drawing.Point(1088, 18);
+ this.txtHDeleteMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHDeleteMan.Name = "txtHDeleteMan";
+ this.txtHDeleteMan.Size = new System.Drawing.Size(147, 22);
+ this.txtHDeleteMan.TabIndex = 17;
+ //
+ // label27
+ //
+ this.label27.AutoSize = true;
+ this.label27.BackColor = System.Drawing.Color.Transparent;
+ this.label27.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label27.Location = new System.Drawing.Point(999, 18);
+ this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label27.Name = "label27";
+ this.label27.Size = new System.Drawing.Size(62, 18);
+ this.label27.TabIndex = 16;
+ this.label27.Text = "浣滃簾浜�";
+ //
+ // txtHUpDateDate
+ //
+ this.txtHUpDateDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHUpDateDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHUpDateDate.Location = new System.Drawing.Point(843, 70);
+ this.txtHUpDateDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHUpDateDate.Name = "txtHUpDateDate";
+ this.txtHUpDateDate.Size = new System.Drawing.Size(147, 22);
+ this.txtHUpDateDate.TabIndex = 15;
+ //
+ // label23
+ //
+ this.label23.AutoSize = true;
+ this.label23.BackColor = System.Drawing.Color.Transparent;
+ this.label23.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label23.Location = new System.Drawing.Point(754, 70);
+ this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label23.Name = "label23";
+ this.label23.Size = new System.Drawing.Size(80, 18);
+ this.label23.TabIndex = 14;
+ this.label23.Text = "淇敼鏃ユ湡";
+ //
+ // txtHUpDater
+ //
+ this.txtHUpDater.BackColor = System.Drawing.Color.Transparent;
+ this.txtHUpDater.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHUpDater.Location = new System.Drawing.Point(843, 18);
+ this.txtHUpDater.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHUpDater.Name = "txtHUpDater";
+ this.txtHUpDater.Size = new System.Drawing.Size(147, 22);
+ this.txtHUpDater.TabIndex = 13;
+ //
+ // label21
+ //
+ this.label21.AutoSize = true;
+ this.label21.BackColor = System.Drawing.Color.Transparent;
+ this.label21.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label21.Location = new System.Drawing.Point(754, 18);
+ this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label21.Name = "label21";
+ this.label21.Size = new System.Drawing.Size(62, 18);
+ this.label21.TabIndex = 12;
+ this.label21.Text = "淇敼浜�";
+ //
+ // txtHCloseDate
+ //
+ this.txtHCloseDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHCloseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHCloseDate.Location = new System.Drawing.Point(596, 70);
+ this.txtHCloseDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHCloseDate.Name = "txtHCloseDate";
+ this.txtHCloseDate.Size = new System.Drawing.Size(147, 22);
+ this.txtHCloseDate.TabIndex = 11;
+ //
+ // label19
+ //
+ this.label19.AutoSize = true;
+ this.label19.BackColor = System.Drawing.Color.Transparent;
+ this.label19.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label19.Location = new System.Drawing.Point(507, 75);
+ this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label19.Name = "label19";
+ this.label19.Size = new System.Drawing.Size(80, 18);
+ this.label19.TabIndex = 10;
+ this.label19.Text = "鍏抽棴鏃ユ湡";
+ //
+ // txtHCloseMan
+ //
+ this.txtHCloseMan.BackColor = System.Drawing.Color.Transparent;
+ this.txtHCloseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHCloseMan.Location = new System.Drawing.Point(594, 20);
+ this.txtHCloseMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHCloseMan.Name = "txtHCloseMan";
+ this.txtHCloseMan.Size = new System.Drawing.Size(147, 22);
+ this.txtHCloseMan.TabIndex = 9;
+ //
+ // label17
+ //
+ this.label17.AutoSize = true;
+ this.label17.BackColor = System.Drawing.Color.Transparent;
+ this.label17.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label17.Location = new System.Drawing.Point(507, 24);
+ this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label17.Name = "label17";
+ this.label17.Size = new System.Drawing.Size(62, 18);
+ this.label17.TabIndex = 8;
+ this.label17.Text = "鍏抽棴浜�";
+ //
+ // txtHCheckDate
+ //
+ this.txtHCheckDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHCheckDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHCheckDate.Location = new System.Drawing.Point(351, 70);
+ this.txtHCheckDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHCheckDate.Name = "txtHCheckDate";
+ this.txtHCheckDate.Size = new System.Drawing.Size(147, 22);
+ this.txtHCheckDate.TabIndex = 7;
+ //
+ // label15
+ //
+ this.label15.AutoSize = true;
+ this.label15.BackColor = System.Drawing.Color.Transparent;
+ this.label15.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label15.Location = new System.Drawing.Point(262, 75);
+ this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label15.Name = "label15";
+ this.label15.Size = new System.Drawing.Size(80, 18);
+ this.label15.TabIndex = 6;
+ this.label15.Text = "瀹℃牳鏃ユ湡";
+ //
+ // txtHChecker
+ //
+ this.txtHChecker.BackColor = System.Drawing.Color.Transparent;
+ this.txtHChecker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHChecker.Location = new System.Drawing.Point(351, 20);
+ this.txtHChecker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHChecker.Name = "txtHChecker";
+ this.txtHChecker.Size = new System.Drawing.Size(147, 22);
+ this.txtHChecker.TabIndex = 5;
+ //
+ // label13
+ //
+ this.label13.AutoSize = true;
+ this.label13.BackColor = System.Drawing.Color.Transparent;
+ this.label13.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label13.Location = new System.Drawing.Point(262, 24);
+ this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label13.Name = "label13";
+ this.label13.Size = new System.Drawing.Size(62, 18);
+ this.label13.TabIndex = 4;
+ this.label13.Text = "瀹℃牳浜�";
+ //
+ // txtHMakeDate
+ //
+ this.txtHMakeDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHMakeDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHMakeDate.Location = new System.Drawing.Point(106, 70);
+ this.txtHMakeDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHMakeDate.Name = "txtHMakeDate";
+ this.txtHMakeDate.Size = new System.Drawing.Size(147, 22);
+ this.txtHMakeDate.TabIndex = 3;
+ //
+ // label11
+ //
+ this.label11.AutoSize = true;
+ this.label11.BackColor = System.Drawing.Color.Transparent;
+ this.label11.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label11.Location = new System.Drawing.Point(18, 75);
+ this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(80, 18);
+ this.label11.TabIndex = 2;
+ this.label11.Text = "鍒跺崟鏃ユ湡";
+ //
+ // txtHMaker
+ //
+ this.txtHMaker.BackColor = System.Drawing.Color.Transparent;
+ this.txtHMaker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHMaker.Location = new System.Drawing.Point(106, 20);
+ this.txtHMaker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHMaker.Name = "txtHMaker";
+ this.txtHMaker.Size = new System.Drawing.Size(147, 22);
+ this.txtHMaker.TabIndex = 1;
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.BackColor = System.Drawing.Color.Transparent;
+ this.label8.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label8.Location = new System.Drawing.Point(18, 24);
+ this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(62, 18);
+ this.label8.TabIndex = 0;
+ this.label8.Text = "鍒跺崟浜�";
+ //
+ // timer1
+ //
+ this.timer1.Enabled = true;
+ this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+ //
+ // panel1
+ //
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.panel1.Location = new System.Drawing.Point(0, 75);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(62, 823);
+ this.panel1.TabIndex = 33;
+ //
+ // panel3
+ //
+ this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
+ this.panel3.Location = new System.Drawing.Point(1866, 75);
+ this.panel3.Margin = new System.Windows.Forms.Padding(4);
+ this.panel3.Name = "panel3";
+ this.panel3.Size = new System.Drawing.Size(58, 823);
+ this.panel3.TabIndex = 34;
+ //
+ // grdSum
+ //
+ this.grdSum.AllowUserToAddRows = false;
+ this.grdSum.AllowUserToDeleteRows = false;
+ this.grdSum.BackgroundColor = System.Drawing.Color.Khaki;
+ this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.grdSum.Location = new System.Drawing.Point(62, 730);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Name = "grdSum";
+ this.grdSum.ReadOnly = true;
+ this.grdSum.RowHeadersWidth = 51;
+ this.grdSum.RowTemplate.Height = 23;
+ this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
+ this.grdSum.Size = new System.Drawing.Size(1804, 28);
+ this.grdSum.TabIndex = 45;
+ //
+ // grdPrint
+ //
+ this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdPrint.Location = new System.Drawing.Point(1214, 814);
+ this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
+ this.grdPrint.Name = "grdPrint";
+ this.grdPrint.RowHeadersWidth = 51;
+ this.grdPrint.RowTemplate.Height = 23;
+ this.grdPrint.Size = new System.Drawing.Size(38, 36);
+ this.grdPrint.TabIndex = 46;
+ this.grdPrint.Visible = false;
+ //
+ // tabPage3
+ //
+ this.tabPage3.Controls.Add(this.grdList);
+ this.tabPage3.Location = new System.Drawing.Point(4, 5);
+ this.tabPage3.Margin = new System.Windows.Forms.Padding(4);
+ this.tabPage3.Name = "tabPage3";
+ this.tabPage3.Size = new System.Drawing.Size(1796, 288);
+ this.tabPage3.TabIndex = 2;
+ this.tabPage3.Text = "妗ｆ鍒楄〃";
+ this.tabPage3.UseVisualStyleBackColor = true;
+ //
+ // grdList
+ //
+ this.grdList.AllowUserToAddRows = false;
+ this.grdList.AllowUserToDeleteRows = false;
+ this.grdList.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+ this.grdList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.grdList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdList.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdList.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.grdList.Location = new System.Drawing.Point(0, 0);
+ this.grdList.Margin = new System.Windows.Forms.Padding(4);
+ this.grdList.Name = "grdList";
+ this.grdList.ReadOnly = true;
+ this.grdList.RowHeadersWidth = 30;
+ this.grdList.RowTemplate.Height = 23;
+ this.grdList.Size = new System.Drawing.Size(1796, 288);
+ this.grdList.TabIndex = 46;
+ //
+ // tabPage2
+ //
+ this.tabPage2.Controls.Add(this.grdSub);
+ this.tabPage2.Location = new System.Drawing.Point(4, 5);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(4);
+ this.tabPage2.Name = "tabPage2";
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(4);
+ this.tabPage2.Size = new System.Drawing.Size(1796, 288);
+ this.tabPage2.TabIndex = 1;
+ this.tabPage2.Text = "鏉＄爜淇℃伅";
+ this.tabPage2.UseVisualStyleBackColor = true;
+ //
+ // grdSub
+ //
+ this.grdSub.AllowUserToAddRows = false;
+ this.grdSub.AllowUserToDeleteRows = false;
+ this.grdSub.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+ this.grdSub.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdSub.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.grdSub.Location = new System.Drawing.Point(4, 4);
+ this.grdSub.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSub.Name = "grdSub";
+ this.grdSub.ReadOnly = true;
+ this.grdSub.RowHeadersWidth = 30;
+ this.grdSub.RowTemplate.Height = 23;
+ this.grdSub.Size = new System.Drawing.Size(1788, 280);
+ this.grdSub.TabIndex = 45;
+ //
+ // tabPage1
+ //
+ this.tabPage1.Controls.Add(this.grdMain);
+ this.tabPage1.Location = new System.Drawing.Point(4, 5);
+ this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
+ this.tabPage1.Name = "tabPage1";
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
+ this.tabPage1.Size = new System.Drawing.Size(1796, 288);
+ this.tabPage1.TabIndex = 0;
+ this.tabPage1.Text = "鐗╂枡淇℃伅";
+ this.tabPage1.UseVisualStyleBackColor = true;
+ //
+ // grdMain
+ //
+ this.grdMain.AllowUserToAddRows = false;
+ this.grdMain.AllowUserToDeleteRows = false;
+ this.grdMain.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+ this.grdMain.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdMain.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.grdMain.Location = new System.Drawing.Point(4, 4);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Name = "grdMain";
+ this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 30;
+ this.grdMain.RowTemplate.Height = 23;
+ this.grdMain.Size = new System.Drawing.Size(1788, 280);
+ this.grdMain.TabIndex = 44;
+ //
+ // tabControl1
+ //
+ this.tabControl1.Controls.Add(this.tabPage1);
+ this.tabControl1.Controls.Add(this.tabPage2);
+ this.tabControl1.Controls.Add(this.tabPage3);
+ this.tabControl1.Controls.Add(this.tabPage4);
+ this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabControl1.ItemSize = new System.Drawing.Size(0, 1);
+ this.tabControl1.Location = new System.Drawing.Point(62, 433);
+ this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
+ this.tabControl1.Name = "tabControl1";
+ this.tabControl1.SelectedIndex = 0;
+ this.tabControl1.Size = new System.Drawing.Size(1804, 297);
+ this.tabControl1.SizeMode = System.Windows.Forms.TabSizeMode.Fixed;
+ this.tabControl1.TabIndex = 47;
+ this.tabControl1.TabStop = false;
+ //
+ // tabPage4
+ //
+ this.tabPage4.Controls.Add(this.grdBillBarCodeList);
+ this.tabPage4.Location = new System.Drawing.Point(4, 5);
+ this.tabPage4.Name = "tabPage4";
+ this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage4.Size = new System.Drawing.Size(1796, 288);
+ this.tabPage4.TabIndex = 3;
+ this.tabPage4.Text = "宸ュ崟鏉＄爜";
+ this.tabPage4.UseVisualStyleBackColor = true;
+ //
+ // grdBillBarCodeList
+ //
+ this.grdBillBarCodeList.AllowUserToAddRows = false;
+ this.grdBillBarCodeList.AllowUserToDeleteRows = false;
+ this.grdBillBarCodeList.BackgroundColor = System.Drawing.Color.WhiteSmoke;
+ this.grdBillBarCodeList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.grdBillBarCodeList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.grdBillBarCodeList.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.grdBillBarCodeList.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.grdBillBarCodeList.Location = new System.Drawing.Point(3, 3);
+ this.grdBillBarCodeList.Margin = new System.Windows.Forms.Padding(4);
+ this.grdBillBarCodeList.Name = "grdBillBarCodeList";
+ this.grdBillBarCodeList.ReadOnly = true;
+ this.grdBillBarCodeList.RowHeadersWidth = 30;
+ this.grdBillBarCodeList.RowTemplate.Height = 23;
+ this.grdBillBarCodeList.Size = new System.Drawing.Size(1790, 282);
+ this.grdBillBarCodeList.TabIndex = 47;
+ //
+ // pageSetupDialog1
+ //
+ this.pageSetupDialog1.Document = this.printDocument1;
+ //
+ // printDialog1
+ //
+ this.printDialog1.Document = this.printDocument1;
+ this.printDialog1.UseEXDialog = true;
+ //
+ // printPreviewDialog1
+ //
+ this.printPreviewDialog1.AutoScrollMargin = new System.Drawing.Size(0, 0);
+ this.printPreviewDialog1.AutoScrollMinSize = new System.Drawing.Size(0, 0);
+ this.printPreviewDialog1.ClientSize = new System.Drawing.Size(400, 300);
+ this.printPreviewDialog1.Document = this.printDocument1;
+ this.printPreviewDialog1.Enabled = true;
+ this.printPreviewDialog1.Icon = ((System.Drawing.Icon)(resources.GetObject("printPreviewDialog1.Icon")));
+ this.printPreviewDialog1.Name = "printPreviewDialog1";
+ this.printPreviewDialog1.Visible = false;
+ //
+ // timer2
+ //
+ this.timer2.Enabled = true;
+ this.timer2.Tick += new System.EventHandler(this.timer2_Tick);
+ //
+ // timer3
+ //
+ this.timer3.Interval = 5000;
+ this.timer3.Tick += new System.EventHandler(this.timer3_Tick);
+ //
+ // textBox_WorkPositionParams
+ //
+ this.textBox_WorkPositionParams.BackColor = System.Drawing.SystemColors.Window;
+ this.textBox_WorkPositionParams.Location = new System.Drawing.Point(973, 164);
+ this.textBox_WorkPositionParams.Name = "textBox_WorkPositionParams";
+ this.textBox_WorkPositionParams.Size = new System.Drawing.Size(280, 28);
+ this.textBox_WorkPositionParams.TabIndex = 115;
+ //
+ // label_WorkPositionParams
+ //
+ this.label_WorkPositionParams.AutoSize = true;
+ this.label_WorkPositionParams.Location = new System.Drawing.Point(871, 167);
+ this.label_WorkPositionParams.Name = "label_WorkPositionParams";
+ this.label_WorkPositionParams.Size = new System.Drawing.Size(80, 18);
+ this.label_WorkPositionParams.TabIndex = 114;
+ this.label_WorkPositionParams.Text = "MQTT宸ヤ綅";
+ //
+ // Gy_BarCodeBill_automaticallyByPLC_New_Change
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackColor = System.Drawing.Color.Lavender;
+ this.ClientSize = new System.Drawing.Size(1924, 898);
+ this.Controls.Add(this.tabControl1);
+ this.Controls.Add(this.grdSum);
+ this.Controls.Add(this.panel2);
+ this.Controls.Add(this.P1);
+ this.Controls.Add(this.panel1);
+ this.Controls.Add(this.panel3);
+ this.Controls.Add(this.Tool);
+ this.Controls.Add(this.grdPrint);
+ this.ForeColor = System.Drawing.Color.Black;
+ this.KeyPreview = true;
+ this.Margin = new System.Windows.Forms.Padding(4);
+ this.Name = "Gy_BarCodeBill_automaticallyByPLC_New_Change";
+ this.Text = "鍗曟嵁缂栬緫";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Gy_BarCodeBill_FormClosing);
+ this.Load += new System.EventHandler(this.Gy_BarCodeBill_Load);
+ this.Paint += new System.Windows.Forms.PaintEventHandler(this.Gy_BarCodeBill_Paint);
+ this.Resize += new System.EventHandler(this.Gy_BarCodeBill_Resize);
+ this.Tool.ResumeLayout(false);
+ this.Tool.PerformLayout();
+ this.P1.ResumeLayout(false);
+ this.P1.PerformLayout();
+ this.tabControl_MainInfo.ResumeLayout(false);
+ this.tabPage_BillInfo.ResumeLayout(false);
+ this.gbUp.ResumeLayout(false);
+ this.gbUp.PerformLayout();
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.tabPage_ParamsInfo.ResumeLayout(false);
+ this.groupBox_ParamsInfo.ResumeLayout(false);
+ this.groupBox_ParamsInfo.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pic1)).EndInit();
+ this.panel2.ResumeLayout(false);
+ this.panel2.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.grdSum)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.grdPrint)).EndInit();
+ this.tabPage3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdList)).EndInit();
+ this.tabPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdSub)).EndInit();
+ this.tabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdMain)).EndInit();
+ this.tabControl1.ResumeLayout(false);
+ this.tabPage4.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.grdBillBarCodeList)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.ToolStrip Tool;
+ private System.Windows.Forms.ToolStripButton yl;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+ private System.Windows.Forms.ToolStripButton bc;
+ private System.Windows.Forms.ToolStripButton cz;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
+ private System.Windows.Forms.Label lblCaption;
+ private System.Windows.Forms.Panel P1;
+ private System.Windows.Forms.Panel panel2;
+ private System.Windows.Forms.Label txtHMaker;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Label txtHUpDateDate;
+ private System.Windows.Forms.Label label23;
+ private System.Windows.Forms.Label txtHUpDater;
+ private System.Windows.Forms.Label label21;
+ private System.Windows.Forms.Label txtHCloseDate;
+ private System.Windows.Forms.Label label19;
+ private System.Windows.Forms.Label txtHCloseMan;
+ private System.Windows.Forms.Label label17;
+ private System.Windows.Forms.Label txtHCheckDate;
+ private System.Windows.Forms.Label label15;
+ private System.Windows.Forms.Label txtHChecker;
+ private System.Windows.Forms.Label label13;
+ private System.Windows.Forms.Label txtHMakeDate;
+ private System.Windows.Forms.Label label11;
+ private System.Windows.Forms.Label txtHDeleteDate;
+ private System.Windows.Forms.Label label25;
+ private System.Windows.Forms.Label txtHDeleteMan;
+ private System.Windows.Forms.Label label27;
+ private System.Windows.Forms.Timer timer1;
+ private System.Windows.Forms.ToolStripButton AddRow;
+ private System.Windows.Forms.ToolStripButton DelRow;
+ private System.Windows.Forms.GroupBox gbUp;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.ComboBox cmbSourceBillType;
+ private System.Windows.Forms.TextBox txtHSourceBillNo;
+ private System.Windows.Forms.Label label14;
+ private System.Windows.Forms.ToolStripButton tc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
+ private System.Windows.Forms.ToolStripButton mrlk;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
+ private System.Windows.Forms.ToolStripButton bclk;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;
+ private System.Windows.Forms.PictureBox pic1;
+ private System.Windows.Forms.Panel panel1;
+ private System.Windows.Forms.Panel panel3;
+ private System.Windows.Forms.DataGridView grdSum;
+ private System.Windows.Forms.DataGridView grdPrint;
+ private System.Windows.Forms.ComboBox cmbHBarCodeType;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.ToolStripButton dy;
+ private System.Windows.Forms.ToolStripButton kc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+ private System.Windows.Forms.ComboBox cmbHOrgID;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.ToolStripButton tb;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+ private System.Windows.Forms.ComboBox cmbHWorksNumber;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.DateTimePicker dtpHDate;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.ToolStripButton spRow;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
+ private System.Windows.Forms.ToolStripButton gl;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
+ private System.Windows.Forms.ToolStripButton BatchNo;
+ private System.Windows.Forms.ToolStripButton sdy;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
+ private System.Windows.Forms.ToolStripButton wxm;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator9;
+ private System.Windows.Forms.TabPage tabPage3;
+ private System.Windows.Forms.TabPage tabPage2;
+ private System.Windows.Forms.DataGridView grdSub;
+ private System.Windows.Forms.TabPage tabPage1;
+ private System.Windows.Forms.TabControl tabControl1;
+ private System.Windows.Forms.DataGridView grdList;
+ private System.Windows.Forms.DataGridView grdMain;
+ private System.Windows.Forms.TabPage tabPage4;
+ private System.Windows.Forms.DataGridView grdBillBarCodeList;
+ private System.Windows.Forms.TabControl tabControl_MainInfo;
+ private System.Windows.Forms.TabPage tabPage_BillInfo;
+ private System.Windows.Forms.RadioButton radioButton_HIsUsingBatchNo;
+ private System.Windows.Forms.Button button_stopListen;
+ private System.Windows.Forms.Button button_startListen;
+ private System.Windows.Forms.TextBox textBox_HQty;
+ private System.Windows.Forms.Label label_HQty;
+ private System.Windows.Forms.TextBox textBox_HPlanQty;
+ private System.Windows.Forms.Label label_HPlanQty;
+ private System.Windows.Forms.TextBox textBox_HMaterModel;
+ private System.Windows.Forms.Label label_HMaterModel;
+ private System.Windows.Forms.TextBox textBox_HMaterName;
+ private System.Windows.Forms.Label label_HMaterName;
+ private System.Windows.Forms.TextBox textBox_HMaterNumber;
+ private System.Windows.Forms.Label label_HMaterNumber;
+ private System.Windows.Forms.TextBox textBox_SourceName;
+ private System.Windows.Forms.Label label_SourceName;
+ private System.Windows.Forms.TabPage tabPage_ParamsInfo;
+ private System.Windows.Forms.GroupBox groupBox_ParamsInfo;
+ private System.Windows.Forms.Button button_resetParams;
+ private System.Windows.Forms.Button button_saveParams;
+ private System.Windows.Forms.TextBox textBox_PrintModelParams;
+ private System.Windows.Forms.Label label_PrintModelParams;
+ private System.Windows.Forms.ComboBox comboBox_PrinterParams;
+ private System.Windows.Forms.Label label_PrinterParams;
+ private System.Windows.Forms.ComboBox comboBox_SourceNameParams;
+ private System.Windows.Forms.Label label_SourceNameParams;
+ private System.Windows.Forms.TextBox textBox_PortParams;
+ private System.Windows.Forms.Label label_PortParams;
+ private System.Windows.Forms.TextBox textBox_IPParams;
+ private System.Windows.Forms.Label label_IPParams;
+ private System.Windows.Forms.Button cmdSourceBillNo;
+ private System.Windows.Forms.PageSetupDialog pageSetupDialog1;
+ private System.Drawing.Printing.PrintDocument printDocument1;
+ private System.Windows.Forms.PrintDialog printDialog1;
+ private System.Windows.Forms.PrintPreviewDialog printPreviewDialog1;
+ private System.Windows.Forms.Timer timer2;
+ private System.Windows.Forms.Timer timer3;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.RadioButton radioButton_IsPrint_No;
+ private System.Windows.Forms.RadioButton radioButton_IsPrint_Yes;
+ private System.Windows.Forms.TextBox textBox_PasswordParams;
+ private System.Windows.Forms.Label label_PasswordParams;
+ private System.Windows.Forms.TextBox textBox_UserParams;
+ private System.Windows.Forms.Label label_UserParams;
+ private System.Windows.Forms.TextBox textBox_ClientIDParams;
+ private System.Windows.Forms.Label label_ClientIDParams;
+ private System.Windows.Forms.TextBox textBox_TopicParams;
+ private System.Windows.Forms.Label label_TopicParams;
+ private System.Windows.Forms.TextBox textBox_WorkPositionParams;
+ private System.Windows.Forms.Label label_WorkPositionParams;
+ }
+}
\ No newline at end of file
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.resx" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.resx"
new file mode 100644
index 0000000..8ff7f84
--- /dev/null
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill_automaticallyByPLC_New_Change.resx"
@@ -0,0 +1,769 @@
+<?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="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="Tool.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ /9j/4AAQSkZJRgABAQEASABIAAD/4QSARXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
+ AAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAUAAAAcgEyAAIAAAAUAAAAhodpAAQAAAAB
+ AAAAmgAAAMYASAAAAAEAAABIAAAAAQAAQWRvYmUgUGhvdG9zaG9wIDcuMAAyMDA0OjEwOjE0IDE1OjUw
+ OjUwAAADoAEAAwAAAAH//wAAoAIABAAAAAEAAAQAoAMABAAAAAEAAABoAAAAAAAAAAYBAwADAAAAAQAG
+ AAABGgAFAAAAAQAAARQBGwAFAAAAAQAAARwBKAADAAAAAQACAAACAQAEAAAAAQAAASQCAgAEAAAAAQAA
+ A1QAAAAAAAAASAAAAAEAAABIAAAAAf/Y/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMPFB0aHx4d
+ GhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIyMjIyMjIy
+ MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgABgCgAwEhAAIRAQMR
+ Af/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAE
+ EQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElK
+ U1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrC
+ w8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAAB
+ AgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkj
+ M1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5
+ eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm
+ 5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A9P8A+EAsf+fy4o/4QCy/5/Liuv6z/dOf2HmH/CAWX/P5
+ cUf8IBZf8/lz+lH1n+6HsPMP+EAsv+fy5/Oj/hALL/n8uKPrP90PYeYf8IBZf8/lxR/wgFl/z+XFH1n+
+ 6HsPMP8AhALL/n8uKP8AhX9j/wA/lxR9Z/uh7B9w/wCFf2P/AD+XFH/CAWP/AD+XFH1n+6HsH3D/AIQC
+ x/5/Lij/AIQCy/5/Lij6z/dD2HmH/CAWX/P5cUf8K/sf+fy4o+tf3Q9h5h/wgFj/AM/lxR/wgFl/z+XF
+ H1r+6HsPMP8AhALL/n8uKP8AhALL/n8uKPrX90PYeZ//2f/bAEMAAgEBAgEBAgICAgICAgIDBQMDAwMD
+ BgQEAwUHBgcHBwYHBwgJCwkICAoIBwcKDQoKCwwMDAwHCQ4PDQwOCwwMDP/bAEMBAgICAwMDBgMDBgwI
+ BwgMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDP/AABEIACoE
+ AAMBIgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUE
+ BAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4
+ OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmq
+ srO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEB
+ AQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIy
+ gQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZn
+ aGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV
+ 1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/APWB+2p4nH/MN0Qf9w20/wDjNL/w2t4o
+ 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
+</value>
+ </data>
+ <data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
+ grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
+ FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
+ u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="sdy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
+ V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
+ 9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
+ f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
+ NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
+ BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
+ AABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
+ V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
+ 9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
+ f7HKuoh2wcgCX7FfROMpZvmw7V68mxSHTx4gm0DXCbAYEefyyNSsgQXeowl8RDmmPMAnEhg7BzS34ss8
+ NghoSgE55YDvFRCSSahvgMM34El8YX+8JjAyrka/Yhh9iiHJcuA49IxA4BquF+DsG3hoFGiKwsP+4ioN
+ BMV7oHO6NqcawJG+u/2IXN1kL/JBgsgOwZ6up82IDNUgQdhDwF12GKDQCLXjQAVC/gBsYdYbXS03WwAA
+ AABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ 9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
+ W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
+ mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
+ jP+Ny1r/F00v+5/akQW3DWQzSDNWF6CHwcbdGzAwSAPMZhjAagByLIDwiuXLwRhmK4YBZ8+cIRqD1CMD
+ sAGkYmRAYXb+/x8A86/iJXr/E3YAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="spRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ 9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
+ W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
+ mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
+ jP+Ny1r/F00v+5/akQW3DWQzSDNWF6CHwcbdGzAwSAPMZhjAagByLIDwiuXLwRhmK4YBZ8+cIRqD1CMD
+ sAGkYmRAYXb+/x8A86/iJXr/E3YAAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ /gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
+ mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
+ ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
+ rTWjutBHQN0+oOxgCbE4NuIJW2tGJc4jgNvvgUu9LLzYhHRuQ96Yp1vvdWwjt2UR0mVA6vdf4h1+hSv9
+ BDxfh1R+huS/ghR0Hnd+Bxu+QKrdcEwkmY2dAAwQ8DScGe8sSRUbqj0Y+c5zR+QUwOOQFbz2EtKyij+/
+ rTc/69tFKLjzH+DyM9O2wq3MiXSsux8JGGSx+YcFKHpNQBD+b8Dc/C78Pw2E/3L9RwGPAhYg654LeY4l
+ ZA+x2DiH9CaPeZygaQEBBrU5sJxCNJo6BOgSHi4wrz8TdbF8GJefBUn0IRYBQktAmKtZXeExsoPouoF0
+ eosbh3u/3ot3QQKafJAHsxZAlVUxCinthlx3QkreHrqY1+oS+maP5Rs8L6Xvj2MPx8IASe80O9sAAAAA
+ SUVORK5CYII=
+</value>
+ </data>
+ <data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
+ G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
+ 5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
+ EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
+ E8pc2+4AAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="wxm.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ /gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
+ mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
+ ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
+ rTWjutBHQN0+oOxgCbE4NuIJW2tGJc4jgNvvgUu9LLzYhHRuQ96Yp1vvdWwjt2UR0mVA6vdf4h1+hSv9
+ BDxfh1R+huS/ghR0Hnd+Bxu+QKrdcEwkmY2dAAwQ8DScGe8sSRUbqj0Y+c5zR+QUwOOQFbz2EtKyij+/
+ rTc/69tFKLjzH+DyM9O2wq3MiXSsux8JGGSx+YcFKHpNQBD+b8Dc/C78Pw2E/3L9RwGPAhYg654LeY4l
+ ZA+x2DiH9CaPeZygaQEBBrU5sJxCNJo6BOgSHi4wrz8TdbF8GJefBUn0IRYBQktAmKtZXeExsoPouoF0
+ eosbh3u/3ot3QQKafJAHsxZAlVUxCinthlx3QkreHrqY1+oS+maP5Rs8L6Xvj2MPx8IASe80O9sAAAAA
+ SUVORK5CYII=
+</value>
+ </data>
+ <data name="cz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
+ mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
+ OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="kc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAEwSURBVDhPlZKxSgNBEIb3Qa66V7ha6xS+glgErvURzBNE
+ 2wOLaKet2NlEsFtIiohgJR6xEdQ0Gojwu/9k59xdL1z84Ye73Z1vZmfWpLJVgeMD02l//K8IACy+l2N8
+ vl1h8XyO14cTzO0RnsaHEgxbEhBDer0B6CzLkOc5CPp6d4B6DXixgwYgSUIIA+/qWjZWy1vJTBD/+/1T
+ 8dwDfNCvNTgEDIc3YkIW9Vl0hcfrfdxf7GE62tkMkLu70gnQClJPRrvbAdIesILZZUcF4RXastMTBVBt
+ TeQkqqpyB0pZj3rgKogAFCE0s2owVh8oS45rDdlYQSge1IdUuE/jOGIP0Qqm2sRUCtBMAnErIWTmxthZ
+ QTiNNkgzhVRF0TzRyOxNCAn2tldaiV/+nwgRkMiYHwIr6UXY3sHBAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
+ znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
+ vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
+ AG0RaJ0Gqp8A+0ICGBIZLkZLifXv8Xb3YnVlRdrdb23gtAHHjpdj5hAVRVdv+vBlaVkes+6pPVzhieHn
+ YQKiwHtHpSFp6+rB4sIn+Y37R+3hB5kNec2SSKV5isvebuiZj8YPxoKxYrSMAR90RyWc2AZqgp/lKSzB
+ Jc91xJI6nEoUdCECchrRJlZl4YA7XgJL+Yl7BszjauvEu9QCZoUk8UFHMq3jW+6HLJS1p+1hniZXO6pq
+ 63Hk5Bkr/Fy9SHvC4+FXhuTa7V6s/dopydbOriXA7Ll/YN7nHrNSENeXMDA4aq0WvP0V2IpLSQFOpuaQ
+ mF+WPSm4Iv7CxmaXNBbWPwUtDpLhZ8/HwyU9ZolvjjkaUH3qrBUuV9WeBkv4mufh42clHWYaz7vwG72U
+ TLZQdeFnAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ /QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
+ 77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
+ aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
+ JWylHvVeGGCm+hBQnNlCNIatWNxW6lGv9B0D3PsIXOrnQts2pGsX0mOdLX3WuYsbjT8gvTyNmsOPeJ+n
+ cOUtAa2bkEdfIbkdkLyuk8rtZGAGUuGCYzxBb/QUYJCAlpAp73+jnIEKN979pNcRPgPQEDSA7HZI4xpW
+ /pgvP+vdRzCwx/Y1AKeP3uZVtjIr0rJKPhMwxMX6RQO41U1AAL45YP77Pny/Ugitc//HAc/8BpD1wIkc
+ xxKuDnOxdh7pbc45rKBuAX4aNexfTiISYQNlALqFpwv068/EcbF0BJdfBEj0IhoGgktAKAisrXIO7yGy
+ mUI6vcPGYe/XePA+QECdF/Jk1gB0ZJWNQgpfQ273QQpeHSmf96oCquiN0R1eF1IPP+AAgRmsjnCqFmoA
+ AAAASUVORK5CYII=
+</value>
+ </data>
+ <data name="tb.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
+ EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
+ cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
+ 6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
+ ArrI3Rmmkq3NDWRK40o13XiAxYXPsltBkAb7YbIRN6HoyVyEDyt51rhSV67dRTL5EcqgxV5yn91GQvI4
+ 1BjFViHBEeCNI98qqGu+ibnEB7h8UaiqWaiLlo3Jpd9w8J15BC6ZzVdWQX3LbfSPPBUPjY4jqJ2cXxDg
+ YENE4LkdoMi/mF3AOlvhwonSM+JjJeUYHhkT+EBDzAbLsYr7ZabRbM08p6sg5bjf/hVm6Xi2eOirVv8H
+ x2foKkhcgFcV/4YnQhFkOnDJvF+Bd74D2zEp2YO/pJZtefqFO/Dy9Xu8iCQQin1CgEHSXoHLocSs+LQh
+ Gc4yw6w676yRL37ccRpHS87hfqUZPnKqzCzRmhoz0EYzznCWmQvOWvwCAklSiLgvRB8AAAAASUVORK5C
+ YII=
+</value>
+ </data>
+ <data name="gl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
+ NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
+ Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
+ yioKMfc5Zc4IkhUMCAOXVgvY4OQsNeJJBYl/qKYM8/ZtQr9QCwlZtFf0j3lI+PiUIQmoaHvg/RJ7mMzX
+ KlDtv6NXUIBjeJoG3mNfiMbNlFXdXGy/MplZAGB1QeqxPtcUHV4lbUkxg7K2PK4XOW7+N3PYBiaoeI5+
+ 4uXDINdWu1hhM0evc5SEx7c4nt4TRL51rvEAXLT+MR+fGn8m67YPUXH/IuH+NUbkNZnVB0C5opD8m3Me
+ QndfXpGHXECnlRF/ZILJ09zWhaqGJlTVG+R6ZW0jeAgNadjZ29f72iz36Cpj3yFNGCz1c9N0AAAAAElF
+ TkSuQmCC
+</value>
+ </data>
+ <data name="BatchNo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
+ CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
+ tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
+ cx82d1+EpURiHmu8817neYkEHQH+BEtZSfYHLCWSdTgI3vBtcjUXOHiVAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
+</value>
+ </data>
+ <data name="cmdSourceBillNo.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>93, 17</value>
+ </metadata>
+ <metadata name="pageSetupDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>212, 17</value>
+ </metadata>
+ <metadata name="printDocument1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>610, 17</value>
+ </metadata>
+ <metadata name="printDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>438, 17</value>
+ </metadata>
+ <metadata name="printPreviewDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>817, 17</value>
+ </metadata>
+ <data name="printPreviewDialog1.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAABAAYAICAQAAAAAADoAgAAZgAAABAQEAAAAAAAKAEAAE4DAAAgIAAAAQAIAKgIAAB2BAAAEBAAAAEA
+ CABoBQAAHg0AACAgAAABACAAqBAAAIYSAAAQEAAAAQAgAGgEAAAuIwAAKAAAACAAAABAAAAAAQAEAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA
+ /wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIoiI
+ iIiIiIiIiIiIiIiIiIiCIigiIiIozMzMzMzMyCIogiIoIiIiKM7m5ubm5sgiKIIiKCIiIijObm5ubm7I
+ IiiCIigiIiIozubm5ubmyCIogiIoIiIiKM5ubm5ubsgiKIIiKCIiIijO5ubm5ubIIiiIiIiIiIiIzm5u
+ bm5uyCIogRERERERGM7u7u7u7sgiKIHZWVlZWRjMzMzMzMzIIiiB1ZWVlZUYiIiIiIiIiIiIgdlZWVlZ
+ GDMzMzMzMzMzOIHVlZWVlRg/uLi4uLi4uDiB2VlZWVkYP7uLi4uLi4s4gdWVlZWVGD+4uLi4uLi4OIHZ
+ WVlZWRg/u4uLi4uLiziB1ZWVlZUYP7i4uLi4uLg4gdlZWVlZGD+7i4uLi4uLOIHVlZWVlRg/uLi4uLi4
+ uDiB3d3d3d0YP7uLi4uLi4s4gRERERERGD+4uLi4uLi4OIiIiIiIiIg/u4uLi4uLiziCIiIiIiIoP7i4
+ uLi4uLg4giIiIiIiKD+7i4uLi4uLOIIiIiIiIig/uLi4uLi4uDiCIiIiIiIoP7u7u7u7u7s4giIiIiIi
+ KD//////////OIIiIiIiIigzMzMzMzMzMziIiIiIiIiIiIiIiIiIiIiIIiIiIiIiIiIiIiIiIiIiIv//
+ ////////AAAAAHv4AA57+AAOe/gADnv4AA57+AAOe/gADgAAAA4AAAAOAAAADgAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/4AAB/+AAAf/gAAH/4AAB/+AAAf/gAAAAA
+ AAD/////KAAAABAAAAAgAAAAAQAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACA
+ gACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAiIiIiIiIiIoiI
+ iIiIiIiIgigijMzMyCiCKCKM5mbIKIiIiIzu7sgogRERjMzMyCiB2ZGIiIiIiIHZkYMzMzM4gdmRg/u7
+ uziB3dGD+7u7OIEREYP7u7s4iIiIg/u7uziCIiKD+7u7OIIiIoP///84giIigzMzMziIiIiIiIiIiP//
+ KCIAACjObALm5mwCIigAAoiIAAKIzgAAbm4AACIoAAAREQAAGM4AAO7uAAAiKHwAWVl8ABjMfADMzAAA
+ IigoAAAAIAAAAEAAAAABAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAA
+ AACAAIAAgIAAAICAgADA3MAA8MqmAKo/KgD/PyoAAF8qAFVfKgCqXyoA/18qAAB/KgBVfyoAqn8qAP9/
+ KgAAnyoAVZ8qAKqfKgD/nyoAAL8qAFW/KgCqvyoA/78qAADfKgBV3yoAqt8qAP/fKgAA/yoAVf8qAKr/
+ KgD//yoAAABVAFUAVQCqAFUA/wBVAAAfVQBVH1UAqh9VAP8fVQAAP1UAVT9VAKo/VQD/P1UAAF9VAFVf
+ VQCqX1UA/19VAAB/VQBVf1UAqn9VAP9/VQAAn1UAVZ9VAKqfVQD/n1UAAL9VAFW/VQCqv1UA/79VAADf
+ VQBV31UAqt9VAP/fVQAA/1UAVf9VAKr/VQD//1UAAAB/AFUAfwCqAH8A/wB/AAAffwBVH38Aqh9/AP8f
+ fwAAP38AVT9/AKo/fwD/P38AAF9/AFVffwCqX38A/19/AAB/fwBVf38Aqn9/AP9/fwAAn38AVZ9/AKqf
+ fwD/n38AAL9/AFW/fwCqv38A/79/AADffwBV338Aqt9/AP/ffwAA/38AVf9/AKr/fwD//38AAACqAFUA
+ qgCqAKoA/wCqAAAfqgBVH6oAqh+qAP8fqgAAP6oAVT+qAKo/qgD/P6oAAF+qAFVfqgCqX6oA/1+qAAB/
+ qgBVf6oAqn+qAP9/qgAAn6oAVZ+qAKqfqgD/n6oAAL+qAFW/qgCqv6oA/7+qAADfqgBV36oAqt+qAP/f
+ qgAA/6oAVf+qAKr/qgD//6oAAADUAFUA1ACqANQA/wDUAAAf1ABVH9QAqh/UAP8f1AAAP9QAVT/UAKo/
+ 1AD/P9QAAF/UAFVf1ACqX9QA/1/UAAB/1ABVf9QAqn/UAP9/1AAAn9QAVZ/UAKqf1AD/n9QAAL/UAFW/
+ 1ACqv9QA/7/UAADf1ABV39QAqt/UAP/f1AAA/9QAVf/UAKr/1AD//9QAVQD/AKoA/wAAH/8AVR//AKof
+ /wD/H/8AAD//AFU//wCqP/8A/z//AABf/wBVX/8Aql//AP9f/wAAf/8AVX//AKp//wD/f/8AAJ//AFWf
+ /wCqn/8A/5//AAC//wBVv/8Aqr//AP+//wAA3/8AVd//AKrf/wD/3/8AVf//AKr//wD/zMwA/8z/AP//
+ MwD//2YA//+ZAP//zAAAfwAAVX8AAKp/AAD/fwAAAJ8AAFWfAACqnwAA/58AAAC/AABVvwAAqr8AAP+/
+ AAAA3wAAVd8AAKrfAAD/3wAAVf8AAKr/AAAAACoAVQAqAKoAKgD/ACoAAB8qAFUfKgCqHyoA/x8qAAA/
+ KgBVPyoA8Pv/AKSgoACAgIAAAAD/AAD/AAAA//8A/wAAAAAAAAD//wAA////AP39/f39/f39/f39/f39
+ /f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39
+ /f39/f39/f39/f39/f39/f39/f39/f39qoYIqoYIhqoIqgiqCaoIqgiqhqqGhoYIhoYIqv39/f0I/f39
+ /ar9/f39/YY2Ng4yDg4ODgoOCgoKCgqG/f39/Yb9/f39CP39/f39qjY7Ozs3Nzc3NjMSMjIOCqr9/f39
+ qv39/f2G/f39/f0IN19fOzs3Nzc3NjcODg4KCP39/f0I/f39/ar9/f39/ao6X19fXzs7Ozc3NzY3NgqG
+ /f39/Yb9/f39CP39/f39hl9jY19jX187Ozs7Nzc3Dqr9/f39qv39/f2G/f39/f0IOodjh19jX19fXztf
+ OzcOCP39/f0ICAmqCAiqCKoICapfCYdjh2ODY19fXzs7Ow6q/f39/QhITEwoSCUoKSQoqmMJCYcJCWNj
+ Y2NfY19fNgj9/f39qkyZmZmYmJRwlCmqX19fXl9fX186WzY3Njc2gv39/f0JcJ2dmZmZlJmUJAmqCaoJ
+ hggIqggICKoIqggI/f39/YZwnp2dnZmZmJVMqnx8fHx8fFR8VHhUVFRUVKr9/f39CHChoZ2dnZ2ZmUwJ
+ fKSkxqSkxqSkpKSkpKBUCP39/f2qcKLDoqGdnZ2ZTKp8ysakxqSkxqSkxqSkpFSq/f39/QiUpqbDoqHE
+ nZ1Mq3ykqMakyqSkxqSkpKSkVAj9/f39hpTIyKbHoqGhoXAIfMrLpMqkxqSkxqTGpKRUqv39/f0IlMym
+ yKbIpcShcAh8y6jKpMqkxsqkpKSkxlQI/f39/aqUzMzMyKbIpqJwqnzLy8qpxsqkpMakxqSkeAj9/f39
+ CJSUlJSUlJSUlJQJgMupy8qpysqkyqSkxqRUqv39/f2GCKoIqgiqCKoIhgigrcvPqcuoy8qkxsqkxnyG
+ /f39/ar9/f39/f39/f39qnzPz6nLy8uoyqnKpKTKVAj9/f39CP39/f39/f39/f0IfNDPz8+py8upyqjG
+ yqR8hv39/f2G/f39/f39/f39/Qik0K7P0M+ty8vLy6jKpXyq/f39/ar9/f39/f39/f39CHzQ09Ctz8/P
+ qcupy6jKeAj9/f39CP39/f39/f39/f2qoNPQ0NPQ0M/Qz8vLy6l8CP39/f2G/f39/f39/f39/QmkfKR8
+ oHx8fHx8fHx8fHyG/f39/aoIqgiqCKoIqgiqCKoIqgiqCKoIqgiqCKoIqgj9/f39/f39/f39/f39/f39
+ /f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f3/////////////
+ ///AAAAD3vgAA974AAPe+AAD3vgAA974AAPe+AADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA
+ AAPAAAADwAAAA8AAAAPAAAADwAAAA9/4AAPf+AAD3/gAA9/4AAPf+AAD3/gAA8AAAAP//////////ygA
+ AAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAA
+ gACAgAAAgICAAMDcwADwyqYAqj8qAP8/KgAAXyoAVV8qAKpfKgD/XyoAAH8qAFV/KgCqfyoA/38qAACf
+ KgBVnyoAqp8qAP+fKgAAvyoAVb8qAKq/KgD/vyoAAN8qAFXfKgCq3yoA/98qAAD/KgBV/yoAqv8qAP//
+ KgAAAFUAVQBVAKoAVQD/AFUAAB9VAFUfVQCqH1UA/x9VAAA/VQBVP1UAqj9VAP8/VQAAX1UAVV9VAKpf
+ VQD/X1UAAH9VAFV/VQCqf1UA/39VAACfVQBVn1UAqp9VAP+fVQAAv1UAVb9VAKq/VQD/v1UAAN9VAFXf
+ VQCq31UA/99VAAD/VQBV/1UAqv9VAP//VQAAAH8AVQB/AKoAfwD/AH8AAB9/AFUffwCqH38A/x9/AAA/
+ fwBVP38Aqj9/AP8/fwAAX38AVV9/AKpffwD/X38AAH9/AFV/fwCqf38A/39/AACffwBVn38Aqp9/AP+f
+ fwAAv38AVb9/AKq/fwD/v38AAN9/AFXffwCq338A/99/AAD/fwBV/38Aqv9/AP//fwAAAKoAVQCqAKoA
+ qgD/AKoAAB+qAFUfqgCqH6oA/x+qAAA/qgBVP6oAqj+qAP8/qgAAX6oAVV+qAKpfqgD/X6oAAH+qAFV/
+ qgCqf6oA/3+qAACfqgBVn6oAqp+qAP+fqgAAv6oAVb+qAKq/qgD/v6oAAN+qAFXfqgCq36oA/9+qAAD/
+ qgBV/6oAqv+qAP//qgAAANQAVQDUAKoA1AD/ANQAAB/UAFUf1ACqH9QA/x/UAAA/1ABVP9QAqj/UAP8/
+ 1AAAX9QAVV/UAKpf1AD/X9QAAH/UAFV/1ACqf9QA/3/UAACf1ABVn9QAqp/UAP+f1AAAv9QAVb/UAKq/
+ 1AD/v9QAAN/UAFXf1ACq39QA/9/UAAD/1ABV/9QAqv/UAP//1ABVAP8AqgD/AAAf/wBVH/8Aqh//AP8f
+ /wAAP/8AVT//AKo//wD/P/8AAF//AFVf/wCqX/8A/1//AAB//wBVf/8Aqn//AP9//wAAn/8AVZ//AKqf
+ /wD/n/8AAL//AFW//wCqv/8A/7//AADf/wBV3/8Aqt//AP/f/wBV//8Aqv//AP/MzAD/zP8A//8zAP//
+ ZgD//5kA///MAAB/AABVfwAAqn8AAP9/AAAAnwAAVZ8AAKqfAAD/nwAAAL8AAFW/AACqvwAA/78AAADf
+ AABV3wAAqt8AAP/fAABV/wAAqv8AAAAAKgBVACoAqgAqAP8AKgAAHyoAVR8qAKofKgD/HyoAAD8qAFU/
+ KgDw+/8ApKCgAICAgAAAAP8AAP8AAAD//wD/AAAAAAAAAP//AAD///8A/f39/f39/f39/f39/f39/f0I
+ hgiqCKoICKoICKaGCP39qv39hv2GNg4ODjII/ar9/Yb9/ar9qjdjXzsOCP2G/f0IhquGCAleCWNfNob9
+ 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
+ bv+3d0n/wr/B/wAAAAAAAAAAAAAAAAAAAADCv8H/FRqE/0dN1v8/RNL/Nz3Q/y40zv8nLcz/ISfK/xwh
+ yf8WHMf/GxJh/8K/wf/gr3r/4K96/+Cvev/gr3r/3614/9yqdf/apnL/16Nw/9Sea//Rmmj/zZZk/8qR
+ X//GjFz/w4dW/7+CUv/Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf8SHZD/WF3a/05U1/9FS9X/PUPS/zU7
+ 0P8uM83/JyzL/yAmyf8aFGn/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/
+ wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/xAfnP9obt7/YGTc/1Zb
+ 2f9NU9f/RUrU/ztB0v80OdD/LDHO/xgWcv/Cv8H/Dn+n/w18pP8MeqH/DHie/wt1m/8Kc5j/CXGV/wlv
+ k/8JbJD/CGqN/wdpi/8HZ4j/BmWH/wZkhf8GYoP/wr/B/wAAAAAAAAAAAAAAAAAAAADCv8H/DiKp/3l+
+ 4/9vdeH/Zmze/11i2/9UWtn/S1HW/0NI1P86P9H/Fhh9/8K/wf8Ogar/Barp/wGo6P8Apef/AKPm/wCi
+ 5P8An+L/AJ7h/wCd3/8AnN7/AJnc/wCY2/8AmNn/AJbX/wZjhP/Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/
+ wf8MJbX/iI7n/4CF5v93fOP/bnPg/2Vr3f9bYdv/UljY/0lP1v8UGoj/wr/B/w+Erf8Lrur/Bqvq/wOo
+ 6f8Apuf/AKTm/wCi5f8AoOT/AJ/i/wCd4f8AnN//AJrd/wCZ2/8AmNr/BmWH/8K/wf8AAAAAAAAAAAAA
+ AAAAAAAAwr/B/wkowP+WnOz/jpTq/4aL6P9+hOX/dXri/2xx4P9jaN3/WV/b/xEek//Cv8H/EIaw/xay
+ 7P8Or+z/Cavr/wWq6v8Bp+j/AKbn/wCj5f8AoeT/AJ/j/wCe4f8AnOD/AJve/wCa3f8HZ4n/wr/B/wAA
+ AAAAAAAAAAAAAAAAAADCv8H/CCrK/6Ko7/+coe7/lZrr/42T6f+Fiub/fIHl/3N54v9rcN//ECGg/8K/
+ wf8QiLP/I7nu/xq07f8Ssez/C63r/war6v8Cqen/AKbo/wCk5v8AouX/AKHk/wCf4f8AneH/AJzf/who
+ i//Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf8GLNP/q7Hy/6as8P+hpu//mp/u/5OY6/+LkOj/g4nm/3qA
+ 5P8NI6z/wr/B/xCKtv8xvvD/J7rv/x627f8Vsuz/Dq/s/wmr6/8Equn/Aafo/wCl5/8Ao+X/AKHk/wCf
+ 4v8AnuH/CGqO/8K/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/wUu2/+vtPP/r7Tz/6qv8v+mq/D/oKXv/5me
+ 7f+Sl+v/io/p/wsmt//Cv8H/Eo24/0HF8f82wfD/LLzv/yK47v8atO3/EbHs/wut6/8Gq+r/A6np/wCm
+ 6P8Apeb/AKLl/wCh5P8IbJD/wr/B/wAAAAAAAAAAAAAAAAAAAADCv8H/BC/h/wQv3/8FL9z/BS3Z/wYt
+ 1v8GLNL/ByvP/wgqy/8IKcb/CSnC/8K/wf8Sjrv/Uszy/0fH8f87w/H/Mb7v/ye67/8et+7/FbPt/w6v
+ 6/8IrOv/BKnp/wGo6P8Apef/AKPl/wluk//Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf/Cv8H/wr/B/8K/
+ wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/xKRvf9j0/P/WM/z/0zK8f9BxfH/N8Hw/yy8
+ 7/8iuO7/GbTt/xGx7P8Lruv/Bqrq/wOo6f8Apuf/CnGV/8K/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/wAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADCv8H/E5LA/3Ta8/9q1fP/XtHz/1LM
+ 8v9Hx/H/O8Pw/zG+7/8nu+//Hrbt/xay7f8Or+v/CKzq/wSq6f8Kc5j/wr/B/wAAAAAAAAAAAAAAAAAA
+ AADCv8H/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMK/wf8UlMH/hOD1/3rc
+ 9f9v2PP/ZNTy/1jO8v9NyvH/Qsbx/zbB8P8svO//I7ju/xm07f8SsOz/C67r/wt2m//Cv8H/AAAAAAAA
+ AAAAAAAAAAAAAMK/wf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwr/B/xSW
+ w/+T5vb/iuL1/3/e9P912vT/adbz/13R8/9SzPL/R8jx/zzD8P8xvvD/J7rv/x627v8Vsuz/C3ie/8K/
+ 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
+</value>
+ </data>
+ <metadata name="timer2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>1058, 17</value>
+ </metadata>
+ <metadata name="timer3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>1177, 17</value>
+ </metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>25</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
index 7a1cf54..2dfbf7c 100644
--- a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
@@ -6,6 +6,8 @@
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
+using System.IO;
+using System.Web;
using System.Web.Http;
using WebAPI.Models;
using WebAPI.Service;
@@ -21,7 +23,7 @@
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
-
+ string fileip = System.Configuration.ConfigurationManager.AppSettings["FileIP"];
/// <summary>
/// 杩斿洖鑱屽憳鍒楄〃
@@ -265,6 +267,8 @@
// return objJsonResult;
// }
//}
+
+
/// <summary>
/// 淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -577,6 +581,8 @@
return objJsonResult;
}
}
+
+
///// <summary>
///// 淇濆瓨鑱屽憳
///// </summary>
@@ -1335,7 +1341,6 @@
}
#endregion
-
#region 鏍规嵁鐝粍杩斿洖鑱屽憳淇℃伅
/// <summary>
/// 鏍规嵁鐝粍杩斿洖鑱屽憳淇℃伅
@@ -1387,5 +1392,189 @@
}
#endregion
+ #region 鑱屽憳闄勪欢涓婁紶
+ /// <summary>
+ /// 鏂囦欢涓婁紶
+ /// </summary>
+ /// <returns></returns>
+ [Route("Gy_Employee_UploadFile")]
+ [HttpPost]
+ public object Gy_Employee_UploadFile()
+ {
+
+ string HBillNo = HttpContext.Current.Request.Params["HBillNo"]; //鍗曟嵁鍙�
+ string HRemark = HttpContext.Current.Request.Params["HRemark"]; //澶囨敞
+ string HUserName = HttpContext.Current.Request.Params["HUserName"]; //鍒涘缓浜�
+ HttpPostedFile files = HttpContext.Current.Request.Files["file"];
+ string path = HttpContext.Current.Server.MapPath("~/../Files/Gy_Employee/" + HBillNo);
+
+ dynamic dyResult = UpLoadFile(files, path, HBillNo, HRemark, HUserName);
+ if (dyResult != null && dyResult.result == 1)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "涓婁紶鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = dyResult.returnval;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+
+ public dynamic UpLoadFile(HttpPostedFile files, string path, string HBillNo, string HRemark, string HUserName)
+ {
+ dynamic Result_Ob = new { result = 1, returnval = "涓婁紶鎴愬姛锛�" };
+ string filePath = Path.GetFullPath(files.FileName);//鏂囦欢涓婁紶璺緞
+ string fileExtension = Path.GetExtension(files.FileName);// 鏂囦欢鎵╁睍鍚�
+ string filename = files.FileName;//鏂囦欢鍚�
+ string fileSavePath = path;// 涓婁紶淇濆瓨璺緞
+ int filesize = files.ContentLength;//鑾峰彇涓婁紶鏂囦欢鐨勫ぇ灏忓崟浣嶄负瀛楄妭byte
+ int Maxsize = 40000 * 1024;//瀹氫箟涓婁紶鏂囦欢鐨勬渶澶х┖闂村ぇ灏忎负40M
+ try
+ {
+ if (files == null || files.ContentLength <= 0)
+ {
+ Result_Ob = new { result = 0, returnval = "鏂囦欢涓嶈兘涓虹┖!" };
+ return Result_Ob;
+ }
+ if (filesize >= Maxsize)
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶鏂囦欢瓒呰繃40M锛屼笉鑳戒笂浼狅紒" };
+ return Result_Ob;
+ }
+
+ string fileurl = Path.Combine(fileSavePath, filename);
+ if (Directory.Exists(fileurl) == true) //濡傛灉瀛樺湪閲嶅悕鏂囦欢灏辨彁绀�
+ {
+ Result_Ob = new { result = 0, returnval = "瀛樺湪鍚屽悕鏂囦欢锛�" };
+ return Result_Ob;
+ }
+ //鍒犻櫎鏁版嵁琛ㄦ暟鎹�
+ ds = oCN.RunProcReturn("delete from MES_AccessoriesList where HSourceBillNo ='" + HBillNo + "' and HFileName='" + filename + "'", "MES_AccessoriesList");
+ if (Directory.Exists(path))
+ {
+ File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
+ files.SaveAs(fileurl);
+ string StrPath = "/files/Gy_Employee/" + HBillNo + "/" + filename;
+ if (File.Exists(fileurl))
+ {
+ //杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
+ //鍐欏叆鏁版嵁琛�
+ oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
+ ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
+ ",HFileClsID,HSourceBillNo" +
+ ") values('"
+ + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+ ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
+ "','" + 0 + "','" + HBillNo +
+ "') ");
+ }
+ else
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+ }
+ }
+ else
+ {
+ Directory.CreateDirectory(fileSavePath); //娣诲姞鏂囦欢澶�
+ files.SaveAs(fileurl);
+ string StrPath = "/files/Gy_Employee/" + HBillNo + "/" + filename;
+ if (File.Exists(fileurl))
+ {
+ //杩欓噷鍙互鎵ц涓�浜涘叾瀹冪殑鎿嶄綔锛屾瘮濡傛洿鏂版暟鎹簱
+ //鍐欏叆鏁版嵁琛�
+ oCN.RunProc("Insert into MES_AccessoriesList (HFileName,HFilePath,HFilePath_Cus,HFileType" +
+ ",HLoadMan,HLoadDate,HRemark,HVerNum,HFileSize" +
+ ",HFileClsID,HSourceBillNo" +
+ ") values('"
+ + filename.ToString() + "','" + StrPath.ToString() + "','" + filePath.ToString() + "','" + fileExtension.ToString() + "'" +
+ ",'" + HUserName + "',getdate(),'" + HRemark + "','V1','" + filesize +
+ "','" + 0 + "','" + HBillNo +
+ "') ");
+ }
+ else
+ {
+ Result_Ob = new { result = 0, returnval = "涓婁紶澶辫触锛佹鏂囦欢涓烘伓鎰忔枃浠�" };
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ Result_Ob = new { result = 0, returnval = e.Message };
+ }
+ return Result_Ob;
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍗曟嵁鍙锋煡鎵句笂浼犳枃浠跺垪琛�
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("Gy_Employee_Filelist")]
+ [HttpGet]
+ public object Gy_Employee_Filelist(string HBillNo)
+ {
+ var url = fileip + "/files/Gy_Employee/" + HBillNo + "/";
+ //@"C:\\files\\"
+ try
+ {
+ ds = oCN.RunProcReturn("select *,'" + url + "'+CAST(HFileName as varchar(200))as url from MES_AccessoriesList where HSourceBillNo='" + HBillNo + "'", "MES_AccessoriesList");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁ID,鍗曟嵁鍙�,鏂囦欢鍚� 鍒犻櫎鏂囦欢
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <returns></returns>
+ [Route("Gy_Employee_DeleteFilelist")]
+ [HttpGet]
+ public object Gy_Employee_DeleteFilelist(string HItemID, string HSourceBillNo, string HFileName)
+ {
+ try
+ {
+
+ oCN.RunProc("delete from MES_AccessoriesList where HItemID =" + HItemID);
+ string fileurl = Path.Combine(HttpContext.Current.Server.MapPath("~/../Files/EquipTechParamFolder/" + HSourceBillNo), HFileName);
+ File.Delete(fileurl); //鍒犻櫎鎸囧畾鏂囦欢
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+#endregion
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
index 484d2a0..7432842 100644
--- a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
@@ -775,14 +775,14 @@
foreach (ClsCg_POInStockBillSub oSub in DetailColl)
{
i++;
- if (oSub.HQty <= 0 || oSub.HQty == null)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + i + "琛岋紝鏁伴噺涓嶈兘涓�0鎴栬�呭皬浜�0";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (oSub.HQty <= 0 || oSub.HQty == null)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "绗�" + i + "琛岋紝鏁伴噺涓嶈兘涓�0鎴栬�呭皬浜�0";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
if (oSub.HMaterID == 0)
{
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 7654825..0db6ff1 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -1042,14 +1042,14 @@
long HBUYERWITHHOLDING = DetailColl2[i].HBUYERWITHHOLDING;//涔版柟浠ｆ墸浠ｇ即
string HMATERIALDESC = DetailColl2[i].HMATERIALDESC == null ? "''" : DetailColl2[i].HMATERIALDESC; //鐗╂枡璇存槑
i++;
- if (oSub.HQty <= 0 || oSub.HQty == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + i + "琛岋紝鏁伴噺涓嶈兘涓�0鎴栬�呭皬浜�0";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (oSub.HQty <= 0 || oSub.HQty == 0)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "绗�" + i + "琛岋紝鏁伴噺涓嶈兘涓�0鎴栬�呭皬浜�0";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
if (oSub.HMaterID == 0)
{
diff --git a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
index b853ee9..eb29396 100644
--- a/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_PayableBillController.cs
@@ -1711,5 +1711,198 @@
}
}
#endregion
+
+ #region 搴斾粯鍗曢渶瑕佹垜瀹℃壒娴佸鎵圭殑
+ [Route("Cg_PayableBill/NeedChecklist")]
+ [HttpGet]
+ public object NeedChecklist(string user, string userid)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ //if (!DBUtility.ClsPub.Security_Log("Cg_PayableBillQuery", 1, false, user))
+ //{
+ // objJsonResult.code = CodeConstant.FAIL;
+ // objJsonResult.count = CountConstant.FAIL;
+ // objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //鎼滅储闇�瑕佸鏍哥殑
+ string sql = "select * from h_v_Cg_PayableBillQuery_NeedCheck where HCheckUserID = '" + userid + "' ORDER BY hmainid DESC,hsubid ASC";
+ ds = oCN.RunProcReturn(sql, "h_v_Cg_PayableBillQuery_NeedCheck");
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 搴斾粯鍗曞凡缁忓鎵规祦瀹℃壒鐨�
+ [Route("Cg_PayableBill/Checkedlist")]
+ [HttpGet]
+ public object Checkedlist(string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ //if (!DBUtility.ClsPub.Security_Log("Cg_PayableBillQuery", 1, false, user))
+ //{
+ // objJsonResult.code = CodeConstant.FAIL;
+ // objJsonResult.count = CountConstant.FAIL;
+ // objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ //鎼滅储闇�瑕佸鏍哥殑
+ string sql = "select TOP 1000 * from h_v_Cg_PayableBillQuery_Checked where 椤圭洰瀹℃牳浜� = '" + user + "'" +
+ " ORDER BY hmainid DESC,hsubid ASC";
+ ds = oCN.RunProcReturn(sql, "h_v_Cg_PayableBillList_Query");
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
+ #region 搴斾粯鍗� 鎵归噺澶氱骇瀹℃牳
+ [Route("Cg_PayableBill/CheckAllFlow")]
+ [HttpGet]
+ public object CheckAll(string HInterIDS, int IsAudit, string CurUserName, string CurUserID)
+ {
+ try
+ {
+ //澶勭悊瀛楃涓�
+ if (!string.IsNullOrEmpty(HInterIDS))
+ {
+ int[] idArray = Array.ConvertAll(HInterIDS.Split(','), int.Parse);
+ // 澶勭悊idArray...
+ for (int i = 0; i < idArray.Length; i++)
+ {
+ objJsonResult = (json)AuditCg_PayableBill_Flow(idArray[i], IsAudit, CurUserName, CurUserID);//瀹℃牳鎵ц
+ if (objJsonResult.count == 0)
+ {
+ objJsonResult.Message += "绗�" + (i + 1) + "琛屽嚭鐜伴棶棰樻棤娉曠户缁畬鎴�";
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨姝ｇ‘琛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳鎴栧弽瀹℃牳搴斾粯鍗曞け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 搴斾粯鍗� 鎵归噺椹冲洖
+ [Route("Cg_PayableBill/RejectAllCheckFlow")]
+ [HttpGet]
+ public object RejectAllCheckFlow(string HInterIDS, string CurUserID)
+ {
+ try
+ {
+ //澶勭悊瀛楃涓�
+ if (!string.IsNullOrEmpty(HInterIDS))
+ {
+ int[] idArray = Array.ConvertAll(HInterIDS.Split(','), int.Parse);
+ // 澶勭悊idArray...
+ for (int i = 0; i < idArray.Length; i++)
+ {
+ objJsonResult = (json)RejectCheckFlow_POOrderBill(idArray[i].ToString(), CurUserID);//瀹℃牳鎵ц
+ if (objJsonResult.count == 0)
+ {
+ objJsonResult.Message += "绗�" + (i + 1) + "琛屽嚭鐜伴棶棰樻棤娉曠户缁畬鎴�";
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "璇烽�夋嫨姝ｇ‘琛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "椹冲洖搴斾粯鍗曞け璐ワ紒" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
index deff087..ce23fc9 100644
--- a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
+++ b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
@@ -413,14 +413,14 @@
{
ClsKf_ICStockBillSub oSub = (ClsKf_ICStockBillSub)list[i1];
i++;
- if (oSub.HQty <= 0 || oSub.HQty == null)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "绗�" + i + "琛岋紝鏁伴噺涓嶈兘涓�0鎴栬�呭皬浜�0";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (oSub.HQty <= 0 || oSub.HQty == null)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "绗�" + i + "琛岋紝鏁伴噺涓嶈兘涓�0鎴栬�呭皬浜�0";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
if (oSub.HMaterID == 0)
{
diff --git a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
index 93e8a5a..543ee6c 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs
@@ -3976,5 +3976,95 @@
}
}
#endregion
+
+ #region 缂栬緫椤甸潰鏍规嵁id鑾峰彇宸ュ簭鍑虹珯姹囨姤鍗曚俊鎭�
+ [Route("Cj_StationOutBill/SetBillTime")]
+ [HttpGet]
+ public object SetBillTime(int HInterID,DateTime dateTime,string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cj_StationOutBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍑虹珯鍗曟棤缂栬緫鏉冮檺!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from Sc_StationOutBillMain with(nolock) where HInterID=" + HInterID;
+ ds = oCN.RunProcReturn(sql, "Sc_StationOutBillMain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇敼澶辫触娌℃壘鍒扮浉鍏冲嚭绔欐眹鎶ュ崟";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //淇敼鍓嶆椂闂翠慨鏀瑰悗鏃堕棿鍒ゆ柇鏈夋棤宸ヨ祫璁＄畻
+ string HGroupID = ds.Tables[0].Rows[0]["HGroupID"].ToString();
+ string HOldDate = ds.Tables[0].Rows[0]["HDate"].ToString();
+ string sql1 = "select * from Pay_SingleBalBillMain where HGroupID =" +HGroupID + " and HDate ='" + HOldDate + "'";
+ string sql2 = "select * from Pay_GroupBalBillMain where HGroupID =" + HGroupID + " and HDate ='" + HOldDate + "'";
+ string sql3 = "select * from Pay_SingleBalBillMain where HGroupID =" + HGroupID + " and HDate ='" + dateTime + "'";
+ string sql4 = "select * from Pay_GroupBalBillMain where HGroupID =" + HGroupID + " and HDate ='" + dateTime + "'";
+ ds = oCN.RunProcReturn(sql1, "Sc_StationOutBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇敼澶辫触璇ユ椂闂寸彮缁勫凡璁＄畻宸ヨ祫:" + HOldDate;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCN.RunProcReturn(sql2, "Sc_StationOutBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇敼澶辫触璇ユ椂闂寸彮缁勫凡璁＄畻宸ヨ祫:" + HOldDate;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCN.RunProcReturn(sql3, "Sc_StationOutBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇敼澶辫触璇ユ椂闂寸彮缁勫凡璁＄畻宸ヨ祫:" + dateTime;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ ds = oCN.RunProcReturn(sql4, "Sc_StationOutBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇敼澶辫触璇ユ椂闂寸彮缁勫凡璁＄畻宸ヨ祫:" + dateTime;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //淇敼鏃堕棿
+ sql = "update Sc_StationOutBillMain set HDate = '" + dateTime + "' where HInterID = " + HInterID;
+ oCN.RunProcReturn(sql, "Sc_StationOutBillMain");
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index f655bd7..08d95d3 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -1350,6 +1350,16 @@
var ds = oCN.RunProcReturn("select * from Gy_RoutingBillMain where HInterID=" + HInterID, "Gy_RoutingBillMain");
if (ds.Tables[0].Rows.Count > 0)
{
+ string HBillStatus = Convert.ToString(ds.Tables[0].Rows[0]["HBillStatus"]);
+ //string hdeleteman = Convert.ToString(ds.Tables[0].Rows[0]["hdeleteman"]);
+ if (HBillStatus == "6")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍦ㄥ鏍镐腑,涓嶈兘鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
if (IsAudit == 0) //鍏抽棴鍒ゆ柇
{
if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
@@ -1625,10 +1635,11 @@
return objJsonResult;
}
//鎼滅储闇�瑕佸鏍哥殑
- string sql = " select DISTINCT a.*,c.HItemID as HCheckFlowStatusID,m.HName as 瀹℃壒娴�,c.HCheckFlowID,i.HName as 瀹℃壒椤圭洰鍚嶇О,c.HCheckItemID,c.HChecker as 椤圭洰瀹℃牳浜�,c.HCheckNote as 瀹℃壒娴佸鏍稿缓璁�,c.HCheckDate 瀹℃壒娴佸鏍告棩鏈� from h_v_Gy_RoutingBillList AS a LEFT JOIN Xt_BillCheckFlowStatus AS c ON a.hmainid = c.HBillInterID and a.鍗曟嵁绫诲瀷 = c.HBillTypeID" +
+ string sql = "select TOP 1000 a.*,c.HItemID as HCheckFlowStatusID,m.HName as 瀹℃壒娴�,c.HCheckFlowID,i.HName as 瀹℃壒椤圭洰鍚嶇О,c.HCheckItemID,c.HChecker as 椤圭洰瀹℃牳浜�,c.HCheckNote as 瀹℃壒娴佸鏍稿缓璁�,c.HCheckDate 瀹℃壒娴佸鏍告棩鏈� from h_v_Gy_RoutingBillList AS a LEFT JOIN Xt_BillCheckFlowStatus AS c ON a.hmainid = c.HBillInterID and a.鍗曟嵁绫诲瀷 = c.HBillTypeID" +
" LEFT JOIN Xt_CheckFlowMain as m ON m.HInterID = c.HCheckFlowID" +
" LEFT JOIN Xt_CheckItem as i ON i.HItemID = c.HCheckItemID" +
- " where 宸ュ簭浠ｇ爜 != '9999' and a.HBillSubType<>'SUB' and c.HCheckDate is not NUll and c.HChecker = '" + user + "'";
+ " where 宸ュ簭浠ｇ爜 != '9999' and a.HBillSubType<>'SUB' and c.HCheckDate is not NUll and c.HChecker = '" + user + "'"+
+ " ORDER BY a.hmainid DESC;";
ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList");
foreach (DataColumn col in ds.Tables[0].Columns)
{
@@ -2314,7 +2325,7 @@
return objJsonResult;
}
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where 瀹氶绫诲瀷 = '涓存椂瀹氶' and 澶辨晥鏃堕棿 BETWEEN DATEADD(DAY, -15, GETDATE()) AND GETDATE() " + sWhere + " order by hmainid desc", "h_v_Gy_RoutingBillList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where 瀹氶绫诲瀷 = '涓存椂瀹氶' and 鐘舵��!= '鍏抽棴' and 澶辨晥鏃堕棿 BETWEEN CAST(GETDATE() AS DATE) AND DATEADD(DAY, 15, GETDATE()) " + sWhere + " order by hmainid desc", "h_v_Gy_RoutingBillList");
foreach (DataColumn col in ds.Tables[0].Columns)
{
Type dataType = col.DataType;
@@ -2440,5 +2451,113 @@
}
#endregion
+ #region 宸ヨ壓璺嚎鎾ゅ洖
+ [Route("Gy_Routing/WithdrawCheckFlow")]
+ [HttpGet]
+ public object WithdrawCheckFlow(string HInterID, string user)
+ {
+ try
+ {
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹�
+ DAL.ClsGy_RoutingBill oBill = new DAL.ClsGy_RoutingBill(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣�
+ //鑾峰彇绯荤粺鍙傛暟鍒ゆ柇宸ヨ壓璺嚎鏄惁鍚敤澶氱骇瀹℃壒绂佺敤
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Gy_RoutingBill_EnableMultiLevel.ToUpper() == "N") //绯荤粺鍙傛暟 鏈惎鐢ㄨ嚜鍔ㄥ鏍�
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "宸ヨ壓璺嚎鏈惎鐢ㄥ绾у鎵圭鐢�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁
+ {
+ if (oBill.omodel.HBillStatus != 6)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鍗曟嵁鏈湪瀹℃牳涓笉鑳芥挙鍥�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ヨ壓璺嚎鏃犳潈闄愭挙鍥�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁瀛樺湪瀹℃牳杩囩殑椤圭洰
+ string sql0 = "select * from Xt_BillCheckFlowStatus where HBillInterID = " + lngBillKey + " and HBillTypeID = '" + oBill.BillType + "' and ISNULL(HChecker,'') <> ''";
+ DataSet ds0 = oCN.RunProcReturn(sql0, "Xt_BillCheckFlowStatus");
+ if (ds0 != null && ds0.Tables[0].Rows.Count == 0)
+ {
+ oCN.BeginTran();
+ //鑾峰彇闇�瑕侀┏鍥炵殑瀹℃牳椤圭洰
+ string sql1 = "select c.* from Xt_CheckFlowMain as a " +
+ "inner join Xt_CheckFlowSub as b on a.HInterID = b.HInterID " +
+ "inner join Xt_BillCheckFlowStatus as c on a.HBillTypeID = c.HBillTypeID and b.HCheckItemID = c.HCheckItemID " +
+ "where c.HBillTypeID = '" + this.BillType + "' and c.HBillInterID = " + lngBillKey + " " +
+ "order by b.HFlowNo asc";
+ DataSet ds1= oCN.RunProcReturn(sql1, "Xt_BillCheckFlowStatus");
+ if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鎾ゅ洖澶辫触!鍘熷洜:鏈彂璧峰鎵癸紒锛�";
+ return false;
+ }
+ //鑾峰彇褰撳墠瀹℃牳椤圭洰
+ string HCheckFlowID = ds1.Tables[0].Rows[0]["HCheckFlowID"].ToString(); //瀹℃壒娴佸唴鐮�
+ sql0 = "select * from Gy_RoutingBillMain " + " where HInterID = " + lngBillKey;
+ ds0 = oCN.RunProcReturn(sql0, "Gy_RoutingBillMain");
+ string HCheckItemNowID = ds0.Tables[0].Rows[0]["HCheckItemNowID"].ToString(); //褰撳墠瀹℃壒椤圭洰鍐呯爜
+ //鏇存柊 椹冲洖鍒犻櫎瀹℃牳娴佺姸鎬佽〃
+ string sql02 = "Delete Xt_BillCheckFlowStatus where HBillTypeID = '" + this.BillType + "' and HBillInterID=" + lngBillKey + " and HCheckFlowID=" + HCheckFlowID;
+ oCN.RunProc(sql02);
+ oCN.RunProc(" Update Gy_RoutingBillMain" + " set HChecker='',HCheckDate=null,HBillStatus=1,HCheckItemNowID = 0,HCheckItemNextID = 0 Where HInterID=" + lngBillKey.ToString());
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎾ゅ洖鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鎾ゅ洖澶辫触!鍘熷洜:鍗曟嵁瀛樺湪宸茬粡瀹℃牳鐨勯」鐩紒锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/LMESController.cs b/WebAPI/Controllers/LMESController.cs
index a978efe..4931d80 100644
--- a/WebAPI/Controllers/LMESController.cs
+++ b/WebAPI/Controllers/LMESController.cs
@@ -1218,14 +1218,14 @@
{
List<object> columnNameList = new List<object>();
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Gy_RoutingBill_Query", 1, false, user))
- {
- res.code = "0";
- res.count = 0;
- res.Message = "鏃犳煡鐪嬫潈闄愶紒";
- res.data = null;
- return res;
- }
+ //if (!DBUtility.ClsPub.Security_Log_second("Gy_RoutingBill_Query", 1, false, user))
+ //{
+ // res.code = "0";
+ // res.count = 0;
+ // res.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ // res.data = null;
+ // return res;
+ //}
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("exec h_p_Gy_RoutingBillList " + page + "," + size + ",''", "h_p_Gy_RoutingBillList");
@@ -1598,6 +1598,16 @@
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string HBillStatus = Convert.ToString(ds.Tables[0].Rows[0]["HBillStatus"]);
+ //string hdeleteman = Convert.ToString(ds.Tables[0].Rows[0]["hdeleteman"]);
+ if (HBillStatus == "6")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍦ㄥ鏍镐腑,涓嶈兘鍒犻櫎锛�";
objJsonResult.data = null;
return objJsonResult;
}
@@ -3779,6 +3789,16 @@
return objJsonResult;
}
}
+ string HBillStatus = Convert.ToString(ds.Tables[0].Rows[0]["HBillStatus"]);
+ //string hdeleteman = Convert.ToString(ds.Tables[0].Rows[0]["hdeleteman"]);
+ if (HBillStatus == "6")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍦ㄥ鏍镐腑,涓嶈兘鍏抽棴锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鍏抽棴鍗曟嵁
if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
{
@@ -3817,6 +3837,16 @@
return objJsonResult;
}
}
+ string HBillStatus = Convert.ToString(ds.Tables[0].Rows[0]["HBillStatus"]);
+ //string hdeleteman = Convert.ToString(ds.Tables[0].Rows[0]["hdeleteman"]);
+ if (HBillStatus == "6")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍦ㄥ鏍镐腑,涓嶈兘鍙嶅叧闂紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鍙嶅叧闂崟鎹�
if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
{
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldDotCheckRuleBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldDotCheckRuleBillController.cs
index 9e1745f..ae9c12e 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldDotCheckRuleBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldDotCheckRuleBillController.cs
@@ -8,7 +8,10 @@
using System.Net.Http;
using System.Web.Http;
using WebAPI.Models;
-
+using System.Web;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
+using System.IO;
+using SyntacticSugar.constant;
namespace WebAPI.Controllers.MJGL
{
public class Sc_MouldDotCheckRuleBillController : ApiController
@@ -334,7 +337,7 @@
[HttpGet]
public object DeleteMouldDotCheckRuleBill(string HInterID, string user)
{
- if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainRuleBill_Delete", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckPlanBill_Delete", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -431,5 +434,416 @@
}
#endregion
+
+ #region 鍣ㄥ叿鐐规瑙勭▼ 鏂囦欢瀵煎叆淇濆瓨
+ #region 鍣ㄥ叿鐐规瑙勭▼ 鏂囦欢涓婁紶
+ [Route("Sc_MouldDotCheckRuleBill/Sc_MouldDotCheckRuleBill_Excel")]
+ [HttpPost]
+ public object Sc_MouldDotCheckRuleBill_Excel()
+ {
+ try
+ {
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable tb2 = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
+ tb2.Columns.Add("HOrgID", typeof(Int32));//缁勭粐ID
+ tb2.Columns.Add("HDotCheckItemID", typeof(Int32));//鐐规椤圭洰ID
+ tb2.Columns.Add("HManagerID", typeof(Int32));//璐熻矗浜篒D
+ tb2.Columns.Add("HMouldID", typeof(Int32));//鍣ㄥ叿ID
+ tb2.Columns.Add("HDotCheckItemClassID", typeof(Int32));//鐐规椤圭洰鍒嗙被
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = tb2.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ tb2.Rows.Add(row);
+ }
+
+
+ var error = "";
+
+ //鏌ヨ娌℃湁鐨勫垪
+ if (!tb2.Columns.Contains("缁勭粐浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囦唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("缁勭粐鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囧悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("瑙勭▼缂栧彿"))
+ error += "娌℃湁鎵惧埌銆愯绋嬬紪鍙枫�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("瑙勭▼鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愯绋嬪悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鍣ㄥ叿缂栫爜"))
+ error += "娌℃湁鎵惧埌銆愬櫒鍏风紪鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鍣ㄥ叿鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愬櫒鍏峰悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鍛ㄦ湡鍗曚綅"))
+ error += "娌℃湁鎵惧埌銆愬懆鏈熷崟浣嶃�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鐐规鍛ㄦ湡"))
+ error += "娌℃湁鎵惧埌銆愮偣妫�鍛ㄦ湡銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鎽樿"))
+ error += "娌℃湁鎵惧埌銆愭憳瑕併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("琛ㄥご澶囨敞"))
+ error += "娌℃湁鎵惧埌銆愯〃澶村娉ㄣ�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鐐规椤圭洰浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愮偣妫�椤圭洰浠ｇ爜銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鐐规椤圭洰鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愮偣妫�椤圭洰鍚嶇О銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鐐规閮ㄤ綅"))
+ error += "娌℃湁鎵惧埌銆愮偣妫�閮ㄤ綅銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鍏蜂綋瑕佹眰"))
+ error += "娌℃湁鎵惧埌銆愬叿浣撹姹傘�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("璐熻矗浜轰唬鐮�"))
+ error += "娌℃湁鎵惧埌銆愯礋璐ｄ汉浠ｇ爜銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("璐熻矗浜�"))
+ error += "娌℃湁鎵惧埌銆愯礋璐ｄ汉銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("琛ㄤ綋澶囨敞"))
+ error += "娌℃湁鎵惧埌銆愯〃浣撳娉ㄣ�戠殑鏍囬,";
+
+ if (error.Length > 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ for (int i = 0; i <= tb2.Rows.Count - 1; i++)
+ {
+ string HName = "";
+ string HNum = "";
+ string HORGNumber = "";
+ string HORGName = "";
+ string HManagerName = "";
+ string HManagerNumber = "";
+ string HDotCheckItemNumber = "";
+ string HDotCheckItemName = "";
+ string HMouldNumber = "";
+ string HMouldName = "";
+
+ HName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["瑙勭▼缂栧彿"].ToString());
+ HNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["瑙勭▼鍚嶇О"].ToString());
+ HMouldNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鍣ㄥ叿缂栫爜"].ToString());
+ HMouldName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鍣ㄥ叿鍚嶇О"].ToString());
+ HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐浠ｇ爜"].ToString());
+ HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐鍚嶇О"].ToString());
+ HManagerNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["璐熻矗浜轰唬鐮�"].ToString());
+ HManagerName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["璐熻矗浜�"].ToString());
+ HDotCheckItemNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐐规椤圭洰浠ｇ爜"].ToString());
+ HDotCheckItemName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["鐐规椤圭洰鍚嶇О"].ToString());
+
+ //妫�鏌�
+ int index = i + 1;
+ //缁勭粐
+ if (HORGNumber != "")
+ {
+ //鏌ヨ缁勭粐
+ ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,缁勭粐涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,缁勭粐浠ｇ爜涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍣ㄥ叿
+ if (HMouldNumber != "")
+ {
+ ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HMouldNo='" + HMouldNumber + "' and Hname='" + HMouldName + "'", "Gy_MouldFileMain");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,鍣ㄥ叿涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HMouldID"] = ds.Tables[0].Rows[0]["HInterID"].ToString();
+ }
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,鍣ㄥ叿浠ｇ爜涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鐐规椤圭洰浠ｇ爜
+ if (HDotCheckItemNumber != "")
+ {
+
+ ds = oCN.RunProcReturn("select * from Gy_DotCheck where HNumber='" + HDotCheckItemNumber + "' and Hname='" + HDotCheckItemName + "'", "Gy_DotCheck");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,鐐规椤圭洰涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HDotCheckItemID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ tb2.Rows[i]["HDotCheckItemClassID"] = ds.Tables[0].Rows[0]["HDotCheckItemClassID"].ToString();
+ }
+ string HDotCheckItemID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,鐐规椤圭洰浠ｇ爜涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //璐熻矗浜轰唬鐮�
+ if (HManagerNumber != "")
+ {
+ //鏌ヨ缁勭粐
+ ds = oCN.RunProcReturn("select * from Gy_Employee where HNumber='" + HManagerNumber + "' and Hname='" + HManagerName + "'", "Gy_Employee");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,璐熻矗浜轰笉瀛樺湪锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HManagerID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ }
+ //鍣ㄥ叿鐐规瑙勭▼鍚嶇О
+ if (HName == "")
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,鍣ㄥ叿鐐规瑙勭▼鍚嶇О涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍣ㄥ叿鐐规瑙勭▼浠ｇ爜
+ if (HNum == "")
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,鍣ㄥ叿鐐规瑙勭▼浠ｇ爜涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = error;
+ objJsonResult.data = tb2;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿鐐规瑙勭▼椤圭洰 瀵煎叆(淇濆瓨)
+ [Route("Sc_MouldDotCheckRuleBill/Sc_MouldDotCheckRuleBill_btnSave")]
+ [HttpPost]
+ public object Sc_MouldDotCheckRuleBill_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckRuleBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HBillType = "3834";
+ string HMaker = user;//鍒跺崟浜�
+ DateTime HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ long HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ long HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ string HOrgID = item["HOrgID"].ToString();//缁勭粐ID
+ string HMouldID = item["HMouldID"].ToString();//鍣ㄥ叿ID
+ string HName = item["瑙勭▼鍚嶇О"].ToString();
+ string HBillNo = item["瑙勭▼缂栧彿"].ToString();
+ string HCycleUnit = item["鍛ㄦ湡鍗曚綅"].ToString();
+ string HCheckCycle = item["鐐规鍛ㄦ湡"].ToString();
+ string HExplanation = item["鎽樿"].ToString();
+ string HRemark = item["琛ㄥご澶囨敞"].ToString();
+ //瀛愯〃
+ string HDotCheckItemID = item["HDotCheckItemID"].ToString();//鐐规椤圭洰
+ string HDotCheckItemClassID = item["HDotCheckItemClassID"].ToString();//鐐规鍒嗙被椤圭洰
+ string HManagerID = item["HManagerID"].ToString()==""? "0": item["HManagerID"].ToString();//璐熻矗浜�
+ string HDotCheckPart = item["鐐规閮ㄤ綅"].ToString();
+ string HClaim = item["鍏蜂綋瑕佹眰"].ToString();
+ string HSubRemark = item["琛ㄤ綋澶囨敞"].ToString();
+ string HDotCheckItem = item["鐐规椤圭洰鍚嶇О"].ToString();
+ ds = oCN.RunProcReturn("select * from Sc_MouldDotCheckRuleBillMain where HBillNo='" + HBillNo + "'", "Sc_MouldDotCheckRuleBillMain");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ long HInterID = DBUtility.ClsPub.CreateBillID(HBillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鎻掑叆涓昏〃
+ oCN.RunProc("Insert Into Sc_MouldDotCheckRuleBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HMouldID,HBeginDate,HEndDate,HCycleUnit,HCheckCycle,HExplanation,HInnerBillNo" +
+ ") " +
+ " values('" + HBillType + "','" + HBillType + "'," + HInterID.ToString() + ",'" + HBillNo + "','" + HDate + "'" +
+ ", " + HYear.ToString() + "," + HPeriod.ToString() + ",'" + HRemark + "','" + HMaker + "',getdate()" +
+ ", " + HMouldID.ToString() + ", '" + DateTime.Now.ToShortDateString() + "','" + DateTime.Now.AddMonths(1).ToShortDateString() + "','" + HCycleUnit + "', " + HCheckCycle.ToString() + ",'" + HExplanation + "','" + "" + "'" +
+
+ ") ");
+ //鎻掑叆瀛愯〃
+ oCN.RunProc("Insert into Sc_MouldDotCheckRuleBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HDotCheckItemID,HDotCheckItem,HDotCheckPart,HClaim,HManagerID,HDotCheckItemClassID,HDotCheckItemMethodID" +
+ ") values("
+ + HInterID.ToString() + "," + 1 + ",'" + "" + "'," + DateTime.Now.ToShortDateString() + "," + Convert.ToString(false ? 1 : 0) + ",'" + HSubRemark + "'" +
+ "," + 0 + "," + 0 + ",'" + "" + "','" + "" + "'," + 0 + "," + 0 +
+ "," + HDotCheckItemID.ToString() + ",'" + HDotCheckItem + "','" + HDotCheckPart + "','" + HClaim + "'," + HManagerID.ToString() + "," + HDotCheckItemClassID + "," + 0 +
+ ") ");
+ }
+ else
+ {
+ long HInterID = long.Parse(ds.Tables[0].Rows[0]["HInterID"].ToString());
+ //鑾峰彇鏈�澶у瓙id
+ DataSet ds2 = oCN.RunProcReturn("select max(HEntryID) HEntryID from Sc_MouldDotCheckRuleBillSub where HInterID='" + HInterID + "'", "Sc_MouldDotCheckRuleBillSub");
+ long HEntryID = 1;
+ if (ds2.Tables[0].Rows.Count > 0)
+ {
+ HEntryID = long.Parse(ds2.Tables[0].Rows[0]["HEntryID"].ToString()) + 1;
+ }
+ //鎻掑叆瀛愯〃
+ oCN.RunProc("Insert into Sc_MouldDotCheckRuleBillSub " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HDotCheckItemID,HDotCheckItem,HDotCheckPart,HClaim,HManagerID,HDotCheckItemClassID,HDotCheckItemMethodID" +
+ ") values("
+ + HInterID.ToString() + "," + HEntryID + ",'" + "" + "'," + DateTime.Now.ToShortDateString() + "," + Convert.ToString(false ? 1 : 0) + ",'" + HSubRemark + "'" +
+ "," + 0 + "," + 0 + ",'" + "" + "','" + "" + "'," + 0 + "," + 0 +
+ "," + HDotCheckItemID.ToString() + ",'" + HDotCheckItem + "','" + HDotCheckPart + "','" + HClaim + "'," + HManagerID.ToString() + "," + HDotCheckItemClassID + "," + 0 +
+ ") ");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "瀵煎叆鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ oCN.RollBack();
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs
index 43dbbd8..95517a5 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs
@@ -9,7 +9,10 @@
using System.Net.Http;
using System.Web.Http;
using WebAPI.Models;
-
+using System.Web;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
+using System.IO;
+using SyntacticSugar.constant;
namespace WebAPI.Controllers.MJGL
{
public class Sc_MouldMaintainRuleBillController : ApiController
@@ -627,5 +630,375 @@
}
#endregion
+ #region 鍣ㄥ叿淇濆吇瑙勭▼ 鏂囦欢瀵煎叆淇濆瓨
+ #region 鍣ㄥ叿淇濆吇瑙勭▼ 鏂囦欢涓婁紶
+ [Route("Sc_MouldMaintainRuleBill/Sc_MouldMaintainRuleBill_Excel")]
+ [HttpPost]
+ public object Sc_MouldMaintainRuleBill_Excel()
+ {
+ try
+ {
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable tb2 = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
+ tb2.Columns.Add("HOrgID", typeof(Int32));//缁勭粐ID
+ tb2.Columns.Add("HMaintainItemID", typeof(Int32));//淇濆吇椤圭洰ID
+ tb2.Columns.Add("HManagerID", typeof(Int32));//璐熻矗浜篒D
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = tb2.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ tb2.Rows.Add(row);
+ }
+
+
+ var error = "";
+
+ //鏌ヨ娌℃湁鐨勫垪
+ if (!tb2.Columns.Contains("缁勭粐浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囦唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("缁勭粐鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囧悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("瑙勭▼缂栧彿"))
+ error += "娌℃湁鎵惧埌銆愯绋嬬紪鍙枫�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("瑙勭▼鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愯绋嬪悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鍛ㄦ湡鍗曚綅"))
+ error += "娌℃湁鎵惧埌銆愬懆鏈熷崟浣嶃�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("淇濆吇鍛ㄦ湡"))
+ error += "娌℃湁鎵惧埌銆愪繚鍏诲懆鏈熴�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鎽樿"))
+ error += "娌℃湁鎵惧埌銆愭憳瑕併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("琛ㄥご澶囨敞"))
+ error += "娌℃湁鎵惧埌銆愯〃澶村娉ㄣ�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("淇濆吇椤圭洰浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愪繚鍏婚」鐩唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("淇濆吇椤圭洰鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愪繚鍏婚」鐩悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("淇濆吇閮ㄤ綅"))
+ error += "娌℃湁鎵惧埌銆愪繚鍏婚儴浣嶃�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鍏蜂綋瑕佹眰"))
+ error += "娌℃湁鎵惧埌銆愬叿浣撹姹傘�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("璐熻矗浜轰唬鐮�"))
+ error += "娌℃湁鎵惧埌銆愯礋璐ｄ汉浠ｇ爜銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("璐熻矗浜�"))
+ error += "娌℃湁鎵惧埌銆愯礋璐ｄ汉銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("琛ㄤ綋澶囨敞"))
+ error += "娌℃湁鎵惧埌銆愯〃浣撳娉ㄣ�戠殑鏍囬,";
+
+ if (error.Length > 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ for (int i = 0; i <= tb2.Rows.Count - 1; i++)
+ {
+ string HName = "";
+ string HNum = "";
+ string HORGNumber = "";
+ string HORGName = "";
+ string HManagerName = "";
+ string HManagerNumber = "";
+ string HMaintainItemNumber = "";
+ string HMaintainItemName = "";
+
+ HName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["瑙勭▼缂栧彿"].ToString());
+ HNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["瑙勭▼鍚嶇О"].ToString());
+ HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐浠ｇ爜"].ToString());
+ HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐鍚嶇О"].ToString());
+ HManagerNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["璐熻矗浜轰唬鐮�"].ToString());
+ HManagerName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["璐熻矗浜�"].ToString());
+ HMaintainItemNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["淇濆吇椤圭洰浠ｇ爜"].ToString());
+ HMaintainItemName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["淇濆吇椤圭洰鍚嶇О"].ToString());
+
+ //妫�鏌�
+ int index = i + 1;
+ //缁勭粐
+ if (HORGNumber != "")
+ {
+ //鏌ヨ缁勭粐
+ ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,缁勭粐涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,缁勭粐浠ｇ爜涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //淇濆吇椤圭洰浠ｇ爜
+ if (HMaintainItemNumber != "")
+ {
+ //鏌ヨ缁勭粐
+ ds = oCN.RunProcReturn("select * from Gy_Maintain where HNumber='" + HMaintainItemNumber + "' and Hname='" + HMaintainItemName + "'", "Gy_Maintain");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,淇濆吇椤圭洰涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HMaintainItemID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ string HMaintainItemID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,淇濆吇椤圭洰浠ｇ爜涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //璐熻矗浜轰唬鐮�
+ if (HManagerNumber != "")
+ {
+ //鏌ヨ缁勭粐
+ ds = oCN.RunProcReturn("select * from Gy_Employee where HNumber='" + HManagerNumber + "' and Hname='" + HManagerName + "'", "Gy_Employee");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,璐熻矗浜轰笉瀛樺湪锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HManagerID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ }
+ //鍣ㄥ叿淇濆吇瑙勭▼鍚嶇О
+ if (HName == "")
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,鍣ㄥ叿淇濆吇瑙勭▼鍚嶇О涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鍣ㄥ叿淇濆吇瑙勭▼浠ｇ爜
+ if (HNum == "")
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,鍣ㄥ叿淇濆吇瑙勭▼浠ｇ爜涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = error;
+ objJsonResult.data = tb2;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍣ㄥ叿淇濆吇瑙勭▼椤圭洰 瀵煎叆(淇濆瓨)
+ [Route("Sc_MouldMaintainRuleBill/Sc_MouldMaintainRuleBill_btnSave")]
+ [HttpPost]
+ public object Sc_MouldMaintainRuleBill_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainRuleBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HBillType = "3833";
+ string HMaker = user;//鍒跺崟浜�
+ DateTime HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ long HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ long HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ string HOrgID = item["HOrgID"].ToString();//缁勭粐ID
+ string HName = item["瑙勭▼鍚嶇О"].ToString();
+ string HBillNo = item["瑙勭▼缂栧彿"].ToString();
+ string HCycleUnit = item["鍛ㄦ湡鍗曚綅"].ToString();
+ string HCheckCycle = item["淇濆吇鍛ㄦ湡"].ToString();
+ string HExplanation = item["鎽樿"].ToString();
+ string HRemark = item["琛ㄥご澶囨敞"].ToString();
+ //瀛愯〃
+ string HMaintainItemID = item["HMaintainItemID"].ToString();//淇濆吇椤圭洰
+ string HManagerID = item["HManagerID"].ToString() == "" ? "0" : item["HManagerID"].ToString();//璐熻矗浜�
+ string HMaintainPart = item["淇濆吇閮ㄤ綅"].ToString();
+ string HClaim = item["鍏蜂綋瑕佹眰"].ToString();
+ string HSubRemark = item["琛ㄤ綋澶囨敞"].ToString();
+ string HMaintainItem = item["淇濆吇椤圭洰鍚嶇О"].ToString();
+ ds = oCN.RunProcReturn("select * from Sc_MouldMaintainRuleBillMain where HBillNo='" + HBillNo + "'", "Sc_MouldMaintainRuleBillMain");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ long HInterID = DBUtility.ClsPub.CreateBillID(HBillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鎻掑叆涓昏〃
+ oCN.RunProc("Insert Into Sc_MouldMaintainRuleBillMain" +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
+ ",HCycleUnit,HCheckCycle,HExplanation,HInnerBillNo,HMaintainLevID,HUseQtys,HSafeDays,HErrWarDays,HErrWarQtys" +
+ ") " +
+ " values('" + HBillType + "','" + HBillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
+ ", " + HYear.ToString() + "," + HPeriod.ToString() + ",'" + HRemark + "','" + HMaker + "',getdate()" +
+ ",'" + HCycleUnit + "'," + HCheckCycle.ToString() + ",'" + HExplanation + "','" + " " + "'," + 0 + "," + 0 + "," + 0 + "," + 0 + "," + 0 +
+ ") ");
+ //鎻掑叆瀛愯〃
+ oCN.RunProc("Insert into Sc_MouldMaintainRuleBillSub_Item " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaintainItemID,HMaintainItem,HMaintainPart" +
+ ",HClaim,HManagerID" +
+ ") values("
+ + HInterID.ToString() + "," + 1 + ",'" + "" + "'," + DateTime.Now.ToShortDateString() + "," + Convert.ToString(false ? 1 : 0) + ",'" + HSubRemark + "'" +
+ "," + 0 + "," + 0 + ",'" + "" + "','" + "" + "'," + 0 + "," + 0 +
+ "," + HMaintainItemID.ToString() + ",'" + HMaintainItem + "','" + HMaintainPart + "','" + HClaim + "'," + HManagerID.ToString() +
+ ") ");
+ }
+ else
+ {
+ long HInterID = long.Parse(ds.Tables[0].Rows[0]["HInterID"].ToString());
+ //鑾峰彇鏈�澶у瓙id
+ DataSet ds2 = oCN.RunProcReturn("select max(HEntryID) HEntryID from Sc_MouldMaintainRuleBillSub_Item where HInterID='" + HInterID + "'", "Sc_MouldMaintainRuleBillSub_Item");
+ long HEntryID = 1;
+ if (ds2.Tables[0].Rows.Count > 0)
+ {
+ HEntryID = long.Parse(ds2.Tables[0].Rows[0]["HEntryID"].ToString())+1;
+ }
+ //鎻掑叆瀛愯〃
+ oCN.RunProc("Insert into Sc_MouldMaintainRuleBillSub_Item " +
+ " (HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HMaintainItemID,HMaintainItem,HMaintainPart" +
+ ",HClaim,HManagerID" +
+ ") values("
+ + HInterID.ToString() + "," + HEntryID + ",'" + "" + "'," + DateTime.Now.ToShortDateString() + "," + Convert.ToString(false ? 1 : 0) + ",'" + HSubRemark + "'" +
+ "," + 0 + "," + 0 + ",'" + "" + "','" + "" + "'," + 0 + "," + 0 +
+ "," + HMaintainItemID.ToString() + ",'" + HMaintainItem + "','" + HMaintainPart + "','" + HClaim + "'," + HManagerID.ToString() +
+ ") ");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "瀵煎叆鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ oCN.RollBack();
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ #endregion
+
}
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
index de79d99..4c57f43 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
@@ -5,6 +5,8 @@
using System.Data;
using System.Web.Http;
using WebAPI.Models;
+using SyntacticSugar.constant;
+using Newtonsoft.Json;
namespace WebAPI.Controllers
{
/**
@@ -134,6 +136,61 @@
#endregion
+ #region 鍣ㄥ叿鐩存帴璋冩嫧鍗曞垎椤靛垪琛�
+ [Route("Sc_MouldProdMoveBill/page")]
+ [HttpGet]
+ public object Sc_MouldProdMoveBillPage(string sWhere, string user, int page, int size)
+ {
+ DataSet ds;
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdMoveBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCn.RunProcReturn("exec h_p_Sc_MouldProdMoveBillList " + page + "," + size + ",''", "h_p_Sc_MouldProdMoveBillList");
+ }
+ else
+ {
+ ds = oCn.RunProcReturn("exec h_p_Sc_MouldProdMoveBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_Sc_MouldProdMoveBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region[鍣ㄥ叿鐩存帴璋冩嫧鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
[Route("Sc_MouldProdMoveBill/Sc_MouldProdMoveBillListCheckDetai")]
[HttpGet]
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
index 598cfba..82d5bda 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
@@ -1,9 +1,11 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Web.Http;
using WebAPI.Models;
+
+using SyntacticSugar.constant;
namespace WebAPI.Controllers
{
public class Sc_MouldScrapInBillController : ApiController
@@ -463,5 +465,61 @@
#endregion
+ #region 妯″叿鎶ュ簾鍏ュ簱鍗曞垎椤靛垪琛�
+ [Route("Sc_MouldScrapInBill/page")]
+ [HttpGet]
+ public object Sc_MouldScrapInBillPage(string sWhere, string user, int page, int size)
+ {
+ DataSet ds;
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapRequestBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCn.RunProcReturn("exec h_p_Sc_MouldScrapInHouseBillList " + page + "," + size + ",''", "h_p_Sc_MouldScrapInHouseBillList");
+ }
+ else
+ {
+ ds = oCn.RunProcReturn("exec h_p_Sc_MouldScrapInHouseBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_Sc_MouldScrapInHouseBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
index 0e7481c..8d3ae33 100644
--- a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
+++ b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
@@ -773,7 +773,7 @@
{
BillStatus = DBUtility.ClsPub.Enum_BillStatus.BillStatus_AddNew;
//鍒ゆ柇鏂板鏉冮檺
- if (!DBUtility.ClsPub.Security_Log(ModRightName, 1, false, HMaker))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameEdit, 1, false, HMaker))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs
index c08f545..75c44db 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs
@@ -9,7 +9,10 @@
using System.Net.Http;
using System.Web.Http;
using WebAPI.Models;
-
+using System.Web;
+using WebAPI.Controllers.SCGL.鏃ヨ鍒掔鐞�;
+using System.IO;
+using SyntacticSugar.constant;
namespace WebAPI.Controllers.SBGL
{
public class Sb_EquipMaintainRuleBillController : ApiController
@@ -616,5 +619,383 @@
}
}
#endregion
+
+ #region 璁惧淇濆吇瑙勭▼ 鏂囦欢瀵煎叆淇濆瓨
+ #region 璁惧淇濆吇瑙勭▼ 鏂囦欢涓婁紶
+ [Route("Sb_EquipMaintainRuleBill/Sb_EquipMaintainRuleBill_Excel")]
+ [HttpPost]
+ public object Sb_EquipMaintainRuleBill_Excel()
+ {
+ try
+ {
+ //鑾峰彇鏂囦欢鍚嶇О
+ var file = HttpContext.Current.Request.Files[0];
+ //鑾峰彇鏂囦欢鐗╃悊璺緞
+ string ExcelPath = HttpContext.Current.Server.MapPath("~/" + file.FileName);
+ //淇濆瓨鏂囦欢
+ file.SaveAs(ExcelPath);
+
+ NpoiHelper np = new NpoiHelper();
+ DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 1, "0");
+
+ //鍒犻櫎鏂囦欢
+ File.Delete(ExcelPath);
+
+ //鍒涘缓涓存椂琛�
+ DataTable tb2 = new DataTable("dt2");
+
+ //娣诲姞鍒楀悕
+ for (int i = 0; i < ExcelDs.Tables[0].Columns.Count; i++)
+ {
+ tb2.Columns.Add(ExcelDs.Tables[0].Rows[0][i].ToString());
+ }
+
+ //妯℃澘缂哄皯鍒� 浣嗛渶瑕佷粠鏁版嵁搴撲腑鏌ヨ鍑烘潵鏄剧ず鍦ㄩ〉闈㈢殑瀛楁
+ tb2.Columns.Add("HOrgID", typeof(Int32));//缁勭粐ID
+ tb2.Columns.Add("HMaintainItemID", typeof(Int32));//淇濆吇椤圭洰ID
+ tb2.Columns.Add("HManagerID", typeof(Int32));//璐熻矗浜篒D
+ //娣诲姞鏁版嵁
+ for (int i = 1; i < ExcelDs.Tables[0].Rows.Count; i++)
+ {
+ DataRow row = tb2.NewRow();
+ for (int j = 0; j < ExcelDs.Tables[0].Columns.Count; j++)
+ {
+ row[j] = ExcelDs.Tables[0].Rows[i][j].ToString();
+ }
+ tb2.Rows.Add(row);
+ }
+
+
+ var error = "";
+
+ //鏌ヨ娌℃湁鐨勫垪
+ if (!tb2.Columns.Contains("缁勭粐浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囦唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("缁勭粐鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愮粍缁囧悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("瑙勭▼缂栧彿"))
+ error += "娌℃湁鎵惧埌銆愯绋嬬紪鍙枫�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("瑙勭▼鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愯绋嬪悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鍛ㄦ湡鍗曚綅"))
+ error += "娌℃湁鎵惧埌銆愬懆鏈熷崟浣嶃�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("淇濆吇鍛ㄦ湡"))
+ error += "娌℃湁鎵惧埌銆愪繚鍏诲懆鏈熴�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鎽樿"))
+ error += "娌℃湁鎵惧埌銆愭憳瑕併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("琛ㄥご澶囨敞"))
+ error += "娌℃湁鎵惧埌銆愯〃澶村娉ㄣ�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("淇濆吇椤圭洰浠ｇ爜"))
+ error += "娌℃湁鎵惧埌銆愪繚鍏婚」鐩唬鐮併�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("淇濆吇椤圭洰鍚嶇О"))
+ error += "娌℃湁鎵惧埌銆愪繚鍏婚」鐩悕绉般�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("淇濆吇閮ㄤ綅"))
+ error += "娌℃湁鎵惧埌銆愪繚鍏婚儴浣嶃�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("鍏蜂綋瑕佹眰"))
+ error += "娌℃湁鎵惧埌銆愬叿浣撹姹傘�戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("璐熻矗浜轰唬鐮�"))
+ error += "娌℃湁鎵惧埌銆愯礋璐ｄ汉浠ｇ爜銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("璐熻矗浜�"))
+ error += "娌℃湁鎵惧埌銆愯礋璐ｄ汉銆戠殑鏍囬,";
+
+ if (!tb2.Columns.Contains("琛ㄤ綋澶囨敞"))
+ error += "娌℃湁鎵惧埌銆愯〃浣撳娉ㄣ�戠殑鏍囬,";
+
+ if (error.Length > 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = $"Excel妯℃澘瀛樺湪閿欒,{error}\r\n";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ for (int i = 0; i <= tb2.Rows.Count - 1; i++)
+ {
+ string HName = "";
+ string HNum = "";
+ string HORGNumber = "";
+ string HORGName = "";
+ string HManagerName = "";
+ string HManagerNumber = "";
+ string HMaintainItemNumber = "";
+ string HMaintainItemName = "";
+
+ HName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["瑙勭▼缂栧彿"].ToString());
+ HNum = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["瑙勭▼鍚嶇О"].ToString());
+ HORGNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐浠ｇ爜"].ToString());
+ HORGName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["缁勭粐鍚嶇О"].ToString());
+ HManagerNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["璐熻矗浜轰唬鐮�"].ToString());
+ HManagerName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["璐熻矗浜�"].ToString());
+ HMaintainItemNumber = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["淇濆吇椤圭洰浠ｇ爜"].ToString());
+ HMaintainItemName = DBUtility.ClsPub.isStrNull(tb2.Rows[i]["淇濆吇椤圭洰鍚嶇О"].ToString());
+
+ //妫�鏌�
+ int index = i + 1;
+ //缁勭粐
+ if (HORGNumber != "")
+ {
+ //鏌ヨ缁勭粐
+ ds = oCN.RunProcReturn("select * from Xt_ORGANIZATIONS where HNumber='" + HORGNumber + "' and Hname='" + HORGName + "'", "Xt_ORGANIZATIONS");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,缁勭粐涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HOrgID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ string HORGid = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,缁勭粐浠ｇ爜涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //淇濆吇椤圭洰浠ｇ爜
+ if (HMaintainItemNumber != "")
+ {
+ //鏌ヨ缁勭粐
+ ds = oCN.RunProcReturn("select * from Gy_Maintain where HNumber='" + HMaintainItemNumber + "' and Hname='" + HMaintainItemName + "'", "Gy_Maintain");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,淇濆吇椤圭洰涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HMaintainItemID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ string HMaintainItemID = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ else
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,淇濆吇椤圭洰浠ｇ爜涓虹┖";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //璐熻矗浜轰唬鐮�
+ if (HManagerNumber != "")
+ {
+ //鏌ヨ缁勭粐
+ ds = oCN.RunProcReturn("select * from Gy_Employee where HNumber='" + HManagerNumber + "' and Hname='" + HManagerName + "'", "Gy_Employee");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,璐熻矗浜轰笉瀛樺湪锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ tb2.Rows[i]["HManagerID"] = ds.Tables[0].Rows[0]["HItemID"].ToString();
+ }
+ }
+ //璁惧淇濆吇瑙勭▼鍚嶇О
+ if (HName == "")
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,璁惧淇濆吇瑙勭▼鍚嶇О涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //璁惧淇濆吇瑙勭▼浠ｇ爜
+ if (HNum == "")
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "绗�" + index + "琛�,璁惧淇濆吇瑙勭▼浠ｇ爜涓嶈兘涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = error;
+ objJsonResult.data = tb2;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 璁惧淇濆吇瑙勭▼椤圭洰 瀵煎叆(淇濆瓨)
+ [Route("Sb_EquipMaintainRuleBill/Sb_EquipMaintainRuleBill_btnSave")]
+ [HttpPost]
+ public object Sb_EquipMaintainRuleBill_btnSave([FromBody] JObject sMainSub)
+ {
+ var _value = sMainSub["sMainSub"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { "&鍜�" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string user = sArray[1].ToString();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainRuleBill_Edit", 1, false, user))
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ List<object> Excel = Newtonsoft.Json.JsonConvert.DeserializeObject<List<object>>(msg2);
+ List<Dictionary<string, string>> list = new List<Dictionary<string, string>>();
+
+ foreach (JObject item in Excel)
+ {
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ foreach (var itm in item.Properties())
+ {
+ dic.Add(itm.Name, itm.Value.ToString());
+ }
+ list.Add(dic);
+ }
+
+ oCN.BeginTran();
+ int i = 1;
+ foreach (Dictionary<string, string> item in list)
+ {
+ string HBillType = "3912";
+ string HMaker = user;//鍒跺崟浜�
+ DateTime HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));// --鏃ユ湡
+ long HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ long HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
+ string HOrgID = item["HOrgID"].ToString();//缁勭粐ID
+ string HName = item["瑙勭▼鍚嶇О"].ToString();
+ string HBillNo = item["瑙勭▼缂栧彿"].ToString();
+ string HCycleUnit = item["鍛ㄦ湡鍗曚綅"].ToString();
+ string HCheckCycle = item["淇濆吇鍛ㄦ湡"].ToString();
+ string HExplanation = item["鎽樿"].ToString();
+ string HRemark = item["琛ㄥご澶囨敞"].ToString();
+ //瀛愯〃
+ string HMaintainItemID = item["HMaintainItemID"].ToString();//淇濆吇椤圭洰
+ string HManagerID = item["HManagerID"].ToString() == "" ? "0" : item["HManagerID"].ToString();//璐熻矗浜�
+ string HMaintainPart = item["淇濆吇閮ㄤ綅"].ToString();
+ string HClaim = item["鍏蜂綋瑕佹眰"].ToString();
+ string HSubRemark = item["琛ㄤ綋澶囨敞"].ToString();
+ string HMaintainItem = item["淇濆吇椤圭洰鍚嶇О"].ToString();
+ ds = oCN.RunProcReturn("select * from Sb_EquipMaintainRuleBillMain where HBillNo='" + HBillNo + "'", "Sb_EquipMaintainRuleBillMain");
+
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ long HInterID = DBUtility.ClsPub.CreateBillID(HBillType, ref DBUtility.ClsPub.sExeReturnInfo);
+ //鎻掑叆涓昏〃
+ oCN.RunProc("Insert Into Sb_EquipMaintainRuleBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HRemark" +
+ ",HCheckCycle,HCycleUnit,HExplanation,HInnerBillNo,HMaintainLevID,HSafeDays,HErrWarDays" +
+ ") " +
+ " values('" + HBillType + "','" + HBillType + "'," + HInterID.ToString() + ",'" + HBillNo + "','" + HDate + "','" + HMaker + "',getdate()" +
+ "," + HYear.ToString() + "," + HPeriod.ToString() + ",'" + HRemark +
+ "'," + HCheckCycle.ToString() + ",'" + HCycleUnit + "','" + HExplanation + "','" + "" + "'," + 0 + "," + 0 + ", " + 0 +
+ ") ");
+ //鎻掑叆瀛愯〃
+ oCN.RunProc("Insert into Sb_EquipMaintainRuleBillSub_Item" +
+ " (HInterID,HEntryID,HMaintainItemID,HMaintainItem" +
+ ",HMaintainPart,HClaim" +
+ ",HManagerID" +
+ ",HCloseMan,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ") values("
+ + HInterID.ToString() + "," + 1 + "," + HMaintainItemID.ToString() + ",'" + HMaintainItem.ToString() + "'" +
+ ",'" + HMaintainPart.ToString() + "','" + HClaim.ToString() + "'" +
+ "," + HManagerID.ToString() +
+ ",'" + "" + "'," + Convert.ToString(false ? 1 : 0) + ",'" + HSubRemark + "'" +
+ "," + 0 + "," + 0 + ",'" + "" + "','" + "" + "'," + 0 + "," + 0 +
+ ") ");
+ }
+ else
+ {
+ long HInterID = long.Parse(ds.Tables[0].Rows[0]["HInterID"].ToString());
+ //鑾峰彇鏈�澶у瓙id
+ DataSet ds2 = oCN.RunProcReturn("select max(HEntryID) HEntryID from Sb_EquipMaintainRuleBillSub_Item where HInterID='" + HInterID + "'", "Sb_EquipMaintainRuleBillSub_Item");
+ long HEntryID = 1;
+ if (ds2.Tables[0].Rows.Count > 0)
+ {
+ HEntryID = long.Parse(ds2.Tables[0].Rows[0]["HEntryID"].ToString()) + 1;
+ }
+ //鎻掑叆瀛愯〃
+ //鎻掑叆瀛愯〃
+ oCN.RunProc("Insert into Sb_EquipMaintainRuleBillSub_Item" +
+ " (HInterID,HEntryID,HMaintainItemID,HMaintainItem" +
+ ",HMaintainPart,HClaim" +
+ ",HManagerID" +
+ ",HCloseMan,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ") values("
+ + HInterID.ToString() + "," + HEntryID + "," + HMaintainItemID.ToString() + ",'" + HMaintainItem.ToString() + "'" +
+ ",'" + HMaintainPart.ToString() + "','" + HClaim.ToString() + "'" +
+ "," + HManagerID.ToString() +
+ ",'" + "" + "'," + Convert.ToString(false ? 1 : 0) + ",'" + HSubRemark + "'" +
+ "," + 0 + "," + 0 + ",'" + "" + "','" + "" + "'," + 0 + "," + 0 +
+ ") ");
+ }
+
+ i++;
+ }
+
+ oCN.Commit();
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "瀵煎叆鎴愬姛!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ LogService.Write(e);
+ oCN.RollBack();
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+ #endregion
+
}
}
diff --git a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
index baed541..d79645e 100644
--- a/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
+++ b/WebAPI/Controllers/SCGL/QC_OutCompCheckBillController.cs
@@ -1,6 +1,7 @@
锘縰sing Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
+using SyntacticSugar.constant;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -20,17 +21,12 @@
public DataSet ds = new DataSet();
public WebServer webserver = new WebServer();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ public DAL.ClsQC_FirstPieceCheckBill BillOld = new DAL.ClsQC_FirstPieceCheckBill();
-
-
- /// <summary>
- /// 杩斿洖鍑哄巶妫�楠屽崟鍒楄〃
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #region 鍑哄巶妫�楠屽崟鍒楄〃
[Route("QC_OutCompCheckBill/GetOutCompCheckBillList")]
[HttpGet]
- public object GetOutCompCheckBillList(string sWhere,string user)
+ public object GetOutCompCheckBillList(string sWhere, string user)
{
try
{
@@ -52,33 +48,23 @@
else
{
string sql1 = "select * from h_v_QC_OutCompCheckBillList where 1 = 1 ";
- string sql = sql1 + sWhere+ " order by hmainid desc ";
+ string sql = sql1 + sWhere + " order by hmainid desc ";
ds = oCN.RunProcReturn(sql, "h_v_QC_OutCompCheckBillList");
}
- foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
- {
- Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
- string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
- a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
- }
+ foreach (DataColumn col in ds.Tables[0].Columns)//閬嶅巻ds涓涓�涓〃锛圱ables[0]锛夌殑鎵�鏈夊垪锛圕olumns锛夋瘡娆″惊鐜腑锛宑ol鍙橀噺浼氭寔鏈夊綋鍓嶅垪鐨勫紩鐢�
+ {
+ Type dataType = col.DataType; //鑾峰彇褰撳墠鏁版嵁绫诲瀷浼犲叆 鑷畾涔夊彉閲廳atadataType
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; //瀛楃涓叉嫾鎺� // 灏嗗垪鍚嶅拰鏁版嵁绫诲瀷淇℃伅鎷兼帴鎴愪竴涓狫SON鏍煎紡鐨勫瓧绗︿覆
+ a.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
objJsonResult.list = a;
return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
}
catch (Exception e)
{
@@ -89,59 +75,116 @@
return objJsonResult;
}
}
- #region[缂栬緫鏃惰幏鍙栬〃澶存暟鎹甝
- [Route("QC_OutCompCheckBill/QC_OutCompCheckBillListCheckDetail")]
+ #endregion
+
+ #region 鍑哄巶妫�楠屽崟鍒嗛〉鍒楄〃
+ [Route("QC_OutCompCheckBill/QC_OutCompCheckBillListPage")]
[HttpGet]
- public ApiResult<DataSet> QC_OutCompCheckBillListCheckDetail(string HID)
+ public json QC_OutCompCheckBillListPage(string sWhere, string user, int page, int size)
{
- if (string.IsNullOrEmpty(HID))
- return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+ json res = new json();
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鍒ゆ柇鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("QC_OutCompCheckBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎮ㄦ病鏈夎妯″潡鏉冮檺,璇蜂笌绠＄悊鍛樿仈绯伙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_QC_OutCompCheckBillList " + page + "," + size + ",''", "h_p_QC_OutCompCheckBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_QC_OutCompCheckBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_QC_OutCompCheckBillList");
+ }
- var dataSet = oCN.RunProcReturn("select top 1 * from h_v_QC_OutCompCheckBillList where hmainid= " + HID + " ", "h_v_QC_OutCompCheckBillList");
- if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
- return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ粨绠楀崟鍙�" };
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
- return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ res.code = CodeConstant.SUCCEED;
+ res.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ res.Message = "Sucess锛�";
+ res.list = columnNameList;
+ res.data = ds.Tables[0];
+ return res;
+ }
+ catch (Exception e)
+ {
+ res.code = CodeConstant.FAIL;
+ res.count = CountConstant.FAIL;
+ res.Message = "Exception锛�" + e.ToString();
+ res.data = null;
+ return res;
+ }
}
#endregion
- #region[缂栬緫鏃惰幏鍙栬〃浣撴暟鎹甝
- [Route("QC_OutCompCheckBill/QC_OutCompCheckBillListProjectDetai")]
+ #region[缂栬緫鏃惰幏鍙栨暟鎹甝
+ [Route("QC_OutCompCheckBill/QC_OutCompCheckBill_Edit")]
[HttpGet]
- public object QC_OutCompCheckBillListProjectDetai(string sqlWhere)
+ public object QC_OutCompCheckBill_Edit(string sWhere, string user)
{
- DataSet ds;
try
{
- SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- string sql1 = "SELECT 鏃ユ湡,鍗曟嵁鍙�,琛ㄥご澶囨敞,瀹㈡埛鍚嶇О" +
- ",瀹㈡埛浠ｇ爜,浜у搧鍐呯爜, 浜у搧鍚嶇О, 浜у搧鍨嬪彿, 妫�楠屽憳浠ｇ爜" +
- ", 妫�楠屽憳鍚嶇О, 鍒跺崟浜�, 鍒跺崟鏃ユ湡, 瀹℃牳浜�, 瀹℃牳鏃ユ湡" +
- ", 淇敼浜�, 淇敼鏃ユ湡, 鍏抽棴浜�, 鍏抽棴鏃ユ湡,鍗曟嵁绫诲瀷 FROM h_v_QC_OutCompCheckBillList where 1 = 1 ";
- string sql = sql1 + sqlWhere;
- ds = oCN.RunProcReturn(sql, "h_v_QC_OutCompCheckBillList");
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
- objJsonResult.data = ds.Tables[0];
+ List<object> columnNameList = new List<object>();
+
+ string sql1 = "select * from h_v_QC_OutCompCheckBillList_Edit where 1 = 1 ";
+ string sql = sql1 + sWhere + " order by hmainid desc";
+ ds = oCN.RunProcReturn(sql, "h_v_QC_OutCompCheckBillList_Edit");
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ヨ鍒版暟鎹�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
}
catch (Exception e)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.Message = "Exception锛�" + e.ToString();
objJsonResult.data = null;
+ return objJsonResult;
}
- return objJsonResult;
}
+
#endregion
- /// <summary>
- /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #region 鍑哄巶妫�楠屽崟 涓诲瓙琛ㄤ繚瀛�
[Route("QC_OutCompCheckBill/AddBill")]
[HttpPost]
public object AddBill([FromBody] JObject sMainSub)
@@ -172,7 +215,8 @@
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
string msg3 = sArray[1].ToString();
- string user = sArray[2].ToString();
+ string OperationType = sArray[2].ToString();
+ string user = sArray[3].ToString();
try
{
//鍒ゆ柇鏉冮檺
@@ -187,47 +231,98 @@
msg2 = "[" + msg2.ToString() + "]";
List<QC_OutCompCheckBillMain> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<QC_OutCompCheckBillMain>>(msg2);
- int HYear = 2021;
- double HPeriod = 1;
+ int HYear = DateTime.Now.Year; ;
+ double HPeriod = DateTime.Now.Month; ;
string HBillType = "7504";
string HBillSubType = "7504";
long HInterID = mainList[0].HInterID;//閫掑叆type寰楀埌鐨勫崟鎹甀D
DateTime HDate = mainList[0].HDate;//鏃ユ湡
string HBillNo = mainList[0].HBillNo;//閫掑叆type寰楀埌鐨勫崟鎹彿
long HBillStatus = mainList[0].HBillStatus;
- string HRemark = mainList[0].HRemark;//澶囨敞
- string HBacker = mainList[0].HBacker;
- DateTime HBackDate = mainList[0].HBackDate;
- string HBackRemark = mainList[0].HBackRemark;
- string HChecker = mainList[0].HChecker;
- DateTime HCheckDate = mainList[0].HCheckDate;
- string HMaker = mainList[0].HMaker;
- DateTime HMakeDate = mainList[0].HMakeDate;
+ string HRemark = mainList[0].HRemark;//澶囨敞
+ string HMaker = user;
+
long HCusID = mainList[0].HCusID;
long HMaterID = mainList[0].HMaterID;
long HFirstCheckEmp = mainList[0].HFirstCheckEmp;
- string HCheckerResult = mainList[0].HCheckerResult;
+ bool HCheckerResult = ClsPub.isBool(mainList[0].HCheckerResult);
double HInStockQty = mainList[0].HInStockQty;
double HCheckQty = mainList[0].HCheckQty;
double HRightQty = mainList[0].HRightQTy;
double HBadQty = mainList[0].HBadQty;
+
+ long HICMOInterID = ClsPub.isLong(mainList[0].HICMOInterID);
+ string HICMOBillNo = ClsPub.isStrNull(mainList[0].HICMOBillNo);
+ long HICMOEntryID = ClsPub.isLong(mainList[0].HICMOEntryID);
+ long HICMOQty = ClsPub.isLong(mainList[0].HICMOQty);
+ long HProcExchInterID = ClsPub.isLong(mainList[0].HProcExchInterID);
+ long HProcExchEntryID = ClsPub.isLong(mainList[0].HProcExchEntryID);
+ string HProcExchBillNo = ClsPub.isStrNull(mainList[0].HProcExchBillNo);
+ long HProcExchQty = ClsPub.isLong(mainList[0].HProcExchQty);
+ long HSourceID = ClsPub.isLong(mainList[0].HSourceID);
+ long HProcID = ClsPub.isLong(mainList[0].HProcID);
+ long HMainSourceInterID = ClsPub.isLong(mainList[0].HMainSourceInterID);
+ long HMainSourceEntryID = ClsPub.isLong(mainList[0].HMainSourceEntryID);
+ string HMainSourceBillNo = ClsPub.isStrNull(mainList[0].HMainSourceBillNo);
+ string HMainSourceBillType = ClsPub.isStrNull(mainList[0].HMainSourceBillType);
+ long HQCSchemeID = ClsPub.isLong(mainList[0].HQCSchemeID);
+ long HShiftsID = ClsPub.isLong(mainList[0].HShiftsID);
+ string HErrTreatment = ClsPub.isStrNull(mainList[0].HErrTreatment);
+ string HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
+ long HSourceOrgID = ClsPub.isLong(mainList[0].HSourceOrgID);
+ long HInspectOrgID = ClsPub.isLong(mainList[0].HInspectOrgID);
- //涓昏〃
- oCN.RunProc("Insert Into QC_OutCompCheckBillMain " +
- "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
- ",HYear,HPeriod,HRemark" +
- ",HCusID,HMaterID,HInStockQty,HCheckQty,HRightQty" +
- ",HBadQty,HFirstCheckEmp,HCheckerResult" +
- ") " +
- " values('" + HBillType + "','" + HBillSubType + "'," + HInterID.ToString() + ",'" + HBillNo + "'," + HBillStatus.ToString() + ",'" + HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
- "," + HYear.ToString() + "," + HPeriod.ToString() + ",'" + HRemark + "'" +
- "," + HCusID.ToString() + "," + HMaterID.ToString() + "," + HInStockQty.ToString() + "," + HCheckQty.ToString() + "," + HRightQty.ToString() +
- "," + HBadQty.ToString() + "," + HFirstCheckEmp.ToString() + ",'" + HCheckerResult + "'" +
- ") ");
+ if (OperationType=="1" || OperationType=="2")
+ {
+ //涓昏〃
+ oCN.RunProc("Insert Into QC_OutCompCheckBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
+ ",HYear,HPeriod,HRemark,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
+ ",HCusID,HMaterID,HInStockQty,HCheckQty,HRightQty,HBadQty,HFirstCheckEmp,HCheckerResult" +
+ ",HICMOInterID,HICMOEntryID,HICMOBillNo,HICMOQty,HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HProcExchQty" +
+ ",HSourceID,HProcID,HQCSchemeID,HShiftsID,HErrTreatment,HBatchNo,HSourceOrgID,HInspectOrgID" +
+ ") " +
+ " values('" + HBillType + "','" + HBillSubType + "'," + HInterID.ToString() + ",'" + HBillNo + "'," + HBillStatus.ToString() + ",'" + HDate + "','" + user + "',getdate()" +
+ "," + HYear.ToString() + "," + HPeriod.ToString() + ",'" + HRemark + "','" + HMainSourceInterID + "','" + HMainSourceEntryID + "','" + HMainSourceBillNo + "','" + HMainSourceBillType + "'" +
+ ",'" + HCusID.ToString() + "','" + HMaterID.ToString() + "','" + HInStockQty.ToString() + "','" + HCheckQty.ToString() + "','" + HRightQty.ToString() + "','" + HBadQty.ToString() + "','" + HFirstCheckEmp.ToString() + "','" + DBUtility.ClsPub.BoolToString(HCheckerResult) + "'" +
+ ",'" + HICMOInterID.ToString() + "','" + HICMOEntryID.ToString() + "','" + HICMOBillNo.ToString() + "','" + HICMOQty.ToString() + "','" + HProcExchInterID.ToString() + "','" + HProcExchEntryID.ToString() + "','" + HProcExchBillNo.ToString() + "','" + HProcExchQty + "'" +
+ ",'" + HSourceID.ToString() + "','" + HProcID.ToString() + "','" + HQCSchemeID.ToString() + "','" + HShiftsID.ToString() + "','" + HErrTreatment.ToString() + "','" + HBatchNo.ToString() + "','" + HSourceOrgID.ToString() + "','" + HInspectOrgID.ToString() + "') ");
+ }
+ else if (OperationType == "3")
+ {
+ oCN.RunProc("UpDate QC_OutCompCheckBillMain set " +
+ " HBillNo='" + HBillNo + "'" +
+ ",HDate='" + HDate + "'" +
+ ",HYear='" + HYear.ToString() + "'" +
+ ",HPeriod='" + HPeriod.ToString() + "'" +
+ ",HBillStatus='" + HBillStatus + "'" +
+ ",HRemark='" + HRemark + "'" +
+ ",HUpDater='" +user + "'" +
+ ",HUpDateDate=getdate()" +
+ //========================================
+ ",HSourceID=" + HSourceID.ToString() +
+ ",HQCSchemeID=" + HQCSchemeID.ToString() +
+ ",HICMOInterID=" + HICMOInterID.ToString() +
+ ",HICMOBillNo='" + HICMOBillNo + "'" +
+ ",HICMOQty=" + HICMOQty.ToString() +
+ ",HProcExchInterID=" + HProcExchInterID.ToString() +
+ ",HProcExchEntryID=" + HProcExchEntryID.ToString() +
+ ",HProcExchBillNo='" + HProcExchBillNo + "'" +
+ ",HProcExchQty=" + HProcExchQty.ToString() +
+ ",HProcID=" + HProcID.ToString() +
+ ",HMaterID=" + HMaterID.ToString() +
+ ",HFirstCheckEmp=" + HFirstCheckEmp.ToString() +
+ ",HCheckerResult=" + DBUtility.ClsPub.BoolToString(HCheckerResult) +
+ ",HShiftsID=" + HShiftsID.ToString() +
+ ",HErrTreatment='" + HErrTreatment + "'" +
+ ",HBatchNo='" + HBatchNo + "'" +
+ " where HInterID=" + HInterID.ToString());
+ oCN.RunProc("Delete From QC_OutCompCheckBillSub where HInterID = " + HInterID);
+ }
//淇濆瓨瀛愯〃
- objJsonResult = AddBillSub(msg3, HInterID);
+ objJsonResult = AddBillSub(msg3, HInterID, HBillNo);
if (objJsonResult.code == "0")
{
objJsonResult.code = "0";
@@ -253,37 +348,66 @@
}
}
- public json AddBillSub(string msg3, long HInterID)
+ public json AddBillSub(string msg3, long HInterID, string HBillNo)
{
List<QC_OutCompCheckBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<QC_OutCompCheckBillSub>>(msg3);
- for (int i = 0; i < subList.ToArray().Length; i++)
- {
- string HBillNo_bak = subList[0].HBillNo_bak;
- long HEntryID = subList[0].HEntryID;//宸ユID
- string HCloseMan = subList[0].HCloseMan;
- long HCloseType = subList[0].HCloseType;
- string HRemark = subList[0].HRemark;
- long HSourceInterID = subList[0].HSourceInterID;
- long HSourceEntryID = subList[0].HSourceEntryID;
- string HSourceBillNo = subList[0].HSourceBillNo;
- string HSourceBillType = subList[0].HSourceBillType;
- double HRelationQty = subList[0].HRelationQty;
- double HRelationMoney = subList[0].HRelationMoney;
+ for (int i = 0; i < subList.Count; i++)
+ {
+
+ int HEntryID = i + 1;
+ string HRemark = ClsPub.isStrNull(subList[i].HRemark);
+ long HSourceInterID = ClsPub.isLong(subList[i].HSourceInterID);
+ long HSourceEntryID = ClsPub.isLong(subList[i].HSourceEntryID);
+ string HSourceBillType = ClsPub.isStrNull(subList[i].HSourceBillType);
+ string HSourceBillNo = ClsPub.isStrNull(subList[i].HSourceBillNo);
+ double HRelationQty = DBUtility.ClsPub.isDoule(subList[i].HRelationQty);
+ double HRelationMoney = DBUtility.ClsPub.isDoule(subList[i].HRelationMoney);
+ string HCloseMan = DBUtility.ClsPub.isStrNull(subList[i].HCloseMan);
+ DateTime HEntryCloseDate = DBUtility.ClsPub.isDate(subList[i].HEntryCloseDate);
+ bool HCloseType = DBUtility.ClsPub.isBool(subList[i].HCloseType);
+
+
long HQCCheckClassID = subList[0].HQCCheckClassID;
- long HQCCheckItemID = subList[0].HQCCheckItemID;
- string HQCStd = subList[0].HQCStd;
- string HResult = subList[0].HResult;
+ long HQCCheckItemID = DBUtility.ClsPub.isLong(subList[i].HQCCheckItemID);
+ string HQCStd = DBUtility.ClsPub.isStrNull(subList[i].HQCStd);
+ string HUnit = DBUtility.ClsPub.isStrNull(subList[i].HUnit);
+ string HQCNote = DBUtility.ClsPub.isStrNull(subList[i].HQCNote);
+ string HResult = DBUtility.ClsPub.isStrNull(subList[i].HResult);
+ string HMax = DBUtility.ClsPub.isStrNull(subList[i].HMax);
+ string HMin = DBUtility.ClsPub.isStrNull(subList[i].HMin);
+ string HAvg = DBUtility.ClsPub.isStrNull(subList[i].HAvg);
+ long HSampleSchemeID = DBUtility.ClsPub.isLong(subList[i].HSampleSchemeID);
+ long HSampleQty = DBUtility.ClsPub.isLong(subList[i].HSampleQty);
+ double HSampleDamageQty = DBUtility.ClsPub.isDoule(subList[i].HSampleDamageQty);
+ long HAcceptQty = DBUtility.ClsPub.isLong(subList[i].HAcceptQty);
+ long HRejectQty = DBUtility.ClsPub.isLong(subList[i].HRejectQty);
+ double HSampleUnRightQty = DBUtility.ClsPub.isDoule(subList[i].HSampleUnRightQty);
+ string HStatus = DBUtility.ClsPub.isStrNull(subList[i].HStatus);
+ long HUnitID = DBUtility.ClsPub.isLong(subList[i].HUnitID);
+ string HInspectVal = DBUtility.ClsPub.isStrNull(subList[i].HInspectVal);
+ string HTargetVal = DBUtility.ClsPub.isStrNull(subList[i].HTargetVal);
+ string HUpLimit = DBUtility.ClsPub.isStrNull(subList[i].HUpLimit);
+ string HDownLimit = DBUtility.ClsPub.isStrNull(subList[i].HDownLimit);
+ string HUpOffSet = DBUtility.ClsPub.isStrNull(subList[i].HUpOffSet);
+ string HDownOffSet = DBUtility.ClsPub.isStrNull(subList[i].HDownOffSet);
+ string HAnalysisMethod = DBUtility.ClsPub.isStrNull(subList[i].HAnalysisMethod);
+ long HKeyInspect = DBUtility.ClsPub.isLong(subList[i].HKeyInspect);
+ long HInspectInstruMentID = DBUtility.ClsPub.isLong(subList[i].HInspectInstruMentID);
+ string HInspectResult = DBUtility.ClsPub.isStrNull(subList[i].HResult);
+
oCN.RunProc("Insert into QC_OutCompCheckBillSub " +
- " (HInterID,HBillNo_bak,HEntryID,HCloseMan" +
- ",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
+ " (HInterID,HBillNo_bak,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ",HQCCheckClassID,HQCCheckItemID,HQCStd,HResult" +
+ ",HQCCheckClassID,HQCCheckItemID,HQCStd,HQCNote,HResult,HMax,HMin,HAvg,HSampleSchemeID,HSampleQty" +
+ ",HSampleDamageQty,HAcceptQty,HRejectQty,HSampleUnRightQty,HStatus,HUnitID,HInspectVal,HTargetVal,HUpLimit,HDownLimit" +
+ ",HUpOffSet,HDownOffSet,HAnalysisMethod,HKeyInspect,HInspectInstruMentID,HInspectResult" +
") values("
- + HInterID.ToString() + ",'" + HBillNo_bak + "'," + HEntryID.ToString() + ",'" + HCloseMan + "'" +
- ",getdate()," + HCloseType + ",'" + HRemark + "'," + HSourceInterID.ToString() +
+ + HInterID.ToString() + ",'" + HBillNo + "'," + HEntryID.ToString() + ",'" + HCloseMan + "',getdate()," + DBUtility.ClsPub.BoolToString(HCloseType) + ",'" + HRemark + "'," + HSourceInterID.ToString() +
"," + HSourceEntryID.ToString() + ",'" + HSourceBillNo + "','" + HSourceBillType + "'," + HRelationQty.ToString() + "," + HRelationMoney.ToString() +
- "," + HQCCheckClassID.ToString() + "," + HQCCheckItemID.ToString() + ",'" + HQCStd + "','" + HResult + "'" + ") ");
+ "," + HQCCheckClassID.ToString() + "," + HQCCheckItemID.ToString() + ",'" + HQCStd + "','" + HQCNote + "','" + HResult + "','" + HMax + "','" + HMin + "','" + HAvg + "','" + HSampleSchemeID + "','" + HSampleQty + "'" +
+ "," + HSampleDamageQty.ToString() + "," + HAcceptQty.ToString() + ",'" + HRejectQty + "','" + HSampleUnRightQty + "','" + HStatus + "','" + HUnitID + "','" + HInspectVal + "','" + HTargetVal + "','" + HUpLimit + "','" + HDownLimit + "'" +
+ ",'" + HUpOffSet.ToString() + "','" + HDownOffSet.ToString() + "','" + HAnalysisMethod + "','" + DBUtility.ClsPub.BoolToString(HKeyInspect) + "','" + HInspectInstruMentID + "','" + HInspectResult + "' ) ");
}
objJsonResult.code = "1";
@@ -292,13 +416,62 @@
objJsonResult.data = null;
return objJsonResult;
}
- /// <summary>
- ///鍒犻櫎鍔熻兘
- /// </summary>
- /// <returns></returns>
+
+ #endregion
+
+ #region 妫�楠屽�间繚瀛�
+ [Route("QC_OutCompCheckBill/set_SaveValue")]
+ [HttpPost]
+ public object set_SaveValue([FromBody] JObject msg)
+ {
+ ListModels oListModels = new ListModels();
+ try
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+
+ string Value = sArray[0].ToString(); //妫�楠屽�艰〃鏍�
+ Int64 HInterID = Convert.ToInt64(sArray[1]); //涓籌D
+ Int64 HEntryID = Convert.ToInt64(sArray[2]); //瀛怚D
+
+ List<QC_OutCompCheckBillSub_ValueGrid> valueList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<QC_OutCompCheckBillSub_ValueGrid>>(Value);
+
+
+ for (int i = 0; i < valueList.ToArray().Length; i++)
+ {
+ int HSEQ = i + 1;
+ string HInSpectResult = ClsPub.isStrNull(valueList[i].HInSpectResult);
+ double HInSpectValue = ClsPub.isDoule(valueList[i].HInSpectValue);
+ long HInSpectValueB = ClsPub.isLong(valueList[i].HInSpectValueB);
+ string HInSpectValueT = ClsPub.isStrNull(valueList[i].HInSpectValueT);
+
+ oCN.RunProc("Insert into QC_OutCompCheckBillSub_ValueGrid " +
+ " (HInterID,HEntryID,HSEQ,HInSpectResult,HInSpectValue,HInSpectValueB,HInSpectValueT) " +
+ "values("+ HInterID + "," + HEntryID + "," + HSEQ + ",'" + HInSpectResult + "'," +HInSpectValue + "," + HInSpectValueB + ",'" + HInSpectValueT + "'" +") ");
+ }
+
+ 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;
+ }
+ }
+ #endregion
+
+ #region 鍑哄巶妫�楠屽崟 鍒犻櫎
[Route("QC_OutCompCheckBill/DeltetOutCompCheckBill")]
[HttpGet]
- public object DeltetOutCompCheckBill(string HInterID,string user)
+ public object DeltetOutCompCheckBill(string HInterID, string user)
{
try
{
@@ -315,6 +488,7 @@
oCN.BeginTran();
oCN.RunProc("Delete From QC_OutCompCheckBillMain where HInterID = " + HInterID);
oCN.RunProc("Delete From QC_OutCompCheckBillSub where HInterID = " + HInterID);
+ oCN.RunProc("Delete From QC_OutCompCheckBillSub_ValueGrid where HInterID = " + HInterID);
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -332,6 +506,380 @@
return objJsonResult;
}
}
- //
+
+ #endregion
+
+ #region 鍑哄巶妫�楠屽崟缁存姢 瀹℃牳 鍙嶅鏍� 鍏抽棴 鍙嶅叧闂� 浣滃簾 鍙嶄綔搴�
+ /// <summary>
+ /// 鍑哄巶妫�楠屽崟缁存姢 瀹℃牳銆佸弽瀹℃牳
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("QC_OutCompCheckBill/CheckQC_OutCompCheckBill")]
+ [HttpGet]
+ public object CheckQC_OutCompCheckBill(int HInterID, int IsAudit, string CurUserName)
+ {
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("QC_OutCompCheckBill_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ var ds = oCN.RunProcReturn("select * from QC_OutCompCheckBillMain where HInterID=" + HInterID, "QC_OutCompCheckBillMain");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ oCN.BeginTran();
+
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+
+ oCN.RunProc("update QC_OutCompCheckBillMain set HChecker='" + CurUserName + "',HCheckDate=getdate() where HInterID=" + HInterID);
+
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+
+ oCN.RunProc("update QC_OutCompCheckBillMain set HChecker='',HCheckDate=null where HInterID=" + 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;
+ }
+ }
+
+ /// <summary>
+ /// 鍑哄巶妫�楠屽崟缁存姢 鍏抽棴 鍙嶅叧闂�
+ /// </summary>
+ /// <param name="HInterID"></param>
+ /// <param name="Type"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("QC_OutCompCheckBill/CloseQC_OutCompCheckBill")]
+ [HttpGet]
+ public object CloseQC_FirstPieceCheckBill(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_OutCompCheckBill_Close", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愬叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ BillOld.MvarItemKey = "QC_OutCompCheckBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 鍏抽棴 2 鍙嶅叧闂�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍏抽棴
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ if (ds.Tables[0].Rows[0]["HCloseMan"] != null && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍏抽棴鍗曟嵁
+ if (!BillOld.CloseBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍏抽棴澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶅叧闂�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘杩涜鍏抽棴!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (ds.Tables[0].Rows[0]["HCloseMan"] == null || ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸啀鍙嶅叧闂�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶅叧闂崟鎹�
+ if (!BillOld.CancelClose(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅叧闂け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+
+ /// <summary>
+ /// 鍑哄巶妫�楠屽崟缁存姢 浣滃簾 鍙嶄綔搴�
+ /// </summary>
+ /// <param name="HInterID"></param>
+ /// <param name="Type"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ [Route("QC_OutCompCheckBill/DropQC_OutCompCheckBill")]
+ [HttpGet]
+ public object DropQC_FirstPieceCheckBills(string HInterID, int Type, string user)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈変綔搴熸潈闄�
+ if (!DBUtility.ClsPub.Security_Log("QC_OutCompCheckBill_Drop", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愪綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (string.IsNullOrWhiteSpace(HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ClsPub.CurUserName = user;
+ BillOld.MvarItemKey = "QC_OutCompCheckBillMain";
+ oCN.BeginTran();//寮�濮嬩簨鍔�
+
+ //Type 1 浣滃簾 2 鍙嶄綔搴�
+ if (Type == 1)
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡浣滃簾
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] != null && ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶉渶瑕佸啀浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //浣滃簾鍗曟嵁
+ if (!BillOld.Cancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "浣滃簾澶辫触!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ //鍒ゆ柇鍗曟嵁鏄惁宸茬粡鍙嶄綔搴�
+ DataSet ds;
+ string sql = "select * from " + BillOld.MvarItemKey + " where HinterID = " + HInterID;
+ ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
+ if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
+ {
+ if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘杩涜浣滃簾!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (ds.Tables[0].Rows[0]["HDeleteMan"] == null || ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸啀鍙嶄綔搴�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍙嶄綔搴熷崟鎹�
+ if (!BillOld.AbandonCancelltion(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶄綔搴熷け璐�!鍘熷洜:" + ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+
+ oCN.Commit();//鎻愪氦浜嬪姟
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎵ц鎴愬姛锛�";
+ objJsonResult.data = null;
+ return objJsonResult; ;
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index 081f353..fa524c1 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -9,6 +9,7 @@
using System.Web.Http;
using ViewAPI;
using WebAPI.Models;
+using SyntacticSugar.constant;
namespace WebAPI.Controllers
{
/**
@@ -767,81 +768,7 @@
//}
#endregion
- /// <summary>
- /// 妯″叿缁翠慨宸ュ崟琛ㄥ垪琛�
- /// </summary>
- /// <returns></returns>
- [Route("Sb_MouldRepairWorkBill/GetMouldRepairWorkBillList")]
- [HttpGet]
- public object GetMouldRepairWorkBillList(string sWhere,string user)
- {
- try
- {
- List<object> columnNameList = new List<object>();
- if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBillList", 1, false, user))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
- ds = Sc_MouldRepairWorkBillList_s(sWhere);
-
- //娣诲姞鍒楀悕
- foreach (DataColumn col in ds.Tables[0].Columns)
- {
- Type dataType = col.DataType;
- string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
- columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
- }
-
- //if (ds.Tables[0].Rows.Count != 0 || ds != null)
- //{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- objJsonResult.list = columnNameList;
- return objJsonResult;
- //}
- //else
- //{
- //objJsonResult.code = "0";
- //objJsonResult.count = 0;
- //objJsonResult.Message = "鏃犳暟鎹�";
- //objJsonResult.data = null;
- //return objJsonResult;
- //}
- }
- catch (Exception ex)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
- objJsonResult.data = null;
- return objJsonResult;
- }
- }
-
- #region sql璇彞
-
-
- public static DataSet Sc_MouldRepairWorkBillList_s(string sWhere)
- {
- if (sWhere == null || sWhere.Equals(""))
- {
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairWorkBillList where 1=1 " + sWhere+ " order by hmainid desc", "h_v_Sc_MouldRepairWorkBillList");
- }
- else
- {
- string sql1 = "select * from h_v_Sc_MouldRepairWorkBillList where 1 = 1 ";
- string sql = sql1 + sWhere + "order by hmainid desc";
- return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList");
- }
- }
- #endregion
+
/// <summary>
@@ -4052,6 +3979,7 @@
#endregion
+ #region 妯″叿缁翠慨璁板綍鍗�
#region 妯″叿缁翠慨璁板綍鍗曚繚瀛�/缂栬緫
/// <summary>
@@ -4511,6 +4439,253 @@
}
#endregion
+ #region 妯″叿缁翠慨璁板綍鍗曚繚瀛�/缂栬緫
+ /// <summary>
+ /// 淇濆瓨妯″叿缁翠慨鍗�
+ /// </summary>
+ /// <param name="msg"></param>
+ /// <returns></returns>
+ [Route("Sb_MouldRepairWorkBill/SaveGetMouldRepairWorkBill_PDA")]
+ [HttpPost]
+ public object SaveGetMouldRepairWorkBill_PDA([FromBody] JObject msg)
+ {
+ var _value = msg["msg"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+
+
+ string UserName = "";
+ ListModels oListModels = new ListModels();
+ try
+ {
+ if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBill_Edit", 1, false, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ DAL.ClsSb_MouldRepairWorkBill oBill = new DAL.ClsSb_MouldRepairWorkBill();
+ List<Model.ClsSb_MouldRepairWorkBillMain> lsmain = new List<Model.ClsSb_MouldRepairWorkBillMain>();
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", ""); //\n
+ lsmain = oListModels.getObjectByJson_Gy_MouldRepairWorkBillMain(msg2);
+ foreach (Model.ClsSb_MouldRepairWorkBillMain oItem in lsmain)
+ {
+ oItem.HMaker = msg4;
+ UserName = msg4; //鍒跺崟浜�
+ oItem.HBillType = "3807";
+ oItem.HBillSubType = "3807";
+ oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
+ oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
+ if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ oBill.omodel = oItem;
+ }
+ //琛ㄤ綋鏁版嵁
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg3 = msg3.Substring(1, msg3.Length - 2);
+ msg3 = msg3.Replace("\\", "");
+ msg3 = msg3.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsSb_MouldRepairWorkBillSub> ls = new List<Model.ClsSb_MouldRepairWorkBillSub>();
+ ls = oListModels.getObjectByJson_Gy_MouldRepairWorkBillSub(msg3);
+ int i = 0;
+ foreach (Model.ClsSb_MouldRepairWorkBillSub oItem in ls)
+ {
+
+ i++;
+ oItem.HEntryID = i;
+ oItem.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ oItem.HCloseType = false; //鍏抽棴绫诲瀷
+ oItem.HRelationQty = 0; //鍏宠仈鏁伴噺
+ oBill.DetailColl.Add(oItem);
+
+ }
+
+
+ //淇濆瓨
+ //淇濆瓨瀹屾瘯鍚庡鐞�
+ bool bResult;
+ if (oBill.omodel.HInterID == 0)
+ {
+ bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ else
+ {
+ bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ }
+ if (bResult)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString();
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 妯″叿缁翠慨璁板綍琛ㄥ垪琛�
+ [Route("Sb_MouldRepairWorkBill/GetMouldRepairWorkBillList")]
+ [HttpGet]
+ public object GetMouldRepairWorkBillList(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = Sc_MouldRepairWorkBillList_s(sWhere);
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public static DataSet Sc_MouldRepairWorkBillList_s(string sWhere)
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairWorkBillList where 1=1 " + sWhere + " order by hmainid desc", "h_v_Sc_MouldRepairWorkBillList");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MouldRepairWorkBillList where 1 = 1 ";
+ string sql = sql1 + sWhere + "order by hmainid desc";
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList");
+ }
+ }
+ #endregion
+
+ #region 妯″叿缁翠慨璁板綍琛ㄥ垪琛�
+ [Route("Sb_MouldRepairWorkBill/GetMouldRepairWorkBill_PDA")]
+ [HttpGet]
+ public object GetMouldRepairWorkBill_PDA(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = Sc_MouldRepairWorkBillList_PDA(sWhere);
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public static DataSet Sc_MouldRepairWorkBillList_PDA(string sWhere)
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairWorkBillList_PDA where 1=1 " + sWhere + " order by hmainid desc", "h_v_Sc_MouldRepairWorkBillList_PDA");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MouldRepairWorkBillList_PDA where 1 = 1 ";
+ string sql = sql1 + sWhere + "order by hmainid desc";
+ return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairWorkBillList_PDA");
+ }
+ }
+ #endregion
+
+ #endregion
+
#region 鍣ㄥ叿缁翠慨璁板綍缁熻鍒嗘瀽
/// <summary>
/// 鍣ㄥ叿缁翠慨璁板綍缁熻鍒嗘瀽 鍒楄〃
@@ -4563,7 +4738,7 @@
}
#endregion
-
+ #region 妯″叿楠屾敹鍗�
#region 妯″叿缁翠慨楠屾敹鍗曚繚瀛�/缂栬緫
/// <summary>
@@ -4852,6 +5027,7 @@
}
#endregion
+ #endregion
#region 妯″叿鏁呴殰鐧昏琛�
@@ -4901,19 +5077,6 @@
//oItem.HInnerBillNo = ""; // --鍐呴儴鍗曟嵁鍙�
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
- //oItem.HEquipID = 0; //璁惧ID(Gy_EquipMent)
- //oItem.HPeriod = 0;
- //oItem.HCheckBeginDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); // --缁翠慨鏃ユ湡
- //oItem.HCheckResult = ""; //楠屾敹缁撹--(姝ｅ父锛屽紓甯�)
- //oItem.HEmpID = 0; //楠屾敹浜�(Gy_Employee)
- //oItem.HManagerID = 0; //璐熻矗浜�(Gy_Employee)
- //oItem.HDeptID = 0; //楠屾敹閮ㄩ棬(Gy_Department)
- //oItem.HExplanation = ""; //鎽樿(鏁呴殰鎻忚堪)
- //oItem.HRemark = ""; //澶囨敞
-
- //oItem.HMainSourceInterID = oItem.HInterID;
-
- //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
{
objJsonResult.code = "0";
@@ -4939,22 +5102,11 @@
i++;
oItemSub.HEntryID = i;
- //oItemSub.HRepairCheckID = 0; //楠屾敹椤圭洰ID
- //oItemSub.HRepairCheckContent = ""; //楠屾敹鍐呭
- //oItemSub.HManagerID = 0; //璐熻矗浜篒D
- //oItemSub.HCloseMan = ""; //琛屽叧闂�
+
oItemSub.HCloseType = false; //鍏抽棴绫诲瀷
- //oItemSub.HRemark = ""; //澶囨敞
+
oItemSub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
oItemSub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
- //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
- //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
- //oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
- //oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
- //oItemSub.HRepairID = 0; //缁翠慨椤圭洰
- //oItemSub.HRepairExplanation =""; //缁翠慨瑕佹眰
-
- //oItemSub.HMoney = 0; //缁翠慨璐圭敤
oBill.DetailColl.Add(oItemSub);
}
@@ -4963,7 +5115,6 @@
bool bResult;
if (oBill.omodel.HInterID == 0)
{
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
}
else
@@ -4975,7 +5126,6 @@
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
- //WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
objJsonResult.data = 1;
return objJsonResult;
}
@@ -5140,6 +5290,68 @@
}
}
#endregion
+
+ #region 妯″叿鏁呴殰鐧昏鍗昣PDA
+ [Route("Sc_MouldConkBookBill/GetMouldConkBookBillList_PDA")]
+ [HttpGet]
+ public object GetMouldConkBookBillList_PDA(string sWhere, string user)
+ {
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldConkBookBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ ds = Sc_MouldConkBookBillList_PDA(sWhere);
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ catch (Exception ex)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + ex.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ public static DataSet Sc_MouldConkBookBillList_PDA(string sWhere)
+ {
+ DataSet ds;
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldConkBookBillList_PDA where 1=1 " + sWhere + " order by hmainid desc", "h_v_Sc_MouldConkBookBillList_PDA");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_Sc_MouldConkBookBillList_PDA where 1 = 1 ";
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldConkBookBillList_PDA");
+ }
+ return ds;
+ }
+ #endregion
+
#endregion
@@ -7654,6 +7866,62 @@
}
#endregion
+
+ #region 妯″叿澶勭悊鍑哄簱鍗曞垎椤靛垪琛�
+ [Route("Sc_MouldScrapOutHouseBill/page")]
+ [HttpGet]
+ public object Sc_MouldScrapOutHouseBillPage(string sWhere, string user, int page, int size)
+ {
+ DataSet ds;
+ try
+ {
+ List<object> columnNameList = new List<object>();
+ //鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBillList", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ sWhere = sWhere.Replace("'", "''");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("exec h_p_Sc_MouldScrapOutHouseBillList " + page + "," + size + ",''", "h_p_Sc_MouldScrapOutHouseBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn("exec h_p_Sc_MouldScrapOutHouseBillList " + page + "," + size + ",'" + sWhere + "'", "h_p_Sc_MouldScrapOutHouseBillList");
+ }
+
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.list = columnNameList;
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region[妯″叿澶勭悊鍑哄簱鍗曠紪杈戞椂鑾峰彇琛ㄥご鏁版嵁]
[Route("Sc_MouldScrapOutHouseBill/Sc_MouldScrapOutHouseBillListCheckDetai")]
@@ -10671,7 +10939,7 @@
return objJsonResult;
}
}
- #endregion
-
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 07dc69c..b847978 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -1497,6 +1497,106 @@
}
}
+
+ /// <summary>
+ /// 鑾峰彇鐝鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetGy_ShiftsList_Json")]
+ [HttpGet]
+ public object GetGy_ShiftsList_Json(string Shifts)
+ {
+ sWhere = " 绂佺敤鏍囪!='Y'";
+ if (Shifts != "")
+ {
+ sWhere = " Where 绂佺敤鏍囪!='Y' and ( 鐝浠ｇ爜 like '%" + Shifts + "%' or 鐝鍚嶇О like '%" + Shifts + "%' ) ";
+ }
+ else
+ {
+ sWhere = " Where 绂佺敤鏍囪!='Y' ";
+ }
+ try
+ {
+ string sql = $"Select * from h_v_Gy_ShiftsList {sWhere} Order by 鐝浠ｇ爜";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_ShiftsList");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇寮傚父鍙嶉绫诲瀷鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetGy_ErrMsgBackTypeList_Json")]
+ [HttpGet]
+ public object GetGy_ErrMsgBackTypeList_Json(string ErrMsg)
+ {
+ sWhere = " 绂佺敤鏍囧織 ='鍚�'";
+ if (ErrMsg != "")
+ {
+ sWhere = " Where 绂佺敤鏍囧織 ='鍚�' and ( 寮傚父鍙嶉绫诲瀷浠ｇ爜 like '%" + ErrMsg + "%' or 寮傚父鍙嶉绫诲瀷鍚嶇О like '%" + ErrMsg + "%' ) ";
+ }
+ else
+ {
+ sWhere = " Where 绂佺敤鏍囧織 ='鍚�' ";
+ }
+ try
+ {
+ string sql = $"Select * from h_v_Gy_ErrMsgBackType {sWhere} Order by 寮傚父鍙嶉绫诲瀷浠ｇ爜";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_ErrMsgBackType");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+
/// <summary>
/// 鑾峰彇鐝粍鍒楄〃
///鍙傛暟锛歴tring sql銆�
@@ -14979,6 +15079,46 @@
}
/// <summary>
+ /// 鏍规嵁鐗╂枡+宸ュ簭鑾峰彇妫�楠屾柟妗�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Web/GetCheckItemID")]
+ [HttpGet]
+ public object GetCheckItemID(string HName,string HProName)
+ {
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCCheckProjectList_Main where 鐗╂枡鍚嶇О='"+HName+ "' and 宸ュ簭鍚嶇О='" + HProName + "' order by 鏃ユ湡 desc ", "h_v_Gy_QCCheckProjectList_Main");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + DBUtility.ClsPub.sErrInfo;
+ objjson.data = null;
+ return objjson;
+ }
+ else
+ {
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛!";
+ objjson.data = ds.Tables[0];
+ return objjson;
+ }
+ }
+ catch (Exception ex)
+ {
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触" + ex.ToString();
+ objjson.data = null;
+ return objjson;
+ }
+ }
+
+
+ /// <summary>
/// 鏍规嵁妫�楠屾柟妗堜富鍐呯爜鑾峰彇妫�楠岄」鐩�
/// </summary>
/// <returns></returns>
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
index 53b6023..099c900 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOutStockBillController.cs
@@ -2259,5 +2259,44 @@
}
}
#endregion
+
+
+ #region 鍙戣揣閫氱煡鍗曟煡璇㈠嵆鏃跺簱瀛�
+ [Route("Xs_SeOutStockBill/GetICInventory")]
+ [HttpGet]
+ public object GetICInventory(int HMaterID, int HWHID, int HORGID)
+ {
+ try
+ {
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+
+ //if (!DBUtility.ClsPub.Security_Log("Xs_SeOutStockBillQuery", 1, false, user))
+ //{
+ // objJsonResult.code = CodeConstant.FAIL;
+ // objJsonResult.count = CountConstant.FAIL;
+ // objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ string sql = "exec h_p_Xs_SeOutStockBillGetICInventory " + HMaterID + "," + HWHID + "," + HORGID;
+
+ ds = oCN.RunProcReturn(sql, "h_p_Xs_SeOutStockBillGetICInventory");
+
+ objJsonResult.code = CodeConstant.SUCCEED;
+ objJsonResult.count = CountConstant.SUCCEED;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0].Rows[0]["HBack"];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = CodeConstant.FAIL;
+ objJsonResult.count = CountConstant.FAIL;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
\ No newline at end of file
diff --git "a/WebAPI/Controllers/\344\272\272\344\272\213\347\256\241\347\220\206/\344\272\272\345\221\230\345\261\245\345\216\206/HR_PersonnelResumeController.cs" "b/WebAPI/Controllers/\344\272\272\344\272\213\347\256\241\347\220\206/\344\272\272\345\221\230\345\261\245\345\216\206/HR_PersonnelResumeController.cs"
index d8973ce..59a47f6 100644
--- "a/WebAPI/Controllers/\344\272\272\344\272\213\347\256\241\347\220\206/\344\272\272\345\221\230\345\261\245\345\216\206/HR_PersonnelResumeController.cs"
+++ "b/WebAPI/Controllers/\344\272\272\344\272\213\347\256\241\347\220\206/\344\272\272\345\221\230\345\261\245\345\216\206/HR_PersonnelResumeController.cs"
@@ -41,7 +41,8 @@
string HNumber = dic["HNumber"].ToString();//鑱屽憳浠ｇ爜
string HName = dic["HName"].ToString();//鑱屽憳
string HProcID = dic["HProcID"].ToString();//宸ュ簭id
- ds = oCN.RunProcReturn("exec h_p_HR_PersonnelResumeReport '" + HNumber.ToString() + "','" + HName + "','" + HProcID + "'", "h_p_HR_PersonnelResumeReport");
+ string HMaterID = dic["HMaterID"].ToString();//宸ュ簭id
+ ds = oCN.RunProcReturn("exec h_p_HR_PersonnelResumeReport '" + HNumber.ToString() + "','" + HName + "','" + HProcID + "','"+ HMaterID + "'", "h_p_HR_PersonnelResumeReport");
List<object> columnNameList = new List<object>();
// 閬嶅巻鎵�鏈夎〃
foreach (DataTable table in ds.Tables)
diff --git "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs" "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
index 85039e8..2217daa 100644
--- "a/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\223\201\350\264\250\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_FirstPieceCheckBillController.cs"
@@ -137,7 +137,7 @@
}
#endregion
- #region 宸ヨ祫缁撶畻鍗�(涓汉)鍒嗛〉鍒楄〃
+ #region 棣栦欢妫�楠屽崟鍒嗛〉鍒楄〃
[Route("QC_FirstPieceCheckBillMain/QC_FirstPieceCheckBillMainListPage")]
[HttpGet]
public json QC_FirstPieceCheckBillMainListPage(string sWhere, string user, int page, int size)
diff --git "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs" "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
index d7adea1..06f4011 100644
--- "a/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
+++ "b/WebAPI/Controllers/\346\225\260\346\215\256\345\220\214\346\255\245/\351\222\211\351\222\211\345\220\214\346\255\245/DD_DataSynchronizationController.cs"
@@ -3587,14 +3587,14 @@
string msg = "";
try
{
- if (getData_ErrWorkTimesRequest(startTime,endTime,ref msg) == false)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "Exception锛�" + msg;
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (getData_ErrWorkTimesRequest(startTime,endTime,ref msg) == false)
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "Exception锛�" + msg;
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
objJsonResult.code = "1";
objJsonResult.count = 1;
diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs"
index 26184fa..fbb29bc 100644
--- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs"
+++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\347\250\213\351\241\271\347\233\256/PM_ProjectBillController.cs"
@@ -126,6 +126,43 @@
public double HGongFeiMoney; //宸ヨ垂缁撹处
public double HJieZhangMoney; //缁撶畻缁撹处
+ public int HTaskClassID; //浠诲姟澶х被(Gy_TaskClass)
+ public int HTaskClassEntryID; //浠诲姟椤圭洰鍒嗙被(Gy_TaskClass)
+ public string HTaskAddress; //浠诲姟鍦扮偣
+ public string HBreakStatus; //鎹熷潖鎯呭喌
+ public string HWaterLeakage; //婕忔按閲�
+ public string HPipeDiameter; //绠″緞
+ public string HPipeMaterial; //绠￠亾鏉愯川
+ public string HAlarmEmp; //鎶ユ紡浜�
+ public string HAlarmLink; //鎶ユ紡浜鸿仈绯荤數璇�
+ public string HReceEmp; //鍙楃悊浜�
+ public string HReceTime; //鍙楃悊鏃堕棿锛堝勾鏈堟棩鏃跺垎绉掞級
+ public double HTaskMaterMoney; //浠诲姟鏉愭枡璐�
+ public double HTaskSetupMoney; //浠诲姟瀹夎璐�
+ public double HTaskOtherMoney; //浠诲姟闄勫睘璐�
+ public double HTaskExamMoney; //浠诲姟鑰冩牳璐�
+ public double HTaskWorkMoney; //浠诲姟宸ヨ垂
+ public bool HIsAccount; //鏄惁缁撹处(澶嶉�夋)
+ public string HAccountDate; //缁撶畻缁撹处鏃ユ湡
+ public string HAccountWorkMoneyDate; //宸ヨ垂缁撹处鏃ユ湡
+ public bool HIsCheckExam; //鏄惁瀹℃牳鑰冩牳璐�(澶嶉�夋)
+ public bool HIsCheckWorkMoney; //鏄惁瀹℃牳宸ヨ垂(澶嶉�夋)
+ public string HInfoBackTime; //鍥炲鏃堕棿锛堝勾鏈堟棩鏃跺垎绉掞級
+ public string HInfoBackMan; //鍥炲浜�
+ public string HInfoNote; //鍥炲鍐呭(瀵屾枃鏈級
+ public string HTaskBTime; //浠诲姟寮�濮嬫椂闂达紙骞存湀鏃ユ椂鍒嗙锛�
+ public string HTaskETime; //浠诲姟瀹屽伐鏃堕棿锛堝勾鏈堟棩鏃跺垎绉掞級
+ public string HTaskNote; //浠诲姟璇︾粏鍐呭锛堝瘜鏂囨湰锛�
+ public string HTaskWorkEmp; //宸ヤ綔浜哄憳锛堝瘜鏂囨湰锛�
+ public string HBeginCloseValveTime; //寮�濮嬪叧闃�鏃堕棿锛堝勾鏈堟棩鏃跺垎绉掞級
+ public string HEndCloseValveTime; //缁撴潫鍏抽榾鏃堕棿锛堝勾鏈堟棩鏃跺垎绉掞級
+ public long HCloseValveQty; //鍏抽榾鍙暟
+ public string HBeginOpenValveTime; //寮�濮嬪紑闃�鏃堕棿锛堝勾鏈堟棩鏃跺垎绉掞級
+ public string HEndOpenValveTime; //缁撴潫寮�闃�鏃堕棿锛堝勾鏈堟棩鏃跺垎绉掞級
+ public long HOpenValveQty; //寮�闃�鍙暟
+ public string HValveWorkEmp; //鎿嶄綔浜哄憳
+ public string HTaskRemark; //浠诲姟澶囨敞锛堝瘜鏂囨湰锛�
+
}
#endregion
#region 宸ョ▼椤圭洰 椤圭洰闃舵琛ㄤ綋鏁版嵁
@@ -306,6 +343,43 @@
double HGongFeiMoney = mainList[0].HGongFeiMoney; //宸ヨ垂缁撹处
double HJieZhangMoney = mainList[0].HJieZhangMoney; //缁撶畻缁撹处
+ int HTaskClassID = mainList[0].HTaskClassID; //浠诲姟澶х被(Gy_TaskClass)
+ int HTaskClassEntryID = mainList[0].HTaskClassEntryID; //浠诲姟椤圭洰鍒嗙被(Gy_TaskClass)
+ string HTaskAddress = mainList[0].HTaskAddress; //浠诲姟鍦扮偣
+ string HBreakStatus = mainList[0].HBreakStatus; //鎹熷潖鎯呭喌
+ string HWaterLeakage = mainList[0].HWaterLeakage; //婕忔按閲�
+ string HPipeDiameter = mainList[0].HPipeDiameter; //绠″緞
+ string HPipeMaterial = mainList[0].HPipeMaterial; //绠￠亾鏉愯川
+ string HAlarmEmp = mainList[0].HAlarmEmp; //鎶ユ紡浜�
+ string HAlarmLink = mainList[0].HAlarmLink; //鎶ユ紡浜鸿仈绯荤數璇�
+ string HReceEmp = mainList[0].HReceEmp; //鍙楃悊浜�
+ string HReceTime = mainList[0].HReceTime; //鍙楃悊鏃堕棿锛堝勾鏈堟棩鏃跺垎绉掞級
+ double HTaskMaterMoney = mainList[0].HTaskMaterMoney; //浠诲姟鏉愭枡璐�
+ double HTaskSetupMoney = mainList[0].HTaskSetupMoney; //浠诲姟瀹夎璐�
+ double HTaskOtherMoney = mainList[0].HTaskOtherMoney; //浠诲姟闄勫睘璐�
+ double HTaskExamMoney = mainList[0].HTaskExamMoney; //浠诲姟鑰冩牳璐�
+ double HTaskWorkMoney = mainList[0].HTaskWorkMoney; //浠诲姟宸ヨ垂
+ bool HIsAccount = mainList[0].HIsAccount; //鏄惁缁撹处(澶嶉�夋)
+ string HAccountDate = mainList[0].HAccountDate; //缁撶畻缁撹处鏃ユ湡
+ string HAccountWorkMoneyDate = mainList[0].HAccountWorkMoneyDate; //宸ヨ垂缁撹处鏃ユ湡
+ bool HIsCheckExam = mainList[0].HIsCheckExam; //鏄惁瀹℃牳鑰冩牳璐�(澶嶉�夋)
+ bool HIsCheckWorkMoney = mainList[0].HIsCheckWorkMoney; //鏄惁瀹℃牳宸ヨ垂(澶嶉�夋)
+ string HInfoBackTime = mainList[0].HInfoBackTime; //鍥炲鏃堕棿锛堝勾鏈堟棩鏃跺垎绉掞級
+ string HInfoBackMan = mainList[0].HInfoBackMan; //鍥炲浜�
+ string HInfoNote = mainList[0].HInfoNote; //鍥炲鍐呭(瀵屾枃鏈級
+ string HTaskBTime = mainList[0].HTaskBTime; //浠诲姟寮�濮嬫椂闂达紙骞存湀鏃ユ椂鍒嗙锛�
+ string HTaskETime = mainList[0].HTaskETime; //浠诲姟瀹屽伐鏃堕棿锛堝勾鏈堟棩鏃跺垎绉掞級
+ string HTaskNote = mainList[0].HTaskNote; //浠诲姟璇︾粏鍐呭锛堝瘜鏂囨湰锛�
+ string HTaskWorkEmp = mainList[0].HTaskWorkEmp; //宸ヤ綔浜哄憳锛堝瘜鏂囨湰锛�
+ string HBeginCloseValveTime = mainList[0].HBeginCloseValveTime; //寮�濮嬪叧闃�鏃堕棿锛堝勾鏈堟棩鏃跺垎绉掞級
+ string HEndCloseValveTime = mainList[0].HEndCloseValveTime; //缁撴潫鍏抽榾鏃堕棿锛堝勾鏈堟棩鏃跺垎绉掞級
+ long HCloseValveQty = mainList[0].HCloseValveQty; //鍏抽榾鍙暟
+ string HBeginOpenValveTime = mainList[0].HBeginOpenValveTime; //寮�濮嬪紑闃�鏃堕棿锛堝勾鏈堟棩鏃跺垎绉掞級
+ string HEndOpenValveTime = mainList[0].HEndOpenValveTime; //缁撴潫寮�闃�鏃堕棿锛堝勾鏈堟棩鏃跺垎绉掞級
+ long HOpenValveQty = mainList[0].HOpenValveQty; //寮�闃�鍙暟
+ string HValveWorkEmp = mainList[0].HValveWorkEmp; //鎿嶄綔浜哄憳
+ string HTaskRemark = mainList[0].HTaskRemark; //浠诲姟澶囨敞锛堝瘜鏂囨湰锛�
+
if (OperationType == 2)
{
@@ -327,7 +401,8 @@
string sql = "insert into PM_ProjectBillMain" +
"(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HBillStatus,HRemark,HMaker,HMakeDate,HProNumber,HProName,HCusID,HBeginDate,HEndDate,HSumMoney," +
"HProMoney,HWorkMoney,HOtherMoney,HProType,HPMEmpID,HWorkEmpID,HDepEmpID,HConWorkDays,HDepDays,HLastMoney,HPayCusID,HOrgID,HMaterID,HProjectClassID,HBuildComp,HBuildAddress,HWorkNo,HReDate,HPicNo,HWorkTask,HProjectNote,HContacts,HContactNumber" +
- ",HSupplierID,HMangerEmpID,HMaterPlanDate,HWorkerID,HPlanWorkTimes,HRelWorkTimes,HTestDate,HTestCheckerID,HTestNote,HSewageDate,HWaterSupplyDate,HWorkNote,HWorkProcNote,HYuSuanMoney,HHeTongMoney,HJieSuanMoney,HShenJiMoney,HCaiLiaoMoney,HAnZhuangMoney,HBanZuMoney,HYuShouKuanMoney,HGongFeiMoney,HJieZhangMoney) " +
+ ",HSupplierID,HMangerEmpID,HMaterPlanDate,HWorkerID,HPlanWorkTimes,HRelWorkTimes,HTestDate,HTestCheckerID,HTestNote,HSewageDate,HWaterSupplyDate,HWorkNote,HWorkProcNote,HYuSuanMoney,HHeTongMoney,HJieSuanMoney,HShenJiMoney,HCaiLiaoMoney,HAnZhuangMoney,HBanZuMoney,HYuShouKuanMoney,HGongFeiMoney,HJieZhangMoney," +
+ "HTaskClassID,HTaskClassEntryID,HTaskAddress,HBreakStatus,HWaterLeakage,HPipeDiameter,HPipeMaterial,HAlarmEmp,HAlarmLink,HReceEmp,HReceTime,HTaskMaterMoney,HTaskSetupMoney,HTaskOtherMoney,HTaskExamMoney,HTaskWorkMoney,HIsAccount,HAccountDate,HAccountWorkMoneyDate,HIsCheckExam,HIsCheckWorkMoney,HInfoBackTime,HInfoBackMan,HInfoNote,HTaskBTime,HTaskETime,HTaskNote,HTaskWorkEmp,HBeginCloseValveTime,HEndCloseValveTime,HCloseValveQty,HBeginOpenValveTime,HEndOpenValveTime,HOpenValveQty,HValveWorkEmp,HTaskRemark)" +
"values(" +
"" + HYear +
"," + HPeriod +
@@ -392,6 +467,12 @@
",'" + HYuShouKuanMoney + "'" +
",'" + HGongFeiMoney + "'" +
",'" + HJieZhangMoney + "'" +
+ ",'" + HTaskClassID + "'" + ",'" + HTaskClassEntryID + "'" + ",'" + HTaskAddress + "'" + ",'" + HBreakStatus + "'" + ",'" + HWaterLeakage + "'" + ",'" + HPipeDiameter + "'" + ",'" + HPipeMaterial + "'" +
+ ",'" + HAlarmEmp + "'" +",'" + HAlarmLink + "'" + ",'" + HReceEmp + "'" + ",'" + HReceTime + "'" + ",'" + HTaskMaterMoney + "'" + ",'" + HTaskSetupMoney + "'" + ",'" + HTaskOtherMoney + "'" +
+ ",'" + HTaskExamMoney + "'" + ",'" + HTaskWorkMoney + "'" + ",'" + (HIsAccount?1:0) + "'" + ",'" + HAccountDate + "'" + ",'" + HAccountWorkMoneyDate + "'" + ",'" + (HIsCheckExam ? 1 : 0) + "'" +
+ ",'" + (HIsCheckWorkMoney ? 1 : 0) + "'" + ",'" + HInfoBackTime + "'" + ",'" + HInfoBackMan + "'" + ",'" + HInfoNote + "'" + ",'" + HTaskBTime + "'" +
+ ",'" + HTaskETime + "'" + ",'" + HTaskNote + "'" + ",'" + HTaskWorkEmp + "'" + ",'" + HBeginCloseValveTime + "'" + ",'" + HEndCloseValveTime + "'" +
+ ",'" + HCloseValveQty + "'" + ",'" + HBeginOpenValveTime + "'" + ",'" + HEndOpenValveTime + "'" + ",'" + HOpenValveQty + "'" + ",'" + HValveWorkEmp + "'" + ",'" + HTaskRemark + "'" +
")";
//涓昏〃
@@ -465,7 +546,12 @@
"',HYuShouKuanMoney = '" + HYuShouKuanMoney +
"',HGongFeiMoney = '" + HGongFeiMoney +
"',HJieZhangMoney = '" + HJieZhangMoney +
-
+ "',HTaskClassID = '" + HTaskClassID + "',HTaskClassEntryID = '" + HTaskClassEntryID + "',HTaskAddress = '" + HTaskAddress + "',HBreakStatus = '" + HBreakStatus + "',HWaterLeakage = '" + HWaterLeakage + "',HPipeDiameter = '" + HPipeDiameter +
+ "',HPipeMaterial = '" + HPipeMaterial + "',HAlarmEmp = '" + HAlarmEmp + "',HAlarmLink = '" + HAlarmLink + "',HReceEmp = '" + HReceEmp + "',HReceTime = '" + HReceTime + "',HTaskMaterMoney = '" + HTaskMaterMoney +
+ "',HTaskSetupMoney = '" + HTaskSetupMoney + "',HTaskOtherMoney = '" + HTaskOtherMoney + "',HTaskExamMoney = '" + HTaskExamMoney + "',HTaskWorkMoney = '" + HTaskWorkMoney + "',HIsAccount = '" + (HIsAccount?1:0) + "',HAccountDate = '" + HAccountDate +
+ "',HAccountWorkMoneyDate = '" + HAccountWorkMoneyDate + "',HIsCheckExam = '" + (HIsCheckExam?1:0) + "',HIsCheckWorkMoney = '" + (HIsCheckWorkMoney?1:0) + "',HInfoBackTime = '" + HInfoBackTime + "',HInfoBackMan = '" + HInfoBackMan + "',HInfoNote = '" + HInfoNote +
+ "',HTaskBTime = '" + HTaskBTime + "',HTaskETime = '" + HTaskETime + "',HTaskNote = '" + HTaskNote + "',HTaskWorkEmp = '" + HTaskWorkEmp + "',HBeginCloseValveTime = '" + HBeginCloseValveTime + "',HEndCloseValveTime = '" + HEndCloseValveTime +
+ "',HCloseValveQty = '" + HCloseValveQty + "',HBeginOpenValveTime = '" + HBeginOpenValveTime + "',HEndOpenValveTime = '" + HEndOpenValveTime + "',HOpenValveQty = '" + HOpenValveQty + "',HValveWorkEmp = '" + HValveWorkEmp + "',HTaskRemark = '" + HTaskRemark +
"' where HInterID = " + HInterID;
diff --git a/WebAPI/Models/QC_OutCompCheckBillMain.cs b/WebAPI/Models/QC_OutCompCheckBillMain.cs
index 7ce7872..1e2fc38 100644
--- a/WebAPI/Models/QC_OutCompCheckBillMain.cs
+++ b/WebAPI/Models/QC_OutCompCheckBillMain.cs
@@ -5,34 +5,8 @@
namespace WebAPI.Models
{
- public class QC_OutCompCheckBillMain
+ public class QC_OutCompCheckBillMain : DBUtility.ClsXt_BaseBillMain
{
- public long HInterID { get; set; }
- public string HBillNo { get; set; }
- public DateTime HDate { get; set; }
- public long HBillStatus { get; set; }
- public long HCheckItemNowID { get; set; }
- public long HCheckItemNextID { get; set; }
- public long HCheckFlowID { get; set; }
- public string HRemark { get; set; }
- public string HBacker { get; set; }
- public DateTime HBackDate { get; set; }
- public string HBackRemark { get; set; }
- public string HChecker { get; set; }
- public DateTime HCheckDate { get; set; }
- public string HMaker { get; set; }
- public DateTime HMakeDate { get; set; }
- public string HUpDater { get; set; }
- public DateTime HUpDateDate { get; set; }
- public string HCloseMan { get; set; }
- public DateTime HCloseDate { get; set; }
- public string HCloseType { get; set; }
- public string HDeleteMan { get; set; }
- public DateTime HDeleteDate { get; set; }
- public string HMainSourceBillType { get; set; }
- public long HMainSourceInterID { get; set; }
- public long HMainSourceEntryID { get; set; }
- public string HMainSourceBillNo { get; set; }
public long HPrintQty { get; set; }
public long HCusID { get; set; }
public long HMaterID { get; set; }
@@ -41,7 +15,27 @@
public double HRightQTy { get; set; }
public double HBadQty { get; set; }
public long HFirstCheckEmp { get; set; }
- public string HCheckerResult { get; set; }
+ public bool HCheckerResult { get; set; }
+
+ //鏂板瀛楁24/12/10
+ public Int64 HSourceID { get; set; }
+ public Int64 HICMOInterID { get; set; }
+ public String HICMOBillNo { get; set; }
+ public Int64 HICMOQty { get; set; }
+ public Int64 HProcExchInterID { get; set; }
+ public Int64 HProcExchEntryID { get; set; }
+ public String HProcExchBillNo { get; set; }
+ public Int64 HProcExchQty { get; set; }
+ public Int64 HICMOEntryID { get; set; }
+ public Int64 HQCSchemeID { get; set; }
+ public Int64 HUnitID { get; set; }
+ public Int64 HProcID { get; set; }
+ public Int64 HDeptID { get; set; }
+ public Int64 HShiftsID { get; set; }
+ public string HErrTreatment { get; set; }
+ public string HBatchNo { get; set; }
+ public Int64 HSourceOrgID { get; set; }
+ public Int64 HInspectOrgID { get; set; }
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/QC_OutCompCheckBillSub.cs b/WebAPI/Models/QC_OutCompCheckBillSub.cs
index 8d5bb54..6ba01a2 100644
--- a/WebAPI/Models/QC_OutCompCheckBillSub.cs
+++ b/WebAPI/Models/QC_OutCompCheckBillSub.cs
@@ -5,25 +5,38 @@
namespace WebAPI.Models
{
- public class QC_OutCompCheckBillSub
- {
- public long HInterID { get; set; }
- public string HBillNo_bak { get; set; }
- public long HEntryID { get; set; }
- public string HCloseMan { get; set; }
- public DateTime HEntryCloseDate { get; set; }
- public long HCloseType { get; set; }
- public string HRemark { get; set; }
- public long HSourceInterID { get; set; }
- public long HSourceEntryID { get; set; }
- public string HSourceBillNo { get; set; }
- public string HSourceBillType { get; set; }
- public double HRelationQty { get; set; }
- public double HRelationMoney { get; set; }
+ public class QC_OutCompCheckBillSub : DBUtility.ClsXt_BaseBillSub
+ {
public long HQCCheckClassID { get; set; }
public long HQCCheckItemID { get; set; }
public string HQCStd { get; set; }
public string HResult { get; set; }
+
+ //鏂板瀛楁24/12/10
+ public String HUnit { get; set; }
+ public String HQCNote { get; set; }
+ public String HMax { get; set; }
+ public String HMin { get; set; }
+ public String HAvg { get; set; }
+ public Int64 HSampleSchemeID { get; set; }
+ public Int64 HSampleQty { get; set; }
+ public double HSampleDamageQty { get; set; }
+ public Int64 HAcceptQty { get; set; }
+ public Int64 HRejectQty { get; set; }
+ public double HSampleUnRightQty { get; set; }
+ public String HStatus { get; set; }
+ public Int64 HUnitID { get; set; }
+ public String HInspectVal { get; set; }
+ public String HTargetVal { get; set; }
+ public String HUpLimit { get; set; }
+ public String HDownLimit { get; set; }
+ public String HUpOffSet { get; set; }
+ public String HDownOffSet { get; set; }
+ public String HAnalysisMethod { get; set; }
+ public Int64 HKeyInspect { get; set; }
+ public Int64 HInspectInstruMentID { get; set; }
+ public String HInspectResult { get; set; }
+
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/QC_OutCompCheckBillSub_ValueGrid.cs b/WebAPI/Models/QC_OutCompCheckBillSub_ValueGrid.cs
new file mode 100644
index 0000000..0f03350
--- /dev/null
+++ b/WebAPI/Models/QC_OutCompCheckBillSub_ValueGrid.cs
@@ -0,0 +1,20 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace WebAPI.Models
+{
+ public class QC_OutCompCheckBillSub_ValueGrid
+ {
+ public long HInterID { get; set; }
+ public long HEntryID { get; set; }
+ public Int64 HItemID { get; set; }
+ public Int64 HSEQ { get; set; }
+ public String HInSpectResult { get; set; }
+ public double HInSpectValue { get; set; }
+ public Int64 HInSpectValueB { get; set; }
+ public String HInSpectValueT { get; set; }
+
+ }
+}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
index a2f1c31..efa1b1e 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|2024-12-02T06:57:10.0773563Z;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|2024-12-11T14:14:41.4392948Z;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>11/26/2024 08:55:11</publishTime>
+ <publishTime>12/11/2024 21:48:15</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>11/26/2024 08:55:11</publishTime>
+ <publishTime>12/11/2024 21:48:15</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>11/26/2024 08:55:07</publishTime>
+ <publishTime>12/11/2024 21:48:12</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>11/26/2024 08:55:07</publishTime>
+ <publishTime>12/11/2024 21:48:12</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>11/26/2024 08:23:55</publishTime>
+ <publishTime>12/11/2024 21:48:07</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>11/26/2024 08:23:55</publishTime>
+ <publishTime>12/11/2024 21:48:07</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>11/26/2024 08:55:02</publishTime>
+ <publishTime>12/11/2024 21:48:08</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>11/26/2024 08:55:02</publishTime>
+ <publishTime>12/11/2024 21:48:08</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>04/06/2023 15:57:02</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>11/26/2024 08:23:53</publishTime>
+ <publishTime>12/11/2024 21:48:04</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>11/26/2024 08:23:53</publishTime>
+ <publishTime>12/11/2024 21:48:04</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>11/26/2024 08:23:55</publishTime>
+ <publishTime>12/11/2024 21:48:06</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>11/26/2024 08:23:55</publishTime>
+ <publishTime>12/11/2024 21:48:06</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>11/26/2024 08:23:55</publishTime>
+ <publishTime>12/11/2024 21:48:06</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>11/26/2024 08:23:55</publishTime>
+ <publishTime>12/11/2024 21:48:06</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>11/26/2024 08:23:52</publishTime>
+ <publishTime>12/11/2024 21:48:03</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>11/26/2024 08:23:52</publishTime>
+ <publishTime>12/11/2024 21:48:03</publishTime>
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -285,22 +285,22 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
- <publishTime>11/26/2024 08:23:57</publishTime>
+ <publishTime>12/11/2024 21:48:09</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>11/26/2024 08:23:57</publishTime>
+ <publishTime>12/11/2024 21:48:09</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>12/02/2024 14:57:01</publishTime>
+ <publishTime>12/11/2024 22:14:36</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/02/2024 14:57:01</publishTime>
+ <publishTime>12/11/2024 22:14:36</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>12/02/2024 14:57:08</publishTime>
+ <publishTime>12/11/2024 22:14:40</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>11/26/2024 08:24:30</publishTime>
+ <publishTime>12/11/2024 21:48:51</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 3cffb25..28b74f0 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|2024-12-04T01:52:03.8506923Z;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|2024-12-13T07:44:29.9921182Z;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>12/04/2024 09:51:28</publishTime>
+ <publishTime>12/13/2024 15:43:56</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/04/2024 09:51:28</publishTime>
+ <publishTime>12/13/2024 15:43:56</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>12/04/2024 09:51:25</publishTime>
+ <publishTime>12/13/2024 15:43:54</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/04/2024 09:51:25</publishTime>
+ <publishTime>12/13/2024 15:43:54</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>12/04/2024 09:51:19</publishTime>
+ <publishTime>12/13/2024 15:43:49</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>12/04/2024 09:51:19</publishTime>
+ <publishTime>12/13/2024 15:43:49</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -111,10 +111,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>12/04/2024 09:51:20</publishTime>
+ <publishTime>12/13/2024 15:43:49</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/04/2024 09:51:20</publishTime>
+ <publishTime>12/13/2024 15:43:49</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>12/04/2024 09:51:17</publishTime>
+ <publishTime>12/13/2024 15:43:46</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>12/04/2024 09:51:17</publishTime>
+ <publishTime>12/13/2024 15:43:46</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>12/04/2024 09:51:18</publishTime>
+ <publishTime>12/13/2024 15:43:47</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>12/04/2024 09:51:18</publishTime>
+ <publishTime>12/13/2024 15:43:47</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>12/04/2024 09:51:18</publishTime>
+ <publishTime>12/13/2024 15:43:47</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>12/04/2024 09:51:18</publishTime>
+ <publishTime>12/13/2024 15:43:47</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>12/04/2024 09:47:01</publishTime>
+ <publishTime>12/11/2024 09:03:39</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>12/04/2024 09:47:01</publishTime>
+ <publishTime>12/11/2024 09:03:39</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>12/04/2024 09:47:07</publishTime>
+ <publishTime>12/11/2024 09:03:45</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>12/04/2024 09:47:07</publishTime>
+ <publishTime>12/11/2024 09:03:45</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>12/04/2024 09:52:01</publishTime>
+ <publishTime>12/13/2024 15:52:14</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/04/2024 09:52:01</publishTime>
+ <publishTime>12/13/2024 15:52:14</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>12/03/2024 15:09:47</publishTime>
+ <publishTime>12/06/2024 13:13:33</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 a75459b..a588dd5 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|2024-12-03T07:16:04.1754554Z;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|2024-12-12T02:01:42.4944750Z;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>12/02/2024 16:31:07</publishTime>
+ <publishTime>12/12/2024 10:01:27</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>12/02/2024 16:31:07</publishTime>
+ <publishTime>12/12/2024 10:01:27</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>12/02/2024 16:31:05</publishTime>
+ <publishTime>12/12/2024 10:01:25</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>12/02/2024 16:31:05</publishTime>
+ <publishTime>12/12/2024 10:01:25</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>12/02/2024 16:31:03</publishTime>
+ <publishTime>12/12/2024 10:01:22</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>12/02/2024 16:31:03</publishTime>
+ <publishTime>12/12/2024 10:01:22</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>12/02/2024 16:31:03</publishTime>
+ <publishTime>12/12/2024 10:01:22</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>12/02/2024 16:31:03</publishTime>
+ <publishTime>12/12/2024 10:01:22</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/25/2024 09:46:41</publishTime>
@@ -147,34 +147,34 @@
<publishTime>10/23/2021 17:07:54</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>12/02/2024 16:31:01</publishTime>
+ <publishTime>12/12/2024 10:01:20</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>12/02/2024 16:31:01</publishTime>
+ <publishTime>12/12/2024 10:01:20</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>12/02/2024 16:31:02</publishTime>
+ <publishTime>12/12/2024 10:01:21</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>12/02/2024 16:31:02</publishTime>
+ <publishTime>12/12/2024 10:01:21</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>12/02/2024 16:31:02</publishTime>
+ <publishTime>12/12/2024 10:01:21</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>12/02/2024 16:31:02</publishTime>
+ <publishTime>12/12/2024 10:01:21</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
- <publishTime>12/02/2024 16:27:25</publishTime>
+ <publishTime>12/12/2024 10:00:30</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
- <publishTime>12/02/2024 16:27:32</publishTime>
+ <publishTime>12/12/2024 10:00:30</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>12/02/2024 16:27:07</publishTime>
+ <publishTime>12/12/2024 10:00:33</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
- <publishTime>12/02/2024 16:27:07</publishTime>
+ <publishTime>12/12/2024 10:00:33</publishTime>
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>12/03/2024 15:15:52</publishTime>
+ <publishTime>12/12/2024 10:00:56</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>12/03/2024 15:15:52</publishTime>
+ <publishTime>12/12/2024 10:00:56</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -492,7 +492,7 @@
<publishTime>05/25/2024 09:46:41</publishTime>
</File>
<File Include="Web.config">
- <publishTime>12/02/2024 16:31:20</publishTime>
+ <publishTime>12/11/2024 09:49:18</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 77d3f96..352a956 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -35,7 +35,7 @@
<!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> --> <!--娴嬭瘯鏈嶅姟鍣�-->
<!--<add key="surl" value="http://localhost:8082/webs/webservice1.asmx"/> 鏈湴-->
<!--<add key="sUrl" value="http://192.168.110.57:81/WEBS/WebService1.asmx"/>--> <!--闄堥洴闈欐湰鍦伴厤缃�-->
- <!--<add key="surl" value="http://localhost/webs-web/webservice1.asmx" />--> <!--缈佹稕娑涙湰鍦伴厤缃�-->
+ <add key="surl" value="http://localhost/webs-web/webservice1.asmx" /> <!--缈佹稕娑涙湰鍦伴厤缃�-->
<!--<add key="sUrl" value="http://192.168.1.57:8082/WEBS-WMS/WebService1.asmx"/>涔濊彵-->
<!--<add key="sUrl" value="http://61.130.182.102:18181/WEBSCS/WebService1.asmx"/>--><!--鏂帿灏�-->
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 47a90a7..f1aa900 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -827,6 +827,7 @@
<Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
<Compile Include="Models\ClsSc_MESBeginWorkBillSub_RelationBill.cs" />
<Compile Include="Models\Gy_MouldFileSub_SubMater.cs" />
+ <Compile Include="Models\QC_OutCompCheckBillSub_ValueGrid.cs" />
<Compile Include="Models\SBGL\SBBB\Sb_EquipMentCollectionTechParam_Temp.cs" />
<Compile Include="Models\SBGL\SBBB\Sb_EquipMentCollectionTechParam.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_ColorClass.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index 8aa44b2..be6507d 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -2,7 +2,14 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
- <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-API\WebAPI\Properties\PublishProfiles\JFAPI.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfilewtt.pubxml</NameOfLastUsedPublishProfile>
+ <UseIISExpress>true</UseIISExpress>
+ <Use64BitIISExpress />
+ <IISExpressSSLPort />
+ <IISExpressAnonymousAuthentication>enabled</IISExpressAnonymousAuthentication>
+ <IISExpressWindowsAuthentication>disabled</IISExpressWindowsAuthentication>
+ <IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
+ <UseGlobalApplicationHostFile />
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
diff --git a/WorkM/bin/Release/BLL.dll b/WorkM/bin/Release/BLL.dll
index c9e9569..8abad3e 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 45e9d10..9fa82ef 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 d33ebe6..47cf6dd 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 7ef44ed..51b1670 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 87ed9f6..9f77883 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 dd56d66..8d03eea 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 86be651..720cf62 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 a7b61f6..3891935 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 561a964..ed5cf2b 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 ad21151..fc1b742 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 e461506..a0906c3 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 ad14f15..9da7cc1 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 1e64426..dedb3fb 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 ffc0037..6897e5c 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 b9475fd..271f758 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 5c37dd3..c23f0e3 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 04f942a..c9951bb 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 864a3ec..5d0fefc 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 4ffa8ff..92d6573 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 bfdd28b..cbb2978 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 889231a..692b4c7 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 ca1b775..be011f4 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cache
deleted file mode 100644
index d6e21aa..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 c0d4d5f..6b4bdd1 100644
--- a/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,7 +1,6 @@
<<<<<<< HEAD
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb
-D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
@@ -12,4 +11,4 @@
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb
C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache
->>>>>>> b75c484393ae95535edada81e805d05c56652931
+>>>>>>> afed30bef0f01fa5f8e9e6627a5604632eb3d37a
diff --git a/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll b/sdk_dingding/TopSdk/obj/Debug/TopSdk.dll
index 4ffa8ff..92d6573 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 bfdd28b..cbb2978 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 f5e894a..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
new file mode 100644
index 0000000..dd9e641
--- /dev/null
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -0,0 +1,5 @@
+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
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
index 889231a..692b4c7 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
index ca1b775..be011f4 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1