到货条码打印

lu

2024-12-30 5614d12346dc567febdcc51e5533a3b98e67348d

到货条码打印

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs

@@ -29,22 +29,22 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesQaItemsDetect01));
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -1167,8 +1167,8 @@
            // 
            this.gv_ftype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_ftype.AppearanceCell.Options.UseFont = true;
            this.gv_ftype.Caption = "类型(0来料,1在库)";
            this.gv_ftype.FieldName = "ftype";
            this.gv_ftype.Caption = "类型";
            this.gv_ftype.FieldName = "ftypeTxt";
            this.gv_ftype.MinWidth = 30;
            this.gv_ftype.Name = "gv_ftype";
            this.gv_ftype.OptionsColumn.AllowEdit = false;
@@ -1710,10 +1710,10 @@
            // repositoryItemButtonEdit2
            // 
            this.repositoryItemButtonEdit2.AutoHeight = false;
            editorButtonImageOptions4.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions4.Image")));
            editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "浏览", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "浏览", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1731,10 +1731,10 @@
            // repositoryItemButtonEdit3
            // 
            this.repositoryItemButtonEdit3.AutoHeight = false;
            editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.download_16x16;
            editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "下载", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "下载", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
            this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
@@ -1752,10 +1752,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "删除", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "删除", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs

@@ -1,3 +1,4 @@
using DevExpress.Utils.MVVM.Services;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -308,7 +309,7 @@
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1);
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
@@ -367,7 +368,7 @@
        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1);
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
@@ -443,7 +444,9 @@
        private   void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
            _sbSqlWhere += " and isnull(fsubmit,0)=0";
            MessageBox.Show(_sbSqlWhere.ToString());
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
            {

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.resx

@@ -118,7 +118,7 @@
    <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="editorButtonImageOptions4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABN0RVh0VGl0
        bGUAV2ViO1dvcmxkO0V5ZQdEODoAAAONSURBVDhPVZJtTNNXFIcvoHOyLhMTt2Qsm4oMI5luEE3jZlsR

 DevApp/Gs.DevApp/DevFrm/Rpt/RptPreview.cs

@@ -49,27 +49,20 @@
                    {
                        report.Load(Stream);
                    }

                    //主表
                    var array = new JArray();
                    foreach (var a in _job["rtnData"]["zb"]) array.Add(a);
                    var _zb =
                        JsonConvert.DeserializeObject<DataTable>(
                            array.ToString());
                    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());
                    var _mx1 =JsonConvert.DeserializeObject<DataTable>( array1.ToString());
                    _mx1.TableName = "mx1";
                    //明细表2
                    var array2 = new JArray();
                    foreach (var a in _job["rtnData"]["mx2"]) array1.Add(a);
                    var _mx2 =
                        JsonConvert.DeserializeObject<DataTable>(
                            array2.ToString());
                    var _mx2 =JsonConvert.DeserializeObject<DataTable>(array2.ToString());
                    _mx2.TableName = "mx2";
                    //加到数据集中
                    var ds = new DataSet();

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs

@@ -45,37 +45,36 @@
            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gvAbtGuid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1ebeln = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1ebelnLine = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1ebeln = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1ebelnQty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1okRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1ebelnQty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1states = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
            this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
            this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
            this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
            this.kyPrtQty = new DevExpress.XtraEditors.TextEdit();
            this.txtKdy = new DevExpress.XtraEditors.TextEdit();
            this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
            this.textEdit6 = new DevExpress.XtraEditors.TextEdit();
            this.txtYdy = new DevExpress.XtraEditors.TextEdit();
            this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
            this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
            this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
@@ -134,7 +133,6 @@
            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
            this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
            this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -147,8 +145,8 @@
            this.panelMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.kyPrtQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.textEdit6.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
@@ -229,7 +227,7 @@
            // 
            this.tabMxPage2.Controls.Add(this.gcMx2);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1342, 377);
            this.tabMxPage2.Size = new System.Drawing.Size(1342, 383);
            this.tabMxPage2.Text = "已打条码信息";
            // 
            // gcMx2
@@ -238,7 +236,7 @@
            this.gcMx2.Location = new System.Drawing.Point(0, 0);
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.Size = new System.Drawing.Size(1342, 377);
            this.gcMx2.Size = new System.Drawing.Size(1342, 383);
            this.gcMx2.TabIndex = 0;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
