From 2f2798aa608e16814ad2f15d3d159d1cd4ea9c11 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 04 十二月 2024 17:27:56 +0800
Subject: [PATCH] 修改了细节
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs | 231 ++++++++++++++++++++-------------------------
DevApp/Gs.DevApp/UserControl/UcLookOrg.cs | 2
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 5
DevApp/Gs.DevApp/UserControl/UcLookOrg.Designer.cs | 18 +-
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 29 +++++
6 files changed, 147 insertions(+), 142 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 77ee15e..3ac99d8 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/Warehouse/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
index dafd62f..f5664c8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -29,12 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
- this.gvMx1states = new DevExpress.XtraGrid.Columns.GridColumn();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1returnFlag = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1okRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1isdepsIn = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -54,15 +53,15 @@
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvAbtGuid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
this.lb_fType = new DevExpress.XtraEditors.LabelControl();
this.lb_urgentFlag = new DevExpress.XtraEditors.LabelControl();
this.lb_ischeck = new DevExpress.XtraEditors.LabelControl();
@@ -111,7 +110,8 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
- this.ucLookOrg1 = new Gs.DevApp.UserControl.UcLookOrg();
+ this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_receiveOrgId = new Gs.DevApp.UserControl.UcLookOrg();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.btnTui = new DevExpress.XtraEditors.SimpleButton();
this.txtDepotsCode = new DevExpress.XtraEditors.TextEdit();
@@ -129,12 +129,11 @@
this.lbGuid = new System.Windows.Forms.Label();
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
- this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -154,20 +153,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
this.SuspendLayout();
//
- // gvMx1states
- //
- this.gvMx1states.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1states.AppearanceCell.Options.UseFont = true;
- this.gvMx1states.Caption = "鎺ㄩ�佺姸鎬�";
- this.gvMx1states.FieldName = "states";
- this.gvMx1states.MinWidth = 100;
- this.gvMx1states.Name = "gvMx1states";
- this.gvMx1states.OptionsColumn.ReadOnly = true;
- this.gvMx1states.Tag = "query_a.states";
- this.gvMx1states.Visible = true;
- this.gvMx1states.VisibleIndex = 14;
- this.gvMx1states.Width = 100;
- //
// gvMx1returnFlag
//
this.gvMx1returnFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -180,7 +165,7 @@
this.gvMx1returnFlag.Tag = "query_a.return_flag";
this.gvMx1returnFlag.UnboundDataType = typeof(bool);
this.gvMx1returnFlag.Visible = true;
- this.gvMx1returnFlag.VisibleIndex = 4;
+ this.gvMx1returnFlag.VisibleIndex = 2;
this.gvMx1returnFlag.Width = 100;
//
// gvMx1okRkqty
@@ -194,21 +179,21 @@
this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
this.gvMx1okRkqty.Visible = true;
- this.gvMx1okRkqty.VisibleIndex = 13;
+ this.gvMx1okRkqty.VisibleIndex = 11;
this.gvMx1okRkqty.Width = 100;
//
// gvMx1isdepsIn
//
this.gvMx1isdepsIn.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1isdepsIn.AppearanceCell.Options.UseFont = true;
- this.gvMx1isdepsIn.Caption = "鍏ュ簱鏍囪瘑";
+ this.gvMx1isdepsIn.Caption = "瀹岀粨鏍囪瘑";
this.gvMx1isdepsIn.FieldName = "isdepsIn";
this.gvMx1isdepsIn.MinWidth = 60;
this.gvMx1isdepsIn.Name = "gvMx1isdepsIn";
this.gvMx1isdepsIn.OptionsColumn.ReadOnly = true;
this.gvMx1isdepsIn.Tag = "query_a.isdeps_in";
this.gvMx1isdepsIn.Visible = true;
- this.gvMx1isdepsIn.VisibleIndex = 6;
+ this.gvMx1isdepsIn.VisibleIndex = 4;
this.gvMx1isdepsIn.Width = 100;
//
// gvMx1boardStyle
@@ -222,7 +207,7 @@
this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
this.gvMx1boardStyle.Tag = "query_a.board_style";
this.gvMx1boardStyle.Visible = true;
- this.gvMx1boardStyle.VisibleIndex = 8;
+ this.gvMx1boardStyle.VisibleIndex = 6;
this.gvMx1boardStyle.Width = 180;
//
// gvMx1checkDate
@@ -236,7 +221,7 @@
this.gvMx1checkDate.OptionsColumn.ReadOnly = true;
this.gvMx1checkDate.Tag = "query_a.check_date";
this.gvMx1checkDate.Visible = true;
- this.gvMx1checkDate.VisibleIndex = 17;
+ this.gvMx1checkDate.VisibleIndex = 14;
this.gvMx1checkDate.Width = 180;
//
// gvMx1checkStates
@@ -250,7 +235,7 @@
this.gvMx1checkStates.OptionsColumn.ReadOnly = true;
this.gvMx1checkStates.Tag = "query_a.check_states";
this.gvMx1checkStates.Visible = true;
- this.gvMx1checkStates.VisibleIndex = 16;
+ this.gvMx1checkStates.VisibleIndex = 13;
this.gvMx1checkStates.Width = 100;
//
// gvMx1checkRes
@@ -264,7 +249,7 @@
this.gvMx1checkRes.OptionsColumn.ReadOnly = true;
this.gvMx1checkRes.Tag = "query_a.check_res";
this.gvMx1checkRes.Visible = true;
- this.gvMx1checkRes.VisibleIndex = 15;
+ this.gvMx1checkRes.VisibleIndex = 12;
this.gvMx1checkRes.Width = 100;
//
// gvMx1memo
@@ -278,7 +263,7 @@
this.gvMx1memo.OptionsColumn.ReadOnly = true;
this.gvMx1memo.Tag = "query_a.memo";
this.gvMx1memo.Visible = true;
- this.gvMx1memo.VisibleIndex = 21;
+ this.gvMx1memo.VisibleIndex = 18;
this.gvMx1memo.Width = 180;
//
// gvMx1urgentFlag
@@ -291,7 +276,7 @@
this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
this.gvMx1urgentFlag.Visible = true;
- this.gvMx1urgentFlag.VisibleIndex = 5;
+ this.gvMx1urgentFlag.VisibleIndex = 3;
this.gvMx1urgentFlag.Width = 100;
//
// gvMx1subQty
@@ -305,7 +290,7 @@
this.gvMx1subQty.OptionsColumn.ReadOnly = true;
this.gvMx1subQty.Tag = "query_a.sub_qty";
this.gvMx1subQty.Visible = true;
- this.gvMx1subQty.VisibleIndex = 10;
+ this.gvMx1subQty.VisibleIndex = 8;
this.gvMx1subQty.Width = 100;
//
// gvMx1quantity
@@ -322,7 +307,7 @@
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.quantity";
this.gvMx1quantity.Visible = true;
- this.gvMx1quantity.VisibleIndex = 11;
+ this.gvMx1quantity.VisibleIndex = 9;
this.gvMx1quantity.Width = 100;
//
// gvMx1ebelnQty
@@ -336,7 +321,7 @@
this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
this.gvMx1ebelnQty.Visible = true;
- this.gvMx1ebelnQty.VisibleIndex = 12;
+ this.gvMx1ebelnQty.VisibleIndex = 10;
this.gvMx1ebelnQty.Width = 100;
//
// gvMx1ebelnLine
@@ -349,8 +334,6 @@
this.gvMx1ebelnLine.Name = "gvMx1ebelnLine";
this.gvMx1ebelnLine.OptionsColumn.ReadOnly = true;
this.gvMx1ebelnLine.Tag = "query_a.ebeln_line";
- this.gvMx1ebelnLine.Visible = true;
- this.gvMx1ebelnLine.VisibleIndex = 3;
this.gvMx1ebelnLine.Width = 100;
//
// gvMx1ebeln
@@ -359,12 +342,13 @@
this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
this.gvMx1ebeln.Caption = "ERP閲囪喘鍗曞彿";
this.gvMx1ebeln.FieldName = "ebeln";
+ this.gvMx1ebeln.MaxWidth = 1;
this.gvMx1ebeln.MinWidth = 120;
this.gvMx1ebeln.Name = "gvMx1ebeln";
this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
this.gvMx1ebeln.Tag = "query_a.ebeln";
this.gvMx1ebeln.Visible = true;
- this.gvMx1ebeln.VisibleIndex = 2;
+ this.gvMx1ebeln.VisibleIndex = 1;
this.gvMx1ebeln.Width = 120;
//
// gvMx1guid
@@ -384,7 +368,7 @@
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
this.tabMxPage1.Size = new System.Drawing.Size(1229, 376);
- this.tabMxPage1.Text = "鏄庣粏1";
+ this.tabMxPage1.Text = "鍏ヤ粨鐗╂枡鏄庣粏";
//
// gcMx1
//
@@ -405,21 +389,20 @@
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvAbtGuid,
this.gvMx1guid,
- this.gridColumn8,
+ this.gvMx1ebelnLine,
+ this.gridColumn1,
this.gvMxDel,
this.gvMx1ebeln,
- this.gvMx1ebelnLine,
this.gvMx1returnFlag,
this.gvMx1urgentFlag,
this.gvMx1isdepsIn,
- this.gridColumn1,
+ this.gridColumn8,
this.gvMx1boardStyle,
this.gridColumn6,
this.gvMx1subQty,
this.gvMx1quantity,
this.gvMx1ebelnQty,
this.gvMx1okRkqty,
- this.gvMx1states,
this.gvMx1checkRes,
this.gvMx1checkStates,
this.gvMx1checkDate,
@@ -443,21 +426,14 @@
this.gvAbtGuid.OptionsColumn.ReadOnly = true;
this.gvAbtGuid.Width = 94;
//
- // gridColumn8
+ // gridColumn1
//
- this.gridColumn8.Caption = "閫�璐ч�夋嫨";
- this.gridColumn8.ColumnEdit = this.repositoryItemCheckEdit1;
- this.gridColumn8.FieldName = "gvChk";
- this.gridColumn8.MinWidth = 60;
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 0;
- this.gridColumn8.Width = 94;
- //
- // repositoryItemCheckEdit1
- //
- this.repositoryItemCheckEdit1.AutoHeight = false;
- this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
+ this.gridColumn1.Caption = "鐗╂枡ID";
+ this.gridColumn1.FieldName = "itemId";
+ this.gridColumn1.MinWidth = 100;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.OptionsColumn.ReadOnly = true;
+ this.gridColumn1.Width = 100;
//
// gvMxDel
//
@@ -466,30 +442,29 @@
this.gvMxDel.MinWidth = 80;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 1;
- this.gvMxDel.Width = 94;
+ this.gvMxDel.VisibleIndex = 0;
+ this.gvMxDel.Width = 80;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
- // gridColumn1
+ // gridColumn8
//
- this.gridColumn1.Caption = "鐗╂枡ID";
- this.gridColumn1.FieldName = "itemId";
- this.gridColumn1.MinWidth = 100;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.OptionsColumn.ReadOnly = true;
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 7;
- this.gridColumn1.Width = 100;
+ this.gridColumn8.Caption = "鐗╂枡缂栧彿";
+ this.gridColumn8.FieldName = "itemNo";
+ this.gridColumn8.MinWidth = 70;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 5;
+ this.gridColumn8.Width = 70;
//
// gridColumn6
//
@@ -499,7 +474,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 9;
+ this.gridColumn6.VisibleIndex = 7;
this.gridColumn6.Width = 180;
//
// gridColumn3
@@ -510,7 +485,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 18;
+ this.gridColumn3.VisibleIndex = 15;
this.gridColumn3.Width = 180;
//
// gridColumn9
@@ -521,7 +496,7 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 19;
+ this.gridColumn9.VisibleIndex = 16;
this.gridColumn9.Width = 94;
//
// gridColumn7
@@ -532,14 +507,19 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 20;
+ this.gridColumn7.VisibleIndex = 17;
this.gridColumn7.Width = 94;
+ //
+ // repositoryItemCheckEdit1
+ //
+ this.repositoryItemCheckEdit1.AutoHeight = false;
+ this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
//
// lb_fType
//
this.lb_fType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fType.Appearance.Options.UseFont = true;
- this.lb_fType.Location = new System.Drawing.Point(651, 54);
+ this.lb_fType.Location = new System.Drawing.Point(632, 54);
this.lb_fType.Name = "lb_fType";
this.lb_fType.Size = new System.Drawing.Size(68, 21);
this.lb_fType.TabIndex = 378;
@@ -549,7 +529,7 @@
//
this.lb_urgentFlag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_urgentFlag.Appearance.Options.UseFont = true;
- this.lb_urgentFlag.Location = new System.Drawing.Point(651, 16);
+ this.lb_urgentFlag.Location = new System.Drawing.Point(632, 20);
this.lb_urgentFlag.Name = "lb_urgentFlag";
this.lb_urgentFlag.Size = new System.Drawing.Size(68, 21);
this.lb_urgentFlag.TabIndex = 343;
@@ -559,7 +539,7 @@
//
this.lb_ischeck.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ischeck.Appearance.Options.UseFont = true;
- this.lb_ischeck.Location = new System.Drawing.Point(778, 16);
+ this.lb_ischeck.Location = new System.Drawing.Point(759, 20);
this.lb_ischeck.Name = "lb_ischeck";
this.lb_ischeck.Size = new System.Drawing.Size(102, 21);
this.lb_ischeck.TabIndex = 319;
@@ -569,7 +549,7 @@
//
this.lb_paperBillNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_paperBillNo.Appearance.Options.UseFont = true;
- this.lb_paperBillNo.Location = new System.Drawing.Point(651, 91);
+ this.lb_paperBillNo.Location = new System.Drawing.Point(632, 91);
this.lb_paperBillNo.Name = "lb_paperBillNo";
this.lb_paperBillNo.Size = new System.Drawing.Size(68, 21);
this.lb_paperBillNo.TabIndex = 243;
@@ -577,7 +557,7 @@
//
// txt_paperBillNo
//
- this.txt_paperBillNo.Location = new System.Drawing.Point(728, 87);
+ this.txt_paperBillNo.Location = new System.Drawing.Point(709, 87);
this.txt_paperBillNo.Name = "txt_paperBillNo";
this.txt_paperBillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
@@ -588,7 +568,7 @@
//
this.lb_billNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_billNo.Appearance.Options.UseFont = true;
- this.lb_billNo.Location = new System.Drawing.Point(348, 17);
+ this.lb_billNo.Location = new System.Drawing.Point(329, 20);
this.lb_billNo.Name = "lb_billNo";
this.lb_billNo.Size = new System.Drawing.Size(68, 21);
this.lb_billNo.TabIndex = 213;
@@ -597,7 +577,7 @@
// txt_billNo
//
this.txt_billNo.Enabled = false;
- this.txt_billNo.Location = new System.Drawing.Point(420, 13);
+ this.txt_billNo.Location = new System.Drawing.Point(401, 16);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
@@ -1066,7 +1046,7 @@
//
this.panel1.BackColor = System.Drawing.Color.White;
this.panel1.Controls.Add(this.labelControl5);
- this.panel1.Controls.Add(this.ucLookOrg1);
+ this.panel1.Controls.Add(this.txt_receiveOrgId);
this.panel1.Controls.Add(this.labelControl2);
this.panel1.Controls.Add(this.btnTui);
this.panel1.Controls.Add(this.txtDepotsCode);
@@ -1098,19 +1078,29 @@
this.panel1.Size = new System.Drawing.Size(1231, 162);
this.panel1.TabIndex = 1;
//
- // ucLookOrg1
+ // labelControl5
//
- this.ucLookOrg1.IsReadly = true;
- this.ucLookOrg1.Location = new System.Drawing.Point(107, 16);
- this.ucLookOrg1.Name = "ucLookOrg1";
- this.ucLookOrg1.Size = new System.Drawing.Size(215, 28);
- this.ucLookOrg1.TabIndex = 457;
+ this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl5.Appearance.Options.UseFont = true;
+ this.labelControl5.Location = new System.Drawing.Point(312, 55);
+ this.labelControl5.Name = "labelControl5";
+ this.labelControl5.Size = new System.Drawing.Size(85, 21);
+ this.labelControl5.TabIndex = 458;
+ this.labelControl5.Text = "渚涘簲鍟嗙紪鐮�";
+ //
+ // txt_receiveOrgId
+ //
+ this.txt_receiveOrgId.IsReadly = true;
+ this.txt_receiveOrgId.Location = new System.Drawing.Point(88, 16);
+ this.txt_receiveOrgId.Name = "txt_receiveOrgId";
+ this.txt_receiveOrgId.Size = new System.Drawing.Size(215, 28);
+ this.txt_receiveOrgId.TabIndex = 457;
//
// labelControl2
//
this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(33, 16);
+ this.labelControl2.Location = new System.Drawing.Point(14, 20);
this.labelControl2.Name = "labelControl2";
this.labelControl2.Size = new System.Drawing.Size(68, 21);
this.labelControl2.TabIndex = 456;
@@ -1119,7 +1109,7 @@
// btnTui
//
this.btnTui.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.close_16x16;
- this.btnTui.Location = new System.Drawing.Point(206, 126);
+ this.btnTui.Location = new System.Drawing.Point(187, 126);
this.btnTui.Name = "btnTui";
this.btnTui.Size = new System.Drawing.Size(116, 29);
this.btnTui.TabIndex = 455;
@@ -1128,7 +1118,7 @@
// txtDepotsCode
//
this.txtDepotsCode.Enabled = false;
- this.txtDepotsCode.Location = new System.Drawing.Point(421, 87);
+ this.txtDepotsCode.Location = new System.Drawing.Point(402, 87);
this.txtDepotsCode.Name = "txtDepotsCode";
this.txtDepotsCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txtDepotsCode.Properties.Appearance.Options.UseFont = true;
@@ -1139,7 +1129,7 @@
//
this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl4.Appearance.Options.UseFont = true;
- this.labelControl4.Location = new System.Drawing.Point(346, 91);
+ this.labelControl4.Location = new System.Drawing.Point(327, 91);
this.labelControl4.Name = "labelControl4";
this.labelControl4.Size = new System.Drawing.Size(68, 21);
this.labelControl4.TabIndex = 453;
@@ -1148,7 +1138,7 @@
// txtSupplierCode
//
this.txtSupplierCode.Enabled = false;
- this.txtSupplierCode.Location = new System.Drawing.Point(107, 87);
+ this.txtSupplierCode.Location = new System.Drawing.Point(401, 51);
this.txtSupplierCode.Name = "txtSupplierCode";
this.txtSupplierCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txtSupplierCode.Properties.Appearance.Options.UseFont = true;
@@ -1157,7 +1147,7 @@
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(728, 52);
+ this.txt_fType.Location = new System.Drawing.Point(709, 52);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Properties.Caption = "";
this.txt_fType.Size = new System.Drawing.Size(35, 24);
@@ -1166,7 +1156,7 @@
// txt_urgentFlag
//
this.txt_urgentFlag.Enabled = false;
- this.txt_urgentFlag.Location = new System.Drawing.Point(728, 14);
+ this.txt_urgentFlag.Location = new System.Drawing.Point(709, 18);
this.txt_urgentFlag.Name = "txt_urgentFlag";
this.txt_urgentFlag.Properties.Caption = "";
this.txt_urgentFlag.Size = new System.Drawing.Size(35, 24);
@@ -1175,7 +1165,7 @@
// txt_fstatus
//
this.txt_fstatus.Enabled = false;
- this.txt_fstatus.Location = new System.Drawing.Point(886, 14);
+ this.txt_fstatus.Location = new System.Drawing.Point(867, 18);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "";
this.txt_fstatus.Size = new System.Drawing.Size(47, 24);
@@ -1184,7 +1174,7 @@
// txt_depotsId
//
this.txt_depotsId.IsReadly = true;
- this.txt_depotsId.Location = new System.Drawing.Point(421, 50);
+ this.txt_depotsId.Location = new System.Drawing.Point(88, 87);
this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0);
this.txt_depotsId.Name = "txt_depotsId";
this.txt_depotsId.Size = new System.Drawing.Size(215, 28);
@@ -1194,7 +1184,7 @@
//
this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl3.Appearance.Options.UseFont = true;
- this.labelControl3.Location = new System.Drawing.Point(346, 57);
+ this.labelControl3.Location = new System.Drawing.Point(14, 91);
this.labelControl3.Name = "labelControl3";
this.labelControl3.Size = new System.Drawing.Size(68, 21);
this.labelControl3.TabIndex = 444;
@@ -1203,7 +1193,7 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(30, 126);
+ this.btnSelect.Location = new System.Drawing.Point(14, 126);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(128, 29);
this.btnSelect.TabIndex = 443;
@@ -1212,7 +1202,7 @@
// txt_suppId
//
this.txt_suppId.IsReadly = true;
- this.txt_suppId.Location = new System.Drawing.Point(107, 50);
+ this.txt_suppId.Location = new System.Drawing.Point(88, 51);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppId.Name = "txt_suppId";
this.txt_suppId.Size = new System.Drawing.Size(215, 28);
@@ -1222,15 +1212,15 @@
//
this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(16, 55);
+ this.labelControl1.Location = new System.Drawing.Point(14, 55);
this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(85, 21);
+ this.labelControl1.Size = new System.Drawing.Size(68, 21);
this.labelControl1.TabIndex = 439;
- this.labelControl1.Text = "渚涘簲鍟嗗悕绉�";
+ this.labelControl1.Text = "閫変緵搴斿晢";
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(939, 50);
+ this.labelControl11.Location = new System.Drawing.Point(920, 50);
this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl11.Name = "labelControl11";
this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -1251,7 +1241,7 @@
//
this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remark.Appearance.Options.UseFont = true;
- this.lb_remark.Location = new System.Drawing.Point(346, 130);
+ this.lb_remark.Location = new System.Drawing.Point(327, 130);
this.lb_remark.Name = "lb_remark";
this.lb_remark.Size = new System.Drawing.Size(68, 21);
this.lb_remark.TabIndex = 240;
@@ -1259,22 +1249,12 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(421, 126);
+ this.txt_remark.Location = new System.Drawing.Point(402, 126);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
this.txt_remark.Size = new System.Drawing.Size(522, 28);
this.txt_remark.TabIndex = 240;
- //
- // labelControl5
- //
- this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl5.Appearance.Options.UseFont = true;
- this.labelControl5.Location = new System.Drawing.Point(16, 90);
- this.labelControl5.Name = "labelControl5";
- this.labelControl5.Size = new System.Drawing.Size(85, 21);
- this.labelControl5.TabIndex = 458;
- this.labelControl5.Text = "渚涘簲鍟嗙紪鐮�";
//
// Frm_MesInvItemArn
//
@@ -1287,8 +1267,8 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
@@ -1321,9 +1301,6 @@
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.LabelControl labelControl11;
private DevExpress.XtraTab.XtraTabControl tabMx;
-
- //BQCreateConrolObejct
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1states;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnFlag;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1okRkqty;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1isdepsIn;
@@ -1408,11 +1385,11 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
private DevExpress.XtraEditors.SimpleButton btnTui;
- private UserControl.UcLookOrg ucLookOrg1;
+ private UserControl.UcLookOrg txt_receiveOrgId;
private DevExpress.XtraEditors.LabelControl labelControl2;
private DevExpress.XtraEditors.LabelControl labelControl5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index ce94a01..aa905ac 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -519,7 +519,6 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
UcLoading _loading = new UcLoading();
var _obj = new
@@ -542,7 +541,7 @@
gvList);
var _job = JObject.Parse(strJson);
var array = new JArray();
- foreach (var a in _job["rtnData"]["listDya"]) array.Add(a);
+ foreach (var a in _job["rtnData"]["list"]) array.Add(a);
var dt =
JsonConvert.DeserializeObject<DataTable>(
array.ToString());
@@ -615,6 +614,6 @@
}
}
-
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 25fbc03..fecb3a4 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -565,6 +565,17 @@
txt.Enabled = false;
continue;
}
+ //鑷畾缁勭粐
+ if (colType is UcLookOrg)
+ {
+ var txt = colType as UcLookOrg;
+ txt.SetIdOrCode(strVal);
+ if (txt.IsReadly == false)
+ txt.Enabled = !isEdt;
+ else
+ txt.Enabled = false;
+ continue;
+ }
if (colType is SimpleButton)
{
@@ -738,6 +749,14 @@
txt.Enabled = !isEdt;
continue;
}
+ //鑷畾缁勭粐
+ if (ctrl is UcLookOrg)
+ {
+ var txt = ctrl as UcLookOrg;
+ txt.SetIdOrCode("-1");
+ txt.Enabled = !isEdt;
+ continue;
+ }
if (ctrl is SimpleButton)
{
var txt = ctrl as SimpleButton;
@@ -902,6 +921,16 @@
txt.Enabled = false;
continue;
}
+ //鑷畾缁勭粐
+ if (ctrl is UcLookOrg)
+ {
+ var txt = ctrl as UcLookOrg;
+ if (txt.IsReadly == false)
+ txt.Enabled = !isEdt;
+ else
+ txt.Enabled = false;
+ continue;
+ }
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookOrg.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookOrg.Designer.cs
index 762bcfc..5b43c51 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookOrg.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookOrg.Designer.cs
@@ -31,8 +31,8 @@
this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
@@ -72,14 +72,6 @@
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
//
- // gridColumn5
- //
- this.gridColumn5.Caption = "缁勭粐鍚嶇О";
- this.gridColumn5.FieldName = "name";
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 2;
- //
// gridColumn2
//
this.gridColumn2.Caption = "缁勭粐缂栧彿";
@@ -91,6 +83,14 @@
this.gridColumn2.VisibleIndex = 1;
this.gridColumn2.Width = 80;
//
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "缁勭粐鍚嶇О";
+ this.gridColumn5.FieldName = "name";
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 2;
+ //
// gridColumn4
//
this.gridColumn4.Caption = "guid";
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs b/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs
index 15ef123..e9c7ccb 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs
@@ -82,7 +82,7 @@
public void SetIdOrCode(string Code)
{
- if (Code == "-1")
+ if (Code == "-1" || string.IsNullOrEmpty(Code))
{
lookSearchSupplier.EditValue = null;
return;
--
Gitblit v1.9.3