From ad76617fb57542f92350f84a33b0c2cf63f69383 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 11 四月 2025 15:14:24 +0800
Subject: [PATCH] fqc
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 19 +
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 23 +-
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs | 4
DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.resx | 0
DevApp/Gs.DevApp/Gs.DevApp.csproj | 6
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs | 54 ++--
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 8
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 39 ++-
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 104 +++++----
DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.cs | 27 --
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 274 ++++++++++++------------
DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs | 65 ++---
13 files changed, 316 insertions(+), 311 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 2d4703e..09d6be2 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 e3ed5d6..d44d5bb 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -88,6 +88,7 @@
this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -240,7 +241,7 @@
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1285, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -251,7 +252,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1285, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -261,7 +262,7 @@
//
this.xtraTabPage1.Controls.Add(this.split1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1283, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -275,7 +276,7 @@
//
this.split1.Panel1.Controls.Add(this.gcMain1);
this.split1.Panel1.Controls.Add(this.pageBar1);
- this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.Size = new System.Drawing.Size(1283, 570);
this.split1.SplitterPosition = 545;
this.split1.TabIndex = 4;
//
@@ -285,7 +286,7 @@
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1126, 506);
+ this.gcMain1.Size = new System.Drawing.Size(1283, 506);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -339,7 +340,8 @@
this.gridColumn36,
this.gridColumn37,
this.gridColumn38,
- this.gridColumn39});
+ this.gridColumn39,
+ this.gridColumn30});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -630,7 +632,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.CAA005";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 22;
+ this.gv_createDate.VisibleIndex = 26;
this.gv_createDate.Width = 180;
//
// gridColumn18
@@ -640,7 +642,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 23;
+ this.gridColumn18.VisibleIndex = 22;
this.gridColumn18.Width = 94;
//
// gridColumn19
@@ -650,7 +652,7 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 24;
+ this.gridColumn19.VisibleIndex = 23;
this.gridColumn19.Width = 94;
//
// gridColumn20
@@ -660,7 +662,7 @@
this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 25;
+ this.gridColumn20.VisibleIndex = 24;
this.gridColumn20.Width = 94;
//
// gridColumn21
@@ -670,7 +672,7 @@
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 26;
+ this.gridColumn21.VisibleIndex = 25;
this.gridColumn21.Width = 94;
//
// gridColumn22
@@ -833,6 +835,16 @@
this.gridColumn39.VisibleIndex = 42;
this.gridColumn39.Width = 94;
//
+ // gridColumn30
+ //
+ this.gridColumn30.Caption = "鍚屾鏃堕棿";
+ this.gridColumn30.FieldName = "createDate";
+ this.gridColumn30.MinWidth = 25;
+ this.gridColumn30.Name = "gridColumn30";
+ this.gridColumn30.Visible = true;
+ this.gridColumn30.VisibleIndex = 43;
+ this.gridColumn30.Width = 94;
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
@@ -841,7 +853,7 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1283, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
@@ -1700,7 +1712,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.ClientSize = new System.Drawing.Size(1285, 682);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_Womcaa";
@@ -1897,5 +1909,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index c5ff92b..81d11b6 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -108,7 +108,6 @@
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.lbGuid = new System.Windows.Forms.Label();
- this.txt_sjXt = new Gs.DevApp.UserControl.UcLookWorkline();
this.txt_daa009 = new DevExpress.XtraEditors.TextEdit();
this.txt_daa013 = new DevExpress.XtraEditors.TextEdit();
this.txt_daa001 = new DevExpress.XtraEditors.TextEdit();
@@ -118,7 +117,7 @@
this.txt_daa028 = new DevExpress.XtraEditors.TextEdit();
this.txt_mesStartProd = new DevExpress.XtraEditors.TextEdit();
this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
- this.txt_daa022Txt = new DevExpress.XtraEditors.TextEdit();
+ this.txt_daa022Remark = new DevExpress.XtraEditors.TextEdit();
this.txt_daa010 = new DevExpress.XtraEditors.TextEdit();
this.txt_mesEndProd = new DevExpress.XtraEditors.TextEdit();
this.txt_daa011 = new DevExpress.XtraEditors.TextEdit();
@@ -150,10 +149,7 @@
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -247,6 +243,10 @@
this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.txt_daa015 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -275,7 +275,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa028.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa022Txt.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa022Remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa010.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).BeginInit();
@@ -307,10 +307,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -351,6 +348,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -520,8 +521,6 @@
this.gridColumn8.MinWidth = 50;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Tag = "query_a.jabs";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 3;
this.gridColumn8.Width = 50;
//
// gridColumn9
@@ -533,7 +532,7 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Tag = "query_a.jabs";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 4;
+ this.gridColumn9.VisibleIndex = 3;
this.gridColumn9.Width = 50;
//
// gridColumn10
@@ -545,7 +544,7 @@
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Tag = "query_a.jabs";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 5;
+ this.gridColumn10.VisibleIndex = 4;
this.gridColumn10.Width = 50;
//
// gridColumn11
@@ -557,7 +556,7 @@
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Tag = "query_a.jabs";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 6;
+ this.gridColumn11.VisibleIndex = 5;
this.gridColumn11.Width = 50;
//
// gridColumn12
@@ -569,7 +568,7 @@
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Tag = "query_a.jabs";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 7;
+ this.gridColumn12.VisibleIndex = 6;
this.gridColumn12.Width = 50;
//
// gridColumn6
@@ -581,17 +580,17 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Tag = "query_a.jabs";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 8;
+ this.gridColumn6.VisibleIndex = 7;
this.gridColumn6.Width = 50;
//
// gridColumn27
//
this.gridColumn27.Caption = "澶囨枡绾у埆";
- this.gridColumn27.FieldName = "daa022Txt";
+ this.gridColumn27.FieldName = "daa022Remark";
this.gridColumn27.MinWidth = 25;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.Visible = true;
- this.gridColumn27.VisibleIndex = 9;
+ this.gridColumn27.VisibleIndex = 8;
this.gridColumn27.Width = 94;
//
// gv_daa018
@@ -604,7 +603,7 @@
this.gv_daa018.OptionsColumn.AllowEdit = false;
this.gv_daa018.Tag = "query_a.daa018";
this.gv_daa018.Visible = true;
- this.gv_daa018.VisibleIndex = 10;
+ this.gv_daa018.VisibleIndex = 9;
this.gv_daa018.Width = 90;
//
// gridColoun100
@@ -615,7 +614,7 @@
this.gridColoun100.Name = "gridColoun100";
this.gridColoun100.Tag = "org.fnamber";
this.gridColoun100.Visible = true;
- this.gridColoun100.VisibleIndex = 11;
+ this.gridColoun100.VisibleIndex = 10;
this.gridColoun100.Width = 250;
//
// gv_daa001
@@ -628,7 +627,7 @@
this.gv_daa001.OptionsColumn.AllowEdit = false;
this.gv_daa001.Tag = "query_a.daa001";
this.gv_daa001.Visible = true;
- this.gv_daa001.VisibleIndex = 12;
+ this.gv_daa001.VisibleIndex = 11;
this.gv_daa001.Width = 120;
//
// gv_daa021
@@ -641,7 +640,7 @@
this.gv_daa021.OptionsColumn.AllowEdit = false;
this.gv_daa021.Tag = "query_a.daa021";
this.gv_daa021.Visible = true;
- this.gv_daa021.VisibleIndex = 13;
+ this.gv_daa021.VisibleIndex = 12;
this.gv_daa021.Width = 100;
//
// gridColumn3
@@ -651,7 +650,7 @@
this.gridColumn3.MinWidth = 50;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 14;
+ this.gridColumn3.VisibleIndex = 13;
this.gridColumn3.Width = 94;
//
// gv_daa003
@@ -664,7 +663,7 @@
this.gv_daa003.OptionsColumn.AllowEdit = false;
this.gv_daa003.Tag = "query_a.daa003";
this.gv_daa003.Visible = true;
- this.gv_daa003.VisibleIndex = 15;
+ this.gv_daa003.VisibleIndex = 14;
this.gv_daa003.Width = 150;
//
// gv_daa004
@@ -677,7 +676,7 @@
this.gv_daa004.OptionsColumn.AllowEdit = false;
this.gv_daa004.Tag = "query_a.daa004";
this.gv_daa004.Visible = true;
- this.gv_daa004.VisibleIndex = 16;
+ this.gv_daa004.VisibleIndex = 15;
this.gv_daa004.Width = 150;
//
// gv_daa008
@@ -691,7 +690,7 @@
this.gv_daa008.OptionsColumn.AllowEdit = false;
this.gv_daa008.Tag = "query_a.daa008";
this.gv_daa008.Visible = true;
- this.gv_daa008.VisibleIndex = 17;
+ this.gv_daa008.VisibleIndex = 16;
this.gv_daa008.Width = 50;
//
// gv_daa011
@@ -705,7 +704,7 @@
this.gv_daa011.OptionsColumn.AllowEdit = false;
this.gv_daa011.Tag = "query_a.daa011";
this.gv_daa011.Visible = true;
- this.gv_daa011.VisibleIndex = 18;
+ this.gv_daa011.VisibleIndex = 17;
this.gv_daa011.Width = 50;
//
// gridColumn4
@@ -716,7 +715,7 @@
this.gridColumn4.MinWidth = 50;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 19;
+ this.gridColumn4.VisibleIndex = 18;
this.gridColumn4.Width = 50;
//
// gv_daa010
@@ -730,7 +729,7 @@
this.gv_daa010.OptionsColumn.AllowEdit = false;
this.gv_daa010.Tag = "query_a.daa010";
this.gv_daa010.Visible = true;
- this.gv_daa010.VisibleIndex = 21;
+ this.gv_daa010.VisibleIndex = 20;
this.gv_daa010.Width = 50;
//
// gv_daa005
@@ -744,7 +743,7 @@
this.gv_daa005.OptionsColumn.AllowEdit = false;
this.gv_daa005.Tag = "query_a.daa005";
this.gv_daa005.Visible = true;
- this.gv_daa005.VisibleIndex = 22;
+ this.gv_daa005.VisibleIndex = 21;
this.gv_daa005.Width = 50;
//
// gv_cust
@@ -757,7 +756,7 @@
this.gv_cust.OptionsColumn.AllowEdit = false;
this.gv_cust.Tag = "query_a.cust";
this.gv_cust.Visible = true;
- this.gv_cust.VisibleIndex = 23;
+ this.gv_cust.VisibleIndex = 22;
this.gv_cust.Width = 100;
//
// gridColumn1
@@ -767,7 +766,7 @@
this.gridColumn1.MinWidth = 50;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 24;
+ this.gridColumn1.VisibleIndex = 23;
this.gridColumn1.Width = 94;
//
// gv_daa015
@@ -780,7 +779,7 @@
this.gv_daa015.OptionsColumn.AllowEdit = false;
this.gv_daa015.Tag = "query_a.daa015";
this.gv_daa015.Visible = true;
- this.gv_daa015.VisibleIndex = 25;
+ this.gv_daa015.VisibleIndex = 24;
this.gv_daa015.Width = 94;
//
// gridColumn2
@@ -790,7 +789,7 @@
this.gridColumn2.MinWidth = 50;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 26;
+ this.gridColumn2.VisibleIndex = 25;
this.gridColumn2.Width = 94;
//
// gv_daa009
@@ -803,7 +802,7 @@
this.gv_daa009.OptionsColumn.AllowEdit = false;
this.gv_daa009.Tag = "query_a.daa009";
this.gv_daa009.Visible = true;
- this.gv_daa009.VisibleIndex = 20;
+ this.gv_daa009.VisibleIndex = 19;
this.gv_daa009.Width = 94;
//
// gv_prepareTime
@@ -816,7 +815,7 @@
this.gv_prepareTime.OptionsColumn.AllowEdit = false;
this.gv_prepareTime.Tag = "query_a.prepare_time";
this.gv_prepareTime.Visible = true;
- this.gv_prepareTime.VisibleIndex = 27;
+ this.gv_prepareTime.VisibleIndex = 26;
this.gv_prepareTime.Width = 180;
//
// gv_daa028
@@ -829,7 +828,7 @@
this.gv_daa028.OptionsColumn.AllowEdit = false;
this.gv_daa028.Tag = "query_a.daa028";
this.gv_daa028.Visible = true;
- this.gv_daa028.VisibleIndex = 28;
+ this.gv_daa028.VisibleIndex = 27;
this.gv_daa028.Width = 180;
//
// gv_daa016
@@ -842,7 +841,7 @@
this.gv_daa016.OptionsColumn.AllowEdit = false;
this.gv_daa016.Tag = "query_a.daa016";
this.gv_daa016.Visible = true;
- this.gv_daa016.VisibleIndex = 29;
+ this.gv_daa016.VisibleIndex = 28;
this.gv_daa016.Width = 180;
//
// gv_daa017
@@ -855,7 +854,7 @@
this.gv_daa017.OptionsColumn.AllowEdit = false;
this.gv_daa017.Tag = "query_a.daa017";
this.gv_daa017.Visible = true;
- this.gv_daa017.VisibleIndex = 30;
+ this.gv_daa017.VisibleIndex = 29;
this.gv_daa017.Width = 180;
//
// gv_mesStartProd
@@ -868,7 +867,7 @@
this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
this.gv_mesStartProd.Visible = true;
- this.gv_mesStartProd.VisibleIndex = 31;
+ this.gv_mesStartProd.VisibleIndex = 30;
this.gv_mesStartProd.Width = 180;
//
// gv_mesEndProd
@@ -881,7 +880,7 @@
this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
this.gv_mesEndProd.Visible = true;
- this.gv_mesEndProd.VisibleIndex = 32;
+ this.gv_mesEndProd.VisibleIndex = 31;
this.gv_mesEndProd.Width = 180;
//
// gridColumn21
@@ -891,7 +890,7 @@
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 33;
+ this.gridColumn21.VisibleIndex = 32;
this.gridColumn21.Width = 94;
//
// gridColumn22
@@ -901,7 +900,7 @@
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 34;
+ this.gridColumn22.VisibleIndex = 33;
this.gridColumn22.Width = 94;
//
// gridColumn23
@@ -919,7 +918,7 @@
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 35;
+ this.gridColumn24.VisibleIndex = 34;
this.gridColumn24.Width = 94;
//
// gridColumn25
@@ -929,7 +928,7 @@
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 36;
+ this.gridColumn25.VisibleIndex = 35;
this.gridColumn25.Width = 94;
//
// gridColumn26
@@ -939,7 +938,7 @@
this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 37;
+ this.gridColumn26.VisibleIndex = 36;
this.gridColumn26.Width = 94;
//
// pageBar1
@@ -984,7 +983,6 @@
// layoutMx1
//
this.layoutMx1.Controls.Add(this.lbGuid);
- this.layoutMx1.Controls.Add(this.txt_sjXt);
this.layoutMx1.Controls.Add(this.txt_daa009);
this.layoutMx1.Controls.Add(this.txt_daa013);
this.layoutMx1.Controls.Add(this.txt_daa001);
@@ -994,7 +992,7 @@
this.layoutMx1.Controls.Add(this.txt_daa028);
this.layoutMx1.Controls.Add(this.txt_mesStartProd);
this.layoutMx1.Controls.Add(this.txt_daa014);
- this.layoutMx1.Controls.Add(this.txt_daa022Txt);
+ this.layoutMx1.Controls.Add(this.txt_daa022Remark);
this.layoutMx1.Controls.Add(this.txt_daa010);
this.layoutMx1.Controls.Add(this.txt_mesEndProd);
this.layoutMx1.Controls.Add(this.txt_daa011);
@@ -1006,6 +1004,7 @@
this.layoutMx1.Controls.Add(this.txt_daa003);
this.layoutMx1.Controls.Add(this.txt_dwName);
this.layoutMx1.Controls.Add(this.txt_daa004);
+ this.layoutMx1.Controls.Add(this.txt_daa015);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem29});
@@ -1026,27 +1025,19 @@
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
- // txt_sjXt
- //
- this.txt_sjXt.IsReadly = false;
- this.txt_sjXt.Location = new System.Drawing.Point(385, 152);
- this.txt_sjXt.Name = "txt_sjXt";
- this.txt_sjXt.Size = new System.Drawing.Size(165, 24);
- this.txt_sjXt.TabIndex = 334;
- //
// txt_daa009
//
- this.txt_daa009.Location = new System.Drawing.Point(656, 124);
+ this.txt_daa009.Location = new System.Drawing.Point(385, 147);
this.txt_daa009.Name = "txt_daa009";
this.txt_daa009.Properties.Appearance.Options.UseFont = true;
- this.txt_daa009.Size = new System.Drawing.Size(165, 24);
+ this.txt_daa009.Size = new System.Drawing.Size(436, 24);
this.txt_daa009.StyleController = this.layoutMx1;
this.txt_daa009.TabIndex = 240;
this.txt_daa009.Tag = "";
//
// txt_daa013
//
- this.txt_daa013.Location = new System.Drawing.Point(656, 96);
+ this.txt_daa013.Location = new System.Drawing.Point(656, 119);
this.txt_daa013.Name = "txt_daa013";
this.txt_daa013.Properties.Appearance.Options.UseFont = true;
this.txt_daa013.Size = new System.Drawing.Size(165, 24);
@@ -1056,7 +1047,7 @@
//
// txt_daa001
//
- this.txt_daa001.Location = new System.Drawing.Point(114, 12);
+ this.txt_daa001.Location = new System.Drawing.Point(114, 7);
this.txt_daa001.Name = "txt_daa001";
this.txt_daa001.Properties.Appearance.Options.UseFont = true;
this.txt_daa001.Size = new System.Drawing.Size(165, 24);
@@ -1066,7 +1057,7 @@
//
// textEdit1
//
- this.textEdit1.Location = new System.Drawing.Point(385, 40);
+ this.textEdit1.Location = new System.Drawing.Point(385, 35);
this.textEdit1.Name = "textEdit1";
this.textEdit1.Properties.Appearance.Options.UseFont = true;
this.textEdit1.Size = new System.Drawing.Size(165, 24);
@@ -1076,7 +1067,7 @@
//
// txt_daa008
//
- this.txt_daa008.Location = new System.Drawing.Point(656, 12);
+ this.txt_daa008.Location = new System.Drawing.Point(656, 7);
this.txt_daa008.Name = "txt_daa008";
this.txt_daa008.Properties.Appearance.Options.UseFont = true;
this.txt_daa008.Size = new System.Drawing.Size(165, 24);
@@ -1086,7 +1077,7 @@
//
// txt_saleOrderNo
//
- this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 68);
+ this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 63);
this.txt_saleOrderNo.Name = "txt_saleOrderNo";
this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
this.txt_saleOrderNo.Size = new System.Drawing.Size(165, 24);
@@ -1096,7 +1087,7 @@
//
// txt_daa028
//
- this.txt_daa028.Location = new System.Drawing.Point(385, 68);
+ this.txt_daa028.Location = new System.Drawing.Point(385, 63);
this.txt_daa028.Name = "txt_daa028";
this.txt_daa028.Properties.Appearance.Options.UseFont = true;
this.txt_daa028.Size = new System.Drawing.Size(165, 24);
@@ -1106,7 +1097,7 @@
//
// txt_mesStartProd
//
- this.txt_mesStartProd.Location = new System.Drawing.Point(927, 40);
+ this.txt_mesStartProd.Location = new System.Drawing.Point(927, 35);
this.txt_mesStartProd.Name = "txt_mesStartProd";
this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
this.txt_mesStartProd.Size = new System.Drawing.Size(166, 24);
@@ -1116,7 +1107,7 @@
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(114, 40);
+ this.txt_daa014.Location = new System.Drawing.Point(114, 35);
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Properties.Appearance.Options.UseFont = true;
this.txt_daa014.Size = new System.Drawing.Size(165, 24);
@@ -1124,19 +1115,19 @@
this.txt_daa014.TabIndex = 327;
this.txt_daa014.Tag = "readonly";
//
- // txt_daa022Txt
+ // txt_daa022Remark
//
- this.txt_daa022Txt.Location = new System.Drawing.Point(385, 12);
- this.txt_daa022Txt.Name = "txt_daa022Txt";
- this.txt_daa022Txt.Properties.Appearance.Options.UseFont = true;
- this.txt_daa022Txt.Size = new System.Drawing.Size(165, 24);
- this.txt_daa022Txt.StyleController = this.layoutMx1;
- this.txt_daa022Txt.TabIndex = 462;
- this.txt_daa022Txt.Tag = "readonly";
+ this.txt_daa022Remark.Location = new System.Drawing.Point(385, 7);
+ this.txt_daa022Remark.Name = "txt_daa022Remark";
+ this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true;
+ this.txt_daa022Remark.Size = new System.Drawing.Size(165, 24);
+ this.txt_daa022Remark.StyleController = this.layoutMx1;
+ this.txt_daa022Remark.TabIndex = 462;
+ this.txt_daa022Remark.Tag = "readonly";
//
// txt_daa010
//
- this.txt_daa010.Location = new System.Drawing.Point(656, 40);
+ this.txt_daa010.Location = new System.Drawing.Point(656, 35);
this.txt_daa010.Name = "txt_daa010";
this.txt_daa010.Properties.Appearance.Options.UseFont = true;
this.txt_daa010.Size = new System.Drawing.Size(165, 24);
@@ -1146,7 +1137,7 @@
//
// txt_mesEndProd
//
- this.txt_mesEndProd.Location = new System.Drawing.Point(927, 68);
+ this.txt_mesEndProd.Location = new System.Drawing.Point(927, 63);
this.txt_mesEndProd.Name = "txt_mesEndProd";
this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
this.txt_mesEndProd.Size = new System.Drawing.Size(166, 24);
@@ -1156,7 +1147,7 @@
//
// txt_daa011
//
- this.txt_daa011.Location = new System.Drawing.Point(656, 68);
+ this.txt_daa011.Location = new System.Drawing.Point(656, 63);
this.txt_daa011.Name = "txt_daa011";
this.txt_daa011.Properties.Appearance.Options.UseFont = true;
this.txt_daa011.Size = new System.Drawing.Size(165, 24);
@@ -1166,7 +1157,7 @@
//
// txt_dptName
//
- this.txt_dptName.Location = new System.Drawing.Point(385, 124);
+ this.txt_dptName.Location = new System.Drawing.Point(656, 91);
this.txt_dptName.Name = "txt_dptName";
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
this.txt_dptName.Size = new System.Drawing.Size(165, 24);
@@ -1176,7 +1167,7 @@
//
// txt_daa016
//
- this.txt_daa016.Location = new System.Drawing.Point(927, 96);
+ this.txt_daa016.Location = new System.Drawing.Point(927, 91);
this.txt_daa016.Name = "txt_daa016";
this.txt_daa016.Properties.Appearance.Options.UseFont = true;
this.txt_daa016.Size = new System.Drawing.Size(166, 24);
@@ -1186,7 +1177,7 @@
//
// txt_daa029
//
- this.txt_daa029.Location = new System.Drawing.Point(114, 96);
+ this.txt_daa029.Location = new System.Drawing.Point(114, 91);
this.txt_daa029.Name = "txt_daa029";
this.txt_daa029.Properties.Appearance.Options.UseFont = true;
this.txt_daa029.Size = new System.Drawing.Size(165, 24);
@@ -1196,7 +1187,7 @@
//
// txt_lineName
//
- this.txt_lineName.Location = new System.Drawing.Point(385, 96);
+ this.txt_lineName.Location = new System.Drawing.Point(385, 91);
this.txt_lineName.Name = "txt_lineName";
this.txt_lineName.Properties.Appearance.Options.UseFont = true;
this.txt_lineName.Size = new System.Drawing.Size(165, 24);
@@ -1206,7 +1197,7 @@
//
// txt_daa017
//
- this.txt_daa017.Location = new System.Drawing.Point(927, 124);
+ this.txt_daa017.Location = new System.Drawing.Point(927, 119);
this.txt_daa017.Name = "txt_daa017";
this.txt_daa017.Properties.Appearance.Options.UseFont = true;
this.txt_daa017.Size = new System.Drawing.Size(166, 24);
@@ -1216,7 +1207,7 @@
//
// txt_daa003
//
- this.txt_daa003.Location = new System.Drawing.Point(114, 152);
+ this.txt_daa003.Location = new System.Drawing.Point(114, 147);
this.txt_daa003.Name = "txt_daa003";
this.txt_daa003.Properties.Appearance.Options.UseFont = true;
this.txt_daa003.Size = new System.Drawing.Size(165, 24);
@@ -1226,7 +1217,7 @@
//
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(927, 12);
+ this.txt_dwName.Location = new System.Drawing.Point(927, 7);
this.txt_dwName.Name = "txt_dwName";
this.txt_dwName.Properties.Appearance.Options.UseFont = true;
this.txt_dwName.Size = new System.Drawing.Size(166, 24);
@@ -1236,7 +1227,7 @@
//
// txt_daa004
//
- this.txt_daa004.Location = new System.Drawing.Point(114, 124);
+ this.txt_daa004.Location = new System.Drawing.Point(114, 119);
this.txt_daa004.Name = "txt_daa004";
this.txt_daa004.Properties.Appearance.Options.UseFont = true;
this.txt_daa004.Size = new System.Drawing.Size(165, 24);
@@ -1279,10 +1270,10 @@
this.layoutControlItem8,
this.layoutControlItem12,
this.layoutControlItem16,
- this.layoutControlItem18,
- this.layoutControlItem20,
this.layoutControlItem28,
- this.layoutControlItem27});
+ this.layoutControlItem27,
+ this.layoutControlItem20,
+ this.layoutControlItem18});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1435,7 +1426,7 @@
//
// layoutControlItem6
//
- this.layoutControlItem6.Control = this.txt_daa022Txt;
+ this.layoutControlItem6.Control = this.txt_daa022Remark;
this.layoutControlItem6.Location = new System.Drawing.Point(271, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -1508,49 +1499,17 @@
this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿";
this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem18
- //
- this.layoutControlItem18.Control = this.txt_daa013;
- this.layoutControlItem18.Location = new System.Drawing.Point(542, 84);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(271, 28);
- this.layoutControlItem18.Text = "鐢熶骇杞﹂棿";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem20
- //
- this.layoutControlItem20.Control = this.txt_dptName;
- this.layoutControlItem20.Location = new System.Drawing.Point(271, 112);
- this.layoutControlItem20.Name = "layoutControlItem20";
- this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem20.Size = new System.Drawing.Size(271, 28);
- this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
- //
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_daa009;
- this.layoutControlItem28.Location = new System.Drawing.Point(542, 112);
+ this.layoutControlItem28.Location = new System.Drawing.Point(271, 140);
this.layoutControlItem28.Name = "layoutControlItem28";
- this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem28.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem28.Size = new System.Drawing.Size(542, 28);
this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem27
- //
- this.layoutControlItem27.Control = this.txt_sjXt;
- this.layoutControlItem27.Location = new System.Drawing.Point(271, 140);
- this.layoutControlItem27.Name = "layoutControlItem27";
- this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem27.Size = new System.Drawing.Size(271, 28);
- this.layoutControlItem27.Text = "瀹為檯绾夸綋";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
// tabMx
//
@@ -2650,6 +2609,48 @@
this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem34.TextVisible = false;
//
+ // txt_daa015
+ //
+ this.txt_daa015.Location = new System.Drawing.Point(385, 119);
+ this.txt_daa015.Name = "txt_daa015";
+ this.txt_daa015.Size = new System.Drawing.Size(165, 24);
+ this.txt_daa015.StyleController = this.layoutMx1;
+ this.txt_daa015.TabIndex = 473;
+ //
+ // layoutControlItem27
+ //
+ this.layoutControlItem27.Control = this.txt_daa015;
+ this.layoutControlItem27.Location = new System.Drawing.Point(271, 112);
+ this.layoutControlItem27.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem27.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem27.Text = "鐢熶骇绾垮埆ID";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.txt_dptName;
+ this.layoutControlItem20.Location = new System.Drawing.Point(542, 84);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem20.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txt_daa013;
+ this.layoutControlItem18.CustomizationFormText = "鐢熶骇杞﹂棿ID";
+ this.layoutControlItem18.Location = new System.Drawing.Point(542, 112);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem18.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem18.Text = "杞﹂棿ID";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+ //
// Frm_Womdaa
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2687,7 +2688,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa028.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa022Txt.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa022Remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa010.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).EndInit();
@@ -2719,10 +2720,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2763,6 +2761,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
this.ResumeLayout(false);
}
@@ -2817,11 +2819,10 @@
private DevExpress.XtraEditors.TextEdit txt_daa013;
private DevExpress.XtraEditors.TextEdit textEdit1;
private DevExpress.XtraEditors.TextEdit txt_saleOrderNo;
- private DevExpress.XtraEditors.TextEdit txt_daa022Txt;
+ private DevExpress.XtraEditors.TextEdit txt_daa022Remark;
private DevExpress.XtraEditors.TextEdit txt_daa028;
private DevExpress.XtraEditors.TextEdit txt_mesEndProd;
private DevExpress.XtraEditors.TextEdit txt_mesStartProd;
- private UserControl.UcLookWorkline txt_sjXt;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_daa014;
private DevExpress.XtraEditors.TextEdit txt_daa017;
@@ -2928,10 +2929,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
private DevExpress.XtraGrid.GridControl gcMx3;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
@@ -2956,5 +2953,10 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+ private DevExpress.XtraEditors.TextEdit txt_daa015;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 2f04a9b..e2b6400 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -19,7 +19,7 @@
{
InitializeComponent();
this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
- this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ // this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
@@ -47,7 +47,7 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
-
+
//杩欐槸鎶ュ伐鐮�
this.ucBtnPrint1.btnDesignClick += (s, e) =>
{
@@ -58,7 +58,8 @@
_print();
};
//杩欐槸杩芥函鐮�
- this.ucBtnPrint98.btnDesignClick += (s, e) => {
+ this.ucBtnPrint98.btnDesignClick += (s, e) =>
+ {
ucBtnPrint98.rptParameter = "rpt_trace{}";
};
this.ucBtnPrint98.btnReportClick += (s, e) =>
@@ -67,15 +68,15 @@
};
}
-
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
-
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -95,7 +96,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -117,7 +118,7 @@
/// <exception cref="NotImplementedException"></exception>
private void ToolBarMenu1_btnFjieAnClick(object sender, EventArgs e)
{
-
+
}
/// <summary>
/// 鍙嶇粨妗�
@@ -241,36 +242,36 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
- toolBarMenu1.isSetBtn = false;
- var _obj = new
- {
- guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- sjxt = txt_sjXt.GetId(), //瀹為檯绾夸綋
- bz = txt_daa009.Text.Trim()//澶囨敞
- };
- try
- {
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- if (_rtn.rtnCode > 0)
- {
- lbGuid.Text = _rtn.rtnData;
- toolBarMenu1.isSetBtn = true;
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
- toolBarMenu1.currentAction = "";
- txt_printRemark.Enabled = txt_psnQty_1.Enabled = txt_iCount_1.Enabled = true;
- txt_printRemark.ReadOnly = txt_psnQty_1.ReadOnly = txt_iCount_1.ReadOnly = false;
- toolBarMenu1.currentAction = "";
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
- }
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
+ //toolBarMenu1.isSetBtn = false;
+ //var _obj = new
+ //{
+ // guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ // sjxt = txt_sjXt.GetId(), //瀹為檯绾夸綋
+ // bz = txt_daa009.Text.Trim()//澶囨敞
+ //};
+ //try
+ //{
+ // string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+ // ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ // if (_rtn.rtnCode > 0)
+ // {
+ // lbGuid.Text = _rtn.rtnData;
+ // toolBarMenu1.isSetBtn = true;
+ // List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ // gvList.Add(gvMx1);
+ // UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
+ // toolBarMenu1.currentAction = "";
+ // txt_printRemark.Enabled = txt_psnQty_1.Enabled = txt_iCount_1.Enabled = true;
+ // txt_printRemark.ReadOnly = txt_psnQty_1.ReadOnly = txt_iCount_1.ReadOnly = false;
+ // toolBarMenu1.currentAction = "";
+ // Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ // }
+ //}
+ //catch (Exception ex)
+ //{
+ // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ //}
}
/// <summary>
@@ -341,14 +342,16 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
- string cjId = dy.daa013;
- string xjxt = dy.sjXt;
- txt_sjXt.getSuppler(cjId, xjxt);
+ //string cjId = dy.daa013;
+ //string xjxt = dy.sjXt;
+ // txt_sjXt.getSuppler(cjId, xjxt);
+ txt_yQty.Text = dy.yQty;
+ txt_kQty.Text = dy.kQty;
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
gvList.Add(gvMx2);
- UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
@@ -380,12 +383,12 @@
gcMx2.DataSource = dt2;
gcMx2.ForceInitialize();
gvMx2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
}
else
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
}
-
JArray array3 = new JArray();
foreach (var a in _job["rtnData"]["list3"])
{
@@ -398,6 +401,7 @@
gcMx3.DataSource = dt3;
gcMx3.ForceInitialize();
gvMx3.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx3);
}
else
{
@@ -482,7 +486,8 @@
{
getModel(lbGuid.Text.Trim());
}
- else {
+ else
+ {
//娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
getPageList(this.pageBar1.CurrentPage);
int rowHandle = gridView1.LocateByValue("guid", rowGuid);
@@ -516,13 +521,14 @@
}
if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍐呭寘瑁呮暟閲忥紒");
txt_psnQty_1.Focus();
this.ucBtnPrint1.rptParameter = "return false";
return;
}
- this.ucBtnPrint1.rptParameter = "rpt_daa{" + ""
- + "," + txt_printRemark.Text.Trim()
+ this.ucBtnPrint1.rptParameter = "rpt_daa{"
+ + txt_printRemark.Text.Trim()
+ + "," +""
+ "," + ""
+ "," + txt_iCount_1.Text.Trim()
+ "," + txt_psnQty_1.Text.Trim()
@@ -548,7 +554,7 @@
return;
}
this.ucBtnPrint98.rptParameter = "rpt_trace{" + ""
- + "," + txt_printRemark.Text.Trim()
+ + "," + txt_printRemark98.Text.Trim()
+ "," + ""
+ "," + txt_iCount_98.Text.Trim()
+ "," + 1
@@ -589,6 +595,6 @@
}
}
}
-
+
}
}
\ 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 e4cef98..1464d5d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -464,7 +464,7 @@
this.txt_pba013.IsReadly = false;
this.txt_pba013.Location = new System.Drawing.Point(89, 43);
this.txt_pba013.Name = "txt_pba013";
- this.txt_pba013.Size = new System.Drawing.Size(195, 24);
+ this.txt_pba013.Size = new System.Drawing.Size(190, 24);
this.txt_pba013.TabIndex = 459;
//
// txt_erpSczz
@@ -472,54 +472,54 @@
this.txt_erpSczz.IsReadly = false;
this.txt_erpSczz.Location = new System.Drawing.Point(89, 12);
this.txt_erpSczz.Name = "txt_erpSczz";
- this.txt_erpSczz.Size = new System.Drawing.Size(195, 24);
+ this.txt_erpSczz.Size = new System.Drawing.Size(190, 24);
this.txt_erpSczz.TabIndex = 460;
//
// txt_hNo
//
- this.txt_hNo.Location = new System.Drawing.Point(365, 12);
+ this.txt_hNo.Location = new System.Drawing.Point(360, 12);
this.txt_hNo.Name = "txt_hNo";
this.txt_hNo.Properties.Appearance.Options.UseFont = true;
- this.txt_hNo.Size = new System.Drawing.Size(195, 24);
+ this.txt_hNo.Size = new System.Drawing.Size(190, 24);
this.txt_hNo.StyleController = this.layoutMx1;
this.txt_hNo.TabIndex = 458;
this.txt_hNo.Tag = "readonly";
//
// txt_pba009
//
- this.txt_pba009.Location = new System.Drawing.Point(365, 43);
+ this.txt_pba009.Location = new System.Drawing.Point(360, 43);
this.txt_pba009.Name = "txt_pba009";
this.txt_pba009.Properties.Appearance.Options.UseFont = true;
- this.txt_pba009.Size = new System.Drawing.Size(471, 24);
+ this.txt_pba009.Size = new System.Drawing.Size(461, 24);
this.txt_pba009.StyleController = this.layoutMx1;
this.txt_pba009.TabIndex = 240;
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(917, 12);
+ this.txt_checkUser.Location = new System.Drawing.Point(902, 12);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(197, 24);
+ this.txt_checkUser.Size = new System.Drawing.Size(191, 24);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 273;
this.txt_checkUser.Tag = "readonly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(641, 12);
+ this.txt_checkDate.Location = new System.Drawing.Point(631, 12);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(195, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(190, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 267;
this.txt_checkDate.Tag = "readonly";
//
// txt_fstatus
//
- this.txt_fstatus.Location = new System.Drawing.Point(840, 43);
+ this.txt_fstatus.Location = new System.Drawing.Point(825, 43);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_fstatus.Size = new System.Drawing.Size(274, 24);
+ this.txt_fstatus.Size = new System.Drawing.Size(268, 24);
this.txt_fstatus.StyleController = this.layoutMx1;
this.txt_fstatus.TabIndex = 461;
this.txt_fstatus.Tag = "readonly";
@@ -574,7 +574,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1126, 113);
+ this.Root.Size = new System.Drawing.Size(1105, 113);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -582,27 +582,27 @@
this.layoutControlItem1.Control = this.txt_erpSczz;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem1.Text = "鐢熶骇缁勭粐";
this.layoutControlItem1.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_hNo;
- this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem2.Text = "鎺掍骇缂栧彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_checkDate;
- this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem3.Text = "瀹℃牳鏃ユ湡 ";
this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 18);
//
@@ -612,28 +612,28 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem4.Text = "宸ヤ綔杞﹂棿";
this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_checkUser;
- this.layoutControlItem5.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(813, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem5.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem5.Text = "瀹℃牳浜�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_fstatus;
- this.layoutControlItem6.Location = new System.Drawing.Point(828, 31);
+ this.layoutControlItem6.Location = new System.Drawing.Point(813, 31);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem6.Text = "瀹℃牳鐘舵��";
this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem6.TextVisible = false;
@@ -641,12 +641,12 @@
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_pba009;
- this.layoutControlItem7.Location = new System.Drawing.Point(276, 31);
+ this.layoutControlItem7.Location = new System.Drawing.Point(271, 31);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(552, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
this.layoutControlItem7.Text = "鎺掍骇澶囨敞";
this.layoutControlItem7.TextSize = new System.Drawing.Size(65, 18);
//
@@ -658,7 +658,7 @@
this.layoutControlItem8.MinSize = new System.Drawing.Size(105, 31);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem8.Text = "閫夋嫨鎶曟枡鍗�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
@@ -748,7 +748,7 @@
// gvMx1guid
//
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
- this.gvMx1guid.Caption = "guid";
+ this.gvMx1guid.Caption = "鏄庣粏Guid";
this.gvMx1guid.FieldName = "guid";
this.gvMx1guid.MinWidth = 50;
this.gvMx1guid.Name = "gvMx1guid";
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index a91dd61..cd9f538 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -94,6 +94,7 @@
gvMx1.UpdateCurrentRow();
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
catch (Exception ex)
{
@@ -105,7 +106,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -129,7 +130,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -319,16 +320,15 @@
if (row != null)
{
Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
- //string _LineId = row["daa015"].ToString();
- //if (string.IsNullOrEmpty(_LineId))
- //{
- // MsgHelper.ShowError("浜х嚎缂栫爜涓嶈兘涓虹┖锛�");
- // return;
- //}
- string _Pcsl = row["daa008"].ToString();
- if (string.IsNullOrEmpty(_Pcsl))
+ string _LineId = row["daa015"].ToString();
+ if (string.IsNullOrEmpty(_LineId))
{
- MsgHelper.ShowError("鎺掍骇鏁伴噺涓嶈兘涓虹┖锛�");
+ MsgHelper.ShowError("绾垮埆涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(row["daa008"].ToString()) <= 0)
+ {
+ MsgHelper.ShowError("璇疯緭鍏ユ纭殑鎺掍骇鏁伴噺锛�");
return;
}
string _Yjkgsj = row["mesStartProd"].ToString();
@@ -489,6 +489,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
diff --git a/DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs
similarity index 91%
rename from DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs
rename to DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs
index e95e51f..4d3fc65 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.Designer.cs
@@ -28,7 +28,6 @@
/// </summary>
private void InitializeComponent()
{
- this.pageBar1 = new UserControls.Data.UcPageBar();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -49,32 +48,20 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
this.panelControl1.SuspendLayout();
this.SuspendLayout();
//
- // pageBar1
- //
- this.pageBar1.CurrentPage = 1;
- this.pageBar1.Dock = System.Windows.Forms.DockStyle.Left;
- this.pageBar1.Location = new System.Drawing.Point(2, 2);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
- this.pageBar1.Name = "pageBar1";
- this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(943, 39);
- this.pageBar1.TabIndex = 3;
- this.pageBar1.TotalPages = 0;
- //
// gcMain
//
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1047, 517);
+ this.gcMain.Size = new System.Drawing.Size(1047, 642);
this.gcMain.TabIndex = 1;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -83,7 +70,6 @@
//
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -102,7 +88,8 @@
this.gridColumn7,
this.gv_purchaseUnit,
this.gv_inventoryUnit,
- this.gridColumn1});
+ this.gridColumn1,
+ this.gridColumn2});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -114,7 +101,6 @@
//
// gv_guid
//
-
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
this.gv_guid.FieldName = "guid";
@@ -127,7 +113,6 @@
//
// gv_remarks
//
-
this.gv_remarks.AppearanceCell.Options.UseFont = true;
this.gv_remarks.Caption = "闇�姹傚崟鍙�";
this.gv_remarks.FieldName = "saleOrderNo";
@@ -175,7 +160,6 @@
//
// gv_billNo
//
-
this.gv_billNo.AppearanceCell.ForeColor = System.Drawing.Color.Red;
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.AppearanceCell.Options.UseForeColor = true;
@@ -195,7 +179,6 @@
//
// gv_supplierItemCode
//
-
this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜";
this.gv_supplierItemCode.FieldName = "wlbm";
@@ -210,7 +193,6 @@
//
// gv_supplierItemName
//
-
this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
this.gv_supplierItemName.Caption = "鐗╂枡鍚嶇О";
this.gv_supplierItemName.FieldName = "wlmc";
@@ -230,8 +212,6 @@
this.gridColumn5.MinWidth = 50;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 8;
this.gridColumn5.Width = 250;
//
// gridColumn6
@@ -243,7 +223,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 9;
+ this.gridColumn6.VisibleIndex = 8;
this.gridColumn6.Width = 50;
//
// gridColumn9
@@ -254,7 +234,7 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 10;
+ this.gridColumn9.VisibleIndex = 9;
this.gridColumn9.Width = 100;
//
// gridColumn8
@@ -265,7 +245,7 @@
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.OptionsColumn.ReadOnly = true;
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 11;
+ this.gridColumn8.VisibleIndex = 10;
this.gridColumn8.Width = 100;
//
// gridColumn7
@@ -276,12 +256,11 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 12;
+ this.gridColumn7.VisibleIndex = 11;
this.gridColumn7.Width = 100;
//
// gv_purchaseUnit
//
-
this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
this.gv_purchaseUnit.Caption = "杞﹂棿";
this.gv_purchaseUnit.FieldName = "dptName";
@@ -291,12 +270,11 @@
this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
this.gv_purchaseUnit.Visible = true;
- this.gv_purchaseUnit.VisibleIndex = 13;
+ this.gv_purchaseUnit.VisibleIndex = 12;
this.gv_purchaseUnit.Width = 100;
//
// gv_inventoryUnit
//
-
this.gv_inventoryUnit.AppearanceCell.Options.UseFont = true;
this.gv_inventoryUnit.Caption = "寮�宸ョ姸鎬�";
this.gv_inventoryUnit.FieldName = "gdzt";
@@ -306,7 +284,7 @@
this.gv_inventoryUnit.OptionsColumn.ReadOnly = true;
this.gv_inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
this.gv_inventoryUnit.Visible = true;
- this.gv_inventoryUnit.VisibleIndex = 14;
+ this.gv_inventoryUnit.VisibleIndex = 13;
this.gv_inventoryUnit.Width = 100;
//
// gridColumn1
@@ -315,16 +293,13 @@
this.gridColumn1.FieldName = "fSubsidiary";
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 15;
this.gridColumn1.Width = 94;
//
// panelControl1
//
this.panelControl1.Controls.Add(this.btnIn);
- this.panelControl1.Controls.Add(this.pageBar1);
this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panelControl1.Location = new System.Drawing.Point(0, 517);
+ this.panelControl1.Location = new System.Drawing.Point(0, 642);
this.panelControl1.Name = "panelControl1";
this.panelControl1.Size = new System.Drawing.Size(1047, 43);
this.panelControl1.TabIndex = 5;
@@ -332,7 +307,6 @@
// btnIn
//
this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
-
this.btnIn.Appearance.Options.UseBackColor = true;
this.btnIn.Appearance.Options.UseFont = true;
this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
@@ -343,11 +317,21 @@
this.btnIn.TabIndex = 4;
this.btnIn.Text = "纭畾瀵煎叆";
//
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鐢ㄦ枡娓呭崟";
+ this.gridColumn2.FieldName = "ylqd";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 14;
+ this.gridColumn2.Width = 94;
+ //
// SelectWompba
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1047, 560);
+ this.ClientSize = new System.Drawing.Size(1047, 685);
this.Controls.Add(this.gcMain);
this.Controls.Add(this.panelControl1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
@@ -355,7 +339,7 @@
this.MinimizeBox = false;
this.Name = "SelectWompba";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "閫夋嫨鐢熶骇浠诲姟鍗曪紝鍙樉绀轰笅杈撅紝鐢ㄦ枡娓呭崟宸插鏍哥殑";
+ this.Text = "閫夋嫨鐢熶骇浠诲姟鍗曪紝鍙樉绀轰笅杈�+鐢ㄦ枡娓呭崟宸插鏍�+鏈帓浜ч噺>0";
this.TopMost = true;
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -366,8 +350,6 @@
}
#endregion
-
- private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.GridControl gcMain;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
@@ -388,5 +370,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.PanelControl panelControl1;
private DevExpress.XtraEditors.SimpleButton btnIn;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectWompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.cs
similarity index 76%
rename from DevApp/Gs.DevApp/UserControl/SelectWompba.cs
rename to DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.cs
index fb3daf1..dc79f79 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectWompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.cs
@@ -1,4 +1,4 @@
-锘縰sing DevExpress.RichEdit.Export;
+锘�
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
@@ -10,20 +10,17 @@
{
public partial class SelectWompba : DevExpress.XtraEditors.XtraForm
{
- private readonly List<FilterEntity> _filterList =
- new List<FilterEntity>();
private readonly string _webServiceName = "WompbaManager/";
private string workId = "";
public SelectWompba(string _workId)
{
InitializeComponent();
this.workId = _workId;
- pageBar1.PagerEvent += PageBar1_PagerEvent;
- getPageList(1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
-
- });
+
+ }, null, false);
+ getPageList(1);
btnIn.Click += (s, e) =>
{
var list = new List<string>();
@@ -46,16 +43,6 @@
public event EventHandler<UpdateParentEventArgs> UpdateParent;
/// <summary>
- /// 鍒嗛〉浜嬩欢
- /// </summary>
- /// <param name="curPage"></param>
- /// <param name="pageSize"></param>
- private void PageBar1_PagerEvent(int curPage, int pageSize)
- {
- getPageList(curPage);
- }
-
- /// <summary>
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
@@ -64,7 +51,7 @@
var _obj = new
{
currentPage = curPage,
- everyPageSize = this.pageBar1.RowsCount,
+ everyPageSize = 999999,
sortName = "",
keyWhere = "",
workId = this.workId
@@ -80,10 +67,6 @@
gcMain.DataSource = dt;
gcMain.ForceInitialize();
gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
- var dddd = dd.rtnData.pages; //鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
- pageBar1.CurrentPage = curPage; //褰撳墠椤�
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/UserControl/SelectWompba.resx b/DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.resx
similarity index 100%
rename from DevApp/Gs.DevApp/UserControl/SelectWompba.resx
rename to DevApp/Gs.DevApp/DevFrm/WOM/SelectWompba.resx
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 148fc26..aca2c67 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -156,6 +156,7 @@
this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -955,7 +956,8 @@
this.gridColumn9,
this.gridColumn7,
this.gridColumn15,
- this.gridColumn19});
+ this.gridColumn19,
+ this.gridColumn12});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1129,7 +1131,7 @@
// gridColumn15
//
this.gridColumn15.Caption = "妫�楠岀姸鎬�";
- this.gridColumn15.FieldName = "checkStates";
+ this.gridColumn15.FieldName = "jyzt";
this.gridColumn15.MinWidth = 50;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
@@ -1139,7 +1141,7 @@
// gridColumn19
//
this.gridColumn19.Caption = "妫�楠岀粨鏋�";
- this.gridColumn19.FieldName = "checkRes";
+ this.gridColumn19.FieldName = "jyjg";
this.gridColumn19.MinWidth = 50;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
@@ -1538,6 +1540,16 @@
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "鍒ゅ畾缁撴灉";
+ this.gridColumn12.FieldName = "pdjg";
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 14;
+ this.gridColumn12.Width = 94;
+ //
// Frm_ArrivalBarcode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1731,5 +1743,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 7fb333f..fb99090 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -955,10 +955,10 @@
<Compile Include="UserControl\SelectWomdaahb.Designer.cs">
<DependentUpon>SelectWomdaahb.cs</DependentUpon>
</Compile>
- <Compile Include="UserControl\SelectWompba.cs">
+ <Compile Include="DevFrm\WOM\SelectWompba.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="UserControl\SelectWompba.Designer.cs">
+ <Compile Include="DevFrm\WOM\SelectWompba.Designer.cs">
<DependentUpon>SelectWompba.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\SelectWwPc.cs">
@@ -1530,7 +1530,7 @@
<EmbeddedResource Include="UserControl\SelectWomdaahb.resx">
<DependentUpon>SelectWomdaahb.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="UserControl\SelectWompba.resx">
+ <EmbeddedResource Include="DevFrm\WOM\SelectWompba.resx">
<DependentUpon>SelectWompba.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectWwPc.resx">
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index ff2a2f4..37f6cca 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -2025,7 +2025,13 @@
Regex regex = new Regex("^[0-9]+$");
return regex.IsMatch(str);
}
-
+ public static bool IsNumeric2(string str)
+ {
+ string input = str;
+ decimal number;
+ bool isNumeric = decimal.TryParse(input, out number);
+ return isNumeric;
+ }
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
index 5c379e0..069bccd 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -10,9 +10,7 @@
{
public partial class SelectCgMx : XtraForm
{
- private readonly List<FilterEntity> _filterList =
- new List<FilterEntity>();
-
+
private readonly string _webServiceName = "MesInvItemArnManager/";
private string suppId = "";
private string receiveOrgId = "";
--
Gitblit v1.9.3