From 11d39af68e6665b8d64c62e492ece4df942cfd0e Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期三, 22 十月 2025 13:13:57 +0800
Subject: [PATCH] 合并打印
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 557 ++++++++
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.resx | 3
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 2775 +++++++++++++++++++++++++++++++++++++++-----
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs | 88
DevApp/Gs.DevApp/UserControl/UcBtnPrint.Designer.cs | 69
DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs | 130 ++
DevApp/Gs.DevApp/UserControl/UcBtnPrint.resx | 19
7 files changed, 3,212 insertions(+), 429 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index a503c6b..9bc1968 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -37,16 +37,27 @@
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.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -63,16 +74,92 @@
this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_depotsCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn106 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMxL2 = new DevExpress.XtraGrid.GridControl();
+ this.gvMxL2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn88 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn89 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn90 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn91 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn92 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn93 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn94 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn95 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn96 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn97 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn98 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn99 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn100 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn101 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn102 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn103 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn104 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn105 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit7 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.repositoryItemButtonEdit8 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.repositoryItemComboBox4 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMxL1 = new DevExpress.XtraGrid.GridControl();
+ this.gvMxL1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn51 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn55 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn56 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn57 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn58 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn59 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn60 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn61 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn62 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn63 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn64 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn65 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn66 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn67 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn68 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn69 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemComboBox3 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gridColumn70 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn71 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn72 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit5 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.repositoryItemButtonEdit6 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.xtraTabPage6 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMxL3 = new DevExpress.XtraGrid.GridControl();
+ this.gvMxL3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn73 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn74 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn75 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn76 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn77 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn78 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn79 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn80 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn81 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn82 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn83 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn84 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn85 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn86 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn87 = new DevExpress.XtraGrid.Columns.GridColumn();
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_dptName = new DevExpress.XtraEditors.TextEdit();
this.txt_gysNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_depotsCode = new DevExpress.XtraEditors.TextEdit();
this.txt_barcodeProgress = new DevExpress.XtraEditors.TextEdit();
this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
@@ -85,16 +172,73 @@
this.layoutControlItem14 = 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.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
+ this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.lay99 = new DevExpress.XtraLayout.LayoutControl();
+ this.layoutControl2 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_iCount_2 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_yuliang_2 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.radOut2 = new DevExpress.XtraEditors.RadioGroup();
+ this.ucBtnPrint2 = new Gs.DevApp.UserControl.UcBtnPrint();
+ this.txtItemNo = new DevExpress.XtraEditors.TextEdit();
+ this.txtItemName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_kQtyHb = new DevExpress.XtraEditors.TextEdit();
+ this.txt_psnQty_2 = new DevExpress.XtraEditors.TextEdit();
+ this.txtItemModel = new DevExpress.XtraEditors.TextEdit();
+ this.txtQuantityHb = new DevExpress.XtraEditors.TextEdit();
+ this.txt_yQtyHb = new DevExpress.XtraEditors.TextEdit();
+ this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.gcMx3 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn41 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn44 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn45 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn46 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn50 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn53 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
this.layout99 = new DevExpress.XtraLayout.LayoutControl();
@@ -146,6 +290,13 @@
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -162,7 +313,10 @@
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_hbdy = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -170,9 +324,27 @@
((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
this.split1.Panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+ this.split1.Panel2.SuspendLayout();
this.split1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
+ this.xtraTabControl2.SuspendLayout();
+ this.xtraTabPage5.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMxL2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMxL2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).BeginInit();
+ this.xtraTabPage4.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMxL1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMxL1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit6)).BeginInit();
+ this.xtraTabPage6.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMxL3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMxL3)).BeginInit();
this.xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
@@ -182,7 +354,9 @@
this.splitMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_barcodeProgress.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
@@ -195,17 +369,62 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).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.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
+ this.xtraTabPage3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
+ this.splitContainerControl1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
+ this.splitContainerControl1.Panel2.SuspendLayout();
+ this.splitContainerControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.lay99)).BeginInit();
+ this.lay99.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControl2)).BeginInit();
+ this.layoutControl2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_2.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_2.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.radOut2.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtItemNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtItemName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_kQtyHb.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_2.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtItemModel.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtQuantityHb.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yQtyHb.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit();
@@ -244,9 +463,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -258,9 +481,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1346, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1478, 62);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -268,10 +492,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 62);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1346, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1478, 695);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -280,8 +505,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1344, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1476, 669);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -290,6 +516,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -300,19 +527,22 @@
//
// split1.Panel2
//
+ this.split1.Panel2.Controls.Add(this.xtraTabControl2);
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1344, 570);
- this.split1.SplitterPosition = 0;
+ this.split1.Size = new System.Drawing.Size(1476, 669);
+ this.split1.SplitterPosition = 416;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1344, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1476, 213);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -324,7 +554,7 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Appearance.ViewCaption.Options.UseTextOptions = true;
this.gridView1.Appearance.ViewCaption.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridView1.ColumnPanelRowHeight = 50;
+ this.gridView1.ColumnPanelRowHeight = 39;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn13,
this.gv_urgentFlag,
@@ -336,12 +566,16 @@
this.gridColumn26,
this.gv_suppNo,
this.gridColumn2,
+ this.gv_depotsCode,
+ this.gridColumn3,
this.gv_remark,
this.gv_fstatus,
this.gridColumn11,
- this.gv_checkDate});
+ this.gv_checkDate,
+ this.gridColumn106});
+ this.gridView1.DetailHeight = 272;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 44;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -351,188 +585,1012 @@
//
this.gridColumn13.Caption = "鏀舵枡缁勭粐";
this.gridColumn13.FieldName = "receivingOrg";
- this.gridColumn13.MinWidth = 50;
+ this.gridColumn13.MinWidth = 44;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Tag = "org.fnamber";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 0;
- this.gridColumn13.Width = 250;
+ this.gridColumn13.Width = 219;
//
// gv_urgentFlag
//
this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
this.gv_urgentFlag.Caption = "鎬ユ枡";
- this.gv_urgentFlag.FieldName = "urgentFlagTxt";
- this.gv_urgentFlag.MaxWidth = 50;
- this.gv_urgentFlag.MinWidth = 50;
+ this.gv_urgentFlag.FieldName = "urgentFlag";
+ this.gv_urgentFlag.MaxWidth = 44;
+ this.gv_urgentFlag.MinWidth = 44;
this.gv_urgentFlag.Name = "gv_urgentFlag";
this.gv_urgentFlag.OptionsColumn.AllowEdit = false;
this.gv_urgentFlag.Tag = "query_a.urgent_flag";
this.gv_urgentFlag.Visible = true;
this.gv_urgentFlag.VisibleIndex = 1;
- this.gv_urgentFlag.Width = 50;
+ this.gv_urgentFlag.Width = 44;
//
// gridColumn25
//
this.gridColumn25.Caption = "濮斿";
this.gridColumn25.FieldName = "fType";
- this.gridColumn25.MinWidth = 25;
+ this.gridColumn25.MinWidth = 22;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 2;
- this.gridColumn25.Width = 94;
+ this.gridColumn25.Width = 82;
//
// gv_status
//
this.gv_status.AppearanceCell.Options.UseFont = true;
this.gv_status.Caption = "鍏ュ簱";
this.gv_status.FieldName = "statusChk";
- this.gv_status.MaxWidth = 50;
- this.gv_status.MinWidth = 50;
+ this.gv_status.MaxWidth = 44;
+ this.gv_status.MinWidth = 44;
this.gv_status.Name = "gv_status";
this.gv_status.OptionsColumn.AllowEdit = false;
this.gv_status.Tag = "query_a.status";
this.gv_status.Visible = true;
this.gv_status.VisibleIndex = 3;
- this.gv_status.Width = 50;
+ this.gv_status.Width = 44;
//
// gv_billNo
//
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鍒拌揣鍗曞彿";
this.gv_billNo.FieldName = "billNo";
- this.gv_billNo.MinWidth = 50;
+ this.gv_billNo.MinWidth = 44;
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 = 4;
- this.gv_billNo.Width = 120;
+ this.gv_billNo.Width = 105;
//
// gridColumn1
//
this.gridColumn1.Caption = "鏉＄爜鎵撳嵃姣旂巼";
this.gridColumn1.FieldName = "barRatio";
- this.gridColumn1.MaxWidth = 80;
- this.gridColumn1.MinWidth = 80;
+ this.gridColumn1.MaxWidth = 70;
+ this.gridColumn1.MinWidth = 70;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 5;
- this.gridColumn1.Width = 80;
+ this.gridColumn1.Width = 70;
//
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
- this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 50;
+ this.gv_createBy.FieldName = "cjr";
+ this.gv_createBy.MinWidth = 44;
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 = 6;
- this.gv_createBy.Width = 94;
+ this.gv_createBy.VisibleIndex = 7;
+ this.gv_createBy.Width = 82;
//
// gridColumn26
//
this.gridColumn26.Caption = "鍒涘缓鏃ユ湡";
this.gridColumn26.FieldName = "createDate";
- this.gridColumn26.MinWidth = 25;
+ this.gridColumn26.MinWidth = 22;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 7;
- this.gridColumn26.Width = 94;
+ this.gridColumn26.VisibleIndex = 8;
+ this.gridColumn26.Width = 82;
//
// gv_suppNo
//
this.gv_suppNo.AppearanceCell.Options.UseFont = true;
this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮�";
this.gv_suppNo.FieldName = "suppNo";
- this.gv_suppNo.MinWidth = 50;
+ this.gv_suppNo.MinWidth = 44;
this.gv_suppNo.Name = "gv_suppNo";
this.gv_suppNo.OptionsColumn.AllowEdit = false;
this.gv_suppNo.Tag = "query_a.supp_no";
this.gv_suppNo.Visible = true;
- this.gv_suppNo.VisibleIndex = 8;
- this.gv_suppNo.Width = 94;
+ this.gv_suppNo.VisibleIndex = 9;
+ this.gv_suppNo.Width = 82;
//
// gridColumn2
//
this.gridColumn2.Caption = "渚涘簲鍟嗗悕绉�";
this.gridColumn2.FieldName = "suppName";
- this.gridColumn2.MinWidth = 50;
+ this.gridColumn2.MinWidth = 44;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 9;
- this.gridColumn2.Width = 200;
+ this.gridColumn2.VisibleIndex = 10;
+ this.gridColumn2.Width = 175;
+ //
+ // gv_depotsCode
+ //
+ this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
+ this.gv_depotsCode.Caption = "鏀惰揣浠撳簱缂栫爜";
+ this.gv_depotsCode.FieldName = "depotsCode";
+ this.gv_depotsCode.MinWidth = 44;
+ this.gv_depotsCode.Name = "gv_depotsCode";
+ this.gv_depotsCode.OptionsColumn.AllowEdit = false;
+ this.gv_depotsCode.Tag = "query_a.depots_code";
+ this.gv_depotsCode.Visible = true;
+ this.gv_depotsCode.VisibleIndex = 11;
+ this.gv_depotsCode.Width = 82;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鏀惰揣浠撳簱鍚嶇О";
+ this.gridColumn3.FieldName = "depotName";
+ this.gridColumn3.MinWidth = 22;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.OptionsColumn.AllowEdit = false;
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 12;
+ this.gridColumn3.Width = 82;
//
// gv_remark
//
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "澶囨敞";
this.gv_remark.FieldName = "remark";
- this.gv_remark.MinWidth = 50;
+ this.gv_remark.MinWidth = 44;
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 = 10;
- this.gv_remark.Width = 94;
+ this.gv_remark.VisibleIndex = 13;
+ this.gv_remark.Width = 82;
//
// gv_fstatus
//
this.gv_fstatus.AppearanceCell.Options.UseFont = true;
this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
this.gv_fstatus.FieldName = "fstatus";
- this.gv_fstatus.MaxWidth = 50;
- this.gv_fstatus.MinWidth = 50;
+ this.gv_fstatus.MaxWidth = 44;
+ this.gv_fstatus.MinWidth = 44;
this.gv_fstatus.Name = "gv_fstatus";
this.gv_fstatus.OptionsColumn.AllowEdit = false;
this.gv_fstatus.Tag = "query_a.fstatus";
- this.gv_fstatus.Width = 50;
+ this.gv_fstatus.Width = 44;
//
// gridColumn11
//
this.gridColumn11.Caption = "瀹℃牳浜�";
- this.gridColumn11.FieldName = "checkUser";
- this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.FieldName = "shr";
+ this.gridColumn11.MinWidth = 22;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 11;
- this.gridColumn11.Width = 94;
+ this.gridColumn11.VisibleIndex = 14;
+ this.gridColumn11.Width = 82;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 50;
+ this.gv_checkDate.MinWidth = 44;
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 = 12;
- this.gv_checkDate.Width = 180;
+ this.gv_checkDate.VisibleIndex = 15;
+ this.gv_checkDate.Width = 157;
+ //
+ // gridColumn106
+ //
+ this.gridColumn106.Caption = "鍏ュ簱姣斾緥";
+ this.gridColumn106.FieldName = "rkbl";
+ this.gridColumn106.Name = "gridColumn106";
+ this.gridColumn106.Visible = true;
+ this.gridColumn106.VisibleIndex = 6;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 519);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 213);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1344, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1476, 30);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
+ //
+ // xtraTabControl2
+ //
+ this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
+ this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.xtraTabControl2.Name = "xtraTabControl2";
+ this.xtraTabControl2.SelectedTabPage = this.xtraTabPage5;
+ this.xtraTabControl2.Size = new System.Drawing.Size(1476, 416);
+ this.xtraTabControl2.TabIndex = 4;
+ this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage5,
+ this.xtraTabPage4,
+ this.xtraTabPage6});
+ //
+ // xtraTabPage5
+ //
+ this.xtraTabPage5.Controls.Add(this.gcMxL2);
+ this.xtraTabPage5.Name = "xtraTabPage5";
+ this.xtraTabPage5.Size = new System.Drawing.Size(1474, 390);
+ this.xtraTabPage5.Text = "鍚堝苟鏄庣粏";
+ //
+ // gcMxL2
+ //
+ this.gcMxL2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMxL2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.gcMxL2.Location = new System.Drawing.Point(0, 0);
+ this.gcMxL2.MainView = this.gvMxL2;
+ this.gcMxL2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.gcMxL2.Name = "gcMxL2";
+ this.gcMxL2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit7,
+ this.repositoryItemButtonEdit8,
+ this.repositoryItemComboBox4});
+ this.gcMxL2.Size = new System.Drawing.Size(1474, 390);
+ this.gcMxL2.TabIndex = 3;
+ this.gcMxL2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMxL2});
+ //
+ // gvMxL2
+ //
+ this.gvMxL2.Appearance.Row.Options.UseFont = true;
+ this.gvMxL2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn88,
+ this.gridColumn89,
+ this.gridColumn90,
+ this.gridColumn91,
+ this.gridColumn92,
+ this.gridColumn93,
+ this.gridColumn94,
+ this.gridColumn95,
+ this.gridColumn96,
+ this.gridColumn97,
+ this.gridColumn98,
+ this.gridColumn99,
+ this.gridColumn100,
+ this.gridColumn101,
+ this.gridColumn102,
+ this.gridColumn103,
+ this.gridColumn104,
+ this.gridColumn105});
+ this.gvMxL2.DetailHeight = 272;
+ this.gvMxL2.GridControl = this.gcMxL2;
+ this.gvMxL2.Name = "gvMxL2";
+ this.gvMxL2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+ this.gvMxL2.OptionsFilter.AllowFilterEditor = false;
+ this.gvMxL2.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMxL2.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMxL2.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn88
+ //
+ this.gridColumn88.Caption = "abtGuid涓嶈兘鍒犻櫎";
+ this.gridColumn88.FieldName = "aboutGuid";
+ this.gridColumn88.MinWidth = 44;
+ this.gridColumn88.Name = "gridColumn88";
+ this.gridColumn88.OptionsColumn.ReadOnly = true;
+ this.gridColumn88.Width = 82;
+ //
+ // gridColumn89
+ //
+ this.gridColumn89.Caption = "鐗╂枡缂栧彿";
+ this.gridColumn89.FieldName = "itemNo";
+ this.gridColumn89.MinWidth = 44;
+ this.gridColumn89.Name = "gridColumn89";
+ this.gridColumn89.OptionsColumn.ReadOnly = true;
+ this.gridColumn89.Visible = true;
+ this.gridColumn89.VisibleIndex = 0;
+ this.gridColumn89.Width = 77;
+ //
+ // gridColumn90
+ //
+ this.gridColumn90.AppearanceCell.Options.UseFont = true;
+ this.gridColumn90.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn90.FieldName = "itemName";
+ this.gridColumn90.MinWidth = 44;
+ this.gridColumn90.Name = "gridColumn90";
+ this.gridColumn90.OptionsColumn.ReadOnly = true;
+ this.gridColumn90.Tag = "query_a.board_style";
+ this.gridColumn90.Visible = true;
+ this.gridColumn90.VisibleIndex = 1;
+ this.gridColumn90.Width = 139;
+ //
+ // gridColumn91
+ //
+ this.gridColumn91.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn91.FieldName = "itemModel";
+ this.gridColumn91.MinWidth = 44;
+ this.gridColumn91.Name = "gridColumn91";
+ this.gridColumn91.Visible = true;
+ this.gridColumn91.VisibleIndex = 2;
+ this.gridColumn91.Width = 95;
+ //
+ // gridColumn92
+ //
+ this.gridColumn92.Caption = "鏈鏀惰揣鏁伴噺";
+ this.gridColumn92.FieldName = "quantity";
+ this.gridColumn92.MinWidth = 44;
+ this.gridColumn92.Name = "gridColumn92";
+ this.gridColumn92.Visible = true;
+ this.gridColumn92.VisibleIndex = 3;
+ this.gridColumn92.Width = 73;
+ //
+ // gridColumn93
+ //
+ this.gridColumn93.AppearanceCell.Options.UseFont = true;
+ this.gridColumn93.Caption = "宸插叆搴撴暟閲�";
+ this.gridColumn93.FieldName = "okRkqty";
+ this.gridColumn93.MinWidth = 44;
+ this.gridColumn93.Name = "gridColumn93";
+ this.gridColumn93.OptionsColumn.ReadOnly = true;
+ this.gridColumn93.Tag = "query_a.ok_rkqty";
+ this.gridColumn93.Visible = true;
+ this.gridColumn93.VisibleIndex = 4;
+ this.gridColumn93.Width = 77;
+ //
+ // gridColumn94
+ //
+ this.gridColumn94.AppearanceCell.Options.UseFont = true;
+ this.gridColumn94.Caption = "宸叉墦鍗版暟閲�";
+ this.gridColumn94.FieldName = "yQty";
+ this.gridColumn94.MinWidth = 44;
+ this.gridColumn94.Name = "gridColumn94";
+ this.gridColumn94.OptionsColumn.ReadOnly = true;
+ this.gridColumn94.Tag = "query_a.ebeln_qty";
+ this.gridColumn94.Visible = true;
+ this.gridColumn94.VisibleIndex = 5;
+ this.gridColumn94.Width = 77;
+ //
+ // gridColumn95
+ //
+ this.gridColumn95.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn95.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn95.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn95.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn95.Caption = "鍙墦鍗版�婚噺";
+ this.gridColumn95.FieldName = "kQty";
+ this.gridColumn95.MinWidth = 44;
+ this.gridColumn95.Name = "gridColumn95";
+ this.gridColumn95.Visible = true;
+ this.gridColumn95.VisibleIndex = 6;
+ this.gridColumn95.Width = 73;
+ //
+ // gridColumn96
+ //
+ this.gridColumn96.Caption = "鐗╂枡鍗曚綅";
+ this.gridColumn96.FieldName = "wnDw";
+ this.gridColumn96.MinWidth = 44;
+ this.gridColumn96.Name = "gridColumn96";
+ this.gridColumn96.OptionsColumn.ReadOnly = true;
+ this.gridColumn96.Width = 139;
+ //
+ // gridColumn97
+ //
+ this.gridColumn97.Caption = "閲囪喘鍗曚綅";
+ this.gridColumn97.FieldName = "cgUnit";
+ this.gridColumn97.MinWidth = 44;
+ this.gridColumn97.Name = "gridColumn97";
+ this.gridColumn97.OptionsColumn.ReadOnly = true;
+ this.gridColumn97.Visible = true;
+ this.gridColumn97.VisibleIndex = 7;
+ this.gridColumn97.Width = 73;
+ //
+ // gridColumn98
+ //
+ this.gridColumn98.Caption = "搴撳瓨鍗曚綅";
+ this.gridColumn98.FieldName = "kcUnit";
+ this.gridColumn98.MinWidth = 44;
+ this.gridColumn98.Name = "gridColumn98";
+ this.gridColumn98.OptionsColumn.ReadOnly = true;
+ this.gridColumn98.Width = 73;
+ //
+ // gridColumn99
+ //
+ this.gridColumn99.Caption = "妫�楠岀姸鎬�";
+ this.gridColumn99.FieldName = "jyzt";
+ this.gridColumn99.MinWidth = 44;
+ this.gridColumn99.Name = "gridColumn99";
+ this.gridColumn99.Visible = true;
+ this.gridColumn99.VisibleIndex = 8;
+ this.gridColumn99.Width = 73;
+ //
+ // gridColumn100
+ //
+ this.gridColumn100.Caption = "妫�楠岀粨鏋�";
+ this.gridColumn100.FieldName = "jyjg";
+ this.gridColumn100.MinWidth = 44;
+ this.gridColumn100.Name = "gridColumn100";
+ this.gridColumn100.Visible = true;
+ this.gridColumn100.VisibleIndex = 9;
+ this.gridColumn100.Width = 80;
+ //
+ // gridColumn101
+ //
+ this.gridColumn101.Caption = "澶勭悊鎰忚";
+ this.gridColumn101.FieldName = "clyj";
+ this.gridColumn101.MinWidth = 22;
+ this.gridColumn101.Name = "gridColumn101";
+ this.gridColumn101.Visible = true;
+ this.gridColumn101.VisibleIndex = 10;
+ this.gridColumn101.Width = 82;
+ //
+ // gridColumn102
+ //
+ this.gridColumn102.Caption = "榛樿姣忓紶鏉＄爜鏁伴噺";
+ this.gridColumn102.FieldName = "mrtmsl";
+ this.gridColumn102.MinWidth = 22;
+ this.gridColumn102.Name = "gridColumn102";
+ this.gridColumn102.Width = 82;
+ //
+ // gridColumn103
+ //
+ this.gridColumn103.Caption = "浠撳簱缂栫爜";
+ this.gridColumn103.FieldName = "depotCode";
+ this.gridColumn103.Name = "gridColumn103";
+ this.gridColumn103.Visible = true;
+ this.gridColumn103.VisibleIndex = 11;
+ //
+ // gridColumn104
+ //
+ this.gridColumn104.Caption = "浠撳簱鍚嶇О";
+ this.gridColumn104.FieldName = "depotName";
+ this.gridColumn104.Name = "gridColumn104";
+ this.gridColumn104.Visible = true;
+ this.gridColumn104.VisibleIndex = 12;
+ //
+ // gridColumn105
+ //
+ this.gridColumn105.Caption = "浠撶鍛�";
+ this.gridColumn105.FieldName = "staffName";
+ this.gridColumn105.Name = "gridColumn105";
+ this.gridColumn105.Visible = true;
+ this.gridColumn105.VisibleIndex = 13;
+ //
+ // repositoryItemButtonEdit7
+ //
+ this.repositoryItemButtonEdit7.AutoHeight = false;
+ this.repositoryItemButtonEdit7.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.repositoryItemButtonEdit7.Name = "repositoryItemButtonEdit7";
+ //
+ // repositoryItemButtonEdit8
+ //
+ this.repositoryItemButtonEdit8.AutoHeight = false;
+ this.repositoryItemButtonEdit8.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.repositoryItemButtonEdit8.Name = "repositoryItemButtonEdit8";
+ //
+ // repositoryItemComboBox4
+ //
+ this.repositoryItemComboBox4.AutoHeight = false;
+ this.repositoryItemComboBox4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox4.Name = "repositoryItemComboBox4";
+ //
+ // xtraTabPage4
+ //
+ this.xtraTabPage4.Controls.Add(this.gcMxL1);
+ this.xtraTabPage4.Name = "xtraTabPage4";
+ this.xtraTabPage4.Size = new System.Drawing.Size(1174, 390);
+ this.xtraTabPage4.Text = "鏉ユ枡鏄庣粏";
+ //
+ // gcMxL1
+ //
+ this.gcMxL1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMxL1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.gcMxL1.Location = new System.Drawing.Point(0, 0);
+ this.gcMxL1.MainView = this.gvMxL1;
+ this.gcMxL1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.gcMxL1.Name = "gcMxL1";
+ this.gcMxL1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit5,
+ this.repositoryItemButtonEdit6,
+ this.repositoryItemComboBox3});
+ this.gcMxL1.Size = new System.Drawing.Size(1174, 390);
+ this.gcMxL1.TabIndex = 2;
+ this.gcMxL1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMxL1});
+ //
+ // gvMxL1
+ //
+ this.gvMxL1.Appearance.Row.Options.UseFont = true;
+ this.gvMxL1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn34,
+ this.gridColumn35,
+ this.gridColumn36,
+ this.gridColumn51,
+ this.gridColumn55,
+ this.gridColumn56,
+ this.gridColumn57,
+ this.gridColumn58,
+ this.gridColumn59,
+ this.gridColumn60,
+ this.gridColumn61,
+ this.gridColumn62,
+ this.gridColumn63,
+ this.gridColumn64,
+ this.gridColumn65,
+ this.gridColumn66,
+ this.gridColumn67,
+ this.gridColumn68,
+ this.gridColumn69,
+ this.gridColumn70,
+ this.gridColumn71,
+ this.gridColumn72});
+ this.gvMxL1.DetailHeight = 272;
+ this.gvMxL1.GridControl = this.gcMxL1;
+ this.gvMxL1.Name = "gvMxL1";
+ this.gvMxL1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+ this.gvMxL1.OptionsFilter.AllowFilterEditor = false;
+ this.gvMxL1.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMxL1.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMxL1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn34
+ //
+ this.gridColumn34.Caption = "abtGuid涓嶈兘鍒犻櫎";
+ this.gridColumn34.FieldName = "aboutGuid";
+ this.gridColumn34.MinWidth = 44;
+ this.gridColumn34.Name = "gridColumn34";
+ this.gridColumn34.OptionsColumn.ReadOnly = true;
+ this.gridColumn34.Width = 82;
+ //
+ // gridColumn35
+ //
+ this.gridColumn35.AppearanceCell.Options.UseFont = true;
+ this.gridColumn35.Caption = "guid涓嶈兘鍒犻櫎";
+ this.gridColumn35.FieldName = "guid";
+ this.gridColumn35.MinWidth = 61;
+ this.gridColumn35.Name = "gridColumn35";
+ this.gridColumn35.OptionsColumn.ReadOnly = true;
+ this.gridColumn35.Tag = "query_a.guid";
+ this.gridColumn35.Width = 87;
+ //
+ // gridColumn36
+ //
+ this.gridColumn36.AppearanceCell.Options.UseFont = true;
+ this.gridColumn36.Caption = "鎬ユ枡鏍囪瘑";
+ this.gridColumn36.FieldName = "urgentFlag";
+ this.gridColumn36.MinWidth = 10;
+ this.gridColumn36.Name = "gridColumn36";
+ this.gridColumn36.Tag = "query_a.urgent_flag";
+ this.gridColumn36.Visible = true;
+ this.gridColumn36.VisibleIndex = 0;
+ this.gridColumn36.Width = 10;
+ //
+ // gridColumn51
+ //
+ this.gridColumn51.AppearanceCell.Options.UseFont = true;
+ this.gridColumn51.Caption = "ERP閲囪喘鍗曞彿";
+ this.gridColumn51.FieldName = "ebeln";
+ this.gridColumn51.MinWidth = 44;
+ this.gridColumn51.Name = "gridColumn51";
+ this.gridColumn51.OptionsColumn.ReadOnly = true;
+ this.gridColumn51.Tag = "query_a.ebeln";
+ this.gridColumn51.Visible = true;
+ this.gridColumn51.VisibleIndex = 1;
+ this.gridColumn51.Width = 79;
+ //
+ // gridColumn55
+ //
+ this.gridColumn55.Caption = "鐗╂枡缂栧彿";
+ this.gridColumn55.FieldName = "itemNo";
+ this.gridColumn55.MinWidth = 44;
+ this.gridColumn55.Name = "gridColumn55";
+ this.gridColumn55.OptionsColumn.ReadOnly = true;
+ this.gridColumn55.Visible = true;
+ this.gridColumn55.VisibleIndex = 2;
+ this.gridColumn55.Width = 66;
+ //
+ // gridColumn56
+ //
+ this.gridColumn56.AppearanceCell.Options.UseFont = true;
+ this.gridColumn56.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn56.FieldName = "itemName";
+ this.gridColumn56.MinWidth = 44;
+ this.gridColumn56.Name = "gridColumn56";
+ this.gridColumn56.OptionsColumn.ReadOnly = true;
+ this.gridColumn56.Tag = "query_a.board_style";
+ this.gridColumn56.Visible = true;
+ this.gridColumn56.VisibleIndex = 3;
+ this.gridColumn56.Width = 120;
+ //
+ // gridColumn57
+ //
+ this.gridColumn57.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn57.FieldName = "itemModel";
+ this.gridColumn57.MinWidth = 44;
+ this.gridColumn57.Name = "gridColumn57";
+ this.gridColumn57.Visible = true;
+ this.gridColumn57.VisibleIndex = 4;
+ this.gridColumn57.Width = 82;
+ //
+ // gridColumn58
+ //
+ this.gridColumn58.Caption = "鏈鏀惰揣鏁伴噺";
+ this.gridColumn58.FieldName = "quantity";
+ this.gridColumn58.MinWidth = 44;
+ this.gridColumn58.Name = "gridColumn58";
+ this.gridColumn58.Visible = true;
+ this.gridColumn58.VisibleIndex = 5;
+ this.gridColumn58.Width = 178;
+ //
+ // gridColumn59
+ //
+ this.gridColumn59.AppearanceCell.Options.UseFont = true;
+ this.gridColumn59.Caption = "宸插叆搴撴暟閲�";
+ this.gridColumn59.FieldName = "okRkqty";
+ this.gridColumn59.MinWidth = 44;
+ this.gridColumn59.Name = "gridColumn59";
+ this.gridColumn59.OptionsColumn.ReadOnly = true;
+ this.gridColumn59.Tag = "query_a.ok_rkqty";
+ this.gridColumn59.Visible = true;
+ this.gridColumn59.VisibleIndex = 6;
+ this.gridColumn59.Width = 139;
+ //
+ // gridColumn60
+ //
+ this.gridColumn60.AppearanceCell.Options.UseFont = true;
+ this.gridColumn60.Caption = "宸叉墦鍗版暟閲�";
+ this.gridColumn60.FieldName = "yQty";
+ this.gridColumn60.MinWidth = 44;
+ this.gridColumn60.Name = "gridColumn60";
+ this.gridColumn60.OptionsColumn.ReadOnly = true;
+ this.gridColumn60.Tag = "query_a.ebeln_qty";
+ this.gridColumn60.Visible = true;
+ this.gridColumn60.VisibleIndex = 7;
+ this.gridColumn60.Width = 109;
+ //
+ // gridColumn61
+ //
+ this.gridColumn61.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn61.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn61.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn61.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn61.Caption = "鍙墦鍗版�婚噺";
+ this.gridColumn61.FieldName = "kQty";
+ this.gridColumn61.MinWidth = 44;
+ this.gridColumn61.Name = "gridColumn61";
+ this.gridColumn61.Visible = true;
+ this.gridColumn61.VisibleIndex = 8;
+ this.gridColumn61.Width = 84;
+ //
+ // gridColumn62
+ //
+ this.gridColumn62.Caption = "鐗╂枡鍗曚綅";
+ this.gridColumn62.FieldName = "wnDw";
+ this.gridColumn62.MinWidth = 44;
+ this.gridColumn62.Name = "gridColumn62";
+ this.gridColumn62.OptionsColumn.ReadOnly = true;
+ this.gridColumn62.Width = 139;
+ //
+ // gridColumn63
+ //
+ this.gridColumn63.Caption = "閲囪喘鍗曚綅";
+ this.gridColumn63.FieldName = "cgUnit";
+ this.gridColumn63.MinWidth = 44;
+ this.gridColumn63.Name = "gridColumn63";
+ this.gridColumn63.OptionsColumn.ReadOnly = true;
+ this.gridColumn63.Visible = true;
+ this.gridColumn63.VisibleIndex = 9;
+ this.gridColumn63.Width = 44;
+ //
+ // gridColumn64
+ //
+ this.gridColumn64.Caption = "搴撳瓨鍗曚綅";
+ this.gridColumn64.FieldName = "kcUnit";
+ this.gridColumn64.MinWidth = 44;
+ this.gridColumn64.Name = "gridColumn64";
+ this.gridColumn64.OptionsColumn.ReadOnly = true;
+ this.gridColumn64.Width = 73;
+ //
+ // gridColumn65
+ //
+ this.gridColumn65.Caption = "妫�楠岀姸鎬�";
+ this.gridColumn65.FieldName = "jyzt";
+ this.gridColumn65.MinWidth = 44;
+ this.gridColumn65.Name = "gridColumn65";
+ this.gridColumn65.Visible = true;
+ this.gridColumn65.VisibleIndex = 10;
+ this.gridColumn65.Width = 44;
+ //
+ // gridColumn66
+ //
+ this.gridColumn66.Caption = "妫�楠岀粨鏋�";
+ this.gridColumn66.FieldName = "jyjg";
+ this.gridColumn66.MinWidth = 44;
+ this.gridColumn66.Name = "gridColumn66";
+ this.gridColumn66.Visible = true;
+ this.gridColumn66.VisibleIndex = 11;
+ this.gridColumn66.Width = 44;
+ //
+ // gridColumn67
+ //
+ this.gridColumn67.Caption = "澶勭悊鎰忚";
+ this.gridColumn67.FieldName = "clyj";
+ this.gridColumn67.MinWidth = 22;
+ this.gridColumn67.Name = "gridColumn67";
+ this.gridColumn67.Visible = true;
+ this.gridColumn67.VisibleIndex = 12;
+ this.gridColumn67.Width = 22;
+ //
+ // gridColumn68
+ //
+ this.gridColumn68.Caption = "榛樿姣忓紶鏉＄爜鏁伴噺";
+ this.gridColumn68.FieldName = "mrtmsl";
+ this.gridColumn68.MinWidth = 22;
+ this.gridColumn68.Name = "gridColumn68";
+ this.gridColumn68.Width = 82;
+ //
+ // gridColumn69
+ //
+ this.gridColumn69.Caption = "鍏ュ簱绫诲瀷";
+ this.gridColumn69.ColumnEdit = this.repositoryItemComboBox3;
+ this.gridColumn69.FieldName = "rkType";
+ this.gridColumn69.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+ this.gridColumn69.Name = "gridColumn69";
+ this.gridColumn69.OptionsColumn.ReadOnly = true;
+ this.gridColumn69.Visible = true;
+ this.gridColumn69.VisibleIndex = 16;
+ this.gridColumn69.Width = 66;
+ //
+ // repositoryItemComboBox3
+ //
+ this.repositoryItemComboBox3.AutoHeight = false;
+ this.repositoryItemComboBox3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox3.Name = "repositoryItemComboBox3";
+ //
+ // gridColumn70
+ //
+ this.gridColumn70.Caption = "浠撳簱缂栫爜";
+ this.gridColumn70.FieldName = "depotCode";
+ this.gridColumn70.Name = "gridColumn70";
+ this.gridColumn70.Visible = true;
+ this.gridColumn70.VisibleIndex = 13;
+ this.gridColumn70.Width = 20;
+ //
+ // gridColumn71
+ //
+ this.gridColumn71.Caption = "浠撳簱鍚嶇О";
+ this.gridColumn71.FieldName = "depotName";
+ this.gridColumn71.Name = "gridColumn71";
+ this.gridColumn71.Visible = true;
+ this.gridColumn71.VisibleIndex = 14;
+ this.gridColumn71.Width = 20;
+ //
+ // gridColumn72
+ //
+ this.gridColumn72.Caption = "浠撶鍛�";
+ this.gridColumn72.FieldName = "staffName";
+ this.gridColumn72.Name = "gridColumn72";
+ this.gridColumn72.Visible = true;
+ this.gridColumn72.VisibleIndex = 15;
+ this.gridColumn72.Width = 20;
+ //
+ // repositoryItemButtonEdit5
+ //
+ this.repositoryItemButtonEdit5.AutoHeight = false;
+ this.repositoryItemButtonEdit5.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.repositoryItemButtonEdit5.Name = "repositoryItemButtonEdit5";
+ //
+ // repositoryItemButtonEdit6
+ //
+ this.repositoryItemButtonEdit6.AutoHeight = false;
+ this.repositoryItemButtonEdit6.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.repositoryItemButtonEdit6.Name = "repositoryItemButtonEdit6";
+ //
+ // xtraTabPage6
+ //
+ this.xtraTabPage6.Controls.Add(this.gcMxL3);
+ this.xtraTabPage6.Name = "xtraTabPage6";
+ this.xtraTabPage6.Size = new System.Drawing.Size(1174, 390);
+ this.xtraTabPage6.Text = "宸叉墦鏉＄爜鏄庣粏";
+ //
+ // gcMxL3
+ //
+ this.gcMxL3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMxL3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.gcMxL3.Location = new System.Drawing.Point(0, 0);
+ this.gcMxL3.MainView = this.gvMxL3;
+ this.gcMxL3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.gcMxL3.Name = "gcMxL3";
+ this.gcMxL3.Size = new System.Drawing.Size(1174, 390);
+ this.gcMxL3.TabIndex = 1;
+ this.gcMxL3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMxL3});
+ //
+ // gvMxL3
+ //
+ this.gvMxL3.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gvMxL3.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMxL3.Appearance.Row.Options.UseFont = true;
+ this.gvMxL3.ColumnPanelRowHeight = 39;
+ this.gvMxL3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn73,
+ this.gridColumn74,
+ this.gridColumn75,
+ this.gridColumn76,
+ this.gridColumn77,
+ this.gridColumn78,
+ this.gridColumn79,
+ this.gridColumn80,
+ this.gridColumn81,
+ this.gridColumn82,
+ this.gridColumn83,
+ this.gridColumn84,
+ this.gridColumn85,
+ this.gridColumn86,
+ this.gridColumn87});
+ this.gvMxL3.DetailHeight = 272;
+ this.gvMxL3.GridControl = this.gcMxL3;
+ this.gvMxL3.Name = "gvMxL3";
+ this.gvMxL3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMxL3.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMxL3.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn73
+ //
+ this.gridColumn73.AppearanceCell.Options.UseFont = true;
+ this.gridColumn73.Caption = "guid ";
+ this.gridColumn73.FieldName = "guid";
+ this.gridColumn73.MinWidth = 44;
+ this.gridColumn73.Name = "gridColumn73";
+ this.gridColumn73.Tag = "query_a.guid";
+ this.gridColumn73.Width = 82;
+ //
+ // gridColumn74
+ //
+ this.gridColumn74.Caption = "鏄惁鍏ュ簱";
+ this.gridColumn74.FieldName = "isRk";
+ this.gridColumn74.MaxWidth = 44;
+ this.gridColumn74.MinWidth = 44;
+ this.gridColumn74.Name = "gridColumn74";
+ this.gridColumn74.Visible = true;
+ this.gridColumn74.VisibleIndex = 0;
+ this.gridColumn74.Width = 44;
+ //
+ // gridColumn75
+ //
+ this.gridColumn75.AppearanceCell.Options.UseFont = true;
+ this.gridColumn75.Caption = "鐗╂枡鏉＄爜";
+ this.gridColumn75.FieldName = "itemBarcode";
+ this.gridColumn75.MinWidth = 44;
+ this.gridColumn75.Name = "gridColumn75";
+ this.gridColumn75.Tag = "query_a.ITEM_BARCODE";
+ this.gridColumn75.Visible = true;
+ this.gridColumn75.VisibleIndex = 1;
+ this.gridColumn75.Width = 262;
+ //
+ // gridColumn76
+ //
+ this.gridColumn76.AppearanceCell.Options.UseFont = true;
+ this.gridColumn76.Caption = "鐗╂枡缂栫爜 ";
+ this.gridColumn76.FieldName = "itemNo";
+ this.gridColumn76.MinWidth = 44;
+ this.gridColumn76.Name = "gridColumn76";
+ this.gridColumn76.Tag = "query_a.ITEM_NO";
+ this.gridColumn76.Visible = true;
+ this.gridColumn76.VisibleIndex = 2;
+ this.gridColumn76.Width = 87;
+ //
+ // gridColumn77
+ //
+ this.gridColumn77.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn77.FieldName = "itemName";
+ this.gridColumn77.MinWidth = 44;
+ this.gridColumn77.Name = "gridColumn77";
+ this.gridColumn77.Visible = true;
+ this.gridColumn77.VisibleIndex = 3;
+ this.gridColumn77.Width = 131;
+ //
+ // gridColumn78
+ //
+ this.gridColumn78.Caption = "瑙勬牸鍨嬪彿";
+ this.gridColumn78.FieldName = "itemModel";
+ this.gridColumn78.MinWidth = 44;
+ this.gridColumn78.Name = "gridColumn78";
+ this.gridColumn78.Visible = true;
+ this.gridColumn78.VisibleIndex = 4;
+ this.gridColumn78.Width = 131;
+ //
+ // gridColumn79
+ //
+ this.gridColumn79.AppearanceCell.Options.UseFont = true;
+ this.gridColumn79.Caption = "鏁伴噺";
+ this.gridColumn79.FieldName = "quantity";
+ this.gridColumn79.MinWidth = 44;
+ this.gridColumn79.Name = "gridColumn79";
+ this.gridColumn79.Tag = "query_a.OLDQTY";
+ this.gridColumn79.Visible = true;
+ this.gridColumn79.VisibleIndex = 5;
+ this.gridColumn79.Width = 82;
+ //
+ // gridColumn80
+ //
+ this.gridColumn80.Caption = "鍗曚綅";
+ this.gridColumn80.FieldName = "dwName";
+ this.gridColumn80.MinWidth = 22;
+ this.gridColumn80.Name = "gridColumn80";
+ this.gridColumn80.Visible = true;
+ this.gridColumn80.VisibleIndex = 6;
+ this.gridColumn80.Width = 82;
+ //
+ // gridColumn81
+ //
+ this.gridColumn81.Caption = "鎵撶爜浜�";
+ this.gridColumn81.FieldName = "createBy";
+ this.gridColumn81.MinWidth = 22;
+ this.gridColumn81.Name = "gridColumn81";
+ this.gridColumn81.Visible = true;
+ this.gridColumn81.VisibleIndex = 7;
+ this.gridColumn81.Width = 82;
+ //
+ // gridColumn82
+ //
+ this.gridColumn82.Caption = "鎵撶爜鏃ユ湡";
+ this.gridColumn82.FieldName = "createDate";
+ this.gridColumn82.MinWidth = 10;
+ this.gridColumn82.Name = "gridColumn82";
+ this.gridColumn82.Visible = true;
+ this.gridColumn82.VisibleIndex = 8;
+ this.gridColumn82.Width = 157;
+ //
+ // gridColumn83
+ //
+ this.gridColumn83.Caption = "鍏ュ簱浜�";
+ this.gridColumn83.FieldName = "rkUser";
+ this.gridColumn83.MinWidth = 22;
+ this.gridColumn83.Name = "gridColumn83";
+ this.gridColumn83.Visible = true;
+ this.gridColumn83.VisibleIndex = 9;
+ this.gridColumn83.Width = 82;
+ //
+ // gridColumn84
+ //
+ this.gridColumn84.Caption = "鍏ュ簱鏃ユ湡";
+ this.gridColumn84.FieldName = "rkDate";
+ this.gridColumn84.MinWidth = 22;
+ this.gridColumn84.Name = "gridColumn84";
+ this.gridColumn84.Visible = true;
+ this.gridColumn84.VisibleIndex = 10;
+ this.gridColumn84.Width = 82;
+ //
+ // gridColumn85
+ //
+ this.gridColumn85.Caption = "鍏ュ簱浣�";
+ this.gridColumn85.FieldName = "rkPositon";
+ this.gridColumn85.MinWidth = 22;
+ this.gridColumn85.Name = "gridColumn85";
+ this.gridColumn85.Visible = true;
+ this.gridColumn85.VisibleIndex = 11;
+ this.gridColumn85.Width = 82;
+ //
+ // gridColumn86
+ //
+ this.gridColumn86.Caption = "鍏ュ簱绫诲瀷";
+ this.gridColumn86.FieldName = "cgrkType";
+ this.gridColumn86.Name = "gridColumn86";
+ this.gridColumn86.Visible = true;
+ this.gridColumn86.VisibleIndex = 12;
+ //
+ // gridColumn87
+ //
+ this.gridColumn87.Caption = "鏄惁鍚堝苟鎵撳嵃";
+ this.gridColumn87.FieldName = "hbdy2";
+ this.gridColumn87.Name = "gridColumn87";
+ this.gridColumn87.Visible = true;
+ this.gridColumn87.VisibleIndex = 13;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1344, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1476, 669);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -540,6 +1598,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -552,14 +1611,16 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1344, 570);
- this.splitMx1.SplitterPosition = 103;
+ this.splitMx1.Size = new System.Drawing.Size(1476, 669);
+ this.splitMx1.SplitterPosition = 109;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
this.layoutMx1.Controls.Add(this.lbGuid);
+ this.layoutMx1.Controls.Add(this.txt_dptName);
this.layoutMx1.Controls.Add(this.txt_gysNo);
+ this.layoutMx1.Controls.Add(this.txt_depotsCode);
this.layoutMx1.Controls.Add(this.txt_barcodeProgress);
this.layoutMx1.Controls.Add(this.txt_paperBillNo);
this.layoutMx1.Controls.Add(this.txt_billNo);
@@ -573,108 +1634,139 @@
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem14});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(638, 441, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1344, 103);
+ this.layoutMx1.Size = new System.Drawing.Size(1476, 109);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(989, 108);
+ this.lbGuid.Location = new System.Drawing.Point(865, 84);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(322, 28);
+ this.lbGuid.Size = new System.Drawing.Size(282, 22);
this.lbGuid.TabIndex = 471;
this.lbGuid.Text = "lbGuid";
//
+ // txt_dptName
+ //
+ this.txt_dptName.Location = new System.Drawing.Point(455, 36);
+ this.txt_dptName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_dptName.Name = "txt_dptName";
+ this.txt_dptName.Properties.Appearance.Options.UseFont = true;
+ this.txt_dptName.Size = new System.Drawing.Size(272, 20);
+ this.txt_dptName.StyleController = this.layoutMx1;
+ this.txt_dptName.TabIndex = 468;
+ //
// txt_gysNo
//
- this.txt_gysNo.Location = new System.Drawing.Point(114, 40);
+ this.txt_gysNo.Location = new System.Drawing.Point(96, 60);
+ this.txt_gysNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_gysNo.Name = "txt_gysNo";
this.txt_gysNo.Properties.Appearance.Options.UseFont = true;
- this.txt_gysNo.Size = new System.Drawing.Size(225, 24);
+ this.txt_gysNo.Size = new System.Drawing.Size(271, 20);
this.txt_gysNo.StyleController = this.layoutMx1;
this.txt_gysNo.TabIndex = 467;
//
+ // txt_depotsCode
+ //
+ this.txt_depotsCode.Location = new System.Drawing.Point(455, 60);
+ this.txt_depotsCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_depotsCode.Name = "txt_depotsCode";
+ this.txt_depotsCode.Properties.Appearance.Options.UseFont = true;
+ this.txt_depotsCode.Size = new System.Drawing.Size(272, 20);
+ this.txt_depotsCode.StyleController = this.layoutMx1;
+ this.txt_depotsCode.TabIndex = 462;
+ //
// txt_barcodeProgress
//
- this.txt_barcodeProgress.Location = new System.Drawing.Point(776, 68);
+ this.txt_barcodeProgress.Location = new System.Drawing.Point(815, 60);
+ this.txt_barcodeProgress.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_barcodeProgress.Name = "txt_barcodeProgress";
this.txt_barcodeProgress.Properties.Appearance.Options.UseFont = true;
- this.txt_barcodeProgress.Size = new System.Drawing.Size(225, 24);
+ this.txt_barcodeProgress.Size = new System.Drawing.Size(272, 20);
this.txt_barcodeProgress.StyleController = this.layoutMx1;
this.txt_barcodeProgress.TabIndex = 342;
//
// txt_paperBillNo
//
- this.txt_paperBillNo.Location = new System.Drawing.Point(445, 12);
+ this.txt_paperBillNo.Location = new System.Drawing.Point(455, 12);
+ this.txt_paperBillNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_paperBillNo.Name = "txt_paperBillNo";
this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_paperBillNo.Size = new System.Drawing.Size(225, 24);
+ this.txt_paperBillNo.Size = new System.Drawing.Size(272, 20);
this.txt_paperBillNo.StyleController = this.layoutMx1;
this.txt_paperBillNo.TabIndex = 463;
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(114, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(96, 12);
+ this.txt_billNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(225, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(271, 20);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
//
// txt_gysName
//
- this.txt_gysName.Location = new System.Drawing.Point(445, 40);
+ this.txt_gysName.Location = new System.Drawing.Point(96, 36);
+ this.txt_gysName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_gysName.Name = "txt_gysName";
this.txt_gysName.Properties.Appearance.Options.UseFont = true;
- this.txt_gysName.Size = new System.Drawing.Size(225, 24);
+ this.txt_gysName.Size = new System.Drawing.Size(271, 20);
this.txt_gysName.StyleController = this.layoutMx1;
this.txt_gysName.TabIndex = 459;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(776, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(815, 12);
+ this.txt_createBy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(225, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(272, 20);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 217;
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(114, 68);
+ this.txt_remark.Location = new System.Drawing.Point(96, 84);
+ this.txt_remark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(556, 24);
+ this.txt_remark.Size = new System.Drawing.Size(631, 20);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 235;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(776, 40);
+ this.txt_createDate.Location = new System.Drawing.Point(815, 36);
+ this.txt_createDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(225, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(272, 20);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 252;
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(1005, 12);
+ this.txt_fType.Location = new System.Drawing.Point(1091, 12);
+ this.txt_fType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
- this.txt_fType.Size = new System.Drawing.Size(327, 24);
+ this.txt_fType.Size = new System.Drawing.Size(356, 20);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 469;
//
// txt_urgentFlag
//
- this.txt_urgentFlag.Location = new System.Drawing.Point(1005, 40);
+ this.txt_urgentFlag.Location = new System.Drawing.Point(1091, 36);
+ this.txt_urgentFlag.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_urgentFlag.Name = "txt_urgentFlag";
this.txt_urgentFlag.Properties.Caption = "鎬ユ枡鏍囪瘑";
- this.txt_urgentFlag.Size = new System.Drawing.Size(327, 24);
+ this.txt_urgentFlag.Size = new System.Drawing.Size(356, 20);
this.txt_urgentFlag.StyleController = this.layoutMx1;
this.txt_urgentFlag.TabIndex = 470;
//
@@ -696,15 +1788,17 @@
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
- this.layoutControlItem4,
- this.layoutControlItem7,
- this.layoutControlItem8,
- this.layoutControlItem10,
- this.layoutControlItem11,
- this.layoutControlItem13,
this.layoutControlItem2,
this.layoutControlItem3,
- this.layoutControlItem12});
+ this.layoutControlItem4,
+ this.layoutControlItem5,
+ this.layoutControlItem6,
+ this.layoutControlItem7,
+ this.layoutControlItem8,
+ this.layoutControlItem12,
+ this.layoutControlItem10,
+ this.layoutControlItem11,
+ this.layoutControlItem13});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -726,11 +1820,14 @@
rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition3.Height = 100D;
rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
- rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1344, 104);
+ rowDefinition3,
+ rowDefinition4});
+ this.Root.Size = new System.Drawing.Size(1459, 116);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -738,49 +1835,102 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(331, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(359, 24);
this.layoutControlItem1.Text = "鍒拌揣鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_gysName;
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 24);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(359, 24);
+ this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_gysNo;
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 48);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem3.Size = new System.Drawing.Size(359, 24);
+ this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_paperBillNo;
- this.layoutControlItem4.Location = new System.Drawing.Point(331, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(359, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(331, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(360, 24);
this.layoutControlItem4.Text = "閫佽揣鍗曞彿";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_dptName;
+ this.layoutControlItem5.Location = new System.Drawing.Point(359, 24);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem5.Size = new System.Drawing.Size(360, 24);
+ this.layoutControlItem5.Text = "浠撳簱鍚嶇О";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_depotsCode;
+ this.layoutControlItem6.Location = new System.Drawing.Point(359, 48);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem6.Size = new System.Drawing.Size(360, 24);
+ this.layoutControlItem6.Text = "浠撳簱缂栧彿";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_createBy;
- this.layoutControlItem7.Location = new System.Drawing.Point(662, 0);
+ this.layoutControlItem7.Location = new System.Drawing.Point(719, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(331, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(360, 24);
this.layoutControlItem7.Text = "鍒涘缓浜哄憳";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_createDate;
this.layoutControlItem8.CustomizationFormText = "鍒涘缓鏃ユ湡";
- this.layoutControlItem8.Location = new System.Drawing.Point(662, 28);
+ this.layoutControlItem8.Location = new System.Drawing.Point(719, 24);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(331, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(360, 24);
this.layoutControlItem8.Text = "鍒涘缓鏃ユ湡";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_remark;
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 72);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem12.Size = new System.Drawing.Size(719, 24);
+ this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fType;
- this.layoutControlItem10.Location = new System.Drawing.Point(993, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(1079, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(331, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(360, 24);
this.layoutControlItem10.Text = "鎻愪氦鐘舵��";
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
@@ -788,11 +1938,11 @@
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_urgentFlag;
- this.layoutControlItem11.Location = new System.Drawing.Point(993, 28);
+ this.layoutControlItem11.Location = new System.Drawing.Point(1079, 24);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(331, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(360, 24);
this.layoutControlItem11.Text = "鎬ユ枡鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -800,63 +1950,687 @@
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_barcodeProgress;
- this.layoutControlItem13.Location = new System.Drawing.Point(662, 56);
+ this.layoutControlItem13.Location = new System.Drawing.Point(719, 48);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(331, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(360, 24);
this.layoutControlItem13.Text = "鏉＄爜鎵撳嵃姣旂巼";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_gysName;
- this.layoutControlItem2.Location = new System.Drawing.Point(331, 28);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(331, 28);
- this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_gysNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 28);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(331, 28);
- this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_remark;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 56);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(662, 28);
- this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 14);
//
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabMx.Name = "tabMx";
- this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1344, 455);
+ this.tabMx.SelectedTabPage = this.xtraTabPage3;
+ this.tabMx.Size = new System.Drawing.Size(1476, 550);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage3,
this.tabMxPage1,
this.tabMxPage2});
+ //
+ // xtraTabPage3
+ //
+ this.xtraTabPage3.Controls.Add(this.splitContainerControl1);
+ this.xtraTabPage3.Name = "xtraTabPage3";
+ this.xtraTabPage3.Size = new System.Drawing.Size(1474, 524);
+ this.xtraTabPage3.Text = "鍚堝苟鏄庣粏";
+ //
+ // splitContainerControl1
+ //
+ this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainerControl1.Horizontal = false;
+ this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
+ this.splitContainerControl1.Name = "splitContainerControl1";
+ //
+ // splitContainerControl1.Panel1
+ //
+ this.splitContainerControl1.Panel1.Controls.Add(this.lay99);
+ this.splitContainerControl1.Panel1.Text = "Panel1";
+ //
+ // splitContainerControl1.Panel2
+ //
+ this.splitContainerControl1.Panel2.Controls.Add(this.gcMx3);
+ this.splitContainerControl1.Panel2.Text = "Panel2";
+ this.splitContainerControl1.Size = new System.Drawing.Size(1474, 524);
+ this.splitContainerControl1.SplitterPosition = 130;
+ this.splitContainerControl1.TabIndex = 0;
+ //
+ // lay99
+ //
+ this.lay99.Controls.Add(this.layoutControl2);
+ this.lay99.Controls.Add(this.radOut2);
+ this.lay99.Controls.Add(this.ucBtnPrint2);
+ this.lay99.Controls.Add(this.txtItemNo);
+ this.lay99.Controls.Add(this.txtItemName);
+ this.lay99.Controls.Add(this.txt_kQtyHb);
+ this.lay99.Controls.Add(this.txt_psnQty_2);
+ this.lay99.Controls.Add(this.txtItemModel);
+ this.lay99.Controls.Add(this.txtQuantityHb);
+ this.lay99.Controls.Add(this.txt_yQtyHb);
+ this.lay99.Controls.Add(this.txt_releaseNo);
+ this.lay99.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.lay99.Location = new System.Drawing.Point(0, 0);
+ this.lay99.Name = "lay99";
+ this.lay99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(684, 503, 650, 400);
+ this.lay99.Root = this.layoutControlGroup3;
+ this.lay99.Size = new System.Drawing.Size(1474, 130);
+ this.lay99.TabIndex = 0;
+ this.lay99.Text = "layoutControl2";
+ //
+ // layoutControl2
+ //
+ this.layoutControl2.Controls.Add(this.txt_iCount_2);
+ this.layoutControl2.Controls.Add(this.txt_yuliang_2);
+ this.layoutControl2.Location = new System.Drawing.Point(738, 48);
+ this.layoutControl2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.layoutControl2.Name = "layoutControl2";
+ this.layoutControl2.Root = this.layoutControlGroup4;
+ this.layoutControl2.Size = new System.Drawing.Size(359, 33);
+ this.layoutControl2.TabIndex = 478;
+ this.layoutControl2.Text = "layoutControl2";
+ //
+ // txt_iCount_2
+ //
+ this.txt_iCount_2.Location = new System.Drawing.Point(86, 2);
+ this.txt_iCount_2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_iCount_2.Name = "txt_iCount_2";
+ this.txt_iCount_2.Properties.Appearance.Options.UseFont = true;
+ this.txt_iCount_2.Properties.ReadOnly = true;
+ this.txt_iCount_2.Properties.UseMaskAsDisplayFormat = true;
+ this.txt_iCount_2.Size = new System.Drawing.Size(91, 20);
+ this.txt_iCount_2.StyleController = this.layoutControl2;
+ this.txt_iCount_2.TabIndex = 264;
+ this.txt_iCount_2.Tag = "ReadOnly";
+ this.txt_iCount_2.ToolTip = "璇疯緭鍏ユ潯鐮佸紶鏁�";
+ //
+ // txt_yuliang_2
+ //
+ this.txt_yuliang_2.Location = new System.Drawing.Point(265, 2);
+ this.txt_yuliang_2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_yuliang_2.Name = "txt_yuliang_2";
+ this.txt_yuliang_2.Properties.ReadOnly = true;
+ this.txt_yuliang_2.Size = new System.Drawing.Size(92, 20);
+ this.txt_yuliang_2.StyleController = this.layoutControl2;
+ this.txt_yuliang_2.TabIndex = 265;
+ //
+ // layoutControlGroup4
+ //
+ this.layoutControlGroup4.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup4.GroupBordersVisible = false;
+ this.layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem31,
+ this.layoutControlItem32});
+ this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup4.Name = "Root";
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition5,
+ columnDefinition6});
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition5});
+ this.layoutControlGroup4.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ this.layoutControlGroup4.Size = new System.Drawing.Size(359, 33);
+ this.layoutControlGroup4.TextVisible = false;
+ //
+ // layoutControlItem31
+ //
+ this.layoutControlItem31.Control = this.txt_iCount_2;
+ this.layoutControlItem31.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem31.Name = "layoutControlItem26";
+ this.layoutControlItem31.Size = new System.Drawing.Size(179, 33);
+ this.layoutControlItem31.Text = "鎵撳嵃鏁村紶鏁板��";
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem32
+ //
+ this.layoutControlItem32.Control = this.txt_yuliang_2;
+ this.layoutControlItem32.Location = new System.Drawing.Point(179, 0);
+ this.layoutControlItem32.Name = "layoutControlItem27";
+ this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem32.Size = new System.Drawing.Size(180, 33);
+ this.layoutControlItem32.Text = "鎵撳嵃浣欐暟";
+ this.layoutControlItem32.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // radOut2
+ //
+ this.radOut2.Location = new System.Drawing.Point(1101, 48);
+ this.radOut2.Margin = new System.Windows.Forms.Padding(0);
+ this.radOut2.Name = "radOut2";
+ this.radOut2.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
+ this.radOut2.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
+ this.radOut2.Properties.Padding = new System.Windows.Forms.Padding(0);
+ this.radOut2.Size = new System.Drawing.Size(361, 33);
+ this.radOut2.StyleController = this.lay99;
+ this.radOut2.TabIndex = 477;
+ //
+ // ucBtnPrint2
+ //
+ this.ucBtnPrint2.allClickKey = null;
+ this.ucBtnPrint2.guidKey = null;
+ this.ucBtnPrint2.Location = new System.Drawing.Point(1101, 85);
+ this.ucBtnPrint2.Margin = new System.Windows.Forms.Padding(0);
+ this.ucBtnPrint2.Name = "ucBtnPrint2";
+ this.ucBtnPrint2.rptParameter = null;
+ this.ucBtnPrint2.Size = new System.Drawing.Size(361, 33);
+ this.ucBtnPrint2.TabIndex = 6;
+ //
+ // txtItemNo
+ //
+ this.txtItemNo.Location = new System.Drawing.Point(96, 12);
+ this.txtItemNo.Name = "txtItemNo";
+ this.txtItemNo.Properties.ReadOnly = true;
+ this.txtItemNo.Properties.Tag = "ReadOnly";
+ this.txtItemNo.Size = new System.Drawing.Size(275, 20);
+ this.txtItemNo.StyleController = this.lay99;
+ this.txtItemNo.TabIndex = 4;
+ //
+ // txtItemName
+ //
+ this.txtItemName.Location = new System.Drawing.Point(96, 48);
+ this.txtItemName.Name = "txtItemName";
+ this.txtItemName.Properties.ReadOnly = true;
+ this.txtItemName.Size = new System.Drawing.Size(275, 20);
+ this.txtItemName.StyleController = this.lay99;
+ this.txtItemName.TabIndex = 5;
+ this.txtItemName.Tag = "ReadOnly";
+ //
+ // txt_kQtyHb
+ //
+ this.txt_kQtyHb.Location = new System.Drawing.Point(822, 12);
+ this.txt_kQtyHb.Name = "txt_kQtyHb";
+ this.txt_kQtyHb.Properties.ReadOnly = true;
+ this.txt_kQtyHb.Size = new System.Drawing.Size(275, 20);
+ this.txt_kQtyHb.StyleController = this.lay99;
+ this.txt_kQtyHb.TabIndex = 479;
+ this.txt_kQtyHb.Tag = "ReadOnly";
+ //
+ // txt_psnQty_2
+ //
+ this.txt_psnQty_2.Location = new System.Drawing.Point(822, 85);
+ this.txt_psnQty_2.Name = "txt_psnQty_2";
+ this.txt_psnQty_2.Size = new System.Drawing.Size(275, 20);
+ this.txt_psnQty_2.StyleController = this.lay99;
+ this.txt_psnQty_2.TabIndex = 480;
+ //
+ // txtItemModel
+ //
+ this.txtItemModel.Location = new System.Drawing.Point(96, 85);
+ this.txtItemModel.Name = "txtItemModel";
+ this.txtItemModel.Properties.ReadOnly = true;
+ this.txtItemModel.Size = new System.Drawing.Size(275, 20);
+ this.txtItemModel.StyleController = this.lay99;
+ this.txtItemModel.TabIndex = 481;
+ //
+ // txtQuantityHb
+ //
+ this.txtQuantityHb.Location = new System.Drawing.Point(459, 12);
+ this.txtQuantityHb.Name = "txtQuantityHb";
+ this.txtQuantityHb.Properties.ReadOnly = true;
+ this.txtQuantityHb.Size = new System.Drawing.Size(275, 20);
+ this.txtQuantityHb.StyleController = this.lay99;
+ this.txtQuantityHb.TabIndex = 482;
+ //
+ // txt_yQtyHb
+ //
+ this.txt_yQtyHb.Location = new System.Drawing.Point(459, 48);
+ this.txt_yQtyHb.Name = "txt_yQtyHb";
+ this.txt_yQtyHb.Properties.ReadOnly = true;
+ this.txt_yQtyHb.Size = new System.Drawing.Size(275, 20);
+ this.txt_yQtyHb.StyleController = this.lay99;
+ this.txt_yQtyHb.TabIndex = 483;
+ //
+ // txt_releaseNo
+ //
+ this.txt_releaseNo.Location = new System.Drawing.Point(459, 85);
+ this.txt_releaseNo.Name = "txt_releaseNo";
+ this.txt_releaseNo.Properties.ReadOnly = true;
+ this.txt_releaseNo.Size = new System.Drawing.Size(275, 20);
+ this.txt_releaseNo.StyleController = this.lay99;
+ this.txt_releaseNo.TabIndex = 484;
+ //
+ // layoutControlGroup3
+ //
+ this.layoutControlGroup3.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup3.GroupBordersVisible = false;
+ this.layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem33,
+ this.layoutControlItem30,
+ this.layoutControlItem29,
+ this.layoutControlItem28,
+ this.layoutControlItem9,
+ this.layoutControlItem34,
+ this.layoutControlItem36,
+ this.layoutControlItem37,
+ this.layoutControlItem38,
+ this.layoutControlItem39,
+ this.layoutControlItem35,
+ this.layoutControlItem40});
+ this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup3.Name = "Root";
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ this.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition7,
+ columnDefinition8,
+ columnDefinition9,
+ columnDefinition10});
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8});
+ this.layoutControlGroup3.Size = new System.Drawing.Size(1474, 130);
+ this.layoutControlGroup3.TextVisible = false;
+ //
+ // layoutControlItem33
+ //
+ this.layoutControlItem33.Control = this.layoutControl2;
+ this.layoutControlItem33.Location = new System.Drawing.Point(726, 36);
+ this.layoutControlItem33.Name = "layoutControlItem33";
+ this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem33.Size = new System.Drawing.Size(363, 37);
+ this.layoutControlItem33.Text = "鎵撳嵃寮犳暟";
+ this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem33.TextVisible = false;
+ //
+ // layoutControlItem30
+ //
+ this.layoutControlItem30.Control = this.radOut2;
+ this.layoutControlItem30.CustomizationFormText = "鎵撳嵃妯″紡";
+ this.layoutControlItem30.Location = new System.Drawing.Point(1089, 36);
+ this.layoutControlItem30.Name = "layoutControlItem30";
+ this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem30.Size = new System.Drawing.Size(365, 37);
+ this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem30.TextVisible = false;
+ //
+ // layoutControlItem29
+ //
+ this.layoutControlItem29.Control = this.ucBtnPrint2;
+ this.layoutControlItem29.Location = new System.Drawing.Point(1089, 73);
+ this.layoutControlItem29.Name = "layoutControlItem29";
+ this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem29.Size = new System.Drawing.Size(365, 37);
+ this.layoutControlItem29.Text = "鎵撳嵃鎸夐挳";
+ this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem29.TextVisible = false;
+ //
+ // layoutControlItem28
+ //
+ this.layoutControlItem28.Control = this.txtItemName;
+ this.layoutControlItem28.Location = new System.Drawing.Point(0, 36);
+ this.layoutControlItem28.Name = "layoutControlItem28";
+ this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem28.Size = new System.Drawing.Size(363, 37);
+ this.layoutControlItem28.Text = "鐗╂枡鍚嶇О";
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txtItemNo;
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.Size = new System.Drawing.Size(363, 36);
+ this.layoutControlItem9.Text = "鐗╂枡缂栧彿";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem34
+ //
+ this.layoutControlItem34.Control = this.txt_kQtyHb;
+ this.layoutControlItem34.Location = new System.Drawing.Point(726, 0);
+ this.layoutControlItem34.Name = "layoutControlItem34";
+ this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem34.Size = new System.Drawing.Size(363, 36);
+ this.layoutControlItem34.Text = "鍙墦鍗版暟";
+ this.layoutControlItem34.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem36
+ //
+ this.layoutControlItem36.Control = this.txtItemModel;
+ this.layoutControlItem36.Location = new System.Drawing.Point(0, 73);
+ this.layoutControlItem36.Name = "layoutControlItem36";
+ this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem36.Size = new System.Drawing.Size(363, 37);
+ this.layoutControlItem36.Text = "鐗╂枡瑙勬牸";
+ this.layoutControlItem36.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem37
+ //
+ this.layoutControlItem37.Control = this.txtQuantityHb;
+ this.layoutControlItem37.Location = new System.Drawing.Point(363, 0);
+ this.layoutControlItem37.Name = "layoutControlItem37";
+ this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem37.Size = new System.Drawing.Size(363, 36);
+ this.layoutControlItem37.Text = "鏀惰揣鎬绘暟";
+ this.layoutControlItem37.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem38
+ //
+ this.layoutControlItem38.Control = this.txt_yQtyHb;
+ this.layoutControlItem38.Location = new System.Drawing.Point(363, 36);
+ this.layoutControlItem38.Name = "layoutControlItem38";
+ this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem38.Size = new System.Drawing.Size(363, 37);
+ this.layoutControlItem38.Text = "宸叉墦鍗版�婚噺";
+ this.layoutControlItem38.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem39
+ //
+ this.layoutControlItem39.Control = this.txt_releaseNo;
+ this.layoutControlItem39.Location = new System.Drawing.Point(363, 73);
+ this.layoutControlItem39.Name = "layoutControlItem39";
+ this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem39.Size = new System.Drawing.Size(363, 37);
+ this.layoutControlItem39.Text = "妫�楠屽崟鍙�";
+ this.layoutControlItem39.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem35
+ //
+ this.layoutControlItem35.Control = this.txt_psnQty_2;
+ this.layoutControlItem35.Location = new System.Drawing.Point(726, 73);
+ this.layoutControlItem35.Name = "layoutControlItem35";
+ this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem35.Size = new System.Drawing.Size(363, 37);
+ this.layoutControlItem35.Text = "姣忓紶鏉＄爜鏁伴噺";
+ this.layoutControlItem35.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem40
+ //
+ this.layoutControlItem40.Location = new System.Drawing.Point(1089, 0);
+ this.layoutControlItem40.Name = "layoutControlItem40";
+ this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem40.Size = new System.Drawing.Size(365, 36);
+ this.layoutControlItem40.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem40.TextVisible = false;
+ //
+ // gcMx3
+ //
+ this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.gcMx3.Location = new System.Drawing.Point(0, 0);
+ this.gcMx3.MainView = this.gvMx3;
+ this.gcMx3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.gcMx3.Name = "gcMx3";
+ this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit3,
+ this.repositoryItemButtonEdit4,
+ this.repositoryItemComboBox2});
+ this.gcMx3.Size = new System.Drawing.Size(1474, 384);
+ this.gcMx3.TabIndex = 2;
+ this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx3});
+ //
+ // gvMx3
+ //
+ this.gvMx3.Appearance.Row.Options.UseFont = true;
+ this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn33,
+ this.gridColumn37,
+ this.gridColumn38,
+ this.gridColumn39,
+ this.gridColumn40,
+ this.gridColumn41,
+ this.gridColumn42,
+ this.gridColumn43,
+ this.gridColumn44,
+ this.gridColumn45,
+ this.gridColumn46,
+ this.gridColumn47,
+ this.gridColumn48,
+ this.gridColumn49,
+ this.gridColumn50,
+ this.gridColumn52,
+ this.gridColumn53,
+ this.gridColumn54});
+ this.gvMx3.DetailHeight = 272;
+ this.gvMx3.GridControl = this.gcMx3;
+ this.gvMx3.Name = "gvMx3";
+ this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+ this.gvMx3.OptionsFilter.AllowFilterEditor = false;
+ this.gvMx3.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx3.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx3.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn33
+ //
+ this.gridColumn33.Caption = "abtGuid涓嶈兘鍒犻櫎";
+ this.gridColumn33.FieldName = "aboutGuid";
+ this.gridColumn33.MinWidth = 44;
+ this.gridColumn33.Name = "gridColumn33";
+ this.gridColumn33.OptionsColumn.ReadOnly = true;
+ this.gridColumn33.Width = 82;
+ //
+ // gridColumn37
+ //
+ this.gridColumn37.Caption = "鐗╂枡缂栧彿";
+ this.gridColumn37.FieldName = "itemNo";
+ this.gridColumn37.MinWidth = 44;
+ this.gridColumn37.Name = "gridColumn37";
+ this.gridColumn37.OptionsColumn.ReadOnly = true;
+ this.gridColumn37.Visible = true;
+ this.gridColumn37.VisibleIndex = 0;
+ this.gridColumn37.Width = 77;
+ //
+ // gridColumn38
+ //
+ this.gridColumn38.AppearanceCell.Options.UseFont = true;
+ this.gridColumn38.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn38.FieldName = "itemName";
+ this.gridColumn38.MinWidth = 44;
+ this.gridColumn38.Name = "gridColumn38";
+ this.gridColumn38.OptionsColumn.ReadOnly = true;
+ this.gridColumn38.Tag = "query_a.board_style";
+ this.gridColumn38.Visible = true;
+ this.gridColumn38.VisibleIndex = 1;
+ this.gridColumn38.Width = 139;
+ //
+ // gridColumn39
+ //
+ this.gridColumn39.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn39.FieldName = "itemModel";
+ this.gridColumn39.MinWidth = 44;
+ this.gridColumn39.Name = "gridColumn39";
+ this.gridColumn39.Visible = true;
+ this.gridColumn39.VisibleIndex = 2;
+ this.gridColumn39.Width = 95;
+ //
+ // gridColumn40
+ //
+ this.gridColumn40.Caption = "鏈鏀惰揣鏁伴噺";
+ this.gridColumn40.FieldName = "quantity";
+ this.gridColumn40.MinWidth = 44;
+ this.gridColumn40.Name = "gridColumn40";
+ this.gridColumn40.Visible = true;
+ this.gridColumn40.VisibleIndex = 3;
+ this.gridColumn40.Width = 73;
+ //
+ // gridColumn41
+ //
+ this.gridColumn41.AppearanceCell.Options.UseFont = true;
+ this.gridColumn41.Caption = "宸插叆搴撴暟閲�";
+ this.gridColumn41.FieldName = "okRkqty";
+ this.gridColumn41.MinWidth = 44;
+ this.gridColumn41.Name = "gridColumn41";
+ this.gridColumn41.OptionsColumn.ReadOnly = true;
+ this.gridColumn41.Tag = "query_a.ok_rkqty";
+ this.gridColumn41.Visible = true;
+ this.gridColumn41.VisibleIndex = 4;
+ this.gridColumn41.Width = 77;
+ //
+ // gridColumn42
+ //
+ this.gridColumn42.AppearanceCell.Options.UseFont = true;
+ this.gridColumn42.Caption = "宸叉墦鍗版暟閲�";
+ this.gridColumn42.FieldName = "yQty";
+ this.gridColumn42.MinWidth = 44;
+ this.gridColumn42.Name = "gridColumn42";
+ this.gridColumn42.OptionsColumn.ReadOnly = true;
+ this.gridColumn42.Tag = "query_a.ebeln_qty";
+ this.gridColumn42.Visible = true;
+ this.gridColumn42.VisibleIndex = 5;
+ this.gridColumn42.Width = 77;
+ //
+ // gridColumn43
+ //
+ this.gridColumn43.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn43.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn43.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn43.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn43.Caption = "鍙墦鍗版�婚噺";
+ this.gridColumn43.FieldName = "kQty";
+ this.gridColumn43.MinWidth = 44;
+ this.gridColumn43.Name = "gridColumn43";
+ this.gridColumn43.Visible = true;
+ this.gridColumn43.VisibleIndex = 6;
+ this.gridColumn43.Width = 73;
+ //
+ // gridColumn44
+ //
+ this.gridColumn44.Caption = "鐗╂枡鍗曚綅";
+ this.gridColumn44.FieldName = "wnDw";
+ this.gridColumn44.MinWidth = 44;
+ this.gridColumn44.Name = "gridColumn44";
+ this.gridColumn44.OptionsColumn.ReadOnly = true;
+ this.gridColumn44.Width = 139;
+ //
+ // gridColumn45
+ //
+ this.gridColumn45.Caption = "閲囪喘鍗曚綅";
+ this.gridColumn45.FieldName = "cgUnit";
+ this.gridColumn45.MinWidth = 44;
+ this.gridColumn45.Name = "gridColumn45";
+ this.gridColumn45.OptionsColumn.ReadOnly = true;
+ this.gridColumn45.Visible = true;
+ this.gridColumn45.VisibleIndex = 7;
+ this.gridColumn45.Width = 73;
+ //
+ // gridColumn46
+ //
+ this.gridColumn46.Caption = "搴撳瓨鍗曚綅";
+ this.gridColumn46.FieldName = "kcUnit";
+ this.gridColumn46.MinWidth = 44;
+ this.gridColumn46.Name = "gridColumn46";
+ this.gridColumn46.OptionsColumn.ReadOnly = true;
+ this.gridColumn46.Width = 73;
+ //
+ // gridColumn47
+ //
+ this.gridColumn47.Caption = "妫�楠岀姸鎬�";
+ this.gridColumn47.FieldName = "jyzt";
+ this.gridColumn47.MinWidth = 44;
+ this.gridColumn47.Name = "gridColumn47";
+ this.gridColumn47.Visible = true;
+ this.gridColumn47.VisibleIndex = 8;
+ this.gridColumn47.Width = 73;
+ //
+ // gridColumn48
+ //
+ this.gridColumn48.Caption = "妫�楠岀粨鏋�";
+ this.gridColumn48.FieldName = "jyjg";
+ this.gridColumn48.MinWidth = 44;
+ this.gridColumn48.Name = "gridColumn48";
+ this.gridColumn48.Visible = true;
+ this.gridColumn48.VisibleIndex = 9;
+ this.gridColumn48.Width = 80;
+ //
+ // gridColumn49
+ //
+ this.gridColumn49.Caption = "澶勭悊鎰忚";
+ this.gridColumn49.FieldName = "clyj";
+ this.gridColumn49.MinWidth = 22;
+ this.gridColumn49.Name = "gridColumn49";
+ this.gridColumn49.Visible = true;
+ this.gridColumn49.VisibleIndex = 10;
+ this.gridColumn49.Width = 82;
+ //
+ // gridColumn50
+ //
+ this.gridColumn50.Caption = "榛樿姣忓紶鏉＄爜鏁伴噺";
+ this.gridColumn50.FieldName = "mrtmsl";
+ this.gridColumn50.MinWidth = 22;
+ this.gridColumn50.Name = "gridColumn50";
+ this.gridColumn50.Width = 82;
+ //
+ // gridColumn52
+ //
+ this.gridColumn52.Caption = "浠撳簱缂栫爜";
+ this.gridColumn52.FieldName = "depotCode";
+ this.gridColumn52.Name = "gridColumn52";
+ this.gridColumn52.Visible = true;
+ this.gridColumn52.VisibleIndex = 11;
+ //
+ // gridColumn53
+ //
+ this.gridColumn53.Caption = "浠撳簱鍚嶇О";
+ this.gridColumn53.FieldName = "depotName";
+ this.gridColumn53.Name = "gridColumn53";
+ this.gridColumn53.Visible = true;
+ this.gridColumn53.VisibleIndex = 12;
+ //
+ // gridColumn54
+ //
+ this.gridColumn54.Caption = "浠撶鍛�";
+ this.gridColumn54.FieldName = "staffName";
+ this.gridColumn54.Name = "gridColumn54";
+ this.gridColumn54.Visible = true;
+ this.gridColumn54.VisibleIndex = 13;
+ //
+ // repositoryItemButtonEdit3
+ //
+ this.repositoryItemButtonEdit3.AutoHeight = false;
+ this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
+ //
+ // repositoryItemButtonEdit4
+ //
+ this.repositoryItemButtonEdit4.AutoHeight = false;
+ this.repositoryItemButtonEdit4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.repositoryItemButtonEdit4.Name = "repositoryItemButtonEdit4";
+ //
+ // repositoryItemComboBox2
+ //
+ this.repositoryItemComboBox2.AutoHeight = false;
+ this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
//
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.split99);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1342, 423);
+ this.tabMxPage1.Size = new System.Drawing.Size(1474, 524);
this.tabMxPage1.Text = "鏉ユ枡鏄庣粏";
//
// split99
@@ -864,6 +2638,7 @@
this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
this.split99.Horizontal = false;
this.split99.Location = new System.Drawing.Point(0, 0);
+ this.split99.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.split99.Name = "split99";
//
// split99.Panel1
@@ -876,7 +2651,7 @@
this.split99.Panel2.Controls.Add(this.gcMx1);
this.split99.Panel2.Text = "Panel2";
this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split99.Size = new System.Drawing.Size(1342, 423);
+ this.split99.Size = new System.Drawing.Size(1474, 524);
this.split99.SplitterPosition = 136;
this.split99.TabIndex = 2;
//
@@ -897,10 +2672,11 @@
this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem24});
this.layout99.Location = new System.Drawing.Point(0, 0);
+ this.layout99.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.layout99.Name = "layout99";
this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(31, 355, 812, 500);
this.layout99.Root = this.layoutControlGroup1;
- this.layout99.Size = new System.Drawing.Size(1342, 136);
+ this.layout99.Size = new System.Drawing.Size(1474, 136);
this.layout99.TabIndex = 0;
this.layout99.Text = "layoutControl1";
//
@@ -908,21 +2684,23 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(692, 89);
+ this.layoutControl1.Location = new System.Drawing.Point(738, 89);
+ this.layoutControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(336, 35);
+ this.layoutControl1.Size = new System.Drawing.Size(359, 35);
this.layoutControl1.TabIndex = 477;
this.layoutControl1.Text = "layoutControl1";
//
// txt_iCount_1
//
- this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);
+ this.txt_iCount_1.Location = new System.Drawing.Point(86, 2);
+ this.txt_iCount_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
this.txt_iCount_1.Properties.ReadOnly = true;
this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(91, 20);
this.txt_iCount_1.StyleController = this.layoutControl1;
this.txt_iCount_1.TabIndex = 264;
this.txt_iCount_1.Tag = "ReadOnly";
@@ -930,10 +2708,11 @@
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(265, 2);
+ this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_yuliang_1.Name = "txt_yuliang_1";
this.txt_yuliang_1.Properties.ReadOnly = true;
- this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(92, 20);
this.txt_yuliang_1.StyleController = this.layoutControl1;
this.txt_yuliang_1.TabIndex = 265;
//
@@ -945,20 +2724,20 @@
this.layoutControlItem26,
this.layoutControlItem27});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
- this.layoutControlGroup2.Name = "layoutControlGroup2";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
+ this.layoutControlGroup2.Name = "Root";
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6});
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11,
+ columnDefinition12});
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition4});
+ rowDefinition9});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 35);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(359, 35);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem26
@@ -966,25 +2745,26 @@
this.layoutControlItem26.Control = this.txt_iCount_1;
this.layoutControlItem26.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem26.Name = "layoutControlItem26";
- this.layoutControlItem26.Size = new System.Drawing.Size(168, 35);
+ this.layoutControlItem26.Size = new System.Drawing.Size(179, 35);
this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��";
- this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_yuliang_1;
- this.layoutControlItem27.Location = new System.Drawing.Point(168, 0);
+ this.layoutControlItem27.Location = new System.Drawing.Point(179, 0);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem27.Size = new System.Drawing.Size(168, 35);
+ this.layoutControlItem27.Size = new System.Drawing.Size(180, 35);
this.layoutControlItem27.Text = "鎵撳嵃浣欐暟";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(72, 14);
//
// lbMxGuid
//
- this.lbMxGuid.Location = new System.Drawing.Point(1032, 119);
+ this.lbMxGuid.Location = new System.Drawing.Point(903, 93);
+ this.lbMxGuid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.lbMxGuid.Name = "lbMxGuid";
- this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
+ this.lbMxGuid.Size = new System.Drawing.Size(51, 14);
this.lbMxGuid.StyleController = this.layout99;
this.lbMxGuid.TabIndex = 229;
this.lbMxGuid.Text = "lbMxGuid";
@@ -994,16 +2774,16 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1030, 48);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1100, 48);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = "rpt_daa";
- this.ucBtnPrint1.Size = new System.Drawing.Size(340, 39);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(363, 39);
this.ucBtnPrint1.TabIndex = 232;
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(1030, 10);
+ this.radOut.Location = new System.Drawing.Point(1102, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1012,17 +2792,18 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(340, 38);
+ this.radOut.Size = new System.Drawing.Size(362, 38);
this.radOut.StyleController = this.layout99;
this.radOut.TabIndex = 476;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 50);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(822, 50);
+ this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(275, 20);
this.txt_psnQty_1.StyleController = this.layout99;
this.txt_psnQty_1.TabIndex = 263;
this.txt_psnQty_1.Tag = "ReadOnly";
@@ -1030,63 +2811,69 @@
//
// txtWlid
//
- this.txtWlid.Location = new System.Drawing.Point(114, 12);
+ this.txtWlid.Location = new System.Drawing.Point(96, 12);
+ this.txtWlid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txtWlid.Name = "txtWlid";
this.txtWlid.Properties.Appearance.Options.UseFont = true;
this.txtWlid.Properties.ReadOnly = true;
- this.txtWlid.Size = new System.Drawing.Size(234, 24);
+ this.txtWlid.Size = new System.Drawing.Size(275, 20);
this.txtWlid.StyleController = this.layout99;
this.txtWlid.TabIndex = 214;
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 50);
+ this.txtWlmc.Location = new System.Drawing.Point(96, 50);
+ this.txtWlmc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
- this.txtWlmc.Size = new System.Drawing.Size(234, 24);
+ this.txtWlmc.Size = new System.Drawing.Size(275, 20);
this.txtWlmc.StyleController = this.layout99;
this.txtWlmc.TabIndex = 216;
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 89);
+ this.txtWlgg.Location = new System.Drawing.Point(96, 89);
+ this.txtWlgg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
- this.txtWlgg.Size = new System.Drawing.Size(574, 24);
+ this.txtWlgg.Size = new System.Drawing.Size(638, 20);
this.txtWlgg.StyleController = this.layout99;
this.txtWlgg.TabIndex = 218;
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(794, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(822, 12);
+ this.txt_kQty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(275, 20);
this.txt_kQty.StyleController = this.layout99;
this.txt_kQty.TabIndex = 224;
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(454, 12);
+ this.txtQuantity.Location = new System.Drawing.Point(459, 12);
+ this.txtQuantity.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txtQuantity.Name = "txtQuantity";
this.txtQuantity.Properties.Appearance.Options.UseFont = true;
this.txtQuantity.Properties.ReadOnly = true;
- this.txtQuantity.Size = new System.Drawing.Size(234, 24);
+ this.txtQuantity.Size = new System.Drawing.Size(275, 20);
this.txtQuantity.StyleController = this.layout99;
this.txtQuantity.TabIndex = 220;
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(454, 50);
+ this.txt_yQty.Location = new System.Drawing.Point(459, 50);
+ this.txt_yQty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
- this.txt_yQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(275, 20);
this.txt_yQty.StyleController = this.layout99;
this.txt_yQty.TabIndex = 222;
//
@@ -1119,30 +2906,30 @@
this.layoutControlItem25});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
- columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition9.Width = 100D;
- columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition10.Width = 100D;
+ columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition13.Width = 100D;
+ columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition14.Width = 100D;
+ columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition15.Width = 100D;
+ columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition16.Width = 100D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition7,
- columnDefinition8,
- columnDefinition9,
- columnDefinition10});
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition13,
+ columnDefinition14,
+ columnDefinition15,
+ columnDefinition16});
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5,
- rowDefinition6,
- rowDefinition7});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 136);
+ rowDefinition10,
+ rowDefinition11,
+ rowDefinition12});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1474, 136);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem15
@@ -1150,9 +2937,9 @@
this.layoutControlItem15.Control = this.txtWlid;
this.layoutControlItem15.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.Size = new System.Drawing.Size(340, 38);
+ this.layoutControlItem15.Size = new System.Drawing.Size(363, 38);
this.layoutControlItem15.Text = "鐗╂枡缂栧彿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem16
//
@@ -1160,9 +2947,9 @@
this.layoutControlItem16.Location = new System.Drawing.Point(0, 38);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem16.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem16.Size = new System.Drawing.Size(363, 39);
this.layoutControlItem16.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem17
//
@@ -1171,60 +2958,60 @@
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(680, 39);
- this.layoutControlItem17.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem17.Size = new System.Drawing.Size(726, 39);
+ this.layoutControlItem17.Text = "鐗╂枡瑙勬牸123";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txtQuantity;
- this.layoutControlItem18.Location = new System.Drawing.Point(340, 0);
+ this.layoutControlItem18.Location = new System.Drawing.Point(363, 0);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem18.Size = new System.Drawing.Size(340, 38);
+ this.layoutControlItem18.Size = new System.Drawing.Size(363, 38);
this.layoutControlItem18.Text = "鏈鏀惰揣鎬婚噺";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_yQty;
- this.layoutControlItem19.Location = new System.Drawing.Point(340, 38);
+ this.layoutControlItem19.Location = new System.Drawing.Point(363, 38);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem19.Size = new System.Drawing.Size(363, 39);
this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_kQty;
- this.layoutControlItem20.Location = new System.Drawing.Point(680, 0);
+ this.layoutControlItem20.Location = new System.Drawing.Point(726, 0);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(340, 38);
+ this.layoutControlItem20.Size = new System.Drawing.Size(363, 38);
this.layoutControlItem20.Text = "鍙墦鍗版�绘暟";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_psnQty_1;
- this.layoutControlItem21.Location = new System.Drawing.Point(680, 38);
+ this.layoutControlItem21.Location = new System.Drawing.Point(726, 38);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem21.Size = new System.Drawing.Size(363, 39);
this.layoutControlItem21.Text = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.radOut;
- this.layoutControlItem22.Location = new System.Drawing.Point(1020, 0);
+ this.layoutControlItem22.Location = new System.Drawing.Point(1089, 0);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem22.Size = new System.Drawing.Size(340, 38);
+ this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
+ this.layoutControlItem22.Size = new System.Drawing.Size(365, 38);
this.layoutControlItem22.Text = "鑷姩璁＄畻";
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem22.TextVisible = false;
@@ -1232,12 +3019,12 @@
// layoutControlItem23
//
this.layoutControlItem23.Control = this.ucBtnPrint1;
- this.layoutControlItem23.Location = new System.Drawing.Point(1020, 38);
+ this.layoutControlItem23.Location = new System.Drawing.Point(1089, 38);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem23.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
+ this.layoutControlItem23.Size = new System.Drawing.Size(365, 39);
this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
@@ -1245,11 +3032,11 @@
// layoutControlItem25
//
this.layoutControlItem25.Control = this.layoutControl1;
- this.layoutControlItem25.Location = new System.Drawing.Point(680, 77);
+ this.layoutControlItem25.Location = new System.Drawing.Point(726, 77);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem25.Size = new System.Drawing.Size(363, 39);
this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
@@ -1257,10 +3044,16 @@
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1342, 275);
+ this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1,
+ this.repositoryItemButtonEdit2,
+ this.repositoryItemComboBox1});
+ this.gcMx1.Size = new System.Drawing.Size(1474, 378);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1286,35 +3079,43 @@
this.gridColumn15,
this.gridColumn19,
this.gridColumn12,
- this.gridColumn27});
+ this.gridColumn27,
+ this.gridColumn28,
+ this.gridColumn29,
+ this.gridColumn30,
+ this.gridColumn31});
+ this.gvMx1.DetailHeight = 272;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
this.gvMx1.OptionsFilter.AllowFilterEditor = false;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
this.gvMx1.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx1.OptionsView.GroupFooterShowMode = DevExpress.XtraGrid.Views.Grid.GroupFooterShowMode.VisibleAlways;
+ this.gvMx1.OptionsView.ShowErrorPanel = DevExpress.Utils.DefaultBoolean.True;
this.gvMx1.OptionsView.ShowFooter = true;
+ this.gvMx1.OptionsView.ShowGroupedColumns = true;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
// gvAbtGuid
//
this.gvAbtGuid.Caption = "abtGuid涓嶈兘鍒犻櫎";
this.gvAbtGuid.FieldName = "aboutGuid";
- this.gvAbtGuid.MinWidth = 50;
+ this.gvAbtGuid.MinWidth = 44;
this.gvAbtGuid.Name = "gvAbtGuid";
this.gvAbtGuid.OptionsColumn.ReadOnly = true;
- this.gvAbtGuid.Width = 94;
+ this.gvAbtGuid.Width = 82;
//
// gvMx1guid
//
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 70;
+ this.gvMx1guid.MinWidth = 61;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 100;
+ this.gvMx1guid.Width = 87;
//
// gvMx1urgentFlag
//
@@ -1326,92 +3127,94 @@
this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
this.gvMx1urgentFlag.Visible = true;
this.gvMx1urgentFlag.VisibleIndex = 0;
- this.gvMx1urgentFlag.Width = 10;
+ this.gvMx1urgentFlag.Width = 42;
//
// gvMx1ebeln
//
this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
this.gvMx1ebeln.Caption = "ERP閲囪喘鍗曞彿";
this.gvMx1ebeln.FieldName = "ebeln";
- this.gvMx1ebeln.MinWidth = 50;
+ this.gvMx1ebeln.MinWidth = 44;
this.gvMx1ebeln.Name = "gvMx1ebeln";
this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
this.gvMx1ebeln.Tag = "query_a.ebeln";
this.gvMx1ebeln.Visible = true;
this.gvMx1ebeln.VisibleIndex = 1;
- this.gvMx1ebeln.Width = 105;
+ this.gvMx1ebeln.Width = 76;
//
// gridColumn4
//
this.gridColumn4.Caption = "鐗╂枡缂栧彿";
this.gridColumn4.FieldName = "itemNo";
- this.gridColumn4.MinWidth = 50;
+ this.gridColumn4.MinWidth = 44;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 2;
- this.gridColumn4.Width = 88;
+ this.gridColumn4.Width = 63;
//
// gvMx1boardStyle
//
this.gvMx1boardStyle.AppearanceCell.Options.UseFont = true;
this.gvMx1boardStyle.Caption = "鐗╂枡鍚嶇О";
this.gvMx1boardStyle.FieldName = "itemName";
- this.gvMx1boardStyle.MinWidth = 50;
+ this.gvMx1boardStyle.MinWidth = 44;
this.gvMx1boardStyle.Name = "gvMx1boardStyle";
this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
this.gvMx1boardStyle.Tag = "query_a.board_style";
this.gvMx1boardStyle.Visible = true;
this.gvMx1boardStyle.VisibleIndex = 3;
- this.gvMx1boardStyle.Width = 159;
+ this.gvMx1boardStyle.Width = 115;
//
// gridColumn6
//
this.gridColumn6.Caption = "鐗╂枡瑙勬牸";
this.gridColumn6.FieldName = "itemModel";
- this.gridColumn6.MinWidth = 50;
+ this.gridColumn6.MinWidth = 44;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 4;
- this.gridColumn6.Width = 109;
+ this.gridColumn6.Width = 79;
//
// gridColumn8
//
this.gridColumn8.Caption = "鏈鏀惰揣鏁伴噺";
this.gridColumn8.FieldName = "quantity";
- this.gridColumn8.MinWidth = 50;
+ this.gridColumn8.MinWidth = 44;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣={0:0.##}")});
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 5;
- this.gridColumn8.Width = 83;
+ this.gridColumn8.Width = 60;
//
// gvMx1okRkqty
//
this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
this.gvMx1okRkqty.Caption = "宸插叆搴撴暟閲�";
this.gvMx1okRkqty.FieldName = "okRkqty";
- this.gvMx1okRkqty.MinWidth = 50;
+ this.gvMx1okRkqty.MinWidth = 44;
this.gvMx1okRkqty.Name = "gvMx1okRkqty";
this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
+ this.gvMx1okRkqty.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "okRkqty", "SUM={0:0.##}")});
this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
this.gvMx1okRkqty.Visible = true;
this.gvMx1okRkqty.VisibleIndex = 6;
- this.gvMx1okRkqty.Width = 88;
+ this.gvMx1okRkqty.Width = 63;
//
// gvMx1ebelnQty
//
this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
this.gvMx1ebelnQty.Caption = "宸叉墦鍗版暟閲�";
this.gvMx1ebelnQty.FieldName = "yQty";
- this.gvMx1ebelnQty.MinWidth = 50;
+ this.gvMx1ebelnQty.MinWidth = 44;
this.gvMx1ebelnQty.Name = "gvMx1ebelnQty";
this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
this.gvMx1ebelnQty.Visible = true;
this.gvMx1ebelnQty.VisibleIndex = 7;
- this.gvMx1ebelnQty.Width = 88;
+ this.gvMx1ebelnQty.Width = 63;
//
// gridColumn10
//
@@ -1421,93 +3224,156 @@
this.gridColumn10.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn10.Caption = "鍙墦鍗版�婚噺";
this.gridColumn10.FieldName = "kQty";
- this.gridColumn10.MinWidth = 50;
+ this.gridColumn10.MinWidth = 44;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 8;
- this.gridColumn10.Width = 83;
+ this.gridColumn10.Width = 60;
//
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡鍗曚綅";
this.gridColumn5.FieldName = "wnDw";
- this.gridColumn5.MinWidth = 50;
+ this.gridColumn5.MinWidth = 44;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
- this.gridColumn5.Width = 159;
+ this.gridColumn5.Width = 139;
//
// gridColumn9
//
this.gridColumn9.Caption = "閲囪喘鍗曚綅";
this.gridColumn9.FieldName = "cgUnit";
- this.gridColumn9.MinWidth = 50;
+ this.gridColumn9.MinWidth = 44;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 9;
- this.gridColumn9.Width = 83;
+ this.gridColumn9.Width = 60;
//
// gridColumn7
//
this.gridColumn7.Caption = "搴撳瓨鍗曚綅";
this.gridColumn7.FieldName = "kcUnit";
- this.gridColumn7.MinWidth = 50;
+ this.gridColumn7.MinWidth = 44;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
- this.gridColumn7.Width = 83;
+ this.gridColumn7.Width = 73;
//
// gridColumn15
//
this.gridColumn15.Caption = "妫�楠岀姸鎬�";
this.gridColumn15.FieldName = "jyzt";
- this.gridColumn15.MinWidth = 50;
+ this.gridColumn15.MinWidth = 44;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 10;
- this.gridColumn15.Width = 83;
+ this.gridColumn15.Width = 60;
//
// gridColumn19
//
this.gridColumn19.Caption = "妫�楠岀粨鏋�";
this.gridColumn19.FieldName = "jyjg";
- this.gridColumn19.MinWidth = 50;
+ this.gridColumn19.MinWidth = 44;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 11;
- this.gridColumn19.Width = 91;
+ this.gridColumn19.Width = 66;
//
// gridColumn12
//
this.gridColumn12.Caption = "澶勭悊鎰忚";
this.gridColumn12.FieldName = "clyj";
- this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.MinWidth = 22;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 12;
- this.gridColumn12.Width = 94;
+ this.gridColumn12.Width = 68;
//
// gridColumn27
//
this.gridColumn27.Caption = "榛樿姣忓紶鏉＄爜鏁伴噺";
this.gridColumn27.FieldName = "mrtmsl";
- this.gridColumn27.MinWidth = 25;
+ this.gridColumn27.MinWidth = 22;
this.gridColumn27.Name = "gridColumn27";
- this.gridColumn27.Width = 94;
+ this.gridColumn27.Width = 82;
+ //
+ // gridColumn28
+ //
+ this.gridColumn28.Caption = "鍏ュ簱绫诲瀷";
+ this.gridColumn28.ColumnEdit = this.repositoryItemComboBox1;
+ this.gridColumn28.FieldName = "rkType";
+ this.gridColumn28.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+ this.gridColumn28.Name = "gridColumn28";
+ this.gridColumn28.OptionsColumn.ReadOnly = true;
+ this.gridColumn28.Visible = true;
+ this.gridColumn28.VisibleIndex = 16;
+ this.gridColumn28.Width = 66;
+ //
+ // repositoryItemComboBox1
+ //
+ this.repositoryItemComboBox1.AutoHeight = false;
+ this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
+ //
+ // gridColumn29
+ //
+ this.gridColumn29.Caption = "浠撳簱缂栫爜";
+ this.gridColumn29.FieldName = "depotCode";
+ this.gridColumn29.Name = "gridColumn29";
+ this.gridColumn29.Visible = true;
+ this.gridColumn29.VisibleIndex = 13;
+ this.gridColumn29.Width = 62;
+ //
+ // gridColumn30
+ //
+ this.gridColumn30.Caption = "浠撳簱鍚嶇О";
+ this.gridColumn30.FieldName = "depotName";
+ this.gridColumn30.Name = "gridColumn30";
+ this.gridColumn30.Visible = true;
+ this.gridColumn30.VisibleIndex = 14;
+ this.gridColumn30.Width = 62;
+ //
+ // gridColumn31
+ //
+ this.gridColumn31.Caption = "浠撶鍛�";
+ this.gridColumn31.FieldName = "staffName";
+ this.gridColumn31.Name = "gridColumn31";
+ this.gridColumn31.Visible = true;
+ this.gridColumn31.VisibleIndex = 15;
+ this.gridColumn31.Width = 82;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ //
+ // repositoryItemButtonEdit2
+ //
+ this.repositoryItemButtonEdit2.AutoHeight = false;
+ this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
//
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx2);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1342, 423);
+ this.tabMxPage2.Size = new System.Drawing.Size(1474, 524);
this.tabMxPage2.Text = "宸叉墦鏉＄爜鏄庣粏";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1342, 423);
+ this.gcMx2.Size = new System.Drawing.Size(1474, 524);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1517,7 +3383,7 @@
this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gvMx2.Appearance.Row.Options.UseFont = true;
- this.gvMx2.ColumnPanelRowHeight = 50;
+ this.gvMx2.ColumnPanelRowHeight = 39;
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx2guid,
this.gridColumn16,
@@ -1531,7 +3397,10 @@
this.gridColumn17,
this.gridColumn22,
this.gridColumn23,
- this.gridColumn24});
+ this.gridColumn24,
+ this.gridColumn32,
+ this.gv_hbdy});
+ this.gvMx2.DetailHeight = 272;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1543,97 +3412,97 @@
this.gvMx2guid.AppearanceCell.Options.UseFont = true;
this.gvMx2guid.Caption = "guid ";
this.gvMx2guid.FieldName = "guid";
- this.gvMx2guid.MinWidth = 50;
+ this.gvMx2guid.MinWidth = 44;
this.gvMx2guid.Name = "gvMx2guid";
this.gvMx2guid.Tag = "query_a.guid";
- this.gvMx2guid.Width = 94;
+ this.gvMx2guid.Width = 82;
//
// gridColumn16
//
this.gridColumn16.Caption = "鏄惁鍏ュ簱";
this.gridColumn16.FieldName = "isRk";
- this.gridColumn16.MaxWidth = 50;
- this.gridColumn16.MinWidth = 50;
+ this.gridColumn16.MaxWidth = 44;
+ this.gridColumn16.MinWidth = 44;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 0;
- this.gridColumn16.Width = 50;
+ this.gridColumn16.Width = 44;
//
// gvMx2itemBarcode
//
this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx2itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx2itemBarcode.FieldName = "itemBarcode";
- this.gvMx2itemBarcode.MinWidth = 50;
+ this.gvMx2itemBarcode.MinWidth = 44;
this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx2itemBarcode.Visible = true;
this.gvMx2itemBarcode.VisibleIndex = 1;
- this.gvMx2itemBarcode.Width = 300;
+ this.gvMx2itemBarcode.Width = 262;
//
// gvMx2itemNo
//
this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜 ";
this.gvMx2itemNo.FieldName = "itemNo";
- this.gvMx2itemNo.MinWidth = 50;
+ this.gvMx2itemNo.MinWidth = 44;
this.gvMx2itemNo.Name = "gvMx2itemNo";
this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
this.gvMx2itemNo.Visible = true;
this.gvMx2itemNo.VisibleIndex = 2;
- this.gvMx2itemNo.Width = 100;
+ this.gvMx2itemNo.Width = 87;
//
// gridColumn18
//
this.gridColumn18.Caption = "鐗╂枡鍚嶇О";
this.gridColumn18.FieldName = "itemName";
- this.gridColumn18.MinWidth = 50;
+ this.gridColumn18.MinWidth = 44;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 3;
- this.gridColumn18.Width = 150;
+ this.gridColumn18.Width = 131;
//
// gridColumn14
//
this.gridColumn14.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn14.FieldName = "itemModel";
- this.gridColumn14.MinWidth = 50;
+ this.gridColumn14.MinWidth = 44;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 4;
- this.gridColumn14.Width = 150;
+ this.gridColumn14.Width = 131;
//
// gvMx2oldqty
//
this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
this.gvMx2oldqty.Caption = "鏁伴噺";
this.gvMx2oldqty.FieldName = "quantity";
- this.gvMx2oldqty.MinWidth = 50;
+ this.gvMx2oldqty.MinWidth = 44;
this.gvMx2oldqty.Name = "gvMx2oldqty";
this.gvMx2oldqty.Tag = "query_a.OLDQTY";
this.gvMx2oldqty.Visible = true;
this.gvMx2oldqty.VisibleIndex = 5;
- this.gvMx2oldqty.Width = 94;
+ this.gvMx2oldqty.Width = 82;
//
// gridColumn21
//
this.gridColumn21.Caption = "鍗曚綅";
this.gridColumn21.FieldName = "dwName";
- this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.MinWidth = 22;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 6;
- this.gridColumn21.Width = 94;
+ this.gridColumn21.Width = 82;
//
// gridColumn20
//
this.gridColumn20.Caption = "鎵撶爜浜�";
this.gridColumn20.FieldName = "createBy";
- this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.MinWidth = 22;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 7;
- this.gridColumn20.Width = 94;
+ this.gridColumn20.Width = 82;
//
// gridColumn17
//
@@ -1643,45 +3512,62 @@
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 8;
- this.gridColumn17.Width = 180;
+ this.gridColumn17.Width = 157;
//
// gridColumn22
//
this.gridColumn22.Caption = "鍏ュ簱浜�";
this.gridColumn22.FieldName = "rkUser";
- this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.MinWidth = 22;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 9;
- this.gridColumn22.Width = 94;
+ this.gridColumn22.Width = 82;
//
// gridColumn23
//
this.gridColumn23.Caption = "鍏ュ簱鏃ユ湡";
this.gridColumn23.FieldName = "rkDate";
- this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.MinWidth = 22;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
this.gridColumn23.VisibleIndex = 10;
- this.gridColumn23.Width = 94;
+ this.gridColumn23.Width = 82;
//
// gridColumn24
//
this.gridColumn24.Caption = "鍏ュ簱浣�";
this.gridColumn24.FieldName = "rkPositon";
- this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.MinWidth = 22;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 11;
- this.gridColumn24.Width = 94;
+ this.gridColumn24.Width = 82;
+ //
+ // gridColumn32
+ //
+ this.gridColumn32.Caption = "鍏ュ簱绫诲瀷";
+ this.gridColumn32.FieldName = "cgrkType";
+ this.gridColumn32.Name = "gridColumn32";
+ this.gridColumn32.Visible = true;
+ this.gridColumn32.VisibleIndex = 12;
+ //
+ // gv_hbdy
+ //
+ this.gv_hbdy.Caption = "鏄惁鍚堝苟鎵撳嵃";
+ this.gv_hbdy.FieldName = "hbdy2";
+ this.gv_hbdy.Name = "gv_hbdy";
+ this.gv_hbdy.Visible = true;
+ this.gv_hbdy.VisibleIndex = 13;
//
// Frm_ArrivalBarcode
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1346, 682);
+ this.ClientSize = new System.Drawing.Size(1478, 757);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "Frm_ArrivalBarcode";
this.Text = "鍒拌揣鏉＄爜鎵撳嵃";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1690,10 +3576,28 @@
((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
this.split1.Panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+ this.split1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
this.split1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
+ this.xtraTabControl2.ResumeLayout(false);
+ this.xtraTabPage5.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMxL2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMxL2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).EndInit();
+ this.xtraTabPage4.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMxL1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMxL1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit6)).EndInit();
+ this.xtraTabPage6.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMxL3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMxL3)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
this.splitMx1.Panel1.ResumeLayout(false);
@@ -1703,7 +3607,9 @@
this.splitMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_barcodeProgress.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
@@ -1716,17 +3622,62 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).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.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
+ this.xtraTabPage3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
+ this.splitContainerControl1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
+ this.splitContainerControl1.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
+ this.splitContainerControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.lay99)).EndInit();
+ this.lay99.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControl2)).EndInit();
+ this.layoutControl2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_2.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_2.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.radOut2.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtItemNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtItemName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_kQtyHb.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_2.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtItemModel.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtQuantityHb.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yQtyHb.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit();
this.split99.Panel1.ResumeLayout(false);
@@ -1765,9 +3716,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit();
this.ResumeLayout(false);
}
@@ -1788,14 +3743,18 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotsCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private DevExpress.XtraEditors.TextEdit txt_dptName;
private DevExpress.XtraEditors.TextEdit txt_gysNo;
private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
+ private DevExpress.XtraEditors.TextEdit txt_depotsCode;
private DevExpress.XtraEditors.TextEdit txt_gysName;
private DevExpress.XtraEditors.TextEdit txt_barcodeProgress;
private DevExpress.XtraEditors.TextEdit txt_createDate;
@@ -1803,31 +3762,18 @@
private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.TextEdit txt_billNo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraEditors.CheckEdit txt_fType;
private DevExpress.XtraEditors.CheckEdit txt_urgentFlag;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
- private DevExpress.XtraGrid.Columns.GridColumn gvAbtGuid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1boardStyle;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1okRkqty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnQty;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraEditors.TextEdit txt_iCount_1;
private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
private UserControl.UcBtnPrint ucBtnPrint1;
@@ -1862,7 +3808,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.Utils.ToolTipController tips;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraEditors.RadioGroup radOut;
private DevExpress.XtraEditors.SplitContainerControl split99;
private DevExpress.XtraLayout.LayoutControl layout99;
@@ -1884,9 +3829,163 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
+ private DevExpress.XtraGrid.GridControl gcMx1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+ private DevExpress.XtraGrid.Columns.GridColumn gvAbtGuid;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1boardStyle;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1okRkqty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
+ private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
+ private DevExpress.XtraGrid.GridControl gcMx3;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn37;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn39;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn40;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn41;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn42;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn43;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn44;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn45;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn46;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn47;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn48;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn49;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn50;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn52;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn53;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit4;
+ private DevExpress.XtraLayout.LayoutControl lay99;
+ private UserControl.UcBtnPrint ucBtnPrint2;
+ private DevExpress.XtraEditors.TextEdit txtItemNo;
+ private DevExpress.XtraEditors.TextEdit txtItemName;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup3;
+ private DevExpress.XtraEditors.RadioGroup radOut2;
+ private DevExpress.XtraLayout.LayoutControl layoutControl2;
+ private DevExpress.XtraEditors.TextEdit txt_iCount_2;
+ private DevExpress.XtraEditors.TextEdit txt_yuliang_2;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraEditors.TextEdit txt_kQtyHb;
+ private DevExpress.XtraEditors.TextEdit txt_psnQty_2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+ private DevExpress.XtraEditors.TextEdit txtItemModel;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
+ private DevExpress.XtraEditors.TextEdit txtQuantityHb;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
+ private DevExpress.XtraEditors.TextEdit txt_yQtyHb;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
+ private DevExpress.XtraEditors.TextEdit txt_releaseNo;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_hbdy;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl2;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage4;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage5;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage6;
+ private DevExpress.XtraGrid.GridControl gcMxL1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMxL1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn51;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn56;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn57;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn58;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn59;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn60;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn61;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn62;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn63;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn64;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn65;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn66;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn67;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn68;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn69;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn70;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn71;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn72;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit5;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit6;
+ private DevExpress.XtraGrid.GridControl gcMxL2;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMxL2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn88;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn89;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn90;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn91;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn92;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn93;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn94;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn95;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn96;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn97;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn98;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn99;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn100;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn101;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn102;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn103;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn104;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn105;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit7;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit8;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox4;
+ private DevExpress.XtraGrid.GridControl gcMxL3;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMxL3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn73;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn74;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn75;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn76;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn77;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn78;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn79;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn80;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn81;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn82;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn83;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn84;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn85;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn86;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn87;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn106;
+ private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
+ // private UserControl.UcBtnPrintOne ucBtnPrintOne1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index db352f3..849e58f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -1,3 +1,4 @@
+using DevExpress.XtraRichEdit.Model;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -7,6 +8,7 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -24,54 +26,40 @@
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMxL1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMxL2);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMxL3);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- }, tips);
+ }, tips, true, (strGuid) =>
+ {
+ getModelList(strGuid);
+ });
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
+
getModel(value);
+
+
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //鎵撳嵃浜嬩欢
+
+
+ #region 鎵撳嵃鐩稿叧 2025-10-18
+
+ //娴忚鎵撳嵃浜嬩欢
this.ucBtnPrint1.btnPrintClick += (s, e) =>
{
- string rowGuid = lbMxGuid.Text.Trim();
- ucBtnPrint1.guidKey = rowGuid;
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
- txt_iCount_1.Focus();
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
- txt_psnQty_1.Focus();
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- if (lbMxGuid.Text.Trim().Length < 10)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- this.ucBtnPrint1.rptParameter = "rpt_Arrival{"
- + lbMxGuid.Text.Trim()//鍏宠仈涓婚敭
- + "," + ""
- + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())//浣欐暟
- + "," + txt_iCount_1.Text.Trim()//寮犳暟
- + "," + txt_psnQty_1.Text.Trim()//姣忓紶鏉＄爜鏁伴噺
- + "}";
- txt_iCount_1.Text = "";
- txt_psnQty_1.Text = "";
+ _print(0);
+
};
+
//鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
this.ucBtnPrint1.btnAllClick += (s, e) =>
{
@@ -87,7 +75,8 @@
frm.ShowDialog();
if (string.IsNullOrEmpty(strCodeList))
return;
- if (strAction == "print") {
+ if (strAction == "print")
+ {
try
{
string rptParameter = "rpt_Arrival{"
@@ -109,9 +98,204 @@
MsgHelper.ShowError(ex.Message);
}
}
+
};
+
+ //鐩存帴鎵撳嵃浜嬩欢
+ this.ucBtnPrint1.btnZhiJieClick += (s, e) =>
+ {
+ _print(1);
+
+ };
+
+ // -------------------- gvMx3 鎵撳嵃浜嬩欢 --------------------
+ this.ucBtnPrint2.btnPrintClick += (s, e) =>
+ {
+ _print2(0);
+ };
+
+ //鐩存帴鎵撳嵃浜嬩欢
+ this.ucBtnPrint2.btnZhiJieClick += (s, e) =>
+ {
+ _print2(1);
+
+ };
+
+ // gvMx3 鎵归噺鎵撳嵃浜嬩欢
+ this.ucBtnPrint2.btnAllClick += (s, e) =>
+ {
+ // string rowGuid = lbMxGuid3.Text.Trim(); // 浣跨敤gvMx3鐨凣UID
+ string rowGuid = txt_releaseNo.Text.Trim();
+ SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "鍒拌揣鏉＄爜锛堝悎骞讹級鐮�"); // 鏍囬鍖哄垎鏉ユ簮
+ string strCodeList = "";
+ string strAction = "";
+ frm.UpdateParent += (ss, ee) =>
+ {
+ strCodeList = ee.StringSingle;
+ strAction = ee.Data;
+ };
+ frm.ShowDialog();
+ if (string.IsNullOrEmpty(strCodeList))
+ return;
+ if (strAction == "print")
+ {
+ try
+ {
+ string rptParameter = "rpt_Arrival_Hb{"
+ + "100"//閲嶆墦閮芥槸浼�100锛�
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
+ }
+
+ };
+ // --------------------gvMx3 ucBtnPrintOne1 鎵归噺鎵撳嵃浜嬩欢锛堜紭鍖栫増锛�--------------------
+// this.ucBtnPrintOne1.btnPrintClick += (s, e) =>
+// {
+// // 1. 鍩虹楠岃瘉锛氫富琛ㄨ閫夋嫨
+// string mainGuid = lbGuid.Text.Trim();
+// if (string.IsNullOrEmpty(mainGuid) || mainGuid.Length < 10)
+// {
+// Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛鍦ㄤ富琛ㄤ腑閫夋嫨鏁版嵁琛岋紒");
+// this.ucBtnPrintOne1.rptParameter = "return false";
+// return;
+// }
+
+// // 2. 鑾峰彇鏄庣粏鏁版嵁婧�
+// DataTable dtDetails = gcMx3.DataSource as DataTable;
+// if (dtDetails == null || dtDetails.Rows.Count == 0)
+// {
+// Gs.DevApp.ToolBox.MsgHelper.ShowError("褰撳墠涓昏〃鏃犲叧鑱旂殑鏄庣粏鏁版嵁锛岃鍏堝姞杞芥槑缁嗭紒");
+// this.ucBtnPrintOne1.rptParameter = "return false";
+// return;
+// }
+
+// // 3. 绛涢�夊彲鎵撳嵃鏄庣粏锛堥�昏緫涓嶅彉锛�
+// List<string> validReleaseNos = new List<string>();
+// List<string> validPrintQtys = new List<string>();
+// string releaseNoField = "releaseNo";
+
+// if (!dtDetails.Columns.Contains(releaseNoField))
+// {
+// Gs.DevApp.ToolBox.MsgHelper.ShowError($"鏄庣粏鏁版嵁婧愮己灏戝繀瑕佸瓧娈碉細{releaseNoField}");
+// this.ucBtnPrintOne1.rptParameter = "return false";
+// return;
+// }
+
+// foreach (DataRow row in dtDetails.Rows)
+// {
+// string rowReleaseNo = row[releaseNoField]?.ToString()?.Trim() ?? "";
+// if (string.IsNullOrEmpty(rowReleaseNo) || rowReleaseNo.Length < 5)
+// {
+// Gs.DevApp.ToolBox.MsgHelper.ShowError($"璺宠繃鏃犳晥鏄庣粏琛岋細缂哄皯鎴栨棤鏁堢殑releaseNo");
+// continue;
+// }
+
+// string kQtyStr = row["kQty"]?.ToString()?.Trim() ?? "0";
+// if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(kQtyStr)
+// || !decimal.TryParse(kQtyStr, out decimal kQty)
+// || kQty <= 0)
+// {
+// Gs.DevApp.ToolBox.MsgHelper.ShowError($"璺宠繃鏄庣粏琛岋紙releaseNo锛歿rowReleaseNo}锛夛細鍙墦鍗版暟閲忔棤鏁堟垨<=0");
+// continue;
+// }
+
+// if (!validReleaseNos.Contains(rowReleaseNo))
+// {
+// validReleaseNos.Add(rowReleaseNo);
+// validPrintQtys.Add(kQty.ToString("F2"));
+// }
+// else
+// {
+// Gs.DevApp.ToolBox.MsgHelper.ShowError($"璺宠繃閲嶅鏄庣粏琛岋紙releaseNo锛歿rowReleaseNo}锛夛細宸插寘鍚releaseNo");
+// }
+// }
+
+// if (validReleaseNos.Count == 0)
+// {
+// Gs.DevApp.ToolBox.MsgHelper.ShowError("娌℃湁鍙壒閲忔墦鍗扮殑鏄庣粏琛岋紙鎵�鏈夎鍧囦负鏃犳晥鏁版嵁鎴栧彲鎵撳嵃鏁伴噺<=0锛�");
+// this.ucBtnPrintOne1.rptParameter = "return false";
+// return;
+// }
+
+// // 4. 缁勮鍙傛暟锛堥�傞厤_rptGetParameterP瑙ｆ瀽閫昏緫锛�
+// string releaseNosStr = string.Join("|", validReleaseNos);
+// string printQtysStr = string.Join("|", validPrintQtys);
+
+// // 浠呬紶6涓叧閿弬鏁帮紝瀵瑰簲瑙ｆ瀽鏂规硶鐨剆0-s5
+// string[] reportParams = new string[]
+// {
+// "batch", // s0 鈫� @in1锛氭壒閲忔爣璇�
+// "0", // s1 鈫� @in2锛氬崰浣�
+// "0", // s2 鈫� @in3锛氫綑閲�
+// "1", // s3 鈫� @in4锛氬紶鏁�
+// printQtysStr, // s4 鈫� @in5锛氭暟閲忓垪琛�
+// releaseNosStr // s5 鈫� @in6锛歳eleaseNo鍒楄〃
+// };
+
+// /*string paramContent = string.Join(",", reportParams);
+// string rptParam = $"rpt_Arrival_One{{{paramContent}}}";
+
+// this.ucBtnPrintOne1.guidKey = mainGuid;
+// this.ucBtnPrintOne1.rptParameter = rptParam;
+
+// // 5. 璋冪敤棰勮锛堥�昏緫涓嶅彉锛�
+// try
+// {
+// using (Form rptPreviewForm = new RptPreview(mainGuid, rptParam))
+// {
+// DialogResult previewResult = rptPreviewForm.ShowDialog();
+// if (previewResult == DialogResult.OK)
+// {
+// getModel(mainGuid);
+// Gs.DevApp.ToolBox.MsgHelper.ShowError($"鎵归噺鎵撳嵃瀹屾垚锛佸叡鎵撳嵃 {validReleaseNos.Count} 鏉℃湁鏁堟槑缁�");
+// }
+// else if (previewResult == DialogResult.Cancel)
+// {
+// Gs.DevApp.ToolBox.MsgHelper.ShowError("鐢ㄦ埛鍙栨秷鎵归噺鎵撳嵃鎿嶄綔");
+// }
+// }
+// }
+// catch (Exception ex)
+// {
+// string errorMsg = $"鎵归噺鎵撳嵃寮傚父锛歿ex.Message}";
+// if (ex.InnerException != null)
+// {
+// errorMsg += $"\n鍐呴儴閿欒锛歿ex.InnerException.Message}";
+// }
+// Gs.DevApp.ToolBox.MsgHelper.ShowError(errorMsg);
+// this.ucBtnPrintOne1.rptParameter = "return false";
+// }
+//*/
+
+// this.ucBtnPrintOne1.guidKey = mainGuid;
+// this.ucBtnPrintOne1.rptParameter = "rpt_Arrival_One{"
+// + string.Join(",", reportParams) // 鎷兼帴reportParams鏁扮粍鍏冪礌
+// + "}";
+// // 6. 娓呯┖鎺т欢
+// txt_iCount_2.Text = "";
+// txt_psnQty_2.Text = "";
+// txt_releaseNo.Text = "";
+// };
+
+ //鏄庣粏琛屽垏鎹簨浠�
+ // 鍏抽敭锛氱粦瀹歡vMx1鍜実vMx3鐨勭劍鐐硅鍙樺寲浜嬩欢
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
- //鎵撳嵃鑷姩璁＄畻
+ gvMx3.FocusedRowChanged += GvMx3_FocusedRowChanged; // 鍙栨秷娉ㄩ噴骞剁粦瀹氫簨浠�
+ //gvMx1鎵撳嵃鑷姩璁＄畻
txt_psnQty_1.TextChanged += (s, e) =>
{
Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
@@ -120,13 +304,156 @@
{
Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
+ // gvMx3鐨勮嚜鍔ㄨ绠�
+ txt_psnQty_2.TextChanged += (s, e) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_2, txt_iCount_2, txt_kQtyHb.Text.Trim(), radOut2, txt_yuliang_2);
+ };
+ radOut2.SelectedIndexChanged += (s, e) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_2, txt_iCount_2, radOut2, txt_yuliang_2);
+ };
+ #endregion
+
+ ////搴曢儴姹囨�诲惎鐢�
+ //gvMx1.OptionsView.ShowFooter = true;
+ //// 涓烘煇涓�鍒楄缃眰鍜屾眹鎬�
+ //gvMx1.Columns["quantity"].SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Sum;
+ //gvMx1.Columns["quantity"].SummaryItem.DisplayFormat = "鍚堣: {0}";
+
+ // 涓轰簡鏂逛究浣跨敤鏁村悎鍒� UtilityHelper 绫讳腑鐨� SetupGridSummary 鏂规硶
+ // UtilityHelper.SetupGridSummary(gvMx1, "quantity", "okRkqty");
+ // UtilityHelper.SetupGridSummary(gvMxL1, "quantity", "okRkqty");
+
+ // 妫�鏌ユ暟鎹姞杞藉悗鍐嶈缃鑹�
+ this.Load += (s, e) =>
+ {
+ System.Windows.Forms.Timer timer = new System.Windows.Forms.Timer();
+ timer.Interval = 1000; // 1绉掑悗鎵ц锛岀‘淇濇暟鎹凡鍔犺浇
+ timer.Tick += (sender, args) =>
+ {
+ timer.Stop();
+ timer.Dispose();
+
+ // 浣跨敤鏂扮殑绠�鍖栨牸寮忚缃楠岀粨鏋滈鑹�
+ //UtilityHelper.SetSimpleGridColor(gvMxL1, "jyjg", "contains涓嶅悎鏍�", "Cell", Color.Red);
+ //UtilityHelper.SetSimpleGridColor(gvMxL1, "jyjg", "contains鍚堟牸", "Cell", Color.Green);
+ //UtilityHelper.SetSimpleGridColor(gvMxL1, "jyjg", "contains鍏嶆", "Cell", Color.Green);
+
+ //UtilityHelper.SetSimpleGridColor(gvMxL2, "jyjg", "contains涓嶅悎鏍�", "Cell", Color.Red);
+ //UtilityHelper.SetSimpleGridColor(gvMxL2, "jyjg", "contains鍚堟牸", "Cell", Color.Green);
+ //UtilityHelper.SetSimpleGridColor(gvMxL2, "jyjg", "contains鍏嶆", "Cell", Color.Green);
+
+ //UtilityHelper.SetSimpleGridColor(gvMx1, "jyjg", "contains涓嶅悎鏍�", "Cell", Color.Red);
+ //UtilityHelper.SetSimpleGridColor(gvMx1, "jyjg", "contains鍚堟牸", "Cell", Color.Green);
+ //UtilityHelper.SetSimpleGridColor(gvMx1, "jyjg", "contains鍏嶆", "Cell", Color.Green);
+
+ //UtilityHelper.SetSimpleGridColor(gvMx3, "jyjg", "contains涓嶅悎鏍�", "Cell", Color.Red);
+ //UtilityHelper.SetSimpleGridColor(gvMx3, "jyjg", "contains鍚堟牸", "Cell", Color.Green);
+ //UtilityHelper.SetSimpleGridColor(gvMx3, "jyjg", "contains鍏嶆", "Cell", Color.Green);
+
+ // 褰撴敹璐ф暟閲�(quantity)澶т簬宸插叆搴撴暟閲�(okRkqty)鏃讹紝鏁磋鏄剧ず姗欒壊
+ // UtilityHelper.SetSimpleGridColor(gvMx1, "", "quantity-okRkqty>0", "Row", Color.Orange);
+
+ // 褰撳彲鎵撳嵃鏁伴噺(kQty)灏忎簬绛変簬0鏃讹紝鏁磋鏄剧ず鐏拌壊
+ //UtilityHelper.SetSimpleGridColor(gvMx1, "", "kQty<=0", "Row", Color.Gray);
+ //UtilityHelper.SetSimpleGridColor(gridView1, "barRatio", "=100.00%", "Cell", Color.Green);
+ ////鍏ュ簱姣斾緥
+ //UtilityHelper.SetSimpleGridColor(gridView1, "rkbl", "=100.00%", "Cell", Color.Green);
+ };
+ timer.Start();
+ };
+
}
+ /// <summary>
+ /// 鎵撳嵃
+ /// </summary>
+ /// <param name="type">0琛ㄧず棰勮鎵撳嵃锛�1琛ㄧず鐩存帴鎵撳嵃</param>
+ private void _print(int type)
+ {
+ string rowGuid = lbMxGuid.Text.Trim();
+ ucBtnPrint1.guidKey = rowGuid;
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
+ txt_iCount_1.Focus();
+ this.ucBtnPrint1.rptParameter = "return false";
+ return;
+ }
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
+ txt_psnQty_1.Focus();
+ this.ucBtnPrint1.rptParameter = "return false";
+ return;
+ }
+ if (lbMxGuid.Text.Trim().Length < 10)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
+ this.ucBtnPrint1.rptParameter = "return false";
+ return;
+ }
+ this.ucBtnPrint1.rptParameter = "rpt_Arrival{"
+ + lbMxGuid.Text.Trim()//鍏宠仈涓婚敭
+ + "," + ""
+ + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())//浣欐暟
+ + "," + txt_iCount_1.Text.Trim()//寮犳暟
+ + "," + txt_psnQty_1.Text.Trim()//姣忓紶鏉＄爜鏁伴噺
+ + "}";
+ txt_iCount_1.Text = "";
+ txt_psnQty_1.Text = "";
+ }
+
+ private void _print2(int type)
+ {
+ string rowGuid = txt_releaseNo.Text.Trim(); // 鏂板lbMxGuid3鐢ㄤ簬瀛樺偍gvMx3鐨勯�変腑琛孏UID
+ ucBtnPrint2.guidKey = rowGuid;
+
+ // 楠岃瘉杈撳叆锛堜娇鐢╣vMx3瀵瑰簲鐨勮緭鍏ユ帶浠讹級
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_2.Text.Trim(), txt_yuliang_2.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
+ txt_iCount_2.Focus();
+ this.ucBtnPrint2.rptParameter = "return false";
+ return;
+ }
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_2.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
+ txt_psnQty_2.Focus();
+ this.ucBtnPrint2.rptParameter = "return false";
+ return;
+ }
+ if (rowGuid.Length < 10)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
+ this.ucBtnPrint2.rptParameter = "return false";
+ return;
+ }
+
+ // 缁勮鎵撳嵃鍙傛暟锛堜娇鐢╣vMx3鐨勬帶浠跺�硷級
+ this.ucBtnPrint2.rptParameter = "rpt_Arrival_Hb{"
+ + rowGuid//鍏宠仈涓婚敭锛坓vMx3鐨凣UID锛�
+ + "," + ""
+ + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_2.Text.Trim())//浣欐暟
+ + "," + txt_iCount_2.Text.Trim()//寮犳暟
+ + "," + txt_psnQty_2.Text.Trim()//姣忓紶鏉＄爜鏁伴噺
+ + "}";
+
+ // 娓呯┖杈撳叆妗�
+ txt_iCount_2.Text = "";
+ txt_psnQty_2.Text = "";
+ }
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
+
+
+
private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
{
if (e.FocusedRowHandle >= 0)
@@ -155,6 +482,39 @@
txt_iCount_1.Text = "";
}
}
+
+ //鏄庣粏琛屽垏鎹簨浠�
+
+ private void GvMx3_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
+ {
+ if (e.FocusedRowHandle >= 0)
+ {
+ DataRow row = gvMx3.GetDataRow(e.FocusedRowHandle);
+ //lbMxGuid.Text = row["guid"].ToString();
+ txtItemNo.Text = row["itemNo"].ToString();
+ txtItemModel.Text = row["itemModel"].ToString();
+ txtItemName.Text = row["itemName"].ToString();
+ txtQuantityHb.Text = row["quantity"].ToString();//鏈鏀惰揣鎬婚噺
+ txt_yQtyHb.Text = row["yQty"].ToString();//宸叉墦鍗版�婚噺
+ txt_kQtyHb.Text = row["kQty"].ToString(); //鍙墦鍗版�婚噺
+ txt_psnQty_2.Text = row["mrtmsl"].ToString(); //榛樿姣忓紶鏉＄爜鏁伴噺
+ txt_releaseNo.Text = row["releaseNo"].ToString(); //鍙墦鍗版�婚噺
+ }
+ else
+ {
+ lbMxGuid.Text = "";
+ ucBtnPrint1.guidKey = "";
+ txtItemNo.Text = "";
+ txtItemModel.Text = "";
+ txtItemName.Text = "";
+ txtQuantityHb.Text = "";
+ txt_yQtyHb.Text = "";
+ txt_kQtyHb.Text = "";
+ txt_psnQty_2.Text = "";
+ txt_iCount_2.Text = "";
+ }
+ }
+
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -218,11 +578,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null;
- System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- _sbSqlWhere.Append(" and a.ReceiveOrgId in");
- _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
- _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
@@ -261,7 +617,10 @@
}
private void getModel(string strGuid)
{
+ gcMx3.DataSource = null;
gcMx1.DataSource = null;
+ gcMx2.DataSource = null;
+
bool isEdit = false;
if (toolBarMenu1.currentAction == "add") return;
if (toolBarMenu1.currentAction == "edit") isEdit = true;
@@ -278,6 +637,7 @@
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
@@ -285,12 +645,35 @@
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
gvList.Add(gvMx2);
+ gvList.Add(gvMx3);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+
+ JArray array3 = new JArray();
+ foreach (var a in dy["list3"])
+ {
+ array3.Add(a);
+ }
+ DataTable dt3 = JsonConvert.DeserializeObject<DataTable>(array3.ToString());
+ if (dt3.Rows.Count > 0)
+ {
+ gcMx3.BindingContext = new BindingContext();
+ gcMx3.DataSource = dt3;
+ gcMx3.ForceInitialize();
+ gvMx3.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx3);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx3, gvMx3);
+ }
+
+
JArray array1 = new JArray();
foreach (var a in dy["list1"])
{
array1.Add(a);
}
+
DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
if (dt1.Rows.Count > 0)
{
@@ -304,6 +687,7 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
+
JArray array2 = new JArray();
foreach (var a in dy["list2"])
{
@@ -322,13 +706,102 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
}
+
}
+
+
else
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ /// 鏂板鏂规硶锛氬垪琛ㄦ樉绀�
+ /// </summary>
+ /// <param name="strGuid">涓昏〃id</param>
+
+ private void getModelList(string strGuid)
+ {
+ gcMxL1.DataSource = null;
+ gcMxL2.DataSource = null;
+ gcMxL3.DataSource = null;
+ var _obj = new
+ {
+ guid = strGuid,//涓诲缓
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ dynamic dy = _rtn.rtnData;
+
+ JArray array1 = new JArray();
+ foreach (var a in dy["list1"])
+ {
+ array1.Add(a);
+ }
+ DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
+ if (dt1.Rows.Count > 0)
+ {
+ gcMxL1.BindingContext = new BindingContext();
+ gcMxL1.DataSource = dt1;
+ gcMxL1.ForceInitialize();
+ gvMxL1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMxL1);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMxL1, gvMxL1);
+ }
+ JArray array2 = new JArray();
+ foreach (var a in dy["list3"])
+ {
+ array2.Add(a);
+ }
+
+ DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+ if (dt2.Rows.Count > 0)
+ {
+ gcMxL2.BindingContext = new BindingContext();
+ gcMxL2.DataSource = dt2;
+ gcMxL2.ForceInitialize();
+ gvMxL2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMxL2);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMxL2, gvMxL2);
+ }
+ JArray array3 = new JArray();
+ foreach (var a in dy["list2"])
+ {
+ array3.Add(a);
+ }
+ DataTable dt3 = JsonConvert.DeserializeObject<DataTable>(array3.ToString());
+ if (dt3.Rows.Count > 0)
+ {
+ gcMxL3.BindingContext = new BindingContext();
+ gcMxL3.DataSource = dt3;
+ gcMxL3.ForceInitialize();
+ gvMxL3.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMxL3);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMxL3, gvMxL3);
+ }
+ }
+ else
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.resx b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.resx
index a4826a3..a989fe1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.resx
@@ -120,4 +120,7 @@
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
+ <metadata name="behaviorManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>93, 17</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
index 1ae2c35..5aba8c3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.cs
@@ -39,41 +39,67 @@
{
txt_suppId.Text = this.txt_suppNo_1.GetCode();
};
+
+
+
+ //娴忚鎵撳嵃浜嬩欢
this.ucBtnPrint1.btnPrintClick += (s, e) =>
{
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_itemName, gridView1);
- ucBtnPrint1.guidKey = rowGuid;
- if (string.IsNullOrEmpty(txt_suppNo_1.GetCode()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨渚涘簲鍟嗭紒");
- txt_suppNo_1.Focus();
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
- txt_iCount_1.Focus();
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
- txt_psnQty_1.Focus();
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- this.ucBtnPrint1.rptParameter = "rpt_ItemInv{" + txt_createDate1.Text.Trim()
- + "," + txt_tc_1.Checked.ToString().ToUpper()
- + "," + txt_suppNo_1.GetId()
- + "," + txt_iCount_1.Text.Trim()
- + "," + txt_psnQty_1.Text.Trim()
- + "}";
+ _print(0);
+
};
+ //鐩存帴鎵撳嵃浜嬩欢
+ this.ucBtnPrint1.btnZhiJieClick += (s, e) =>
+ {
+ _print(1);
+
+ };
+
+ //闅愯棌鎵归噺鎵撳嵃鎸夐挳
+ this.ucBtnPrint1.SetPlButton(false);
+
}
+
+
+ /// <summary>
+ /// 鎵撳嵃
+ /// </summary>
+ /// <param name="type">0琛ㄧず棰勮鎵撳嵃锛�1琛ㄧず鐩存帴鎵撳嵃</param>
+ private void _print(int type)
+ {
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_itemName, gridView1);
+ ucBtnPrint1.guidKey = rowGuid;
+ //if (string.IsNullOrEmpty(txt_suppNo_1.GetCode()))
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨渚涘簲鍟嗭紒");
+ // txt_suppNo_1.Focus();
+ // this.ucBtnPrint1.rptParameter = "return false";
+ // return;
+ //}
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
+ txt_iCount_1.Focus();
+ this.ucBtnPrint1.rptParameter = "return false";
+ return;
+ }
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
+ txt_psnQty_1.Focus();
+ this.ucBtnPrint1.rptParameter = "return false";
+ return;
+ }
+ this.ucBtnPrint1.rptParameter = "rpt_ItemInv{" + txt_createDate1.Text.Trim()
+ + "," + txt_tc_1.Checked.ToString().ToUpper()
+ + "," + txt_suppNo_1.GetId()
+ + "," + txt_iCount_1.Text.Trim()
+ + "," + txt_psnQty_1.Text.Trim()
+ + "}";
+ }
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
diff --git a/DevApp/Gs.DevApp/UserControl/UcBtnPrint.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcBtnPrint.Designer.cs
index dbea880..c788131 100644
--- a/DevApp/Gs.DevApp/UserControl/UcBtnPrint.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcBtnPrint.Designer.cs
@@ -28,18 +28,23 @@
/// </summary>
private void InitializeComponent()
{
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UcBtnPrint));
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.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
this.layoutControl2 = new DevExpress.XtraLayout.LayoutControl();
this.btnPrint = new DevExpress.XtraEditors.SimpleButton();
this.btnAll = new DevExpress.XtraEditors.SimpleButton();
+ this.btnZhiJie = new DevExpress.XtraEditors.SimpleButton();
this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.lay2 = new DevExpress.XtraLayout.LayoutControlItem();
this.lay1 = new DevExpress.XtraLayout.LayoutControlItem();
this.lay3 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.layoutControl2)).BeginInit();
this.layoutControl2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lay2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.lay1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.lay3)).BeginInit();
this.SuspendLayout();
@@ -48,43 +53,55 @@
//
this.layoutControl2.Controls.Add(this.btnPrint);
this.layoutControl2.Controls.Add(this.btnAll);
+ this.layoutControl2.Controls.Add(this.btnZhiJie);
this.layoutControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutControl2.Location = new System.Drawing.Point(0, 0);
this.layoutControl2.Margin = new System.Windows.Forms.Padding(0);
this.layoutControl2.Name = "layoutControl2";
- this.layoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(803, 337, 812, 500);
+ this.layoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(602, 323, 812, 500);
this.layoutControl2.Padding = new System.Windows.Forms.Padding(0, 1, 0, 0);
this.layoutControl2.Root = this.layoutControlGroup1;
- this.layoutControl2.Size = new System.Drawing.Size(261, 34);
+ this.layoutControl2.Size = new System.Drawing.Size(382, 34);
this.layoutControl2.TabIndex = 6;
this.layoutControl2.Text = "layoutControl2";
//
// btnPrint
//
- this.btnPrint.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
- this.btnPrint.Location = new System.Drawing.Point(0, 2);
+ this.btnPrint.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnPrint.ImageOptions.Image")));
+ this.btnPrint.Location = new System.Drawing.Point(127, 2);
this.btnPrint.Margin = new System.Windows.Forms.Padding(10, 0, 0, 0);
this.btnPrint.Name = "btnPrint";
- this.btnPrint.Size = new System.Drawing.Size(130, 27);
+ this.btnPrint.Size = new System.Drawing.Size(127, 27);
this.btnPrint.StyleController = this.layoutControl2;
this.btnPrint.TabIndex = 3;
- this.btnPrint.Text = "纭畾鎵撳嵃";
+ this.btnPrint.Text = "棰勮鎵撳嵃";
//
// btnAll
//
this.btnAll.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.refreshpivottable_16x16;
- this.btnAll.Location = new System.Drawing.Point(130, 2);
+ this.btnAll.Location = new System.Drawing.Point(254, 2);
this.btnAll.Name = "btnAll";
- this.btnAll.Size = new System.Drawing.Size(131, 27);
+ this.btnAll.Size = new System.Drawing.Size(128, 27);
this.btnAll.StyleController = this.layoutControl2;
this.btnAll.TabIndex = 4;
this.btnAll.Text = "鎵归噺鎿嶄綔";
+ //
+ // btnZhiJie
+ //
+ this.btnZhiJie.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
+ this.btnZhiJie.Location = new System.Drawing.Point(0, 2);
+ this.btnZhiJie.Name = "btnZhiJie";
+ this.btnZhiJie.Size = new System.Drawing.Size(127, 27);
+ this.btnZhiJie.StyleController = this.layoutControl2;
+ this.btnZhiJie.TabIndex = 5;
+ this.btnZhiJie.Text = "鐩存帴鎵撳嵃";
//
// layoutControlGroup1
//
this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.layoutControlGroup1.GroupBordersVisible = false;
this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.lay2,
this.lay1,
this.lay3});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
@@ -93,36 +110,51 @@
columnDefinition1.Width = 100D;
columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition1,
- columnDefinition2});
+ columnDefinition2,
+ columnDefinition3});
rowDefinition1.Height = 100D;
rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1});
this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 2, 0);
- this.layoutControlGroup1.Size = new System.Drawing.Size(261, 34);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(382, 34);
this.layoutControlGroup1.TextVisible = false;
+ //
+ // lay2
+ //
+ this.lay2.Control = this.btnZhiJie;
+ this.lay2.Location = new System.Drawing.Point(0, 0);
+ this.lay2.Name = "lay2";
+ this.lay2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ this.lay2.Size = new System.Drawing.Size(127, 32);
+ this.lay2.Text = "鐩存帴鎵撳嵃";
+ this.lay2.TextSize = new System.Drawing.Size(0, 0);
+ this.lay2.TextVisible = false;
//
// lay1
//
this.lay1.Control = this.btnPrint;
- this.lay1.Location = new System.Drawing.Point(0, 0);
+ this.lay1.Location = new System.Drawing.Point(127, 0);
this.lay1.Name = "lay1";
+ this.lay1.OptionsTableLayoutItem.ColumnIndex = 1;
this.lay1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.lay1.Size = new System.Drawing.Size(130, 32);
- this.lay1.Text = "纭畾鎵撳嵃";
+ this.lay1.Size = new System.Drawing.Size(127, 32);
+ this.lay1.Text = "棰勮鎵撳嵃";
this.lay1.TextSize = new System.Drawing.Size(0, 0);
this.lay1.TextVisible = false;
//
// lay3
//
this.lay3.Control = this.btnAll;
- this.lay3.Location = new System.Drawing.Point(130, 0);
+ this.lay3.Location = new System.Drawing.Point(254, 0);
this.lay3.Name = "lay3";
- this.lay3.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.lay3.OptionsTableLayoutItem.ColumnIndex = 2;
this.lay3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.lay3.Size = new System.Drawing.Size(131, 32);
+ this.lay3.Size = new System.Drawing.Size(128, 32);
this.lay3.Text = "鎵归噺鎿嶄綔";
this.lay3.TextSize = new System.Drawing.Size(0, 0);
this.lay3.TextVisible = false;
@@ -134,10 +166,11 @@
this.Controls.Add(this.layoutControl2);
this.Margin = new System.Windows.Forms.Padding(0);
this.Name = "UcBtnPrint";
- this.Size = new System.Drawing.Size(261, 34);
+ this.Size = new System.Drawing.Size(382, 34);
((System.ComponentModel.ISupportInitialize)(this.layoutControl2)).EndInit();
this.layoutControl2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lay2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.lay1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.lay3)).EndInit();
this.ResumeLayout(false);
@@ -150,6 +183,8 @@
private DevExpress.XtraLayout.LayoutControl layoutControl2;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
private DevExpress.XtraEditors.SimpleButton btnAll;
+ private DevExpress.XtraEditors.SimpleButton btnZhiJie;
+ private DevExpress.XtraLayout.LayoutControlItem lay2;
private DevExpress.XtraLayout.LayoutControlItem lay1;
private DevExpress.XtraLayout.LayoutControlItem lay3;
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs b/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs
index 2f42c04..6a658a8 100644
--- a/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs
@@ -2,9 +2,11 @@
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Data;
using System.Drawing;
+using System.IO;
using System.Windows.Forms;
@@ -15,6 +17,7 @@
public UcBtnPrint()
{
InitializeComponent();
+ //棰勮鎵撳嵃
this.btnPrint.Click += (s, e) =>
{
if (btnPrintClick != null)
@@ -67,12 +70,66 @@
#endregion
_print();
};
+ //鎵归噺鎿嶄綔
this.btnAll.Click += (s, e) =>
{
if (btnAllClick != null)
btnAllClick(this, e);
else
return;
+ };
+ //鐩存帴鎵撳嵃
+ this.btnZhiJie.Click += (s, e) =>
+ {
+ if (btnZhiJieClick != null)
+ btnZhiJieClick(this, e);
+ else
+ return;
+ if (rptParameter == "return false")
+ return;
+ if (string.IsNullOrEmpty(rptParameter))
+ {
+ MsgHelper.ShowError("娌℃湁鎸囧畾鎶ヨ〃鍙傛暟锛岃鑱旂郴鎶�鏈紑鍙戜汉鍛橈紒");
+ return;
+ }
+ #region 濡傛灉鏄鎴风殑鍚庣洊鐮�
+ if (rptParameter.Contains("rpt_hgm"))
+ {
+ var _obj = new
+ {
+ keyType = "瀹㈡埛妯℃澘"
+ };
+ var json = JsonConvert.SerializeObject(_obj);
+ try
+ {
+ var strReturn =
+ UtilityHelper.HttpPost("", "Report/GetTemplateList", json);
+ ReturnModel<DataTable> dd = UtilityHelper.ReturnToList(strReturn);
+ DataTable dt = dd.rtnData;
+ if (dd.rtnCode > 0)
+ {
+ // 鍒涘缓鎴栬幏鍙栦竴涓狢ontextMenu瀵硅薄锛堜緥濡備娇鐢–ontextMenuStrip锛�
+ ContextMenu contextMenu = new ContextMenu();
+ foreach (DataRow dr in dt.Rows)
+ {
+ MenuItem menuItem1 = new MenuItem(dr["reportType"].ToString() + "銆�" + dr["reportName"].ToString() + "銆�");
+ menuItem1.Click += (ss, ee) =>
+ {
+ rptParameter = rptParameter.Replace("rpt_hgm", dr["reportType"].ToString());
+ _printZhiJie();
+ };
+ contextMenu.MenuItems.Add(menuItem1);
+ }
+ // 鏄剧ず鑿滃崟鍦ㄦ寜閽殑浣嶇疆
+ contextMenu.Show(btnPrint, new Point(0, btnPrint.Height)); // 璋冩暣绗簩涓弬鏁颁互璋冩暣鑿滃崟鐨勬樉绀轰綅缃�
+ return;
+ }
+ }
+ catch (Exception ex)
+ { }
+ }
+ #endregion
+ _printZhiJie();
};
}
/// <summary>
@@ -101,6 +158,12 @@
/// 鎵归噺鎿嶄綔
/// </summary>
public event EventHandler btnAllClick;
+
+ /// <summary>
+ /// 鐩存帴鎵撳嵃
+ /// </summary>
+ public event EventHandler btnZhiJieClick;
+
private bool _ckRptService()
{
@@ -146,13 +209,19 @@
public void SetPrintButton(bool blPiLiang)
{
if (blPiLiang == true)
+ {
this.lay1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
+ this.lay2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
+ }
else
+ {
this.lay1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ this.lay2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ }
}
/// <summary>
- ///
+ /// 棰勮鎵撳嵃
/// </summary>
private void _print()
{
@@ -174,5 +243,64 @@
}
MsgHelper.ShowError("娌℃湁璁捐妯℃澘锛岃鍏堣璁℃ā鏉匡紒");
}
+ /// <summary>
+ /// 鐩存帴鎵撳嵃
+ /// </summary>
+ private void _printZhiJie() {
+ var _obj = new
+ {
+ rptParameter = rptParameter,
+ guid = guidKey,
+ isDesign = 0
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "Report/GetRptData",
+ JsonConvert.SerializeObject(_obj));
+ var _job = JObject.Parse(strJson);
+ var rtnCode = _job["rtnCode"].ToString();
+ if (int.Parse(rtnCode) > 0)
+ {
+ //妯℃澘
+ var report = new FastReport.Report();
+ var buffer = (byte[])_job["rtnData"]["reportTemplateData"];
+ using (var Stream = new MemoryStream(buffer))
+ {
+ report.Load(Stream);
+ }
+ //涓昏〃
+ var array = new JArray();
+ foreach (var a in _job["rtnData"]["zb"]) array.Add(a);
+ var _zb = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ _zb.TableName = "zb";
+ //鏄庣粏琛�1
+ var array1 = new JArray();
+ foreach (var a in _job["rtnData"]["mx1"]) array1.Add(a);
+ var _mx1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
+ _mx1.TableName = "mx1";
+ //鏄庣粏琛�2
+ var array2 = new JArray();
+ foreach (var a in _job["rtnData"]["mx2"]) array2.Add(a);
+ var _mx2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+ _mx2.TableName = "mx2";
+ //鍔犲埌鏁版嵁闆嗕腑
+ var ds = new DataSet();
+ ds.Tables.Add(_zb);
+ ds.Tables.Add(_mx1);
+ ds.Tables.Add(_mx2);
+ report.RegisterData(ds);
+ report.Print();
+ // report.ShowPrepared();
+ }
+ else
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + _job["rtnMsg"]);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcBtnPrint.resx b/DevApp/Gs.DevApp/UserControl/UcBtnPrint.resx
index 1af7de1..9742de5 100644
--- a/DevApp/Gs.DevApp/UserControl/UcBtnPrint.resx
+++ b/DevApp/Gs.DevApp/UserControl/UcBtnPrint.resx
@@ -117,4 +117,23 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="btnPrint.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABB0RVh0VGl0
+ bGUAUHJpbnQ7UGRmO6W13RIAAAK5SURBVDhPpZJdSJNhFMffNCLNvm6CLvz+yqzUOecQXWuTjMoPiBRJ
+ sKQLRdBaq1ZZJjOLLEIqqJsouujKLkI083s5JJ3fgs3KIFOpTec2t3e+Fv/O+26uSZe98OM8nOc9//M/
+ h4cB8F/8PTDMBmNm5uuPCgUm5XJMyDIwnpaGkdRUDKaIMSBKwoeEBPTti0fv3jjoYmPRHR3V6Cuw0ahU
+ YIVbhcv1C181GoxJpXCwHJYdHCYrz6HvwH4s2Vyw2FgsLDnRERHhY4VhNhkVcqF4PD0dTnaVuktgp+L+
+ xERY7S7o4+NhsbLQxUSjKzIS7eHh6wQ289ZZ16pQ/Fl9UbBuc6ygn6wvkQBvfdHqhNni7t4WFuaenfAn
+ giZkMqF4TJqKEUkKDCIRbMsuwTpvW7cnFmbeemSE0L01JARM3RNd5oMXw4aC0jsYzyDrTo6KJTAki9zW
+ PTOPlpUL1k2LTqG4LTSUBILB3Hs2+GPO5EB20XU0HsvHKL91cTIGktxb5+fujaOtx8SgKzoK7R7rb6l7
+ S3BwI1P31ACO+438kptQ5qmhzCVy1FDkXIAiW4VDx1WQE3lFV+GkBVc16Pm5A7y7q37YB+syh9bOQRzN
+ V0GqLIFEfgYp8tMQHyxGsqwYWbkVaO4w0PwsLt3t4QUCvQKaeh3mFx34Mm/DtIAd07MUZ+1Cbi0vRMpX
+ ajt4gSCvwPlbnZiatWJ4ygRx1hUPmn8YmjJj+JMJZVXveIGtXoHyG20wGM3oHJqB9pGeXtoKalu/o6Zl
+ BlVNM1iwuqB93It2wzf0jM7h7OVmXmCbV6Cw/GX3qYpXOFn6HNUNOmFOs4WFiaKJHsxPgs8fLriNI4X1
+ UJ6o0a3bAX0BvCKxS13b9P7a/S646fZGlfaNnu53EzuIQMLPK+Cj5Oe53E7s9IEv2kL4r/37FzB/AO2A
+ e7eRmc9hAAAAAElFTkSuQmCC
+</value>
+ </data>
</root>
\ No newline at end of file
--
Gitblit v1.9.3