From cb828d0bb553dd6e9ac386d7f7f71b611820c311 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 20 十二月 2024 15:37:14 +0800
Subject: [PATCH] 工单排产
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 91 +++--
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.resx | 117 ++++++++
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs | 4
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 130 +++++----
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs | 351 ++++++++----------------
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.resx | 117 ++++++++
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 16
8 files changed, 502 insertions(+), 328 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 48985a7..a645fe4 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <add key="WebApiUrl" value="http://localhost:5263/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index b4dc033..9ae2815 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -29,6 +29,7 @@
/// </summary>
private void InitializeComponent()
{
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Womcaa));
this.gvMx1scraprate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1scrapqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1denominator = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -114,6 +115,7 @@
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -484,7 +486,7 @@
this.gv_closeType.OptionsColumn.AllowEdit = false;
this.gv_closeType.Tag = "query_a.CLOSE_TYPE";
this.gv_closeType.Visible = true;
- this.gv_closeType.VisibleIndex = 29;
+ this.gv_closeType.VisibleIndex = 30;
this.gv_closeType.Width = 80;
//
// gv_forceCloserid
@@ -498,7 +500,7 @@
this.gv_forceCloserid.OptionsColumn.AllowEdit = false;
this.gv_forceCloserid.Tag = "query_a.FORCE_CLOSERID";
this.gv_forceCloserid.Visible = true;
- this.gv_forceCloserid.VisibleIndex = 28;
+ this.gv_forceCloserid.VisibleIndex = 29;
this.gv_forceCloserid.Width = 80;
//
// gv_saleOrderEntryseq
@@ -512,7 +514,7 @@
this.gv_saleOrderEntryseq.OptionsColumn.AllowEdit = false;
this.gv_saleOrderEntryseq.Tag = "query_a.SALE_ORDER_ENTRYSEQ";
this.gv_saleOrderEntryseq.Visible = true;
- this.gv_saleOrderEntryseq.VisibleIndex = 27;
+ this.gv_saleOrderEntryseq.VisibleIndex = 28;
this.gv_saleOrderEntryseq.Width = 50;
//
// lb_saleOrderNo
@@ -545,7 +547,7 @@
this.gv_saleOrderNo.OptionsColumn.AllowEdit = false;
this.gv_saleOrderNo.Tag = "query_a.SALE_ORDER_NO";
this.gv_saleOrderNo.Visible = true;
- this.gv_saleOrderNo.VisibleIndex = 26;
+ this.gv_saleOrderNo.VisibleIndex = 27;
this.gv_saleOrderNo.Width = 100;
//
// gv_srcBillentryseq
@@ -559,7 +561,7 @@
this.gv_srcBillentryseq.OptionsColumn.AllowEdit = false;
this.gv_srcBillentryseq.Tag = "query_a.SRC_BILLENTRYSEQ";
this.gv_srcBillentryseq.Visible = true;
- this.gv_srcBillentryseq.VisibleIndex = 25;
+ this.gv_srcBillentryseq.VisibleIndex = 26;
this.gv_srcBillentryseq.Width = 50;
//
// gv_srcBillNo
@@ -573,7 +575,7 @@
this.gv_srcBillNo.OptionsColumn.AllowEdit = false;
this.gv_srcBillNo.Tag = "query_a.SRC_BILL_NO";
this.gv_srcBillNo.Visible = true;
- this.gv_srcBillNo.VisibleIndex = 24;
+ this.gv_srcBillNo.VisibleIndex = 25;
this.gv_srcBillNo.Width = 100;
//
// gv_srcBillType
@@ -587,7 +589,7 @@
this.gv_srcBillType.OptionsColumn.AllowEdit = false;
this.gv_srcBillType.Tag = "query_a.SRC_BILL_TYPE";
this.gv_srcBillType.Visible = true;
- this.gv_srcBillType.VisibleIndex = 23;
+ this.gv_srcBillType.VisibleIndex = 24;
this.gv_srcBillType.Width = 60;
//
// gv_createType
@@ -601,7 +603,7 @@
this.gv_createType.OptionsColumn.AllowEdit = false;
this.gv_createType.Tag = "query_a.CREATE_TYPE";
this.gv_createType.Visible = true;
- this.gv_createType.VisibleIndex = 22;
+ this.gv_createType.VisibleIndex = 23;
this.gv_createType.Width = 100;
//
// lb_stockInlimitl
@@ -634,7 +636,7 @@
this.gv_stockInlimitl.OptionsColumn.AllowEdit = false;
this.gv_stockInlimitl.Tag = "query_a.STOCK_INLIMITL";
this.gv_stockInlimitl.Visible = true;
- this.gv_stockInlimitl.VisibleIndex = 31;
+ this.gv_stockInlimitl.VisibleIndex = 32;
this.gv_stockInlimitl.Width = 100;
//
// lb_stockInlimith
@@ -667,7 +669,7 @@
this.gv_stockInlimith.OptionsColumn.AllowEdit = false;
this.gv_stockInlimith.Tag = "query_a.STOCK_INLIMITH";
this.gv_stockInlimith.Visible = true;
- this.gv_stockInlimith.VisibleIndex = 30;
+ this.gv_stockInlimith.VisibleIndex = 31;
this.gv_stockInlimith.Width = 100;
//
// lb_depotCode
@@ -694,13 +696,13 @@
this.gv_depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_depotCode.AppearanceCell.Options.UseFont = true;
this.gv_depotCode.Caption = "浠撳簱";
- this.gv_depotCode.FieldName = "depotCode";
+ this.gv_depotCode.FieldName = "depotName";
this.gv_depotCode.MinWidth = 120;
this.gv_depotCode.Name = "gv_depotCode";
this.gv_depotCode.OptionsColumn.AllowEdit = false;
this.gv_depotCode.Tag = "query_a.DEPOT_CODE";
this.gv_depotCode.Visible = true;
- this.gv_depotCode.VisibleIndex = 8;
+ this.gv_depotCode.VisibleIndex = 9;
this.gv_depotCode.Width = 120;
//
// gv_caa024
@@ -714,7 +716,7 @@
this.gv_caa024.OptionsColumn.AllowEdit = false;
this.gv_caa024.Tag = "query_a.CAA024";
this.gv_caa024.Visible = true;
- this.gv_caa024.VisibleIndex = 18;
+ this.gv_caa024.VisibleIndex = 19;
this.gv_caa024.Width = 60;
//
// gv_checkUser
@@ -728,7 +730,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.CHECK_USER";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 13;
+ this.gv_checkUser.VisibleIndex = 14;
this.gv_checkUser.Width = 50;
//
// gv_fstatus
@@ -736,7 +738,7 @@
this.gv_fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fstatus.AppearanceCell.Options.UseFont = true;
this.gv_fstatus.Caption = "宸插鏍�";
- this.gv_fstatus.FieldName = "fstatus";
+ this.gv_fstatus.FieldName = "fstatusChk";
this.gv_fstatus.MinWidth = 50;
this.gv_fstatus.Name = "gv_fstatus";
this.gv_fstatus.OptionsColumn.AllowEdit = false;
@@ -760,13 +762,13 @@
this.gv_caa021.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_caa021.AppearanceCell.Options.UseFont = true;
this.gv_caa021.Caption = "鐢熶骇杞﹂棿";
- this.gv_caa021.FieldName = "caa021";
+ this.gv_caa021.FieldName = "sccj";
this.gv_caa021.MinWidth = 120;
this.gv_caa021.Name = "gv_caa021";
this.gv_caa021.OptionsColumn.AllowEdit = false;
this.gv_caa021.Tag = "query_a.CAA021";
this.gv_caa021.Visible = true;
- this.gv_caa021.VisibleIndex = 7;
+ this.gv_caa021.VisibleIndex = 8;
this.gv_caa021.Width = 120;
//
// lb_caa020
@@ -799,7 +801,7 @@
this.gv_caa020.OptionsColumn.AllowEdit = false;
this.gv_caa020.Tag = "query_a.CAA020";
this.gv_caa020.Visible = true;
- this.gv_caa020.VisibleIndex = 4;
+ this.gv_caa020.VisibleIndex = 5;
this.gv_caa020.Width = 100;
//
// gv_caa019
@@ -813,7 +815,7 @@
this.gv_caa019.OptionsColumn.AllowEdit = false;
this.gv_caa019.Tag = "query_a.CAA019";
this.gv_caa019.Visible = true;
- this.gv_caa019.VisibleIndex = 14;
+ this.gv_caa019.VisibleIndex = 15;
this.gv_caa019.Width = 50;
//
// gv_caa018
@@ -827,7 +829,7 @@
this.gv_caa018.OptionsColumn.AllowEdit = false;
this.gv_caa018.Tag = "query_a.CAA018";
this.gv_caa018.Visible = true;
- this.gv_caa018.VisibleIndex = 32;
+ this.gv_caa018.VisibleIndex = 33;
this.gv_caa018.Width = 80;
//
// lb_caa016
@@ -860,7 +862,7 @@
this.gv_caa016.OptionsColumn.AllowEdit = false;
this.gv_caa016.Tag = "query_a.CAA016";
this.gv_caa016.Visible = true;
- this.gv_caa016.VisibleIndex = 21;
+ this.gv_caa016.VisibleIndex = 22;
this.gv_caa016.Width = 100;
//
// gv_caa015
@@ -874,7 +876,7 @@
this.gv_caa015.OptionsColumn.AllowEdit = false;
this.gv_caa015.Tag = "query_a.CAA015";
this.gv_caa015.Visible = true;
- this.gv_caa015.VisibleIndex = 20;
+ this.gv_caa015.VisibleIndex = 21;
this.gv_caa015.Width = 100;
//
// lb_caa012
@@ -907,7 +909,7 @@
this.gv_caa012.OptionsColumn.AllowEdit = false;
this.gv_caa012.Tag = "query_a.CAA012";
this.gv_caa012.Visible = true;
- this.gv_caa012.VisibleIndex = 9;
+ this.gv_caa012.VisibleIndex = 10;
this.gv_caa012.Width = 50;
//
// lb_caa011
@@ -940,7 +942,7 @@
this.gv_caa011.OptionsColumn.AllowEdit = false;
this.gv_caa011.Tag = "query_a.CAA011";
this.gv_caa011.Visible = true;
- this.gv_caa011.VisibleIndex = 12;
+ this.gv_caa011.VisibleIndex = 13;
this.gv_caa011.Width = 180;
//
// lb_caa010
@@ -973,7 +975,7 @@
this.gv_caa010.OptionsColumn.AllowEdit = false;
this.gv_caa010.Tag = "query_a.CAA010";
this.gv_caa010.Visible = true;
- this.gv_caa010.VisibleIndex = 11;
+ this.gv_caa010.VisibleIndex = 12;
this.gv_caa010.Width = 180;
//
// lb_caa009
@@ -1000,13 +1002,13 @@
this.gv_caa009.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_caa009.AppearanceCell.Options.UseFont = true;
this.gv_caa009.Caption = "鍗曚綅";
- this.gv_caa009.FieldName = "caa009";
+ this.gv_caa009.FieldName = "fname";
this.gv_caa009.MinWidth = 50;
this.gv_caa009.Name = "gv_caa009";
this.gv_caa009.OptionsColumn.AllowEdit = false;
this.gv_caa009.Tag = "query_a.CAA009";
this.gv_caa009.Visible = true;
- this.gv_caa009.VisibleIndex = 10;
+ this.gv_caa009.VisibleIndex = 11;
this.gv_caa009.Width = 50;
//
// lb_caa006
@@ -1033,13 +1035,13 @@
this.gv_caa006.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_caa006.AppearanceCell.Options.UseFont = true;
this.gv_caa006.Caption = "浜у搧缂栫爜";
- this.gv_caa006.FieldName = "caa006";
+ this.gv_caa006.FieldName = "itemNo";
this.gv_caa006.MinWidth = 80;
this.gv_caa006.Name = "gv_caa006";
this.gv_caa006.OptionsColumn.AllowEdit = false;
this.gv_caa006.Tag = "query_a.CAA006";
this.gv_caa006.Visible = true;
- this.gv_caa006.VisibleIndex = 5;
+ this.gv_caa006.VisibleIndex = 6;
this.gv_caa006.Width = 80;
//
// lb_caa005
@@ -1072,7 +1074,7 @@
this.gv_caa005.OptionsColumn.AllowEdit = false;
this.gv_caa005.Tag = "query_a.CAA005";
this.gv_caa005.Visible = true;
- this.gv_caa005.VisibleIndex = 19;
+ this.gv_caa005.VisibleIndex = 20;
this.gv_caa005.Width = 180;
//
// lb_caa001
@@ -1105,7 +1107,7 @@
this.gv_caa001.OptionsColumn.AllowEdit = false;
this.gv_caa001.Tag = "query_a.CAA001";
this.gv_caa001.Visible = true;
- this.gv_caa001.VisibleIndex = 2;
+ this.gv_caa001.VisibleIndex = 3;
this.gv_caa001.Width = 100;
//
// lb_erpid
@@ -1164,6 +1166,7 @@
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_fstatus,
this.gridColumn5,
+ this.gridColumn8,
this.gv_caa001,
this.gridColumn1,
this.gv_caa020,
@@ -1205,11 +1208,23 @@
// gridColumn5
//
this.gridColumn5.Caption = "缁撴鏍囪瘑";
+ this.gridColumn5.FieldName = "jabzChk";
this.gridColumn5.MinWidth = 50;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 1;
this.gridColumn5.Width = 50;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鐢熶骇缁勭粐";
+ this.gridColumn8.FieldName = "fSubsidiary";
+ this.gridColumn8.MinWidth = 200;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Tag = "org.fnamber";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 2;
+ this.gridColumn8.Width = 200;
//
// gridColumn1
//
@@ -1219,7 +1234,7 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 3;
+ this.gridColumn1.VisibleIndex = 4;
this.gridColumn1.Width = 80;
//
// gridColumn3
@@ -1230,7 +1245,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 6;
+ this.gridColumn3.VisibleIndex = 7;
this.gridColumn3.Width = 120;
//
// gridColumn2
@@ -1241,7 +1256,7 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 15;
+ this.gridColumn2.VisibleIndex = 16;
this.gridColumn2.Width = 110;
//
// gridColumn7
@@ -1251,7 +1266,7 @@
this.gridColumn7.MinWidth = 50;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 16;
+ this.gridColumn7.VisibleIndex = 17;
this.gridColumn7.Width = 50;
//
// gridColumn4
@@ -1261,7 +1276,7 @@
this.gridColumn4.MinWidth = 50;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 17;
+ this.gridColumn4.VisibleIndex = 18;
this.gridColumn4.Width = 50;
//
// xtraTabControl1
@@ -1386,7 +1401,7 @@
//
// picCheckBox
//
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
this.picCheckBox.Location = new System.Drawing.Point(1001, 55);
this.picCheckBox.Name = "picCheckBox";
this.picCheckBox.Size = new System.Drawing.Size(100, 50);
@@ -1404,6 +1419,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_Womcaa";
+ this.Text = "鐢熶骇浠诲姟璁㈠崟";
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
@@ -1551,5 +1567,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private System.Windows.Forms.PictureBox picCheckBox;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
index 07d1103..f65db63 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
@@ -20,8 +20,8 @@
InitializeComponent();
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- this.toolBarMenu1.btnJieAnClick += ToolBarMenu1_btnJieAnClick;
- this.toolBarMenu1.btnFjieAnClick += ToolBarMenu1_btnFjieAnClick;
+ //this.toolBarMenu1.btnJieAnClick += ToolBarMenu1_btnJieAnClick;
+ //this.toolBarMenu1.btnFjieAnClick += ToolBarMenu1_btnFjieAnClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fstatus", "", (value) =>
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.resx b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.resx
index d58980a..091f281 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.resx
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.resx
@@ -117,4 +117,121 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="picCheckBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ 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
+ 2OyW1yHZAAAAAElFTkSuQmCC
+</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index fab075b..6132777 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -34,6 +34,7 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Wompba));
this.gvMx1machineNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -50,6 +51,7 @@
this.gvMx1fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa019 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa018 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemDateEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.gvMx1daa017 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa016 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
@@ -66,17 +68,14 @@
this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1daa001 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.caaGuid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_checkUser = new DevExpress.XtraEditors.LabelControl();
this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -86,15 +85,11 @@
this.lb_fstatus = new DevExpress.XtraEditors.LabelControl();
this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_pba013 = new DevExpress.XtraEditors.LabelControl();
- this.gv_pba013 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_pba010 = new DevExpress.XtraEditors.LabelControl();
- this.txt_pba015 = new DevExpress.XtraEditors.TextEdit();
this.lb_pba009 = new DevExpress.XtraEditors.LabelControl();
this.txt_pba009 = new DevExpress.XtraEditors.TextEdit();
this.gv_pba009 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_pba006 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_pba005 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_pba001 = new DevExpress.XtraEditors.LabelControl();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -106,7 +101,6 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
- this.txt_pba016 = new Gs.DevApp.UserControl.UcLookWorkline();
this.txt_pba013 = new Gs.DevApp.UserControl.UcLookWorkshop();
this.txt_hNo = new DevExpress.XtraEditors.TextEdit();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
@@ -114,8 +108,11 @@
this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
@@ -125,7 +122,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_pba015.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_pba009.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -138,6 +134,7 @@
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_hNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// gvMx1machineNo
@@ -154,9 +151,7 @@
this.gvMx1machineNo.MinWidth = 200;
this.gvMx1machineNo.Name = "gvMx1machineNo";
this.gvMx1machineNo.Tag = "query_a.machine_no";
- this.gvMx1machineNo.Visible = true;
- this.gvMx1machineNo.VisibleIndex = 31;
- this.gvMx1machineNo.Width = 250;
+ this.gvMx1machineNo.Width = 200;
//
// repositoryItemDateEdit1
//
@@ -177,12 +172,12 @@
this.gvMx1reporttime.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1reporttime.Caption = "澶囨敞";
this.gvMx1reporttime.FieldName = "daa009";
- this.gvMx1reporttime.MinWidth = 50;
+ this.gvMx1reporttime.MinWidth = 100;
this.gvMx1reporttime.Name = "gvMx1reporttime";
this.gvMx1reporttime.Tag = "query_a.reporttime";
this.gvMx1reporttime.Visible = true;
- this.gvMx1reporttime.VisibleIndex = 30;
- this.gvMx1reporttime.Width = 94;
+ this.gvMx1reporttime.VisibleIndex = 15;
+ this.gvMx1reporttime.Width = 100;
//
// gvMx1isReportcheck
//
@@ -198,9 +193,7 @@
this.gvMx1isReportcheck.Name = "gvMx1isReportcheck";
this.gvMx1isReportcheck.OptionsColumn.ReadOnly = true;
this.gvMx1isReportcheck.Tag = "query_a.is_reportcheck";
- this.gvMx1isReportcheck.Visible = true;
- this.gvMx1isReportcheck.VisibleIndex = 29;
- this.gvMx1isReportcheck.Width = 94;
+ this.gvMx1isReportcheck.Width = 50;
//
// gvMx1daa026
//
@@ -214,10 +207,8 @@
this.gvMx1daa026.FieldName = "changeLineTime";
this.gvMx1daa026.MinWidth = 50;
this.gvMx1daa026.Name = "gvMx1daa026";
- this.gvMx1daa026.Tag = "query_a.daa026";
- this.gvMx1daa026.Visible = true;
- this.gvMx1daa026.VisibleIndex = 28;
- this.gvMx1daa026.Width = 94;
+ this.gvMx1daa026.Tag = "yz_quantity_0";
+ this.gvMx1daa026.Width = 50;
//
// gvMx1daa025
//
@@ -229,9 +220,7 @@
this.gvMx1daa025.Name = "gvMx1daa025";
this.gvMx1daa025.OptionsColumn.ReadOnly = true;
this.gvMx1daa025.Tag = "query_a.daa025";
- this.gvMx1daa025.Visible = true;
- this.gvMx1daa025.VisibleIndex = 27;
- this.gvMx1daa025.Width = 94;
+ this.gvMx1daa025.Width = 50;
//
// gvMx1daa024
//
@@ -243,9 +232,7 @@
this.gvMx1daa024.Name = "gvMx1daa024";
this.gvMx1daa024.OptionsColumn.ReadOnly = true;
this.gvMx1daa024.Tag = "query_a.daa024";
- this.gvMx1daa024.Visible = true;
- this.gvMx1daa024.VisibleIndex = 26;
- this.gvMx1daa024.Width = 94;
+ this.gvMx1daa024.Width = 50;
//
// gvMx1daa023
//
@@ -257,9 +244,7 @@
this.gvMx1daa023.Name = "gvMx1daa023";
this.gvMx1daa023.OptionsColumn.ReadOnly = true;
this.gvMx1daa023.Tag = "query_a.daa023";
- this.gvMx1daa023.Visible = true;
- this.gvMx1daa023.VisibleIndex = 25;
- this.gvMx1daa023.Width = 94;
+ this.gvMx1daa023.Width = 50;
//
// gvMx1daa022
//
@@ -271,9 +256,7 @@
this.gvMx1daa022.Name = "gvMx1daa022";
this.gvMx1daa022.OptionsColumn.ReadOnly = true;
this.gvMx1daa022.Tag = "query_a.daa022";
- this.gvMx1daa022.Visible = true;
- this.gvMx1daa022.VisibleIndex = 24;
- this.gvMx1daa022.Width = 94;
+ this.gvMx1daa022.Width = 50;
//
// gvMx1daa021
//
@@ -285,9 +268,7 @@
this.gvMx1daa021.Name = "gvMx1daa021";
this.gvMx1daa021.OptionsColumn.ReadOnly = true;
this.gvMx1daa021.Tag = "query_a.daa021";
- this.gvMx1daa021.Visible = true;
- this.gvMx1daa021.VisibleIndex = 23;
- this.gvMx1daa021.Width = 94;
+ this.gvMx1daa021.Width = 50;
//
// gvMx1daa020
//
@@ -299,9 +280,7 @@
this.gvMx1daa020.Name = "gvMx1daa020";
this.gvMx1daa020.OptionsColumn.ReadOnly = true;
this.gvMx1daa020.Tag = "query_a.daa020";
- this.gvMx1daa020.Visible = true;
- this.gvMx1daa020.VisibleIndex = 22;
- this.gvMx1daa020.Width = 94;
+ this.gvMx1daa020.Width = 50;
//
// gvMx1checkUser
//
@@ -313,9 +292,7 @@
this.gvMx1checkUser.Name = "gvMx1checkUser";
this.gvMx1checkUser.OptionsColumn.ReadOnly = true;
this.gvMx1checkUser.Tag = "query_a.check_user";
- this.gvMx1checkUser.Visible = true;
- this.gvMx1checkUser.VisibleIndex = 21;
- this.gvMx1checkUser.Width = 94;
+ this.gvMx1checkUser.Width = 50;
//
// gvMx1checkDate
//
@@ -327,9 +304,7 @@
this.gvMx1checkDate.Name = "gvMx1checkDate";
this.gvMx1checkDate.OptionsColumn.ReadOnly = true;
this.gvMx1checkDate.Tag = "query_a.check_date";
- this.gvMx1checkDate.Visible = true;
- this.gvMx1checkDate.VisibleIndex = 20;
- this.gvMx1checkDate.Width = 94;
+ this.gvMx1checkDate.Width = 50;
//
// gvMx1fstatus
//
@@ -337,13 +312,13 @@
this.gvMx1fstatus.AppearanceCell.Options.UseFont = true;
this.gvMx1fstatus.Caption = "閿�鍞鍗曞彿";
this.gvMx1fstatus.FieldName = "caa015";
- this.gvMx1fstatus.MinWidth = 50;
+ this.gvMx1fstatus.MinWidth = 120;
this.gvMx1fstatus.Name = "gvMx1fstatus";
this.gvMx1fstatus.OptionsColumn.ReadOnly = true;
this.gvMx1fstatus.Tag = "query_a.fstatus";
this.gvMx1fstatus.Visible = true;
- this.gvMx1fstatus.VisibleIndex = 19;
- this.gvMx1fstatus.Width = 94;
+ this.gvMx1fstatus.VisibleIndex = 0;
+ this.gvMx1fstatus.Width = 120;
//
// gvMx1daa019
//
@@ -355,22 +330,34 @@
this.gvMx1daa019.Name = "gvMx1daa019";
this.gvMx1daa019.OptionsColumn.ReadOnly = true;
this.gvMx1daa019.Tag = "query_a.daa019";
- this.gvMx1daa019.Visible = true;
- this.gvMx1daa019.VisibleIndex = 18;
- this.gvMx1daa019.Width = 94;
+ this.gvMx1daa019.Width = 50;
//
// gvMx1daa018
//
this.gvMx1daa018.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1daa018.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
this.gvMx1daa018.AppearanceCell.Options.UseFont = true;
+ this.gvMx1daa018.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1daa018.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1daa018.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1daa018.Caption = "棰勮瀹屽伐鏃堕棿";
+ this.gvMx1daa018.ColumnEdit = this.repositoryItemDateEdit3;
this.gvMx1daa018.FieldName = "mesEndProd";
- this.gvMx1daa018.MinWidth = 50;
+ this.gvMx1daa018.MinWidth = 180;
this.gvMx1daa018.Name = "gvMx1daa018";
this.gvMx1daa018.Tag = "query_a.daa018";
this.gvMx1daa018.Visible = true;
- this.gvMx1daa018.VisibleIndex = 17;
- this.gvMx1daa018.Width = 94;
+ this.gvMx1daa018.VisibleIndex = 2;
+ this.gvMx1daa018.Width = 180;
+ //
+ // repositoryItemDateEdit3
+ //
+ this.repositoryItemDateEdit3.AutoHeight = false;
+ this.repositoryItemDateEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemDateEdit3.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemDateEdit3.Name = "repositoryItemDateEdit3";
//
// gvMx1daa017
//
@@ -384,10 +371,8 @@
this.gvMx1daa017.FieldName = "planPersonnel";
this.gvMx1daa017.MinWidth = 50;
this.gvMx1daa017.Name = "gvMx1daa017";
- this.gvMx1daa017.Tag = "query_a.daa017";
- this.gvMx1daa017.Visible = true;
- this.gvMx1daa017.VisibleIndex = 16;
- this.gvMx1daa017.Width = 94;
+ this.gvMx1daa017.Tag = "yz_quantity_0";
+ this.gvMx1daa017.Width = 50;
//
// gvMx1daa016
//
@@ -400,12 +385,12 @@
this.gvMx1daa016.Caption = "棰勮寮�宸ユ棩鏃堕棿";
this.gvMx1daa016.ColumnEdit = this.repositoryItemDateEdit2;
this.gvMx1daa016.FieldName = "mesStartProd";
- this.gvMx1daa016.MinWidth = 200;
+ this.gvMx1daa016.MinWidth = 180;
this.gvMx1daa016.Name = "gvMx1daa016";
this.gvMx1daa016.Tag = "query_a.daa016";
this.gvMx1daa016.Visible = true;
- this.gvMx1daa016.VisibleIndex = 15;
- this.gvMx1daa016.Width = 200;
+ this.gvMx1daa016.VisibleIndex = 1;
+ this.gvMx1daa016.Width = 180;
//
// repositoryItemDateEdit2
//
@@ -428,7 +413,7 @@
this.gvMx1daa014.Tag = "query_a.daa014";
this.gvMx1daa014.Visible = true;
this.gvMx1daa014.VisibleIndex = 14;
- this.gvMx1daa014.Width = 94;
+ this.gvMx1daa014.Width = 50;
//
// gvMx1daa012
//
@@ -466,12 +451,12 @@
this.gvMx1daa011.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1daa011.Caption = "鏈鎺掓暟閲�";
this.gvMx1daa011.FieldName = "daa008";
- this.gvMx1daa011.MinWidth = 50;
+ this.gvMx1daa011.MinWidth = 60;
this.gvMx1daa011.Name = "gvMx1daa011";
- this.gvMx1daa011.Tag = "query_a.daa011";
+ this.gvMx1daa011.Tag = "yz_quantity_0";
this.gvMx1daa011.Visible = true;
this.gvMx1daa011.VisibleIndex = 12;
- this.gvMx1daa011.Width = 94;
+ this.gvMx1daa011.Width = 60;
//
// gvMx1daa010
//
@@ -484,7 +469,7 @@
this.gvMx1daa010.OptionsColumn.ReadOnly = true;
this.gvMx1daa010.Tag = "query_a.daa010";
this.gvMx1daa010.Visible = true;
- this.gvMx1daa010.VisibleIndex = 4;
+ this.gvMx1daa010.VisibleIndex = 7;
this.gvMx1daa010.Width = 110;
//
// gvMx1daa009
@@ -499,7 +484,7 @@
this.gvMx1daa009.Tag = "query_a.daa009";
this.gvMx1daa009.Visible = true;
this.gvMx1daa009.VisibleIndex = 11;
- this.gvMx1daa009.Width = 94;
+ this.gvMx1daa009.Width = 50;
//
// gvMx1daa008
//
@@ -513,7 +498,7 @@
this.gvMx1daa008.Tag = "query_a.daa008";
this.gvMx1daa008.Visible = true;
this.gvMx1daa008.VisibleIndex = 8;
- this.gvMx1daa008.Width = 94;
+ this.gvMx1daa008.Width = 50;
//
// gvMx1daa007
//
@@ -527,7 +512,7 @@
this.gvMx1daa007.Tag = "query_a.daa007";
this.gvMx1daa007.Visible = true;
this.gvMx1daa007.VisibleIndex = 10;
- this.gvMx1daa007.Width = 94;
+ this.gvMx1daa007.Width = 50;
//
// gvMx1daa006
//
@@ -541,7 +526,7 @@
this.gvMx1daa006.Tag = "query_a.daa006";
this.gvMx1daa006.Visible = true;
this.gvMx1daa006.VisibleIndex = 9;
- this.gvMx1daa006.Width = 94;
+ this.gvMx1daa006.Width = 50;
//
// gvMx1daa005
//
@@ -549,13 +534,13 @@
this.gvMx1daa005.AppearanceCell.Options.UseFont = true;
this.gvMx1daa005.Caption = "鐗╂枡缂栫爜";
this.gvMx1daa005.FieldName = "itemNo";
- this.gvMx1daa005.MinWidth = 50;
+ this.gvMx1daa005.MinWidth = 80;
this.gvMx1daa005.Name = "gvMx1daa005";
this.gvMx1daa005.OptionsColumn.ReadOnly = true;
this.gvMx1daa005.Tag = "query_a.daa005";
this.gvMx1daa005.Visible = true;
- this.gvMx1daa005.VisibleIndex = 7;
- this.gvMx1daa005.Width = 94;
+ this.gvMx1daa005.VisibleIndex = 4;
+ this.gvMx1daa005.Width = 80;
//
// gvMx1daa004
//
@@ -599,48 +584,6 @@
this.gvMx1daa002.VisibleIndex = 3;
this.gvMx1daa002.Width = 110;
//
- // gvMx1daa001
- //
- this.gvMx1daa001.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1daa001.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa001.Caption = "鎺掍骇搴忓彿";
- this.gvMx1daa001.FieldName = "scheduleOrder";
- this.gvMx1daa001.MinWidth = 50;
- this.gvMx1daa001.Name = "gvMx1daa001";
- this.gvMx1daa001.OptionsColumn.ReadOnly = true;
- this.gvMx1daa001.Tag = "query_a.daa001";
- this.gvMx1daa001.Visible = true;
- this.gvMx1daa001.VisibleIndex = 2;
- this.gvMx1daa001.Width = 94;
- //
- // gvMx1pid
- //
- this.gvMx1pid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1pid.AppearanceCell.Options.UseFont = true;
- this.gvMx1pid.Caption = "鎶ユ";
- this.gvMx1pid.FieldName = "isReportcheck";
- this.gvMx1pid.MinWidth = 50;
- this.gvMx1pid.Name = "gvMx1pid";
- this.gvMx1pid.OptionsColumn.ReadOnly = true;
- this.gvMx1pid.Tag = "query_a.pid";
- this.gvMx1pid.Visible = true;
- this.gvMx1pid.VisibleIndex = 1;
- this.gvMx1pid.Width = 94;
- //
- // gvMx1id
- //
- this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1id.AppearanceCell.Options.UseFont = true;
- this.gvMx1id.Caption = "鎺ㄩ�佺姸鎬�";
- this.gvMx1id.FieldName = "ts";
- this.gvMx1id.MinWidth = 50;
- this.gvMx1id.Name = "gvMx1id";
- this.gvMx1id.OptionsColumn.ReadOnly = true;
- this.gvMx1id.Tag = "query_a.id";
- this.gvMx1id.Visible = true;
- this.gvMx1id.VisibleIndex = 0;
- this.gvMx1id.Width = 94;
- //
// gvMx1guid
//
this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -657,8 +600,8 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 381);
- this.tabMxPage1.Text = "鏄庣粏1";
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 417);
+ this.tabMxPage1.Text = "浠诲姟鍗曟槑缁�";
//
// gcMx1
//
@@ -670,8 +613,9 @@
this.repositoryItemDateEdit1,
this.repositoryItemDateEdit2,
this.repositoryItemButtonEdit1,
- this.rptJYBZ});
- this.gcMx1.Size = new System.Drawing.Size(1124, 381);
+ this.rptJYBZ,
+ this.repositoryItemDateEdit3});
+ this.gcMx1.Size = new System.Drawing.Size(1124, 417);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -684,25 +628,22 @@
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.caaGuid,
- this.gvMx1id,
- this.gvMx1pid,
- this.gvMx1daa001,
+ this.gvMx1fstatus,
+ this.gvMx1daa016,
+ this.gvMx1daa018,
this.gvMx1daa002,
- this.gvMx1daa010,
+ this.gvMx1daa005,
this.gvMx1daa003,
this.gvMx1daa004,
- this.gvMx1daa005,
+ this.gvMx1daa010,
this.gvMx1daa008,
this.gvMx1daa006,
this.gvMx1daa007,
this.gvMx1daa009,
this.gvMx1daa011,
this.gvMx1daa012,
- this.gvMx1daa016,
this.gvMx1daa017,
- this.gvMx1daa018,
this.gvMx1daa019,
- this.gvMx1fstatus,
this.gvMx1checkDate,
this.gvMx1checkUser,
this.gvMx1daa020,
@@ -733,6 +674,14 @@
this.caaGuid.OptionsColumn.ReadOnly = true;
this.caaGuid.Width = 94;
//
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "绾夸綋ID";
+ this.gridColumn3.FieldName = "daa015";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Width = 94;
+ //
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
@@ -740,8 +689,8 @@
this.gvMxDel.MinWidth = 80;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 33;
- this.gvMxDel.Width = 94;
+ this.gvMxDel.VisibleIndex = 16;
+ this.gvMxDel.Width = 80;
//
// repositoryItemButtonEdit1
//
@@ -753,16 +702,6 @@
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "绾夸綋ID";
- this.gridColumn3.FieldName = "daa015";
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 32;
- this.gridColumn3.Width = 94;
//
// lb_checkUser
//
@@ -824,13 +763,13 @@
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 50;
+ this.gv_checkDate.MinWidth = 180;
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
this.gv_checkDate.VisibleIndex = 3;
- this.gv_checkDate.Width = 94;
+ this.gv_checkDate.Width = 180;
//
// lb_fstatus
//
@@ -848,13 +787,14 @@
this.gv_fstatus.AppearanceCell.Options.UseFont = true;
this.gv_fstatus.Caption = "瀹℃牳鐮�";
this.gv_fstatus.FieldName = "fstatus";
+ this.gv_fstatus.MaxWidth = 50;
this.gv_fstatus.MinWidth = 50;
this.gv_fstatus.Name = "gv_fstatus";
this.gv_fstatus.OptionsColumn.AllowEdit = false;
this.gv_fstatus.Tag = "query_a.fstatus";
this.gv_fstatus.Visible = true;
- this.gv_fstatus.VisibleIndex = 1;
- this.gv_fstatus.Width = 94;
+ this.gv_fstatus.VisibleIndex = 0;
+ this.gv_fstatus.Width = 50;
//
// lb_pba013
//
@@ -866,44 +806,11 @@
this.lb_pba013.TabIndex = 258;
this.lb_pba013.Text = "宸ヤ綔杞﹂棿";
//
- // gv_pba013
- //
- this.gv_pba013.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_pba013.AppearanceCell.Options.UseFont = true;
- this.gv_pba013.Caption = "宸ヤ綔杞﹂棿";
- this.gv_pba013.FieldName = "pba013";
- this.gv_pba013.MinWidth = 50;
- this.gv_pba013.Name = "gv_pba013";
- this.gv_pba013.OptionsColumn.AllowEdit = false;
- this.gv_pba013.Tag = "query_a.pba013";
- this.gv_pba013.Visible = true;
- this.gv_pba013.VisibleIndex = 7;
- this.gv_pba013.Width = 94;
- //
- // lb_pba010
- //
- this.lb_pba010.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_pba010.Appearance.Options.UseFont = true;
- this.lb_pba010.Location = new System.Drawing.Point(286, 53);
- this.lb_pba010.Name = "lb_pba010";
- this.lb_pba010.Size = new System.Drawing.Size(68, 21);
- this.lb_pba010.TabIndex = 243;
- this.lb_pba010.Text = "璁″垝浜烘暟";
- //
- // txt_pba015
- //
- this.txt_pba015.Location = new System.Drawing.Point(360, 49);
- this.txt_pba015.Name = "txt_pba015";
- this.txt_pba015.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_pba015.Properties.Appearance.Options.UseFont = true;
- this.txt_pba015.Size = new System.Drawing.Size(150, 28);
- this.txt_pba015.TabIndex = 243;
- //
// lb_pba009
//
this.lb_pba009.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_pba009.Appearance.Options.UseFont = true;
- this.lb_pba009.Location = new System.Drawing.Point(49, 87);
+ this.lb_pba009.Location = new System.Drawing.Point(49, 53);
this.lb_pba009.Name = "lb_pba009";
this.lb_pba009.Size = new System.Drawing.Size(39, 21);
this.lb_pba009.TabIndex = 240;
@@ -911,7 +818,7 @@
//
// txt_pba009
//
- this.txt_pba009.Location = new System.Drawing.Point(100, 83);
+ this.txt_pba009.Location = new System.Drawing.Point(100, 49);
this.txt_pba009.Name = "txt_pba009";
this.txt_pba009.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_pba009.Properties.Appearance.Options.UseFont = true;
@@ -924,13 +831,13 @@
this.gv_pba009.AppearanceCell.Options.UseFont = true;
this.gv_pba009.Caption = "澶囨敞";
this.gv_pba009.FieldName = "pba009";
- this.gv_pba009.MinWidth = 50;
+ this.gv_pba009.MinWidth = 100;
this.gv_pba009.Name = "gv_pba009";
this.gv_pba009.OptionsColumn.AllowEdit = false;
this.gv_pba009.Tag = "query_a.pba009";
this.gv_pba009.Visible = true;
this.gv_pba009.VisibleIndex = 6;
- this.gv_pba009.Width = 94;
+ this.gv_pba009.Width = 100;
//
// gv_pba006
//
@@ -938,13 +845,13 @@
this.gv_pba006.AppearanceCell.Options.UseFont = true;
this.gv_pba006.Caption = "鍒涘缓鏃堕棿";
this.gv_pba006.FieldName = "pba006";
- this.gv_pba006.MinWidth = 50;
+ this.gv_pba006.MinWidth = 180;
this.gv_pba006.Name = "gv_pba006";
this.gv_pba006.OptionsColumn.AllowEdit = false;
this.gv_pba006.Tag = "query_a.pba006";
this.gv_pba006.Visible = true;
this.gv_pba006.VisibleIndex = 5;
- this.gv_pba006.Width = 94;
+ this.gv_pba006.Width = 180;
//
// gv_pba005
//
@@ -960,19 +867,10 @@
this.gv_pba005.VisibleIndex = 4;
this.gv_pba005.Width = 94;
//
- // lb_pba001
- //
- this.lb_pba001.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_pba001.Appearance.Options.UseFont = true;
- this.lb_pba001.Location = new System.Drawing.Point(54, 53);
- this.lb_pba001.Name = "lb_pba001";
- this.lb_pba001.Size = new System.Drawing.Size(34, 21);
- this.lb_pba001.TabIndex = 216;
- this.lb_pba001.Text = "浜х嚎";
- //
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -998,17 +896,19 @@
//
// gridView1
//
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn2,
this.gv_fstatus,
+ this.gridColumn2,
this.gv_checkUser,
this.gv_checkDate,
this.gv_pba005,
this.gv_pba006,
this.gv_pba009,
- this.gv_pba013,
this.gridColumn1});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
@@ -1021,20 +921,21 @@
//
this.gridColumn2.Caption = "鎺掍骇鍗曞彿";
this.gridColumn2.FieldName = "hNo";
- this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.MinWidth = 150;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 0;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.Width = 150;
//
// gridColumn1
//
this.gridColumn1.Caption = "杞﹂棿鍚嶇О";
+ this.gridColumn1.FieldName = "dptName";
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 8;
+ this.gridColumn1.VisibleIndex = 7;
this.gridColumn1.Width = 94;
//
// xtraTabControl1
@@ -1074,17 +975,16 @@
this.xtraTabPage2.Controls.Add(this.tabMx);
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
-
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 157);
+ this.tabMx.Location = new System.Drawing.Point(0, 121);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 413);
+ this.tabMx.Size = new System.Drawing.Size(1126, 449);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1092,7 +992,6 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.txt_pba016);
this.panel1.Controls.Add(this.txt_pba013);
this.panel1.Controls.Add(this.txt_hNo);
this.panel1.Controls.Add(this.labelControl1);
@@ -1106,25 +1005,14 @@
this.panel1.Controls.Add(this.txt_checkDate);
this.panel1.Controls.Add(this.lb_fstatus);
this.panel1.Controls.Add(this.lb_pba013);
- this.panel1.Controls.Add(this.lb_pba010);
- this.panel1.Controls.Add(this.txt_pba015);
this.panel1.Controls.Add(this.lb_pba009);
this.panel1.Controls.Add(this.txt_pba009);
- this.panel1.Controls.Add(this.lb_pba001);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 157);
+ this.panel1.Size = new System.Drawing.Size(1126, 121);
this.panel1.TabIndex = 1;
- //
- // txt_pba016
- //
- this.txt_pba016.IsReadly = false;
- this.txt_pba016.Location = new System.Drawing.Point(100, 49);
- this.txt_pba016.Name = "txt_pba016";
- this.txt_pba016.Size = new System.Drawing.Size(180, 28);
- this.txt_pba016.TabIndex = 460;
//
// txt_pba013
//
@@ -1157,7 +1045,7 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(49, 117);
+ this.btnSelect.Location = new System.Drawing.Point(49, 83);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(128, 29);
this.btnSelect.TabIndex = 456;
@@ -1191,16 +1079,31 @@
this.lbGuid.TabIndex = 1;
this.lbGuid.Visible = false;
//
+ // picCheckBox
+ //
+ this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
+ this.picCheckBox.Location = new System.Drawing.Point(1024, 55);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 7;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
// Frm_Wompba
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_Wompba";
+ this.Text = "鎵归噺鎺掍骇";
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
@@ -1210,7 +1113,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_pba015.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_pba009.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -1224,6 +1126,7 @@
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_hNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
@@ -1268,9 +1171,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa004;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa003;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa002;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa001;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1pid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1id;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
@@ -1288,18 +1188,12 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
private DevExpress.XtraEditors.LabelControl lb_pba013;
- private DevExpress.XtraGrid.Columns.GridColumn gv_pba013;
-
- private DevExpress.XtraEditors.LabelControl lb_pba010;
- private DevExpress.XtraEditors.TextEdit txt_pba015;
private DevExpress.XtraEditors.LabelControl lb_pba009;
private DevExpress.XtraEditors.TextEdit txt_pba009;
private DevExpress.XtraGrid.Columns.GridColumn gv_pba009;
private DevExpress.XtraGrid.Columns.GridColumn gv_pba006;
private DevExpress.XtraGrid.Columns.GridColumn gv_pba005;
-
- private DevExpress.XtraEditors.LabelControl lb_pba001;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.CheckEdit txt_fstatus;
private DevExpress.XtraEditors.SimpleButton btnSelect;
@@ -1312,8 +1206,9 @@
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private UserControl.UcLookWorkshop txt_pba013;
- private UserControl.UcLookWorkline txt_pba016;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private System.Windows.Forms.PictureBox picCheckBox;
+ private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index 6b97c13..acc6d88 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -3,14 +3,11 @@
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
-using MES.Service.Modes;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
-using System.Drawing;
-using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -32,15 +29,23 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
-
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fstatus", "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ });
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ });
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
txt_pba013.EditChanged += (s, e) =>
{
string workGuid = this.txt_pba013.GetGuid();
- txt_pba016.getSuppler(workGuid);
_getListJybz(workGuid);
};
//閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
@@ -89,17 +94,7 @@
Task.Delay(100);
getPageList(1);
}
- /// <summary>
- /// 鍙屽嚮浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
- {
- string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
- if (!string.IsNullOrEmpty(rowGuid))
- getModel(rowGuid, false, 999);
- }
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -168,7 +163,7 @@
if (_rtn.rtnCode > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
+ getModel(lbGuid.Text.Trim());
else
getPageList(1);
}
@@ -213,7 +208,7 @@
if (_rtn.rtnCode > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
+ getModel(lbGuid.Text.Trim());
else
getPageList(1);
}
@@ -269,8 +264,10 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1);
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ getPageList(this.pageBar1.CurrentPage);
+ else
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
}
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -289,7 +286,7 @@
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
+ getModel(lbGuid.Text.Trim());
else
{
_filterList.Clear();
@@ -316,7 +313,10 @@
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- getModel(rowGuid, true, 1);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
}
/// <summary>
/// 鏂板浜嬩欢
@@ -325,11 +325,9 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 1);
lbGuid.Text = "";
- List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gridViews.Add(gvMx1);
- UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
+ UtilityHelper.CleanValueByControl(panel1.Controls, true);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
/// <summary>
@@ -347,26 +345,11 @@
txt_pba013.Focus();
return;
}
- string lineId = txt_pba016.GetId();
- if (string.IsNullOrEmpty(lineId.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨浜х嚎锛�");
- txt_pba016.Focus();
- return;
- }
- if (string.IsNullOrEmpty(txt_pba015.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璁″垝浜烘暟涓嶈兘涓虹┖锛�");
- txt_pba015.Focus();
- return;
- }
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
bz = txt_pba009.Text.Trim(),
cjId = workId,
- cxId = lineId,
- jhrs = txt_pba015.Text.Trim(),
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -382,35 +365,66 @@
if (row != null)
{
Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
- string _LineId = row["daa015"].ToString();
- if (string.IsNullOrEmpty(_LineId))
- {
- MsgHelper.ShowError("浜х嚎涓嶈兘涓虹┖锛�");
- return;
- }
+ //string _LineId = row["daa015"].ToString();
+ //if (string.IsNullOrEmpty(_LineId))
+ //{
+ // MsgHelper.ShowError("浜х嚎缂栫爜涓嶈兘涓虹┖锛�");
+ // return;
+ //}
string _Pcsl = row["daa008"].ToString();
- if (string.IsNullOrEmpty(_LineId))
+ if (string.IsNullOrEmpty(_Pcsl))
{
MsgHelper.ShowError("鎺掍骇鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
string _Yjkgsj = row["mesStartProd"].ToString();
- if (string.IsNullOrEmpty(_LineId))
+ if (string.IsNullOrEmpty(_Yjkgsj))
{
MsgHelper.ShowError("棰勮寮�宸ユ椂闂翠笉鑳戒负绌猴紒");
return;
}
+ //string _prepareTime = row["prepareTime"].ToString();
+ //if (string.IsNullOrEmpty(_prepareTime))
+ //{
+ // MsgHelper.ShowError("棰勮澶囨枡鏃堕棿涓嶈兘涓虹┖锛�");
+ // return;
+ //}
+ //string _planPersonnel = row["planPersonnel"].ToString();
+ //if (string.IsNullOrEmpty(_planPersonnel))
+ //{
+ // MsgHelper.ShowError("璁″垝浜烘暟锛�");
+ // return;
+ //}
+ //string _changeLinetime = row["changeLinetime"].ToString();
+ //if (string.IsNullOrEmpty(_changeLinetime))
+ //{
+ // MsgHelper.ShowError("鎹㈢嚎鏃堕棿涓嶈兘涓虹┖锛�");
+ // return;
+ //}
+ string _mesEndProd = row["mesEndProd"].ToString();
+ if (string.IsNullOrEmpty(_mesEndProd))
+ {
+ MsgHelper.ShowError("棰勮瀹屽伐鏃堕棿涓嶈兘涓虹┖锛�");
+ return;
+ }
+ //string _restTime = row["restTime"].ToString();
+ //if (string.IsNullOrEmpty(_prepareTime))
+ //{
+ // MsgHelper.ShowError("浼戞伅鏃堕棿涓嶈兘涓虹┖锛�");
+ // return;
+ //}
_obj.list.Add(new
{
Guid = _guid,
AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["caaGuid"].ToString()),
- LineId = int.Parse(row["daa015"].ToString()),//浜х嚎id
+ LineId = row["daa015"].ToString(),//浜х嚎id
Yjkgsj = (row["mesStartProd"].ToString()),//棰勮寮�宸ユ椂闂�
Jhrs = row["planPersonnel"].ToString(),//璁″垝浜烘暟
Hxsj = row["changeLinetime"].ToString(),//鎹㈢嚎鏃堕棿
Bz = row["daa009"].ToString(),//澶囨敞
Blsj = row["prepareTime"].ToString(),//棰勮澶囨枡鏃堕棿
- Pcsl = row["daa008"].ToString()//鎺掍骇鏁伴噺
+ Pcsl = row["daa008"].ToString(),//鎺掍骇鏁伴噺
+ Yjwgsj = row["mesEndProd"].ToString()//棰勮瀹屽伐鏃堕棿
});
}
}
@@ -439,7 +453,6 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
-
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
@@ -476,14 +489,19 @@
}
}
- private void getModel(string strGuid, bool isEdit, int tabIdx)
+ private void getModel(string strGuid)
{
+ bool isEdit = false;
+ if (toolBarMenu1.currentAction == "add") {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ return;
+ };
+ if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
guid = strGuid,//涓诲缓
@@ -555,7 +573,7 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
+ if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
}
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.resx b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.resx
index d58980a..091f281 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.resx
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.resx
@@ -117,4 +117,121 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="picCheckBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ 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
+ 2OyW1yHZAAAAAElFTkSuQmCC
+</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 401c407..bd91ba9 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -59,7 +59,7 @@
}
}
}
-
+
public static string HttpPost(string url, string meth, string param)
{
string _caption = "鎷煎懡鍔犺浇涓紝璇风◢鍚�...";
@@ -1070,9 +1070,11 @@
/// </summary>
/// <param name="tabControl"></param>
/// <param name="idx">0鏌ョ湅锛�1閫�鍑猴紝2鍒犻櫎锛�3淇敼锛�4鏂板鍔�</param>
- public static void JumpTab(XtraTabControl tabControl, int action) {
+ public static void JumpTab(XtraTabControl tabControl, int action)
+ {
- if (action == 0) {
+ if (action == 0)
+ {
tabControl.TabPages[0].PageEnabled = true;
tabControl.TabPages[1].PageEnabled = true;
tabControl.SelectedTabPageIndex = 1;
@@ -1223,6 +1225,13 @@
if (str.ToUpper() == "true".ToUpper())
return 1;
return 0;
+ }
+
+ public string GetIsNullOrEmpty(string str)
+ {
+ if (string.IsNullOrEmpty(str.Trim()))
+ return "{>";
+ return str.Trim();
}
/// <summary>
@@ -1595,6 +1604,7 @@
/// <param name="icoName"></param>
public static void SetGridViewParameterMx(GridView gridView1)
{
+ gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
gridView1.OptionsFilter.AllowFilterEditor = false;
gridView1.OptionsFilter.ShowCustomFunctions = DevExpress.Utils.DefaultBoolean.False;
gridView1.OptionsCustomization.AllowFilter = false;
--
Gitblit v1.9.3