From c68df1200cc2b6cf34867789ad61aa84feb20f42 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 13 一月 2025 17:53:21 +0800
Subject: [PATCH] 生产退料申请
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 48 +++++++--
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 163 +++++++++++++++++++-------------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 46 +++++++++
3 files changed, 180 insertions(+), 77 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index 954c447..1adc71e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -29,6 +29,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();
@@ -127,13 +132,15 @@
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.panel1 = new System.Windows.Forms.Panel();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.txt_tbl023 = new Gs.DevApp.UserControl.UcLookOrg();
@@ -178,6 +185,7 @@
this.xtraTabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl013.Properties)).BeginInit();
@@ -203,7 +211,7 @@
this.gvMx1tld007.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1tld007.AppearanceCell.Options.UseFont = true;
this.gvMx1tld007.Caption = "鍗曚綅";
- this.gvMx1tld007.FieldName = "tld007";
+ this.gvMx1tld007.FieldName = "dwName";
this.gvMx1tld007.MinWidth = 50;
this.gvMx1tld007.Name = "gvMx1tld007";
this.gvMx1tld007.Tag = "query_a.tld007";
@@ -345,7 +353,6 @@
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
// gridColumn3
@@ -387,10 +394,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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);
@@ -485,11 +492,11 @@
//
// labelControl13
//
- this.labelControl13.Location = new System.Drawing.Point(332, 70);
+ this.labelControl13.Location = new System.Drawing.Point(345, 70);
this.labelControl13.Name = "labelControl13";
- this.labelControl13.Size = new System.Drawing.Size(90, 18);
+ this.labelControl13.Size = new System.Drawing.Size(80, 18);
this.labelControl13.TabIndex = 223;
- this.labelControl13.Text = "鍙墦鍗版�绘暟锛�";
+ this.labelControl13.Text = "鍙墦鍗版�绘暟:";
//
// txtYdy
//
@@ -503,11 +510,11 @@
//
// labelControl1
//
- this.labelControl1.Location = new System.Drawing.Point(332, 39);
+ this.labelControl1.Location = new System.Drawing.Point(345, 39);
this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(90, 18);
+ this.labelControl1.Size = new System.Drawing.Size(80, 18);
this.labelControl1.TabIndex = 221;
- this.labelControl1.Text = "宸叉墦鍗版�婚噺锛�";
+ this.labelControl1.Text = "宸叉墦鍗版�婚噺:";
//
// txtQuantity
//
@@ -521,11 +528,11 @@
//
// labelControl10
//
- this.labelControl10.Location = new System.Drawing.Point(317, 9);
+ this.labelControl10.Location = new System.Drawing.Point(330, 9);
this.labelControl10.Name = "labelControl10";
- this.labelControl10.Size = new System.Drawing.Size(105, 18);
+ this.labelControl10.Size = new System.Drawing.Size(95, 18);
this.labelControl10.TabIndex = 219;
- this.labelControl10.Text = "鏈鏀惰揣鎬婚噺锛�";
+ this.labelControl10.Text = "鏈鏀惰揣鎬婚噺:";
//
// txtWlgg
//
@@ -534,16 +541,16 @@
this.txtWlgg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
- this.txtWlgg.Size = new System.Drawing.Size(215, 28);
+ this.txtWlgg.Size = new System.Drawing.Size(232, 28);
this.txtWlgg.TabIndex = 218;
//
// labelControl9
//
- this.labelControl9.Location = new System.Drawing.Point(11, 70);
+ this.labelControl9.Location = new System.Drawing.Point(21, 70);
this.labelControl9.Name = "labelControl9";
- this.labelControl9.Size = new System.Drawing.Size(75, 18);
+ this.labelControl9.Size = new System.Drawing.Size(65, 18);
this.labelControl9.TabIndex = 217;
- this.labelControl9.Text = "鐗╂枡瑙勬牸锛�";
+ this.labelControl9.Text = "鐗╂枡瑙勬牸:";
//
// txtWlmc
//
@@ -552,16 +559,16 @@
this.txtWlmc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
- this.txtWlmc.Size = new System.Drawing.Size(215, 28);
+ this.txtWlmc.Size = new System.Drawing.Size(232, 28);
this.txtWlmc.TabIndex = 216;
//
// labelControl8
//
- this.labelControl8.Location = new System.Drawing.Point(11, 39);
+ this.labelControl8.Location = new System.Drawing.Point(21, 39);
this.labelControl8.Name = "labelControl8";
- this.labelControl8.Size = new System.Drawing.Size(75, 18);
+ this.labelControl8.Size = new System.Drawing.Size(65, 18);
this.labelControl8.TabIndex = 215;
- this.labelControl8.Text = "鐗╂枡鍚嶇О锛�";
+ this.labelControl8.Text = "鐗╂枡鍚嶇О:";
//
// txtWlid
//
@@ -570,16 +577,16 @@
this.txtWlid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txtWlid.Properties.Appearance.Options.UseFont = true;
this.txtWlid.Properties.ReadOnly = true;
- this.txtWlid.Size = new System.Drawing.Size(215, 28);
+ this.txtWlid.Size = new System.Drawing.Size(232, 28);
this.txtWlid.TabIndex = 214;
//
// labelControl7
//
- this.labelControl7.Location = new System.Drawing.Point(25, 9);
+ this.labelControl7.Location = new System.Drawing.Point(21, 9);
this.labelControl7.Name = "labelControl7";
- this.labelControl7.Size = new System.Drawing.Size(61, 18);
+ this.labelControl7.Size = new System.Drawing.Size(65, 18);
this.labelControl7.TabIndex = 213;
- this.labelControl7.Text = "鐗╂枡ID锛�";
+ this.labelControl7.Text = "鐗╂枡缂栧彿:";
//
// gv_tbl022
//
@@ -1236,7 +1243,7 @@
this.xtraTabPage3.Controls.Add(this.gcMx2);
this.xtraTabPage3.Name = "xtraTabPage3";
this.xtraTabPage3.Size = new System.Drawing.Size(1124, 351);
- this.xtraTabPage3.Text = "鏉＄爜鏄庣粏";
+ this.xtraTabPage3.Text = "宸叉墦鏉＄爜鏄庣粏";
//
// gcMx2
//
@@ -1244,6 +1251,8 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
+ this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit2});
this.gcMx2.Size = new System.Drawing.Size(1124, 351);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -1254,18 +1263,18 @@
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1itemBarcode,
- this.gvMx1quantity,
- this.gridColumn7,
this.gridColumn4,
this.gridColumn9,
this.gridColumn8,
+ this.gvMx1quantity,
+ this.gridColumn7,
this.gvMx1createBy,
- this.gvMx1lotDate});
+ this.gvMx1lotDate,
+ this.gvBtnAlawys});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx2.OptionsView.ShowGroupPanel = false;
//
// gvMx1guid
@@ -1292,6 +1301,36 @@
this.gvMx1itemBarcode.VisibleIndex = 0;
this.gvMx1itemBarcode.Width = 300;
//
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn4.FieldName = "itemNo";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 1;
+ this.gridColumn4.Width = 94;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn9.FieldName = "itemName";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 2;
+ this.gridColumn9.Width = 94;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "瑙勬牸鍨嬪彿";
+ this.gridColumn8.FieldName = "itemModel";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 3;
+ this.gridColumn8.Width = 94;
+ //
// gvMx1quantity
//
this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1302,7 +1341,7 @@
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.QUANTITY";
this.gvMx1quantity.Visible = true;
- this.gvMx1quantity.VisibleIndex = 1;
+ this.gvMx1quantity.VisibleIndex = 4;
this.gvMx1quantity.Width = 94;
//
// gridColumn7
@@ -1312,38 +1351,8 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 2;
+ this.gridColumn7.VisibleIndex = 5;
this.gridColumn7.Width = 94;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "鐗╂枡缂栫爜";
- this.gridColumn4.FieldName = "wlbm";
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 3;
- this.gridColumn4.Width = 94;
- //
- // gridColumn9
- //
- this.gridColumn9.Caption = "鐗╂枡鍚嶇О";
- this.gridColumn9.FieldName = "wlmc";
- this.gridColumn9.MinWidth = 25;
- this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 4;
- this.gridColumn9.Width = 94;
- //
- // gridColumn8
- //
- this.gridColumn8.Caption = "瑙勬牸鍨嬪彿";
- this.gridColumn8.FieldName = "wlgg";
- this.gridColumn8.MinWidth = 25;
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 5;
- this.gridColumn8.Width = 94;
//
// gvMx1createBy
//
@@ -1370,6 +1379,27 @@
this.gvMx1lotDate.Visible = true;
this.gvMx1lotDate.VisibleIndex = 7;
this.gvMx1lotDate.Width = 94;
+ //
+ // gvBtnAlawys
+ //
+ this.gvBtnAlawys.Caption = "绉诲嚭";
+ this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2;
+ this.gvBtnAlawys.MinWidth = 25;
+ this.gvBtnAlawys.Name = "gvBtnAlawys";
+ this.gvBtnAlawys.Visible = true;
+ this.gvBtnAlawys.VisibleIndex = 8;
+ this.gvBtnAlawys.Width = 94;
+ //
+ // repositoryItemButtonEdit2
+ //
+ this.repositoryItemButtonEdit2.AutoHeight = false;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ 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.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
+ this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
//
// panel1
//
@@ -1551,6 +1581,7 @@
this.xtraTabPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).EndInit();
@@ -1684,5 +1715,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraEditors.LabelControl labelControl2;
private UserControl.UcLookOrg txt_tbl023;
+ private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index 92ba1bc..5aff43e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -1,4 +1,3 @@
-using DevExpress.XtraGrid.Views.Base.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -29,6 +28,7 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "tbl013", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -562,6 +562,11 @@
}
}
+ /// <summary>
+ /// 绉诲嚭鐢宠鏄庣粏
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gvMx1.FocusedRowHandle;
@@ -675,5 +680,44 @@
}
}
+ /// <summary>
+ /// 绉诲嚭鏉＄爜
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx2.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx2.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ var _obj = new
+ {
+ mxGuid = mxGuid,
+ inType = "dhtm"
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "DeleteBarcode",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+ }
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 7dfe72f..7072ca3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ 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.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -137,6 +137,8 @@
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
+ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -258,6 +260,8 @@
this.gridColumn18,
this.gridColumn14,
this.gvMx2oldqty,
+ this.gridColumn21,
+ this.gridColumn20,
this.gridColumn17,
this.gvBtnAlawys});
this.gvMx2.GridControl = this.gcMx2;
@@ -300,10 +304,10 @@
//
this.gridColumn17.Caption = "鎵撳嵃鏃ユ湡";
this.gridColumn17.FieldName = "createDate";
- this.gridColumn17.MinWidth = 180;
+ this.gridColumn17.MinWidth = 10;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 6;
+ this.gridColumn17.VisibleIndex = 8;
this.gridColumn17.Width = 180;
//
// gvBtnAlawys
@@ -313,16 +317,16 @@
this.gvBtnAlawys.MinWidth = 25;
this.gvBtnAlawys.Name = "gvBtnAlawys";
this.gvBtnAlawys.Visible = true;
- this.gvBtnAlawys.VisibleIndex = 7;
+ this.gvBtnAlawys.VisibleIndex = 9;
this.gvBtnAlawys.Width = 94;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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);
@@ -1365,6 +1369,26 @@
this.txt_billNo.Size = new System.Drawing.Size(215, 28);
this.txt_billNo.TabIndex = 211;
//
+ // gridColumn20
+ //
+ this.gridColumn20.Caption = "鎵撳嵃浜�";
+ this.gridColumn20.FieldName = "createBy";
+ this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.Visible = true;
+ this.gridColumn20.VisibleIndex = 7;
+ this.gridColumn20.Width = 94;
+ //
+ // gridColumn21
+ //
+ this.gridColumn21.Caption = "鍗曚綅";
+ this.gridColumn21.FieldName = "dwName";
+ this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.Visible = true;
+ this.gridColumn21.VisibleIndex = 6;
+ this.gridColumn21.Width = 94;
+ //
// Frm_ArrivalBarcode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1522,5 +1546,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraEditors.TextEdit txt_iCount_1;
private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
}
}
\ No newline at end of file
--
Gitblit v1.9.3