@@ -253,8 +251,7 @@
            this.gridColumn18,
            this.gridColumn14,
            this.gvMx2oldqty,
            this.gridColumn17,
            this.gridColumn15});
            this.gridColumn17});
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -295,29 +292,19 @@
            // gridColumn17
            // 
            this.gridColumn17.Caption = "打印日期";
            this.gridColumn17.FieldName = "lotDate";
            this.gridColumn17.MinWidth = 25;
            this.gridColumn17.FieldName = "createDate";
            this.gridColumn17.MinWidth = 180;
            this.gridColumn17.Name = "gridColumn17";
            this.gridColumn17.Visible = true;
            this.gridColumn17.VisibleIndex = 6;
            this.gridColumn17.Width = 94;
            // 
            // gridColumn15
            // 
            this.gridColumn15.Caption = "条码来源标识 1-采购入库";
            this.gridColumn15.FieldName = "comeFlg";
            this.gridColumn15.MinWidth = 25;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 7;
            this.gridColumn15.Width = 94;
            this.gridColumn17.Width = 180;
            // 
            // tabMxPage1
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Controls.Add(this.panelMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1342, 377);
            this.tabMxPage1.Size = new System.Drawing.Size(1342, 383);
            this.tabMxPage1.Text = "来料信息明细";
            // 
            // gcMx1
@@ -329,7 +316,7 @@
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1,
            this.repositoryItemCheckEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1342, 279);
            this.gcMx1.Size = new System.Drawing.Size(1342, 285);
            this.gcMx1.TabIndex = 1;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -339,20 +326,19 @@
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvAbtGuid,
            this.gvMx1guid,
            this.gvMx1ebeln,
            this.gvMx1ebelnLine,
            this.gvMx1urgentFlag,
            this.gvMx1ebeln,
            this.gridColumn4,
            this.gvMx1boardStyle,
            this.gridColumn6,
            this.gridColumn8,
            this.gvMx1ebelnQty,
            this.gvMx1okRkqty,
            this.gvMx1ebelnQty,
            this.gridColumn10,
            this.gvMx1states,
            this.gridColumn5,
            this.gridColumn9,
            this.gridColumn7,
            this.gridColumn10});
            this.gridColumn7});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -382,6 +368,20 @@
            this.gvMx1guid.Tag = "query_a.guid";
            this.gvMx1guid.Width = 100;
            // 
            // gvMx1urgentFlag
            // 
            this.gvMx1urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
            this.gvMx1urgentFlag.Caption = "急料标识";
            this.gvMx1urgentFlag.FieldName = "urgentFlag";
            this.gvMx1urgentFlag.MaxWidth = 50;
            this.gvMx1urgentFlag.MinWidth = 50;
            this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
            this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
            this.gvMx1urgentFlag.Visible = true;
            this.gvMx1urgentFlag.VisibleIndex = 0;
            this.gvMx1urgentFlag.Width = 50;
            // 
            // gvMx1ebeln
            // 
            this.gvMx1ebeln.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -393,45 +393,18 @@
            this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
            this.gvMx1ebeln.Tag = "query_a.ebeln";
            this.gvMx1ebeln.Visible = true;
            this.gvMx1ebeln.VisibleIndex = 0;
            this.gvMx1ebeln.VisibleIndex = 1;
            this.gvMx1ebeln.Width = 120;
            // 
            // gvMx1ebelnLine
            // 
            this.gvMx1ebelnLine.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1ebelnLine.AppearanceCell.Options.UseFont = true;
            this.gvMx1ebelnLine.Caption = "ERP行ID";
            this.gvMx1ebelnLine.FieldName = "ebelnK3id";
            this.gvMx1ebelnLine.MinWidth = 90;
            this.gvMx1ebelnLine.Name = "gvMx1ebelnLine";
            this.gvMx1ebelnLine.OptionsColumn.ReadOnly = true;
            this.gvMx1ebelnLine.Tag = "query_a.ebeln_line";
            this.gvMx1ebelnLine.Visible = true;
            this.gvMx1ebelnLine.VisibleIndex = 1;
            this.gvMx1ebelnLine.Width = 100;
            // 
            // gvMx1urgentFlag
            // 
            this.gvMx1urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
            this.gvMx1urgentFlag.Caption = "急料标识";
            this.gvMx1urgentFlag.FieldName = "urgentFlag";
            this.gvMx1urgentFlag.MinWidth = 60;
            this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
            this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
            this.gvMx1urgentFlag.Visible = true;
            this.gvMx1urgentFlag.VisibleIndex = 2;
            this.gvMx1urgentFlag.Width = 100;
            // 
            // gridColumn4
            // 
            this.gridColumn4.Caption = "物料ID";
            this.gridColumn4.FieldName = "itemId";
            this.gridColumn4.Caption = "物料编号";
            this.gridColumn4.FieldName = "itemNo";
            this.gridColumn4.MinWidth = 100;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.OptionsColumn.ReadOnly = true;
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 3;
            this.gridColumn4.VisibleIndex = 2;
            this.gridColumn4.Width = 100;
            // 
            // gvMx1boardStyle
