From 28e0b0a36d0b1a842d8a140c75533c25485b8c70 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 02 一月 2025 08:20:43 +0800
Subject: [PATCH] 采购
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 10
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 50 +++++--
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 257 ++++++++++++++++++++----------------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 50 +++---
DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs | 2
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 16 +
7 files changed, 221 insertions(+), 166 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index d9a7392..0702e87 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -30,22 +30,22 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesQaItemsDetect01));
- 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();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
+ 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();
+ 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();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -1509,7 +1509,7 @@
// gridColumn15
//
this.gridColumn15.Caption = "鎻愪氦妫�楠屾棩鏈�";
- this.gridColumn15.FieldName = "date01";
+ this.gridColumn15.FieldName = "iqcDate";
this.gridColumn15.MinWidth = 30;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.OptionsColumn.ReadOnly = true;
@@ -1683,10 +1683,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions4.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions4.Image")));
- editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
+ editorButtonImageOptions1.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, 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.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1704,10 +1704,10 @@
// repositoryItemButtonEdit3
//
this.repositoryItemButtonEdit3.AutoHeight = false;
- editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.download_16x16;
- editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", 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.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
@@ -1725,10 +1725,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.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, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx
index 7eb5350..5e16aec 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx
@@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="editorButtonImageOptions4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABN0RVh0VGl0
bGUAV2ViO1dvcmxkO0V5ZQdEODoAAAONSURBVDhPVZJtTNNXFIcvoHOyLhMTt2Qsm4oMI5luEE3jZlsR
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index 790fdd7..5cafb6b 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -201,11 +201,11 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
lbGuid, txt_itemName, gridView1);
toolBarMenu1.guidKey = rowGuid;
- this.toolBarMenu1.rptParameter = "rpt_Detect01{" + ""
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + ""
+ this.toolBarMenu1.rptParameter = "rpt_Detect01{" + "1"
+ + "," + "1"
+ + "," + "1"
+ + "," + "1"
+ + "," + "1"
+ "}";
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
index 5b7a885..dfad8ad 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs
@@ -61,7 +61,7 @@
_mx1.TableName = "mx1";
//鏄庣粏琛�2
var array2 = new JArray();
- foreach (var a in _job["rtnData"]["mx2"]) array1.Add(a);
+ foreach (var a in _job["rtnData"]["mx2"]) array2.Add(a);
var _mx2 =JsonConvert.DeserializeObject<DataTable>(array2.ToString());
_mx2.TableName = "mx2";
//鍔犲埌鏁版嵁闆嗕腑
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index fed6dca..514acd4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -45,6 +45,8 @@
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -59,12 +61,9 @@
this.gvMx1okRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1ebelnQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1states = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
@@ -97,26 +96,29 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_gysNo = new DevExpress.XtraEditors.TextEdit();
this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit();
this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
- this.txtDepotsId = new DevExpress.XtraEditors.TextEdit();
+ this.txt_depotsCode = new DevExpress.XtraEditors.TextEdit();
this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
this.label1 = new System.Windows.Forms.Label();
- this.txtSupplierId = new DevExpress.XtraEditors.TextEdit();
- this.txt_depotsId = new Gs.DevApp.UserControl.UcLookCk();
+ this.txt_gysName = new DevExpress.XtraEditors.TextEdit();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
- this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
this.txt_percentage = new DevExpress.XtraEditors.TextEdit();
@@ -136,11 +138,10 @@
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
this.panelMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
@@ -160,11 +161,13 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtDepotsId.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtSupplierId.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_percentage.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_insDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
@@ -236,6 +239,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.repositoryItemButtonEdit1});
this.gcMx2.Size = new System.Drawing.Size(1342, 383);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -251,12 +256,12 @@
this.gridColumn18,
this.gridColumn14,
this.gvMx2oldqty,
- this.gridColumn17});
+ this.gridColumn17,
+ 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;
//
// gridColumn16
@@ -299,6 +304,27 @@
this.gridColumn17.VisibleIndex = 6;
this.gridColumn17.Width = 180;
//
+ // gvBtnAlawys
+ //
+ this.gvBtnAlawys.Caption = "绉诲嚭";
+ this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gvBtnAlawys.MinWidth = 25;
+ this.gvBtnAlawys.Name = "gvBtnAlawys";
+ this.gvBtnAlawys.Visible = true;
+ this.gvBtnAlawys.VisibleIndex = 7;
+ this.gvBtnAlawys.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ 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, 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);
+ //
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
@@ -313,9 +339,6 @@
this.gcMx1.Location = new System.Drawing.Point(0, 98);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit1,
- this.repositoryItemCheckEdit1});
this.gcMx1.Size = new System.Drawing.Size(1342, 285);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -335,7 +358,6 @@
this.gvMx1okRkqty,
this.gvMx1ebelnQty,
this.gridColumn10,
- this.gvMx1states,
this.gridColumn5,
this.gridColumn9,
this.gridColumn7});
@@ -483,20 +505,6 @@
this.gridColumn10.VisibleIndex = 8;
this.gridColumn10.Width = 94;
//
- // gvMx1states
- //
- this.gvMx1states.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1states.AppearanceCell.Options.UseFont = true;
- this.gvMx1states.Caption = "鎵撳嵃鏉＄爜寮犳暟";
- this.gvMx1states.FieldName = "icount";
- this.gvMx1states.MinWidth = 50;
- this.gvMx1states.Name = "gvMx1states";
- this.gvMx1states.OptionsColumn.ReadOnly = true;
- this.gvMx1states.Tag = "query_a.states";
- this.gvMx1states.Visible = true;
- this.gvMx1states.VisibleIndex = 9;
- this.gvMx1states.Width = 100;
- //
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡鍗曚綅";
@@ -505,7 +513,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 10;
+ this.gridColumn5.VisibleIndex = 9;
this.gridColumn5.Width = 180;
//
// gridColumn9
@@ -516,7 +524,7 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 11;
+ this.gridColumn9.VisibleIndex = 10;
this.gridColumn9.Width = 94;
//
// gridColumn7
@@ -527,23 +535,8 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 12;
+ this.gridColumn7.VisibleIndex = 11;
this.gridColumn7.Width = 94;
- //
- // repositoryItemButtonEdit1
- //
- this.repositoryItemButtonEdit1.AutoHeight = false;
- 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, 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;
- //
- // repositoryItemCheckEdit1
- //
- this.repositoryItemCheckEdit1.AutoHeight = false;
- this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
//
// panelMx1
//
@@ -747,7 +740,7 @@
this.gv_urgentFlag.OptionsColumn.AllowEdit = false;
this.gv_urgentFlag.Tag = "query_a.urgent_flag";
this.gv_urgentFlag.Visible = true;
- this.gv_urgentFlag.VisibleIndex = 0;
+ this.gv_urgentFlag.VisibleIndex = 1;
this.gv_urgentFlag.Width = 50;
//
// gv_fstatus
@@ -762,7 +755,7 @@
this.gv_fstatus.OptionsColumn.AllowEdit = false;
this.gv_fstatus.Tag = "query_a.fstatus";
this.gv_fstatus.Visible = true;
- this.gv_fstatus.VisibleIndex = 1;
+ this.gv_fstatus.VisibleIndex = 2;
this.gv_fstatus.Width = 50;
//
// gv_suppNo
@@ -776,7 +769,7 @@
this.gv_suppNo.OptionsColumn.AllowEdit = false;
this.gv_suppNo.Tag = "query_a.supp_no";
this.gv_suppNo.Visible = true;
- this.gv_suppNo.VisibleIndex = 8;
+ this.gv_suppNo.VisibleIndex = 9;
this.gv_suppNo.Width = 94;
//
// gv_depotsCode
@@ -790,7 +783,7 @@
this.gv_depotsCode.OptionsColumn.AllowEdit = false;
this.gv_depotsCode.Tag = "query_a.depots_code";
this.gv_depotsCode.Visible = true;
- this.gv_depotsCode.VisibleIndex = 10;
+ this.gv_depotsCode.VisibleIndex = 11;
this.gv_depotsCode.Width = 94;
//
// gv_insDate
@@ -804,7 +797,7 @@
this.gv_insDate.OptionsColumn.AllowEdit = false;
this.gv_insDate.Tag = "query_a.ins_date";
this.gv_insDate.Visible = true;
- this.gv_insDate.VisibleIndex = 6;
+ this.gv_insDate.VisibleIndex = 7;
this.gv_insDate.Width = 180;
//
// gv_checkDate
@@ -818,7 +811,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 7;
+ this.gv_checkDate.VisibleIndex = 8;
this.gv_checkDate.Width = 180;
//
// gv_remark
@@ -832,7 +825,7 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 12;
+ this.gv_remark.VisibleIndex = 15;
this.gv_remark.Width = 94;
//
// gv_createBy
@@ -846,7 +839,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 5;
+ this.gv_createBy.VisibleIndex = 6;
this.gv_createBy.Width = 94;
//
// gv_status
@@ -854,14 +847,14 @@
this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_status.AppearanceCell.Options.UseFont = true;
this.gv_status.Caption = "鍏ュ簱";
- this.gv_status.FieldName = "status";
+ this.gv_status.FieldName = "statusChk";
this.gv_status.MaxWidth = 50;
this.gv_status.MinWidth = 50;
this.gv_status.Name = "gv_status";
this.gv_status.OptionsColumn.AllowEdit = false;
this.gv_status.Tag = "query_a.status";
this.gv_status.Visible = true;
- this.gv_status.VisibleIndex = 2;
+ this.gv_status.VisibleIndex = 3;
this.gv_status.Width = 50;
//
// gv_billNo
@@ -875,7 +868,7 @@
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.bill_no";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 3;
+ this.gv_billNo.VisibleIndex = 4;
this.gv_billNo.Width = 120;
//
// toolBarMenu1
@@ -915,6 +908,7 @@
this.gridView1.Appearance.ViewCaption.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn13,
this.gv_urgentFlag,
this.gv_fstatus,
this.gv_status,
@@ -927,6 +921,8 @@
this.gridColumn2,
this.gv_depotsCode,
this.gridColumn3,
+ this.gridColumn12,
+ this.gridColumn11,
this.gv_remark});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
@@ -935,16 +931,28 @@
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "鏀舵枡缁勭粐";
+ this.gridColumn13.FieldName = "receivingOrg";
+ this.gridColumn13.MinWidth = 250;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Tag = "org.fnamber";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 0;
+ this.gridColumn13.Width = 250;
+ //
// gridColumn1
//
this.gridColumn1.Caption = "鏉＄爜鎵撳嵃姣旂巼";
- this.gridColumn1.FieldName = "percentage";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.FieldName = "barRatio";
+ this.gridColumn1.MaxWidth = 80;
+ this.gridColumn1.MinWidth = 80;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 4;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.VisibleIndex = 5;
+ this.gridColumn1.Width = 80;
//
// gridColumn2
//
@@ -954,7 +962,7 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 9;
+ this.gridColumn2.VisibleIndex = 10;
this.gridColumn2.Width = 200;
//
// gridColumn3
@@ -965,8 +973,26 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 11;
+ this.gridColumn3.VisibleIndex = 12;
this.gridColumn3.Width = 94;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "鍏ュ簱鏃ユ湡";
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 13;
+ this.gridColumn12.Width = 94;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "妫�楠屾椂闂�";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 14;
+ this.gridColumn11.Width = 94;
//
// xtraTabControl1
//
@@ -1023,17 +1049,17 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_dptName);
+ this.panel1.Controls.Add(this.txt_gysNo);
this.panel1.Controls.Add(this.txt_fstatus);
this.panel1.Controls.Add(this.txt_urgentFlag);
this.panel1.Controls.Add(this.labelControl5);
this.panel1.Controls.Add(this.txt_paperBillNo);
- this.panel1.Controls.Add(this.txtDepotsId);
+ this.panel1.Controls.Add(this.txt_depotsCode);
this.panel1.Controls.Add(this.labelControl4);
this.panel1.Controls.Add(this.label1);
- this.panel1.Controls.Add(this.txtSupplierId);
- this.panel1.Controls.Add(this.txt_depotsId);
+ this.panel1.Controls.Add(this.txt_gysName);
this.panel1.Controls.Add(this.labelControl1);
- this.panel1.Controls.Add(this.txt_suppId);
this.panel1.Controls.Add(this.labelControl2);
this.panel1.Controls.Add(this.labelControl3);
this.panel1.Controls.Add(this.txt_percentage);
@@ -1056,6 +1082,24 @@
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1344, 155);
this.panel1.TabIndex = 1;
+ //
+ // txt_dptName
+ //
+ this.txt_dptName.Location = new System.Drawing.Point(413, 48);
+ this.txt_dptName.Name = "txt_dptName";
+ this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_dptName.Properties.Appearance.Options.UseFont = true;
+ this.txt_dptName.Size = new System.Drawing.Size(215, 28);
+ this.txt_dptName.TabIndex = 468;
+ //
+ // txt_gysNo
+ //
+ this.txt_gysNo.Location = new System.Drawing.Point(111, 83);
+ this.txt_gysNo.Name = "txt_gysNo";
+ this.txt_gysNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_gysNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_gysNo.Size = new System.Drawing.Size(215, 28);
+ this.txt_gysNo.TabIndex = 467;
//
// txt_fstatus
//
@@ -1092,15 +1136,14 @@
this.txt_paperBillNo.Size = new System.Drawing.Size(215, 28);
this.txt_paperBillNo.TabIndex = 463;
//
- // txtDepotsId
+ // txt_depotsCode
//
- this.txtDepotsId.Enabled = false;
- this.txtDepotsId.Location = new System.Drawing.Point(413, 83);
- this.txtDepotsId.Name = "txtDepotsId";
- this.txtDepotsId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txtDepotsId.Properties.Appearance.Options.UseFont = true;
- this.txtDepotsId.Size = new System.Drawing.Size(215, 28);
- this.txtDepotsId.TabIndex = 462;
+ this.txt_depotsCode.Location = new System.Drawing.Point(413, 83);
+ this.txt_depotsCode.Name = "txt_depotsCode";
+ this.txt_depotsCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_depotsCode.Properties.Appearance.Options.UseFont = true;
+ this.txt_depotsCode.Size = new System.Drawing.Size(215, 28);
+ this.txt_depotsCode.TabIndex = 462;
//
// labelControl4
//
@@ -1121,24 +1164,14 @@
this.label1.TabIndex = 460;
this.label1.Text = "渚涘簲鍟嗙紪鍙�";
//
- // txtSupplierId
+ // txt_gysName
//
- this.txtSupplierId.Enabled = false;
- this.txtSupplierId.Location = new System.Drawing.Point(111, 83);
- this.txtSupplierId.Name = "txtSupplierId";
- this.txtSupplierId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txtSupplierId.Properties.Appearance.Options.UseFont = true;
- this.txtSupplierId.Size = new System.Drawing.Size(215, 28);
- this.txtSupplierId.TabIndex = 459;
- //
- // txt_depotsId
- //
- this.txt_depotsId.IsReadly = true;
- this.txt_depotsId.Location = new System.Drawing.Point(413, 48);
- 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);
- this.txt_depotsId.TabIndex = 458;
+ this.txt_gysName.Location = new System.Drawing.Point(111, 48);
+ this.txt_gysName.Name = "txt_gysName";
+ this.txt_gysName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_gysName.Properties.Appearance.Options.UseFont = true;
+ this.txt_gysName.Size = new System.Drawing.Size(215, 28);
+ this.txt_gysName.TabIndex = 459;
//
// labelControl1
//
@@ -1149,15 +1182,6 @@
this.labelControl1.Size = new System.Drawing.Size(68, 21);
this.labelControl1.TabIndex = 457;
this.labelControl1.Text = "浠撳簱鍚嶇О";
- //
- // txt_suppId
- //
- this.txt_suppId.IsReadly = true;
- this.txt_suppId.Location = new System.Drawing.Point(111, 48);
- 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);
- this.txt_suppId.TabIndex = 456;
//
// labelControl2
//
@@ -1323,11 +1347,10 @@
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
this.panelMx1.ResumeLayout(false);
this.panelMx1.PerformLayout();
@@ -1349,11 +1372,13 @@
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtDepotsId.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtSupplierId.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_percentage.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_insDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
@@ -1413,13 +1438,11 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
- private DevExpress.XtraEditors.TextEdit txtDepotsId;
+ private DevExpress.XtraEditors.TextEdit txt_depotsCode;
private DevExpress.XtraEditors.LabelControl labelControl4;
private System.Windows.Forms.Label label1;
- private DevExpress.XtraEditors.TextEdit txtSupplierId;
- private UserControl.UcLookCk txt_depotsId;
+ private DevExpress.XtraEditors.TextEdit txt_gysName;
private DevExpress.XtraEditors.LabelControl labelControl1;
- private UserControl.UcLookSupplier txt_suppId;
private DevExpress.XtraEditors.LabelControl labelControl2;
private DevExpress.XtraEditors.LabelControl labelControl5;
private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
@@ -1430,15 +1453,12 @@
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraGrid.Columns.GridColumn gvAbtGuid;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
- private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1boardStyle;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnQty;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1okRkqty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1states;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
@@ -1463,5 +1483,12 @@
private DevExpress.XtraEditors.LabelControl lbMxGuid;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private UserControl.UcBtnPrint ucBtnPrint1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraEditors.TextEdit txt_gysNo;
+ private DevExpress.XtraEditors.TextEdit txt_dptName;
+ private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
}
}
\ 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 7a1a7a1..f7c464e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -1,4 +1,3 @@
-using DevExpress.Utils.MVVM.Services;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -8,7 +7,6 @@
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
-using System.Windows.Controls;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -37,19 +35,6 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- txt_depotsId.getSuppler("");
- txt_suppId.getSuppler("");
- //璁剧疆浠撳簱閫夋嫨
- this.txt_depotsId.EditChanged += (s, e) =>
- {
- txtDepotsId.Text = this.txt_depotsId.GetCode();
- };
- //璁剧疆渚涘簲鍟嗛�夋嫨
- this.txt_suppId.EditChanged += (s, e) =>
- {
- txtSupplierId.Text = this.txt_suppId.GetCode();
- };
-
this.ucBtnPrint1.btnDesignClick += (s, e) =>
{
ucBtnPrint1.rptParameter = "rpt_Arrival{}";
@@ -274,5 +259,40 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+ private void repositoryItemButtonEdit1_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/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index e2a9375..f5afa9d 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -275,13 +275,21 @@
foreach (GridColumn colmn in gv.Columns)
{
colmn.OptionsColumn.AllowEdit = true;
+
+ if (colmn.Name.ToString().Contains("gvBtnAlawys") )
+ {
+ colmn.Visible = true;
+ colmn.OptionsColumn.ReadOnly = false;
+ };
+
if (colmn.Name.ToString().Contains("gvMxDel") || colmn.Name.ToString().Contains("gvMxTui"))
{
colmn.Visible = !isEdt;
}
else
{
- if (isEdt == false) {
+ if (isEdt == false)
+ {
if (colmn.Tag != null && colmn.Tag.ToString().EndsWith("edit"))
colmn.OptionsColumn.ReadOnly = isEdt;
else
@@ -353,13 +361,13 @@
txt.Text = strVal;
}
-
+
else
txt.Text = strVal;
txt.ReadOnly = isEdt;
continue;
}
-
+
//鑷畾涔変笅鎷�
if (colType is UcComBox)
@@ -909,7 +917,7 @@
}
else
{
- if (colmn.Tag!=null && colmn.Tag.ToString().EndsWith("edit"))
+ if (colmn.Tag != null && colmn.Tag.ToString().EndsWith("edit"))
colmn.OptionsColumn.ReadOnly = isEdt;
else
colmn.OptionsColumn.ReadOnly = isEdt;
--
Gitblit v1.9.3