From aa4e638512f70d2ac2a8ccc48d6ba026bdfc959e Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 18 二月 2025 08:24:37 +0800
Subject: [PATCH] 出库细节
---
DevApp/Gs.DevApp/UserControl/UcLookDaa.cs | 10 ++
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs | 13 ++-
DevApp/Gs.DevApp/UserControl/UcLookCk.cs | 5 +
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 4 -
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 1
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs | 62 +++++++++------
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs | 110 +++++++++++++-------------
7 files changed, 114 insertions(+), 91 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
index c65a670..05f049e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
@@ -27,11 +27,11 @@
/// </summary>
private void InitializeComponent()
{
- 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();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1bld014 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1bld012 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
@@ -61,6 +61,7 @@
this.dabGuid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_wcTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_wcUser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_bl019 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -173,14 +174,13 @@
this.gvMx1bld012.AppearanceCell.Options.UseForeColor = true;
this.gvMx1bld012.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gvMx1bld012.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1bld012.Caption = "鐗╂枡id ";
+ this.gvMx1bld012.Caption = "閫夋嫨鐗╂枡";
this.gvMx1bld012.ColumnEdit = this.repositoryItemSearchLookUpEdit1;
- this.gvMx1bld012.FieldName = "bld012";
this.gvMx1bld012.MinWidth = 50;
this.gvMx1bld012.Name = "gvMx1bld012";
this.gvMx1bld012.Tag = "edit";
this.gvMx1bld012.Visible = true;
- this.gvMx1bld012.VisibleIndex = 1;
+ this.gvMx1bld012.VisibleIndex = 0;
this.gvMx1bld012.Width = 94;
//
// repositoryItemSearchLookUpEdit1
@@ -287,7 +287,7 @@
this.gvMx1bld010.Name = "gvMx1bld010";
this.gvMx1bld010.Tag = "edit";
this.gvMx1bld010.Visible = true;
- this.gvMx1bld010.VisibleIndex = 8;
+ this.gvMx1bld010.VisibleIndex = 7;
this.gvMx1bld010.Width = 150;
//
// gvMx1bld009
@@ -301,7 +301,7 @@
this.gvMx1bld009.OptionsColumn.ReadOnly = true;
this.gvMx1bld009.Tag = "query_a.bld009";
this.gvMx1bld009.Visible = true;
- this.gvMx1bld009.VisibleIndex = 7;
+ this.gvMx1bld009.VisibleIndex = 6;
this.gvMx1bld009.Width = 94;
//
// gvMx1bld008
@@ -315,7 +315,7 @@
this.gvMx1bld008.OptionsColumn.ReadOnly = true;
this.gvMx1bld008.Tag = "query_a.bld008";
this.gvMx1bld008.Visible = true;
- this.gvMx1bld008.VisibleIndex = 6;
+ this.gvMx1bld008.VisibleIndex = 5;
this.gvMx1bld008.Width = 94;
//
// gvMx1bld007
@@ -332,7 +332,7 @@
this.gvMx1bld007.Name = "gvMx1bld007";
this.gvMx1bld007.Tag = "yz_quantity_0_edit";
this.gvMx1bld007.Visible = true;
- this.gvMx1bld007.VisibleIndex = 5;
+ this.gvMx1bld007.VisibleIndex = 4;
this.gvMx1bld007.Width = 94;
//
// gvMx1bld006
@@ -358,7 +358,7 @@
this.gvMx1bld004.OptionsColumn.ReadOnly = true;
this.gvMx1bld004.Tag = "query_a.bld004";
this.gvMx1bld004.Visible = true;
- this.gvMx1bld004.VisibleIndex = 4;
+ this.gvMx1bld004.VisibleIndex = 3;
this.gvMx1bld004.Width = 120;
//
// gvMx1bld003
@@ -372,7 +372,7 @@
this.gvMx1bld003.OptionsColumn.ReadOnly = true;
this.gvMx1bld003.Tag = "query_a.bld003";
this.gvMx1bld003.Visible = true;
- this.gvMx1bld003.VisibleIndex = 3;
+ this.gvMx1bld003.VisibleIndex = 2;
this.gvMx1bld003.Width = 120;
//
// gvMx1bld002
@@ -386,7 +386,7 @@
this.gvMx1bld002.OptionsColumn.ReadOnly = true;
this.gvMx1bld002.Tag = "query_a.bld002";
this.gvMx1bld002.Visible = true;
- this.gvMx1bld002.VisibleIndex = 2;
+ this.gvMx1bld002.VisibleIndex = 1;
this.gvMx1bld002.Width = 100;
//
// gvMx1bld001
@@ -400,7 +400,7 @@
this.gvMx1bld001.OptionsColumn.ReadOnly = true;
this.gvMx1bld001.Tag = "query_a.bld001";
this.gvMx1bld001.Visible = true;
- this.gvMx1bld001.VisibleIndex = 0;
+ this.gvMx1bld001.VisibleIndex = 9;
this.gvMx1bld001.Width = 94;
//
// gvMx1mid
@@ -453,7 +453,6 @@
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1id,
this.gvMx1mid,
- this.gvMx1bld001,
this.gvMx1bld012,
this.gvMx1bld002,
this.gvMx1bld003,
@@ -465,7 +464,9 @@
this.gvMx1bld010,
this.gvMx1bld014,
this.dabGuid,
- this.gvMxDel});
+ this.gvMx1bld001,
+ this.gvMxDel,
+ this.gridColumn10});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -494,13 +495,21 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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);
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "鐗╂枡id";
+ this.gridColumn10.FieldName = "bld012";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Width = 94;
//
// gv_wcTime
//
@@ -732,7 +741,7 @@
//
this.gv_bl012.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_bl012.AppearanceCell.Options.UseFont = true;
- this.gv_bl012.Caption = "琛ユ枡浜х嚎 ";
+ this.gv_bl012.Caption = "鐢宠浜х嚎 ";
this.gv_bl012.FieldName = "bl012";
this.gv_bl012.MinWidth = 50;
this.gv_bl012.Name = "gv_bl012";
@@ -766,7 +775,7 @@
//
this.gv_bl011.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_bl011.AppearanceCell.Options.UseFont = true;
- this.gv_bl011.Caption = "琛ユ枡閮ㄩ棬 ";
+ this.gv_bl011.Caption = "鐢宠閮ㄩ棬 ";
this.gv_bl011.FieldName = "bl011";
this.gv_bl011.MinWidth = 50;
this.gv_bl011.Name = "gv_bl011";
@@ -837,7 +846,7 @@
//
this.gv_bl007.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_bl007.AppearanceCell.Options.UseFont = true;
- this.gv_bl007.Caption = "琛ユ枡鍘熷洜 ";
+ this.gv_bl007.Caption = "鐢宠鍘熷洜 ";
this.gv_bl007.FieldName = "bl007";
this.gv_bl007.MinWidth = 50;
this.gv_bl007.Name = "gv_bl007";
@@ -991,7 +1000,7 @@
//
this.gv_blNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_blNo.AppearanceCell.Options.UseFont = true;
- this.gv_blNo.Caption = "琛ユ枡鍗曞彿 ";
+ this.gv_blNo.Caption = "鐢宠鍗曞彿 ";
this.gv_blNo.FieldName = "blNo";
this.gv_blNo.MinWidth = 100;
this.gv_blNo.Name = "gv_blNo";
@@ -1078,7 +1087,7 @@
//
// gridColumn9
//
- this.gridColumn9.Caption = "缁勭粐";
+ this.gridColumn9.Caption = "鐢熶骇缁勭粐";
this.gridColumn9.FieldName = "fSubsidiary";
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
@@ -1421,5 +1430,6 @@
private UserControl.UcLookOrg txt_orgId;
private DevExpress.XtraEditors.LabelControl labelControl2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
index 8827009..cde1d5f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
@@ -14,7 +14,8 @@
{
public partial class UcBlcl : DevExpress.XtraEditors.XtraUserControl
{
-
+ string _ucCk = "";//浠撳簱
+ string _ucGd = "";//宸ュ崟
string _webServiceName = "MesItemBlManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
public string strType = "";
@@ -60,11 +61,10 @@
{
string orgdId = txt_orgId.GetId();
if (string.IsNullOrEmpty(orgdId)) return;
- txt_bl010.getSuppler(orgdId);
- txt_aboutGuid.getSuppler(orgdId);
+ txt_bl010.getSuppler(orgdId,_ucCk);
+ txt_aboutGuid.getSuppler(orgdId, _ucGd);
};
//璁剧疆浠撳簱閫夋嫨
- // txt_bl010.getSuppler("");
this.txt_bl010.EditChanged += (s, e) =>
{
@@ -361,6 +361,7 @@
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
+ toolBarMenu1.currentAction = "";
}
}
catch (Exception ex)
@@ -434,10 +435,14 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
+ _ucCk = dy.bl010;
+ _ucGd = dy.aboutGuid;
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
+ _ucCk = "";
+ _ucGd = "";
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
index 4abb7a6..785c903 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
@@ -93,6 +93,7 @@
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -105,7 +106,6 @@
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -400,7 +400,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 417);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 423);
this.tabMxPage1.Text = "鍑哄簱鏄庣粏";
//
// gcMx1
@@ -409,7 +409,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 417);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 423);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -458,11 +458,11 @@
//
this.lb_depotId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_depotId.Appearance.Options.UseFont = true;
- this.lb_depotId.Location = new System.Drawing.Point(302, 51);
+ this.lb_depotId.Location = new System.Drawing.Point(275, 52);
this.lb_depotId.Name = "lb_depotId";
- this.lb_depotId.Size = new System.Drawing.Size(34, 21);
+ this.lb_depotId.Size = new System.Drawing.Size(68, 21);
this.lb_depotId.TabIndex = 571;
- this.lb_depotId.Text = "浠撳簱";
+ this.lb_depotId.Text = "鍙戞枡浠撳簱";
//
// gv_pbillNo
//
@@ -496,15 +496,15 @@
//
this.lb_outType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_outType.Appearance.Options.UseFont = true;
- this.lb_outType.Location = new System.Drawing.Point(263, 89);
+ this.lb_outType.Location = new System.Drawing.Point(275, 85);
this.lb_outType.Name = "lb_outType";
- this.lb_outType.Size = new System.Drawing.Size(73, 21);
+ this.lb_outType.Size = new System.Drawing.Size(68, 21);
this.lb_outType.TabIndex = 450;
- this.lb_outType.Text = "鍑哄簱绫诲埆 ";
+ this.lb_outType.Text = "鍑哄簱绫诲埆";
//
// txt_outType
//
- this.txt_outType.Location = new System.Drawing.Point(342, 85);
+ this.txt_outType.Location = new System.Drawing.Point(349, 81);
this.txt_outType.Name = "txt_outType";
this.txt_outType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_outType.Properties.Appearance.Options.UseFont = true;
@@ -531,17 +531,17 @@
this.lb_workNo.Appearance.Options.UseFont = true;
this.lb_workNo.Location = new System.Drawing.Point(20, 52);
this.lb_workNo.Name = "lb_workNo";
- this.lb_workNo.Size = new System.Drawing.Size(73, 21);
+ this.lb_workNo.Size = new System.Drawing.Size(68, 21);
this.lb_workNo.TabIndex = 387;
- this.lb_workNo.Text = "浠诲姟鍗曞彿 ";
+ this.lb_workNo.Text = "浠诲姟鍗曞彿";
//
// txt_workNo
//
- this.txt_workNo.Location = new System.Drawing.Point(98, 48);
+ this.txt_workNo.Location = new System.Drawing.Point(92, 48);
this.txt_workNo.Name = "txt_workNo";
this.txt_workNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_workNo.Properties.Appearance.Options.UseFont = true;
- this.txt_workNo.Size = new System.Drawing.Size(150, 28);
+ this.txt_workNo.Size = new System.Drawing.Size(178, 28);
this.txt_workNo.TabIndex = 387;
//
// gv_workNo
@@ -576,11 +576,11 @@
//
this.lb_outPart.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_outPart.Appearance.Options.UseFont = true;
- this.lb_outPart.Location = new System.Drawing.Point(263, 20);
+ this.lb_outPart.Location = new System.Drawing.Point(275, 20);
this.lb_outPart.Name = "lb_outPart";
- this.lb_outPart.Size = new System.Drawing.Size(73, 21);
+ this.lb_outPart.Size = new System.Drawing.Size(68, 21);
this.lb_outPart.TabIndex = 319;
- this.lb_outPart.Text = "棰嗘枡閮ㄩ棬 ";
+ this.lb_outPart.Text = "棰嗘枡閮ㄩ棬";
//
// gv_outPart
//
@@ -614,7 +614,7 @@
//
this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_checkDate.Appearance.Options.UseFont = true;
- this.lb_checkDate.Location = new System.Drawing.Point(773, 52);
+ this.lb_checkDate.Location = new System.Drawing.Point(778, 52);
this.lb_checkDate.Name = "lb_checkDate";
this.lb_checkDate.Size = new System.Drawing.Size(73, 21);
this.lb_checkDate.TabIndex = 262;
@@ -622,7 +622,7 @@
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(850, 48);
+ this.txt_checkDate.Location = new System.Drawing.Point(855, 48);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
@@ -647,7 +647,7 @@
//
this.lb_checkUser.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_checkUser.Appearance.Options.UseFont = true;
- this.lb_checkUser.Location = new System.Drawing.Point(790, 20);
+ this.lb_checkUser.Location = new System.Drawing.Point(795, 20);
this.lb_checkUser.Name = "lb_checkUser";
this.lb_checkUser.Size = new System.Drawing.Size(56, 21);
this.lb_checkUser.TabIndex = 258;
@@ -655,7 +655,7 @@
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(850, 16);
+ this.txt_checkUser.Location = new System.Drawing.Point(855, 16);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
@@ -694,7 +694,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(522, 83);
+ this.lb_remark.Location = new System.Drawing.Point(527, 85);
this.lb_remark.Name = "lb_remark";
this.lb_remark.Size = new System.Drawing.Size(73, 21);
this.lb_remark.TabIndex = 243;
@@ -702,7 +702,7 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(599, 79);
+ this.txt_remark.Location = new System.Drawing.Point(604, 81);
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;
@@ -727,7 +727,7 @@
//
this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_createDate.Appearance.Options.UseFont = true;
- this.lb_createDate.Location = new System.Drawing.Point(522, 52);
+ this.lb_createDate.Location = new System.Drawing.Point(527, 52);
this.lb_createDate.Name = "lb_createDate";
this.lb_createDate.Size = new System.Drawing.Size(73, 21);
this.lb_createDate.TabIndex = 226;
@@ -735,7 +735,7 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(599, 48);
+ this.txt_createDate.Location = new System.Drawing.Point(604, 48);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
@@ -760,7 +760,7 @@
//
this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_createBy.Appearance.Options.UseFont = true;
- this.lb_createBy.Location = new System.Drawing.Point(539, 20);
+ this.lb_createBy.Location = new System.Drawing.Point(544, 20);
this.lb_createBy.Name = "lb_createBy";
this.lb_createBy.Size = new System.Drawing.Size(56, 21);
this.lb_createBy.TabIndex = 222;
@@ -768,7 +768,7 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(599, 16);
+ this.txt_createBy.Location = new System.Drawing.Point(604, 16);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
@@ -793,7 +793,7 @@
//
this.lb_status.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_status.Appearance.Options.UseFont = true;
- this.lb_status.Location = new System.Drawing.Point(807, 86);
+ this.lb_status.Location = new System.Drawing.Point(812, 85);
this.lb_status.Name = "lb_status";
this.lb_status.Size = new System.Drawing.Size(39, 21);
this.lb_status.TabIndex = 219;
@@ -820,19 +820,19 @@
//
this.lb_taskNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_taskNo.Appearance.Options.UseFont = true;
- this.lb_taskNo.Location = new System.Drawing.Point(20, 86);
+ this.lb_taskNo.Location = new System.Drawing.Point(20, 85);
this.lb_taskNo.Name = "lb_taskNo";
- this.lb_taskNo.Size = new System.Drawing.Size(73, 21);
+ this.lb_taskNo.Size = new System.Drawing.Size(68, 21);
this.lb_taskNo.TabIndex = 216;
- this.lb_taskNo.Text = "鐢熶骇璁㈠崟 ";
+ this.lb_taskNo.Text = "鐢宠鍗曞彿";
//
// txt_taskNo
//
- this.txt_taskNo.Location = new System.Drawing.Point(98, 82);
+ this.txt_taskNo.Location = new System.Drawing.Point(92, 81);
this.txt_taskNo.Name = "txt_taskNo";
this.txt_taskNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_taskNo.Properties.Appearance.Options.UseFont = true;
- this.txt_taskNo.Size = new System.Drawing.Size(150, 28);
+ this.txt_taskNo.Size = new System.Drawing.Size(178, 28);
this.txt_taskNo.TabIndex = 216;
//
// lb_itemOutNo
@@ -841,17 +841,17 @@
this.lb_itemOutNo.Appearance.Options.UseFont = true;
this.lb_itemOutNo.Location = new System.Drawing.Point(20, 20);
this.lb_itemOutNo.Name = "lb_itemOutNo";
- this.lb_itemOutNo.Size = new System.Drawing.Size(73, 21);
+ this.lb_itemOutNo.Size = new System.Drawing.Size(68, 21);
this.lb_itemOutNo.TabIndex = 213;
- this.lb_itemOutNo.Text = "鍑哄簱鍗曞彿 ";
+ this.lb_itemOutNo.Text = "鍑哄簱鍗曞彿";
//
// txt_itemOutNo
//
- this.txt_itemOutNo.Location = new System.Drawing.Point(98, 16);
+ this.txt_itemOutNo.Location = new System.Drawing.Point(92, 16);
this.txt_itemOutNo.Name = "txt_itemOutNo";
this.txt_itemOutNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemOutNo.Size = new System.Drawing.Size(150, 28);
+ this.txt_itemOutNo.Size = new System.Drawing.Size(178, 28);
this.txt_itemOutNo.TabIndex = 213;
//
// gv_itemOutNo
@@ -937,6 +937,16 @@
this.gridColumn1.VisibleIndex = 5;
this.gridColumn1.Width = 120;
//
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "浜у搧鍨嬪彿";
+ this.gridColumn6.FieldName = "itemModel";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 6;
+ this.gridColumn6.Width = 94;
+ //
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -980,10 +990,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 121);
+ this.tabMx.Location = new System.Drawing.Point(0, 115);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 449);
+ this.tabMx.Size = new System.Drawing.Size(1126, 455);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1022,13 +1032,13 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 121);
+ this.panel1.Size = new System.Drawing.Size(1126, 115);
this.panel1.TabIndex = 1;
//
// txt_outPart
//
this.txt_outPart.IsReadly = false;
- this.txt_outPart.Location = new System.Drawing.Point(342, 19);
+ this.txt_outPart.Location = new System.Drawing.Point(349, 19);
this.txt_outPart.Name = "txt_outPart";
this.txt_outPart.Size = new System.Drawing.Size(174, 28);
this.txt_outPart.TabIndex = 574;
@@ -1036,7 +1046,7 @@
// depot_id
//
this.depot_id.IsReadly = false;
- this.depot_id.Location = new System.Drawing.Point(342, 51);
+ this.depot_id.Location = new System.Drawing.Point(349, 48);
this.depot_id.Margin = new System.Windows.Forms.Padding(0);
this.depot_id.Name = "depot_id";
this.depot_id.Size = new System.Drawing.Size(174, 28);
@@ -1044,7 +1054,7 @@
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(850, 84);
+ this.txt_status.Location = new System.Drawing.Point(855, 83);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "";
this.txt_status.Size = new System.Drawing.Size(44, 24);
@@ -1052,7 +1062,7 @@
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(919, 86);
+ this.labelControl11.Location = new System.Drawing.Point(924, 85);
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);
@@ -1063,7 +1073,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(970, 86);
+ this.lbGuid.Location = new System.Drawing.Point(975, 85);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -1079,16 +1089,6 @@
this.picCheckBox.TabIndex = 11;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // gridColumn6
- //
- this.gridColumn6.Caption = "浜у搧鍨嬪彿";
- this.gridColumn6.FieldName = "itemModel";
- this.gridColumn6.MinWidth = 25;
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 6;
- this.gridColumn6.Width = 94;
//
// UcBlclDj
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index 682f327..91ca5b7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -459,6 +459,7 @@
gvList.Add(gvMx1);
gvList.Add(gvMx2);
UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
+ toolBarMenu1.currentAction = "";
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index f0d06b9..0ecce60 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -658,8 +658,6 @@
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
- this.txt_iCount_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
- this.txt_iCount_1.Properties.MaskSettings.Set("mask", "\\d+");
this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
this.txt_iCount_1.Size = new System.Drawing.Size(94, 28);
this.txt_iCount_1.TabIndex = 264;
@@ -672,8 +670,6 @@
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
- this.txt_psnQty_1.Properties.MaskSettings.Set("mask", "\\d+");
this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
this.txt_psnQty_1.Size = new System.Drawing.Size(94, 28);
this.txt_psnQty_1.TabIndex = 263;
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookCk.cs b/DevApp/Gs.DevApp/UserControl/UcLookCk.cs
index bce5000..1b0b3e9 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookCk.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookCk.cs
@@ -30,6 +30,11 @@
if (EditChanged != null) EditChanged(this, e);
}
+ /// <summary>
+ /// 璇诲彇浠撳簱
+ /// </summary>
+ /// <param name="orgId"></param>
+ /// <param name="_dftVale"></param>
public void getSuppler(string orgId, string _dftVale = "")
{
lookSearchSupplier.EditValue = null;
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDaa.cs b/DevApp/Gs.DevApp/UserControl/UcLookDaa.cs
index 1e9886c..3444941 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookDaa.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDaa.cs
@@ -37,9 +37,13 @@
{
if (EditChanged != null) EditChanged(this, e);
}
-
- public void getSuppler(string orgId)
+ /// <summary>
+ /// 璇诲彇宸ュ崟
+ /// </summary>
+ /// <param name="orgId"></param>
+ public void getSuppler(string orgId,string _dftVale = "")
{
+ lookSearchSupplier.EditValue = null;
string _keyWhere = "";
if (!string.IsNullOrEmpty(orgId))
_keyWhere = " and a.erp_sczz ='" + orgId + "'";
@@ -56,6 +60,8 @@
lookSearchSupplier.Properties.ValueMember = "guid";
lookSearchSupplier.ForceInitialize();
lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
+ if (!string.IsNullOrEmpty(_dftVale))
+ SetIdOrCode(_dftVale);
}
catch (Exception ex)
{
--
Gitblit v1.9.3