@@ -445,7 +418,7 @@
            this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
            this.gvMx1boardStyle.Tag = "query_a.board_style";
            this.gvMx1boardStyle.Visible = true;
            this.gvMx1boardStyle.VisibleIndex = 4;
            this.gvMx1boardStyle.VisibleIndex = 3;
            this.gvMx1boardStyle.Width = 180;
            // 
            // gridColumn6
@@ -455,32 +428,18 @@
            this.gridColumn6.MinWidth = 125;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.VisibleIndex = 4;
            this.gridColumn6.Width = 125;
            // 
            // gridColumn8
            // 
            this.gridColumn8.Caption = "本次收货数量";
            this.gridColumn8.FieldName = "quantity";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.MinWidth = 50;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 6;
            this.gridColumn8.VisibleIndex = 5;
            this.gridColumn8.Width = 94;
            // 
            // gvMx1ebelnQty
            // 
            this.gvMx1ebelnQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
            this.gvMx1ebelnQty.Caption = "已打印数量";
            this.gvMx1ebelnQty.FieldName = "prnQty";
            this.gvMx1ebelnQty.MinWidth = 90;
            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 = 100;
            // 
            // gvMx1okRkqty
            // 
@@ -488,13 +447,41 @@
            this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
            this.gvMx1okRkqty.Caption = "已入库数量";
            this.gvMx1okRkqty.FieldName = "okRkqty";
            this.gvMx1okRkqty.MinWidth = 90;
            this.gvMx1okRkqty.MinWidth = 50;
            this.gvMx1okRkqty.Name = "gvMx1okRkqty";
            this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
            this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
            this.gvMx1okRkqty.Visible = true;
            this.gvMx1okRkqty.VisibleIndex = 8;
            this.gvMx1okRkqty.VisibleIndex = 6;
            this.gvMx1okRkqty.Width = 100;
            // 
            // gvMx1ebelnQty
            // 
            this.gvMx1ebelnQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
            this.gvMx1ebelnQty.Caption = "已打印数量";
            this.gvMx1ebelnQty.FieldName = "yQty";
            this.gvMx1ebelnQty.MinWidth = 50;
            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 = 100;
            // 
            // gridColumn10
            // 
            this.gridColumn10.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn10.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn10.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn10.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn10.Caption = "可打印总量";
            this.gridColumn10.FieldName = "kQty";
            this.gridColumn10.MinWidth = 50;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 8;
            this.gridColumn10.Width = 94;
            // 
            // gvMx1states
            // 
@@ -502,7 +489,7 @@
            this.gvMx1states.AppearanceCell.Options.UseFont = true;
            this.gvMx1states.Caption = "打印条码张数";
            this.gvMx1states.FieldName = "icount";
            this.gvMx1states.MinWidth = 90;
            this.gvMx1states.MinWidth = 50;
            this.gvMx1states.Name = "gvMx1states";
            this.gvMx1states.OptionsColumn.ReadOnly = true;
            this.gvMx1states.Tag = "query_a.states";
@@ -514,7 +501,7 @@
            // 
            this.gridColumn5.Caption = "物料单位";
            this.gridColumn5.FieldName = "wnDw";
            this.gridColumn5.MinWidth = 60;
            this.gridColumn5.MinWidth = 50;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Visible = true;
@@ -525,7 +512,7 @@
            // 
            this.gridColumn9.Caption = "采购单位";
            this.gridColumn9.FieldName = "cgUnit";
            this.gridColumn9.MinWidth = 60;
            this.gridColumn9.MinWidth = 50;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.OptionsColumn.ReadOnly = true;
            this.gridColumn9.Visible = true;
