From 1d02515defc2cfb961164ec7490022e2d734f073 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 22 十一月 2024 13:41:48 +0800
Subject: [PATCH] 采购
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs | 511 +++++++++------------
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 4
DevApp/Gs.DevApp/UserControl/SelectCgOutMx.cs | 110 ++++
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.cs | 173 +++++++
DevApp/Gs.DevApp/UserControl/SelectCgOutMx.Designer.cs | 418 ++++++++++++++++++
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutItems.cs | 6
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/UserControl/SelectCgOutMx.resx | 120 +++++
8 files changed, 1,053 insertions(+), 298 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs
index 1042ff1..7e2ce0d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.Designer.cs
@@ -29,8 +29,12 @@
/// </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();
this.gvMx2itemOutId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2tlQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2status = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -47,6 +51,8 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -56,7 +62,6 @@
this.lb_suppNo = new DevExpress.XtraEditors.LabelControl();
this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fType = new DevExpress.XtraEditors.LabelControl();
- this.txt_fType = new DevExpress.XtraEditors.TextEdit();
this.gv_fType = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_depotCode = new DevExpress.XtraEditors.LabelControl();
this.gv_depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -64,18 +69,13 @@
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_checkUser = new DevExpress.XtraEditors.LabelControl();
- this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_reason = new DevExpress.XtraEditors.LabelControl();
this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
- this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
- this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_itemOutNo = new DevExpress.XtraEditors.LabelControl();
@@ -108,28 +108,24 @@
this.gvMx1ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
this.panel1 = new System.Windows.Forms.Panel();
- this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
- this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
+ this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
+ this.txt_check = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_reason = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier();
+ this.txt_depotId = new Gs.DevApp.UserControl.UcLookCk();
this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
this.txt_checkUserFname = new DevExpress.XtraEditors.TextEdit();
- this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
- this.txt_createByFname = new DevExpress.XtraEditors.TextEdit();
- this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
- this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
this.lbGuid = new System.Windows.Forms.Label();
- this.txt_depotId = new Gs.DevApp.UserControl.UcLookCk();
- this.txt_suppId = new Gs.DevApp.UserControl.UcLookSupplier();
- this.txt_reason = new DevExpress.XtraEditors.ComboBoxEdit();
- this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -143,12 +139,11 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserFname.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createByFname.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_check.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserFname.Properties)).BeginInit();
this.SuspendLayout();
//
// gvMx2itemOutId
@@ -159,19 +154,9 @@
this.gvMx2itemOutId.FieldName = "itemOutId";
this.gvMx2itemOutId.MinWidth = 50;
this.gvMx2itemOutId.Name = "gvMx2itemOutId";
+ this.gvMx2itemOutId.OptionsColumn.ReadOnly = true;
this.gvMx2itemOutId.Tag = "query_a.item_out_id";
this.gvMx2itemOutId.Width = 94;
- //
- // gvMx2guid
- //
- this.gvMx2guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx2guid.AppearanceCell.Options.UseFont = true;
- this.gvMx2guid.Caption = "guid ";
- this.gvMx2guid.FieldName = "guid";
- this.gvMx2guid.MinWidth = 50;
- this.gvMx2guid.Name = "gvMx2guid";
- this.gvMx2guid.Tag = "query_a.guid";
- this.gvMx2guid.Width = 94;
//
// gvMx2tlQty
//
@@ -181,9 +166,10 @@
this.gvMx2tlQty.FieldName = "tlQty";
this.gvMx2tlQty.MinWidth = 50;
this.gvMx2tlQty.Name = "gvMx2tlQty";
+ this.gvMx2tlQty.OptionsColumn.ReadOnly = true;
this.gvMx2tlQty.Tag = "query_a.tl_qty";
this.gvMx2tlQty.Visible = true;
- this.gvMx2tlQty.VisibleIndex = 8;
+ this.gvMx2tlQty.VisibleIndex = 10;
this.gvMx2tlQty.Width = 94;
//
// gvMx2pbillNo
@@ -194,9 +180,10 @@
this.gvMx2pbillNo.FieldName = "pbillNo";
this.gvMx2pbillNo.MinWidth = 50;
this.gvMx2pbillNo.Name = "gvMx2pbillNo";
+ this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
this.gvMx2pbillNo.Tag = "query_a.pbill_no";
this.gvMx2pbillNo.Visible = true;
- this.gvMx2pbillNo.VisibleIndex = 1;
+ this.gvMx2pbillNo.VisibleIndex = 3;
this.gvMx2pbillNo.Width = 94;
//
// gvMx2status
@@ -207,9 +194,10 @@
this.gvMx2status.FieldName = "status";
this.gvMx2status.MinWidth = 50;
this.gvMx2status.Name = "gvMx2status";
+ this.gvMx2status.OptionsColumn.ReadOnly = true;
this.gvMx2status.Tag = "query_a.status";
this.gvMx2status.Visible = true;
- this.gvMx2status.VisibleIndex = 0;
+ this.gvMx2status.VisibleIndex = 2;
this.gvMx2status.Width = 94;
//
// gvMx2lineK3id
@@ -220,9 +208,10 @@
this.gvMx2lineK3id.FieldName = "lineK3id";
this.gvMx2lineK3id.MinWidth = 50;
this.gvMx2lineK3id.Name = "gvMx2lineK3id";
+ this.gvMx2lineK3id.OptionsColumn.ReadOnly = true;
this.gvMx2lineK3id.Tag = "query_a.line_k3id";
this.gvMx2lineK3id.Visible = true;
- this.gvMx2lineK3id.VisibleIndex = 12;
+ this.gvMx2lineK3id.VisibleIndex = 14;
this.gvMx2lineK3id.Width = 94;
//
// gvMx2ebelnK3id
@@ -233,9 +222,10 @@
this.gvMx2ebelnK3id.FieldName = "ebelnK3id";
this.gvMx2ebelnK3id.MinWidth = 50;
this.gvMx2ebelnK3id.Name = "gvMx2ebelnK3id";
+ this.gvMx2ebelnK3id.OptionsColumn.ReadOnly = true;
this.gvMx2ebelnK3id.Tag = "query_a.ebeln_k3id";
this.gvMx2ebelnK3id.Visible = true;
- this.gvMx2ebelnK3id.VisibleIndex = 11;
+ this.gvMx2ebelnK3id.VisibleIndex = 13;
this.gvMx2ebelnK3id.Width = 94;
//
// gvMx2workLine
@@ -246,9 +236,10 @@
this.gvMx2workLine.FieldName = "workLine";
this.gvMx2workLine.MinWidth = 50;
this.gvMx2workLine.Name = "gvMx2workLine";
+ this.gvMx2workLine.OptionsColumn.ReadOnly = true;
this.gvMx2workLine.Tag = "query_a.work_line";
this.gvMx2workLine.Visible = true;
- this.gvMx2workLine.VisibleIndex = 2;
+ this.gvMx2workLine.VisibleIndex = 4;
this.gvMx2workLine.Width = 94;
//
// gvMx2depotCode
@@ -259,9 +250,10 @@
this.gvMx2depotCode.FieldName = "depotCode";
this.gvMx2depotCode.MinWidth = 50;
this.gvMx2depotCode.Name = "gvMx2depotCode";
+ this.gvMx2depotCode.OptionsColumn.ReadOnly = true;
this.gvMx2depotCode.Tag = "query_a.depot_code";
this.gvMx2depotCode.Visible = true;
- this.gvMx2depotCode.VisibleIndex = 9;
+ this.gvMx2depotCode.VisibleIndex = 11;
this.gvMx2depotCode.Width = 94;
//
// gvMx2remark
@@ -272,22 +264,27 @@
this.gvMx2remark.FieldName = "remark";
this.gvMx2remark.MinWidth = 50;
this.gvMx2remark.Name = "gvMx2remark";
+ this.gvMx2remark.OptionsColumn.ReadOnly = true;
this.gvMx2remark.Tag = "query_a.remark";
this.gvMx2remark.Visible = true;
- this.gvMx2remark.VisibleIndex = 10;
+ this.gvMx2remark.VisibleIndex = 12;
this.gvMx2remark.Width = 94;
//
// gvMx2quantity
//
this.gvMx2quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx2quantity.AppearanceCell.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
+ this.gvMx2quantity.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx2quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx2quantity.AppearanceHeader.Options.UseForeColor = true;
this.gvMx2quantity.Caption = "鐢宠鏁伴噺 ";
this.gvMx2quantity.FieldName = "quantity";
this.gvMx2quantity.MinWidth = 50;
this.gvMx2quantity.Name = "gvMx2quantity";
this.gvMx2quantity.Tag = "query_a.quantity";
this.gvMx2quantity.Visible = true;
- this.gvMx2quantity.VisibleIndex = 7;
+ this.gvMx2quantity.VisibleIndex = 9;
this.gvMx2quantity.Width = 94;
//
// gvMx2itemNo
@@ -298,16 +295,17 @@
this.gvMx2itemNo.FieldName = "itemNo";
this.gvMx2itemNo.MinWidth = 50;
this.gvMx2itemNo.Name = "gvMx2itemNo";
+ this.gvMx2itemNo.OptionsColumn.ReadOnly = true;
this.gvMx2itemNo.Tag = "query_a.item_no";
this.gvMx2itemNo.Visible = true;
- this.gvMx2itemNo.VisibleIndex = 3;
+ this.gvMx2itemNo.VisibleIndex = 5;
this.gvMx2itemNo.Width = 94;
//
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1124, 306);
+ this.tabMxPage2.Size = new System.Drawing.Size(1124, 341);
this.tabMxPage2.Text = "閫�璐х墿鏂欑敵璇�";
//
// gcMx2
@@ -316,7 +314,9 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1124, 306);
+ this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1});
+ this.gcMx2.Size = new System.Drawing.Size(1124, 341);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -324,6 +324,8 @@
// gvMx2
//
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn12,
+ this.gridColumn11,
this.gvMx2status,
this.gvMx2pbillNo,
this.gvMx2workLine,
@@ -337,13 +339,12 @@
this.gvMx2remark,
this.gvMx2ebelnK3id,
this.gvMx2lineK3id,
- this.gvMx2guid,
- this.gvMx2itemOutId});
+ this.gvMx2itemOutId,
+ this.gvMxDel});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
- this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx2.OptionsView.ShowGroupPanel = false;
//
// gridColumn5
@@ -352,8 +353,9 @@
this.gridColumn5.FieldName = "itemName";
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 4;
+ this.gridColumn5.VisibleIndex = 6;
this.gridColumn5.Width = 94;
//
// gridColumn6
@@ -362,8 +364,9 @@
this.gridColumn6.FieldName = "itemModel";
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 5;
+ this.gridColumn6.VisibleIndex = 7;
this.gridColumn6.Width = 94;
//
// gridColumn7
@@ -372,9 +375,31 @@
this.gridColumn7.FieldName = "ktQty";
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 6;
+ this.gridColumn7.VisibleIndex = 8;
this.gridColumn7.Width = 94;
+ //
+ // gvMxDel
+ //
+ this.gvMxDel.Caption = "绉诲嚭";
+ this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gvMxDel.MinWidth = 25;
+ this.gvMxDel.Name = "gvMxDel";
+ this.gvMxDel.Visible = true;
+ this.gvMxDel.VisibleIndex = 15;
+ this.gvMxDel.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
// gv_depotId
//
@@ -416,7 +441,7 @@
//
this.lb_fmrmode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fmrmode.Appearance.Options.UseFont = true;
- this.lb_fmrmode.Location = new System.Drawing.Point(254, 70);
+ this.lb_fmrmode.Location = new System.Drawing.Point(336, 55);
this.lb_fmrmode.Name = "lb_fmrmode";
this.lb_fmrmode.Size = new System.Drawing.Size(73, 21);
this.lb_fmrmode.TabIndex = 507;
@@ -454,11 +479,11 @@
//
this.lb_suppNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_suppNo.Appearance.Options.UseFont = true;
- this.lb_suppNo.Location = new System.Drawing.Point(242, 116);
+ this.lb_suppNo.Location = new System.Drawing.Point(39, 55);
this.lb_suppNo.Name = "lb_suppNo";
- this.lb_suppNo.Size = new System.Drawing.Size(90, 21);
+ this.lb_suppNo.Size = new System.Drawing.Size(51, 21);
this.lb_suppNo.TabIndex = 387;
- this.lb_suppNo.Text = "渚涘簲鍟嗙紪鍙� ";
+ this.lb_suppNo.Text = "渚涘簲鍟�";
//
// gv_suppNo
//
@@ -478,20 +503,11 @@
//
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(242, 23);
+ this.lb_fType.Location = new System.Drawing.Point(375, 19);
this.lb_fType.Name = "lb_fType";
- this.lb_fType.Size = new System.Drawing.Size(102, 21);
+ this.lb_fType.Size = new System.Drawing.Size(34, 21);
this.lb_fType.TabIndex = 312;
- this.lb_fType.Text = "鏄惁濮斿閫�璐�";
- //
- // txt_fType
- //
- this.txt_fType.Location = new System.Drawing.Point(350, 20);
- this.txt_fType.Name = "txt_fType";
- this.txt_fType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fType.Properties.Appearance.Options.UseFont = true;
- this.txt_fType.Size = new System.Drawing.Size(150, 28);
- this.txt_fType.TabIndex = 312;
+ this.lb_fType.Text = "濮斿";
//
// gv_fType
//
@@ -511,7 +527,7 @@
//
this.lb_depotCode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_depotCode.Appearance.Options.UseFont = true;
- this.lb_depotCode.Location = new System.Drawing.Point(3, 70);
+ this.lb_depotCode.Location = new System.Drawing.Point(22, 93);
this.lb_depotCode.Name = "lb_depotCode";
this.lb_depotCode.Size = new System.Drawing.Size(68, 21);
this.lb_depotCode.TabIndex = 267;
@@ -535,15 +551,16 @@
//
this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_checkDate.Appearance.Options.UseFont = true;
- this.lb_checkDate.Location = new System.Drawing.Point(885, 70);
+ this.lb_checkDate.Location = new System.Drawing.Point(552, 93);
this.lb_checkDate.Name = "lb_checkDate";
- this.lb_checkDate.Size = new System.Drawing.Size(73, 21);
+ this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
this.lb_checkDate.TabIndex = 252;
- this.lb_checkDate.Text = "瀹℃牳鏃ユ湡 ";
+ this.lb_checkDate.Text = "瀹℃牳鏃ユ湡";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(964, 67);
+ this.txt_checkDate.Enabled = false;
+ this.txt_checkDate.Location = new System.Drawing.Point(627, 89);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
@@ -568,20 +585,11 @@
//
this.lb_checkUser.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_checkUser.Appearance.Options.UseFont = true;
- this.lb_checkUser.Location = new System.Drawing.Point(506, 70);
+ this.lb_checkUser.Location = new System.Drawing.Point(586, 19);
this.lb_checkUser.Name = "lb_checkUser";
- this.lb_checkUser.Size = new System.Drawing.Size(85, 21);
+ this.lb_checkUser.Size = new System.Drawing.Size(34, 21);
this.lb_checkUser.TabIndex = 247;
- this.lb_checkUser.Text = "瀹℃牳浜虹紪鐮�";
- //
- // txt_checkUser
- //
- this.txt_checkUser.Location = new System.Drawing.Point(597, 67);
- this.txt_checkUser.Name = "txt_checkUser";
- this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(113, 28);
- this.txt_checkUser.TabIndex = 247;
+ this.lb_checkUser.Text = "瀹℃牳";
//
// gv_checkUser
//
@@ -601,7 +609,7 @@
//
this.lb_reason.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_reason.Appearance.Options.UseFont = true;
- this.lb_reason.Location = new System.Drawing.Point(3, 116);
+ this.lb_reason.Location = new System.Drawing.Point(336, 93);
this.lb_reason.Name = "lb_reason";
this.lb_reason.Size = new System.Drawing.Size(73, 21);
this.lb_reason.TabIndex = 240;
@@ -625,19 +633,19 @@
//
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(3, 164);
+ this.lb_remark.Location = new System.Drawing.Point(22, 130);
this.lb_remark.Name = "lb_remark";
- this.lb_remark.Size = new System.Drawing.Size(73, 21);
+ this.lb_remark.Size = new System.Drawing.Size(68, 21);
this.lb_remark.TabIndex = 235;
- this.lb_remark.Text = "澶囨敞淇℃伅 ";
+ this.lb_remark.Text = "澶囨敞淇℃伅";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(80, 157);
+ this.txt_remark.Location = new System.Drawing.Point(94, 126);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(448, 28);
+ this.txt_remark.Size = new System.Drawing.Size(446, 28);
this.txt_remark.TabIndex = 235;
//
// gv_remark
@@ -654,25 +662,6 @@
this.gv_remark.VisibleIndex = 9;
this.gv_remark.Width = 94;
//
- // lb_createDate
- //
- this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_createDate.Appearance.Options.UseFont = true;
- this.lb_createDate.Location = new System.Drawing.Point(885, 23);
- this.lb_createDate.Name = "lb_createDate";
- this.lb_createDate.Size = new System.Drawing.Size(73, 21);
- this.lb_createDate.TabIndex = 219;
- this.lb_createDate.Text = "鍒涘缓鏃堕棿 ";
- //
- // txt_createDate
- //
- this.txt_createDate.Location = new System.Drawing.Point(964, 20);
- this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(150, 28);
- this.txt_createDate.TabIndex = 219;
- //
// gv_createDate
//
this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -686,25 +675,6 @@
this.gv_createDate.Visible = true;
this.gv_createDate.VisibleIndex = 10;
this.gv_createDate.Width = 94;
- //
- // lb_createBy
- //
- this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_createBy.Appearance.Options.UseFont = true;
- this.lb_createBy.Location = new System.Drawing.Point(506, 23);
- this.lb_createBy.Name = "lb_createBy";
- this.lb_createBy.Size = new System.Drawing.Size(85, 21);
- this.lb_createBy.TabIndex = 217;
- this.lb_createBy.Text = "鍒涘缓浜虹紪鐮�";
- //
- // txt_createBy
- //
- this.txt_createBy.Location = new System.Drawing.Point(597, 20);
- this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(113, 28);
- this.txt_createBy.TabIndex = 217;
//
// gv_createBy
//
@@ -738,19 +708,19 @@
//
this.lb_itemOutNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_itemOutNo.Appearance.Options.UseFont = true;
- this.lb_itemOutNo.Location = new System.Drawing.Point(3, 23);
+ this.lb_itemOutNo.Location = new System.Drawing.Point(22, 19);
this.lb_itemOutNo.Name = "lb_itemOutNo";
- this.lb_itemOutNo.Size = new System.Drawing.Size(73, 21);
+ this.lb_itemOutNo.Size = new System.Drawing.Size(68, 21);
this.lb_itemOutNo.TabIndex = 210;
- this.lb_itemOutNo.Text = "鍑哄簱鍗曞彿 ";
+ this.lb_itemOutNo.Text = "鍑哄簱鍗曞彿";
//
// txt_itemOutNo
//
- this.txt_itemOutNo.Location = new System.Drawing.Point(80, 20);
+ this.txt_itemOutNo.Location = new System.Drawing.Point(94, 15);
this.txt_itemOutNo.Name = "txt_itemOutNo";
this.txt_itemOutNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemOutNo.Size = new System.Drawing.Size(150, 28);
+ this.txt_itemOutNo.Size = new System.Drawing.Size(221, 28);
this.txt_itemOutNo.TabIndex = 210;
//
// gv_itemOutNo
@@ -910,10 +880,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 232);
+ this.tabMx.Location = new System.Drawing.Point(0, 197);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage2;
- this.tabMx.Size = new System.Drawing.Size(1126, 338);
+ this.tabMx.Size = new System.Drawing.Size(1126, 373);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage2,
@@ -923,7 +893,7 @@
//
this.xtraTabPage3.Controls.Add(this.gcMx1);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1124, 338);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1124, 341);
this.xtraTabPage3.Text = "閫�璐х墿鏂欐壂鐮�";
//
// gcMx1
@@ -932,7 +902,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 338);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 341);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1093,151 +1063,76 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.btnSelect);
+ this.panel1.Controls.Add(this.txt_check);
+ this.panel1.Controls.Add(this.txt_fType);
this.panel1.Controls.Add(this.txt_fmrmode);
this.panel1.Controls.Add(this.txt_reason);
this.panel1.Controls.Add(this.txt_suppId);
this.panel1.Controls.Add(this.txt_depotId);
- this.panel1.Controls.Add(this.labelControl4);
- this.panel1.Controls.Add(this.txt_depotName);
this.panel1.Controls.Add(this.labelControl3);
this.panel1.Controls.Add(this.txt_checkUserFname);
- this.panel1.Controls.Add(this.labelControl2);
- this.panel1.Controls.Add(this.txt_createByFname);
- this.panel1.Controls.Add(this.labelControl1);
- this.panel1.Controls.Add(this.txt_suppName);
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_fmrmode);
this.panel1.Controls.Add(this.lb_suppNo);
this.panel1.Controls.Add(this.lb_fType);
- this.panel1.Controls.Add(this.txt_fType);
this.panel1.Controls.Add(this.lb_depotCode);
this.panel1.Controls.Add(this.lb_checkDate);
this.panel1.Controls.Add(this.txt_checkDate);
this.panel1.Controls.Add(this.lb_checkUser);
- this.panel1.Controls.Add(this.txt_checkUser);
this.panel1.Controls.Add(this.lb_reason);
this.panel1.Controls.Add(this.lb_remark);
this.panel1.Controls.Add(this.txt_remark);
- this.panel1.Controls.Add(this.lb_createDate);
- this.panel1.Controls.Add(this.txt_createDate);
- this.panel1.Controls.Add(this.lb_createBy);
- this.panel1.Controls.Add(this.txt_createBy);
this.panel1.Controls.Add(this.lb_itemOutNo);
this.panel1.Controls.Add(this.txt_itemOutNo);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 232);
+ this.panel1.Size = new System.Drawing.Size(1126, 197);
this.panel1.TabIndex = 1;
//
- // labelControl4
+ // btnSelect
//
- this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl4.Appearance.Options.UseFont = true;
- this.labelControl4.Location = new System.Drawing.Point(725, 116);
- this.labelControl4.Name = "labelControl4";
- this.labelControl4.Size = new System.Drawing.Size(68, 21);
- this.labelControl4.TabIndex = 514;
- this.labelControl4.Text = "浠撳簱鍚嶇О";
+ this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.btnSelect.Location = new System.Drawing.Point(22, 160);
+ this.btnSelect.Name = "btnSelect";
+ this.btnSelect.Size = new System.Drawing.Size(128, 29);
+ this.btnSelect.TabIndex = 522;
+ this.btnSelect.Text = "鍘婚�夋嫨鏉ユ枡鏄庣粏";
//
- // txt_depotName
+ // txt_check
//
- this.txt_depotName.Location = new System.Drawing.Point(816, 113);
- this.txt_depotName.Name = "txt_depotName";
- this.txt_depotName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_depotName.Properties.Appearance.Options.UseFont = true;
- this.txt_depotName.Size = new System.Drawing.Size(113, 28);
- this.txt_depotName.TabIndex = 515;
+ this.txt_check.Enabled = false;
+ this.txt_check.Location = new System.Drawing.Point(627, 17);
+ this.txt_check.Name = "txt_check";
+ this.txt_check.Properties.Caption = "";
+ this.txt_check.Size = new System.Drawing.Size(94, 24);
+ this.txt_check.TabIndex = 521;
//
- // labelControl3
+ // txt_fType
//
- this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl3.Appearance.Options.UseFont = true;
- this.labelControl3.Location = new System.Drawing.Point(716, 70);
- this.labelControl3.Name = "labelControl3";
- this.labelControl3.Size = new System.Drawing.Size(56, 21);
- this.labelControl3.TabIndex = 512;
- this.labelControl3.Text = "瀹℃牳浜� ";
+ this.txt_fType.Location = new System.Drawing.Point(415, 17);
+ this.txt_fType.Name = "txt_fType";
+ this.txt_fType.Properties.Caption = "";
+ this.txt_fType.Size = new System.Drawing.Size(94, 24);
+ this.txt_fType.TabIndex = 520;
//
- // txt_checkUserFname
+ // txt_fmrmode
//
- this.txt_checkUserFname.Location = new System.Drawing.Point(769, 67);
- this.txt_checkUserFname.Name = "txt_checkUserFname";
- this.txt_checkUserFname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_checkUserFname.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUserFname.Size = new System.Drawing.Size(113, 28);
- this.txt_checkUserFname.TabIndex = 513;
- //
- // labelControl2
- //
- this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(716, 23);
- this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(56, 21);
- this.labelControl2.TabIndex = 510;
- this.labelControl2.Text = "鍒涘缓浜� ";
- //
- // txt_createByFname
- //
- this.txt_createByFname.Location = new System.Drawing.Point(769, 20);
- this.txt_createByFname.Name = "txt_createByFname";
- this.txt_createByFname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_createByFname.Properties.Appearance.Options.UseFont = true;
- this.txt_createByFname.Size = new System.Drawing.Size(113, 28);
- this.txt_createByFname.TabIndex = 511;
- //
- // labelControl1
- //
- this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(506, 116);
- this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(85, 21);
- this.labelControl1.TabIndex = 508;
- this.labelControl1.Text = "渚涘簲鍟嗗悕绉�";
- //
- // txt_suppName
- //
- this.txt_suppName.Location = new System.Drawing.Point(597, 113);
- this.txt_suppName.Name = "txt_suppName";
- this.txt_suppName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_suppName.Properties.Appearance.Options.UseFont = true;
- this.txt_suppName.Size = new System.Drawing.Size(113, 28);
- this.txt_suppName.TabIndex = 509;
- //
- // lbGuid
- //
- this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(958, 438);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(0, 21);
- this.lbGuid.TabIndex = 1;
- //
- // txt_depotId
- //
- this.txt_depotId.IsReadly = false;
- this.txt_depotId.KeyFile = "depotId";
- this.txt_depotId.Location = new System.Drawing.Point(80, 70);
- this.txt_depotId.Margin = new System.Windows.Forms.Padding(0);
- this.txt_depotId.Name = "txt_depotId";
- this.txt_depotId.Size = new System.Drawing.Size(171, 30);
- this.txt_depotId.TabIndex = 516;
- //
- // txt_suppId
- //
- this.txt_suppId.IsReadly = false;
- this.txt_suppId.KeyFile = "id";
- this.txt_suppId.Location = new System.Drawing.Point(350, 110);
- this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
- this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(153, 30);
- this.txt_suppId.TabIndex = 517;
+ this.txt_fmrmode.Location = new System.Drawing.Point(415, 53);
+ this.txt_fmrmode.Name = "txt_fmrmode";
+ this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_fmrmode.Properties.Items.AddRange(new object[] {
+ "閫�鏂欒ˉ鏂�",
+ "閫�鏂欏苟鎵ｆ"});
+ this.txt_fmrmode.Size = new System.Drawing.Size(125, 24);
+ this.txt_fmrmode.TabIndex = 519;
//
// txt_reason
//
- this.txt_reason.Location = new System.Drawing.Point(83, 114);
+ this.txt_reason.Location = new System.Drawing.Point(415, 91);
this.txt_reason.Name = "txt_reason";
this.txt_reason.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1250,17 +1145,73 @@
this.txt_reason.Size = new System.Drawing.Size(125, 24);
this.txt_reason.TabIndex = 518;
//
- // txt_fmrmode
+ // txt_suppId
//
- this.txt_fmrmode.Location = new System.Drawing.Point(350, 67);
- this.txt_fmrmode.Name = "txt_fmrmode";
- this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_fmrmode.Properties.Items.AddRange(new object[] {
- "閫�鏂欒ˉ鏂�",
- "閫�鏂欏苟鎵ｆ"});
- this.txt_fmrmode.Size = new System.Drawing.Size(125, 24);
- this.txt_fmrmode.TabIndex = 519;
+ this.txt_suppId.IsReadly = false;
+ this.txt_suppId.KeyFile = "id";
+ this.txt_suppId.Location = new System.Drawing.Point(94, 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(221, 28);
+ this.txt_suppId.TabIndex = 517;
+ //
+ // txt_depotId
+ //
+ this.txt_depotId.IsReadly = false;
+ this.txt_depotId.KeyFile = "depotId";
+ this.txt_depotId.Location = new System.Drawing.Point(94, 88);
+ this.txt_depotId.Margin = new System.Windows.Forms.Padding(0);
+ this.txt_depotId.Name = "txt_depotId";
+ this.txt_depotId.Size = new System.Drawing.Size(221, 28);
+ this.txt_depotId.TabIndex = 516;
+ //
+ // labelControl3
+ //
+ this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl3.Appearance.Options.UseFont = true;
+ this.labelControl3.Location = new System.Drawing.Point(569, 55);
+ this.labelControl3.Name = "labelControl3";
+ this.labelControl3.Size = new System.Drawing.Size(51, 21);
+ this.labelControl3.TabIndex = 512;
+ this.labelControl3.Text = "瀹℃牳浜�";
+ //
+ // txt_checkUserFname
+ //
+ this.txt_checkUserFname.Enabled = false;
+ this.txt_checkUserFname.Location = new System.Drawing.Point(627, 51);
+ this.txt_checkUserFname.Name = "txt_checkUserFname";
+ this.txt_checkUserFname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_checkUserFname.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkUserFname.Size = new System.Drawing.Size(150, 28);
+ this.txt_checkUserFname.TabIndex = 513;
+ //
+ // lbGuid
+ //
+ this.lbGuid.AutoSize = true;
+ this.lbGuid.Location = new System.Drawing.Point(958, 438);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(0, 21);
+ this.lbGuid.TabIndex = 1;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "aboutGuid";
+ this.gridColumn11.FieldName = "aboutGuid";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 1;
+ this.gridColumn11.Width = 94;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "guid";
+ this.gridColumn12.FieldName = "guid";
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 0;
+ this.gridColumn12.Width = 94;
//
// Frm_MesInvItemOuts
//
@@ -1273,12 +1224,9 @@
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -1293,12 +1241,11 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserFname.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createByFname.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_check.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_reason.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserFname.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -1316,7 +1263,6 @@
//BQCreateConrolObejct
private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemOutId;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2guid;
private DevExpress.XtraGrid.Columns.GridColumn gvMx2tlQty;
private DevExpress.XtraGrid.Columns.GridColumn gvMx2pbillNo;
private DevExpress.XtraGrid.Columns.GridColumn gvMx2status;
@@ -1342,7 +1288,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
private DevExpress.XtraEditors.LabelControl lb_fType;
-private DevExpress.XtraEditors.TextEdit txt_fType;
private DevExpress.XtraGrid.Columns.GridColumn gv_fType;
private DevExpress.XtraEditors.LabelControl lb_depotCode;
@@ -1353,7 +1298,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
private DevExpress.XtraEditors.LabelControl lb_checkUser;
-private DevExpress.XtraEditors.TextEdit txt_checkUser;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
private DevExpress.XtraEditors.LabelControl lb_reason;
@@ -1362,13 +1306,7 @@
private DevExpress.XtraEditors.LabelControl lb_remark;
private DevExpress.XtraEditors.TextEdit txt_remark;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
-
-private DevExpress.XtraEditors.LabelControl lb_createDate;
-private DevExpress.XtraEditors.TextEdit txt_createDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
-
-private DevExpress.XtraEditors.LabelControl lb_createBy;
-private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_status;
@@ -1381,12 +1319,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraEditors.LabelControl labelControl3;
private DevExpress.XtraEditors.TextEdit txt_checkUserFname;
- private DevExpress.XtraEditors.LabelControl labelControl2;
- private DevExpress.XtraEditors.TextEdit txt_createByFname;
- private DevExpress.XtraEditors.LabelControl labelControl1;
- private DevExpress.XtraEditors.TextEdit txt_suppName;
- private DevExpress.XtraEditors.LabelControl labelControl4;
- private DevExpress.XtraEditors.TextEdit txt_depotName;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
@@ -1408,5 +1340,12 @@
private UserControl.UcLookSupplier txt_suppId;
private DevExpress.XtraEditors.ComboBoxEdit txt_fmrmode;
private DevExpress.XtraEditors.ComboBoxEdit txt_reason;
+ private DevExpress.XtraEditors.CheckEdit txt_fType;
+ private DevExpress.XtraEditors.CheckEdit txt_check;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraEditors.SimpleButton btnSelect;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.cs
index bce5800..c1f707c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.cs
@@ -2,6 +2,8 @@
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using MES.Service.Modes;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
@@ -26,6 +28,8 @@
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
getPageList(1, UtilityHelper.GetPageSize());
pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -42,6 +46,45 @@
Font f = new Font("寰蒋闆呴粦", 16);
Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
e.Graphics.DrawString(str, f, Brushes.Gray, r);
+ };
+ //閫夋嫨闇�瑕佺殑鏄庣粏
+ btnSelect.Click += (s, e) =>
+ {
+ if (string.IsNullOrEmpty(this.txt_suppId.GetId()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨渚涘簲鍟嗭紝鎵嶈兘閫夋嫨鏉ユ枡鏄庣粏锛�");
+ return;
+ }
+ var frm = new SelectCgOutMx(this.txt_suppId.GetId());
+ //璧嬪�肩粰鏄庣粏琛�
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ var lst = new List<string>();
+ lst = ee.StringList;
+ var _obj = lst;
+ var strReturn = UtilityHelper.HttpPost("",
+ _webServiceName + "GetListPageByThmxGuid",
+ JsonConvert.SerializeObject(_obj));
+ var dt = UtilityHelper.ReturnToList(strReturn);
+ DataTable _newTable = dt.rtnData;
+ DataTable _oldTable = (DataTable)gcMx2.DataSource;
+ DataRow[] sourceRows = _newTable.Select();
+ for (int i = 0; i < sourceRows.Length; i++)
+ {
+ _oldTable.ImportRow(sourceRows[i]);
+ }
+ gcMx2.BindingContext = new BindingContext();
+ gcMx2.DataSource = _oldTable;
+ gcMx2.ForceInitialize();
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ };
+ frm.ShowDialog();
};
}
@@ -86,7 +129,34 @@
_filterList = e.FilterList;
getPageList(1, pageBar1.RowsCount);
}
+ /// <summary>
+ /// 鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_itemOutNo, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ }
+ /// <summary>
+ /// 瀹℃牳浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_itemOutNo, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ }
/// <summary>
/// 鍙栨秷浜嬩欢
/// </summary>
@@ -172,8 +242,10 @@
lbGuid.Text = "";
List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gridViews.Add(gvMx1);
+ gridViews.Add(gvMx2);
UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -183,31 +255,76 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- //if (string.IsNullOrEmpty(txt_account.Text.Trim()))
+ var _ckId = txt_depotId.GetId(); //浠撳簱缂栧彿 depots_code
+ var _gysId = txt_suppId.GetId(); //渚涘簲鍟嗙紪鍙�
+ if (string.IsNullOrEmpty(_gysId))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
- // txt_account.Focus();
+ MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
+ txt_suppId.Focus();
return;
}
- var _obj = new
+
+ if (string.IsNullOrEmpty(_ckId))
{
- guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
+ txt_depotId.Focus();
+ return;
+ }
+ var _obj = new MesInvItemOuts()
+ {
+ Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()), //鍒拌揣鍗曚富閿�
+ Remark = txt_remark.Text.Trim(), //澶囨敞
+ SuppId = int.Parse( _gysId), //渚涘簲鍟�
+ DepotId = int.Parse(_ckId),//浠撳簱
+ FType = txt_fType.Checked==true?1:0, //0=閲囪喘锛�1=濮斿
+ Fmrmode = txt_fmrmode.Text,//閫�鏂欐柟寮�
+ Reason = txt_reason.Text,//閫�鏂欐柟寮�
+ MesInvItemOutItemsList = new List<MesInvItemOutItems>(),
};
+ gvMx2.CloseEditor();
+ gvMx2.UpdateCurrentRow();
+ if (gvMx2.DataRowCount <= 0)
+ {
+ MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
+ return;
+ }
+ for (var i = 0; i < gvMx2.DataRowCount; i++)
+ {
+ var row = gvMx2.GetDataRow(i);
+ if (row != null)
+ {
+ Guid _guid = UtilityHelper.ToGuid(row["guid"].ToString());
+ string _msl = row["quantity"].ToString();
+ if (string.IsNullOrEmpty(_msl))
+ {
+ MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�");
+ return;
+ }
+ _obj.MesInvItemOutItemsList.Add(new MesInvItemOutItems
+ {
+ Guid = _guid,
+ AboutGuid = row["aboutGuid"].ToString(),//
+ Quantity = decimal.Parse(row["quantity"].ToString())
+ });
+ }
+ }
try
{
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "EditModel",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, false);
}
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
@@ -302,5 +419,41 @@
}
}
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ gvMx1.CloseEditor();
+ gvMx1.UpdateCurrentRow();
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ gvMx1.DeleteRow(rowhandle);
+ return;
+ }
+ var strJson = "";
+ var lst = new List<string>();
+ lst.Add(mxGuid);
+ try
+ {
+ strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "DeleteModelMx",
+ JsonConvert.SerializeObject(lst));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
+ 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/Models/MesInvItemOutItems.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutItems.cs
index f0d8334..be9a25e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutItems.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesInvItemOutItems.cs
@@ -162,5 +162,11 @@
public string ItemName { get; set; }
public string ItemModel { get; set; }
+
+
+ /// <summary>
+ /// RK_LINE
+ /// </summary>
+ public string AboutGuid { get; set; }
}
}
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 1444854..554990d 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -486,6 +486,12 @@
<Compile Include="UserControl\SelectCgMx.Designer.cs">
<DependentUpon>SelectCgMx.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\SelectCgOutMx.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\SelectCgOutMx.Designer.cs">
+ <DependentUpon>SelectCgOutMx.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\SelectCheckDt.cs">
<SubType>Form</SubType>
</Compile>
@@ -712,6 +718,9 @@
<EmbeddedResource Include="UserControl\SelectCgMx.resx">
<DependentUpon>SelectCgMx.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\SelectCgOutMx.resx">
+ <DependentUpon>SelectCgOutMx.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectCheckDt.resx">
<DependentUpon>SelectCheckDt.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgOutMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgOutMx.Designer.cs
new file mode 100644
index 0000000..c1d77a3
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgOutMx.Designer.cs
@@ -0,0 +1,418 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+ partial class SelectCgOutMx
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+ this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_inventoryUnit = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+ this.panelControl1.SuspendLayout();
+ this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Right;
+ this.pageBar1.Location = new System.Drawing.Point(87, 2);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.RowsCount = 50;
+ this.pageBar1.Size = new System.Drawing.Size(984, 39);
+ this.pageBar1.TabIndex = 3;
+ this.pageBar1.TotalPages = 0;
+ //
+ // panelControl1
+ //
+ this.panelControl1.Controls.Add(this.btnIn);
+ this.panelControl1.Controls.Add(this.pageBar1);
+ this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panelControl1.Location = new System.Drawing.Point(0, 479);
+ this.panelControl1.Name = "panelControl1";
+ this.panelControl1.Size = new System.Drawing.Size(1073, 43);
+ this.panelControl1.TabIndex = 4;
+ //
+ // btnIn
+ //
+ this.btnIn.Dock = System.Windows.Forms.DockStyle.Left;
+ this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
+ this.btnIn.Location = new System.Drawing.Point(2, 2);
+ this.btnIn.Name = "btnIn";
+ this.btnIn.Size = new System.Drawing.Size(94, 39);
+ this.btnIn.TabIndex = 4;
+ this.btnIn.Text = "纭畾瀵煎叆";
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.gcMain);
+ this.xtraTabPage1.Controls.Add(this.panelControl1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1073, 522);
+ this.xtraTabPage1.Text = "璇烽�夋嫨閲囬渶瑕佸叆搴撶殑鏁版嵁";
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain.Location = new System.Drawing.Point(0, 0);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.Size = new System.Drawing.Size(1073, 479);
+ this.gcMain.TabIndex = 1;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 50;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_chk,
+ this.gv_guid,
+ this.gridColumn4,
+ this.gv_ebelnK3id,
+ this.gridColumn1,
+ this.gv_supplierItemCode,
+ this.gv_supplierItemName,
+ this.gridColumn5,
+ this.gridColumn8,
+ this.gv_purchaseUnit,
+ this.gridColumn6,
+ this.gridColumn7,
+ this.gv_inventoryUnit,
+ this.gridColumn3,
+ this.gridColumn2,
+ this.gridColumn11,
+ this.gridColumn10});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.IndicatorWidth = 50;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_chk
+ //
+ this.gv_chk.Caption = "閫夋嫨";
+ this.gv_chk.FieldName = "gvChk";
+ this.gv_chk.MinWidth = 60;
+ this.gv_chk.Name = "gv_chk";
+ this.gv_chk.Visible = true;
+ this.gv_chk.VisibleIndex = 0;
+ this.gv_chk.Width = 94;
+ //
+ // gv_guid
+ //
+ this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_guid.AppearanceCell.Options.UseFont = true;
+ this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
+ this.gv_guid.FieldName = "guid";
+ this.gv_guid.MinWidth = 50;
+ this.gv_guid.Name = "gv_guid";
+ this.gv_guid.OptionsColumn.AllowEdit = false;
+ this.gv_guid.OptionsColumn.ReadOnly = true;
+ this.gv_guid.Tag = "query_a.guid";
+ this.gv_guid.Width = 94;
+ //
+ // gv_ebelnK3id
+ //
+ this.gv_ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
+ this.gv_ebelnK3id.Caption = "閲囪喘鍗曞唴鐮�";
+ this.gv_ebelnK3id.FieldName = "lineK3id";
+ this.gv_ebelnK3id.MinWidth = 80;
+ this.gv_ebelnK3id.Name = "gv_ebelnK3id";
+ this.gv_ebelnK3id.OptionsColumn.AllowEdit = false;
+ this.gv_ebelnK3id.OptionsColumn.ReadOnly = true;
+ this.gv_ebelnK3id.Tag = "query_a.EBELN_K3ID";
+ this.gv_ebelnK3id.Visible = true;
+ this.gv_ebelnK3id.VisibleIndex = 2;
+ this.gv_ebelnK3id.Width = 100;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "閲囪喘鍗曞彿";
+ this.gridColumn4.FieldName = "workNo";
+ this.gridColumn4.MinWidth = 120;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.ReadOnly = true;
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 1;
+ this.gridColumn4.Width = 120;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鐗╂枡ID";
+ this.gridColumn1.FieldName = "itemId";
+ this.gridColumn1.MinWidth = 80;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.OptionsColumn.ReadOnly = true;
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 3;
+ this.gridColumn1.Width = 94;
+ //
+ // gv_supplierItemCode
+ //
+ this.gv_supplierItemCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
+ this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜";
+ this.gv_supplierItemCode.FieldName = "itemNo";
+ this.gv_supplierItemCode.MinWidth = 80;
+ this.gv_supplierItemCode.Name = "gv_supplierItemCode";
+ this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
+ this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
+ this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
+ this.gv_supplierItemCode.Visible = true;
+ this.gv_supplierItemCode.VisibleIndex = 4;
+ this.gv_supplierItemCode.Width = 100;
+ //
+ // gv_supplierItemName
+ //
+ this.gv_supplierItemName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
+ this.gv_supplierItemName.Caption = "鐗╂枡鍚嶇О";
+ this.gv_supplierItemName.FieldName = "itemName";
+ this.gv_supplierItemName.MinWidth = 120;
+ this.gv_supplierItemName.Name = "gv_supplierItemName";
+ this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
+ this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
+ this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
+ this.gv_supplierItemName.Visible = true;
+ this.gv_supplierItemName.VisibleIndex = 5;
+ this.gv_supplierItemName.Width = 120;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn5.FieldName = "itemModel";
+ this.gridColumn5.MinWidth = 200;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.OptionsColumn.ReadOnly = true;
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 6;
+ this.gridColumn5.Width = 250;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "宸查��鏁伴噺";
+ this.gridColumn6.FieldName = "ytlQty";
+ this.gridColumn6.MinWidth = 60;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.OptionsColumn.ReadOnly = true;
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 9;
+ this.gridColumn6.Width = 100;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鍏ュ簱鏁伴噺";
+ this.gridColumn8.FieldName = "rkQty";
+ this.gridColumn8.MinWidth = 60;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.OptionsColumn.ReadOnly = true;
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 7;
+ this.gridColumn8.Width = 100;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "鍙��鏁伴噺";
+ this.gridColumn7.FieldName = "ktQty";
+ this.gridColumn7.MinWidth = 60;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.OptionsColumn.ReadOnly = true;
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 10;
+ this.gridColumn7.Width = 100;
+ //
+ // gv_purchaseUnit
+ //
+ this.gv_purchaseUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
+ this.gv_purchaseUnit.Caption = "鍗曚綅";
+ this.gv_purchaseUnit.FieldName = "unitName";
+ this.gv_purchaseUnit.MinWidth = 60;
+ this.gv_purchaseUnit.Name = "gv_purchaseUnit";
+ this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
+ this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
+ this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
+ this.gv_purchaseUnit.Visible = true;
+ this.gv_purchaseUnit.VisibleIndex = 8;
+ this.gv_purchaseUnit.Width = 100;
+ //
+ // gv_inventoryUnit
+ //
+ 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 = "pbillNo";
+ this.gv_inventoryUnit.MinWidth = 100;
+ this.gv_inventoryUnit.Name = "gv_inventoryUnit";
+ this.gv_inventoryUnit.OptionsColumn.AllowEdit = false;
+ this.gv_inventoryUnit.OptionsColumn.ReadOnly = true;
+ this.gv_inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
+ this.gv_inventoryUnit.Visible = true;
+ this.gv_inventoryUnit.VisibleIndex = 11;
+ this.gv_inventoryUnit.Width = 100;
+ //
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(1075, 554);
+ this.xtraTabControl1.TabIndex = 4;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1});
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鍏ュ簱鏃ユ湡";
+ this.gridColumn2.FieldName = "rkDate";
+ this.gridColumn2.MinWidth = 120;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.OptionsColumn.ReadOnly = true;
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 13;
+ this.gridColumn2.Width = 120;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鍏ュ簱鍗曞彿";
+ this.gridColumn3.FieldName = "rkNo";
+ this.gridColumn3.MinWidth = 100;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.OptionsColumn.ReadOnly = true;
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 12;
+ this.gridColumn3.Width = 100;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "閲囪喘琛屽唴鐮�";
+ this.gridColumn10.FieldName = "lineK3id";
+ this.gridColumn10.MinWidth = 80;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.OptionsColumn.ReadOnly = true;
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 15;
+ this.gridColumn10.Width = 94;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "鍏ュ簱鍗曡鍐呯爜";
+ this.gridColumn11.FieldName = "rkLine";
+ this.gridColumn11.MinWidth = 120;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.OptionsColumn.ReadOnly = true;
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 14;
+ this.gridColumn11.Width = 120;
+ //
+ // SelectCgOutMx
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1075, 554);
+ this.Controls.Add(this.xtraTabControl1);
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "SelectCgOutMx";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "閫夋嫨鍏ュ簱鏄庣粏";
+ this.TopMost = true;
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+ this.panelControl1.ResumeLayout(false);
+ this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+ this.xtraTabControl1.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraEditors.SimpleButton btnIn;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_chk;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_ebelnK3id;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_inventoryUnit;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgOutMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgOutMx.cs
new file mode 100644
index 0000000..7d15573
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgOutMx.cs
@@ -0,0 +1,110 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.UserControl
+{
+ public partial class SelectCgOutMx : DevExpress.XtraEditors.XtraForm
+ {
+ private readonly List<FilterEntity> _filterList =
+ new List<FilterEntity>();
+
+ private readonly string _webServiceName = "MesInvItemOutsManager/";
+ private string suppId = "";
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鍙�
+ /// </summary>
+ /// <param name="supp_no"></param>
+ public SelectCgOutMx(string _suppId)
+ {
+ InitializeComponent();
+ this.suppId = _suppId;
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ getPageList(1, UtilityHelper.GetPageSize());
+ gridView1.IndicatorWidth = 50;
+ gridView1.CustomDrawRowIndicator += (s, e) =>
+ {
+ if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+ e.Info.DisplayText = (e.RowHandle + 1).ToString();
+ };
+ btnIn.Click += (s, e) =>
+ {
+ var list = new List<string>();
+ for (var i = 0; i < gridView1.DataRowCount; i++)
+ {
+ var checkBox = gridView1.GetRowCellDisplayText(i, "gvChk");
+ if (checkBox == "Checked")
+ {
+ var _guid = gridView1.GetRowCellValue(i, "guid").ToString();
+ list.Add(_guid);
+ }
+ }
+ UpdateParent?.Invoke(this,
+ new UpdateParentEventArgs { StringList = list });
+ Close();
+ };
+ }
+
+ /// <summary>
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+ /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage, pageSize);
+ }
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage, int pageSize)
+ {
+ 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 + "GetCgtlViews", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ var dddd = dd.rtnData.pages; //鎬婚〉
+ pageBar1.TotalPages = dddd;
+ pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
+ pageBar1.CurrentPage = curPage; //褰撳墠椤�
+ pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
+ pageBar1.setTxt();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgOutMx.resx b/DevApp/Gs.DevApp/UserControl/SelectCgOutMx.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgOutMx.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index 28cc77e..53f85a5 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -487,7 +487,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 75);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 45);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -522,7 +522,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 75);
+ this.Size = new System.Drawing.Size(1543, 45);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
--
Gitblit v1.9.3