From 93ec2955713f40a50348b1990bbaeeee837f5378 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 12 四月 2025 09:09:40 +0800
Subject: [PATCH] 工单
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs | 2
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.Designer.cs | 1420 +++++++++++++++++++++++++++---------------------
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 18
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 259 +++++---
4 files changed, 947 insertions(+), 752 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.Designer.cs
index 29db778..0856dc0 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.Designer.cs
@@ -30,39 +30,24 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1billNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
- this.gcMx1 = new DevExpress.XtraGrid.GridControl();
- this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gv_boxQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_kbQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_taskNo = new DevExpress.XtraEditors.LabelControl();
- this.txt_taskNo = new DevExpress.XtraEditors.TextEdit();
- this.gv_taskNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
- this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_classNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lastupdateBy = 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_lineNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
- this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
- this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_taskNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -72,12 +57,53 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lineNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.gv_classNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_kbQty = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_boxQty = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
+ this.lbGuid = new System.Windows.Forms.Label();
+ this.txt_taskNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_slSum = new DevExpress.XtraEditors.TextEdit();
+ this.txt_daa013 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_lineName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
+ this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gvMx1billNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -90,367 +116,56 @@
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.panel1 = new System.Windows.Forms.Panel();
- this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
- this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
- this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
- this.lbGuid = new System.Windows.Forms.Label();
- this.lb_status = new DevExpress.XtraEditors.LabelControl();
- this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
- this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
- this.lb_factory = new DevExpress.XtraEditors.LabelControl();
- this.txt_slSum = new DevExpress.XtraEditors.TextEdit();
- this.lb_company = new DevExpress.XtraEditors.LabelControl();
- this.txt_daa013 = new DevExpress.XtraEditors.TextEdit();
- this.lb_lineNo = new DevExpress.XtraEditors.LabelControl();
- this.txt_lineName = new DevExpress.XtraEditors.TextEdit();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.tabMxPage1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+ this.split1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+ this.split1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
this.xtraTabPage2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
- this.tabMx.SuspendLayout();
- this.xtraTabPage3.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+ this.splitMx1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+ this.splitMx1.Panel2.SuspendLayout();
+ this.splitMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+ this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_slSum.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa013.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+ this.tabMx.SuspendLayout();
+ this.tabMxPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ this.xtraTabPage3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
this.SuspendLayout();
- //
- // gvMx1itemNo
- //
- this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1itemNo.Caption = "鐗╂枡缂栧彿 ";
- this.gvMx1itemNo.FieldName = "itemNo";
- this.gvMx1itemNo.MinWidth = 50;
- this.gvMx1itemNo.Name = "gvMx1itemNo";
- this.gvMx1itemNo.Tag = "query_a.item_no";
- this.gvMx1itemNo.Visible = true;
- this.gvMx1itemNo.VisibleIndex = 1;
- this.gvMx1itemNo.Width = 94;
- //
- // gvMx1quantity
- //
- this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
- this.gvMx1quantity.Caption = "鏁伴噺 ";
- this.gvMx1quantity.FieldName = "quantity";
- this.gvMx1quantity.MinWidth = 50;
- this.gvMx1quantity.Name = "gvMx1quantity";
- this.gvMx1quantity.Tag = "query_a.quantity";
- this.gvMx1quantity.Visible = true;
- this.gvMx1quantity.VisibleIndex = 2;
- this.gvMx1quantity.Width = 94;
- //
- // gvMx1billNo
- //
- this.gvMx1billNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1billNo.Caption = "鎶ュ伐鍗曞彿 ";
- this.gvMx1billNo.FieldName = "billNo";
- this.gvMx1billNo.MinWidth = 50;
- this.gvMx1billNo.Name = "gvMx1billNo";
- this.gvMx1billNo.Tag = "query_a.bill_no";
- this.gvMx1billNo.Visible = true;
- this.gvMx1billNo.VisibleIndex = 0;
- this.gvMx1billNo.Width = 94;
- //
- // tabMxPage1
- //
- this.tabMxPage1.Controls.Add(this.gcMx1);
- this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 387);
- this.tabMxPage1.Text = "鎶ュ伐鏄庣粏";
- //
- // gcMx1
- //
- this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- 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, 387);
- this.gcMx1.TabIndex = 0;
- this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx1});
- //
- // gvMx1
- //
- this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gvMx1billNo,
- this.gvMx1itemNo,
- this.gvMx1quantity});
- this.gvMx1.GridControl = this.gcMx1;
- this.gvMx1.Name = "gvMx1";
- this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
- this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.ShowGroupPanel = false;
- //
- // gv_boxQty
- //
- this.gv_boxQty.AppearanceCell.Options.UseFont = true;
- this.gv_boxQty.Caption = "姣忕鏁伴噺 ";
- this.gv_boxQty.FieldName = "boxQty";
- this.gv_boxQty.MinWidth = 50;
- this.gv_boxQty.Name = "gv_boxQty";
- this.gv_boxQty.OptionsColumn.AllowEdit = false;
- this.gv_boxQty.Tag = "query_a.box_qty";
- this.gv_boxQty.Width = 94;
- //
- // gv_kbQty
- //
- this.gv_kbQty.AppearanceCell.Options.UseFont = true;
- this.gv_kbQty.Caption = "鍗℃澘鏁伴噺 ";
- this.gv_kbQty.FieldName = "kbQty";
- this.gv_kbQty.MinWidth = 50;
- this.gv_kbQty.Name = "gv_kbQty";
- this.gv_kbQty.OptionsColumn.AllowEdit = false;
- this.gv_kbQty.Tag = "query_a.kb_qty";
- this.gv_kbQty.Width = 94;
- //
- // lb_taskNo
- //
- this.lb_taskNo.Appearance.Options.UseFont = true;
- this.lb_taskNo.Location = new System.Drawing.Point(25, 52);
- this.lb_taskNo.Name = "lb_taskNo";
- this.lb_taskNo.Size = new System.Drawing.Size(60, 18);
- this.lb_taskNo.TabIndex = 262;
- this.lb_taskNo.Text = "宸ュ崟鍗曞彿";
- //
- // txt_taskNo
- //
- this.txt_taskNo.Location = new System.Drawing.Point(97, 48);
- this.txt_taskNo.Name = "txt_taskNo";
- this.txt_taskNo.Properties.Appearance.Options.UseFont = true;
- this.txt_taskNo.Size = new System.Drawing.Size(162, 24);
- this.txt_taskNo.TabIndex = 262;
- //
- // gv_taskNo
- //
- this.gv_taskNo.AppearanceCell.Options.UseFont = true;
- this.gv_taskNo.Caption = "宸ュ崟鍗曞彿 ";
- this.gv_taskNo.FieldName = "taskNo";
- this.gv_taskNo.MinWidth = 50;
- this.gv_taskNo.Name = "gv_taskNo";
- this.gv_taskNo.OptionsColumn.AllowEdit = false;
- this.gv_taskNo.Tag = "query_a.task_no";
- this.gv_taskNo.Visible = true;
- this.gv_taskNo.VisibleIndex = 2;
- this.gv_taskNo.Width = 94;
- //
- // gv_pbillNo
- //
- this.gv_pbillNo.AppearanceCell.Options.UseFont = true;
- this.gv_pbillNo.Caption = "娲惧伐鍗曞彿 ";
- this.gv_pbillNo.FieldName = "pbillNo";
- this.gv_pbillNo.MinWidth = 50;
- this.gv_pbillNo.Name = "gv_pbillNo";
- this.gv_pbillNo.OptionsColumn.AllowEdit = false;
- this.gv_pbillNo.Tag = "query_a.pbill_no";
- this.gv_pbillNo.Width = 94;
- //
- // txt_itemName
- //
- this.txt_itemName.Location = new System.Drawing.Point(348, 48);
- this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(238, 24);
- this.txt_itemName.TabIndex = 243;
- //
- // gv_status
- //
- this.gv_status.AppearanceCell.Options.UseFont = true;
- this.gv_status.Caption = "鍏ュ簱鏍囪瘑";
- this.gv_status.FieldName = "isRk";
- this.gv_status.MaxWidth = 50;
- this.gv_status.MinWidth = 50;
- this.gv_status.Name = "gv_status";
- this.gv_status.OptionsColumn.AllowEdit = false;
- this.gv_status.Tag = "query_a.status";
- this.gv_status.Visible = true;
- this.gv_status.VisibleIndex = 0;
- this.gv_status.Width = 50;
- //
- // gv_checkDate
- //
- this.gv_checkDate.AppearanceCell.Options.UseFont = true;
- this.gv_checkDate.Caption = "check_date ";
- this.gv_checkDate.FieldName = "瀹℃牳鏃堕棿";
- this.gv_checkDate.MinWidth = 50;
- this.gv_checkDate.Name = "gv_checkDate";
- this.gv_checkDate.OptionsColumn.AllowEdit = false;
- this.gv_checkDate.Tag = "query_a.check_date";
- this.gv_checkDate.Width = 94;
- //
- // gv_checkUser
- //
- this.gv_checkUser.AppearanceCell.Options.UseFont = true;
- this.gv_checkUser.Caption = "check_user ";
- this.gv_checkUser.FieldName = "瀹℃牳浜�";
- this.gv_checkUser.MinWidth = 50;
- this.gv_checkUser.Name = "gv_checkUser";
- this.gv_checkUser.OptionsColumn.AllowEdit = false;
- this.gv_checkUser.Tag = "query_a.check_user";
- this.gv_checkUser.Width = 94;
- //
- // gv_classNo
- //
- this.gv_classNo.AppearanceCell.Options.UseFont = true;
- this.gv_classNo.Caption = "鐝 ";
- this.gv_classNo.FieldName = "classNo";
- this.gv_classNo.MinWidth = 50;
- this.gv_classNo.Name = "gv_classNo";
- this.gv_classNo.OptionsColumn.AllowEdit = false;
- this.gv_classNo.Tag = "query_a.class_no";
- this.gv_classNo.Width = 94;
- //
- // gv_lastupdateDate
- //
- this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateDate.Caption = "lastupdate_date ";
- this.gv_lastupdateDate.FieldName = "鏈�鍚庢洿鏂版椂闂�";
- this.gv_lastupdateDate.MinWidth = 50;
- this.gv_lastupdateDate.Name = "gv_lastupdateDate";
- this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
- this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
- this.gv_lastupdateDate.Width = 94;
- //
- // gv_lastupdateBy
- //
- this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateBy.Caption = "lastupdate_by ";
- this.gv_lastupdateBy.FieldName = "鏈�鍚庢洿鏂颁汉";
- this.gv_lastupdateBy.MinWidth = 50;
- this.gv_lastupdateBy.Name = "gv_lastupdateBy";
- this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
- this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
- this.gv_lastupdateBy.Width = 94;
- //
- // lb_createDate
- //
- this.lb_createDate.Appearance.Options.UseFont = true;
- this.lb_createDate.Location = new System.Drawing.Point(586, 52);
- this.lb_createDate.Name = "lb_createDate";
- this.lb_createDate.Size = new System.Drawing.Size(60, 18);
- this.lb_createDate.TabIndex = 222;
- this.lb_createDate.Text = "鍒涘缓鏃ユ湡";
- //
- // txt_createDate
- //
- this.txt_createDate.Location = new System.Drawing.Point(659, 48);
- this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(150, 24);
- this.txt_createDate.TabIndex = 222;
- //
- // gv_createDate
- //
- this.gv_createDate.AppearanceCell.Options.UseFont = true;
- this.gv_createDate.Caption = "鍒涘缓鏃ユ湡 ";
- this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 50;
- this.gv_createDate.Name = "gv_createDate";
- this.gv_createDate.OptionsColumn.AllowEdit = false;
- this.gv_createDate.Tag = "query_a.create_date";
- this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 13;
- this.gv_createDate.Width = 94;
- //
- // lb_createBy
- //
- this.lb_createBy.Appearance.Options.UseFont = true;
- this.lb_createBy.Location = new System.Drawing.Point(603, 20);
- this.lb_createBy.Name = "lb_createBy";
- this.lb_createBy.Size = new System.Drawing.Size(45, 18);
- this.lb_createBy.TabIndex = 219;
- this.lb_createBy.Text = "鍒涘缓鑰�";
- //
- // txt_createBy
- //
- this.txt_createBy.Location = new System.Drawing.Point(659, 16);
- this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(150, 24);
- this.txt_createBy.TabIndex = 219;
- //
- // gv_createBy
- //
- this.gv_createBy.AppearanceCell.Options.UseFont = true;
- this.gv_createBy.Caption = "鍒涘缓浜�";
- this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 50;
- this.gv_createBy.Name = "gv_createBy";
- this.gv_createBy.OptionsColumn.AllowEdit = false;
- this.gv_createBy.Tag = "query_a.create_by";
- this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 12;
- this.gv_createBy.Width = 94;
- //
- // gv_lineNo
- //
- this.gv_lineNo.AppearanceCell.Options.UseFont = true;
- this.gv_lineNo.Caption = "绾垮埆鍚嶇О";
- this.gv_lineNo.FieldName = "lineName";
- this.gv_lineNo.MinWidth = 50;
- this.gv_lineNo.Name = "gv_lineNo";
- this.gv_lineNo.OptionsColumn.AllowEdit = false;
- this.gv_lineNo.Tag = "query_a.line_no";
- this.gv_lineNo.Visible = true;
- this.gv_lineNo.VisibleIndex = 14;
- this.gv_lineNo.Width = 94;
- //
- // lb_billNo
- //
- this.lb_billNo.Appearance.Options.UseFont = true;
- this.lb_billNo.Location = new System.Drawing.Point(25, 20);
- this.lb_billNo.Name = "lb_billNo";
- this.lb_billNo.Size = new System.Drawing.Size(60, 18);
- this.lb_billNo.TabIndex = 211;
- this.lb_billNo.Text = "鎶ュ伐鍗曞彿";
- //
- // txt_billNo
- //
- this.txt_billNo.Location = new System.Drawing.Point(97, 16);
- this.txt_billNo.Name = "txt_billNo";
- this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(162, 24);
- this.txt_billNo.TabIndex = 211;
- //
- // gv_billNo
- //
- this.gv_billNo.AppearanceCell.Options.UseFont = true;
- this.gv_billNo.Caption = "鎶ュ伐鍗曞彿 ";
- this.gv_billNo.FieldName = "billNo";
- this.gv_billNo.MinWidth = 50;
- this.gv_billNo.Name = "gv_billNo";
- this.gv_billNo.OptionsColumn.AllowEdit = false;
- this.gv_billNo.Tag = "query_a.bill_no";
- this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 1;
- this.gv_billNo.Width = 94;
- //
- // gv_id
- //
- this.gv_id.AppearanceCell.Options.UseFont = true;
- this.gv_id.Caption = "鍞竴鏍囪瘑绗� ";
- this.gv_id.FieldName = "id";
- this.gv_id.MinWidth = 50;
- this.gv_id.Name = "gv_id";
- this.gv_id.OptionsColumn.AllowEdit = false;
- this.gv_id.Tag = "query_a.id";
- this.gv_id.Width = 94;
//
// toolBarMenu1
//
@@ -468,14 +183,53 @@
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
//
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.TabIndex = 3;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1,
+ this.xtraTabPage2});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+ //
+ // split1
+ //
+ this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.Horizontal = false;
+ this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Name = "split1";
+ //
+ // split1.split1_Panel1
+ //
+ this.split1.Panel1.Controls.Add(this.gcMain);
+ this.split1.Panel1.Controls.Add(this.pageBar1);
+ this.split1.Panel1.Text = "Panel1";
+ //
+ // split1.split1_Panel2
+ //
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.SplitterPosition = 558;
+ this.split1.TabIndex = 0;
+ //
// gcMain
//
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
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(1126, 531);
- this.gcMain.TabIndex = 1;
+ this.gcMain.Size = new System.Drawing.Size(1126, 519);
+ this.gcMain.TabIndex = 2;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
//
@@ -517,6 +271,46 @@
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_status
+ //
+ this.gv_status.AppearanceCell.Options.UseFont = true;
+ this.gv_status.Caption = "鍏ュ簱鏍囪瘑";
+ this.gv_status.FieldName = "isRk";
+ this.gv_status.MaxWidth = 50;
+ this.gv_status.MinWidth = 50;
+ this.gv_status.Name = "gv_status";
+ this.gv_status.OptionsColumn.AllowEdit = false;
+ this.gv_status.Tag = "query_a.status";
+ this.gv_status.Visible = true;
+ this.gv_status.VisibleIndex = 0;
+ this.gv_status.Width = 50;
+ //
+ // gv_billNo
+ //
+ this.gv_billNo.AppearanceCell.Options.UseFont = true;
+ this.gv_billNo.Caption = "鎶ュ伐鍗曞彿 ";
+ this.gv_billNo.FieldName = "billNo";
+ this.gv_billNo.MinWidth = 50;
+ this.gv_billNo.Name = "gv_billNo";
+ this.gv_billNo.OptionsColumn.AllowEdit = false;
+ this.gv_billNo.Tag = "query_a.bill_no";
+ this.gv_billNo.Visible = true;
+ this.gv_billNo.VisibleIndex = 1;
+ this.gv_billNo.Width = 94;
+ //
+ // gv_taskNo
+ //
+ this.gv_taskNo.AppearanceCell.Options.UseFont = true;
+ this.gv_taskNo.Caption = "宸ュ崟鍗曞彿 ";
+ this.gv_taskNo.FieldName = "taskNo";
+ this.gv_taskNo.MinWidth = 50;
+ this.gv_taskNo.Name = "gv_taskNo";
+ this.gv_taskNo.OptionsColumn.AllowEdit = false;
+ this.gv_taskNo.Tag = "query_a.task_no";
+ this.gv_taskNo.Visible = true;
+ this.gv_taskNo.VisibleIndex = 2;
+ this.gv_taskNo.Width = 94;
//
// gridColumn5
//
@@ -606,6 +400,89 @@
this.gridColumn12.VisibleIndex = 11;
this.gridColumn12.Width = 94;
//
+ // gv_createBy
+ //
+ this.gv_createBy.AppearanceCell.Options.UseFont = true;
+ this.gv_createBy.Caption = "鍒涘缓浜�";
+ this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.MinWidth = 50;
+ this.gv_createBy.Name = "gv_createBy";
+ this.gv_createBy.OptionsColumn.AllowEdit = false;
+ this.gv_createBy.Tag = "query_a.create_by";
+ this.gv_createBy.Visible = true;
+ this.gv_createBy.VisibleIndex = 12;
+ this.gv_createBy.Width = 94;
+ //
+ // gv_createDate
+ //
+ this.gv_createDate.AppearanceCell.Options.UseFont = true;
+ this.gv_createDate.Caption = "鍒涘缓鏃ユ湡 ";
+ this.gv_createDate.FieldName = "createDate";
+ this.gv_createDate.MinWidth = 50;
+ this.gv_createDate.Name = "gv_createDate";
+ this.gv_createDate.OptionsColumn.AllowEdit = false;
+ this.gv_createDate.Tag = "query_a.create_date";
+ this.gv_createDate.Visible = true;
+ this.gv_createDate.VisibleIndex = 13;
+ this.gv_createDate.Width = 94;
+ //
+ // gv_lastupdateBy
+ //
+ this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
+ this.gv_lastupdateBy.Caption = "lastupdate_by ";
+ this.gv_lastupdateBy.FieldName = "鏈�鍚庢洿鏂颁汉";
+ this.gv_lastupdateBy.MinWidth = 50;
+ this.gv_lastupdateBy.Name = "gv_lastupdateBy";
+ this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
+ this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
+ this.gv_lastupdateBy.Width = 94;
+ //
+ // gv_lastupdateDate
+ //
+ this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
+ this.gv_lastupdateDate.Caption = "lastupdate_date ";
+ this.gv_lastupdateDate.FieldName = "鏈�鍚庢洿鏂版椂闂�";
+ this.gv_lastupdateDate.MinWidth = 50;
+ this.gv_lastupdateDate.Name = "gv_lastupdateDate";
+ this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
+ this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
+ this.gv_lastupdateDate.Width = 94;
+ //
+ // gv_checkUser
+ //
+ this.gv_checkUser.AppearanceCell.Options.UseFont = true;
+ this.gv_checkUser.Caption = "check_user ";
+ this.gv_checkUser.FieldName = "瀹℃牳浜�";
+ this.gv_checkUser.MinWidth = 50;
+ this.gv_checkUser.Name = "gv_checkUser";
+ this.gv_checkUser.OptionsColumn.AllowEdit = false;
+ this.gv_checkUser.Tag = "query_a.check_user";
+ this.gv_checkUser.Width = 94;
+ //
+ // gv_checkDate
+ //
+ this.gv_checkDate.AppearanceCell.Options.UseFont = true;
+ this.gv_checkDate.Caption = "check_date ";
+ this.gv_checkDate.FieldName = "瀹℃牳鏃堕棿";
+ this.gv_checkDate.MinWidth = 50;
+ this.gv_checkDate.Name = "gv_checkDate";
+ this.gv_checkDate.OptionsColumn.AllowEdit = false;
+ this.gv_checkDate.Tag = "query_a.check_date";
+ this.gv_checkDate.Width = 94;
+ //
+ // gv_lineNo
+ //
+ this.gv_lineNo.AppearanceCell.Options.UseFont = true;
+ this.gv_lineNo.Caption = "绾垮埆鍚嶇О";
+ this.gv_lineNo.FieldName = "lineName";
+ this.gv_lineNo.MinWidth = 50;
+ this.gv_lineNo.Name = "gv_lineNo";
+ this.gv_lineNo.OptionsColumn.AllowEdit = false;
+ this.gv_lineNo.Tag = "query_a.line_no";
+ this.gv_lineNo.Visible = true;
+ this.gv_lineNo.VisibleIndex = 14;
+ this.gv_lineNo.Width = 94;
+ //
// gridColumn13
//
this.gridColumn13.Caption = "鐢熶骇杞﹂棿";
@@ -616,64 +493,467 @@
this.gridColumn13.VisibleIndex = 15;
this.gridColumn13.Width = 94;
//
- // xtraTabControl1
+ // gv_classNo
//
- this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
- this.xtraTabControl1.Name = "xtraTabControl1";
- this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
- this.xtraTabControl1.TabIndex = 3;
- this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1,
- this.xtraTabPage2});
+ this.gv_classNo.AppearanceCell.Options.UseFont = true;
+ this.gv_classNo.Caption = "鐝 ";
+ this.gv_classNo.FieldName = "classNo";
+ this.gv_classNo.MinWidth = 50;
+ this.gv_classNo.Name = "gv_classNo";
+ this.gv_classNo.OptionsColumn.AllowEdit = false;
+ this.gv_classNo.Tag = "query_a.class_no";
+ this.gv_classNo.Width = 94;
//
- // xtraTabPage1
+ // gv_pbillNo
//
- this.xtraTabPage1.Controls.Add(this.gcMain);
- this.xtraTabPage1.Controls.Add(this.pageBar1);
- this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+ this.gv_pbillNo.AppearanceCell.Options.UseFont = true;
+ this.gv_pbillNo.Caption = "娲惧伐鍗曞彿 ";
+ this.gv_pbillNo.FieldName = "pbillNo";
+ this.gv_pbillNo.MinWidth = 50;
+ this.gv_pbillNo.Name = "gv_pbillNo";
+ this.gv_pbillNo.OptionsColumn.AllowEdit = false;
+ this.gv_pbillNo.Tag = "query_a.pbill_no";
+ this.gv_pbillNo.Width = 94;
+ //
+ // gv_kbQty
+ //
+ this.gv_kbQty.AppearanceCell.Options.UseFont = true;
+ this.gv_kbQty.Caption = "鍗℃澘鏁伴噺 ";
+ this.gv_kbQty.FieldName = "kbQty";
+ this.gv_kbQty.MinWidth = 50;
+ this.gv_kbQty.Name = "gv_kbQty";
+ this.gv_kbQty.OptionsColumn.AllowEdit = false;
+ this.gv_kbQty.Tag = "query_a.kb_qty";
+ this.gv_kbQty.Width = 94;
+ //
+ // gv_boxQty
+ //
+ this.gv_boxQty.AppearanceCell.Options.UseFont = true;
+ this.gv_boxQty.Caption = "姣忕鏁伴噺 ";
+ this.gv_boxQty.FieldName = "boxQty";
+ this.gv_boxQty.MinWidth = 50;
+ this.gv_boxQty.Name = "gv_boxQty";
+ this.gv_boxQty.OptionsColumn.AllowEdit = false;
+ this.gv_boxQty.Tag = "query_a.box_qty";
+ this.gv_boxQty.Width = 94;
+ //
+ // gv_id
+ //
+ this.gv_id.AppearanceCell.Options.UseFont = true;
+ this.gv_id.Caption = "鍞竴鏍囪瘑绗� ";
+ this.gv_id.FieldName = "id";
+ this.gv_id.MinWidth = 50;
+ this.gv_id.Name = "gv_id";
+ this.gv_id.OptionsColumn.AllowEdit = false;
+ this.gv_id.Tag = "query_a.id";
+ this.gv_id.Width = 94;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 531);
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
this.pageBar1.Size = new System.Drawing.Size(1126, 39);
- this.pageBar1.TabIndex = 3;
+ this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
- this.xtraTabPage2.Controls.Add(this.tabMx);
- this.xtraTabPage2.Controls.Add(this.panel1);
+ this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.PageEnabled = false;
this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+ //
+ // splitMx1
+ //
+ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitMx1.Horizontal = false;
+ this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Name = "splitMx1";
+ //
+ // splitMx1.splitMx1_Panel1
+ //
+ this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+ this.splitMx1.Panel1.Text = "Panel1";
+ //
+ // splitMx1.splitMx1_Panel2
+ //
+ this.splitMx1.Panel2.Controls.Add(this.tabMx);
+ this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.Size = new System.Drawing.Size(1126, 570);
+ this.splitMx1.SplitterPosition = 131;
+ this.splitMx1.TabIndex = 0;
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.lbGuid);
+ this.layoutMx1.Controls.Add(this.txt_itemModel);
+ this.layoutMx1.Controls.Add(this.txt_billNo);
+ this.layoutMx1.Controls.Add(this.txt_taskNo);
+ this.layoutMx1.Controls.Add(this.txt_createDate);
+ this.layoutMx1.Controls.Add(this.txt_itemName);
+ this.layoutMx1.Controls.Add(this.txt_itemNo);
+ this.layoutMx1.Controls.Add(this.txt_createBy);
+ this.layoutMx1.Controls.Add(this.txt_daa013);
+ this.layoutMx1.Controls.Add(this.txt_lineName);
+ this.layoutMx1.Controls.Add(this.txt_slSum);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem11});
+ this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Name = "layoutMx1";
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
+ this.layoutMx1.Root = this.Root;
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 131);
+ this.layoutMx1.TabIndex = 0;
+ this.layoutMx1.Text = "layoutControl1";
+ //
+ // Root
+ //
+ this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.Root.GroupBordersVisible = false;
+ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem1,
+ this.layoutControlItem2,
+ this.layoutControlItem3,
+ this.layoutControlItem4,
+ this.layoutControlItem5,
+ this.layoutControlItem6,
+ this.layoutControlItem7,
+ this.layoutControlItem8,
+ this.layoutControlItem9,
+ this.layoutControlItem10});
+ this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.Root.Name = "Root";
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
+ this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
+ this.Root.Size = new System.Drawing.Size(1105, 132);
+ this.Root.TextVisible = false;
+ //
+ // txt_itemModel
+ //
+ this.txt_itemModel.Location = new System.Drawing.Point(355, 68);
+ this.txt_itemModel.Name = "txt_itemModel";
+ this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemModel.Size = new System.Drawing.Size(195, 24);
+ this.txt_itemModel.StyleController = this.layoutMx1;
+ this.txt_itemModel.TabIndex = 264;
+ //
+ // lbGuid
+ //
+ this.lbGuid.Location = new System.Drawing.Point(825, 99);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(268, 25);
+ this.lbGuid.TabIndex = 1;
+ this.lbGuid.Text = "lbGuid";
+ this.lbGuid.Visible = false;
+ //
+ // txt_taskNo
+ //
+ this.txt_taskNo.Location = new System.Drawing.Point(84, 40);
+ this.txt_taskNo.Name = "txt_taskNo";
+ this.txt_taskNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_taskNo.Size = new System.Drawing.Size(195, 24);
+ this.txt_taskNo.StyleController = this.layoutMx1;
+ this.txt_taskNo.TabIndex = 262;
+ //
+ // txt_itemName
+ //
+ this.txt_itemName.Location = new System.Drawing.Point(355, 40);
+ this.txt_itemName.Name = "txt_itemName";
+ this.txt_itemName.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemName.Size = new System.Drawing.Size(195, 24);
+ this.txt_itemName.StyleController = this.layoutMx1;
+ this.txt_itemName.TabIndex = 243;
+ //
+ // txt_itemNo
+ //
+ this.txt_itemNo.Location = new System.Drawing.Point(355, 12);
+ this.txt_itemNo.Name = "txt_itemNo";
+ this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemNo.Size = new System.Drawing.Size(195, 24);
+ this.txt_itemNo.StyleController = this.layoutMx1;
+ this.txt_itemNo.TabIndex = 228;
+ //
+ // txt_createDate
+ //
+ this.txt_createDate.Location = new System.Drawing.Point(626, 40);
+ this.txt_createDate.Name = "txt_createDate";
+ this.txt_createDate.Properties.Appearance.Options.UseFont = true;
+ this.txt_createDate.Size = new System.Drawing.Size(195, 24);
+ this.txt_createDate.StyleController = this.layoutMx1;
+ this.txt_createDate.TabIndex = 222;
+ //
+ // txt_createBy
+ //
+ this.txt_createBy.Location = new System.Drawing.Point(626, 12);
+ this.txt_createBy.Name = "txt_createBy";
+ this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+ this.txt_createBy.Size = new System.Drawing.Size(195, 24);
+ this.txt_createBy.StyleController = this.layoutMx1;
+ this.txt_createBy.TabIndex = 219;
+ //
+ // txt_slSum
+ //
+ this.txt_slSum.Location = new System.Drawing.Point(355, 96);
+ this.txt_slSum.Name = "txt_slSum";
+ this.txt_slSum.Properties.Appearance.Options.UseFont = true;
+ this.txt_slSum.Size = new System.Drawing.Size(195, 24);
+ this.txt_slSum.StyleController = this.layoutMx1;
+ this.txt_slSum.TabIndex = 217;
+ //
+ // txt_daa013
+ //
+ this.txt_daa013.Location = new System.Drawing.Point(84, 68);
+ this.txt_daa013.Name = "txt_daa013";
+ this.txt_daa013.Properties.Appearance.Options.UseFont = true;
+ this.txt_daa013.Size = new System.Drawing.Size(195, 24);
+ this.txt_daa013.StyleController = this.layoutMx1;
+ this.txt_daa013.TabIndex = 216;
+ //
+ // txt_lineName
+ //
+ this.txt_lineName.Location = new System.Drawing.Point(84, 96);
+ this.txt_lineName.Name = "txt_lineName";
+ this.txt_lineName.Properties.Appearance.Options.UseFont = true;
+ this.txt_lineName.Size = new System.Drawing.Size(195, 24);
+ this.txt_lineName.StyleController = this.layoutMx1;
+ this.txt_lineName.TabIndex = 213;
+ //
+ // txt_billNo
+ //
+ this.txt_billNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_billNo.Name = "txt_billNo";
+ this.txt_billNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_billNo.Size = new System.Drawing.Size(195, 24);
+ this.txt_billNo.StyleController = this.layoutMx1;
+ this.txt_billNo.TabIndex = 211;
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_billNo;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem1.Text = "鎶ュ伐鍗曞彿";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_itemNo;
+ this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem2.Text = "浜у搧缂栧彿";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_taskNo;
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem3.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem3.Text = "宸ュ崟鍗曞彿";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_daa013;
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem4.Text = "鐢熶骇杞﹂棿";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_lineName;
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 84);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem5.Text = "鐢熶骇绾�";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_itemName;
+ this.layoutControlItem6.Location = new System.Drawing.Point(271, 28);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem6.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem6.Text = "浜у搧鍚嶇О";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_itemModel;
+ this.layoutControlItem7.Location = new System.Drawing.Point(271, 56);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem7.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem7.Text = "瑙勬牸鍨嬪彿";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_slSum;
+ this.layoutControlItem8.Location = new System.Drawing.Point(271, 84);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem8.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem8.Text = "鎶ュ伐鎬绘暟";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_createBy;
+ this.layoutControlItem9.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem9.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem9.Text = "鍒涘缓鑰�";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_createDate;
+ this.layoutControlItem10.Location = new System.Drawing.Point(542, 28);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem10.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem10.Text = "鍒涘缓鏃ユ湡";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.lbGuid;
+ this.layoutControlItem11.Location = new System.Drawing.Point(813, 87);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem11.Size = new System.Drawing.Size(272, 29);
+ this.layoutControlItem11.Text = "lbGuid";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem11.TextVisible = false;
//
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 151);
+ this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 419);
- this.tabMx.TabIndex = 2;
+ this.tabMx.Size = new System.Drawing.Size(1126, 427);
+ this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
this.xtraTabPage3});
+ //
+ // tabMxPage1
+ //
+ this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Name = "tabMxPage1";
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 395);
+ this.tabMxPage1.Text = "鎶ュ伐鏄庣粏";
+ //
+ // gcMx1
+ //
+ this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ 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, 395);
+ this.gcMx1.TabIndex = 0;
+ this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx1});
+ //
+ // gvMx1
+ //
+ this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gvMx1billNo,
+ this.gvMx1itemNo,
+ this.gvMx1quantity});
+ this.gvMx1.GridControl = this.gcMx1;
+ this.gvMx1.Name = "gvMx1";
+ this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx1.OptionsView.ShowGroupPanel = false;
+ //
+ // gvMx1billNo
+ //
+ this.gvMx1billNo.AppearanceCell.Options.UseFont = true;
+ this.gvMx1billNo.Caption = "鎶ュ伐鍗曞彿 ";
+ this.gvMx1billNo.FieldName = "billNo";
+ this.gvMx1billNo.MinWidth = 50;
+ this.gvMx1billNo.Name = "gvMx1billNo";
+ this.gvMx1billNo.Tag = "query_a.bill_no";
+ this.gvMx1billNo.Visible = true;
+ this.gvMx1billNo.VisibleIndex = 0;
+ this.gvMx1billNo.Width = 94;
+ //
+ // gvMx1itemNo
+ //
+ this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
+ this.gvMx1itemNo.Caption = "鐗╂枡缂栧彿 ";
+ this.gvMx1itemNo.FieldName = "itemNo";
+ this.gvMx1itemNo.MinWidth = 50;
+ this.gvMx1itemNo.Name = "gvMx1itemNo";
+ this.gvMx1itemNo.Tag = "query_a.item_no";
+ this.gvMx1itemNo.Visible = true;
+ this.gvMx1itemNo.VisibleIndex = 1;
+ this.gvMx1itemNo.Width = 94;
+ //
+ // gvMx1quantity
+ //
+ this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
+ this.gvMx1quantity.Caption = "鏁伴噺 ";
+ this.gvMx1quantity.FieldName = "quantity";
+ this.gvMx1quantity.MinWidth = 50;
+ this.gvMx1quantity.Name = "gvMx1quantity";
+ this.gvMx1quantity.Tag = "query_a.quantity";
+ this.gvMx1quantity.Visible = true;
+ this.gvMx1quantity.VisibleIndex = 2;
+ this.gvMx1quantity.Width = 94;
//
// xtraTabPage3
//
this.xtraTabPage3.Controls.Add(this.gcMx2);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1124, 387);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1124, 538);
this.xtraTabPage3.Text = "鏉＄爜鏄庣粏";
//
// gcMx2
@@ -682,7 +962,7 @@
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, 387);
+ this.gcMx2.Size = new System.Drawing.Size(1124, 538);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -807,150 +1087,6 @@
this.gridColumn16.VisibleIndex = 8;
this.gridColumn16.Width = 94;
//
- // panel1
- //
- this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.labelControl1);
- this.panel1.Controls.Add(this.txt_itemModel);
- this.panel1.Controls.Add(this.labelControl11);
- this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_taskNo);
- this.panel1.Controls.Add(this.txt_taskNo);
- this.panel1.Controls.Add(this.lb_status);
- this.panel1.Controls.Add(this.txt_itemName);
- this.panel1.Controls.Add(this.lb_lastupdateDate);
- this.panel1.Controls.Add(this.txt_itemNo);
- 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_factory);
- this.panel1.Controls.Add(this.txt_slSum);
- this.panel1.Controls.Add(this.lb_company);
- this.panel1.Controls.Add(this.txt_daa013);
- this.panel1.Controls.Add(this.lb_lineNo);
- this.panel1.Controls.Add(this.txt_lineName);
- this.panel1.Controls.Add(this.lb_billNo);
- this.panel1.Controls.Add(this.txt_billNo);
- this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 151);
- this.panel1.TabIndex = 1;
- //
- // labelControl1
- //
- this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(273, 84);
- this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(60, 18);
- this.labelControl1.TabIndex = 263;
- this.labelControl1.Text = "瑙勬牸鍨嬪彿";
- //
- // txt_itemModel
- //
- this.txt_itemModel.Location = new System.Drawing.Point(348, 80);
- this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(238, 24);
- this.txt_itemModel.TabIndex = 264;
- //
- // labelControl11
- //
- this.labelControl11.Location = new System.Drawing.Point(629, 90);
- 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);
- this.labelControl11.TabIndex = 130;
- this.labelControl11.Text = "涓婚敭锛�";
- this.labelControl11.Visible = false;
- //
- // lbGuid
- //
- this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(680, 90);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(0, 18);
- this.lbGuid.TabIndex = 1;
- this.lbGuid.Visible = false;
- //
- // lb_status
- //
- this.lb_status.Appearance.Options.UseFont = true;
- this.lb_status.Location = new System.Drawing.Point(273, 52);
- this.lb_status.Name = "lb_status";
- this.lb_status.Size = new System.Drawing.Size(60, 18);
- this.lb_status.TabIndex = 243;
- this.lb_status.Text = "浜у搧鍚嶇О";
- //
- // lb_lastupdateDate
- //
- this.lb_lastupdateDate.Appearance.Options.UseFont = true;
- this.lb_lastupdateDate.Location = new System.Drawing.Point(273, 20);
- this.lb_lastupdateDate.Name = "lb_lastupdateDate";
- this.lb_lastupdateDate.Size = new System.Drawing.Size(60, 18);
- this.lb_lastupdateDate.TabIndex = 228;
- this.lb_lastupdateDate.Text = "浜у搧缂栧彿";
- //
- // txt_itemNo
- //
- this.txt_itemNo.Location = new System.Drawing.Point(348, 16);
- this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(238, 24);
- this.txt_itemNo.TabIndex = 228;
- //
- // lb_factory
- //
- this.lb_factory.Appearance.Options.UseFont = true;
- this.lb_factory.Location = new System.Drawing.Point(273, 117);
- this.lb_factory.Name = "lb_factory";
- this.lb_factory.Size = new System.Drawing.Size(60, 18);
- this.lb_factory.TabIndex = 217;
- this.lb_factory.Text = "鎶ュ伐鎬绘暟";
- //
- // txt_slSum
- //
- this.txt_slSum.Location = new System.Drawing.Point(348, 113);
- this.txt_slSum.Name = "txt_slSum";
- this.txt_slSum.Properties.Appearance.Options.UseFont = true;
- this.txt_slSum.Size = new System.Drawing.Size(238, 24);
- this.txt_slSum.TabIndex = 217;
- //
- // lb_company
- //
- this.lb_company.Appearance.Options.UseFont = true;
- this.lb_company.Location = new System.Drawing.Point(25, 84);
- this.lb_company.Name = "lb_company";
- this.lb_company.Size = new System.Drawing.Size(60, 18);
- this.lb_company.TabIndex = 216;
- this.lb_company.Text = "鐢熶骇杞﹂棿";
- //
- // txt_daa013
- //
- this.txt_daa013.Location = new System.Drawing.Point(97, 80);
- this.txt_daa013.Name = "txt_daa013";
- this.txt_daa013.Properties.Appearance.Options.UseFont = true;
- this.txt_daa013.Size = new System.Drawing.Size(162, 24);
- this.txt_daa013.TabIndex = 216;
- //
- // lb_lineNo
- //
- this.lb_lineNo.Appearance.Options.UseFont = true;
- this.lb_lineNo.Location = new System.Drawing.Point(42, 117);
- this.lb_lineNo.Name = "lb_lineNo";
- this.lb_lineNo.Size = new System.Drawing.Size(45, 18);
- this.lb_lineNo.TabIndex = 213;
- this.lb_lineNo.Text = "鐢熶骇绾�";
- //
- // txt_lineName
- //
- this.txt_lineName.Location = new System.Drawing.Point(97, 113);
- this.txt_lineName.Name = "txt_lineName";
- this.txt_lineName.Properties.Appearance.Options.UseFont = true;
- this.txt_lineName.Size = new System.Drawing.Size(162, 24);
- this.txt_lineName.TabIndex = 213;
- //
// Frm_MesWorkProd
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -960,81 +1096,125 @@
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesWorkProd";
this.Text = "鐢熶骇鎶ュ伐鏌ヨ";
- this.tabMxPage1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+ this.split1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+ this.split1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
- this.tabMx.ResumeLayout(false);
- this.xtraTabPage3.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+ this.splitMx1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+ this.splitMx1.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+ this.splitMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+ this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_slSum.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa013.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+ this.tabMx.ResumeLayout(false);
+ this.tabMxPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ this.xtraTabPage3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
this.ResumeLayout(false);
}
#endregion
private UserControl.UcToolBarMenu toolBarMenu1;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_status;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_taskNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_lineNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_classNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_pbillNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_kbQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_boxQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_id;
private UserControls.Data.UcPageBar pageBar1;
- private System.Windows.Forms.Panel panel1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+ private DevExpress.XtraLayout.LayoutControl layoutMx1;
+ private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private DevExpress.XtraEditors.TextEdit txt_itemModel;
private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.LabelControl labelControl11;
+ private DevExpress.XtraEditors.TextEdit txt_taskNo;
+ private DevExpress.XtraEditors.TextEdit txt_itemName;
+ private DevExpress.XtraEditors.TextEdit txt_itemNo;
+ private DevExpress.XtraEditors.TextEdit txt_createDate;
+ private DevExpress.XtraEditors.TextEdit txt_createBy;
+ private DevExpress.XtraEditors.TextEdit txt_slSum;
+ private DevExpress.XtraEditors.TextEdit txt_daa013;
+ private DevExpress.XtraEditors.TextEdit txt_lineName;
+ private DevExpress.XtraEditors.TextEdit txt_billNo;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraTab.XtraTabControl tabMx;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1billNo;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_boxQty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_kbQty;
-
- private DevExpress.XtraEditors.LabelControl lb_taskNo;
- private DevExpress.XtraEditors.TextEdit txt_taskNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_taskNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_pbillNo;
- private DevExpress.XtraEditors.TextEdit txt_itemName;
- private DevExpress.XtraGrid.Columns.GridColumn gv_status;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
- private DevExpress.XtraGrid.Columns.GridColumn gv_classNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
-
- 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_lineNo;
-
- private DevExpress.XtraEditors.LabelControl lb_billNo;
- private DevExpress.XtraEditors.TextEdit txt_billNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_id;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1billNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
@@ -1044,30 +1224,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemSname;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private DevExpress.XtraEditors.LabelControl lb_factory;
- private DevExpress.XtraEditors.TextEdit txt_slSum;
- private DevExpress.XtraEditors.LabelControl lb_company;
- private DevExpress.XtraEditors.TextEdit txt_daa013;
- private DevExpress.XtraEditors.LabelControl lb_lineNo;
- private DevExpress.XtraEditors.TextEdit txt_lineName;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
- private DevExpress.XtraEditors.LabelControl labelControl1;
- private DevExpress.XtraEditors.TextEdit txt_itemModel;
- private DevExpress.XtraEditors.LabelControl lb_status;
- private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
- private DevExpress.XtraEditors.TextEdit txt_itemNo;
- private DevExpress.Utils.ToolTipController tips;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs
index 2678478..2830788 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWorkProd.cs
@@ -183,7 +183,7 @@
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx2);
gvList.Add(gvMx1);
- UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index cb0399c..acccbab 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -57,6 +57,7 @@
DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -244,12 +245,14 @@
this.txt_kQty98 = new DevExpress.XtraEditors.TextEdit();
this.txt_printRemark98 = new DevExpress.XtraEditors.TextEdit();
this.txt_iCount_98 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_zQty98 = new DevExpress.XtraEditors.TextEdit();
this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx4 = new DevExpress.XtraGrid.GridControl();
this.gvMx4 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -367,12 +370,14 @@
((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_printRemark98.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_zQty98.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
this.xtraTabPage4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
@@ -2212,7 +2217,7 @@
this.layoutMx99.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx99.Location = new System.Drawing.Point(0, 0);
this.layoutMx99.Name = "layoutMx99";
- this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(174, 443, 812, 500);
+ this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(256, 530, 812, 500);
this.layoutMx99.Root = this.layoutControlGroup1;
this.layoutMx99.Size = new System.Drawing.Size(1265, 82);
this.layoutMx99.TabIndex = 0;
@@ -2220,7 +2225,7 @@
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(813, 10);
+ this.radOut.Location = new System.Drawing.Point(853, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2228,46 +2233,46 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄨ嚜鍔�"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍗婅嚜鍔�"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩")});
- this.radOut.Size = new System.Drawing.Size(348, 28);
+ this.radOut.Size = new System.Drawing.Size(248, 31);
this.radOut.StyleController = this.layoutMx99;
this.radOut.TabIndex = 473;
//
// ucBtnPrint1
//
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(812, 41);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(851, 41);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(267, 31);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(278, 31);
this.ucBtnPrint1.TabIndex = 464;
//
// txt_iCount_1
//
- this.txt_iCount_1.Location = new System.Drawing.Point(633, 43);
+ this.txt_iCount_1.Location = new System.Drawing.Point(659, 43);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(176, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(189, 24);
this.txt_iCount_1.StyleController = this.layoutMx99;
this.txt_iCount_1.TabIndex = 332;
this.txt_iCount_1.Tag = "readOnly-1";
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(366, 43);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(379, 43);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(176, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(189, 24);
this.txt_psnQty_1.StyleController = this.layoutMx99;
this.txt_psnQty_1.TabIndex = 330;
this.txt_psnQty_1.Tag = "readOnly-1";
//
// txt_printRemark
//
- this.txt_printRemark.Location = new System.Drawing.Point(633, 12);
+ this.txt_printRemark.Location = new System.Drawing.Point(659, 12);
this.txt_printRemark.Name = "txt_printRemark";
this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
- this.txt_printRemark.Size = new System.Drawing.Size(176, 24);
+ this.txt_printRemark.Size = new System.Drawing.Size(189, 24);
this.txt_printRemark.StyleController = this.layoutMx99;
this.txt_printRemark.TabIndex = 334;
this.txt_printRemark.Tag = "readOnly-1";
@@ -2275,11 +2280,11 @@
// txt_kQty
//
this.txt_kQty.EditValue = "";
- this.txt_kQty.Location = new System.Drawing.Point(366, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(379, 12);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(176, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(189, 24);
this.txt_kQty.StyleController = this.layoutMx99;
this.txt_kQty.TabIndex = 472;
this.txt_kQty.Tag = "readonly";
@@ -2290,7 +2295,7 @@
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
- this.txt_yQty.Size = new System.Drawing.Size(176, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(189, 24);
this.txt_yQty.StyleController = this.layoutMx99;
this.txt_yQty.TabIndex = 470;
this.txt_yQty.Tag = "readonly";
@@ -2300,7 +2305,7 @@
this.txt_zQty.Location = new System.Drawing.Point(99, 12);
this.txt_zQty.Name = "txt_zQty";
this.txt_zQty.Properties.ReadOnly = true;
- this.txt_zQty.Size = new System.Drawing.Size(176, 24);
+ this.txt_zQty.Size = new System.Drawing.Size(189, 24);
this.txt_zQty.StyleController = this.layoutMx99;
this.txt_zQty.TabIndex = 474;
//
@@ -2328,7 +2333,7 @@
columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition8.Width = 100D;
columnDefinition9.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition9.Width = 175D;
+ columnDefinition9.Width = 125D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition5,
columnDefinition6,
@@ -2350,10 +2355,10 @@
this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem23.Control = this.txt_kQty;
- this.layoutControlItem23.Location = new System.Drawing.Point(267, 0);
+ this.layoutControlItem23.Location = new System.Drawing.Point(280, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem23.Size = new System.Drawing.Size(267, 31);
+ this.layoutControlItem23.Size = new System.Drawing.Size(280, 31);
this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2362,10 +2367,10 @@
this.layoutControlItem21.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem21.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem21.Control = this.txt_printRemark;
- this.layoutControlItem21.Location = new System.Drawing.Point(534, 0);
+ this.layoutControlItem21.Location = new System.Drawing.Point(560, 0);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem21.Size = new System.Drawing.Size(267, 31);
+ this.layoutControlItem21.Size = new System.Drawing.Size(280, 31);
this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2375,11 +2380,11 @@
this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem24.Control = this.txt_psnQty_1;
this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�";
- this.layoutControlItem24.Location = new System.Drawing.Point(267, 31);
+ this.layoutControlItem24.Location = new System.Drawing.Point(280, 31);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem24.Size = new System.Drawing.Size(267, 31);
+ this.layoutControlItem24.Size = new System.Drawing.Size(280, 31);
this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2388,25 +2393,25 @@
this.layoutControlItem25.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem25.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem25.Control = this.txt_iCount_1;
- this.layoutControlItem25.Location = new System.Drawing.Point(534, 31);
+ this.layoutControlItem25.Location = new System.Drawing.Point(560, 31);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem25.Size = new System.Drawing.Size(267, 31);
+ this.layoutControlItem25.Size = new System.Drawing.Size(280, 31);
this.layoutControlItem25.Text = "鎵撳嵃寮犳暟";
this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.radOut;
- this.layoutControlItem35.Location = new System.Drawing.Point(801, 0);
- this.layoutControlItem35.MaxSize = new System.Drawing.Size(350, 28);
- this.layoutControlItem35.MinSize = new System.Drawing.Size(300, 20);
+ this.layoutControlItem35.Location = new System.Drawing.Point(840, 0);
+ this.layoutControlItem35.MaxSize = new System.Drawing.Size(251, 0);
+ this.layoutControlItem35.MinSize = new System.Drawing.Size(221, 20);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem35.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
- this.layoutControlItem35.Size = new System.Drawing.Size(444, 31);
+ this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
+ this.layoutControlItem35.Size = new System.Drawing.Size(405, 31);
this.layoutControlItem35.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem35.Text = "鑷姩璁＄畻";
this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
@@ -2417,12 +2422,12 @@
this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem26.Control = this.ucBtnPrint1;
- this.layoutControlItem26.Location = new System.Drawing.Point(801, 31);
+ this.layoutControlItem26.Location = new System.Drawing.Point(840, 31);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
- this.layoutControlItem26.Size = new System.Drawing.Size(269, 31);
+ this.layoutControlItem26.Size = new System.Drawing.Size(280, 31);
this.layoutControlItem26.Text = "鎶ュ伐鎵撳嵃";
this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem26.TextVisible = false;
@@ -2435,7 +2440,7 @@
this.layoutControlItem22.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(267, 31);
+ this.layoutControlItem22.Size = new System.Drawing.Size(280, 31);
this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2444,7 +2449,7 @@
this.layoutControlItem36.Control = this.txt_zQty;
this.layoutControlItem36.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem36.Name = "layoutControlItem36";
- this.layoutControlItem36.Size = new System.Drawing.Size(267, 31);
+ this.layoutControlItem36.Size = new System.Drawing.Size(280, 31);
this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2594,10 +2599,11 @@
this.layoutMx98.Controls.Add(this.txt_kQty98);
this.layoutMx98.Controls.Add(this.txt_printRemark98);
this.layoutMx98.Controls.Add(this.txt_iCount_98);
+ this.layoutMx98.Controls.Add(this.txt_zQty98);
this.layoutMx98.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx98.Location = new System.Drawing.Point(0, 0);
this.layoutMx98.Name = "layoutMx98";
- this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(199, 178, 812, 500);
+ this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(96, 558, 812, 500);
this.layoutMx98.Root = this.layoutControlGroup2;
this.layoutMx98.Size = new System.Drawing.Size(1265, 54);
this.layoutMx98.TabIndex = 0;
@@ -2606,57 +2612,67 @@
// ucBtnPrint98
//
this.ucBtnPrint98.guidKey = null;
- this.ucBtnPrint98.Location = new System.Drawing.Point(1007, 10);
+ this.ucBtnPrint98.Location = new System.Drawing.Point(1046, 10);
this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint98.Name = "ucBtnPrint98";
this.ucBtnPrint98.rptParameter = null;
- this.ucBtnPrint98.Size = new System.Drawing.Size(247, 34);
+ this.ucBtnPrint98.Size = new System.Drawing.Size(208, 34);
this.ucBtnPrint98.TabIndex = 8;
//
// txt_yQty98
//
- this.txt_yQty98.Location = new System.Drawing.Point(114, 12);
+ this.txt_yQty98.Location = new System.Drawing.Point(321, 12);
this.txt_yQty98.Name = "txt_yQty98";
this.txt_yQty98.Properties.ReadOnly = true;
- this.txt_yQty98.Size = new System.Drawing.Size(143, 24);
+ this.txt_yQty98.Size = new System.Drawing.Size(101, 24);
this.txt_yQty98.StyleController = this.layoutMx98;
this.txt_yQty98.TabIndex = 4;
//
// txt_kQty98
//
- this.txt_kQty98.Location = new System.Drawing.Point(363, 12);
+ this.txt_kQty98.Location = new System.Drawing.Point(528, 12);
this.txt_kQty98.Name = "txt_kQty98";
this.txt_kQty98.Properties.ReadOnly = true;
- this.txt_kQty98.Size = new System.Drawing.Size(143, 24);
+ this.txt_kQty98.Size = new System.Drawing.Size(101, 24);
this.txt_kQty98.StyleController = this.layoutMx98;
this.txt_kQty98.TabIndex = 5;
//
// txt_printRemark98
//
- this.txt_printRemark98.Location = new System.Drawing.Point(612, 12);
+ this.txt_printRemark98.Location = new System.Drawing.Point(735, 12);
this.txt_printRemark98.Name = "txt_printRemark98";
- this.txt_printRemark98.Size = new System.Drawing.Size(143, 24);
+ this.txt_printRemark98.Size = new System.Drawing.Size(101, 24);
this.txt_printRemark98.StyleController = this.layoutMx98;
this.txt_printRemark98.TabIndex = 6;
//
// txt_iCount_98
//
- this.txt_iCount_98.Location = new System.Drawing.Point(861, 12);
+ this.txt_iCount_98.Location = new System.Drawing.Point(942, 12);
this.txt_iCount_98.Name = "txt_iCount_98";
- this.txt_iCount_98.Size = new System.Drawing.Size(143, 24);
+ this.txt_iCount_98.Size = new System.Drawing.Size(101, 24);
this.txt_iCount_98.StyleController = this.layoutMx98;
this.txt_iCount_98.TabIndex = 7;
+ //
+ // txt_zQty98
+ //
+ this.txt_zQty98.Location = new System.Drawing.Point(114, 12);
+ this.txt_zQty98.Name = "txt_zQty98";
+ this.txt_zQty98.Properties.ReadOnly = true;
+ this.txt_zQty98.Size = new System.Drawing.Size(101, 24);
+ this.txt_zQty98.StyleController = this.layoutMx98;
+ this.txt_zQty98.TabIndex = 9;
//
// layoutControlGroup2
//
this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.layoutControlGroup2.GroupBordersVisible = false;
this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem30,
- this.layoutControlItem31,
- this.layoutControlItem32,
+ this.layoutControlItem34,
this.layoutControlItem33,
- this.layoutControlItem34});
+ this.layoutControlItem32,
+ this.layoutControlItem31,
+ this.layoutControlItem30,
+ this.layoutControlItem37});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "Root";
columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -2669,12 +2685,15 @@
columnDefinition13.Width = 100D;
columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition14.Width = 100D;
+ columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition15.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition10,
columnDefinition11,
columnDefinition12,
columnDefinition13,
- columnDefinition14});
+ columnDefinition14,
+ columnDefinition15});
rowDefinition9.Height = 100D;
rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
@@ -2682,56 +2701,66 @@
this.layoutControlGroup2.Size = new System.Drawing.Size(1265, 54);
this.layoutControlGroup2.TextVisible = false;
//
- // layoutControlItem30
+ // layoutControlItem34
//
- this.layoutControlItem30.Control = this.txt_yQty98;
- this.layoutControlItem30.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem30.Name = "layoutControlItem30";
- this.layoutControlItem30.Size = new System.Drawing.Size(249, 34);
- this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�";
- this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem31
- //
- this.layoutControlItem31.Control = this.txt_kQty98;
- this.layoutControlItem31.Location = new System.Drawing.Point(249, 0);
- this.layoutControlItem31.Name = "layoutControlItem31";
- this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem31.Size = new System.Drawing.Size(249, 34);
- this.layoutControlItem31.Text = "鍙墦鍗版暟閲�";
- this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem32
- //
- this.layoutControlItem32.Control = this.txt_printRemark98;
- this.layoutControlItem32.Location = new System.Drawing.Point(498, 0);
- this.layoutControlItem32.Name = "layoutControlItem32";
- this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem32.Size = new System.Drawing.Size(249, 34);
- this.layoutControlItem32.Text = "鎵撳嵃澶囨敞";
- this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem34.Control = this.ucBtnPrint98;
+ this.layoutControlItem34.Location = new System.Drawing.Point(1035, 0);
+ this.layoutControlItem34.Name = "layoutControlItem34";
+ this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 5;
+ this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
+ this.layoutControlItem34.Size = new System.Drawing.Size(210, 34);
+ this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳";
+ this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem34.TextVisible = false;
//
// layoutControlItem33
//
this.layoutControlItem33.Control = this.txt_iCount_98;
- this.layoutControlItem33.Location = new System.Drawing.Point(747, 0);
+ this.layoutControlItem33.Location = new System.Drawing.Point(828, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem33.Size = new System.Drawing.Size(249, 34);
+ this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem33.Size = new System.Drawing.Size(207, 34);
this.layoutControlItem33.Text = "鏈鎵撳嵃寮犳暟";
this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem34
+ // layoutControlItem32
//
- this.layoutControlItem34.Control = this.ucBtnPrint98;
- this.layoutControlItem34.Location = new System.Drawing.Point(996, 0);
- this.layoutControlItem34.Name = "layoutControlItem34";
- this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
- this.layoutControlItem34.Size = new System.Drawing.Size(249, 34);
- this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳";
- this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem34.TextVisible = false;
+ this.layoutControlItem32.Control = this.txt_printRemark98;
+ this.layoutControlItem32.Location = new System.Drawing.Point(621, 0);
+ this.layoutControlItem32.Name = "layoutControlItem32";
+ this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem32.Size = new System.Drawing.Size(207, 34);
+ this.layoutControlItem32.Text = "鎵撳嵃澶囨敞";
+ this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem31
+ //
+ this.layoutControlItem31.Control = this.txt_kQty98;
+ this.layoutControlItem31.Location = new System.Drawing.Point(414, 0);
+ this.layoutControlItem31.Name = "layoutControlItem31";
+ this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem31.Size = new System.Drawing.Size(207, 34);
+ this.layoutControlItem31.Text = "鍙墦鍗版暟閲�";
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem30
+ //
+ this.layoutControlItem30.Control = this.txt_yQty98;
+ this.layoutControlItem30.Location = new System.Drawing.Point(207, 0);
+ this.layoutControlItem30.Name = "layoutControlItem30";
+ this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem30.Size = new System.Drawing.Size(207, 34);
+ this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�";
+ this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem37
+ //
+ this.layoutControlItem37.Control = this.txt_zQty98;
+ this.layoutControlItem37.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem37.Name = "layoutControlItem37";
+ this.layoutControlItem37.Size = new System.Drawing.Size(207, 34);
+ this.layoutControlItem37.Text = "宸ュ崟鎬婚噺";
+ this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
//
// xtraTabPage4
//
@@ -2798,8 +2827,8 @@
// gridColumn41
//
this.gridColumn41.AppearanceCell.Options.UseFont = true;
- this.gridColumn41.Caption = "杩芥函鐮�";
- this.gridColumn41.FieldName = "barCode";
+ this.gridColumn41.Caption = "鍚庣洊鐮�";
+ this.gridColumn41.FieldName = "itemBarcode";
this.gridColumn41.MinWidth = 50;
this.gridColumn41.Name = "gridColumn41";
this.gridColumn41.Tag = "query_a.ITEM_BARCODE";
@@ -2845,8 +2874,8 @@
//
// gridColumn47
//
- this.gridColumn47.Caption = "绾垮埆ID";
- this.gridColumn47.FieldName = "lineId";
+ this.gridColumn47.Caption = "宸茬粦鎵樻澘鐮�";
+ this.gridColumn47.FieldName = "aboutTbBarcode";
this.gridColumn47.MinWidth = 25;
this.gridColumn47.Name = "gridColumn47";
this.gridColumn47.Visible = true;
@@ -2855,8 +2884,8 @@
//
// gridColumn48
//
- this.gridColumn48.Caption = "绾垮埆鍚嶇О";
- this.gridColumn48.FieldName = "xtName";
+ this.gridColumn48.Caption = "宸茬粦杩芥函鐮�";
+ this.gridColumn48.FieldName = "aboutTracBarcode";
this.gridColumn48.MinWidth = 25;
this.gridColumn48.Name = "gridColumn48";
this.gridColumn48.Visible = true;
@@ -2875,7 +2904,7 @@
// ucBtnPrint100
//
this.ucBtnPrint100.guidKey = null;
- this.ucBtnPrint100.Location = new System.Drawing.Point(20, 9);
+ this.ucBtnPrint100.Location = new System.Drawing.Point(20, 10);
this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint100.Name = "ucBtnPrint100";
this.ucBtnPrint100.rptParameter = null;
@@ -2994,12 +3023,14 @@
((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_printRemark98.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_zQty98.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
this.xtraTabPage4.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
@@ -3179,11 +3210,6 @@
private DevExpress.XtraEditors.TextEdit txt_kQty98;
private DevExpress.XtraEditors.TextEdit txt_printRemark98;
private DevExpress.XtraEditors.TextEdit txt_iCount_98;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
private DevExpress.Utils.ToolTipController tips;
@@ -3214,5 +3240,12 @@
private DevExpress.XtraEditors.TextEdit txt_zQty;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
+ private DevExpress.XtraEditors.TextEdit txt_zQty98;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index ea3b89f..c1b0f62 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -70,7 +70,7 @@
//杩欐槸鍚庣洊鐮侊紝浠呬粎鎵撳嵃锛�
this.ucBtnPrint100.btnDesignClick += (s, e) =>
{
- ucBtnPrint100.rptParameter = "rpt_trace{}";
+ ucBtnPrint100.rptParameter = "rpt_hgm{}";
};
this.ucBtnPrint100.btnReportClick += (s, e) =>
{
@@ -91,8 +91,6 @@
radOut.Properties.Items[0].Description = "鍏ㄨ嚜鍔�";
};
}
-
-
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -369,9 +367,14 @@
//string cjId = dy.daa013;
//string xjxt = dy.sjXt;
// txt_sjXt.getSuppler(cjId, xjxt);
- txt_zQty.Text = dy.daa008;
+ //鎵樻澘鐮�
+ txt_zQty.Text = dy.daa008;
txt_yQty.Text = dy.yQty;
txt_kQty.Text = dy.kQty;
+ //杩芥函鐮�
+ txt_zQty98.Text = dy.daa008;
+ txt_yQty98.Text = dy.yQty98;
+ txt_kQty98.Text = dy.kQty98;
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
@@ -609,7 +612,8 @@
this.ucBtnPrint98.rptParameter = "return false";
return;
}
- this.ucBtnPrint98.rptParameter = "rpt_trace{" + ""
+ this.ucBtnPrint98.rptParameter = "rpt_trace{"
+ + ""
+ "," + txt_printRemark98.Text.Trim()
+ "," + ""
+ "," + txt_iCount_98.Text.Trim()
@@ -633,8 +637,8 @@
return;
}
- this.ucBtnPrint100.rptParameter = "rpt_trace{"
- + lbGuid.Text.Trim()
+ this.ucBtnPrint100.rptParameter = "rpt_hgm{"
+ + "100"
+ "," + ""
+ "," + ""
+ "," + ""
--
Gitblit v1.9.3