@@ -536,22 +523,12 @@
            // 
            this.gridColumn7.Caption = "库存单位";
            this.gridColumn7.FieldName = "kcUnit";
            this.gridColumn7.MinWidth = 60;
            this.gridColumn7.MinWidth = 50;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.ReadOnly = true;
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 12;
            this.gridColumn7.Width = 94;
            // 
            // gridColumn10
            // 
            this.gridColumn10.Caption = "可打印总量";
            this.gridColumn10.FieldName = "kyPrtQty";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 13;
            this.gridColumn10.Width = 94;
            // 
            // repositoryItemButtonEdit1
            // 
@@ -576,9 +553,9 @@
            this.panelMx1.Controls.Add(this.labelControl14);
            this.panelMx1.Controls.Add(this.txt_psnQty_1);
            this.panelMx1.Controls.Add(this.labelControl12);
            this.panelMx1.Controls.Add(this.kyPrtQty);
            this.panelMx1.Controls.Add(this.txtKdy);
            this.panelMx1.Controls.Add(this.labelControl13);
            this.panelMx1.Controls.Add(this.textEdit6);
            this.panelMx1.Controls.Add(this.txtYdy);
            this.panelMx1.Controls.Add(this.labelControl11);
            this.panelMx1.Controls.Add(this.txtQuantity);
            this.panelMx1.Controls.Add(this.labelControl10);
@@ -593,6 +570,15 @@
            this.panelMx1.Name = "panelMx1";
            this.panelMx1.Size = new System.Drawing.Size(1342, 98);
            this.panelMx1.TabIndex = 0;
            // 
            // ucBtnPrint1
            // 
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(541, 59);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
            this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);
            this.ucBtnPrint1.TabIndex = 232;
            // 
            // lbMxGuid
            // 
@@ -609,6 +595,8 @@
            this.txt_iCount_1.Name = "txt_iCount_1";
            this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
            this.txt_iCount_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
            this.txt_iCount_1.Properties.MaskSettings.Set("mask", "\\d+");
            this.txt_iCount_1.Size = new System.Drawing.Size(96, 28);
            this.txt_iCount_1.TabIndex = 228;
            // 
@@ -626,6 +614,8 @@
            this.txt_psnQty_1.Name = "txt_psnQty_1";
            this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
            this.txt_psnQty_1.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.RegExpMaskManager));
            this.txt_psnQty_1.Properties.MaskSettings.Set("mask", "\\d+");
            this.txt_psnQty_1.Size = new System.Drawing.Size(96, 28);
            this.txt_psnQty_1.TabIndex = 226;
            // 
@@ -637,15 +627,15 @@
            this.labelControl12.TabIndex = 225;
            this.labelControl12.Text = "每张条码数量：";
            // 
            // kyPrtQty
            // txtKdy
            // 
            this.kyPrtQty.Location = new System.Drawing.Point(430, 65);
            this.kyPrtQty.Name = "kyPrtQty";
            this.kyPrtQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.kyPrtQty.Properties.Appearance.Options.UseFont = true;
            this.kyPrtQty.Properties.ReadOnly = true;
            this.kyPrtQty.Size = new System.Drawing.Size(96, 28);
            this.kyPrtQty.TabIndex = 224;
            this.txtKdy.Location = new System.Drawing.Point(430, 65);
            this.txtKdy.Name = "txtKdy";
            this.txtKdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txtKdy.Properties.Appearance.Options.UseFont = true;
            this.txtKdy.Properties.ReadOnly = true;
            this.txtKdy.Size = new System.Drawing.Size(96, 28);
            this.txtKdy.TabIndex = 224;
            // 
            // labelControl13
            // 
@@ -655,15 +645,15 @@
            this.labelControl13.TabIndex = 223;
            this.labelControl13.Text = "可打印总数：";
            // 
            // textEdit6
            // txtYdy
            // 
            this.textEdit6.Location = new System.Drawing.Point(430, 34);
            this.textEdit6.Name = "textEdit6";
            this.textEdit6.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.textEdit6.Properties.Appearance.Options.UseFont = true;
            this.textEdit6.Properties.ReadOnly = true;
            this.textEdit6.Size = new System.Drawing.Size(96, 28);
            this.textEdit6.TabIndex = 222;
            this.txtYdy.Location = new System.Drawing.Point(430, 34);
            this.txtYdy.Name = "txtYdy";
            this.txtYdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txtYdy.Properties.Appearance.Options.UseFont = true;
            this.txtYdy.Properties.ReadOnly = true;
            this.txtYdy.Size = new System.Drawing.Size(96, 28);
            this.txtYdy.TabIndex = 222;
            // 
            // labelControl11
            // 
