From 1aca87a7186fe6bff1e6aa9501bc3e7daf1159ba Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 11 三月 2025 14:32:33 +0800
Subject: [PATCH] 生产补料
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 691 +++++++++---------
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs | 42 -
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs | 598 ++++++++-------
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 9
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs | 373 +++++----
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs | 513 +++++++-----
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 36
7 files changed, 1,170 insertions(+), 1,092 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
index 61e3945..595ccd8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
@@ -39,7 +39,6 @@
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.picCheckBox = new System.Windows.Forms.PictureBox();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
@@ -55,42 +54,43 @@
this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_receiver = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_outPart = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = 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.lbGuid = new System.Windows.Forms.Label();
this.txt_depotId = new DevExpress.XtraEditors.TextEdit();
this.txt_outPart = new DevExpress.XtraEditors.TextEdit();
- this.lbGuid = new System.Windows.Forms.Label();
this.txt_outType = new DevExpress.XtraEditors.TextEdit();
- this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
- this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
- this.txt_pbillNo = new DevExpress.XtraEditors.TextEdit();
this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
- this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
+ this.txt_pbillNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
+ this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
+ this.txt_status = new DevExpress.XtraEditors.CheckEdit();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
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.txt_status = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -118,9 +118,15 @@
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.txt_dldh = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_fSubsidiary = new DevExpress.XtraEditors.TextEdit();
+ this.sp_fSubsidiary = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.xtraTabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
@@ -136,34 +142,33 @@
((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.txt_depotId.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_outPart.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
- this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).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.txt_status.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -172,6 +177,12 @@
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dldh.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.sp_fSubsidiary)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -201,17 +212,6 @@
this.xtraTabPage1,
this.xtraTabPage2});
//
- // picCheckBox
- //
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(847, 55);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 8;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
- //
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
@@ -226,13 +226,13 @@
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
//
- // split1.split1_Panel1
+ // split1.Panel1
//
this.split1.Panel1.Controls.Add(this.gcMain1);
this.split1.Panel1.Controls.Add(this.pageBar1);
this.split1.Panel1.Text = "Panel1";
//
- // split1.split1_Panel2
+ // split1.Panel2
//
this.split1.Panel2.Text = "Panel2";
this.split1.Size = new System.Drawing.Size(1126, 570);
@@ -258,8 +258,6 @@
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_status,
this.gv_itemOutNo,
- this.gv_workNo,
- this.gv_pbillNo,
this.gv_boardItem,
this.gridColumn1,
this.gv_outDate,
@@ -267,11 +265,16 @@
this.gv_checkUser,
this.gv_checkDate,
this.gv_receiver,
- this.gv_outPart,
this.gv_createBy,
this.gv_createDate,
this.gv_remark,
- this.gv_reason});
+ this.gv_workNo,
+ this.gv_pbillNo,
+ this.gridColumn7,
+ this.gridColumn8,
+ this.gridColumn11,
+ this.gridColumn9,
+ this.gridColumn10});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -312,13 +315,13 @@
this.gv_workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_workNo.AppearanceCell.Options.UseFont = true;
this.gv_workNo.Caption = "鎶曟枡鍗曞彿";
- this.gv_workNo.FieldName = "workNo";
+ this.gv_workNo.FieldName = "dldh";
this.gv_workNo.MinWidth = 25;
this.gv_workNo.Name = "gv_workNo";
this.gv_workNo.OptionsColumn.AllowEdit = false;
this.gv_workNo.Tag = "query_a.work_no";
this.gv_workNo.Visible = true;
- this.gv_workNo.VisibleIndex = 2;
+ this.gv_workNo.VisibleIndex = 12;
this.gv_workNo.Width = 100;
//
// gv_pbillNo
@@ -332,7 +335,7 @@
this.gv_pbillNo.OptionsColumn.AllowEdit = false;
this.gv_pbillNo.Tag = "query_a.pbill_no";
this.gv_pbillNo.Visible = true;
- this.gv_pbillNo.VisibleIndex = 3;
+ this.gv_pbillNo.VisibleIndex = 13;
this.gv_pbillNo.Width = 94;
//
// gv_boardItem
@@ -346,7 +349,7 @@
this.gv_boardItem.OptionsColumn.AllowEdit = false;
this.gv_boardItem.Tag = "query_a.board_item";
this.gv_boardItem.Visible = true;
- this.gv_boardItem.VisibleIndex = 4;
+ this.gv_boardItem.VisibleIndex = 2;
this.gv_boardItem.Width = 94;
//
// gridColumn1
@@ -356,7 +359,7 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 5;
+ this.gridColumn1.VisibleIndex = 3;
this.gridColumn1.Width = 120;
//
// gv_outDate
@@ -370,7 +373,7 @@
this.gv_outDate.OptionsColumn.AllowEdit = false;
this.gv_outDate.Tag = "query_a.out_date";
this.gv_outDate.Visible = true;
- this.gv_outDate.VisibleIndex = 6;
+ this.gv_outDate.VisibleIndex = 4;
this.gv_outDate.Width = 120;
//
// gv_outType
@@ -384,7 +387,7 @@
this.gv_outType.OptionsColumn.AllowEdit = false;
this.gv_outType.Tag = "query_a.out_type";
this.gv_outType.Visible = true;
- this.gv_outType.VisibleIndex = 7;
+ this.gv_outType.VisibleIndex = 5;
this.gv_outType.Width = 94;
//
// gv_checkUser
@@ -398,7 +401,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 8;
+ this.gv_checkUser.VisibleIndex = 6;
this.gv_checkUser.Width = 94;
//
// gv_checkDate
@@ -412,7 +415,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 9;
+ this.gv_checkDate.VisibleIndex = 7;
this.gv_checkDate.Width = 120;
//
// gv_receiver
@@ -426,22 +429,8 @@
this.gv_receiver.OptionsColumn.AllowEdit = false;
this.gv_receiver.Tag = "query_a.receiver";
this.gv_receiver.Visible = true;
- this.gv_receiver.VisibleIndex = 10;
+ this.gv_receiver.VisibleIndex = 8;
this.gv_receiver.Width = 94;
- //
- // gv_outPart
- //
- this.gv_outPart.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_outPart.AppearanceCell.Options.UseFont = true;
- this.gv_outPart.Caption = "棰嗘枡閮ㄩ棬 ";
- this.gv_outPart.FieldName = "outPart";
- this.gv_outPart.MinWidth = 25;
- this.gv_outPart.Name = "gv_outPart";
- this.gv_outPart.OptionsColumn.AllowEdit = false;
- this.gv_outPart.Tag = "query_a.out_part";
- this.gv_outPart.Visible = true;
- this.gv_outPart.VisibleIndex = 11;
- this.gv_outPart.Width = 94;
//
// gv_createBy
//
@@ -454,7 +443,7 @@
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.VisibleIndex = 9;
this.gv_createBy.Width = 94;
//
// gv_createDate
@@ -468,7 +457,7 @@
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.VisibleIndex = 10;
this.gv_createDate.Width = 94;
//
// gv_remark
@@ -482,22 +471,48 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 14;
+ this.gv_remark.VisibleIndex = 11;
this.gv_remark.Width = 94;
//
- // gv_reason
+ // gridColumn7
//
- this.gv_reason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_reason.AppearanceCell.Options.UseFont = true;
- this.gv_reason.Caption = "鍑哄簱鍘熷洜 ";
- this.gv_reason.FieldName = "reason";
- this.gv_reason.MinWidth = 25;
- this.gv_reason.Name = "gv_reason";
- this.gv_reason.OptionsColumn.AllowEdit = false;
- this.gv_reason.Tag = "query_a.reason";
- this.gv_reason.Visible = true;
- this.gv_reason.VisibleIndex = 15;
- this.gv_reason.Width = 94;
+ this.gridColumn7.Caption = "浠诲姟鍗曞彿";
+ this.gridColumn7.FieldName = "workNo";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 14;
+ this.gridColumn7.Width = 94;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鐢熶骇缁勭粐";
+ this.gridColumn8.FieldName = "fSubsidiary";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 15;
+ this.gridColumn8.Width = 94;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "濮旀墭缁勭粐";
+ this.gridColumn11.FieldName = "wtOrg";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 16;
+ this.gridColumn11.Width = 94;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "杞﹂棿";
+ this.gridColumn9.FieldName = "sccj";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 17;
+ this.gridColumn9.Width = 94;
//
// pageBar1
//
@@ -525,18 +540,55 @@
this.splitMx1.Location = new System.Drawing.Point(0, 0);
this.splitMx1.Name = "splitMx1";
//
- // splitMx1.splitMx1_Panel1
+ // splitMx1.Panel1
//
this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
this.splitMx1.Panel1.Text = "Panel1";
//
- // splitMx1.splitMx1_Panel2
+ // 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 = 137;
this.splitMx1.TabIndex = 0;
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.lbGuid);
+ this.layoutMx1.Controls.Add(this.txt_depotId);
+ this.layoutMx1.Controls.Add(this.txt_outPart);
+ this.layoutMx1.Controls.Add(this.txt_outType);
+ this.layoutMx1.Controls.Add(this.txt_remark);
+ this.layoutMx1.Controls.Add(this.txt_itemOutNo);
+ this.layoutMx1.Controls.Add(this.txt_createBy);
+ this.layoutMx1.Controls.Add(this.txt_checkDate);
+ this.layoutMx1.Controls.Add(this.txt_pbillNo);
+ this.layoutMx1.Controls.Add(this.txt_checkUser);
+ this.layoutMx1.Controls.Add(this.txt_workNo);
+ this.layoutMx1.Controls.Add(this.txt_createDate);
+ this.layoutMx1.Controls.Add(this.txt_status);
+ this.layoutMx1.Controls.Add(this.txt_dldh);
+ this.layoutMx1.Controls.Add(this.txt_fSubsidiary);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem13});
+ this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Name = "layoutMx1";
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(576, 277, 812, 500);
+ this.layoutMx1.Root = this.Root;
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 137);
+ this.layoutMx1.TabIndex = 0;
+ this.layoutMx1.Text = "layoutControl1";
+ //
+ // lbGuid
+ //
+ this.lbGuid.Location = new System.Drawing.Point(825, 108);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(268, 28);
+ this.lbGuid.TabIndex = 1;
+ this.lbGuid.Text = "lbGuid";
+ this.lbGuid.Visible = false;
//
// txt_depotId
//
@@ -558,15 +610,6 @@
this.txt_outPart.StyleController = this.layoutMx1;
this.txt_outPart.TabIndex = 574;
//
- // lbGuid
- //
- this.lbGuid.Location = new System.Drawing.Point(825, 108);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(268, 28);
- this.lbGuid.TabIndex = 1;
- this.lbGuid.Text = "lbGuid";
- this.lbGuid.Visible = false;
- //
// txt_outType
//
this.txt_outType.Location = new System.Drawing.Point(355, 76);
@@ -576,36 +619,6 @@
this.txt_outType.Size = new System.Drawing.Size(195, 28);
this.txt_outType.StyleController = this.layoutMx1;
this.txt_outType.TabIndex = 450;
- //
- // txt_workNo
- //
- this.txt_workNo.Location = new System.Drawing.Point(84, 44);
- this.txt_workNo.Name = "txt_workNo";
- this.txt_workNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_workNo.Properties.Appearance.Options.UseFont = true;
- this.txt_workNo.Size = new System.Drawing.Size(195, 28);
- this.txt_workNo.StyleController = this.layoutMx1;
- this.txt_workNo.TabIndex = 387;
- //
- // txt_checkDate
- //
- this.txt_checkDate.Location = new System.Drawing.Point(897, 44);
- this.txt_checkDate.Name = "txt_checkDate";
- this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(196, 28);
- this.txt_checkDate.StyleController = this.layoutMx1;
- this.txt_checkDate.TabIndex = 262;
- //
- // txt_checkUser
- //
- this.txt_checkUser.Location = new System.Drawing.Point(897, 12);
- this.txt_checkUser.Name = "txt_checkUser";
- this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(196, 28);
- this.txt_checkUser.StyleController = this.layoutMx1;
- this.txt_checkUser.TabIndex = 258;
//
// txt_remark
//
@@ -617,15 +630,15 @@
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 243;
//
- // txt_createDate
+ // txt_itemOutNo
//
- this.txt_createDate.Location = new System.Drawing.Point(626, 44);
- this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(195, 28);
- this.txt_createDate.StyleController = this.layoutMx1;
- this.txt_createDate.TabIndex = 226;
+ this.txt_itemOutNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_itemOutNo.Name = "txt_itemOutNo";
+ this.txt_itemOutNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemOutNo.Size = new System.Drawing.Size(195, 28);
+ this.txt_itemOutNo.StyleController = this.layoutMx1;
+ this.txt_itemOutNo.TabIndex = 213;
//
// txt_createBy
//
@@ -637,6 +650,16 @@
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 222;
//
+ // txt_checkDate
+ //
+ this.txt_checkDate.Location = new System.Drawing.Point(897, 44);
+ this.txt_checkDate.Name = "txt_checkDate";
+ this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkDate.Size = new System.Drawing.Size(196, 28);
+ this.txt_checkDate.StyleController = this.layoutMx1;
+ this.txt_checkDate.TabIndex = 262;
+ //
// txt_pbillNo
//
this.txt_pbillNo.Location = new System.Drawing.Point(84, 76);
@@ -647,41 +670,56 @@
this.txt_pbillNo.StyleController = this.layoutMx1;
this.txt_pbillNo.TabIndex = 216;
//
- // txt_itemOutNo
+ // txt_checkUser
//
- this.txt_itemOutNo.Location = new System.Drawing.Point(84, 12);
- this.txt_itemOutNo.Name = "txt_itemOutNo";
- this.txt_itemOutNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemOutNo.Size = new System.Drawing.Size(195, 28);
- this.txt_itemOutNo.StyleController = this.layoutMx1;
- this.txt_itemOutNo.TabIndex = 213;
+ this.txt_checkUser.Location = new System.Drawing.Point(897, 12);
+ this.txt_checkUser.Name = "txt_checkUser";
+ this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkUser.Size = new System.Drawing.Size(196, 28);
+ this.txt_checkUser.StyleController = this.layoutMx1;
+ this.txt_checkUser.TabIndex = 258;
//
- // layoutMx1
+ // txt_workNo
//
- this.layoutMx1.Controls.Add(this.lbGuid);
- this.layoutMx1.Controls.Add(this.txt_depotId);
- this.layoutMx1.Controls.Add(this.txt_outPart);
- this.layoutMx1.Controls.Add(this.txt_outType);
- this.layoutMx1.Controls.Add(this.txt_remark);
- this.layoutMx1.Controls.Add(this.txt_itemOutNo);
- this.layoutMx1.Controls.Add(this.txt_createBy);
- this.layoutMx1.Controls.Add(this.txt_checkDate);
- this.layoutMx1.Controls.Add(this.txt_pbillNo);
- this.layoutMx1.Controls.Add(this.txt_checkUser);
- this.layoutMx1.Controls.Add(this.txt_workNo);
- this.layoutMx1.Controls.Add(this.txt_createDate);
- this.layoutMx1.Controls.Add(this.txt_status);
- this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem13});
- this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(576, 277, 812, 500);
- this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 137);
- this.layoutMx1.TabIndex = 0;
- this.layoutMx1.Text = "layoutControl1";
+ this.txt_workNo.Location = new System.Drawing.Point(626, 76);
+ this.txt_workNo.Name = "txt_workNo";
+ this.txt_workNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_workNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_workNo.Size = new System.Drawing.Size(195, 28);
+ this.txt_workNo.StyleController = this.layoutMx1;
+ this.txt_workNo.TabIndex = 387;
+ //
+ // txt_createDate
+ //
+ this.txt_createDate.Location = new System.Drawing.Point(626, 44);
+ this.txt_createDate.Name = "txt_createDate";
+ this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_createDate.Properties.Appearance.Options.UseFont = true;
+ this.txt_createDate.Size = new System.Drawing.Size(195, 28);
+ this.txt_createDate.StyleController = this.layoutMx1;
+ this.txt_createDate.TabIndex = 226;
+ //
+ // txt_status
+ //
+ this.txt_status.Location = new System.Drawing.Point(825, 76);
+ this.txt_status.Name = "txt_status";
+ this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
+ this.txt_status.Size = new System.Drawing.Size(268, 24);
+ this.txt_status.StyleController = this.layoutMx1;
+ this.txt_status.TabIndex = 576;
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.lbGuid;
+ this.layoutControlItem13.Location = new System.Drawing.Point(813, 96);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem13.Text = "lbGuid";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem13.TextVisible = false;
//
// Root
//
@@ -692,14 +730,16 @@
this.layoutControlItem2,
this.layoutControlItem3,
this.layoutControlItem4,
- this.layoutControlItem5,
this.layoutControlItem6,
this.layoutControlItem7,
this.layoutControlItem8,
this.layoutControlItem9,
this.layoutControlItem10,
this.layoutControlItem11,
- this.layoutControlItem12});
+ this.layoutControlItem12,
+ this.layoutControlItem5,
+ this.layoutControlItem14,
+ this.sp_fSubsidiary});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -770,16 +810,6 @@
this.layoutControlItem4.Text = "瀹℃牳浜�";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_workNo;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 32);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem5.Text = "鎶曟枡鍗曞彿";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
- //
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_depotId;
@@ -845,15 +875,6 @@
this.layoutControlItem11.Text = "澶囨敞淇℃伅";
this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
//
- // txt_status
- //
- this.txt_status.Location = new System.Drawing.Point(825, 76);
- this.txt_status.Name = "txt_status";
- this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_status.Size = new System.Drawing.Size(268, 24);
- this.txt_status.StyleController = this.layoutMx1;
- this.txt_status.TabIndex = 576;
- //
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_status;
@@ -865,18 +886,6 @@
this.layoutControlItem12.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.lbGuid;
- this.layoutControlItem13.Location = new System.Drawing.Point(813, 96);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem13.Text = "lbGuid";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem13.TextVisible = false;
//
// tabMx
//
@@ -1053,7 +1062,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1124, 538);
+ this.tabMxPage2.Size = new System.Drawing.Size(1124, 389);
this.tabMxPage2.Text = "鍑哄簱鏉＄爜";
//
// gcMx2
@@ -1062,7 +1071,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, 538);
+ this.gcMx2.Size = new System.Drawing.Size(1124, 389);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1207,6 +1216,73 @@
this.gvMx2remark.VisibleIndex = 9;
this.gvMx2remark.Width = 94;
//
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(847, 55);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 8;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "涓婚敭GUID";
+ this.gridColumn10.FieldName = "guid";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Width = 94;
+ //
+ // txt_dldh
+ //
+ this.txt_dldh.Location = new System.Drawing.Point(84, 44);
+ this.txt_dldh.Name = "txt_dldh";
+ this.txt_dldh.Size = new System.Drawing.Size(195, 24);
+ this.txt_dldh.StyleController = this.layoutMx1;
+ this.txt_dldh.TabIndex = 577;
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_workNo;
+ this.layoutControlItem5.Location = new System.Drawing.Point(542, 64);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem5.Text = "浠诲姟鍗曞彿";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_dldh;
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem14.Text = "鎶曟枡鍗曞彿";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // txt_fSubsidiary
+ //
+ this.txt_fSubsidiary.Location = new System.Drawing.Point(626, 108);
+ this.txt_fSubsidiary.Name = "txt_fSubsidiary";
+ this.txt_fSubsidiary.Size = new System.Drawing.Size(195, 24);
+ this.txt_fSubsidiary.StyleController = this.layoutMx1;
+ this.txt_fSubsidiary.TabIndex = 578;
+ //
+ // sp_fSubsidiary
+ //
+ this.sp_fSubsidiary.Control = this.txt_fSubsidiary;
+ this.sp_fSubsidiary.Location = new System.Drawing.Point(542, 96);
+ this.sp_fSubsidiary.Name = "sp_fSubsidiary";
+ this.sp_fSubsidiary.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.sp_fSubsidiary.OptionsTableLayoutItem.RowIndex = 3;
+ this.sp_fSubsidiary.Size = new System.Drawing.Size(271, 32);
+ this.sp_fSubsidiary.Text = "鐢熶骇缁勭粐";
+ this.sp_fSubsidiary.TextSize = new System.Drawing.Size(60, 18);
+ //
// Frm_MesInvItemOut_SCLL
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1219,7 +1295,6 @@
this.Text = "鐢熶骇棰嗘枡鍗�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.xtraTabPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
this.split1.Panel1.ResumeLayout(false);
@@ -1235,34 +1310,33 @@
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.txt_depotId.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_outPart.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
- this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).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.txt_status.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1271,6 +1345,12 @@
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dldh.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.sp_fSubsidiary)).EndInit();
this.ResumeLayout(false);
}
@@ -1293,11 +1373,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_receiver;
- private DevExpress.XtraGrid.Columns.GridColumn gv_outPart;
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private DevExpress.XtraGrid.Columns.GridColumn gv_reason;
private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
@@ -1319,7 +1397,6 @@
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;
@@ -1356,5 +1433,15 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gvMx2remark;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraEditors.TextEdit txt_dldh;
+ private DevExpress.XtraEditors.TextEdit txt_fSubsidiary;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem sp_fSubsidiary;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
index 4172dcb..afee59c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
@@ -19,7 +19,6 @@
{
InitializeComponent();
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
- this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
@@ -126,46 +125,7 @@
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
}
-
- /// <summary>
- /// 鍒犻櫎浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
- {
- string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1, "itemOutNo");
- if (string.IsNullOrEmpty(rowGuid))
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
- return;
- List<dynamic> lst = new List<dynamic>();
- lst.Add(rowGuid);
- var _obj = lst;
- try
- {
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 0)
- { }
- else
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
- getPageList(this.pageBar1.CurrentPage);
- }
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
+
/// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
index 58aeb83..861d24d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
@@ -29,22 +29,27 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+ 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_ischeck = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_taskNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_depotsId = 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();
@@ -53,19 +58,16 @@
this.gv_paperBillNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_taskNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_ischeck = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_iqcReleaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_depotsId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.bandedGridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_guid = 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.txt_dptName = new DevExpress.XtraEditors.TextEdit();
- this.txt_remark = new DevExpress.XtraEditors.TextEdit();
+ this.txt_dhgRemark = new DevExpress.XtraEditors.TextEdit();
this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
this.txt_fcheckUser = new DevExpress.XtraEditors.TextEdit();
this.lbGuid = new System.Windows.Forms.Label();
@@ -106,6 +108,8 @@
this.gvMx2workNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = 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();
@@ -123,13 +127,10 @@
this.gvMx1depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = 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();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -150,7 +151,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dhgRemark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckUser.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
@@ -253,8 +254,13 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_ischeck,
+ this.gridColumn9,
this.gv_billNo,
- this.gv_reason,
+ this.gv_taskNo,
+ this.gv_suppNo,
+ this.gv_suppId,
+ this.gridColumn4,
+ this.gv_depotsId,
this.gv_createBy,
this.gv_createDate,
this.gv_lastupdateBy,
@@ -263,14 +269,9 @@
this.gv_paperBillNo,
this.gv_checkUser,
this.gv_checkDate,
- this.gv_taskNo,
this.gv_iqcReleaseNo,
- this.gridColumn4,
- this.gv_depotsId,
- this.gv_suppNo,
- this.gv_suppId,
- this.bandedGridColumn2,
this.gridColumn3,
+ this.bandedGridColumn2,
this.gv_guid});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
@@ -278,161 +279,6 @@
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
- //
- // gv_guid
- //
- this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_guid.AppearanceCell.Options.UseFont = true;
- this.gv_guid.Caption = "涓婚敭GUID";
- this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 50;
- this.gv_guid.Name = "gv_guid";
- this.gv_guid.OptionsColumn.AllowEdit = false;
- this.gv_guid.Tag = "query_a.GUID";
- this.gv_guid.Width = 94;
- //
- // gv_billNo
- //
- this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_billNo.AppearanceCell.Options.UseFont = true;
- this.gv_billNo.Caption = "鍏ュ簱鍗曞彿 ";
- this.gv_billNo.FieldName = "billNo";
- 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 = 180;
- //
- // gv_reason
- //
- this.gv_reason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_reason.AppearanceCell.Options.UseFont = true;
- this.gv_reason.Caption = "鍘熷洜 ";
- this.gv_reason.FieldName = "reason";
- this.gv_reason.Name = "gv_reason";
- this.gv_reason.OptionsColumn.AllowEdit = false;
- this.gv_reason.Tag = "query_a.REASON";
- this.gv_reason.Visible = true;
- this.gv_reason.VisibleIndex = 2;
- this.gv_reason.Width = 94;
- //
- // gv_createBy
- //
- this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_createBy.AppearanceCell.Options.UseFont = true;
- this.gv_createBy.Caption = "鍒涘缓浜� ";
- this.gv_createBy.FieldName = "createBy";
- 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 = 3;
- this.gv_createBy.Width = 80;
- //
- // gv_createDate
- //
- this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_createDate.AppearanceCell.Options.UseFont = true;
- this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
- this.gv_createDate.FieldName = "createDate";
- 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 = 4;
- this.gv_createDate.Width = 180;
- //
- // gv_lastupdateBy
- //
- this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
- this.gv_lastupdateBy.FieldName = "lastupdateBy";
- this.gv_lastupdateBy.Name = "gv_lastupdateBy";
- this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
- this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
- this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 5;
- this.gv_lastupdateBy.Width = 94;
- //
- // gv_lastupdateDate
- //
- this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� ";
- this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.Name = "gv_lastupdateDate";
- this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
- this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
- this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 6;
- this.gv_lastupdateDate.Width = 94;
- //
- // gv_remark
- //
- this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_remark.AppearanceCell.Options.UseFont = true;
- this.gv_remark.Caption = "澶囨敞 ";
- this.gv_remark.FieldName = "remark";
- this.gv_remark.Name = "gv_remark";
- this.gv_remark.OptionsColumn.AllowEdit = false;
- this.gv_remark.Tag = "query_a.REMARK";
- this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 7;
- this.gv_remark.Width = 120;
- //
- // gv_paperBillNo
- //
- this.gv_paperBillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_paperBillNo.AppearanceCell.Options.UseFont = true;
- this.gv_paperBillNo.Caption = "閫佽揣鍗曞彿 ";
- this.gv_paperBillNo.FieldName = "shdh";
- this.gv_paperBillNo.Name = "gv_paperBillNo";
- this.gv_paperBillNo.OptionsColumn.AllowEdit = false;
- this.gv_paperBillNo.Tag = "query_a.PAPER_BILL_NO";
- this.gv_paperBillNo.Visible = true;
- this.gv_paperBillNo.VisibleIndex = 8;
- this.gv_paperBillNo.Width = 120;
- //
- // gv_checkUser
- //
- this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_checkUser.AppearanceCell.Options.UseFont = true;
- this.gv_checkUser.Caption = "瀹℃牳浜� ";
- this.gv_checkUser.FieldName = "checkUser";
- this.gv_checkUser.Name = "gv_checkUser";
- this.gv_checkUser.OptionsColumn.AllowEdit = false;
- this.gv_checkUser.Tag = "query_a.CHECK_USER";
- this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 9;
- this.gv_checkUser.Width = 60;
- //
- // gv_checkDate
- //
- this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_checkDate.AppearanceCell.Options.UseFont = true;
- this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
- this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.Name = "gv_checkDate";
- this.gv_checkDate.OptionsColumn.AllowEdit = false;
- this.gv_checkDate.Tag = "query_a.CHECK_DATE";
- this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 10;
- this.gv_checkDate.Width = 180;
- //
- // gv_taskNo
- //
- this.gv_taskNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_taskNo.AppearanceCell.Options.UseFont = true;
- this.gv_taskNo.Caption = "鍒拌揣鍗曞彿";
- this.gv_taskNo.FieldName = "taskNo";
- 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 = 11;
- this.gv_taskNo.Width = 94;
//
// gv_ischeck
//
@@ -447,31 +293,41 @@
this.gv_ischeck.VisibleIndex = 0;
this.gv_ischeck.Width = 94;
//
- // gv_iqcReleaseNo
+ // gridColumn9
//
- this.gv_iqcReleaseNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_iqcReleaseNo.AppearanceCell.Options.UseFont = true;
- this.gv_iqcReleaseNo.Caption = "IQC妫�楠屽崟鍙� ";
- this.gv_iqcReleaseNo.FieldName = "iqcReleaseNo";
- this.gv_iqcReleaseNo.Name = "gv_iqcReleaseNo";
- this.gv_iqcReleaseNo.OptionsColumn.AllowEdit = false;
- this.gv_iqcReleaseNo.Tag = "query_a.IQC_RELEASE_NO";
- this.gv_iqcReleaseNo.Visible = true;
- this.gv_iqcReleaseNo.VisibleIndex = 12;
- this.gv_iqcReleaseNo.Width = 64;
+ this.gridColumn9.Caption = "濮斿鏍囪瘑";
+ this.gridColumn9.FieldName = "isWw";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 1;
+ this.gridColumn9.Width = 94;
//
- // gv_suppId
+ // gv_billNo
//
- this.gv_suppId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_suppId.AppearanceCell.Options.UseFont = true;
- this.gv_suppId.Caption = "渚涘簲鍟嗗悕绉�";
- this.gv_suppId.FieldName = "supName";
- this.gv_suppId.Name = "gv_suppId";
- this.gv_suppId.OptionsColumn.AllowEdit = false;
- this.gv_suppId.Tag = "query_a.SUPP_ID";
- this.gv_suppId.Visible = true;
- this.gv_suppId.VisibleIndex = 16;
- this.gv_suppId.Width = 150;
+ this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_billNo.AppearanceCell.Options.UseFont = true;
+ this.gv_billNo.Caption = "鍏ュ簱鍗曞彿 ";
+ this.gv_billNo.FieldName = "billNo";
+ 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 = 2;
+ this.gv_billNo.Width = 180;
+ //
+ // gv_taskNo
+ //
+ this.gv_taskNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_taskNo.AppearanceCell.Options.UseFont = true;
+ this.gv_taskNo.Caption = "鍒拌揣鍗曞彿";
+ this.gv_taskNo.FieldName = "taskNo";
+ 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 = 3;
+ this.gv_taskNo.Width = 94;
//
// gv_suppNo
//
@@ -483,8 +339,31 @@
this.gv_suppNo.OptionsColumn.AllowEdit = false;
this.gv_suppNo.Tag = "query_a.SUPP_NO";
this.gv_suppNo.Visible = true;
- this.gv_suppNo.VisibleIndex = 15;
+ this.gv_suppNo.VisibleIndex = 4;
this.gv_suppNo.Width = 100;
+ //
+ // gv_suppId
+ //
+ this.gv_suppId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_suppId.AppearanceCell.Options.UseFont = true;
+ this.gv_suppId.Caption = "渚涘簲鍟嗗悕绉�";
+ this.gv_suppId.FieldName = "supName";
+ this.gv_suppId.Name = "gv_suppId";
+ this.gv_suppId.OptionsColumn.AllowEdit = false;
+ this.gv_suppId.Tag = "query_a.SUPP_ID";
+ this.gv_suppId.Visible = true;
+ this.gv_suppId.VisibleIndex = 5;
+ this.gv_suppId.Width = 150;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "浠撳簱缂栧彿";
+ this.gridColumn4.FieldName = "depotCode";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 6;
+ this.gridColumn4.Width = 94;
//
// gv_depotsId
//
@@ -496,8 +375,135 @@
this.gv_depotsId.OptionsColumn.AllowEdit = false;
this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
this.gv_depotsId.Visible = true;
- this.gv_depotsId.VisibleIndex = 14;
+ this.gv_depotsId.VisibleIndex = 7;
this.gv_depotsId.Width = 100;
+ //
+ // gv_createBy
+ //
+ this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_createBy.AppearanceCell.Options.UseFont = true;
+ this.gv_createBy.Caption = "鍒涘缓浜� ";
+ this.gv_createBy.FieldName = "createBy";
+ 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 = 8;
+ this.gv_createBy.Width = 80;
+ //
+ // gv_createDate
+ //
+ this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_createDate.AppearanceCell.Options.UseFont = true;
+ this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
+ this.gv_createDate.FieldName = "createDate";
+ 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 = 9;
+ this.gv_createDate.Width = 180;
+ //
+ // gv_lastupdateBy
+ //
+ this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
+ this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
+ this.gv_lastupdateBy.FieldName = "lastupdateBy";
+ this.gv_lastupdateBy.Name = "gv_lastupdateBy";
+ this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
+ this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
+ this.gv_lastupdateBy.Visible = true;
+ this.gv_lastupdateBy.VisibleIndex = 10;
+ this.gv_lastupdateBy.Width = 94;
+ //
+ // gv_lastupdateDate
+ //
+ this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
+ this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� ";
+ this.gv_lastupdateDate.FieldName = "lastupdateDate";
+ this.gv_lastupdateDate.Name = "gv_lastupdateDate";
+ this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
+ this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
+ this.gv_lastupdateDate.Visible = true;
+ this.gv_lastupdateDate.VisibleIndex = 11;
+ this.gv_lastupdateDate.Width = 94;
+ //
+ // gv_remark
+ //
+ this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_remark.AppearanceCell.Options.UseFont = true;
+ this.gv_remark.Caption = "澶囨敞璇存槑";
+ this.gv_remark.FieldName = "dhgRemark";
+ this.gv_remark.Name = "gv_remark";
+ this.gv_remark.OptionsColumn.AllowEdit = false;
+ this.gv_remark.Tag = "query_a.REMARK";
+ this.gv_remark.Visible = true;
+ this.gv_remark.VisibleIndex = 12;
+ this.gv_remark.Width = 120;
+ //
+ // gv_paperBillNo
+ //
+ this.gv_paperBillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_paperBillNo.AppearanceCell.Options.UseFont = true;
+ this.gv_paperBillNo.Caption = "閫佽揣鍗曞彿 ";
+ this.gv_paperBillNo.FieldName = "shdh";
+ this.gv_paperBillNo.Name = "gv_paperBillNo";
+ this.gv_paperBillNo.OptionsColumn.AllowEdit = false;
+ this.gv_paperBillNo.Tag = "query_a.PAPER_BILL_NO";
+ this.gv_paperBillNo.Visible = true;
+ this.gv_paperBillNo.VisibleIndex = 13;
+ this.gv_paperBillNo.Width = 120;
+ //
+ // gv_checkUser
+ //
+ this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_checkUser.AppearanceCell.Options.UseFont = true;
+ this.gv_checkUser.Caption = "瀹℃牳浜� ";
+ this.gv_checkUser.FieldName = "checkUser";
+ this.gv_checkUser.Name = "gv_checkUser";
+ this.gv_checkUser.OptionsColumn.AllowEdit = false;
+ this.gv_checkUser.Tag = "query_a.CHECK_USER";
+ this.gv_checkUser.Visible = true;
+ this.gv_checkUser.VisibleIndex = 14;
+ this.gv_checkUser.Width = 60;
+ //
+ // gv_checkDate
+ //
+ this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_checkDate.AppearanceCell.Options.UseFont = true;
+ this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
+ this.gv_checkDate.FieldName = "checkDate";
+ this.gv_checkDate.Name = "gv_checkDate";
+ this.gv_checkDate.OptionsColumn.AllowEdit = false;
+ this.gv_checkDate.Tag = "query_a.CHECK_DATE";
+ this.gv_checkDate.Visible = true;
+ this.gv_checkDate.VisibleIndex = 15;
+ this.gv_checkDate.Width = 180;
+ //
+ // gv_iqcReleaseNo
+ //
+ this.gv_iqcReleaseNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_iqcReleaseNo.AppearanceCell.Options.UseFont = true;
+ this.gv_iqcReleaseNo.Caption = "IQC妫�楠屽崟鍙� ";
+ this.gv_iqcReleaseNo.FieldName = "iqcReleaseNo";
+ this.gv_iqcReleaseNo.Name = "gv_iqcReleaseNo";
+ this.gv_iqcReleaseNo.OptionsColumn.AllowEdit = false;
+ this.gv_iqcReleaseNo.Tag = "query_a.IQC_RELEASE_NO";
+ this.gv_iqcReleaseNo.Visible = true;
+ this.gv_iqcReleaseNo.VisibleIndex = 16;
+ this.gv_iqcReleaseNo.Width = 64;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鍏ュ簱绫诲埆";
+ this.gridColumn3.FieldName = "inType";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 17;
+ this.gridColumn3.Width = 94;
//
// bandedGridColumn2
//
@@ -506,8 +512,20 @@
this.bandedGridColumn2.Name = "bandedGridColumn2";
this.bandedGridColumn2.Tag = "org.fnamber";
this.bandedGridColumn2.Visible = true;
- this.bandedGridColumn2.VisibleIndex = 17;
+ this.bandedGridColumn2.VisibleIndex = 18;
this.bandedGridColumn2.Width = 250;
+ //
+ // gv_guid
+ //
+ this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_guid.AppearanceCell.Options.UseFont = true;
+ this.gv_guid.Caption = "涓婚敭GUID";
+ this.gv_guid.FieldName = "guid";
+ this.gv_guid.MinWidth = 50;
+ this.gv_guid.Name = "gv_guid";
+ this.gv_guid.OptionsColumn.AllowEdit = false;
+ this.gv_guid.Tag = "query_a.GUID";
+ this.gv_guid.Width = 94;
//
// pageBar1
//
@@ -551,7 +569,7 @@
// layoutMx1
//
this.layoutMx1.Controls.Add(this.txt_dptName);
- this.layoutMx1.Controls.Add(this.txt_remark);
+ this.layoutMx1.Controls.Add(this.txt_dhgRemark);
this.layoutMx1.Controls.Add(this.txt_suppName);
this.layoutMx1.Controls.Add(this.txt_fcheckUser);
this.layoutMx1.Controls.Add(this.lbGuid);
@@ -586,15 +604,15 @@
this.txt_dptName.TabIndex = 593;
this.txt_dptName.Tag = "readonly";
//
- // txt_remark
+ // txt_dhgRemark
//
- this.txt_remark.Location = new System.Drawing.Point(425, 76);
- this.txt_remark.Name = "txt_remark";
- this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(561, 28);
- this.txt_remark.StyleController = this.layoutMx1;
- this.txt_remark.TabIndex = 240;
+ this.txt_dhgRemark.Location = new System.Drawing.Point(425, 76);
+ this.txt_dhgRemark.Name = "txt_dhgRemark";
+ this.txt_dhgRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_dhgRemark.Properties.Appearance.Options.UseFont = true;
+ this.txt_dhgRemark.Size = new System.Drawing.Size(561, 28);
+ this.txt_dhgRemark.StyleController = this.layoutMx1;
+ this.txt_dhgRemark.TabIndex = 240;
//
// txt_suppName
//
@@ -744,29 +762,29 @@
this.layoutControlItem12});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition17.Width = 100D;
- columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition18.Width = 100D;
- columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition19.Width = 100D;
- columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition20.Width = 100D;
+ 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[] {
- columnDefinition17,
- columnDefinition18,
- columnDefinition19,
- columnDefinition20});
- rowDefinition13.Height = 100D;
- rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition14.Height = 100D;
- rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition15.Height = 100D;
- rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ 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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition13,
- rowDefinition14,
- rowDefinition15});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3});
this.Root.Size = new System.Drawing.Size(1325, 116);
this.Root.TextVisible = false;
//
@@ -864,14 +882,14 @@
//
// layoutControlItem11
//
- this.layoutControlItem11.Control = this.txt_remark;
+ this.layoutControlItem11.Control = this.txt_dhgRemark;
this.layoutControlItem11.Location = new System.Drawing.Point(326, 64);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem11.Size = new System.Drawing.Size(652, 32);
- this.layoutControlItem11.Text = "澶囨敞";
+ this.layoutControlItem11.Text = "澶囨敞璇存槑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem12
@@ -930,6 +948,7 @@
this.gvMx2workNo,
this.gvMx2ebelnK3id,
this.gvMx2lineK3id,
+ this.gridColumn10,
this.gridColumn5,
this.gridColumn6});
this.gvMx1.GridControl = this.gcMx1;
@@ -1060,6 +1079,26 @@
this.gvMx2lineK3id.Visible = true;
this.gvMx2lineK3id.VisibleIndex = 8;
this.gvMx2lineK3id.Width = 94;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "寤虹珛鑰�";
+ this.gridColumn5.FieldName = "createBy";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 10;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "寤虹珛鏃堕棿";
+ this.gridColumn6.FieldName = "createDate";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 11;
+ this.gridColumn6.Width = 94;
//
// xtraTabPage3
//
@@ -1272,57 +1311,6 @@
this.gvMx1lineK3id.VisibleIndex = 12;
this.gvMx1lineK3id.Width = 94;
//
- // picCheckBox
- //
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(961, 55);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 6;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "鍏ュ簱绫诲埆";
- this.gridColumn3.FieldName = "inType";
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 18;
- this.gridColumn3.Width = 94;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "浠撳簱缂栧彿";
- this.gridColumn4.FieldName = "depotCode";
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 13;
- this.gridColumn4.Width = 94;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "寤虹珛鑰�";
- this.gridColumn5.FieldName = "createBy";
- this.gridColumn5.MinWidth = 25;
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 9;
- this.gridColumn5.Width = 94;
- //
- // gridColumn6
- //
- this.gridColumn6.Caption = "寤虹珛鏃堕棿";
- this.gridColumn6.FieldName = "createDate";
- this.gridColumn6.MinWidth = 25;
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 10;
- this.gridColumn6.Width = 94;
- //
// gridColumn7
//
this.gridColumn7.Caption = "寤虹珛鑰�";
@@ -1342,6 +1330,27 @@
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 14;
this.gridColumn8.Width = 94;
+ //
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(961, 55);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 6;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "澶囨敞";
+ this.gridColumn10.FieldName = "dhgRemark";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 9;
+ this.gridColumn10.Width = 94;
//
// Frm_MesInvItemIns
//
@@ -1373,7 +1382,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dhgRemark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
@@ -1420,7 +1429,6 @@
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_reason;
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
@@ -1455,7 +1463,7 @@
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
- private DevExpress.XtraEditors.TextEdit txt_remark;
+ private DevExpress.XtraEditors.TextEdit txt_dhgRemark;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
@@ -1505,5 +1513,7 @@
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;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index 312c478..3aa56dd 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -29,19 +29,18 @@
/// </summary>
private void InitializeComponent()
{
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Womcaa));
- 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();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.picCheckBox = new System.Windows.Forms.PictureBox();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
@@ -82,8 +81,6 @@
this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -96,25 +93,27 @@
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.lbGuid = new System.Windows.Forms.Label();
this.txt_wtOrg = new DevExpress.XtraEditors.TextEdit();
this.txt_scOrg = new DevExpress.XtraEditors.TextEdit();
- this.txt_caa004 = new DevExpress.XtraEditors.TextEdit();
- this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
- this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
- this.txt_gdzt = new DevExpress.XtraEditors.TextEdit();
- this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
- this.txt_saleOrderNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_caa024 = new DevExpress.XtraEditors.TextEdit();
- this.txt_caa020 = new DevExpress.XtraEditors.TextEdit();
this.txt_caa016 = new DevExpress.XtraEditors.TextEdit();
- this.txt_caa012 = new DevExpress.XtraEditors.TextEdit();
- this.txt_caa011 = new DevExpress.XtraEditors.TextEdit();
- this.txt_caa010 = new DevExpress.XtraEditors.TextEdit();
- this.txt_dwName = new DevExpress.XtraEditors.TextEdit();
- this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_caa005 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_djlx = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
this.txt_caa001 = new DevExpress.XtraEditors.TextEdit();
- this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_caa012 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_caa010 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_caa020 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_caa024 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_gdzt = new DevExpress.XtraEditors.TextEdit();
+ this.txt_caa011 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_saleOrderNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_dwName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_caa005 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -130,12 +129,9 @@
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.lbGuid = new System.Windows.Forms.Label();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -164,9 +160,12 @@
this.gvMx1scraprate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1scrapqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.txt_srcBillNo = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.xtraTabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
@@ -182,26 +181,27 @@
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
this.splitMx1.Panel2.SuspendLayout();
this.splitMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_wtOrg.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_scOrg.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa004.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_gdzt.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa024.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa020.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa016.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa012.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa011.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa010.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa005.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa001.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_wtOrg.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_scOrg.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa016.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_djlx.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa001.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa012.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa010.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa020.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa024.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_gdzt.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa011.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa005.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -217,16 +217,18 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).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();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_srcBillNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -255,17 +257,6 @@
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
this.xtraTabPage2});
- //
- // picCheckBox
- //
- this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
- this.picCheckBox.Location = new System.Drawing.Point(1001, 55);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 6;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
//
// xtraTabPage1
//
@@ -345,8 +336,6 @@
this.gridColumn26,
this.gridColumn27,
this.gridColumn28,
- this.gridColumn29,
- this.gridColumn30,
this.gridColumn31,
this.gridColumn32,
this.gridColumn33,
@@ -803,26 +792,6 @@
this.gridColumn28.VisibleIndex = 35;
this.gridColumn28.Width = 94;
//
- // gridColumn29
- //
- this.gridColumn29.Caption = "閿�鍞鍗曞彿";
- this.gridColumn29.FieldName = "caa015";
- this.gridColumn29.MinWidth = 25;
- this.gridColumn29.Name = "gridColumn29";
- this.gridColumn29.Visible = true;
- this.gridColumn29.VisibleIndex = 36;
- this.gridColumn29.Width = 94;
- //
- // gridColumn30
- //
- this.gridColumn30.Caption = "閿�鍞鍗曡鍙�";
- this.gridColumn30.FieldName = "caa015Head";
- this.gridColumn30.MinWidth = 25;
- this.gridColumn30.Name = "gridColumn30";
- this.gridColumn30.Visible = true;
- this.gridColumn30.VisibleIndex = 37;
- this.gridColumn30.Width = 94;
- //
// gridColumn31
//
this.gridColumn31.Caption = "鐢熸垚鏂瑰紡";
@@ -886,11 +855,11 @@
// gridColumn37
//
this.gridColumn37.Caption = "婧愬崟鍒嗗綍琛屽彿";
- this.gridColumn37.FieldName = "srcBillEntrySeq";
+ this.gridColumn37.FieldName = "ydflxh";
this.gridColumn37.MinWidth = 25;
this.gridColumn37.Name = "gridColumn37";
this.gridColumn37.Visible = true;
- this.gridColumn37.VisibleIndex = 44;
+ this.gridColumn37.VisibleIndex = 42;
this.gridColumn37.Width = 94;
//
// gridColumn38
@@ -939,18 +908,59 @@
this.splitMx1.Location = new System.Drawing.Point(0, 0);
this.splitMx1.Name = "splitMx1";
//
- // splitMx1.splitMx1_Panel1
+ // splitMx1.Panel1
//
this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
this.splitMx1.Panel1.Text = "Panel1";
//
- // splitMx1.splitMx1_Panel2
+ // 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 = 168;
+ this.splitMx1.SplitterPosition = 178;
this.splitMx1.TabIndex = 0;
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.lbGuid);
+ this.layoutMx1.Controls.Add(this.txt_wtOrg);
+ this.layoutMx1.Controls.Add(this.txt_scOrg);
+ this.layoutMx1.Controls.Add(this.txt_caa016);
+ this.layoutMx1.Controls.Add(this.txt_djlx);
+ this.layoutMx1.Controls.Add(this.txt_itemModel);
+ this.layoutMx1.Controls.Add(this.txt_caa001);
+ this.layoutMx1.Controls.Add(this.txt_caa012);
+ this.layoutMx1.Controls.Add(this.txt_itemName);
+ this.layoutMx1.Controls.Add(this.txt_dptName);
+ this.layoutMx1.Controls.Add(this.txt_caa010);
+ this.layoutMx1.Controls.Add(this.txt_caa020);
+ this.layoutMx1.Controls.Add(this.txt_caa024);
+ this.layoutMx1.Controls.Add(this.txt_gdzt);
+ this.layoutMx1.Controls.Add(this.txt_caa011);
+ this.layoutMx1.Controls.Add(this.txt_itemNo);
+ this.layoutMx1.Controls.Add(this.txt_saleOrderNo);
+ this.layoutMx1.Controls.Add(this.txt_dwName);
+ this.layoutMx1.Controls.Add(this.txt_caa005);
+ this.layoutMx1.Controls.Add(this.txt_srcBillNo);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem19});
+ 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, 178);
+ this.layoutMx1.TabIndex = 0;
+ this.layoutMx1.Text = "layoutControl1";
+ //
+ // lbGuid
+ //
+ this.lbGuid.Location = new System.Drawing.Point(554, 140);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(267, 28);
+ this.lbGuid.TabIndex = 466;
+ this.lbGuid.Text = "lbGuid";
//
// txt_wtOrg
//
@@ -972,86 +982,6 @@
this.txt_scOrg.StyleController = this.layoutMx1;
this.txt_scOrg.TabIndex = 463;
//
- // txt_caa004
- //
- this.txt_caa004.Location = new System.Drawing.Point(656, 76);
- this.txt_caa004.Name = "txt_caa004";
- this.txt_caa004.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_caa004.Properties.Appearance.Options.UseFont = true;
- this.txt_caa004.Size = new System.Drawing.Size(165, 28);
- this.txt_caa004.StyleController = this.layoutMx1;
- this.txt_caa004.TabIndex = 461;
- //
- // txt_itemModel
- //
- this.txt_itemModel.Location = new System.Drawing.Point(656, 108);
- this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(165, 28);
- this.txt_itemModel.StyleController = this.layoutMx1;
- this.txt_itemModel.TabIndex = 459;
- //
- // txt_itemName
- //
- this.txt_itemName.Location = new System.Drawing.Point(385, 108);
- this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(165, 28);
- this.txt_itemName.StyleController = this.layoutMx1;
- this.txt_itemName.TabIndex = 457;
- //
- // txt_gdzt
- //
- this.txt_gdzt.Location = new System.Drawing.Point(656, 44);
- this.txt_gdzt.Name = "txt_gdzt";
- this.txt_gdzt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_gdzt.Properties.Appearance.Options.UseFont = true;
- this.txt_gdzt.Size = new System.Drawing.Size(165, 28);
- this.txt_gdzt.StyleController = this.layoutMx1;
- this.txt_gdzt.TabIndex = 455;
- //
- // txt_dptName
- //
- this.txt_dptName.Location = new System.Drawing.Point(656, 12);
- this.txt_dptName.Name = "txt_dptName";
- this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_dptName.Properties.Appearance.Options.UseFont = true;
- this.txt_dptName.Size = new System.Drawing.Size(165, 28);
- this.txt_dptName.StyleController = this.layoutMx1;
- this.txt_dptName.TabIndex = 451;
- //
- // txt_saleOrderNo
- //
- this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 76);
- this.txt_saleOrderNo.Name = "txt_saleOrderNo";
- this.txt_saleOrderNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_saleOrderNo.Size = new System.Drawing.Size(165, 28);
- this.txt_saleOrderNo.StyleController = this.layoutMx1;
- this.txt_saleOrderNo.TabIndex = 450;
- //
- // txt_caa024
- //
- this.txt_caa024.Location = new System.Drawing.Point(385, 44);
- this.txt_caa024.Name = "txt_caa024";
- this.txt_caa024.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_caa024.Properties.Appearance.Options.UseFont = true;
- this.txt_caa024.Size = new System.Drawing.Size(165, 28);
- this.txt_caa024.StyleController = this.layoutMx1;
- this.txt_caa024.TabIndex = 370;
- //
- // txt_caa020
- //
- this.txt_caa020.Location = new System.Drawing.Point(114, 44);
- this.txt_caa020.Name = "txt_caa020";
- this.txt_caa020.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_caa020.Properties.Appearance.Options.UseFont = true;
- this.txt_caa020.Size = new System.Drawing.Size(165, 28);
- this.txt_caa020.StyleController = this.layoutMx1;
- this.txt_caa020.TabIndex = 262;
- //
// txt_caa016
//
this.txt_caa016.Location = new System.Drawing.Point(114, 140);
@@ -1062,65 +992,25 @@
this.txt_caa016.StyleController = this.layoutMx1;
this.txt_caa016.TabIndex = 243;
//
- // txt_caa012
+ // txt_djlx
//
- this.txt_caa012.Location = new System.Drawing.Point(385, 12);
- this.txt_caa012.Name = "txt_caa012";
- this.txt_caa012.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_caa012.Properties.Appearance.Options.UseFont = true;
- this.txt_caa012.Size = new System.Drawing.Size(165, 28);
- this.txt_caa012.StyleController = this.layoutMx1;
- this.txt_caa012.TabIndex = 231;
+ this.txt_djlx.Location = new System.Drawing.Point(656, 76);
+ this.txt_djlx.Name = "txt_djlx";
+ this.txt_djlx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_djlx.Properties.Appearance.Options.UseFont = true;
+ this.txt_djlx.Size = new System.Drawing.Size(165, 28);
+ this.txt_djlx.StyleController = this.layoutMx1;
+ this.txt_djlx.TabIndex = 461;
//
- // txt_caa011
+ // txt_itemModel
//
- this.txt_caa011.Location = new System.Drawing.Point(927, 44);
- this.txt_caa011.Name = "txt_caa011";
- this.txt_caa011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_caa011.Properties.Appearance.Options.UseFont = true;
- this.txt_caa011.Size = new System.Drawing.Size(166, 28);
- this.txt_caa011.StyleController = this.layoutMx1;
- this.txt_caa011.TabIndex = 228;
- //
- // txt_caa010
- //
- this.txt_caa010.Location = new System.Drawing.Point(927, 12);
- this.txt_caa010.Name = "txt_caa010";
- this.txt_caa010.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_caa010.Properties.Appearance.Options.UseFont = true;
- this.txt_caa010.Size = new System.Drawing.Size(166, 28);
- this.txt_caa010.StyleController = this.layoutMx1;
- this.txt_caa010.TabIndex = 226;
- //
- // txt_dwName
- //
- this.txt_dwName.Location = new System.Drawing.Point(385, 76);
- this.txt_dwName.Name = "txt_dwName";
- this.txt_dwName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_dwName.Properties.Appearance.Options.UseFont = true;
- this.txt_dwName.Size = new System.Drawing.Size(165, 28);
- this.txt_dwName.StyleController = this.layoutMx1;
- this.txt_dwName.TabIndex = 222;
- //
- // txt_itemNo
- //
- this.txt_itemNo.Location = new System.Drawing.Point(114, 108);
- this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(165, 28);
- this.txt_itemNo.StyleController = this.layoutMx1;
- this.txt_itemNo.TabIndex = 219;
- //
- // txt_caa005
- //
- this.txt_caa005.Location = new System.Drawing.Point(927, 76);
- this.txt_caa005.Name = "txt_caa005";
- this.txt_caa005.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_caa005.Properties.Appearance.Options.UseFont = true;
- this.txt_caa005.Size = new System.Drawing.Size(166, 28);
- this.txt_caa005.StyleController = this.layoutMx1;
- this.txt_caa005.TabIndex = 217;
+ this.txt_itemModel.Location = new System.Drawing.Point(656, 140);
+ this.txt_itemModel.Name = "txt_itemModel";
+ this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemModel.Size = new System.Drawing.Size(165, 28);
+ this.txt_itemModel.StyleController = this.layoutMx1;
+ this.txt_itemModel.TabIndex = 459;
//
// txt_caa001
//
@@ -1132,37 +1022,137 @@
this.txt_caa001.StyleController = this.layoutMx1;
this.txt_caa001.TabIndex = 213;
//
- // layoutMx1
+ // txt_caa012
//
- this.layoutMx1.Controls.Add(this.lbGuid);
- this.layoutMx1.Controls.Add(this.txt_wtOrg);
- this.layoutMx1.Controls.Add(this.txt_scOrg);
- this.layoutMx1.Controls.Add(this.txt_caa016);
- this.layoutMx1.Controls.Add(this.txt_caa004);
- this.layoutMx1.Controls.Add(this.txt_itemModel);
- this.layoutMx1.Controls.Add(this.txt_caa001);
- this.layoutMx1.Controls.Add(this.txt_caa012);
- this.layoutMx1.Controls.Add(this.txt_itemName);
- this.layoutMx1.Controls.Add(this.txt_dptName);
- this.layoutMx1.Controls.Add(this.txt_caa010);
- this.layoutMx1.Controls.Add(this.txt_caa020);
- this.layoutMx1.Controls.Add(this.txt_caa024);
- this.layoutMx1.Controls.Add(this.txt_gdzt);
- this.layoutMx1.Controls.Add(this.txt_caa011);
- this.layoutMx1.Controls.Add(this.txt_itemNo);
- this.layoutMx1.Controls.Add(this.txt_saleOrderNo);
- this.layoutMx1.Controls.Add(this.txt_dwName);
- this.layoutMx1.Controls.Add(this.txt_caa005);
- this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem19});
- 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, 168);
- this.layoutMx1.TabIndex = 0;
- this.layoutMx1.Text = "layoutControl1";
+ this.txt_caa012.Location = new System.Drawing.Point(385, 12);
+ this.txt_caa012.Name = "txt_caa012";
+ this.txt_caa012.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_caa012.Properties.Appearance.Options.UseFont = true;
+ this.txt_caa012.Size = new System.Drawing.Size(165, 28);
+ this.txt_caa012.StyleController = this.layoutMx1;
+ this.txt_caa012.TabIndex = 231;
+ //
+ // txt_itemName
+ //
+ this.txt_itemName.Location = new System.Drawing.Point(385, 108);
+ this.txt_itemName.Name = "txt_itemName";
+ this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemName.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemName.Size = new System.Drawing.Size(165, 28);
+ this.txt_itemName.StyleController = this.layoutMx1;
+ this.txt_itemName.TabIndex = 457;
+ //
+ // txt_dptName
+ //
+ this.txt_dptName.Location = new System.Drawing.Point(656, 12);
+ this.txt_dptName.Name = "txt_dptName";
+ this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_dptName.Properties.Appearance.Options.UseFont = true;
+ this.txt_dptName.Size = new System.Drawing.Size(165, 28);
+ this.txt_dptName.StyleController = this.layoutMx1;
+ this.txt_dptName.TabIndex = 451;
+ //
+ // txt_caa010
+ //
+ this.txt_caa010.Location = new System.Drawing.Point(927, 12);
+ this.txt_caa010.Name = "txt_caa010";
+ this.txt_caa010.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_caa010.Properties.Appearance.Options.UseFont = true;
+ this.txt_caa010.Size = new System.Drawing.Size(166, 28);
+ this.txt_caa010.StyleController = this.layoutMx1;
+ this.txt_caa010.TabIndex = 226;
+ //
+ // txt_caa020
+ //
+ this.txt_caa020.Location = new System.Drawing.Point(114, 44);
+ this.txt_caa020.Name = "txt_caa020";
+ this.txt_caa020.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_caa020.Properties.Appearance.Options.UseFont = true;
+ this.txt_caa020.Size = new System.Drawing.Size(165, 28);
+ this.txt_caa020.StyleController = this.layoutMx1;
+ this.txt_caa020.TabIndex = 262;
+ //
+ // txt_caa024
+ //
+ this.txt_caa024.Location = new System.Drawing.Point(385, 44);
+ this.txt_caa024.Name = "txt_caa024";
+ this.txt_caa024.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_caa024.Properties.Appearance.Options.UseFont = true;
+ this.txt_caa024.Size = new System.Drawing.Size(165, 28);
+ this.txt_caa024.StyleController = this.layoutMx1;
+ this.txt_caa024.TabIndex = 370;
+ //
+ // txt_gdzt
+ //
+ this.txt_gdzt.Location = new System.Drawing.Point(656, 44);
+ this.txt_gdzt.Name = "txt_gdzt";
+ this.txt_gdzt.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_gdzt.Properties.Appearance.Options.UseFont = true;
+ this.txt_gdzt.Size = new System.Drawing.Size(165, 28);
+ this.txt_gdzt.StyleController = this.layoutMx1;
+ this.txt_gdzt.TabIndex = 455;
+ //
+ // txt_caa011
+ //
+ this.txt_caa011.Location = new System.Drawing.Point(927, 44);
+ this.txt_caa011.Name = "txt_caa011";
+ this.txt_caa011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_caa011.Properties.Appearance.Options.UseFont = true;
+ this.txt_caa011.Size = new System.Drawing.Size(166, 28);
+ this.txt_caa011.StyleController = this.layoutMx1;
+ this.txt_caa011.TabIndex = 228;
+ //
+ // txt_itemNo
+ //
+ this.txt_itemNo.Location = new System.Drawing.Point(114, 108);
+ this.txt_itemNo.Name = "txt_itemNo";
+ this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemNo.Size = new System.Drawing.Size(165, 28);
+ this.txt_itemNo.StyleController = this.layoutMx1;
+ this.txt_itemNo.TabIndex = 219;
+ //
+ // txt_saleOrderNo
+ //
+ this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 76);
+ this.txt_saleOrderNo.Name = "txt_saleOrderNo";
+ this.txt_saleOrderNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_saleOrderNo.Size = new System.Drawing.Size(165, 28);
+ this.txt_saleOrderNo.StyleController = this.layoutMx1;
+ this.txt_saleOrderNo.TabIndex = 450;
+ //
+ // txt_dwName
+ //
+ this.txt_dwName.Location = new System.Drawing.Point(385, 76);
+ this.txt_dwName.Name = "txt_dwName";
+ this.txt_dwName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_dwName.Properties.Appearance.Options.UseFont = true;
+ this.txt_dwName.Size = new System.Drawing.Size(165, 28);
+ this.txt_dwName.StyleController = this.layoutMx1;
+ this.txt_dwName.TabIndex = 222;
+ //
+ // txt_caa005
+ //
+ this.txt_caa005.Location = new System.Drawing.Point(927, 76);
+ this.txt_caa005.Name = "txt_caa005";
+ this.txt_caa005.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_caa005.Properties.Appearance.Options.UseFont = true;
+ this.txt_caa005.Size = new System.Drawing.Size(166, 28);
+ this.txt_caa005.StyleController = this.layoutMx1;
+ this.txt_caa005.TabIndex = 217;
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.lbGuid;
+ this.layoutControlItem19.Location = new System.Drawing.Point(542, 128);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem19.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem19.Text = "lbGuid";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem19.TextVisible = false;
//
// Root
//
@@ -1183,41 +1173,42 @@
this.layoutControlItem12,
this.layoutControlItem13,
this.layoutControlItem14,
- this.layoutControlItem15,
this.layoutControlItem16,
this.layoutControlItem17,
- this.layoutControlItem18});
+ this.layoutControlItem18,
+ this.layoutControlItem20,
+ this.layoutControlItem15});
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;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.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;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9,
+ columnDefinition10,
+ columnDefinition11,
+ columnDefinition12});
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition13.Height = 100D;
+ rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition14.Height = 100D;
+ rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition15.Height = 100D;
+ rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5});
+ rowDefinition11,
+ rowDefinition12,
+ rowDefinition13,
+ rowDefinition14,
+ rowDefinition15});
this.Root.Size = new System.Drawing.Size(1105, 180);
this.Root.TextVisible = false;
//
@@ -1326,7 +1317,7 @@
//
// layoutControlItem11
//
- this.layoutControlItem11.Control = this.txt_caa004;
+ this.layoutControlItem11.Control = this.txt_djlx;
this.layoutControlItem11.Location = new System.Drawing.Point(542, 64);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -1367,17 +1358,6 @@
this.layoutControlItem14.Text = "浜у搧鍚嶇О";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_itemModel;
- this.layoutControlItem15.Location = new System.Drawing.Point(542, 96);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem15.Text = "浜у搧瑙勬牸";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
- //
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_scOrg;
@@ -1411,33 +1391,13 @@
this.layoutControlItem18.Text = "濮旀墭缁勭粐";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
- // lbGuid
- //
- this.lbGuid.Location = new System.Drawing.Point(554, 140);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(267, 28);
- this.lbGuid.TabIndex = 466;
- this.lbGuid.Text = "lbGuid";
- //
- // layoutControlItem19
- //
- this.layoutControlItem19.Control = this.lbGuid;
- this.layoutControlItem19.Location = new System.Drawing.Point(542, 128);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem19.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem19.Text = "lbGuid";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem19.TextVisible = false;
- //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
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, 390);
+ this.tabMx.Size = new System.Drawing.Size(1126, 380);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1446,7 +1406,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 358);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 348);
this.tabMxPage1.Text = "鏄庣粏";
//
// gcMx1
@@ -1455,7 +1415,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 358);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 348);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1777,6 +1737,47 @@
this.gridColumn17.VisibleIndex = 22;
this.gridColumn17.Width = 94;
//
+ // picCheckBox
+ //
+ this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
+ this.picCheckBox.Location = new System.Drawing.Point(1001, 55);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 6;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
+ // txt_srcBillNo
+ //
+ this.txt_srcBillNo.Location = new System.Drawing.Point(656, 108);
+ this.txt_srcBillNo.Name = "txt_srcBillNo";
+ this.txt_srcBillNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_srcBillNo.StyleController = this.layoutMx1;
+ this.txt_srcBillNo.TabIndex = 467;
+ //
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.txt_srcBillNo;
+ this.layoutControlItem20.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem20.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem20.Text = "婧愬崟绫诲瀷";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_itemModel;
+ this.layoutControlItem15.Location = new System.Drawing.Point(542, 128);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem15.Text = "浜у搧瑙勬牸";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ //
// Frm_Womcaa
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1789,7 +1790,6 @@
this.Text = "鐢熶骇浠诲姟璁㈠崟";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.xtraTabPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
this.split1.Panel1.ResumeLayout(false);
@@ -1805,26 +1805,27 @@
this.splitMx1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
this.splitMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txt_wtOrg.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_scOrg.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa004.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_gdzt.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa024.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa020.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa016.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa012.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa011.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa010.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa005.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_caa001.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_wtOrg.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_scOrg.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa016.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_djlx.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa001.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa012.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa010.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa020.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa024.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_gdzt.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa011.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa005.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1840,16 +1841,18 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).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();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_srcBillNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
this.ResumeLayout(false);
}
@@ -1897,8 +1900,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
@@ -1913,7 +1914,7 @@
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraEditors.TextEdit txt_wtOrg;
private DevExpress.XtraEditors.TextEdit txt_scOrg;
- private DevExpress.XtraEditors.TextEdit txt_caa004;
+ private DevExpress.XtraEditors.TextEdit txt_djlx;
private DevExpress.XtraEditors.TextEdit txt_itemModel;
private DevExpress.XtraEditors.TextEdit txt_itemName;
private DevExpress.XtraEditors.TextEdit txt_gdzt;
@@ -1946,7 +1947,6 @@
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
@@ -1979,5 +1979,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1scraprate;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1scrapqty;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+ private DevExpress.XtraEditors.TextEdit txt_srcBillNo;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index da35da9..7d5354a 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -62,7 +62,7 @@
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa018 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.鐢熶骇缁勭粐 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColoun100 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa001 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa021 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -371,7 +371,7 @@
this.gridColumn12,
this.gridColumn6,
this.gv_daa018,
- this.鐢熶骇缁勭粐,
+ this.gridColoun100,
this.gv_daa001,
this.gv_daa021,
this.gridColumn3,
@@ -533,16 +533,16 @@
this.gv_daa018.VisibleIndex = 9;
this.gv_daa018.Width = 90;
//
- // 鐢熶骇缁勭粐
+ // gridColoun100
//
- this.鐢熶骇缁勭粐.Caption = "鐢熶骇缁勭粐";
- this.鐢熶骇缁勭粐.FieldName = "fSubsidiary";
- this.鐢熶骇缁勭粐.MinWidth = 50;
- this.鐢熶骇缁勭粐.Name = "鐢熶骇缁勭粐";
- this.鐢熶骇缁勭粐.Tag = "org.fnamber";
- this.鐢熶骇缁勭粐.Visible = true;
- this.鐢熶骇缁勭粐.VisibleIndex = 10;
- this.鐢熶骇缁勭粐.Width = 250;
+ this.gridColoun100.Caption = "鐢熶骇缁勭粐";
+ this.gridColoun100.FieldName = "fSubsidiary";
+ this.gridColoun100.MinWidth = 50;
+ this.gridColoun100.Name = "gridColoun100";
+ this.gridColoun100.Tag = "org.fnamber";
+ this.gridColoun100.Visible = true;
+ this.gridColoun100.VisibleIndex = 10;
+ this.gridColoun100.Width = 250;
//
// gv_daa001
//
@@ -848,12 +848,10 @@
//
// gridColumn23
//
- this.gridColumn23.Caption = "GUID";
+ this.gridColumn23.Caption = "涓婚敭GUID";
this.gridColumn23.FieldName = "guid";
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
- this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 34;
this.gridColumn23.Width = 94;
//
// gridColumn24
@@ -863,7 +861,7 @@
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 35;
+ this.gridColumn24.VisibleIndex = 34;
this.gridColumn24.Width = 94;
//
// gridColumn25
@@ -873,7 +871,7 @@
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 36;
+ this.gridColumn25.VisibleIndex = 35;
this.gridColumn25.Width = 94;
//
// gridColumn26
@@ -883,7 +881,7 @@
this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 37;
+ this.gridColumn26.VisibleIndex = 36;
this.gridColumn26.Width = 94;
//
// pageBar1
@@ -1851,7 +1849,7 @@
this.gvMx1dab014.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1dab014.AppearanceCell.Options.UseFont = true;
this.gvMx1dab014.Caption = "鏄惁鏇挎枡";
- this.gvMx1dab014.FieldName = "dab014";
+ this.gvMx1dab014.FieldName = "dab014Txt";
this.gvMx1dab014.MinWidth = 50;
this.gvMx1dab014.Name = "gvMx1dab014";
this.gvMx1dab014.Tag = "query_a.dab014";
@@ -2366,7 +2364,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa018;
- private DevExpress.XtraGrid.Columns.GridColumn 鐢熶骇缁勭粐;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColoun100;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa001;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa021;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index 586a779..deb473f 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -29,18 +29,18 @@
/// </summary>
private void InitializeComponent()
{
- 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Wompba));
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -87,16 +87,15 @@
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.caaGuid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1daa016 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
- this.gvMx1daa018 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemDateEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa005 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1daa018 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemDateEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
+ this.gvMx1daa016 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.gvMx1daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa006 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa007 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -104,6 +103,7 @@
this.gvMx1daa011 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa012 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa017 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa019 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -117,13 +117,14 @@
this.gvMx1daa026 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1isReportcheck = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa014 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1machineNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -163,10 +164,10 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
@@ -558,29 +559,29 @@
this.layoutControlItem8});
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;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.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;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3});
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
this.Root.Size = new System.Drawing.Size(1105, 116);
this.Root.TextVisible = false;
//
@@ -714,20 +715,20 @@
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.caaGuid,
- this.gvMx1fstatus,
- this.gvMx1daa016,
- this.gvMx1daa018,
this.gvMx1daa002,
+ this.gvMx1daa010,
this.gvMx1daa005,
this.gvMx1daa003,
this.gvMx1daa004,
- this.gvMx1daa010,
+ this.gvMx1daa018,
+ this.gvMx1daa016,
this.gvMx1daa008,
this.gvMx1daa006,
this.gvMx1daa007,
this.gvMx1daa009,
this.gvMx1daa011,
this.gvMx1daa012,
+ this.gvMx1reporttime,
this.gvMx1daa017,
this.gvMx1daa019,
this.gvMx1checkDate,
@@ -741,9 +742,10 @@
this.gvMx1daa026,
this.gvMx1isReportcheck,
this.gvMx1daa014,
- this.gvMx1reporttime,
this.gvMx1machineNo,
this.gridColumn3,
+ this.gvMx1fstatus,
+ this.gridColumn6,
this.gvMxDel});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
@@ -772,46 +774,75 @@
this.caaGuid.OptionsColumn.ReadOnly = true;
this.caaGuid.Width = 94;
//
- // gvMx1fstatus
+ // gvMx1daa002
//
- this.gvMx1fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1fstatus.AppearanceCell.Options.UseFont = true;
- this.gvMx1fstatus.Caption = "闇�姹傚崟鍙�";
- this.gvMx1fstatus.FieldName = "caa015";
- this.gvMx1fstatus.MinWidth = 50;
- this.gvMx1fstatus.Name = "gvMx1fstatus";
- this.gvMx1fstatus.OptionsColumn.ReadOnly = true;
- this.gvMx1fstatus.Tag = "query_a.fstatus";
- this.gvMx1fstatus.Visible = true;
- this.gvMx1fstatus.VisibleIndex = 0;
- this.gvMx1fstatus.Width = 76;
+ this.gvMx1daa002.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
+ this.gvMx1daa002.Caption = "宸ュ崟鍗曞彿";
+ this.gvMx1daa002.FieldName = "daa001";
+ this.gvMx1daa002.MinWidth = 50;
+ this.gvMx1daa002.Name = "gvMx1daa002";
+ this.gvMx1daa002.OptionsColumn.ReadOnly = true;
+ this.gvMx1daa002.Tag = "query_a.daa002";
+ this.gvMx1daa002.Visible = true;
+ this.gvMx1daa002.VisibleIndex = 0;
+ this.gvMx1daa002.Width = 50;
//
- // gvMx1daa016
+ // gvMx1daa010
//
- this.gvMx1daa016.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1daa016.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1daa016.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa016.AppearanceCell.Options.UseForeColor = true;
- this.gvMx1daa016.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1daa016.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1daa016.Caption = "棰勮寮�宸ユ棩鏃堕棿";
- this.gvMx1daa016.ColumnEdit = this.repositoryItemDateEdit2;
- this.gvMx1daa016.FieldName = "mesStartProd";
- this.gvMx1daa016.MinWidth = 50;
- this.gvMx1daa016.Name = "gvMx1daa016";
- this.gvMx1daa016.Tag = "edit";
- this.gvMx1daa016.Visible = true;
- this.gvMx1daa016.VisibleIndex = 1;
- this.gvMx1daa016.Width = 78;
+ this.gvMx1daa010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
+ this.gvMx1daa010.Caption = "浠诲姟鍗曞彿";
+ this.gvMx1daa010.FieldName = "daa021";
+ this.gvMx1daa010.MinWidth = 50;
+ this.gvMx1daa010.Name = "gvMx1daa010";
+ this.gvMx1daa010.OptionsColumn.ReadOnly = true;
+ this.gvMx1daa010.Tag = "query_a.daa010";
+ this.gvMx1daa010.Visible = true;
+ this.gvMx1daa010.VisibleIndex = 1;
+ this.gvMx1daa010.Width = 50;
//
- // repositoryItemDateEdit2
+ // gvMx1daa005
//
- this.repositoryItemDateEdit2.AutoHeight = false;
- this.repositoryItemDateEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemDateEdit2.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemDateEdit2.Name = "repositoryItemDateEdit2";
+ this.gvMx1daa005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1daa005.AppearanceCell.Options.UseFont = true;
+ this.gvMx1daa005.Caption = "鐗╂枡缂栫爜";
+ this.gvMx1daa005.FieldName = "itemNo";
+ this.gvMx1daa005.MinWidth = 50;
+ this.gvMx1daa005.Name = "gvMx1daa005";
+ this.gvMx1daa005.OptionsColumn.ReadOnly = true;
+ this.gvMx1daa005.Tag = "query_a.daa005";
+ this.gvMx1daa005.Visible = true;
+ this.gvMx1daa005.VisibleIndex = 2;
+ this.gvMx1daa005.Width = 50;
+ //
+ // gvMx1daa003
+ //
+ this.gvMx1daa003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1daa003.AppearanceCell.Options.UseFont = true;
+ this.gvMx1daa003.Caption = "浜у搧鍚嶇О";
+ this.gvMx1daa003.FieldName = "daa003";
+ this.gvMx1daa003.MinWidth = 50;
+ this.gvMx1daa003.Name = "gvMx1daa003";
+ this.gvMx1daa003.OptionsColumn.ReadOnly = true;
+ this.gvMx1daa003.Tag = "query_a.daa003";
+ this.gvMx1daa003.Visible = true;
+ this.gvMx1daa003.VisibleIndex = 3;
+ this.gvMx1daa003.Width = 50;
+ //
+ // gvMx1daa004
+ //
+ this.gvMx1daa004.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
+ this.gvMx1daa004.Caption = "浜у搧瑙勬牸";
+ this.gvMx1daa004.FieldName = "daa004";
+ this.gvMx1daa004.MinWidth = 50;
+ this.gvMx1daa004.Name = "gvMx1daa004";
+ this.gvMx1daa004.OptionsColumn.ReadOnly = true;
+ this.gvMx1daa004.Tag = "query_a.daa004";
+ this.gvMx1daa004.Visible = true;
+ this.gvMx1daa004.VisibleIndex = 4;
+ this.gvMx1daa004.Width = 50;
//
// gvMx1daa018
//
@@ -828,7 +859,7 @@
this.gvMx1daa018.Name = "gvMx1daa018";
this.gvMx1daa018.Tag = "edit";
this.gvMx1daa018.Visible = true;
- this.gvMx1daa018.VisibleIndex = 2;
+ this.gvMx1daa018.VisibleIndex = 5;
this.gvMx1daa018.Width = 50;
//
// repositoryItemDateEdit3
@@ -840,75 +871,32 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.repositoryItemDateEdit3.Name = "repositoryItemDateEdit3";
//
- // gvMx1daa002
+ // gvMx1daa016
//
- this.gvMx1daa002.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa002.Caption = "宸ュ崟鍗曞彿";
- this.gvMx1daa002.FieldName = "daa001";
- this.gvMx1daa002.MinWidth = 50;
- this.gvMx1daa002.Name = "gvMx1daa002";
- this.gvMx1daa002.OptionsColumn.ReadOnly = true;
- this.gvMx1daa002.Tag = "query_a.daa002";
- this.gvMx1daa002.Visible = true;
- this.gvMx1daa002.VisibleIndex = 3;
- this.gvMx1daa002.Width = 50;
+ this.gvMx1daa016.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1daa016.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1daa016.AppearanceCell.Options.UseFont = true;
+ this.gvMx1daa016.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1daa016.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1daa016.AppearanceHeader.Options.UseForeColor = true;
+ this.gvMx1daa016.Caption = "棰勮寮�宸ユ棩鏃堕棿";
+ this.gvMx1daa016.ColumnEdit = this.repositoryItemDateEdit2;
+ this.gvMx1daa016.FieldName = "mesStartProd";
+ this.gvMx1daa016.MinWidth = 50;
+ this.gvMx1daa016.Name = "gvMx1daa016";
+ this.gvMx1daa016.Tag = "edit";
+ this.gvMx1daa016.Visible = true;
+ this.gvMx1daa016.VisibleIndex = 6;
+ this.gvMx1daa016.Width = 78;
//
- // gvMx1daa005
+ // repositoryItemDateEdit2
//
- this.gvMx1daa005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1daa005.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa005.Caption = "鐗╂枡缂栫爜";
- this.gvMx1daa005.FieldName = "itemNo";
- this.gvMx1daa005.MinWidth = 50;
- this.gvMx1daa005.Name = "gvMx1daa005";
- this.gvMx1daa005.OptionsColumn.ReadOnly = true;
- this.gvMx1daa005.Tag = "query_a.daa005";
- this.gvMx1daa005.Visible = true;
- this.gvMx1daa005.VisibleIndex = 4;
- this.gvMx1daa005.Width = 50;
- //
- // gvMx1daa003
- //
- this.gvMx1daa003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1daa003.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa003.Caption = "浜у搧鍚嶇О";
- this.gvMx1daa003.FieldName = "daa003";
- this.gvMx1daa003.MinWidth = 50;
- this.gvMx1daa003.Name = "gvMx1daa003";
- this.gvMx1daa003.OptionsColumn.ReadOnly = true;
- this.gvMx1daa003.Tag = "query_a.daa003";
- this.gvMx1daa003.Visible = true;
- this.gvMx1daa003.VisibleIndex = 5;
- this.gvMx1daa003.Width = 50;
- //
- // gvMx1daa004
- //
- this.gvMx1daa004.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa004.Caption = "浜у搧瑙勬牸";
- this.gvMx1daa004.FieldName = "daa004";
- this.gvMx1daa004.MinWidth = 50;
- this.gvMx1daa004.Name = "gvMx1daa004";
- this.gvMx1daa004.OptionsColumn.ReadOnly = true;
- this.gvMx1daa004.Tag = "query_a.daa004";
- this.gvMx1daa004.Visible = true;
- this.gvMx1daa004.VisibleIndex = 6;
- this.gvMx1daa004.Width = 50;
- //
- // gvMx1daa010
- //
- this.gvMx1daa010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa010.Caption = "浠诲姟鍗曞彿";
- this.gvMx1daa010.FieldName = "daa021";
- this.gvMx1daa010.MinWidth = 50;
- this.gvMx1daa010.Name = "gvMx1daa010";
- this.gvMx1daa010.OptionsColumn.ReadOnly = true;
- this.gvMx1daa010.Tag = "query_a.daa010";
- this.gvMx1daa010.Visible = true;
- this.gvMx1daa010.VisibleIndex = 7;
- this.gvMx1daa010.Width = 50;
+ this.repositoryItemDateEdit2.AutoHeight = false;
+ this.repositoryItemDateEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemDateEdit2.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemDateEdit2.Name = "repositoryItemDateEdit2";
//
// gvMx1daa008
//
@@ -922,7 +910,7 @@
this.gvMx1daa008.OptionsColumn.ReadOnly = true;
this.gvMx1daa008.Tag = "query_a.daa008";
this.gvMx1daa008.Visible = true;
- this.gvMx1daa008.VisibleIndex = 8;
+ this.gvMx1daa008.VisibleIndex = 7;
this.gvMx1daa008.Width = 50;
//
// gvMx1daa006
@@ -937,7 +925,7 @@
this.gvMx1daa006.OptionsColumn.ReadOnly = true;
this.gvMx1daa006.Tag = "query_a.daa006";
this.gvMx1daa006.Visible = true;
- this.gvMx1daa006.VisibleIndex = 9;
+ this.gvMx1daa006.VisibleIndex = 8;
this.gvMx1daa006.Width = 50;
//
// gvMx1daa007
@@ -952,7 +940,7 @@
this.gvMx1daa007.OptionsColumn.ReadOnly = true;
this.gvMx1daa007.Tag = "query_a.daa007";
this.gvMx1daa007.Visible = true;
- this.gvMx1daa007.VisibleIndex = 10;
+ this.gvMx1daa007.VisibleIndex = 9;
this.gvMx1daa007.Width = 50;
//
// gvMx1daa009
@@ -967,7 +955,7 @@
this.gvMx1daa009.OptionsColumn.ReadOnly = true;
this.gvMx1daa009.Tag = "query_a.daa009";
this.gvMx1daa009.Visible = true;
- this.gvMx1daa009.VisibleIndex = 11;
+ this.gvMx1daa009.VisibleIndex = 10;
this.gvMx1daa009.Width = 50;
//
// gvMx1daa011
@@ -985,7 +973,7 @@
this.gvMx1daa011.Name = "gvMx1daa011";
this.gvMx1daa011.Tag = "yz_quantity_0_edit";
this.gvMx1daa011.Visible = true;
- this.gvMx1daa011.VisibleIndex = 12;
+ this.gvMx1daa011.VisibleIndex = 11;
this.gvMx1daa011.Width = 60;
//
// gvMx1daa012
@@ -1003,7 +991,7 @@
this.gvMx1daa012.Name = "gvMx1daa012";
this.gvMx1daa012.Tag = "edit";
this.gvMx1daa012.Visible = true;
- this.gvMx1daa012.VisibleIndex = 13;
+ this.gvMx1daa012.VisibleIndex = 12;
this.gvMx1daa012.Width = 153;
//
// rptJYBZ
@@ -1012,6 +1000,26 @@
this.rptJYBZ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.rptJYBZ.Name = "rptJYBZ";
+ this.rptJYBZ.NullText = "-璇烽�夋嫨-";
+ this.rptJYBZ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.rptJYBZ.SelectedIndexChanged += new System.EventHandler(this.rptJYBZ_SelectedIndexChanged);
+ //
+ // gvMx1reporttime
+ //
+ this.gvMx1reporttime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1reporttime.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1reporttime.AppearanceCell.Options.UseFont = true;
+ this.gvMx1reporttime.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1reporttime.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1reporttime.AppearanceHeader.Options.UseForeColor = true;
+ this.gvMx1reporttime.Caption = "澶囨敞";
+ this.gvMx1reporttime.FieldName = "daa009";
+ this.gvMx1reporttime.MinWidth = 50;
+ this.gvMx1reporttime.Name = "gvMx1reporttime";
+ this.gvMx1reporttime.Tag = "edit";
+ this.gvMx1reporttime.Visible = true;
+ this.gvMx1reporttime.VisibleIndex = 13;
+ this.gvMx1reporttime.Width = 102;
//
// gvMx1daa017
//
@@ -1181,23 +1189,6 @@
this.gvMx1daa014.VisibleIndex = 14;
this.gvMx1daa014.Width = 51;
//
- // gvMx1reporttime
- //
- this.gvMx1reporttime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1reporttime.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1reporttime.AppearanceCell.Options.UseFont = true;
- this.gvMx1reporttime.AppearanceCell.Options.UseForeColor = true;
- this.gvMx1reporttime.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1reporttime.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1reporttime.Caption = "澶囨敞";
- this.gvMx1reporttime.FieldName = "daa009";
- this.gvMx1reporttime.MinWidth = 50;
- this.gvMx1reporttime.Name = "gvMx1reporttime";
- this.gvMx1reporttime.Tag = "edit";
- this.gvMx1reporttime.Visible = true;
- this.gvMx1reporttime.VisibleIndex = 15;
- this.gvMx1reporttime.Width = 102;
- //
// gvMx1machineNo
//
this.gvMx1machineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1231,6 +1222,20 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Width = 94;
//
+ // gvMx1fstatus
+ //
+ this.gvMx1fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1fstatus.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fstatus.Caption = "闇�姹傚崟鍙�";
+ this.gvMx1fstatus.FieldName = "caa015";
+ this.gvMx1fstatus.MinWidth = 50;
+ this.gvMx1fstatus.Name = "gvMx1fstatus";
+ this.gvMx1fstatus.OptionsColumn.ReadOnly = true;
+ this.gvMx1fstatus.Tag = "query_a.fstatus";
+ this.gvMx1fstatus.Visible = true;
+ this.gvMx1fstatus.VisibleIndex = 15;
+ this.gvMx1fstatus.Width = 76;
+ //
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
@@ -1238,18 +1243,19 @@
this.gvMxDel.MinWidth = 80;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 16;
+ this.gvMxDel.VisibleIndex = 17;
this.gvMxDel.Width = 84;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
// picCheckBox
//
@@ -1261,6 +1267,16 @@
this.picCheckBox.TabIndex = 7;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "娆″簭";
+ this.gridColumn6.FieldName = "scheduleOrder";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 16;
+ this.gridColumn6.Width = 94;
//
// Frm_Wompba
//
@@ -1311,10 +1327,10 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
@@ -1406,5 +1422,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index 395c187..2ae5682 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -89,6 +89,9 @@
}
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = _oldTable;
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
}
@@ -130,7 +133,7 @@
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
-
+
/// <summary>
/// 鏌ヨ鍥炶皟
/// </summary>
@@ -307,7 +310,7 @@
gvMx1.UpdateCurrentRow();
if (gvMx1.DataRowCount <= 0)
{
- MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
+ MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨鏄庣粏锛�");
return;
}
for (var i = 0; i < gvMx1.DataRowCount; i++)
@@ -617,7 +620,7 @@
};
try
{
- var strJson = UtilityHelper.HttpPost("", _webServiceName + _mth,JsonConvert.SerializeObject(_obj));
+ var strJson = UtilityHelper.HttpPost("", _webServiceName + _mth, JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
--
Gitblit v1.9.3