From 6f0266b7737f7f6af97cb1ace5bb0521c9b0790c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 27 六月 2025 17:15:21 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.cs | 27 ++++
DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.Designer.cs | 257 ++++++++++++++++++++++-----------------------------
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.resx | 3
4 files changed, 139 insertions(+), 152 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 3d80851..f77fd81 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,9 +28,9 @@
</assemblyBinding>
</runtime>
<appSettings>
- <add key="WebApiUrl" value="http://localhost:5263/" />
+ <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
<!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <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/FrmBackFlash.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.Designer.cs
index 1205e7f..9a714e8 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.Designer.cs
@@ -47,15 +47,13 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lineNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_name = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lineType = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_isZxbg = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -207,15 +205,13 @@
this.gridColumn1,
this.gv_lineNo,
this.gv_name,
- this.gv_remark,
this.gv_createBy,
this.gv_createDate,
- this.gv_lastupdateBy,
- this.gv_lastupdateDate,
- this.gv_lineType,
- this.gv_isZxbg,
+ this.gridColumn3,
this.gridColumn2,
- this.gridColumn3});
+ this.gridColumn4,
+ this.gridColumn5,
+ this.gridColumn6});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -227,64 +223,51 @@
//
this.gv_org.AppearanceCell.Options.UseFont = true;
this.gv_org.Caption = "浣跨敤缁勭粐";
- this.gv_org.FieldName = "fSubsidiary";
+ this.gv_org.FieldName = "orgName";
this.gv_org.MinWidth = 50;
this.gv_org.Name = "gv_org";
this.gv_org.OptionsColumn.AllowEdit = false;
this.gv_org.Tag = "org.fnamber";
this.gv_org.Visible = true;
- this.gv_org.VisibleIndex = 0;
- this.gv_org.Width = 254;
+ this.gv_org.VisibleIndex = 1;
+ this.gv_org.Width = 50;
//
// gridColumn1
//
- this.gridColumn1.Caption = "鎵�鍦ㄩ儴闂�";
- this.gridColumn1.FieldName = "departName";
+ this.gridColumn1.Caption = "杞﹂棿";
+ this.gridColumn1.FieldName = "bmName";
this.gridColumn1.MinWidth = 60;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "query_a.departName";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 1;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.VisibleIndex = 2;
+ this.gridColumn1.Width = 119;
//
// gv_lineNo
//
this.gv_lineNo.AppearanceCell.Options.UseFont = true;
- this.gv_lineNo.Caption = "绾夸綋缂栧彿";
- this.gv_lineNo.FieldName = "lineNo";
+ this.gv_lineNo.Caption = "浠撳簱";
+ this.gv_lineNo.FieldName = "depotName";
this.gv_lineNo.MinWidth = 50;
this.gv_lineNo.Name = "gv_lineNo";
this.gv_lineNo.OptionsColumn.AllowEdit = false;
this.gv_lineNo.Tag = "query_a.line_no";
this.gv_lineNo.Visible = true;
- this.gv_lineNo.VisibleIndex = 2;
- this.gv_lineNo.Width = 82;
+ this.gv_lineNo.VisibleIndex = 3;
+ this.gv_lineNo.Width = 104;
//
// gv_name
//
this.gv_name.AppearanceCell.Options.UseFont = true;
- this.gv_name.Caption = "浜х嚎鍚嶇О";
- this.gv_name.FieldName = "name";
+ this.gv_name.Caption = "鐗╂枡ID";
+ this.gv_name.FieldName = "itemId";
this.gv_name.MinWidth = 60;
this.gv_name.Name = "gv_name";
this.gv_name.OptionsColumn.AllowEdit = false;
this.gv_name.Tag = "query_a.name";
this.gv_name.Visible = true;
- this.gv_name.VisibleIndex = 3;
- this.gv_name.Width = 100;
- //
- // gv_remark
- //
- this.gv_remark.AppearanceCell.Options.UseFont = true;
- this.gv_remark.Caption = "澶囨敞";
- this.gv_remark.FieldName = "remark";
- this.gv_remark.MinWidth = 50;
- this.gv_remark.Name = "gv_remark";
- this.gv_remark.OptionsColumn.AllowEdit = false;
- this.gv_remark.Tag = "query_a.remark";
- this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 4;
- this.gv_remark.Width = 79;
+ this.gv_name.VisibleIndex = 4;
+ this.gv_name.Width = 126;
//
// gv_createBy
//
@@ -296,8 +279,8 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 5;
- this.gv_createBy.Width = 63;
+ this.gv_createBy.VisibleIndex = 8;
+ this.gv_createBy.Width = 80;
//
// gv_createDate
//
@@ -309,66 +292,8 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 6;
- this.gv_createDate.Width = 180;
- //
- // gv_lastupdateBy
- //
- this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateBy.Caption = "鏇存柊鑰�";
- this.gv_lastupdateBy.FieldName = "lastupdateBy";
- this.gv_lastupdateBy.MinWidth = 50;
- this.gv_lastupdateBy.Name = "gv_lastupdateBy";
- this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
- this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
- this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 7;
- this.gv_lastupdateBy.Width = 63;
- //
- // gv_lastupdateDate
- //
- this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateDate.Caption = "鏇存柊鏃堕棿";
- this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 180;
- this.gv_lastupdateDate.Name = "gv_lastupdateDate";
- this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
- this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
- this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 8;
- this.gv_lastupdateDate.Width = 180;
- //
- // gv_lineType
- //
- this.gv_lineType.AppearanceCell.Options.UseFont = true;
- this.gv_lineType.Caption = "绾夸綋绫诲埆";
- this.gv_lineType.FieldName = "lineType";
- this.gv_lineType.MinWidth = 80;
- this.gv_lineType.Name = "gv_lineType";
- this.gv_lineType.OptionsColumn.AllowEdit = false;
- this.gv_lineType.Tag = "query_a.line_type";
- this.gv_lineType.Width = 80;
- //
- // gv_isZxbg
- //
- this.gv_isZxbg.AppearanceCell.Options.UseFont = true;
- this.gv_isZxbg.Caption = "鏁寸嚎鎶ュ伐";
- this.gv_isZxbg.FieldName = "isZxbg";
- this.gv_isZxbg.MinWidth = 50;
- this.gv_isZxbg.Name = "gv_isZxbg";
- this.gv_isZxbg.OptionsColumn.AllowEdit = false;
- this.gv_isZxbg.Tag = "query_a.is_zxbg";
- this.gv_isZxbg.Width = 50;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "绾夸綋ID";
- this.gridColumn2.FieldName = "id";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 9;
- this.gridColumn2.Width = 94;
+ this.gv_createDate.VisibleIndex = 9;
+ this.gv_createDate.Width = 229;
//
// gridColumn3
//
@@ -377,6 +302,46 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn2.FieldName = "itemNo";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 5;
+ this.gridColumn2.Width = 119;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn4.FieldName = "itemName";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 6;
+ this.gridColumn4.Width = 119;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn5.FieldName = "itemModel";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 7;
+ this.gridColumn5.Width = 128;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "瀹℃牳";
+ this.gridColumn6.FieldName = "checkStatus";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 0;
+ this.gridColumn6.Width = 94;
//
// pageBar1
//
@@ -445,10 +410,10 @@
// txt_depotId
//
this.txt_depotId.IsReadly = false;
- this.txt_depotId.Location = new System.Drawing.Point(360, 40);
+ this.txt_depotId.Location = new System.Drawing.Point(355, 40);
this.txt_depotId.Margin = new System.Windows.Forms.Padding(0);
this.txt_depotId.Name = "txt_depotId";
- this.txt_depotId.Size = new System.Drawing.Size(200, 24);
+ this.txt_depotId.Size = new System.Drawing.Size(195, 24);
this.txt_depotId.TabIndex = 251;
//
// txt_ItemId
@@ -456,7 +421,7 @@
this.txt_ItemId.IsReadly = false;
this.txt_ItemId.Location = new System.Drawing.Point(84, 68);
this.txt_ItemId.Name = "txt_ItemId";
- this.txt_ItemId.Size = new System.Drawing.Size(200, 24);
+ this.txt_ItemId.Size = new System.Drawing.Size(195, 24);
this.txt_ItemId.TabIndex = 246;
this.txt_ItemId.Tag = "no";
//
@@ -465,7 +430,7 @@
this.txt_orgId.IsReadly = false;
this.txt_orgId.Location = new System.Drawing.Point(84, 12);
this.txt_orgId.Name = "txt_orgId";
- this.txt_orgId.Size = new System.Drawing.Size(200, 24);
+ this.txt_orgId.Size = new System.Drawing.Size(195, 24);
this.txt_orgId.TabIndex = 245;
//
// lbGuid
@@ -482,71 +447,71 @@
this.txt_departmentId.IsReadly = false;
this.txt_departmentId.Location = new System.Drawing.Point(84, 40);
this.txt_departmentId.Name = "txt_departmentId";
- this.txt_departmentId.Size = new System.Drawing.Size(200, 24);
+ this.txt_departmentId.Size = new System.Drawing.Size(195, 24);
this.txt_departmentId.TabIndex = 244;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(636, 40);
+ this.txt_createDate.Location = new System.Drawing.Point(626, 40);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(200, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(195, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 231;
this.txt_createDate.Tag = "readonly";
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(636, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(626, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(200, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(195, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 228;
this.txt_createBy.Tag = "readonly";
//
// txt_checkBy
//
- this.txt_checkBy.Location = new System.Drawing.Point(912, 12);
+ this.txt_checkBy.Location = new System.Drawing.Point(897, 12);
this.txt_checkBy.Name = "txt_checkBy";
- this.txt_checkBy.Size = new System.Drawing.Size(202, 24);
+ this.txt_checkBy.Size = new System.Drawing.Size(196, 24);
this.txt_checkBy.StyleController = this.layoutMx1;
this.txt_checkBy.TabIndex = 247;
this.txt_checkBy.Tag = "readonly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(912, 40);
+ this.txt_checkDate.Location = new System.Drawing.Point(897, 40);
this.txt_checkDate.Name = "txt_checkDate";
- this.txt_checkDate.Size = new System.Drawing.Size(202, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(196, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 248;
this.txt_checkDate.Tag = "readonly";
//
// txt_checkStatus
//
- this.txt_checkStatus.Location = new System.Drawing.Point(840, 68);
+ this.txt_checkStatus.Location = new System.Drawing.Point(825, 68);
this.txt_checkStatus.Name = "txt_checkStatus";
this.txt_checkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_checkStatus.Size = new System.Drawing.Size(274, 24);
+ this.txt_checkStatus.Size = new System.Drawing.Size(268, 24);
this.txt_checkStatus.StyleController = this.layoutMx1;
this.txt_checkStatus.TabIndex = 249;
this.txt_checkStatus.Tag = "readonly";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(360, 68);
+ this.txt_itemNo.Location = new System.Drawing.Point(355, 68);
this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Size = new System.Drawing.Size(200, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(195, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 250;
this.txt_itemNo.Tag = "readonly";
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(636, 68);
+ this.txt_itemModel.Location = new System.Drawing.Point(626, 68);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(200, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(195, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 252;
this.txt_itemModel.Tag = "readonly";
@@ -607,7 +572,7 @@
rowDefinition2,
rowDefinition3,
rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1126, 132);
+ this.Root.Size = new System.Drawing.Size(1105, 132);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -616,7 +581,7 @@
this.layoutControlItem1.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem1.Text = "閫夋嫨杞﹂棿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
@@ -625,7 +590,7 @@
this.layoutControlItem2.Control = this.txt_orgId;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem2.Text = "閫夋嫨缁勭粐";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
@@ -635,93 +600,93 @@
this.layoutControlItem3.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem3.Text = "閫夋嫨鐗╂枡";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_checkBy;
- this.layoutControlItem7.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem7.Location = new System.Drawing.Point(813, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem7.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(272, 28);
this.layoutControlItem7.Text = "瀹℃牳鑰�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_checkDate;
- this.layoutControlItem8.Location = new System.Drawing.Point(828, 28);
+ this.layoutControlItem8.Location = new System.Drawing.Point(813, 28);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(272, 28);
this.layoutControlItem8.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_checkStatus;
- this.layoutControlItem10.Location = new System.Drawing.Point(828, 56);
+ this.layoutControlItem10.Location = new System.Drawing.Point(813, 56);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(272, 28);
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_createBy;
- this.layoutControlItem5.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(542, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem5.Text = "寤虹珛鑰�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_createDate;
- this.layoutControlItem6.Location = new System.Drawing.Point(552, 28);
+ this.layoutControlItem6.Location = new System.Drawing.Point(542, 28);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem6.Text = "寤虹珛鏃堕棿";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemNo;
- this.layoutControlItem11.Location = new System.Drawing.Point(276, 56);
+ this.layoutControlItem11.Location = new System.Drawing.Point(271, 56);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem11.Text = "鐗╂枡缂栫爜";
this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_depotId;
- this.layoutControlItem12.Location = new System.Drawing.Point(276, 28);
+ this.layoutControlItem12.Location = new System.Drawing.Point(271, 28);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem12.Text = "閫夋嫨浠撳簱";
this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_itemModel;
- this.layoutControlItem4.Location = new System.Drawing.Point(552, 56);
+ this.layoutControlItem4.Location = new System.Drawing.Point(542, 56);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem4.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
@@ -799,13 +764,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gv_lineNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_name;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lineType;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isZxbg;
private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
@@ -817,7 +777,6 @@
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.Utils.ToolTipController tips;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private UserControl.UcLookItems txt_ItemId;
private UserControl.UcLookOrg txt_orgId;
@@ -839,5 +798,9 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private System.Windows.Forms.PictureBox picCheckBox;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.cs b/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.cs
index 9fdf40c..5171794 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.cs
@@ -17,6 +17,9 @@
{
string _webServiceName = "MesBackFlash/";
List<FilterEntity> _filterList = new List<FilterEntity>();
+ string _ucBm = "";//棰嗘枡閮ㄩ棬
+ string _ucCk = "";//鍙戞枡浠撳簱
+ string _ucWl = "";//鏂�
public FrmBackFlash()
{
InitializeComponent();
@@ -42,9 +45,21 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- txt_depotId.getSuppler("");
- txt_departmentId.getSuppler("");
- txt_ItemId.getSuppler("");
+ //閫夋嫨搴撳瓨缁勭粐锛堝彉鏄庣粏涓殑鐗╂枡鍜屽彉璐т富锛�
+ this.txt_orgId.EditChanged += (s, e) =>
+ {
+ string _orgId = txt_orgId.GetId();
+ if (string.IsNullOrEmpty(_orgId))
+ return;
+ txt_depotId.getSuppler(_orgId, _ucCk);
+ txt_departmentId.getSuppler(_orgId, _ucBm);
+ txt_ItemId.getSuppler(_orgId, _ucWl);
+ };
+ this.txt_ItemId.EditChanged += (s, e) =>
+ {
+ txt_itemNo.Text = txt_ItemId.GetCode();
+ txt_itemModel.Text = txt_ItemId.GetModel();
+ };
}
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -320,8 +335,14 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
+ _ucBm = dy.departmentId;
+ _ucCk = dy.depotId;
+ _ucWl = dy.ItemId;
lbGuid.Text = strGuid;
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
+ _ucBm = "";
+ _ucCk = "";
+ _ucWl = "";
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.resx b/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.resx
index 5160e8b..e7132ea 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.resx
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/FrmBackFlash.resx
@@ -120,4 +120,7 @@
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>25</value>
+ </metadata>
</root>
\ No newline at end of file
--
Gitblit v1.9.3