@@ -739,11 +729,11 @@
            // 
            // labelControl7
            // 
            this.labelControl7.Location = new System.Drawing.Point(25, 9);
            this.labelControl7.Location = new System.Drawing.Point(11, 9);
            this.labelControl7.Name = "labelControl7";
            this.labelControl7.Size = new System.Drawing.Size(61, 18);
            this.labelControl7.Size = new System.Drawing.Size(75, 18);
            this.labelControl7.TabIndex = 213;
            this.labelControl7.Text = "物料ID：";
            this.labelControl7.Text = "物料编号：";
            // 
            // gv_urgentFlag
            // 
@@ -1021,10 +1011,10 @@
            // tabMx
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabMx.Location = new System.Drawing.Point(0, 161);
            this.tabMx.Location = new System.Drawing.Point(0, 155);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1344, 409);
            this.tabMx.Size = new System.Drawing.Size(1344, 415);
            this.tabMx.TabIndex = 2;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
@@ -1064,7 +1054,7 @@
            this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.panel1.Location = new System.Drawing.Point(0, 0);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(1344, 161);
            this.panel1.Size = new System.Drawing.Size(1344, 155);
            this.panel1.TabIndex = 1;
            // 
            // txt_fstatus
@@ -1077,7 +1067,7 @@
            // 
            // txt_urgentFlag
            // 
            this.txt_urgentFlag.Location = new System.Drawing.Point(993, 53);
            this.txt_urgentFlag.Location = new System.Drawing.Point(993, 50);
            this.txt_urgentFlag.Name = "txt_urgentFlag";
            this.txt_urgentFlag.Properties.Caption = "";
            this.txt_urgentFlag.Size = new System.Drawing.Size(94, 24);
@@ -1087,7 +1077,7 @@
            // 
            this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl5.Appearance.Options.UseFont = true;
            this.labelControl5.Location = new System.Drawing.Point(335, 19);
            this.labelControl5.Location = new System.Drawing.Point(337, 19);
            this.labelControl5.Name = "labelControl5";
            this.labelControl5.Size = new System.Drawing.Size(68, 21);
            this.labelControl5.TabIndex = 464;
@@ -1095,7 +1085,7 @@
            // 
            // txt_paperBillNo
            // 
            this.txt_paperBillNo.Location = new System.Drawing.Point(415, 15);
            this.txt_paperBillNo.Location = new System.Drawing.Point(413, 15);
            this.txt_paperBillNo.Name = "txt_paperBillNo";
            this.txt_paperBillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
@@ -1105,7 +1095,7 @@
            // txtDepotsId
            // 
            this.txtDepotsId.Enabled = false;
            this.txtDepotsId.Location = new System.Drawing.Point(413, 90);
            this.txtDepotsId.Location = new System.Drawing.Point(413, 83);
            this.txtDepotsId.Name = "txtDepotsId";
            this.txtDepotsId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txtDepotsId.Properties.Appearance.Options.UseFont = true;
@@ -1116,25 +1106,25 @@
            // 
            this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl4.Appearance.Options.UseFont = true;
            this.labelControl4.Location = new System.Drawing.Point(351, 94);
            this.labelControl4.Location = new System.Drawing.Point(337, 87);
            this.labelControl4.Name = "labelControl4";
            this.labelControl4.Size = new System.Drawing.Size(52, 21);
            this.labelControl4.Size = new System.Drawing.Size(68, 21);
            this.labelControl4.TabIndex = 461;
            this.labelControl4.Text = "仓库ID";
            this.labelControl4.Text = "仓库编号";
            // 
            // label1
            // 
            this.label1.AutoSize = true;
            this.label1.Location = new System.Drawing.Point(22, 94);
            this.label1.Location = new System.Drawing.Point(8, 87);
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(79, 21);
            this.label1.Size = new System.Drawing.Size(95, 21);
            this.label1.TabIndex = 460;
            this.label1.Text = "供应商ID";
            this.label1.Text = "供应商编号";
            // 
            // txtSupplierId
            // 
            this.txtSupplierId.Enabled = false;
            this.txtSupplierId.Location = new System.Drawing.Point(111, 90);
            this.txtSupplierId.Location = new System.Drawing.Point(111, 83);
            this.txtSupplierId.Name = "txtSupplierId";
            this.txtSupplierId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txtSupplierId.Properties.Appearance.Options.UseFont = true;
