From e3ae7f17842fe7de358ced5398ef792a961f80eb Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 20 八月 2021 15:33:54 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
PlanM/计划管理/Gy_RoutingBill.cs | 17
MES/bin/Debug/Interop.gregn6Lib.dll | 0
WorkM/流转卡管理/Sc_ProcessExchangeBill_CF.designer.cs | 35
MES/bin/Debug/Model.dll | 0
WebAPI/Controllers/QC_ManagementController.cs | 148 +
WebAPI/WebAPI.csproj.user | 2
WorkM/流转卡管理/Sc_ProcessExchangeBill.cs | 40
DAL/计划管理/ClsGy_RoutingBill.cs | 37
MES/bin/Debug/MES.pdb | 0
DAL/车间管理/ClsSc_ProcessExchangeBill.cs | 83
MES/bin/Debug/DAL.pdb | 0
WarM/条码打印/Gy_BarCodeBill.cs | 61
DAL/基础资料/InterFace基础资料/ClsIF_Property_View.cs | 73
WebAPI/DLL/ClsSc_MESBeginWorkBill.cs | 70
MES/bin/Debug/Model.pdb | 0
WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs | 265 ++
DAL/生产管理/模具管理/ClsSc_MouldMaintainBill.cs | 79
WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs | 105
WorkM/流转卡管理/Sc_ProcessExchangeBill.designer.cs | 977 ++++----
MES/bin/Debug/AxInterop.gregn6Lib.dll | 0
MES/bin/Debug/stdole.dll | 0
MES/bin/Debug/DAL.dll | 0
BaseSet/公用资料/公用基础资料/Gy_StockPlace.cs | 6
WorkM/报表分析/Sc_StationOutSumReport.resx | 20
BLL/公用模块/Gy_DataInTmp.resx | 616 ++--
DAL/基础资料/InterFace基础资料/ClsIF_Material_View.cs | 2
WebAPI/DLL/ClsSc_MESStopWorkBill.cs | 69
MES/bin/Debug/MES.exe | 0
Model/MES/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs | 18
BLL/公用模块/Gy_DataInTmp.designer.cs | 110
MES/bin/Debug/WarM.pdb | 0
MES/bin/Debug/BLL.dll | 0
WebAPI/ListModels.cs | 14
PlanM/计划管理/Gy_RoutingBill.resx | 837 ++---
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs | 102
WebAPI/DLL/ClsSc_MESEndWorkBill.cs | 67
MES/bin/Debug/WarM.dll | 0
MES/bin/Debug/BLL.pdb | 0
WorkM/报表分析/Sc_StationOutSumReport.designer.cs | 215 +
WebAPI/WebAPI.csproj | 6
WebAPI/Models/json.cs | 3
WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs | 419 +++
WebAPI/Web References/WebS/WebService1.wsdl | 53
.gitignore | 37
Model/车间管理/ClsSc_ProcessExchangeBillSub.cs | 2
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 40
WorkM/报表分析/Sc_StationOutSumReport.cs | 4
PlanM/数据导入/Gy_DataIn_RoutingBill.cs | 538 ++-
Model/生产管理/模具管理/ClsSc_MouldMaintainRuleBillSub_Item.cs | 1
Model/车间管理/ClsSc_ProcessExchangeBillMain.cs | 5
WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs | 263 ++
WebAPI/Web References/WebS/Reference.cs | 84
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache | 0
WebAPI/Web.config | 2
Model/计划管理/ClsGy_RoutingBillMain.cs | 5
DBUtility/业务单据/ClsXt_BaseBill.cs | 7
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 33
Model/计划管理/ClsGy_RoutingBillSub.cs | 1
DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache | 0
PlanM/计划管理/Gy_RoutingBill.designer.cs | 381 ++-
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 16
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 138
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 519 ++++
WebAPI/Controllers/PublicPageMethodController.cs | 317 ++
/dev/null | 0
WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs | 108
WorkM/流转卡管理/Sc_ProcessExchangeBill_CF.cs | 3
LMES/bin/x86/HXERP.ini | 37
WorkM/流转卡管理/Sc_ProcessExchangeBill.resx | 53
69 files changed, 5,108 insertions(+), 2,035 deletions(-)
diff --git a/.gitignore b/.gitignore
index edb22d2..14fcf85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,40 +12,58 @@
/APSM/obj/Debug
/APSM/obj/Release
/APSM/obj/x86/Debug
+/APSM/obj/x86/Release
/BaseSet/bin/Debug
/BaseSet/bin/x86/Debug
/BaseSet/obj/Debug
/BaseSet/obj/Release
/BaseSet/obj/x86/Debug
+/BaseSet/obj/x86/Release
/BLL/bin/Debug
/BLL/bin/x86/Debug
/BLL/obj/Debug
/BLL/obj/Release
/BLL/obj/x86/Debug
+/BLL/obj/x86/Release
/DAL/bin/Debug
/DAL/bin/x86/Debug
/DAL/obj/Debug
/DAL/obj/Release
/DAL/obj/x86/Debug
+/DAL/obj/x86/Release
/DBUtility/bin/Debug
/DBUtility/bin/x86/Debug
/DBUtility/obj/Debug
/DBUtility/obj/x86/Debug
+/DBUtility/obj/x86/Release
/EAM/bin/Debug
/EAM/bin/x86/Debug
/EAM/obj/Debug
+/EAM/obj/Release
/EAM/obj/x86/Debug
+/EAM/obj/x86/Release
/Kanban/bin/Debug
/Kanban/bin/x86/Debug
/Kanban/obj/Debug
+/Kanban/obj/Release
/Kanban/obj/x86/Debug
+/Kanban/obj/x86/Release
+/KanbanBoard/obj/Debug
+/KanbanBoard/obj/Release
/LMES/bin/Debug
/LMES/bin/x86/Debug
/LMES/obj/Debug
+/LMES/obj/Release
/LMES/obj/x86/Debug
/MES/bin/x86/Debug
/MES/obj/Debug
+/MES/obj/Release
/MES/obj/x86/Debug
+/MES/obj/x86/Release
+/MoveForm/obj/Debug
+/MoveForm/obj/Release
+/MoveForm/obj/x86/Debug
+/MoveForm/obj/x86/Release
/Model/bin/Debug
/Model/bin/x86/Debug
/Model/obj/Debug
@@ -53,30 +71,45 @@
/OAM/bin/Debug
/OAM/bin/x86/Debug
/OAM/obj/Debug
+/OAM/obj/Release
/OAM/obj/x86/Debug
+/OAM/obj/x86/Release
/PlanM/bin/Debug
/PlanM/bin/x86/Debug
/PlanM/obj/Debug
+/PlanM/obj/Release
/PlanM/obj/x86/Debug
+/PlanM/obj/x86/Release
/ProM/bin/Debug
/ProM/bin/x86/Debug
/ProM/obj/Debug
+/ProM/obj/Release
/ProM/obj/x86/Debug
+/ProM/obj/x86/Release
+/Pub_Class/bin/Debug
/Pub_Class/bin/x86/Debug
/Pub_Class/obj/Debug
+/Pub_Class/obj/Release
/Pub_Class/obj/x86/Debug
+/Pub_Class/obj/x86/Release
/Pub_Control/bin/Debug
/Pub_Control/bin/x86/Debug
/Pub_Control/obj/Debug
+/Pub_Control/obj/Release
/Pub_Control/obj/x86/Debug
+/Pub_Control/obj/x86/Release
/SCM/bin/Debug
/SCM/bin/x86/Debug
/SCM/obj/Debug
+/SCM/obj/Release
/SCM/obj/x86/Debug
+/SCM/obj/x86/Release
/SelM/bin/Debug
/SelM/bin/x86/Debug
/SelM/obj/Debug
+/SelM/obj/Release
/SelM/obj/x86/Debug
+/SelM/obj/x86/Release
/SQLHelper/bin/Debug
/SQLHelper/bin/x86/Debug
/SQLHelper/obj/Debug
@@ -84,10 +117,14 @@
/WarM/bin/Debug
/WarM/bin/x86/Debug
/WarM/obj/Debug
+/WarM/obj/Release
/WarM/obj/x86/Debug
+/WarM/obj/x86/Release
/WorkM/bin/Debug
/WorkM/bin/x86/Debug
/WorkM/obj/Debug
+/WorkM/obj/Release
/WorkM/obj/x86/Debug
+/WorkM/obj/x86/Release
/DBUtility/bin/x86/Debug
/DBUtility/obj/x86/Debug
\ No newline at end of file
diff --git a/APSM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/APSM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/APSM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/APSM/obj/x86/Release/APSM.csproj.ResolveComReference.cache b/APSM/obj/x86/Release/APSM.csproj.ResolveComReference.cache
deleted file mode 100644
index c485d5a..0000000
--- a/APSM/obj/x86/Release/APSM.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/APSM/obj/x86/Release/AxInterop.gregn6Lib.dll b/APSM/obj/x86/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index 8e025b3..0000000
--- a/APSM/obj/x86/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/APSM/obj/x86/Release/Interop.gregn6Lib.dll b/APSM/obj/x86/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index 73a4c29..0000000
--- a/APSM/obj/x86/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/BLL/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/BLL/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/BLL/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/BLL/obj/x86/Release/AxInterop.gregn6Lib.cs b/BLL/obj/x86/Release/AxInterop.gregn6Lib.cs
deleted file mode 100644
index 4a702cc..0000000
--- a/BLL/obj/x86/Release/AxInterop.gregn6Lib.cs
+++ /dev/null
@@ -1,2700 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
-// 杩愯鏃剁増鏈�:4.0.30319.42000
-//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-[assembly: System.Reflection.AssemblyVersion("6.0.0.0")]
-[assembly: System.Windows.Forms.AxHost.TypeLibraryTimeStamp("09/21/2015 09:55:14")]
-
-namespace Axgregn6Lib {
-
-
- [System.Windows.Forms.AxHost.ClsidAttribute("{1b5ea181-a38d-4f42-88b2-6af74cf6d6c0}")]
- [System.ComponentModel.DesignTimeVisibleAttribute(true)]
- [System.ComponentModel.DefaultEvent("ControlClick")]
- public class AxGRDisplayViewer : System.Windows.Forms.AxHost {
-
- private gregn6Lib.IGRDisplayViewer ocx;
-
- private AxGRDisplayViewerEventMulticaster eventMulticaster;
-
- private System.Windows.Forms.AxHost.ConnectionPointCookie cookie;
-
- public AxGRDisplayViewer() :
- base("1b5ea181-a38d-4f42-88b2-6af74cf6d6c0") {
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(-504)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual gregn6Lib.GRViewerBorderStyle BorderStyle {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("BorderStyle", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.BorderStyle;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("BorderStyle", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.BorderStyle = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(152)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual int LeftGap {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("LeftGap", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.LeftGap;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("LeftGap", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.LeftGap = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(153)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual int RightGap {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("RightGap", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.RightGap;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("RightGap", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.RightGap = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(154)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual int TopGap {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("TopGap", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.TopGap;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("TopGap", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.TopGap = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(155)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual int BottomGap {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("BottomGap", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.BottomGap;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("BottomGap", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.BottomGap = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(163)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual int RowsPerPage {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("RowsPerPage", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.RowsPerPage;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("RowsPerPage", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.RowsPerPage = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(150)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool ShowHeader {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowHeader", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.ShowHeader;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowHeader", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.ShowHeader = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(151)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool ShowFooter {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowFooter", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.ShowFooter;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowFooter", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.ShowFooter = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(135)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool ShowToolbar {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowToolbar", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.ShowToolbar;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowToolbar", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.ShowToolbar = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(156)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool Resortable {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Resortable", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.Resortable;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Resortable", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.Resortable = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(157)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool ResortCaseSensitive {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ResortCaseSensitive", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.ResortCaseSensitive;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ResortCaseSensitive", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.ResortCaseSensitive = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(160)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool ResortDefaultAsc {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ResortDefaultAsc", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.ResortDefaultAsc;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ResortDefaultAsc", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.ResortDefaultAsc = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(161)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool GridTitle3D {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("GridTitle3D", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.GridTitle3D;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("GridTitle3D", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.GridTitle3D = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(162)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool Searchable {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Searchable", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.Searchable;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Searchable", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.Searchable = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(164)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool GridCenterView {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("GridCenterView", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.GridCenterView;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("GridCenterView", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.GridCenterView = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(165)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool GridCanShrink {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("GridCanShrink", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.GridCanShrink;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("GridCanShrink", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.GridCanShrink = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(166)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool ResizeToFit {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ResizeToFit", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.ResizeToFit;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ResizeToFit", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.ResizeToFit = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(170)]
- [System.Runtime.InteropServices.ComAliasNameAttribute("System.UInt32")]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual System.Drawing.Color SelectionBackColor {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SelectionBackColor", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return GetColorFromOleColor(((uint)(this.ocx.SelectionBackColor)));
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SelectionBackColor", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.SelectionBackColor = ((uint)(GetOleColorFromColor(value)));
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(171)]
- [System.Runtime.InteropServices.ComAliasNameAttribute("System.UInt32")]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual System.Drawing.Color SelectionForeColor {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SelectionForeColor", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return GetColorFromOleColor(((uint)(this.ocx.SelectionForeColor)));
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SelectionForeColor", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.SelectionForeColor = ((uint)(GetOleColorFromColor(value)));
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(172)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool SelectionFollowScroll {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SelectionFollowScroll", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.SelectionFollowScroll;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SelectionFollowScroll", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.SelectionFollowScroll = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(173)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool AlwaysShowHScrollBar {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("AlwaysShowHScrollBar", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.AlwaysShowHScrollBar;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("AlwaysShowHScrollBar", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.AlwaysShowHScrollBar = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(174)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool AlwaysShowVScrollBar {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("AlwaysShowVScrollBar", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.AlwaysShowVScrollBar;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("AlwaysShowVScrollBar", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.AlwaysShowVScrollBar = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(175)]
- [System.Runtime.InteropServices.ComAliasNameAttribute("System.UInt32")]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual System.Drawing.Color BackgroundColor {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("BackgroundColor", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return GetColorFromOleColor(((uint)(this.ocx.BackgroundColor)));
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("BackgroundColor", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.BackgroundColor = ((uint)(GetOleColorFromColor(value)));
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(176)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool ColumnMove {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ColumnMove", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.ColumnMove;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ColumnMove", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.ColumnMove = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(177)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool ColumnResize {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ColumnResize", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.ColumnResize;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ColumnResize", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.ColumnResize = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(178)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool RowSelection {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("RowSelection", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.RowSelection;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("RowSelection", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.RowSelection = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(100)]
- public virtual bool BatchGetRecord {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("BatchGetRecord", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.BatchGetRecord;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("BatchGetRecord", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.BatchGetRecord = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(101)]
- public virtual int BatchWantRecords {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("BatchWantRecords", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.BatchWantRecords;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("BatchWantRecords", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.BatchWantRecords = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(102)]
- public virtual int TotalRecord {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("TotalRecord", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.TotalRecord;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("TotalRecord", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.TotalRecord = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(103)]
- public virtual bool BatchFinished {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("BatchFinished", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.BatchFinished;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("BatchFinished", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.BatchFinished = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(104)]
- public virtual int BatchNo {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("BatchNo", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.BatchNo;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(105)]
- public virtual int BatchStartRecNo {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("BatchStartRecNo", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.BatchStartRecNo;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(2)]
- public virtual bool Running {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Running", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.Running;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(9)]
- public virtual int RowCount {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("RowCount", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.RowCount;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(17)]
- public virtual int PageCount {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("PageCount", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.PageCount;
- }
- }
-
- [System.ComponentModel.Browsable(false)]
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(18)]
- public virtual bool DefaultToolbarCommand {
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("DefaultToolbarCommand", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.DefaultToolbarCommand = value;
- }
- }
-
- [System.ComponentModel.Browsable(false)]
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(1)]
- public virtual gregn6Lib.GridppReport Report {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Report", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.Report;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Report", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.Report = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(3)]
- public virtual bool ShowPreviewLine {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowPreviewLine", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.ShowPreviewLine;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowPreviewLine", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.ShowPreviewLine = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(4)]
- public virtual int SelRowNo {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SelRowNo", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.SelRowNo;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SelRowNo", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.SelRowNo = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(5)]
- public virtual int SelColumnNo {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SelColumnNo", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.SelColumnNo;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SelColumnNo", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.SelColumnNo = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(6)]
- public virtual string SelColumnName {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SelColumnName", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.SelColumnName;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SelColumnName", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.SelColumnName = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(7)]
- public virtual int VScrollPos {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("VScrollPos", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.VScrollPos;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("VScrollPos", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.VScrollPos = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(8)]
- public virtual int HScrollPos {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("HScrollPos", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.HScrollPos;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("HScrollPos", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.HScrollPos = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(10)]
- public virtual string SortColumns {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SortColumns", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.SortColumns;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SortColumns", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.SortColumns = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(11)]
- public virtual bool AlwaysShowSelection {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("AlwaysShowSelection", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.AlwaysShowSelection;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("AlwaysShowSelection", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.AlwaysShowSelection = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(12)]
- public virtual bool ToPostColumnLayout {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ToPostColumnLayout", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.ToPostColumnLayout;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ToPostColumnLayout", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.ToPostColumnLayout = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(16)]
- public virtual int CurPageNo {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("CurPageNo", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.CurPageNo;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("CurPageNo", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.CurPageNo = value;
- }
- }
-
- public event System.EventHandler ClickEvent;
-
- public event System.EventHandler DblClick;
-
- public event _IGRDisplayViewerEvents_KeyDownEventHandler KeyDownEvent;
-
- public event _IGRDisplayViewerEvents_KeyPressEventHandler KeyPressEvent;
-
- public event _IGRDisplayViewerEvents_KeyUpEventHandler KeyUpEvent;
-
- public event _IGRDisplayViewerEvents_MouseDownEventHandler MouseDownEvent;
-
- public event _IGRDisplayViewerEvents_MouseUpEventHandler MouseUpEvent;
-
- public event _IGRDisplayViewerEvents_MouseMoveEventHandler MouseMoveEvent;
-
- public event _IGRDisplayViewerEvents_ControlClickEventHandler ControlClick;
-
- public event _IGRDisplayViewerEvents_ControlDblClickEventHandler ControlDblClick;
-
- public event _IGRDisplayViewerEvents_SectionClickEventHandler SectionClick;
-
- public event _IGRDisplayViewerEvents_SectionDblClickEventHandler SectionDblClick;
-
- public event _IGRDisplayViewerEvents_ContentCellClickEventHandler ContentCellClick;
-
- public event _IGRDisplayViewerEvents_ContentCellDblClickEventHandler ContentCellDblClick;
-
- public event _IGRDisplayViewerEvents_TitleCellClickEventHandler TitleCellClick;
-
- public event _IGRDisplayViewerEvents_TitleCellDblClickEventHandler TitleCellDblClick;
-
- public event _IGRDisplayViewerEvents_ChartClickSeriesEventHandler ChartClickSeries;
-
- public event _IGRDisplayViewerEvents_ChartDblClickSeriesEventHandler ChartDblClickSeries;
-
- public event _IGRDisplayViewerEvents_ChartClickLegendEventHandler ChartClickLegend;
-
- public event _IGRDisplayViewerEvents_ChartDblClickLegendEventHandler ChartDblClickLegend;
-
- public event System.EventHandler ColumnLayoutChange;
-
- public event _IGRDisplayViewerEvents_SelectionCellChangeEventHandler SelectionCellChange;
-
- public event System.EventHandler StatusChange;
-
- public event System.EventHandler CloseButtonClick;
-
- public event _IGRDisplayViewerEvents_CustomButtonClickEventHandler CustomButtonClick;
-
- public event _IGRDisplayViewerEvents_ToolbarCommandClickEventHandler ToolbarCommandClick;
-
- public event System.EventHandler BatchFetchRecord;
-
- public virtual void QuickRefresh() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("QuickRefresh", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.QuickRefresh();
- }
-
- public virtual void Refresh() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Refresh", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.Refresh();
- }
-
- public virtual void Start() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Start", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.Start();
- }
-
- public virtual void Stop() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Stop", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.Stop();
- }
-
- public virtual gregn6Lib.IGRControl GetControlFromPos(int xPos, int yPos) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("GetControlFromPos", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- gregn6Lib.IGRControl returnValue = ((gregn6Lib.IGRControl)(this.ocx.GetControlFromPos(xPos, yPos)));
- return returnValue;
- }
-
- public virtual gregn6Lib.IGRSection GetSectionFromPos(int xPos, int yPos) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("GetSectionFromPos", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- gregn6Lib.IGRSection returnValue = ((gregn6Lib.IGRSection)(this.ocx.GetSectionFromPos(xPos, yPos)));
- return returnValue;
- }
-
- public virtual gregn6Lib.IGRColumnContentCell GetContentCellFromPos(int xPos, int yPos) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("GetContentCellFromPos", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- gregn6Lib.IGRColumnContentCell returnValue = ((gregn6Lib.IGRColumnContentCell)(this.ocx.GetContentCellFromPos(xPos, yPos)));
- return returnValue;
- }
-
- public virtual gregn6Lib.IGRColumnTitleCell GetTitleCellFromPos(int xPos, int yPos) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("GetTitleCellFromPos", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- gregn6Lib.IGRColumnTitleCell returnValue = ((gregn6Lib.IGRColumnTitleCell)(this.ocx.GetTitleCellFromPos(xPos, yPos)));
- return returnValue;
- }
-
- public virtual void PostColumnLayout() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("PostColumnLayout", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.PostColumnLayout();
- }
-
- public virtual void ResizeColumnToFitPage() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ResizeColumnToFitPage", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.ResizeColumnToFitPage();
- }
-
- public virtual void ResizeColumnToFit() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ResizeColumnToFit", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.ResizeColumnToFit();
- }
-
- public virtual void ResizeColumnToFitText() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ResizeColumnToFitText", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.ResizeColumnToFitText();
- }
-
- public virtual void NextPage() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("NextPage", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.NextPage();
- }
-
- public virtual void PriorPage() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("PriorPage", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.PriorPage();
- }
-
- public virtual void FirstPage() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("FirstPage", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.FirstPage();
- }
-
- public virtual void LastPage() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("LastPage", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.LastPage();
- }
-
- public virtual bool GetColumnVisible(string columnName) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("GetColumnVisible", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- bool returnValue = ((bool)(this.ocx.GetColumnVisible(columnName)));
- return returnValue;
- }
-
- public virtual void SetColumnVisible(string columnName, bool visible) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SetColumnVisible", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.SetColumnVisible(columnName, visible);
- }
-
- public virtual void UpdateColumnView() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("UpdateColumnView", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.UpdateColumnView();
- }
-
- public virtual void UpdateSelCell() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("UpdateSelCell", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.UpdateSelCell();
- }
-
- public virtual void UpdateSelRow() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("UpdateSelRow", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.UpdateSelRow();
- }
-
- public virtual void UpdateControl(gregn6Lib.IGRControl pControl) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("UpdateControl", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.UpdateControl(pControl);
- }
-
- public virtual void UpdateViewer() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("UpdateViewer", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.UpdateViewer();
- }
-
- public virtual void LockUpdate() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("LockUpdate", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.LockUpdate();
- }
-
- public virtual void UnlockUpdate() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("UnlockUpdate", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.UnlockUpdate();
- }
-
- public virtual string GetSelRowCellText(int columnIndex) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("GetSelRowCellText", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- string returnValue = ((string)(this.ocx.GetSelRowCellText(columnIndex)));
- return returnValue;
- }
-
- public virtual bool Search(string text, bool caseSensitive, bool wholeWord, bool toUp, bool fromSelection, bool showDlg, bool showMsg) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Search", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- bool returnValue = ((bool)(this.ocx.Search(text, caseSensitive, wholeWord, toUp, fromSelection, showDlg, showMsg)));
- return returnValue;
- }
-
- public virtual bool SearchAgain(bool showMsg) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SearchAgain", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- bool returnValue = ((bool)(this.ocx.SearchAgain(showMsg)));
- return returnValue;
- }
-
- public virtual void ShowColumnVisibleDlg() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowColumnVisibleDlg", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.ShowColumnVisibleDlg();
- }
-
- public virtual void UpdateLanguage() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("UpdateLanguage", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.UpdateLanguage();
- }
-
- public virtual void UpdateUI() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("UpdateUI", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.UpdateUI();
- }
-
- public virtual void AddToolbarControl(gregn6Lib.GRToolControlType2 controlType) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("AddToolbarControl", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.AddToolbarControl(controlType);
- }
-
- public virtual void AddToolbarCustomButton(int btnID, string btnFileName, string tooltipText) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("AddToolbarCustomButton", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.AddToolbarCustomButton(btnID, btnFileName, tooltipText);
- }
-
- public virtual void RemoveToolbarControl(gregn6Lib.GRToolControlType2 controlType) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("RemoveToolbarControl", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.RemoveToolbarControl(controlType);
- }
-
- public virtual void ResetToolbarContent() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ResetToolbarContent", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.ResetToolbarContent();
- }
-
- public virtual void UpdateToolbar() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("UpdateToolbar", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.UpdateToolbar();
- }
-
- public virtual void DoToolbarCommand(gregn6Lib.GRToolControlType2 controlType) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("DoToolbarCommand", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.DoToolbarCommand(controlType);
- }
-
- public virtual bool GetOptionValue(gregn6Lib.GRDisplayViewerOption option) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("GetOptionValue", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- bool returnValue = ((bool)(this.ocx.GetOptionValue(option)));
- return returnValue;
- }
-
- public virtual void SetOptionValue(gregn6Lib.GRDisplayViewerOption option, bool newVal) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SetOptionValue", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.SetOptionValue(option, newVal);
- }
-
- protected override void CreateSink() {
- try {
- this.eventMulticaster = new AxGRDisplayViewerEventMulticaster(this);
- this.cookie = new System.Windows.Forms.AxHost.ConnectionPointCookie(this.ocx, this.eventMulticaster, typeof(gregn6Lib._IGRDisplayViewerEvents));
- }
- catch (System.Exception ) {
- }
- }
-
- protected override void DetachSink() {
- try {
- this.cookie.Disconnect();
- }
- catch (System.Exception ) {
- }
- }
-
- protected override void AttachInterfaces() {
- try {
- this.ocx = ((gregn6Lib.IGRDisplayViewer)(this.GetOcx()));
- }
- catch (System.Exception ) {
- }
- }
-
- internal void RaiseOnClickEvent(object sender, System.EventArgs e) {
- if ((this.ClickEvent != null)) {
- this.ClickEvent(sender, e);
- }
- }
-
- internal void RaiseOnDblClick(object sender, System.EventArgs e) {
- if ((this.DblClick != null)) {
- this.DblClick(sender, e);
- }
- }
-
- internal void RaiseOnKeyDownEvent(object sender, _IGRDisplayViewerEvents_KeyDownEvent e) {
- if ((this.KeyDownEvent != null)) {
- this.KeyDownEvent(sender, e);
- }
- }
-
- internal void RaiseOnKeyPressEvent(object sender, _IGRDisplayViewerEvents_KeyPressEvent e) {
- if ((this.KeyPressEvent != null)) {
- this.KeyPressEvent(sender, e);
- }
- }
-
- internal void RaiseOnKeyUpEvent(object sender, _IGRDisplayViewerEvents_KeyUpEvent e) {
- if ((this.KeyUpEvent != null)) {
- this.KeyUpEvent(sender, e);
- }
- }
-
- internal void RaiseOnMouseDownEvent(object sender, _IGRDisplayViewerEvents_MouseDownEvent e) {
- if ((this.MouseDownEvent != null)) {
- this.MouseDownEvent(sender, e);
- }
- }
-
- internal void RaiseOnMouseUpEvent(object sender, _IGRDisplayViewerEvents_MouseUpEvent e) {
- if ((this.MouseUpEvent != null)) {
- this.MouseUpEvent(sender, e);
- }
- }
-
- internal void RaiseOnMouseMoveEvent(object sender, _IGRDisplayViewerEvents_MouseMoveEvent e) {
- if ((this.MouseMoveEvent != null)) {
- this.MouseMoveEvent(sender, e);
- }
- }
-
- internal void RaiseOnControlClick(object sender, _IGRDisplayViewerEvents_ControlClickEvent e) {
- if ((this.ControlClick != null)) {
- this.ControlClick(sender, e);
- }
- }
-
- internal void RaiseOnControlDblClick(object sender, _IGRDisplayViewerEvents_ControlDblClickEvent e) {
- if ((this.ControlDblClick != null)) {
- this.ControlDblClick(sender, e);
- }
- }
-
- internal void RaiseOnSectionClick(object sender, _IGRDisplayViewerEvents_SectionClickEvent e) {
- if ((this.SectionClick != null)) {
- this.SectionClick(sender, e);
- }
- }
-
- internal void RaiseOnSectionDblClick(object sender, _IGRDisplayViewerEvents_SectionDblClickEvent e) {
- if ((this.SectionDblClick != null)) {
- this.SectionDblClick(sender, e);
- }
- }
-
- internal void RaiseOnContentCellClick(object sender, _IGRDisplayViewerEvents_ContentCellClickEvent e) {
- if ((this.ContentCellClick != null)) {
- this.ContentCellClick(sender, e);
- }
- }
-
- internal void RaiseOnContentCellDblClick(object sender, _IGRDisplayViewerEvents_ContentCellDblClickEvent e) {
- if ((this.ContentCellDblClick != null)) {
- this.ContentCellDblClick(sender, e);
- }
- }
-
- internal void RaiseOnTitleCellClick(object sender, _IGRDisplayViewerEvents_TitleCellClickEvent e) {
- if ((this.TitleCellClick != null)) {
- this.TitleCellClick(sender, e);
- }
- }
-
- internal void RaiseOnTitleCellDblClick(object sender, _IGRDisplayViewerEvents_TitleCellDblClickEvent e) {
- if ((this.TitleCellDblClick != null)) {
- this.TitleCellDblClick(sender, e);
- }
- }
-
- internal void RaiseOnChartClickSeries(object sender, _IGRDisplayViewerEvents_ChartClickSeriesEvent e) {
- if ((this.ChartClickSeries != null)) {
- this.ChartClickSeries(sender, e);
- }
- }
-
- internal void RaiseOnChartDblClickSeries(object sender, _IGRDisplayViewerEvents_ChartDblClickSeriesEvent e) {
- if ((this.ChartDblClickSeries != null)) {
- this.ChartDblClickSeries(sender, e);
- }
- }
-
- internal void RaiseOnChartClickLegend(object sender, _IGRDisplayViewerEvents_ChartClickLegendEvent e) {
- if ((this.ChartClickLegend != null)) {
- this.ChartClickLegend(sender, e);
- }
- }
-
- internal void RaiseOnChartDblClickLegend(object sender, _IGRDisplayViewerEvents_ChartDblClickLegendEvent e) {
- if ((this.ChartDblClickLegend != null)) {
- this.ChartDblClickLegend(sender, e);
- }
- }
-
- internal void RaiseOnColumnLayoutChange(object sender, System.EventArgs e) {
- if ((this.ColumnLayoutChange != null)) {
- this.ColumnLayoutChange(sender, e);
- }
- }
-
- internal void RaiseOnSelectionCellChange(object sender, _IGRDisplayViewerEvents_SelectionCellChangeEvent e) {
- if ((this.SelectionCellChange != null)) {
- this.SelectionCellChange(sender, e);
- }
- }
-
- internal void RaiseOnStatusChange(object sender, System.EventArgs e) {
- if ((this.StatusChange != null)) {
- this.StatusChange(sender, e);
- }
- }
-
- internal void RaiseOnCloseButtonClick(object sender, System.EventArgs e) {
- if ((this.CloseButtonClick != null)) {
- this.CloseButtonClick(sender, e);
- }
- }
-
- internal void RaiseOnCustomButtonClick(object sender, _IGRDisplayViewerEvents_CustomButtonClickEvent e) {
- if ((this.CustomButtonClick != null)) {
- this.CustomButtonClick(sender, e);
- }
- }
-
- internal void RaiseOnToolbarCommandClick(object sender, _IGRDisplayViewerEvents_ToolbarCommandClickEvent e) {
- if ((this.ToolbarCommandClick != null)) {
- this.ToolbarCommandClick(sender, e);
- }
- }
-
- internal void RaiseOnBatchFetchRecord(object sender, System.EventArgs e) {
- if ((this.BatchFetchRecord != null)) {
- this.BatchFetchRecord(sender, e);
- }
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_KeyDownEventHandler(object sender, _IGRDisplayViewerEvents_KeyDownEvent e);
-
- public class _IGRDisplayViewerEvents_KeyDownEvent {
-
- public gregn6Lib.GRShiftStates shift;
-
- public int key;
-
- public _IGRDisplayViewerEvents_KeyDownEvent(gregn6Lib.GRShiftStates shift, int key) {
- this.shift = shift;
- this.key = key;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_KeyPressEventHandler(object sender, _IGRDisplayViewerEvents_KeyPressEvent e);
-
- public class _IGRDisplayViewerEvents_KeyPressEvent {
-
- public sbyte key;
-
- public _IGRDisplayViewerEvents_KeyPressEvent(sbyte key) {
- this.key = key;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_KeyUpEventHandler(object sender, _IGRDisplayViewerEvents_KeyUpEvent e);
-
- public class _IGRDisplayViewerEvents_KeyUpEvent {
-
- public gregn6Lib.GRShiftStates shift;
-
- public int key;
-
- public _IGRDisplayViewerEvents_KeyUpEvent(gregn6Lib.GRShiftStates shift, int key) {
- this.shift = shift;
- this.key = key;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_MouseDownEventHandler(object sender, _IGRDisplayViewerEvents_MouseDownEvent e);
-
- public class _IGRDisplayViewerEvents_MouseDownEvent {
-
- public gregn6Lib.GRMouseButton button;
-
- public gregn6Lib.GRShiftStates shift;
-
- public int xPos;
-
- public int yPos;
-
- public _IGRDisplayViewerEvents_MouseDownEvent(gregn6Lib.GRMouseButton button, gregn6Lib.GRShiftStates shift, int xPos, int yPos) {
- this.button = button;
- this.shift = shift;
- this.xPos = xPos;
- this.yPos = yPos;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_MouseUpEventHandler(object sender, _IGRDisplayViewerEvents_MouseUpEvent e);
-
- public class _IGRDisplayViewerEvents_MouseUpEvent {
-
- public gregn6Lib.GRMouseButton button;
-
- public gregn6Lib.GRShiftStates shift;
-
- public int xPos;
-
- public int yPos;
-
- public _IGRDisplayViewerEvents_MouseUpEvent(gregn6Lib.GRMouseButton button, gregn6Lib.GRShiftStates shift, int xPos, int yPos) {
- this.button = button;
- this.shift = shift;
- this.xPos = xPos;
- this.yPos = yPos;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_MouseMoveEventHandler(object sender, _IGRDisplayViewerEvents_MouseMoveEvent e);
-
- public class _IGRDisplayViewerEvents_MouseMoveEvent {
-
- public gregn6Lib.GRShiftStates shift;
-
- public int xPos;
-
- public int yPos;
-
- public _IGRDisplayViewerEvents_MouseMoveEvent(gregn6Lib.GRShiftStates shift, int xPos, int yPos) {
- this.shift = shift;
- this.xPos = xPos;
- this.yPos = yPos;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_ControlClickEventHandler(object sender, _IGRDisplayViewerEvents_ControlClickEvent e);
-
- public class _IGRDisplayViewerEvents_ControlClickEvent {
-
- public gregn6Lib.IGRControl pSender;
-
- public _IGRDisplayViewerEvents_ControlClickEvent(gregn6Lib.IGRControl pSender) {
- this.pSender = pSender;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_ControlDblClickEventHandler(object sender, _IGRDisplayViewerEvents_ControlDblClickEvent e);
-
- public class _IGRDisplayViewerEvents_ControlDblClickEvent {
-
- public gregn6Lib.IGRControl pSender;
-
- public _IGRDisplayViewerEvents_ControlDblClickEvent(gregn6Lib.IGRControl pSender) {
- this.pSender = pSender;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_SectionClickEventHandler(object sender, _IGRDisplayViewerEvents_SectionClickEvent e);
-
- public class _IGRDisplayViewerEvents_SectionClickEvent {
-
- public gregn6Lib.IGRSection pSender;
-
- public _IGRDisplayViewerEvents_SectionClickEvent(gregn6Lib.IGRSection pSender) {
- this.pSender = pSender;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_SectionDblClickEventHandler(object sender, _IGRDisplayViewerEvents_SectionDblClickEvent e);
-
- public class _IGRDisplayViewerEvents_SectionDblClickEvent {
-
- public gregn6Lib.IGRSection pSender;
-
- public _IGRDisplayViewerEvents_SectionDblClickEvent(gregn6Lib.IGRSection pSender) {
- this.pSender = pSender;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_ContentCellClickEventHandler(object sender, _IGRDisplayViewerEvents_ContentCellClickEvent e);
-
- public class _IGRDisplayViewerEvents_ContentCellClickEvent {
-
- public gregn6Lib.IGRColumnContentCell pSender;
-
- public _IGRDisplayViewerEvents_ContentCellClickEvent(gregn6Lib.IGRColumnContentCell pSender) {
- this.pSender = pSender;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_ContentCellDblClickEventHandler(object sender, _IGRDisplayViewerEvents_ContentCellDblClickEvent e);
-
- public class _IGRDisplayViewerEvents_ContentCellDblClickEvent {
-
- public gregn6Lib.IGRColumnContentCell pSender;
-
- public _IGRDisplayViewerEvents_ContentCellDblClickEvent(gregn6Lib.IGRColumnContentCell pSender) {
- this.pSender = pSender;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_TitleCellClickEventHandler(object sender, _IGRDisplayViewerEvents_TitleCellClickEvent e);
-
- public class _IGRDisplayViewerEvents_TitleCellClickEvent {
-
- public gregn6Lib.IGRColumnTitleCell pSender;
-
- public _IGRDisplayViewerEvents_TitleCellClickEvent(gregn6Lib.IGRColumnTitleCell pSender) {
- this.pSender = pSender;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_TitleCellDblClickEventHandler(object sender, _IGRDisplayViewerEvents_TitleCellDblClickEvent e);
-
- public class _IGRDisplayViewerEvents_TitleCellDblClickEvent {
-
- public gregn6Lib.IGRColumnTitleCell pSender;
-
- public _IGRDisplayViewerEvents_TitleCellDblClickEvent(gregn6Lib.IGRColumnTitleCell pSender) {
- this.pSender = pSender;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_ChartClickSeriesEventHandler(object sender, _IGRDisplayViewerEvents_ChartClickSeriesEvent e);
-
- public class _IGRDisplayViewerEvents_ChartClickSeriesEvent {
-
- public gregn6Lib.IGRChart pSender;
-
- public int seriesIndex;
-
- public int groupIndex;
-
- public _IGRDisplayViewerEvents_ChartClickSeriesEvent(gregn6Lib.IGRChart pSender, int seriesIndex, int groupIndex) {
- this.pSender = pSender;
- this.seriesIndex = seriesIndex;
- this.groupIndex = groupIndex;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_ChartDblClickSeriesEventHandler(object sender, _IGRDisplayViewerEvents_ChartDblClickSeriesEvent e);
-
- public class _IGRDisplayViewerEvents_ChartDblClickSeriesEvent {
-
- public gregn6Lib.IGRChart pSender;
-
- public int seriesIndex;
-
- public int groupIndex;
-
- public _IGRDisplayViewerEvents_ChartDblClickSeriesEvent(gregn6Lib.IGRChart pSender, int seriesIndex, int groupIndex) {
- this.pSender = pSender;
- this.seriesIndex = seriesIndex;
- this.groupIndex = groupIndex;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_ChartClickLegendEventHandler(object sender, _IGRDisplayViewerEvents_ChartClickLegendEvent e);
-
- public class _IGRDisplayViewerEvents_ChartClickLegendEvent {
-
- public gregn6Lib.IGRChart pSender;
-
- public int seriesIndex;
-
- public int groupIndex;
-
- public _IGRDisplayViewerEvents_ChartClickLegendEvent(gregn6Lib.IGRChart pSender, int seriesIndex, int groupIndex) {
- this.pSender = pSender;
- this.seriesIndex = seriesIndex;
- this.groupIndex = groupIndex;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_ChartDblClickLegendEventHandler(object sender, _IGRDisplayViewerEvents_ChartDblClickLegendEvent e);
-
- public class _IGRDisplayViewerEvents_ChartDblClickLegendEvent {
-
- public gregn6Lib.IGRChart pSender;
-
- public int seriesIndex;
-
- public int groupIndex;
-
- public _IGRDisplayViewerEvents_ChartDblClickLegendEvent(gregn6Lib.IGRChart pSender, int seriesIndex, int groupIndex) {
- this.pSender = pSender;
- this.seriesIndex = seriesIndex;
- this.groupIndex = groupIndex;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_SelectionCellChangeEventHandler(object sender, _IGRDisplayViewerEvents_SelectionCellChangeEvent e);
-
- public class _IGRDisplayViewerEvents_SelectionCellChangeEvent {
-
- public int oldRow;
-
- public int oldCol;
-
- public _IGRDisplayViewerEvents_SelectionCellChangeEvent(int oldRow, int oldCol) {
- this.oldRow = oldRow;
- this.oldCol = oldCol;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_CustomButtonClickEventHandler(object sender, _IGRDisplayViewerEvents_CustomButtonClickEvent e);
-
- public class _IGRDisplayViewerEvents_CustomButtonClickEvent {
-
- public int btnID;
-
- public _IGRDisplayViewerEvents_CustomButtonClickEvent(int btnID) {
- this.btnID = btnID;
- }
- }
-
- public delegate void _IGRDisplayViewerEvents_ToolbarCommandClickEventHandler(object sender, _IGRDisplayViewerEvents_ToolbarCommandClickEvent e);
-
- public class _IGRDisplayViewerEvents_ToolbarCommandClickEvent {
-
- public gregn6Lib.GRToolControlType2 controlType;
-
- public _IGRDisplayViewerEvents_ToolbarCommandClickEvent(gregn6Lib.GRToolControlType2 controlType) {
- this.controlType = controlType;
- }
- }
-
- [System.Runtime.InteropServices.ClassInterface(System.Runtime.InteropServices.ClassInterfaceType.None)]
- public class AxGRDisplayViewerEventMulticaster : gregn6Lib._IGRDisplayViewerEvents {
-
- private AxGRDisplayViewer parent;
-
- public AxGRDisplayViewerEventMulticaster(AxGRDisplayViewer parent) {
- this.parent = parent;
- }
-
- public virtual void Click() {
- System.EventArgs clickEvent = new System.EventArgs();
- this.parent.RaiseOnClickEvent(this.parent, clickEvent);
- }
-
- public virtual void DblClick() {
- System.EventArgs dblclickEvent = new System.EventArgs();
- this.parent.RaiseOnDblClick(this.parent, dblclickEvent);
- }
-
- public virtual void KeyDown(gregn6Lib.GRShiftStates shift, int key) {
- _IGRDisplayViewerEvents_KeyDownEvent keydownEvent = new _IGRDisplayViewerEvents_KeyDownEvent(shift, key);
- this.parent.RaiseOnKeyDownEvent(this.parent, keydownEvent);
- }
-
- public virtual void KeyPress(sbyte key) {
- _IGRDisplayViewerEvents_KeyPressEvent keypressEvent = new _IGRDisplayViewerEvents_KeyPressEvent(key);
- this.parent.RaiseOnKeyPressEvent(this.parent, keypressEvent);
- }
-
- public virtual void KeyUp(gregn6Lib.GRShiftStates shift, int key) {
- _IGRDisplayViewerEvents_KeyUpEvent keyupEvent = new _IGRDisplayViewerEvents_KeyUpEvent(shift, key);
- this.parent.RaiseOnKeyUpEvent(this.parent, keyupEvent);
- }
-
- public virtual void MouseDown(gregn6Lib.GRMouseButton button, gregn6Lib.GRShiftStates shift, int xPos, int yPos) {
- _IGRDisplayViewerEvents_MouseDownEvent mousedownEvent = new _IGRDisplayViewerEvents_MouseDownEvent(button, shift, xPos, yPos);
- this.parent.RaiseOnMouseDownEvent(this.parent, mousedownEvent);
- }
-
- public virtual void MouseUp(gregn6Lib.GRMouseButton button, gregn6Lib.GRShiftStates shift, int xPos, int yPos) {
- _IGRDisplayViewerEvents_MouseUpEvent mouseupEvent = new _IGRDisplayViewerEvents_MouseUpEvent(button, shift, xPos, yPos);
- this.parent.RaiseOnMouseUpEvent(this.parent, mouseupEvent);
- }
-
- public virtual void MouseMove(gregn6Lib.GRShiftStates shift, int xPos, int yPos) {
- _IGRDisplayViewerEvents_MouseMoveEvent mousemoveEvent = new _IGRDisplayViewerEvents_MouseMoveEvent(shift, xPos, yPos);
- this.parent.RaiseOnMouseMoveEvent(this.parent, mousemoveEvent);
- }
-
- public virtual void ControlClick(gregn6Lib.IGRControl pSender) {
- _IGRDisplayViewerEvents_ControlClickEvent controlclickEvent = new _IGRDisplayViewerEvents_ControlClickEvent(pSender);
- this.parent.RaiseOnControlClick(this.parent, controlclickEvent);
- }
-
- public virtual void ControlDblClick(gregn6Lib.IGRControl pSender) {
- _IGRDisplayViewerEvents_ControlDblClickEvent controldblclickEvent = new _IGRDisplayViewerEvents_ControlDblClickEvent(pSender);
- this.parent.RaiseOnControlDblClick(this.parent, controldblclickEvent);
- }
-
- public virtual void SectionClick(gregn6Lib.IGRSection pSender) {
- _IGRDisplayViewerEvents_SectionClickEvent sectionclickEvent = new _IGRDisplayViewerEvents_SectionClickEvent(pSender);
- this.parent.RaiseOnSectionClick(this.parent, sectionclickEvent);
- }
-
- public virtual void SectionDblClick(gregn6Lib.IGRSection pSender) {
- _IGRDisplayViewerEvents_SectionDblClickEvent sectiondblclickEvent = new _IGRDisplayViewerEvents_SectionDblClickEvent(pSender);
- this.parent.RaiseOnSectionDblClick(this.parent, sectiondblclickEvent);
- }
-
- public virtual void ContentCellClick(gregn6Lib.IGRColumnContentCell pSender) {
- _IGRDisplayViewerEvents_ContentCellClickEvent contentcellclickEvent = new _IGRDisplayViewerEvents_ContentCellClickEvent(pSender);
- this.parent.RaiseOnContentCellClick(this.parent, contentcellclickEvent);
- }
-
- public virtual void ContentCellDblClick(gregn6Lib.IGRColumnContentCell pSender) {
- _IGRDisplayViewerEvents_ContentCellDblClickEvent contentcelldblclickEvent = new _IGRDisplayViewerEvents_ContentCellDblClickEvent(pSender);
- this.parent.RaiseOnContentCellDblClick(this.parent, contentcelldblclickEvent);
- }
-
- public virtual void TitleCellClick(gregn6Lib.IGRColumnTitleCell pSender) {
- _IGRDisplayViewerEvents_TitleCellClickEvent titlecellclickEvent = new _IGRDisplayViewerEvents_TitleCellClickEvent(pSender);
- this.parent.RaiseOnTitleCellClick(this.parent, titlecellclickEvent);
- }
-
- public virtual void TitleCellDblClick(gregn6Lib.IGRColumnTitleCell pSender) {
- _IGRDisplayViewerEvents_TitleCellDblClickEvent titlecelldblclickEvent = new _IGRDisplayViewerEvents_TitleCellDblClickEvent(pSender);
- this.parent.RaiseOnTitleCellDblClick(this.parent, titlecelldblclickEvent);
- }
-
- public virtual void ChartClickSeries(gregn6Lib.IGRChart pSender, int seriesIndex, int groupIndex) {
- _IGRDisplayViewerEvents_ChartClickSeriesEvent chartclickseriesEvent = new _IGRDisplayViewerEvents_ChartClickSeriesEvent(pSender, seriesIndex, groupIndex);
- this.parent.RaiseOnChartClickSeries(this.parent, chartclickseriesEvent);
- }
-
- public virtual void ChartDblClickSeries(gregn6Lib.IGRChart pSender, int seriesIndex, int groupIndex) {
- _IGRDisplayViewerEvents_ChartDblClickSeriesEvent chartdblclickseriesEvent = new _IGRDisplayViewerEvents_ChartDblClickSeriesEvent(pSender, seriesIndex, groupIndex);
- this.parent.RaiseOnChartDblClickSeries(this.parent, chartdblclickseriesEvent);
- }
-
- public virtual void ChartClickLegend(gregn6Lib.IGRChart pSender, int seriesIndex, int groupIndex) {
- _IGRDisplayViewerEvents_ChartClickLegendEvent chartclicklegendEvent = new _IGRDisplayViewerEvents_ChartClickLegendEvent(pSender, seriesIndex, groupIndex);
- this.parent.RaiseOnChartClickLegend(this.parent, chartclicklegendEvent);
- }
-
- public virtual void ChartDblClickLegend(gregn6Lib.IGRChart pSender, int seriesIndex, int groupIndex) {
- _IGRDisplayViewerEvents_ChartDblClickLegendEvent chartdblclicklegendEvent = new _IGRDisplayViewerEvents_ChartDblClickLegendEvent(pSender, seriesIndex, groupIndex);
- this.parent.RaiseOnChartDblClickLegend(this.parent, chartdblclicklegendEvent);
- }
-
- public virtual void ColumnLayoutChange() {
- System.EventArgs columnlayoutchangeEvent = new System.EventArgs();
- this.parent.RaiseOnColumnLayoutChange(this.parent, columnlayoutchangeEvent);
- }
-
- public virtual void SelectionCellChange(int oldRow, int oldCol) {
- _IGRDisplayViewerEvents_SelectionCellChangeEvent selectioncellchangeEvent = new _IGRDisplayViewerEvents_SelectionCellChangeEvent(oldRow, oldCol);
- this.parent.RaiseOnSelectionCellChange(this.parent, selectioncellchangeEvent);
- }
-
- public virtual void StatusChange() {
- System.EventArgs statuschangeEvent = new System.EventArgs();
- this.parent.RaiseOnStatusChange(this.parent, statuschangeEvent);
- }
-
- public virtual void CloseButtonClick() {
- System.EventArgs closebuttonclickEvent = new System.EventArgs();
- this.parent.RaiseOnCloseButtonClick(this.parent, closebuttonclickEvent);
- }
-
- public virtual void CustomButtonClick(int btnID) {
- _IGRDisplayViewerEvents_CustomButtonClickEvent custombuttonclickEvent = new _IGRDisplayViewerEvents_CustomButtonClickEvent(btnID);
- this.parent.RaiseOnCustomButtonClick(this.parent, custombuttonclickEvent);
- }
-
- public virtual void ToolbarCommandClick(gregn6Lib.GRToolControlType2 controlType) {
- _IGRDisplayViewerEvents_ToolbarCommandClickEvent toolbarcommandclickEvent = new _IGRDisplayViewerEvents_ToolbarCommandClickEvent(controlType);
- this.parent.RaiseOnToolbarCommandClick(this.parent, toolbarcommandclickEvent);
- }
-
- public virtual void BatchFetchRecord() {
- System.EventArgs batchfetchrecordEvent = new System.EventArgs();
- this.parent.RaiseOnBatchFetchRecord(this.parent, batchfetchrecordEvent);
- }
- }
-
- [System.Windows.Forms.AxHost.ClsidAttribute("{44cbb5de-5afb-4c3d-8f3f-0f70ca5372ad}")]
- [System.ComponentModel.DesignTimeVisibleAttribute(true)]
- public class AxGRPrintViewer : System.Windows.Forms.AxHost {
-
- private gregn6Lib.IGRPrintViewer ocx;
-
- private AxGRPrintViewerEventMulticaster eventMulticaster;
-
- private System.Windows.Forms.AxHost.ConnectionPointCookie cookie;
-
- public AxGRPrintViewer() :
- base("44cbb5de-5afb-4c3d-8f3f-0f70ca5372ad") {
- }
-
- [System.ComponentModel.Browsable(false)]
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(2)]
- public virtual gregn6Lib.GridppReport Report {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Report", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.Report;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Report", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.Report = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(1)]
- public virtual int CurPageNo {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("CurPageNo", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.CurPageNo;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("CurPageNo", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.CurPageNo = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(4)]
- public virtual int PageCount {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("PageCount", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.PageCount;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(5)]
- public virtual bool Running {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Running", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.Running;
- }
- }
-
- [System.ComponentModel.Browsable(false)]
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(6)]
- public virtual bool DefaultToolbarCommand {
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("DefaultToolbarCommand", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.DefaultToolbarCommand = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(-504)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual gregn6Lib.GRViewerBorderStyle BorderStyle {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("BorderStyle", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.BorderStyle;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("BorderStyle", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.BorderStyle = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(145)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual gregn6Lib.GRPreviewEditMode CtlEditMode {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("CtlEditMode", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.EditMode;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("CtlEditMode", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.EditMode = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(131)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual int RowPages {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("RowPages", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.RowPages;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("RowPages", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.RowPages = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(130)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual int ColPages {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ColPages", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.ColPages;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ColPages", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.ColPages = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(132)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual int ZoomPercent {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ZoomPercent", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.ZoomPercent;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ZoomPercent", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.ZoomPercent = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(133)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual gregn6Lib.GRPrintViewMode ViewMode {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ViewMode", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.ViewMode;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ViewMode", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.ViewMode = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(134)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool ShowRuler {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowRuler", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.ShowRuler;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowRuler", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.ShowRuler = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(135)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool ShowToolbar {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowToolbar", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.ShowToolbar;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowToolbar", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.ShowToolbar = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(136)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual gregn6Lib.GRPrintGenerateStyle GenerateStyle {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("GenerateStyle", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.GenerateStyle;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("GenerateStyle", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.GenerateStyle = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(137)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool ShowMarginCorner {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowMarginCorner", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.ShowMarginCorner;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowMarginCorner", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.ShowMarginCorner = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(162)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool Searchable {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Searchable", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.Searchable;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Searchable", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.Searchable = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(143)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool ShowBookmark {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowBookmark", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.ShowBookmark;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowBookmark", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.ShowBookmark = value;
- }
- }
-
- [System.ComponentModel.DesignerSerializationVisibility(System.ComponentModel.DesignerSerializationVisibility.Hidden)]
- [System.Runtime.InteropServices.DispIdAttribute(146)]
- [System.ComponentModel.Bindable(System.ComponentModel.BindableSupport.Yes)]
- public virtual bool ShowPrintDlg {
- get {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowPrintDlg", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertyGet);
- }
- return this.ocx.ShowPrintDlg;
- }
- set {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ShowPrintDlg", System.Windows.Forms.AxHost.ActiveXInvokeKind.PropertySet);
- }
- this.ocx.ShowPrintDlg = value;
- }
- }
-
- public event System.EventHandler ClickEvent;
-
- public event System.EventHandler DblClick;
-
- public event _IGRPrintViewerEvents_KeyDownEventHandler KeyDownEvent;
-
- public event _IGRPrintViewerEvents_KeyPressEventHandler KeyPressEvent;
-
- public event _IGRPrintViewerEvents_KeyUpEventHandler KeyUpEvent;
-
- public event _IGRPrintViewerEvents_MouseDownEventHandler MouseDownEvent;
-
- public event _IGRPrintViewerEvents_MouseUpEventHandler MouseUpEvent;
-
- public event _IGRPrintViewerEvents_MouseMoveEventHandler MouseMoveEvent;
-
- public event _IGRPrintViewerEvents_CurPageChangeEventHandler CurPageChange;
-
- public event System.EventHandler StatusChange;
-
- public event _IGRPrintViewerEvents_RulerClickEventHandler RulerClick;
-
- public event _IGRPrintViewerEvents_RulerDblClickEventHandler RulerDblClick;
-
- public event System.EventHandler PageClick;
-
- public event System.EventHandler PageDblClick;
-
- public event System.EventHandler CloseButtonClick;
-
- public event _IGRPrintViewerEvents_CustomButtonClickEventHandler CustomButtonClick;
-
- public event _IGRPrintViewerEvents_ToolbarCommandClickEventHandler ToolbarCommandClick;
-
- public virtual void NextPage() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("NextPage", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.NextPage();
- }
-
- public virtual void PriorPage() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("PriorPage", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.PriorPage();
- }
-
- public virtual void FirstPage() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("FirstPage", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.FirstPage();
- }
-
- public virtual void LastPage() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("LastPage", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.LastPage();
- }
-
- public virtual void Print(bool showPrintDialog) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Print", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.Print(showPrintDialog);
- }
-
- public virtual void Refresh() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Refresh", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.Refresh();
- }
-
- public virtual void Start() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Start", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.Start();
- }
-
- public virtual void Stop() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Stop", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.Stop();
- }
-
- public virtual void ZoomToHeight() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ZoomToHeight", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.ZoomToHeight();
- }
-
- public virtual void ZoomIn() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ZoomIn", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.ZoomIn();
- }
-
- public virtual void ZoomOut() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ZoomOut", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.ZoomOut();
- }
-
- public virtual void ZoomToFit() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ZoomToFit", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.ZoomToFit();
- }
-
- public virtual void ZoomToWidth() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ZoomToWidth", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.ZoomToWidth();
- }
-
- public virtual void AddToolbarControl(gregn6Lib.GRToolControlType controlType) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("AddToolbarControl", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.AddToolbarControl(controlType);
- }
-
- public virtual void AddToolbarCustomButton(int btnID, string btnFileName, string tooltipText) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("AddToolbarCustomButton", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.AddToolbarCustomButton(btnID, btnFileName, tooltipText);
- }
-
- public virtual void RemoveToolbarControl(gregn6Lib.GRToolControlType controlType) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("RemoveToolbarControl", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.RemoveToolbarControl(controlType);
- }
-
- public virtual void ResetToolbarContent() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("ResetToolbarContent", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.ResetToolbarContent();
- }
-
- public virtual void UpdateToolbar() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("UpdateToolbar", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.UpdateToolbar();
- }
-
- public virtual bool LoadFromDocumentFile(string fileName) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("LoadFromDocumentFile", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- bool returnValue = ((bool)(this.ocx.LoadFromDocumentFile(fileName)));
- return returnValue;
- }
-
- public virtual void QuickRefresh() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("QuickRefresh", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.QuickRefresh();
- }
-
- public virtual bool Search(string text, bool caseSensitive, bool wholeWord, bool toUp, bool fromSelection, bool showDlg, bool showMsg) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("Search", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- bool returnValue = ((bool)(this.ocx.Search(text, caseSensitive, wholeWord, toUp, fromSelection, showDlg, showMsg)));
- return returnValue;
- }
-
- public virtual bool SearchAgain(bool showMsg) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SearchAgain", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- bool returnValue = ((bool)(this.ocx.SearchAgain(showMsg)));
- return returnValue;
- }
-
- public virtual void DoToolbarCommand(gregn6Lib.GRToolControlType controlType) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("DoToolbarCommand", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.DoToolbarCommand(controlType);
- }
-
- public virtual void UpdateLanguage() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("UpdateLanguage", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.UpdateLanguage();
- }
-
- public virtual void UpdateUI() {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("UpdateUI", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.UpdateUI();
- }
-
- public virtual bool GetOptionValue(gregn6Lib.GRPrintViewerOption option) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("GetOptionValue", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- bool returnValue = ((bool)(this.ocx.GetOptionValue(option)));
- return returnValue;
- }
-
- public virtual void SetOptionValue(gregn6Lib.GRPrintViewerOption option, bool newVal) {
- if ((this.ocx == null)) {
- throw new System.Windows.Forms.AxHost.InvalidActiveXStateException("SetOptionValue", System.Windows.Forms.AxHost.ActiveXInvokeKind.MethodInvoke);
- }
- this.ocx.SetOptionValue(option, newVal);
- }
-
- protected override void CreateSink() {
- try {
- this.eventMulticaster = new AxGRPrintViewerEventMulticaster(this);
- this.cookie = new System.Windows.Forms.AxHost.ConnectionPointCookie(this.ocx, this.eventMulticaster, typeof(gregn6Lib._IGRPrintViewerEvents));
- }
- catch (System.Exception ) {
- }
- }
-
- protected override void DetachSink() {
- try {
- this.cookie.Disconnect();
- }
- catch (System.Exception ) {
- }
- }
-
- protected override void AttachInterfaces() {
- try {
- this.ocx = ((gregn6Lib.IGRPrintViewer)(this.GetOcx()));
- }
- catch (System.Exception ) {
- }
- }
-
- internal void RaiseOnClickEvent(object sender, System.EventArgs e) {
- if ((this.ClickEvent != null)) {
- this.ClickEvent(sender, e);
- }
- }
-
- internal void RaiseOnDblClick(object sender, System.EventArgs e) {
- if ((this.DblClick != null)) {
- this.DblClick(sender, e);
- }
- }
-
- internal void RaiseOnKeyDownEvent(object sender, _IGRPrintViewerEvents_KeyDownEvent e) {
- if ((this.KeyDownEvent != null)) {
- this.KeyDownEvent(sender, e);
- }
- }
-
- internal void RaiseOnKeyPressEvent(object sender, _IGRPrintViewerEvents_KeyPressEvent e) {
- if ((this.KeyPressEvent != null)) {
- this.KeyPressEvent(sender, e);
- }
- }
-
- internal void RaiseOnKeyUpEvent(object sender, _IGRPrintViewerEvents_KeyUpEvent e) {
- if ((this.KeyUpEvent != null)) {
- this.KeyUpEvent(sender, e);
- }
- }
-
- internal void RaiseOnMouseDownEvent(object sender, _IGRPrintViewerEvents_MouseDownEvent e) {
- if ((this.MouseDownEvent != null)) {
- this.MouseDownEvent(sender, e);
- }
- }
-
- internal void RaiseOnMouseUpEvent(object sender, _IGRPrintViewerEvents_MouseUpEvent e) {
- if ((this.MouseUpEvent != null)) {
- this.MouseUpEvent(sender, e);
- }
- }
-
- internal void RaiseOnMouseMoveEvent(object sender, _IGRPrintViewerEvents_MouseMoveEvent e) {
- if ((this.MouseMoveEvent != null)) {
- this.MouseMoveEvent(sender, e);
- }
- }
-
- internal void RaiseOnCurPageChange(object sender, _IGRPrintViewerEvents_CurPageChangeEvent e) {
- if ((this.CurPageChange != null)) {
- this.CurPageChange(sender, e);
- }
- }
-
- internal void RaiseOnStatusChange(object sender, System.EventArgs e) {
- if ((this.StatusChange != null)) {
- this.StatusChange(sender, e);
- }
- }
-
- internal void RaiseOnRulerClick(object sender, _IGRPrintViewerEvents_RulerClickEvent e) {
- if ((this.RulerClick != null)) {
- this.RulerClick(sender, e);
- }
- }
-
- internal void RaiseOnRulerDblClick(object sender, _IGRPrintViewerEvents_RulerDblClickEvent e) {
- if ((this.RulerDblClick != null)) {
- this.RulerDblClick(sender, e);
- }
- }
-
- internal void RaiseOnPageClick(object sender, System.EventArgs e) {
- if ((this.PageClick != null)) {
- this.PageClick(sender, e);
- }
- }
-
- internal void RaiseOnPageDblClick(object sender, System.EventArgs e) {
- if ((this.PageDblClick != null)) {
- this.PageDblClick(sender, e);
- }
- }
-
- internal void RaiseOnCloseButtonClick(object sender, System.EventArgs e) {
- if ((this.CloseButtonClick != null)) {
- this.CloseButtonClick(sender, e);
- }
- }
-
- internal void RaiseOnCustomButtonClick(object sender, _IGRPrintViewerEvents_CustomButtonClickEvent e) {
- if ((this.CustomButtonClick != null)) {
- this.CustomButtonClick(sender, e);
- }
- }
-
- internal void RaiseOnToolbarCommandClick(object sender, _IGRPrintViewerEvents_ToolbarCommandClickEvent e) {
- if ((this.ToolbarCommandClick != null)) {
- this.ToolbarCommandClick(sender, e);
- }
- }
- }
-
- public delegate void _IGRPrintViewerEvents_KeyDownEventHandler(object sender, _IGRPrintViewerEvents_KeyDownEvent e);
-
- public class _IGRPrintViewerEvents_KeyDownEvent {
-
- public gregn6Lib.GRShiftStates shift;
-
- public int key;
-
- public _IGRPrintViewerEvents_KeyDownEvent(gregn6Lib.GRShiftStates shift, int key) {
- this.shift = shift;
- this.key = key;
- }
- }
-
- public delegate void _IGRPrintViewerEvents_KeyPressEventHandler(object sender, _IGRPrintViewerEvents_KeyPressEvent e);
-
- public class _IGRPrintViewerEvents_KeyPressEvent {
-
- public sbyte key;
-
- public _IGRPrintViewerEvents_KeyPressEvent(sbyte key) {
- this.key = key;
- }
- }
-
- public delegate void _IGRPrintViewerEvents_KeyUpEventHandler(object sender, _IGRPrintViewerEvents_KeyUpEvent e);
-
- public class _IGRPrintViewerEvents_KeyUpEvent {
-
- public gregn6Lib.GRShiftStates shift;
-
- public int key;
-
- public _IGRPrintViewerEvents_KeyUpEvent(gregn6Lib.GRShiftStates shift, int key) {
- this.shift = shift;
- this.key = key;
- }
- }
-
- public delegate void _IGRPrintViewerEvents_MouseDownEventHandler(object sender, _IGRPrintViewerEvents_MouseDownEvent e);
-
- public class _IGRPrintViewerEvents_MouseDownEvent {
-
- public gregn6Lib.GRMouseButton button;
-
- public gregn6Lib.GRShiftStates shift;
-
- public int xPos;
-
- public int yPos;
-
- public _IGRPrintViewerEvents_MouseDownEvent(gregn6Lib.GRMouseButton button, gregn6Lib.GRShiftStates shift, int xPos, int yPos) {
- this.button = button;
- this.shift = shift;
- this.xPos = xPos;
- this.yPos = yPos;
- }
- }
-
- public delegate void _IGRPrintViewerEvents_MouseUpEventHandler(object sender, _IGRPrintViewerEvents_MouseUpEvent e);
-
- public class _IGRPrintViewerEvents_MouseUpEvent {
-
- public gregn6Lib.GRMouseButton button;
-
- public gregn6Lib.GRShiftStates shift;
-
- public int xPos;
-
- public int yPos;
-
- public _IGRPrintViewerEvents_MouseUpEvent(gregn6Lib.GRMouseButton button, gregn6Lib.GRShiftStates shift, int xPos, int yPos) {
- this.button = button;
- this.shift = shift;
- this.xPos = xPos;
- this.yPos = yPos;
- }
- }
-
- public delegate void _IGRPrintViewerEvents_MouseMoveEventHandler(object sender, _IGRPrintViewerEvents_MouseMoveEvent e);
-
- public class _IGRPrintViewerEvents_MouseMoveEvent {
-
- public gregn6Lib.GRShiftStates shift;
-
- public int xPos;
-
- public int yPos;
-
- public _IGRPrintViewerEvents_MouseMoveEvent(gregn6Lib.GRShiftStates shift, int xPos, int yPos) {
- this.shift = shift;
- this.xPos = xPos;
- this.yPos = yPos;
- }
- }
-
- public delegate void _IGRPrintViewerEvents_CurPageChangeEventHandler(object sender, _IGRPrintViewerEvents_CurPageChangeEvent e);
-
- public class _IGRPrintViewerEvents_CurPageChangeEvent {
-
- public int newCurPageNo;
-
- public _IGRPrintViewerEvents_CurPageChangeEvent(int newCurPageNo) {
- this.newCurPageNo = newCurPageNo;
- }
- }
-
- public delegate void _IGRPrintViewerEvents_RulerClickEventHandler(object sender, _IGRPrintViewerEvents_RulerClickEvent e);
-
- public class _IGRPrintViewerEvents_RulerClickEvent {
-
- public bool isHorzRuler;
-
- public _IGRPrintViewerEvents_RulerClickEvent(bool isHorzRuler) {
- this.isHorzRuler = isHorzRuler;
- }
- }
-
- public delegate void _IGRPrintViewerEvents_RulerDblClickEventHandler(object sender, _IGRPrintViewerEvents_RulerDblClickEvent e);
-
- public class _IGRPrintViewerEvents_RulerDblClickEvent {
-
- public bool isHorzRuler;
-
- public _IGRPrintViewerEvents_RulerDblClickEvent(bool isHorzRuler) {
- this.isHorzRuler = isHorzRuler;
- }
- }
-
- public delegate void _IGRPrintViewerEvents_CustomButtonClickEventHandler(object sender, _IGRPrintViewerEvents_CustomButtonClickEvent e);
-
- public class _IGRPrintViewerEvents_CustomButtonClickEvent {
-
- public int btnID;
-
- public _IGRPrintViewerEvents_CustomButtonClickEvent(int btnID) {
- this.btnID = btnID;
- }
- }
-
- public delegate void _IGRPrintViewerEvents_ToolbarCommandClickEventHandler(object sender, _IGRPrintViewerEvents_ToolbarCommandClickEvent e);
-
- public class _IGRPrintViewerEvents_ToolbarCommandClickEvent {
-
- public gregn6Lib.GRToolControlType controlType;
-
- public _IGRPrintViewerEvents_ToolbarCommandClickEvent(gregn6Lib.GRToolControlType controlType) {
- this.controlType = controlType;
- }
- }
-
- [System.Runtime.InteropServices.ClassInterface(System.Runtime.InteropServices.ClassInterfaceType.None)]
- public class AxGRPrintViewerEventMulticaster : gregn6Lib._IGRPrintViewerEvents {
-
- private AxGRPrintViewer parent;
-
- public AxGRPrintViewerEventMulticaster(AxGRPrintViewer parent) {
- this.parent = parent;
- }
-
- public virtual void Click() {
- System.EventArgs clickEvent = new System.EventArgs();
- this.parent.RaiseOnClickEvent(this.parent, clickEvent);
- }
-
- public virtual void DblClick() {
- System.EventArgs dblclickEvent = new System.EventArgs();
- this.parent.RaiseOnDblClick(this.parent, dblclickEvent);
- }
-
- public virtual void KeyDown(gregn6Lib.GRShiftStates shift, int key) {
- _IGRPrintViewerEvents_KeyDownEvent keydownEvent = new _IGRPrintViewerEvents_KeyDownEvent(shift, key);
- this.parent.RaiseOnKeyDownEvent(this.parent, keydownEvent);
- }
-
- public virtual void KeyPress(sbyte key) {
- _IGRPrintViewerEvents_KeyPressEvent keypressEvent = new _IGRPrintViewerEvents_KeyPressEvent(key);
- this.parent.RaiseOnKeyPressEvent(this.parent, keypressEvent);
- }
-
- public virtual void KeyUp(gregn6Lib.GRShiftStates shift, int key) {
- _IGRPrintViewerEvents_KeyUpEvent keyupEvent = new _IGRPrintViewerEvents_KeyUpEvent(shift, key);
- this.parent.RaiseOnKeyUpEvent(this.parent, keyupEvent);
- }
-
- public virtual void MouseDown(gregn6Lib.GRMouseButton button, gregn6Lib.GRShiftStates shift, int xPos, int yPos) {
- _IGRPrintViewerEvents_MouseDownEvent mousedownEvent = new _IGRPrintViewerEvents_MouseDownEvent(button, shift, xPos, yPos);
- this.parent.RaiseOnMouseDownEvent(this.parent, mousedownEvent);
- }
-
- public virtual void MouseUp(gregn6Lib.GRMouseButton button, gregn6Lib.GRShiftStates shift, int xPos, int yPos) {
- _IGRPrintViewerEvents_MouseUpEvent mouseupEvent = new _IGRPrintViewerEvents_MouseUpEvent(button, shift, xPos, yPos);
- this.parent.RaiseOnMouseUpEvent(this.parent, mouseupEvent);
- }
-
- public virtual void MouseMove(gregn6Lib.GRShiftStates shift, int xPos, int yPos) {
- _IGRPrintViewerEvents_MouseMoveEvent mousemoveEvent = new _IGRPrintViewerEvents_MouseMoveEvent(shift, xPos, yPos);
- this.parent.RaiseOnMouseMoveEvent(this.parent, mousemoveEvent);
- }
-
- public virtual void CurPageChange(int newCurPageNo) {
- _IGRPrintViewerEvents_CurPageChangeEvent curpagechangeEvent = new _IGRPrintViewerEvents_CurPageChangeEvent(newCurPageNo);
- this.parent.RaiseOnCurPageChange(this.parent, curpagechangeEvent);
- }
-
- public virtual void StatusChange() {
- System.EventArgs statuschangeEvent = new System.EventArgs();
- this.parent.RaiseOnStatusChange(this.parent, statuschangeEvent);
- }
-
- public virtual void RulerClick(bool isHorzRuler) {
- _IGRPrintViewerEvents_RulerClickEvent rulerclickEvent = new _IGRPrintViewerEvents_RulerClickEvent(isHorzRuler);
- this.parent.RaiseOnRulerClick(this.parent, rulerclickEvent);
- }
-
- public virtual void RulerDblClick(bool isHorzRuler) {
- _IGRPrintViewerEvents_RulerDblClickEvent rulerdblclickEvent = new _IGRPrintViewerEvents_RulerDblClickEvent(isHorzRuler);
- this.parent.RaiseOnRulerDblClick(this.parent, rulerdblclickEvent);
- }
-
- public virtual void PageClick() {
- System.EventArgs pageclickEvent = new System.EventArgs();
- this.parent.RaiseOnPageClick(this.parent, pageclickEvent);
- }
-
- public virtual void PageDblClick() {
- System.EventArgs pagedblclickEvent = new System.EventArgs();
- this.parent.RaiseOnPageDblClick(this.parent, pagedblclickEvent);
- }
-
- public virtual void CloseButtonClick() {
- System.EventArgs closebuttonclickEvent = new System.EventArgs();
- this.parent.RaiseOnCloseButtonClick(this.parent, closebuttonclickEvent);
- }
-
- public virtual void CustomButtonClick(int btnID) {
- _IGRPrintViewerEvents_CustomButtonClickEvent custombuttonclickEvent = new _IGRPrintViewerEvents_CustomButtonClickEvent(btnID);
- this.parent.RaiseOnCustomButtonClick(this.parent, custombuttonclickEvent);
- }
-
- public virtual void ToolbarCommandClick(gregn6Lib.GRToolControlType controlType) {
- _IGRPrintViewerEvents_ToolbarCommandClickEvent toolbarcommandclickEvent = new _IGRPrintViewerEvents_ToolbarCommandClickEvent(controlType);
- this.parent.RaiseOnToolbarCommandClick(this.parent, toolbarcommandclickEvent);
- }
- }
-}
diff --git a/BLL/obj/x86/Release/AxInterop.gregn6Lib.dll b/BLL/obj/x86/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index 41762a7..0000000
--- a/BLL/obj/x86/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/BLL/obj/x86/Release/BLL.csproj.ResolveComReference.cache b/BLL/obj/x86/Release/BLL.csproj.ResolveComReference.cache
deleted file mode 100644
index c485d5a..0000000
--- a/BLL/obj/x86/Release/BLL.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/BLL/obj/x86/Release/Interop.gregn6Lib.dll b/BLL/obj/x86/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index 4dbae6d..0000000
--- a/BLL/obj/x86/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/BLL/obj/x86/Release/gregn6Lib.dll b/BLL/obj/x86/Release/gregn6Lib.dll
deleted file mode 100644
index 7e7c316..0000000
--- a/BLL/obj/x86/Release/gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.designer.cs" "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.designer.cs"
index ddfb83e..0e5ecbf 100644
--- "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.designer.cs"
+++ "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.designer.cs"
@@ -50,6 +50,7 @@
this.tc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.pPic = new System.Windows.Forms.Panel();
+ this.pb1 = new System.Windows.Forms.ProgressBar();
this.txtHDataInTmp = new System.Windows.Forms.TextBox();
this.cmdHDataInTmp = new System.Windows.Forms.Button();
this.label5 = new System.Windows.Forms.Label();
@@ -104,7 +105,7 @@
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(1095, 47);
+ this.Tool.Size = new System.Drawing.Size(1460, 59);
this.Tool.Stretch = true;
this.Tool.TabIndex = 17;
this.Tool.Text = "toolStrip1";
@@ -113,7 +114,7 @@
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 59);
//
// mrlk
//
@@ -123,7 +124,7 @@
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(60, 44);
+ this.mrlk.Size = new System.Drawing.Size(73, 56);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -133,7 +134,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 59);
//
// bclk
//
@@ -143,7 +144,7 @@
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(60, 44);
+ this.bclk.Size = new System.Drawing.Size(73, 56);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -153,7 +154,7 @@
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 59);
//
// dc
//
@@ -172,7 +173,7 @@
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 59);
//
// set
//
@@ -219,7 +220,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 59);
//
// sx
//
@@ -238,7 +239,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 59);
//
// Out
//
@@ -257,7 +258,7 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 59);
//
// tc
//
@@ -276,13 +277,14 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 47);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 59);
//
// pPic
//
this.pPic.BackColor = System.Drawing.Color.White;
this.pPic.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pPic.BackgroundImage")));
this.pPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.pPic.Controls.Add(this.pb1);
this.pPic.Controls.Add(this.txtHDataInTmp);
this.pPic.Controls.Add(this.cmdHDataInTmp);
this.pPic.Controls.Add(this.label5);
@@ -290,16 +292,25 @@
this.pPic.Controls.Add(this.lbljl);
this.pPic.Controls.Add(this.lbldj);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
- this.pPic.Location = new System.Drawing.Point(0, 47);
+ this.pPic.Location = new System.Drawing.Point(0, 59);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1095, 45);
+ this.pPic.Size = new System.Drawing.Size(1460, 56);
this.pPic.TabIndex = 18;
+ //
+ // pb1
+ //
+ this.pb1.Location = new System.Drawing.Point(920, 18);
+ this.pb1.Name = "pb1";
+ this.pb1.Size = new System.Drawing.Size(391, 23);
+ this.pb1.TabIndex = 104;
//
// txtHDataInTmp
//
- this.txtHDataInTmp.Location = new System.Drawing.Point(382, 14);
+ this.txtHDataInTmp.Location = new System.Drawing.Point(509, 18);
+ this.txtHDataInTmp.Margin = new System.Windows.Forms.Padding(4);
this.txtHDataInTmp.Name = "txtHDataInTmp";
- this.txtHDataInTmp.Size = new System.Drawing.Size(178, 21);
+ this.txtHDataInTmp.Size = new System.Drawing.Size(236, 25);
this.txtHDataInTmp.TabIndex = 103;
this.txtHDataInTmp.Visible = false;
//
@@ -307,9 +318,10 @@
//
this.cmdHDataInTmp.Image = ((System.Drawing.Image)(resources.GetObject("cmdHDataInTmp.Image")));
this.cmdHDataInTmp.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHDataInTmp.Location = new System.Drawing.Point(560, 14);
+ this.cmdHDataInTmp.Location = new System.Drawing.Point(747, 18);
+ this.cmdHDataInTmp.Margin = new System.Windows.Forms.Padding(4);
this.cmdHDataInTmp.Name = "cmdHDataInTmp";
- this.cmdHDataInTmp.Size = new System.Drawing.Size(22, 22);
+ this.cmdHDataInTmp.Size = new System.Drawing.Size(29, 28);
this.cmdHDataInTmp.TabIndex = 102;
this.cmdHDataInTmp.UseVisualStyleBackColor = true;
this.cmdHDataInTmp.Visible = false;
@@ -318,9 +330,10 @@
//
this.label5.AutoSize = true;
this.label5.BackColor = System.Drawing.Color.Transparent;
- this.label5.Location = new System.Drawing.Point(314, 15);
+ this.label5.Location = new System.Drawing.Point(419, 19);
+ this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(65, 12);
+ this.label5.Size = new System.Drawing.Size(82, 15);
this.label5.TabIndex = 35;
this.label5.Text = "瀵煎叆妯℃澘锛�";
this.label5.Visible = false;
@@ -331,55 +344,61 @@
this.lblCaption.BackColor = System.Drawing.Color.Transparent;
this.lblCaption.Cursor = System.Windows.Forms.Cursors.No;
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(12, 16);
+ this.lblCaption.Location = new System.Drawing.Point(16, 20);
+ this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(89, 19);
+ this.lblCaption.Size = new System.Drawing.Size(110, 24);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "鏁版嵁瀵煎叆";
//
// lbljl
//
this.lbljl.AutoSize = true;
- this.lbljl.Location = new System.Drawing.Point(943, 32);
+ this.lbljl.Location = new System.Drawing.Point(1257, 40);
+ this.lbljl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbljl.Name = "lbljl";
- this.lbljl.Size = new System.Drawing.Size(11, 12);
+ this.lbljl.Size = new System.Drawing.Size(15, 15);
this.lbljl.TabIndex = 99;
this.lbljl.Text = " ";
//
// lbldj
//
this.lbldj.AutoSize = true;
- this.lbldj.Location = new System.Drawing.Point(943, 14);
+ this.lbldj.Location = new System.Drawing.Point(1257, 18);
+ this.lbldj.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbldj.Name = "lbldj";
- this.lbldj.Size = new System.Drawing.Size(0, 12);
+ this.lbldj.Size = new System.Drawing.Size(0, 15);
this.lbldj.TabIndex = 98;
//
// cmdHPath
//
this.cmdHPath.Image = ((System.Drawing.Image)(resources.GetObject("cmdHPath.Image")));
this.cmdHPath.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHPath.Location = new System.Drawing.Point(797, 6);
+ this.cmdHPath.Location = new System.Drawing.Point(1063, 8);
+ this.cmdHPath.Margin = new System.Windows.Forms.Padding(4);
this.cmdHPath.Name = "cmdHPath";
- this.cmdHPath.Size = new System.Drawing.Size(22, 22);
+ this.cmdHPath.Size = new System.Drawing.Size(29, 28);
this.cmdHPath.TabIndex = 34;
this.cmdHPath.UseVisualStyleBackColor = true;
this.cmdHPath.Click += new System.EventHandler(this.cmdHPath_Click);
//
// txtHPath
//
- this.txtHPath.Location = new System.Drawing.Point(460, 7);
+ this.txtHPath.Location = new System.Drawing.Point(613, 9);
+ this.txtHPath.Margin = new System.Windows.Forms.Padding(4);
this.txtHPath.Multiline = true;
this.txtHPath.Name = "txtHPath";
- this.txtHPath.Size = new System.Drawing.Size(336, 40);
+ this.txtHPath.Size = new System.Drawing.Size(447, 49);
this.txtHPath.TabIndex = 33;
//
// label4
//
this.label4.AutoSize = true;
this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(390, 7);
+ this.label4.Location = new System.Drawing.Point(520, 9);
+ this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(65, 12);
+ this.label4.Size = new System.Drawing.Size(82, 15);
this.label4.TabIndex = 32;
this.label4.Text = "鏂囦欢璺緞锛�";
//
@@ -390,11 +409,13 @@
this.grdMain.BackgroundColor = System.Drawing.Color.White;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(0, 142);
+ this.grdMain.Location = new System.Drawing.Point(0, 177);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
+ this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1095, 470);
+ this.grdMain.Size = new System.Drawing.Size(1460, 588);
this.grdMain.TabIndex = 19;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
@@ -406,12 +427,14 @@
this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(0, 612);
+ this.grdSum.Location = new System.Drawing.Point(0, 765);
+ 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(1095, 19);
+ this.grdSum.Size = new System.Drawing.Size(1460, 24);
this.grdSum.TabIndex = 48;
//
// timer1
@@ -421,10 +444,12 @@
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(535, 303);
+ this.grdPrint.Location = new System.Drawing.Point(713, 379);
+ 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(25, 24);
+ this.grdPrint.Size = new System.Drawing.Size(33, 30);
this.grdPrint.TabIndex = 49;
this.grdPrint.Visible = false;
//
@@ -435,22 +460,24 @@
this.panel1.Controls.Add(this.label4);
this.panel1.Controls.Add(this.cmdHPath);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel1.Location = new System.Drawing.Point(0, 92);
+ this.panel1.Location = new System.Drawing.Point(0, 115);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1095, 50);
+ this.panel1.Size = new System.Drawing.Size(1460, 62);
this.panel1.TabIndex = 50;
//
// Gy_DataInTmp
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1095, 631);
+ this.ClientSize = new System.Drawing.Size(1460, 789);
this.Controls.Add(this.grdMain);
this.Controls.Add(this.panel1);
this.Controls.Add(this.grdPrint);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
+ this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Gy_DataInTmp";
this.Text = "鏁版嵁瀵煎叆";
this.Load += new System.EventHandler(this.Gy_DataInTmp_Load);
@@ -503,5 +530,6 @@
public System.Windows.Forms.Button cmdHPath;
public System.Windows.Forms.TextBox txtHPath;
public System.Windows.Forms.Label label4;
+ public System.Windows.Forms.ProgressBar pb1;
}
}
\ No newline at end of file
diff --git "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.resx" "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.resx"
index a1dfa70..59467e8 100644
--- "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.resx"
+++ "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.resx"
@@ -112,296 +112,256 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="OpenExcelFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="OpenExcelFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
- <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="Tool.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>266, 21</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <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/7QkuUGhvdG9zaG9wIDMuMAA4QklNBCUAAAAAABAAAAAAAAAAAAAA
- AAAAAAAAOEJJTQPtAAAAAAAQAEgAAAABAAIASAAAAAEAAjhCSU0EJgAAAAAADgAAAAAAAAAAAAA/gAAA
- OEJJTQQNAAAAAAAEAAAAeDhCSU0EGQAAAAAABAAAAB44QklNA/MAAAAAAAkAAAAAAAAAAAEAOEJJTQQK
- AAAAAAABAAA4QklNJxAAAAAAAAoAAQAAAAAAAAACOEJJTQP1AAAAAABIAC9mZgABAGxmZgAGAAAAAAAB
- AC9mZgABAKGZmgAGAAAAAAABADIAAAABAFoAAAAGAAAAAAABADUAAAABAC0AAAAGAAAAAAABOEJJTQP4
- AAAAAABwAAD/////////////////////////////A+gAAAAA/////////////////////////////wPo
- AAAAAP////////////////////////////8D6AAAAAD/////////////////////////////A+gAADhC
- SU0EAAAAAAAAAgABOEJJTQQCAAAAAAAEAAAAADhCSU0ECAAAAAAAEAAAAAEAAAJAAAACQAAAAAA4QklN
- BB4AAAAAAAQAAAAAOEJJTQQaAAAAAAM/AAAABgAAAAAAAAAAAAAAaAAABAAAAAAFZypoB5iYAC0AMQAA
- AAEAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAEAAAAAGgAAAAAAAAAAAAAAAAAAAAAAQAAAAAA
- AAAAAAAAAAAAAAAAAAAQAAAAAQAAAAAAAG51bGwAAAACAAAABmJvdW5kc09iamMAAAABAAAAAAAAUmN0
- MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAAAExlZnRsb25nAAAAAAAAAABCdG9tbG9uZwAAAGgAAAAAUmdo
- dGxvbmcAAAQAAAAABnNsaWNlc1ZsTHMAAAABT2JqYwAAAAEAAAAAAAVzbGljZQAAABIAAAAHc2xpY2VJ
- RGxvbmcAAAAAAAAAB2dyb3VwSURsb25nAAAAAAAAAAZvcmlnaW5lbnVtAAAADEVTbGljZU9yaWdpbgAA
- AA1hdXRvR2VuZXJhdGVkAAAAAFR5cGVlbnVtAAAACkVTbGljZVR5cGUAAAAASW1nIAAAAAZib3VuZHNP
- YmpjAAAAAQAAAAAAAFJjdDEAAAAEAAAAAFRvcCBsb25nAAAAAAAAAABMZWZ0bG9uZwAAAAAAAAAAQnRv
- bWxvbmcAAABoAAAAAFJnaHRsb25nAAAEAAAAAAN1cmxURVhUAAAAAQAAAAAAAG51bGxURVhUAAAAAQAA
- AAAAAE1zZ2VURVhUAAAAAQAAAAAABmFsdFRhZ1RFWFQAAAABAAAAAAAOY2VsbFRleHRJc0hUTUxib29s
- AQAAAAhjZWxsVGV4dFRFWFQAAAABAAAAAAAJaG9yekFsaWduZW51bQAAAA9FU2xpY2VIb3J6QWxpZ24A
- AAAHZGVmYXVsdAAAAAl2ZXJ0QWxpZ25lbnVtAAAAD0VTbGljZVZlcnRBbGlnbgAAAAdkZWZhdWx0AAAA
- C2JnQ29sb3JUeXBlZW51bQAAABFFU2xpY2VCR0NvbG9yVHlwZQAAAABOb25lAAAACXRvcE91dHNldGxv
- bmcAAAAAAAAACmxlZnRPdXRzZXRsb25nAAAAAAAAAAxib3R0b21PdXRzZXRsb25nAAAAAAAAAAtyaWdo
- dE91dHNldGxvbmcAAAAAADhCSU0EEQAAAAAAAQEAOEJJTQQUAAAAAAAEAAAAAjhCSU0EDAAAAAADbAAA
- AAEAAACAAAAADQAAAYAAABOAAAADUAAYAAH/2P/gABBKRklGAAECAQBIAEgAAP/tAAxBZG9iZV9DTQAC
- /+4ADkFkb2JlAGSAAAAAAf/bAIQADAgICAkIDAkJDBELCgsRFQ8MDA8VGBMTFRMTGBEMDAwMDAwRDAwM
- DAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAENCwsNDg0QDg4QFA4ODhQUDg4ODhQRDAwMDAwREQwMDAwM
- DBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM/8AAEQgADQCAAwEiAAIRAQMRAf/dAAQACP/EAT8A
- AAEFAQEBAQEBAAAAAAAAAAMAAQIEBQYHCAkKCwEAAQUBAQEBAQEAAAAAAAAAAQACAwQFBgcICQoLEAAB
- BAEDAgQCBQcGCAUDDDMBAAIRAwQhEjEFQVFhEyJxgTIGFJGhsUIjJBVSwWIzNHKC0UMHJZJT8OHxY3M1
- FqKygyZEk1RkRcKjdDYX0lXiZfKzhMPTdePzRieUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm9jdHV2d3
- h5ent8fX5/cRAAICAQIEBAMEBQYHBwYFNQEAAhEDITESBEFRYXEiEwUygZEUobFCI8FS0fAzJGLhcoKS
- Q1MVY3M08SUGFqKygwcmNcLSRJNUoxdkRVU2dGXi8rOEw9N14/NGlKSFtJXE1OT0pbXF1eX1VmZ2hpam
- tsbW5vYnN0dXZ3eHl6e3x//aAAwDAQACEQMRAD8A7L/mvg/uZn/btf8A5JL/AJr4P7mZ/wBu1/8Aklvp
- KXizeP2MfDj8PtcD/mvg/uZn/btf/kkv+a+D+5mf9u1/+SW+klxZvH7FVj8PtcD/AJr4P7mZ/wBu1/8A
- kkv+a+D+5mf9u1f+SW+klxZvH7FcOPw+1wP+a+D+5mf9u1f+SS/5r4P7mZ/27V/5Jb6SXFm8fsVw4/D7
- XA/5r4P7mZ/27V/5JL/mvg/uZn/btX/klvpJcWbx+xXDj8PtcD/mvg/uZn/btf8A5JL/AJr4P7mZ/wBu
- 1/8AklvpJcWbx+xVY/D7XA/5r4P7mZ/27V/5JL/mvg/uZn/btf8A5Jb6SXFm8fsVw4/D7XA/5r4P7mZ/
- 27X/AOSS/wCa+D+5mf8Abtf/AJJb6SXFm8fsVw4/D7X/2ThCSU0EIQAAAAAAVQAAAAEBAAAADwBBAGQA
- bwBiAGUAIABQAGgAbwB0AG8AcwBoAG8AcAAAABMAQQBkAG8AYgBlACAAUABoAG8AdABvAHMAaABvAHAA
- IAA3AC4AMAAAAAEAOEJJTQQGAAAAAAAHAAgAAAABAQD/4QR8RXhpZgAATU0AKgAAAAgABwESAAMAAAAB
- AAEAAAEaAAUAAAABAAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAUAAAAcgEyAAIAAAAU
- AAAAhodpAAQAAAABAAAAmgAAAMYAAABIAAAAAQAAAEgAAAABQWRvYmUgUGhvdG9zaG9wIDcuMAAyMDA0
- OjEwOjE0IDE1OjUwOjUwAAADoAEAAwAAAAH//wAAoAIABAAAAAEAAAQAoAMABAAAAAEAAABoAAAAAAAA
- AAYBAwADAAAAAQAGAAABGgAFAAAAAQAAARQBGwAFAAAAAQAAARwBKAADAAAAAQACAAACAQAEAAAAAQAA
- ASQCAgAEAAAAAQAAA1AAAAAAAAAASAAAAAEAAABIAAAAAf/Y/+AAEEpGSUYAAQIBAEgASAAA/+0ADEFk
- b2JlX0NNAAL/7gAOQWRvYmUAZIAAAAAB/9sAhAAMCAgICQgMCQkMEQsKCxEVDwwMDxUYExMVExMYEQwM
- DAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAQ0LCw0ODRAODhAUDg4OFBQODg4OFBEMDAwM
- DBERDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAANAIADASIAAhEBAxEB/90A
- BAAI/8QBPwAAAQUBAQEBAQEAAAAAAAAAAwABAgQFBgcICQoLAQABBQEBAQEBAQAAAAAAAAABAAIDBAUG
- BwgJCgsQAAEEAQMCBAIFBwYIBQMMMwEAAhEDBCESMQVBUWETInGBMgYUkaGxQiMkFVLBYjM0coLRQwcl
- klPw4fFjczUWorKDJkSTVGRFwqN0NhfSVeJl8rOEw9N14/NGJ5SkhbSVxNTk9KW1xdXl9VZmdoaWprbG
- 1ub2N0dXZ3eHl6e3x9fn9xEAAgIBAgQEAwQFBgcHBgU1AQACEQMhMRIEQVFhcSITBTKBkRShsUIjwVLR
- 8DMkYuFygpJDUxVjczTxJQYWorKDByY1wtJEk1SjF2RFVTZ0ZeLys4TD03Xj80aUpIW0lcTU5PSltcXV
- 5fVWZnaGlqa2xtbm9ic3R1dnd4eXp7fH/9oADAMBAAIRAxEAPwDsv+a+D+5mf9u1/wDkkv8Amvg/uZn/
- AG7X/wCSW+kpeLN4/Yx8OPw+1wP+a+D+5mf9u1/+SS/5r4P7mZ/27X/5Jb6SXFm8fsVWPw+1wP8Amvg/
- uZn/AG7X/wCSS/5r4P7mZ/27V/5Jb6SXFm8fsVw4/D7XA/5r4P7mZ/27V/5JL/mvg/uZn/btX/klvpJc
- Wbx+xXDj8PtcD/mvg/uZn/btX/kkv+a+D+5mf9u1f+SW+klxZvH7FcOPw+1wP+a+D+5mf9u1/wDkkv8A
- mvg/uZn/AG7X/wCSW+klxZvH7FVj8PtcD/mvg/uZn/btX/kkv+a+D+5mf9u1/wDklvpJcWbx+xXDj8Pt
- cD/mvg/uZn/btf8A5JL/AJr4P7mZ/wBu1/8AklvpJcWbx+xXDj8Ptf/Z/9sAQwAIBgYHBgUIBwcHCQkI
- CgwUDQwLCwwZEhMPFB0aHx4dGhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkM
- CwwYDQ0YMiEcITIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy
- /8AAEQgAKQQAAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIB
- AwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYn
- KCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqi
- o6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8B
- AAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYS
- QVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZX
- WFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXG
- x8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A1v8AhI7v/nlD/wB+k/8A
- iaP+Eku/+eUP/fpP/iapfZ6Ps9er7NHn87Lv/CR3f/PKH/v0n/xNH/CR3f8Azyh/79J/8TVL7PR9no5E
- HOy7/wAJHd/88of+/Sf/ABNH/CR3f/PKH/v0n/xNUvs9H2f2o5EHOy7/AMJHd/8APKH/AL9J/wDE0f8A
- CSXf/PKH/v0n/wATVL7P7UfZ/ajkQc7Lv/CSXf8Azyh/79J/8TR/wkl3/wA8of8Av0n/AMTVL7P7UfZ/
- ajkQc7Lv/CR3X/PKH/v0n/xNH/CR3X/PKH/v0n/xNUvs/tR9no5EHOy7/wAJHdf88of+/af/ABNH/CR3
- f/PKH/v0n/xNUvs9H2ejkQc7Lv8Awkd1/wA8of8Av2n/AMTR/wAJHdf88of+/af/ABNUvs/tR9n9qORB
- zsu/8JHd/wDPKH/v2n/xNH/CR3f/ADyh/wC/af8AxNUvs/tR9n9qORBzsu/8JJdf88of+/Sf4Uf8JJdf
- 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
- 6K5iiiwHT0VzFFFgOnormKKLAf/Z
+ /9j/4AAQSkZJRgABAQEASABIAAD/4QR8RXhpZgAATU0AKgAAAAgABwESAAMAAAABAAEAAAEaAAUAAAAB
+ AAAAYgEbAAUAAAABAAAAagEoAAMAAAABAAIAAAExAAIAAAAUAAAAcgEyAAIAAAAUAAAAhodpAAQAAAAB
+ AAAAmgAAAMYAAABIAAAAAQAAAEgAAAABQWRvYmUgUGhvdG9zaG9wIDcuMAAyMDA0OjEwOjE0IDE1OjUw
+ OjUwAAADoAEAAwAAAAH//wAAoAIABAAAAAEAAAQAoAMABAAAAAEAAABoAAAAAAAAAAYBAwADAAAAAQAG
+ AAABGgAFAAAAAQAAARQBGwAFAAAAAQAAARwBKAADAAAAAQACAAACAQAEAAAAAQAAASQCAgAEAAAAAQAA
+ A1AAAAAAAAAASAAAAAEAAABIAAAAAf/Y/+AAEEpGSUYAAQIBAEgASAAA/+0ADEFkb2JlX0NNAAL/7gAO
+ QWRvYmUAZIAAAAAB/9sAhAAMCAgICQgMCQkMEQsKCxEVDwwMDxUYExMVExMYEQwMDAwMDBEMDAwMDAwM
+ DAwMDAwMDAwMDAwMDAwMDAwMDAwMAQ0LCw0ODRAODhAUDg4OFBQODg4OFBEMDAwMDBERDAwMDAwMEQwM
+ DAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAANAIADASIAAhEBAxEB/90ABAAI/8QBPwAAAQUB
+ AQEBAQEAAAAAAAAAAwABAgQFBgcICQoLAQABBQEBAQEBAQAAAAAAAAABAAIDBAUGBwgJCgsQAAEEAQMC
+ BAIFBwYIBQMMMwEAAhEDBCESMQVBUWETInGBMgYUkaGxQiMkFVLBYjM0coLRQwclklPw4fFjczUWorKD
+ JkSTVGRFwqN0NhfSVeJl8rOEw9N14/NGJ5SkhbSVxNTk9KW1xdXl9VZmdoaWprbG1ub2N0dXZ3eHl6e3
+ x9fn9xEAAgIBAgQEAwQFBgcHBgU1AQACEQMhMRIEQVFhcSITBTKBkRShsUIjwVLR8DMkYuFygpJDUxVj
+ czTxJQYWorKDByY1wtJEk1SjF2RFVTZ0ZeLys4TD03Xj80aUpIW0lcTU5PSltcXV5fVWZnaGlqa2xtbm
+ 9ic3R1dnd4eXp7fH/9oADAMBAAIRAxEAPwDsv+a+D+5mf9u1/wDkkv8Amvg/uZn/AG7X/wCSW+kpeLN4
+ /Yx8OPw+1wP+a+D+5mf9u1/+SS/5r4P7mZ/27X/5Jb6SXFm8fsVWPw+1wP8Amvg/uZn/AG7X/wCSS/5r
+ 4P7mZ/27V/5Jb6SXFm8fsVw4/D7XA/5r4P7mZ/27V/5JL/mvg/uZn/btX/klvpJcWbx+xXDj8PtcD/mv
+ g/uZn/btX/kkv+a+D+5mf9u1f+SW+klxZvH7FcOPw+1wP+a+D+5mf9u1/wDkkv8Amvg/uZn/AG7X/wCS
+ W+klxZvH7FVj8PtcD/mvg/uZn/btX/kkv+a+D+5mf9u1/wDklvpJcWbx+xXDj8PtcD/mvg/uZn/btf8A
+ 5JL/AJr4P7mZ/wBu1/8AklvpJcWbx+xXDj8Ptf/Z/9sAQwAIBgYHBgUIBwcHCQkICgwUDQwLCwwZEhMP
+ FB0aHx4dGhwcICQuJyAiLCMcHCg3KSwwMTQ0NB8nOT04MjwuMzQy/9sAQwEJCQkMCwwYDQ0YMiEcITIy
+ MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy/8AAEQgAKQQAAwEi
+ AAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAAB
+ fQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNE
+ RUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1
+ tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEA
+ AAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRC
+ kaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpz
+ dHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ
+ 2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A1v8AhI7v/nlD/wB+k/8AiaP+Eku/+eUP/fpP
+ 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
+ OnormKKLAf/Z
</value>
</data>
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPfZLfS1NhHMZfkSSwu/A/8MK6ydIQFlg3dudN
- YBLDYtBF05XMMAoLL3bhRGF4zjzUUiKiG4mCgkCMiam5cqP9aO4YJlqIDmqh00KRHt/v92xnW7gdeHgP
- 7/t8nvd533OEyDxuZRQDymMoXh/U4cNFa+TpV58gy/Ho8vgwOR1A5ywgFClvEck15xzwbuoDiDFD7rtV
- bG2l4fDv4FkSJdU5uYO09BJjBtx1ebCZSkEMAjNpwL0IWKeBky9kE01KzYiaDYG9xJgB3b0D+JVMQngA
- bRm4OgPUvgLKfBJ4KPUoJy0m3/9/nD192Fhb43T7xxJw3IBDZyoxe1zkgm7dc+HHyipXbXhdZOcMfMwR
- wp9qAQSBz5YqI6S9uxfLS9/49o+MHFI7D36e2GaIQgJVmRY3nD3QE1+NC6OA0Zy0hFH7qD0IgiN7wGnv
- d25hBlx33EEoqsOqBCGuBCCshrSJDYYr7OECmDeof5q7A1t7Fz7FljAvQyJfdETjOn6mfrOhvCNeGiZT
- i60DNXWNOHH2gimaV6+JovC4/73R4PaDPmz+3S/Q7v4/XqQAzF/iM+fXpnViiOWAsL6CoeERczThvXVg
- N8wh2TNHYwuILK6ynwNuyk/YfNnGidkxP6DNIkCiubfj/gIfsYKgU5Ym1J67aIrMNXXnQUfI/rVjL98U
- eIhpbrXhAL2UTLYOQlZyAAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/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
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPjZPNS1RhFMaPIbRoFy4yEFFyoYkRbqNWCkIr
- /wE/G0VwEwmpbWbXh1+YtipQF0GDklQULlqqMzY5+cFYTo1DisMgDs6Xo3N1Hp/jbRgTvfjCw33ve5/z
- e89533NFHrghdbMIdQJrjy8m9WrMcaw0zuHLNhAD8PuCUq/GaKyI7Tsk/yknIikjBcMwLKUe9co1xmis
- NM2h8hNpHNPTgHPWWupRb7s7k0GjC7ffm4vxZBKJPWupR73VU4xpcOkZZAEzM9zdaS31KOCGQzM4BdiK
- xLAdjVtKPQq49IaApn+AykwJkSgS0Zil4vQcH+LQCcCdj8Dl11x4vgvp24cMGGdLv/Xuo6BjGTLI22jW
- a2Qdd3kLV0cIeLYDqf0KKeqBFPf9r6JeBnyD1Dthn4rTGzkFGCWgO2imd96o4471Loyv0GsPnQF4FDAB
- 119AOjbw9495I/OeQwT8B2xfE+DwEtC1zlZmRprWvc8sYYyL7T9NQEk/AX54fwALi4fw/kohuMn6TwIe
- +kxATpUDhfZV5L0lwLaA9C6fhcygZQk+7qTBvrUkwmE2UAagJbQt0a8/E0du9TtceeIn0YNICAisAsEA
- sLHOZ+gA4Z0U0uk9Ng57v9mNST8BLR5I63z2zHJqJiAVw5CbQ5Cyl1mV8l1VRt16Zaqc8wrq/gccAYEZ
- rI51LX54AAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ /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="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD6SURBVDhPrZMvD4MwEMX7TdEzc3NLWjGDmCJzFLlWTeDR
- xRaLXCXf4XbH38LSNWwjeYKk/fXduzuWJAnsFWMMUMNHl7uug6dz0LYtWGvBmBqqqoKyLEErDVJKyLIM
- 0jQFLgRdhjzPB8gEcCuAWQB6DRA8AmjIQb0AFAJO+OLkQHxycMeDBeqGuqIuqDOKAEcUlRAEPPDAlEHt
- OdAbBzxUwgxo3kvwQxScR0L8C8D4Iaq5jQcsk4uIA4mHjAfQeg34uQvBEN1zmERqo+9AkYNimcToINlN
- iNTGwh/l4CSODghQ+7vgZdAP0hYwblbf2z2al4kWin6+Ed19ASAtZRPFvKE6AAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADoSURBVDhPrZMvD4MwEMXvm6Jn5uaWtGIGMUXmKHKgJvBo
+ asEiqeQ73O4glHb8C9uaPNFr+su7dy0EQYBHBQCsYXGh6zpsjcGmabCqKixLjUVRYJ7nmKUZKqUwiiIM
+ wxCFlD0gjuMBMgKMBygnQOYDpNgB1AzQEyAlwIUuWMCWgycdJKQH6U66ka4kBpxJm4AXFccWtOOAW3Ad
+ iLUWLKCet+BnIJYBNsS/AJwppFlqASe6KOQOQNGhP0Yf8PMUVkM07eCAAbMWkgMP6TNEHmPihLjrgAHa
+ /QtOBosOaPWFo3IBwJtvBADwBiAtZRNHCGN5AAAAAElFTkSuQmCC
</value>
</data>
<data name="set.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEHSURBVDhPhZKxDYQwDEXZ6Xa6FVgAMQISHcUNQkWVnooh
- 6Oh8fCffOODTRbJQov9fvk2arusE1ZTFvTuXvu+tqLMvzXfQTSj7vstxHE+QByzLoknwZbl0CkBt2wZd
- LgiKUQ8CM8Vge7OFNBp69TOAYZ7n+sZ8c704JMSzaKcQ523bKgRFIM5QSoGIfbE3tpRSknVdVQxdABAD
- cEAlgfabmpcAgkIC/ztLggvAmGk8TWcpoJiHYRAUAa6FC6DibNTFNqbp8zBzNpqWG/RKgKS3pRjHUQE+
- gRt0vo0QAGCOABwizNa/+5k6pAiAFnhjFT14DyEA5n9GCxIl8NEfL/DHQfUa3bsI5V+xFcwIIn269wAA
- AABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADwSURBVDhPhY+xDYUwDESz09/pr8ACiBGQ6Cj+IFRU6akY
+ go7OP2dzliGROOkp2Pgucer7XkC6xDr0ZRgGx6aCaA6GluQ4DjnPsw6KAeu66jdOEkI1AOz7jp4RjErD
+ TKBodvkQngYTQW9ZlvuNxl3cC88rpYNe13UaAtDDiR4otZm5F2/iSjln2bZNhzGH3iNAPIBo0yQ5fTQE
+ wIhZUgXwmXkqpoIGXOZxHJVorgJ02IwqrjHPv8rME/81AAV2ZYDkr79imqbqBWo0TAyBCeZWQDT67UG+
+ /zMAK+AEvIh14aZmAHgzuloBzZ1fFA0vxpT+sRXMCLq81bkAAAAASUVORK5CYII=
</value>
</data>
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD4SURBVDhPlZO7DYNAEETpyT25BTqgBCQyAldABRRATkRE
- RkZGduatmWP5CoNGCLTzdo69S5IHV5ZlQXpQvi3BOI6jaZqm/0CY+74PwzBEAJCu68LcRjqGUty2ba0Y
- gCDOfG2kS5qmoa5rEyaSXJrVUfHojPjuQcQGyDdkESiS0TrM97tIQtM0JkAUU3cCCBEABKn7XB2a5BVB
- dPbjXBKsAK1XICXgmee5SQC3hBUggwcVRRHK8nMw69/YKPVC9D0EM5B9gsMeEIRoHuIB+omY4/rdTogz
- 1/oAAUDquIn+24mbywqrqoqzfmo8Bfmx3e77m+N5f2AW4xdr8dl8xOqDBAAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
+ grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
+ FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
+ u3/Bo2wICEG/Oo9XdCIYwhNr8dl8ZRwfdQAAAABJRU5ErkJggg==
</value>
</data>
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPnZJNSwJRFIbvv6h+QNQycBnUPlpE0SJBSJAo
- ohA0chFiUihhaCmE2hdFtGgfQkQkVkIupHZBVERFSKljzjjjx9vcm06T+BEeeODeyz3PPXPmEIdvF3Z3
- ELbVgMKivF/2bsG3cwTSLKwrG6gVHvc1O24qsSx52MViqaRA9y5XVPE2lJhtLnZRyhcU6D4QPMXgqA7D
- WgOszvX6n2JccDBBNieBLyOIeRTpGZ9DXpIYdVsxM29nAi4rIsP/khPLiRMxEDXVpkmTlQk+OR7JjMDg
- BfHnVTlxOFT6A5OpwzBrYYL35BcSqSyjkuy8kXuT5fDGA2QNaDsE5uLyWi0ZnzIzwUsijdcEx1AL+HQa
- QyeA/kr+M3c1BPqyQD0LFUHwCchlMtBdAnvPwH0JCKWqKhgY0aFb048uTZ9CRXAQfUA4fAHvI3D8AdzW
- EjScVI0ftIpzAYjIfaBrIp9Na3uwb2pvPuZMLieoMY51ohAhiG8SbBs7/ilRlantJYj5CbizFgXURSWU
- liqo7tk3bGHWG43QzHIAAAAASUVORK5CYII=
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/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="sx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHMSURBVDhPjZI5SANBFIYX7CNWClEbC+0E7UXEQq0UK4+I
- oPGOd/DCeMQDDzxBESstLAQPBJuonQQbj0axFFQIeEaTzWazye++WbPJukEd+Blm5r3v/W9mOC5qjC2s
- gzQ6twbbzCoGp1diis76J5YRncvRBo2ppXU2/2doIGEAJVY1dkOSZ68Yiik+oOCbrEMRFz32ebVocbkZ
- paZ6lFSadaL9spoWVDV0oNbSEwF0D88ygBQM/em+b3xR2z9dRqdtmiX6RQkXN3e4uo2I1mJAguBXvFOs
- 5gJp0d4/yQ55QYQoBZmTsAJSSAGICoBidYDWXjs79PpEnJ7fwHl5q8r19KZrSwdoto6wILdXAO+X4AsE
- VdE+Z+K0+klo6LIxwLtHgOP0AsfOK9y7ntXKBJAxTAz2c9S1D7Dglw8en3IbHoF+grYyJSfvpMZ2Ym7r
- YwnPbh77R04cnJypgHBlmjP2jEh3pEWcVMsfoqLGguomK0twvXoY5MXt0wDiNhJg2DQgacsA43Y8EncT
- FCeVtRbQ1yEAmX54+sDjt1gLBXJQrtJ38XUOsg6NSmK+rEJZRaUmtbruraI2wpeY6UjRX2J6dg5+k+ok
- L6ry9yt8Ae9ue03yyMc9AAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
+ e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
+ 4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
+ zxrQMvLuNGvabAbHXnFT1XToRo5vYilr5GWALgNo1rTZPHk2zc1UWsfm711Et2MFxY9OuVeMabN5FJji
+ RiKlQc0YSGdzBRGKR3HqMn1PQzx4ltQQ2dzCenQH+/FjrhFkEr+skgEPB8d58ORcxT/xGUmNXoLzZDLf
+ /FLtqJl2RfEOjLLhOKFi7WcU3zd+8d4yWrr9zY2ayC3+zwFd4kE86PajyxcQRSD+N8khJ4k0762AiuVK
+ uFZcuLHqgvvzNVz/WikDOnr8oKdDAXTpg6NzHJoilCYxVC9Pa/1Th9ofbmlsFGoWamnzFE4vh3WTO5Eq
+ GVBMzd06lBMH0E0aik5mFOUC7257TWMZuJgAAAAASUVORK5CYII=
</value>
</data>
<data name="Out.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHMSURBVDhPjZI5SANBFIYX7CNWClEbC+0E7UXEQq0UK4+I
- oPGOd/DCeMQDDzxBESstLAQPBJuonQQbj0axFFQIeEaTzWazye++WbPJukEd+Blm5r3v/W9mOC5qjC2s
- gzQ6twbbzCoGp1diis76J5YRncvRBo2ppXU2/2doIGEAJVY1dkOSZ68Yiik+oOCbrEMRFz32ebVocbkZ
- paZ6lFSadaL9spoWVDV0oNbSEwF0D88ygBQM/em+b3xR2z9dRqdtmiX6RQkXN3e4uo2I1mJAguBXvFOs
- 5gJp0d4/yQ55QYQoBZmTsAJSSAGICoBidYDWXjs79PpEnJ7fwHl5q8r19KZrSwdoto6wILdXAO+X4AsE
- VdE+Z+K0+klo6LIxwLtHgOP0AsfOK9y7ntXKBJAxTAz2c9S1D7Dglw8en3IbHoF+grYyJSfvpMZ2Ym7r
- YwnPbh77R04cnJypgHBlmjP2jEh3pEWcVMsfoqLGguomK0twvXoY5MXt0wDiNhJg2DQgacsA43Y8EncT
- FCeVtRbQ1yEAmX54+sDjt1gLBXJQrtJ38XUOsg6NSmK+rEJZRaUmtbruraI2wpeY6UjRX2J6dg5+k+ok
- L6ry9yt8Ae9ue03yyMc9AAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
+ e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
+ 4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
+ zxrQMvLuNGvabAbHXnFT1XToRo5vYilr5GWALgNo1rTZPHk2zc1UWsfm711Et2MFxY9OuVeMabN5FJji
+ RiKlQc0YSGdzBRGKR3HqMn1PQzx4ltQQ2dzCenQH+/FjrhFkEr+skgEPB8d58ORcxT/xGUmNXoLzZDLf
+ /FLtqJl2RfEOjLLhOKFi7WcU3zd+8d4yWrr9zY2ayC3+zwFd4kE86PajyxcQRSD+N8khJ4k0762AiuVK
+ uFZcuLHqgvvzNVz/WikDOnr8oKdDAXTpg6NzHJoilCYxVC9Pa/1Th9ofbmlsFGoWamnzFE4vh3WTO5Eq
+ GVBMzd06lBMH0E0aik5mFOUC7257TWMZuJgAAAAASUVORK5CYII=
</value>
</data>
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADHSURBVDhPpZLNDcMgDIXZiZEiZQJzTs/JuZEiVUpGYYDs
- 9IoRppSfhrYRFgLlfdh+VqryaT2iN2p6xWJjCNN0w7zMWO8rjn2H+xnD8ABwujX6cxNAAbA4QC48Nw2O
- AsAvM9FnQNQUVgFBHAEUAJyuCPI9ZsBiV5V/MW0eny8BImZAHt2AjZv6KyDYAIaEmt52KcFaC460D7kL
- 0ZbUBQEI/BOAk3nZ6OagqwetUSYy/wEk5ZaNSb+q0yyXxRz0CgvAt8IIuBI+AZInmNFWdMJxAAAAAElF
- TkSuQmCC
+ YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
</value>
</data>
<data name="pPic.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -446,7 +406,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////Av//////////////////////////////////////////////////
+ ////////////////////////////AP//////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -485,7 +445,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////wL/////////////
+ /////////////////////////////////////////////////////////////////wD/////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -525,7 +485,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////8C////////////////////////////////////////////////////////
+ //////////////////////8A////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -564,7 +524,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////Av//////////////////
+ ////////////////////////////////////////////////////////////AP//////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -604,7 +564,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////wL/////////////////////////////////////////////////////////////
+ /////////////////wD/////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -643,7 +603,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////8C////////////////////////
+ //////////////////////////////////////////////////////8A////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -683,7 +643,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////Av//////////////////////////////////////////////////////////////////
+ ////////////AP//////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -722,7 +682,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////wL/////////////////////////////
+ /////////////////////////////////////////////////wD/////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -762,7 +722,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////8C////////////////////////////////////////////////////////////////////////
+ //////8A////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -801,7 +761,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////Av//////////////////////////////////
+ ////////////////////////////////////////////AP//////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -841,7 +801,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /wL/////////////////////////////////////////////////////////////////////////////
+ /wD/////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -880,7 +840,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////8C////////////////////////////////////////
+ //////////////////////////////////////8A////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -919,7 +879,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////Av//
+ ////////////////////////////////////////////////////////////////////////////AP//
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -959,7 +919,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////wL/////////////////////////////////////////////
+ /////////////////////////////////wD/////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -998,7 +958,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////////////////////8C////////
+ //////////////////////////////////////////////////////////////////////8A////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1038,7 +998,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////Av//////////////////////////////////////////////////
+ ////////////////////////////AP//////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1077,7 +1037,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////wL/////////////
+ /////////////////////////////////////////////////////////////////wD/////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1117,7 +1077,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////8C////////////////////////////////////////////////////////
+ //////////////////////8A////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1156,7 +1116,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////Av//////////////////
+ ////////////////////////////////////////////////////////////AP//////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1196,7 +1156,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////wL/////////////////////////////////////////////////////////////
+ /////////////////wD/////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1235,7 +1195,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////8C////////////////////////
+ //////////////////////////////////////////////////////8A////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1275,7 +1235,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////Av//////////////////////////////////////////////////////////////////
+ ////////////AP//////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1314,7 +1274,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////wL/////////////////////////////
+ /////////////////////////////////////////////////wD/////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1354,7 +1314,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////8C////////////////////////////////////////////////////////////////////////
+ //////8A////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1393,7 +1353,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////Av//////////////////////////////////
+ ////////////////////////////////////////////AP//////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1433,7 +1393,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /wL/////////////////////////////////////////////////////////////////////////////
+ /wD/////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1472,7 +1432,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////8C////////////////////////////////////////
+ //////////////////////////////////////8A////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1511,7 +1471,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////Av//
+ ////////////////////////////////////////////////////////////////////////////AP//
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1551,7 +1511,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////wL/////////////////////////////////////////////
+ /////////////////////////////////wD/////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1590,7 +1550,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////////////////////8C////////
+ //////////////////////////////////////////////////////////////////////8A////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1630,7 +1590,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////Av//////////////////////////////////////////////////
+ ////////////////////////////AP//////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1669,7 +1629,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////wL/////////////
+ /////////////////////////////////////////////////////////////////wD/////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1709,7 +1669,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////8C////////////////////////////////////////////////////////
+ //////////////////////8A////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1748,7 +1708,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////Av//////////////////
+ ////////////////////////////////////////////////////////////AP//////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1788,7 +1748,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////wL/////////////////////////////////////////////////////////////
+ /////////////////wD/////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1827,7 +1787,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////8C////////////////////////
+ //////////////////////////////////////////////////////8A////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1867,7 +1827,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////Av//////////////////////////////////////////////////////////////////
+ ////////////AP//////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1906,7 +1866,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////wL/////////////////////////////
+ /////////////////////////////////////////////////wD/////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -1946,7 +1906,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////8C/////////////////////v7+/v7+/v7+/f39/f39/Pz8/Pz8/Pz8+/v7+/v7+/v7+/v7+/v7
+ //////8A/////////////////////v7+/v7+/v7+/f39/f39/Pz8/Pz8/Pz8+/v7+/v7+/v7+/v7+/v7
+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7
+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7
+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7
@@ -1985,7 +1945,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////Av////////////////7+/v7+/v39/fz8/Pr6
+ ////////////////////////////////////////////AP////////////////7+/v7+/v39/fz8/Pr6
+vn5+ff39/b29vX19fT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0
9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0
9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0
@@ -2025,7 +1985,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /wL////////////////+/v79/f37+/v5+fn29vby8vLv7+/t7e3r6+vq6urq6urq6urq6urq6urq6urq
+ /wD////////////////+/v79/f37+/v5+fn29vby8vLv7+/t7e3r6+vq6urq6urq6urq6urq6urq6urq
6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq
6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq
6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq6urq
@@ -2064,7 +2024,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////8C/////////////////v7+/Pz8+fn59fX18PDw6urq
+ //////////////////////////////////////8A/////////////////v7+/Pz8+fn59fX18PDw6urq
5eXl4eHh3t7e3Nzc29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb
@@ -2103,7 +2063,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////Av//
+ ////////////////////////////////////////////////////////////////////////////AP//
//////////////39/fr6+vb29vDw8Onp6eDg4NjY2NLS0s7OzsvLy8rKysrKysrKysrKysrKysrKysrK
ysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrK
ysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrK
@@ -2143,7 +2103,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////wL////////////////9/f35+fny8vLq6urg4ODT09PJycnB
+ /////////////////////////////////wD////////////////9/f35+fny8vLq6urg4ODT09PJycnB
wcG7u7u2tra0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0
tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0
tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0
@@ -2182,7 +2142,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////////////////////8C////////
+ //////////////////////////////////////////////////////////////////////8A////////
/////////Pz89/f37+/v5eXl2NjYycnJvLy8srKyqqqqpaWlo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Oj
o6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Oj
o6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Ojo6Oj
@@ -2222,7 +2182,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////Av////////////////z8/Pb29u3t7eHh4dLS0sHBwbKysqampp2d
+ ////////////////////////////AP////////////////z8/Pb29u3t7eHh4dLS0sHBwbKysqampp2d
nZeXl5WVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWV
lZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWV
lZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWVlZWV
@@ -2261,7 +2221,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////wL+/v7+/v7+/v7+
+ /////////////////////////////////////////////////////////////////wD+/v7+/v7+/v7+
/v7V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW0snW08rW0snW08rW08rY1s3Y1s3X1MvZ18/c
2tLe3NTq6OPw7urx7+vx7+vx7+vy8e7v7enw7urx7+vy8Ozv7enx7+ve3NTZ18/m5N7w7urw7urx7+vx
7+vu7Ojw7urv7ens6+fv7ens6+fv7ens6uXi4Nnd29Pe3NTZ18/W08rW0snT0MbSz8XSz8XU0cjV0cjS
@@ -2301,7 +2261,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////8C/v7+/v7+/v7+/v7+1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1dHI1dHI1dHI
+ //////////////////////8A/v7+/v7+/v7+/v7+1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1dHI1dHI1dHI
1tLJ1tLJ1tLJ1tPK19TL1tPK2NbN19TL2NXM2tjQ29nR5OLb7+3p8O7q8O7q8e/r8vHu7+3p8O7q8e/r
8O7q8vDs8O7q7uzo8e/r8vDs7+3p8O7q7+3p7Ovn7Ovn7Ovn7+3p7uzo6ujj5+Xg4uDZ3tzU2NbN1tLJ
1NHI09DG09DG09DG0s/F0s/F0s/F09DG1dHI09DGz8zBxsG2yMO40s/F09DG2NbN3NrS3tzU4uDZ5eTe
@@ -2340,7 +2300,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////Av7+/v7+/v7+/v7+/tXR
+ ////////////////////////////////////////////////////////////AP7+/v7+/v7+/v7+/tXR
yNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbSydbSydbSydbSydbSydbTytfUy9jVzNbTytnXz9vZ0dnX
z9/d1e/t6e/t6fDu6vDu6vHv6/Hv6+/t6fDu6vDu6vHv6+/t6fLw7PLw7O7s6O/t6fDu6u/t6ezr5+7s
6Ojm4ePh2uDe19rY0NjWzdnXz9bTytXRyNTRyNPQxtPQxtLPxdLOw9DNwtLPxdLOw9LOw9LOw9PQxtXR
@@ -2380,7 +2340,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////wL+/v7+/v7+/v7+/v7V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW
+ /////////////////wD+/v7+/v7+/v7+/v7V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW
0snW0snW0snW08rX1MvW08rY1s3X1Mva2NDb2dHg3tfu7Ojv7enw7urw7urx7+vx7+vv7enw7urx7+vw
7ury8Ozx7+vu7Ojy8Ozw7urs6+fq6OPj4drd29PZ18/Z18/Z18/Y1czY1czY1s3W0snW0snV0cjT0MbT
0MbSzsPQzcLSz8XT0MbT0MbV0cjW08rc2tLi4Nnn5eDm5N7n5eDl5N7h39ja2NDa2NDZ18/LyL3d29Pj
@@ -2419,7 +2379,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////8C/v7+/v7+/v7+/v7+1dHI1dHI
+ //////////////////////////////////////////////////////8A/v7+/v7+/v7+/v7+1dHI1dHI
1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1tLJ1tLJ1tLJ1tPK19TL1tPK2NXM19TL2NXM2NbN393V
7Ovn7uzo7+3p8e/r8e/r8e/r7uzo7uzo8O7q8O7q8O7q7Ovn7Orl6Obh4uDZ393V1tPK0s/F0M3C1NHI
2NbN2NXM2NXM1tLJ1tLJ1tLJ1tLJ1NHI09DG1NHI09DG1dHI2NXM2tjQ3dvT5OLb5+Xg5+Xg5+Xg4uDZ
@@ -2459,7 +2419,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////Av7+/v7+/v7+/v7+/tXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbSydbS
+ ////////////AP7+/v7+/v7+/v7+/tXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbSydbS
ydbSydbTytbTytbTytbTytjWzdnXz9fUy9nXz+jm4e/t6e/t6fDu6vHv6/Hv6+7s6O7s6PHv6+ro4+Xj
3N3b09nXz9TRyNPQxs7LwMfCt8S/tMbBttLPxdjVzNbSydXRyNTRyNPQxtXRyNXRyNXRyNjWzdrY0N/d
1eTi2+fl4Ofl4Obk3uXk3uXk3uXj3OXk3tvZ0c3Kv8jDuMfCt9LOw9rY0M7LwM7LwNrY0NvZ0ePh2uLg
@@ -2498,7 +2458,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////wL+/v7+/v7+/v7+/v7V0cjV0cjV0cjV
+ /////////////////////////////////////////////////wD+/v7+/v7+/v7+/v7V0cjV0cjV0cjV
0cjV0cjV0cjV0cjV0cjV0cjW0snV0cjV0cjW0snW0snW08rV0cjX1MvW08rY1czY1s3Y1czY1s3k4tvu
7Oju7Ojv7enx7+vw7urv7ens6+fq6OPd29PZ18/PzMHNyr/Kx7vKx7vFwLXEv7S+ua3DvbHOy8DW0snV
0cjT0MbU0cjY1s3c2tLg3tfl49zn5eDn5eDn5eDo5uHj4drk4tvo5uHk4tvl5N7l5N7l5N7Z18/Iw7jW
@@ -2538,7 +2498,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////8C/v7+/v7+/v7+/v7+1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1tLJ1dHI1tLJ
+ //////8A/v7+/v7+/v7+/v7+1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1tLJ1dHI1tLJ
1tPK1dHI1tLJ19TL2NXM2NbN2NXM2dfP4d/Y7Ovn7Orl7+3p8e/r8e/r7+3p7Ovn4+Ha2NXM2NXMysW6
y8i9xsG2x8K3zMm+zcq/yMO4ysW60s7D1tPK2dfP2dfP4d/Y5eTe6ujj6ujj6ujj5eTe4uDZ4d/Y393V
09DG2dfP5+Xg5eTe5eTe4+Ha5OLb3dvT1tPK4+Ha4N7X5OLb4+Ha5OLb4uDZ4uDZ4d/Y4N7X4+Ha4uDZ
@@ -2577,7 +2537,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////Av7+/f7+/v7+/v7+/tXRyNXRyNXRyNXRyNXR
+ ////////////////////////////////////////////AP7+/f7+/v7+/v7+/tXRyNXRyNXRyNXRyNXR
yNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbSydbSydbTytbSydbSydbTytjVzNjWzdfUy9jWzd/d1ezq5ezr
5+/t6fDu6vDu6u7s6Ozr59/d1dbTytbSycrHu8bBtsnEuczJvtXRyNbTytnXz9/d1ePh2uXj3Obk3ufl
4Ojm4ero4+Xk3t/d1dza0tPQxtbTytnXz9LPxc/MwdbTyuTi2+Ti2+Xj3OPh2uPh2uPh2uTi2+Lg2eLg
@@ -2617,7 +2577,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /wL+/v3+/v3+/v3+/v7V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW08rW
+ /wD+/v3+/v3+/v3+/v7V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW08rW
0snW0snW08rX1MvY1s3X1MvZ18/c2tLp5+Lu7Ojs6+fv7enw7uru7Ojs6+fk4tvZ18/U0cjOy8DSzsPW
0sna2NDf3dXl5N7n5eDq6OPq6OPo5uHn5eDn5eDm5N7l5N7n5eDY1czOy8DLyL3c2tLY1s3Oy8DZ18/b
2dHk4tvj4drk4tvj4drj4drj4dri4Nni4Nni4Nni4Nni4Nnj4drl49zk4tvl49zl49zj4drj4drh39jg
@@ -2656,7 +2616,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////8C/v7+/v79/v79/v7+1dHI1dHI1dHI1dHI1dHI1dHI
+ //////////////////////////////////////8A/v7+/v79/v79/v7+1dHI1dHI1dHI1dHI1dHI1dHI
1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1tLJ1tLJ1tPK19TL19TL2NXM19TL2dfP2dfP5+Xg7uzo7uzo
7uzo8O7q7uzo7Orl7Orl4+Ha3dvT3NrS4uDZ5eTe6ujj6ujj6ujj6ujj6ujj6ujj6Obh5+Xg5+Xg5uTe
5+Xg5ePc09DG09DG1NHI3NrS3dvT4N7X5OLb4d/Y4+Ha4uDZ4+Ha4uDZ4uDZ4uDZ4+Ha4+Ha4+Ha4uDZ
@@ -2695,7 +2655,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////Av7+
+ ////////////////////////////////////////////////////////////////////////////AP7+
/f7+/f7+/f7+/tXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbSydbSydbSydbSydbT
ytfUy9bTytfUy9fUy9nXz9jWzeTi2+7s6O7s6O7s6PDu6u7s6Oro4+ro4+zq5ezq5ero4+zr5+ro4+zq
5ero4+jm4efl4Ofl4Obk3uXk3uXk3uXk3uXk3uXk3uXk3uLg2eLg2ePh2uXk3uTi2+Ti2+Ph2uLg2eLg
@@ -2735,7 +2695,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////wL+/v39/f3+/f3+/v7V0cjV0cjV0cjV0cjV0cjV0cjV0cjV
+ /////////////////////////////////wD+/v39/f3+/f3+/v7V0cjV0cjV0cjV0cjV0cjV0cjV0cjV
0cjV0cjV0cjV0cjV0cjW0snW0snW0snW0snW08rX1MvW08rX1MvY1s3a2NDY1cze3NTq6OPs6+fs6uXu
7Ojv7enp5+Lp5+Lq6OPs6uXq6OPq6OPo5uHo5uHo5uHo5uHn5eDn5eDm5N7l5N7l5N7l5N7l49zm5N7l
5N7l5N7k4tvk4tvj4dri4Nni4Nni4Nnj4drj4drj4drk4tvk4tvk4tvh39jd29Pe3NTi4Nnj4drh39jg
@@ -2774,7 +2734,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////////////////////8C/v39/f39
+ //////////////////////////////////////////////////////////////////////8A/v39/f39
/f39/v791dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1dHI1tLJ1tLJ1tPK19TL
1tPK19TL2NbN2tjQ2NbN3NrS6efi7Orl7Orl7Ovn7uzo6efi6ujj6Obh6Obh5uTe5+Xg6Obh5uTe6Obh
5eTe5eTe5eTe5eTe5ePc5eTe5eTe5OLb4uDZ5eTe4uDZ5ePc4+Ha4+Ha5OLb5OLb5ePc5OLb5OLb5ePc
@@ -2814,7 +2774,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////Av39/f79/f7+/f7+/dXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXR
+ ////////////////////////////AP39/f79/f7+/f7+/dXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXR
yNXRyNXRyNXRyNXRyNXRyNbSydbSydbTytfUy9bTytjVzNjWzdnXz9jWzdza0unn4unn4uzq5ero4+zq
5enn4ufl4Ofl4OXk3uXk3uXk3uXk3uTi2+Xk3ubk3uXk3uXj3OTi2+Ph2uPh2uPh2uPh2uXk3uPh2uTi
2+Xk3uXk3ujm4ePh2uTi2+Hf2OPh2uLg2ePh2uHf2OHf2OLg2drY0NjVzNrY0ODe1+De197c1ODe197c
@@ -2853,7 +2813,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////wL+/v39/f39/f3+
+ /////////////////////////////////////////////////////////////////wD+/v39/f39/f3+
/v3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW0snW0snW08rW08rX
1MvY1czZ18/Y1s3c2tLp5+Ln5eDp5+Lq6OPp5+Lp5+Ll5N7n5eDk4tvl49zl49zk4tvk4tvl49zl5N7k
4tvj4drj4dri4Nnj4drk4tvk4tvm5N7l49zo5uHk4tvk4tvk4tvk4tvb2dHa2NDj4dri4Nni4Nni4Nng
@@ -2893,7 +2853,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////8C/v39/f39/f39/f391dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI
+ //////////////////////8A/v39/f39/f39/f391dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI
1dHI1dHI1tLJ1dHI1tLJ1tLJ1tPK1tPK1tPK2NXM2NbN2NXM2dfP29nR5uTe6Obh6Obh5uTe6efi6efi
5eTe5OLb5OLb4+Ha5OLb4uDZ4+Ha4+Ha4uDZ5eTe4uDZ4+Ha5ePc5OLb5eTe5OLb5OLb4+Ha4+Ha4+Ha
4+Ha5OLb4uDZ2dfP2dfP4uDZ4N7X4uDZ4d/Y3dvT4N7X3dvT3dvT1tPK1tLJyMO4yse7vrmtzMm+ubSm
@@ -2932,7 +2892,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////Av79/f7+/f39/f7+/dXR
+ ////////////////////////////////////////////////////////////AP79/f7+/f39/f7+/dXR
yNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbSydXRyNbSydbSydbSydbTytfUy9jVzNfU
y9fUy9nXz9vZ0eXk3ufl4Ojm4ebk3ufl4Ofl4OPh2uLg2eXk3uPh2uLg2ePh2uPh2uPh2uTi2+Xj3OXk
3uTi2+Xk3uTi2+Xj3NnXz9jVzOPh2uPh2uDe1+Ti2+Hf2ODe1+Hf2ODe197c1ODe197c1Nza0t/d1dPQ
@@ -2972,7 +2932,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////wL+/f3+/v39/f3+/v3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV
+ /////////////////wD+/f3+/v39/f3+/v3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV
0cjV0cjV0cjW0snW0snW0snW08rX1MvY1s3X1MvX1MvY1czZ18/j4drm5N7n5eDl5N7l5N7l5N7j4drh
39ji4Nng3tfi4Nnj4drl49zm5N7l5N7j4drk4tvj4drk4tvh39jj4drW08rW0sni4Nng3tfh39jh39jh
39jg3tfe3NTe3NTZ18/Z18/f3dXDvrPT0MbSzsO6tqre3NTSzsOyrJ7KxbrHwrehm4vMyb64s6XKxbrL
@@ -3011,7 +2971,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////8C/f39/f39/f39/v391dHI1dHI
+ //////////////////////////////////////////////////////8A/f39/f39/f39/v391dHI1dHI
1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1tLJ1tLJ1tLJ1tPK2NbN2NbN19TL
2NXM2dfP4d/Y5ePc5ePc4+Ha4+Ha5ePc4d/Y4N7X3tzU4uDZ5OLb4+Ha4+Ha2dfP2NbN4uDZ4uDZ4d/Y
4d/Y4N7X4d/Y3NrS3NrS4N7X4N7X4d/Y3NrS2NbN2dfP2NXMycS5zMm+zcq/0M3CubSmzsvA1dHIuLOl
@@ -3051,7 +3011,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////Av79/f7+/f7+/f39/dXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbS
+ ////////////AP79/f7+/f7+/f39/dXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbS
ydXRyNbSydbSydbSydbSydbTytjWzdjWzdfUy9nXz9nXz9/d1eXj3OTi2+Lg2eLg2ePh2t/d1d3b0+De
1+Ph2uLg2ePh2uLg2dLOw87LwODe1+Hf2ODe193b097c1NvZ0d/d1d/d1dza0tza0tnXz8jDuM3Kv8XA
tcXAtb65rdLOw8XAtcO+s9DNwsbBtsrHu7WwosXAtcnEucvIvdTRyNTRyNXRyNPQxtXRyNTRyNLOw9LO
@@ -3090,7 +3050,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////wL+/v3+/f3+/v39/f3V0cjV0cjV0cjV
+ /////////////////////////////////////////////////wD+/v3+/f3+/v39/f3V0cjV0cjV0cjV
0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW0snW08rW08rY1czY1czY1cza2NDZ
18/d29Pj4dri4Nni4Nnh39ji4Nne3NTb2dHg3tfh39jh39ji4Nng3tfa2NDd29Pd29Pc2tLf3dXd29PZ
18/a2NDb2dHKx7vKx7vf3dXGwbbDvrPb2dHJxLm0r6G7t6vKxbqup5jLyL3SzsPDvrPHwrfPzMHSz8XT
@@ -3130,7 +3090,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////8C/v79/v79/v79/v791dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI
+ //////8A/v79/v79/v79/v791dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI
1tLJ1tLJ1tPK1tPK1tPK19TL19TL2NbN29nR2NbN2tjQ4+Ha4N7X4d/Y393V4N7X3dvT2tjQ393V393V
4N7X3tzU3NrS4N7X393V3NrS3NrSyse7y8i9w76z0s7D2tjQxL+0vrmty8i9t7Kkw72x1dHIwrywvbmt
vrmtycS5yMO41NHI0s7D09DG1NHI09DG0s/F0M3CzsvAzcq/y8i9zMm+zMm+zMm+zcq/zcq/z8zB0s7D
@@ -3169,7 +3129,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////Av39/f7+/f39/f39/dXRyNXRyNXRyNXRyNXR
+ ////////////////////////////////////////////AP39/f7+/f39/f39/dXRyNXRyNXRyNXRyNXR
yNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbSydbSydbTytbTytbTytfUy9fUy9jVzNza0tjWzdvZ
0ePh2t/d1d7c1Nza0t7c1Nza0tnXz9za0t7c1NvZ0d3b093b09XRyMrHu9nXz9jWza+omcrFur65rcO+
s8bBtsO+s7u3q7u3q765rcK8sMbBtsjDuNPQxtLOw9LOw9PQxtDNwtLPxc/MwczJvs3Kv8rHu8rHu8vI
@@ -3209,7 +3169,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /wL+/f3+/v39/f39/f3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW0snW
+ /wD+/f3+/v39/f39/f3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW0snW
0snW08rX1MvX1MvW08rW08rY1czc2tLZ18/b2dHh39jd29Pe3NTb2dHd29PZ18/Y1czZ18/Z18/Z18/Z
18/Y1s3T0Ma9ua3Iw7jBu6+tppfV0ci6tae7t6u3sqTAuq66tafGwbbT0MbSzsPSz8XT0MbSzsPSz8XP
zMHMyb7LyL3Myb7LyL3LyL3LyL3Myb7Nyr/Oy8DNyr/Myb7Nyr/Nyr/Myb7Nyr/Nyr/Oy8DOy8DPzMHP
@@ -3248,7 +3208,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////8C/v79/v79/v39/f391dHI1dHI1dHI1dHI1dHI1dHI
+ //////////////////////////////////////8A/v79/v79/v39/f391dHI1dHI1dHI1dHI1dHI1dHI
1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1tLJ1tLJ1tLJ1tPK1tPK19TL19TL19TL2dfP2NbN29nR393V
2dfP2dfP2dfP2dfP1tLJ1NHI1tLJ1tPK1tLJ1tLJ1tPK1tLJysW6uraqtK6gvrmt09DGw72xwrywyse7
zsvAzsvA0s/F0M3Czcq/zsvAzcq/y8i9zMm+y8i9y8i9y8i9zMm+zMm+zcq/zsvAzcq/zMm+zMm+zMm+
@@ -3287,7 +3247,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////Av79
+ ////////////////////////////////////////////////////////////////////////////AP79
/f39/f79/f39/dXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbSydbSydbS
ydbTytfUy9fUy9jVzNfUy9jWzdjVzNrY0N7c1NbTytbSydXRyNXRyNPQxtLOw9PQxtPQxtLPxdLPxdTR
yNXRyNbSycK8sJ+ZicrHu9PQxtLOw9LOw9LOw8zJvs7LwMzJvsvIvcvIvcvIvcvIvcvIvc3Kv83Kv83K
@@ -3327,7 +3287,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////wL9/f39/f39/f39/f3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV
+ /////////////////////////////////wD9/f39/f39/f39/f3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV
0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW08rW08rX1MvY1czY1czZ18/Y1czY1s3c2tLV0cjT
0MbSz8XT0MbPzMHMyb7PzMHSzsPSzsPSzsPSz8XSz8XT0MbOy8DEv7TSzsPNyr/Nyr/Myb7LyL3LyL3L
yL3Kx7vLyL3Nyr/Nyr/Nyr/PzMHLyL3Myb7LyL3LyL3LyL3LyL3LyL3Kx7vOy8DNyr/SzsPQzcLT0MbW
@@ -3366,7 +3326,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////////////////////8C/f39/f39
+ //////////////////////////////////////////////////////////////////////8A/f39/f39
/f38/f391dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1tLJ1tPK
1tPK1tPK2NXM2NXM2dfP2NXM2tjQ3NrS09DG0s7D0s7D0M3CzMm+ysW6yse7zMm+zsvAz8zB0M3Cz8zB
0s/F0M3Cz8zBy8i9yse7yse7ysW6ysW6zMm+y8i9zMm+zcq/zcq/zcq/zcq/zcq/y8i9zMm+zMm+zMm+
@@ -3406,7 +3366,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////Av39/P39/f39/f39/dXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXR
+ ////////////////////////////AP39/P39/f39/f39/dXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXR
yNXRyNXRyNXRyNXRyNXRyNXRyNbSydbSydbSydbTytbTytfUy9jWzdjWzdjVzNvZ0dvZ0dLOw9DNws/M
wc3Kv8zJvsjDuMjDuMrFusrHu8rHu8vIvcvIvcvIvczJvsvIvcvIvcvIvcvIvcrHu8vIvcrHu8zJvsvI
vczJvszJvszJvszJvszJvs7LwNDNwtPQxtPQxtXRyNXRyNTRyNPQxtbSydPQxtTRyNTRyNPQxtPQxtPQ
@@ -3445,7 +3405,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////////////////////wL9/fz9/f39/f39
+ /////////////////////////////////////////////////////////////////wD9/fz9/f39/f39
/f3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW0snW08rW
08rX1MvY1s3Y1czY1cza2NDa2NDOy8DNyr/Oy8DMyb7LyL3Iw7jIw7jIw7jIw7jIw7jKx7vKx7vLyL3L
yL3Oy8DMyb7Nyr/LyL3LyL3Kx7vKx7vMyb7Kx7vMyb7PzMHPzMHQzcLSz8XU0cjU0cjU0cjT0MbT0MbT
@@ -3485,7 +3445,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////8C/f38/f38/f38/f391dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI
+ //////////////////////8A/f38/f38/f38/f391dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI
1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1tLJ1tPK1tPK19TL19TL2NbN19TL2NXM2NbNzsvAzMm+zcq/zcq/
yse7yMO4yMO4ysW6yse7y8i9zcq/zcq/y8i9zMm+zMm+zMm+ysW6y8i9y8i9y8i9zsvA0s7D09DG1dHI
19TL1tLJ1tLJ09DG1NHI1NHI1NHI09DG09DG09DG09DG09DG09DG1NHI09DG09DG1NHI09DG09DG09DG
@@ -3524,7 +3484,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////Av39/P39/P39/f39/dXR
+ ////////////////////////////////////////////////////////////AP39/P39/P39/f39/dXR
yNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNbSydbSydbSydbSydbTytfU
y9bTytfUy9fUy9jVzNfUy83Kv83Kv8zJvsvIvczJvsrHu8vIvczJvszJvszJvszJvs3Kv8zJvsvIvczJ
vs/MwdDNwtLPxdTRyNbSydbSydXRyNbSydbSydXRyNTRyNTRyNTRyNTRyNTRyNPQxtPQxtLPxdPQxtPQ
@@ -3564,7 +3524,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////wL9/fz9/fz9/fz9/f3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV
+ /////////////////wD9/fz9/fz9/fz9/f3V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV
0cjV0cjV0cjV0cjV0cjV0cjW0snW0snW08rX1MvW0snW0snX1MvW08rW0snNyr/Myb7Myb7JxLnKx7vL
yL3Kx7vKx7vLyL3Myb7Nyr/PzMHT0MbT0MbU0cjW0snW0snW0snY1czY1czV0cjV0cjU0cjV0cjU0cjT
0MbU0cjU0cjU0cjT0MbT0MbT0MbT0MbSzsPT0MbU0cjU0cjSz8XSz8XU0cjT0MbU0cjT0MbT0MbU0cjU
@@ -3603,7 +3563,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////8C/f38/f38/f39/f391dHI1dHI
+ //////////////////////////////////////////////////////8A/f38/f38/f39/f391dHI1dHI
1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1tLJ1tLJ1tPK1tLJ
1dHI19TL2NXM1tLJzcq/yse7zMm+yse7yse7zcq/zsvA0M3C09DG1NHI1NHI19TL1tLJ1tLJ1tLJ1dHI
1NHI1NHI1tLJ1tLJ1NHI1NHI1NHI1NHI1NHI1NHI1NHI1NHI1NHI09DG09DG1NHI09DG0s/F0s/F1NHI
@@ -3643,7 +3603,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////Av39/P39/P39/f79/dXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXR
+ ////////////AP39/P39/P39/f79/dXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXR
yNXRyNXRyNXRyNXRyNXRyNbSydbSydbSydXRyNXRyNXRyNfUy9PQxsvIvc3Kv83Kv8/MwdPQxtTRyNXR
yNbSydfUy9fUy9TRyNXRyNXRyNTRyNbSydTRyNTRyNTRyNTRyNTRyNPQxtTRyNTRyNTRyNTRyNPQxtPQ
xtTRyNTRyNTRyNTRyNTRyNTRyNPQxtPQxtPQxtPQxtPQxtTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTR
@@ -3682,7 +3642,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////////////////////wL9/fz9/fz9/f39/f3V0cjV0cjV0cjV
+ /////////////////////////////////////////////////wD9/fz9/fz9/f39/f3V0cjV0cjV0cjV
0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjW0snV0cjV0cjV0cjW0snV
0cjV0cjT0MbSz8XU0cjU0cjW0snX1MvW0snW0snW0snW0snW0snU0cjU0cjV0cjU0cjV0cjV0cjV0cjU
0cjU0cjSz8XT0MbU0cjU0cjU0cjT0MbT0MbT0MbU0cjU0cjT0MbT0MbU0cjU0cjT0MbT0MbU0cjT0MbU
@@ -3722,7 +3682,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////8C/f38/f39/v39/v791dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI
+ //////8A/f38/f39/v39/v791dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI
1dHI1dHI1dHI1dHI1dHI1dHI1dHI1dHI1tLJ1dHI1NHI1dHI1tLJ1tLJ1tLJ1NHI1tLJ1NHI1dHI1dHI
1dHI1dHI1dHI1NHI1NHI1NHI1NHI1NHI1NHI1dHI1NHI1NHI09DG1NHI1NHI1NHI09DG09DG1NHI1NHI
1NHI1NHI1NHI1NHI1NHI09DG1NHI1NHI1NHI1NHI1NHI1NHI1NHI1NHI1NHI1NHI1dHI1NHI1NHI1NHI
@@ -3761,7 +3721,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////Av38/P39/f79/f7+/dXRyNXRyNXRyNXRyNXR
+ ////////////////////////////////////////////AP38/P39/f79/f7+/dXRyNXRyNXRyNXRyNXR
yNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNXRyNTR
yNTRyNXRyNTRyNXRyNTRyNTRyNTRyNTRyNXRyNXRyNXRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTR
yNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTRyNTR
@@ -3801,7 +3761,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /wL9/fz9/f39/f3+/v7V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV
+ /wD9/fz9/f39/f3+/v7V0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV
0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjV0cjU0cjU0cjV0cjV0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU
0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU
0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjU0cjV0cjU0cjU0cjU0cjU0cjU0cjV0cjV0cjV0cjV0cjV
@@ -3840,7 +3800,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////8C/////////////////v7+/v7+/f39/Pz8+vr6+fn5
+ //////////////////////////////////////8A/////////////////v7+/v7+/f39/Pz8+vr6+fn5
9/f39vb29fX19PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0
9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0
9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0
@@ -3879,7 +3839,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- ////////////////////////////////////////////////////////////////////////////Av//
+ ////////////////////////////////////////////////////////////////////////////AP//
//////////////////7+/v7+/v7+/v39/f39/fz8/Pz8/Pz8/Pv7+/v7+/v7+/v7+/v7+/v7+/v7+/v7
+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7
+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7+/v7
@@ -3919,7 +3879,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- /////////////////////////////////wL/////////////////////////////////////////////
+ /////////////////////////////////wD/////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -3958,7 +3918,7 @@
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
- //////////////////////////////////////////////////////////////////////8C
+ //////////////////////////////////////////////////////////////////////8A
</value>
</data>
<data name="cmdHDataInTmp.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -3991,10 +3951,10 @@
FIYcEAA7
</value>
</data>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>344, 21</value>
</metadata>
- <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>78</value>
</metadata>
</root>
\ No newline at end of file
diff --git a/BaseSet/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/BaseSet/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/BaseSet/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/BaseSet/obj/x86/Release/AxInterop.gregn6Lib.dll b/BaseSet/obj/x86/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index 413b623..0000000
--- a/BaseSet/obj/x86/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/BaseSet/obj/x86/Release/BaseSet.csproj.ResolveComReference.cache b/BaseSet/obj/x86/Release/BaseSet.csproj.ResolveComReference.cache
deleted file mode 100644
index c485d5a..0000000
--- a/BaseSet/obj/x86/Release/BaseSet.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/BaseSet/obj/x86/Release/Interop.gregn6Lib.dll b/BaseSet/obj/x86/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index cb13321..0000000
--- a/BaseSet/obj/x86/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace.cs"
index f119294..8ef31c9 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StockPlace.cs"
@@ -597,9 +597,9 @@
{
try
{
- Report.FieldByName("浠撲綅浠ｇ爜").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("浠撲綅浠ｇ爜")].Value.ToString();
- Report.FieldByName("浠撲綅鍚嶇О").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("浠撲綅鍚嶇О")].Value.ToString();
- Report.FieldByName("鏉＄爜缂栧彿").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value.ToString();
+ //Report.FieldByName("浠撲綅浠ｇ爜").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("浠撲綅浠ｇ爜")].Value.ToString();
+ //Report.FieldByName("浠撲綅鍚嶇О").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("浠撲綅鍚嶇О")].Value.ToString();
+ //Report.FieldByName("鏉＄爜缂栧彿").AsString = grdMain.Rows[CurRows].Cells[Fun_GetCol("鏉＄爜缂栧彿")].Value.ToString();
}
catch (Exception e)
{
diff --git a/DAL/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/DAL/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/DAL/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/DAL/obj/x86/Release/DAL.csproj.ResolveComReference.cache b/DAL/obj/x86/Release/DAL.csproj.ResolveComReference.cache
deleted file mode 100644
index 1b41656..0000000
--- a/DAL/obj/x86/Release/DAL.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Material_View.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Material_View.cs"
index 5973447..895bb20 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Material_View.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Material_View.cs"
@@ -62,7 +62,7 @@
DataSet DS;
try
{
- DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HNumber='" + sNumber + "'", MvarItemKey, ref DBUtility.ClsPub.sExeReturnInfo);
+ DS = oCn.RunProcReturn("Select * from " + MvarItemKey + " Where HNumber='" + sNumber + "' and HUSEORGID="+ DBUtility.ClsPub.HOrgID, MvarItemKey, ref DBUtility.ClsPub.sExeReturnInfo);
if (DS.Tables[0].Rows.Count == 0)
return false;
else
diff --git "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Property_View.cs" "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Property_View.cs"
index 261d7c2..c713d91 100644
--- "a/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Property_View.cs"
+++ "b/DAL/\345\237\272\347\241\200\350\265\204\346\226\231/InterFace\345\237\272\347\241\200\350\265\204\346\226\231/ClsIF_Property_View.cs"
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using System.Data;
+using DBUtility;
namespace DAL
{
@@ -17,8 +18,10 @@
public ClsIF_Property_View()
{
base.MvarReportTitle = "杈呭姪灞炴�ц缃�";
- base.MvarItemKey = "h_v_IF_Property";
- base.SQLName = "Select HItemID,HNumber 杈呭姪灞炴�т唬鐮�,HName 杈呭姪灞炴�� from h_v_IF_Property where HStopflag=0 ";
+ base.MvarItemKey = "h_v_IF_PropertyByMaterID";
+ base.SQLName = "Select HItemID,HNumber 杈呭姪灞炴�т唬鐮�,HName 杈呭姪灞炴�� from h_v_IF_PropertyByMaterID ";
+ base.SQLWhere = " where HStopflag=0 ";
+ base.SQLOrder = " ";
//涓嬫媺SQL
base.SQLNameForDown = " Select top 30 HItemID,HNumber 杈呭姪灞炴�т唬鐮�,HName 杈呭姪灞炴�� from h_v_IF_Property ";
base.SQLOrderForDown = " Order by HNumber ";
@@ -94,5 +97,71 @@
throw (e);
}
}
+
+ /// <summary>
+ /// 鍩虹璧勬枡甯姪-鍏ㄩ儴鍨�
+ /// </summary>
+ /// <returns></returns>
+ public override bool RefreshView(string sLike)
+ {
+ try
+ {//
+ Pub_Control.frmHlpInfo_View ofrm = new Pub_Control.frmHlpInfo_View();
+ //
+ string sSQL = SQLName + SQLWhere + sLike + SQLOrder;
+ //缂栬緫ofrm
+ ofrm.sTitle = MvarReportTitle;
+ ofrm.sBill = MvarItemKey;
+ ofrm.txtFindInfo.Text = WherePart;
+
+ //
+ DataSet Ds;
+ Pub_Class.ClsSqlHelper oCn = new Pub_Class.ClsSqlHelper();
+ Ds = oCn.RunProcReturn(sSQL, MvarItemKey);
+ if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ {
+ return false;
+ }
+
+ //缁戝畾
+ ofrm.grdShow.DataSource = Ds.Tables[0].DefaultView;
+ Ds.Dispose();
+ Ds = null;
+ ofrm.grdShow.SuspendLayout();
+ ofrm.grdShow.Columns[0].Visible = false;
+ ofrm.ShowDialog();
+ //寰楀埌瀵瑰簲鍒�
+ int HItemIDCol = 0;
+ int HNumberCol = 1;
+ int HNameCol = 2;
+ //
+ if (ofrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
+ {
+ if (ofrm.grdShow.CurrentRow == null)
+ {
+ return false;
+ }
+ oModel = new ClsGy_Base_Model();
+ oModel.HItemID = Pub_Class.ClsPub.isLong(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[0].Value);
+ oModel.HNumber = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[1].Value);
+ oModel.HName = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[2].Value);
+ }
+ else
+ {
+ return false;
+ }
+ //
+ ofrm.Dispose();
+ ofrm = null;
+ //
+ return true;
+ }
+ catch (Exception e)
+ {
+ throw (e);
+ }
+ }
+
+
}
}
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs"
index 7759aee..11dc22d 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainBill.cs"
@@ -8,12 +8,13 @@
public class ClsSc_MouldMaintainBill:DBUtility.ClsXt_BaseBill
{
public Model.ClsSc_MouldMaintainBillMain omodel = new Model.ClsSc_MouldMaintainBillMain();
+ public List<Model.ClsSc_MouldMaintainRuleBillSub_Item> DetailCol = new List<Model.ClsSc_MouldMaintainRuleBillSub_Item>();
public List<Model.ClsSc_MouldMaintainBillSub> DetailColl = new List<Model.ClsSc_MouldMaintainBillSub>();
public ClsSc_MouldMaintainBill()
{
- base.MvarItemKeySub = "Sc_MouldMaintainBillSub";
- base.MvarItemKeySub2 = "";
+ base.MvarItemKeySub = "Sc_MouldMaintainBillSub_Item";
+ base.MvarItemKeySub2 = "Sc_MouldMaintainBillSub";
base.MvarItemKeySub3 = "";
base.MvarItemKeySub4 = "";
base.MvarItemKey="Sc_MouldMaintainBillMain";
@@ -70,8 +71,26 @@
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
DeleteBillSub(lngBillKey);
- //鎻掑叆瀛愯〃
+ DeleteBillSub2(lngBillKey);
omodel.HInterID = lngBillKey;
+ //鎻掑叆淇濆吇椤瑰瓙琛�
+ foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item oSub in DetailCol)
+ {
+ oCn.RunProc("Insert into Sc_MouldMaintainBillSub " +
+ " (HInterID,HEntryID,HMaintainItemID" +
+ ",HMaintainPart,HClaim" +
+ ",HManagerID" +
+ ",HCloseMan,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaintainItemID.ToString() +
+ ",'" + oSub.HMaintainPart.ToString() + "','" + oSub.HClaim.ToString() + "'" +
+ "," + oSub.HManagerID.ToString() +
+ ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ ") ");
+ }
+ //鎻掑叆閰嶄欢椤瑰瓙琛�
foreach (Model.ClsSc_MouldMaintainBillSub oSub in DetailColl)
{
oCn.RunProc("Insert into Sc_MouldMaintainBillSub " +
@@ -134,22 +153,46 @@
",'" + omodel.HEndDate + "'"+
",'" + omodel.HInnerBillNo + "','" + omodel.HExplanation + "'" +
") ");
- //鎻掑叆瀛愯〃
- foreach (Model.ClsSc_MouldMaintainBillSub oSub in DetailColl)
+
+ if (DetailCol.Count > 0)
{
- oCn.RunProc("Insert into Sc_MouldMaintainBillSub " +
- " (HInterID,HEntryID,HMaterID" +
- ",HQty,HUnitID" +
- ",HQtyMust,HManagerID" +
- ",HCloseMan,HCloseType,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
- ") values("
- + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() +
- "," + oSub.HQty.ToString() + "," + oSub.HUnitID.ToString() +
- "," + oSub.HQtyMust.ToString() + "," + oSub.HManagerID.ToString() +
- ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
- ") ");
+ //鎻掑叆淇濆吇椤瑰瓙琛�
+ foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item oSub in DetailCol)
+ {
+ oCn.RunProc("Insert into Sc_MouldMaintainBillSub_Item" +
+ " (HInterID,HEntryID,HMaintainItemID,HMaintainItem" +
+ ",HMaintainPart,HClaim" +
+ ",HManagerID" +
+ ",HCloseMan,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaintainItemID.ToString() + ",'" + oSub.HMaintainItem.ToString() + "'" +
+ ",'" + oSub.HMaintainPart.ToString() + "','" + oSub.HClaim.ToString() + "'" +
+ "," + oSub.HManagerID.ToString() +
+ ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ ") ");
+ }
+ }
+ if (DetailColl.Count > 0)
+ {
+ //鎻掑叆閰嶄欢椤瑰瓙琛�
+ foreach (Model.ClsSc_MouldMaintainBillSub oSub in DetailColl)
+ {
+ oCn.RunProc("Insert into Sc_MouldMaintainBillSub " +
+ " (HInterID,HEntryID,HMaterID" +
+ ",HQty,HUnitID" +
+ ",HQtyMust,HManagerID" +
+ ",HCloseMan,HCloseType,HRemark" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ") values("
+ + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HMaterID.ToString() +
+ "," + oSub.HQty.ToString() + "," + oSub.HUnitID.ToString() +
+ "," + oSub.HQtyMust.ToString() + "," + oSub.HManagerID.ToString() +
+ ",'" + oSub.HCloseMan + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
+ ") ");
+ }
}
//
//foreach (Model.ClsSc_MouldMaintainBillSub oSub in DetailColl)
diff --git "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs" "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs"
index 9c293f8..a91f6db 100644
--- "a/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs"
+++ "b/DAL/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBill.cs"
@@ -141,6 +141,37 @@
omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCn.BeginTran();
+ //string BillType1 = this.BillType;
+ //string HInterID = omodel.HInterID.ToString();
+ //string HBillNo = omodel.HBillNo;
+ //DateTime HDate = omodel.HDate;
+ //string HYear = omodel.HYear.ToString();
+ //string HPeriod = omodel.HPeriod.ToString();
+ //string HRemark = omodel.HRemark;
+ //string CurUserName = DBUtility.ClsPub.CurUserName;
+ //string HMaterID = omodel.HMaterID.ToString();
+ //string HName = omodel.HName;
+ //string HMaterTypeID = omodel.HMaterTypeID.ToString();
+ //string HRoutingGroupID = omodel.HRoutingGroupID.ToString();
+ //string HUnitID = omodel.HUnitID.ToString();
+ //string HMaterNumber = omodel.HMaterNumber;
+ //string HUnitNumber = omodel.HUnitNumber;
+ //string HStandard = DBUtility.ClsPub.BoolToString(omodel.HStandard);
+ //string HMainGroupID = omodel.HMainGroupID.ToString();
+ //string HMainProcID = omodel.HMainProcID.ToString();
+ //string HMainCenterID = omodel.HMainCenterID.ToString();
+ //string HMainTimeUnit = omodel.HMainTimeUnit;
+ //string HMainUnitTime = omodel.HMainUnitTime.ToString();
+ //string HMainWorkQty = omodel.HMainWorkQty.ToString();
+ //string HMainPrice = omodel.HMainPrice.ToString();
+ //string HStdSourceQty = omodel.HStdSourceQty.ToString();
+ //string HAddSourceRate = omodel.HAddSourceRate.ToString();
+ //string HDelSourceRate = omodel.HDelSourceRate.ToString();
+ //string HPicNumVer = omodel.HPicNumVer.ToString();
+ //string HPicNumAssemble = omodel.HPicNumAssemble.ToString();
+ //string HMaterTexture = omodel.HMaterTexture.ToString();
+ //string HProductNum = omodel.HProductNum.ToString();
+ //string HVerNum = omodel.HVerNum.ToString();
//涓昏〃
oCn.RunProc("Insert Into Gy_RoutingBillMain " +
"(HBillType,HInterID,HBillNo,HDate" +
@@ -148,12 +179,14 @@
",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
",HMainPrice,HStdSourceQty,HAddSourceRate,HDelSourceRate" +
+ ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum" +
") " +
" values('" + this.BillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()," + omodel.HMaterID.ToString() + ",'" + omodel.HName + "'," + omodel.HMaterTypeID.ToString() +
",'" + omodel.HRoutingGroupID.ToString() + "'," + omodel.HUnitID.ToString() + ",'" + omodel.HMaterNumber + "','" + omodel.HUnitNumber + "'," + DBUtility.ClsPub.BoolToString(omodel.HStandard) +
"," + omodel.HMainGroupID.ToString() + "," + omodel.HMainProcID.ToString() + "," + omodel.HMainCenterID.ToString() + ",'" + omodel.HMainTimeUnit + "'," + omodel.HMainUnitTime.ToString() + "," + omodel.HMainWorkQty.ToString() +
"," + omodel.HMainPrice.ToString() + "," + omodel.HStdSourceQty.ToString() + "," + omodel.HAddSourceRate + "," + omodel.HDelSourceRate.ToString() +
+ ",'" + omodel.HPicNumVer.ToString() + "','" + omodel.HPicNumAssemble.ToString() + "','" + omodel.HMaterTexture.ToString() + "','" + omodel.HProductNum.ToString() + "','" + omodel.HVerNum.ToString() + "'"+
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsGy_RoutingBillSub oSub in DetailColl)
@@ -169,7 +202,7 @@
",HProcID_S,HCenterID_S,HWorkQty_S,HSubStdEmpQty_S,HMouldNo,HChangeMould" +
",HPackStd,HPack,HPutArea,HMyWorkDays,HMyFixWorkDays,HPassRate" +
",HTechnologyParameter,HPicNum,HProcCheckNote" +
- ",HOverRate" +
+ ",HOverRate,HProcWorkNum" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + "," + oSub.HProcID.ToString() + "," + oSub.HProcNo.ToString() + "," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "" +
"," + oSub.HWorkQty.ToString() + "," + oSub.HCenterID.ToString() + ",'" + oSub.HTimeUnit.ToString() + "'," + oSub.HUnitTime.ToString() +
@@ -181,7 +214,7 @@
"," + oSub.HProcID_S.ToString() + "," + oSub.HCenterID_S.ToString() + "," + oSub.HWorkQty_S.ToString() + ", " + oSub.HSubStdEmpQty_S.ToString() + ",'" + oSub.HMouldNo + "'," + oSub.HChangeMould.ToString() +
",'" + oSub.HPackStd + "','" + oSub.HPack + "','" + oSub.HPutArea + "'," + oSub.HMyWorkDays.ToString() + "," + oSub.HMyFixWorkDays.ToString() + "," + oSub.HPassRate.ToString() +
",'"+ oSub.HTechnologyParameter.ToString() + "','" + oSub.HPicNum.ToString() + "','" + oSub.HProcCheckNote.ToString() +
- "', " + oSub.HOverRate.ToString() +
+ "', " + oSub.HOverRate.ToString() + ",'" + oSub.HProcWorkNum.ToString() + "'" +
") ");
}
//
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
index 5d42bac..a6c3598 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBill.cs"
@@ -71,7 +71,7 @@
",HWWOrderInterID=" + omodel.HWWOrderInterID.ToString() +
",HWWOrderEntryID=" + omodel.HWWOrderEntryID.ToString() +
",HWWOrderBillNo='" + omodel.HWWOrderBillNo + "'" +
- ",HICMOInterID=" + omodel.HICMOInterID.ToString() +
+ //",HICMOInterID=" + omodel.HICMOInterID.ToString() +
",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
",HBatchNo='" + omodel.HBatchNo + "'" +
",HMaterID2=" + omodel.HMaterID2.ToString() +
@@ -112,9 +112,14 @@
",HMaterIDB='" + omodel.HMaterIDB + "'" +
",HMaterIDC='" + omodel.HMaterIDC + "'" +
",HMaterIDD='" + omodel.HMaterIDD + "'" +
+ ",HPicNumVer='" + omodel.HPicNumVer + "'" +
+ ",HPicNumAssemble='" + omodel.HPicNumAssemble + "'" +
+ ",HMaterTexture='" + omodel.HMaterTexture + "'" +
+ ",HProductNum='" + omodel.HProductNum + "'" +
+ ",HVerNum='" + omodel.HVerNum + "'" +
//鍔犲叆鐢熶骇绫诲瀷
- ",HWorkTypeNum='" + omodel.HWorkTypeNum +
- "' where HInterID=" + lngBillKey.ToString());
+ ",HWorkTypeNum='" + omodel.HWorkTypeNum + "'" +
+ " where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
//鍒犻櫎瀛愯〃
@@ -126,18 +131,28 @@
oCn.RunProc("Insert into Sc_ProcessExchangeBillSub " +
" (HInterID,HEntryID,HBillNo_bak," +
"HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
- "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HRelationQty_In,HRelationQty_Out,HRelationQty_WWOrder,HRelationQty_Bad," +
- "HProcNo,HProcID,HProcNumber,HWorkRemark,HCenterID,HDeptID" +
- ",HDeptNumber,HGroupID,HGroupNumber,HWorkerID,HWorkerNumber,HSourceID" +
- ",HQty,HTimeUnit,HPlanWorkTimes,HPlanBeginDate,HPlanEndDate,HRelBeginDate" +
+ "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType," +
+ "HRelationQty,HRelationMoney,HRelationQty_In," +
+ "HRelationQty_Out,HRelationQty_WWOrder,HRelationQty_Bad," +
+ "HProcNo,HProcID,HProcNumber,HWorkRemark," +
+ "HCenterID,HDeptID" +
+ ",HDeptNumber,HGroupID," +
+ "HGroupNumber,HWorkerID,HWorkerNumber,HSourceID" +
+ ",HQty,HTimeUnit,HPlanWorkTimes,HPlanBeginDate," +
+ "HPlanEndDate,HRelBeginDate" +
",HRelEndDate,HReadyTime,HQueueTime,HMoveTime,HBeginDayQty,HBeginFixQty" +
- ",HFixWorkDays,HTrunWorkDays,HReadyTimes,HMyWorkDays,HOutPrice,HOutMoney,HPassRate" +
- ",HLastProc,HKeyProc,HFstProc,HICMOInterID,HICMOBillNo,HWWOrderInterID,HWWOrderEntryID,HWWOrderBillNo,HReportQty,HBackProc" +
+ ",HFixWorkDays,HTrunWorkDays,HReadyTimes," +
+ "HMyWorkDays,HOutPrice,HOutMoney,HPassRate" +
+ ",HLastProc,HKeyProc,HFstProc,HICMOInterID,HICMOBillNo,HWWOrderInterID," +
+ "HWWOrderEntryID,HWWOrderBillNo,HReportQty,HBackProc" +
",HSupID,HSupFlag,HOverRate,HMaxQty,HTechnologyParameter,HProcCheckNote,HPicNum" +
+ ",HMouldNo,HProcWorkNum" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + omodel.HBillNo + "'" +
",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
- "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HRelationQty_In.ToString() + "," + oSub.HRelationQty_Out.ToString() + "," + oSub.HRelationQty_WWOrder.ToString() + "," + oSub.HRelationQty_Bad.ToString() +
+ "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "',"
+ + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HRelationQty_In.ToString() + ","
+ + oSub.HRelationQty_Out.ToString() + "," + oSub.HRelationQty_WWOrder.ToString() + "," + oSub.HRelationQty_Bad.ToString() +
"," + oSub.HProcNo.ToString() + "," + oSub.HProcID.ToString() + ",'" + oSub.HProcNumber + "','" + oSub.HWorkRemark + "'" +
"," + oSub.HCenterID.ToString() + "," + oSub.HDeptID.ToString() + ",'" + oSub.HDeptNumber + "'," + oSub.HGroupID.ToString() +
",'" + oSub.HGroupNumber + "'," + oSub.HWorkerID.ToString() + ",'" + oSub.HWorkerNumber + "'," + oSub.HSourceID.ToString() +
@@ -149,6 +164,7 @@
",'" + oSub.HKeyProc + "','" + oSub.HFstProc + "'," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HWWOrderInterID.ToString() +
"," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HReportQty.ToString() + "," + Convert.ToString(oSub.HBackProc ? 1 : 0) +
"," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "," + oSub.HOverRate.ToString() + "," + oSub.HMaxQty.ToString() + ",'" + oSub.HTechnologyParameter + "','" + oSub.HProcCheckNote + "','" + oSub.HPicNum + "'" +
+ ",'" + oSub.HMouldNo.ToString() + "','" + oSub.HProcWorkNum.ToString() + "'" +
") ");
}
//
@@ -270,7 +286,8 @@
",HProdMaterCode,HSeOrderBillNo,HCusShortName,HCusNeedMaterial,HPlanSendGoodsDate" +
",HProdMaterName,HCusName,HWorkRemark,HImportNote,HMaterNumber_A" +
",HMaterNumber_B,HMaterNumber_C,HMaterNumber_D,HProdType,HMaterShortName" +
- ",HMaterIDA,HMaterIDB,HMaterIDC,HMaterIDD" +
+ ",HMaterIDA,HMaterIDB,HMaterIDC,HMaterIDD,HICMOEntryID" +
+ ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()," + "" + (omodel.HPrevMainSourceInterID == 0 ? omodel.HInterID : omodel.HPrevMainSourceInterID) +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HBatchNo + "'," + omodel.HMainMaterID.ToString() + "," + omodel.HKeyMaterID.ToString() + "," + omodel.HNo.ToString() + ",'" + omodel.HOrderProcNO + "'" +
@@ -281,7 +298,8 @@
",'" + omodel.HProdMaterCode + "','" + omodel.HSeOrderBillNo + "','" + omodel.HCusShortName + "','" + omodel.HCusNeedMaterial + "','" + omodel.HPlanSendGoodsDate + "'" +
",'" + omodel.HProdMaterName + "','" + omodel.HCusName + "','" + omodel.HWorkRemark + "','" + omodel.HImportNote + "','" + omodel.HMaterNumber_A + "'" +
",'" + omodel.HMaterNumber_B + "','" + omodel.HMaterNumber_C + "','" + omodel.HMaterNumber_D + "','" + omodel.HProdType + "','" + omodel.HMaterShortName + "'" +
- ",'" + omodel.HMaterIDA + "','" + omodel.HMaterIDB + "','" + omodel.HMaterIDC + "','" + omodel.HMaterIDD + "'" +
+ ",'" + omodel.HMaterIDA + "','" + omodel.HMaterIDB + "','" + omodel.HMaterIDC + "','" + omodel.HMaterIDD + "'," + omodel.HICMOEntryID +
+ ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "'" +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
@@ -297,6 +315,7 @@
",HFixWorkDays,HTrunWorkDays,HReadyTimes,HMyWorkDays,HOutPrice,HOutMoney,HPassRate" +
",HLastProc,HKeyProc,HFstProc,HICMOInterID,HICMOBillNo,HWWOrderInterID,HWWOrderEntryID,HWWOrderBillNo,HReportQty,HBackProc" +
",HSupID,HSupFlag,HOverRate,HMaxQty,HTechnologyParameter,HProcCheckNote,HPicNum" +
+ ",HMouldNo,HProcWorkNum" +
") values("
+ omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + omodel.HBillNo + "'" +
",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
@@ -312,6 +331,7 @@
",'" + oSub.HKeyProc + "','" + oSub.HFstProc + "'," + oSub.HICMOInterID.ToString() + ",'" + oSub.HICMOBillNo + "'," + oSub.HWWOrderInterID.ToString() +
"," + oSub.HWWOrderEntryID.ToString() + ",'" + oSub.HWWOrderBillNo + "'," + oSub.HReportQty.ToString() + "," + Convert.ToString(oSub.HBackProc ? 1 : 0) +
"," + oSub.HSupID.ToString() + "," + Convert.ToString(oSub.HSupFlag ? 1 : 0) + "," + oSub.HOverRate.ToString() + "," + oSub.HMaxQty.ToString() + ",'" + oSub.HTechnologyParameter + "','" + oSub.HProcCheckNote + "','"+ oSub.HPicNum + "'" +
+ ",'" + oSub.HMouldNo.ToString() + "','" + oSub.HProcWorkNum.ToString() + "'" +
") ");
//鏇存柊鎵�閫夋祦杞崱鏁伴噺
if (!oSub.HBackProc)
@@ -407,6 +427,7 @@
omodel.HWWOrderEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWWOrderEntryID"]);
omodel.HWWOrderBillNo = Ds.Tables[0].Rows[0]["HWWOrderBillNo"].ToString().Trim();
omodel.HICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOInterID"]);
+ omodel.HICMOEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOEntryID"]);
omodel.HICMOBillNo = Ds.Tables[0].Rows[0]["HICMOBillNo"].ToString().Trim();
omodel.HBatchNo = Ds.Tables[0].Rows[0]["HBatchNo"].ToString().Trim();
omodel.HMaterID2 = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterID2"]);
@@ -432,6 +453,12 @@
omodel.HBLFlag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HBLFlag"]);
omodel.HEquipMentID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEquipMentID"]);
omodel.HProjectNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProjectNum"]);
+ //===============
+ omodel.HPicNumVer = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPicNumVer"]);
+ omodel.HPicNumAssemble = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPicNumAssemble"]);
+ omodel.HMaterTexture = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterTexture"]);
+ omodel.HProductNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProductNum"]);
+ omodel.HVerNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HVerNum"]);
//
//寰幆
DataSet DsSub;
@@ -509,6 +536,8 @@
oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HTechnologyParameter"]);
oSub.HPicNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPicNum"]);
oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcCheckNote"]);
+ oSub.HMouldNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMouldNo"]);
+ oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcWorkNum"]);
DetailColl.Add(oSub);
}
@@ -598,6 +627,7 @@
omodel.HWWOrderEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWWOrderEntryID"]);
omodel.HWWOrderBillNo = Ds.Tables[0].Rows[0]["HWWOrderBillNo"].ToString().Trim();
omodel.HICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOInterID"]);
+ omodel.HICMOEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOEntryID"]);
omodel.HICMOBillNo = Ds.Tables[0].Rows[0]["HICMOBillNo"].ToString().Trim();
omodel.HBatchNo = Ds.Tables[0].Rows[0]["HBatchNo"].ToString().Trim();
omodel.HMaterID2 = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterID2"]);
@@ -630,7 +660,31 @@
omodel.HBLFlag = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HBLFlag"]);
omodel.HEquipMentID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HEquipMentID"]);
omodel.HProjectNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProjectNum"]);
- //
+
+ omodel.HProdMaterCode = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProdMaterCode"]);
+ omodel.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSeOrderBillNo"]);
+ omodel.HCusShortName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCusShortName"]);
+ omodel.HCusNeedMaterial = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCusNeedMaterial"]);
+ omodel.HPlanSendGoodsDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPlanSendGoodsDate"]);
+ omodel.HProdMaterName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProdMaterName"]);
+ omodel.HCusName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HCusName"]);
+ omodel.HWorkRemark = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HWorkRemark"]);
+ omodel.HImportNote = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HImportNote"]);
+ omodel.HMaterNumber_A = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterNumber_A"]);
+ omodel.HMaterNumber_B = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterNumber_B"]);
+ omodel.HMaterNumber_C = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterNumber_C"]);
+ omodel.HMaterNumber_D = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterNumber_D"]);
+ omodel.HProdType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProdType"]);
+ omodel.HMaterShortName = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterShortName"]);
+ omodel.HMaterIDA = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterIDA"]);
+ omodel.HMaterIDB = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterIDB"]);
+ omodel.HMaterIDC = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterIDC"]);
+ omodel.HMaterIDD = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterIDD"]);
+ omodel.HPicNumVer = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPicNumVer"]);
+ omodel.HPicNumAssemble = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HPicNumAssemble"]);
+ omodel.HMaterTexture = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HMaterTexture"]);
+ omodel.HVerNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HVerNum"]);
+ omodel.HProductNum = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HProductNum"]);
//寰幆
DataSet DsSub;
if (bBack)
@@ -722,6 +776,8 @@
oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HTechnologyParameter"]);
oSub.HPicNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HPicNum"]);
oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcCheckNote"]);
+ oSub.HMouldNo = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HMouldNo"]);
+ oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HProcWorkNum"]);
DetailColl.Add(oSub);
}
sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�";
@@ -779,6 +835,7 @@
omodel.HWWOrderEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWWOrderEntryID"]);
omodel.HWWOrderBillNo = Ds.Tables[0].Rows[0]["HWWOrderBillNo"].ToString().Trim();
omodel.HICMOInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOInterID"]);
+ omodel.HICMOEntryID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HICMOEntryID"]);
omodel.HICMOBillNo = Ds.Tables[0].Rows[0]["HICMOBillNo"].ToString().Trim();
omodel.HBatchNo = Ds.Tables[0].Rows[0]["HBatchNo"].ToString().Trim();
omodel.HMaterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HMaterID"]);
diff --git a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
index 1b41656..ebee6a3 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache
new file mode 100644
index 0000000..089d37c
--- /dev/null
+++ b/DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache
Binary files differ
diff --git a/DBUtility/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/DBUtility/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/DBUtility/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/DBUtility/obj/x86/Release/DBUtility.csproj.ResolveComReference.cache b/DBUtility/obj/x86/Release/DBUtility.csproj.ResolveComReference.cache
deleted file mode 100644
index 1b41656..0000000
--- a/DBUtility/obj/x86/Release/DBUtility.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/DBUtility/obj/x86/Release/build.force b/DBUtility/obj/x86/Release/build.force
deleted file mode 100644
index e69de29..0000000
--- a/DBUtility/obj/x86/Release/build.force
+++ /dev/null
diff --git "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs" "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
index 53b2ee58..fb13b4e 100644
--- "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
+++ "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
@@ -463,9 +463,10 @@
//鍗曟嵁鍙锋槸鍚﹂噸澶�
public virtual bool IsExistBillNo(ref string sReturn, string sBillNo, ClsPub.Enum_BillStatus oBillStatus, Int64 lngBillKey)
{
+ string sSql = "";
try
{
- string sSql = "";
+
if (oBillStatus == ClsPub.Enum_BillStatus.BillStatus_AddNew)
{
sSql = "Select HInterID from " + MvarItemKey + " where hbilltype='" + BillType + "'and HBillNO ='" + sBillNo + "'";
@@ -486,8 +487,8 @@
}
catch (Exception e)
{
- sReturn = e.Message;
- throw (e);
+ sReturn = e.Message+"sql:"+ sSql;
+ return false;
}
}
#endregion
diff --git a/EAM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/EAM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/EAM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/EAM/obj/Release/AxInterop.gregn6Lib.dll b/EAM/obj/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index be6a5a2..0000000
--- a/EAM/obj/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/EAM/obj/Release/EAM.csproj.ResolveComReference.cache b/EAM/obj/Release/EAM.csproj.ResolveComReference.cache
deleted file mode 100644
index c485d5a..0000000
--- a/EAM/obj/Release/EAM.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/EAM/obj/Release/Interop.gregn6Lib.dll b/EAM/obj/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index 720b8e4..0000000
--- a/EAM/obj/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/EAM/obj/Release/gregn6Lib.dll b/EAM/obj/Release/gregn6Lib.dll
deleted file mode 100644
index 91254f4..0000000
--- a/EAM/obj/Release/gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/Kanban/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/Kanban/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/Kanban/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/Kanban/obj/Release/AxInterop.gregn6Lib.dll b/Kanban/obj/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index 3f7b563..0000000
--- a/Kanban/obj/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/Kanban/obj/Release/Interop.gregn6Lib.dll b/Kanban/obj/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index 495482b..0000000
--- a/Kanban/obj/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/Kanban/obj/Release/Kanban.csproj.ResolveComReference.cache b/Kanban/obj/Release/Kanban.csproj.ResolveComReference.cache
deleted file mode 100644
index c485d5a..0000000
--- a/Kanban/obj/Release/Kanban.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/Kanban/obj/Release/Kanban.csprojAssemblyReference.cache b/Kanban/obj/Release/Kanban.csprojAssemblyReference.cache
deleted file mode 100644
index 4a4e92f..0000000
--- a/Kanban/obj/Release/Kanban.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/KanbanBoard/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/KanbanBoard/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/KanbanBoard/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/KanbanBoard/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/KanbanBoard/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index 4abaeb1..0000000
--- a/KanbanBoard/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/KanbanBoard/obj/Debug/KanbanBoard.Frm_MESSetIni.resources b/KanbanBoard/obj/Debug/KanbanBoard.Frm_MESSetIni.resources
deleted file mode 100644
index bf344ca..0000000
--- a/KanbanBoard/obj/Debug/KanbanBoard.Frm_MESSetIni.resources
+++ /dev/null
Binary files differ
diff --git a/KanbanBoard/obj/Debug/KanbanBoard.MESMain.resources b/KanbanBoard/obj/Debug/KanbanBoard.MESMain.resources
deleted file mode 100644
index ae7bd65..0000000
--- a/KanbanBoard/obj/Debug/KanbanBoard.MESMain.resources
+++ /dev/null
Binary files differ
diff --git a/KanbanBoard/obj/Debug/KanbanBoard.Properties.Resources.resources b/KanbanBoard/obj/Debug/KanbanBoard.Properties.Resources.resources
deleted file mode 100644
index 06c24d0..0000000
--- a/KanbanBoard/obj/Debug/KanbanBoard.Properties.Resources.resources
+++ /dev/null
Binary files differ
diff --git a/KanbanBoard/obj/Debug/KanbanBoard.csproj.GenerateResource.Cache b/KanbanBoard/obj/Debug/KanbanBoard.csproj.GenerateResource.Cache
deleted file mode 100644
index 4566de1..0000000
--- a/KanbanBoard/obj/Debug/KanbanBoard.csproj.GenerateResource.Cache
+++ /dev/null
Binary files differ
diff --git a/KanbanBoard/obj/Debug/KanbanBoard.csprojAssemblyReference.cache b/KanbanBoard/obj/Debug/KanbanBoard.csprojAssemblyReference.cache
deleted file mode 100644
index 26de2dc..0000000
--- a/KanbanBoard/obj/Debug/KanbanBoard.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/KanbanBoard/obj/Debug/ResolveAssemblyReference.cache b/KanbanBoard/obj/Debug/ResolveAssemblyReference.cache
deleted file mode 100644
index 8c40de8..0000000
--- a/KanbanBoard/obj/Debug/ResolveAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/KanbanBoard/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/KanbanBoard/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
deleted file mode 100644
index 661d874..0000000
--- a/KanbanBoard/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
+++ /dev/null
Binary files differ
diff --git a/KanbanBoard/obj/Debug/build.force b/KanbanBoard/obj/Debug/build.force
deleted file mode 100644
index e69de29..0000000
--- a/KanbanBoard/obj/Debug/build.force
+++ /dev/null
diff --git a/KanbanBoard/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/KanbanBoard/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/KanbanBoard/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/KanbanBoard/obj/Release/KanbanBoard.csprojAssemblyReference.cache b/KanbanBoard/obj/Release/KanbanBoard.csprojAssemblyReference.cache
deleted file mode 100644
index 1d3545b..0000000
--- a/KanbanBoard/obj/Release/KanbanBoard.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/LMES/bin/x86/HXERP.ini b/LMES/bin/x86/HXERP.ini
new file mode 100644
index 0000000..4b0d5e2
--- /dev/null
+++ b/LMES/bin/x86/HXERP.ini
@@ -0,0 +1,37 @@
+[po]
+Server=47.96.97.237,15127
+[Erp]
+Server=47.96.97.237,15127
+DataBase=HX_LMESsys
+DataBaseNumber=001-智云LMES管理系统
+UserName=HX_USER
+PassWord=lc@841022
+UserPsd=
+Remember=
+[K3Erp]
+Server=47.96.97.237,15127
+DataBase=
+UserName=HX_USER
+PassWord=lc@841022
+[K32Erp]
+Server=47.96.97.237,15127
+DataBase=HX_LMESsys
+UserName=HX_USER
+PassWord=lc@841022
+[SRM]
+Server=.\sql2008
+DataBase=hx_lims_SRM
+UserName=HX_USER
+PassWord=lc@841022
+[UserInfo]
+UserName=admin,景焕章,生管员,条码,测试用户
+UserPsd=
+Remember=1
+HOrgName=手机事业部
+[CLOUDINFO]
+sCLOUDUrl=ddddd
+sCLOUDAcc=4455xddd
+sCLOUDUseName=顾问1
+sCLOUDPsd=123456
+
+
diff --git a/LMES/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/LMES/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/LMES/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/LMES/obj/Release/LMES.csprojAssemblyReference.cache b/LMES/obj/Release/LMES.csprojAssemblyReference.cache
deleted file mode 100644
index 4be87d4..0000000
--- a/LMES/obj/Release/LMES.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/AxInterop.gregn6Lib.dll b/MES/bin/Debug/AxInterop.gregn6Lib.dll
index 5b16566..08ebd4b 100644
--- a/MES/bin/Debug/AxInterop.gregn6Lib.dll
+++ b/MES/bin/Debug/AxInterop.gregn6Lib.dll
Binary files differ
diff --git a/MES/bin/Debug/BLL.dll b/MES/bin/Debug/BLL.dll
index 95b242f..d1e02c5 100644
--- a/MES/bin/Debug/BLL.dll
+++ b/MES/bin/Debug/BLL.dll
Binary files differ
diff --git a/MES/bin/Debug/BLL.pdb b/MES/bin/Debug/BLL.pdb
index 617830d..daf590c 100644
--- a/MES/bin/Debug/BLL.pdb
+++ b/MES/bin/Debug/BLL.pdb
Binary files differ
diff --git a/MES/bin/Debug/DAL.dll b/MES/bin/Debug/DAL.dll
index 081b580..8124f11 100644
--- a/MES/bin/Debug/DAL.dll
+++ b/MES/bin/Debug/DAL.dll
Binary files differ
diff --git a/MES/bin/Debug/DAL.pdb b/MES/bin/Debug/DAL.pdb
index 8856a4c..eb3563b 100644
--- a/MES/bin/Debug/DAL.pdb
+++ b/MES/bin/Debug/DAL.pdb
Binary files differ
diff --git a/MES/bin/Debug/Interop.VBIDE.dll b/MES/bin/Debug/Interop.VBIDE.dll
deleted file mode 100644
index 95f8a22..0000000
--- a/MES/bin/Debug/Interop.VBIDE.dll
+++ /dev/null
Binary files differ
diff --git a/MES/bin/Debug/Interop.gregn6Lib.dll b/MES/bin/Debug/Interop.gregn6Lib.dll
index abf36cf..f9b4c2c 100644
--- a/MES/bin/Debug/Interop.gregn6Lib.dll
+++ b/MES/bin/Debug/Interop.gregn6Lib.dll
Binary files differ
diff --git a/MES/bin/Debug/MES.exe b/MES/bin/Debug/MES.exe
index 820d70b..5fe763c 100644
--- a/MES/bin/Debug/MES.exe
+++ b/MES/bin/Debug/MES.exe
Binary files differ
diff --git a/MES/bin/Debug/MES.pdb b/MES/bin/Debug/MES.pdb
index 646a002..9d7bb33 100644
--- a/MES/bin/Debug/MES.pdb
+++ b/MES/bin/Debug/MES.pdb
Binary files differ
diff --git a/MES/bin/Debug/Model.dll b/MES/bin/Debug/Model.dll
index 461a09e..f6e035b 100644
--- a/MES/bin/Debug/Model.dll
+++ b/MES/bin/Debug/Model.dll
Binary files differ
diff --git a/MES/bin/Debug/Model.pdb b/MES/bin/Debug/Model.pdb
index 622ff5b..72cae54 100644
--- a/MES/bin/Debug/Model.pdb
+++ b/MES/bin/Debug/Model.pdb
Binary files differ
diff --git a/MES/bin/Debug/WarM.dll b/MES/bin/Debug/WarM.dll
index 7f3d241..2df66b1 100644
--- a/MES/bin/Debug/WarM.dll
+++ b/MES/bin/Debug/WarM.dll
Binary files differ
diff --git a/MES/bin/Debug/WarM.pdb b/MES/bin/Debug/WarM.pdb
index 96a120b..f85e500 100644
--- a/MES/bin/Debug/WarM.pdb
+++ b/MES/bin/Debug/WarM.pdb
Binary files differ
diff --git a/MES/bin/Debug/stdole.dll b/MES/bin/Debug/stdole.dll
index 9673c81..e46a32c 100644
--- a/MES/bin/Debug/stdole.dll
+++ b/MES/bin/Debug/stdole.dll
Binary files differ
diff --git a/MES/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/MES/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/MES/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/MES/obj/Release/AxInterop.gregn6Lib.dll b/MES/obj/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index 67cf3ea..0000000
--- a/MES/obj/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/MES/obj/Release/Interop.gregn6Lib.dll b/MES/obj/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index 3014873..0000000
--- a/MES/obj/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/MES/obj/Release/MES.csproj.ResolveComReference.cache b/MES/obj/Release/MES.csproj.ResolveComReference.cache
deleted file mode 100644
index c485d5a..0000000
--- a/MES/obj/Release/MES.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/MES/obj/Release/MES.csprojAssemblyReference.cache b/MES/obj/Release/MES.csprojAssemblyReference.cache
deleted file mode 100644
index 1418e22..0000000
--- a/MES/obj/Release/MES.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/MES/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/MES/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/MES/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/MES/obj/x86/Release/AxInterop.gregn6Lib.dll b/MES/obj/x86/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index 2d82cf4..0000000
--- a/MES/obj/x86/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/MES/obj/x86/Release/Interop.gregn6Lib.dll b/MES/obj/x86/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index ffebdf3..0000000
--- a/MES/obj/x86/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/MES/obj/x86/Release/MES.csproj.ResolveComReference.cache b/MES/obj/x86/Release/MES.csproj.ResolveComReference.cache
deleted file mode 100644
index c485d5a..0000000
--- a/MES/obj/x86/Release/MES.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/Model/MES/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs b/Model/MES/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
index 2a81135..080196f 100644
--- a/Model/MES/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
+++ b/Model/MES/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
@@ -4,13 +4,14 @@
namespace Model
{
- public class ClsSc_ICMOBillWorkQtyStatus_Tmp
+ public class ClsSc_ICMOBillWorkQtyStatus_Tmp
{
//生产产量状态临时表
public Int64 HInterID;// int //主表 （生产状态表ID）
public Int64 HEntryID;// int（自增列） //自增列
public string HBillType;// varchar(10) // 单据类型
+ public int HBillStatus; //单据状态（1未审，2审核通过，3关闭，4作废，5审核退回,6审核中,7已阅，8已回复，9结案，10验证,11下达，12开工）
public Int64 HSourceID;// int //生产资源ID New
public Int64 HReportType;// int //汇报类型（1条码扫描，2机器汇报，3手工录入）
@@ -30,5 +31,20 @@
public Int64 HRelationEntryID;// int //关联单子ID （生产汇报单子ID）
public string HRelationBillNo;// varchar(50) //关联单号
public Int64 HReportEntryID;// int //汇报单子表ID
+
+ //
+ public string HUpDater;
+ public string HUpDateDate;
+ public string HChecker;
+ public string HCheckDate;
+ public string HBacker;
+ public string HBackDate;
+ public string HBackRemark;
+ public string HCloseMan;
+ public string HCloseDate;
+ public bool HCloseType;
+ public string HDeleteMan;
+ public string HDeleteDate;
+ public Int64 HBillerID;
}
}
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainRuleBillSub_Item.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainRuleBillSub_Item.cs"
index 74e1264..4ebd423 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainRuleBillSub_Item.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\346\250\241\345\205\267\347\256\241\347\220\206/ClsSc_MouldMaintainRuleBillSub_Item.cs"
@@ -14,5 +14,6 @@
public string HClaim;// varchar(100) --具体要求
public Int64 HManagerID;// int --负责人id(职员表)
+
}
}
diff --git "a/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBillMain.cs" "b/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBillMain.cs"
index 27fa12f..0b0faa8 100644
--- "a/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBillMain.cs"
+++ "b/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBillMain.cs"
@@ -29,6 +29,11 @@
public double HDelSourceRate;// money //减资源减量 --addnew
public bool HUseFlag;
+ public string HPicNumVer;//
+ public string HPicNumAssemble;//
+ public string HMaterTexture;//
+ public string HProductNum;//
+ public string HVerNum;//
}
}
diff --git "a/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBillSub.cs" "b/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBillSub.cs"
index 8d1894c..5ffe647 100644
--- "a/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBillSub.cs"
+++ "b/Model/\350\256\241\345\210\222\347\256\241\347\220\206/ClsGy_RoutingBillSub.cs"
@@ -62,6 +62,7 @@
public string HTechnologyParameter=""; // varchar(1000) 工艺参数
public string HPicNum = ""; // varchar(200) 图纸编号
public string HProcCheckNote = ""; // varchar(2000) 本工序确认记录
+ public string HProcWorkNum = ""; // varchar(100) 程序号
}
}
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
index a04535a..60611bd 100644
--- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillMain.cs"
@@ -59,5 +59,10 @@
public string HMaterIDB;
public string HMaterIDC;
public string HMaterIDD;
+ public string HPicNumVer;//图号版本
+ public string HPicNumAssemble;//总装图号
+ public string HMaterTexture;//材质
+ public string HProductNum;//成品编号
+ public string HVerNum;//版本
}
}
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs"
index 1f7b77c..924e656 100644
--- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs"
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_ProcessExchangeBillSub.cs"
@@ -68,5 +68,7 @@
public string HProcCheckNote;
public string HPicNum;
public string HTechnologyParameter;
+ public string HMouldNo;//模具编号
+ public string HProcWorkNum;//程序号
}
}
diff --git a/MoveForm/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/MoveForm/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/MoveForm/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/MoveForm/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/MoveForm/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index cbcce26..0000000
--- a/MoveForm/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/MoveForm/obj/Debug/MoveForm.csprojAssemblyReference.cache b/MoveForm/obj/Debug/MoveForm.csprojAssemblyReference.cache
deleted file mode 100644
index 5c2c9a1..0000000
--- a/MoveForm/obj/Debug/MoveForm.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/MoveForm/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/MoveForm/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/MoveForm/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/MoveForm/obj/x86/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/MoveForm/obj/x86/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/MoveForm/obj/x86/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/MoveForm/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/MoveForm/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
deleted file mode 100644
index d4f3b18..0000000
--- a/MoveForm/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+++ /dev/null
Binary files differ
diff --git a/MoveForm/obj/x86/Debug/MoveForm.csprojAssemblyReference.cache b/MoveForm/obj/x86/Debug/MoveForm.csprojAssemblyReference.cache
deleted file mode 100644
index 1c711ae..0000000
--- a/MoveForm/obj/x86/Debug/MoveForm.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/OAM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/OAM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/OAM/obj/Release/AxInterop.gregn6Lib.dll b/OAM/obj/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index f0f9ec8..0000000
--- a/OAM/obj/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/AxInterop.grproLib.dll b/OAM/obj/Release/AxInterop.grproLib.dll
deleted file mode 100644
index b6bbfb4..0000000
--- a/OAM/obj/Release/AxInterop.grproLib.dll
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/Interop.gregn6Lib.dll b/OAM/obj/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index c428e41..0000000
--- a/OAM/obj/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/Interop.grproLib.dll b/OAM/obj/Release/Interop.grproLib.dll
deleted file mode 100644
index 2a63f32..0000000
--- a/OAM/obj/Release/Interop.grproLib.dll
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_ComFileBill.resources b/OAM/obj/Release/OAM.OA_ComFileBill.resources
deleted file mode 100644
index 49ae48f..0000000
--- a/OAM/obj/Release/OAM.OA_ComFileBill.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_ComFileBillList.resources b/OAM/obj/Release/OAM.OA_ComFileBillList.resources
deleted file mode 100644
index e62461d..0000000
--- a/OAM/obj/Release/OAM.OA_ComFileBillList.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_EmpMessageBill.resources b/OAM/obj/Release/OAM.OA_EmpMessageBill.resources
deleted file mode 100644
index 1f73604..0000000
--- a/OAM/obj/Release/OAM.OA_EmpMessageBill.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_EmpMessageBillList.resources b/OAM/obj/Release/OAM.OA_EmpMessageBillList.resources
deleted file mode 100644
index e62461d..0000000
--- a/OAM/obj/Release/OAM.OA_EmpMessageBillList.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_EmpMinMessage.resources b/OAM/obj/Release/OAM.OA_EmpMinMessage.resources
deleted file mode 100644
index 1f73604..0000000
--- a/OAM/obj/Release/OAM.OA_EmpMinMessage.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_EmpMinMessageList.resources b/OAM/obj/Release/OAM.OA_EmpMinMessageList.resources
deleted file mode 100644
index e62461d..0000000
--- a/OAM/obj/Release/OAM.OA_EmpMinMessageList.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_ErrMsgBackBill.resources b/OAM/obj/Release/OAM.OA_ErrMsgBackBill.resources
deleted file mode 100644
index 346b908..0000000
--- a/OAM/obj/Release/OAM.OA_ErrMsgBackBill.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_ErrMsgBackBillList.resources b/OAM/obj/Release/OAM.OA_ErrMsgBackBillList.resources
deleted file mode 100644
index e62461d..0000000
--- a/OAM/obj/Release/OAM.OA_ErrMsgBackBillList.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_FileChangeRequestBill.resources b/OAM/obj/Release/OAM.OA_FileChangeRequestBill.resources
deleted file mode 100644
index e71e59c..0000000
--- a/OAM/obj/Release/OAM.OA_FileChangeRequestBill.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_FileChangeRequestBillList.resources b/OAM/obj/Release/OAM.OA_FileChangeRequestBillList.resources
deleted file mode 100644
index e62461d..0000000
--- a/OAM/obj/Release/OAM.OA_FileChangeRequestBillList.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_InformBill.resources b/OAM/obj/Release/OAM.OA_InformBill.resources
deleted file mode 100644
index 49ae48f..0000000
--- a/OAM/obj/Release/OAM.OA_InformBill.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_InformBillList.resources b/OAM/obj/Release/OAM.OA_InformBillList.resources
deleted file mode 100644
index e62461d..0000000
--- a/OAM/obj/Release/OAM.OA_InformBillList.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_Knowledge.resources b/OAM/obj/Release/OAM.OA_Knowledge.resources
deleted file mode 100644
index c69ee8f..0000000
--- a/OAM/obj/Release/OAM.OA_Knowledge.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_KnowledgeList.resources b/OAM/obj/Release/OAM.OA_KnowledgeList.resources
deleted file mode 100644
index e62461d..0000000
--- a/OAM/obj/Release/OAM.OA_KnowledgeList.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_ManagerEmail.resources b/OAM/obj/Release/OAM.OA_ManagerEmail.resources
deleted file mode 100644
index 925652c..0000000
--- a/OAM/obj/Release/OAM.OA_ManagerEmail.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_ManagerEmailList.resources b/OAM/obj/Release/OAM.OA_ManagerEmailList.resources
deleted file mode 100644
index e62461d..0000000
--- a/OAM/obj/Release/OAM.OA_ManagerEmailList.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_MeetNotifyBill.resources b/OAM/obj/Release/OAM.OA_MeetNotifyBill.resources
deleted file mode 100644
index 2aecc65..0000000
--- a/OAM/obj/Release/OAM.OA_MeetNotifyBill.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_MeetNotifyBillList.resources b/OAM/obj/Release/OAM.OA_MeetNotifyBillList.resources
deleted file mode 100644
index e62461d..0000000
--- a/OAM/obj/Release/OAM.OA_MeetNotifyBillList.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_New.resources b/OAM/obj/Release/OAM.OA_New.resources
deleted file mode 100644
index c69ee8f..0000000
--- a/OAM/obj/Release/OAM.OA_New.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_NewList.resources b/OAM/obj/Release/OAM.OA_NewList.resources
deleted file mode 100644
index ddf04c4..0000000
--- a/OAM/obj/Release/OAM.OA_NewList.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_WorkLinkBill.resources b/OAM/obj/Release/OAM.OA_WorkLinkBill.resources
deleted file mode 100644
index 137d37c..0000000
--- a/OAM/obj/Release/OAM.OA_WorkLinkBill.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_WorkLinkBillList.resources b/OAM/obj/Release/OAM.OA_WorkLinkBillList.resources
deleted file mode 100644
index 5bdf98a..0000000
--- a/OAM/obj/Release/OAM.OA_WorkLinkBillList.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_WorkLinkBillReport.resources b/OAM/obj/Release/OAM.OA_WorkLinkBillReport.resources
deleted file mode 100644
index c7c71dd..0000000
--- a/OAM/obj/Release/OAM.OA_WorkLinkBillReport.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_WorkLinkBillReportDlg.resources b/OAM/obj/Release/OAM.OA_WorkLinkBillReportDlg.resources
deleted file mode 100644
index 6cc7186..0000000
--- a/OAM/obj/Release/OAM.OA_WorkLinkBillReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.OA_WorkLinkBill_BackMsg.resources b/OAM/obj/Release/OAM.OA_WorkLinkBill_BackMsg.resources
deleted file mode 100644
index f1daa6d..0000000
--- a/OAM/obj/Release/OAM.OA_WorkLinkBill_BackMsg.resources
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.csproj.GenerateResource.Cache b/OAM/obj/Release/OAM.csproj.GenerateResource.Cache
deleted file mode 100644
index 66fe8b5..0000000
--- a/OAM/obj/Release/OAM.csproj.GenerateResource.Cache
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.csproj.ResolveComReference.cache b/OAM/obj/Release/OAM.csproj.ResolveComReference.cache
deleted file mode 100644
index c485d5a..0000000
--- a/OAM/obj/Release/OAM.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.csprojAssemblyReference.cache b/OAM/obj/Release/OAM.csprojAssemblyReference.cache
deleted file mode 100644
index 078ae41..0000000
--- a/OAM/obj/Release/OAM.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.dll b/OAM/obj/Release/OAM.dll
deleted file mode 100644
index 5fabd55..0000000
--- a/OAM/obj/Release/OAM.dll
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/OAM.pdb b/OAM/obj/Release/OAM.pdb
deleted file mode 100644
index ed14e13..0000000
--- a/OAM/obj/Release/OAM.pdb
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/Release/ResolveAssemblyReference.cache b/OAM/obj/Release/ResolveAssemblyReference.cache
deleted file mode 100644
index b1e6022..0000000
--- a/OAM/obj/Release/ResolveAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/OAM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/OAM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/OAM/obj/x86/Release/AxInterop.gregn6Lib.dll b/OAM/obj/x86/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index b13869e..0000000
--- a/OAM/obj/x86/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/x86/Release/Interop.gregn6Lib.dll b/OAM/obj/x86/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index e595dd9..0000000
--- a/OAM/obj/x86/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/OAM/obj/x86/Release/OAM.csproj.ResolveComReference.cache b/OAM/obj/x86/Release/OAM.csproj.ResolveComReference.cache
deleted file mode 100644
index c485d5a..0000000
--- a/OAM/obj/x86/Release/OAM.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/PlanM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/PlanM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/PlanM/obj/Release/AxInterop.gregn6Lib.dll b/PlanM/obj/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index 2ab94f8..0000000
--- a/PlanM/obj/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/AxInterop.grproLib.dll b/PlanM/obj/Release/AxInterop.grproLib.dll
deleted file mode 100644
index 8ff2e5c..0000000
--- a/PlanM/obj/Release/AxInterop.grproLib.dll
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/Interop.gregn6Lib.dll b/PlanM/obj/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index 2153dac..0000000
--- a/PlanM/obj/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/Interop.grproLib.dll b/PlanM/obj/Release/Interop.grproLib.dll
deleted file mode 100644
index b87f39c..0000000
--- a/PlanM/obj/Release/Interop.grproLib.dll
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/PlanM.Gy_ICBomBill.resources b/PlanM/obj/Release/PlanM.Gy_ICBomBill.resources
deleted file mode 100644
index 3bdb8cf..0000000
--- a/PlanM/obj/Release/PlanM.Gy_ICBomBill.resources
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/PlanM.Gy_ICBomBillList.resources b/PlanM/obj/Release/PlanM.Gy_ICBomBillList.resources
deleted file mode 100644
index cafddfa..0000000
--- a/PlanM/obj/Release/PlanM.Gy_ICBomBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/PlanM.Gy_ICBomBillList_K3.resources b/PlanM/obj/Release/PlanM.Gy_ICBomBillList_K3.resources
deleted file mode 100644
index cafddfa..0000000
--- a/PlanM/obj/Release/PlanM.Gy_ICBomBillList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/PlanM.Gy_ICBomBill_K3.resources b/PlanM/obj/Release/PlanM.Gy_ICBomBill_K3.resources
deleted file mode 100644
index 3bdb8cf..0000000
--- a/PlanM/obj/Release/PlanM.Gy_ICBomBill_K3.resources
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/PlanM.Gy_RoutingBill.resources b/PlanM/obj/Release/PlanM.Gy_RoutingBill.resources
deleted file mode 100644
index a41ee56..0000000
--- a/PlanM/obj/Release/PlanM.Gy_RoutingBill.resources
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/PlanM.Gy_RoutingBillList.resources b/PlanM/obj/Release/PlanM.Gy_RoutingBillList.resources
deleted file mode 100644
index cafddfa..0000000
--- a/PlanM/obj/Release/PlanM.Gy_RoutingBillList.resources
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/PlanM.Sc_ICBomBillMuiList_K3.resources b/PlanM/obj/Release/PlanM.Sc_ICBomBillMuiList_K3.resources
deleted file mode 100644
index a753dd6..0000000
--- a/PlanM/obj/Release/PlanM.Sc_ICBomBillMuiList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/PlanM.Sc_ICMrpResultBillList_K3.resources b/PlanM/obj/Release/PlanM.Sc_ICMrpResultBillList_K3.resources
deleted file mode 100644
index cafddfa..0000000
--- a/PlanM/obj/Release/PlanM.Sc_ICMrpResultBillList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/PlanM.Sc_ICMrpResultBill_K3.resources b/PlanM/obj/Release/PlanM.Sc_ICMrpResultBill_K3.resources
deleted file mode 100644
index 678984d..0000000
--- a/PlanM/obj/Release/PlanM.Sc_ICMrpResultBill_K3.resources
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/PlanM.Sc_PPOrderBillList_K3.resources b/PlanM/obj/Release/PlanM.Sc_PPOrderBillList_K3.resources
deleted file mode 100644
index 6fcfc3b..0000000
--- a/PlanM/obj/Release/PlanM.Sc_PPOrderBillList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/PlanM.Sc_PPOrderBill_K3.resources b/PlanM/obj/Release/PlanM.Sc_PPOrderBill_K3.resources
deleted file mode 100644
index 298d7a3..0000000
--- a/PlanM/obj/Release/PlanM.Sc_PPOrderBill_K3.resources
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/PlanM.Sc_PPOrderBill_K3_Extend.resources b/PlanM/obj/Release/PlanM.Sc_PPOrderBill_K3_Extend.resources
deleted file mode 100644
index 06c24d0..0000000
--- a/PlanM/obj/Release/PlanM.Sc_PPOrderBill_K3_Extend.resources
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/PlanM.csproj.GenerateResource.Cache b/PlanM/obj/Release/PlanM.csproj.GenerateResource.Cache
deleted file mode 100644
index acd58f9..0000000
--- a/PlanM/obj/Release/PlanM.csproj.GenerateResource.Cache
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/PlanM.csproj.ResolveComReference.cache b/PlanM/obj/Release/PlanM.csproj.ResolveComReference.cache
deleted file mode 100644
index c485d5a..0000000
--- a/PlanM/obj/Release/PlanM.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/PlanM.dll b/PlanM/obj/Release/PlanM.dll
deleted file mode 100644
index 8e59ab3..0000000
--- a/PlanM/obj/Release/PlanM.dll
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/Release/PlanM.pdb b/PlanM/obj/Release/PlanM.pdb
deleted file mode 100644
index b37f06a..0000000
--- a/PlanM/obj/Release/PlanM.pdb
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/PlanM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/PlanM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/PlanM/obj/x86/Release/AxInterop.gregn6Lib.dll b/PlanM/obj/x86/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index 9a3a5bf..0000000
--- a/PlanM/obj/x86/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/x86/Release/Interop.gregn6Lib.dll b/PlanM/obj/x86/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index b6a4f18..0000000
--- a/PlanM/obj/x86/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/PlanM/obj/x86/Release/PlanM.csproj.ResolveComReference.cache b/PlanM/obj/x86/Release/PlanM.csproj.ResolveComReference.cache
deleted file mode 100644
index c485d5a..0000000
--- a/PlanM/obj/x86/Release/PlanM.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.cs" "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.cs"
index d38b39a..3488207 100644
--- "a/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.cs"
+++ "b/PlanM/\346\225\260\346\215\256\345\257\274\345\205\245/Gy_DataIn_RoutingBill.cs"
@@ -10,7 +10,7 @@
namespace PlanM
{
- public partial class Gy_DataIn_RoutingBill :BLL.Gy_DataInTmp
+ public partial class Gy_DataIn_RoutingBill : BLL.Gy_DataInTmp
{
public Gy_DataIn_RoutingBill()
{
@@ -18,17 +18,26 @@
}
public int HMaterNumberCol = 0; //产品代码
+ public int HProcNoCol = 0; //工序序号
public int HProcNameCol = 0; //工序
public int HWorkCenterNameCol = 0; //工作中心
- public int HWorkQtyCol = 0; //产能
+ public int HWorkQtyCol = 0; //加工数量
public int HBeginDayQtyCol = 6; //开工固天
public int HBeginFixQtyCol = 7; //开工余量
public int HFixPriceCol = 8; //定额 小时工资
public int HProcPriceCol = 9; //工价
- public int HProcNoCol = 0; //工序序号
public int HTechnologyParameterCol = 0; //工艺参数
public int HPicNumCol = 0; //图纸编号
public int HProcCheckNoteCol = 0; //本工序确认记录
+
+ public int HPicNumVerCol = 0; //图号版本
+ public int HPicNumAssembleCol = 0; //总装图号
+ public int HMaterTextureCol = 0; //材质
+ public int HProductNumCol = 0; //成品编号
+ public int HVerNumCol = 0; //版本
+ public int HMouldNoCol = 0; //模具编号
+ public int HProcWorkNumCol = 0; //程序号
+ public int HPassRateCol = 0; //良率
//
public const int HBeginRow = 2; //有效数据，开始行数
//
@@ -45,7 +54,7 @@
{
base.sSheetName = txtHSheetName.Text;
return base.OpenExcelData();
- }
+ }
/// <summary>
/// 初始化界面
@@ -53,7 +62,7 @@
public override void initData()
{
base.initData();
- base.sSheetName = txtHSheetName.Text ;
+ base.sSheetName = txtHSheetName.Text;
base.ModRightName = "Gy_DataIn_RoutingBill";
base.ModRightNameCheck = base.ModRightName + base.ModRightNameCheck;
base.ModRightNameClose = base.ModRightName + base.ModRightNameClose;
@@ -72,255 +81,330 @@
//导入
public override void Sub_DataIn()
{
- string hnumber = "";
- string HBillNo = "";
- //
- HMaterNumberCol = DBUtility.Gy_BaseFun.Fun_GetCol("产品代码", grdMain);
- HProcNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序", grdMain);
- HWorkCenterNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("工作中心", grdMain);
- HWorkQtyCol = DBUtility.Gy_BaseFun.Fun_GetCol("产能", grdMain);
- HBeginFixQtyCol = DBUtility.Gy_BaseFun.Fun_GetCol("开工余量", grdMain);
- HBeginDayQtyCol = DBUtility.Gy_BaseFun.Fun_GetCol("开工固天", grdMain);
- HFixPriceCol = DBUtility.Gy_BaseFun.Fun_GetCol("小时工资", grdMain);
- HProcPriceCol = DBUtility.Gy_BaseFun.Fun_GetCol("单个工价", grdMain);
+ try
+ {
+ string hnumber = "";
+ string HBillNo = "";
+ //
+ HMaterNumberCol = DBUtility.Gy_BaseFun.Fun_GetCol("产品代码", grdMain);
+ HProcNoCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序序号", grdMain);
+ HProcNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序", grdMain);
+ HWorkCenterNameCol = DBUtility.Gy_BaseFun.Fun_GetCol("工作中心", grdMain);
+ HWorkQtyCol = DBUtility.Gy_BaseFun.Fun_GetCol("加工数量", grdMain);
+ HPicNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("图纸编号", grdMain);
+ HTechnologyParameterCol = DBUtility.Gy_BaseFun.Fun_GetCol("工艺参数", grdMain);
+ HProcCheckNoteCol = DBUtility.Gy_BaseFun.Fun_GetCol("本工序确认记录", grdMain);
+ HPicNumVerCol = DBUtility.Gy_BaseFun.Fun_GetCol("图号版本", grdMain);
+ HPicNumAssembleCol = DBUtility.Gy_BaseFun.Fun_GetCol("总装图号", grdMain);
+ HMaterTextureCol = DBUtility.Gy_BaseFun.Fun_GetCol("材质", grdMain);
+ HProductNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("成品编号", grdMain);
+ HVerNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("版本", grdMain);
+ HMouldNoCol = DBUtility.Gy_BaseFun.Fun_GetCol("模具编号", grdMain);
+ HProcWorkNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("程序号", grdMain);
+ HBeginFixQtyCol = DBUtility.Gy_BaseFun.Fun_GetCol("开工余量", grdMain);
+ HBeginDayQtyCol = DBUtility.Gy_BaseFun.Fun_GetCol("开工固天", grdMain);
+ HFixPriceCol = DBUtility.Gy_BaseFun.Fun_GetCol("小时工资", grdMain);
+ HProcPriceCol = DBUtility.Gy_BaseFun.Fun_GetCol("单个工价", grdMain);
+ HPassRateCol = DBUtility.Gy_BaseFun.Fun_GetCol("良率", grdMain);
- HProcNoCol = DBUtility.Gy_BaseFun.Fun_GetCol("工序序号", grdMain);
- HTechnologyParameterCol = DBUtility.Gy_BaseFun.Fun_GetCol("工艺参数", grdMain);
- HPicNumCol = DBUtility.Gy_BaseFun.Fun_GetCol("图纸编号", grdMain);
- HProcCheckNoteCol = DBUtility.Gy_BaseFun.Fun_GetCol("本工序确认记录", grdMain);
- //没有找到列
- if (HMaterNumberCol == -1)
- {
- MessageBox.Show("没有找到【产品代码】的标题", "提示");
- return;
- }
- if (HProcNameCol == -1)
- {
- MessageBox.Show("没有找到【工序】的标题", "提示");
- return;
- }
- if (HWorkCenterNameCol == -1)
- {
- MessageBox.Show("没有找到【工作中心】的标题", "提示");
- return;
- }
- if (HWorkQtyCol == -1)
- {
- MessageBox.Show("没有找到【产能】的标题", "提示");
- return;
- }
- if (HBeginFixQtyCol == -1)
- {
- MessageBox.Show("没有找到【开工余量】的标题", "提示");
- return;
- }
- if (HBeginDayQtyCol == -1)
- {
- MessageBox.Show("没有找到【开工固天】的标题", "提示");
- return;
- }
- if (HFixPriceCol == -1)
- {
- MessageBox.Show("没有找到【小时工资】的标题", "提示");
- return;
- }
- if (HProcPriceCol == -1)
- {
- MessageBox.Show("没有找到【单个工价】的标题", "提示");
- return;
- }
- if (HProcNoCol == -1)
- {
- MessageBox.Show("没有找到【工序序号】的标题", "提示");
- return;
- }
- if (HTechnologyParameterCol == -1)
- {
- MessageBox.Show("没有找到【工艺参数】的标题", "提示");
- return;
- }
- if (HPicNumCol == -1)
- {
- MessageBox.Show("没有找到【图纸编号】的标题", "提示");
- return;
- }
- if (HProcCheckNoteCol == -1)
- {
- MessageBox.Show("没有找到【本工序确认记录】的标题", "提示");
- return;
- }
- //
- if (!Checkdata())
- {
- return;
- }
- if (grdMain.Rows.Count > 0)
- {
- hnumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HMaterNumberCol].Value);
- HBillNo = ClsPub.CreateBillCode(BillNew.BillType, ref ClsPub.sExeReturnInfo, true);
- BillNew.omodel.HStandard = false;
- BillNew.omodel.HMainTimeUnit = "小时";
- BillNew.omodel.HYear = 2011;
- BillNew.omodel.HPeriod = 1;
- BillNew.omodel.HBillNo = HBillNo;
- BillNew.omodel.HDate = DateTime.Today.Date;
- BillNew.DetailColl.Clear();
- }
- for (int i = 0; i <= grdMain.Rows.Count - 1; i++)
- {
- string sHNumber = "";
- if (DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value) != "" )
+ //没有找到列
+ if (HMaterNumberCol == -1)
{
- //
- sHNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value);
- //审核代码是否合理
- if (!DBUtility.ClsPub.AllowNumber(sHNumber))
+ MessageBox.Show("没有找到【产品代码】的标题", "提示");
+ return;
+ }
+ if (HProcNameCol == -1)
+ {
+ MessageBox.Show("没有找到【工序】的标题", "提示");
+ return;
+ }
+ if (HWorkCenterNameCol == -1)
+ {
+ MessageBox.Show("没有找到【工作中心】的标题", "提示");
+ return;
+ }
+ if (HWorkQtyCol == -1)
+ {
+ MessageBox.Show("没有找到【加工数量】的标题", "提示");
+ return;
+ }
+ if (HBeginFixQtyCol == -1)
+ {
+ MessageBox.Show("没有找到【开工余量】的标题", "提示");
+ return;
+ }
+ if (HBeginDayQtyCol == -1)
+ {
+ MessageBox.Show("没有找到【开工固天】的标题", "提示");
+ return;
+ }
+ if (HFixPriceCol == -1)
+ {
+ MessageBox.Show("没有找到【小时工资】的标题", "提示");
+ return;
+ }
+ if (HProcPriceCol == -1)
+ {
+ MessageBox.Show("没有找到【单个工价】的标题", "提示");
+ return;
+ }
+ if (HProcNoCol == -1)
+ {
+ MessageBox.Show("没有找到【工序序号】的标题", "提示");
+ return;
+ }
+ if (HTechnologyParameterCol == -1)
+ {
+ MessageBox.Show("没有找到【工艺参数】的标题", "提示");
+ return;
+ }
+ if (HPicNumCol == -1)
+ {
+ MessageBox.Show("没有找到【图纸编号】的标题", "提示");
+ return;
+ }
+ if (HProcCheckNoteCol == -1)
+ {
+ MessageBox.Show("没有找到【本工序确认记录】的标题", "提示");
+ return;
+ }
+ if (HPicNumVerCol == -1)
+ {
+ MessageBox.Show("没有找到【图号版本】的标题", "提示");
+ return;
+ }
+ if (HPicNumAssembleCol == -1)
+ {
+ MessageBox.Show("没有找到【总装图号】的标题", "提示");
+ return;
+ }
+ if (HMaterTextureCol == -1)
+ {
+ MessageBox.Show("没有找到【材质】的标题", "提示");
+ return;
+ }
+ if (HProductNumCol == -1)
+ {
+ MessageBox.Show("没有找到【成品编号】的标题", "提示");
+ return;
+ }
+ if (HVerNumCol == -1)
+ {
+ MessageBox.Show("没有找到【版本】的标题", "提示");
+ return;
+ }
+ if (HMouldNoCol == -1)
+ {
+ MessageBox.Show("没有找到【模具编号】的标题", "提示");
+ return;
+ }
+ if (HProcWorkNumCol == -1)
+ {
+ MessageBox.Show("没有找到【程序号】的标题", "提示");
+ return;
+ }
+ if (HPassRateCol == -1)
+ {
+ MessageBox.Show("没有找到【良率】的标题", "提示");
+ return;
+ }
+ //
+ if (!Checkdata())
+ {
+ return;
+ }
+ if (grdMain.Rows.Count > 0)
+ {
+ hnumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[0].Cells[HMaterNumberCol].Value);
+ HBillNo = ClsPub.CreateBillCode(BillNew.BillType, ref ClsPub.sExeReturnInfo, true);
+ BillNew.omodel.HStandard = false;
+ BillNew.omodel.HMainTimeUnit = "小时";
+ BillNew.omodel.HYear = 2011;
+ BillNew.omodel.HPeriod = 1;
+ BillNew.omodel.HBillNo = HBillNo;
+ BillNew.omodel.HDate = DateTime.Today.Date;
+ BillNew.omodel.HPicNumVer = "";
+ BillNew.omodel.HPicNumAssemble = "";
+ BillNew.omodel.HMaterTexture = "";
+ BillNew.omodel.HProductNum = "";
+ BillNew.omodel.HVerNum = "";
+ BillNew.DetailColl.Clear();
+ }
+ for (int i = 0; i <= grdMain.Rows.Count - 1; i++)
+ {
+ BillNew.omodel.HPicNumVer = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumVerCol].Value);
+ BillNew.omodel.HPicNumAssemble = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumAssembleCol].Value);
+ BillNew.omodel.HMaterTexture = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterTextureCol].Value);
+ BillNew.omodel.HProductNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProductNumCol].Value);
+ BillNew.omodel.HVerNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HVerNumCol].Value);
+ string sHNumber = "";
+ if (DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value) != "")
{
- MessageBox.Show("物料代码中不能出现连续‘.’并且首位末位不能为‘.’！", "提示");
- return;
- }
-
- if (hnumber == DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value))
- {
- //得到物料内码
- if (oMaterHlp.GetInfoByNumber(sHNumber))
- {
- if (BillNew.omodel.HMaterID != oMaterHlp.omodel.HItemID)
- {
- BillNew.omodel.HMaterID = oMaterHlp.omodel.HItemID;
- BillNew.omodel.HMaterNumber = oMaterHlp.omodel.HNumber;
- BillNew.omodel.HUnitID = oMaterHlp.omodel.HUnitID;
- BillNew.omodel.HUnitNumber = oMaterHlp.omodel.HUnitNumber;
- }
-
- }
- else
- {
- BillNew.omodel.HMaterID = 0;
- MessageBox.Show("第" + i.ToString() + "行," + sHNumber + "没有找到对应的物料！");
- return;
- }
- j++;
- //写入类
- WriteClass(i);
-
- }
- else
- {
- DataSet Ds;
- ClsCN oCn=new ClsCN();
- bool b = false;
- // 判断是否存在工艺路线
- Ds = oCn.RunProcReturn("Select HMaterID from Gy_RoutingBillMain Where HMaterID=" + BillNew.omodel.HMaterID.ToString(), "Gy_RoutingBillMain");
- if (checkadd.Checked == true)
- {
- //if (Ds.Tables[0].Rows.Count == 0)//追加
- //{
- //新增前 先删除原来工艺
- BillNew.DeleteByMaterID(BillNew.omodel.HMaterID);
- b = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
- if (b == false) return;
- c++;
- BillNew.CheckBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
- //}
- //else
- //{
-
- //}
- }
- else
- {
- BillNew.DeleteByMaterID(BillNew.omodel.HMaterID);
- b = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
- if (b == false) return;
- c++;
- BillNew.CheckBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
- }
-
-
- BillNew.DetailColl.Clear();
- hnumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value);
+ //
sHNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value);
-
//审核代码是否合理
if (!DBUtility.ClsPub.AllowNumber(sHNumber))
{
MessageBox.Show("物料代码中不能出现连续‘.’并且首位末位不能为‘.’！", "提示");
return;
}
- //得到物料内码
- if (oMaterHlp.GetInfoByNumber(sHNumber))
+
+ if (hnumber == DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value))
{
- if (BillNew.omodel.HMaterID != oMaterHlp.omodel.HItemID)
+ //得到物料内码
+ if (oMaterHlp.GetInfoByNumber(sHNumber))
{
- BillNew.omodel.HMaterID = oMaterHlp.omodel.HItemID;
- BillNew.omodel.HMaterNumber = oMaterHlp.omodel.HNumber;
- BillNew.omodel.HUnitID = oMaterHlp.omodel.HUnitID;
- BillNew.omodel.HUnitNumber = oMaterHlp.omodel.HUnitNumber;
+ if (BillNew.omodel.HMaterID != oMaterHlp.omodel.HItemID)
+ {
+ BillNew.omodel.HMaterID = oMaterHlp.omodel.HItemID;
+ BillNew.omodel.HMaterNumber = oMaterHlp.omodel.HNumber;
+ BillNew.omodel.HUnitID = oMaterHlp.omodel.HUnitID;
+ BillNew.omodel.HUnitNumber = oMaterHlp.omodel.HUnitNumber;
+ }
+
}
+ else
+ {
+ BillNew.omodel.HMaterID = 0;
+ MessageBox.Show("第" + i.ToString() + "行," + sHNumber + "没有找到对应的物料！");
+ return;
+ }
+ j++;
+ //写入类
+ WriteClass(i);
}
else
{
- BillNew.omodel.HMaterID = 0;
- MessageBox.Show("第" + i.ToString() + "行," + sHNumber + "没有找到对应的物料！");
- return;
+ DataSet Ds;
+ ClsCN oCn = new ClsCN();
+ bool b = false;
+ // 判断是否存在工艺路线
+ Ds = oCn.RunProcReturn("Select HMaterID from Gy_RoutingBillMain Where HMaterID=" + BillNew.omodel.HMaterID.ToString(), "Gy_RoutingBillMain");
+ if (checkadd.Checked == true)
+ {
+ //if (Ds.Tables[0].Rows.Count == 0)//追加
+ //{
+ //新增前 先删除原来工艺
+ BillNew.DeleteByMaterID(BillNew.omodel.HMaterID);
+ b = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ if (b == false)
+ {
+ MessageBox.Show("第" + i.ToString() + "行,物料" + BillNew.omodel.HMaterNumber + "新增工艺路线失败！代码293行中，原因：" + ClsPub.sExeReturnInfo);
+ return;
+ }
+ c++;
+ BillNew.CheckBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
+ //}
+ //else
+ //{
+
+ //}
+ }
+ else
+ {
+ BillNew.DeleteByMaterID(BillNew.omodel.HMaterID);
+ b = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
+ if (b == false)
+ {
+ MessageBox.Show("第" + i.ToString() + "行,物料" + sHNumber + "新增工艺路线失败！代码310行中");
+ return;
+ }
+ c++;
+ BillNew.CheckBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
+ }
+
+
+ BillNew.DetailColl.Clear();
+ hnumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value);
+ sHNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value);
+
+ //审核代码是否合理
+ if (!DBUtility.ClsPub.AllowNumber(sHNumber))
+ {
+ MessageBox.Show("物料代码中不能出现连续‘.’并且首位末位不能为‘.’！", "提示");
+ return;
+ }
+ //得到物料内码
+ if (oMaterHlp.GetInfoByNumber(sHNumber))
+ {
+ if (BillNew.omodel.HMaterID != oMaterHlp.omodel.HItemID)
+ {
+ BillNew.omodel.HMaterID = oMaterHlp.omodel.HItemID;
+ BillNew.omodel.HMaterNumber = oMaterHlp.omodel.HNumber;
+ BillNew.omodel.HUnitID = oMaterHlp.omodel.HUnitID;
+ BillNew.omodel.HUnitNumber = oMaterHlp.omodel.HUnitNumber;
+ }
+
+ }
+ else
+ {
+ BillNew.omodel.HMaterID = 0;
+ MessageBox.Show("第" + i.ToString() + "行," + sHNumber + "没有找到对应的物料！");
+ return;
+ }
+ j = 0;
+ HBillNo = ClsPub.CreateBillCode(BillNew.BillType, ref ClsPub.sExeReturnInfo, true);
+ BillNew.omodel.HBillNo = HBillNo;
+ //写入类
+ WriteClass(i);
}
- j = 0;
- HBillNo = ClsPub.CreateBillCode(BillNew.BillType, ref ClsPub.sExeReturnInfo, true);
- BillNew.omodel.HBillNo = HBillNo;
- //写入类
- WriteClass(i);
+ }
+ else
+ {
+ MessageBox.Show("第" + i.ToString() + "行,没有找到对应的物料！");
+ return;
}
}
- else
+ //最后一个物料处理
+ if (BillNew.DetailColl.Count > 0)
{
- MessageBox.Show("第" + i.ToString() + "行,没有找到对应的物料！");
- return;
- }
- }
- //最后一个物料处理
- if (BillNew.DetailColl.Count > 0)
- {
- DataSet Ds;
- ClsCN oCn = new ClsCN();
- bool b = false;
- //Ds = oCn.RunProcReturn("Select HMaterID from Gy_RoutingBillMain Where HMaterID=" + BillNew.omodel.HMaterID.ToString(), "Gy_RoutingBillMain");
- //if (Ds.Tables[0].Rows.Count == 0)
- //{
+ DataSet Ds;
+ ClsCN oCn = new ClsCN();
+ bool b = false;
+ //Ds = oCn.RunProcReturn("Select HMaterID from Gy_RoutingBillMain Where HMaterID=" + BillNew.omodel.HMaterID.ToString(), "Gy_RoutingBillMain");
+ //if (Ds.Tables[0].Rows.Count == 0)
+ //{
BillNew.DeleteByMaterID(BillNew.omodel.HMaterID);
b = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
if (b == false) return;
c++;
BillNew.CheckBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
- //}
- MessageBox.Show("导入完毕:共"+c.ToString()+"个工艺路线");
- grdMain.DataSource = null;
+ //}
+ MessageBox.Show("导入完毕:共" + c.ToString() + "个工艺路线");
+ grdMain.DataSource = null;
+ }
+ c = 0;
}
- c = 0;
+ catch (Exception e)
+ {
+ MessageBox.Show("导入失败!原因:" + e.Message, "提示");
+ }
}
//写入类 从控件
private bool WriteClass(int row)
{
string sHNumber = "";
- string sHNamePoc = "";
+ string sHNamePoc = "";
string sHNumberCen = "";
Single sWorkQty = 0;
Single sBeginDayQty = 0;
Single sBeginFixQty = 0;
+ Single sHPassRate = 0;
//long HItemID = 0;
//
- sHNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HMaterNumberCol].Value);
+ sHNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HMaterNumberCol].Value);
sHNumberCen = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HWorkCenterNameCol].Value);
sHNamePoc = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HProcNameCol].Value);
sWorkQty = DBUtility.ClsPub.isSingle(grdMain.Rows[row].Cells[HWorkQtyCol].Value);
sBeginDayQty = DBUtility.ClsPub.isSingle(grdMain.Rows[row].Cells[HBeginDayQtyCol].Value);
sBeginFixQty = DBUtility.ClsPub.isSingle(grdMain.Rows[row].Cells[HBeginFixQtyCol].Value);
+ sHPassRate = DBUtility.ClsPub.isSingle(grdMain.Rows[row].Cells[HPassRateCol].Value);
//判断是否允许 保存
-
- Model.ClsGy_RoutingBillSub oSub=new Model.ClsGy_RoutingBillSub();
+
+ Model.ClsGy_RoutingBillSub oSub = new Model.ClsGy_RoutingBillSub();
//得到工序内码
if (oProcHlp.GetInfoByName(sHNamePoc))
@@ -339,20 +423,21 @@
oSub.HProcNo = DBUtility.ClsPub.isInt(grdMain.Rows[row].Cells[HProcNoCol].Value);
oSub.HUnitTime = 1;
oSub.HWorkQty = sWorkQty;
+ oSub.HPassRate = sHPassRate;
oSub.HRemark = "";
oSub.HTimeUnit = "小时";
oSub.HReadyTime = 0;
oSub.HQueueTime = 0;
oSub.HMoveTime = 0;
//
-
+
//
oSub.HCloseMan = "";
oSub.HCloseType = false;
oSub.HSourceInterID = 0;
oSub.HSourceEntryID = 0;
oSub.HSourceBillType = "";
- oSub.HSourceBillNo ="";
+ oSub.HSourceBillNo = "";
oSub.HRelationQty = 0;
oSub.HRelationMoney = 0;
@@ -366,6 +451,8 @@
oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HTechnologyParameterCol].Value);
oSub.HPicNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HPicNumCol].Value);
oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HProcCheckNoteCol].Value);
+ oSub.HMouldNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HMouldNoCol].Value);
+ oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[row].Cells[HProcWorkNumCol].Value);
BillNew.DetailColl.Add(oSub);
return true;
}
@@ -373,22 +460,39 @@
//检查物料
private bool Checkdata()
{
- bool b=false;
+ bool b = false;
string sErrMsg = "";
string sMsg = "";
for (int i = 0; i <= grdMain.Rows.Count - 1; i++)
{
string sHNumber = "";
- string sHNamePoc = "";
+ string sHNamePoc = "";
string sHNumberCen = "";
-
+ Single sWorkQty = 0;
+ Single sHPassRate = 0;
+
//
sHNumber = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMaterNumberCol].Value);
sHNumberCen = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HWorkCenterNameCol].Value);
sHNamePoc = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcNameCol].Value);
- if (sHNumber != "" )
+ sWorkQty = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HWorkQtyCol].Value);
+ sHPassRate = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HPassRateCol].Value);
+ if (sHNumber != "")
{
//
+ int index = i + 1;
+ //加工数量不能小于等于零
+ if (sWorkQty <= 0)
+ {
+ MessageBox.Show("第" + index + "行加工数量不能小于等于零！", "提示");
+ return false;
+ }
+ //良率不能小于等于零
+ if (sHPassRate <= 0)
+ {
+ MessageBox.Show("第" + index + "行良率不能小于等于零！", "提示");
+ return false;
+ }
//审核代码是否合理
if (!DBUtility.ClsPub.AllowNumber(sHNumber))
{
@@ -400,9 +504,9 @@
if (!oMaterHlp.GetInfoByNumber(sHNumber))
{
sMsg = "[" + sHNumber + "]物料不存在";
- if (sErrMsg.Contains(sMsg)==false)
+ if (sErrMsg.Contains(sMsg) == false)
{
- sErrMsg = sErrMsg + "[" + sHNumber + "]物料不存在\r\n" ;
+ sErrMsg = sErrMsg + "[" + sHNumber + "]物料不存在\r\n";
}
b = true;
}
@@ -429,7 +533,7 @@
}
- }
+ }
}
if (b == true)
{
diff --git "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs" "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs"
index ecb98f4..613641e 100644
--- "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs"
+++ "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.cs"
@@ -91,6 +91,7 @@
public const Int16 HTechnologyParameterCol = 59;
public const Int16 HPicNumCol = 60;
public const Int16 HProcCheckNoteCol = 61;
+ public const Int16 HProcWorkNumCol = 62;
//
public string ModName = "3301";
@@ -953,6 +954,7 @@
grdMain.Rows[i].Cells[HWorkQty_SCol].Value = oSub.HWorkQty_S.ToString();
grdMain.Rows[i].Cells[HSubStdEmpQty_SCol].Value = oSub.HSubStdEmpQty_S.ToString();
grdMain.Rows[i].Cells[HMouldNoCol].Value = oSub.HMouldNo;
+ grdMain.Rows[i].Cells[HProcWorkNumCol].Value = oSub.HProcWorkNum;
grdMain.Rows[i].Cells[HChangeMouldCol].Value = oSub.HChangeMould.ToString();
grdMain.Rows[i].Cells[HPackStdCol].Value = oSub.HPackStd;
grdMain.Rows[i].Cells[HPackCol].Value = oSub.HPack;
@@ -1057,7 +1059,13 @@
BillNew.omodel.HStdSourceQty = ClsPub.isSingle(this.txtHStdSourceQty.Text);
BillNew.omodel.HAddSourceRate = ClsPub.isSingle(this.txtHAddSourceRate.Text);
BillNew.omodel.HDelSourceRate = ClsPub.isSingle(this.txtHDelSourceRate.Text);
-
+
+ BillNew.omodel.HPicNumVer = ClsPub.isStrNull(this.textHPicNumVer.Text);
+ BillNew.omodel.HPicNumAssemble = ClsPub.isStrNull(this.textHPicNumAssemble.Text);
+ BillNew.omodel.HMaterTexture = ClsPub.isStrNull(this.textHMaterTexture.Text);
+ BillNew.omodel.HProductNum = ClsPub.isStrNull(this.textHProductNum.Text);
+ BillNew.omodel.HVerNum = ClsPub.isStrNull(this.textHVerNum.Text);
+
//鏄庣粏绫昏祴鍊�
BillNew.DetailColl=new List<Model.ClsGy_RoutingBillSub>();
for (i = 0; i <= grdMain.RowCount - 1; i++)
@@ -1111,6 +1119,7 @@
oSub.HProcID_S = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HProcID_SCol].Value);
oSub.HCenterID_S = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HCenterID_SCol].Value);
oSub.HMouldNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMouldNoCol].Value);
+ oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcWorkNumCol].Value);
oSub.HPackStd = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPackStdCol].Value);
oSub.HPack = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPackCol].Value);
oSub.HPutArea = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPutAreaCol].Value);
@@ -1153,6 +1162,8 @@
oSub.HStdFlag = DBUtility.ClsPub.isBool(grdMain.Rows[i].Cells[HStdFlagCol].Value);
oSub.HAutoTrunFlag = DBUtility.ClsPub.isBool(grdMain.Rows[i].Cells[HAutoTrunFlagCol].Value);
oSub.HProcType = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcTypeCol].Value);
+
+ oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcWorkNumCol].Value);
if (DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HPassRateCol].Value) > 0)
{
oSub.HPassRate = DBUtility.ClsPub.isSingle(grdMain.Rows[i].Cells[HPassRateCol].Value);
@@ -1225,7 +1236,7 @@
private void initGrid()
{
//
- grdMain.ColumnCount = 62; //鎬诲垪鏁�
+ grdMain.ColumnCount = 63; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
//
grdMain.RowsDefaultCellStyle.WrapMode = DataGridViewTriState.True;
@@ -1301,6 +1312,7 @@
grdMain.Columns[HTechnologyParameterCol].HeaderText = "宸ヨ壓鍙傛暟";
grdMain.Columns[HPicNumCol].HeaderText = "鍥剧焊缂栧彿";
grdMain.Columns[HProcCheckNoteCol].HeaderText = "鏈伐搴忕‘璁よ褰�";
+ grdMain.Columns[HProcWorkNumCol].HeaderText = "绋嬪簭鍙�";
//鏍煎紡鍖�
grdMain.Columns[HTagCol].Visible = false;
//闅愯棌鍒�
@@ -1344,6 +1356,7 @@
"," + HWorkQty_SCol.ToString() +
"," + HSubStdEmpQty_SCol.ToString() +
"," + HMouldNoCol.ToString() +
+ "," + HProcWorkNumCol.ToString() +
"," + HChangeMouldCol.ToString() +
"," + HPackStdCol.ToString() +
"," + HPackCol.ToString() +
diff --git "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.designer.cs" "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.designer.cs"
index fad1016..1cc9378 100644
--- "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.designer.cs"
+++ "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.designer.cs"
@@ -45,6 +45,8 @@
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.sh = new System.Windows.Forms.ToolStripButton();
this.qsh = new System.Windows.Forms.ToolStripButton();
+ this.sy = new System.Windows.Forms.ToolStripButton();
+ this.fsy = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.sz = new System.Windows.Forms.ToolStripButton();
this.syz = new System.Windows.Forms.ToolStripButton();
@@ -79,6 +81,10 @@
this.P1 = new System.Windows.Forms.Panel();
this.pic1 = new System.Windows.Forms.PictureBox();
this.gbUp = new System.Windows.Forms.GroupBox();
+ this.chkHUseFlag = new System.Windows.Forms.CheckBox();
+ this.cmdHGroupID = new System.Windows.Forms.Button();
+ this.txtHGroupID = new System.Windows.Forms.TextBox();
+ this.label31 = new System.Windows.Forms.Label();
this.txtHMainPrice = new System.Windows.Forms.TextBox();
this.label30 = new System.Windows.Forms.Label();
this.txtHDelSourceRate = new System.Windows.Forms.TextBox();
@@ -123,6 +129,10 @@
this.cmbSourceBillType = new System.Windows.Forms.ComboBox();
this.label10 = new System.Windows.Forms.Label();
this.panel2 = new System.Windows.Forms.Panel();
+ this.txtHUseDate = new System.Windows.Forms.Label();
+ this.label33 = new System.Windows.Forms.Label();
+ this.txtHUseMan = new System.Windows.Forms.Label();
+ this.label35 = new System.Windows.Forms.Label();
this.txtHDeleteDate = new System.Windows.Forms.Label();
this.label25 = new System.Windows.Forms.Label();
this.txtHDeleteMan = new System.Windows.Forms.Label();
@@ -149,16 +159,16 @@
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
this.grdPrint = new System.Windows.Forms.DataGridView();
- this.cmdHGroupID = new System.Windows.Forms.Button();
- this.txtHGroupID = new System.Windows.Forms.TextBox();
- this.label31 = new System.Windows.Forms.Label();
- this.txtHUseDate = new System.Windows.Forms.Label();
- this.label33 = new System.Windows.Forms.Label();
- this.txtHUseMan = new System.Windows.Forms.Label();
- this.label35 = new System.Windows.Forms.Label();
- this.chkHUseFlag = new System.Windows.Forms.CheckBox();
- this.sy = new System.Windows.Forms.ToolStripButton();
- this.fsy = new System.Windows.Forms.ToolStripButton();
+ this.label32 = new System.Windows.Forms.Label();
+ this.textHPicNumVer = new System.Windows.Forms.TextBox();
+ this.textHPicNumAssemble = new System.Windows.Forms.TextBox();
+ this.label34 = new System.Windows.Forms.Label();
+ this.textHMaterTexture = new System.Windows.Forms.TextBox();
+ this.label36 = new System.Windows.Forms.Label();
+ this.textHProductNum = new System.Windows.Forms.TextBox();
+ this.label37 = new System.Windows.Forms.Label();
+ this.textHVerNum = new System.Windows.Forms.TextBox();
+ this.label38 = new System.Windows.Forms.Label();
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
@@ -211,7 +221,7 @@
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(1017, 50);
+ this.Tool.Size = new System.Drawing.Size(1314, 50);
this.Tool.Stretch = true;
this.Tool.TabIndex = 17;
this.Tool.Text = "toolStrip1";
@@ -378,6 +388,34 @@
this.qsh.Visible = false;
this.qsh.Click += new System.EventHandler(this.qsh_Click);
//
+ // sy
+ //
+ this.sy.AutoSize = false;
+ this.sy.Image = ((System.Drawing.Image)(resources.GetObject("sy.Image")));
+ this.sy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.sy.ImageTransparentColor = System.Drawing.Color.White;
+ this.sy.Name = "sy";
+ this.sy.Size = new System.Drawing.Size(35, 47);
+ this.sy.Text = "浣跨敤";
+ this.sy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.sy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.sy.Click += new System.EventHandler(this.sy_Click);
+ //
+ // fsy
+ //
+ this.fsy.AutoSize = false;
+ this.fsy.Image = ((System.Drawing.Image)(resources.GetObject("fsy.Image")));
+ this.fsy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fsy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.fsy.ImageTransparentColor = System.Drawing.Color.White;
+ this.fsy.Name = "fsy";
+ this.fsy.Size = new System.Drawing.Size(35, 47);
+ this.fsy.Text = "鍙栨秷";
+ this.fsy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fsy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.fsy.Click += new System.EventHandler(this.fsy_Click);
+ //
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
@@ -481,7 +519,7 @@
this.qt.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.qt.ImageTransparentColor = System.Drawing.Color.White;
this.qt.Name = "qt";
- this.qt.Size = new System.Drawing.Size(42, 47);
+ this.qt.Size = new System.Drawing.Size(45, 47);
this.qt.Text = "鍏朵粬";
this.qt.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.qt.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -489,64 +527,64 @@
// 鍏抽棴ToolStripMenuItem
//
this.鍏抽棴ToolStripMenuItem.Name = "鍏抽棴ToolStripMenuItem";
- this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
this.鍏抽棴ToolStripMenuItem.Text = "鍏抽棴";
this.鍏抽棴ToolStripMenuItem.Click += new System.EventHandler(this.鍏抽棴ToolStripMenuItem_Click);
//
// 鍙嶅叧闂璗oolStripMenuItem
//
this.鍙嶅叧闂璗oolStripMenuItem.Name = "鍙嶅叧闂璗oolStripMenuItem";
- this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(136, 22);
this.鍙嶅叧闂璗oolStripMenuItem.Text = "鍙嶅叧闂�";
this.鍙嶅叧闂璗oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅叧闂璗oolStripMenuItem_Click);
//
// toolStripSeparator15
//
this.toolStripSeparator15.Name = "toolStripSeparator15";
- this.toolStripSeparator15.Size = new System.Drawing.Size(149, 6);
+ this.toolStripSeparator15.Size = new System.Drawing.Size(133, 6);
//
// 瀹℃牳ToolStripMenuItem
//
this.瀹℃牳ToolStripMenuItem.Name = "瀹℃牳ToolStripMenuItem";
- this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
this.瀹℃牳ToolStripMenuItem.Text = "瀹℃牳";
this.瀹℃牳ToolStripMenuItem.Click += new System.EventHandler(this.瀹℃牳ToolStripMenuItem_Click);
//
// 鍙嶅鏍窽oolStripMenuItem
//
this.鍙嶅鏍窽oolStripMenuItem.Name = "鍙嶅鏍窽oolStripMenuItem";
- this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(136, 22);
this.鍙嶅鏍窽oolStripMenuItem.Text = "鍙嶅鏍�";
this.鍙嶅鏍窽oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅鏍窽oolStripMenuItem_Click);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
- this.toolStripSeparator14.Size = new System.Drawing.Size(149, 6);
+ this.toolStripSeparator14.Size = new System.Drawing.Size(133, 6);
//
// 浣滃簾ToolStripMenuItem
//
this.浣滃簾ToolStripMenuItem.Name = "浣滃簾ToolStripMenuItem";
- this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
this.浣滃簾ToolStripMenuItem.Text = "浣滃簾";
this.浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.浣滃簾ToolStripMenuItem_Click);
//
// 鎾ら攢浣滃簾ToolStripMenuItem
//
this.鎾ら攢浣滃簾ToolStripMenuItem.Name = "鎾ら攢浣滃簾ToolStripMenuItem";
- this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
this.鎾ら攢浣滃簾ToolStripMenuItem.Text = "鎾ら攢浣滃簾";
this.鎾ら攢浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.鎾ら攢浣滃簾ToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
- this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6);
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(133, 6);
//
// 闅愯棌鍒楄缃甌oolStripMenuItem
//
this.闅愯棌鍒楄缃甌oolStripMenuItem.Name = "闅愯棌鍒楄缃甌oolStripMenuItem";
- this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+ this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(136, 22);
this.闅愯棌鍒楄缃甌oolStripMenuItem.Text = "闅愯棌鍒楄缃�";
this.闅愯棌鍒楄缃甌oolStripMenuItem.Click += new System.EventHandler(this.闅愯棌鍒楄缃甌oolStripMenuItem_Click);
//
@@ -583,7 +621,7 @@
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(57, 47);
+ this.mrlk.Size = new System.Drawing.Size(60, 47);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -603,7 +641,7 @@
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(57, 47);
+ this.bclk.Size = new System.Drawing.Size(60, 47);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -673,7 +711,7 @@
this.P1.Dock = System.Windows.Forms.DockStyle.Top;
this.P1.Location = new System.Drawing.Point(41, 50);
this.P1.Name = "P1";
- this.P1.Size = new System.Drawing.Size(937, 273);
+ this.P1.Size = new System.Drawing.Size(1234, 273);
this.P1.TabIndex = 31;
//
// pic1
@@ -689,6 +727,16 @@
// gbUp
//
this.gbUp.BackColor = System.Drawing.Color.Transparent;
+ this.gbUp.Controls.Add(this.textHVerNum);
+ this.gbUp.Controls.Add(this.label38);
+ this.gbUp.Controls.Add(this.textHProductNum);
+ this.gbUp.Controls.Add(this.label37);
+ this.gbUp.Controls.Add(this.textHMaterTexture);
+ this.gbUp.Controls.Add(this.label36);
+ this.gbUp.Controls.Add(this.textHPicNumAssemble);
+ this.gbUp.Controls.Add(this.label34);
+ this.gbUp.Controls.Add(this.textHPicNumVer);
+ this.gbUp.Controls.Add(this.label32);
this.gbUp.Controls.Add(this.chkHUseFlag);
this.gbUp.Controls.Add(this.cmdHGroupID);
this.gbUp.Controls.Add(this.txtHGroupID);
@@ -737,9 +785,52 @@
this.gbUp.Controls.Add(this.txtHUnitID);
this.gbUp.Location = new System.Drawing.Point(14, 50);
this.gbUp.Name = "gbUp";
- this.gbUp.Size = new System.Drawing.Size(892, 216);
+ this.gbUp.Size = new System.Drawing.Size(1199, 216);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
+ //
+ // chkHUseFlag
+ //
+ this.chkHUseFlag.AutoSize = true;
+ this.chkHUseFlag.Enabled = false;
+ this.chkHUseFlag.Location = new System.Drawing.Point(769, 187);
+ this.chkHUseFlag.Name = "chkHUseFlag";
+ this.chkHUseFlag.Size = new System.Drawing.Size(72, 16);
+ this.chkHUseFlag.TabIndex = 134;
+ this.chkHUseFlag.Text = "鏄惁鍚敤";
+ this.chkHUseFlag.UseVisualStyleBackColor = true;
+ //
+ // cmdHGroupID
+ //
+ this.cmdHGroupID.BackColor = System.Drawing.Color.Transparent;
+ this.cmdHGroupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHGroupID.Image")));
+ this.cmdHGroupID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
+ this.cmdHGroupID.Location = new System.Drawing.Point(828, 106);
+ this.cmdHGroupID.Name = "cmdHGroupID";
+ this.cmdHGroupID.Size = new System.Drawing.Size(22, 22);
+ this.cmdHGroupID.TabIndex = 133;
+ this.cmdHGroupID.UseVisualStyleBackColor = false;
+ this.cmdHGroupID.Click += new System.EventHandler(this.cmdHGroupID_Click);
+ //
+ // txtHGroupID
+ //
+ this.txtHGroupID.BackColor = System.Drawing.Color.Beige;
+ this.txtHGroupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.txtHGroupID.Location = new System.Drawing.Point(667, 105);
+ this.txtHGroupID.Name = "txtHGroupID";
+ this.txtHGroupID.Size = new System.Drawing.Size(161, 21);
+ this.txtHGroupID.TabIndex = 132;
+ this.txtHGroupID.TextChanged += new System.EventHandler(this.txtHGroupID_TextChanged);
+ //
+ // label31
+ //
+ this.label31.AutoSize = true;
+ this.label31.ForeColor = System.Drawing.Color.Black;
+ this.label31.Location = new System.Drawing.Point(606, 108);
+ this.label31.Name = "label31";
+ this.label31.Size = new System.Drawing.Size(53, 12);
+ this.label31.TabIndex = 131;
+ this.label31.Text = "鐢熶骇鐝粍";
//
// txtHMainPrice
//
@@ -1210,8 +1301,48 @@
this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel2.Location = new System.Drawing.Point(41, 649);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(937, 93);
+ this.panel2.Size = new System.Drawing.Size(1234, 93);
this.panel2.TabIndex = 32;
+ //
+ // txtHUseDate
+ //
+ this.txtHUseDate.BackColor = System.Drawing.Color.Transparent;
+ this.txtHUseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHUseDate.Location = new System.Drawing.Point(361, 47);
+ this.txtHUseDate.Name = "txtHUseDate";
+ this.txtHUseDate.Size = new System.Drawing.Size(80, 15);
+ this.txtHUseDate.TabIndex = 23;
+ //
+ // label33
+ //
+ this.label33.AutoSize = true;
+ this.label33.BackColor = System.Drawing.Color.Transparent;
+ this.label33.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label33.Location = new System.Drawing.Point(302, 50);
+ this.label33.Name = "label33";
+ this.label33.Size = new System.Drawing.Size(53, 12);
+ this.label33.TabIndex = 22;
+ this.label33.Text = "鍚敤鏃ユ湡";
+ //
+ // txtHUseMan
+ //
+ this.txtHUseMan.BackColor = System.Drawing.Color.Transparent;
+ this.txtHUseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.txtHUseMan.Location = new System.Drawing.Point(361, 13);
+ this.txtHUseMan.Name = "txtHUseMan";
+ this.txtHUseMan.Size = new System.Drawing.Size(80, 15);
+ this.txtHUseMan.TabIndex = 21;
+ //
+ // label35
+ //
+ this.label35.AutoSize = true;
+ this.label35.BackColor = System.Drawing.Color.Transparent;
+ this.label35.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
+ this.label35.Location = new System.Drawing.Point(302, 16);
+ this.label35.Name = "label35";
+ this.label35.Size = new System.Drawing.Size(41, 12);
+ this.label35.TabIndex = 20;
+ this.label35.Text = "鍚敤浜�";
//
// txtHDeleteDate
//
@@ -1429,7 +1560,7 @@
// panel3
//
this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel3.Location = new System.Drawing.Point(978, 50);
+ this.panel3.Location = new System.Drawing.Point(1275, 50);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(39, 692);
this.panel3.TabIndex = 34;
@@ -1448,15 +1579,15 @@
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 30;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(937, 307);
+ this.grdMain.Size = new System.Drawing.Size(1234, 307);
this.grdMain.TabIndex = 44;
- this.grdMain.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Scroll);
- this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
- this.grdMain.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellLeave);
- this.grdMain.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellEndEdit);
this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
- this.grdMain.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.grdMain_EditingControlShowing);
+ this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
+ this.grdMain.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellEndEdit);
+ this.grdMain.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.grdMain_CellLeave);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
+ this.grdMain.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.grdMain_EditingControlShowing);
+ this.grdMain.Scroll += new System.Windows.Forms.ScrollEventHandler(this.grdMain_Scroll);
//
// grdSum
//
@@ -1470,7 +1601,7 @@
this.grdSum.ReadOnly = true;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(937, 19);
+ this.grdSum.Size = new System.Drawing.Size(1234, 19);
this.grdSum.TabIndex = 45;
//
// grdPrint
@@ -1483,123 +1614,107 @@
this.grdPrint.TabIndex = 46;
this.grdPrint.Visible = false;
//
- // cmdHGroupID
+ // label32
//
- this.cmdHGroupID.BackColor = System.Drawing.Color.Transparent;
- this.cmdHGroupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHGroupID.Image")));
- this.cmdHGroupID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHGroupID.Location = new System.Drawing.Point(828, 106);
- this.cmdHGroupID.Name = "cmdHGroupID";
- this.cmdHGroupID.Size = new System.Drawing.Size(22, 22);
- this.cmdHGroupID.TabIndex = 133;
- this.cmdHGroupID.UseVisualStyleBackColor = false;
- this.cmdHGroupID.Click += new System.EventHandler(this.cmdHGroupID_Click);
+ this.label32.AutoSize = true;
+ this.label32.ForeColor = System.Drawing.Color.Black;
+ this.label32.Location = new System.Drawing.Point(884, 23);
+ this.label32.Name = "label32";
+ this.label32.Size = new System.Drawing.Size(53, 12);
+ this.label32.TabIndex = 135;
+ this.label32.Text = "鍥惧彿鐗堟湰";
//
- // txtHGroupID
+ // textHPicNumVer
//
- this.txtHGroupID.BackColor = System.Drawing.Color.Beige;
- this.txtHGroupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHGroupID.Location = new System.Drawing.Point(667, 105);
- this.txtHGroupID.Name = "txtHGroupID";
- this.txtHGroupID.Size = new System.Drawing.Size(161, 21);
- this.txtHGroupID.TabIndex = 132;
- this.txtHGroupID.TextChanged += new System.EventHandler(this.txtHGroupID_TextChanged);
+ this.textHPicNumVer.BackColor = System.Drawing.Color.Beige;
+ this.textHPicNumVer.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHPicNumVer.Location = new System.Drawing.Point(967, 20);
+ this.textHPicNumVer.Name = "textHPicNumVer";
+ this.textHPicNumVer.Size = new System.Drawing.Size(187, 21);
+ this.textHPicNumVer.TabIndex = 136;
//
- // label31
+ // textHPicNumAssemble
//
- this.label31.AutoSize = true;
- this.label31.ForeColor = System.Drawing.Color.Black;
- this.label31.Location = new System.Drawing.Point(606, 108);
- this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(53, 12);
- this.label31.TabIndex = 131;
- this.label31.Text = "鐢熶骇鐝粍";
+ this.textHPicNumAssemble.BackColor = System.Drawing.Color.Beige;
+ this.textHPicNumAssemble.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHPicNumAssemble.Location = new System.Drawing.Point(967, 51);
+ this.textHPicNumAssemble.Name = "textHPicNumAssemble";
+ this.textHPicNumAssemble.Size = new System.Drawing.Size(187, 21);
+ this.textHPicNumAssemble.TabIndex = 138;
//
- // txtHUseDate
+ // label34
//
- this.txtHUseDate.BackColor = System.Drawing.Color.Transparent;
- this.txtHUseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUseDate.Location = new System.Drawing.Point(361, 47);
- this.txtHUseDate.Name = "txtHUseDate";
- this.txtHUseDate.Size = new System.Drawing.Size(80, 15);
- this.txtHUseDate.TabIndex = 23;
+ this.label34.AutoSize = true;
+ this.label34.ForeColor = System.Drawing.Color.Black;
+ this.label34.Location = new System.Drawing.Point(884, 54);
+ this.label34.Name = "label34";
+ this.label34.Size = new System.Drawing.Size(53, 12);
+ this.label34.TabIndex = 137;
+ this.label34.Text = "鎬昏鍥惧彿";
//
- // label33
+ // textHMaterTexture
//
- this.label33.AutoSize = true;
- this.label33.BackColor = System.Drawing.Color.Transparent;
- this.label33.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label33.Location = new System.Drawing.Point(302, 50);
- this.label33.Name = "label33";
- this.label33.Size = new System.Drawing.Size(53, 12);
- this.label33.TabIndex = 22;
- this.label33.Text = "鍚敤鏃ユ湡";
+ this.textHMaterTexture.BackColor = System.Drawing.Color.Beige;
+ this.textHMaterTexture.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHMaterTexture.Location = new System.Drawing.Point(967, 78);
+ this.textHMaterTexture.Name = "textHMaterTexture";
+ this.textHMaterTexture.Size = new System.Drawing.Size(187, 21);
+ this.textHMaterTexture.TabIndex = 140;
//
- // txtHUseMan
+ // label36
//
- this.txtHUseMan.BackColor = System.Drawing.Color.Transparent;
- this.txtHUseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUseMan.Location = new System.Drawing.Point(361, 13);
- this.txtHUseMan.Name = "txtHUseMan";
- this.txtHUseMan.Size = new System.Drawing.Size(80, 15);
- this.txtHUseMan.TabIndex = 21;
+ this.label36.AutoSize = true;
+ this.label36.ForeColor = System.Drawing.Color.Black;
+ this.label36.Location = new System.Drawing.Point(884, 82);
+ this.label36.Name = "label36";
+ this.label36.Size = new System.Drawing.Size(29, 12);
+ this.label36.TabIndex = 139;
+ this.label36.Text = "鏉愯川";
//
- // label35
+ // textHProductNum
//
- this.label35.AutoSize = true;
- this.label35.BackColor = System.Drawing.Color.Transparent;
- this.label35.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label35.Location = new System.Drawing.Point(302, 16);
- this.label35.Name = "label35";
- this.label35.Size = new System.Drawing.Size(41, 12);
- this.label35.TabIndex = 20;
- this.label35.Text = "鍚敤浜�";
+ this.textHProductNum.BackColor = System.Drawing.Color.Beige;
+ this.textHProductNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHProductNum.Location = new System.Drawing.Point(967, 110);
+ this.textHProductNum.Name = "textHProductNum";
+ this.textHProductNum.Size = new System.Drawing.Size(187, 21);
+ this.textHProductNum.TabIndex = 142;
//
- // chkHUseFlag
+ // label37
//
- this.chkHUseFlag.AutoSize = true;
- this.chkHUseFlag.Enabled = false;
- this.chkHUseFlag.Location = new System.Drawing.Point(769, 187);
- this.chkHUseFlag.Name = "chkHUseFlag";
- this.chkHUseFlag.Size = new System.Drawing.Size(72, 16);
- this.chkHUseFlag.TabIndex = 134;
- this.chkHUseFlag.Text = "鏄惁鍚敤";
- this.chkHUseFlag.UseVisualStyleBackColor = true;
+ this.label37.AutoSize = true;
+ this.label37.ForeColor = System.Drawing.Color.Black;
+ this.label37.Location = new System.Drawing.Point(884, 113);
+ this.label37.Name = "label37";
+ this.label37.Size = new System.Drawing.Size(53, 12);
+ this.label37.TabIndex = 141;
+ this.label37.Text = "鎴愬搧缂栧彿";
//
- // sy
+ // textHVerNum
//
- this.sy.AutoSize = false;
- this.sy.Image = ((System.Drawing.Image)(resources.GetObject("sy.Image")));
- this.sy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.sy.ImageTransparentColor = System.Drawing.Color.White;
- this.sy.Name = "sy";
- this.sy.Size = new System.Drawing.Size(35, 47);
- this.sy.Text = "浣跨敤";
- this.sy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.sy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.sy.Click += new System.EventHandler(this.sy_Click);
+ this.textHVerNum.BackColor = System.Drawing.Color.Beige;
+ this.textHVerNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHVerNum.Location = new System.Drawing.Point(967, 137);
+ this.textHVerNum.Name = "textHVerNum";
+ this.textHVerNum.Size = new System.Drawing.Size(187, 21);
+ this.textHVerNum.TabIndex = 144;
//
- // fsy
+ // label38
//
- this.fsy.AutoSize = false;
- this.fsy.Image = ((System.Drawing.Image)(resources.GetObject("fsy.Image")));
- this.fsy.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.fsy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
- this.fsy.ImageTransparentColor = System.Drawing.Color.White;
- this.fsy.Name = "fsy";
- this.fsy.Size = new System.Drawing.Size(35, 47);
- this.fsy.Text = "鍙栨秷";
- this.fsy.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
- this.fsy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
- this.fsy.Click += new System.EventHandler(this.fsy_Click);
+ this.label38.AutoSize = true;
+ this.label38.ForeColor = System.Drawing.Color.Black;
+ this.label38.Location = new System.Drawing.Point(884, 140);
+ this.label38.Name = "label38";
+ this.label38.Size = new System.Drawing.Size(29, 12);
+ this.label38.TabIndex = 143;
+ this.label38.Text = "鐗堟湰";
//
// Gy_RoutingBill
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Lavender;
- this.ClientSize = new System.Drawing.Size(1017, 742);
+ this.ClientSize = new System.Drawing.Size(1314, 742);
this.Controls.Add(this.grdMain);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.panel2);
@@ -1618,9 +1733,9 @@
this.Name = "Gy_RoutingBill";
this.Text = "鍗曟嵁缂栬緫";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+ this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Gy_RoutingBill_FormClosing);
this.Load += new System.EventHandler(this.Gy_RoutingBill_Load);
this.Paint += new System.Windows.Forms.PaintEventHandler(this.Gy_RoutingBill_Paint);
- this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Gy_RoutingBill_FormClosing);
this.Resize += new System.EventHandler(this.Gy_RoutingBill_Resize);
this.Tool.ResumeLayout(false);
this.Tool.PerformLayout();
@@ -1769,5 +1884,15 @@
private System.Windows.Forms.CheckBox chkHUseFlag;
private System.Windows.Forms.ToolStripButton sy;
private System.Windows.Forms.ToolStripButton fsy;
+ private System.Windows.Forms.TextBox textHVerNum;
+ private System.Windows.Forms.Label label38;
+ private System.Windows.Forms.TextBox textHProductNum;
+ private System.Windows.Forms.Label label37;
+ private System.Windows.Forms.TextBox textHMaterTexture;
+ private System.Windows.Forms.Label label36;
+ private System.Windows.Forms.TextBox textHPicNumAssemble;
+ private System.Windows.Forms.Label label34;
+ private System.Windows.Forms.TextBox textHPicNumVer;
+ private System.Windows.Forms.Label label32;
}
}
\ No newline at end of file
diff --git "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.resx" "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.resx"
index 67ca1b8..e7c2a9d 100644
--- "a/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.resx"
+++ "b/PlanM/\350\256\241\345\210\222\347\256\241\347\220\206/Gy_RoutingBill.resx"
@@ -112,15 +112,15 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <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=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <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=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <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
@@ -142,584 +142,465 @@
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/tCS5QaG90b3Nob3AgMy4wADhCSU0EJQAA
- AAAAEAAAAAAAAAAAAAAAAAAAAAA4QklNA+0AAAAAABAASAAAAAEAAgBIAAAAAQACOEJJTQQmAAAAAAAO
- AAAAAAAAAAAAAD+AAAA4QklNBA0AAAAAAAQAAAB4OEJJTQQZAAAAAAAEAAAAHjhCSU0D8wAAAAAACQAA
- AAAAAAAAAQA4QklNBAoAAAAAAAEAADhCSU0nEAAAAAAACgABAAAAAAAAAAI4QklNA/UAAAAAAEgAL2Zm
- AAEAbGZmAAYAAAAAAAEAL2ZmAAEAoZmaAAYAAAAAAAEAMgAAAAEAWgAAAAYAAAAAAAEANQAAAAEALQAA
- AAYAAAAAAAE4QklNA/gAAAAAAHAAAP////////////////////////////8D6AAAAAD/////////////
- ////////////////A+gAAAAA/////////////////////////////wPoAAAAAP//////////////////
- //////////8D6AAAOEJJTQQAAAAAAAACAAE4QklNBAIAAAAAAAQAAAAAOEJJTQQIAAAAAAAQAAAAAQAA
- AkAAAAJAAAAAADhCSU0EHgAAAAAABAAAAAA4QklNBBoAAAAAAz8AAAAGAAAAAAAAAAAAAABoAAAEAAAA
- AAVnKmgHmJgALQAxAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAQAAAAAaAAAAAAAAAAA
- AAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAABAAAAABAAAAAAAAbnVsbAAAAAIAAAAGYm91bmRzT2Jq
- YwAAAAEAAAAAAABSY3QxAAAABAAAAABUb3AgbG9uZwAAAAAAAAAATGVmdGxvbmcAAAAAAAAAAEJ0b21s
- b25nAAAAaAAAAABSZ2h0bG9uZwAABAAAAAAGc2xpY2VzVmxMcwAAAAFPYmpjAAAAAQAAAAAABXNsaWNl
- AAAAEgAAAAdzbGljZUlEbG9uZwAAAAAAAAAHZ3JvdXBJRGxvbmcAAAAAAAAABm9yaWdpbmVudW0AAAAM
- RVNsaWNlT3JpZ2luAAAADWF1dG9HZW5lcmF0ZWQAAAAAVHlwZWVudW0AAAAKRVNsaWNlVHlwZQAAAABJ
- bWcgAAAABmJvdW5kc09iamMAAAABAAAAAAAAUmN0MQAAAAQAAAAAVG9wIGxvbmcAAAAAAAAAAExlZnRs
- b25nAAAAAAAAAABCdG9tbG9uZwAAAGgAAAAAUmdodGxvbmcAAAQAAAAAA3VybFRFWFQAAAABAAAAAAAA
- bnVsbFRFWFQAAAABAAAAAAAATXNnZVRFWFQAAAABAAAAAAAGYWx0VGFnVEVYVAAAAAEAAAAAAA5jZWxs
- VGV4dElzSFRNTGJvb2wBAAAACGNlbGxUZXh0VEVYVAAAAAEAAAAAAAlob3J6QWxpZ25lbnVtAAAAD0VT
- bGljZUhvcnpBbGlnbgAAAAdkZWZhdWx0AAAACXZlcnRBbGlnbmVudW0AAAAPRVNsaWNlVmVydEFsaWdu
- AAAAB2RlZmF1bHQAAAALYmdDb2xvclR5cGVlbnVtAAAAEUVTbGljZUJHQ29sb3JUeXBlAAAAAE5vbmUA
- AAAJdG9wT3V0c2V0bG9uZwAAAAAAAAAKbGVmdE91dHNldGxvbmcAAAAAAAAADGJvdHRvbU91dHNldGxv
- bmcAAAAAAAAAC3JpZ2h0T3V0c2V0bG9uZwAAAAAAOEJJTQQRAAAAAAABAQA4QklNBBQAAAAAAAQAAAAC
- OEJJTQQMAAAAAANsAAAAAQAAAIAAAAANAAABgAAAE4AAAANQABgAAf/Y/+AAEEpGSUYAAQIBAEgASAAA
- /+0ADEFkb2JlX0NNAAL/7gAOQWRvYmUAZIAAAAAB/9sAhAAMCAgICQgMCQkMEQsKCxEVDwwMDxUYExMV
- ExMYEQwMDAwMDBEMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAQ0LCw0ODRAODhAUDg4OFBQODg4O
- FBEMDAwMDBERDAwMDAwMEQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAANAIADASIAAhEB
- AxEB/90ABAAI/8QBPwAAAQUBAQEBAQEAAAAAAAAAAwABAgQFBgcICQoLAQABBQEBAQEBAQAAAAAAAAAB
- AAIDBAUGBwgJCgsQAAEEAQMCBAIFBwYIBQMMMwEAAhEDBCESMQVBUWETInGBMgYUkaGxQiMkFVLBYjM0
- coLRQwclklPw4fFjczUWorKDJkSTVGRFwqN0NhfSVeJl8rOEw9N14/NGJ5SkhbSVxNTk9KW1xdXl9VZm
- doaWprbG1ub2N0dXZ3eHl6e3x9fn9xEAAgIBAgQEAwQFBgcHBgU1AQACEQMhMRIEQVFhcSITBTKBkRSh
- sUIjwVLR8DMkYuFygpJDUxVjczTxJQYWorKDByY1wtJEk1SjF2RFVTZ0ZeLys4TD03Xj80aUpIW0lcTU
- 5PSltcXV5fVWZnaGlqa2xtbm9ic3R1dnd4eXp7fH/9oADAMBAAIRAxEAPwDsv+a+D+5mf9u1/wDkkv8A
- mvg/uZn/AG7X/wCSW+kpeLN4/Yx8OPw+1wP+a+D+5mf9u1/+SS/5r4P7mZ/27X/5Jb6SXFm8fsVWPw+1
- wP8Amvg/uZn/AG7X/wCSS/5r4P7mZ/27V/5Jb6SXFm8fsVw4/D7XA/5r4P7mZ/27V/5JL/mvg/uZn/bt
- X/klvpJcWbx+xXDj8PtcD/mvg/uZn/btX/kkv+a+D+5mf9u1f+SW+klxZvH7FcOPw+1wP+a+D+5mf9u1
- /wDkkv8Amvg/uZn/AG7X/wCSW+klxZvH7FVj8PtcD/mvg/uZn/btX/kkv+a+D+5mf9u1/wDklvpJcWbx
- +xXDj8PtcD/mvg/uZn/btf8A5JL/AJr4P7mZ/wBu1/8AklvpJcWbx+xXDj8Ptf/ZOEJJTQQhAAAAAABV
- AAAAAQEAAAAPAEEAZABvAGIAZQAgAFAAaABvAHQAbwBzAGgAbwBwAAAAEwBBAGQAbwBiAGUAIABQAGgA
- bwB0AG8AcwBoAG8AcAAgADcALgAwAAAAAQA4QklNBAYAAAAAAAcACAAAAAEBAP/hEkhodHRwOi8vbnMu
- YWRvYmUuY29tL3hhcC8xLjAvADw/eHBhY2tldCBiZWdpbj0n77u/JyBpZD0nVzVNME1wQ2VoaUh6cmVT
- ek5UY3prYzlkJz8+DQo8P2Fkb2JlLXhhcC1maWx0ZXJzIGVzYz0iQ1IiPz4NCjx4OnhhcG1ldGEgeG1s
- bnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eGFwdGs9IlhNUCB0b29sa2l0IDIuOC4yLTMzLCBmcmFtZXdv
- cmsgMS41Ij4NCgk8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjIt
- cmRmLXN5bnRheC1ucyMiIHhtbG5zOmlYPSJodHRwOi8vbnMuYWRvYmUuY29tL2lYLzEuMC8iPg0KCQk8
- cmRmOkRlc2NyaXB0aW9uIGFib3V0PSIiIHhtbG5zOnhhcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hh
- cC8xLjAvbW0vIj4NCgkJCTx4YXBNTTpEb2N1bWVudElEPmFkb2JlOmRvY2lkOnBob3Rvc2hvcDozOWZj
- MWM4NC0xZGIyLTExZDktYTU2YS1lOGQ1YmIxNTEyYjU8L3hhcE1NOkRvY3VtZW50SUQ+DQoJCTwvcmRm
- OkRlc2NyaXB0aW9uPg0KCTwvcmRmOlJERj4NCjwveDp4YXBtZXRhPg0KICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAK
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAog
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- IAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
- ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8P3hwYWNrZXQgZW5kPSd3Jz8+/9sAQwACAQECAQEC
- AgICAgICAgMFAwMDAwMGBAQDBQcGBwcHBgcHCAkLCQgICggHBwoNCgoLDAwMDAcJDg8NDA4LDAwM/9sA
- QwECAgIDAwMGAwMGDAgHCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM
- DAwMDAwM/8AAEQgAKgQAAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//E
- ALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYX
- GBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SV
- lpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5
- +v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMR
- BAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJ
- SlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5
- usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/aAAwDAQACEQMRAD8A9YH7anicf8w3
- RB/3DbT/AOM0v/Da3ig/8w/Rf/Bbaf8AxmuL/wCEOHpR/wAIcPSv1/8As+n/ACn5x9cn3OyP7anig5B0
- 7RT/ANwy0/8AjNH/AA2l4n76boo/7hlp/wDGa43/AIQ4f3cUf8IcPSmsvh/KH1yf8x2X/DaPib/oHaJ/
- 4LLT/wCM0f8ADafiZeum6IR/2DbT/wCM1xv/AAhw9KP+EOH900v7Pp/yoFjJ/wAx2R/bV8S/9A3RP/Bb
- af8Axmj/AIbV8S/9A3RP/BbZ/wDxmuM/4Q0f3KX/AIQ4DopFH1Cn/KP67P8AmZ2X/DaviX/oG6J/4LbP
- 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
+ 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
+ P/MP0X/wW2n/AMZri/8AhDh6Uf8ACHD0r9f/ALPp/wAp+cfXJ9zsj+2p4oOQdO0U/wDcMtP/AIzR/wAN
+ peJ++m6KP+4Zaf8AxmuN/wCEOH93FH/CHD0prL4fyh9cn/Mdl/w2j4m/6B2if+Cy0/8AjNH/AA2n4mXr
+ puiEf9g20/8AjNcb/wAIcPSj/hDh/dNL+z6f8qBYyf8AMdkf21fEv/QN0T/wW2n/AMZo/wCG1fEv/QN0
+ T/wW2f8A8ZrjP+ENH9yl/wCEOA6KRR9Qp/yj+uz/AJmdl/w2r4l/6Buif+C2z/8AjNH/AA2r4l/6Buif
+ +C2z/wDjNcb/AMIcP7po/wCEOH900/7Ph/KL65P+Y7Mftq+JMf8AIO0Uf9w20/8AjNB/bU8S5407RD/3
+ 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
- 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
- /9k=
+ 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
</value>
</data>
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPnZJNSwJRFIbvv6h+QNQycBnUPlpE0SJBSJAo
- ohA0chFiUihhaCmE2hdFtGgfQkQkVkIupHZBVERFSKljzjjjx9vcm06T+BEeeODeyz3PPXPmEIdvF3Z3
- ELbVgMKivF/2bsG3cwTSLKwrG6gVHvc1O24qsSx52MViqaRA9y5XVPE2lJhtLnZRyhcU6D4QPMXgqA7D
- WgOszvX6n2JccDBBNieBLyOIeRTpGZ9DXpIYdVsxM29nAi4rIsP/khPLiRMxEDXVpkmTlQk+OR7JjMDg
- BfHnVTlxOFT6A5OpwzBrYYL35BcSqSyjkuy8kXuT5fDGA2QNaDsE5uLyWi0ZnzIzwUsijdcEx1AL+HQa
- QyeA/kr+M3c1BPqyQD0LFUHwCchlMtBdAnvPwH0JCKWqKhgY0aFb048uTZ9CRXAQfUA4fAHvI3D8AdzW
- EjScVI0ftIpzAYjIfaBrIp9Na3uwb2pvPuZMLieoMY51ohAhiG8SbBs7/ilRlantJYj5CbizFgXURSWU
- liqo7tk3bGHWG43QzHIAAAAASUVORK5CYII=
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/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="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG6SURBVDhPfVLLK0RRGD+lpNjJf2ChrDyibJSllWSjyEhN
- JkQj70zUFKYMY4aFGrJQio2tQpRMISxkr+Rt3Jkx7r3z+Dnnu83cuRxO/er0/R7n+7572dzyBty+NbgX
- g3L4gpgNrCOwvg0mO9PeVTmRI17ynZFGGuLyrBCZTqchg+C83tPsI79CJmb8RCZTKcgguIWFkKVLS8iY
- e5FIPZGEDGkAwbUDNLV2oqXNjr39I+vIw9PzVFC1BGTQ9ARSPEWJxfEWVkh7UVmIk2JmBDldHrrEVR3/
- QYwndEW9F4iXMuAcuKwrARuYmCEiGtcQ+wN6wjRv3saMB3lIqIR30TfqpsLHpwpFAo3vRvAFjnMI87UO
- VATuqAsK6BmaIsF75AvhqBWqbpjzHVcWMwsCrHrD2EG3c5IurwpfUsSEypcn6nk9N3+bhcDeP07C5/An
- Xj5MiJq/g/1vFqKu3hEKeHyL4uk9RhBfIxOAs2aaObftw2Pzz2Q2xyCJ718U3L9GCFmz/gBoVxAh2Zk5
- mfHQDmzdRsDPI9oHD2ivY4Rc3uJpbOlAeW0DymtMCHFZVT1ESMa4tbNraLhWeDL1byFNGCxpuVuVAAAA
- AElFTkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG3SURBVDhPfVLdK0NhHH5LSXGn/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="xg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH1SURBVDhPnZFdSJNRGMcPCBLkXXrhfRddiGl1s3XRTQp6
- YSCMCbHSLkJbIoWIWug0huD0Yl+v5MeFuXmjF2J3+UG1BoO2mgxXTMWvWmkwETbDCf07z3nX9r57140P
- /OFwzv/3P89zDmOKstonYXOMw+Eah9OtFu3Z7BMgj5LJrvuHx/D79AxmH8AcXK488b0O/x/hIa8mpNdq
- x1HiGOblJGYOUFDtKynhIa8moMsygsSvQ7BR4NU3wPAWKJ3hXTgzoo7sEB7yagKePh/CQfy7MDX7gXIP
- B8a4XirEQ05SSSgrG9Te/QJ727vixnJvAZgHSREZDV27CP8lJtbZgEedfYjFNsEkvjnJNaWWFJXhksch
- nFzmcBD4rC/LBTzs6MFadAMmZwisKQB2Nydp6WcW9n6RR6CQQBnLBbQ+eYbpuddCnvlFeDOKbW0L4EJb
- EASvpYFq1542gGapazSh6matUKXuNmbnFgRc3BZWwWK8G9PqN8j/ltV3/Ct4FZnX/wurHjE/gA6d99n5
- 4Mgq/4pMAD42ipmVbatufuMLQin3Pfl/6XakfwCnYVDIv5n344cqP+uyDOPDp694H4zCF96Bm0BFgEnP
- QKKKrEjCQ15iiGUNxhbx4lf1NajQ1WPAIJuvXL8ld5Gp5QUJg/yMPOQl5o7xAf4CAklSiMnmMdUAAAAA
- SUVORK5CYII=
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
+ 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="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPlZHfK4NhFMf3B7j0B7iSufTj1o9rbolSKC78
- iLa0hAixQmohzM/GGBttktKKEpahJS8yE41GJtsbq/n59T6P933y2kZOfeuc8zzn85xzHoUiiqkaOvBd
- 0e7EzJHCYOgNfj5MRXyS+xXy88W/YhmMXP6PuTi3vCMCCDy9wnPtx9G5D66TSzgOTrHu5LC66YLV7sDM
- 0hpGTMvQjc2jZ9gYCVA3d8F9do6p2QWMGy3QG+YwMGpE7+AEtLoRtPYMoqVrAAbzCho7dZE7UTVp6RQO
- 1wlC4WfcBkIYnVnC6YUPdgeH/kkzbPZt2pGmtTtyodWaNgrY3OXAPz7h2s9DP23FsccL7809W5HX58fW
- zn4koELdHBXwwD8CHx9wKhVUkkkx+42ymvqoAJKkhXuCI4iBvsUUUlJZFxPQpxAA7QlfEgulmJxRQFF5
- bewRhBMKqY6XiRUTQEFp1a8AOkZunEwkx3aQX1xBARvOQwSFX7i6C2LIsEhzbAcEkipK3AuDFIodkILw
- O/AQesHlLU8BtH2xmPg0JiAhJxsjOycPiSkZSErLhDItC8npWTBZbAxCCwUjbUsg4n8CfOpdAgkBExUA
- AAAASUVORK5CYII=
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
+ iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
+ wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
+ GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
+ gwcDBhOOzp0wW+zoGpmG0bxBE1U2tAX/ocWVjQRY27JDenzClUtC39g8Dk4dcFzf0RuXw+nC+uZOMKCg
+ vI4avgPupUfg4wPWaEb2yVeLOGN5JVX08B3ARcFt+SBbAfnVBMgprKDmUIBOJgeaIr4sgr6avxEgK7+U
+ mkOuIIsgxeEBVsJcGblF1PgTgMZODQuwMj5XenYBNa5a9+CWAZe3bvTo5uhO2Zn/xgmLOwWSKSbg8r4D
+ 954XXNxIVNP4IszPVAtIwBrJKWmIjE1AlCoR0aokxMQnYWLGqEAoKIv3+mrGGPsEfOpdAqh7YNYAAAAA
+ SUVORK5CYII=
</value>
</data>
<data name="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEoSURBVDhPY/hPIWCws7P7TypGthNsgMeO/2DstOXnf+s1
- n/4bLn35X3Pug/8KU2/8F+87/5+v7dh/5po9YAxST30DCvLz/xOLsbpg1cqV/9+8fk0UJmjA5UuX/u/Z
- vfv/1i1b/oMMXrpkCRwrKCj8h2FYOIADEdkFIAOOXjz2f9WO1RgYpLnkbsN/a2treDjCDYDZvHD9ov99
- 6yf+r1pa/z9rct7/mOZEuK0S7Wr/rc75/AfRMJegGACyeev5Hf+Xnl/1f9a5+f+nnJ/9v3VfN1gxyGYQ
- DrmWAqYnPZ0NFsfqgqkbZvxvXNb6v2h62f/UjiwUF4A0Y3UBLBZgYbBx94b/6BhkI8xmvIGIHAugAF6x
- fDkY44yFs2fO/CcWY00HFGUmCnPzfwDzr+IlC3vuSwAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY/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="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADjSURBVDhPlZPhDYQgDIVZxgWYwjCGf93DkfxNHMABHIAB
- WKDna65N4cqdR9IYKu+jPEqIMdK/QWYEiGutwyilkA2sdwE5ZzqOQ+M8T+rjui6u1gX8EgP2CDDaGeKv
- AE+IXAiBhRaAnAw2ESZ55+WF66oQAdI8cw7DBWA3EdM0KYRzt1gC8w+ALbeBANSJmwqs0IU4YgWMxNJA
- tnRr4BBgO68/tzVQAdu2UUqJlmVp2tYTsw+3H3oLoMh7AGTfd4a4juMW3rciEO0IQFAJANLWAsEXbwX/
- ONdXIF3lPWsI+rw18gVeD88TFY2IrAAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
+ G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
+ 5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
+ EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
+ E8pc2+4AAAAASUVORK5CYII=
</value>
</data>
<data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH9SURBVDhPjZPNS1RhFMaPErRoJy4qCDFyoYYRbqNWCUGr
- /gE/UwncREJpm9nZhx+UuVKwFoKDYpQULlyqMzY5mTGZU+OQ0jCEg/Oho/fqPD5n3mRM9OKBhzv33Of8
- 3nPe9x2Ruz5I9Qyij4DlhyeTerUmWyt1s/i4BiQB/Dyh1Ks1WivS+BlyroMpwLIt2LbtKPVoyNkOZGul
- fhaV49kcpqYAz4yz1KPR4tvvoM6Lq2MmmUqnsbHlLPVoVE0QUOvVPcgBpqe5usdZ6tG45NYODgH+xpNY
- S6QcpR6N/AEC6v8BKvdHiCewkUg6KkVPdhN7DwCuvQdO9zPxdBPStQ3psY+WfuvcxoXWb5AXFqRBj5Fz
- XOcpFAwS8GQdcmcSUvwccrHrfxV3suATpMYD10SK3vghwGsC2iNmh44JqeaKNV6MfKfXFT0C8CBs5jv/
- DNK6it+/zInM+XcRDu3w+hqAO0BP2wqvMjvStm584AhvmGxZNICSbgJCCHwB5r/uIvDDQuQP5z8IuB80
- gLybbhS5llA4xMLGeWQ2+SxiB00LCHIlLQ4upxGLpXMAHeHeAv36Z2KcqhrGmcchEv2IR4HwEhDhNKsr
- fEZ3EFu3kMls8eLw7jf48DZEQJMf0jxnABp5t0YhFa8g5b2Qspc5lfJdVUZd6TO6zN8V1O132APHwgBJ
- bClz8wAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH1SURBVDhPjZPNSxRxGMcfI+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="fq.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACsSURBVDhPnZOxDYAwDARTsRCz0EMBDcPQ0DAQDSISE9Ax
- BjJ+wChCyDiJ9KLx3zuOcc5wstaToUwpqWdyDSv5lBPtRAkQpELFSL2nCAhM1ZUqAsAGYfPGRqhbuO3h
- Q/mgzIMBknaaUYwhCshifpKlWACqGU90p59p4bMB8GvWACazBjAvUHCFNWlxkMTt4hUwhwciC2Xq5AaE
- EIDiOsLQoK8livqpBPT+Blc5APZJ/iMjbIaYAAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
+ mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
+ OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
</value>
</data>
<data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGnSURBVDhPlZPLK8RRFMdP2Y9mRQ0WLJCFktghLNj5A1jO
- RrHwaEioibLw2AkbkSw0T6EohQkLz9R4bUzyzJsxU2r6uufe+Y2feWSc+nR+v3vv93vOPb9+RLpoqiHE
- Q38m4TMLxSYKs1VmCjJVDu8l9jFXp0REmjg6h8/EN+HN42nCzTwBZ4qvTcK1m3A6Q1gfIiRt8LZK8K8R
- Hpf/abA3TjgR1S5shEsnwWdX77tifcmaRAdssD9BOJokeMV1OO+MJWnAk6kqL8PGMEk8I4S1QcVyH2He
- 5eIh/x1s4uwgia1dwWtS2SA+qZ5ou97BMSxOWeQ3ry9ReBZGoQWLAYU00kdn3wi2D8/xElDHjRafhENf
- lcUZ9qzYTlq7B7B1cIq7Zz8CwSC6nFfocV9FDLTKnPOcJuSu5PzupLnDKjo4w/3LJ94//Cjt90q0DliY
- MmWEYdqA9FkDTHOpSHMYf67S2NojDW6eRAeBAMi8K5EG/I9UqHvXectQtGhSwmpBbXgWWgds8PD0ihbb
- Ldoc9wiFQjFDLFzJjB0iDzS/uAKJiHRSGVVZ6L4BYiGPeVyVcksAAAAASUVORK5CYII=
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
+ hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
+ M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
+ cax9ArbHDzukt5HJ9wxbpuGe7+fvvL1esLU6BTmsSHpyfggGRiaxe3yJaJzfhbI/wGHJ7MqKS1ZKv+xx
+ gWFoDDtH57h7jCGeSGDQHoTJGUwL5M6MSrsKFd5y/jst6DaapQkuEI6+4eU1hoZRP4dFFhTMK6FYUKB4
+ SQHVciGKbMpPQafBxAWhiDRBPA7S73O4gH0HWtGtza9BrVslCnUSrSmBPAET3Eee0GO9Ra8tjGQyySUs
+ 8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==
</value>
</data>
<data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGfSURBVDhPlZLLK8RRFMdP2dooWyW7ycKC2KFYWPgTbGcj
- LAzNSKhBWXgslIaNSFkYxijKQg1CMR4pz5JpGo+JMR5jpn40X/fc32N+M83UuPXt3nPP/X5+5577IzKN
- 9iZCNpnP5FyzUSRRUabOrPISddZyuTnWxgLDpJszZ+1MdggnL+cJj2sE3KhS9ggPXsL1AmF7jJA34GOL
- EPMRXjf/CTieJlyJr927CUEPIbCsxn6xv+HMowIGnMwQzmcJF+I6PB+58gRwZxrqarEzTlK7EwTfqKqg
- fwo88npKhngcJOXuJtztC3MyiUMLSemQzFjuD4y6sD5nl2/eUq2KBx+GXyyEdKM5luaeoQkcnN0iGpce
- FNkDUjwmxY+EwVJVGkiPOScBtr4R7J9e4/kthngigV5PCP3eEH5+f1OQtmLAJMPMgA6HU1Rwg3D0G59f
- MdQMX0gpipK6RnMhYJK5J9Rq65eAx4ioIB4HWf1SaT3gXlRq0vpiQPQKGPASeUen+wldK+FU+ZqZy5Y9
- YZDYS7uGpaoemVpcWjUg5sM6iK//B0B1r7kils6HAAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
+ C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
+ TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
+ 4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
+ RjjfEubPT+xYiFFjlN6zugecWJq08TevKzWQkoPwiYMgbkzu2dzeO4ztwzNENPYgx3bJSI2IfwA9+QbK
+ GO/lHQdYO/uxdRDA3WMUWiyGDncQXZ4g3j8+EiGNuSmYZqlmu0NscIpQ5A0vr1GU9fkZXdc5gNeuzU7B
+ XF+qwdrFATdhsYGmgep9jGmWR1mLFeqZGRLfQAbch5/Q4rpF63yIA3h9ZZZn7lVIymtYSiqRzszsghmS
+ PJzoib4AQHWvuebaS2wAAAAASUVORK5CYII=
</value>
</data>
<data name="sy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEGSURBVDhPjZOxEYMwDEUzEwOEAcgAyVGzgAdgCKpQpQpV
- OgagS0WXygPAADDAjyUjsAM4cKczB/rvWx9zOoUvbLxGmmLr+aoV4zujRreZxV0LPFUfhGBslanMhXhi
- AkRRvQkBPoqL3AlEq+vsiFcATyyQw2JyExF0zs5oc55Xatr22pkCk+1i1CDAXUUMEIgj9gAYmtscFotN
- tcUipnuC0Y66KkH3iJevo5QNaWiWxF2ACEXMaxlDl+cdiAEJlJoJ0FcXLhYbdxFPffYAiaivrwygknFo
- DYrlDM6Ql3E0xV/BE9vZPeffAywQG1ZyzHkPoqewNmf+8xfOmejCph3c9h5MxgmJv/BtcjWFBNAYAAAA
- AElFTkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
+ CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
+ tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
+ cx82d1+EpURiHmu8817neYkEHQH+BEtZSfYHLCWSdTgI3vBtcjUXOHiVAAAAAElFTkSuQmCC
</value>
</data>
<data name="fsy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFwSURBVDhPtVNLS0JBGPVH+Iv6Ba3rT/joar7rKprZ46Yg
- GdaiyJWUgYViVihUFr0halHUoqCoRW2KNqc5E7cuXh+1aGCYYeY75/vOd2Yslv8aymgfevt7TJPnXXMS
- mGqEUHtJofqkoXg3jvxVHPPnUfiKA7Bare1JCN57S+PgY1qudUFSftRQuElg8SKG7LGKpCBvScLymJng
- M8zIPQP1yeyzJ2F5zr1JDrPXXlNovKe/wUa9JCIwuRtEbMtnroIE1ecpqb2dTsZo2wFENzytCYr3Eyg/
- THYkGKv7Ea4MfsU0W5W/jmP5NiEvjXe6FJ6NbHoRKrl/kjA4cziMudMIFoRVOdHt3OWIXJulkEAV2U12
- MjC9P4TMkYqs6DS73QocWffAv6pAKTjNMgnQdgKyy0awLkWtuOFfU+ASYHvebraROnXPjfaRIFhywSss
- dBUcAmzr/Bqb3zoJ3CtOOJccsP0VTDIS6JX96jN1/W2GgE8Xey/mqymHugAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFtSURBVDhPtVPLTsJAFOUj+kV+gWv9CaAWBApoITzER6UJ
+ EYMuNLIiigkaCKAGEhWN78ToQqMLTTS60I3GzXHu2CpxCsGFJ5l0eu8959y50zr+DcrYAPoH+4RFcbOk
+ M6jQaIXReDFQf9JRuptA4SqJhfMYAqUhSJLUWYTIe28ZHHzM8GeTiVQedRRvUli6iCN3rCHNxG1FqD1y
+ JvIZZvmeCq1F7nMnER6nvXAccm+8Gmi9Z77JZorDEknvhhDfCohdkED9eZqfXUiaoBp9O4jYhs9eoHQ/
+ icrDVFeB8aaKSHX4q4YC7atwncTKbYon2+Mmn9cnNv0Il70/JrTJHo5i/jSKRXZVeTbt/GWCP393QgIa
+ cxeuk14y+yPIHmnIsUnTtO3I0ZoP6poCpSgLeS6i7wT5lNuT1jG0qhfqugIPI7sKLvuvkoh2zqGyB37W
+ tqfoZmSn6N4NJOBdlSEvu+H8K5lAAlZnPf1MvcPh+AQXey/m/1+IkwAAAABJRU5ErkJggg==
</value>
</data>
<data name="sz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACmSURBVDhPrZNBCsUgDES9aw/kUgqCS4/gEdyUv/U4aScQ
- UJt+TKkQXMR5jiZx7qu1bZF2ItoPootJpRTsw8IZ5Gqtt5ybASml4RDyF5sBOWcbQMRwCMAMZ5tPDnqx
- PG8ZMItNAE1sAnjv+b0x/rgyEst/EEKQUg6QZQA+qrXG0TsxAaSLesgrAEAC+QtAUkKrtUDUTsQt6H8I
- EdosiBN1Fr4aSjPnBNm9Vm8eGPvoAAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAClSURBVDhPxZNBCgMhDEVz1zmQSxkQXHoEj+CmdOtx0vyU
+ wFhjqaXQDyGEn/8QZ6Sf6TgSn8x83phl5For+iDsSOPW2uRNgJzzsARfLPVKKXsAC8OXcYKrVoBreHU6
+ lQd4DW8BvPAWIISgPaX7d4AYo33KAYL54zvovWthNoh5yAzyAE+H6ApB3wZABkEtAdLeLhnE/RMhXBqC
+ KO8tQIC4b+FPInoA2b1WbweybUAAAAAASUVORK5CYII=
</value>
</data>
<data name="syz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACiSURBVDhPtZPBCcAgDEW7q1MVBI+O4AheSq+O4QhpfyAl
- qK1NoUIOyv8vGpNl+XmR8J3zpGOaF+JTRDlnhmC/EtG6EZ+nlC54B4P41LEwxjgEhBDGADEjGwAibG8w
- BGizXPU1oDWbACOzCVBr5fd6v3OVJUw1KKV0EBMAf9lCzIAW8gmgIZ8BGqI7EUCJ207UfY2ayCzgHP0P
- I+JxFqaTpgQHIZpkvpJOnAQAAAAASUVORK5CYII=
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACcSURBVDhPtZPBCcQgEEXtNVUFBI+WYAlewl4twxJm88RZ
+ xDUbDeyDQWf4805q/o3U02yblbbq+JoakhhjCdPvIrIfUuYhhGsJ4TNXgt77ocA5NxboMuGz/QSnBO1y
+ H7wV9MtLgtHykiDnXIbWvp4JIKX0JaGfFkAv4b4kgFbCuSwAlVCPBKCS9iXSa90KAIn+BeD9s0j9/Avz
+ GPMGIZpkvqVDGAQAAAAASUVORK5CYII=
</value>
</data>
<data name="xyz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACwSURBVDhPrZOxDsMgDETzr/kYRuZIlRj5BEZGlu58zjVX
- xanbEOyhkSxFke/lMOdl+cezrg/oEia/ufhs3ABsT1CAUspbeADQe5+DfgEppRMg0ClkBthNnc5uISbA
- gpiA3Yae0cWJC3BAhoP1AkQcY0St9XMzHoCIQwjIOX9frQWYiiUwekg6B6bYAjCZQ9s64/IXNrPEAd95
- 3suZRwvC/FPIkl1gX2vN3gXXxt00vQDT8HpVG78ybQAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACYSURBVDhPrZMxDsMgEAT5qx9DSW0pEiVPoKSkSc9zNlmL
+ i+wUezjKSifB6mZEYYe/ZNseOM+sj34edbi4A9ifIIBa6wFOAcYYWvQtyDl/BNZJiRK8K1/iCjzJyguk
+ ZEkwJey4c5GsCgxOKaG1dk9gcIwRpZR7L5AwowQuzCgB7xJmbNHGBDwTlLCF3z9Bjv0LTO/dh39PCC/T
+ 8HpVcPCyWAAAAABJRU5ErkJggg==
</value>
</data>
<data name="mz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACgSURBVDhPrZMxCsAgDEV7Vw/j6FwoOHoEj+DS3eOk/cWA
- 2F8wbYVMyX8m4WdZ/njObfLEQa4PWtcAUmu9gZBbRWTdBTnJOd8/u4pawQgZATFGDjj1FGIDEIgNcLbR
- z4tx7IAG0cW+Aqg4hGDvQMXee0kp2QCj2LQDJobrpncAl2nbvZmmABBjXgRzIvIa1IlotZRCbwE5+B9C
- BL2FLxd9ADaJcBEpOS48AAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACXSURBVDhPrZPBCYAwDEW7a4fpsWdB6LEjdIRevHec2JQE
+ NIlgxA9B6c97iGj4JTHuQLcq2F2Hju+hAsYYagG7DQC2A9ZOa01L1hItSIkUlFJswexNiU9gSNxPICV+
+ AUnwbFbfBAznnP0ChlNKUGv1CSTsegcWzN0rwbwoGPNKMLNACWNYzvMkCL13BXPw+0cQx/wXvieEEzaJ
+ cBFxK5ZNAAAAAElFTkSuQmCC
</value>
</data>
<data name="fz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEfSURBVDhPlZM5bsJAFIZ9J+4ALYWpaeAI4AtATUNDn6VB
- iovQkC4IKiSQUYhAUCQCpQkK0IAVS3/eG4+dAS9jRnqFt8//MmMYtMadHFplI3UsywK/G7sYAIzx677i
- 9POM4/Yeu2UbX5MGPoc1AaYPkQgJAJ4A9Ahwh+8FA5oh4K1bTIZcAnwFAjBt4IMU8N/ViSgJAWdfwYEV
- sIUpKRjVsOpX8P5UgvOYj1dxoWBPgM0/gBWsGWAzoJAOUEP0M/BDXPWrmNsmZg8agOcOZAtSAYfIFl6q
- ZMGEowfIFjYUYlhjXSgQFvQAViBrFCEGFipkIUMGXtBCoCDSgjYDsqC2EIbILWTOQNlIErCmEFNbuN5p
- uuvYM8E3b5nEk3nrgz81NgEQIcgnOAAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEXSURBVDhPpZG/TsJQFMbvO/kOsjrAzNI+Qu0L4MzCwg66
+ mMgAC2wYmEggECCQdtDUuGhQFiWQfJxz7+0VUmgv8SRn6T395fsjeAbVK5SLInV934c8PjUMAAbYbrr4
+ WTWxfqvjc1nB+7CE154nAXR2HhIDdhLQIkANHwsG3BnA9PHmPOQYoBRIwKiEFwLQydEmIAbwqxR8swK2
+ MCIFfQ9B28H8qYDxw3UGgBV8ESD6A7CCkAENBuTSAYchqgxUiEHbxayRx+Q+A7DbPGuAVsAhsoWOSxby
+ GGcDdAsRKTA13koF0oKdAl2jzCC24JAFiwxMC7GCRAs2Fg5bMCFyC9YZJFsIKcTUFmjkg+2eAgj+eMnq
+ 3/47QuwBNTYBELFI9AQAAAAASUVORK5CYII=
</value>
</data>
<data name="qt.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADvSURBVDhPzVNNCoJAFPYIcw5XXsRbeKq2LqpN0cJ1EIEr
- CRIRFxExEEJkERHRYr58Twct1IRaJDwYZub7e280jF9+ruvCcRwIIbhoTXu9NOhyfhGWZWHmpxhM17zW
- RJ0kpQqDwgMQH4HFVsGLFe8RSacTUie15ATIK5DeCpL5RmESKj4rHTYbIQWyLS9AdgfOj4rEiyoXrTE0
- QZLlDnKS/ZsDHaOVQEcIUnAPIurBrujBMOgRod7EpVTwJRg8WhX2aTpltQ+jPkYC6TFqMMYCtm13v4mm
- h0QEBDZNk+sjSYtHjvBfJL3+j4443+BfsU900QUlZFF6RwAAAABJRU5ErkJggg==
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADvSURBVDhPzVLBCoJAEPUT/A5P/oh/4Vd19VBdig6egwg8
+ SZCIeIgIIYTIIiKiw752ZlcMS43q0IPB2dmZ994OGj+F53lwXRemaXJQTjV93Q5qlh/Yto1JkKM3XnJe
+ EqmuBmgVHop2QLIHZmsBPxFcI5JWJ6RAaukByM5AflEk05XAKBJ81+qCFMh2dgKKK3C8VSR+XLnQ7c8o
+ CdJCOpAk25qDToLyCWEO3kFMO9ioHfTDN57wuMR5JhBk0rocHiyUOt3paIZWYDUaoqCcahQYmnAcp53k
+ 1Y8kyzxsWRZHJ0kDmOi/SNTxM3w1XINh3AF00QUlYhBzgwAAAABJRU5ErkJggg==
</value>
</data>
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADHSURBVDhPpZLNDcMgDIXZiZEiZQJzTs/JuZEiVUpGYYDs
- 9IoRppSfhrYRFgLlfdh+VqryaT2iN2p6xWJjCNN0w7zMWO8rjn2H+xnD8ABwujX6cxNAAbA4QC48Nw2O
- AsAvM9FnQNQUVgFBHAEUAJyuCPI9ZsBiV5V/MW0eny8BImZAHt2AjZv6KyDYAIaEmt52KcFaC460D7kL
- 0ZbUBQEI/BOAk3nZ6OagqwetUSYy/wEk5ZaNSb+q0yyXxRz0CgvAt8IIuBI+AZInmNFWdMJxAAAAAElF
- TkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
+ rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
+ wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
+ gg==
</value>
</data>
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPfZLfS1NhHMZfkSSwu/A/8MK6ydIQFlg3dudN
- YBLDYtBF05XMMAoLL3bhRGF4zjzUUiKiG4mCgkCMiam5cqP9aO4YJlqIDmqh00KRHt/v92xnW7gdeHgP
- 7/t8nvd533OEyDxuZRQDymMoXh/U4cNFa+TpV58gy/Ho8vgwOR1A5ywgFClvEck15xzwbuoDiDFD7rtV
- bG2l4fDv4FkSJdU5uYO09BJjBtx1ebCZSkEMAjNpwL0IWKeBky9kE01KzYiaDYG9xJgB3b0D+JVMQngA
- bRm4OgPUvgLKfBJ4KPUoJy0m3/9/nD192Fhb43T7xxJw3IBDZyoxe1zkgm7dc+HHyipXbXhdZOcMfMwR
- wp9qAQSBz5YqI6S9uxfLS9/49o+MHFI7D36e2GaIQgJVmRY3nD3QE1+NC6OA0Zy0hFH7qD0IgiN7wGnv
- d25hBlx33EEoqsOqBCGuBCCshrSJDYYr7OECmDeof5q7A1t7Fz7FljAvQyJfdETjOn6mfrOhvCNeGiZT
- i60DNXWNOHH2gimaV6+JovC4/73R4PaDPmz+3S/Q7v4/XqQAzF/iM+fXpnViiOWAsL6CoeERczThvXVg
- N8wh2TNHYwuILK6ynwNuyk/YfNnGidkxP6DNIkCiubfj/gIfsYKgU5Ym1J67aIrMNXXnQUfI/rVjL98U
- eIhpbrXhAL2UTLYOQlZyAAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/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
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPjZPNS1RhFMaPIbRoFy4yEFFyoYkRbqNWCkIr
- /wE/G0VwEwmpbWbXh1+YtipQF0GDklQULlqqMzY5+cFYTo1DisMgDs6Xo3N1Hp/jbRgTvfjCw33ve5/z
- e89533NFHrghdbMIdQJrjy8m9WrMcaw0zuHLNhAD8PuCUq/GaKyI7Tsk/yknIikjBcMwLKUe9co1xmis
- NM2h8hNpHNPTgHPWWupRb7s7k0GjC7ffm4vxZBKJPWupR73VU4xpcOkZZAEzM9zdaS31KOCGQzM4BdiK
- xLAdjVtKPQq49IaApn+AykwJkSgS0Zil4vQcH+LQCcCdj8Dl11x4vgvp24cMGGdLv/Xuo6BjGTLI22jW
- a2Qdd3kLV0cIeLYDqf0KKeqBFPf9r6JeBnyD1Dthn4rTGzkFGCWgO2imd96o4471Loyv0GsPnQF4FDAB
- 119AOjbw9495I/OeQwT8B2xfE+DwEtC1zlZmRprWvc8sYYyL7T9NQEk/AX54fwALi4fw/kohuMn6TwIe
- +kxATpUDhfZV5L0lwLaA9C6fhcygZQk+7qTBvrUkwmE2UAagJbQt0a8/E0du9TtceeIn0YNICAisAsEA
- sLHOZ+gA4Z0U0uk9Ng57v9mNST8BLR5I63z2zHJqJiAVw5CbQ5Cyl1mV8l1VRt16Zaqc8wrq/gccAYEZ
- rI51LX54AAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ /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="cmdHGroupID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -827,10 +708,10 @@
FIYcEAA7
</value>
</data>
- <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <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="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <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/ProM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/ProM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/ProM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/ProM/obj/Release/AxInterop.grdes6Lib.dll b/ProM/obj/Release/AxInterop.grdes6Lib.dll
deleted file mode 100644
index eed402e..0000000
--- a/ProM/obj/Release/AxInterop.grdes6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/AxInterop.grdesLib.dll b/ProM/obj/Release/AxInterop.grdesLib.dll
deleted file mode 100644
index e9c1523..0000000
--- a/ProM/obj/Release/AxInterop.grdesLib.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/AxInterop.gregn6Lib.dll b/ProM/obj/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index a0883ef..0000000
--- a/ProM/obj/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/AxInterop.grproLib.dll b/ProM/obj/Release/AxInterop.grproLib.dll
deleted file mode 100644
index 2f56890..0000000
--- a/ProM/obj/Release/AxInterop.grproLib.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/Interop.grdes6Lib.dll b/ProM/obj/Release/Interop.grdes6Lib.dll
deleted file mode 100644
index 971e355..0000000
--- a/ProM/obj/Release/Interop.grdes6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/Interop.grdesLib.dll b/ProM/obj/Release/Interop.grdesLib.dll
deleted file mode 100644
index 5f45155..0000000
--- a/ProM/obj/Release/Interop.grdesLib.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/Interop.gregn6Lib.dll b/ProM/obj/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index 2fc1518..0000000
--- a/ProM/obj/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/Interop.grproLib.dll b/ProM/obj/Release/Interop.grproLib.dll
deleted file mode 100644
index 1f7872d..0000000
--- a/ProM/obj/Release/Interop.grproLib.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_CgDetailReport.resources b/ProM/obj/Release/ProM.Cg_CgDetailReport.resources
deleted file mode 100644
index a017d46..0000000
--- a/ProM/obj/Release/ProM.Cg_CgDetailReport.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_CgDetailReportDlg.resources b/ProM/obj/Release/ProM.Cg_CgDetailReportDlg.resources
deleted file mode 100644
index 848b833..0000000
--- a/ProM/obj/Release/ProM.Cg_CgDetailReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_CgPOOrderBillList.resources b/ProM/obj/Release/ProM.Cg_CgPOOrderBillList.resources
deleted file mode 100644
index a017d46..0000000
--- a/ProM/obj/Release/ProM.Cg_CgPOOrderBillList.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_CgPOOrderBillListDlg.resources b/ProM/obj/Release/ProM.Cg_CgPOOrderBillListDlg.resources
deleted file mode 100644
index f908cdf..0000000
--- a/ProM/obj/Release/ProM.Cg_CgPOOrderBillListDlg.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_CgPOOrderProcReport.resources b/ProM/obj/Release/ProM.Cg_CgPOOrderProcReport.resources
deleted file mode 100644
index a017d46..0000000
--- a/ProM/obj/Release/ProM.Cg_CgPOOrderProcReport.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_CgPOOrderProcReportDlg.resources b/ProM/obj/Release/ProM.Cg_CgPOOrderProcReportDlg.resources
deleted file mode 100644
index f908cdf..0000000
--- a/ProM/obj/Release/ProM.Cg_CgPOOrderProcReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_CgPriceAnalyseReport.resources b/ProM/obj/Release/ProM.Cg_CgPriceAnalyseReport.resources
deleted file mode 100644
index 0488472..0000000
--- a/ProM/obj/Release/ProM.Cg_CgPriceAnalyseReport.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_CgPriceAnalyseReportDlg.resources b/ProM/obj/Release/ProM.Cg_CgPriceAnalyseReportDlg.resources
deleted file mode 100644
index 8030cf9..0000000
--- a/ProM/obj/Release/ProM.Cg_CgPriceAnalyseReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_CgSumReport.resources b/ProM/obj/Release/ProM.Cg_CgSumReport.resources
deleted file mode 100644
index 0488472..0000000
--- a/ProM/obj/Release/ProM.Cg_CgSumReport.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_CgSumReportDlg.resources b/ProM/obj/Release/ProM.Cg_CgSumReportDlg.resources
deleted file mode 100644
index f908cdf..0000000
--- a/ProM/obj/Release/ProM.Cg_CgSumReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_ContractBill.resources b/ProM/obj/Release/ProM.Cg_ContractBill.resources
deleted file mode 100644
index 0e4c2eb..0000000
--- a/ProM/obj/Release/ProM.Cg_ContractBill.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_ContractBillList.resources b/ProM/obj/Release/ProM.Cg_ContractBillList.resources
deleted file mode 100644
index 65506c3..0000000
--- a/ProM/obj/Release/ProM.Cg_ContractBillList.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_InvoiceBill.resources b/ProM/obj/Release/ProM.Cg_InvoiceBill.resources
deleted file mode 100644
index 4cefada..0000000
--- a/ProM/obj/Release/ProM.Cg_InvoiceBill.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_InvoiceBillList.resources b/ProM/obj/Release/ProM.Cg_InvoiceBillList.resources
deleted file mode 100644
index 6b30160..0000000
--- a/ProM/obj/Release/ProM.Cg_InvoiceBillList.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_InvoiceSpecBill.resources b/ProM/obj/Release/ProM.Cg_InvoiceSpecBill.resources
deleted file mode 100644
index 4cefada..0000000
--- a/ProM/obj/Release/ProM.Cg_InvoiceSpecBill.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_InvoiceSpecBillList.resources b/ProM/obj/Release/ProM.Cg_InvoiceSpecBillList.resources
deleted file mode 100644
index 6b30160..0000000
--- a/ProM/obj/Release/ProM.Cg_InvoiceSpecBillList.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_POInStockBackBill.resources b/ProM/obj/Release/ProM.Cg_POInStockBackBill.resources
deleted file mode 100644
index a792b56..0000000
--- a/ProM/obj/Release/ProM.Cg_POInStockBackBill.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_POInStockBackBillList.resources b/ProM/obj/Release/ProM.Cg_POInStockBackBillList.resources
deleted file mode 100644
index 6b30160..0000000
--- a/ProM/obj/Release/ProM.Cg_POInStockBackBillList.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_POInStockBill.resources b/ProM/obj/Release/ProM.Cg_POInStockBill.resources
deleted file mode 100644
index e588096..0000000
--- a/ProM/obj/Release/ProM.Cg_POInStockBill.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_POInStockBillList.resources b/ProM/obj/Release/ProM.Cg_POInStockBillList.resources
deleted file mode 100644
index 6b30160..0000000
--- a/ProM/obj/Release/ProM.Cg_POInStockBillList.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_POOrderBill.resources b/ProM/obj/Release/ProM.Cg_POOrderBill.resources
deleted file mode 100644
index da2e4f9..0000000
--- a/ProM/obj/Release/ProM.Cg_POOrderBill.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_POOrderBillList.resources b/ProM/obj/Release/ProM.Cg_POOrderBillList.resources
deleted file mode 100644
index 6b30160..0000000
--- a/ProM/obj/Release/ProM.Cg_POOrderBillList.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_POOrderBillList_K3.resources b/ProM/obj/Release/ProM.Cg_POOrderBillList_K3.resources
deleted file mode 100644
index 2fe6b1a..0000000
--- a/ProM/obj/Release/ProM.Cg_POOrderBillList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_POOrderBill_K3.resources b/ProM/obj/Release/ProM.Cg_POOrderBill_K3.resources
deleted file mode 100644
index c161e2c..0000000
--- a/ProM/obj/Release/ProM.Cg_POOrderBill_K3.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_PORequestBill.resources b/ProM/obj/Release/ProM.Cg_PORequestBill.resources
deleted file mode 100644
index c623768..0000000
--- a/ProM/obj/Release/ProM.Cg_PORequestBill.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_PORequestBillList.resources b/ProM/obj/Release/ProM.Cg_PORequestBillList.resources
deleted file mode 100644
index 6b30160..0000000
--- a/ProM/obj/Release/ProM.Cg_PORequestBillList.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_PORequestBillList_K3.resources b/ProM/obj/Release/ProM.Cg_PORequestBillList_K3.resources
deleted file mode 100644
index 7a2e9d8..0000000
--- a/ProM/obj/Release/ProM.Cg_PORequestBillList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_PORequestBill_K3.resources b/ProM/obj/Release/ProM.Cg_PORequestBill_K3.resources
deleted file mode 100644
index fdbf352..0000000
--- a/ProM/obj/Release/ProM.Cg_PORequestBill_K3.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_PORequestPriceBill.resources b/ProM/obj/Release/ProM.Cg_PORequestPriceBill.resources
deleted file mode 100644
index fb52e2f..0000000
--- a/ProM/obj/Release/ProM.Cg_PORequestPriceBill.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_PORequestPriceBillList.resources b/ProM/obj/Release/ProM.Cg_PORequestPriceBillList.resources
deleted file mode 100644
index e62461d..0000000
--- a/ProM/obj/Release/ProM.Cg_PORequestPriceBillList.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_SupStatusChangeBill.resources b/ProM/obj/Release/ProM.Cg_SupStatusChangeBill.resources
deleted file mode 100644
index 01c6ee3..0000000
--- a/ProM/obj/Release/ProM.Cg_SupStatusChangeBill.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_SupStatusChangeBillList.resources b/ProM/obj/Release/ProM.Cg_SupStatusChangeBillList.resources
deleted file mode 100644
index 3f1c1aa..0000000
--- a/ProM/obj/Release/ProM.Cg_SupStatusChangeBillList.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_SupStatusChangeBillReport.resources b/ProM/obj/Release/ProM.Cg_SupStatusChangeBillReport.resources
deleted file mode 100644
index 549c96c..0000000
--- a/ProM/obj/Release/ProM.Cg_SupStatusChangeBillReport.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.Cg_SupStatusChangeBillReportDlg.resources b/ProM/obj/Release/ProM.Cg_SupStatusChangeBillReportDlg.resources
deleted file mode 100644
index 0100dec..0000000
--- a/ProM/obj/Release/ProM.Cg_SupStatusChangeBillReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.csproj.GenerateResource.Cache b/ProM/obj/Release/ProM.csproj.GenerateResource.Cache
deleted file mode 100644
index cecf2db..0000000
--- a/ProM/obj/Release/ProM.csproj.GenerateResource.Cache
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.csproj.ResolveComReference.cache b/ProM/obj/Release/ProM.csproj.ResolveComReference.cache
deleted file mode 100644
index 529d88d..0000000
--- a/ProM/obj/Release/ProM.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.dll b/ProM/obj/Release/ProM.dll
deleted file mode 100644
index 5d05567..0000000
--- a/ProM/obj/Release/ProM.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/Release/ProM.pdb b/ProM/obj/Release/ProM.pdb
deleted file mode 100644
index dd2e0ce..0000000
--- a/ProM/obj/Release/ProM.pdb
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/ProM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/ProM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/ProM/obj/x86/Release/AxInterop.grdes6Lib.dll b/ProM/obj/x86/Release/AxInterop.grdes6Lib.dll
deleted file mode 100644
index e12bf16..0000000
--- a/ProM/obj/x86/Release/AxInterop.grdes6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/x86/Release/AxInterop.gregn6Lib.dll b/ProM/obj/x86/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index d945562..0000000
--- a/ProM/obj/x86/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/x86/Release/Interop.grdes6Lib.dll b/ProM/obj/x86/Release/Interop.grdes6Lib.dll
deleted file mode 100644
index 7ded135..0000000
--- a/ProM/obj/x86/Release/Interop.grdes6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/x86/Release/Interop.gregn6Lib.dll b/ProM/obj/x86/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index b01089a..0000000
--- a/ProM/obj/x86/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/ProM/obj/x86/Release/ProM.csproj.ResolveComReference.cache b/ProM/obj/x86/Release/ProM.csproj.ResolveComReference.cache
deleted file mode 100644
index 529d88d..0000000
--- a/ProM/obj/x86/Release/ProM.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 78c9619..8e40f14 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -696,6 +696,39 @@
omodel.Sc_ICMOReportBill_UpdateSourceInterID = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //=======JIT
+
+ //==========开班单
+ //自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESBeginWorkBill_AutoCheck")
+ {
+ omodel.Sc_MESBeginWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //==========结班单
+ //自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESEndWorkBill_AutoCheck")
+ {
+ omodel.Sc_MESEndWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //==========停工单
+ //自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESStopWorkBill_AutoCheck")
+ {
+ omodel.Sc_MESStopWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //==========产量汇报单
+ //自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBillWorkQtyStatus_AutoCheck")
+ {
+ omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //==========质量汇报单
+ //自动审核
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_ICMOBillQualityStatus_AutoCheck")
+ {
+ omodel.Sc_ICMOBillQualityStatus_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+
}
sReturn = "显示单据成功！";
return true;
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index 939c058..2b26d3b 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -191,6 +191,22 @@
public string Sc_ICMOReportBill_BillTypeOneScan;//本单据类型内只允许一次扫码（唯一码，含缓存列表）
public string Sc_ICMOReportBill_UpdateSourceInterID;//覆盖源单内码
+
+ //JIT
+
+
+ //开班单
+ public string Sc_MESBeginWorkBill_AutoCheck; //自动审核
+ //结班单
+ public string Sc_MESEndWorkBill_AutoCheck; //自动审核
+ //停工挂起单
+ public string Sc_MESStopWorkBill_AutoCheck; //自动审核
+ //产量汇报单
+ public string Sc_ICMOBillWorkQtyStatus_AutoCheck; //自动审核
+ //质量汇报单
+ public string Sc_ICMOBillQualityStatus_AutoCheck; //自动审核
+
+ //
}
}
diff --git a/Pub_Class/bin/Debug/Pub_Class.dll b/Pub_Class/bin/Debug/Pub_Class.dll
deleted file mode 100644
index dc6437e..0000000
--- a/Pub_Class/bin/Debug/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/Pub_Class/bin/Debug/Pub_Class.pdb b/Pub_Class/bin/Debug/Pub_Class.pdb
deleted file mode 100644
index 72379d0..0000000
--- a/Pub_Class/bin/Debug/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/Pub_Class/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/Pub_Class/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/Pub_Class/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/Pub_Class/obj/Release/Interop.VSFlex7.dll b/Pub_Class/obj/Release/Interop.VSFlex7.dll
deleted file mode 100644
index f6a47bf..0000000
--- a/Pub_Class/obj/Release/Interop.VSFlex7.dll
+++ /dev/null
Binary files differ
diff --git a/Pub_Class/obj/Release/Pub_Class.csproj.ResolveComReference.cache b/Pub_Class/obj/Release/Pub_Class.csproj.ResolveComReference.cache
deleted file mode 100644
index 1b41656..0000000
--- a/Pub_Class/obj/Release/Pub_Class.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/Pub_Class/obj/Release/Pub_Class.dll b/Pub_Class/obj/Release/Pub_Class.dll
deleted file mode 100644
index 81c2807..0000000
--- a/Pub_Class/obj/Release/Pub_Class.dll
+++ /dev/null
Binary files differ
diff --git a/Pub_Class/obj/Release/Pub_Class.pdb b/Pub_Class/obj/Release/Pub_Class.pdb
deleted file mode 100644
index ed9a4e7..0000000
--- a/Pub_Class/obj/Release/Pub_Class.pdb
+++ /dev/null
Binary files differ
diff --git a/Pub_Class/obj/Release/ResolveAssemblyReference.cache b/Pub_Class/obj/Release/ResolveAssemblyReference.cache
deleted file mode 100644
index 54b7fad..0000000
--- a/Pub_Class/obj/Release/ResolveAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/Pub_Class/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/Pub_Class/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/Pub_Class/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/Pub_Class/obj/x86/Release/Pub_Class.csproj.ResolveComReference.cache b/Pub_Class/obj/x86/Release/Pub_Class.csproj.ResolveComReference.cache
deleted file mode 100644
index 1b41656..0000000
--- a/Pub_Class/obj/x86/Release/Pub_Class.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/Pub_Control/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/Pub_Control/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/Pub_Control/obj/Release/AxInterop.VSFlex7.dll b/Pub_Control/obj/Release/AxInterop.VSFlex7.dll
deleted file mode 100644
index 2747bad..0000000
--- a/Pub_Control/obj/Release/AxInterop.VSFlex7.dll
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/Release/Interop.VSFlex7.dll b/Pub_Control/obj/Release/Interop.VSFlex7.dll
deleted file mode 100644
index 261f7b6..0000000
--- a/Pub_Control/obj/Release/Interop.VSFlex7.dll
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/Release/Pub_Control.Gy_GridView_Hide.resources b/Pub_Control/obj/Release/Pub_Control.Gy_GridView_Hide.resources
deleted file mode 100644
index 15f3092..0000000
--- a/Pub_Control/obj/Release/Pub_Control.Gy_GridView_Hide.resources
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/Release/Pub_Control.Properties.Resources.resources b/Pub_Control/obj/Release/Pub_Control.Properties.Resources.resources
deleted file mode 100644
index 06c24d0..0000000
--- a/Pub_Control/obj/Release/Pub_Control.Properties.Resources.resources
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/Release/Pub_Control.csproj.GenerateResource.Cache b/Pub_Control/obj/Release/Pub_Control.csproj.GenerateResource.Cache
deleted file mode 100644
index 0d9c9b7..0000000
--- a/Pub_Control/obj/Release/Pub_Control.csproj.GenerateResource.Cache
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/Release/Pub_Control.csproj.ResolveComReference.cache b/Pub_Control/obj/Release/Pub_Control.csproj.ResolveComReference.cache
deleted file mode 100644
index 1b41656..0000000
--- a/Pub_Control/obj/Release/Pub_Control.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/Release/Pub_Control.dll b/Pub_Control/obj/Release/Pub_Control.dll
deleted file mode 100644
index d61866b..0000000
--- a/Pub_Control/obj/Release/Pub_Control.dll
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/Release/Pub_Control.frmBillQueryCondition_Base.resources b/Pub_Control/obj/Release/Pub_Control.frmBillQueryCondition_Base.resources
deleted file mode 100644
index 3beb5ab..0000000
--- a/Pub_Control/obj/Release/Pub_Control.frmBillQueryCondition_Base.resources
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/Release/Pub_Control.frmHlpInfo.resources b/Pub_Control/obj/Release/Pub_Control.frmHlpInfo.resources
deleted file mode 100644
index 84b984e..0000000
--- a/Pub_Control/obj/Release/Pub_Control.frmHlpInfo.resources
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/Release/Pub_Control.frmHlpInfo_View.resources b/Pub_Control/obj/Release/Pub_Control.frmHlpInfo_View.resources
deleted file mode 100644
index d3ae71c..0000000
--- a/Pub_Control/obj/Release/Pub_Control.frmHlpInfo_View.resources
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/Release/Pub_Control.frmHlpTree.resources b/Pub_Control/obj/Release/Pub_Control.frmHlpTree.resources
deleted file mode 100644
index 386f179..0000000
--- a/Pub_Control/obj/Release/Pub_Control.frmHlpTree.resources
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/Release/Pub_Control.frm_G_BillQueryCondition_Base.resources b/Pub_Control/obj/Release/Pub_Control.frm_G_BillQueryCondition_Base.resources
deleted file mode 100644
index 9f5dfe6..0000000
--- a/Pub_Control/obj/Release/Pub_Control.frm_G_BillQueryCondition_Base.resources
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/Release/Pub_Control.frm_S_BillQueryCondition_Base.resources b/Pub_Control/obj/Release/Pub_Control.frm_S_BillQueryCondition_Base.resources
deleted file mode 100644
index b1d1399..0000000
--- a/Pub_Control/obj/Release/Pub_Control.frm_S_BillQueryCondition_Base.resources
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/Release/Pub_Control.frm_SetName.resources b/Pub_Control/obj/Release/Pub_Control.frm_SetName.resources
deleted file mode 100644
index 06c24d0..0000000
--- a/Pub_Control/obj/Release/Pub_Control.frm_SetName.resources
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/Release/Pub_Control.pdb b/Pub_Control/obj/Release/Pub_Control.pdb
deleted file mode 100644
index a3856a6..0000000
--- a/Pub_Control/obj/Release/Pub_Control.pdb
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/Release/ResolveAssemblyReference.cache b/Pub_Control/obj/Release/ResolveAssemblyReference.cache
deleted file mode 100644
index 8ba30bd..0000000
--- a/Pub_Control/obj/Release/ResolveAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/Pub_Control/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
deleted file mode 100644
index a25570a..0000000
--- a/Pub_Control/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/Release/build.force b/Pub_Control/obj/Release/build.force
deleted file mode 100644
index e69de29..0000000
--- a/Pub_Control/obj/Release/build.force
+++ /dev/null
diff --git a/Pub_Control/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/Pub_Control/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/Pub_Control/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/Pub_Control/obj/x86/Release/Pub_Control.csproj.ResolveComReference.cache b/Pub_Control/obj/x86/Release/Pub_Control.csproj.ResolveComReference.cache
deleted file mode 100644
index 1b41656..0000000
--- a/Pub_Control/obj/x86/Release/Pub_Control.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/x86/Release/TempPE/Properties.Resources.Designer.cs.dll b/Pub_Control/obj/x86/Release/TempPE/Properties.Resources.Designer.cs.dll
deleted file mode 100644
index 64e3eb1..0000000
--- a/Pub_Control/obj/x86/Release/TempPE/Properties.Resources.Designer.cs.dll
+++ /dev/null
Binary files differ
diff --git a/Pub_Control/obj/x86/Release/build.force b/Pub_Control/obj/x86/Release/build.force
deleted file mode 100644
index e69de29..0000000
--- a/Pub_Control/obj/x86/Release/build.force
+++ /dev/null
diff --git a/SCM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/SCM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/SCM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/SCM/obj/Release/AxInterop.gregn6Lib.dll b/SCM/obj/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index c682fae..0000000
--- a/SCM/obj/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/SCM/obj/Release/Interop.gregn6Lib.dll b/SCM/obj/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index 7a1d985..0000000
--- a/SCM/obj/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/SCM/obj/Release/SCM.csproj.ResolveComReference.cache b/SCM/obj/Release/SCM.csproj.ResolveComReference.cache
deleted file mode 100644
index c485d5a..0000000
--- a/SCM/obj/Release/SCM.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/SCM/obj/Release/SCM.csprojAssemblyReference.cache b/SCM/obj/Release/SCM.csprojAssemblyReference.cache
deleted file mode 100644
index fa9c5a9..0000000
--- a/SCM/obj/Release/SCM.csprojAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/SCM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/SCM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/SCM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/SCM/obj/x86/Release/AxInterop.gregn6Lib.dll b/SCM/obj/x86/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index fd0eefc..0000000
--- a/SCM/obj/x86/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/SCM/obj/x86/Release/Interop.gregn6Lib.dll b/SCM/obj/x86/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index 2404e65..0000000
--- a/SCM/obj/x86/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/SCM/obj/x86/Release/SCM.csproj.ResolveComReference.cache b/SCM/obj/x86/Release/SCM.csproj.ResolveComReference.cache
deleted file mode 100644
index c485d5a..0000000
--- a/SCM/obj/x86/Release/SCM.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/SelM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/SelM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/SelM/obj/Release/AxInterop.grdes6Lib.dll b/SelM/obj/Release/AxInterop.grdes6Lib.dll
deleted file mode 100644
index 6916277..0000000
--- a/SelM/obj/Release/AxInterop.grdes6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/AxInterop.grdesLib.dll b/SelM/obj/Release/AxInterop.grdesLib.dll
deleted file mode 100644
index 7ec286d..0000000
--- a/SelM/obj/Release/AxInterop.grdesLib.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/AxInterop.gregn6Lib.dll b/SelM/obj/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index cccc71c..0000000
--- a/SelM/obj/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/AxInterop.grproLib.dll b/SelM/obj/Release/AxInterop.grproLib.dll
deleted file mode 100644
index 271a950..0000000
--- a/SelM/obj/Release/AxInterop.grproLib.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/Interop.grdes6Lib.dll b/SelM/obj/Release/Interop.grdes6Lib.dll
deleted file mode 100644
index 5d9c929..0000000
--- a/SelM/obj/Release/Interop.grdes6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/Interop.grdesLib.dll b/SelM/obj/Release/Interop.grdesLib.dll
deleted file mode 100644
index 3ae63c0..0000000
--- a/SelM/obj/Release/Interop.grdesLib.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/Interop.gregn6Lib.dll b/SelM/obj/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index e0859b3..0000000
--- a/SelM/obj/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/Interop.grproLib.dll b/SelM/obj/Release/Interop.grproLib.dll
deleted file mode 100644
index ab9df86..0000000
--- a/SelM/obj/Release/Interop.grproLib.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/PlanM.Xs_CusStatusChangeBill.resources b/SelM/obj/Release/PlanM.Xs_CusStatusChangeBill.resources
deleted file mode 100644
index 1db4788..0000000
--- a/SelM/obj/Release/PlanM.Xs_CusStatusChangeBill.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/PlanM.Xs_CusStatusChangeBillList.resources b/SelM/obj/Release/PlanM.Xs_CusStatusChangeBillList.resources
deleted file mode 100644
index cafddfa..0000000
--- a/SelM/obj/Release/PlanM.Xs_CusStatusChangeBillList.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/ResolveAssemblyReference.cache b/SelM/obj/Release/ResolveAssemblyReference.cache
deleted file mode 100644
index 1ee43cd..0000000
--- a/SelM/obj/Release/ResolveAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.K3_SeOrderBill_CheckExtend.resources b/SelM/obj/Release/SelM.K3_SeOrderBill_CheckExtend.resources
deleted file mode 100644
index 19d0743..0000000
--- a/SelM/obj/Release/SelM.K3_SeOrderBill_CheckExtend.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_ContactBal2_K3.resources b/SelM/obj/Release/SelM.Xs_ContactBal2_K3.resources
deleted file mode 100644
index a017d46..0000000
--- a/SelM/obj/Release/SelM.Xs_ContactBal2_K3.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_ContactBal2_K3Dlg.resources b/SelM/obj/Release/SelM.Xs_ContactBal2_K3Dlg.resources
deleted file mode 100644
index 37e16c5..0000000
--- a/SelM/obj/Release/SelM.Xs_ContactBal2_K3Dlg.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_ContactBal_K3.resources b/SelM/obj/Release/SelM.Xs_ContactBal_K3.resources
deleted file mode 100644
index a017d46..0000000
--- a/SelM/obj/Release/SelM.Xs_ContactBal_K3.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_ContactBal_K3Dlg.resources b/SelM/obj/Release/SelM.Xs_ContactBal_K3Dlg.resources
deleted file mode 100644
index 37e16c5..0000000
--- a/SelM/obj/Release/SelM.Xs_ContactBal_K3Dlg.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_ContractBill.resources b/SelM/obj/Release/SelM.Xs_ContractBill.resources
deleted file mode 100644
index 782e5ac..0000000
--- a/SelM/obj/Release/SelM.Xs_ContractBill.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_ContractBillList.resources b/SelM/obj/Release/SelM.Xs_ContractBillList.resources
deleted file mode 100644
index 65506c3..0000000
--- a/SelM/obj/Release/SelM.Xs_ContractBillList.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_ContractReport.resources b/SelM/obj/Release/SelM.Xs_ContractReport.resources
deleted file mode 100644
index 049fbc1..0000000
--- a/SelM/obj/Release/SelM.Xs_ContractReport.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_ContractReportDlg.resources b/SelM/obj/Release/SelM.Xs_ContractReportDlg.resources
deleted file mode 100644
index cda5772..0000000
--- a/SelM/obj/Release/SelM.Xs_ContractReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_CusMaterOutReport.resources b/SelM/obj/Release/SelM.Xs_CusMaterOutReport.resources
deleted file mode 100644
index 0488472..0000000
--- a/SelM/obj/Release/SelM.Xs_CusMaterOutReport.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_CusMaterOutReportDlg.resources b/SelM/obj/Release/SelM.Xs_CusMaterOutReportDlg.resources
deleted file mode 100644
index 71d0de9..0000000
--- a/SelM/obj/Release/SelM.Xs_CusMaterOutReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_CusRatingChangeBill.resources b/SelM/obj/Release/SelM.Xs_CusRatingChangeBill.resources
deleted file mode 100644
index 01c6ee3..0000000
--- a/SelM/obj/Release/SelM.Xs_CusRatingChangeBill.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_CusRatingChangeBillList.resources b/SelM/obj/Release/SelM.Xs_CusRatingChangeBillList.resources
deleted file mode 100644
index f661cf8..0000000
--- a/SelM/obj/Release/SelM.Xs_CusRatingChangeBillList.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_CusSeReport.resources b/SelM/obj/Release/SelM.Xs_CusSeReport.resources
deleted file mode 100644
index 0488472..0000000
--- a/SelM/obj/Release/SelM.Xs_CusSeReport.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_CusSeReportDlg.resources b/SelM/obj/Release/SelM.Xs_CusSeReportDlg.resources
deleted file mode 100644
index 71d0de9..0000000
--- a/SelM/obj/Release/SelM.Xs_CusSeReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_InvoiceBill.resources b/SelM/obj/Release/SelM.Xs_InvoiceBill.resources
deleted file mode 100644
index 1db1804..0000000
--- a/SelM/obj/Release/SelM.Xs_InvoiceBill.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_InvoiceBillList.resources b/SelM/obj/Release/SelM.Xs_InvoiceBillList.resources
deleted file mode 100644
index 1ff70b4..0000000
--- a/SelM/obj/Release/SelM.Xs_InvoiceBillList.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_InvoiceSpecBill.resources b/SelM/obj/Release/SelM.Xs_InvoiceSpecBill.resources
deleted file mode 100644
index 1db1804..0000000
--- a/SelM/obj/Release/SelM.Xs_InvoiceSpecBill.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_InvoiceSpecBillList.resources b/SelM/obj/Release/SelM.Xs_InvoiceSpecBillList.resources
deleted file mode 100644
index 1ff70b4..0000000
--- a/SelM/obj/Release/SelM.Xs_InvoiceSpecBillList.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_MonthAvgValueBill.resources b/SelM/obj/Release/SelM.Xs_MonthAvgValueBill.resources
deleted file mode 100644
index 0ac5832..0000000
--- a/SelM/obj/Release/SelM.Xs_MonthAvgValueBill.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_MonthAvgValueBillList.resources b/SelM/obj/Release/SelM.Xs_MonthAvgValueBillList.resources
deleted file mode 100644
index 2664459..0000000
--- a/SelM/obj/Release/SelM.Xs_MonthAvgValueBillList.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SeGainAnalyseReport.resources b/SelM/obj/Release/SelM.Xs_SeGainAnalyseReport.resources
deleted file mode 100644
index 0488472..0000000
--- a/SelM/obj/Release/SelM.Xs_SeGainAnalyseReport.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SeGainAnalyseReportDlg.resources b/SelM/obj/Release/SelM.Xs_SeGainAnalyseReportDlg.resources
deleted file mode 100644
index 24a1dce..0000000
--- a/SelM/obj/Release/SelM.Xs_SeGainAnalyseReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SeOrderBill.resources b/SelM/obj/Release/SelM.Xs_SeOrderBill.resources
deleted file mode 100644
index 55bd646..0000000
--- a/SelM/obj/Release/SelM.Xs_SeOrderBill.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SeOrderBillList.resources b/SelM/obj/Release/SelM.Xs_SeOrderBillList.resources
deleted file mode 100644
index 2ef5ae0..0000000
--- a/SelM/obj/Release/SelM.Xs_SeOrderBillList.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SeOrderBillList_K3.resources b/SelM/obj/Release/SelM.Xs_SeOrderBillList_K3.resources
deleted file mode 100644
index cbe2dd7..0000000
--- a/SelM/obj/Release/SelM.Xs_SeOrderBillList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SeOrderBill_K3.resources b/SelM/obj/Release/SelM.Xs_SeOrderBill_K3.resources
deleted file mode 100644
index 3e1cd2d..0000000
--- a/SelM/obj/Release/SelM.Xs_SeOrderBill_K3.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SeOrderBill_K3_Extend.resources b/SelM/obj/Release/SelM.Xs_SeOrderBill_K3_Extend.resources
deleted file mode 100644
index 06c24d0..0000000
--- a/SelM/obj/Release/SelM.Xs_SeOrderBill_K3_Extend.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SeOrderPSChaoE.resources b/SelM/obj/Release/SelM.Xs_SeOrderPSChaoE.resources
deleted file mode 100644
index 0488472..0000000
--- a/SelM/obj/Release/SelM.Xs_SeOrderPSChaoE.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SeOrderPSZL.resources b/SelM/obj/Release/SelM.Xs_SeOrderPSZL.resources
deleted file mode 100644
index 0488472..0000000
--- a/SelM/obj/Release/SelM.Xs_SeOrderPSZL.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SeOrderPSZiL.resources b/SelM/obj/Release/SelM.Xs_SeOrderPSZiL.resources
deleted file mode 100644
index 0488472..0000000
--- a/SelM/obj/Release/SelM.Xs_SeOrderPSZiL.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SeOrderReport.resources b/SelM/obj/Release/SelM.Xs_SeOrderReport.resources
deleted file mode 100644
index c8a51ee..0000000
--- a/SelM/obj/Release/SelM.Xs_SeOrderReport.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SeOrderReportDlg.resources b/SelM/obj/Release/SelM.Xs_SeOrderReportDlg.resources
deleted file mode 100644
index ec7ea14..0000000
--- a/SelM/obj/Release/SelM.Xs_SeOrderReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SeOutStockBackBill.resources b/SelM/obj/Release/SelM.Xs_SeOutStockBackBill.resources
deleted file mode 100644
index bedf0f9..0000000
--- a/SelM/obj/Release/SelM.Xs_SeOutStockBackBill.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SeOutStockBackBillList.resources b/SelM/obj/Release/SelM.Xs_SeOutStockBackBillList.resources
deleted file mode 100644
index bd1a680..0000000
--- a/SelM/obj/Release/SelM.Xs_SeOutStockBackBillList.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SeOutStockBill.resources b/SelM/obj/Release/SelM.Xs_SeOutStockBill.resources
deleted file mode 100644
index bedf0f9..0000000
--- a/SelM/obj/Release/SelM.Xs_SeOutStockBill.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SeOutStockBillList.resources b/SelM/obj/Release/SelM.Xs_SeOutStockBillList.resources
deleted file mode 100644
index bd1a680..0000000
--- a/SelM/obj/Release/SelM.Xs_SeOutStockBillList.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutBill_CP2_TeeChart.resources b/SelM/obj/Release/SelM.Xs_SellOutBill_CP2_TeeChart.resources
deleted file mode 100644
index 2b5d82f..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutBill_CP2_TeeChart.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutBill_CP2_TeeChartDlg.resources b/SelM/obj/Release/SelM.Xs_SellOutBill_CP2_TeeChartDlg.resources
deleted file mode 100644
index cd38d76..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutBill_CP2_TeeChartDlg.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutBill_CP_TeeChart.resources b/SelM/obj/Release/SelM.Xs_SellOutBill_CP_TeeChart.resources
deleted file mode 100644
index 2b5d82f..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutBill_CP_TeeChart.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutBill_CP_TeeChartDlg.resources b/SelM/obj/Release/SelM.Xs_SellOutBill_CP_TeeChartDlg.resources
deleted file mode 100644
index cd38d76..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutBill_CP_TeeChartDlg.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutBill_Cus2_TeeChart.resources b/SelM/obj/Release/SelM.Xs_SellOutBill_Cus2_TeeChart.resources
deleted file mode 100644
index 2b5d82f..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutBill_Cus2_TeeChart.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutBill_Cus2_TeeChartDlg.resources b/SelM/obj/Release/SelM.Xs_SellOutBill_Cus2_TeeChartDlg.resources
deleted file mode 100644
index cd38d76..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutBill_Cus2_TeeChartDlg.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutBill_Cus_TeeChart.resources b/SelM/obj/Release/SelM.Xs_SellOutBill_Cus_TeeChart.resources
deleted file mode 100644
index 2b5d82f..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutBill_Cus_TeeChart.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutBill_Cus_TeeChartDlg.resources b/SelM/obj/Release/SelM.Xs_SellOutBill_Cus_TeeChartDlg.resources
deleted file mode 100644
index cd38d76..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutBill_Cus_TeeChartDlg.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutBill_Mx2_TeeChart.resources b/SelM/obj/Release/SelM.Xs_SellOutBill_Mx2_TeeChart.resources
deleted file mode 100644
index 0488472..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutBill_Mx2_TeeChart.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutBill_Mx2_TeeChartDlg.resources b/SelM/obj/Release/SelM.Xs_SellOutBill_Mx2_TeeChartDlg.resources
deleted file mode 100644
index cd38d76..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutBill_Mx2_TeeChartDlg.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutBill_Mx_TeeChart.resources b/SelM/obj/Release/SelM.Xs_SellOutBill_Mx_TeeChart.resources
deleted file mode 100644
index 0488472..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutBill_Mx_TeeChart.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutBill_Mx_TeeChartDlg.resources b/SelM/obj/Release/SelM.Xs_SellOutBill_Mx_TeeChartDlg.resources
deleted file mode 100644
index cd38d76..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutBill_Mx_TeeChartDlg.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutBill_Quyu_TeeChart.resources b/SelM/obj/Release/SelM.Xs_SellOutBill_Quyu_TeeChart.resources
deleted file mode 100644
index 0488472..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutBill_Quyu_TeeChart.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutBill_Quyu_TeeChartDlg.resources b/SelM/obj/Release/SelM.Xs_SellOutBill_Quyu_TeeChartDlg.resources
deleted file mode 100644
index cd38d76..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutBill_Quyu_TeeChartDlg.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutBill_Sum_TeeChart.resources b/SelM/obj/Release/SelM.Xs_SellOutBill_Sum_TeeChart.resources
deleted file mode 100644
index 9801e33..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutBill_Sum_TeeChart.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutBill_Sum_TeeChartDlg.resources b/SelM/obj/Release/SelM.Xs_SellOutBill_Sum_TeeChartDlg.resources
deleted file mode 100644
index 71d0de9..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutBill_Sum_TeeChartDlg.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutBill_Type_TeeChart.resources b/SelM/obj/Release/SelM.Xs_SellOutBill_Type_TeeChart.resources
deleted file mode 100644
index 0488472..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutBill_Type_TeeChart.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutBill_Type_TeeChartDlg.resources b/SelM/obj/Release/SelM.Xs_SellOutBill_Type_TeeChartDlg.resources
deleted file mode 100644
index cd38d76..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutBill_Type_TeeChartDlg.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutDayReport.resources b/SelM/obj/Release/SelM.Xs_SellOutDayReport.resources
deleted file mode 100644
index 0488472..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutDayReport.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellOutDayReportDlg.resources b/SelM/obj/Release/SelM.Xs_SellOutDayReportDlg.resources
deleted file mode 100644
index 21648c8..0000000
--- a/SelM/obj/Release/SelM.Xs_SellOutDayReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellPlanBill.resources b/SelM/obj/Release/SelM.Xs_SellPlanBill.resources
deleted file mode 100644
index 272cea2..0000000
--- a/SelM/obj/Release/SelM.Xs_SellPlanBill.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellPlanBillList.resources b/SelM/obj/Release/SelM.Xs_SellPlanBillList.resources
deleted file mode 100644
index 369dd7f..0000000
--- a/SelM/obj/Release/SelM.Xs_SellPlanBillList.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellPlanExecuteBill.resources b/SelM/obj/Release/SelM.Xs_SellPlanExecuteBill.resources
deleted file mode 100644
index 6b31ec1..0000000
--- a/SelM/obj/Release/SelM.Xs_SellPlanExecuteBill.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_SellPlanExecuteBillList.resources b/SelM/obj/Release/SelM.Xs_SellPlanExecuteBillList.resources
deleted file mode 100644
index 9c64341..0000000
--- a/SelM/obj/Release/SelM.Xs_SellPlanExecuteBillList.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_ShouldIncomeEntryReport.resources b/SelM/obj/Release/SelM.Xs_ShouldIncomeEntryReport.resources
deleted file mode 100644
index 0488472..0000000
--- a/SelM/obj/Release/SelM.Xs_ShouldIncomeEntryReport.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_ShouldIncomeReport.resources b/SelM/obj/Release/SelM.Xs_ShouldIncomeReport.resources
deleted file mode 100644
index 2b5d82f..0000000
--- a/SelM/obj/Release/SelM.Xs_ShouldIncomeReport.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.Xs_ShouldIncomeReportDlg.resources b/SelM/obj/Release/SelM.Xs_ShouldIncomeReportDlg.resources
deleted file mode 100644
index 4d7465f..0000000
--- a/SelM/obj/Release/SelM.Xs_ShouldIncomeReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.csproj.GenerateResource.Cache b/SelM/obj/Release/SelM.csproj.GenerateResource.Cache
deleted file mode 100644
index 87b18ce..0000000
--- a/SelM/obj/Release/SelM.csproj.GenerateResource.Cache
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.csproj.ResolveComReference.cache b/SelM/obj/Release/SelM.csproj.ResolveComReference.cache
deleted file mode 100644
index 529d88d..0000000
--- a/SelM/obj/Release/SelM.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.dll b/SelM/obj/Release/SelM.dll
deleted file mode 100644
index 1cbdc2d..0000000
--- a/SelM/obj/Release/SelM.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/Release/SelM.pdb b/SelM/obj/Release/SelM.pdb
deleted file mode 100644
index 3f95903..0000000
--- a/SelM/obj/Release/SelM.pdb
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/SelM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/SelM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/SelM/obj/x86/Release/AxInterop.grdes6Lib.dll b/SelM/obj/x86/Release/AxInterop.grdes6Lib.dll
deleted file mode 100644
index 9dca452..0000000
--- a/SelM/obj/x86/Release/AxInterop.grdes6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/x86/Release/AxInterop.gregn6Lib.dll b/SelM/obj/x86/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index 6046372..0000000
--- a/SelM/obj/x86/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/x86/Release/Interop.grdes6Lib.dll b/SelM/obj/x86/Release/Interop.grdes6Lib.dll
deleted file mode 100644
index f1e0fb9..0000000
--- a/SelM/obj/x86/Release/Interop.grdes6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/x86/Release/Interop.gregn6Lib.dll b/SelM/obj/x86/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index 5e0e574..0000000
--- a/SelM/obj/x86/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/SelM/obj/x86/Release/SelM.csproj.ResolveComReference.cache b/SelM/obj/x86/Release/SelM.csproj.ResolveComReference.cache
deleted file mode 100644
index 529d88d..0000000
--- a/SelM/obj/x86/Release/SelM.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/WarM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/WarM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/WarM/obj/Release/AxInterop.grdesLib.dll b/WarM/obj/Release/AxInterop.grdesLib.dll
deleted file mode 100644
index 93c6307..0000000
--- a/WarM/obj/Release/AxInterop.grdesLib.dll
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/AxInterop.gregn6Lib.dll b/WarM/obj/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index 5ef0be1..0000000
--- a/WarM/obj/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/AxInterop.grproLib.dll b/WarM/obj/Release/AxInterop.grproLib.dll
deleted file mode 100644
index d7cb5c2..0000000
--- a/WarM/obj/Release/AxInterop.grproLib.dll
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/Interop.grdesLib.dll b/WarM/obj/Release/Interop.grdesLib.dll
deleted file mode 100644
index 0fa8e9c..0000000
--- a/WarM/obj/Release/Interop.grdesLib.dll
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/Interop.gregn6Lib.dll b/WarM/obj/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index 638344b..0000000
--- a/WarM/obj/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/Interop.grproLib.dll b/WarM/obj/Release/Interop.grproLib.dll
deleted file mode 100644
index 9ff1f46..0000000
--- a/WarM/obj/Release/Interop.grproLib.dll
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/WarM/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
deleted file mode 100644
index 769ccc7..0000000
--- a/WarM/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Gy_BarCodeBillList.resources b/WarM/obj/Release/WarM.Gy_BarCodeBillList.resources
deleted file mode 100644
index b137660..0000000
--- a/WarM/obj/Release/WarM.Gy_BarCodeBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Gy_BarCodeEdit.resources b/WarM/obj/Release/WarM.Gy_BarCodeEdit.resources
deleted file mode 100644
index 476e29a..0000000
--- a/WarM/obj/Release/WarM.Gy_BarCodeEdit.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.IC_MateOutBillList_K3.resources b/WarM/obj/Release/WarM.IC_MateOutBillList_K3.resources
deleted file mode 100644
index f8f6e8a..0000000
--- a/WarM/obj/Release/WarM.IC_MateOutBillList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.K3_ICMOList.resources b/WarM/obj/Release/WarM.K3_ICMOList.resources
deleted file mode 100644
index ed73a78..0000000
--- a/WarM/obj/Release/WarM.K3_ICMOList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.K3_PoinStockList.resources b/WarM/obj/Release/WarM.K3_PoinStockList.resources
deleted file mode 100644
index ed73a78..0000000
--- a/WarM/obj/Release/WarM.K3_PoinStockList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.KF_ICInventoryList.resources b/WarM/obj/Release/WarM.KF_ICInventoryList.resources
deleted file mode 100644
index 04dad3d..0000000
--- a/WarM/obj/Release/WarM.KF_ICInventoryList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.KF_ICInventoryList_Mould.resources b/WarM/obj/Release/WarM.KF_ICInventoryList_Mould.resources
deleted file mode 100644
index b18c5fd..0000000
--- a/WarM/obj/Release/WarM.KF_ICInventoryList_Mould.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_CheckStockBill.resources b/WarM/obj/Release/WarM.Kf_CheckStockBill.resources
deleted file mode 100644
index 2b2d927..0000000
--- a/WarM/obj/Release/WarM.Kf_CheckStockBill.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_CheckStockBillList.resources b/WarM/obj/Release/WarM.Kf_CheckStockBillList.resources
deleted file mode 100644
index 6b30160..0000000
--- a/WarM/obj/Release/WarM.Kf_CheckStockBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_EditQty.resources b/WarM/obj/Release/WarM.Kf_EditQty.resources
deleted file mode 100644
index 06c24d0..0000000
--- a/WarM/obj/Release/WarM.Kf_EditQty.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_EntrustCheckStockBill.resources b/WarM/obj/Release/WarM.Kf_EntrustCheckStockBill.resources
deleted file mode 100644
index cd0cc04..0000000
--- a/WarM/obj/Release/WarM.Kf_EntrustCheckStockBill.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_EntrustCheckStockBillList.resources b/WarM/obj/Release/WarM.Kf_EntrustCheckStockBillList.resources
deleted file mode 100644
index e86882b..0000000
--- a/WarM/obj/Release/WarM.Kf_EntrustCheckStockBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_EntrustInBill.resources b/WarM/obj/Release/WarM.Kf_EntrustInBill.resources
deleted file mode 100644
index 9bb28da..0000000
--- a/WarM/obj/Release/WarM.Kf_EntrustInBill.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_EntrustInBillList.resources b/WarM/obj/Release/WarM.Kf_EntrustInBillList.resources
deleted file mode 100644
index 65506c3..0000000
--- a/WarM/obj/Release/WarM.Kf_EntrustInBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_EntrustOutBill.resources b/WarM/obj/Release/WarM.Kf_EntrustOutBill.resources
deleted file mode 100644
index 9bb28da..0000000
--- a/WarM/obj/Release/WarM.Kf_EntrustOutBill.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_EntrustOutBillList.resources b/WarM/obj/Release/WarM.Kf_EntrustOutBillList.resources
deleted file mode 100644
index 65506c3..0000000
--- a/WarM/obj/Release/WarM.Kf_EntrustOutBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_InceptEntInBill.resources b/WarM/obj/Release/WarM.Kf_InceptEntInBill.resources
deleted file mode 100644
index 25586d5..0000000
--- a/WarM/obj/Release/WarM.Kf_InceptEntInBill.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_InceptEntInBillList.resources b/WarM/obj/Release/WarM.Kf_InceptEntInBillList.resources
deleted file mode 100644
index 65506c3..0000000
--- a/WarM/obj/Release/WarM.Kf_InceptEntInBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_InceptEntOutBill.resources b/WarM/obj/Release/WarM.Kf_InceptEntOutBill.resources
deleted file mode 100644
index 25586d5..0000000
--- a/WarM/obj/Release/WarM.Kf_InceptEntOutBill.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_InceptEntOutBillList.resources b/WarM/obj/Release/WarM.Kf_InceptEntOutBillList.resources
deleted file mode 100644
index 18ea5e7..0000000
--- a/WarM/obj/Release/WarM.Kf_InceptEntOutBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_InitStockBill.resources b/WarM/obj/Release/WarM.Kf_InitStockBill.resources
deleted file mode 100644
index f6d917e..0000000
--- a/WarM/obj/Release/WarM.Kf_InitStockBill.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_InitStockBill_WW.resources b/WarM/obj/Release/WarM.Kf_InitStockBill_WW.resources
deleted file mode 100644
index 97028e8..0000000
--- a/WarM/obj/Release/WarM.Kf_InitStockBill_WW.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_MateOutBill.resources b/WarM/obj/Release/WarM.Kf_MateOutBill.resources
deleted file mode 100644
index 30b3eeb..0000000
--- a/WarM/obj/Release/WarM.Kf_MateOutBill.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_MateOutBillList.resources b/WarM/obj/Release/WarM.Kf_MateOutBillList.resources
deleted file mode 100644
index 6b30160..0000000
--- a/WarM/obj/Release/WarM.Kf_MateOutBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_MateOutBillList_K3.resources b/WarM/obj/Release/WarM.Kf_MateOutBillList_K3.resources
deleted file mode 100644
index cafddfa..0000000
--- a/WarM/obj/Release/WarM.Kf_MateOutBillList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_MateOutBill_K3.resources b/WarM/obj/Release/WarM.Kf_MateOutBill_K3.resources
deleted file mode 100644
index fdb8e61..0000000
--- a/WarM/obj/Release/WarM.Kf_MateOutBill_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_MateOutInBookReport.resources b/WarM/obj/Release/WarM.Kf_MateOutInBookReport.resources
deleted file mode 100644
index 0488472..0000000
--- a/WarM/obj/Release/WarM.Kf_MateOutInBookReport.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_MateOutInBookReportDlg.resources b/WarM/obj/Release/WarM.Kf_MateOutInBookReportDlg.resources
deleted file mode 100644
index 777cf74..0000000
--- a/WarM/obj/Release/WarM.Kf_MateOutInBookReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_MateOutRequestBill.resources b/WarM/obj/Release/WarM.Kf_MateOutRequestBill.resources
deleted file mode 100644
index c86985d..0000000
--- a/WarM/obj/Release/WarM.Kf_MateOutRequestBill.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_MateOutRequestBillList.resources b/WarM/obj/Release/WarM.Kf_MateOutRequestBillList.resources
deleted file mode 100644
index 6b30160..0000000
--- a/WarM/obj/Release/WarM.Kf_MateOutRequestBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_MateOutSumReport.resources b/WarM/obj/Release/WarM.Kf_MateOutSumReport.resources
deleted file mode 100644
index 0488472..0000000
--- a/WarM/obj/Release/WarM.Kf_MateOutSumReport.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_MateOutSumReportDlg.resources b/WarM/obj/Release/WarM.Kf_MateOutSumReportDlg.resources
deleted file mode 100644
index f908cdf..0000000
--- a/WarM/obj/Release/WarM.Kf_MateOutSumReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_MateStockAccount.resources b/WarM/obj/Release/WarM.Kf_MateStockAccount.resources
deleted file mode 100644
index 0488472..0000000
--- a/WarM/obj/Release/WarM.Kf_MateStockAccount.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_MateStockAccountDlg.resources b/WarM/obj/Release/WarM.Kf_MateStockAccountDlg.resources
deleted file mode 100644
index 777cf74..0000000
--- a/WarM/obj/Release/WarM.Kf_MateStockAccountDlg.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_MoveStockBill.resources b/WarM/obj/Release/WarM.Kf_MoveStockBill.resources
deleted file mode 100644
index 248488f..0000000
--- a/WarM/obj/Release/WarM.Kf_MoveStockBill.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_MoveStockBillList.resources b/WarM/obj/Release/WarM.Kf_MoveStockBillList.resources
deleted file mode 100644
index 6b30160..0000000
--- a/WarM/obj/Release/WarM.Kf_MoveStockBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_MoveStockBillList_K3.resources b/WarM/obj/Release/WarM.Kf_MoveStockBillList_K3.resources
deleted file mode 100644
index e62461d..0000000
--- a/WarM/obj/Release/WarM.Kf_MoveStockBillList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_MoveStockBill_K3.resources b/WarM/obj/Release/WarM.Kf_MoveStockBill_K3.resources
deleted file mode 100644
index 9e9f164..0000000
--- a/WarM/obj/Release/WarM.Kf_MoveStockBill_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_OtherInBill.resources b/WarM/obj/Release/WarM.Kf_OtherInBill.resources
deleted file mode 100644
index c34effe..0000000
--- a/WarM/obj/Release/WarM.Kf_OtherInBill.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_OtherInBillList.resources b/WarM/obj/Release/WarM.Kf_OtherInBillList.resources
deleted file mode 100644
index 6b30160..0000000
--- a/WarM/obj/Release/WarM.Kf_OtherInBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_OtherInBillList_K3.resources b/WarM/obj/Release/WarM.Kf_OtherInBillList_K3.resources
deleted file mode 100644
index cafddfa..0000000
--- a/WarM/obj/Release/WarM.Kf_OtherInBillList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_OtherInBill_K3.resources b/WarM/obj/Release/WarM.Kf_OtherInBill_K3.resources
deleted file mode 100644
index e6d344d..0000000
--- a/WarM/obj/Release/WarM.Kf_OtherInBill_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_OtherOutBill.resources b/WarM/obj/Release/WarM.Kf_OtherOutBill.resources
deleted file mode 100644
index ed75448..0000000
--- a/WarM/obj/Release/WarM.Kf_OtherOutBill.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_OtherOutBillList.resources b/WarM/obj/Release/WarM.Kf_OtherOutBillList.resources
deleted file mode 100644
index 6b30160..0000000
--- a/WarM/obj/Release/WarM.Kf_OtherOutBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_OtherOutBillList_K3.resources b/WarM/obj/Release/WarM.Kf_OtherOutBillList_K3.resources
deleted file mode 100644
index cafddfa..0000000
--- a/WarM/obj/Release/WarM.Kf_OtherOutBillList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_OtherOutBill_K3.resources b/WarM/obj/Release/WarM.Kf_OtherOutBill_K3.resources
deleted file mode 100644
index e6d344d..0000000
--- a/WarM/obj/Release/WarM.Kf_OtherOutBill_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_POStockInBill.resources b/WarM/obj/Release/WarM.Kf_POStockInBill.resources
deleted file mode 100644
index 3bdf6a6..0000000
--- a/WarM/obj/Release/WarM.Kf_POStockInBill.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_POStockInBillList.resources b/WarM/obj/Release/WarM.Kf_POStockInBillList.resources
deleted file mode 100644
index 6b30160..0000000
--- a/WarM/obj/Release/WarM.Kf_POStockInBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_POStockInBillList_K3.resources b/WarM/obj/Release/WarM.Kf_POStockInBillList_K3.resources
deleted file mode 100644
index cafddfa..0000000
--- a/WarM/obj/Release/WarM.Kf_POStockInBillList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_POStockInBill_K3.resources b/WarM/obj/Release/WarM.Kf_POStockInBill_K3.resources
deleted file mode 100644
index 4e6aead..0000000
--- a/WarM/obj/Release/WarM.Kf_POStockInBill_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_PStockInOutReport.resources b/WarM/obj/Release/WarM.Kf_PStockInOutReport.resources
deleted file mode 100644
index 0488472..0000000
--- a/WarM/obj/Release/WarM.Kf_PStockInOutReport.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_PStockInOutReportDlg.resources b/WarM/obj/Release/WarM.Kf_PStockInOutReportDlg.resources
deleted file mode 100644
index 777cf74..0000000
--- a/WarM/obj/Release/WarM.Kf_PStockInOutReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_PStockInOutSumReport.resources b/WarM/obj/Release/WarM.Kf_PStockInOutSumReport.resources
deleted file mode 100644
index 0488472..0000000
--- a/WarM/obj/Release/WarM.Kf_PStockInOutSumReport.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_PStockInOutSumReportDlg.resources b/WarM/obj/Release/WarM.Kf_PStockInOutSumReportDlg.resources
deleted file mode 100644
index 777cf74..0000000
--- a/WarM/obj/Release/WarM.Kf_PStockInOutSumReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_ProductInBill.resources b/WarM/obj/Release/WarM.Kf_ProductInBill.resources
deleted file mode 100644
index f87ad73..0000000
--- a/WarM/obj/Release/WarM.Kf_ProductInBill.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_ProductInBillList.resources b/WarM/obj/Release/WarM.Kf_ProductInBillList.resources
deleted file mode 100644
index 486fe60..0000000
--- a/WarM/obj/Release/WarM.Kf_ProductInBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_ProductInBillList_K3.resources b/WarM/obj/Release/WarM.Kf_ProductInBillList_K3.resources
deleted file mode 100644
index cafddfa..0000000
--- a/WarM/obj/Release/WarM.Kf_ProductInBillList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_ProductInBill_K3.resources b/WarM/obj/Release/WarM.Kf_ProductInBill_K3.resources
deleted file mode 100644
index cc34704..0000000
--- a/WarM/obj/Release/WarM.Kf_ProductInBill_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_SafeStockReport.resources b/WarM/obj/Release/WarM.Kf_SafeStockReport.resources
deleted file mode 100644
index 0488472..0000000
--- a/WarM/obj/Release/WarM.Kf_SafeStockReport.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_SafeStockReportDlg.resources b/WarM/obj/Release/WarM.Kf_SafeStockReportDlg.resources
deleted file mode 100644
index 777cf74..0000000
--- a/WarM/obj/Release/WarM.Kf_SafeStockReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_SellOutBill.resources b/WarM/obj/Release/WarM.Kf_SellOutBill.resources
deleted file mode 100644
index fec8a61..0000000
--- a/WarM/obj/Release/WarM.Kf_SellOutBill.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_SellOutBillList.resources b/WarM/obj/Release/WarM.Kf_SellOutBillList.resources
deleted file mode 100644
index 6b30160..0000000
--- a/WarM/obj/Release/WarM.Kf_SellOutBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_SellOutBillList_K3.resources b/WarM/obj/Release/WarM.Kf_SellOutBillList_K3.resources
deleted file mode 100644
index cafddfa..0000000
--- a/WarM/obj/Release/WarM.Kf_SellOutBillList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Kf_SellOutBill_K3.resources b/WarM/obj/Release/WarM.Kf_SellOutBill_K3.resources
deleted file mode 100644
index 206038e..0000000
--- a/WarM/obj/Release/WarM.Kf_SellOutBill_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.Properties.Resources.resources b/WarM/obj/Release/WarM.Properties.Resources.resources
deleted file mode 100644
index 06c24d0..0000000
--- a/WarM/obj/Release/WarM.Properties.Resources.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.csproj.GenerateResource.Cache b/WarM/obj/Release/WarM.csproj.GenerateResource.Cache
deleted file mode 100644
index 19c75e4..0000000
--- a/WarM/obj/Release/WarM.csproj.GenerateResource.Cache
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.csproj.ResolveComReference.cache b/WarM/obj/Release/WarM.csproj.ResolveComReference.cache
deleted file mode 100644
index c485d5a..0000000
--- a/WarM/obj/Release/WarM.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.dll b/WarM/obj/Release/WarM.dll
deleted file mode 100644
index a7f7373..0000000
--- a/WarM/obj/Release/WarM.dll
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WarM.pdb b/WarM/obj/Release/WarM.pdb
deleted file mode 100644
index 2257290..0000000
--- a/WarM/obj/Release/WarM.pdb
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WorkM.IC_MateOutRequestBillList.resources b/WarM/obj/Release/WorkM.IC_MateOutRequestBillList.resources
deleted file mode 100644
index 40156cf..0000000
--- a/WarM/obj/Release/WorkM.IC_MateOutRequestBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WorkM.IC_MateOutRequestBillRList.resources b/WarM/obj/Release/WorkM.IC_MateOutRequestBillRList.resources
deleted file mode 100644
index 40156cf..0000000
--- a/WarM/obj/Release/WorkM.IC_MateOutRequestBillRList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WorkM.Kf_EntrustProcInBill.resources b/WarM/obj/Release/WorkM.Kf_EntrustProcInBill.resources
deleted file mode 100644
index 0aba303..0000000
--- a/WarM/obj/Release/WorkM.Kf_EntrustProcInBill.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WorkM.Kf_EntrustProcInBillList.resources b/WarM/obj/Release/WorkM.Kf_EntrustProcInBillList.resources
deleted file mode 100644
index e62461d..0000000
--- a/WarM/obj/Release/WorkM.Kf_EntrustProcInBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WorkM.Kf_EntrustProcOutBill.resources b/WarM/obj/Release/WorkM.Kf_EntrustProcOutBill.resources
deleted file mode 100644
index 0aba303..0000000
--- a/WarM/obj/Release/WorkM.Kf_EntrustProcOutBill.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/Release/WorkM.Kf_EntrustProcOutBillList.resources b/WarM/obj/Release/WorkM.Kf_EntrustProcOutBillList.resources
deleted file mode 100644
index e62461d..0000000
--- a/WarM/obj/Release/WorkM.Kf_EntrustProcOutBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/WarM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/WarM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/WarM/obj/x86/Release/AxInterop.gregn6Lib.dll b/WarM/obj/x86/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index ced2e21..0000000
--- a/WarM/obj/x86/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/x86/Release/Interop.gregn6Lib.dll b/WarM/obj/x86/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index 1be42ea..0000000
--- a/WarM/obj/x86/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/WarM/obj/x86/Release/WarM.csproj.ResolveComReference.cache b/WarM/obj/x86/Release/WarM.csproj.ResolveComReference.cache
deleted file mode 100644
index c485d5a..0000000
--- a/WarM/obj/x86/Release/WarM.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs" "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
index 164b9d3..5a95409 100644
--- "a/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
+++ "b/WarM/\346\235\241\347\240\201\346\211\223\345\215\260/Gy_BarCodeBill.cs"
@@ -156,6 +156,7 @@
public Int64 HInterID = 0; //鍐呯爜
public Int64 HOrgID = -1;
public string HOrgNumber = "";
+ public string ERPMode = ""; //ERP妯″紡锛圵ISE銆丆LOUD锛�
public string CampanyName = ""; //瀹㈡埛瀹氬埗鍖栧悕绉�
public string SourceQtyCtl = ""; //瓒呮簮鍗曟暟閲忔帶鍒�
//-------------------------------------------------------------------------
@@ -373,6 +374,7 @@
}
else
{
+ ERPMode = oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode;
CampanyName = oSystemParameter.omodel.WMS_CampanyName;
SourceQtyCtl = oSystemParameter.omodel.BarCode_SourceQtyCtl;
}
@@ -975,6 +977,7 @@
grdSub.RowCount = 0;
grdMain.ColumnCount = 60; //鎬诲垪鏁�
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 = "婧愬崟鍗曞彿";
@@ -1027,7 +1030,6 @@
grdMain.Columns[HInnerBillNoCol].HeaderText = "鍐呴儴閲囪喘璁㈠崟鍙�";
grdMain.Columns[HMakerCol].HeaderText = "鍒跺崟浜�";
////
- grdMain.Columns[HSnoCol].HeaderText = "搴忓彿";
//鏍煎紡鍖�
grdMain.Columns[HTagCol].Visible = false; //闅愯棌鍒�
grdMain.Columns[HMainIDCol].Visible = false;
@@ -1037,8 +1039,8 @@
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[HAuxPropNumberCol].Visible = false;
+ //grdMain.Columns[HAuxPropNameCol].Visible = false;
grdMain.Columns[HUnitIDCol].Visible = false;
grdMain.Columns[HinitQtyCol].Visible = false;
grdMain.Columns[HSupIDCol].Visible = false;
@@ -1153,8 +1155,8 @@
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[HAuxPropNumber2Col].Visible = false;
+ //grdSub.Columns[HAuxPropName2Col].Visible = false;
grdSub.Columns[HUnitID2Col].Visible = false;
grdSub.Columns[HPrintCol].Visible = false;
grdSub.Columns[HSourceInterID2Col].Visible = false;
@@ -1336,6 +1338,7 @@
}
DAL.ClsIF_Material_View oMater = new DAL.ClsIF_Material_View();//鐗╂枡
DAL.ClsIF_Unit_View oUnit = new DAL.ClsIF_Unit_View();//璁￠噺鍗曚綅
+ DAL.ClsIF_Property_View oProperty = new DAL.ClsIF_Property_View();//杈呭姪灞炴��
if (!grdStatus)
{
return;
@@ -1368,6 +1371,9 @@
grdMain.Rows[sRow].Cells[HMinQtyCol].Value = oMater.omodel.HQtyMin;
grdMain.Rows[sRow].Cells[HDateCol].Value = dtpHDate.Value.ToShortDateString();
grdMain.Rows[sRow].Cells[HShowDateCol].Value = dtpHDate.Value.ToShortDateString();
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
if (oUnit.GetInfoByID(oMater.omodel.HUnitID))
{
grdMain.Rows[sRow].Cells[HUnitIDCol].Value = oUnit.omodel.HItemID.ToString();
@@ -1392,6 +1398,9 @@
grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
}
}
else
@@ -1402,6 +1411,11 @@
grdMain.Rows[sRow].Cells[HMaterModelCol].Value = "";
grdMain.Rows[sRow].Cells[HMinQtyCol].Value = 0;
grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
}
break;
@@ -1435,6 +1449,31 @@
case HDateCol:
BLL.ClsPub_BLL.Sub_SelectDate(grdMain, sRow, HDateCol);
oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HDateCol].Value);
+ break;
+
+ case HAuxPropNumberCol:
+ oProperty.WherePart = "";
+ if (ERPMode == "CLOUD")
+ {
+ sWhere = " and HMaterNumber = '" + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[HMaterNumberCol].Value) + "'";
+ }
+ else
+ {
+ sWhere = "";
+ }
+ if (oProperty.RefreshView(sWhere))
+ {
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = oProperty.oModel.HItemID.ToString();
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = oProperty.oModel.HNumber;
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = oProperty.oModel.HName;
+ oEdit.Text = oProperty.oModel.HNumber;
+ }
+ else
+ {
+ grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
+ grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
+ grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
+ }
break;
@@ -1793,13 +1832,14 @@
//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[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
+ grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["鏈�灏忓寘瑁呮暟"].ToString();
//--
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString() +
+ "," + HMinQtyCol.ToString() +
+ "," + HAuxPropNumberCol.ToString() +
"," + HBatchNoCol.ToString() +
- "," + HRemarkCol.ToString() +
- "," + HMinQtyCol.ToString();
+ "," + HRemarkCol.ToString();
grdMain.Columns[HBillNoCol].ReadOnly = true;
//璁剧疆鍚堣鍒�
string sTotalCol = HQtyCol.ToString();
@@ -1870,9 +1910,10 @@
//--
//璁剧疆鍙紪杈戝垪
string sAllowCol = HQtyCol.ToString() +
+ "," + HMinQtyCol.ToString() +
+ "," + HAuxPropNumberCol.ToString() +
"," + HBatchNoCol.ToString() +
- "," + HRemarkCol.ToString() +
- "," + HMinQtyCol.ToString();
+ "," + HRemarkCol.ToString();
grdMain.Columns[HBillNoCol].ReadOnly = true;
//璁剧疆鍚堣鍒�
string sTotalCol = HQtyCol.ToString();
diff --git a/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs b/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
new file mode 100644
index 0000000..dbb4ac5
--- /dev/null
+++ b/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
@@ -0,0 +1,419 @@
+锘縰sing DBUtility;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.BaseSet
+{
+ public class Gy_ModelTypeController : ApiController
+ {
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ private json objJsonResult = new json();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ DataSet ds;
+ DAL.ClsGy_MouldType_Ctl oDept = new DAL.ClsGy_MouldType_Ctl();
+ DAL.ClsGy_MouldType_View oDeptHlp = new DAL.ClsGy_MouldType_View();
+
+
+ #region 妯℃不鍏峰垎绫诲垪琛ㄦ暟鎹�
+ /// <summary>
+ /// 杩斿洖妯℃不鍏峰垎绫诲垪琛�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_ModelType/list")]
+ [HttpGet]
+ public object list(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_MouldType where 1=1 " + sWhere, "Gy_MouldType");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳ā娌诲叿鍒嗙被鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ユ壘鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 妯℃不鍏峰垎绫绘牴鎹爲鍨婭D鏌ヨ鎵�鏈夊眰绾у垪琛ㄦ暟鎹�
+ /// <summary>
+ /// 鏍规嵁鏍戝瀷ID 鏌ユ壘璁板綍
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_ModelType/cx")]
+ [HttpGet]
+ public object cx(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn(string.Format(@"WITH a AS (
+ SELECT HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,
+ case when HStopFlag<>0 then 'Y'else ' 'end HStopFlag,HRemark,HUseFlag from Gy_MouldType
+ WHERE HitemID="+ HInterID + " UNION ALL SELECT s.HItemID,s.HParentID,s.HNumber,s.HName,s.HLevel, case when s.HEndFlag<>0 then 'Y'else ' 'end HEndFlag, case when s.HStopFlag<>0 then 'Y'else ' 'end HStopFlag,s.HRemark,s.HUseFlag FROM dbo.Gy_MouldType AS s,a WHERE s.HParentID=a.HitemID) SELECT * FROM a"), "h_v_IF_QCCheckItemList");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鍒犻櫎妯℃不鍏峰垎绫诲垪琛�
+ /// <summary>
+ /// 妯℃不鍏峰垎绫诲垪琛ㄥ垹闄ゆ寜閽�
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_ModelType/Delete_Json")]
+ [HttpGet]
+ public object Delete_Json(long HItemID, string User, string ModRightNameDelete)
+ {
+
+ try
+ {
+ //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+ if (oDeptHlp.GetInfoByID(HItemID))
+ {
+ if (oDept.HavChildCodes(HItemID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩瓨鍦ㄥ瓙椤圭洰,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒犻櫎鍓嶅垽鏂槸鍚� 宸蹭娇鐢� 20141020
+ if (oDeptHlp.omodel.HUseFlag != "鏈娇鐢�")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ら」鐩凡浣跨敤鎴栬�呮湭妫�娴嬶紝涓嶈兘鍒犻櫎锛佽閲嶆柊妫�娴嬪啀鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //
+ if (oDept.DeleteByID(HItemID))
+ {
+ //鍐欏叆鏃ュ織
+ ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oDeptHlp.omodel.HNumber + ",鍚嶇О锛�" + oDeptHlp.omodel.HName, ClsPub.CurUserName);
+ //鏇存柊涓婄骇涓� 鏈骇
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍒犻櫎鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒犻櫎澶辫触";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ //ds = oCN.RunProcReturn("delete from Gy_MouldType where HItemID = " + HItemID, "Gy_MouldType");
+
+ 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
+
+ #region 妯℃不鍏峰垎绫绘柊澧炰繚瀛�
+ /// <summary>
+ /// 妯℃不鍏峰垎绫�-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_ModelType/AddBill")]
+ [HttpPost]
+ public object AddBill([FromBody] JObject oMain)
+ {
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ //鍙嶅簭鍒楀寲
+ msg1 = "[" + msg1.ToString() + "]";
+
+ List<Model.ClsGy_MouldType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MouldType_Model>>(msg1);
+
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HNumber;
+ long HParentID = list[0].HParentID;
+ long HLevel = list[0].HLevel;
+ string HHelpCode = list[0].HHelpCode;
+ string HRemark = list[0].HRemark;
+ bool HStopflag = list[0].HStopflag;
+ string HUseFlag = list[0].HUseFlag;
+ bool HEndFlag = list[0].HEndFlag;
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Insert into Gy_MouldType " +
+ " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime) " +
+ " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID +
+ "," + HLevel+ "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ oCN.RunProc("Update Gy_MouldType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏂板鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 妯℃不鍏峰垎绫讳慨鏀逛繚瀛�
+ /// <summary>
+ /// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_ModelType/EditBill")]
+ [HttpPost]
+ public object EditBill([FromBody] JObject oMain)
+ {
+
+ try
+ {
+ var _value = oMain["oMain"].ToString();
+ string msg1 = _value.ToString();
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();
+ string msg4 = sArray[2].ToString();
+ string msg5 = sArray[3].ToString();
+
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+ List<Model.ClsGy_MouldType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MouldType_Model>>(msg2);
+
+ long HItemID = int.Parse(msg3);
+ string HNumber = list[0].HNumber;
+ string HName = list[0].HName;
+ string HShortNumber = list[0].HNumber;
+ long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
+ string HHelpCode = list[0].HHelpCode;
+ string HRemark = list[0].HRemark;
+ bool HStopflag = list[0].HStopflag;
+ string HUseFlag = list[0].HUseFlag;
+
+ //鍒ゆ柇鏉冮檺
+ //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
+
+
+ if (!DBUtility.ClsPub.AllowNumber(HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜涓笉鑳藉嚭鐜拌繛缁��.鈥欏苟涓旈浣嶆湯浣嶄笉鑳戒负鈥�.鈥欙紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ if (oDept.HavSameNumber(HItemID, HNumber))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜閲嶅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
+ oCN.BeginTran();
+ //涓昏〃
+ oCN.RunProc("Update Gy_MouldType set " +
+ " HNumber='" + HNumber + "'" +
+ ",HName='" + HName + "'" +
+ ",HShortNumber='" + HShortNumber + "'" +
+ ",HHelpCode='" + HHelpCode + "'" +
+ ",HParentID=" + HParentID +
+ ",HStopflag='" + HStopflag + "'" +
+ ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //淇敼瀛愰」鐩唬鐮�
+ //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
+ //灏嗕笂绾� 涓洪潪鏈骇
+ oCN.RunProc("Update Gy_QCCheckItem set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
+ //
+ oCN.Commit();
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇敼鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ oCN.RollBack();
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.Message;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 妯℃不鍏峰垎绫讳慨鏀硅幏鍙栫粦瀹氭暟鎹�
+ /// <summary>
+ /// 缁翠慨鍒楄〃淇敼鎸夐挳鏂规硶
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Gy_ModelType/xg")]
+ [HttpGet]
+ public object xg(long HInterID)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("select * from Gy_MouldType where HItemID=" + HInterID, "Gy_MouldType");
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 妯℃不鍏峰垎绫昏幏鍙栨爲鍨嬪垪琛ㄦ暟鎹�
+ [Route("Gy_ModelType/LoadTree")]
+ [HttpGet]
+ public object LoadTree_Json(string sWhere)
+ {
+ SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
+ //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
+
+ ds = oCN.RunProcReturn("select HItemID id, HNumber, HName title, HParentID ParentID, HLevel from Gy_MouldType", "Gy_MouldType");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ #endregion
+ }
+}
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index 752f464..5269994 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -20,12 +20,7 @@
DataSet ds;
DataSet ds1;
-
- /// <summary>
- /// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #region 鏂板鍗曟嵁-淇濆瓨鎸夐挳
[Route("Cj_StationInBill/AddBill")]
[HttpPost]
public object AddBill([FromBody] JObject oMain)
@@ -115,7 +110,7 @@
objJsonResult.data = null;
return objJsonResult;
}
- if (HSourceID <= 0)
+ if (HCenterID <= 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -149,8 +144,6 @@
objJsonResult.data = null;
return objJsonResult;
}
-
-
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
@@ -235,10 +228,6 @@
return objJsonResult;
}
-
-
-
-
ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
if (ds == null)
{
@@ -306,12 +295,9 @@
}
return false;
}
+ #endregion
- /// <summary>
- /// 宸ュ簭杩涚珯鎺ユ敹鍗曟祦姘村彿鍥炶溅鑾峰彇宸ュ簭淇℃伅
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #region 宸ュ簭杩涚珯鎺ユ敹鍗曟祦姘村彿鍥炶溅鑾峰彇宸ュ簭淇℃伅
[Route("Cj_StationInBill/txtHProcNo_KeyDown")]
[HttpGet]
public object txtHProcNo_KeyDown(string sBillNo,string sProcNo)
@@ -354,12 +340,9 @@
return objJsonResult;
}
}
+ #endregion
- /// <summary>
- /// 杩斿洖濮斿宸ュ簭鎺ユ敹鍗曞垪琛�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #region 杩斿洖濮斿宸ュ簭鎺ユ敹鍗曞垪琛�
[Route("Cj_StationInBill/get_Display")]
[HttpGet]
public object get_Display(string sWhere)
@@ -402,12 +385,53 @@
return objJsonResult;
}
}
+ #endregion
- /// <summary>
- /// 缂栬緫椤甸潰鏍规嵁id鑾峰彇宸ュ簭杩涚珯鎺ユ敹鍗曚俊鎭�
- ///鍙傛暟锛歴tring sql銆�
- ///杩斿洖鍊硷細object銆�
- /// </summary>
+ #region 缂栬緫鍓嶅垽鏂�
+ [Route("Cj_StationInBill/set_ShowBillJudge")]
+ [HttpGet]
+ public object set_ShowBillJudge(string HBillNo)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_DelCtrl '" + HBillNo + "'", "h_p_MES_StationInBill_DelCtrl");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍒ゆ柇鍏宠仈澶辫触锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if(ds.Tables[0].Rows.Count > 0 && Pub_Class.ClsPub.isInt(ds.Tables[0].Rows[0][0]) == 2)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 缂栬緫椤甸潰鏍规嵁id鑾峰彇宸ュ簭杩涚珯鎺ユ敹鍗曚俊鎭�
[Route("Cj_StationInBill/GetStationInBill")]
[HttpGet]
public object GetStationOutBill(int HInterID)
@@ -441,8 +465,9 @@
return objJsonResult;
}
}
+ #endregion
- #region [瀹℃牳]
+ #region 瀹℃牳
[Route("Cj_StationInBill/set_CheckBill")]
[HttpGet]
public object set_CheckBill(int HInterID,string CurUserName)
@@ -459,19 +484,17 @@
objJsonResult.data = null;
return objJsonResult;
}
- Int64 lngBillKey = 0;
- lngBillKey = HInterID;
- if (lngBillKey == 0)
+ if (HInterID == 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "HInterID涓�0锛�";
+ objJsonResult.Message = "鍗曟嵁ID涓�0锛屼笉鑳藉鏍革紒";
objJsonResult.data = null;
return objJsonResult;
}
DAL.ClsSc_StationInBill oBill = new DAL.ClsSc_StationInBill();
//鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
- if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
{
if (oBill.omodel.HChecker.Trim() != "")
{
@@ -491,10 +514,10 @@
return objJsonResult;
}
//瀹℃牳
- if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ if (Cj_StationInBillCheckBill(HInterID,CurUserName, ref DBUtility.ClsPub.sExeReturnInfo))
{
- objJsonResult.code = "0";
- objJsonResult.count = 0;
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
objJsonResult.Message = "瀹℃牳鎴愬姛!";
objJsonResult.data = null;
return objJsonResult;
@@ -518,6 +541,47 @@
return objJsonResult;
}
}
+
+ //瀹℃牳
+ public bool Cj_StationInBillCheckBill(Int64 lngBillKey, string CurUserName, ref string sReturn)
+ {
+ try
+ {
+ string HChecker = CurUserName;
+ string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
+ oCN.BeginTran();
+ ds = oCN.RunProcReturn("Select * from Sc_StationInBillMain Where HInterID=" + lngBillKey.ToString(), "Sc_StationInBillMain");
+ if (ds.Tables[0].Rows.Count == 0)
+ {
+ sReturn = "鍗曟嵁鏈壘鍒帮紒";
+ return false;
+ }
+ oCN.RunProc(" Update Sc_StationInBillMain set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
+ oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Check_In " + lngBillKey.ToString() + ",1");
+ //鍒ゆ柇鏄惁鏄� 棣栭亾宸ュ簭
+ DataSet ds1;
+ ds1 = oCN.RunProcReturn("select HLastProc,HFstProc " +
+ " from Sc_ProcessExchangeBillMain a " +
+ " inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " +
+ " Where a.HInterID=(Select HProcExchInterID from Sc_StationInBillMain Where HInterID=55) " +
+ " and b.HEntryID=(Select HProcExchEntryID from Sc_StationInBillMain Where HInterID=55)", "Sc_ProcessExchangeBillMain");
+ if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
+ {
+ }
+ else if (Pub_Class.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFstProc"]) == "鏄�")
+ {
+ }
+ sReturn = sReturn + " 瀹℃牳鍔熻兘锛�";
+ oCN.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCN.RollBack();
+ return false; ;
+ }
+ }
#endregion
diff --git a/WebAPI/Controllers/PublicPageMethodController.cs b/WebAPI/Controllers/PublicPageMethodController.cs
index 2b4279e..6c97202 100644
--- a/WebAPI/Controllers/PublicPageMethodController.cs
+++ b/WebAPI/Controllers/PublicPageMethodController.cs
@@ -1794,7 +1794,7 @@
}
else
{
- string sql1 = "Select HItemID,HParentID,HNumber,HName from h_v_IF_Unit where 1 = 1 ";
+ string sql1 = "Select HItemID,HParentID,HNumber,HName from h_v_IF_Unit ";
string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "h_v_IF_Unit");
}
@@ -2007,5 +2007,320 @@
#endregion
+ #region 閫夋嫨淇濆吇椤圭洰鍩虹璧勬枡
+
+ #region 鏉′欢鏌ヨ淇濆吇椤圭洰鍒楄〃
+ [Route("PublicPageMethod/MaintainList")]
+ [HttpGet]
+ public object MaintainList(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from Gy_Maintain " + sWhere + " Order by HItemID ", "Gy_Maintain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍规嵁鏍戝瀷id鏌ユ壘淇濆吇椤圭洰鍒楄〃
+ [Route("Gy_MaintenanceMode/MaintainCX")]
+ [HttpGet]
+ public object MaintainCX(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn(string.Format(@"WITH a AS (select * from Gy_Maintain WHERE HitemID=" + HInterID + " UNION ALL select s.* from Gy_Maintain AS s,a WHERE s.hparentid=a.HitemID) SELECT * FROM a"), "Gy_Maintain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍戝瀷鍒楄〃淇濆吇椤圭洰鍒楄〃鏁版嵁
+ [Route("Gy_MaintenanceMode/MaintainLoadTree")]
+ [HttpGet]
+ public object MaintainLoadTree(string sWhere)
+ {
+ SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
+ //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
+
+ ds = oCN.RunProcReturn("Select HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from Gy_Maintain " + sWhere + "", "Gy_Maintain");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #endregion
+
+ #region 閫夋嫨妫�楠岄」鐩熀纭�璧勬枡
+
+ #region 鏉′欢鏌ヨ妫�楠岄」鐩垪琛�
+ [Route("PublicPageMethod/CheckItemList")]
+ [HttpGet]
+ public object CheckItemList(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from Gy_QCCheckItem " + sWhere + " Order by HItemID ", "Gy_QCCheckItem");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍规嵁鏍戝瀷id鏌ユ壘妫�楠岄」鐩垪琛�
+ [Route("Gy_MaintenanceMode/CheckItemCX")]
+ [HttpGet]
+ public object CheckItemCX(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn(string.Format(@"WITH a AS (select * from Gy_QCCheckItem WHERE HitemID=" + HInterID + " UNION ALL select s.* from Gy_QCCheckItem AS s,a WHERE s.hparentid=a.HitemID) SELECT * FROM a"), "Gy_QCCheckItem");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍戝瀷鍒楄〃鐐规椤圭洰鍒楄〃鏁版嵁
+ [Route("Gy_MaintenanceMode/CheckItemLoadTree")]
+ [HttpGet]
+ public object CheckItemLoadTree(string sWhere)
+ {
+ SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
+ //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
+
+ ds = oCN.RunProcReturn("Select HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from Gy_QCCheckItem " + sWhere + "", "Gy_QCCheckItem");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犵偣妫�椤圭洰鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #endregion
+
+ #region 閫夋嫨鐗╂枡绫诲瀷鍩虹璧勬枡
+
+ #region 鏉′欢鏌ヨ鐗╂枡绫诲瀷鍒楄〃
+ [Route("PublicPageMethod/MaterTypeList")]
+ [HttpGet]
+ public object MaterTypeList(string sWhere)
+ {
+ try
+ {
+ ds = oCN.RunProcReturn("Select HItemID,HParentID,HNumber,HName from Gy_MaterType " + sWhere + " Order by HItemID ", "Gy_MaterType");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犺缁勭粐鐨勭敤鎴锋暟鎹紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍规嵁鏍戝瀷id鏌ユ壘鐗╂枡绫诲瀷鍒楄〃
+ [Route("Gy_MaintenanceMode/MaterTypeCX")]
+ [HttpGet]
+ public object MaterTypeCX(long HInterID)
+ {
+ try
+ {
+
+ ds = oCN.RunProcReturn(string.Format(@"WITH a AS (select * from Gy_MaterType WHERE HitemID=" + HInterID + " UNION ALL select s.* from Gy_MaterType AS s,a WHERE s.hparentid=a.HitemID) SELECT * FROM a"), "Gy_QCCheckItem");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "false锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 鏍戝瀷鍒楄〃鐗╂枡绫诲瀷鍒楄〃鏁版嵁
+ [Route("Gy_MaintenanceMode/MaterTypeLoadTree")]
+ [HttpGet]
+ public object MaterTypeLoadTree(string sWhere)
+ {
+ SQLHelper.ClsCN SubCn = new SQLHelper.ClsCN();
+ //ds = oCN.RunProcReturn("select * from h_v_IF_GroupList " + sWhere, "h_v_IF_GroupList");
+
+ ds = oCN.RunProcReturn("Select HItemID id,HNumber,(CAST(HNumber as varchar(100))+'-'+CAST(HName as varchar(100))) as title,HParentID ParentID,HLevel from Gy_MaterType " + sWhere + "", "Gy_MaterType");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犵偣妫�椤圭洰鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #endregion
+
}
}
diff --git a/WebAPI/Controllers/QC_ManagementController.cs b/WebAPI/Controllers/QC_ManagementController.cs
index fdde39f..fcfa9fd 100644
--- a/WebAPI/Controllers/QC_ManagementController.cs
+++ b/WebAPI/Controllers/QC_ManagementController.cs
@@ -104,20 +104,20 @@
/// <returns></returns>
[Route("QC_Management/MES_QC_CheckProjectList_Json")]
[HttpGet]
- public object MES_QC_CheckProjectList_Json(string sqlWhere)
+ public object MES_QC_CheckProjectList_Json(string sWhere)
{
DataSet ds;
try
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- if (sqlWhere == null || sqlWhere.Equals(""))
+ if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select top 500 * from h_v_Gy_QCCheckProjectList where HBillStatus>-1 ", "h_v_Gy_QCCheckProjectList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_QCCheckProjectList", "h_v_Gy_QCCheckProjectList");
}
else
{
- string sql1 = "select * from h_v_Gy_QCCheckProjectList where HBillStatus>-1 ";
- string sql = sql1 + sqlWhere;
+ string sql1 = "select * from h_v_Gy_QCCheckProjectList where 1=1";
+ string sql = sql1 + sWhere;
ds = oCN.RunProcReturn(sql, "h_v_Gy_QCCheckProjectList");
}
}
@@ -435,13 +435,59 @@
#region 淇濆瓨/缂栬緫/鍒犻櫎鏂规硶
- #region 妫�楠屾柟妗�
+ #region 妫�楠屾柟妗堢紪杈戞椂鑾峰彇琛ㄥご鏁版嵁
+ [Route("QC_Management/MES_QC_CheckProjectListCheckDetai")]
+ [HttpGet]
+ public ApiResult<DataSet> MES_QC_CheckProjectListCheckDetai(string HID)
+ {
+ if (string.IsNullOrEmpty(HID))
+ return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCCheckProjectList_NEW where hmainid= " + HID + " ", "h_v_Gy_QCCheckProjectList_NEW");
+ if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
+ return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄧ敓浜ф眹鎶ュ崟鍙�" };
+
+ return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
+ }
+ #endregion
+
+ #region 妫�楠屾柟妗堢紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁
+ [Route("QC_Management/MES_QC_CheckProjectListProjectDetai")]
+ [HttpGet]
+ public object MES_QC_CheckProjectListProjectDetai(string HInterID)
+ {
+ DataSet ds;
+ try
+ {
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ ds = oCN.RunProcReturn(string.Format(@"select 娆″簭鍙� HPrjNo,妫�楠岄」鐩甀D HQCCheckItemID,妫�楠岄」鐩唬鐮� HQCCheckItemNumber,妫�楠岄」鐩� HQCCheckItemName,
+ 妫�楠屾爣鍑� HQCStd,鏈�澶ф楠屾爣鍑� HQCStdMax,妫�楠屽崟浣� HQCUnit,琛ㄤ綋澶囨敞 HRemark from h_v_Gy_QCCheckProjectList_NEW
+ where hinterid='"+HInterID+"'"), "h_v_Gy_QCCheckProjectList_NEW");
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+ #region 妫�楠屾柟妗堜繚瀛�
/// <summary>
/// 淇濆瓨妫�楠屾柟妗�
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
- [Route("SaveQCCheckProjectList")]
+ [Route("QC_Management/SaveQCCheckProjectList")]
[HttpPost]
public object SaveQCCheckProjectList([FromBody] JObject msg)
{
@@ -465,11 +511,12 @@
{
//oItem.HMaker = "";
UserName = oItem.HMaker;
+ DBUtility.ClsPub.CurUserName = UserName;
oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
- oItem.HBillType = "3302";
- oItem.HBillSubType = "3302";
+ oItem.HBillType = "3320";
+ oItem.HBillSubType = "3320";
oItem.HBillStatus = 0;
oItem.HPeriod = 0;
oItem.HMaker = "";
@@ -527,7 +574,6 @@
bool bResult;
if (oBill.omodel.HInterID == 0)
{
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
}
else
@@ -562,14 +608,90 @@
}
}
+ #endregion
+
+ #region 妫�楠屾柟妗堥�昏緫鍒犻櫎鍔熻兘
/// <summary>
/// 妫�楠屾柟妗堥�昏緫鍒犻櫎鍔熻兘
/// </summary>
/// <returns></returns>
[Route("DeltetQCCheckProject")]
[HttpGet]
- public object DeltetQCCheckProject(string HInterID)
+ public object DeltetQCCheckProject(string HInterID,string UserName)
{
+
+ DBUtility.ClsPub.CurUserName = UserName;
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckProject_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ if (lngBillKey == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁ID涓虹┖锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ DAL.ClsGy_QCCheckProjectMain oBill = new DAL.ClsGy_QCCheckProjectMain();
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁褰撳墠澶勪簬涓嶈兘鍒犻櫎鐘舵��,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HChecker != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸茬粡瀹℃牳,涓嶈兘鍒犻櫎锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ if (IsDete)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈壘鍒�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
+
DataSet ds;
//string ModRightNameCheck = "Sc_ProcessReport_check";
try
@@ -637,6 +759,10 @@
}
#endregion
+
+
+
+
#region 鏉ユ枡妫�楠�
/// <summary>
/// 淇濆瓨鏉ユ枡妫�楠屽崟
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index 65a9829..adbe425 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -1,4 +1,5 @@
锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
using System;
using System.Collections.Generic;
using System.Data;
@@ -12,11 +13,21 @@
{
public class Sc_MESBeginWorkBillController : ApiController
{
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+
private json objJsonResult = new json();
public DataSet ds = new DataSet();
public WebServer webserver = new WebServer();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
private WebS.WebService1 oWebs = new WebS.WebService1();
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+
+ public DAL.ClsSc_MESBeginWorkBill BillNew = new DAL.ClsSc_MESBeginWorkBill(); //瀵瑰簲鍗曟嵁绫�
+ public DAL.ClsSc_MESBeginWorkBill BillOld = new DAL.ClsSc_MESBeginWorkBill(); //瀵瑰簲鍗曟嵁绫�
+
+ public DAL.ClsSc_ICMOBillWorkQtyStatus_Tmp BillNew1 = new DAL.ClsSc_ICMOBillWorkQtyStatus_Tmp(); //瀵瑰簲鍗曟嵁绫�
+ public DAL.ClsSc_ICMOBillWorkQtyStatus_Tmp BillOld1 = new DAL.ClsSc_ICMOBillWorkQtyStatus_Tmp(); //瀵瑰簲鍗曟嵁绫�
#region 寮�宸ュ崟
@@ -190,17 +201,18 @@
/// <returns></returns>
[Route("Sc_MESBeginWorkBill/DeltetMESBeginWorkBill")]
[HttpGet]
- public object DeltetMESBeginWorkBill(string HInterID)
+ public object DeltetMESBeginWorkBill(string HInterID,string UserName)
{
+ DBUtility.ClsPub.CurUserName = UserName;
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sc_MESBeginWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("MES_MESBeginWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Int64 lngBillKey = 0;
@@ -263,6 +275,145 @@
}
#endregion
+ #region [寮�宸ュ崟瀹℃牳銆佸弽瀹℃牳]
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MESBeginWorkBill/AuditProcessReportList")]
+ [HttpGet]
+ public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "MES_MESBeginWorkBill_Check";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ DLL.ClsSc_MESBeginWorkBill oBill = new DLL.ClsSc_MESBeginWorkBill();
+ //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鎻愪氦
+ {
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#endregion
@@ -316,14 +467,36 @@
[HttpPost]
public object SaveGetMESBeginWorkFrom([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 UserName = sArray[1].ToString();
+ string refSav = sArray[2].ToString();
+ DBUtility.ClsPub.CurUserName = UserName;
+ //淇濆瓨鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("MES_MESBeginWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ListModels oListModels = new ListModels();
try
{
@@ -334,6 +507,56 @@
lsmain = oListModels.getObjectByJson_Gy_MESBeginWorkFrom(msg2);
foreach (Models.ClsSc_MESBeginWorkBillMain oItem in lsmain)
{
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (BillOld.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (BillOld.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
+ DBUtility.ClsPub.CurUserName =oItem.HMaker;
oItem.HBillType = "3787";
oItem.HBillSubType = "3787";
oItem.HBillStatus = 1; //鍗曟嵁鐘舵�侊紙1鏈锛�2瀹℃牳閫氳繃锛�3鍏抽棴锛�4浣滃簾锛�5瀹℃牳閫�鍥�,6瀹℃牳涓�,7宸查槄锛�8宸插洖澶嶏紝9缁撴锛�10楠岃瘉,11涓嬭揪锛�12寮�宸�,13鐢宠瀹℃壒,15鐢宠妫�楠岋紝16 鍒ゅ畾鍚堟牸锛�17鍒ゅ畾涓嶅悎鏍硷級
@@ -356,15 +579,35 @@
bool bResult;
if (oBill.omodel.HInterID == 0)
{
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ if (bResult)
+ {
+ objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
+
}
else
{
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.Verify = "N";
}
if (bResult)
{
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
@@ -453,7 +696,7 @@
public static DataSet Sc_GetMESProductReportBillList(string sWhere)
{
- string sql = string.Format(@"select a.HInterID, a.HBillNo,a.HDate,a.HBillType,a.HMaterID,m.HNumber HMaterCode,m.HName HMaterName,m.HModel HMaterSpec
+ string sql = string.Format(@"select a.HInterID, a.HBillNo,a.HDate,a.HBillType,a.HBillStatus,a.HMaterID,m.HNumber HMaterCode,m.HName HMaterName,m.HModel HMaterSpec
,a.HSourceID,s.HNumber HSourceCode,s.HName HSourceName,a.HGroupID,g.HNumber HGroupCode,g.HName HGroupName
,a.HWorkManID,e.HName HWorkManName,a.HMaker,a.HMakeDate, a.HReportType
,a.HQty,a.HICMOBillNo,a.HICMOInterID,a.HICMOEntryID
@@ -521,6 +764,8 @@
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
+ string refSav = sArray[1].ToString();
+ string s = "";
ListModels oListModels = new ListModels();
try
{
@@ -531,6 +776,55 @@
lsmain = oListModels.getObjectByJson_Gy_MESProductReportFrom(msg2);
foreach (Models.ClsSc_ICMOBillWorkQtyStatus_Tmp oItem in lsmain)
{
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew1.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld1.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (BillOld1.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld1.omodel.HChecker != "" && BillOld1.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (BillOld1.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld1, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
oItem.HBillType = "3724";
oItem.HBillSubType = "3724";
oItem.HReportType = 3;//锛�1鏉＄爜鎵弿锛�2鏈哄櫒姹囨姤锛�3鎵嬪伐褰曞叆锛�
@@ -551,12 +845,29 @@
bool bResult;
if (oBill.omodel.HInterID == 0)
{
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ if (bResult)
+ {
+ objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
}
else
{
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.Verify = "N";
}
if (bResult)
{
@@ -586,10 +897,149 @@
}
#endregion
+ #region 鎶ュ伐骞冲彴浜ч噺姹囨姤瀹℃牳銆佸弽瀹℃牳
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MESBeginWorkBill/MESProductAuditProcessReportList")]
+ [HttpGet]
+ public object MESProductAuditProcessReportList(int HSourceID,int HSourceInterID,int HSourceEntryID,string HSourceBillNo, int HICMOInterID,int HICMOEntryID, int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "Sc_ICMOReportBill_Check";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ DLL.ClsSc_ICMOBillWorkQtyStatus_Tmp oBill = new DLL.ClsSc_ICMOBillWorkQtyStatus_Tmp();
+ //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鎻愪氦
+ {
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(HSourceID, HSourceInterID,HSourceEntryID,HSourceBillNo,HICMOInterID, HICMOEntryID, lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(HSourceID, HSourceInterID, HSourceEntryID, HSourceBillNo, HICMOInterID, HICMOEntryID, lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 鎶ュ伐骞冲彴浜ч噺姹囨姤鍒犻櫎
[Route("Sc_MESBeginWorkBill/DeltetMESProductReportBill")]
[HttpGet]
- public object DeleteGetLineBindBillList(string HInterID,string HICMOInterID,string HICMOEntryID)
+ public object DeleteGetLineBindBillList(string HInterID,string HICMOInterID,string HICMOEntryID,string UserName)
{
try
{
@@ -634,24 +1084,24 @@
long HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
//oCN.BeginTran();
//鏍规嵁鍗曞彿銆佽祫婧怚D銆佽鍗曚富ID銆佽鍗曞瓙ID銆佸埗鍗曚汉杩囨护浜ч噺姹囨姤鎶ユ鐢宠鎻愪氦鏁版嵁
- string sql = string.Format(@"update Sc_ICMOBillWorkQtyStatus_Tmp set
- HICMOReportInterID ='"+HInterID+"', HICMOReportBillNo='"+ ScMaxWork + "' from Sc_ICMOBillWorkQtyStatus_Tmp a where a.HICMOBillNo='" + workcode+ "' and a.HSourceID='" + HSourceID + "' and HICMOInterID='" + HICMOInterID+ "' and a.HICMOEntryID='"+ HICMOEntryID + "' and a.HMaker='"+HMaker+"' and HRelationInterID='0'");
- oCN.RunProc(sql);
+ //string sql = string.Format(@"update Sc_ICMOBillWorkQtyStatus_Tmp set
+ // HICMOReportInterID ='"+HInterID+"', HICMOReportBillNo='"+ ScMaxWork + "' from Sc_ICMOBillWorkQtyStatus_Tmp a where a.HICMOBillNo='" + workcode+ "' and a.HSourceID='" + HSourceID + "' and HICMOInterID='" + HICMOInterID+ "' and a.HICMOEntryID='"+ HICMOEntryID + "' and a.HMaker='"+HMaker+"' and HRelationInterID='0'");
+ //oCN.RunProc(sql);
//oCN.Commit();
//鏍规嵁鐢熶骇璁㈠崟鍙锋煡璇㈢敓浜ц鍗曡〃锛屾嬁鍒扮粍缁囥�佽溅闂�
- DataSet ds0 = oCN.RunProcReturn("select HPRDORGID,HDeptID from Sc_ICMOBillMain where HBillNo='"+ workcode + "'", "Sc_ICMOBillMain");
+ //DataSet ds0 = oCN.RunProcReturn("select HPRDORGID,HDeptID from Sc_ICMOBillMain where HBillNo='"+ workcode + "'", "Sc_ICMOBillMain");
//鏌ヨ浜ч噺姹囨姤涓存椂琛�
- ds = oCN.RunProcReturn("select top 1 * from Sc_ICMOBillWorkQtyStatus_Tmp where HICMOReportInterID='" + HInterID + "' and HICMOReportBillNo='" + ScMaxWork + "'", "Sc_ICMOBillWorkQtyStatus_Tmp");
- if (ds.Tables[0].Rows.Count <= 0)
- {
+ //ds = oCN.RunProcReturn("select top 1 * from Sc_ICMOBillWorkQtyStatus_Tmp where HICMOReportInterID='" + HInterID + "' and HICMOReportBillNo='" + ScMaxWork + "'", "Sc_ICMOBillWorkQtyStatus_Tmp");
+ //if (ds.Tables[0].Rows.Count <= 0)
+ //{
//oCN.RollBack();
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "褰撳墠鍗曟嵁鏃犱骇閲忔眹鎶ヨ褰曪紒";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "褰撳墠鍗曟嵁鏃犱骇閲忔眹鎶ヨ褰曪紒";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
WebS.ClsSc_ICMOReportBillMain model = new WebS.ClsSc_ICMOReportBillMain();
model.HInterID = HInterID;
@@ -662,13 +1112,14 @@
model.HRemark = "";
model.HMaker = HMaker;
model.HEmpID = 0;
- model.HGroupID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HGroupID"]);
- model.HDeptID= DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HDeptID"]);
- model.HPRDORGID = DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HPRDORGID"]);
+ //model.HGroupID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HGroupID"]);
+ //model.HDeptID= DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HDeptID"]);
+ //model.HPRDORGID = DBUtility.ClsPub.isLong(ds0.Tables[0].Rows[0]["HPRDORGID"]);
model.HMainSourceInterID = HICMOInterID;
model.HMainSourceEntryID = HICMOEntryID;
+
//oWebs.Timeout = 30000;
- bool flag=oWebs.set_SaveICMOProductReportBill_Layui(model, sHSourceType, ref DBUtility.ClsPub.sErrInfo);
+ bool flag=oWebs.set_SaveICMOProductReportBill_Layui(model,workcode,HSourceID, sHSourceType, ref DBUtility.ClsPub.sErrInfo);
if (flag)
{
//oCN.Commit();
diff --git a/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs
index 83d27ab..7e97691 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESEndWorkBillController.cs
@@ -1,4 +1,5 @@
锘縰sing Newtonsoft.Json.Linq;
+using Pub_Class;
using System;
using System.Collections.Generic;
using System.Data;
@@ -12,9 +13,16 @@
{
public class Sc_MESEndWorkBillController : ApiController
{
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
+
private json objJsonResult = new json();
public DataSet ds = new DataSet();
public WebServer webserver = new WebServer();
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+
+ public DAL.ClsSc_MESEndWorkBill BillNew = new DAL.ClsSc_MESEndWorkBill(); //瀵瑰簲鍗曟嵁绫�
+ public DAL.ClsSc_MESEndWorkBill BillOld = new DAL.ClsSc_MESEndWorkBill(); //瀵瑰簲鍗曟嵁绫�
#region 瀹屽伐鍗�
@@ -188,17 +196,18 @@
/// <returns></returns>
[Route("Sc_MESEndWorkBill/DeltetMESEndWorkBill")]
[HttpGet]
- public object DeltetMESEndWorkBill(string HInterID)
+ public object DeltetMESEndWorkBill(string HInterID,string UserName)
{
+ DBUtility.ClsPub.CurUserName = UserName;
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sc_MESEndWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("MES_MESEndWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Int64 lngBillKey = 0;
@@ -261,13 +270,152 @@
}
#endregion
+ #region [瀹屽伐鍗曞鏍搞�佸弽瀹℃牳]
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MESEndWorkBill/AuditProcessReportList")]
+ [HttpGet]
+ public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "MES_MESEndWorkBill_Check";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ DLL.ClsSc_MESEndWorkBill oBill = new DLL.ClsSc_MESEndWorkBill();
+ //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鎻愪氦
+ {
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#endregion
#region 鎶ュ伐骞冲彴瀹屽伐鍗曚繚瀛�/缂栬緫
/// <summary>
- /// 寮�宸ュ崟
+ /// 瀹屽伐鍗�
/// </summary>
/// <param name="msg"></param>
/// <returns></returns>
@@ -279,10 +427,34 @@
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
+ string UserName = sArray[1].ToString();
+ string refSav = sArray[2].ToString();
+ DBUtility.ClsPub.CurUserName = UserName;
+
+ //淇濆瓨鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("MES_MESEndWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
- string UserName = "";
ListModels oListModels = new ListModels();
try
{
@@ -293,8 +465,58 @@
lsmain = oListModels.getObjectByJson_Gy_MESEndWorkBillMain(msg2);
foreach (Models.ClsSc_MESEndWorkBillMain oItem in lsmain)
{
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (BillOld.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (BillOld.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
//oItem.HMaker = "";
UserName = oItem.HMaker; //鍒跺崟浜�
+ DBUtility.ClsPub.CurUserName = oItem.HMaker;
oItem.HBillType = "3788";
oItem.HBillSubType = "3788";
oItem.HReportType = "3";//锛�1鏉＄爜鎵弿锛�2鏈哄櫒姹囨姤锛�3鎵嬪伐褰曞叆锛�
@@ -318,16 +540,33 @@
bool bResult;
if (oBill.omodel.HInterID == 0)
{
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ if (bResult)
+ {
+ objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Sc_MESEndWorkBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
}
else
{
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.Verify = "N";
}
if (bResult)
{
- objJsonResult.code = "0";
+ objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
//WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
diff --git a/WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs
new file mode 100644
index 0000000..a79a7f5
--- /dev/null
+++ b/WebAPI/Controllers/SCGL/Sc_MESProductReportBillController.cs
@@ -0,0 +1,105 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+using WebAPI.Models;
+
+namespace WebAPI.Controllers.SCGL
+{
+ public class Sc_MESProductReportBillController : ApiController
+ {
+ private json objJsonResult = new json();
+ public DataSet ds = new DataSet();
+ public WebServer webserver = new WebServer();
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ private WebS.WebService1 oWebs = new WebS.WebService1();
+
+ #region 浜ч噺姹囨姤鍒楄〃
+ [Route("Sc_MESProductReportBill/Get_Sc_MESProductReportBillList")]
+ [HttpGet]
+ public object Get_Sc_MESProductReportBillList(string sWhere)
+ {
+ try
+ {
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn("select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp " + sWhere+ "order by 鍗曟嵁鍙� desc", "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
+ }
+ else
+ {
+ string sql1 = "select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp where 1 = 1 ";
+ string sql = sql1 + sWhere+ " order by 鍗曟嵁鍙� desc";
+ ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
+ }
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛棤鏁版嵁锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鏌ヨ鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
+ #region 浜ч噺姹囨姤缂栬緫鑾峰彇鏁版嵁
+ [Route("Sc_MESProductReportBill/Get_Sc_MESProductReportEditBillList")]
+ [HttpGet]
+ public object Get_Sc_MESProductReportEditBillList(string linterid, string HICMOInID, string HICMOEnID)
+ {
+ try
+ {
+ //鏍规嵁閫夋嫨璧勬簮ID鑾峰彇褰撳墠鐢熶骇宸ュ崟銆佽矗浠讳汉
+ ds=oCN.RunProcReturn("select * from h_v_IF_ICMOBillWorkQtyStatus_Tmp where HInterID='" + linterid + "' and HICMOInterID='" + HICMOInID + "' and HICMOEntryID='" + HICMOEnID + "'", "h_v_IF_ICMOBillWorkQtyStatus_Tmp");
+ if (ds.Tables[0].Rows.Count > 0)
+ {
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇璧勬簮缁戝畾鏁版嵁鎴愬姛锛�";
+ objJsonResult.data = ds;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏆傛棤璧勬簮缁戝畾锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = e.Message.ToString();
+ objJsonResult.data = null;
+
+ }
+ return objJsonResult;
+ }
+ #endregion
+ }
+}
diff --git a/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
index 54a6949..1d74b02 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESStopWorkBillController.cs
@@ -13,11 +13,17 @@
//鐢熶骇鍋滃伐鍗旵ontroller
public class Sc_MESStopWorkBillController : ApiController
{
- public DBUtility.ClsPub.Enum_BillStatus BillStatus;
+
+ public DBUtility.ClsPub.Enum_BillStatus BillStatus;//鍗曟嵁鐘舵�侊紙鏂板锛屼慨鏀癸紝娴忚锛屾洿鏂板崟浠凤紝鍙樻洿锛�
private json objJsonResult = new json();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
+ //鑾峰彇绯荤粺鍙傛暟
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+
+ public DAL.ClsSc_MESStopWorkBill BillNew = new DAL.ClsSc_MESStopWorkBill(); //瀵瑰簲鍗曟嵁绫�
+ public DAL.ClsSc_MESStopWorkBill BillOld = new DAL.ClsSc_MESStopWorkBill(); //瀵瑰簲鍗曟嵁绫�
#region 鍋滃伐鍗�
@@ -182,17 +188,18 @@
/// <returns></returns>
[Route("Sc_MESStopWorkBill/DeltetMESStopWorkBill")]
[HttpGet]
- public object DeltetMESStopWorkBill(string HInterID)
+ public object DeltetMESStopWorkBill(string HInterID,string UserName)
{
+ DBUtility.ClsPub.CurUserName = UserName;
//缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log("Sc_MESStopWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log("MES_MESStopWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
Int64 lngBillKey = 0;
@@ -256,6 +263,145 @@
#endregion
+ #region [鍋滃伐鍗曞鏍搞�佸弽瀹℃牳]
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="HInterID">鍗曟嵁ID</param>
+ /// <param name="IsAudit">瀹℃牳(0),鍙嶅鏍�(1)</param>
+ /// <param name="CurUserName">瀹℃牳浜�</param>
+ /// <returns></returns>
+ [Route("Sc_MESStopWorkBill/AuditProcessReportList")]
+ [HttpGet]
+ public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
+ {
+ string ModRightNameCheck = "MES_MESStopWorkBill_Check";
+ DBUtility.ClsPub.CurUserName = CurUserName;
+ try
+ {
+ //瀹℃牳鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (HInterID <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "HInterID灏忎簬0锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ Int64 lngBillKey = 0;
+ lngBillKey = DBUtility.ClsPub.isLong(HInterID);
+ DLL.ClsSc_MESStopWorkBill oBill = new DLL.ClsSc_MESStopWorkBill();
+ //鏌ョ湅鏄惁宸插鏍�,鍏抽棴,浣滃簾
+ if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
+ {
+ if (oBill.omodel.HCloseMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.omodel.HDeleteMan.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鍒ゆ柇
+ {
+ if (oBill.omodel.HChecker.Trim() != "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍稿垽鏂�
+ {
+ if (oBill.omodel.HChecker.Trim() == "")
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (IsAudit == 0) //瀹℃牳鎻愪氦
+ {
+ //瀹℃牳鎻愪氦
+ if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "瀹℃牳鎴愬姛";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ if (IsAudit == 1) //鍙嶅鏍告彁浜�
+ {
+ //鍙嶅鏍告彁浜bandonCheck
+ if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鍙嶅鏍告垚鍔�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#endregion
@@ -274,10 +420,34 @@
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
string msg2 = sArray[0].ToString();
+ string UserName = sArray[1].ToString();
+ string refSav = sArray[2].ToString();
+ DBUtility.ClsPub.CurUserName = UserName;
+
+ //淇濆瓨鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("MES_MESStopWorkBill_Edit", 1, true, DBUtility.ClsPub.CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ //鍒ゆ柇浼氳鏈熸槸鍚﹀悎鐞�
+ string s = "";
+ int sYear = 0;
+ int sPeriod = 0;
+ if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
- string UserName = "";
ListModels oListModels = new ListModels();
try
{
@@ -288,7 +458,57 @@
lsmain = oListModels.getObjectByJson_Gy_MESStopWorkBillMain(msg2);
foreach (Models.ClsSc_MESStopWorkBillMain oItem in lsmain)
{
+ if (refSav == "Add")
+ {
+ //鍗曟嵁鍙锋槸鍚﹂噸澶�
+ if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+ if (refSav == "Update")
+ {
+ if (BillOld.ShowBill(oItem.HInterID, ref s) == false)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹湁璇紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ //鍒ゆ柇鏄惁鍙紪杈�
+ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (BillOld.omodel.HBillStatus > 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = s + "锛屼笉鍏佽淇敼";
+ objJsonResult.data = 1;
+ return objJsonResult;
+ }
+ }
+
//oItem.HMaker = "";
+ DBUtility.ClsPub.CurUserName = oItem.HMaker;
UserName = oItem.HMaker; //鍒跺崟浜�
oItem.HBillType = "3789";
oItem.HBillSubType = "3789";
@@ -313,16 +533,33 @@
bool bResult;
if (oBill.omodel.HInterID == 0)
{
- // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
+ if (bResult)
+ {
+ objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //杩斿洖涓籌D
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ if (oSystemParameter.omodel.Sc_MESStopWorkBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ objJsonResult.Verify = "Y";
+ }
+ else
+ {
+ objJsonResult.Verify = "N";
+ }
+ }
+ }
}
else
{
bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
+ objJsonResult.Verify = "N";
}
if (bResult)
{
- objJsonResult.code = "0";
+ objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "淇濆瓨鎴愬姛锛�";
//WebAPIController.Add_Log("閫佽揣鍗曚笅鎺�", UserName, "鐢熸垚閫佽揣鍗�");
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
index 62efa49..3077862 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs
@@ -2458,7 +2458,7 @@
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();
@@ -2471,10 +2471,10 @@
lsmain = oListModels.getObjectByJson_Sc_MouldMaintainBillMain(msg2);
foreach (Model.ClsSc_MouldMaintainBillMain oItem in lsmain)
{
- //oItem.HMaker = "";
UserName = oItem.HMaker; //鍒跺崟浜�
- oItem.HBillType = "3818";
- oItem.HBillSubType = "3818";
+ DBUtility.ClsPub.CurUserName = UserName;
+ oItem.HBillType = "3819";
+ oItem.HBillSubType = "3819";
//oItem.HInterID =0;
//oItem.HBillNo = "";
@@ -2502,16 +2502,16 @@
}
oBill.omodel = oItem;
}
- //琛ㄤ綋鏁版嵁
+ //淇濆吇椤硅〃浣撴暟鎹�
//鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
msg3 = msg3.Substring(1, msg3.Length - 2);
msg3 = msg3.Replace("\\", "");
msg3 = msg3.Replace("\n", ""); //\n
//msg2 = msg2.Replace("'", "鈥�");
- List<Model.ClsSc_MouldMaintainBillSub> ls = new List<Model.ClsSc_MouldMaintainBillSub>();
- ls = oListModels.getObjectByJson_Sc_MouldMaintainBillSub(msg3);
+ List<Model.ClsSc_MouldMaintainRuleBillSub_Item> ls = new List<Model.ClsSc_MouldMaintainRuleBillSub_Item>();
+ ls = oListModels.getObjectByJson_Sc_MouldMaintainRuleBillSub_Item(msg3);
int i = 0;
- foreach (Model.ClsSc_MouldMaintainBillSub oItemSub in ls)
+ foreach (Model.ClsSc_MouldMaintainRuleBillSub_Item oItemSub in ls)
{
i++;
@@ -2525,6 +2525,32 @@
//oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
//oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
oItemSub.HRelationQty = 0; //鍏宠仈鏁伴噺
+ oBill.DetailCol.Add(oItemSub);
+
+ }
+ //閰嶄欢椤硅〃浣撴暟鎹�
+ //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆�
+ msg4 = msg4.Substring(1, msg4.Length - 2);
+ msg4 = msg4.Replace("\\", "");
+ msg4 = msg4.Replace("\n", ""); //\n
+ //msg2 = msg2.Replace("'", "鈥�");
+ List<Model.ClsSc_MouldMaintainBillSub> ls1 = new List<Model.ClsSc_MouldMaintainBillSub>();
+ ls1 = oListModels.getObjectByJson_Sc_MouldMaintainBillSub(msg4);
+ int j = 0;
+ foreach (Model.ClsSc_MouldMaintainBillSub Sub in ls1)
+ {
+
+ j++;
+ Sub.HEntryID = j;
+ //oItemSub.HCloseMan = ""; //琛屽叧闂�
+ Sub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now);
+ Sub.HCloseType = false; //鍏抽棴绫诲瀷
+ //oItemSub.HRemark = ""; //澶囨敞
+ Sub.HSourceInterID = 0; // 婧愬崟涓诲唴鐮�
+ Sub.HSourceEntryID = 0; //婧愬崟瀛愬唴鐮�
+ //oItemSub.HSourceBillNo = ""; //婧愬崟鍗曞彿
+ //oItemSub.HSourceBillType = ""; //婧愬崟绫诲瀷
+ Sub.HRelationQty = 0; //鍏宠仈鏁伴噺
//oItemSub.HRelationMoney = 0; //鍏宠仈閲戦
//HMaterID = "";//閰嶄欢浠ｇ爜
//HUnitID = "";//鍗曚綅浠ｇ爜
@@ -2532,7 +2558,7 @@
//HQtyMust = "";//鍗曚綅鐢ㄩ噺
//HRemark = "";//澶囨敞
- oBill.DetailColl.Add(oItemSub);
+ oBill.DetailColl.Add(Sub);
}
//淇濆瓨
@@ -2585,7 +2611,7 @@
if (string.IsNullOrEmpty(HID))
return new ApiResult<DataSet> { code = -1, msg = "ID涓嶈兘涓虹┖" };
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
- var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldMaintainBillList where hmainid= " + HID + " ", "h_v_Sc_MouldMaintainBillList");
+ var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MouldMaintain where hmainid= " + HID + " ", "h_v_Sc_MouldMaintain");
if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
return new ApiResult<DataSet> { code = -1, msg = "涓嶅瓨鍦ㄤ繚鍏昏褰曡〃" };
return new ApiResult<DataSet> { code = 1, msg = "鏌ヨ鎴愬姛", data = dataSet };
@@ -2630,13 +2656,57 @@
}
#endregion
+ #region[妯″叿淇濆吇璁板綍琛ㄧ紪杈戞椂鑾峰彇琛ㄤ綋鏁版嵁鏂�(淇濆吇椤瑰垪琛ㄣ�侀厤浠堕」鍒楄〃)]
+ [Route("Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew")]
+ [HttpGet]
+ public object Sc_MouldMaintainBillListProjectDetaiNew(string HInterID)
+ {
- #region [妯″叿淇濆吇璁板綍琛ㄥ垹闄ゅ姛鑳絔
- /// <summary>
- /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
- /// </summary>
- /// <returns></returns>
- [Route("Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill")]
+ DataSet ds,ds1;
+ List<object> list = new List<object>();
+ string Swhere = "";
+ try
+ {
+ if (HInterID != "" || HInterID != null)
+ {
+ Swhere = " and hmainid='" + HInterID + "'";
+ }
+ else
+ {
+ Swhere = HInterID;
+ }
+ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+ //鑾峰彇淇濆吇椤圭洰缂栬緫鏁版嵁
+ string sql = "select HMaintainItemID, 淇濆吇椤圭洰浠ｇ爜 HMaintainItemNumber,淇濆吇椤圭洰鍚嶇О HMaintainItem,淇濆吇閮ㄤ綅 HMaintainPart,鍏蜂綋瑕佹眰 HClaim,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldMaintainBillListItem where 1 = 1 " + Swhere + "";
+ ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainBillListItem");
+ //鑾峰彇閰嶄欢椤圭洰缂栬緫鏁版嵁
+ string sql1 = "select HMaterID, 閰嶄欢浠ｇ爜 HMaterNumber,閰嶄欢鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HUnitID,鍗曚綅浠ｇ爜 HUnitNumber,鍗曚綅鍚嶇О HUnitName,瀹為檯鐢ㄩ噺 HQty,鏍囧噯鐢ㄩ噺 HQtyMust,HManagerID,璐熻矗浜轰唬鐮� HManagerNumber,璐熻矗浜� HManagerName,琛ㄤ綋澶囨敞 HRemark from h_v_Sc_MouldMaintainBillListItem where 1 = 1 " + Swhere + "";
+ ds1 = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainBillListItem");
+ list.Add(ds.Tables[0]);
+ list.Add(ds1.Tables[0]);
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鑾峰彇淇℃伅鎴愬姛锛�";
+ objJsonResult.list = list;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛�" + e.ToString();
+ objJsonResult.data = null;
+ }
+ return objJsonResult;
+ }
+ #endregion
+
+
+ #region [妯″叿淇濆吇璁板綍琛ㄥ垹闄ゅ姛鑳絔
+ /// <summary>
+ /// 妯″叿缁翠慨鍗曞垹闄ゅ姛鑳�
+ /// </summary>
+ /// <returns></returns>
+ [Route("Sc_MouldMaintainBill/DeltetSc_MouldMaintainBill")]
[HttpGet]
public object DeltetSc_MouldMaintainBill(string HInterID)
{
diff --git a/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs b/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
index 9e52002..4d545ba 100644
--- a/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
+++ b/WebAPI/DLL/ClsSc_ICMOBillWorkQtyStatus_Tmp.cs
@@ -53,6 +53,10 @@
",HRelationEntryID=" + omodel.HRelationEntryID.ToString() +
",HRelationBillNo='" + omodel.HRelationBillNo + "'" +
",HReportEntryID=" + omodel.HReportEntryID.ToString() +
+ ",HGroupID=" + omodel.HGroupID.ToString() +
+ ",HWorkManID=" + omodel.HWorkManID.ToString() +
+ ",HBadQty=" + omodel.HBadQty.ToString() +
+ ",HWasterQty=" + omodel.HWasterQty.ToString() +
" where HInterID=" + lngBillKey.ToString());
//删除关联
DeleteRelation(ref sReturn, lngBillKey);
@@ -95,12 +99,24 @@
"," + omodel.HRelationInterID.ToString() + "," + omodel.HRelationEntryID.ToString() + ",'" + omodel.HRelationBillNo + "'," + omodel.HReportEntryID.ToString() +
") ");
- //根据源单主内码 设置 生产状态表 完工状态(设置本单对应得源单 为完工状态)
- oCn.RunProcReturn("exec h_p_JIT_MESICMOReport_Status " + omodel.HSourceID.ToString() + "," + omodel.HSourceInterID.ToString() + "," + omodel.HSourceEntryID.ToString() + ",'" + omodel.HSourceBillNo.ToString() + "','" + omodel.HPlanQty + "'", "h_p_JIT_MESICMOReport_Status");
- //更新生产状态临时状态表数量
- oCn.RunProcReturn("exec h_p_Sc_UpDateRelation_ICMOToICMOReport_Qty " + omodel.HICMOInterID.ToString() + "," + omodel.HICMOEntryID.ToString() + "", "h_p_Sc_UpDateRelation_ICMOToICMOReport_Qty");
- sReturn = "新增单据成功！";
-
+ //再次验证 保存是否 合理
+ DataSet ds = oCn.RunProcReturn("exec h_p_JIT_ICMOBillWorkQtyStatus_SaveCtrl @HInterId=" + omodel.HInterID + "", "h_p_JIT_ICMOBillWorkQtyStatus_SaveCtrl");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ sReturn = "无验证数据！";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+
+
+ sReturn = omodel.HInterID.ToString();
+
oCn.Commit();
return true;
}
@@ -144,8 +160,19 @@
omodel.HRelationEntryID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HRelationEntryID"]);
omodel.HRelationBillNo = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRelationBillNo"]);
omodel.HReportEntryID = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HReportEntryID"]);
-
-
+ omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim();
+ omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim();
+ omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim();
+ omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim();
+ omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim();
+ omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim();
+ omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim();
+ omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim();
+ omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim();
+ omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim();
+ omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim();
+ omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim();
+
sReturn = "显示单据成功！";
return true;
}
@@ -157,6 +184,71 @@
}
+ //审核
+ public bool CheckBill(int HSourceID, int HSourceInterID, int HSourceEntryID, string HSourceBillNo, int HICMOInterID, int HICMOEntryID, Int64 lngBillKey, ref string sReturn)
+ {
+
+ try
+ {
+ string HChecker = DBUtility.ClsPub.CurUserName;
+ string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
+ oCn.BeginTran();
+ oCn.RunProc(" Update " + MvarItemKey + " set HBillStatus='2',HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
+ //根据源单主内码 设置 生产状态表 完工状态(设置本单对应得源单 为完工状态)
+ //oCn.RunProc("exec h_p_JIT_MESICMOReport_Status " + HSourceID.ToString() + "," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo.ToString() + "','" + HPlanQty + "'");
+ //更新生产状态临时状态表数量
+ //oCn.RunProc("exec h_p_Sc_UpDateRelation_ICMOToICMOReport_Qty " + HICMOInterID.ToString() + "," + HICMOEntryID.ToString() + "");
+ //根据源单主内码 设置 生产状态表 完工状态(设置本单对应得源单 为完工状态) 更新生产状态临时状态表数量
+ oCn.RunProc("exec h_p_JIT_ICMOBillWorkQtyStatus_AddRelation " + HSourceID.ToString() + "," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo.ToString() + "',"+ HICMOInterID.ToString() + ","+ HICMOEntryID.ToString()+ "");
+ sReturn = "审核单据成功！";
+ oCn.Commit();
+ //生成调拨单
+ //得到调拨单 mainid 单据号
+ //long NewInterID = DBUtility.ClsPub.CreateBillID("1207", ref DBUtility.ClsPub.sExeReturnInfo);
+ //string NewBillNo = DBUtility.ClsPub.CreateBillCode("1207", ref DBUtility.ClsPub.sExeReturnInfo, true);//得到新单号
+ //oCn.RunProc("exec h_p_Kf_MoveStockBill_Add " + lngBillKey.ToString() + "," + NewInterID.ToString() + ",'" + NewBillNo + "','" + HChecker + "'");
+ //
+ sReturn = "";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
+ //反审核
+ public bool AbandonCheck(int HSourceID, int HSourceInterID, int HSourceEntryID, string HSourceBillNo, int HICMOInterID, int HICMOEntryID, Int64 lngBillKey, ref string sReturn)
+ {
+
+ try
+ {
+ string HChecker = DBUtility.ClsPub.CurUserName;
+ string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
+ oCn.BeginTran();
+ //还原单据状态为未审核状态
+ oCn.RunProc(" Update " + MvarItemKey + " set HBillStatus='1',HChecker='',HCheckDate='' Where HInterID=" + lngBillKey.ToString());
+ //扣减生产状态表本工单的拆分汇报数、当日完工数量、更新生产状态表 单据状态(汇报数量扣减小于)
+ oCn.RunProc("exec h_p_JIT_ICMOBillWorkQtyStatus_DelRelation " + HSourceID.ToString() + "," + HSourceInterID.ToString() + "," + HSourceEntryID.ToString() + ",'" + HSourceBillNo.ToString() + "'," + HICMOInterID.ToString() + "," + HICMOEntryID.ToString() + ","+ lngBillKey + "");
+ sReturn = "审核单据成功！";
+ oCn.Commit();
+ //生成调拨单
+ //得到调拨单 mainid 单据号
+ //long NewInterID = DBUtility.ClsPub.CreateBillID("1207", ref DBUtility.ClsPub.sExeReturnInfo);
+ //string NewBillNo = DBUtility.ClsPub.CreateBillCode("1207", ref DBUtility.ClsPub.sExeReturnInfo, true);//得到新单号
+ //oCn.RunProc("exec h_p_Kf_MoveStockBill_Add " + lngBillKey.ToString() + "," + NewInterID.ToString() + ",'" + NewBillNo + "','" + HChecker + "'");
+ //
+ sReturn = "";
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ throw (e);
+ }
+ }
+
//判断是否完工
public bool IsEnded(long HInterID, ref string sReturn)
{
diff --git a/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs b/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
index 7ae97e2..5214609 100644
--- a/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
+++ b/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
@@ -10,6 +10,7 @@
public Models.ClsSc_MESBeginWorkBillMain omodel = new Models.ClsSc_MESBeginWorkBillMain();
public List<Models.ClsSc_MESBeginWorkBillSub> DetailColl = new List<Models.ClsSc_MESBeginWorkBillSub>();
//public List<Model.ClsSc_MESBeginWorkBillSub_Item> DetailColl1 = new List<Model.ClsSc_MESBeginWorkBillSub_Item>();
+
public ClsSc_MESBeginWorkBill()
{
base.MvarItemKeySub = "Sc_MESBeginWorkBillSub";
@@ -53,7 +54,7 @@
//",HCheckDate='" + omodel.HCheckDate + "'" +
//",HMaker='" + omodel.HMaker + "'" +
//",HMakeDate='" + omodel.HMakeDate + "'" +
- ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
+ ",HUpDater='" +omodel.HMaker + "'" +
",HUpDateDate=getdate()" +
//",HCloseMan='" + omodel.HCloseMan + "'" +
//",HCloseDate='" + omodel.HCloseDate + "'" +
@@ -166,7 +167,7 @@
",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
",HGroupID,HDeptID,HEmpID,HBarCode,HAddr,HBarCodeMaker,HBarCodeMakeDate" +
") " +
- " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate()" +
+ " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + omodel.HMaker+ "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
"," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOEntryID + "','" + omodel.HICMOBillNo + "'," + omodel.HProcPlanInterID.ToString() + "," + omodel.HProcPlanEntryID.ToString() + ",'" + omodel.HProcPlanBillNo + "'," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() +
",'" + omodel.HProcExchBillNo + "'," + omodel.HMaterID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HICMOQty.ToString() + "," + omodel.HPlanQty.ToString() + ",getdate()," + omodel.HSourceID.ToString() +
@@ -175,9 +176,23 @@
"," + omodel.HGroupID.ToString() + "," + omodel.HDeptID.ToString() + "," + omodel.HEmpID.ToString() + ",'" + omodel.HBarCode + "','" + omodel.HAddr + "','" + omodel.HBarCodeMaker + "',getdate()" +
") ");
- //鏍规嵁寮�宸ュ崟鍐呯爜 璁剧疆 鐢熶骇鐘舵�佽〃 寮�宸ョ姸鎬�(鍏堟妸 鏈祫婧愬叏閮ㄥ伐鍗� 璁剧疆涓洪潪寮�宸ョ姸鎬侊紝鍐嶈缃湰鍗曞搴斿緱婧愬崟 涓哄紑宸ョ姸鎬�)
- oCn.RunProcReturn("exec h_p_JIT_MESBeginWorkBill_BeginWork @HInterId=" + omodel.HInterID + ",@flag='寮�宸�'", "h_p_JIT_MESBeginWorkBill_BeginWork");
- sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+ //鍐嶆楠岃瘉 淇濆瓨鏄惁 鍚堢悊
+ DataSet ds=oCn.RunProcReturn("exec h_p_JIT_MESBeginWorkBill_SaveCtrl @HInterId=" + omodel.HInterID + "", "h_p_JIT_MESBeginWorkBill_SaveCtrl");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ sReturn = "鏃犻獙璇佹暟鎹紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+
+
+ sReturn = omodel.HInterID.ToString();
oCn.Commit();
return true;
}
@@ -383,6 +398,45 @@
}
}
+ //鍒犻櫎鍗曟嵁
+ public override bool DeleteBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鍒ゆ柇鏄惁鍏佽鍒犻櫎
+ DataSet ds = oCn.RunProcReturn("exec h_p_JIT_MESBeginWorkBill_DelCtrl @HInterId=" + lngBillKey + "", "h_p_JIT_MESBeginWorkBill_SaveCtrl");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ sReturn = "鏃犻獙璇佹暟鎹紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+
+ //鍒犻櫎鍏宠仈鍏崇郴
+ oCn.RunProc("exec h_p_JIT_MESBeginWorkBill_DelRelation @HInterId=" + lngBillKey + "");
+
+ //鍒犻櫎鏄庣粏琛�
+ oCn.RunProc("Delete From " + MvarItemKeySub + " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎涓昏〃
+ oCn.RunProc("Delete From " + MvarItemKey + " where HInterID=" + lngBillKey.ToString());
+
+ sReturn = "鍒犻櫎鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
//瀹℃牳
public bool CheckBill(Int64 lngBillKey, ref string sReturn)
{
@@ -391,7 +445,11 @@
{
string HChecker = DBUtility.ClsPub.CurUserName;
string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
- oCn.RunProc(" Update " + MvarItemKey + " set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
+ oCn.BeginTran();
+ oCn.RunProc(" Update " + MvarItemKey + " set HBillStatus='2',HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
+ //鏍规嵁寮�宸ュ崟鍐呯爜 璁剧疆 鐢熶骇鐘舵�佽〃 寮�宸ョ姸鎬�(鍏堟妸 鏈祫婧愬叏閮ㄥ伐鍗� 璁剧疆涓洪潪寮�宸ョ姸鎬侊紝鍐嶈缃湰鍗曞搴斿緱婧愬崟 涓哄紑宸ョ姸鎬�)
+ oCn.RunProc("exec h_p_JIT_MESBeginWorkBill_BeginWork @HInterId=" + lngBillKey + ",@flag='寮�宸�'");
+ oCn.Commit();
//鐢熸垚璋冩嫧鍗�
//寰楀埌璋冩嫧鍗� mainid 鍗曟嵁鍙�
//long NewInterID = DBUtility.ClsPub.CreateBillID("1207", ref DBUtility.ClsPub.sExeReturnInfo);
diff --git a/WebAPI/DLL/ClsSc_MESEndWorkBill.cs b/WebAPI/DLL/ClsSc_MESEndWorkBill.cs
index 48b7999..af7f884 100644
--- a/WebAPI/DLL/ClsSc_MESEndWorkBill.cs
+++ b/WebAPI/DLL/ClsSc_MESEndWorkBill.cs
@@ -31,6 +31,7 @@
}
#endregion 鑷畾涔夋柟娉�
+
//淇敼鍗曟嵁
public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
{
@@ -182,9 +183,22 @@
"," + omodel.HQty.ToString() + "," + omodel.HBadCount.ToString() + "," + omodel.HWasterQty.ToString() + "," + omodel.HWasterQty2.ToString() + "," + omodel.HSelfBadCount.ToString() + "," + omodel.HPieceQty.ToString() +
") ");
- //鏍规嵁寮�宸ュ崟鍐呯爜 璁剧疆 鐢熶骇鐘舵�佽〃 瀹屽伐鐘舵��(鍏堟妸 鏈祫婧愬叏閮ㄥ伐鍗� 璁剧疆涓洪潪瀹屽伐鐘舵�侊紝鍐嶈缃湰鍗曞搴斿緱婧愬崟 涓哄畬宸ョ姸鎬�)
- oCn.RunProcReturn("exec h_p_JIT_MESBeginWorkBill_BeginWork @HInterId=" + omodel.HInterID + ",@flag='瀹屽伐'", "h_p_JIT_MESBeginWorkBill_BeginWork");
- sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+
+ //鍐嶆楠岃瘉 淇濆瓨鏄惁 鍚堢悊
+ DataSet ds = oCn.RunProcReturn("exec h_p_JIT_MESEndWorkBill_SaveCtrl @HInterId=" + omodel.HInterID + "", "h_p_JIT_MESEndWorkBill_SaveCtrl");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ sReturn = "鏃犻獙璇佹暟鎹紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ sReturn = omodel.HInterID.ToString();
oCn.Commit();
return true;
}
@@ -396,15 +410,58 @@
}
}
+ //鍒犻櫎鍗曟嵁
+ public override bool DeleteBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鍒ゆ柇鏄惁鍏佽鍒犻櫎
+ DataSet ds = oCn.RunProcReturn("exec h_p_JIT_MESEndWorkBill_DelCtrl @HInterId=" + lngBillKey + "", "h_p_JIT_MESBeginWorkBill_SaveCtrl");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ sReturn = "鏃犻獙璇佹暟鎹紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+
+ //鍒犻櫎鍏宠仈鍏崇郴
+ oCn.RunProc("exec h_p_JIT_MESEndWorkBill_DelRelation @HInterId=" + lngBillKey + "");
+
+ //鍒犻櫎鏄庣粏琛�
+ oCn.RunProc("Delete From " + MvarItemKeySub + " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎涓昏〃
+ oCn.RunProc("Delete From " + MvarItemKey + " where HInterID=" + lngBillKey.ToString());
+
+ sReturn = "鍒犻櫎鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
//瀹℃牳
public bool CheckBill(Int64 lngBillKey, ref string sReturn)
{
-
try
{
string HChecker = DBUtility.ClsPub.CurUserName;
string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
- oCn.RunProc(" Update " + MvarItemKey + " set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
+ oCn.BeginTran();
+ oCn.RunProc(" Update " + MvarItemKey + " set HBillStatus='2',HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
+ //鏍规嵁寮�宸ュ崟鍐呯爜 璁剧疆 鐢熶骇鐘舵�佽〃 寮�宸ョ姸鎬�(鍏堟妸 鏈祫婧愬叏閮ㄥ伐鍗� 璁剧疆涓洪潪寮�宸ョ姸鎬侊紝鍐嶈缃湰鍗曞搴斿緱婧愬崟 涓哄紑宸ョ姸鎬�)
+ oCn.RunProc("exec h_p_JIT_MESBeginWorkBill_BeginWork @HInterId=" + lngBillKey + ",@flag='瀹屽伐'");
+ oCn.Commit();
+
//鐢熸垚璋冩嫧鍗�
//寰楀埌璋冩嫧鍗� mainid 鍗曟嵁鍙�
//long NewInterID = DBUtility.ClsPub.CreateBillID("1207", ref DBUtility.ClsPub.sExeReturnInfo);
diff --git a/WebAPI/DLL/ClsSc_MESStopWorkBill.cs b/WebAPI/DLL/ClsSc_MESStopWorkBill.cs
index 9176fc7..afdc4a9 100644
--- a/WebAPI/DLL/ClsSc_MESStopWorkBill.cs
+++ b/WebAPI/DLL/ClsSc_MESStopWorkBill.cs
@@ -175,10 +175,22 @@
"," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceBillType + "'" +
"," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo.ToString() + "','" + omodel.HMainSourceBillType + "'" +
") ");
- //鎻掑叆瀛愯〃
- //鏍规嵁寮�宸ュ崟鍐呯爜 璁剧疆 鐢熶骇鐘舵�佽〃 鍋滃伐鐘舵��(鍏堟妸 鏈祫婧愬叏閮ㄥ伐鍗� 璁剧疆涓洪潪鍋滃伐鐘舵�侊紝鍐嶈缃湰鍗曞搴斿緱婧愬崟 涓哄仠宸ョ姸鎬�)
- oCn.RunProcReturn("exec h_p_JIT_MESBeginWorkBill_BeginWork @HInterId=" + omodel.HInterID + ",@flag='鍋滃伐'", "h_p_JIT_MESBeginWorkBill_BeginWork");
- sReturn = "鏂板鍗曟嵁鎴愬姛锛�";
+
+ //鍐嶆楠岃瘉 淇濆瓨鏄惁 鍚堢悊
+ DataSet ds = oCn.RunProcReturn("exec h_p_JIT_MESStopWorkBill_SaveCtrl @HInterId=" + omodel.HInterID + "", "h_p_JIT_MESStopWorkBill_SaveCtrl");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ sReturn = "鏃犻獙璇佹暟鎹紒";
+ oCn.RollBack();
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ oCn.RollBack();
+ return false;
+ }
+ sReturn = omodel.HInterID.ToString();
oCn.Commit();
return true;
}
@@ -386,15 +398,58 @@
}
}
+ //鍒犻櫎鍗曟嵁
+ public override bool DeleteBill(Int64 lngBillKey, ref string sReturn)
+ {
+ try
+ {
+ oCn.BeginTran();
+ //鍒ゆ柇鏄惁鍏佽鍒犻櫎
+ DataSet ds = oCn.RunProcReturn("exec h_p_JIT_MESStopWorkBill_DelCtrl @HInterId=" + lngBillKey + "", "h_p_JIT_MESBeginWorkBill_SaveCtrl");
+ if (ds == null || ds.Tables[0].Rows.Count <= 0)
+ {
+ sReturn = "鏃犻獙璇佹暟鎹紒";
+ return false;
+ }
+ if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) == "2")
+ {
+ sReturn = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBackRemark"]);
+ return false;
+ }
+
+ //鍒犻櫎鍏宠仈鍏崇郴
+ oCn.RunProc("exec h_p_JIT_MESStopWorkBill_DelRelation @HInterId=" + lngBillKey + "");
+
+ //鍒犻櫎鏄庣粏琛�
+ oCn.RunProc("Delete From " + MvarItemKeySub + " where HInterID=" + lngBillKey.ToString());
+ //鍒犻櫎涓昏〃
+ oCn.RunProc("Delete From " + MvarItemKey + " where HInterID=" + lngBillKey.ToString());
+
+ sReturn = "鍒犻櫎鍗曟嵁鎴愬姛锛�";
+ oCn.Commit();
+ return true;
+ }
+ catch (Exception e)
+ {
+ sReturn = e.Message;
+ oCn.RollBack();
+ throw (e);
+ }
+ }
+
//瀹℃牳
public bool CheckBill(Int64 lngBillKey, ref string sReturn)
{
-
try
{
string HChecker = DBUtility.ClsPub.CurUserName;
string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
- oCn.RunProc(" Update " + MvarItemKey + " set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
+ oCn.BeginTran();
+ oCn.RunProc(" Update " + MvarItemKey + " set HBillStatus='2',HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
+ //鏍规嵁寮�宸ュ崟鍐呯爜 璁剧疆 鐢熶骇鐘舵�佽〃 寮�宸ョ姸鎬�(鍏堟妸 鏈祫婧愬叏閮ㄥ伐鍗� 璁剧疆涓洪潪寮�宸ョ姸鎬侊紝鍐嶈缃湰鍗曞搴斿緱婧愬崟 涓哄紑宸ョ姸鎬�)
+ oCn.RunProc("exec h_p_JIT_MESBeginWorkBill_BeginWork @HInterId=" + lngBillKey + ",@flag='鍋滃伐'");
+ oCn.Commit();
+
//鐢熸垚璋冩嫧鍗�
//寰楀埌璋冩嫧鍗� mainid 鍗曟嵁鍙�
//long NewInterID = DBUtility.ClsPub.CreateBillID("1207", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -414,6 +469,6 @@
-
+
}
}
diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs
index 9f11679..d4fe727 100644
--- a/WebAPI/ListModels.cs
+++ b/WebAPI/ListModels.cs
@@ -558,9 +558,20 @@
return list;
}
+ /// <summary>
+ /// 澶勭悊鏂板妯″叿淇濆吇璁板綍琛ㄥ瓙琛ㄤ繚鍏婚」鐩殑json
+ /// </summary>
+ /// <param name="jsonString"></param>
+ /// <returns></returns>
+ public List<Model.ClsSc_MouldMaintainRuleBillSub_Item> getObjectByJson_Sc_MouldMaintainRuleBillSub_Item(string jsonString)
+ {
+ jsonString = "[" + jsonString.ToString() + "]";
+ List<Model.ClsSc_MouldMaintainRuleBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMaintainRuleBillSub_Item>>(jsonString);
+ return list;
+ }
/// <summary>
- /// 澶勭悊鏂板妯″叿淇濆吇璁板綍琛ㄥ瓙琛ㄧ殑json
+ /// 澶勭悊鏂板妯″叿淇濆吇璁板綍琛ㄥ瓙琛ㄩ厤浠堕」鐨刯son
/// </summary>
/// <param name="jsonString"></param>
/// <returns></returns>
@@ -570,6 +581,7 @@
List<Model.ClsSc_MouldMaintainBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMaintainBillSub>>(jsonString);
return list;
}
+
/// <summary>
/// 澶勭悊鏂板璐у竵璁剧疆琛ㄧ殑json
diff --git a/WebAPI/Models/json.cs b/WebAPI/Models/json.cs
index 207e247..ed49eab 100644
--- a/WebAPI/Models/json.cs
+++ b/WebAPI/Models/json.cs
@@ -13,5 +13,8 @@
public object data { get; set; }
public List<object> list { get; set; }
+
+ public string Verify { get; set; }
+ public string HInterID { get; set; }
}
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 206561c..96553ac 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.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|2021-08-06T14:49:09.9538339Z;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
+ <History>True|2021-08-19T09:37:54.9748049Z;True|2021-08-19T17:20:11.0515687+08:00;True|2021-08-19T16:12:35.4392809+08:00;True|2021-08-19T16:06:50.6204587+08:00;True|2021-08-19T16:03:53.0824286+08:00;True|2021-08-19T15:56:01.3498791+08:00;True|2021-08-19T10:18:50.8113630+08:00;True|2021-08-19T09:58:06.2784035+08:00;True|2021-08-19T09:56:54.0619777+08:00;True|2021-08-19T00:32:08.3503093+08:00;True|2021-08-19T00:11:18.3150227+08:00;True|2021-08-19T00:02:49.4827718+08:00;True|2021-08-18T23:54:45.4845900+08:00;True|2021-08-18T23:39:51.6147977+08:00;True|2021-08-18T23:16:42.7214379+08:00;True|2021-08-18T22:38:57.4681929+08:00;True|2021-08-18T21:41:58.7560707+08:00;True|2021-08-18T21:11:52.2369249+08:00;True|2021-08-18T21:01:49.5669106+08:00;True|2021-08-18T20:47:46.5352688+08:00;False|2021-08-18T20:46:36.7956141+08:00;False|2021-08-18T20:46:01.0502138+08:00;True|2021-08-18T19:39:12.8186242+08:00;False|2021-08-18T19:38:12.6839708+08:00;True|2021-08-18T19:15:51.4626694+08:00;True|2021-08-18T16:07:20.4350886+08:00;True|2021-08-18T14:29:41.7171934+08:00;True|2021-08-18T14:20:36.3647361+08:00;True|2021-08-16T09:08:58.3617662+08:00;True|2021-08-15T20:44:29.9214083+08:00;True|2021-08-15T20:36:17.0958549+08:00;True|2021-08-15T20:29:34.3879773+08:00;True|2021-08-15T20:23:47.4052038+08:00;True|2021-08-15T15:01:19.7830862+08:00;True|2021-08-15T12:15:18.3433782+08:00;True|2021-08-13T20:59:11.3947130+08:00;True|2021-08-06T22:49:09.9538339+08:00;True|2021-08-06T22:35:19.0418168+08:00;True|2021-08-06T20:29:47.4241975+08:00;True|2021-08-06T14:08:16.4791827+08:00;True|2021-08-06T13:59:28.9874611+08:00;True|2021-08-06T13:57:34.3723977+08:00;True|2021-08-06T13:36:03.4816652+08:00;True|2021-08-06T12:22:52.5055221+08:00;True|2021-08-06T09:31:58.1272499+08:00;True|2021-08-06T09:26:51.6310039+08:00;True|2021-08-06T09:24:22.2899244+08:00;True|2021-08-06T09:06:30.6477912+08:00;True|2021-08-06T09:00:55.5101612+08:00;True|2021-08-06T08:49:59.9616490+08:00;True|2021-08-06T08:45:18.8586902+08:00;True|2021-08-05T20:09:25.8861998+08:00;True|2021-08-04T19:14:27.2396953+08:00;True|2021-08-04T19:11:47.5849093+08:00;True|2021-08-04T16:42:54.0149043+08:00;True|2021-08-04T15:02:11.5056561+08:00;True|2021-08-04T14:58:37.1435509+08:00;True|2021-08-04T14:55:34.7380132+08:00;True|2021-08-04T14:47:42.5933921+08:00;True|2021-08-04T14:45:17.9911874+08:00;True|2021-08-04T13:52:20.9601351+08:00;True|2021-08-04T09:48:28.8796992+08:00;True|2021-08-03T18:14:13.1894998+08:00;True|2021-08-03T17:45:35.1349721+08:00;True|2021-08-03T17:21:52.6028977+08:00;True|2021-08-03T17:20:35.4423020+08:00;True|2021-08-03T17:03:33.1667669+08:00;True|2021-08-03T17:01:54.2656787+08:00;True|2021-08-03T17:00:22.2778374+08:00;True|2021-08-03T16:56:58.8902582+08:00;True|2021-08-03T15:02:21.8601533+08:00;True|2021-08-03T14:57:34.0186758+08:00;True|2021-08-03T14:28:47.2242515+08:00;True|2021-08-03T14:22:22.4554236+08:00;True|2021-08-03T14:21:51.1339715+08:00;True|2021-08-03T13:37:33.9697131+08:00;True|2021-08-03T13:28:29.7591095+08:00;True|2021-08-03T11:35:09.5118324+08:00;True|2021-08-03T11:11:23.3051573+08:00;True|2021-08-02T13:14:42.3663755+08:00;True|2021-07-30T22:50:19.9749878+08:00;True|2021-07-30T22:49:31.2150970+08:00;True|2021-07-28T19:12:05.8381075+08:00;True|2021-07-28T18:59:45.4808797+08:00;True|2021-07-28T18:15:58.8301509+08:00;True|2021-07-28T18:04:54.8613546+08:00;True|2021-07-28T17:53:48.6225611+08:00;True|2021-07-28T17:42:50.9171563+08:00;True|2021-07-28T17:17:16.3137677+08:00;True|2021-07-28T17:11:46.8925200+08:00;True|2021-07-28T16:28:27.6823943+08:00;True|2021-07-28T16:23:00.3385836+08:00;True|2021-07-28T09:57:55.4237411+08:00;True|2021-07-28T08:38:29.6691541+08:00;True|2021-07-27T23:16:32.0331671+08:00;True|2021-07-27T23:06:08.1947249+08:00;True|2021-07-27T23:05:58.4619176+08:00;True|2021-07-27T18:42:09.5358261+08:00;True|2021-07-27T18:30:04.8532823+08:00;True|2021-07-27T18:29:43.5775092+08:00;True|2021-07-27T15:16:49.8356224+08:00;True|2021-07-27T15:05:27.8453220+08:00;True|2021-07-27T14:59:15.9519440+08:00;True|2021-07-27T09:23:32.6111337+08:00;True|2021-07-27T08:27:41.6395353+08:00;True|2021-07-27T08:25:56.7378296+08:00;True|2021-07-26T11:18:46.0856966+08:00;True|2021-07-26T11:18:02.0751924+08:00;True|2021-07-26T11:13:49.6285395+08:00;True|2021-07-21T21:08:25.9898902+08:00;True|2021-07-21T20:09:26.2258104+08:00;True|2021-07-13T16:17:25.8407435+08:00;True|2021-07-13T13:46:13.4309531+08:00;True|2021-07-13T12:29:04.5082461+08:00;True|2021-06-29T13:55:01.6864637+08:00;True|2021-06-29T10:38:52.2206472+08:00;True|2021-06-29T10:10:13.1540749+08:00;True|2021-06-28T14:37:56.3853273+08:00;False|2021-06-28T14:36:57.5726124+08:00;True|2021-06-25T14:17:57.5196108+08:00;True|2021-06-25T13:56:38.9522535+08:00;True|2021-06-24T19:38:32.8766933+08:00;True|2021-06-24T18:26:35.6118833+08:00;True|2021-06-24T18:02:52.8136877+08:00;True|2021-06-24T17:48:49.5851948+08:00;True|2021-06-24T17:45:46.7527572+08:00;True|2021-06-24T15:05:20.1592723+08:00;True|2021-06-23T16:18:15.6814625+08:00;True|2021-06-23T16:05:24.6112343+08:00;True|2021-06-23T15:14:08.2489658+08:00;True|2021-06-23T13:52:58.6029788+08:00;True|2021-06-22T16:11:20.4726923+08:00;True|2021-06-22T16:04:53.7231389+08:00;True|2021-06-22T15:50:59.2583262+08:00;True|2021-06-22T15:38:15.3016140+08:00;True|2021-06-22T15:34:42.9185543+08:00;True|2021-06-22T15:21:55.1419108+08:00;True|2021-06-22T15:07:21.5357494+08:00;True|2021-06-22T15:03:35.0535733+08:00;True|2021-06-22T14:54:47.8802969+08:00;True|2021-06-22T11:19:38.7303011+08:00;True|2021-06-22T08:53:49.2882695+08:00;True|2021-06-22T08:47:54.8286530+08:00;True|2021-06-21T16:27:19.3017700+08:00;True|2021-06-21T15:32:28.7237952+08:00;True|2021-06-21T12:34:02.6329555+08:00;True|2021-06-21T12:24:17.5427495+08:00;True|2021-06-21T10:47:30.6423502+08:00;True|2021-06-21T08:43:20.3026558+08:00;True|2021-06-19T15:10:06.8335499+08:00;True|2021-06-18T15:37:29.5009930+08:00;True|2021-06-18T13:46:35.6283432+08:00;True|2021-06-18T10:00:37.1474954+08:00;True|2021-06-18T09:55:21.8551780+08:00;True|2021-06-18T09:22:27.8432927+08:00;True|2021-06-17T11:17:43.2166430+08:00;True|2021-06-17T09:24:09.8350403+08:00;True|2021-06-16T16:10:47.8564888+08:00;True|2021-06-16T16:04:09.8286582+08:00;True|2021-06-16T15:12:29.9427169+08:00;True|2021-06-16T14:58:45.6801892+08:00;True|2021-06-16T14:46:01.6873221+08:00;True|2021-06-16T11:02:06.1272477+08:00;True|2021-06-16T09:33:56.0223915+08:00;True|2021-06-16T08:50:07.6995413+08:00;True|2021-06-16T08:28:38.7692635+08:00;True|2021-06-16T01:04:19.6282474+08:00;True|2021-06-16T01:03:50.5058323+08:00;False|2021-06-16T01:02:15.3819672+08:00;False|2021-06-16T01:01:38.6171098+08:00;True|2021-06-16T00:34:54.9902044+08:00;True|2021-06-15T23:55:36.2003828+08:00;True|2021-06-15T22:47:17.2192750+08:00;True|2021-06-15T22:42:41.1512585+08:00;True|2021-06-15T22:38:01.7390462+08:00;True|2021-06-15T22:14:11.2060782+08:00;True|2021-06-15T22:12:27.0615357+08:00;True|2021-06-15T22:07:59.9280871+08:00;True|2021-06-15T22:04:21.5051427+08:00;True|2021-06-15T21:25:55.0099814+08:00;True|2021-06-15T19:13:51.3494172+08:00;True|2021-06-15T19:02:17.6844742+08:00;True|2021-06-15T18:47:37.1629411+08:00;False|2021-06-15T18:47:11.0828111+08:00;True|2021-06-15T18:38:26.6620668+08:00;True|2021-06-15T18:33:45.2069831+08:00;True|2021-06-15T18:24:52.0550838+08:00;True|2021-06-15T18:19:43.6999796+08:00;True|2021-06-15T18:08:17.2464506+08:00;True|2021-06-15T18:03:51.3952624+08:00;True|2021-06-15T18:01:20.6141766+08:00;True|2021-06-15T17:59:04.4479416+08:00;True|2021-06-15T17:41:44.6389379+08:00;True|2021-06-15T17:39:03.1565124+08:00;True|2021-06-15T17:34:41.0634638+08:00;True|2021-06-15T17:33:50.4853178+08:00;True|2021-06-15T17:25:38.5914037+08:00;True|2021-06-15T17:22:21.3611360+08:00;True|2021-06-15T17:16:49.4970813+08:00;True|2021-06-15T17:05:28.9389484+08:00;True|2021-06-15T16:52:54.6372199+08:00;True|2021-06-15T16:51:23.9081030+08:00;True|2021-06-15T16:45:40.6017997+08:00;True|2021-06-15T16:41:05.0218887+08:00;True|2021-06-15T16:38:02.8541862+08:00;True|2021-06-15T16:22:10.3118721+08:00;True|2021-06-15T16:12:11.1552506+08:00;True|2021-06-15T15:33:42.0100494+08:00;True|2021-06-15T15:28:39.7145659+08:00;True|2021-06-15T15:15:02.7939125+08:00;True|2021-06-15T14:49:14.2300396+08:00;True|2021-06-15T14:42:28.1198064+08:00;True|2021-06-15T13:30:12.7997686+08:00;True|2021-06-15T13:25:37.7284670+08:00;True|2021-06-15T13:23:43.6207813+08:00;False|2021-06-15T13:23:19.4190232+08:00;True|2021-06-15T13:16:38.5062674+08:00;True|2021-06-15T13:03:31.2055635+08:00;True|2021-06-15T12:58:43.1653215+08:00;True|2021-06-15T12:39:22.8442109+08:00;True|2021-06-15T12:35:09.1288556+08:00;False|2021-06-15T12:33:50.0723143+08:00;True|2021-06-15T11:28:01.9733727+08:00;True|2021-06-15T11:26:26.6569392+08:00;True|2021-06-15T11:22:43.0366435+08:00;True|2021-06-15T11:07:50.1610580+08:00;True|2021-06-15T10:32:59.1925931+08:00;True|2021-06-10T17:16:57.9552310+08:00;True|2021-06-10T16:44:42.2731836+08:00;True|2021-06-10T14:39:27.6745737+08:00;True|2021-06-10T12:15:05.1524413+08:00;True|2021-06-09T18:19:24.1005606+08:00;True|2021-06-09T17:56:09.5646288+08:00;True|2021-06-09T13:34:06.1882292+08:00;True|2021-06-09T13:29:54.5924933+08:00;True|2021-06-09T13:25:55.7520662+08:00;True|2021-06-09T13:07:47.6686811+08:00;True|2021-06-09T12:59:41.2595048+08:00;True|2021-06-09T12:45:27.1305548+08:00;True|2021-06-09T12:29:52.1418191+08:00;True|2021-06-09T12:24:12.7610588+08:00;True|2021-06-09T11:31:25.3409568+08:00;True|2021-06-09T09:57:44.4387175+08:00;True|2021-06-09T09:54:26.5161307+08:00;True|2021-06-09T09:14:14.7288045+08:00;True|2021-06-09T09:10:25.1812139+08:00;True|2021-06-09T08:46:21.6585123+08:00;True|2021-06-08T19:56:55.7192062+08:00;True|2021-06-08T19:52:59.0326821+08:00;True|2021-06-08T19:49:13.6274217+08:00;True|2021-06-08T19:09:22.1038939+08:00;True|2021-06-08T15:28:41.3716247+08:00;True|2021-06-08T15:26:47.2621178+08:00;True|2021-06-08T13:49:45.8936617+08:00;True|2021-06-08T13:43:18.8115502+08:00;True|2021-06-08T10:04:06.2200731+08:00;True|2021-06-08T09:17:10.0470792+08:00;True|2021-06-08T08:44:37.4395849+08:00;True|2021-06-08T00:01:09.3745613+08:00;True|2021-06-07T23:49:31.5196888+08:00;True|2021-06-07T23:41:00.8017855+08:00;True|2021-06-07T23:21:53.1371134+08:00;True|2021-06-07T23:01:27.5712153+08:00;True|2021-06-07T22:36:12.9274014+08:00;True|2021-06-07T22:23:00.6545134+08:00;True|2021-06-07T17:44:47.5686346+08:00;True|2021-06-07T17:17:01.3431233+08:00;True|2021-06-07T16:53:28.9989587+08:00;True|2021-06-07T16:41:10.4975607+08:00;True|2021-06-07T14:21:06.8176477+08:00;True|2021-06-07T14:10:39.0355659+08:00;True|2021-06-07T12:34:31.4562732+08:00;True|2021-06-07T12:28:44.9629488+08:00;True|2021-06-07T10:30:26.9387988+08:00;True|2021-06-07T09:12:14.7658099+08:00;True|2021-06-07T08:37:19.6353792+08:00;True|2021-06-07T08:35:25.2031954+08:00;True|2021-06-05T07:07:32.0541266+08:00;True|2021-06-05T06:44:35.9475270+08:00;True|2021-06-05T06:37:27.4595197+08:00;True|2021-06-05T06:26:59.7663998+08:00;True|2021-06-05T05:43:12.8699318+08:00;True|2021-06-04T17:00:41.2426007+08:00;True|2021-06-04T16:08:03.8078072+08:00;True|2021-06-04T15:47:21.6412616+08:00;True|2021-06-04T15:21:02.4239800+08:00;True|2021-06-04T15:20:37.8641854+08:00;True|2021-06-04T13:38:51.5088395+08:00;True|2021-06-04T10:20:01.7784282+08:00;True|2021-06-04T10:13:50.3548857+08:00;True|2021-06-04T10:11:25.5017821+08:00;True|2021-06-04T10:09:51.6792228+08:00;True|2021-06-04T10:02:39.5851057+08:00;True|2021-06-04T09:30:40.4495494+08:00;True|2021-06-03T13:16:36.0317546+08:00;True|2021-06-03T13:12:47.0402047+08:00;True|2021-06-02T14:37:08.9683351+08:00;True|2021-06-02T14:10:15.7439829+08:00;True|2021-06-02T13:59:46.5841931+08:00;True|2021-06-02T13:25:18.7962660+08:00;True|2021-06-02T13:23:16.2261980+08:00;True|2021-06-01T15:37:32.2495085+08:00;True|2021-06-01T15:21:01.2856122+08:00;True|2021-06-01T15:13:36.7262365+08:00;True|2021-06-01T15:10:26.8905629+08:00;True|2021-06-01T14:56:17.5231551+08:00;True|2021-06-01T14:38:39.7895927+08:00;True|2021-06-01T14:23:12.3265287+08:00;True|2021-03-01T09:11:31.3226422+08:00;True|2021-05-26T14:54:56.9426462+08:00;True|2021-05-26T13:57:33.7780451+08:00;True|2021-05-26T13:39:02.8043358+08:00;True|2021-02-25T16:01:40.2917200+08:00;True|2021-02-25T15:49:46.6681205+08:00;True|2021-02-25T15:16:30.9372640+08:00;True|2021-05-25T13:10:21.7831921+08:00;True|2021-05-25T11:21:38.5224475+08:00;True|2021-05-25T11:12:52.0637175+08:00;True|2021-05-25T11:02:18.4164663+08:00;True|2021-05-25T10:52:06.8998521+08:00;True|2021-05-25T10:50:45.0929606+08:00;True|2021-05-25T10:45:54.1498313+08:00;True|2021-05-25T10:39:27.8602249+08:00;True|2021-05-25T10:34:49.5771162+08:00;True|2021-05-25T10:17:30.3009163+08:00;True|2021-05-25T10:14:03.8512581+08:00;True|2021-05-25T10:05:33.4343836+08:00;True|2021-05-24T17:01:23.3221168+08:00;True|2021-05-24T10:11:24.0197347+08:00;False|2021-05-24T10:11:07.6338995+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -18,28 +18,28 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>08/07/2021 08:49:01</publishTime>
+ <publishTime>08/20/2021 14:25:34</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>08/07/2021 08:49:01</publishTime>
+ <publishTime>08/20/2021 14:25:34</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>08/07/2021 08:48:57</publishTime>
+ <publishTime>08/20/2021 14:25:30</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>08/07/2021 08:48:57</publishTime>
+ <publishTime>08/20/2021 14:25:30</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>08/07/2021 08:48:52</publishTime>
+ <publishTime>08/20/2021 14:25:24</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>08/07/2021 08:48:52</publishTime>
+ <publishTime>08/20/2021 14:25:24</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
- <publishTime>08/07/2021 08:48:59</publishTime>
+ <publishTime>08/20/2021 14:25:31</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
<publishTime>09/20/2018 19:08:18</publishTime>
@@ -60,10 +60,10 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>08/07/2021 08:48:54</publishTime>
+ <publishTime>08/20/2021 14:25:25</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>08/07/2021 08:48:54</publishTime>
+ <publishTime>08/20/2021 14:25:25</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/06/2021 22:57:28</publishTime>
@@ -72,25 +72,25 @@
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>08/07/2021 08:48:50</publishTime>
+ <publishTime>08/20/2021 14:25:20</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>08/07/2021 08:48:50</publishTime>
+ <publishTime>08/20/2021 14:25:20</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>08/07/2021 08:48:51</publishTime>
+ <publishTime>08/20/2021 14:25:22</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>08/07/2021 08:48:51</publishTime>
+ <publishTime>08/20/2021 14:25:22</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>08/07/2021 08:48:51</publishTime>
+ <publishTime>08/20/2021 14:25:23</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>08/07/2021 08:48:51</publishTime>
+ <publishTime>08/20/2021 14:25:23</publishTime>
</File>
<File Include="bin/stdole.dll">
- <publishTime>01/24/2021 13:08:02</publishTime>
+ <publishTime>01/13/2021 17:00:05</publishTime>
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/15/2015 17:57:08</publishTime>
@@ -189,10 +189,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>08/07/2021 08:49:05</publishTime>
+ <publishTime>08/20/2021 14:25:39</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>08/07/2021 08:49:05</publishTime>
+ <publishTime>08/20/2021 14:25:39</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -363,7 +363,7 @@
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>08/07/2021 08:55:37</publishTime>
+ <publishTime>08/20/2021 14:25:53</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Web References/WebS/Reference.cs b/WebAPI/Web References/WebS/Reference.cs
index 7803c20..f68ee96 100644
--- a/WebAPI/Web References/WebS/Reference.cs
+++ b/WebAPI/Web References/WebS/Reference.cs
@@ -61,6 +61,8 @@
private System.Threading.SendOrPostCallback get_SaveCLOUDUseNameandPsdOperationCompleted;
+ private System.Threading.SendOrPostCallback get_SaveMESCLOUDUseNamePsdOperationCompleted;
+
private System.Threading.SendOrPostCallback CheckAllowBeforeSaveOperationCompleted;
private System.Threading.SendOrPostCallback get_SystemParameterOperationCompleted;
@@ -973,6 +975,9 @@
/// <remarks/>
public event get_SaveCLOUDUseNameandPsdCompletedEventHandler get_SaveCLOUDUseNameandPsdCompleted;
+
+ /// <remarks/>
+ public event get_SaveMESCLOUDUseNamePsdCompletedEventHandler get_SaveMESCLOUDUseNamePsdCompleted;
/// <remarks/>
public event CheckAllowBeforeSaveCompletedEventHandler CheckAllowBeforeSaveCompleted;
@@ -2605,6 +2610,35 @@
if ((this.get_SaveCLOUDUseNameandPsdCompleted != null)) {
System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
this.get_SaveCLOUDUseNameandPsdCompleted(this, new get_SaveCLOUDUseNameandPsdCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+ }
+ }
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/get_SaveMESCLOUDUseNamePsd", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ public System.Data.DataSet get_SaveMESCLOUDUseNamePsd(string HMaker) {
+ object[] results = this.Invoke("get_SaveMESCLOUDUseNamePsd", new object[] {
+ HMaker});
+ return ((System.Data.DataSet)(results[0]));
+ }
+
+ /// <remarks/>
+ public void get_SaveMESCLOUDUseNamePsdAsync(string HMaker) {
+ this.get_SaveMESCLOUDUseNamePsdAsync(HMaker, null);
+ }
+
+ /// <remarks/>
+ public void get_SaveMESCLOUDUseNamePsdAsync(string HMaker, object userState) {
+ if ((this.get_SaveMESCLOUDUseNamePsdOperationCompleted == null)) {
+ this.get_SaveMESCLOUDUseNamePsdOperationCompleted = new System.Threading.SendOrPostCallback(this.Onget_SaveMESCLOUDUseNamePsdOperationCompleted);
+ }
+ this.InvokeAsync("get_SaveMESCLOUDUseNamePsd", new object[] {
+ HMaker}, this.get_SaveMESCLOUDUseNamePsdOperationCompleted, userState);
+ }
+
+ private void Onget_SaveMESCLOUDUseNamePsdOperationCompleted(object arg) {
+ if ((this.get_SaveMESCLOUDUseNamePsdCompleted != null)) {
+ System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+ this.get_SaveMESCLOUDUseNamePsdCompleted(this, new get_SaveMESCLOUDUseNamePsdCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
}
}
@@ -10958,9 +10992,11 @@
/// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveICMOProductReportBill_Layui", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public bool set_SaveICMOProductReportBill_Layui(ClsSc_ICMOReportBillMain oMain, string sHSourceType, ref string sErrMsg) {
+ public bool set_SaveICMOProductReportBill_Layui(ClsSc_ICMOReportBillMain oMain, string workcode, int HSourceID, string sHSourceType, ref string sErrMsg) {
object[] results = this.Invoke("set_SaveICMOProductReportBill_Layui", new object[] {
oMain,
+ workcode,
+ HSourceID,
sHSourceType,
sErrMsg});
sErrMsg = ((string)(results[1]));
@@ -10968,17 +11004,19 @@
}
/// <remarks/>
- public void set_SaveICMOProductReportBill_LayuiAsync(ClsSc_ICMOReportBillMain oMain, string sHSourceType, string sErrMsg) {
- this.set_SaveICMOProductReportBill_LayuiAsync(oMain, sHSourceType, sErrMsg, null);
+ public void set_SaveICMOProductReportBill_LayuiAsync(ClsSc_ICMOReportBillMain oMain, string workcode, int HSourceID, string sHSourceType, string sErrMsg) {
+ this.set_SaveICMOProductReportBill_LayuiAsync(oMain, workcode, HSourceID, sHSourceType, sErrMsg, null);
}
/// <remarks/>
- public void set_SaveICMOProductReportBill_LayuiAsync(ClsSc_ICMOReportBillMain oMain, string sHSourceType, string sErrMsg, object userState) {
+ public void set_SaveICMOProductReportBill_LayuiAsync(ClsSc_ICMOReportBillMain oMain, string workcode, int HSourceID, string sHSourceType, string sErrMsg, object userState) {
if ((this.set_SaveICMOProductReportBill_LayuiOperationCompleted == null)) {
this.set_SaveICMOProductReportBill_LayuiOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveICMOProductReportBill_LayuiOperationCompleted);
}
this.InvokeAsync("set_SaveICMOProductReportBill_Layui", new object[] {
oMain,
+ workcode,
+ HSourceID,
sHSourceType,
sErrMsg}, this.set_SaveICMOProductReportBill_LayuiOperationCompleted, userState);
}
@@ -10992,9 +11030,11 @@
/// <remarks/>
[System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://tempuri.org/set_SaveICMOProductReportBill_CLD_Layui", RequestNamespace="http://tempuri.org/", ResponseNamespace="http://tempuri.org/", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
- public bool set_SaveICMOProductReportBill_CLD_Layui(ClsSc_ICMOReportBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg) {
+ public bool set_SaveICMOProductReportBill_CLD_Layui(ClsSc_ICMOReportBillMain oMain, string workcode, int HSourceID, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg) {
object[] results = this.Invoke("set_SaveICMOProductReportBill_CLD_Layui", new object[] {
oMain,
+ workcode,
+ HSourceID,
sHSourceType,
oSystemParameterMain,
sErrMsg});
@@ -11003,17 +11043,19 @@
}
/// <remarks/>
- public void set_SaveICMOProductReportBill_CLD_LayuiAsync(ClsSc_ICMOReportBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg) {
- this.set_SaveICMOProductReportBill_CLD_LayuiAsync(oMain, sHSourceType, oSystemParameterMain, sErrMsg, null);
+ public void set_SaveICMOProductReportBill_CLD_LayuiAsync(ClsSc_ICMOReportBillMain oMain, string workcode, int HSourceID, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg) {
+ this.set_SaveICMOProductReportBill_CLD_LayuiAsync(oMain, workcode, HSourceID, sHSourceType, oSystemParameterMain, sErrMsg, null);
}
/// <remarks/>
- public void set_SaveICMOProductReportBill_CLD_LayuiAsync(ClsSc_ICMOReportBillMain oMain, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg, object userState) {
+ public void set_SaveICMOProductReportBill_CLD_LayuiAsync(ClsSc_ICMOReportBillMain oMain, string workcode, int HSourceID, string sHSourceType, ClsXt_SystemParameterMain oSystemParameterMain, string sErrMsg, object userState) {
if ((this.set_SaveICMOProductReportBill_CLD_LayuiOperationCompleted == null)) {
this.set_SaveICMOProductReportBill_CLD_LayuiOperationCompleted = new System.Threading.SendOrPostCallback(this.Onset_SaveICMOProductReportBill_CLD_LayuiOperationCompleted);
}
this.InvokeAsync("set_SaveICMOProductReportBill_CLD_Layui", new object[] {
oMain,
+ workcode,
+ HSourceID,
sHSourceType,
oSystemParameterMain,
sErrMsg}, this.set_SaveICMOProductReportBill_CLD_LayuiOperationCompleted, userState);
@@ -37444,6 +37486,32 @@
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ public delegate void get_SaveMESCLOUDUseNamePsdCompletedEventHandler(object sender, get_SaveMESCLOUDUseNamePsdCompletedEventArgs e);
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ public partial class get_SaveMESCLOUDUseNamePsdCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+
+ private object[] results;
+
+ internal get_SaveMESCLOUDUseNamePsdCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) :
+ base(exception, cancelled, userState) {
+ this.results = results;
+ }
+
+ /// <remarks/>
+ public System.Data.DataSet Result {
+ get {
+ this.RaiseExceptionIfNecessary();
+ return ((System.Data.DataSet)(this.results[0]));
+ }
+ }
+ }
+
+ /// <remarks/>
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.8.4084.0")]
public delegate void CheckAllowBeforeSaveCompletedEventHandler(object sender, CheckAllowBeforeSaveCompletedEventArgs e);
/// <remarks/>
diff --git a/WebAPI/Web References/WebS/WebService1.wsdl b/WebAPI/Web References/WebS/WebService1.wsdl
index 35e1726..34c5efe 100644
--- a/WebAPI/Web References/WebS/WebService1.wsdl
+++ b/WebAPI/Web References/WebS/WebService1.wsdl
@@ -229,6 +229,27 @@
</s:sequence>
</s:complexType>
</s:element>
+ <s:element name="get_SaveMESCLOUDUseNamePsd">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="HMaker" type="s:string" />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ <s:element name="get_SaveMESCLOUDUseNamePsdResponse">
+ <s:complexType>
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="get_SaveMESCLOUDUseNamePsdResult">
+ <s:complexType>
+ <s:sequence>
+ <s:element ref="s:schema" />
+ <s:any />
+ </s:sequence>
+ </s:complexType>
+ </s:element>
+ </s:sequence>
+ </s:complexType>
+ </s:element>
<s:element name="CheckAllowBeforeSave">
<s:complexType>
<s:sequence>
@@ -5727,6 +5748,8 @@
<s:complexType>
<s:sequence>
<s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsSc_ICMOReportBillMain" />
+ <s:element minOccurs="0" maxOccurs="1" name="workcode" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSourceID" type="s:int" />
<s:element minOccurs="0" maxOccurs="1" name="sHSourceType" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
</s:sequence>
@@ -5744,6 +5767,8 @@
<s:complexType>
<s:sequence>
<s:element minOccurs="0" maxOccurs="1" name="oMain" type="tns:ClsSc_ICMOReportBillMain" />
+ <s:element minOccurs="0" maxOccurs="1" name="workcode" type="s:string" />
+ <s:element minOccurs="1" maxOccurs="1" name="HSourceID" type="s:int" />
<s:element minOccurs="0" maxOccurs="1" name="sHSourceType" type="s:string" />
<s:element minOccurs="0" maxOccurs="1" name="oSystemParameterMain" type="tns:ClsXt_SystemParameterMain" />
<s:element minOccurs="0" maxOccurs="1" name="sErrMsg" type="s:string" />
@@ -10538,6 +10563,12 @@
<wsdl:message name="get_SaveCLOUDUseNameandPsdSoapOut">
<wsdl:part name="parameters" element="tns:get_SaveCLOUDUseNameandPsdResponse" />
</wsdl:message>
+ <wsdl:message name="get_SaveMESCLOUDUseNamePsdSoapIn">
+ <wsdl:part name="parameters" element="tns:get_SaveMESCLOUDUseNamePsd" />
+ </wsdl:message>
+ <wsdl:message name="get_SaveMESCLOUDUseNamePsdSoapOut">
+ <wsdl:part name="parameters" element="tns:get_SaveMESCLOUDUseNamePsdResponse" />
+ </wsdl:message>
<wsdl:message name="CheckAllowBeforeSaveSoapIn">
<wsdl:part name="parameters" element="tns:CheckAllowBeforeSave" />
</wsdl:message>
@@ -13099,6 +13130,10 @@
<wsdl:input message="tns:get_SaveCLOUDUseNameandPsdSoapIn" />
<wsdl:output message="tns:get_SaveCLOUDUseNameandPsdSoapOut" />
</wsdl:operation>
+ <wsdl:operation name="get_SaveMESCLOUDUseNamePsd">
+ <wsdl:input message="tns:get_SaveMESCLOUDUseNamePsdSoapIn" />
+ <wsdl:output message="tns:get_SaveMESCLOUDUseNamePsdSoapOut" />
+ </wsdl:operation>
<wsdl:operation name="CheckAllowBeforeSave">
<wsdl:input message="tns:CheckAllowBeforeSaveSoapIn" />
<wsdl:output message="tns:CheckAllowBeforeSaveSoapOut" />
@@ -14884,6 +14919,15 @@
</wsdl:operation>
<wsdl:operation name="get_SaveCLOUDUseNameandPsd">
<soap:operation soapAction="http://tempuri.org/get_SaveCLOUDUseNameandPsd" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="get_SaveMESCLOUDUseNamePsd">
+ <soap:operation soapAction="http://tempuri.org/get_SaveMESCLOUDUseNamePsd" style="document" />
<wsdl:input>
<soap:body use="literal" />
</wsdl:input>
@@ -18773,6 +18817,15 @@
<soap12:body use="literal" />
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="get_SaveMESCLOUDUseNamePsd">
+ <soap12:operation soapAction="http://tempuri.org/get_SaveMESCLOUDUseNamePsd" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:output>
+ <soap12:body use="literal" />
+ </wsdl:output>
+ </wsdl:operation>
<wsdl:operation name="CheckAllowBeforeSave">
<soap12:operation soapAction="http://tempuri.org/CheckAllowBeforeSave" style="document" />
<wsdl:input>
diff --git a/WebAPI/Web.config b/WebAPI/Web.config
index 763b182..44bc53f 100644
--- a/WebAPI/Web.config
+++ b/WebAPI/Web.config
@@ -19,7 +19,7 @@
<!--鏈嶅姟鍣ㄦ枃浠禝P鍦板潃-->
<!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->
<add key="FileIP" value="http://localhost:8080/"/>
- <add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>
+ <add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>
<add key="webpages:Version" value="3.0.0.0" />
<add key="webpages:Enabled" value="false" />
<add key="ClientValidationEnabled" value="true" />
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 6a874a7..0859ce4 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -263,10 +263,10 @@
<Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
<DependentUpon>Reference.map</DependentUpon>
</Content>
- <Content Include="Web References\WebS\Reference.map">
+ <None Include="Web References\WebS\Reference.map">
<Generator>MSDiscoCodeGenerator</Generator>
<LastGenOutput>Reference.cs</LastGenOutput>
- </Content>
+ </None>
<None Include="Web References\WebS\WebService1.disco" />
<Content Include="Web.config">
<SubType>Designer</SubType>
@@ -278,6 +278,7 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_ModelTypeController.cs" />
<Compile Include="Controllers\BaseSet\Gy_QCCheckClassController.cs" />
<Compile Include="Controllers\BaseSet\Gy_CheckItemController.cs" />
<Compile Include="Controllers\BaseSet\Gy_MaintenanceAcceptItemController.cs" />
@@ -325,6 +326,7 @@
<Compile Include="Controllers\PublicPageMethodController.cs" />
<Compile Include="Controllers\ReportFromController.cs" />
<Compile Include="Controllers\ReportPlatFormController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" />
<Compile Include="Controllers\Sc_MouldController.cs" />
<Compile Include="Controllers\Sc_GroupOrderBillController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index cf3390b..e034e8d 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -16,7 +16,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
- <ProjectView>ProjectFiles</ProjectView>
+ <ProjectView>ShowAllFiles</ProjectView>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
</PropertyGroup>
diff --git a/WorkM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/WorkM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/WorkM/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/WorkM/obj/Release/AxInterop.grdes6Lib.dll b/WorkM/obj/Release/AxInterop.grdes6Lib.dll
deleted file mode 100644
index a1ddf79..0000000
--- a/WorkM/obj/Release/AxInterop.grdes6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/AxInterop.gregn6Lib.dll b/WorkM/obj/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index fa12c42..0000000
--- a/WorkM/obj/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/AxInterop.grproLib.dll b/WorkM/obj/Release/AxInterop.grproLib.dll
deleted file mode 100644
index 459dd93..0000000
--- a/WorkM/obj/Release/AxInterop.grproLib.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/Interop.grdes6Lib.dll b/WorkM/obj/Release/Interop.grdes6Lib.dll
deleted file mode 100644
index aa420ea..0000000
--- a/WorkM/obj/Release/Interop.grdes6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/Interop.gregn6Lib.dll b/WorkM/obj/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index 9be13f3..0000000
--- a/WorkM/obj/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/Interop.grproLib.dll b/WorkM/obj/Release/Interop.grproLib.dll
deleted file mode 100644
index 4b8cfeb..0000000
--- a/WorkM/obj/Release/Interop.grproLib.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/OAM.Sc_PackDoubleBill.resources b/WorkM/obj/Release/OAM.Sc_PackDoubleBill.resources
deleted file mode 100644
index 75b5332..0000000
--- a/WorkM/obj/Release/OAM.Sc_PackDoubleBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/OAM.Sc_PackDoubleBillList.resources b/WorkM/obj/Release/OAM.Sc_PackDoubleBillList.resources
deleted file mode 100644
index e62461d..0000000
--- a/WorkM/obj/Release/OAM.Sc_PackDoubleBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/OAM.Sc_PackSplitBill.resources b/WorkM/obj/Release/OAM.Sc_PackSplitBill.resources
deleted file mode 100644
index 75b5332..0000000
--- a/WorkM/obj/Release/OAM.Sc_PackSplitBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/OAM.Sc_PackSplitBillList.resources b/WorkM/obj/Release/OAM.Sc_PackSplitBillList.resources
deleted file mode 100644
index e62461d..0000000
--- a/WorkM/obj/Release/OAM.Sc_PackSplitBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/PayM.Sb_EquipConkBookBill.resources b/WorkM/obj/Release/PayM.Sb_EquipConkBookBill.resources
deleted file mode 100644
index 6de4cfe..0000000
--- a/WorkM/obj/Release/PayM.Sb_EquipConkBookBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/PayM.Sb_EquipConkBookBillList.resources b/WorkM/obj/Release/PayM.Sb_EquipConkBookBillList.resources
deleted file mode 100644
index e62461d..0000000
--- a/WorkM/obj/Release/PayM.Sb_EquipConkBookBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/PayM.Sb_EquipRepairCheckBill.resources b/WorkM/obj/Release/PayM.Sb_EquipRepairCheckBill.resources
deleted file mode 100644
index 6713a95..0000000
--- a/WorkM/obj/Release/PayM.Sb_EquipRepairCheckBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/PayM.Sb_EquipRepairCheckBillList.resources b/WorkM/obj/Release/PayM.Sb_EquipRepairCheckBillList.resources
deleted file mode 100644
index e62461d..0000000
--- a/WorkM/obj/Release/PayM.Sb_EquipRepairCheckBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/PayM.Sb_EquipRepairSendWorkBill.resources b/WorkM/obj/Release/PayM.Sb_EquipRepairSendWorkBill.resources
deleted file mode 100644
index 5692dc1..0000000
--- a/WorkM/obj/Release/PayM.Sb_EquipRepairSendWorkBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/PayM.Sb_EquipRepairSendWorkBillList.resources b/WorkM/obj/Release/PayM.Sb_EquipRepairSendWorkBillList.resources
deleted file mode 100644
index e62461d..0000000
--- a/WorkM/obj/Release/PayM.Sb_EquipRepairSendWorkBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/PayM.Sc_MouldEntrustOutBill.resources b/WorkM/obj/Release/PayM.Sc_MouldEntrustOutBill.resources
deleted file mode 100644
index 934319e..0000000
--- a/WorkM/obj/Release/PayM.Sc_MouldEntrustOutBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/PayM.Sc_MouldEntrustOutBillList.resources b/WorkM/obj/Release/PayM.Sc_MouldEntrustOutBillList.resources
deleted file mode 100644
index 230d6dd..0000000
--- a/WorkM/obj/Release/PayM.Sc_MouldEntrustOutBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/PayM.Sc_MouldReportBill.resources b/WorkM/obj/Release/PayM.Sc_MouldReportBill.resources
deleted file mode 100644
index 51b6716..0000000
--- a/WorkM/obj/Release/PayM.Sc_MouldReportBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/PayM.Sc_MouldReportBillList.resources b/WorkM/obj/Release/PayM.Sc_MouldReportBillList.resources
deleted file mode 100644
index ddf04c4..0000000
--- a/WorkM/obj/Release/PayM.Sc_MouldReportBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/ResolveAssemblyReference.cache b/WorkM/obj/Release/ResolveAssemblyReference.cache
deleted file mode 100644
index 87967f3..0000000
--- a/WorkM/obj/Release/ResolveAssemblyReference.cache
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/WorkM/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
deleted file mode 100644
index 6673f0f..0000000
--- a/WorkM/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WarM.Sb_EquipRepairWorkBill.resources b/WorkM/obj/Release/WarM.Sb_EquipRepairWorkBill.resources
deleted file mode 100644
index 895330f..0000000
--- a/WorkM/obj/Release/WarM.Sb_EquipRepairWorkBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WarM.Sb_EquipRepairWorkBillList.resources b/WorkM/obj/Release/WarM.Sb_EquipRepairWorkBillList.resources
deleted file mode 100644
index e62461d..0000000
--- a/WorkM/obj/Release/WarM.Sb_EquipRepairWorkBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WarM.Sc_MonthSource.resources b/WorkM/obj/Release/WarM.Sc_MonthSource.resources
deleted file mode 100644
index 0488472..0000000
--- a/WorkM/obj/Release/WarM.Sc_MonthSource.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WarM.Sc_MonthSourceDlg.resources b/WorkM/obj/Release/WarM.Sc_MonthSourceDlg.resources
deleted file mode 100644
index a14d551..0000000
--- a/WorkM/obj/Release/WarM.Sc_MonthSourceDlg.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WarM.Sc_MouldCostMoneyBill.resources b/WorkM/obj/Release/WarM.Sc_MouldCostMoneyBill.resources
deleted file mode 100644
index 2ed131b..0000000
--- a/WorkM/obj/Release/WarM.Sc_MouldCostMoneyBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WarM.Sc_MouldCostMoneyBillList.resources b/WorkM/obj/Release/WarM.Sc_MouldCostMoneyBillList.resources
deleted file mode 100644
index e62461d..0000000
--- a/WorkM/obj/Release/WarM.Sc_MouldCostMoneyBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Kf_ProcInBill.resources b/WorkM/obj/Release/WorkM.Kf_ProcInBill.resources
deleted file mode 100644
index fe1619e..0000000
--- a/WorkM/obj/Release/WorkM.Kf_ProcInBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Kf_ProcInBillList.resources b/WorkM/obj/Release/WorkM.Kf_ProcInBillList.resources
deleted file mode 100644
index 65506c3..0000000
--- a/WorkM/obj/Release/WorkM.Kf_ProcInBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Kf_ProcOutBill.resources b/WorkM/obj/Release/WorkM.Kf_ProcOutBill.resources
deleted file mode 100644
index fe1619e..0000000
--- a/WorkM/obj/Release/WorkM.Kf_ProcOutBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Kf_ProcOutBillList.resources b/WorkM/obj/Release/WorkM.Kf_ProcOutBillList.resources
deleted file mode 100644
index 65506c3..0000000
--- a/WorkM/obj/Release/WorkM.Kf_ProcOutBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Properties.Resources.resources b/WorkM/obj/Release/WorkM.Properties.Resources.resources
deleted file mode 100644
index 06c24d0..0000000
--- a/WorkM/obj/Release/WorkM.Properties.Resources.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sb_EquipDotCheckBill.resources b/WorkM/obj/Release/WorkM.Sb_EquipDotCheckBill.resources
deleted file mode 100644
index 92d3569..0000000
--- a/WorkM/obj/Release/WorkM.Sb_EquipDotCheckBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sb_EquipDotCheckBillList.resources b/WorkM/obj/Release/WorkM.Sb_EquipDotCheckBillList.resources
deleted file mode 100644
index 184d2ed..0000000
--- a/WorkM/obj/Release/WorkM.Sb_EquipDotCheckBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sb_EquipDotCheckPlanBill.resources b/WorkM/obj/Release/WorkM.Sb_EquipDotCheckPlanBill.resources
deleted file mode 100644
index 92d3569..0000000
--- a/WorkM/obj/Release/WorkM.Sb_EquipDotCheckPlanBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sb_EquipDotCheckPlanBillList.resources b/WorkM/obj/Release/WorkM.Sb_EquipDotCheckPlanBillList.resources
deleted file mode 100644
index 184d2ed..0000000
--- a/WorkM/obj/Release/WorkM.Sb_EquipDotCheckPlanBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sb_EquipLubricateBill.resources b/WorkM/obj/Release/WorkM.Sb_EquipLubricateBill.resources
deleted file mode 100644
index 92d3569..0000000
--- a/WorkM/obj/Release/WorkM.Sb_EquipLubricateBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sb_EquipLubricateBillList.resources b/WorkM/obj/Release/WorkM.Sb_EquipLubricateBillList.resources
deleted file mode 100644
index 184d2ed..0000000
--- a/WorkM/obj/Release/WorkM.Sb_EquipLubricateBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sb_EquipLubricatePlanBill.resources b/WorkM/obj/Release/WorkM.Sb_EquipLubricatePlanBill.resources
deleted file mode 100644
index 92d3569..0000000
--- a/WorkM/obj/Release/WorkM.Sb_EquipLubricatePlanBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sb_EquipLubricatePlanBillList.resources b/WorkM/obj/Release/WorkM.Sb_EquipLubricatePlanBillList.resources
deleted file mode 100644
index 184d2ed..0000000
--- a/WorkM/obj/Release/WorkM.Sb_EquipLubricatePlanBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sb_EquipMaintainBill.resources b/WorkM/obj/Release/WorkM.Sb_EquipMaintainBill.resources
deleted file mode 100644
index 92d3569..0000000
--- a/WorkM/obj/Release/WorkM.Sb_EquipMaintainBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sb_EquipMaintainBillList.resources b/WorkM/obj/Release/WorkM.Sb_EquipMaintainBillList.resources
deleted file mode 100644
index 184d2ed..0000000
--- a/WorkM/obj/Release/WorkM.Sb_EquipMaintainBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sb_EquipMaintainPlanBill.resources b/WorkM/obj/Release/WorkM.Sb_EquipMaintainPlanBill.resources
deleted file mode 100644
index 92d3569..0000000
--- a/WorkM/obj/Release/WorkM.Sb_EquipMaintainPlanBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sb_EquipMaintainPlanBillList.resources b/WorkM/obj/Release/WorkM.Sb_EquipMaintainPlanBillList.resources
deleted file mode 100644
index 184d2ed..0000000
--- a/WorkM/obj/Release/WorkM.Sb_EquipMaintainPlanBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sb_EquipRepairRequestBill.resources b/WorkM/obj/Release/WorkM.Sb_EquipRepairRequestBill.resources
deleted file mode 100644
index 804a9d6..0000000
--- a/WorkM/obj/Release/WorkM.Sb_EquipRepairRequestBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sb_EquipRepairRequestBillList.resources b/WorkM/obj/Release/WorkM.Sb_EquipRepairRequestBillList.resources
deleted file mode 100644
index 184d2ed..0000000
--- a/WorkM/obj/Release/WorkM.Sb_EquipRepairRequestBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sb_MouldRepairWorkBill.resources b/WorkM/obj/Release/WorkM.Sb_MouldRepairWorkBill.resources
deleted file mode 100644
index 5a79b5d..0000000
--- a/WorkM/obj/Release/WorkM.Sb_MouldRepairWorkBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sb_MouldRepairWorkBillList.resources b/WorkM/obj/Release/WorkM.Sb_MouldRepairWorkBillList.resources
deleted file mode 100644
index 369dd7f..0000000
--- a/WorkM/obj/Release/WorkM.Sb_MouldRepairWorkBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_AssemblyBill.resources b/WorkM/obj/Release/WorkM.Sc_AssemblyBill.resources
deleted file mode 100644
index be8bcb7..0000000
--- a/WorkM/obj/Release/WorkM.Sc_AssemblyBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_AssemblyBillList.resources b/WorkM/obj/Release/WorkM.Sc_AssemblyBillList.resources
deleted file mode 100644
index 20d43f7..0000000
--- a/WorkM/obj/Release/WorkM.Sc_AssemblyBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ICMOBill.resources b/WorkM/obj/Release/WorkM.Sc_ICMOBill.resources
deleted file mode 100644
index b1e2703..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ICMOBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ICMOBillList.resources b/WorkM/obj/Release/WorkM.Sc_ICMOBillList.resources
deleted file mode 100644
index cafddfa..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ICMOBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ICMOBillList_K3.resources b/WorkM/obj/Release/WorkM.Sc_ICMOBillList_K3.resources
deleted file mode 100644
index dbbdc07..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ICMOBillList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ICMOBillList_K3Dlg.resources b/WorkM/obj/Release/WorkM.Sc_ICMOBillList_K3Dlg.resources
deleted file mode 100644
index 830bdb6..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ICMOBillList_K3Dlg.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ICMOBill_K3.resources b/WorkM/obj/Release/WorkM.Sc_ICMOBill_K3.resources
deleted file mode 100644
index 482eb29..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ICMOBill_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ICMOPauseBill.resources b/WorkM/obj/Release/WorkM.Sc_ICMOPauseBill.resources
deleted file mode 100644
index 76ab443..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ICMOPauseBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ICMOPauseBillList.resources b/WorkM/obj/Release/WorkM.Sc_ICMOPauseBillList.resources
deleted file mode 100644
index cafddfa..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ICMOPauseBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ICMOReportBill.resources b/WorkM/obj/Release/WorkM.Sc_ICMOReportBill.resources
deleted file mode 100644
index cd3591a..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ICMOReportBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ICMOReportBillList.resources b/WorkM/obj/Release/WorkM.Sc_ICMOReportBillList.resources
deleted file mode 100644
index 184d2ed..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ICMOReportBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MateWasterRequestBill.resources b/WorkM/obj/Release/WorkM.Sc_MateWasterRequestBill.resources
deleted file mode 100644
index 97a81a8..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MateWasterRequestBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MateWasterRequestBillList.resources b/WorkM/obj/Release/WorkM.Sc_MateWasterRequestBillList.resources
deleted file mode 100644
index 184d2ed..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MateWasterRequestBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldCost1.resources b/WorkM/obj/Release/WorkM.Sc_MouldCost1.resources
deleted file mode 100644
index 6555d82..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldCost1.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldCost2.resources b/WorkM/obj/Release/WorkM.Sc_MouldCost2.resources
deleted file mode 100644
index 5b8acf2..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldCost2.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldCost3.resources b/WorkM/obj/Release/WorkM.Sc_MouldCost3.resources
deleted file mode 100644
index 6555d82..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldCost3.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldCost4.resources b/WorkM/obj/Release/WorkM.Sc_MouldCost4.resources
deleted file mode 100644
index 6555d82..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldCost4.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldCost5.resources b/WorkM/obj/Release/WorkM.Sc_MouldCost5.resources
deleted file mode 100644
index 6555d82..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldCost5.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldCostList.resources b/WorkM/obj/Release/WorkM.Sc_MouldCostList.resources
deleted file mode 100644
index fdd084e..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldCostList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldDesignPlanBill.resources b/WorkM/obj/Release/WorkM.Sc_MouldDesignPlanBill.resources
deleted file mode 100644
index 682166c..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldDesignPlanBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldDesignPlanBillList.resources b/WorkM/obj/Release/WorkM.Sc_MouldDesignPlanBillList.resources
deleted file mode 100644
index 230d6dd..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldDesignPlanBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldDesignRequestBill.resources b/WorkM/obj/Release/WorkM.Sc_MouldDesignRequestBill.resources
deleted file mode 100644
index 85e0268..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldDesignRequestBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldDesignRequestBillList.resources b/WorkM/obj/Release/WorkM.Sc_MouldDesignRequestBillList.resources
deleted file mode 100644
index 230d6dd..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldDesignRequestBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldEntrustOutPlanBill.resources b/WorkM/obj/Release/WorkM.Sc_MouldEntrustOutPlanBill.resources
deleted file mode 100644
index 1c515d1..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldEntrustOutPlanBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldEntrustOutPlanBillList.resources b/WorkM/obj/Release/WorkM.Sc_MouldEntrustOutPlanBillList.resources
deleted file mode 100644
index 230d6dd..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldEntrustOutPlanBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldPlanBill.resources b/WorkM/obj/Release/WorkM.Sc_MouldPlanBill.resources
deleted file mode 100644
index e30c5c7..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldPlanBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldPlanBillList.resources b/WorkM/obj/Release/WorkM.Sc_MouldPlanBillList.resources
deleted file mode 100644
index 230d6dd..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldPlanBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldProdBackBill.resources b/WorkM/obj/Release/WorkM.Sc_MouldProdBackBill.resources
deleted file mode 100644
index 4617231..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldProdBackBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldProdBackBillList.resources b/WorkM/obj/Release/WorkM.Sc_MouldProdBackBillList.resources
deleted file mode 100644
index 230d6dd..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldProdBackBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldProdInBill.resources b/WorkM/obj/Release/WorkM.Sc_MouldProdInBill.resources
deleted file mode 100644
index 4617231..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldProdInBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldProdInBillList.resources b/WorkM/obj/Release/WorkM.Sc_MouldProdInBillList.resources
deleted file mode 100644
index 230d6dd..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldProdInBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldProdOutBill.resources b/WorkM/obj/Release/WorkM.Sc_MouldProdOutBill.resources
deleted file mode 100644
index 605996c..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldProdOutBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_MouldProdOutBillList.resources b/WorkM/obj/Release/WorkM.Sc_MouldProdOutBillList.resources
deleted file mode 100644
index d35f340..0000000
--- a/WorkM/obj/Release/WorkM.Sc_MouldProdOutBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_PPBomChangeList_K3.resources b/WorkM/obj/Release/WorkM.Sc_PPBomChangeList_K3.resources
deleted file mode 100644
index bd0c9a1..0000000
--- a/WorkM/obj/Release/WorkM.Sc_PPBomChangeList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_PPBomChange_K3.resources b/WorkM/obj/Release/WorkM.Sc_PPBomChange_K3.resources
deleted file mode 100644
index 8e24b29..0000000
--- a/WorkM/obj/Release/WorkM.Sc_PPBomChange_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_PPBomList_K3.resources b/WorkM/obj/Release/WorkM.Sc_PPBomList_K3.resources
deleted file mode 100644
index bd0c9a1..0000000
--- a/WorkM/obj/Release/WorkM.Sc_PPBomList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_PPBom_K3.resources b/WorkM/obj/Release/WorkM.Sc_PPBom_K3.resources
deleted file mode 100644
index 8e24b29..0000000
--- a/WorkM/obj/Release/WorkM.Sc_PPBom_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_PackUnionBill.resources b/WorkM/obj/Release/WorkM.Sc_PackUnionBill.resources
deleted file mode 100644
index 927774e..0000000
--- a/WorkM/obj/Release/WorkM.Sc_PackUnionBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_PackUnionBillList.resources b/WorkM/obj/Release/WorkM.Sc_PackUnionBillList.resources
deleted file mode 100644
index e62461d..0000000
--- a/WorkM/obj/Release/WorkM.Sc_PackUnionBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_PlanPriceBill.resources b/WorkM/obj/Release/WorkM.Sc_PlanPriceBill.resources
deleted file mode 100644
index de8d067..0000000
--- a/WorkM/obj/Release/WorkM.Sc_PlanPriceBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_PlanPriceBillList.resources b/WorkM/obj/Release/WorkM.Sc_PlanPriceBillList.resources
deleted file mode 100644
index cafddfa..0000000
--- a/WorkM/obj/Release/WorkM.Sc_PlanPriceBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ProcProdMoveBill.resources b/WorkM/obj/Release/WorkM.Sc_ProcProdMoveBill.resources
deleted file mode 100644
index 0bdbb4f..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ProcProdMoveBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ProcProdMoveBillList.resources b/WorkM/obj/Release/WorkM.Sc_ProcProdMoveBillList.resources
deleted file mode 100644
index 13e9766..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ProcProdMoveBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ProcProgressReport.resources b/WorkM/obj/Release/WorkM.Sc_ProcProgressReport.resources
deleted file mode 100644
index 0488472..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ProcProgressReport.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ProcProgressReportDlg.resources b/WorkM/obj/Release/WorkM.Sc_ProcProgressReportDlg.resources
deleted file mode 100644
index 21c1824..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ProcProgressReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ProcessBackPlan.resources b/WorkM/obj/Release/WorkM.Sc_ProcessBackPlan.resources
deleted file mode 100644
index fd3f0db..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ProcessBackPlan.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ProcessBackPlanList.resources b/WorkM/obj/Release/WorkM.Sc_ProcessBackPlanList.resources
deleted file mode 100644
index e62461d..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ProcessBackPlanList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ProcessMoveBill.resources b/WorkM/obj/Release/WorkM.Sc_ProcessMoveBill.resources
deleted file mode 100644
index 278da0b..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ProcessMoveBill.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ProcessMoveBillList.resources b/WorkM/obj/Release/WorkM.Sc_ProcessMoveBillList.resources
deleted file mode 100644
index 13e9766..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ProcessMoveBillList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ProcessPlan.resources b/WorkM/obj/Release/WorkM.Sc_ProcessPlan.resources
deleted file mode 100644
index 90a7e00..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ProcessPlan.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ProcessPlanChange.resources b/WorkM/obj/Release/WorkM.Sc_ProcessPlanChange.resources
deleted file mode 100644
index 90a7e00..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ProcessPlanChange.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ProcessPlanChangeList.resources b/WorkM/obj/Release/WorkM.Sc_ProcessPlanChangeList.resources
deleted file mode 100644
index e78cb9d..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ProcessPlanChangeList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ProcessPlanChangeSec.resources b/WorkM/obj/Release/WorkM.Sc_ProcessPlanChangeSec.resources
deleted file mode 100644
index 90a7e00..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ProcessPlanChangeSec.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ProcessPlanList.resources b/WorkM/obj/Release/WorkM.Sc_ProcessPlanList.resources
deleted file mode 100644
index 13e9766..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ProcessPlanList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ProcessReport.resources b/WorkM/obj/Release/WorkM.Sc_ProcessReport.resources
deleted file mode 100644
index 7d12fba..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ProcessReport.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ProcessReportList.resources b/WorkM/obj/Release/WorkM.Sc_ProcessReportList.resources
deleted file mode 100644
index f661cf8..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ProcessReportList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ProcessSendWork.resources b/WorkM/obj/Release/WorkM.Sc_ProcessSendWork.resources
deleted file mode 100644
index 90a5817..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ProcessSendWork.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_ProcessSendWorkList.resources b/WorkM/obj/Release/WorkM.Sc_ProcessSendWorkList.resources
deleted file mode 100644
index f661cf8..0000000
--- a/WorkM/obj/Release/WorkM.Sc_ProcessSendWorkList.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_RepairICMOBillList_K3.resources b/WorkM/obj/Release/WorkM.Sc_RepairICMOBillList_K3.resources
deleted file mode 100644
index dbbdc07..0000000
--- a/WorkM/obj/Release/WorkM.Sc_RepairICMOBillList_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_RepairICMOBill_K3.resources b/WorkM/obj/Release/WorkM.Sc_RepairICMOBill_K3.resources
deleted file mode 100644
index 482eb29..0000000
--- a/WorkM/obj/Release/WorkM.Sc_RepairICMOBill_K3.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_WorkBillReportDlg.resources b/WorkM/obj/Release/WorkM.Sc_WorkBillReportDlg.resources
deleted file mode 100644
index 21c1824..0000000
--- a/WorkM/obj/Release/WorkM.Sc_WorkBillReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_WorkDayReportDlg.resources b/WorkM/obj/Release/WorkM.Sc_WorkDayReportDlg.resources
deleted file mode 100644
index a14d551..0000000
--- a/WorkM/obj/Release/WorkM.Sc_WorkDayReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.Sc_WorkProcReportDlg.resources b/WorkM/obj/Release/WorkM.Sc_WorkProcReportDlg.resources
deleted file mode 100644
index c4f8119..0000000
--- a/WorkM/obj/Release/WorkM.Sc_WorkProcReportDlg.resources
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.csproj.GenerateResource.Cache b/WorkM/obj/Release/WorkM.csproj.GenerateResource.Cache
deleted file mode 100644
index 80f3cdd..0000000
--- a/WorkM/obj/Release/WorkM.csproj.GenerateResource.Cache
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.csproj.ResolveComReference.cache b/WorkM/obj/Release/WorkM.csproj.ResolveComReference.cache
deleted file mode 100644
index 529d88d..0000000
--- a/WorkM/obj/Release/WorkM.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.dll b/WorkM/obj/Release/WorkM.dll
deleted file mode 100644
index a87a7d5..0000000
--- a/WorkM/obj/Release/WorkM.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/Release/WorkM.pdb b/WorkM/obj/Release/WorkM.pdb
deleted file mode 100644
index 9c0158b..0000000
--- a/WorkM/obj/Release/WorkM.pdb
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs b/WorkM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
deleted file mode 100644
index 5d01041..0000000
--- a/WorkM/obj/x86/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-// <autogenerated />
-using System;
-using System.Reflection;
-[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
diff --git a/WorkM/obj/x86/Release/AxInterop.grdes6Lib.dll b/WorkM/obj/x86/Release/AxInterop.grdes6Lib.dll
deleted file mode 100644
index 0f135b3..0000000
--- a/WorkM/obj/x86/Release/AxInterop.grdes6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/x86/Release/AxInterop.gregn6Lib.dll b/WorkM/obj/x86/Release/AxInterop.gregn6Lib.dll
deleted file mode 100644
index d2d7d21..0000000
--- a/WorkM/obj/x86/Release/AxInterop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/x86/Release/Interop.grdes6Lib.dll b/WorkM/obj/x86/Release/Interop.grdes6Lib.dll
deleted file mode 100644
index 0497495..0000000
--- a/WorkM/obj/x86/Release/Interop.grdes6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/x86/Release/Interop.gregn6Lib.dll b/WorkM/obj/x86/Release/Interop.gregn6Lib.dll
deleted file mode 100644
index 4963439..0000000
--- a/WorkM/obj/x86/Release/Interop.gregn6Lib.dll
+++ /dev/null
Binary files differ
diff --git a/WorkM/obj/x86/Release/WorkM.csproj.ResolveComReference.cache b/WorkM/obj/x86/Release/WorkM.csproj.ResolveComReference.cache
deleted file mode 100644
index 529d88d..0000000
--- a/WorkM/obj/x86/Release/WorkM.csproj.ResolveComReference.cache
+++ /dev/null
Binary files differ
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.cs"
index 5c99205..66d0987 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.cs"
@@ -180,6 +180,10 @@
sDlgWhere = sDlgWhere + ",'" + dtpHEDate.Value.ToShortDateString() + " " + dtpHETime.Value.ToShortTimeString() + "'";
sDlgWhere = sDlgWhere + ",'" + txtHOrderProcNo.Text + "'";
sDlgWhere = sDlgWhere + ",'" + txtHMaterNumber.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + textHProcName.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + textHProcExchBillNo.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + textHEmpName.Text + "'";
+ sDlgWhere = sDlgWhere + ",'" + textHProjectNum.Text + "'";
if (sDlgWhere.Trim().Length > 0)
{
sDlgWhere = sDlgWhere.Substring(1, sDlgWhere.Length - 1);
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.designer.cs" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.designer.cs"
index c3e6dd2..8293ab8 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.designer.cs"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.designer.cs"
@@ -71,6 +71,14 @@
this.timer2 = new System.Windows.Forms.Timer(this.components);
this.grdMain = new System.Windows.Forms.DataGridView();
this.grdSum = new System.Windows.Forms.DataGridView();
+ this.textHProcName = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.textHProcExchBillNo = new System.Windows.Forms.TextBox();
+ this.label5 = new System.Windows.Forms.Label();
+ this.textHEmpName = new System.Windows.Forms.TextBox();
+ this.label6 = new System.Windows.Forms.Label();
+ this.textHProjectNum = new System.Windows.Forms.TextBox();
+ this.label7 = new System.Windows.Forms.Label();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
@@ -110,7 +118,7 @@
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(1432, 59);
+ this.Tool.Size = new System.Drawing.Size(1346, 47);
this.Tool.Stretch = true;
this.Tool.TabIndex = 16;
this.Tool.Text = "toolStrip1";
@@ -124,7 +132,7 @@
this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripDropDownButton1.Name = "toolStripDropDownButton1";
- this.toolStripDropDownButton1.Size = new System.Drawing.Size(53, 56);
+ this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 44);
this.toolStripDropDownButton1.Text = "寮曞嚭";
this.toolStripDropDownButton1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.toolStripDropDownButton1.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -132,14 +140,14 @@
// eXCELToolStripMenuItem
//
this.eXCELToolStripMenuItem.Name = "eXCELToolStripMenuItem";
- this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(128, 26);
+ this.eXCELToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
this.eXCELToolStripMenuItem.Text = "EXCEL";
this.eXCELToolStripMenuItem.Click += new System.EventHandler(this.eXCELToolStripMenuItem_Click);
//
// cSVToolStripMenuItem
//
this.cSVToolStripMenuItem.Name = "cSVToolStripMenuItem";
- this.cSVToolStripMenuItem.Size = new System.Drawing.Size(128, 26);
+ this.cSVToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
this.cSVToolStripMenuItem.Text = "CSV";
this.cSVToolStripMenuItem.Click += new System.EventHandler(this.cSVToolStripMenuItem_Click);
//
@@ -160,7 +168,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 47);
//
// dc
//
@@ -180,13 +188,13 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 47);
this.toolStripSeparator5.Visible = false;
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 47);
this.toolStripSeparator4.Visible = false;
//
// dy
@@ -251,7 +259,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 47);
//
// tc
//
@@ -270,13 +278,13 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 47);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 47);
//
// mrlk
//
@@ -286,7 +294,7 @@
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(73, 56);
+ this.mrlk.Size = new System.Drawing.Size(60, 44);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -296,7 +304,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 47);
//
// bclk
//
@@ -306,7 +314,7 @@
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(73, 56);
+ this.bclk.Size = new System.Drawing.Size(60, 44);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -316,13 +324,21 @@
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 59);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 47);
//
// pPic
//
this.pPic.BackColor = System.Drawing.Color.White;
this.pPic.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pPic.BackgroundImage")));
this.pPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+ this.pPic.Controls.Add(this.textHProjectNum);
+ this.pPic.Controls.Add(this.label7);
+ this.pPic.Controls.Add(this.textHEmpName);
+ this.pPic.Controls.Add(this.label6);
+ this.pPic.Controls.Add(this.textHProcExchBillNo);
+ this.pPic.Controls.Add(this.label5);
+ this.pPic.Controls.Add(this.textHProcName);
+ this.pPic.Controls.Add(this.label1);
this.pPic.Controls.Add(this.txtHMaterNumber);
this.pPic.Controls.Add(this.label9);
this.pPic.Controls.Add(this.txtHOrderProcNo);
@@ -339,74 +355,68 @@
this.pPic.Controls.Add(this.label4);
this.pPic.Controls.Add(this.lblCaption);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
- this.pPic.Location = new System.Drawing.Point(0, 59);
- this.pPic.Margin = new System.Windows.Forms.Padding(4);
+ this.pPic.Location = new System.Drawing.Point(0, 47);
this.pPic.Name = "pPic";
- this.pPic.Size = new System.Drawing.Size(1432, 69);
+ this.pPic.Size = new System.Drawing.Size(1346, 97);
this.pPic.TabIndex = 17;
//
// txtHMaterNumber
//
- this.txtHMaterNumber.Location = new System.Drawing.Point(1144, 7);
- this.txtHMaterNumber.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHMaterNumber.Location = new System.Drawing.Point(858, 6);
this.txtHMaterNumber.Name = "txtHMaterNumber";
- this.txtHMaterNumber.Size = new System.Drawing.Size(222, 25);
+ this.txtHMaterNumber.Size = new System.Drawing.Size(168, 21);
this.txtHMaterNumber.TabIndex = 96;
//
// label9
//
this.label9.AutoSize = true;
this.label9.BackColor = System.Drawing.Color.Transparent;
- this.label9.Location = new System.Drawing.Point(1074, 10);
- this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label9.Location = new System.Drawing.Point(806, 8);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(67, 15);
+ this.label9.Size = new System.Drawing.Size(53, 12);
this.label9.TabIndex = 95;
this.label9.Text = "鐗╂枡浠ｇ爜";
//
// txtHOrderProcNo
//
- this.txtHOrderProcNo.Location = new System.Drawing.Point(426, 38);
- this.txtHOrderProcNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHOrderProcNo.Location = new System.Drawing.Point(320, 30);
this.txtHOrderProcNo.Name = "txtHOrderProcNo";
- this.txtHOrderProcNo.Size = new System.Drawing.Size(160, 25);
+ this.txtHOrderProcNo.Size = new System.Drawing.Size(121, 21);
this.txtHOrderProcNo.TabIndex = 94;
//
// label8
//
this.label8.AutoSize = true;
this.label8.BackColor = System.Drawing.Color.Transparent;
- this.label8.Location = new System.Drawing.Point(336, 38);
- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label8.Location = new System.Drawing.Point(252, 30);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(82, 15);
+ this.label8.Size = new System.Drawing.Size(65, 12);
this.label8.TabIndex = 93;
this.label8.Text = "璁㈠崟璺熻釜鍙�";
//
// dtpHETime
//
this.dtpHETime.Format = System.Windows.Forms.DateTimePickerFormat.Time;
- this.dtpHETime.Location = new System.Drawing.Point(910, 37);
- this.dtpHETime.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHETime.Location = new System.Drawing.Point(682, 30);
this.dtpHETime.Name = "dtpHETime";
- this.dtpHETime.Size = new System.Drawing.Size(147, 25);
+ this.dtpHETime.Size = new System.Drawing.Size(111, 21);
this.dtpHETime.TabIndex = 92;
//
// dtpHBTime
//
this.dtpHBTime.Format = System.Windows.Forms.DateTimePickerFormat.Time;
- this.dtpHBTime.Location = new System.Drawing.Point(910, 5);
- this.dtpHBTime.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHBTime.Location = new System.Drawing.Point(682, 4);
this.dtpHBTime.Name = "dtpHBTime";
- this.dtpHBTime.Size = new System.Drawing.Size(147, 25);
+ this.dtpHBTime.Size = new System.Drawing.Size(111, 21);
this.dtpHBTime.TabIndex = 91;
//
// chkYestoday
//
this.chkYestoday.AutoSize = true;
- this.chkYestoday.Location = new System.Drawing.Point(613, 40);
+ this.chkYestoday.Location = new System.Drawing.Point(460, 32);
+ this.chkYestoday.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.chkYestoday.Name = "chkYestoday";
- this.chkYestoday.Size = new System.Drawing.Size(59, 19);
+ this.chkYestoday.Size = new System.Drawing.Size(48, 16);
this.chkYestoday.TabIndex = 90;
this.chkYestoday.Text = "鏄ㄦ棩";
this.chkYestoday.UseVisualStyleBackColor = true;
@@ -416,20 +426,18 @@
//
this.cmdHCenterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHCenterID.Image")));
this.cmdHCenterID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHCenterID.Location = new System.Drawing.Point(568, 4);
- this.cmdHCenterID.Margin = new System.Windows.Forms.Padding(4);
+ this.cmdHCenterID.Location = new System.Drawing.Point(426, 3);
this.cmdHCenterID.Name = "cmdHCenterID";
- this.cmdHCenterID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHCenterID.Size = new System.Drawing.Size(22, 22);
this.cmdHCenterID.TabIndex = 89;
this.cmdHCenterID.UseVisualStyleBackColor = true;
this.cmdHCenterID.Click += new System.EventHandler(this.cmdHCenterID_Click);
//
// txtHCenterID
//
- this.txtHCenterID.Location = new System.Drawing.Point(426, 5);
- this.txtHCenterID.Margin = new System.Windows.Forms.Padding(4);
+ this.txtHCenterID.Location = new System.Drawing.Point(320, 4);
this.txtHCenterID.Name = "txtHCenterID";
- this.txtHCenterID.Size = new System.Drawing.Size(143, 25);
+ this.txtHCenterID.Size = new System.Drawing.Size(108, 21);
this.txtHCenterID.TabIndex = 88;
this.txtHCenterID.WordWrap = false;
this.txtHCenterID.TextChanged += new System.EventHandler(this.txtHCenterID_TextChanged);
@@ -438,50 +446,45 @@
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Location = new System.Drawing.Point(350, 9);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(262, 7);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(67, 15);
+ this.label2.Size = new System.Drawing.Size(53, 12);
this.label2.TabIndex = 87;
this.label2.Text = "宸ヤ綔涓績";
//
// dtpHEDate
//
this.dtpHEDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHEDate.Location = new System.Drawing.Point(755, 37);
- this.dtpHEDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHEDate.Location = new System.Drawing.Point(566, 30);
this.dtpHEDate.Name = "dtpHEDate";
- this.dtpHEDate.Size = new System.Drawing.Size(147, 25);
+ this.dtpHEDate.Size = new System.Drawing.Size(111, 21);
this.dtpHEDate.TabIndex = 61;
//
// label3
//
this.label3.AutoSize = true;
this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Location = new System.Drawing.Point(679, 41);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(509, 33);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(67, 15);
+ this.label3.Size = new System.Drawing.Size(53, 12);
this.label3.TabIndex = 60;
this.label3.Text = "缁撴潫鏃ユ湡";
//
// dtpHBDate
//
this.dtpHBDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
- this.dtpHBDate.Location = new System.Drawing.Point(755, 4);
- this.dtpHBDate.Margin = new System.Windows.Forms.Padding(4);
+ this.dtpHBDate.Location = new System.Drawing.Point(566, 3);
this.dtpHBDate.Name = "dtpHBDate";
- this.dtpHBDate.Size = new System.Drawing.Size(147, 25);
+ this.dtpHBDate.Size = new System.Drawing.Size(111, 21);
this.dtpHBDate.TabIndex = 59;
//
// label4
//
this.label4.AutoSize = true;
this.label4.BackColor = System.Drawing.Color.Transparent;
- this.label4.Location = new System.Drawing.Point(679, 8);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(509, 6);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(67, 15);
+ this.label4.Size = new System.Drawing.Size(53, 12);
this.label4.TabIndex = 58;
this.label4.Text = "寮�濮嬫棩鏈�";
//
@@ -491,10 +494,9 @@
this.lblCaption.BackColor = System.Drawing.Color.Transparent;
this.lblCaption.Cursor = System.Windows.Forms.Cursors.No;
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(16, 20);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Location = new System.Drawing.Point(12, 16);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(179, 24);
+ this.lblCaption.Size = new System.Drawing.Size(152, 19);
this.lblCaption.TabIndex = 4;
this.lblCaption.Text = "ReportTemplet";
//
@@ -509,12 +511,11 @@
this.grdMain.BackgroundColor = System.Drawing.Color.White;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(0, 128);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(0, 144);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1432, 414);
+ this.grdMain.Size = new System.Drawing.Size(1346, 290);
this.grdMain.TabIndex = 54;
this.grdMain.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.grdMain_CellMouseUp);
this.grdMain.ColumnWidthChanged += new System.Windows.Forms.DataGridViewColumnEventHandler(this.grdMain_ColumnWidthChanged);
@@ -529,26 +530,92 @@
this.grdSum.BackgroundColor = System.Drawing.SystemColors.Control;
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.grdSum.Location = new System.Drawing.Point(0, 542);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4);
+ this.grdSum.Location = new System.Drawing.Point(0, 434);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowTemplate.Height = 23;
this.grdSum.ScrollBars = System.Windows.Forms.ScrollBars.None;
- this.grdSum.Size = new System.Drawing.Size(1432, 24);
+ this.grdSum.Size = new System.Drawing.Size(1346, 19);
this.grdSum.TabIndex = 55;
+ //
+ // textHProcName
+ //
+ this.textHProcName.Location = new System.Drawing.Point(858, 31);
+ this.textHProcName.Name = "textHProcName";
+ this.textHProcName.Size = new System.Drawing.Size(168, 21);
+ this.textHProcName.TabIndex = 98;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.BackColor = System.Drawing.Color.Transparent;
+ this.label1.Location = new System.Drawing.Point(810, 37);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(29, 12);
+ this.label1.TabIndex = 97;
+ this.label1.Text = "宸ュ簭";
+ //
+ // textHProcExchBillNo
+ //
+ this.textHProcExchBillNo.Location = new System.Drawing.Point(320, 60);
+ this.textHProcExchBillNo.Name = "textHProcExchBillNo";
+ this.textHProcExchBillNo.Size = new System.Drawing.Size(168, 21);
+ this.textHProcExchBillNo.TabIndex = 100;
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.BackColor = System.Drawing.Color.Transparent;
+ this.label5.Location = new System.Drawing.Point(253, 64);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(65, 12);
+ this.label5.TabIndex = 99;
+ this.label5.Text = "宸ュ簭娴佽浆鍗�";
+ //
+ // textHEmpName
+ //
+ this.textHEmpName.Location = new System.Drawing.Point(566, 60);
+ this.textHEmpName.Name = "textHEmpName";
+ this.textHEmpName.Size = new System.Drawing.Size(168, 21);
+ this.textHEmpName.TabIndex = 102;
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.BackColor = System.Drawing.Color.Transparent;
+ this.label6.Location = new System.Drawing.Point(525, 65);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(29, 12);
+ this.label6.TabIndex = 101;
+ this.label6.Text = "鑱屽憳";
+ //
+ // textHProjectNum
+ //
+ this.textHProjectNum.Location = new System.Drawing.Point(858, 60);
+ this.textHProjectNum.Name = "textHProjectNum";
+ this.textHProjectNum.Size = new System.Drawing.Size(168, 21);
+ this.textHProjectNum.TabIndex = 104;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.BackColor = System.Drawing.Color.Transparent;
+ this.label7.Location = new System.Drawing.Point(806, 64);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(41, 12);
+ this.label7.TabIndex = 103;
+ this.label7.Text = "椤圭洰鍙�";
//
// Sc_StationOutSumReport
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1432, 566);
+ this.ClientSize = new System.Drawing.Size(1346, 453);
this.Controls.Add(this.grdMain);
this.Controls.Add(this.grdSum);
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
this.KeyPreview = true;
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Sc_StationOutSumReport";
this.Text = "ReportTemplet";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -608,5 +675,13 @@
public System.Windows.Forms.TextBox txtHMaterNumber;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.ToolStripButton toolStripButton1;
+ public System.Windows.Forms.TextBox textHProjectNum;
+ private System.Windows.Forms.Label label7;
+ public System.Windows.Forms.TextBox textHEmpName;
+ private System.Windows.Forms.Label label6;
+ public System.Windows.Forms.TextBox textHProcExchBillNo;
+ private System.Windows.Forms.Label label5;
+ public System.Windows.Forms.TextBox textHProcName;
+ private System.Windows.Forms.Label label1;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.resx" "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.resx"
index 9f63122..c623f5e 100644
--- "a/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.resx"
+++ "b/WorkM/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_StationOutSumReport.resx"
@@ -256,7 +256,7 @@
<data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE6SURBVDhPY0hOnvOfEgw2AAY6OjqA5Jn/v78f+P/tzYb/
7+/P+f/iUsf/x8fK/t/Zmfz/2hr//xcW2v9PS0v7f+DAgf8MDAwIA2aeAWqdaYxiwDuoAY9gBqwFGWD3
v9AbqBGkGZ8BX1+vh7sAZMDdXSAXBIBdADIgNWMh8QY8PlYO9QLCgDR8BvwBewFiwMtLnfAwuAoNA4IG
QMIAZMBsoAGIMLhKrAvAXkByAaoBkEBMzcRiwPTjv8CShHBmwYr/abgMmHzgy//+7W/+d657/L91ya3/
@@ -268,7 +268,7 @@
<data name="cx.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFOSURBVDhPnZBPK0RRGIfvxkL5Dha+gLK0tsRGkY3dkK2w
UjJbCzQWk5EFRslEiUwZFNLo+lMaxWCIIUXIQhYzj/edc28NHUzzq1/v7Z7zPOee6/ybgMu3lhwP6NrO
F9q6blqaSDaETnOs3UIiCx2bUBuDmjmojpr5t0QWZ9KQfJSNkll5roxAxQRUTZn+LvBOH0vBQgbidzB0
KF+wCA1xaEyYqbVLPEG/CwMC9iShbQu69yEo0uFzM7V2QV2Y2E2e4Al07kGL3L/3CEKXsCRXSryaOZ3J
@@ -280,7 +280,7 @@
<data name="dc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -294,7 +294,7 @@
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGYSURBVDhPjYzPK8NxHMY//4uUyxycODhxkIOaRSiSA3Eg
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGYSURBVDhPjYzPK8NxHMY//4uUyxycODhxkIOaRSiSA3Eg
sbY1hi22Iptt5ecmuQgXxcWvFGojuXDy66AUyo9p9t2wx/f5pC9l+/LU06dP79frET/jCc7B5QvB6Z3R
6vLNwB0IIzi7hC8se/pHJpAp/rFD+f45Ynf7JfiRTmtlvN6IfBndEYtzVEKpt3etnAiFt2Gsa0J1Qwt6
PcHsA10Ojxx4VVJaE8kU3j/SuHuIIXp8Crc/nH3AbOuTA89xBbF48ruvSbyoZcw2x++BqdA8xDTQbemR
@@ -307,7 +307,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHXSURBVDhPjZJNSBtRFIUH3Ke4aiHVTRd2V7B7EXGhriyu
ao0ImqppU39qSFVMtVZLrfQXFMlKFy4KbaXQTao7Cd1U3VSyFFQIqNXYZDKZTHJ8976ZTEZD6AcnL+/e
e857A08p5uX7MEgv3i4h9GYRE3MLJUW9sdlPMG0SKhCvP4Z5/R8cIVYA0dk/AkOsKT1fUmpWzvkCz+2A
4PQ7WRW0tnvR5unFvQ7vFVH9fvdjdPYNoccftANGJufZbOTyvJZjdOaD8/uJ4dAcNzO6ga3dPezEbNFe
@@ -321,7 +321,7 @@
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -334,7 +334,7 @@
<data name="view.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -347,7 +347,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -357,7 +357,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -372,7 +372,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
index 8c3ea7e..5b15b03 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.cs"
@@ -102,6 +102,9 @@
public const Int16 HTechnologyParameterCol = 76;
public const Int16 HPicNumCol = 77;
public const Int16 HProcCheckNoteCol = 78;
+ public const Int16 HMouldNoCol = 79;
+ public const Int16 HProcWorkNumCol = 80;
+ public const Int16 HICMOEntryIDCol = 81;
@@ -775,6 +778,7 @@
xyz.Enabled = true;
mz.Enabled = true;
tc.Enabled = true;
+ fz.Enabled = false;
//redblue.Enabled = false;
//鏈鏍�
if (txtHChecker.Text.Trim() == "")
@@ -895,6 +899,7 @@
xyz.Enabled = false;
mz.Enabled = false;
tc.Enabled = true;
+ fz.Enabled = true;
Sub_LrtextStatus(true);
grdStatus = true;
//redblue.Enabled = true;
@@ -1053,6 +1058,11 @@
this.txtHOrderProcNO.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HOrderProcNO);
this.txtHMateOutBatchNo.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HMateOutBatchNo);
this.txtHProjectNum.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HProjectNum);
+ this.textHPicNumVer.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HPicNumVer);
+ this.textHPicNumAssemble.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HPicNumAssemble);
+ this.textHMaterTexture.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HMaterTexture);
+ this.textHProductNum.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HProductNum);
+ this.textHVerNum.Text = DBUtility.ClsPub.isStrNull(BillOld.omodel.HVerNum);
//鍔犺浇琛ㄤ綋
initGrid();
int i = 0;
@@ -1077,6 +1087,8 @@
grdMain.Rows[i].Cells[HRelationQty_WWOrderCol].Value = oSub.HRelationQty_WWOrder.ToString();
grdMain.Rows[i].Cells[HRelationQty_BadCol].Value = oSub.HRelationQty_Bad.ToString();
grdMain.Rows[i].Cells[HRelationMoneyCol].Value = oSub.HRelationMoney.ToString();
+ grdMain.Rows[i].Cells[HMouldNoCol].Value = oSub.HMouldNo.ToString();
+ grdMain.Rows[i].Cells[HProcWorkNumCol].Value = oSub.HProcWorkNum.ToString();
//======================================================================================
//
grdMain.Rows[i].Cells[HProcIDCol].Value = oSub.HProcID.ToString();
@@ -1206,6 +1218,7 @@
//
grdMain.Rows[i].Cells[HICMOBillNoCol].Value = oSub.HICMOBillNo;
grdMain.Rows[i].Cells[HICMOInterIDCol].Value = oSub.HICMOInterID.ToString();
+ grdMain.Rows[i].Cells[HICMOEntryIDCol].Value = oSub.HICMOEntryID.ToString();
grdMain.Rows[i].Cells[HSeOrderBillNoCol].Value = oSub.HSeOrderBillNo;
grdMain.Rows[i].Cells[HSeOrderInterIDCol].Value = oSub.HSeOrderInterID.ToString();
grdMain.Rows[i].Cells[HSeOrderEntryIDCol].Value = oSub.HSeOrderEntryID.ToString();
@@ -1305,6 +1318,8 @@
}
return true;
}
+
+
//淇濆瓨鍗曟嵁
private bool Sub_SaveBill()
{
@@ -1398,6 +1413,12 @@
BillNew.omodel.HMaterIDB = ClsPub.isStrNull(this.txtHMaterIDB.Text);
BillNew.omodel.HMaterIDC = ClsPub.isStrNull(this.txtHMaterIDC.Text);
BillNew.omodel.HMaterIDD = ClsPub.isStrNull(this.txtHMaterIDD.Text);
+ //===================
+ BillNew.omodel.HPicNumVer = ClsPub.isStrNull(this.textHPicNumVer.Text);
+ BillNew.omodel.HPicNumAssemble = ClsPub.isStrNull(this.textHPicNumAssemble.Text);
+ BillNew.omodel.HMaterTexture = ClsPub.isStrNull(this.textHMaterTexture.Text);
+ BillNew.omodel.HProductNum = ClsPub.isStrNull(this.textHProductNum.Text);
+ BillNew.omodel.HVerNum = ClsPub.isStrNull(this.textHVerNum.Text);
//鑾峰彇鏈�澶ц鍙�
int MaxRowNo = 0;
for (int n = 0; n < grdMain.Rows.Count; n++)
@@ -1523,6 +1544,7 @@
}
oSub.HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HICMOBillNoCol].Value);
oSub.HICMOInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HICMOInterIDCol].Value);
+ oSub.HICMOEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HICMOEntryIDCol].Value);
oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSeOrderInterIDCol].Value);
oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSeOrderEntryIDCol].Value);
oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HSeOrderBillNoCol].Value);
@@ -1536,6 +1558,8 @@
oSub.HTechnologyParameter = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HTechnologyParameterCol].Value);
oSub.HPicNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HPicNumCol].Value);
oSub.HProcCheckNote = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcCheckNoteCol].Value);
+ oSub.HMouldNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HMouldNoCol].Value);
+ oSub.HProcWorkNum = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HProcWorkNumCol].Value);
BillNew.DetailColl.Add(oSub);
}
}
@@ -1582,7 +1606,7 @@
{
//
- grdMain.ColumnCount = 79; //鎬诲垪鏁�
+ grdMain.ColumnCount = 82; //鎬诲垪鏁�
DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
//
grdMain.RowsDefaultCellStyle.WrapMode = DataGridViewTriState.True;
@@ -1648,6 +1672,7 @@
grdMain.Columns[HICMOBillNoCol].HeaderText = "鐢熶骇璁㈠崟鍙�";
grdMain.Columns[HICMOInterIDCol].HeaderText = "鐢熶骇璁㈠崟涓诲唴鐮�";
+ grdMain.Columns[HICMOEntryIDCol].HeaderText = "鐢熶骇璁㈠崟瀛愬唴鐮�";
grdMain.Columns[HSeOrderInterIDCol].HeaderText = "閿�鍞鍗曚富鍐呯爜";
grdMain.Columns[HSeOrderEntryIDCol].HeaderText = "閿�鍞鍗曞瓙鍐呯爜";
grdMain.Columns[HSeOrderBillNoCol].HeaderText = "閿�鍞鍗曞崟鍙�";
@@ -1659,6 +1684,8 @@
grdMain.Columns[HTechnologyParameterCol].HeaderText = "宸ヨ壓鍙傛暟";
grdMain.Columns[HPicNumCol].HeaderText = "鍥剧焊缂栧彿";
grdMain.Columns[HProcCheckNoteCol].HeaderText = "鏈伐搴忕‘璁よ褰�";
+ grdMain.Columns[HMouldNoCol].HeaderText = "妯″叿缂栧彿";
+ grdMain.Columns[HProcWorkNumCol].HeaderText = "绋嬪簭鍙�";
// grdMain.Columns[HKeyProcCol].HeaderText = "鍏抽敭宸ュ簭";
grdMain.Columns[HKeyProcCol].Visible = false;
////鍥哄畾璧嬪��=====================================================
@@ -1707,6 +1734,7 @@
grdMain.Columns[HTagCol].Visible = false;
grdMain.Columns[HWorkerIDCol].Visible = false;
grdMain.Columns[HICMOInterIDCol].Visible = false;
+ grdMain.Columns[HICMOEntryIDCol].Visible = false;
grdMain.Columns[HOutMoneyCol].Visible = false;
grdMain.Columns[HSourceIDCol].Visible = false;
//grdMain.Columns[HEntryIDCol].Visible = false;
@@ -1813,6 +1841,8 @@
"," + HLastProcCol.ToString() +
"," + HFstProcCol.ToString() +
"," + HRemarkCol.ToString() +
+ "," + HMouldNoCol.ToString() +
+ "," + HProcWorkNumCol.ToString() +
"," + HSupNameCol +
"," + HSupFlagCol;
//璁剧疆鍚堣鍒�
@@ -3406,6 +3436,11 @@
txtHCusName.Text = oTable.Rows[row]["瀹㈡埛鍚嶇О"].ToString();
txtHWorkRemark.Text = oTable.Rows[row]["鐢熶骇澶囨敞"].ToString();
txtHImportNote.Text = oTable.Rows[row]["閲嶈鎻愮ず"].ToString();
+ textHPicNumVer.Text = oTable.Rows[row]["鍥惧彿鐗堟湰"].ToString();
+ textHPicNumAssemble.Text = oTable.Rows[row]["鎬昏鍥惧彿"].ToString();
+ textHMaterTexture.Text = oTable.Rows[row]["鏉愯川"].ToString();
+ textHProductNum.Text = oTable.Rows[row]["鎴愬搧缂栧彿"].ToString();
+ textHVerNum.Text = oTable.Rows[row]["鐗堟湰"].ToString();
// txtHWorkTypeID.Text = oTable.Rows[row]["鐢熶骇杞﹂棿鍚嶇О"].ToString();
@@ -3479,6 +3514,7 @@
//
grdMain.Rows[i].Cells[HICMOBillNoCol].Value = oTable.Rows[i]["鐢熶骇璁㈠崟鍙�"].ToString();
grdMain.Rows[i].Cells[HICMOInterIDCol].Value = oTable.Rows[i]["hmainid"].ToString();
+ grdMain.Rows[i].Cells[HICMOEntryIDCol].Value = oTable.Rows[i]["HEntryID"].ToString();
grdMain.Rows[i].Cells[HSourceInterIDCol].Value = oTable.Rows[i]["hmainid"].ToString();
grdMain.Rows[i].Cells[HSourceEntryIDCol].Value = oTable.Rows[i]["HEntryID"].ToString();
grdMain.Rows[i].Cells[HSourceBillTypeCol].Value = oTable.Rows[i]["HBillType"].ToString();
@@ -3490,6 +3526,8 @@
grdMain.Rows[i].Cells[HProcCheckNoteCol].Value = oTable.Rows[i]["鏈伐搴忕‘璁よ褰�"].ToString();
grdMain.Rows[i].Cells[HOverRateCol].Value = oTable.Rows[i]["瓒呴姣斾緥"].ToString();
grdMain.Rows[i].Cells[HMaxQtyCol].Value = oTable.Rows[i]["鏈�楂樹笂闄�"].ToString();
+ grdMain.Rows[i].Cells[HMouldNoCol].Value = oTable.Rows[i]["妯″叿缂栧彿"].ToString();
+ grdMain.Rows[i].Cells[HProcWorkNumCol].Value = oTable.Rows[i]["绋嬪簭鍙�"].ToString();
}
Sub_CountProcExchQty();
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.designer.cs"
index 0418241..91b7ee3 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.designer.cs"
@@ -38,6 +38,7 @@
this.xz = new System.Windows.Forms.ToolStripButton();
this.xg = new System.Windows.Forms.ToolStripButton();
this.sc = new System.Windows.Forms.ToolStripButton();
+ this.fz = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.AddRow = new System.Windows.Forms.ToolStripButton();
this.DelRow = new System.Windows.Forms.ToolStripButton();
@@ -63,6 +64,7 @@
this.浣滃簾ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.鎾ら攢浣滃簾ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
+ this.闅愯棌鍒楄缃甌oolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.tc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
@@ -77,6 +79,15 @@
this.tabControl2 = new System.Windows.Forms.TabControl();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.gbUp = new System.Windows.Forms.GroupBox();
+ this.textHProductNum = new System.Windows.Forms.TextBox();
+ this.textHMaterTexture = new System.Windows.Forms.TextBox();
+ this.label62 = new System.Windows.Forms.Label();
+ this.textHVerNum = new System.Windows.Forms.TextBox();
+ this.label63 = new System.Windows.Forms.Label();
+ this.label64 = new System.Windows.Forms.Label();
+ this.label65 = new System.Windows.Forms.Label();
+ this.textHPicNumAssemble = new System.Windows.Forms.TextBox();
+ this.label66 = new System.Windows.Forms.Label();
this.label42 = new System.Windows.Forms.Label();
this.txtHProjectNum = new System.Windows.Forms.TextBox();
this.cmdEquipMentID = new System.Windows.Forms.Button();
@@ -224,7 +235,7 @@
this.grdSum = new System.Windows.Forms.DataGridView();
this.panel6 = new System.Windows.Forms.Panel();
this.lblHStockQty = new System.Windows.Forms.Label();
- this.闅愯棌鍒楄缃甌oolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.textHPicNumVer = new System.Windows.Forms.TextBox();
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
this.tabControl2.SuspendLayout();
@@ -256,6 +267,7 @@
this.xz,
this.xg,
this.sc,
+ this.fz,
this.toolStripSeparator8,
this.AddRow,
this.DelRow,
@@ -284,7 +296,7 @@
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(1356, 62);
+ this.Tool.Size = new System.Drawing.Size(1348, 50);
this.Tool.Stretch = true;
this.Tool.TabIndex = 17;
this.Tool.Text = "toolStrip1";
@@ -334,7 +346,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
//
// xz
//
@@ -380,10 +392,24 @@
this.sc.Visible = false;
this.sc.Click += new System.EventHandler(this.sc_Click);
//
+ // fz
+ //
+ this.fz.AutoSize = false;
+ this.fz.Image = ((System.Drawing.Image)(resources.GetObject("fz.Image")));
+ this.fz.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fz.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.fz.ImageTransparentColor = System.Drawing.Color.White;
+ this.fz.Name = "fz";
+ this.fz.Size = new System.Drawing.Size(35, 47);
+ this.fz.Text = "澶嶅埗";
+ this.fz.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.fz.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.fz.Click += new System.EventHandler(this.fz_Click);
+ //
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
//
// AddRow
//
@@ -416,7 +442,7 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
- this.toolStripSeparator4.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
//
// bc
//
@@ -449,7 +475,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
this.toolStripSeparator5.Visible = false;
//
// sh
@@ -485,7 +511,7 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
//
// sz
//
@@ -550,7 +576,7 @@
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
this.toolStripSeparator6.Visible = false;
//
// qt
@@ -571,7 +597,7 @@
this.qt.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.qt.ImageTransparentColor = System.Drawing.Color.White;
this.qt.Name = "qt";
- this.qt.Size = new System.Drawing.Size(53, 59);
+ this.qt.Size = new System.Drawing.Size(45, 47);
this.qt.Text = "鍏朵粬";
this.qt.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.qt.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -579,64 +605,71 @@
// 鍏抽棴ToolStripMenuItem
//
this.鍏抽棴ToolStripMenuItem.Name = "鍏抽棴ToolStripMenuItem";
- this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
+ this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
this.鍏抽棴ToolStripMenuItem.Text = "鍏抽棴";
this.鍏抽棴ToolStripMenuItem.Click += new System.EventHandler(this.鍏抽棴ToolStripMenuItem_Click);
//
// 鍙嶅叧闂璗oolStripMenuItem
//
this.鍙嶅叧闂璗oolStripMenuItem.Name = "鍙嶅叧闂璗oolStripMenuItem";
- this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(224, 26);
+ this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(136, 22);
this.鍙嶅叧闂璗oolStripMenuItem.Text = "鍙嶅叧闂�";
this.鍙嶅叧闂璗oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅叧闂璗oolStripMenuItem_Click);
//
// toolStripSeparator15
//
this.toolStripSeparator15.Name = "toolStripSeparator15";
- this.toolStripSeparator15.Size = new System.Drawing.Size(221, 6);
+ this.toolStripSeparator15.Size = new System.Drawing.Size(133, 6);
//
// 瀹℃牳ToolStripMenuItem
//
this.瀹℃牳ToolStripMenuItem.Name = "瀹℃牳ToolStripMenuItem";
- this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
+ this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
this.瀹℃牳ToolStripMenuItem.Text = "瀹℃牳";
this.瀹℃牳ToolStripMenuItem.Click += new System.EventHandler(this.瀹℃牳ToolStripMenuItem_Click);
//
// 鍙嶅鏍窽oolStripMenuItem
//
this.鍙嶅鏍窽oolStripMenuItem.Name = "鍙嶅鏍窽oolStripMenuItem";
- this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(224, 26);
+ this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(136, 22);
this.鍙嶅鏍窽oolStripMenuItem.Text = "鍙嶅鏍�";
this.鍙嶅鏍窽oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅鏍窽oolStripMenuItem_Click);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
- this.toolStripSeparator14.Size = new System.Drawing.Size(221, 6);
+ this.toolStripSeparator14.Size = new System.Drawing.Size(133, 6);
//
// 浣滃簾ToolStripMenuItem
//
this.浣滃簾ToolStripMenuItem.Name = "浣滃簾ToolStripMenuItem";
- this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
+ this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
this.浣滃簾ToolStripMenuItem.Text = "浣滃簾";
this.浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.浣滃簾ToolStripMenuItem_Click);
//
// 鎾ら攢浣滃簾ToolStripMenuItem
//
this.鎾ら攢浣滃簾ToolStripMenuItem.Name = "鎾ら攢浣滃簾ToolStripMenuItem";
- this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
+ this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
this.鎾ら攢浣滃簾ToolStripMenuItem.Text = "鎾ら攢浣滃簾";
this.鎾ら攢浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.鎾ら攢浣滃簾ToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
- this.toolStripMenuItem1.Size = new System.Drawing.Size(221, 6);
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(133, 6);
+ //
+ // 闅愯棌鍒楄缃甌oolStripMenuItem
+ //
+ this.闅愯棌鍒楄缃甌oolStripMenuItem.Name = "闅愯棌鍒楄缃甌oolStripMenuItem";
+ this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(136, 22);
+ this.闅愯棌鍒楄缃甌oolStripMenuItem.Text = "闅愯棌鍒楄缃�";
+ this.闅愯棌鍒楄缃甌oolStripMenuItem.Click += new System.EventHandler(this.闅愯棌鍒楄缃甌oolStripMenuItem_Click_1);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
//
// tc
//
@@ -656,7 +689,7 @@
//
this.toolStripSeparator12.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator12.Name = "toolStripSeparator12";
- this.toolStripSeparator12.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator12.Size = new System.Drawing.Size(6, 50);
//
// yc
//
@@ -666,7 +699,7 @@
this.yc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.yc.ImageTransparentColor = System.Drawing.Color.White;
this.yc.Name = "yc";
- this.yc.Size = new System.Drawing.Size(58, 59);
+ this.yc.Size = new System.Drawing.Size(48, 47);
this.yc.Text = "闅愯棌鍒�";
this.yc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.yc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -677,7 +710,7 @@
//
this.toolStripSeparator13.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator13.Name = "toolStripSeparator13";
- this.toolStripSeparator13.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator13.Size = new System.Drawing.Size(6, 50);
//
// mrlk
//
@@ -687,7 +720,7 @@
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(73, 59);
+ this.mrlk.Size = new System.Drawing.Size(60, 47);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -697,7 +730,7 @@
//
this.toolStripSeparator11.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator11.Name = "toolStripSeparator11";
- this.toolStripSeparator11.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator11.Size = new System.Drawing.Size(6, 50);
//
// bclk
//
@@ -707,7 +740,7 @@
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(73, 59);
+ this.bclk.Size = new System.Drawing.Size(60, 47);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -717,16 +750,15 @@
//
this.toolStripSeparator10.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator10.Name = "toolStripSeparator10";
- this.toolStripSeparator10.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator10.Size = new System.Drawing.Size(6, 50);
//
// lblCaption
//
this.lblCaption.Dock = System.Windows.Forms.DockStyle.Top;
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(0, 0);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(1249, 42);
+ this.lblCaption.Size = new System.Drawing.Size(1268, 34);
this.lblCaption.TabIndex = 18;
this.lblCaption.Text = "鍗曟嵁缂栬緫";
this.lblCaption.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -738,10 +770,9 @@
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(55, 62);
- this.P1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.P1.Location = new System.Drawing.Point(41, 50);
this.P1.Name = "P1";
- this.P1.Size = new System.Drawing.Size(1249, 318);
+ this.P1.Size = new System.Drawing.Size(1268, 254);
this.P1.TabIndex = 31;
//
// tabControl2
@@ -750,21 +781,21 @@
this.tabControl2.Controls.Add(this.tabPage3);
this.tabControl2.Controls.Add(this.tabPage4);
this.tabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl2.Location = new System.Drawing.Point(0, 42);
- this.tabControl2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tabControl2.Location = new System.Drawing.Point(0, 34);
+ this.tabControl2.Margin = new System.Windows.Forms.Padding(2);
this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0;
- this.tabControl2.Size = new System.Drawing.Size(1249, 276);
+ this.tabControl2.Size = new System.Drawing.Size(1268, 220);
this.tabControl2.TabIndex = 310;
//
// tabPage2
//
this.tabPage2.Controls.Add(this.gbUp);
- this.tabPage2.Location = new System.Drawing.Point(4, 25);
- this.tabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tabPage2.Location = new System.Drawing.Point(4, 22);
+ this.tabPage2.Margin = new System.Windows.Forms.Padding(2);
this.tabPage2.Name = "tabPage2";
- this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.tabPage2.Size = new System.Drawing.Size(1241, 247);
+ this.tabPage2.Padding = new System.Windows.Forms.Padding(2);
+ this.tabPage2.Size = new System.Drawing.Size(1260, 194);
this.tabPage2.TabIndex = 0;
this.tabPage2.Text = "琛ㄥご淇℃伅";
this.tabPage2.UseVisualStyleBackColor = true;
@@ -772,6 +803,16 @@
// gbUp
//
this.gbUp.BackColor = System.Drawing.Color.Lavender;
+ this.gbUp.Controls.Add(this.textHPicNumVer);
+ this.gbUp.Controls.Add(this.textHProductNum);
+ this.gbUp.Controls.Add(this.textHMaterTexture);
+ this.gbUp.Controls.Add(this.label62);
+ this.gbUp.Controls.Add(this.textHVerNum);
+ this.gbUp.Controls.Add(this.label63);
+ this.gbUp.Controls.Add(this.label64);
+ this.gbUp.Controls.Add(this.label65);
+ this.gbUp.Controls.Add(this.textHPicNumAssemble);
+ this.gbUp.Controls.Add(this.label66);
this.gbUp.Controls.Add(this.label42);
this.gbUp.Controls.Add(this.txtHProjectNum);
this.gbUp.Controls.Add(this.cmdEquipMentID);
@@ -815,32 +856,115 @@
this.gbUp.Controls.Add(this.label4);
this.gbUp.Controls.Add(this.txtHBillNo);
this.gbUp.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gbUp.Location = new System.Drawing.Point(3, 2);
- this.gbUp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.gbUp.Location = new System.Drawing.Point(2, 2);
this.gbUp.Name = "gbUp";
- this.gbUp.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.gbUp.Size = new System.Drawing.Size(1235, 243);
+ this.gbUp.Size = new System.Drawing.Size(1256, 190);
this.gbUp.TabIndex = 33;
this.gbUp.TabStop = false;
+ //
+ // textHProductNum
+ //
+ this.textHProductNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHProductNum.Location = new System.Drawing.Point(1001, 106);
+ this.textHProductNum.Name = "textHProductNum";
+ this.textHProductNum.Size = new System.Drawing.Size(189, 21);
+ this.textHProductNum.TabIndex = 336;
+ this.textHProductNum.Tag = "0";
+ //
+ // textHMaterTexture
+ //
+ this.textHMaterTexture.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHMaterTexture.Location = new System.Drawing.Point(1001, 80);
+ this.textHMaterTexture.Name = "textHMaterTexture";
+ this.textHMaterTexture.Size = new System.Drawing.Size(189, 21);
+ this.textHMaterTexture.TabIndex = 335;
+ this.textHMaterTexture.Tag = "0";
+ //
+ // label62
+ //
+ this.label62.AutoSize = true;
+ this.label62.ForeColor = System.Drawing.Color.Black;
+ this.label62.Location = new System.Drawing.Point(928, 138);
+ this.label62.Name = "label62";
+ this.label62.Size = new System.Drawing.Size(53, 12);
+ this.label62.TabIndex = 333;
+ this.label62.Text = "鐗� 鏈�";
+ //
+ // textHVerNum
+ //
+ this.textHVerNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHVerNum.Location = new System.Drawing.Point(1000, 134);
+ this.textHVerNum.Name = "textHVerNum";
+ this.textHVerNum.Size = new System.Drawing.Size(189, 21);
+ this.textHVerNum.TabIndex = 334;
+ this.textHVerNum.Tag = "0";
+ //
+ // label63
+ //
+ this.label63.AutoSize = true;
+ this.label63.ForeColor = System.Drawing.Color.Black;
+ this.label63.Location = new System.Drawing.Point(928, 110);
+ this.label63.Name = "label63";
+ this.label63.Size = new System.Drawing.Size(53, 12);
+ this.label63.TabIndex = 330;
+ this.label63.Text = "鎴愬搧缂栧彿";
+ //
+ // label64
+ //
+ this.label64.AutoSize = true;
+ this.label64.ForeColor = System.Drawing.Color.Black;
+ this.label64.Location = new System.Drawing.Point(926, 27);
+ this.label64.Name = "label64";
+ this.label64.Size = new System.Drawing.Size(53, 12);
+ this.label64.TabIndex = 328;
+ this.label64.Text = "鍥惧彿鐗堟湰";
+ //
+ // label65
+ //
+ this.label65.AutoSize = true;
+ this.label65.ForeColor = System.Drawing.Color.Black;
+ this.label65.Location = new System.Drawing.Point(927, 56);
+ this.label65.Name = "label65";
+ this.label65.Size = new System.Drawing.Size(53, 12);
+ this.label65.TabIndex = 326;
+ this.label65.Text = "鎬昏鍥惧彿";
+ //
+ // textHPicNumAssemble
+ //
+ this.textHPicNumAssemble.BackColor = System.Drawing.SystemColors.Window;
+ this.textHPicNumAssemble.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHPicNumAssemble.Location = new System.Drawing.Point(1001, 52);
+ this.textHPicNumAssemble.Name = "textHPicNumAssemble";
+ this.textHPicNumAssemble.Size = new System.Drawing.Size(188, 21);
+ this.textHPicNumAssemble.TabIndex = 327;
+ this.textHPicNumAssemble.Tag = "0";
+ //
+ // label66
+ //
+ this.label66.AutoSize = true;
+ this.label66.ForeColor = System.Drawing.Color.Black;
+ this.label66.Location = new System.Drawing.Point(926, 84);
+ this.label66.Name = "label66";
+ this.label66.Size = new System.Drawing.Size(53, 12);
+ this.label66.TabIndex = 323;
+ this.label66.Text = "鏉� 璐�";
//
// label42
//
this.label42.AutoSize = true;
this.label42.ForeColor = System.Drawing.Color.Black;
- this.label42.Location = new System.Drawing.Point(811, 172);
- this.label42.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label42.Location = new System.Drawing.Point(608, 138);
this.label42.Name = "label42";
- this.label42.Size = new System.Drawing.Size(67, 15);
+ this.label42.Size = new System.Drawing.Size(53, 12);
this.label42.TabIndex = 321;
this.label42.Text = "椤圭洰缂栧彿";
//
// txtHProjectNum
//
this.txtHProjectNum.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProjectNum.Location = new System.Drawing.Point(907, 168);
- this.txtHProjectNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHProjectNum.Location = new System.Drawing.Point(680, 134);
this.txtHProjectNum.Name = "txtHProjectNum";
- this.txtHProjectNum.Size = new System.Drawing.Size(251, 25);
+ this.txtHProjectNum.Size = new System.Drawing.Size(189, 21);
this.txtHProjectNum.TabIndex = 322;
this.txtHProjectNum.Tag = "0";
//
@@ -849,10 +973,9 @@
this.cmdEquipMentID.BackColor = System.Drawing.Color.Transparent;
this.cmdEquipMentID.Image = ((System.Drawing.Image)(resources.GetObject("cmdEquipMentID.Image")));
this.cmdEquipMentID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdEquipMentID.Location = new System.Drawing.Point(1131, 132);
- this.cmdEquipMentID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdEquipMentID.Location = new System.Drawing.Point(848, 106);
this.cmdEquipMentID.Name = "cmdEquipMentID";
- this.cmdEquipMentID.Size = new System.Drawing.Size(29, 28);
+ this.cmdEquipMentID.Size = new System.Drawing.Size(22, 22);
this.cmdEquipMentID.TabIndex = 320;
this.cmdEquipMentID.UseVisualStyleBackColor = false;
this.cmdEquipMentID.Click += new System.EventHandler(this.cmdEquipMentID_Click);
@@ -861,20 +984,18 @@
//
this.label41.AutoSize = true;
this.label41.ForeColor = System.Drawing.Color.Black;
- this.label41.Location = new System.Drawing.Point(811, 138);
- this.label41.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label41.Location = new System.Drawing.Point(608, 110);
this.label41.Name = "label41";
- this.label41.Size = new System.Drawing.Size(67, 15);
+ this.label41.Size = new System.Drawing.Size(53, 12);
this.label41.TabIndex = 318;
this.label41.Text = "妯″叿璁惧";
//
// txtHEquipMentID
//
this.txtHEquipMentID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHEquipMentID.Location = new System.Drawing.Point(907, 132);
- this.txtHEquipMentID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHEquipMentID.Location = new System.Drawing.Point(680, 106);
this.txtHEquipMentID.Name = "txtHEquipMentID";
- this.txtHEquipMentID.Size = new System.Drawing.Size(221, 25);
+ this.txtHEquipMentID.Size = new System.Drawing.Size(167, 21);
this.txtHEquipMentID.TabIndex = 319;
this.txtHEquipMentID.Tag = "0";
this.txtHEquipMentID.TextChanged += new System.EventHandler(this.txtEquipMentID_TextChanged);
@@ -883,10 +1004,9 @@
//
this.label40.AutoSize = true;
this.label40.ForeColor = System.Drawing.Color.Black;
- this.label40.Location = new System.Drawing.Point(809, 208);
- this.label40.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label40.Location = new System.Drawing.Point(607, 166);
this.label40.Name = "label40";
- this.label40.Size = new System.Drawing.Size(67, 15);
+ this.label40.Size = new System.Drawing.Size(53, 12);
this.label40.TabIndex = 316;
this.label40.Text = "鍘熸枡鎵规";
//
@@ -894,20 +1014,19 @@
//
this.txtHMateOutBatchNo.BackColor = System.Drawing.SystemColors.Window;
this.txtHMateOutBatchNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMateOutBatchNo.Location = new System.Drawing.Point(907, 202);
- this.txtHMateOutBatchNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMateOutBatchNo.Location = new System.Drawing.Point(680, 162);
this.txtHMateOutBatchNo.Name = "txtHMateOutBatchNo";
- this.txtHMateOutBatchNo.Size = new System.Drawing.Size(252, 25);
+ this.txtHMateOutBatchNo.Size = new System.Drawing.Size(190, 21);
this.txtHMateOutBatchNo.TabIndex = 317;
this.txtHMateOutBatchNo.Tag = "0";
//
// chkHBLFlag
//
this.chkHBLFlag.AutoSize = true;
- this.chkHBLFlag.Location = new System.Drawing.Point(659, 178);
- this.chkHBLFlag.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.chkHBLFlag.Location = new System.Drawing.Point(494, 142);
+ this.chkHBLFlag.Margin = new System.Windows.Forms.Padding(2);
this.chkHBLFlag.Name = "chkHBLFlag";
- this.chkHBLFlag.Size = new System.Drawing.Size(89, 19);
+ this.chkHBLFlag.Size = new System.Drawing.Size(72, 16);
this.chkHBLFlag.TabIndex = 315;
this.chkHBLFlag.Text = "琛ユ枡鏍囪";
this.chkHBLFlag.UseVisualStyleBackColor = true;
@@ -916,10 +1035,9 @@
//
this.label39.AutoSize = true;
this.label39.ForeColor = System.Drawing.Color.Black;
- this.label39.Location = new System.Drawing.Point(32, 178);
- this.label39.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label39.Location = new System.Drawing.Point(24, 142);
this.label39.Name = "label39";
- this.label39.Size = new System.Drawing.Size(67, 15);
+ this.label39.Size = new System.Drawing.Size(53, 12);
this.label39.TabIndex = 314;
this.label39.Text = "琛ユ枡鍘熷洜";
//
@@ -927,10 +1045,9 @@
//
this.txtHQty.BackColor = System.Drawing.SystemColors.Window;
this.txtHQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHQty.Location = new System.Drawing.Point(501, 98);
- this.txtHQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHQty.Location = new System.Drawing.Point(376, 78);
this.txtHQty.Name = "txtHQty";
- this.txtHQty.Size = new System.Drawing.Size(249, 25);
+ this.txtHQty.Size = new System.Drawing.Size(188, 21);
this.txtHQty.TabIndex = 299;
this.txtHQty.Tag = "0";
this.txtHQty.TextChanged += new System.EventHandler(this.txtHQty_TextChanged);
@@ -939,10 +1056,9 @@
//
this.label38.AutoSize = true;
this.label38.ForeColor = System.Drawing.Color.Black;
- this.label38.Location = new System.Drawing.Point(407, 102);
- this.label38.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label38.Location = new System.Drawing.Point(305, 82);
this.label38.Name = "label38";
- this.label38.Size = new System.Drawing.Size(82, 15);
+ this.label38.Size = new System.Drawing.Size(65, 12);
this.label38.TabIndex = 312;
this.label38.Text = "娴佽浆鍗℃暟閲�";
//
@@ -950,10 +1066,9 @@
//
this.label37.AutoSize = true;
this.label37.ForeColor = System.Drawing.Color.Black;
- this.label37.Location = new System.Drawing.Point(803, 32);
- this.label37.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label37.Location = new System.Drawing.Point(602, 26);
this.label37.Name = "label37";
- this.label37.Size = new System.Drawing.Size(82, 15);
+ this.label37.Size = new System.Drawing.Size(65, 12);
this.label37.TabIndex = 310;
this.label37.Text = "璁㈠崟璺熻釜鍙�";
//
@@ -962,11 +1077,10 @@
this.txtHOrderProcNO.BackColor = System.Drawing.Color.Beige;
this.txtHOrderProcNO.Enabled = false;
this.txtHOrderProcNO.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHOrderProcNO.Location = new System.Drawing.Point(907, 30);
- this.txtHOrderProcNO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHOrderProcNO.Location = new System.Drawing.Point(680, 24);
this.txtHOrderProcNO.Name = "txtHOrderProcNO";
this.txtHOrderProcNO.ReadOnly = true;
- this.txtHOrderProcNO.Size = new System.Drawing.Size(249, 25);
+ this.txtHOrderProcNO.Size = new System.Drawing.Size(188, 21);
this.txtHOrderProcNO.TabIndex = 311;
//
// cmdHMaterID2
@@ -974,10 +1088,9 @@
this.cmdHMaterID2.BackColor = System.Drawing.Color.Transparent;
this.cmdHMaterID2.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID2.Image")));
this.cmdHMaterID2.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHMaterID2.Location = new System.Drawing.Point(348, 64);
- this.cmdHMaterID2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHMaterID2.Location = new System.Drawing.Point(261, 51);
this.cmdHMaterID2.Name = "cmdHMaterID2";
- this.cmdHMaterID2.Size = new System.Drawing.Size(29, 28);
+ this.cmdHMaterID2.Size = new System.Drawing.Size(22, 22);
this.cmdHMaterID2.TabIndex = 307;
this.cmdHMaterID2.UseVisualStyleBackColor = false;
this.cmdHMaterID2.Click += new System.EventHandler(this.cmdHMaterID2_Click);
@@ -986,10 +1099,9 @@
//
this.label34.AutoSize = true;
this.label34.ForeColor = System.Drawing.Color.Black;
- this.label34.Location = new System.Drawing.Point(809, 70);
- this.label34.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label34.Location = new System.Drawing.Point(607, 56);
this.label34.Name = "label34";
- this.label34.Size = new System.Drawing.Size(67, 15);
+ this.label34.Size = new System.Drawing.Size(53, 12);
this.label34.TabIndex = 305;
this.label34.Text = "浜у搧瑙勬牸";
//
@@ -997,10 +1109,9 @@
//
this.txtHModel2.BackColor = System.Drawing.SystemColors.Window;
this.txtHModel2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHModel2.Location = new System.Drawing.Point(908, 65);
- this.txtHModel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHModel2.Location = new System.Drawing.Point(681, 52);
this.txtHModel2.Name = "txtHModel2";
- this.txtHModel2.Size = new System.Drawing.Size(249, 25);
+ this.txtHModel2.Size = new System.Drawing.Size(188, 21);
this.txtHModel2.TabIndex = 306;
this.txtHModel2.Tag = "0";
//
@@ -1008,10 +1119,9 @@
//
this.label35.AutoSize = true;
this.label35.ForeColor = System.Drawing.Color.Black;
- this.label35.Location = new System.Drawing.Point(413, 70);
- this.label35.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label35.Location = new System.Drawing.Point(310, 56);
this.label35.Name = "label35";
- this.label35.Size = new System.Drawing.Size(67, 15);
+ this.label35.Size = new System.Drawing.Size(53, 12);
this.label35.TabIndex = 303;
this.label35.Text = "浜у搧浠ｇ爜";
//
@@ -1019,10 +1129,9 @@
//
this.txtHMaterNumber2.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterNumber2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterNumber2.Location = new System.Drawing.Point(501, 65);
- this.txtHMaterNumber2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMaterNumber2.Location = new System.Drawing.Point(376, 52);
this.txtHMaterNumber2.Name = "txtHMaterNumber2";
- this.txtHMaterNumber2.Size = new System.Drawing.Size(249, 25);
+ this.txtHMaterNumber2.Size = new System.Drawing.Size(188, 21);
this.txtHMaterNumber2.TabIndex = 304;
this.txtHMaterNumber2.Tag = "0";
//
@@ -1030,10 +1139,9 @@
//
this.label36.AutoSize = true;
this.label36.ForeColor = System.Drawing.Color.Black;
- this.label36.Location = new System.Drawing.Point(32, 70);
- this.label36.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label36.Location = new System.Drawing.Point(24, 56);
this.label36.Name = "label36";
- this.label36.Size = new System.Drawing.Size(67, 15);
+ this.label36.Size = new System.Drawing.Size(53, 12);
this.label36.TabIndex = 300;
this.label36.Text = "浜у搧鍚嶇О";
//
@@ -1041,10 +1149,9 @@
//
this.txtHMaterID2.BackColor = System.Drawing.Color.Beige;
this.txtHMaterID2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterID2.Location = new System.Drawing.Point(124, 65);
- this.txtHMaterID2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMaterID2.Location = new System.Drawing.Point(93, 52);
this.txtHMaterID2.Name = "txtHMaterID2";
- this.txtHMaterID2.Size = new System.Drawing.Size(221, 25);
+ this.txtHMaterID2.Size = new System.Drawing.Size(167, 21);
this.txtHMaterID2.TabIndex = 301;
this.txtHMaterID2.Tag = "0";
//
@@ -1052,20 +1159,18 @@
//
this.dtpHPlanEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
this.dtpHPlanEndDate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.dtpHPlanEndDate.Location = new System.Drawing.Point(501, 135);
- this.dtpHPlanEndDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.dtpHPlanEndDate.Location = new System.Drawing.Point(376, 108);
this.dtpHPlanEndDate.Name = "dtpHPlanEndDate";
- this.dtpHPlanEndDate.Size = new System.Drawing.Size(249, 25);
+ this.dtpHPlanEndDate.Size = new System.Drawing.Size(188, 21);
this.dtpHPlanEndDate.TabIndex = 282;
//
// label12
//
this.label12.AutoSize = true;
this.label12.ForeColor = System.Drawing.Color.Black;
- this.label12.Location = new System.Drawing.Point(393, 140);
- this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label12.Location = new System.Drawing.Point(295, 112);
this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(97, 15);
+ this.label12.Size = new System.Drawing.Size(77, 12);
this.label12.TabIndex = 281;
this.label12.Text = "璁″垝瀹屽伐鏃ユ湡";
//
@@ -1073,20 +1178,18 @@
//
this.dtpHPlanBeginDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
this.dtpHPlanBeginDate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.dtpHPlanBeginDate.Location = new System.Drawing.Point(123, 135);
- this.dtpHPlanBeginDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.dtpHPlanBeginDate.Location = new System.Drawing.Point(92, 108);
this.dtpHPlanBeginDate.Name = "dtpHPlanBeginDate";
- this.dtpHPlanBeginDate.Size = new System.Drawing.Size(249, 25);
+ this.dtpHPlanBeginDate.Size = new System.Drawing.Size(188, 21);
this.dtpHPlanBeginDate.TabIndex = 280;
//
// label7
//
this.label7.AutoSize = true;
this.label7.ForeColor = System.Drawing.Color.Black;
- this.label7.Location = new System.Drawing.Point(13, 140);
- this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label7.Location = new System.Drawing.Point(10, 112);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(97, 15);
+ this.label7.Size = new System.Drawing.Size(77, 12);
this.label7.TabIndex = 279;
this.label7.Text = "璁″垝寮�宸ユ棩鏈�";
//
@@ -1095,10 +1198,9 @@
this.cmdHUnitID.BackColor = System.Drawing.Color.Transparent;
this.cmdHUnitID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHUnitID.Image")));
this.cmdHUnitID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHUnitID.Location = new System.Drawing.Point(1129, 98);
- this.cmdHUnitID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHUnitID.Location = new System.Drawing.Point(847, 78);
this.cmdHUnitID.Name = "cmdHUnitID";
- this.cmdHUnitID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHUnitID.Size = new System.Drawing.Size(22, 22);
this.cmdHUnitID.TabIndex = 274;
this.cmdHUnitID.UseVisualStyleBackColor = false;
this.cmdHUnitID.Visible = false;
@@ -1108,10 +1210,9 @@
//
this.label26.AutoSize = true;
this.label26.ForeColor = System.Drawing.Color.Black;
- this.label26.Location = new System.Drawing.Point(808, 105);
- this.label26.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label26.Location = new System.Drawing.Point(606, 84);
this.label26.Name = "label26";
- this.label26.Size = new System.Drawing.Size(69, 15);
+ this.label26.Size = new System.Drawing.Size(53, 12);
this.label26.TabIndex = 272;
this.label26.Text = "鍗� 浣�";
//
@@ -1119,10 +1220,9 @@
//
this.txtHUnitID.BackColor = System.Drawing.Color.Beige;
this.txtHUnitID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHUnitID.Location = new System.Drawing.Point(907, 100);
- this.txtHUnitID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHUnitID.Location = new System.Drawing.Point(680, 80);
this.txtHUnitID.Name = "txtHUnitID";
- this.txtHUnitID.Size = new System.Drawing.Size(220, 25);
+ this.txtHUnitID.Size = new System.Drawing.Size(166, 21);
this.txtHUnitID.TabIndex = 273;
this.txtHUnitID.Tag = "0";
this.txtHUnitID.TextChanged += new System.EventHandler(this.txtHUnitID_TextChanged);
@@ -1131,10 +1231,9 @@
//
this.label1.AutoSize = true;
this.label1.ForeColor = System.Drawing.Color.Black;
- this.label1.Location = new System.Drawing.Point(24, 104);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(18, 83);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(82, 15);
+ this.label1.Size = new System.Drawing.Size(65, 12);
this.label1.TabIndex = 265;
this.label1.Text = "鐢熶骇璁㈠崟鍙�";
//
@@ -1142,10 +1241,9 @@
//
this.txtHICMOBillNo.BackColor = System.Drawing.SystemColors.Window;
this.txtHICMOBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHICMOBillNo.Location = new System.Drawing.Point(123, 100);
- this.txtHICMOBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHICMOBillNo.Location = new System.Drawing.Point(92, 80);
this.txtHICMOBillNo.Name = "txtHICMOBillNo";
- this.txtHICMOBillNo.Size = new System.Drawing.Size(249, 25);
+ this.txtHICMOBillNo.Size = new System.Drawing.Size(188, 21);
this.txtHICMOBillNo.TabIndex = 266;
this.txtHICMOBillNo.Tag = "0";
//
@@ -1153,40 +1251,36 @@
//
this.txtHExplanation.BackColor = System.Drawing.SystemColors.Window;
this.txtHExplanation.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHExplanation.Location = new System.Drawing.Point(123, 174);
- this.txtHExplanation.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHExplanation.Location = new System.Drawing.Point(92, 139);
this.txtHExplanation.Name = "txtHExplanation";
- this.txtHExplanation.Size = new System.Drawing.Size(529, 25);
+ this.txtHExplanation.Size = new System.Drawing.Size(398, 21);
this.txtHExplanation.TabIndex = 284;
this.txtHExplanation.Tag = "0";
//
// txtHRemark
//
this.txtHRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHRemark.Location = new System.Drawing.Point(123, 208);
- this.txtHRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHRemark.Location = new System.Drawing.Point(92, 166);
this.txtHRemark.Name = "txtHRemark";
- this.txtHRemark.Size = new System.Drawing.Size(628, 25);
+ this.txtHRemark.Size = new System.Drawing.Size(472, 21);
this.txtHRemark.TabIndex = 264;
//
// label20
//
this.label20.AutoSize = true;
this.label20.ForeColor = System.Drawing.Color.Black;
- this.label20.Location = new System.Drawing.Point(29, 212);
- this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label20.Location = new System.Drawing.Point(22, 170);
this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(69, 15);
+ this.label20.Size = new System.Drawing.Size(53, 12);
this.label20.TabIndex = 263;
this.label20.Text = "澶� 娉�";
//
// txtHWWOrderBillNo
//
this.txtHWWOrderBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWWOrderBillNo.Location = new System.Drawing.Point(908, 381);
- this.txtHWWOrderBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHWWOrderBillNo.Location = new System.Drawing.Point(681, 305);
this.txtHWWOrderBillNo.Name = "txtHWWOrderBillNo";
- this.txtHWWOrderBillNo.Size = new System.Drawing.Size(249, 25);
+ this.txtHWWOrderBillNo.Size = new System.Drawing.Size(188, 21);
this.txtHWWOrderBillNo.TabIndex = 262;
this.txtHWWOrderBillNo.Tag = "0";
this.txtHWWOrderBillNo.Visible = false;
@@ -1195,10 +1289,9 @@
//
this.label2.AutoSize = true;
this.label2.ForeColor = System.Drawing.Color.Black;
- this.label2.Location = new System.Drawing.Point(801, 386);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(601, 309);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(82, 15);
+ this.label2.Size = new System.Drawing.Size(65, 12);
this.label2.TabIndex = 261;
this.label2.Text = "濮斿璁㈠崟鍙�";
this.label2.Visible = false;
@@ -1207,10 +1300,9 @@
//
this.label5.AutoSize = true;
this.label5.ForeColor = System.Drawing.Color.Black;
- this.label5.Location = new System.Drawing.Point(31, 386);
- this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label5.Location = new System.Drawing.Point(23, 309);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(97, 15);
+ this.label5.Size = new System.Drawing.Size(77, 12);
this.label5.TabIndex = 259;
this.label5.Text = "濮斿璁㈠崟鍐呯爜";
this.label5.Visible = false;
@@ -1218,10 +1310,9 @@
// txtHWWOrderInterID
//
this.txtHWWOrderInterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWWOrderInterID.Location = new System.Drawing.Point(139, 381);
- this.txtHWWOrderInterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHWWOrderInterID.Location = new System.Drawing.Point(104, 305);
this.txtHWWOrderInterID.Name = "txtHWWOrderInterID";
- this.txtHWWOrderInterID.Size = new System.Drawing.Size(249, 25);
+ this.txtHWWOrderInterID.Size = new System.Drawing.Size(188, 21);
this.txtHWWOrderInterID.TabIndex = 260;
this.txtHWWOrderInterID.Tag = "0";
this.txtHWWOrderInterID.Visible = false;
@@ -1229,10 +1320,9 @@
// txtHWWOrderEntryID
//
this.txtHWWOrderEntryID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWWOrderEntryID.Location = new System.Drawing.Point(533, 381);
- this.txtHWWOrderEntryID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHWWOrderEntryID.Location = new System.Drawing.Point(400, 305);
this.txtHWWOrderEntryID.Name = "txtHWWOrderEntryID";
- this.txtHWWOrderEntryID.Size = new System.Drawing.Size(249, 25);
+ this.txtHWWOrderEntryID.Size = new System.Drawing.Size(188, 21);
this.txtHWWOrderEntryID.TabIndex = 258;
this.txtHWWOrderEntryID.Tag = "0";
this.txtHWWOrderEntryID.Visible = false;
@@ -1241,10 +1331,9 @@
//
this.label16.AutoSize = true;
this.label16.ForeColor = System.Drawing.Color.Black;
- this.label16.Location = new System.Drawing.Point(408, 386);
- this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label16.Location = new System.Drawing.Point(306, 309);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(112, 15);
+ this.label16.Size = new System.Drawing.Size(89, 12);
this.label16.TabIndex = 257;
this.label16.Text = "濮斿璁㈠崟瀛愬唴鐮�";
this.label16.Visible = false;
@@ -1253,20 +1342,18 @@
//
this.dtpHDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
this.dtpHDate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.dtpHDate.Location = new System.Drawing.Point(501, 29);
- this.dtpHDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.dtpHDate.Location = new System.Drawing.Point(376, 23);
this.dtpHDate.Name = "dtpHDate";
- this.dtpHDate.Size = new System.Drawing.Size(244, 25);
+ this.dtpHDate.Size = new System.Drawing.Size(184, 21);
this.dtpHDate.TabIndex = 256;
//
// label9
//
this.label9.AutoSize = true;
this.label9.ForeColor = System.Drawing.Color.Black;
- this.label9.Location = new System.Drawing.Point(409, 34);
- this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label9.Location = new System.Drawing.Point(307, 27);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(69, 15);
+ this.label9.Size = new System.Drawing.Size(53, 12);
this.label9.TabIndex = 255;
this.label9.Text = "鏃� 鏈�";
//
@@ -1274,10 +1361,9 @@
//
this.label4.AutoSize = true;
this.label4.ForeColor = System.Drawing.Color.Black;
- this.label4.Location = new System.Drawing.Point(29, 34);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(22, 27);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(68, 15);
+ this.label4.Size = new System.Drawing.Size(53, 12);
this.label4.TabIndex = 251;
this.label4.Text = "鍗� 鎹� 鍙�";
//
@@ -1285,10 +1371,9 @@
//
this.txtHBillNo.BackColor = System.Drawing.Color.Beige;
this.txtHBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBillNo.Location = new System.Drawing.Point(123, 29);
- this.txtHBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHBillNo.Location = new System.Drawing.Point(92, 23);
this.txtHBillNo.Name = "txtHBillNo";
- this.txtHBillNo.Size = new System.Drawing.Size(249, 25);
+ this.txtHBillNo.Size = new System.Drawing.Size(188, 21);
this.txtHBillNo.TabIndex = 252;
//
// tabPage3
@@ -1323,11 +1408,11 @@
this.tabPage3.Controls.Add(this.cmdHMaterID);
this.tabPage3.Controls.Add(this.label6);
this.tabPage3.Controls.Add(this.label10);
- this.tabPage3.Location = new System.Drawing.Point(4, 25);
- this.tabPage3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tabPage3.Location = new System.Drawing.Point(4, 22);
+ this.tabPage3.Margin = new System.Windows.Forms.Padding(2);
this.tabPage3.Name = "tabPage3";
- this.tabPage3.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.tabPage3.Size = new System.Drawing.Size(1241, 246);
+ this.tabPage3.Padding = new System.Windows.Forms.Padding(2);
+ this.tabPage3.Size = new System.Drawing.Size(1260, 194);
this.tabPage3.TabIndex = 1;
this.tabPage3.Text = "鍏朵粬淇℃伅";
//
@@ -1335,52 +1420,47 @@
//
this.txtHprocExQty.BackColor = System.Drawing.SystemColors.Window;
this.txtHprocExQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHprocExQty.Location = new System.Drawing.Point(939, 101);
- this.txtHprocExQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHprocExQty.Location = new System.Drawing.Point(704, 81);
this.txtHprocExQty.Name = "txtHprocExQty";
this.txtHprocExQty.ReadOnly = true;
- this.txtHprocExQty.Size = new System.Drawing.Size(113, 25);
+ this.txtHprocExQty.Size = new System.Drawing.Size(86, 21);
this.txtHprocExQty.TabIndex = 313;
this.txtHprocExQty.Tag = "0";
this.txtHprocExQty.TextChanged += new System.EventHandler(this.txtHprocExQty_TextChanged);
//
// txtHWorkTypeID
//
- this.txtHWorkTypeID.Location = new System.Drawing.Point(824, 139);
- this.txtHWorkTypeID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHWorkTypeID.Location = new System.Drawing.Point(618, 111);
this.txtHWorkTypeID.Name = "txtHWorkTypeID";
- this.txtHWorkTypeID.Size = new System.Drawing.Size(229, 25);
+ this.txtHWorkTypeID.Size = new System.Drawing.Size(173, 21);
this.txtHWorkTypeID.TabIndex = 308;
//
// txtHPlanQty
//
this.txtHPlanQty.BackColor = System.Drawing.SystemColors.Window;
this.txtHPlanQty.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPlanQty.Location = new System.Drawing.Point(824, 101);
- this.txtHPlanQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHPlanQty.Location = new System.Drawing.Point(618, 81);
this.txtHPlanQty.Name = "txtHPlanQty";
this.txtHPlanQty.ReadOnly = true;
- this.txtHPlanQty.Size = new System.Drawing.Size(112, 25);
+ this.txtHPlanQty.Size = new System.Drawing.Size(85, 21);
this.txtHPlanQty.TabIndex = 278;
this.txtHPlanQty.Tag = "0";
this.txtHPlanQty.TextChanged += new System.EventHandler(this.txtHPlanQty_TextChanged);
//
// txtHICMOEntryID
//
- this.txtHICMOEntryID.Location = new System.Drawing.Point(437, 139);
- this.txtHICMOEntryID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHICMOEntryID.Location = new System.Drawing.Point(328, 111);
this.txtHICMOEntryID.Name = "txtHICMOEntryID";
- this.txtHICMOEntryID.Size = new System.Drawing.Size(249, 25);
+ this.txtHICMOEntryID.Size = new System.Drawing.Size(188, 21);
this.txtHICMOEntryID.TabIndex = 309;
//
// label28
//
this.label28.AutoSize = true;
this.label28.ForeColor = System.Drawing.Color.Black;
- this.label28.Location = new System.Drawing.Point(720, 101);
- this.label28.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label28.Location = new System.Drawing.Point(540, 81);
this.label28.Name = "label28";
- this.label28.Size = new System.Drawing.Size(67, 15);
+ this.label28.Size = new System.Drawing.Size(53, 12);
this.label28.TabIndex = 277;
this.label28.Text = "鐢熶骇鏁伴噺";
//
@@ -1388,10 +1468,9 @@
//
this.cmdSourceBillNo.Image = ((System.Drawing.Image)(resources.GetObject("cmdSourceBillNo.Image")));
this.cmdSourceBillNo.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdSourceBillNo.Location = new System.Drawing.Point(657, 59);
- this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdSourceBillNo.Location = new System.Drawing.Point(493, 47);
this.cmdSourceBillNo.Name = "cmdSourceBillNo";
- this.cmdSourceBillNo.Size = new System.Drawing.Size(29, 28);
+ this.cmdSourceBillNo.Size = new System.Drawing.Size(22, 22);
this.cmdSourceBillNo.TabIndex = 293;
this.cmdSourceBillNo.UseVisualStyleBackColor = true;
this.cmdSourceBillNo.Click += new System.EventHandler(this.cmdSourceBillNo_Click);
@@ -1400,10 +1479,9 @@
//
this.label3.AutoSize = true;
this.label3.ForeColor = System.Drawing.Color.Black;
- this.label3.Location = new System.Drawing.Point(720, 19);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label3.Location = new System.Drawing.Point(540, 15);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(97, 15);
+ this.label3.Size = new System.Drawing.Size(77, 12);
this.label3.TabIndex = 285;
this.label3.Text = "濮斿鍔犲伐鍗曚綅";
//
@@ -1411,10 +1489,9 @@
//
this.txtHModel.BackColor = System.Drawing.SystemColors.Window;
this.txtHModel.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHModel.Location = new System.Drawing.Point(113, 101);
- this.txtHModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHModel.Location = new System.Drawing.Point(85, 81);
this.txtHModel.Name = "txtHModel";
- this.txtHModel.Size = new System.Drawing.Size(227, 25);
+ this.txtHModel.Size = new System.Drawing.Size(171, 21);
this.txtHModel.TabIndex = 297;
this.txtHModel.Tag = "0";
//
@@ -1422,10 +1499,9 @@
//
this.txtHUnitNumber.BackColor = System.Drawing.SystemColors.Window;
this.txtHUnitNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHUnitNumber.Location = new System.Drawing.Point(824, 59);
- this.txtHUnitNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHUnitNumber.Location = new System.Drawing.Point(618, 47);
this.txtHUnitNumber.Name = "txtHUnitNumber";
- this.txtHUnitNumber.Size = new System.Drawing.Size(229, 25);
+ this.txtHUnitNumber.Size = new System.Drawing.Size(173, 21);
this.txtHUnitNumber.TabIndex = 276;
this.txtHUnitNumber.Tag = "0";
//
@@ -1433,28 +1509,25 @@
//
this.label18.AutoSize = true;
this.label18.ForeColor = System.Drawing.Color.Black;
- this.label18.Location = new System.Drawing.Point(355, 101);
- this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label18.Location = new System.Drawing.Point(266, 81);
this.label18.Name = "label18";
- this.label18.Size = new System.Drawing.Size(67, 15);
+ this.label18.Size = new System.Drawing.Size(53, 12);
this.label18.TabIndex = 94;
this.label18.Text = "涓昏鏉愭枡";
//
// txtHKeyMaterID
//
- this.txtHKeyMaterID.Location = new System.Drawing.Point(113, 139);
- this.txtHKeyMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHKeyMaterID.Location = new System.Drawing.Point(85, 111);
this.txtHKeyMaterID.Name = "txtHKeyMaterID";
- this.txtHKeyMaterID.Size = new System.Drawing.Size(227, 25);
+ this.txtHKeyMaterID.Size = new System.Drawing.Size(171, 21);
this.txtHKeyMaterID.TabIndex = 278;
//
// txtHSupID
//
this.txtHSupID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSupID.Location = new System.Drawing.Point(824, 19);
- this.txtHSupID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSupID.Location = new System.Drawing.Point(618, 15);
this.txtHSupID.Name = "txtHSupID";
- this.txtHSupID.Size = new System.Drawing.Size(229, 25);
+ this.txtHSupID.Size = new System.Drawing.Size(173, 21);
this.txtHSupID.TabIndex = 286;
this.txtHSupID.Tag = "0";
this.txtHSupID.TextChanged += new System.EventHandler(this.txtHSupID_TextChanged);
@@ -1463,38 +1536,34 @@
//
this.label24.AutoSize = true;
this.label24.ForeColor = System.Drawing.Color.Black;
- this.label24.Location = new System.Drawing.Point(720, 59);
- this.label24.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label24.Location = new System.Drawing.Point(540, 47);
this.label24.Name = "label24";
- this.label24.Size = new System.Drawing.Size(67, 15);
+ this.label24.Size = new System.Drawing.Size(53, 12);
this.label24.TabIndex = 275;
this.label24.Text = "鍗曚綅浠ｇ爜";
//
// txtHMainMaterID
//
- this.txtHMainMaterID.Location = new System.Drawing.Point(437, 101);
- this.txtHMainMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMainMaterID.Location = new System.Drawing.Point(328, 81);
this.txtHMainMaterID.Name = "txtHMainMaterID";
- this.txtHMainMaterID.Size = new System.Drawing.Size(249, 25);
+ this.txtHMainMaterID.Size = new System.Drawing.Size(188, 21);
this.txtHMainMaterID.TabIndex = 277;
//
// textBox2
//
this.textBox2.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.textBox2.Location = new System.Drawing.Point(437, 59);
- this.textBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.textBox2.Location = new System.Drawing.Point(328, 47);
this.textBox2.Name = "textBox2";
- this.textBox2.Size = new System.Drawing.Size(221, 25);
+ this.textBox2.Size = new System.Drawing.Size(167, 21);
this.textBox2.TabIndex = 292;
//
// label22
//
this.label22.AutoSize = true;
this.label22.ForeColor = System.Drawing.Color.Black;
- this.label22.Location = new System.Drawing.Point(720, 139);
- this.label22.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label22.Location = new System.Drawing.Point(540, 111);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(82, 15);
+ this.label22.Size = new System.Drawing.Size(65, 12);
this.label22.TabIndex = 253;
this.label22.Text = "娴佽浆鍗＄被鍨�";
//
@@ -1503,10 +1572,9 @@
this.cmdHSupID.BackColor = System.Drawing.Color.Transparent;
this.cmdHSupID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHSupID.Image")));
this.cmdHSupID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHSupID.Location = new System.Drawing.Point(1055, 19);
- this.cmdHSupID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHSupID.Location = new System.Drawing.Point(791, 15);
this.cmdHSupID.Name = "cmdHSupID";
- this.cmdHSupID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHSupID.Size = new System.Drawing.Size(22, 22);
this.cmdHSupID.TabIndex = 287;
this.cmdHSupID.UseVisualStyleBackColor = false;
this.cmdHSupID.Click += new System.EventHandler(this.cmdHSupID_Click);
@@ -1515,10 +1583,9 @@
//
this.label31.AutoSize = true;
this.label31.ForeColor = System.Drawing.Color.Black;
- this.label31.Location = new System.Drawing.Point(37, 101);
- this.label31.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label31.Location = new System.Drawing.Point(28, 81);
this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(67, 15);
+ this.label31.Size = new System.Drawing.Size(53, 12);
this.label31.TabIndex = 296;
this.label31.Text = "瀛愪欢瑙勬牸";
//
@@ -1527,10 +1594,9 @@
this.cmdHWorkShopID.BackColor = System.Drawing.Color.Transparent;
this.cmdHWorkShopID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHWorkShopID.Image")));
this.cmdHWorkShopID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHWorkShopID.Location = new System.Drawing.Point(311, 19);
- this.cmdHWorkShopID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHWorkShopID.Location = new System.Drawing.Point(233, 15);
this.cmdHWorkShopID.Name = "cmdHWorkShopID";
- this.cmdHWorkShopID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHWorkShopID.Size = new System.Drawing.Size(22, 22);
this.cmdHWorkShopID.TabIndex = 290;
this.cmdHWorkShopID.UseVisualStyleBackColor = false;
this.cmdHWorkShopID.Click += new System.EventHandler(this.cmdHWorkShopID_Click);
@@ -1539,10 +1605,9 @@
//
this.label29.AutoSize = true;
this.label29.ForeColor = System.Drawing.Color.Black;
- this.label29.Location = new System.Drawing.Point(355, 59);
- this.label29.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label29.Location = new System.Drawing.Point(266, 47);
this.label29.Name = "label29";
- this.label29.Size = new System.Drawing.Size(68, 15);
+ this.label29.Size = new System.Drawing.Size(53, 12);
this.label29.TabIndex = 291;
this.label29.Text = "閫� 鍗� 鍙�";
//
@@ -1551,10 +1616,9 @@
this.cmdWorkType.BackColor = System.Drawing.Color.Transparent;
this.cmdWorkType.Image = ((System.Drawing.Image)(resources.GetObject("cmdWorkType.Image")));
this.cmdWorkType.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdWorkType.Location = new System.Drawing.Point(1055, 139);
- this.cmdWorkType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdWorkType.Location = new System.Drawing.Point(791, 111);
this.cmdWorkType.Name = "cmdWorkType";
- this.cmdWorkType.Size = new System.Drawing.Size(29, 28);
+ this.cmdWorkType.Size = new System.Drawing.Size(22, 22);
this.cmdWorkType.TabIndex = 309;
this.cmdWorkType.UseVisualStyleBackColor = false;
this.cmdWorkType.Click += new System.EventHandler(this.cmdWorkType_Click);
@@ -1562,10 +1626,9 @@
// txtHWorkShopID
//
this.txtHWorkShopID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWorkShopID.Location = new System.Drawing.Point(115, 19);
- this.txtHWorkShopID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHWorkShopID.Location = new System.Drawing.Point(86, 15);
this.txtHWorkShopID.Name = "txtHWorkShopID";
- this.txtHWorkShopID.Size = new System.Drawing.Size(193, 25);
+ this.txtHWorkShopID.Size = new System.Drawing.Size(146, 21);
this.txtHWorkShopID.TabIndex = 289;
this.txtHWorkShopID.Tag = "0";
this.txtHWorkShopID.TextChanged += new System.EventHandler(this.txtHWorkShopID_TextChanged);
@@ -1574,10 +1637,9 @@
//
this.label32.AutoSize = true;
this.label32.ForeColor = System.Drawing.Color.Black;
- this.label32.Location = new System.Drawing.Point(37, 139);
- this.label32.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label32.Location = new System.Drawing.Point(28, 111);
this.label32.Name = "label32";
- this.label32.Size = new System.Drawing.Size(67, 15);
+ this.label32.Size = new System.Drawing.Size(53, 12);
this.label32.TabIndex = 283;
this.label32.Text = "鍏抽敭鏉愭枡";
//
@@ -1585,10 +1647,9 @@
//
this.txtHMaterNumber.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterNumber.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterNumber.Location = new System.Drawing.Point(437, 19);
- this.txtHMaterNumber.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMaterNumber.Location = new System.Drawing.Point(328, 15);
this.txtHMaterNumber.Name = "txtHMaterNumber";
- this.txtHMaterNumber.Size = new System.Drawing.Size(249, 25);
+ this.txtHMaterNumber.Size = new System.Drawing.Size(188, 21);
this.txtHMaterNumber.TabIndex = 271;
this.txtHMaterNumber.Tag = "0";
//
@@ -1596,10 +1657,9 @@
//
this.txtHMaterID.BackColor = System.Drawing.Color.Beige;
this.txtHMaterID.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterID.Location = new System.Drawing.Point(113, 59);
- this.txtHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMaterID.Location = new System.Drawing.Point(85, 47);
this.txtHMaterID.Name = "txtHMaterID";
- this.txtHMaterID.Size = new System.Drawing.Size(197, 25);
+ this.txtHMaterID.Size = new System.Drawing.Size(149, 21);
this.txtHMaterID.TabIndex = 268;
this.txtHMaterID.Tag = "0";
this.txtHMaterID.TextChanged += new System.EventHandler(this.txtHMaterID_TextChanged);
@@ -1608,10 +1668,9 @@
//
this.label14.AutoSize = true;
this.label14.ForeColor = System.Drawing.Color.Black;
- this.label14.Location = new System.Drawing.Point(37, 59);
- this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label14.Location = new System.Drawing.Point(28, 47);
this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(67, 15);
+ this.label14.Size = new System.Drawing.Size(53, 12);
this.label14.TabIndex = 267;
this.label14.Text = "瀛愪欢鍚嶇О";
//
@@ -1620,10 +1679,9 @@
this.cmdHMaterID.BackColor = System.Drawing.Color.Transparent;
this.cmdHMaterID.Image = ((System.Drawing.Image)(resources.GetObject("cmdHMaterID.Image")));
this.cmdHMaterID.ImageAlign = System.Drawing.ContentAlignment.TopRight;
- this.cmdHMaterID.Location = new System.Drawing.Point(311, 59);
- this.cmdHMaterID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHMaterID.Location = new System.Drawing.Point(233, 47);
this.cmdHMaterID.Name = "cmdHMaterID";
- this.cmdHMaterID.Size = new System.Drawing.Size(29, 28);
+ this.cmdHMaterID.Size = new System.Drawing.Size(22, 22);
this.cmdHMaterID.TabIndex = 269;
this.cmdHMaterID.UseVisualStyleBackColor = false;
this.cmdHMaterID.Click += new System.EventHandler(this.cmdHMaterID_Click);
@@ -1632,10 +1690,9 @@
//
this.label6.AutoSize = true;
this.label6.ForeColor = System.Drawing.Color.Black;
- this.label6.Location = new System.Drawing.Point(37, 19);
- this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label6.Location = new System.Drawing.Point(28, 15);
this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(67, 15);
+ this.label6.Size = new System.Drawing.Size(53, 12);
this.label6.TabIndex = 288;
this.label6.Text = "鐢熶骇杞﹂棿";
//
@@ -1643,10 +1700,9 @@
//
this.label10.AutoSize = true;
this.label10.ForeColor = System.Drawing.Color.Black;
- this.label10.Location = new System.Drawing.Point(355, 19);
- this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label10.Location = new System.Drawing.Point(266, 15);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(67, 15);
+ this.label10.Size = new System.Drawing.Size(53, 12);
this.label10.TabIndex = 270;
this.label10.Text = "瀛愪欢浠ｇ爜";
//
@@ -1691,11 +1747,10 @@
this.tabPage4.Controls.Add(this.label44);
this.tabPage4.Controls.Add(this.txtHProdMaterCode);
this.tabPage4.Controls.Add(this.label43);
- this.tabPage4.Location = new System.Drawing.Point(4, 25);
- this.tabPage4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage4.Location = new System.Drawing.Point(4, 22);
this.tabPage4.Name = "tabPage4";
- this.tabPage4.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tabPage4.Size = new System.Drawing.Size(1241, 246);
+ this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage4.Size = new System.Drawing.Size(1260, 194);
this.tabPage4.TabIndex = 2;
this.tabPage4.Text = "妫�绉荤エ淇℃伅";
//
@@ -1703,10 +1758,9 @@
//
this.txtHMaterIDD.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterIDD.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterIDD.Location = new System.Drawing.Point(144, 212);
- this.txtHMaterIDD.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMaterIDD.Location = new System.Drawing.Point(108, 170);
this.txtHMaterIDD.Name = "txtHMaterIDD";
- this.txtHMaterIDD.Size = new System.Drawing.Size(249, 25);
+ this.txtHMaterIDD.Size = new System.Drawing.Size(188, 21);
this.txtHMaterIDD.TabIndex = 308;
this.txtHMaterIDD.Tag = "0";
//
@@ -1714,10 +1768,9 @@
//
this.label61.AutoSize = true;
this.label61.ForeColor = System.Drawing.Color.Black;
- this.label61.Location = new System.Drawing.Point(36, 216);
- this.label61.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label61.Location = new System.Drawing.Point(27, 173);
this.label61.Name = "label61";
- this.label61.Size = new System.Drawing.Size(90, 15);
+ this.label61.Size = new System.Drawing.Size(71, 12);
this.label61.TabIndex = 307;
this.label61.Text = "鍘熸潗鏂欏唴鐮丏";
//
@@ -1725,10 +1778,9 @@
//
this.txtHMaterIDC.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterIDC.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterIDC.Location = new System.Drawing.Point(941, 179);
- this.txtHMaterIDC.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMaterIDC.Location = new System.Drawing.Point(706, 143);
this.txtHMaterIDC.Name = "txtHMaterIDC";
- this.txtHMaterIDC.Size = new System.Drawing.Size(249, 25);
+ this.txtHMaterIDC.Size = new System.Drawing.Size(188, 21);
this.txtHMaterIDC.TabIndex = 306;
this.txtHMaterIDC.Tag = "0";
//
@@ -1736,10 +1788,9 @@
//
this.label60.AutoSize = true;
this.label60.ForeColor = System.Drawing.Color.Black;
- this.label60.Location = new System.Drawing.Point(841, 182);
- this.label60.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label60.Location = new System.Drawing.Point(631, 146);
this.label60.Name = "label60";
- this.label60.Size = new System.Drawing.Size(90, 15);
+ this.label60.Size = new System.Drawing.Size(71, 12);
this.label60.TabIndex = 305;
this.label60.Text = "鍘熸潗鏂欏唴鐮丆";
//
@@ -1747,10 +1798,9 @@
//
this.txtHMaterIDB.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterIDB.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterIDB.Location = new System.Drawing.Point(532, 179);
- this.txtHMaterIDB.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMaterIDB.Location = new System.Drawing.Point(399, 143);
this.txtHMaterIDB.Name = "txtHMaterIDB";
- this.txtHMaterIDB.Size = new System.Drawing.Size(249, 25);
+ this.txtHMaterIDB.Size = new System.Drawing.Size(188, 21);
this.txtHMaterIDB.TabIndex = 304;
this.txtHMaterIDB.Tag = "0";
//
@@ -1758,10 +1808,9 @@
//
this.label59.AutoSize = true;
this.label59.ForeColor = System.Drawing.Color.Black;
- this.label59.Location = new System.Drawing.Point(429, 182);
- this.label59.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label59.Location = new System.Drawing.Point(322, 146);
this.label59.Name = "label59";
- this.label59.Size = new System.Drawing.Size(90, 15);
+ this.label59.Size = new System.Drawing.Size(71, 12);
this.label59.TabIndex = 303;
this.label59.Text = "鍘熸潗鏂欏唴鐮丅";
//
@@ -1769,10 +1818,9 @@
//
this.txtHMaterIDA.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterIDA.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterIDA.Location = new System.Drawing.Point(144, 179);
- this.txtHMaterIDA.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMaterIDA.Location = new System.Drawing.Point(108, 143);
this.txtHMaterIDA.Name = "txtHMaterIDA";
- this.txtHMaterIDA.Size = new System.Drawing.Size(249, 25);
+ this.txtHMaterIDA.Size = new System.Drawing.Size(188, 21);
this.txtHMaterIDA.TabIndex = 302;
this.txtHMaterIDA.Tag = "0";
//
@@ -1780,10 +1828,9 @@
//
this.label58.AutoSize = true;
this.label58.ForeColor = System.Drawing.Color.Black;
- this.label58.Location = new System.Drawing.Point(36, 182);
- this.label58.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label58.Location = new System.Drawing.Point(27, 146);
this.label58.Name = "label58";
- this.label58.Size = new System.Drawing.Size(90, 15);
+ this.label58.Size = new System.Drawing.Size(71, 12);
this.label58.TabIndex = 301;
this.label58.Text = "鍘熸潗鏂欏唴鐮丄";
//
@@ -1791,10 +1838,9 @@
//
this.txtHMaterShortName.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterShortName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterShortName.Location = new System.Drawing.Point(941, 145);
- this.txtHMaterShortName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMaterShortName.Location = new System.Drawing.Point(706, 116);
this.txtHMaterShortName.Name = "txtHMaterShortName";
- this.txtHMaterShortName.Size = new System.Drawing.Size(249, 25);
+ this.txtHMaterShortName.Size = new System.Drawing.Size(188, 21);
this.txtHMaterShortName.TabIndex = 300;
this.txtHMaterShortName.Tag = "0";
//
@@ -1802,10 +1848,9 @@
//
this.label57.AutoSize = true;
this.label57.ForeColor = System.Drawing.Color.Black;
- this.label57.Location = new System.Drawing.Point(841, 149);
- this.label57.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label57.Location = new System.Drawing.Point(631, 119);
this.label57.Name = "label57";
- this.label57.Size = new System.Drawing.Size(82, 15);
+ this.label57.Size = new System.Drawing.Size(65, 12);
this.label57.TabIndex = 299;
this.label57.Text = "鍘熸潗鏂欑畝绉�";
//
@@ -1813,10 +1858,9 @@
//
this.txtHProdType.BackColor = System.Drawing.SystemColors.Window;
this.txtHProdType.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProdType.Location = new System.Drawing.Point(532, 145);
- this.txtHProdType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHProdType.Location = new System.Drawing.Point(399, 116);
this.txtHProdType.Name = "txtHProdType";
- this.txtHProdType.Size = new System.Drawing.Size(249, 25);
+ this.txtHProdType.Size = new System.Drawing.Size(188, 21);
this.txtHProdType.TabIndex = 298;
this.txtHProdType.Tag = "0";
//
@@ -1824,10 +1868,9 @@
//
this.label56.AutoSize = true;
this.label56.ForeColor = System.Drawing.Color.Black;
- this.label56.Location = new System.Drawing.Point(429, 149);
- this.label56.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label56.Location = new System.Drawing.Point(322, 119);
this.label56.Name = "label56";
- this.label56.Size = new System.Drawing.Size(67, 15);
+ this.label56.Size = new System.Drawing.Size(53, 12);
this.label56.TabIndex = 297;
this.label56.Text = "鐢熶骇绫诲瀷";
//
@@ -1835,10 +1878,9 @@
//
this.txtHMaterNumber_D.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterNumber_D.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterNumber_D.Location = new System.Drawing.Point(144, 145);
- this.txtHMaterNumber_D.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMaterNumber_D.Location = new System.Drawing.Point(108, 116);
this.txtHMaterNumber_D.Name = "txtHMaterNumber_D";
- this.txtHMaterNumber_D.Size = new System.Drawing.Size(249, 25);
+ this.txtHMaterNumber_D.Size = new System.Drawing.Size(188, 21);
this.txtHMaterNumber_D.TabIndex = 296;
this.txtHMaterNumber_D.Tag = "0";
//
@@ -1846,10 +1888,9 @@
//
this.label55.AutoSize = true;
this.label55.ForeColor = System.Drawing.Color.Black;
- this.label55.Location = new System.Drawing.Point(36, 149);
- this.label55.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label55.Location = new System.Drawing.Point(27, 119);
this.label55.Name = "label55";
- this.label55.Size = new System.Drawing.Size(90, 15);
+ this.label55.Size = new System.Drawing.Size(71, 12);
this.label55.TabIndex = 295;
this.label55.Text = "鍘熸潗鏂欑紪鍙稤";
//
@@ -1857,10 +1898,9 @@
//
this.txtHMaterNumber_C.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterNumber_C.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterNumber_C.Location = new System.Drawing.Point(941, 111);
- this.txtHMaterNumber_C.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMaterNumber_C.Location = new System.Drawing.Point(706, 89);
this.txtHMaterNumber_C.Name = "txtHMaterNumber_C";
- this.txtHMaterNumber_C.Size = new System.Drawing.Size(249, 25);
+ this.txtHMaterNumber_C.Size = new System.Drawing.Size(188, 21);
this.txtHMaterNumber_C.TabIndex = 294;
this.txtHMaterNumber_C.Tag = "0";
//
@@ -1868,10 +1908,9 @@
//
this.label54.AutoSize = true;
this.label54.ForeColor = System.Drawing.Color.Black;
- this.label54.Location = new System.Drawing.Point(841, 115);
- this.label54.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label54.Location = new System.Drawing.Point(631, 92);
this.label54.Name = "label54";
- this.label54.Size = new System.Drawing.Size(90, 15);
+ this.label54.Size = new System.Drawing.Size(71, 12);
this.label54.TabIndex = 293;
this.label54.Text = "鍘熸潗鏂欑紪鍙稢";
//
@@ -1879,10 +1918,9 @@
//
this.txtHMaterNumber_B.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterNumber_B.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterNumber_B.Location = new System.Drawing.Point(532, 111);
- this.txtHMaterNumber_B.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMaterNumber_B.Location = new System.Drawing.Point(399, 89);
this.txtHMaterNumber_B.Name = "txtHMaterNumber_B";
- this.txtHMaterNumber_B.Size = new System.Drawing.Size(249, 25);
+ this.txtHMaterNumber_B.Size = new System.Drawing.Size(188, 21);
this.txtHMaterNumber_B.TabIndex = 292;
this.txtHMaterNumber_B.Tag = "0";
//
@@ -1890,10 +1928,9 @@
//
this.label53.AutoSize = true;
this.label53.ForeColor = System.Drawing.Color.Black;
- this.label53.Location = new System.Drawing.Point(429, 115);
- this.label53.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label53.Location = new System.Drawing.Point(322, 92);
this.label53.Name = "label53";
- this.label53.Size = new System.Drawing.Size(90, 15);
+ this.label53.Size = new System.Drawing.Size(71, 12);
this.label53.TabIndex = 291;
this.label53.Text = "鍘熸潗鏂欑紪鍙稡";
//
@@ -1901,10 +1938,9 @@
//
this.txtHMaterNumber_A.BackColor = System.Drawing.SystemColors.Window;
this.txtHMaterNumber_A.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHMaterNumber_A.Location = new System.Drawing.Point(144, 111);
- this.txtHMaterNumber_A.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHMaterNumber_A.Location = new System.Drawing.Point(108, 89);
this.txtHMaterNumber_A.Name = "txtHMaterNumber_A";
- this.txtHMaterNumber_A.Size = new System.Drawing.Size(249, 25);
+ this.txtHMaterNumber_A.Size = new System.Drawing.Size(188, 21);
this.txtHMaterNumber_A.TabIndex = 290;
this.txtHMaterNumber_A.Tag = "0";
//
@@ -1912,10 +1948,9 @@
//
this.label52.AutoSize = true;
this.label52.ForeColor = System.Drawing.Color.Black;
- this.label52.Location = new System.Drawing.Point(36, 115);
- this.label52.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label52.Location = new System.Drawing.Point(27, 92);
this.label52.Name = "label52";
- this.label52.Size = new System.Drawing.Size(90, 15);
+ this.label52.Size = new System.Drawing.Size(71, 12);
this.label52.TabIndex = 289;
this.label52.Text = "鍘熸潗鏂欑紪鍙稟";
//
@@ -1923,10 +1958,9 @@
//
this.txtHImportNote.BackColor = System.Drawing.SystemColors.Window;
this.txtHImportNote.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHImportNote.Location = new System.Drawing.Point(941, 78);
- this.txtHImportNote.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHImportNote.Location = new System.Drawing.Point(706, 62);
this.txtHImportNote.Name = "txtHImportNote";
- this.txtHImportNote.Size = new System.Drawing.Size(249, 25);
+ this.txtHImportNote.Size = new System.Drawing.Size(188, 21);
this.txtHImportNote.TabIndex = 288;
this.txtHImportNote.Tag = "0";
//
@@ -1934,10 +1968,9 @@
//
this.label51.AutoSize = true;
this.label51.ForeColor = System.Drawing.Color.Black;
- this.label51.Location = new System.Drawing.Point(841, 81);
- this.label51.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label51.Location = new System.Drawing.Point(631, 65);
this.label51.Name = "label51";
- this.label51.Size = new System.Drawing.Size(67, 15);
+ this.label51.Size = new System.Drawing.Size(53, 12);
this.label51.TabIndex = 287;
this.label51.Text = "閲嶈鎻愮ず";
//
@@ -1945,10 +1978,9 @@
//
this.txtHWorkRemark.BackColor = System.Drawing.SystemColors.Window;
this.txtHWorkRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHWorkRemark.Location = new System.Drawing.Point(532, 78);
- this.txtHWorkRemark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHWorkRemark.Location = new System.Drawing.Point(399, 62);
this.txtHWorkRemark.Name = "txtHWorkRemark";
- this.txtHWorkRemark.Size = new System.Drawing.Size(249, 25);
+ this.txtHWorkRemark.Size = new System.Drawing.Size(188, 21);
this.txtHWorkRemark.TabIndex = 286;
this.txtHWorkRemark.Tag = "0";
//
@@ -1956,10 +1988,9 @@
//
this.label50.AutoSize = true;
this.label50.ForeColor = System.Drawing.Color.Black;
- this.label50.Location = new System.Drawing.Point(429, 81);
- this.label50.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label50.Location = new System.Drawing.Point(322, 65);
this.label50.Name = "label50";
- this.label50.Size = new System.Drawing.Size(67, 15);
+ this.label50.Size = new System.Drawing.Size(53, 12);
this.label50.TabIndex = 285;
this.label50.Text = "鐢熶骇澶囨敞";
//
@@ -1967,10 +1998,9 @@
//
this.txtHCusName.BackColor = System.Drawing.SystemColors.Window;
this.txtHCusName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHCusName.Location = new System.Drawing.Point(144, 78);
- this.txtHCusName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHCusName.Location = new System.Drawing.Point(108, 62);
this.txtHCusName.Name = "txtHCusName";
- this.txtHCusName.Size = new System.Drawing.Size(249, 25);
+ this.txtHCusName.Size = new System.Drawing.Size(188, 21);
this.txtHCusName.TabIndex = 284;
this.txtHCusName.Tag = "0";
//
@@ -1978,10 +2008,9 @@
//
this.label49.AutoSize = true;
this.label49.ForeColor = System.Drawing.Color.Black;
- this.label49.Location = new System.Drawing.Point(36, 81);
- this.label49.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label49.Location = new System.Drawing.Point(27, 65);
this.label49.Name = "label49";
- this.label49.Size = new System.Drawing.Size(67, 15);
+ this.label49.Size = new System.Drawing.Size(53, 12);
this.label49.TabIndex = 283;
this.label49.Text = "瀹㈡埛鍚嶇О";
//
@@ -1989,10 +2018,9 @@
//
this.txtHProdMaterName.BackColor = System.Drawing.SystemColors.Window;
this.txtHProdMaterName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProdMaterName.Location = new System.Drawing.Point(941, 42);
- this.txtHProdMaterName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHProdMaterName.Location = new System.Drawing.Point(706, 34);
this.txtHProdMaterName.Name = "txtHProdMaterName";
- this.txtHProdMaterName.Size = new System.Drawing.Size(249, 25);
+ this.txtHProdMaterName.Size = new System.Drawing.Size(188, 21);
this.txtHProdMaterName.TabIndex = 282;
this.txtHProdMaterName.Tag = "0";
//
@@ -2000,10 +2028,9 @@
//
this.label48.AutoSize = true;
this.label48.ForeColor = System.Drawing.Color.Black;
- this.label48.Location = new System.Drawing.Point(841, 46);
- this.label48.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label48.Location = new System.Drawing.Point(631, 37);
this.label48.Name = "label48";
- this.label48.Size = new System.Drawing.Size(67, 15);
+ this.label48.Size = new System.Drawing.Size(53, 12);
this.label48.TabIndex = 281;
this.label48.Text = "浜у搧鍚嶇О";
//
@@ -2011,10 +2038,9 @@
//
this.txtHPlanSendGoodsDate.BackColor = System.Drawing.SystemColors.Window;
this.txtHPlanSendGoodsDate.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHPlanSendGoodsDate.Location = new System.Drawing.Point(532, 42);
- this.txtHPlanSendGoodsDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHPlanSendGoodsDate.Location = new System.Drawing.Point(399, 34);
this.txtHPlanSendGoodsDate.Name = "txtHPlanSendGoodsDate";
- this.txtHPlanSendGoodsDate.Size = new System.Drawing.Size(249, 25);
+ this.txtHPlanSendGoodsDate.Size = new System.Drawing.Size(188, 21);
this.txtHPlanSendGoodsDate.TabIndex = 280;
this.txtHPlanSendGoodsDate.Tag = "0";
//
@@ -2022,10 +2048,9 @@
//
this.label47.AutoSize = true;
this.label47.ForeColor = System.Drawing.Color.Black;
- this.label47.Location = new System.Drawing.Point(429, 46);
- this.label47.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label47.Location = new System.Drawing.Point(322, 37);
this.label47.Name = "label47";
- this.label47.Size = new System.Drawing.Size(97, 15);
+ this.label47.Size = new System.Drawing.Size(77, 12);
this.label47.TabIndex = 279;
this.label47.Text = "棰勮鍑鸿揣鏃ユ湡";
//
@@ -2033,10 +2058,9 @@
//
this.txtHCusNeedMaterial.BackColor = System.Drawing.SystemColors.Window;
this.txtHCusNeedMaterial.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHCusNeedMaterial.Location = new System.Drawing.Point(144, 42);
- this.txtHCusNeedMaterial.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHCusNeedMaterial.Location = new System.Drawing.Point(108, 34);
this.txtHCusNeedMaterial.Name = "txtHCusNeedMaterial";
- this.txtHCusNeedMaterial.Size = new System.Drawing.Size(249, 25);
+ this.txtHCusNeedMaterial.Size = new System.Drawing.Size(188, 21);
this.txtHCusNeedMaterial.TabIndex = 278;
this.txtHCusNeedMaterial.Tag = "0";
//
@@ -2044,10 +2068,9 @@
//
this.label46.AutoSize = true;
this.label46.ForeColor = System.Drawing.Color.Black;
- this.label46.Location = new System.Drawing.Point(3, 46);
- this.label46.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label46.Location = new System.Drawing.Point(2, 37);
this.label46.Name = "label46";
- this.label46.Size = new System.Drawing.Size(127, 15);
+ this.label46.Size = new System.Drawing.Size(101, 12);
this.label46.TabIndex = 277;
this.label46.Text = "瀹㈡埛瑕佹眰鏉愭枡鎴愬垎";
//
@@ -2055,10 +2078,9 @@
//
this.txtHCusShortName.BackColor = System.Drawing.SystemColors.Window;
this.txtHCusShortName.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHCusShortName.Location = new System.Drawing.Point(941, 8);
- this.txtHCusShortName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHCusShortName.Location = new System.Drawing.Point(706, 6);
this.txtHCusShortName.Name = "txtHCusShortName";
- this.txtHCusShortName.Size = new System.Drawing.Size(249, 25);
+ this.txtHCusShortName.Size = new System.Drawing.Size(188, 21);
this.txtHCusShortName.TabIndex = 276;
this.txtHCusShortName.Tag = "0";
//
@@ -2066,10 +2088,9 @@
//
this.label45.AutoSize = true;
this.label45.ForeColor = System.Drawing.Color.Black;
- this.label45.Location = new System.Drawing.Point(841, 11);
- this.label45.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label45.Location = new System.Drawing.Point(631, 9);
this.label45.Name = "label45";
- this.label45.Size = new System.Drawing.Size(67, 15);
+ this.label45.Size = new System.Drawing.Size(53, 12);
this.label45.TabIndex = 275;
this.label45.Text = "瀹㈡埛绠�绉�";
//
@@ -2077,10 +2098,9 @@
//
this.txtHSeOrderBillNo.BackColor = System.Drawing.SystemColors.Window;
this.txtHSeOrderBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHSeOrderBillNo.Location = new System.Drawing.Point(532, 8);
- this.txtHSeOrderBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHSeOrderBillNo.Location = new System.Drawing.Point(399, 6);
this.txtHSeOrderBillNo.Name = "txtHSeOrderBillNo";
- this.txtHSeOrderBillNo.Size = new System.Drawing.Size(249, 25);
+ this.txtHSeOrderBillNo.Size = new System.Drawing.Size(188, 21);
this.txtHSeOrderBillNo.TabIndex = 274;
this.txtHSeOrderBillNo.Tag = "0";
//
@@ -2088,10 +2108,9 @@
//
this.label44.AutoSize = true;
this.label44.ForeColor = System.Drawing.Color.Black;
- this.label44.Location = new System.Drawing.Point(429, 11);
- this.label44.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label44.Location = new System.Drawing.Point(322, 9);
this.label44.Name = "label44";
- this.label44.Size = new System.Drawing.Size(82, 15);
+ this.label44.Size = new System.Drawing.Size(65, 12);
this.label44.TabIndex = 273;
this.label44.Text = "閿�鍞鍗曞彿";
//
@@ -2099,10 +2118,9 @@
//
this.txtHProdMaterCode.BackColor = System.Drawing.SystemColors.Window;
this.txtHProdMaterCode.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHProdMaterCode.Location = new System.Drawing.Point(144, 8);
- this.txtHProdMaterCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHProdMaterCode.Location = new System.Drawing.Point(108, 6);
this.txtHProdMaterCode.Name = "txtHProdMaterCode";
- this.txtHProdMaterCode.Size = new System.Drawing.Size(249, 25);
+ this.txtHProdMaterCode.Size = new System.Drawing.Size(188, 21);
this.txtHProdMaterCode.TabIndex = 272;
this.txtHProdMaterCode.Tag = "0";
//
@@ -2110,19 +2128,17 @@
//
this.label43.AutoSize = true;
this.label43.ForeColor = System.Drawing.Color.Black;
- this.label43.Location = new System.Drawing.Point(36, 11);
- this.label43.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label43.Location = new System.Drawing.Point(27, 9);
this.label43.Name = "label43";
- this.label43.Size = new System.Drawing.Size(69, 15);
+ this.label43.Size = new System.Drawing.Size(53, 12);
this.label43.TabIndex = 271;
this.label43.Text = "浜у搧CODE";
//
// pic1
//
- this.pic1.Location = new System.Drawing.Point(403, 4);
- this.pic1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.pic1.Location = new System.Drawing.Point(302, 3);
this.pic1.Name = "pic1";
- this.pic1.Size = new System.Drawing.Size(88, 38);
+ this.pic1.Size = new System.Drawing.Size(66, 30);
this.pic1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pic1.TabIndex = 36;
this.pic1.TabStop = false;
@@ -2132,10 +2148,9 @@
//
this.label33.AutoSize = true;
this.label33.ForeColor = System.Drawing.Color.Black;
- this.label33.Location = new System.Drawing.Point(589, 31);
- this.label33.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label33.Location = new System.Drawing.Point(442, 25);
this.label33.Name = "label33";
- this.label33.Size = new System.Drawing.Size(82, 15);
+ this.label33.Size = new System.Drawing.Size(65, 12);
this.label33.TabIndex = 298;
this.label33.Text = "娴佽浆鍗℃暟閲�";
this.label33.Visible = false;
@@ -2144,10 +2159,9 @@
//
this.label30.AutoSize = true;
this.label30.ForeColor = System.Drawing.Color.Black;
- this.label30.Location = new System.Drawing.Point(493, 34);
- this.label30.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label30.Location = new System.Drawing.Point(370, 27);
this.label30.Name = "label30";
- this.label30.Size = new System.Drawing.Size(69, 15);
+ this.label30.Size = new System.Drawing.Size(53, 12);
this.label30.TabIndex = 294;
this.label30.Text = "鎵� 鍙�";
this.label30.Visible = false;
@@ -2156,10 +2170,9 @@
//
this.txtHBatchNo.BackColor = System.Drawing.SystemColors.Window;
this.txtHBatchNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHBatchNo.Location = new System.Drawing.Point(592, 29);
- this.txtHBatchNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHBatchNo.Location = new System.Drawing.Point(444, 23);
this.txtHBatchNo.Name = "txtHBatchNo";
- this.txtHBatchNo.Size = new System.Drawing.Size(249, 25);
+ this.txtHBatchNo.Size = new System.Drawing.Size(188, 21);
this.txtHBatchNo.TabIndex = 295;
this.txtHBatchNo.Tag = "0";
this.txtHBatchNo.Visible = false;
@@ -2167,10 +2180,9 @@
// txtHInnerBillNo
//
this.txtHInnerBillNo.ImeMode = System.Windows.Forms.ImeMode.NoControl;
- this.txtHInnerBillNo.Location = new System.Drawing.Point(807, 15);
- this.txtHInnerBillNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHInnerBillNo.Location = new System.Drawing.Point(605, 12);
this.txtHInnerBillNo.Name = "txtHInnerBillNo";
- this.txtHInnerBillNo.Size = new System.Drawing.Size(249, 25);
+ this.txtHInnerBillNo.Size = new System.Drawing.Size(188, 21);
this.txtHInnerBillNo.TabIndex = 254;
this.txtHInnerBillNo.Tag = "0";
//
@@ -2198,20 +2210,18 @@
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(55, 658);
- this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panel2.Location = new System.Drawing.Point(41, 526);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(1249, 91);
+ this.panel2.Size = new System.Drawing.Size(1268, 73);
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(967, 59);
- this.txtHDeleteDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHDeleteDate.Location = new System.Drawing.Point(725, 47);
this.txtHDeleteDate.Name = "txtHDeleteDate";
- this.txtHDeleteDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHDeleteDate.Size = new System.Drawing.Size(98, 15);
this.txtHDeleteDate.TabIndex = 19;
//
// label25
@@ -2219,10 +2229,9 @@
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(888, 62);
- this.label25.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label25.Location = new System.Drawing.Point(666, 50);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(67, 15);
+ this.label25.Size = new System.Drawing.Size(53, 12);
this.label25.TabIndex = 18;
this.label25.Text = "浣滃簾鏃ユ湡";
//
@@ -2230,10 +2239,9 @@
//
this.txtHDeleteMan.BackColor = System.Drawing.Color.Transparent;
this.txtHDeleteMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHDeleteMan.Location = new System.Drawing.Point(967, 15);
- this.txtHDeleteMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHDeleteMan.Location = new System.Drawing.Point(725, 12);
this.txtHDeleteMan.Name = "txtHDeleteMan";
- this.txtHDeleteMan.Size = new System.Drawing.Size(131, 19);
+ this.txtHDeleteMan.Size = new System.Drawing.Size(98, 15);
this.txtHDeleteMan.TabIndex = 17;
//
// label27
@@ -2241,10 +2249,9 @@
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(888, 15);
- this.label27.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label27.Location = new System.Drawing.Point(666, 12);
this.label27.Name = "label27";
- this.label27.Size = new System.Drawing.Size(52, 15);
+ this.label27.Size = new System.Drawing.Size(41, 12);
this.label27.TabIndex = 16;
this.label27.Text = "浣滃簾浜�";
//
@@ -2252,10 +2259,9 @@
//
this.txtHUpDateDate.BackColor = System.Drawing.Color.Transparent;
this.txtHUpDateDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUpDateDate.Location = new System.Drawing.Point(749, 59);
- this.txtHUpDateDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHUpDateDate.Location = new System.Drawing.Point(562, 47);
this.txtHUpDateDate.Name = "txtHUpDateDate";
- this.txtHUpDateDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHUpDateDate.Size = new System.Drawing.Size(98, 15);
this.txtHUpDateDate.TabIndex = 15;
//
// label23
@@ -2263,10 +2269,9 @@
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(671, 59);
- this.label23.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label23.Location = new System.Drawing.Point(503, 47);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(67, 15);
+ this.label23.Size = new System.Drawing.Size(53, 12);
this.label23.TabIndex = 14;
this.label23.Text = "淇敼鏃ユ湡";
//
@@ -2274,10 +2279,9 @@
//
this.txtHUpDater.BackColor = System.Drawing.Color.Transparent;
this.txtHUpDater.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHUpDater.Location = new System.Drawing.Point(749, 15);
- this.txtHUpDater.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHUpDater.Location = new System.Drawing.Point(562, 12);
this.txtHUpDater.Name = "txtHUpDater";
- this.txtHUpDater.Size = new System.Drawing.Size(131, 19);
+ this.txtHUpDater.Size = new System.Drawing.Size(98, 15);
this.txtHUpDater.TabIndex = 13;
//
// label21
@@ -2285,10 +2289,9 @@
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(671, 15);
- this.label21.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label21.Location = new System.Drawing.Point(503, 12);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(52, 15);
+ this.label21.Size = new System.Drawing.Size(41, 12);
this.label21.TabIndex = 12;
this.label21.Text = "淇敼浜�";
//
@@ -2296,10 +2299,9 @@
//
this.txtHCloseDate.BackColor = System.Drawing.Color.Transparent;
this.txtHCloseDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCloseDate.Location = new System.Drawing.Point(529, 59);
- this.txtHCloseDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHCloseDate.Location = new System.Drawing.Point(397, 47);
this.txtHCloseDate.Name = "txtHCloseDate";
- this.txtHCloseDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHCloseDate.Size = new System.Drawing.Size(98, 15);
this.txtHCloseDate.TabIndex = 11;
//
// label19
@@ -2307,10 +2309,9 @@
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(451, 62);
- this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label19.Location = new System.Drawing.Point(338, 50);
this.label19.Name = "label19";
- this.label19.Size = new System.Drawing.Size(67, 15);
+ this.label19.Size = new System.Drawing.Size(53, 12);
this.label19.TabIndex = 10;
this.label19.Text = "鍏抽棴鏃ユ湡";
//
@@ -2318,10 +2319,9 @@
//
this.txtHCloseMan.BackColor = System.Drawing.Color.Transparent;
this.txtHCloseMan.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCloseMan.Location = new System.Drawing.Point(528, 16);
- this.txtHCloseMan.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHCloseMan.Location = new System.Drawing.Point(396, 13);
this.txtHCloseMan.Name = "txtHCloseMan";
- this.txtHCloseMan.Size = new System.Drawing.Size(131, 19);
+ this.txtHCloseMan.Size = new System.Drawing.Size(98, 15);
this.txtHCloseMan.TabIndex = 9;
//
// label17
@@ -2329,10 +2329,9 @@
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(451, 20);
- this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label17.Location = new System.Drawing.Point(338, 16);
this.label17.Name = "label17";
- this.label17.Size = new System.Drawing.Size(52, 15);
+ this.label17.Size = new System.Drawing.Size(41, 12);
this.label17.TabIndex = 8;
this.label17.Text = "鍏抽棴浜�";
//
@@ -2340,10 +2339,9 @@
//
this.txtHCheckDate.BackColor = System.Drawing.Color.Transparent;
this.txtHCheckDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHCheckDate.Location = new System.Drawing.Point(312, 59);
- this.txtHCheckDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHCheckDate.Location = new System.Drawing.Point(234, 47);
this.txtHCheckDate.Name = "txtHCheckDate";
- this.txtHCheckDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHCheckDate.Size = new System.Drawing.Size(98, 15);
this.txtHCheckDate.TabIndex = 7;
//
// label15
@@ -2351,10 +2349,9 @@
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(233, 62);
- this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label15.Location = new System.Drawing.Point(175, 50);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(67, 15);
+ this.label15.Size = new System.Drawing.Size(53, 12);
this.label15.TabIndex = 6;
this.label15.Text = "瀹℃牳鏃ユ湡";
//
@@ -2362,10 +2359,9 @@
//
this.txtHChecker.BackColor = System.Drawing.Color.Transparent;
this.txtHChecker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHChecker.Location = new System.Drawing.Point(312, 16);
- this.txtHChecker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHChecker.Location = new System.Drawing.Point(234, 13);
this.txtHChecker.Name = "txtHChecker";
- this.txtHChecker.Size = new System.Drawing.Size(131, 19);
+ this.txtHChecker.Size = new System.Drawing.Size(98, 15);
this.txtHChecker.TabIndex = 5;
//
// label13
@@ -2373,10 +2369,9 @@
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(233, 20);
- this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label13.Location = new System.Drawing.Point(175, 16);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(52, 15);
+ this.label13.Size = new System.Drawing.Size(41, 12);
this.label13.TabIndex = 4;
this.label13.Text = "瀹℃牳浜�";
//
@@ -2384,10 +2379,9 @@
//
this.txtHMakeDate.BackColor = System.Drawing.Color.Transparent;
this.txtHMakeDate.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHMakeDate.Location = new System.Drawing.Point(95, 59);
- this.txtHMakeDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHMakeDate.Location = new System.Drawing.Point(71, 47);
this.txtHMakeDate.Name = "txtHMakeDate";
- this.txtHMakeDate.Size = new System.Drawing.Size(131, 19);
+ this.txtHMakeDate.Size = new System.Drawing.Size(98, 15);
this.txtHMakeDate.TabIndex = 3;
//
// label11
@@ -2395,10 +2389,9 @@
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(16, 62);
- this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label11.Location = new System.Drawing.Point(12, 50);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(67, 15);
+ this.label11.Size = new System.Drawing.Size(53, 12);
this.label11.TabIndex = 2;
this.label11.Text = "鍒跺崟鏃ユ湡";
//
@@ -2406,10 +2399,9 @@
//
this.txtHMaker.BackColor = System.Drawing.Color.Transparent;
this.txtHMaker.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.txtHMaker.Location = new System.Drawing.Point(95, 16);
- this.txtHMaker.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.txtHMaker.Location = new System.Drawing.Point(71, 13);
this.txtHMaker.Name = "txtHMaker";
- this.txtHMaker.Size = new System.Drawing.Size(131, 19);
+ this.txtHMaker.Size = new System.Drawing.Size(98, 15);
this.txtHMaker.TabIndex = 1;
//
// label8
@@ -2417,10 +2409,9 @@
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(16, 20);
- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label8.Location = new System.Drawing.Point(12, 16);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(52, 15);
+ this.label8.Size = new System.Drawing.Size(41, 12);
this.label8.TabIndex = 0;
this.label8.Text = "鍒跺崟浜�";
//
@@ -2432,30 +2423,27 @@
// panel1
//
this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
- this.panel1.Location = new System.Drawing.Point(0, 62);
- this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panel1.Location = new System.Drawing.Point(0, 50);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(55, 687);
+ this.panel1.Size = new System.Drawing.Size(41, 549);
this.panel1.TabIndex = 33;
//
// panel3
//
this.panel3.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel3.Location = new System.Drawing.Point(1304, 62);
- this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panel3.Location = new System.Drawing.Point(1309, 50);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(52, 687);
+ this.panel3.Size = new System.Drawing.Size(39, 549);
this.panel3.TabIndex = 34;
//
// grdPrint
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- this.grdPrint.Location = new System.Drawing.Point(1079, 679);
- this.grdPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.grdPrint.Location = new System.Drawing.Point(809, 543);
this.grdPrint.Name = "grdPrint";
this.grdPrint.RowHeadersWidth = 51;
this.grdPrint.RowTemplate.Height = 23;
- this.grdPrint.Size = new System.Drawing.Size(33, 30);
+ this.grdPrint.Size = new System.Drawing.Size(25, 24);
this.grdPrint.TabIndex = 46;
this.grdPrint.Visible = false;
//
@@ -2463,11 +2451,10 @@
//
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabControl1.Location = new System.Drawing.Point(55, 380);
- this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabControl1.Location = new System.Drawing.Point(41, 304);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
- this.tabControl1.Size = new System.Drawing.Size(1249, 278);
+ this.tabControl1.Size = new System.Drawing.Size(1268, 222);
this.tabControl1.TabIndex = 55;
//
// tabPage1
@@ -2475,11 +2462,10 @@
this.tabPage1.Controls.Add(this.grdMain);
this.tabPage1.Controls.Add(this.grdSum);
this.tabPage1.Controls.Add(this.panel6);
- this.tabPage1.Location = new System.Drawing.Point(4, 25);
- this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tabPage1.Size = new System.Drawing.Size(1241, 249);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+ this.tabPage1.Size = new System.Drawing.Size(1260, 196);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鏄庣粏淇℃伅";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -2493,13 +2479,12 @@
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, 4, 4, 4);
+ this.grdMain.Location = new System.Drawing.Point(3, 3);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 30;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1233, 187);
+ this.grdMain.Size = new System.Drawing.Size(1254, 146);
this.grdMain.TabIndex = 58;
this.grdMain.RowHeadersWidthChanged += new System.EventHandler(this.grdMain_RowHeadersWidthChanged);
this.grdMain.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.grdMain_CellBeginEdit);
@@ -2518,14 +2503,13 @@
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(4, 191);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.grdSum.Location = new System.Drawing.Point(3, 149);
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(1233, 24);
+ this.grdSum.Size = new System.Drawing.Size(1254, 19);
this.grdSum.TabIndex = 57;
//
// panel6
@@ -2534,34 +2518,35 @@
this.panel6.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.panel6.Controls.Add(this.lblHStockQty);
this.panel6.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel6.Location = new System.Drawing.Point(4, 215);
- this.panel6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panel6.Location = new System.Drawing.Point(3, 168);
this.panel6.Name = "panel6";
- this.panel6.Size = new System.Drawing.Size(1233, 30);
+ this.panel6.Size = new System.Drawing.Size(1254, 25);
this.panel6.TabIndex = 56;
//
// lblHStockQty
//
this.lblHStockQty.AutoSize = true;
- this.lblHStockQty.Location = new System.Drawing.Point(11, 8);
- this.lblHStockQty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblHStockQty.Location = new System.Drawing.Point(8, 6);
this.lblHStockQty.Name = "lblHStockQty";
- this.lblHStockQty.Size = new System.Drawing.Size(0, 15);
+ this.lblHStockQty.Size = new System.Drawing.Size(0, 12);
this.lblHStockQty.TabIndex = 0;
//
- // 闅愯棌鍒楄缃甌oolStripMenuItem
+ // textHPicNumVer
//
- this.闅愯棌鍒楄缃甌oolStripMenuItem.Name = "闅愯棌鍒楄缃甌oolStripMenuItem";
- this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(224, 26);
- this.闅愯棌鍒楄缃甌oolStripMenuItem.Text = "闅愯棌鍒楄缃�";
- this.闅愯棌鍒楄缃甌oolStripMenuItem.Click += new System.EventHandler(this.闅愯棌鍒楄缃甌oolStripMenuItem_Click_1);
+ this.textHPicNumVer.BackColor = System.Drawing.SystemColors.Window;
+ this.textHPicNumVer.ImeMode = System.Windows.Forms.ImeMode.NoControl;
+ this.textHPicNumVer.Location = new System.Drawing.Point(1000, 23);
+ this.textHPicNumVer.Name = "textHPicNumVer";
+ this.textHPicNumVer.Size = new System.Drawing.Size(188, 21);
+ this.textHPicNumVer.TabIndex = 337;
+ this.textHPicNumVer.Tag = "0";
//
// Sc_ProcessExchangeBill
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.Lavender;
- this.ClientSize = new System.Drawing.Size(1356, 749);
+ this.ClientSize = new System.Drawing.Size(1348, 599);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.panel2);
this.Controls.Add(this.P1);
@@ -2575,7 +2560,6 @@
this.Controls.Add(this.label30);
this.ForeColor = System.Drawing.Color.Black;
this.KeyPreview = true;
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Sc_ProcessExchangeBill";
this.Text = "宸ュ簭娴佽浆鍗�";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -2806,5 +2790,16 @@
private System.Windows.Forms.TextBox txtHProdMaterCode;
private System.Windows.Forms.Label label43;
private System.Windows.Forms.ToolStripMenuItem 闅愯棌鍒楄缃甌oolStripMenuItem;
+ private System.Windows.Forms.ToolStripButton fz;
+ private System.Windows.Forms.TextBox textHProductNum;
+ private System.Windows.Forms.TextBox textHMaterTexture;
+ private System.Windows.Forms.Label label62;
+ private System.Windows.Forms.TextBox textHVerNum;
+ private System.Windows.Forms.Label label63;
+ private System.Windows.Forms.Label label64;
+ private System.Windows.Forms.Label label65;
+ private System.Windows.Forms.TextBox textHPicNumAssemble;
+ private System.Windows.Forms.Label label66;
+ private System.Windows.Forms.TextBox textHPicNumVer;
}
}
\ No newline at end of file
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.resx" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.resx"
index 832c83e..3c16d4c 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.resx"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill.resx"
@@ -360,7 +360,7 @@
<data name="set.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADwSURBVDhPhY+xDYUwDESz09/pr8ACiBGQ6Cj+IFRU6akY
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADwSURBVDhPhY+xDYUwDESz09/pr8ACiBGQ6Cj+IFRU6akY
go7OP2dzliGROOkp2Pgucer7XkC6xDr0ZRgGx6aCaA6GluQ4DjnPsw6KAeu66jdOEkI1AOz7jp4RjErD
TKBodvkQngYTQW9ZlvuNxl3cC88rpYNe13UaAtDDiR4otZm5F2/iSjln2bZNhzGH3iNAPIBo0yQ5fTQE
wIhZUgXwmXkqpoIGXOZxHJVorgJ02IwqrjHPv8rME/81AAV2ZYDkr79imqbqBWo0TAyBCeZWQDT67UG+
@@ -370,7 +370,7 @@
<data name="dy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADmSURBVDhPlY6xDYMwFES9U3bKCmzACEh0FJmACRiAnoqK
jo6OzvH7yVk/OFHg0MnC/vfuhzOq6zrK76vzIrRtm3nf92sgBpdlieu6ZgCe5xmAXEot0zTZMABBXLiU
grRUVRWHYTATYpOfYR9kiGbMnQelUTu5wzmsoDWk796GOI6jGRDDzH0BxAyQ1Z5e4xhuGUSQWbkAaE2B
FMRN05h9uAD4JoHato1d9yjCOjOAH9Y+QggDOW5gwZdfEgR7iAf4YG53yq0eBADzjlWk/+QP2WXf9xmk
@@ -380,7 +380,7 @@
<data name="yl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF/SURBVDhPnZFNSwJBAIbnX1Q/IOoYeAzqHh3C6JAgJEgU
UQgaeQgxKZQwtBRC7YsiOnQPISISKyEPUrcgKqIipNQ11/XzbWfQdf1IxQceZnaYeVhmiNV9AIvDB/OG
V3JF/F5z7cK9fwrSCtP6NhrhdNyxsWXEuOpkGwvFoiTFbg+xkdI0YjDb2aZsLi9J8fouMDqhhlKlhcm2
9X9At2xlB1JCFnzJdCaHAl3jBeSyWWZpez3zSxYW4FIZJPmKQqZ0cDpcbS0zehML/HA8Ysk0k09npMNK
@@ -393,7 +393,7 @@
<data name="xz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG3SURBVDhPfVLdK0NhHH5LSXGn/QculCsfUbtRLl1JbhQh
taxNNPnOolY+yhjjQo12oRQ3bhWiZGULF3Kv5Nucbeacs4/HeX/HnJ289tRT7+/5/Z7nfc+vw+bXgvD4
NuFZDojpC2DOvwX/1i6YCDPeDXEjDyu+C5oRhrgX1knMZrMQkfe83vNf45+QydlVEtKZDETkvaWlkMlk
Chn3LFOhptIQMQsgsHmElvYetHXYcHB4YgpjIzOLJMhKCiIqagoZLUVKJPEWlWg2UlOKs3KmB7ncC3RI
@@ -407,7 +407,7 @@
<data name="xg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHvSURBVDhPnZJNSFRRGIYPCBHYLl24d9EiKsuN48KNBbUo
EGSEmEwXoo0iRkR/ZBkSaC3m74qmC3/GjS7Edv5RTQNCMzUyNMWUWFaTo6AIaqjQ2/d999id61SLXnjh
cr73ec8991yVqXZPLzq9PfD6e+AL2M1rnZ4n4IyO29Xa0YUf27twhwDlJfv3mdaawz8lw1mNWbrV7sHa
6jrcUxsYTOOPbprelAxnNWbp+r1HWF1ZhnoMDHwFKp8BeYO0s0+b38IDyXBWY5au3nmIdOqbhC6HgYIh
@@ -422,7 +422,7 @@
<data name="sc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG5SURBVDhPlZDrK4NhGMafP8BHf4BPwkfmq8NnvhKlUHxw
iEgSIsQKqcVyPjQ2Z9mS0ooSlqElQ07RaGRib6zmeHmf27O3zSZcdbXnfp77+r33PRZKZdXN8Le4/pt4
wO15g0vykvn5V4j/1/5iEfsSv/iPbPbjQAgvHp5ecXrlwv6ZE7bDC1h2j7BitWNpzYZ5swUG0zL6Jxag
GZxCe68+GFBe14rjkzOMjs9iSD+DPt0ktAN6dHQPQ63pR0N7N+pbtdBNL6KmRRNijVo1jWexHcLjfcbN
@@ -433,10 +433,21 @@
SUVORK5CYII=
</value>
</data>
+ <data name="fz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEXSURBVDhPpZG/TsJQFMbvO/kOsjrAzNI+Qu0L4MzCwg66
+ mMgAC2wYmEggECCQdtDUuGhQFiWQfJxz7+0VUmgv8SRn6T395fsjeAbVK5SLInV934c8PjUMAAbYbrr4
+ WTWxfqvjc1nB+7CE154nAXR2HhIDdhLQIkANHwsG3BnA9PHmPOQYoBRIwKiEFwLQydEmIAbwqxR8swK2
+ MCIFfQ9B28H8qYDxw3UGgBV8ESD6A7CCkAENBuTSAYchqgxUiEHbxayRx+Q+A7DbPGuAVsAhsoWOSxby
+ GGcDdAsRKTA13koF0oKdAl2jzCC24JAFiwxMC7GCRAs2Fg5bMCFyC9YZJFsIKcTUFmjkg+2eAgj+eMnq
+ 3/47QuwBNTYBELFI9AQAAAAASUVORK5CYII=
+</value>
+ </data>
<data name="AddRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEdSURBVDhPY/hPIWCws7P7TypGBmADPHb8B2OnLT//W6/5
9N9w6cv/mnMf/FeYeuO/eN/5/3xtx/4z1+wBY9oYUJCfTzTGasCqlSv/v3n9mihM0IDLly7937N79/+t
W7aAxZcuWQLHCgoKcAwDWA04evHY/1U7VmNgkMaSuw3/ra2todqRDIDZvHD9ov996yf+r1pa/z9rct7/
mOZEuK0S7Wr/rc75gGmYGIoBIJu3nt/xf+n5Vf9nnZv/f8r52f9b93XDbQbhkGspYHrS09mYBsBcMHXD
@@ -447,7 +458,7 @@
<data name="DelRow.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADSSURBVDhPlZPRDYQgEERpxgaswlCGv/ZBSXwbC6AAC7AA
G9hj1huCuMS7SUYi8l4IqhvHUf5tHRWc59ntcRy3dgXrusq2baUppUf3fe8L3mD0J0EPZLsCC0Sdcw8B
5hgV4HBaEIt14bIUCYUyTUViCmpYhqFICLM61wq41YcEbeDbDmqwbpEYMKICC0QhRhUwYMQUEGxhS6KC
EIJ472We51dYm8+DEr1Cgm8BkhijCeNe575vhZJLk8OdQMCvkhKM+FfwjBIdc4oAgaQtFlpzV0Q+Xg/P
@@ -457,7 +468,7 @@
<data name="bc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH1SURBVDhPjZPNSxRxGMcfI+jQLTxYIKLoQQsjvEadEoRO
/gO+awReIiGty97sRQtbPSmoB8FFMSwKDx3VXdvcfGErt9YlpWUJF/dFV2d0v36fHc0XdPALX2bmme/z
mec38xuRBi+kahqRVmD5yfmsWe3J9ErtDD6tAQkAv85pzWqP9oo0foVcbWcJMEwDpmnaWjMqyWlHplfq
ZlD2IVPD5CTgnra3ZlTN3oMJaj24NWYVk6kUNrbsrRlV+QQBNZ7jgKkpPsVtb82oCl06wQnAv1gCa/Gk
@@ -472,7 +483,7 @@
<data name="fq.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACfSURBVDhPYyAGsGWf/Q9lkglSz/xnSANiskHCqf9///8n
wxCQBhAOPfp/ytn/JBgCUpQIsRWGQQYQZwhQ8ilQEQj3XwAqnokFG8/EbwDMNrhiUCCSohluM0wxzAC8
mkEAagBYMbI/QQYQ1AwCuAwgSjMI4DKAaIBkwD2C0YULAJ2LYQgMEwWgBiAbAsMkGQLGoLBAxyR5C2YQ
OoYDBgYA9kn+I3B8Li4AAAAASUVORK5CYII=
@@ -481,7 +492,7 @@
<data name="sh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc
d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t
hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH
M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj
@@ -494,7 +505,7 @@
<data name="qsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGPSURBVDhPlZLLK0RhGMbfsrVRtkp2k4UFsUOxsPAn2NoI
C0MzEmpQFi4LpWEjUhaGMYqyUINQjEtqGEqkcZkY4zLO1CGP73vPN2cujdtTv97vPd/7PL2ncyhZTTWE
TKjrn6UGUVRgVElhnlF/DamvzjJN36FmMkteHk8RbhYJODXQNwnXHkJgmrA2+I+A51VC1Et4WPlnwN4Y
4UQMX7gIV27C5ZzR+8TzZccfA/bHCUcTBL/YRtZd5x8DpKoqyrE+RMzGMME7YHDlG4WUGvtZMsRtJ8bV
@@ -507,7 +518,7 @@
<data name="sz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAClSURBVDhPxZNBCgMhDEVz1zmQSxkQXHoEj+CmdOtx0vyU
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAClSURBVDhPxZNBCgMhDEVz1zmQSxkQXHoEj+CmdOtx0vyU
wFhjqaXQDyGEn/8QZ6Sf6TgSn8x83phl5For+iDsSOPW2uRNgJzzsARfLPVKKXsAC8OXcYKrVoBreHU6
lQd4DW8BvPAWIISgPaX7d4AYo33KAYL54zvovWthNoh5yAzyAE+H6ApB3wZABkEtAdLeLhnE/RMhXBqC
KO8tQIC4b+FPInoA2b1WbweybUAAAAAASUVORK5CYII=
@@ -516,7 +527,7 @@
<data name="syz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACcSURBVDhPtZPBCcQgEEXtNVUFBI+WYAlewl4twxJm88RZ
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACcSURBVDhPtZPBCcQgEEXtNVUFBI+WYAlewl4twxJm88RZ
xDUbDeyDQWf4805q/o3U02yblbbq+JoakhhjCdPvIrIfUuYhhGsJ4TNXgt77ocA5NxboMuGz/QSnBO1y
H7wV9MtLgtHykiDnXIbWvp4JIKX0JaGfFkAv4b4kgFbCuSwAlVCPBKCS9iXSa90KAIn+BeD9s0j9/Avz
GPMGIZpkvqVDGAQAAAAASUVORK5CYII=
@@ -525,7 +536,7 @@
<data name="xyz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACYSURBVDhPrZMxDsMgEAT5qx9DSW0pEiVPoKSkSc9zNlmL
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACYSURBVDhPrZMxDsMgEAT5qx9DSW0pEiVPoKSkSc9zNlmL
i+wUezjKSifB6mZEYYe/ZNseOM+sj34edbi4A9ifIIBa6wFOAcYYWvQtyDl/BNZJiRK8K1/iCjzJyguk
ZEkwJey4c5GsCgxOKaG1dk9gcIwRpZR7L5AwowQuzCgB7xJmbNHGBDwTlLCF3z9Bjv0LTO/dh39PCC/T
8HpVcPCyWAAAAABJRU5ErkJggg==
@@ -534,7 +545,7 @@
<data name="mz.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAACXSURBVDhPrZPBCYAwDEW7a4fpsWdB6LEjdIRevHec2JQE
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACXSURBVDhPrZPBCYAwDEW7a4fpsWdB6LEjdIRevHec2JQE
NIlgxA9B6c97iGj4JTHuQLcq2F2Hju+hAsYYagG7DQC2A9ZOa01L1hItSIkUlFJswexNiU9gSNxPICV+
AUnwbFbfBAznnP0ChlNKUGv1CSTsegcWzN0rwbwoGPNKMLNACWNYzvMkCL13BXPw+0cQx/wXvieEEzaJ
cBFxK5ZNAAAAAElFTkSuQmCC
@@ -543,7 +554,7 @@
<data name="qt.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADvSURBVDhPzVLBCoJAEPUT/A5P/oh/4Vd19VBdig6egwg8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADvSURBVDhPzVLBCoJAEPUT/A5P/oh/4Vd19VBdig6egwg8
SZCIeIgIIYTIIiKiw752ZlcMS43q0IPB2dmZ994OGj+F53lwXRemaXJQTjV93Q5qlh/Yto1JkKM3XnJe
EqmuBmgVHop2QLIHZmsBPxFcI5JWJ6RAaukByM5AflEk05XAKBJ81+qCFMh2dgKKK3C8VSR+XLnQ7c8o
CdJCOpAk25qDToLyCWEO3kFMO9ioHfTDN57wuMR5JhBk0rocHiyUOt3paIZWYDUaoqCcahQYmnAcp53k
@@ -553,7 +564,7 @@
<data name="tc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADCSURBVDhPpZJdCoMwEIRzpxxJ6Ak2z/ZZnysIBXuUHMA7
bXeWrGBMYkoHh+gk8xl/XEneP7jXqXIWJkIgHscnT/PEy2vhz7ZhMQ/Dm5l3ObRcB1ACzAKQ6FTcV69G
rgWTbUl3QFQtFgGpfAAoAVDOi2ZbrwW5hwY4N+P6FmDlkrsBq6zOy3AXIEkhGHMbIMaorgGgI8Cu7CsY
wOZbAEgDBch/gOveRzgJAKLwH0CGJsDmxU1dAMiSu3R5iZr+oJuic1+SJ5jRbOqnmgAAAABJRU5ErkJg
@@ -563,7 +574,7 @@
<data name="yc.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD3SURBVDhPnZC9FYIwFEaZiQFkAB1ADzULZACGoJLKSio7
BqCzorNiABgABnjme+GFBPlR3znfSUJy7yMJdorG0S2KY1r6/lE0PBMcdA8z3NZEd9VtSmiolU7iSjwY
CcNyUUL0UhzMIcK4An8IPFjGr2F0s3CTmrFOLbgN67vK79LQsOCqQhaIxIE9AfXVxT4Wwzp1NsGYQ4b9
tjhSe4smiVKma19NL+4KBEQA85hH1OQH+T6T6MgagaArThys0V3g8ZwpgbryzBuIXAfB3iosZSUP3VEH
@@ -573,7 +584,7 @@
<data name="mrlk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH/SURBVDhPfZHfS1NhGMefkCLQu/A/6MK6SbMQFlg3dudN
oBFDY9BF05XMMAoLL3bhxGB4zjzoVCKim4iCgkCMSam1cqP9aO4YJlpIDmqh00IRv73Pe87OWuV54Mt7
znm/n895z0aF8Stj6FdGoARDUAf/H97jTp96FyZmjC8QwuRUBB0zACkiwT0i9rxvgBcvX4MZEye65Vex
vp6HJ7yJ+1nYpmNyE3nRZcbEiW74AljL5UB3gOk84J8HnFPA0UfirZqIaoZPMQDZZcbEibp6+vE9mwUF
@@ -588,7 +599,7 @@
<data name="bclk.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAH4SURBVDhPjZPNS1RRGMZfI2jRLlqUEKLUQgsl3EauEoRW
/QN+phG4CQXTNrPLbzFrpZAuBIfEqChctFRndHI0YzKnxkHFYQgH50NH5+o8Pm/HwQ/s4oGHc++5z/O7
77nnvSKPPZDyKYSfA8tN55N6NfMvK1XT+LIBxAH8PqfUqxnNitR+g1x/yQuRlJWCZVm2Uo965RozmpXq
aRR/Io1jYgJwTdlLPeqt92QqqHLj7phZTCST2Nqxl3rUWzrOTKX7JGBykm9x2Us96r3p1ApOAf5G49iI
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.cs"
index 0a629ae..659e23f 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.cs"
@@ -944,6 +944,7 @@
this.txtHWWOrderBillNo.Text = BillOld.omodel.HWWOrderBillNo;
this.txtHICMOBillNo.Text = BillOld.omodel.HICMOBillNo;
this.txtHICMOBillNo.Tag = BillOld.omodel.HICMOInterID.ToString();
+ this.txtHICMOEntryID.Text = BillOld.omodel.HICMOEntryID.ToString();
this.txtHExplanation.Text = BillOld.omodel.HExplanation;
this.txtHInnerBillNo.Text = BillOld.omodel.HInnerBillNo;
this.txtHBatchNo.Text = BillOld.omodel.HBatchNo;
@@ -1266,6 +1267,7 @@
BillNew.omodel.HWWOrderEntryID = ClsPub.isLong(this.txtHWWOrderEntryID.Text.ToString());
BillNew.omodel.HWWOrderBillNo = ClsPub.isStrNull(this.txtHWWOrderBillNo.Text);
BillNew.omodel.HICMOInterID = ClsPub.isLong(this.txtHICMOBillNo.Tag);
+ BillNew.omodel.HICMOEntryID = ClsPub.isLong(this.txtHICMOEntryID.Text);
BillNew.omodel.HICMOBillNo = ClsPub.isStrNull(this.txtHICMOBillNo.Text);
BillNew.omodel.HPrevMainSourceInterID = ClsPub.isLong(txtHPrevMainSourceInterID.Text);
BillNew.omodel.HMainSourceInterID = ClsPub.isLong(txtHMainSourceInterID.Text);
@@ -1372,6 +1374,7 @@
//
oSub.HICMOBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HICMOBillNoCol].Value);
oSub.HICMOInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HICMOInterIDCol].Value);
+ //oSub.HICMOEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HICMOEntryIDCol].Value);
oSub.HSeOrderInterID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSeOrderInterIDCol].Value);
oSub.HSeOrderEntryID = DBUtility.ClsPub.isLong(grdMain.Rows[i].Cells[HSeOrderEntryIDCol].Value);
oSub.HSeOrderBillNo = DBUtility.ClsPub.isStrNull(grdMain.Rows[i].Cells[HSeOrderBillNoCol].Value);
diff --git "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.designer.cs" "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.designer.cs"
index 8e362be..e37a8c9 100644
--- "a/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.designer.cs"
+++ "b/WorkM/\346\265\201\350\275\254\345\215\241\347\256\241\347\220\206/Sc_ProcessExchangeBill_CF.designer.cs"
@@ -163,6 +163,7 @@
this.grdSum = new System.Windows.Forms.DataGridView();
this.panel6 = new System.Windows.Forms.Panel();
this.lblHStockQty = new System.Windows.Forms.Label();
+ this.txtHICMOEntryID = new System.Windows.Forms.TextBox();
this.Tool.SuspendLayout();
this.P1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pic1)).BeginInit();
@@ -518,71 +519,71 @@
// 鍏抽棴ToolStripMenuItem
//
this.鍏抽棴ToolStripMenuItem.Name = "鍏抽棴ToolStripMenuItem";
- this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+ this.鍏抽棴ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.鍏抽棴ToolStripMenuItem.Text = "鍏抽棴";
this.鍏抽棴ToolStripMenuItem.Click += new System.EventHandler(this.鍏抽棴ToolStripMenuItem_Click);
//
// 鍙嶅叧闂璗oolStripMenuItem
//
this.鍙嶅叧闂璗oolStripMenuItem.Name = "鍙嶅叧闂璗oolStripMenuItem";
- this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+ this.鍙嶅叧闂璗oolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.鍙嶅叧闂璗oolStripMenuItem.Text = "鍙嶅叧闂�";
this.鍙嶅叧闂璗oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅叧闂璗oolStripMenuItem_Click);
//
// toolStripSeparator15
//
this.toolStripSeparator15.Name = "toolStripSeparator15";
- this.toolStripSeparator15.Size = new System.Drawing.Size(178, 6);
+ this.toolStripSeparator15.Size = new System.Drawing.Size(164, 6);
//
// 瀹℃牳ToolStripMenuItem
//
this.瀹℃牳ToolStripMenuItem.Name = "瀹℃牳ToolStripMenuItem";
- this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+ this.瀹℃牳ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.瀹℃牳ToolStripMenuItem.Text = "瀹℃牳";
this.瀹℃牳ToolStripMenuItem.Click += new System.EventHandler(this.瀹℃牳ToolStripMenuItem_Click);
//
// 鍙嶅鏍窽oolStripMenuItem
//
this.鍙嶅鏍窽oolStripMenuItem.Name = "鍙嶅鏍窽oolStripMenuItem";
- this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+ this.鍙嶅鏍窽oolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.鍙嶅鏍窽oolStripMenuItem.Text = "鍙嶅鏍�";
this.鍙嶅鏍窽oolStripMenuItem.Click += new System.EventHandler(this.鍙嶅鏍窽oolStripMenuItem_Click);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
- this.toolStripSeparator14.Size = new System.Drawing.Size(178, 6);
+ this.toolStripSeparator14.Size = new System.Drawing.Size(164, 6);
//
// 浣滃簾ToolStripMenuItem
//
this.浣滃簾ToolStripMenuItem.Name = "浣滃簾ToolStripMenuItem";
- this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+ this.浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.浣滃簾ToolStripMenuItem.Text = "浣滃簾";
this.浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.浣滃簾ToolStripMenuItem_Click);
//
// 鎾ら攢浣滃簾ToolStripMenuItem
//
this.鎾ら攢浣滃簾ToolStripMenuItem.Name = "鎾ら攢浣滃簾ToolStripMenuItem";
- this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+ this.鎾ら攢浣滃簾ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.鎾ら攢浣滃簾ToolStripMenuItem.Text = "鎾ら攢浣滃簾";
this.鎾ら攢浣滃簾ToolStripMenuItem.Click += new System.EventHandler(this.鎾ら攢浣滃簾ToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
- this.toolStripMenuItem1.Size = new System.Drawing.Size(178, 6);
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(164, 6);
//
// 闅愯棌鍒楄缃甌oolStripMenuItem
//
this.闅愯棌鍒楄缃甌oolStripMenuItem.Name = "闅愯棌鍒楄缃甌oolStripMenuItem";
- this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+ this.闅愯棌鍒楄缃甌oolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.闅愯棌鍒楄缃甌oolStripMenuItem.Text = "闅愯棌鍒楄缃�";
this.闅愯棌鍒楄缃甌oolStripMenuItem.Click += new System.EventHandler(this.闅愯棌鍒楄缃甌oolStripMenuItem_Click);
//
// 澶嶅埗鍗曟嵁ToolStripMenuItem
//
this.澶嶅埗鍗曟嵁ToolStripMenuItem.Name = "澶嶅埗鍗曟嵁ToolStripMenuItem";
- this.澶嶅埗鍗曟嵁ToolStripMenuItem.Size = new System.Drawing.Size(181, 26);
+ this.澶嶅埗鍗曟嵁ToolStripMenuItem.Size = new System.Drawing.Size(167, 26);
this.澶嶅埗鍗曟嵁ToolStripMenuItem.Text = "澶嶅埗鍗曟嵁";
this.澶嶅埗鍗曟嵁ToolStripMenuItem.Click += new System.EventHandler(this.澶嶅埗鍗曟嵁ToolStripMenuItem_Click);
//
@@ -672,6 +673,7 @@
// P1
//
this.P1.BackColor = System.Drawing.Color.Lavender;
+ this.P1.Controls.Add(this.txtHICMOEntryID);
this.P1.Controls.Add(this.pic1);
this.P1.Controls.Add(this.lblCaption);
this.P1.Controls.Add(this.gbUp);
@@ -1666,6 +1668,7 @@
this.grdPrint.Location = new System.Drawing.Point(1079, 679);
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(33, 30);
this.grdPrint.TabIndex = 46;
@@ -1734,6 +1737,7 @@
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(1233, 24);
@@ -1759,6 +1763,14 @@
this.lblHStockQty.Name = "lblHStockQty";
this.lblHStockQty.Size = new System.Drawing.Size(0, 15);
this.lblHStockQty.TabIndex = 0;
+ //
+ // txtHICMOEntryID
+ //
+ this.txtHICMOEntryID.Location = new System.Drawing.Point(785, 12);
+ this.txtHICMOEntryID.Name = "txtHICMOEntryID";
+ this.txtHICMOEntryID.Size = new System.Drawing.Size(100, 25);
+ this.txtHICMOEntryID.TabIndex = 277;
+ this.txtHICMOEntryID.Visible = false;
//
// Sc_ProcessExchangeBill_CF
//
@@ -1937,5 +1949,6 @@
private System.Windows.Forms.TextBox txtHPrevMainSourceInterID;
private System.Windows.Forms.Label label38;
private System.Windows.Forms.TextBox txtHOrderProcNO;
+ private System.Windows.Forms.TextBox txtHICMOEntryID;
}
}
\ No newline at end of file
--
Gitblit v1.9.1