| DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArnDetail.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/SelectCgMx.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/UcLookCk.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -29,11 +29,11 @@ /// </summary> private void InitializeComponent() { 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.gvMx1states = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1returnFlag = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1cgRkqty = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -97,19 +97,24 @@ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.panel1 = new System.Windows.Forms.Panel(); this.txtDepotsId = 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_fType = new DevExpress.XtraEditors.CheckEdit(); this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit(); this.labelControl2 = new DevExpress.XtraEditors.LabelControl(); this.txt_ischeck = new DevExpress.XtraEditors.CheckEdit(); this.txt_depotsCode = new Gs.DevApp.UserControl.UcLookCk(); this.txt_depotsId = new Gs.DevApp.UserControl.UcLookCk(); this.labelControl3 = new DevExpress.XtraEditors.LabelControl(); this.btnSelect = new DevExpress.XtraEditors.SimpleButton(); this.txt_suppNo = new Gs.DevApp.UserControl.UcLookSupplier(); this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier(); this.labelControl1 = new DevExpress.XtraEditors.LabelControl(); this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); this.lbGuid = new System.Windows.Forms.Label(); this.lb_remark = new DevExpress.XtraEditors.LabelControl(); this.txt_remark = new DevExpress.XtraEditors.TextEdit(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); @@ -125,6 +130,8 @@ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.txtDepotsId.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txtSupplierId.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_ischeck.Properties)).BeginInit(); @@ -156,7 +163,7 @@ this.gvMx1returnFlag.OptionsColumn.ReadOnly = true; this.gvMx1returnFlag.Tag = "query_a.return_flag"; this.gvMx1returnFlag.Visible = true; this.gvMx1returnFlag.VisibleIndex = 21; this.gvMx1returnFlag.VisibleIndex = 4; this.gvMx1returnFlag.Width = 100; // // gvMx1cgRkqty @@ -455,7 +462,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; this.tabMxPage1.Size = new System.Drawing.Size(1229, 383); this.tabMxPage1.Size = new System.Drawing.Size(1229, 370); this.tabMxPage1.Text = "明细1"; // // gcMx1 @@ -466,7 +473,7 @@ this.gcMx1.Name = "gcMx1"; this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit1}); this.gcMx1.Size = new System.Drawing.Size(1229, 383); this.gcMx1.Size = new System.Drawing.Size(1229, 370); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -483,6 +490,7 @@ this.gvMx1returnFlag, this.gvMx1urgentFlag, this.gvMx1isdepsIn, this.gridColumn1, this.gvMx1itemNo, this.gvMx1boardStyle, this.gvMx1ebelnQty, @@ -528,10 +536,10 @@ // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions2.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, 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, 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); @@ -564,7 +572,7 @@ // this.lb_fType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_fType.Appearance.Options.UseFont = true; this.lb_fType.Location = new System.Drawing.Point(606, 55); this.lb_fType.Location = new System.Drawing.Point(677, 58); this.lb_fType.Name = "lb_fType"; this.lb_fType.Size = new System.Drawing.Size(68, 21); this.lb_fType.TabIndex = 378; @@ -591,7 +599,7 @@ // this.lb_urgentFlag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_urgentFlag.Appearance.Options.UseFont = true; this.lb_urgentFlag.Location = new System.Drawing.Point(606, 18); this.lb_urgentFlag.Location = new System.Drawing.Point(677, 21); this.lb_urgentFlag.Name = "lb_urgentFlag"; this.lb_urgentFlag.Size = new System.Drawing.Size(68, 21); this.lb_urgentFlag.TabIndex = 343; @@ -629,7 +637,7 @@ // this.lb_ischeck.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_ischeck.Appearance.Options.UseFont = true; this.lb_ischeck.Location = new System.Drawing.Point(606, 91); this.lb_ischeck.Location = new System.Drawing.Point(677, 94); this.lb_ischeck.Name = "lb_ischeck"; this.lb_ischeck.Size = new System.Drawing.Size(102, 21); this.lb_ischeck.TabIndex = 319; @@ -763,7 +771,7 @@ this.txt_paperBillNo.Name = "txt_paperBillNo"; this.txt_paperBillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true; this.txt_paperBillNo.Size = new System.Drawing.Size(150, 28); this.txt_paperBillNo.Size = new System.Drawing.Size(215, 28); this.txt_paperBillNo.TabIndex = 243; // // gv_paperBillNo @@ -960,10 +968,10 @@ // tabMx // this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; this.tabMx.Location = new System.Drawing.Point(0, 155); this.tabMx.Location = new System.Drawing.Point(0, 168); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; this.tabMx.Size = new System.Drawing.Size(1231, 415); this.tabMx.Size = new System.Drawing.Size(1231, 402); this.tabMx.TabIndex = 2; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -971,14 +979,18 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.White; this.panel1.Controls.Add(this.txtDepotsId); this.panel1.Controls.Add(this.labelControl4); this.panel1.Controls.Add(this.label1); this.panel1.Controls.Add(this.txtSupplierId); this.panel1.Controls.Add(this.txt_fType); this.panel1.Controls.Add(this.txt_urgentFlag); this.panel1.Controls.Add(this.labelControl2); this.panel1.Controls.Add(this.txt_ischeck); this.panel1.Controls.Add(this.txt_depotsCode); this.panel1.Controls.Add(this.txt_depotsId); this.panel1.Controls.Add(this.labelControl3); this.panel1.Controls.Add(this.btnSelect); this.panel1.Controls.Add(this.txt_suppNo); this.panel1.Controls.Add(this.txt_suppId); this.panel1.Controls.Add(this.labelControl1); this.panel1.Controls.Add(this.labelControl11); this.panel1.Controls.Add(this.lbGuid); @@ -995,12 +1007,51 @@ 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(1231, 155); this.panel1.Size = new System.Drawing.Size(1231, 168); this.panel1.TabIndex = 1; // // txtDepotsId // this.txtDepotsId.Enabled = false; this.txtDepotsId.Location = new System.Drawing.Point(421, 89); 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 = 454; // // labelControl4 // this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl4.Appearance.Options.UseFont = true; this.labelControl4.Location = new System.Drawing.Point(357, 93); this.labelControl4.Name = "labelControl4"; this.labelControl4.Size = new System.Drawing.Size(52, 21); this.labelControl4.TabIndex = 453; this.labelControl4.Text = "仓库ID"; // // label1 // this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(26, 91); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(62, 21); this.label1.TabIndex = 452; this.label1.Text = "供应ID"; // // txtSupplierId // this.txtSupplierId.Enabled = false; this.txtSupplierId.Location = new System.Drawing.Point(98, 87); 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 = 451; // // txt_fType // this.txt_fType.Location = new System.Drawing.Point(714, 53); this.txt_fType.Location = new System.Drawing.Point(785, 56); this.txt_fType.Name = "txt_fType"; this.txt_fType.Properties.Caption = ""; this.txt_fType.Size = new System.Drawing.Size(35, 24); @@ -1008,7 +1059,7 @@ // // txt_urgentFlag // this.txt_urgentFlag.Location = new System.Drawing.Point(714, 16); this.txt_urgentFlag.Location = new System.Drawing.Point(785, 19); this.txt_urgentFlag.Name = "txt_urgentFlag"; this.txt_urgentFlag.Properties.Caption = ""; this.txt_urgentFlag.Size = new System.Drawing.Size(35, 24); @@ -1016,7 +1067,7 @@ // // labelControl2 // this.labelControl2.Location = new System.Drawing.Point(28, 128); this.labelControl2.Location = new System.Drawing.Point(349, 133); this.labelControl2.Name = "labelControl2"; this.labelControl2.Size = new System.Drawing.Size(60, 18); this.labelControl2.TabIndex = 448; @@ -1025,26 +1076,26 @@ // txt_ischeck // this.txt_ischeck.Enabled = false; this.txt_ischeck.Location = new System.Drawing.Point(714, 89); this.txt_ischeck.Location = new System.Drawing.Point(785, 92); this.txt_ischeck.Name = "txt_ischeck"; this.txt_ischeck.Properties.Caption = ""; this.txt_ischeck.Size = new System.Drawing.Size(47, 24); this.txt_ischeck.TabIndex = 447; // // txt_depotsCode // txt_depotsId // this.txt_depotsCode.KeyFile = ""; this.txt_depotsCode.Location = new System.Drawing.Point(98, 84); this.txt_depotsCode.Margin = new System.Windows.Forms.Padding(0); this.txt_depotsCode.Name = "txt_depotsCode"; this.txt_depotsCode.Size = new System.Drawing.Size(215, 34); this.txt_depotsCode.TabIndex = 445; this.txt_depotsId.KeyFile = ""; this.txt_depotsId.Location = new System.Drawing.Point(421, 50); 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 = 445; // // labelControl3 // this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl3.Appearance.Options.UseFont = true; this.labelControl3.Location = new System.Drawing.Point(20, 91); this.labelControl3.Location = new System.Drawing.Point(341, 57); this.labelControl3.Name = "labelControl3"; this.labelControl3.Size = new System.Drawing.Size(68, 21); this.labelControl3.TabIndex = 444; @@ -1053,34 +1104,34 @@ // btnSelect // this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16; this.btnSelect.Location = new System.Drawing.Point(98, 123); this.btnSelect.Location = new System.Drawing.Point(421, 128); this.btnSelect.Name = "btnSelect"; this.btnSelect.Size = new System.Drawing.Size(74, 29); this.btnSelect.TabIndex = 443; this.btnSelect.Text = "去选择"; // // txt_suppNo // txt_suppId // this.txt_suppNo.KeyFile = ""; this.txt_suppNo.Location = new System.Drawing.Point(98, 50); this.txt_suppNo.Margin = new System.Windows.Forms.Padding(0); this.txt_suppNo.Name = "txt_suppNo"; this.txt_suppNo.Size = new System.Drawing.Size(215, 28); this.txt_suppNo.TabIndex = 440; this.txt_suppId.KeyFile = ""; this.txt_suppId.Location = new System.Drawing.Point(98, 50); 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 = 440; // // labelControl1 // this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.labelControl1.Appearance.Options.UseFont = true; this.labelControl1.Location = new System.Drawing.Point(37, 55); this.labelControl1.Location = new System.Drawing.Point(3, 55); this.labelControl1.Name = "labelControl1"; this.labelControl1.Size = new System.Drawing.Size(51, 21); this.labelControl1.Size = new System.Drawing.Size(85, 21); this.labelControl1.TabIndex = 439; this.labelControl1.Text = "供应商"; this.labelControl1.Text = "选择供应商"; // // labelControl11 // this.labelControl11.Location = new System.Drawing.Point(916, 99); this.labelControl11.Location = new System.Drawing.Point(851, 99); 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); @@ -1091,7 +1142,7 @@ // lbGuid // this.lbGuid.AutoSize = true; this.lbGuid.Location = new System.Drawing.Point(967, 99); this.lbGuid.Location = new System.Drawing.Point(902, 99); this.lbGuid.Name = "lbGuid"; this.lbGuid.Size = new System.Drawing.Size(0, 21); this.lbGuid.TabIndex = 1; @@ -1101,7 +1152,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(375, 55); this.lb_remark.Location = new System.Drawing.Point(54, 132); this.lb_remark.Name = "lb_remark"; this.lb_remark.Size = new System.Drawing.Size(34, 21); this.lb_remark.TabIndex = 240; @@ -1109,12 +1160,22 @@ // // txt_remark // this.txt_remark.Location = new System.Drawing.Point(421, 51); this.txt_remark.Location = new System.Drawing.Point(98, 128); this.txt_remark.Name = "txt_remark"; this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_remark.Properties.Appearance.Options.UseFont = true; this.txt_remark.Size = new System.Drawing.Size(150, 28); this.txt_remark.Size = new System.Drawing.Size(215, 28); this.txt_remark.TabIndex = 240; // // gridColumn1 // this.gridColumn1.Caption = "物料ID"; this.gridColumn1.FieldName = "itemId"; this.gridColumn1.MinWidth = 60; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 5; this.gridColumn1.Width = 94; // // Frm_MesInvItemArn // @@ -1140,6 +1201,8 @@ this.tabMx.ResumeLayout(false); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.txtDepotsId.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txtSupplierId.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_ischeck.Properties)).EndInit(); @@ -1217,10 +1280,10 @@ private DevExpress.XtraEditors.TextEdit txt_billNo; private DevExpress.XtraGrid.Columns.GridColumn gv_billNo; private DevExpress.XtraEditors.LabelControl labelControl1; private UserControl.UcLookSupplier txt_suppNo; private UserControl.UcLookSupplier txt_suppId; private DevExpress.XtraEditors.SimpleButton btnSelect; private DevExpress.XtraEditors.LabelControl labelControl3; private UserControl.UcLookCk txt_depotsCode; private UserControl.UcLookCk txt_depotsId; private DevExpress.XtraGrid.Columns.GridColumn gvAbtGuid; private DevExpress.XtraEditors.LabelControl lb_remark; private DevExpress.XtraEditors.TextEdit txt_remark; @@ -1231,5 +1294,10 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; private DevExpress.XtraEditors.CheckEdit txt_fType; private DevExpress.XtraEditors.CheckEdit txt_urgentFlag; private DevExpress.XtraEditors.TextEdit txtSupplierId; private DevExpress.XtraEditors.LabelControl labelControl4; private System.Windows.Forms.Label label1; private DevExpress.XtraEditors.TextEdit txtDepotsId; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; } } DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -4,10 +4,8 @@ using System.Drawing; using System.Text; using System.Windows.Forms; using DevExpress.DataAccess.DataFederation; using DevExpress.XtraEditors; using DevExpress.XtraEditors.Controls; using DevExpress.XtraGrid.Views.Base.ViewInfo; using DevExpress.XtraGrid.Views.Grid; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; @@ -54,19 +52,28 @@ e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5); e.Graphics.DrawString(str, f, Brushes.Gray, r); }; this.txt_depotsCode.KeyFile = "depotCode"; this.txt_suppNo.KeyFile = "suppNo"; //设置仓库选择 this.txt_depotsId.KeyFile = "depotId"; this.txt_depotsId.EditChanged += (s, e) => { txtDepotsId.Text = this.txt_depotsId.GetId(); }; //设置供应商选择 this.txt_suppId.KeyFile = "id"; this.txt_suppId.EditChanged += (s, e) => { txtSupplierId.Text = this.txt_suppId.GetId(); }; //选择需要入库的明细 btnSelect.Click += (s, e) => { if (string.IsNullOrEmpty(this.txt_suppNo.GetId())) if (string.IsNullOrEmpty(this.txt_suppId.GetId())) { Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择供应商，才能选择来料明细！"); return; } System.Text.StringBuilder sbWhere = new StringBuilder(); sbWhere.Append(" and A.SUPPLIER=" + this.txt_suppNo.GetId()); var frm = new SelectCgMx(this.txt_suppNo.GetCode(), sbWhere.ToString()); var frm = new SelectCgMx(this.txt_suppId.GetId()); //赋值给明细表 frm.UpdateParent += (ss, ee) => { var lst = new List<string>(); @@ -91,44 +98,6 @@ }; } private void ToolBarMenu1_btnLogClick(object sender, EventArgs e) { toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); toolBarMenu1.guidKey = rowGuid; } /// <summary> /// 反检验 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> /// <exception cref="NotImplementedException"></exception> private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e) { toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); toolBarMenu1.guidKey = rowGuid; } /// <summary> /// 检验 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> /// <exception cref="NotImplementedException"></exception> private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e) { toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); toolBarMenu1.guidKey = rowGuid; } /// <summary> /// 双击事件 @@ -175,7 +144,49 @@ _filterList = e.FilterList; getPageList(1, pageBar1.RowsCount); } /// <summary> /// 日志 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnLogClick(object sender, EventArgs e) { toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); toolBarMenu1.guidKey = rowGuid; } /// <summary> /// 反检验 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> /// <exception cref="NotImplementedException"></exception> private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e) { toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); toolBarMenu1.guidKey = rowGuid; } /// <summary> /// 检验 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> /// <exception cref="NotImplementedException"></exception> private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e) { toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1); toolBarMenu1.guidKey = rowGuid; } /// <summary> /// 取消事件 /// </summary> @@ -280,30 +291,32 @@ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) { toolBarMenu1.isSetBtn = false; var _ckCode = txt_depotsCode.GetCode(); //仓库编号 depots_code var _gysCode = txt_suppNo.GetCode(); //供应商编号 if (string.IsNullOrEmpty(_gysCode)) var _ckId = txt_depotsId.GetId(); //仓库编号 depots_code var _gysId = txt_suppId.GetId(); //供应商编号 if (string.IsNullOrEmpty(_gysId)) { MsgHelper.Warning("请选择供应商！"); txt_suppNo.Focus(); txt_suppId.Focus(); return; } if (string.IsNullOrEmpty(_ckCode)) if (string.IsNullOrEmpty(_ckId)) { MsgHelper.Warning("请选择仓库！"); txt_depotsCode.Focus(); txt_depotsId.Focus(); return; } var _obj = new MesInvItemArn(); _obj.Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()); //到货单主键 _obj.PaperBillNo = txt_paperBillNo.Text.Trim(); //送货单号; _obj.Remark = txt_remark.Text.Trim(); //备注 _obj.SuppNo = _gysCode; //供应商编号 _obj.DepotsCode = _ckCode; //仓库编号 depots_code _obj.FType = txt_fType.Checked; //0=采购，1=委外 _obj.UrgentFlag = txt_urgentFlag.Checked;//0=不急，1=急 _obj.list = new List<MesInvItemArnDetail>(); var _obj = new MesInvItemArn() { Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()), //到货单主键 PaperBillNo = txt_paperBillNo.Text.Trim(), //送货单号; Remark = txt_remark.Text.Trim(), //备注 SuppId = _gysId, //供应商 DepotsId = _ckId,//仓库 FType = txt_fType.Checked,//0=采购，1=委外 UrgentFlag = txt_urgentFlag.Checked,//0=不急，1=急 list = new List<MesInvItemArnDetail>(), }; gvMx1.CloseEditor(); gvMx1.UpdateCurrentRow(); if (gvMx1.DataRowCount <= 0) @@ -444,6 +457,11 @@ } } /// <summary> /// 明细删除 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void repositoryItemButtonEdit1_ButtonClick(object sender, ButtonPressedEventArgs e) { DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArn.cs
@@ -1,6 +1,5 @@ using System; using System.Collections.Generic; using System.Linq; namespace MES.Service.Modes { @@ -14,162 +13,201 @@ /// 主键 /// 默认值: (newid()) ///</summary> public Guid Guid { get; set; } /// <summary> /// 到货单号 ///</summary> public string BillNo { get; set; } /// <summary> /// 状态|0-未审核1-审核入库\结案 /// 默认值: ((0)) ///</summary> public int? Status { get; set; } /// <summary> /// 原因 ///</summary> public string Reason { get; set; } /// <summary> /// 创建人 ///</summary> public string CreateBy { get; set; } /// <summary> /// 创建时间 ///</summary> public DateTime? CreateDate { get; set; } /// <summary> /// 最后更新人 ///</summary> public string LastupdateBy { get; set; } /// <summary> /// 最后更新时间 ///</summary> public DateTime? LastupdateDate { get; set; } /// <summary> /// 单据类型ID ///</summary> public int? BillTypeId { get; set; } /// <summary> /// 事务类型ID ///</summary> public int? TransactionId { get; set; } /// <summary> /// 备注 ///</summary> public string Remark { get; set; } /// <summary> /// 送货单号 ///</summary> public string PaperBillNo { get; set; } /// <summary> /// 退料人工号 ///</summary> public string UserNoBack { get; set; } /// <summary> /// 提交人 ///</summary> public string CheckUser { get; set; } /// <summary> /// 提交日期 ///</summary> public DateTime? CheckDate { get; set; } /// <summary> /// 入库日期 ///</summary> public DateTime? InsDate { get; set; } /// <summary> /// 检验结果 ///</summary> public string CheckRes { get; set; } /// <summary> /// 已捡数量 ///</summary> public int? CheckQty { get; set; } /// <summary> /// 仓库编码 /// 仓库id ///</summary> public string DepotsCode { get; set; } public string DepotsId { get; set; } /// <summary> /// 事务类型编码 ///</summary> public string TransctionNo { get; set; } /// <summary> /// 供应商编码 /// 供应商id ///</summary> public string SuppNo { get; set; } public string SuppId { get; set; } /// <summary> /// 提交状态 /// 默认值: ((0)) ///</summary> public bool? Fstatus { get; set; } /// <summary> /// 工厂编码 ///</summary> public string Factory { get; set; } /// <summary> /// 是否已回写SAP /// 默认值: ((0)) ///</summary> public int? Sapstatus { get; set; } /// <summary> /// 是否检验 ///</summary> public bool? Ischeck { get; set; } /// <summary> /// 审核入库人 ///</summary> public string Insby { get; set; } /// <summary> /// 公司代码 ///</summary> public string Company { get; set; } /// <summary> /// 急料标识 /// 默认值: ((0)) ///</summary> public bool? UrgentFlag { get; set; } /// <summary> /// 冲销事务类型编码 ///</summary> public int? MttransctionNo { get; set; } /// <summary> /// IQC检验单号 ///</summary> public string IqcReleaseNo { get; set; } /// <summary> /// 是否显示 /// 默认值: ((0)) ///</summary> public int? IsVisual { get; set; } /// <summary> /// 0=采购，1=委外 /// 默认值: ((1)) ///</summary> public bool? FType { get; set; } /// <summary> /// ERP到货单ID ///</summary> public string EbelnK3id { get; set; } /// <summary> /// 条码条印进度 ///</summary> public int? BarcodeRatio { get; set; } /// <summary> /// ERP单号 ///</summary> public string Erpno { get; set; } /// <summary> /// 是否已退货0-未退货，1-退货 ///</summary> public int? Thstatus { get; set; } /// <summary> /// ERP退货单号 ///</summary> public string Erpthno { get; set; } /// <summary> /// 组织编码 ///</summary> public string OrganizeCode { get; set; } public List<MesInvItemArnDetail> list { get; set; } } } DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemArnDetail.cs
@@ -1,179 +1,221 @@ using System; using System.Collections.Generic; using System.Linq; namespace MES.Service.Modes { /// <summary> /// ///</summary> public class MesInvItemArnDetail { /// <summary> /// /// 默认值: (newid()) ///</summary> public Guid? Guid { get; set; } /// <summary> /// ///</summary> public Guid? ParentGuid { get; set; } /// <summary> /// MES_ROH_IN_DATA的guid ///</summary> public Guid? AboutGuid { get; set; } /// <summary> /// 采购单号 ///</summary> public string Ebeln { get; set; } /// <summary> /// 采购订单行号 ///</summary> public int? EbelnLine { get; set; } /// <summary> /// 采购订单数量 ///</summary> public decimal? EbelnQty { get; set; } /// <summary> /// 物料编码 ///</summary> public string ItemNo { get; set; } /// <summary> /// 收货数量 ///</summary> public decimal? Quantity { get; set; } /// <summary> /// 创建人 ///</summary> public string CreateBy { get; set; } /// <summary> /// 创建时间 ///</summary> public DateTime? CreateDate { get; set; } /// <summary> /// 最后更新人 ///</summary> public string LastupdateBy { get; set; } /// <summary> /// 最后更新时间 ///</summary> public DateTime? LastupdateDate { get; set; } /// <summary> /// 分厂编码 ///</summary> public string Factory { get; set; } /// <summary> /// 公司代码 ///</summary> public string Company { get; set; } /// <summary> /// 采购单ID ///</summary> public int? EbelnK3id { get; set; } /// <summary> /// 采购单行ID ///</summary> public int? LineK3id { get; set; } /// <summary> /// 本次应收数量 ///</summary> public decimal? SubQty { get; set; } /// <summary> /// 余量 ///</summary> public int? MarginQty { get; set; } /// <summary> /// 任务单号 ///</summary> public string WorkNo { get; set; } /// <summary> /// 急料标识 /// 默认值: ((0)) ///</summary> public bool? UrgentFlag { get; set; } /// <summary> /// 备注 ///</summary> public string Memo { get; set; } /// <summary> /// 检验结果 ///</summary> public string CheckRes { get; set; } /// <summary> /// 检验状态 （待检、分选、特采、已检） /// 默认值: ('待检') ///</summary> public string CheckStates { get; set; } /// <summary> /// 收货余量 ///</summary> public int? QuantityM { get; set; } /// <summary> /// 本次应收余量 ///</summary> public int? SubMqty { get; set; } /// <summary> /// 检验日期 ///</summary> public DateTime? CheckDate { get; set; } /// <summary> /// 是否检验 /// 默认值: ((0)) ///</summary> public int? Ischeck { get; set; } /// <summary> /// 已收数量 ///</summary> public int? OkQty { get; set; } /// <summary> /// 已收余量 ///</summary> public int? OkMqty { get; set; } /// <summary> /// 产品型号 ///</summary> public string BoardStyle { get; set; } /// <summary> /// 任务单行号 ///</summary> public int? WorkLine { get; set; } /// <summary> /// 0、采购单，1、委外单 /// 默认值: ((0)) ///</summary> public int? FType { get; set; } /// <summary> /// 是否入库 /// 默认值: ((0)) ///</summary> public bool? IsdepsIn { get; set; } /// <summary> /// 到货单号 ///</summary> public string Dha001 { get; set; } /// <summary> /// 已入库数量 ///</summary> public int? OkRkqty { get; set; } /// <summary> /// 到货单号 ///</summary> public string CbillNo { get; set; } /// <summary> /// 采购入库数量 ///</summary> public int? CgRkqty { get; set; } /// <summary> /// 物料ID ///</summary> public int? ItemId { get; set; } /// <summary> /// 退货标识 /// 默认值: ((0)) ///</summary> public int? ReturnFlag { get; set; } /// <summary> /// 推送状态 ///</summary> public string States { get; set; } } } DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -35,7 +35,6 @@ this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_purchaseQty = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -59,12 +58,12 @@ this.gv_returnableReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_returnableStoredQty = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_changeFlag = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); this.panelControl1 = new DevExpress.XtraEditors.PanelControl(); this.btnIn = new DevExpress.XtraEditors.SimpleButton(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); @@ -95,7 +94,6 @@ this.gv_guid, this.gv_ebelnK3id, this.gv_billNo, this.gv_itemId, this.gridColumn1, this.gv_purchaseUnit, this.gv_purchaseQty, @@ -154,7 +152,7 @@ this.gv_ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true; this.gv_ebelnK3id.Caption = "ERP行ID号"; this.gv_ebelnK3id.FieldName = "ebelnK3id"; this.gv_ebelnK3id.FieldName = "erpMxId"; this.gv_ebelnK3id.MinWidth = 100; this.gv_ebelnK3id.Name = "gv_ebelnK3id"; this.gv_ebelnK3id.OptionsColumn.AllowEdit = false; @@ -177,20 +175,6 @@ this.gv_billNo.VisibleIndex = 2; this.gv_billNo.Width = 110; // // gv_itemId // this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_itemId.AppearanceCell.Options.UseFont = true; this.gv_itemId.Caption = "物料编码"; this.gv_itemId.FieldName = "itemId"; this.gv_itemId.MinWidth = 100; this.gv_itemId.Name = "gv_itemId"; this.gv_itemId.OptionsColumn.AllowEdit = false; this.gv_itemId.Tag = "query_a.ITEM_ID"; this.gv_itemId.Visible = true; this.gv_itemId.VisibleIndex = 3; this.gv_itemId.Width = 100; // // gridColumn1 // this.gridColumn1.Caption = "物料ID"; @@ -198,7 +182,7 @@ this.gridColumn1.MinWidth = 80; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 4; this.gridColumn1.VisibleIndex = 3; this.gridColumn1.Width = 94; // // gv_purchaseUnit @@ -212,7 +196,7 @@ this.gv_purchaseUnit.OptionsColumn.AllowEdit = false; this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT"; this.gv_purchaseUnit.Visible = true; this.gv_purchaseUnit.VisibleIndex = 5; this.gv_purchaseUnit.VisibleIndex = 4; this.gv_purchaseUnit.Width = 100; // // gv_purchaseQty @@ -226,7 +210,7 @@ this.gv_purchaseQty.OptionsColumn.AllowEdit = false; this.gv_purchaseQty.Tag = "query_a.PURCHASE_QTY"; this.gv_purchaseQty.Visible = true; this.gv_purchaseQty.VisibleIndex = 6; this.gv_purchaseQty.VisibleIndex = 5; this.gv_purchaseQty.Width = 100; // // gv_inventoryUnit @@ -234,13 +218,13 @@ this.gv_inventoryUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_inventoryUnit.AppearanceCell.Options.UseFont = true; this.gv_inventoryUnit.Caption = "库存单位"; this.gv_inventoryUnit.FieldName = "inventoryUnit"; this.gv_inventoryUnit.FieldName = "fname"; this.gv_inventoryUnit.MinWidth = 100; this.gv_inventoryUnit.Name = "gv_inventoryUnit"; this.gv_inventoryUnit.OptionsColumn.AllowEdit = false; this.gv_inventoryUnit.Tag = "query_a.INVENTORY_UNIT"; this.gv_inventoryUnit.Visible = true; this.gv_inventoryUnit.VisibleIndex = 7; this.gv_inventoryUnit.VisibleIndex = 6; this.gv_inventoryUnit.Width = 100; // // gv_pricingUnit @@ -254,7 +238,7 @@ this.gv_pricingUnit.OptionsColumn.AllowEdit = false; this.gv_pricingUnit.Tag = "query_a.PRICING_UNIT"; this.gv_pricingUnit.Visible = true; this.gv_pricingUnit.VisibleIndex = 8; this.gv_pricingUnit.VisibleIndex = 7; this.gv_pricingUnit.Width = 100; // // gv_pricingQty @@ -268,7 +252,7 @@ this.gv_pricingQty.OptionsColumn.AllowEdit = false; this.gv_pricingQty.Tag = "query_a.PRICING_QTY"; this.gv_pricingQty.Visible = true; this.gv_pricingQty.VisibleIndex = 9; this.gv_pricingQty.VisibleIndex = 8; this.gv_pricingQty.Width = 100; // // gv_deliveryDate @@ -282,7 +266,7 @@ this.gv_deliveryDate.OptionsColumn.AllowEdit = false; this.gv_deliveryDate.Tag = "query_a.DELIVERY_DATE"; this.gv_deliveryDate.Visible = true; this.gv_deliveryDate.VisibleIndex = 10; this.gv_deliveryDate.VisibleIndex = 9; this.gv_deliveryDate.Width = 100; // // gv_earliestDeliveryDate @@ -296,7 +280,7 @@ this.gv_earliestDeliveryDate.OptionsColumn.AllowEdit = false; this.gv_earliestDeliveryDate.Tag = "query_a.EARLIEST_DELIVERY_DATE"; this.gv_earliestDeliveryDate.Visible = true; this.gv_earliestDeliveryDate.VisibleIndex = 11; this.gv_earliestDeliveryDate.VisibleIndex = 10; this.gv_earliestDeliveryDate.Width = 100; // // gv_latestDeliveryDate @@ -310,7 +294,7 @@ this.gv_latestDeliveryDate.OptionsColumn.AllowEdit = false; this.gv_latestDeliveryDate.Tag = "query_a.LATEST_DELIVERY_DATE"; this.gv_latestDeliveryDate.Visible = true; this.gv_latestDeliveryDate.VisibleIndex = 12; this.gv_latestDeliveryDate.VisibleIndex = 11; this.gv_latestDeliveryDate.Width = 100; // // gv_isGift @@ -324,7 +308,7 @@ this.gv_isGift.OptionsColumn.AllowEdit = false; this.gv_isGift.Tag = "query_a.IS_GIFT"; this.gv_isGift.Visible = true; this.gv_isGift.VisibleIndex = 13; this.gv_isGift.VisibleIndex = 12; this.gv_isGift.Width = 94; // // gv_remarks @@ -338,7 +322,7 @@ this.gv_remarks.OptionsColumn.AllowEdit = false; this.gv_remarks.Tag = "query_a.REMARKS"; this.gv_remarks.Visible = true; this.gv_remarks.VisibleIndex = 14; this.gv_remarks.VisibleIndex = 13; this.gv_remarks.Width = 100; // // gv_supplierItemCode @@ -352,7 +336,7 @@ this.gv_supplierItemCode.OptionsColumn.AllowEdit = false; this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE"; this.gv_supplierItemCode.Visible = true; this.gv_supplierItemCode.VisibleIndex = 15; this.gv_supplierItemCode.VisibleIndex = 14; this.gv_supplierItemCode.Width = 100; // // gv_supplierItemName @@ -366,7 +350,7 @@ this.gv_supplierItemName.OptionsColumn.AllowEdit = false; this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME"; this.gv_supplierItemName.Visible = true; this.gv_supplierItemName.VisibleIndex = 16; this.gv_supplierItemName.VisibleIndex = 15; this.gv_supplierItemName.Width = 100; // // gv_outsourcingOrderId @@ -380,7 +364,7 @@ this.gv_outsourcingOrderId.OptionsColumn.AllowEdit = false; this.gv_outsourcingOrderId.Tag = "query_a.OUTSOURCING_ORDER_ID"; this.gv_outsourcingOrderId.Visible = true; this.gv_outsourcingOrderId.VisibleIndex = 17; this.gv_outsourcingOrderId.VisibleIndex = 16; this.gv_outsourcingOrderId.Width = 94; // // gv_batchNumber @@ -394,7 +378,7 @@ this.gv_batchNumber.OptionsColumn.AllowEdit = false; this.gv_batchNumber.Tag = "query_a.BATCH_NUMBER"; this.gv_batchNumber.Visible = true; this.gv_batchNumber.VisibleIndex = 18; this.gv_batchNumber.VisibleIndex = 17; this.gv_batchNumber.Width = 94; // // gv_totalReceivedQty @@ -408,7 +392,7 @@ this.gv_totalReceivedQty.OptionsColumn.AllowEdit = false; this.gv_totalReceivedQty.Tag = "query_a.TOTAL_RECEIVED_QTY"; this.gv_totalReceivedQty.Visible = true; this.gv_totalReceivedQty.VisibleIndex = 19; this.gv_totalReceivedQty.VisibleIndex = 18; this.gv_totalReceivedQty.Width = 100; // // gv_remainingReceivedQty @@ -422,7 +406,7 @@ this.gv_remainingReceivedQty.OptionsColumn.AllowEdit = false; this.gv_remainingReceivedQty.Tag = "query_a.REMAINING_RECEIVED_QTY"; this.gv_remainingReceivedQty.Visible = true; this.gv_remainingReceivedQty.VisibleIndex = 20; this.gv_remainingReceivedQty.VisibleIndex = 19; this.gv_remainingReceivedQty.Width = 100; // // gv_totalStoredQty @@ -436,7 +420,7 @@ this.gv_totalStoredQty.OptionsColumn.AllowEdit = false; this.gv_totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY"; this.gv_totalStoredQty.Visible = true; this.gv_totalStoredQty.VisibleIndex = 21; this.gv_totalStoredQty.VisibleIndex = 20; this.gv_totalStoredQty.Width = 100; // // gv_remainingStoredQty @@ -450,7 +434,7 @@ this.gv_remainingStoredQty.OptionsColumn.AllowEdit = false; this.gv_remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY"; this.gv_remainingStoredQty.Visible = true; this.gv_remainingStoredQty.VisibleIndex = 22; this.gv_remainingStoredQty.VisibleIndex = 21; this.gv_remainingStoredQty.Width = 100; // // gv_totalReturnedQty @@ -464,7 +448,7 @@ this.gv_totalReturnedQty.OptionsColumn.AllowEdit = false; this.gv_totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY"; this.gv_totalReturnedQty.Visible = true; this.gv_totalReturnedQty.VisibleIndex = 23; this.gv_totalReturnedQty.VisibleIndex = 22; this.gv_totalReturnedQty.Width = 100; // // gv_returnableReceivedQty @@ -478,7 +462,7 @@ this.gv_returnableReceivedQty.OptionsColumn.AllowEdit = false; this.gv_returnableReceivedQty.Tag = "query_a.RETURNABLE_RECEIVED_QTY"; this.gv_returnableReceivedQty.Visible = true; this.gv_returnableReceivedQty.VisibleIndex = 24; this.gv_returnableReceivedQty.VisibleIndex = 23; this.gv_returnableReceivedQty.Width = 100; // // gv_returnableStoredQty @@ -492,7 +476,7 @@ this.gv_returnableStoredQty.OptionsColumn.AllowEdit = false; this.gv_returnableStoredQty.Tag = "query_a.RETURNABLE_STORED_QTY"; this.gv_returnableStoredQty.Visible = true; this.gv_returnableStoredQty.VisibleIndex = 25; this.gv_returnableStoredQty.VisibleIndex = 24; this.gv_returnableStoredQty.Width = 100; // // gv_changeFlag @@ -506,8 +490,18 @@ this.gv_changeFlag.OptionsColumn.AllowEdit = false; this.gv_changeFlag.Tag = "query_a.CHANGE_FLAG"; this.gv_changeFlag.Visible = true; this.gv_changeFlag.VisibleIndex = 26; this.gv_changeFlag.VisibleIndex = 25; this.gv_changeFlag.Width = 100; // // gridColumn2 // this.gridColumn2.Caption = "ERP头ID"; this.gridColumn2.FieldName = "erpId"; this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 26; this.gridColumn2.Width = 94; // // xtraTabControl1 // @@ -561,16 +555,6 @@ this.pageBar1.TabIndex = 3; this.pageBar1.TotalPages = 0; // // gridColumn2 // this.gridColumn2.Caption = "ERP头ID"; this.gridColumn2.FieldName = "erpId"; this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 27; this.gridColumn2.Width = 94; // // SelectCgMx // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -622,7 +606,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_inventoryUnit; private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseQty; private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit; private DevExpress.XtraGrid.Columns.GridColumn gv_itemId; private DevExpress.XtraGrid.Columns.GridColumn gv_billNo; private DevExpress.XtraGrid.Columns.GridColumn gv_guid; private DevExpress.XtraGrid.Columns.GridColumn gv_chk; DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Text; using System.Windows.Forms; using DevExpress.Utils.DirectXPaint; using DevExpress.XtraEditors; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; @@ -15,17 +16,15 @@ new List<FilterEntity>(); private readonly string _webServiceName = "MesRohInDataManager/"; private string suppCode = ""; private string strWhere = ""; private string suppId = ""; /// <summary> /// 供应商编号 /// </summary> /// <param name="supp_no"></param> public SelectCgMx(string _suppCode, string _strWhere) public SelectCgMx(string _suppId) { InitializeComponent(); this.suppCode = _suppCode; this.strWhere = _strWhere; this.suppId = _suppId; pageBar1.PagerEvent += PageBar1_PagerEvent; getPageList(1, UtilityHelper.GetPageSize()); gridView1.IndicatorWidth = 50; @@ -54,7 +53,7 @@ } /// <summary> /// 回调事件 /// 选择后的回调事件 /// </summary> public event EventHandler<UpdateParentEventArgs> UpdateParent; @@ -74,18 +73,20 @@ /// <param name="pageSize">每页几条</param> private void getPageList(int curPage, int pageSize) { var _sbSqlWhere = new StringBuilder(); _sbSqlWhere.Append(strWhere); foreach (var itm in _filterList) _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'"); var pgq = new PageQueryModel(curPage, pageSize, "B.BILL_NO", "asc", "", _sbSqlWhere.ToString()); var json = JsonConvert.SerializeObject(pgq); var _obj = new { currentPage = curPage, everyPageSize = pageSize, sortName = "", keyWhere = "", inBusType = "CG", inSupId = this.suppId }; var json = JsonConvert.SerializeObject(_obj); try { var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json); _webServiceName + "GetListPage2", json); var dd = UtilityHelper.ReturnToTablePage(strReturn); var dt = dd.rtnData.list; gcMain.BindingContext = new BindingContext(); DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs
@@ -71,7 +71,7 @@ this.gridColumn1.MaxWidth = 100; this.gridColumn1.MinWidth = 80; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.UnboundDataType = typeof(short); this.gridColumn1.UnboundDataType = typeof(string); this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 0; this.gridColumn1.Width = 80; DevApp/Gs.DevApp/UserControl/UcLookCk.cs
@@ -94,8 +94,8 @@ lookSearchSupplier.EditValue = null; return; } if (KeyFile == "depotId") lookSearchSupplier.EditValue = Int64.Parse((Code.ToString().Trim())); if (KeyFile.ToUpper() == "depotId".ToUpper()) lookSearchSupplier.EditValue =Int64.Parse( ((Code.ToString().Trim()))); else lookSearchSupplier.EditValue = ((Code.ToString().Trim())); }