@@ -1144,7 +1134,7 @@
            // txt_depotsId
            // 
            this.txt_depotsId.IsReadly = true;
            this.txt_depotsId.Location = new System.Drawing.Point(413, 51);
            this.txt_depotsId.Location = new System.Drawing.Point(413, 48);
            this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0);
            this.txt_depotsId.Name = "txt_depotsId";
            this.txt_depotsId.Size = new System.Drawing.Size(215, 28);
@@ -1154,7 +1144,7 @@
            // 
            this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl1.Appearance.Options.UseFont = true;
            this.labelControl1.Location = new System.Drawing.Point(335, 55);
            this.labelControl1.Location = new System.Drawing.Point(337, 52);
            this.labelControl1.Name = "labelControl1";
            this.labelControl1.Size = new System.Drawing.Size(68, 21);
            this.labelControl1.TabIndex = 457;
@@ -1163,7 +1153,7 @@
            // txt_suppId
            // 
            this.txt_suppId.IsReadly = true;
            this.txt_suppId.Location = new System.Drawing.Point(111, 51);
            this.txt_suppId.Location = new System.Drawing.Point(111, 48);
            this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
            this.txt_suppId.Name = "txt_suppId";
            this.txt_suppId.Size = new System.Drawing.Size(215, 28);
@@ -1173,7 +1163,7 @@
            // 
            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl2.Appearance.Options.UseFont = true;
            this.labelControl2.Location = new System.Drawing.Point(16, 55);
            this.labelControl2.Location = new System.Drawing.Point(16, 52);
            this.labelControl2.Name = "labelControl2";
            this.labelControl2.Size = new System.Drawing.Size(85, 21);
            this.labelControl2.TabIndex = 455;
@@ -1183,7 +1173,7 @@
            // 
            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.labelControl3.Appearance.Options.UseFont = true;
            this.labelControl3.Location = new System.Drawing.Point(884, 94);
            this.labelControl3.Location = new System.Drawing.Point(884, 87);
            this.labelControl3.Name = "labelControl3";
            this.labelControl3.Size = new System.Drawing.Size(102, 21);
            this.labelControl3.TabIndex = 341;
@@ -1191,7 +1181,7 @@
            // 
            // txt_percentage
            // 
            this.txt_percentage.Location = new System.Drawing.Point(993, 90);
            this.txt_percentage.Location = new System.Drawing.Point(993, 83);
            this.txt_percentage.Name = "txt_percentage";
            this.txt_percentage.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_percentage.Properties.Appearance.Options.UseFont = true;
@@ -1210,35 +1200,35 @@
            // 
            this.lb_urgentFlag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_urgentFlag.Appearance.Options.UseFont = true;
            this.lb_urgentFlag.Location = new System.Drawing.Point(913, 55);
            this.lb_urgentFlag.Location = new System.Drawing.Point(918, 52);
            this.lb_urgentFlag.Name = "lb_urgentFlag";
            this.lb_urgentFlag.Size = new System.Drawing.Size(73, 21);
            this.lb_urgentFlag.Size = new System.Drawing.Size(68, 21);
            this.lb_urgentFlag.TabIndex = 336;
            this.lb_urgentFlag.Text = "急料标识 ";
            this.lb_urgentFlag.Text = "急料标识";
            // 
            // lb_fstatus
            // 
            this.lb_fstatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fstatus.Appearance.Options.UseFont = true;
            this.lb_fstatus.Location = new System.Drawing.Point(913, 19);
            this.lb_fstatus.Location = new System.Drawing.Point(918, 19);
            this.lb_fstatus.Name = "lb_fstatus";
            this.lb_fstatus.Size = new System.Drawing.Size(73, 21);
            this.lb_fstatus.Size = new System.Drawing.Size(68, 21);
            this.lb_fstatus.TabIndex = 291;
            this.lb_fstatus.Text = "提交状态 ";
            this.lb_fstatus.Text = "提交状态";
            // 
            // lb_insDate
            // 
            this.lb_insDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_insDate.Appearance.Options.UseFont = true;
            this.lb_insDate.Location = new System.Drawing.Point(639, 94);
            this.lb_insDate.Location = new System.Drawing.Point(644, 87);
            this.lb_insDate.Name = "lb_insDate";
            this.lb_insDate.Size = new System.Drawing.Size(73, 21);
            this.lb_insDate.Size = new System.Drawing.Size(68, 21);
            this.lb_insDate.TabIndex = 258;
            this.lb_insDate.Text = "入库日期 ";
            this.lb_insDate.Text = "入库日期";
            // 
            // txt_insDate
            // 
            this.txt_insDate.Location = new System.Drawing.Point(724, 90);
            this.txt_insDate.Location = new System.Drawing.Point(724, 83);
            this.txt_insDate.Name = "txt_insDate";
            this.txt_insDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_insDate.Properties.Appearance.Options.UseFont = true;
