From 49bec810586be811fd5e841d0633ce9fb8b1871b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 13 五月 2025 15:56:14 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 2
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs | 22 ++--
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs | 105 ++++++++++++--------
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs | 125 +++++++++++++-----------
5 files changed, 150 insertions(+), 108 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
index 684ab93..158c068 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
@@ -1049,7 +1049,7 @@
this.gvMx1invBillNo.Name = "gvMx1invBillNo";
this.gvMx1invBillNo.Tag = "query_a.INV_BILL_NO";
this.gvMx1invBillNo.Visible = true;
- this.gvMx1invBillNo.VisibleIndex = 0;
+ this.gvMx1invBillNo.VisibleIndex = 1;
this.gvMx1invBillNo.Width = 94;
//
// gvMx1ebeln
@@ -1061,7 +1061,7 @@
this.gvMx1ebeln.Name = "gvMx1ebeln";
this.gvMx1ebeln.Tag = "query_a.EBELN";
this.gvMx1ebeln.Visible = true;
- this.gvMx1ebeln.VisibleIndex = 1;
+ this.gvMx1ebeln.VisibleIndex = 2;
this.gvMx1ebeln.Width = 94;
//
// gvMx1itemId
@@ -1081,7 +1081,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 2;
+ this.gridColumn2.VisibleIndex = 3;
this.gridColumn2.Width = 94;
//
// gridColumn5
@@ -1091,7 +1091,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 3;
+ this.gridColumn5.VisibleIndex = 4;
this.gridColumn5.Width = 94;
//
// gridColumn3
@@ -1101,7 +1101,7 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 4;
+ this.gridColumn3.VisibleIndex = 5;
this.gridColumn3.Width = 94;
//
// gridColumn4
@@ -1111,7 +1111,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 5;
+ this.gridColumn4.VisibleIndex = 6;
this.gridColumn4.Width = 94;
//
// gvMx1sqNum
@@ -1127,7 +1127,7 @@
this.gvMx1sqNum.Name = "gvMx1sqNum";
this.gvMx1sqNum.Tag = "yz_quantity_0_edit";
this.gvMx1sqNum.Visible = true;
- this.gvMx1sqNum.VisibleIndex = 6;
+ this.gvMx1sqNum.VisibleIndex = 7;
this.gvMx1sqNum.Width = 94;
//
// gvMx1ysNum
@@ -1139,7 +1139,7 @@
this.gvMx1ysNum.Name = "gvMx1ysNum";
this.gvMx1ysNum.Tag = "query_a.YS_NUM";
this.gvMx1ysNum.Visible = true;
- this.gvMx1ysNum.VisibleIndex = 7;
+ this.gvMx1ysNum.VisibleIndex = 8;
this.gvMx1ysNum.Width = 94;
//
// gvMx1remark
@@ -1155,7 +1155,7 @@
this.gvMx1remark.Name = "gvMx1remark";
this.gvMx1remark.Tag = "edit";
this.gvMx1remark.Visible = true;
- this.gvMx1remark.VisibleIndex = 8;
+ this.gvMx1remark.VisibleIndex = 9;
this.gvMx1remark.Width = 94;
//
// gvMx1orderNo
@@ -1166,6 +1166,8 @@
this.gvMx1orderNo.MinWidth = 50;
this.gvMx1orderNo.Name = "gvMx1orderNo";
this.gvMx1orderNo.Tag = "query_a.ORDER_NO";
+ this.gvMx1orderNo.Visible = true;
+ this.gvMx1orderNo.VisibleIndex = 0;
this.gvMx1orderNo.Width = 94;
//
// gvMx1eid
@@ -1205,7 +1207,7 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 9;
+ this.gvMxDel.VisibleIndex = 10;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
index 7d277a4..f834c72 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
@@ -436,6 +436,10 @@
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
index aaece56..bb5dbe8 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -125,6 +125,7 @@
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -280,7 +281,8 @@
this.gridColumn11,
this.gridColumn12,
this.gridColumn13,
- this.gridColumn3});
+ this.gridColumn3,
+ this.gridColumn17});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -317,7 +319,7 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 1;
+ this.gridColumn1.VisibleIndex = 2;
this.gridColumn1.Width = 94;
//
// gridColumn2
@@ -327,7 +329,7 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 2;
+ this.gridColumn2.VisibleIndex = 3;
this.gridColumn2.Width = 150;
//
// gv_checkUser
@@ -339,7 +341,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 3;
+ this.gv_checkUser.VisibleIndex = 4;
this.gv_checkUser.Width = 94;
//
// gv_checkDate
@@ -351,7 +353,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 4;
+ this.gv_checkDate.VisibleIndex = 5;
this.gv_checkDate.Width = 180;
//
// gv_pba005
@@ -363,7 +365,7 @@
this.gv_pba005.OptionsColumn.AllowEdit = false;
this.gv_pba005.Tag = "query_a.pba005";
this.gv_pba005.Visible = true;
- this.gv_pba005.VisibleIndex = 5;
+ this.gv_pba005.VisibleIndex = 6;
this.gv_pba005.Width = 94;
//
// gridColumn8
@@ -373,7 +375,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 6;
+ this.gridColumn8.VisibleIndex = 7;
this.gridColumn8.Width = 94;
//
// gridColumn9
@@ -383,7 +385,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 7;
+ this.gridColumn9.VisibleIndex = 8;
this.gridColumn9.Width = 94;
//
// gridColumn10
@@ -393,7 +395,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 8;
+ this.gridColumn10.VisibleIndex = 9;
this.gridColumn10.Width = 94;
//
// gridColumn11
@@ -403,7 +405,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 9;
+ this.gridColumn11.VisibleIndex = 10;
this.gridColumn11.Width = 94;
//
// gridColumn12
@@ -413,7 +415,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 10;
+ this.gridColumn12.VisibleIndex = 11;
this.gridColumn12.Width = 94;
//
// gridColumn13
@@ -423,7 +425,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 11;
+ this.gridColumn13.VisibleIndex = 12;
this.gridColumn13.Width = 94;
//
// gridColumn3
@@ -433,7 +435,7 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 12;
+ this.gridColumn3.VisibleIndex = 13;
this.gridColumn3.Width = 94;
//
// pageBar1
@@ -516,33 +518,33 @@
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(912, 96);
+ this.txt_fType.Location = new System.Drawing.Point(927, 96);
this.txt_fType.Name = "txt_fType";
- this.txt_fType.Size = new System.Drawing.Size(181, 24);
+ this.txt_fType.Size = new System.Drawing.Size(187, 24);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 462;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(370, 12);
+ this.txt_itemNo.Location = new System.Drawing.Point(375, 12);
this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Size = new System.Drawing.Size(180, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(185, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 464;
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(370, 68);
+ this.txt_itemName.Location = new System.Drawing.Point(375, 68);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(451, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(461, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 465;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(370, 40);
+ this.txt_itemModel.Location = new System.Drawing.Point(375, 40);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(451, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(461, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 466;
//
@@ -550,7 +552,7 @@
//
this.txt_dhdNo.Location = new System.Drawing.Point(99, 40);
this.txt_dhdNo.Name = "txt_dhdNo";
- this.txt_dhdNo.Size = new System.Drawing.Size(180, 24);
+ this.txt_dhdNo.Size = new System.Drawing.Size(185, 24);
this.txt_dhdNo.StyleController = this.layoutMx1;
this.txt_dhdNo.TabIndex = 467;
//
@@ -558,25 +560,25 @@
//
this.txt_gysNo.Location = new System.Drawing.Point(99, 96);
this.txt_gysNo.Name = "txt_gysNo";
- this.txt_gysNo.Size = new System.Drawing.Size(180, 24);
+ this.txt_gysNo.Size = new System.Drawing.Size(185, 24);
this.txt_gysNo.StyleController = this.layoutMx1;
this.txt_gysNo.TabIndex = 468;
//
// txt_gysName
//
- this.txt_gysName.Location = new System.Drawing.Point(370, 96);
+ this.txt_gysName.Location = new System.Drawing.Point(375, 96);
this.txt_gysName.Name = "txt_gysName";
- this.txt_gysName.Size = new System.Drawing.Size(451, 24);
+ this.txt_gysName.Size = new System.Drawing.Size(461, 24);
this.txt_gysName.StyleController = this.layoutMx1;
this.txt_gysName.TabIndex = 469;
//
// txt_fmrmode
//
- this.txt_fmrmode.Location = new System.Drawing.Point(912, 68);
+ this.txt_fmrmode.Location = new System.Drawing.Point(927, 68);
this.txt_fmrmode.Name = "txt_fmrmode";
this.txt_fmrmode.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fmrmode.Properties.Appearance.Options.UseForeColor = true;
- this.txt_fmrmode.Size = new System.Drawing.Size(181, 24);
+ this.txt_fmrmode.Size = new System.Drawing.Size(187, 24);
this.txt_fmrmode.StyleController = this.layoutMx1;
this.txt_fmrmode.TabIndex = 473;
//
@@ -592,7 +594,7 @@
//
this.txt_fBillNo.Location = new System.Drawing.Point(99, 12);
this.txt_fBillNo.Name = "txt_fBillNo";
- this.txt_fBillNo.Size = new System.Drawing.Size(180, 24);
+ this.txt_fBillNo.Size = new System.Drawing.Size(185, 24);
this.txt_fBillNo.StyleController = this.layoutMx1;
this.txt_fBillNo.TabIndex = 478;
//
@@ -600,28 +602,28 @@
//
this.txt_dhdDate.Location = new System.Drawing.Point(99, 68);
this.txt_dhdDate.Name = "txt_dhdDate";
- this.txt_dhdDate.Size = new System.Drawing.Size(180, 24);
+ this.txt_dhdDate.Size = new System.Drawing.Size(185, 24);
this.txt_dhdDate.StyleController = this.layoutMx1;
this.txt_dhdDate.TabIndex = 481;
//
// txt_handResult
//
- this.txt_handResult.Location = new System.Drawing.Point(912, 12);
+ this.txt_handResult.Location = new System.Drawing.Point(927, 12);
this.txt_handResult.Name = "txt_handResult";
this.txt_handResult.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_handResult.Properties.Appearance.Options.UseForeColor = true;
- this.txt_handResult.Size = new System.Drawing.Size(181, 24);
+ this.txt_handResult.Size = new System.Drawing.Size(187, 24);
this.txt_handResult.StyleController = this.layoutMx1;
this.txt_handResult.TabIndex = 483;
this.txt_handResult.Tag = "readonly";
//
// txt_handSuggestion
//
- this.txt_handSuggestion.Location = new System.Drawing.Point(912, 40);
+ this.txt_handSuggestion.Location = new System.Drawing.Point(927, 40);
this.txt_handSuggestion.Name = "txt_handSuggestion";
this.txt_handSuggestion.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_handSuggestion.Properties.Appearance.Options.UseForeColor = true;
- this.txt_handSuggestion.Size = new System.Drawing.Size(181, 24);
+ this.txt_handSuggestion.Size = new System.Drawing.Size(187, 24);
this.txt_handSuggestion.StyleController = this.layoutMx1;
this.txt_handSuggestion.TabIndex = 484;
this.txt_handSuggestion.Tag = "readonly";
@@ -630,7 +632,7 @@
//
this.txt_fngDesc.Location = new System.Drawing.Point(99, 124);
this.txt_fngDesc.Name = "txt_fngDesc";
- this.txt_fngDesc.Size = new System.Drawing.Size(994, 52);
+ this.txt_fngDesc.Size = new System.Drawing.Size(1015, 52);
this.txt_fngDesc.StyleController = this.layoutMx1;
this.txt_fngDesc.TabIndex = 485;
//
@@ -709,7 +711,7 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1105, 188);
+ this.Root.Size = new System.Drawing.Size(1126, 188);
this.Root.TextVisible = false;
//
// layoutControlItem2
@@ -717,7 +719,7 @@
this.layoutControlItem2.Control = this.txt_fBillNo;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem2.Text = "寮傚父缂栧彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
@@ -725,43 +727,43 @@
//
this.layoutControlItem20.Control = this.txt_fmrmode;
this.layoutControlItem20.CustomizationFormText = "澶勭悊鏂瑰紡";
- this.layoutControlItem20.Location = new System.Drawing.Point(813, 56);
+ this.layoutControlItem20.Location = new System.Drawing.Point(828, 56);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem20.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem20.Text = "閫�鏂欐柟寮�";
this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_fType;
- this.layoutControlItem1.Location = new System.Drawing.Point(813, 84);
+ this.layoutControlItem1.Location = new System.Drawing.Point(828, 84);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem1.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem1.Text = "寮傚父绫诲瀷";
this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_handResult;
- this.layoutControlItem21.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem21.Location = new System.Drawing.Point(828, 0);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem21.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem21.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem21.Text = "鍒ゅ畾缁撴灉";
this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_handSuggestion;
- this.layoutControlItem19.Location = new System.Drawing.Point(813, 28);
+ this.layoutControlItem19.Location = new System.Drawing.Point(828, 28);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem19.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem19.Text = "澶勭悊缁撴灉";
this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
//
@@ -771,7 +773,7 @@
this.layoutControlItem14.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem14.Text = "鍒拌揣鍗曞彿";
this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
//
@@ -781,17 +783,17 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem4.Text = "鍒拌揣鍗曟棩鏈�";
this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemNo;
- this.layoutControlItem11.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem11.Text = "鐗╂枡缂栧彿";
this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
//
@@ -801,43 +803,43 @@
this.layoutControlItem15.Location = new System.Drawing.Point(0, 84);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem15.Text = "渚涘簲鍟嗙紪鍙�";
this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_gysName;
- this.layoutControlItem16.Location = new System.Drawing.Point(271, 84);
+ this.layoutControlItem16.Location = new System.Drawing.Point(276, 84);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(542, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(552, 28);
this.layoutControlItem16.Text = "渚涘簲鍟嗗悕绉�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_itemModel;
- this.layoutControlItem13.Location = new System.Drawing.Point(271, 28);
+ this.layoutControlItem13.Location = new System.Drawing.Point(276, 28);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem13.Size = new System.Drawing.Size(542, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(552, 28);
this.layoutControlItem13.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_itemName;
- this.layoutControlItem12.Location = new System.Drawing.Point(271, 56);
+ this.layoutControlItem12.Location = new System.Drawing.Point(276, 56);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(542, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(552, 28);
this.layoutControlItem12.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
//
@@ -849,7 +851,7 @@
this.layoutControlItem3.OptionsTableLayoutItem.ColumnSpan = 4;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem3.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(1085, 56);
+ this.layoutControlItem3.Size = new System.Drawing.Size(1106, 56);
this.layoutControlItem3.Text = "涓嶅悎鏍兼弿杩�";
this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
//
@@ -1128,6 +1130,16 @@
this.layoutControlItem10.Size = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextSize = new System.Drawing.Size(50, 20);
//
+ // gridColumn17
+ //
+ this.gridColumn17.Caption = "寮傚父鍗曞彿";
+ this.gridColumn17.FieldName = "fBillNo";
+ this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.Name = "gridColumn17";
+ this.gridColumn17.Visible = true;
+ this.gridColumn17.VisibleIndex = 1;
+ this.gridColumn17.Width = 94;
+ //
// MesQcExceptional
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1288,5 +1300,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
index 78c224f..bb1ed2e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
@@ -30,14 +30,14 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -115,6 +115,7 @@
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -134,6 +135,7 @@
this.gvMx1lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -754,32 +756,32 @@
this.layoutControlItem14});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5,
- rowDefinition6,
- rowDefinition7,
- rowDefinition8});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
this.Root.Size = new System.Drawing.Size(1346, 144);
this.Root.TextVisible = false;
//
@@ -966,7 +968,8 @@
this.gvMx2lineK3id,
this.gridColumn10,
this.gridColumn5,
- this.gridColumn6});
+ this.gridColumn6,
+ this.gridColumn11});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -976,7 +979,7 @@
// gvMx2guid
//
this.gvMx2guid.AppearanceCell.Options.UseFont = true;
- this.gvMx2guid.Caption = "guid";
+ this.gvMx2guid.Caption = "鏄庣粏琛ㄤ富閿瓽UID";
this.gvMx2guid.FieldName = "guid";
this.gvMx2guid.MinWidth = 50;
this.gvMx2guid.Name = "gvMx2guid";
@@ -1047,7 +1050,7 @@
//
this.gvMx2ebeln.AppearanceCell.Options.UseFont = true;
this.gvMx2ebeln.Caption = "閲囪喘鍗曞彿";
- this.gvMx2ebeln.FieldName = "ebeln";
+ this.gvMx2ebeln.FieldName = "cgdh";
this.gvMx2ebeln.Name = "gvMx2ebeln";
this.gvMx2ebeln.Tag = "query_a.EBELN";
this.gvMx2ebeln.Visible = true;
@@ -1062,7 +1065,7 @@
this.gvMx2ebelnK3id.Name = "gvMx2ebelnK3id";
this.gvMx2ebelnK3id.Tag = "query_a.EBELN_K3ID";
this.gvMx2ebelnK3id.Visible = true;
- this.gvMx2ebelnK3id.VisibleIndex = 7;
+ this.gvMx2ebelnK3id.VisibleIndex = 6;
this.gvMx2ebelnK3id.Width = 94;
//
// gvMx2lineK3id
@@ -1073,7 +1076,7 @@
this.gvMx2lineK3id.Name = "gvMx2lineK3id";
this.gvMx2lineK3id.Tag = "query_a.LINE_K3ID";
this.gvMx2lineK3id.Visible = true;
- this.gvMx2lineK3id.VisibleIndex = 8;
+ this.gvMx2lineK3id.VisibleIndex = 7;
this.gvMx2lineK3id.Width = 94;
//
// gridColumn10
@@ -1083,7 +1086,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 9;
+ this.gridColumn10.VisibleIndex = 8;
this.gridColumn10.Width = 94;
//
// gridColumn5
@@ -1093,7 +1096,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 10;
+ this.gridColumn5.VisibleIndex = 9;
this.gridColumn5.Width = 94;
//
// gridColumn6
@@ -1103,8 +1106,16 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 11;
+ this.gridColumn6.VisibleIndex = 10;
this.gridColumn6.Width = 94;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "鍏宠仈GUID(鍒拌揣鏄庣粏琛℅uid)";
+ this.gridColumn11.FieldName = "itemDabid";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Width = 94;
//
// xtraTabPage3
//
@@ -1143,7 +1154,8 @@
this.gvMx1ebelnK3id,
this.gvMx1lineK3id,
this.gridColumn7,
- this.gridColumn8});
+ this.gridColumn8,
+ this.gridColumn12});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1187,7 +1199,7 @@
//
this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
this.gvMx1workNo.Caption = "閲囪喘鍗曞彿";
- this.gvMx1workNo.FieldName = "workNo";
+ this.gvMx1workNo.FieldName = "ebeln";
this.gvMx1workNo.Name = "gvMx1workNo";
this.gvMx1workNo.Tag = "query_a.WORK_NO";
this.gvMx1workNo.Visible = true;
@@ -1323,6 +1335,13 @@
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 14;
this.gridColumn8.Width = 94;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "鍏宠仈GUID(鍒拌揣鏄庣粏琛℅uid)";
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Width = 94;
//
// picCheckBox
//
@@ -1505,5 +1524,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index 72534de..cfcdc86 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -294,6 +294,8 @@
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
+ MsgHelper.ShowInformation("鍔熻兘寮�鍙戜腑锛�");
+ return;
var rowhandle = gvMx2.FocusedRowHandle;
if (rowhandle < 0)
return;
--
Gitblit v1.9.3