@@ -1249,15 +1239,15 @@
            // 
            this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_checkDate.Appearance.Options.UseFont = true;
            this.lb_checkDate.Location = new System.Drawing.Point(639, 55);
            this.lb_checkDate.Location = new System.Drawing.Point(644, 52);
            this.lb_checkDate.Name = "lb_checkDate";
            this.lb_checkDate.Size = new System.Drawing.Size(73, 21);
            this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
            this.lb_checkDate.TabIndex = 252;
            this.lb_checkDate.Text = "提交日期 ";
            this.lb_checkDate.Text = "提交日期";
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Location = new System.Drawing.Point(724, 51);
            this.txt_checkDate.Location = new System.Drawing.Point(724, 48);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
@@ -1268,7 +1258,7 @@
            // 
            this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_remark.Appearance.Options.UseFont = true;
            this.lb_remark.Location = new System.Drawing.Point(62, 128);
            this.lb_remark.Location = new System.Drawing.Point(62, 120);
            this.lb_remark.Name = "lb_remark";
            this.lb_remark.Size = new System.Drawing.Size(39, 21);
            this.lb_remark.TabIndex = 235;
@@ -1276,7 +1266,7 @@
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(111, 124);
            this.txt_remark.Location = new System.Drawing.Point(111, 116);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
@@ -1306,11 +1296,11 @@
            // 
            this.lb_billNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_billNo.Appearance.Options.UseFont = true;
            this.lb_billNo.Location = new System.Drawing.Point(28, 19);
            this.lb_billNo.Location = new System.Drawing.Point(33, 19);
            this.lb_billNo.Name = "lb_billNo";
            this.lb_billNo.Size = new System.Drawing.Size(73, 21);
            this.lb_billNo.Size = new System.Drawing.Size(68, 21);
            this.lb_billNo.TabIndex = 211;
            this.lb_billNo.Text = "到货单号 ";
            this.lb_billNo.Text = "到货单号";
            // 
            // txt_billNo
            // 
@@ -1320,15 +1310,6 @@
            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
            this.txt_billNo.Size = new System.Drawing.Size(215, 28);
            this.txt_billNo.TabIndex = 211;
            // 
            // ucBtnPrint1
            // 
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(543, 59);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
            this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);
            this.ucBtnPrint1.TabIndex = 232;
            // 
            // Frm_ArrivalBarcode
            // 
@@ -1352,8 +1333,8 @@
            this.panelMx1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.kyPrtQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.textEdit6.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
@@ -1432,7 +1413,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
        private DevExpress.XtraEditors.TextEdit txtDepotsId;
        private DevExpress.XtraEditors.LabelControl labelControl4;
        private System.Windows.Forms.Label label1;
@@ -1453,7 +1433,6 @@
        private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnLine;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1boardStyle;
@@ -1467,7 +1446,7 @@
        private DevExpress.XtraEditors.LabelControl labelControl8;
        private DevExpress.XtraEditors.TextEdit txtWlid;
        private DevExpress.XtraEditors.LabelControl labelControl7;
        private DevExpress.XtraEditors.TextEdit textEdit6;
        private DevExpress.XtraEditors.TextEdit txtYdy;
        private DevExpress.XtraEditors.LabelControl labelControl11;
        private DevExpress.XtraEditors.TextEdit txtQuantity;
        private DevExpress.XtraEditors.LabelControl labelControl10;
@@ -1477,7 +1456,7 @@
        private DevExpress.XtraEditors.LabelControl labelControl14;
        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
        private DevExpress.XtraEditors.LabelControl labelControl12;
        private DevExpress.XtraEditors.TextEdit kyPrtQty;
        private DevExpress.XtraEditors.TextEdit txtKdy;
        private DevExpress.XtraEditors.LabelControl labelControl13;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs

@@ -1,3 +1,4 @@
using DevExpress.Utils.MVVM.Services;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -7,6 +8,7 @@
using System.Collections.Generic;
using System.Data;
using System.Threading.Tasks;
using System.Windows.Controls;
using System.Windows.Forms;

namespace Gs.DevApp.DevFrm
@@ -20,8 +22,6 @@
            InitializeComponent();
            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            //toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
            //toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
@@ -42,21 +42,20 @@
            //设置仓库选择
            this.txt_depotsId.EditChanged += (s, e) =>
            {
                txtDepotsId.Text = this.txt_depotsId.GetId();
                txtDepotsId.Text = this.txt_depotsId.GetCode();
            };
            //设置供应商选择
            this.txt_suppId.EditChanged += (s, e) =>
            {
                txtSupplierId.Text = this.txt_suppId.GetId();
                txtSupplierId.Text = this.txt_suppId.GetCode();
            };
            gcMx1.MouseClick += GcMx1_MouseClick;
          
            this.ucBtnPrint1.btnDesignClick += (s, e) =>
            {
                ucBtnPrint1.rptParameter = "rpt_Arrival{}";
            };
            this.ucBtnPrint1.btnReportClick += (s, e) =>
            {
                ucBtnPrint1.guidKey = "";
                string rowGuid = lbMxGuid.Text.Trim();
                ucBtnPrint1.guidKey = rowGuid;
                if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
@@ -86,6 +85,7 @@
                       + "," + txt_psnQty_1.Text.Trim()
                       + "}";
            };
            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
@@ -93,23 +93,20 @@
            Task.Delay(100);
            getPageList(1);
        }
        private void GcMx1_MouseClick(object sender, MouseEventArgs e)
        private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
        {
            string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gvMx1, e, "guid");
            if (string.IsNullOrEmpty(rowGuid))
                return;
            lbMxGuid.Text = rowGuid;
            toolBarMenu1.guidKey = rowGuid;
            var info = gvMx1.CalcHitInfo(e.Location);
            var view = info.View;
            var row = view.GetDataRow(info.RowHandle);
            txtWlid.Text = row["itemId"].ToString();
            txtWlgg.Text = row["itemModel"].ToString();
            txtWlmc.Text = row["itemName"].ToString();
            txtQuantity.Text = row["Quantity"].ToString();
            kyPrtQty.Text = row["kyPrtQty"].ToString();
            if (e.FocusedRowHandle >= 0)
            {
                DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
                lbMxGuid.Text = row["guid"].ToString();
                txtWlid.Text = row["itemNo"].ToString();
                txtWlgg.Text = row["itemModel"].ToString();
                txtWlmc.Text = row["itemName"].ToString();
                txtQuantity.Text = row["quantity"].ToString();//本次收货总量
                txtYdy.Text = row["yQty"].ToString();//已打印总量
                txtKdy.Text = row["kQty"].ToString(); //可打印总量
            }
        }

        /// <summary>
        /// 分页事件
        /// </summary>
@@ -142,19 +139,6 @@
        {
            _filterList = e.FilterList;
            getPageList(1);
        }
        private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_billNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
            toolBarMenu1.rptParameter = "rpt_Arrival{}";
        }
        private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
        {
            _print();
        }

        /// <summary>
@@ -223,6 +207,7 @@
        }
        private void getModel(string strGuid)
        {
            gcMx1.DataSource = null;
            bool isEdit = false;
            if (toolBarMenu1.currentAction == "add") return;
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
@@ -252,6 +237,7 @@
                    {
                        array1.Add(a);
                    }
                   
                    DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
                    if (dt1.Rows.Count > 0)
                    {
@@ -287,47 +273,6 @@
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
            }
        }
        private void _print()
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_billNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
            if (xtraTabControl1.SelectedTabPageIndex == 0)
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 5);
                this.toolBarMenu1.rptParameter = "return false";
                return;
            }
            if (lbMxGuid.Text.Trim().Length < 36)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择你要打印的行！");
                this.toolBarMenu1.rptParameter = "return false";
                return;
            }
            if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码张数！");
                txt_iCount_1.Focus();
                this.toolBarMenu1.rptParameter = "return false";
                return;
            }
            if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码数量！");
                txt_psnQty_1.Focus();
                this.toolBarMenu1.rptParameter = "return false";
                return;
            }
            toolBarMenu1.guidKey = lbMxGuid.Text;
            this.toolBarMenu1.rptParameter = "rpt_Arrival{" + ""
                   + "," + ""
                   + "," + ""
                   + "," + txt_iCount_1.Text.Trim()
                   + "," + txt_psnQty_1.Text.Trim()
                   + "}";
        }
    }
}