From 769b5a6f9c67bab1982f935b54dc0f26e7606972 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 10 四月 2025 12:12:55 +0800
Subject: [PATCH] 状态
---
DevApp/Gs.DevApp/UserControl/ShowLogcs.cs | 31
DevApp/Gs.DevApp/UserControl/UCUpFileList.cs | 17
DevApp/Gs.DevApp/UserControl/UCUpFile.cs | 21
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 1
DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs | 21
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs | 12
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 15
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 228 ++++----
DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.Designer.cs | 882 +++++++++++++++++++--------------
DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.cs | 111 ++--
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | 124 +---
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 43 +
12 files changed, 805 insertions(+), 701 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.Designer.cs
index 5f45c85..e65b3c4 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.Designer.cs
@@ -39,13 +39,14 @@
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -93,9 +94,7 @@
this.txt_gysName = new DevExpress.XtraEditors.TextEdit();
this.txt_qty = new DevExpress.XtraEditors.TextEdit();
this.txt_chooseQty = new DevExpress.XtraEditors.TextEdit();
- this.txt_handSuggestion = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_chooseType = new DevExpress.XtraEditors.TextEdit();
- this.txt_handResult = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
@@ -105,34 +104,19 @@
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
this.grpTopMx2 = new System.Windows.Forms.GroupBox();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
this.xtraTabPage6 = new DevExpress.XtraTab.XtraTabPage();
+ this.ucUpFileList1 = new Gs.DevApp.UserControl.UCUpFileList();
this.xtraTabPage7 = new DevExpress.XtraTab.XtraTabPage();
+ this.ucUpFileList2 = new Gs.DevApp.UserControl.UCUpFileList();
this.panTopMx2 = new System.Windows.Forms.Panel();
this.ucLookStaff4 = new Gs.DevApp.UserControl.UcLookStaff();
this.label2 = new System.Windows.Forms.Label();
@@ -162,6 +146,33 @@
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.textEdit3 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.textEdit4 = new DevExpress.XtraEditors.TextEdit();
+ this.textEdit5 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.textEdit6 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -202,9 +213,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chooseQty.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_handSuggestion.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chooseType.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_handResult.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
@@ -214,30 +223,15 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
this.grpTopMx2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
+ this.xtraTabPage6.SuspendLayout();
+ this.xtraTabPage7.SuspendLayout();
this.panTopMx2.SuspendLayout();
this.grpTopMx3.SuspendLayout();
this.panTopMx3.SuspendLayout();
@@ -263,6 +257,33 @@
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit3.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit6.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -632,7 +653,7 @@
this.splitTopMx1.Panel2.Controls.Add(this.grpTopMx2);
this.splitTopMx1.Panel2.Text = "Panel2";
this.splitTopMx1.Size = new System.Drawing.Size(1126, 456);
- this.splitTopMx1.SplitterPosition = 212;
+ this.splitTopMx1.SplitterPosition = 254;
this.splitTopMx1.TabIndex = 3;
//
// grpTopMx1
@@ -642,7 +663,7 @@
this.grpTopMx1.ForeColor = System.Drawing.Color.Blue;
this.grpTopMx1.Location = new System.Drawing.Point(0, 0);
this.grpTopMx1.Name = "grpTopMx1";
- this.grpTopMx1.Size = new System.Drawing.Size(1126, 212);
+ this.grpTopMx1.Size = new System.Drawing.Size(1126, 254);
this.grpTopMx1.TabIndex = 2;
this.grpTopMx1.TabStop = false;
this.grpTopMx1.Text = "闂鎻忚堪";
@@ -654,7 +675,7 @@
this.panTopMx1.ForeColor = System.Drawing.Color.Black;
this.panTopMx1.Location = new System.Drawing.Point(3, 22);
this.panTopMx1.Name = "panTopMx1";
- this.panTopMx1.Size = new System.Drawing.Size(1120, 187);
+ this.panTopMx1.Size = new System.Drawing.Size(1120, 229);
this.panTopMx1.TabIndex = 0;
//
// layoutMx1
@@ -673,15 +694,19 @@
this.layoutMx1.Controls.Add(this.txt_gysName);
this.layoutMx1.Controls.Add(this.txt_qty);
this.layoutMx1.Controls.Add(this.txt_chooseQty);
- this.layoutMx1.Controls.Add(this.txt_handSuggestion);
this.layoutMx1.Controls.Add(this.txt_chooseType);
- this.layoutMx1.Controls.Add(this.txt_handResult);
this.layoutMx1.Controls.Add(this.txt_createBy);
this.layoutMx1.Controls.Add(this.txt_createDate);
this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Controls.Add(this.txt_fBillNo);
this.layoutMx1.Controls.Add(this.txt_chooseGoodQty);
this.layoutMx1.Controls.Add(this.txt_chooseBadQty);
+ this.layoutMx1.Controls.Add(this.textEdit1);
+ this.layoutMx1.Controls.Add(this.textEdit2);
+ this.layoutMx1.Controls.Add(this.textEdit3);
+ this.layoutMx1.Controls.Add(this.textEdit4);
+ this.layoutMx1.Controls.Add(this.textEdit5);
+ this.layoutMx1.Controls.Add(this.textEdit6);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem9,
@@ -690,7 +715,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(706, 510, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1120, 187);
+ this.layoutMx1.Size = new System.Drawing.Size(1120, 229);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -705,163 +730,135 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(114, 152);
+ this.txt_remark.Location = new System.Drawing.Point(99, 161);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(433, 24);
+ this.txt_remark.Size = new System.Drawing.Size(459, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 240;
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(923, 12);
+ this.txt_checkUser.Location = new System.Drawing.Point(924, 71);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(164, 24);
+ this.txt_checkUser.Size = new System.Drawing.Size(184, 24);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 273;
this.txt_checkUser.Tag = "readonly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(923, 40);
+ this.txt_checkDate.Location = new System.Drawing.Point(924, 101);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(164, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(184, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 267;
this.txt_checkDate.Tag = "readonly";
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(821, 68);
+ this.txt_chkStatus.Location = new System.Drawing.Point(837, 131);
this.txt_chkStatus.Name = "txt_chkStatus";
this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_chkStatus.Size = new System.Drawing.Size(266, 24);
+ this.txt_chkStatus.Size = new System.Drawing.Size(271, 24);
this.txt_chkStatus.StyleController = this.layoutMx1;
this.txt_chkStatus.TabIndex = 461;
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(383, 12);
+ this.txt_fType.Location = new System.Drawing.Point(374, 12);
this.txt_fType.Name = "txt_fType";
- this.txt_fType.Size = new System.Drawing.Size(164, 24);
+ this.txt_fType.Size = new System.Drawing.Size(184, 24);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 462;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(114, 40);
+ this.txt_itemNo.Location = new System.Drawing.Point(649, 12);
this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Size = new System.Drawing.Size(163, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(184, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 464;
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(383, 40);
+ this.txt_itemName.Location = new System.Drawing.Point(649, 41);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(164, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(184, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 465;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(653, 40);
+ this.txt_itemModel.Location = new System.Drawing.Point(649, 71);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(164, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(184, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 466;
//
// txt_dhdNo
//
- this.txt_dhdNo.Location = new System.Drawing.Point(653, 12);
+ this.txt_dhdNo.Location = new System.Drawing.Point(99, 101);
this.txt_dhdNo.Name = "txt_dhdNo";
- this.txt_dhdNo.Size = new System.Drawing.Size(164, 24);
+ this.txt_dhdNo.Size = new System.Drawing.Size(184, 24);
this.txt_dhdNo.StyleController = this.layoutMx1;
this.txt_dhdNo.TabIndex = 467;
//
// txt_gysNo
//
- this.txt_gysNo.Location = new System.Drawing.Point(653, 68);
+ this.txt_gysNo.Location = new System.Drawing.Point(924, 161);
this.txt_gysNo.Name = "txt_gysNo";
- this.txt_gysNo.Size = new System.Drawing.Size(164, 24);
+ this.txt_gysNo.Size = new System.Drawing.Size(184, 24);
this.txt_gysNo.StyleController = this.layoutMx1;
this.txt_gysNo.TabIndex = 468;
//
// txt_gysName
//
- this.txt_gysName.Location = new System.Drawing.Point(653, 96);
+ this.txt_gysName.Location = new System.Drawing.Point(374, 101);
this.txt_gysName.Name = "txt_gysName";
- this.txt_gysName.Size = new System.Drawing.Size(164, 24);
+ this.txt_gysName.Size = new System.Drawing.Size(184, 24);
this.txt_gysName.StyleController = this.layoutMx1;
this.txt_gysName.TabIndex = 469;
//
// txt_qty
//
- this.txt_qty.Location = new System.Drawing.Point(114, 68);
+ this.txt_qty.Location = new System.Drawing.Point(374, 71);
this.txt_qty.Name = "txt_qty";
- this.txt_qty.Size = new System.Drawing.Size(163, 24);
+ this.txt_qty.Size = new System.Drawing.Size(184, 24);
this.txt_qty.StyleController = this.layoutMx1;
this.txt_qty.TabIndex = 470;
//
// txt_chooseQty
//
- this.txt_chooseQty.Location = new System.Drawing.Point(114, 96);
+ this.txt_chooseQty.Location = new System.Drawing.Point(99, 71);
this.txt_chooseQty.Name = "txt_chooseQty";
- this.txt_chooseQty.Size = new System.Drawing.Size(163, 24);
+ this.txt_chooseQty.Size = new System.Drawing.Size(184, 24);
this.txt_chooseQty.StyleController = this.layoutMx1;
this.txt_chooseQty.TabIndex = 471;
//
- // txt_handSuggestion
- //
- this.txt_handSuggestion.Location = new System.Drawing.Point(383, 68);
- this.txt_handSuggestion.Name = "txt_handSuggestion";
- this.txt_handSuggestion.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_handSuggestion.Properties.Items.AddRange(new object[] {
- "-璇烽�夋嫨-",
- "鍔犱弗",
- "鏀惧"});
- this.txt_handSuggestion.Size = new System.Drawing.Size(164, 24);
- this.txt_handSuggestion.StyleController = this.layoutMx1;
- this.txt_handSuggestion.TabIndex = 472;
- //
// txt_chooseType
//
- this.txt_chooseType.Location = new System.Drawing.Point(383, 96);
+ this.txt_chooseType.Location = new System.Drawing.Point(99, 191);
this.txt_chooseType.Name = "txt_chooseType";
- this.txt_chooseType.Size = new System.Drawing.Size(164, 24);
+ this.txt_chooseType.Size = new System.Drawing.Size(184, 24);
this.txt_chooseType.StyleController = this.layoutMx1;
this.txt_chooseType.TabIndex = 473;
//
- // txt_handResult
- //
- this.txt_handResult.Location = new System.Drawing.Point(653, 124);
- this.txt_handResult.Name = "txt_handResult";
- this.txt_handResult.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_handResult.Properties.Items.AddRange(new object[] {
- "-璇烽�夋嫨-",
- "OK",
- "NG"});
- this.txt_handResult.Size = new System.Drawing.Size(164, 24);
- this.txt_handResult.StyleController = this.layoutMx1;
- this.txt_handResult.TabIndex = 474;
- //
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(923, 96);
+ this.txt_createBy.Location = new System.Drawing.Point(924, 12);
this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(164, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(184, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 475;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(923, 124);
+ this.txt_createDate.Location = new System.Drawing.Point(924, 41);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(164, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(184, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 476;
//
@@ -875,25 +872,25 @@
//
// txt_fBillNo
//
- this.txt_fBillNo.Location = new System.Drawing.Point(114, 12);
+ this.txt_fBillNo.Location = new System.Drawing.Point(99, 12);
this.txt_fBillNo.Name = "txt_fBillNo";
- this.txt_fBillNo.Size = new System.Drawing.Size(163, 24);
+ this.txt_fBillNo.Size = new System.Drawing.Size(184, 24);
this.txt_fBillNo.StyleController = this.layoutMx1;
this.txt_fBillNo.TabIndex = 478;
//
// txt_chooseGoodQty
//
- this.txt_chooseGoodQty.Location = new System.Drawing.Point(114, 124);
+ this.txt_chooseGoodQty.Location = new System.Drawing.Point(99, 131);
this.txt_chooseGoodQty.Name = "txt_chooseGoodQty";
- this.txt_chooseGoodQty.Size = new System.Drawing.Size(163, 24);
+ this.txt_chooseGoodQty.Size = new System.Drawing.Size(184, 24);
this.txt_chooseGoodQty.StyleController = this.layoutMx1;
this.txt_chooseGoodQty.TabIndex = 479;
//
// txt_chooseBadQty
//
- this.txt_chooseBadQty.Location = new System.Drawing.Point(383, 124);
+ this.txt_chooseBadQty.Location = new System.Drawing.Point(649, 101);
this.txt_chooseBadQty.Name = "txt_chooseBadQty";
- this.txt_chooseBadQty.Size = new System.Drawing.Size(164, 24);
+ this.txt_chooseBadQty.Size = new System.Drawing.Size(184, 24);
this.txt_chooseBadQty.StyleController = this.layoutMx1;
this.txt_chooseBadQty.TabIndex = 480;
//
@@ -925,27 +922,31 @@
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem5,
this.layoutControlItem1,
- this.layoutControlItem11,
- this.layoutControlItem12,
- this.layoutControlItem13,
- this.layoutControlItem15,
- this.layoutControlItem16,
- this.layoutControlItem17,
- this.layoutControlItem18,
- this.layoutControlItem19,
- this.layoutControlItem20,
- this.layoutControlItem21,
- this.layoutControlItem6,
- this.layoutControlItem3,
- this.layoutControlItem14,
- this.layoutControlItem22,
- this.layoutControlItem23,
this.layoutControlItem2,
this.layoutControlItem7,
this.layoutControlItem25,
- this.layoutControlItem26});
+ this.layoutControlItem22,
+ this.layoutControlItem23,
+ this.layoutControlItem6,
+ this.layoutControlItem5,
+ this.layoutControlItem3,
+ this.layoutControlItem17,
+ this.layoutControlItem18,
+ this.layoutControlItem15,
+ this.layoutControlItem14,
+ this.layoutControlItem16,
+ this.layoutControlItem26,
+ this.layoutControlItem34,
+ this.layoutControlItem35,
+ this.layoutControlItem19,
+ this.layoutControlItem36,
+ this.layoutControlItem37,
+ this.layoutControlItem21,
+ this.layoutControlItem11,
+ this.layoutControlItem12,
+ this.layoutControlItem13,
+ this.layoutControlItem20});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -973,238 +974,58 @@
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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
rowDefinition3,
rowDefinition4,
rowDefinition5,
- rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1099, 188);
+ rowDefinition6,
+ rowDefinition7});
+ this.Root.Size = new System.Drawing.Size(1120, 229);
this.Root.TextVisible = false;
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_checkUser;
- this.layoutControlItem5.Location = new System.Drawing.Point(809, 0);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem5.Size = new System.Drawing.Size(270, 28);
- this.layoutControlItem5.Text = "瀹℃牳浜�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_fType;
- this.layoutControlItem1.Location = new System.Drawing.Point(269, 0);
+ this.layoutControlItem1.Location = new System.Drawing.Point(275, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(270, 28);
- this.layoutControlItem1.Text = "寮傚父绫诲瀷";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_itemNo;
- this.layoutControlItem11.Location = new System.Drawing.Point(0, 28);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(269, 28);
- this.layoutControlItem11.Text = "鐗╂枡缂栧彿";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_itemName;
- this.layoutControlItem12.Location = new System.Drawing.Point(269, 28);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(270, 28);
- this.layoutControlItem12.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_itemModel;
- this.layoutControlItem13.Location = new System.Drawing.Point(539, 28);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem13.Size = new System.Drawing.Size(270, 28);
- this.layoutControlItem13.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_gysNo;
- this.layoutControlItem15.Location = new System.Drawing.Point(539, 56);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(270, 28);
- this.layoutControlItem15.Text = "渚涘簲鍟嗙紪鍙�";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_gysName;
- this.layoutControlItem16.Location = new System.Drawing.Point(539, 84);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(270, 28);
- this.layoutControlItem16.Text = "渚涘簲鍟嗗悕绉�";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_qty;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 56);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(269, 28);
- this.layoutControlItem17.Text = "鏉ユ枡鏁伴噺";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem18
- //
- this.layoutControlItem18.Control = this.txt_chooseQty;
- this.layoutControlItem18.Location = new System.Drawing.Point(0, 84);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(269, 28);
- this.layoutControlItem18.Text = "閫夊埆鏁伴噺";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem19
- //
- this.layoutControlItem19.Control = this.txt_handSuggestion;
- this.layoutControlItem19.Location = new System.Drawing.Point(269, 56);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem19.Size = new System.Drawing.Size(270, 28);
- this.layoutControlItem19.Text = "澶勭疆鎰忚";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem20
- //
- this.layoutControlItem20.Control = this.txt_chooseType;
- this.layoutControlItem20.Location = new System.Drawing.Point(269, 84);
- this.layoutControlItem20.Name = "layoutControlItem20";
- this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(270, 28);
- this.layoutControlItem20.Text = "閫夊埆绫诲埆";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem21
- //
- this.layoutControlItem21.Control = this.txt_handResult;
- this.layoutControlItem21.Location = new System.Drawing.Point(539, 112);
- this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem21.Size = new System.Drawing.Size(270, 28);
- this.layoutControlItem21.Text = "鍒ゅ畾";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_chkStatus;
- this.layoutControlItem6.Location = new System.Drawing.Point(809, 56);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(270, 28);
- this.layoutControlItem6.Text = "瀹℃牳鐘舵��";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem6.TextVisible = false;
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_checkDate;
- this.layoutControlItem3.Location = new System.Drawing.Point(809, 28);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(270, 28);
- this.layoutControlItem3.Text = "瀹℃牳鏃ユ湡 ";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_dhdNo;
- this.layoutControlItem14.Location = new System.Drawing.Point(539, 0);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(270, 28);
- this.layoutControlItem14.Text = "鍒拌揣鍗曞彿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem22
- //
- this.layoutControlItem22.Control = this.txt_createBy;
- this.layoutControlItem22.Location = new System.Drawing.Point(809, 84);
- this.layoutControlItem22.Name = "layoutControlItem22";
- this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem22.Size = new System.Drawing.Size(270, 28);
- this.layoutControlItem22.Text = "鍒涘缓浜�";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem23
- //
- this.layoutControlItem23.Control = this.txt_createDate;
- this.layoutControlItem23.Location = new System.Drawing.Point(809, 112);
- this.layoutControlItem23.Name = "layoutControlItem23";
- this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem23.Size = new System.Drawing.Size(270, 28);
- this.layoutControlItem23.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem1.Size = new System.Drawing.Size(275, 29);
+ this.layoutControlItem1.Text = "闂鏉ユ簮";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fBillNo;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(269, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(275, 29);
this.layoutControlItem2.Text = "鍗曟嵁缂栧彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_remark;
- this.layoutControlItem7.Location = new System.Drawing.Point(0, 140);
+ this.layoutControlItem7.Location = new System.Drawing.Point(0, 149);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem7.Size = new System.Drawing.Size(539, 28);
- this.layoutControlItem7.Text = "寮傚父澶囨敞";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem7.Size = new System.Drawing.Size(550, 30);
+ this.layoutControlItem7.Text = "涓嶈壇鍘熷洜";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_chooseGoodQty;
- this.layoutControlItem25.Location = new System.Drawing.Point(0, 112);
+ this.layoutControlItem25.Location = new System.Drawing.Point(0, 119);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem25.Size = new System.Drawing.Size(269, 28);
- this.layoutControlItem25.Text = "閫夊埆鑹搧鏁�";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem26
- //
- this.layoutControlItem26.Control = this.txt_chooseBadQty;
- this.layoutControlItem26.Location = new System.Drawing.Point(269, 112);
- this.layoutControlItem26.Name = "layoutControlItem26";
- this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem26.Size = new System.Drawing.Size(270, 28);
- this.layoutControlItem26.Text = "閫夊埆涓嶈壇鍝佹暟";
- this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem25.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem25.Text = "闂绛夌骇";
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
//
// grpTopMx2
//
@@ -1214,7 +1035,7 @@
this.grpTopMx2.ForeColor = System.Drawing.Color.Blue;
this.grpTopMx2.Location = new System.Drawing.Point(0, 0);
this.grpTopMx2.Name = "grpTopMx2";
- this.grpTopMx2.Size = new System.Drawing.Size(1126, 232);
+ this.grpTopMx2.Size = new System.Drawing.Size(1126, 190);
this.grpTopMx2.TabIndex = 3;
this.grpTopMx2.TabStop = false;
this.grpTopMx2.Text = "瀵圭瓥缁撴灉";
@@ -1225,7 +1046,7 @@
this.xtraTabControl2.Location = new System.Drawing.Point(3, 67);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.xtraTabPage3;
- this.xtraTabControl2.Size = new System.Drawing.Size(1120, 162);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1120, 120);
this.xtraTabControl2.TabIndex = 0;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage3,
@@ -1237,7 +1058,7 @@
// xtraTabPage3
//
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1118, 130);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1118, 88);
this.xtraTabPage3.Text = "杩濊鍘熷洜";
//
// xtraTabPage4
@@ -1254,15 +1075,37 @@
//
// xtraTabPage6
//
+ this.xtraTabPage6.Controls.Add(this.ucUpFileList1);
this.xtraTabPage6.Name = "xtraTabPage6";
this.xtraTabPage6.Size = new System.Drawing.Size(1118, 130);
this.xtraTabPage6.Text = "闂鍥剧墖";
//
+ // ucUpFileList1
+ //
+ this.ucUpFileList1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.ucUpFileList1.Location = new System.Drawing.Point(0, 0);
+ this.ucUpFileList1.Name = "ucUpFileList1";
+ this.ucUpFileList1.parentGroup = null;
+ this.ucUpFileList1.pGuid = null;
+ this.ucUpFileList1.Size = new System.Drawing.Size(1118, 130);
+ this.ucUpFileList1.TabIndex = 0;
+ //
// xtraTabPage7
//
+ this.xtraTabPage7.Controls.Add(this.ucUpFileList2);
this.xtraTabPage7.Name = "xtraTabPage7";
this.xtraTabPage7.Size = new System.Drawing.Size(1118, 130);
this.xtraTabPage7.Text = "鏀瑰杽鍥剧墖";
+ //
+ // ucUpFileList2
+ //
+ this.ucUpFileList2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.ucUpFileList2.Location = new System.Drawing.Point(0, 0);
+ this.ucUpFileList2.Name = "ucUpFileList2";
+ this.ucUpFileList2.parentGroup = null;
+ this.ucUpFileList2.pGuid = null;
+ this.ucUpFileList2.Size = new System.Drawing.Size(1118, 130);
+ this.ucUpFileList2.TabIndex = 0;
//
// panTopMx2
//
@@ -1459,13 +1302,13 @@
columnDefinition7,
columnDefinition8,
columnDefinition9});
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition8.Height = 100D;
rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition7,
- rowDefinition8});
+ rowDefinition8,
+ rowDefinition9});
this.layoutControlGroup1.Size = new System.Drawing.Size(1120, 77);
this.layoutControlGroup1.TextVisible = false;
//
@@ -1578,6 +1421,281 @@
this.layoutControlItem10.Size = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextSize = new System.Drawing.Size(50, 20);
//
+ // layoutControlItem22
+ //
+ this.layoutControlItem22.Control = this.txt_createBy;
+ this.layoutControlItem22.Location = new System.Drawing.Point(825, 0);
+ this.layoutControlItem22.Name = "layoutControlItem22";
+ this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem22.Size = new System.Drawing.Size(275, 29);
+ this.layoutControlItem22.Text = "鍒涘缓浜�";
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem23
+ //
+ this.layoutControlItem23.Control = this.txt_createDate;
+ this.layoutControlItem23.Location = new System.Drawing.Point(825, 29);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem23.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem23.Text = "鍒涘缓鏃堕棿";
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_chkStatus;
+ this.layoutControlItem6.Location = new System.Drawing.Point(825, 119);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem6.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem6.Text = "瀹℃牳鐘舵��";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem6.TextVisible = false;
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_checkUser;
+ this.layoutControlItem5.Location = new System.Drawing.Point(825, 59);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem5.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem5.Text = "瀹℃牳浜�";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_checkDate;
+ this.layoutControlItem3.Location = new System.Drawing.Point(825, 89);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem3.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem3.Text = "瀹℃牳鏃ユ湡 ";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_qty;
+ this.layoutControlItem17.Location = new System.Drawing.Point(275, 59);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem17.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem17.Text = "璐ｄ换閮ㄩ棬";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txt_chooseQty;
+ this.layoutControlItem18.Location = new System.Drawing.Point(0, 59);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem18.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem18.Text = "璐ｄ换浜�";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_gysNo;
+ this.layoutControlItem15.Location = new System.Drawing.Point(825, 149);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem15.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem15.Text = "渚涘簲鍟嗙紪鍙�";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_dhdNo;
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 89);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem14.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem14.Text = "鐢熶骇绾垮埆";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_gysName;
+ this.layoutControlItem16.Location = new System.Drawing.Point(275, 89);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem16.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem16.Text = "宸ヤ綅";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem26
+ //
+ this.layoutControlItem26.Control = this.txt_chooseBadQty;
+ this.layoutControlItem26.Location = new System.Drawing.Point(550, 89);
+ this.layoutControlItem26.Name = "layoutControlItem26";
+ this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem26.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem26.Text = "宸ュ簭";
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // textEdit1
+ //
+ this.textEdit1.Location = new System.Drawing.Point(374, 131);
+ this.textEdit1.Name = "textEdit1";
+ this.textEdit1.Size = new System.Drawing.Size(184, 24);
+ this.textEdit1.StyleController = this.layoutMx1;
+ this.textEdit1.TabIndex = 481;
+ //
+ // layoutControlItem34
+ //
+ this.layoutControlItem34.Control = this.textEdit1;
+ this.layoutControlItem34.Location = new System.Drawing.Point(275, 119);
+ this.layoutControlItem34.Name = "layoutControlItem34";
+ this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem34.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem34.Text = "涓嶈壇鏁�";
+ this.layoutControlItem34.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // textEdit2
+ //
+ this.textEdit2.Location = new System.Drawing.Point(649, 161);
+ this.textEdit2.Name = "textEdit2";
+ this.textEdit2.Size = new System.Drawing.Size(184, 24);
+ this.textEdit2.StyleController = this.layoutMx1;
+ this.textEdit2.TabIndex = 482;
+ //
+ // layoutControlItem35
+ //
+ this.layoutControlItem35.Control = this.textEdit2;
+ this.layoutControlItem35.Location = new System.Drawing.Point(550, 149);
+ this.layoutControlItem35.Name = "layoutControlItem35";
+ this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem35.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem35.Text = "涓嶈壇鍘熷洜";
+ this.layoutControlItem35.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // textEdit3
+ //
+ this.textEdit3.Location = new System.Drawing.Point(649, 131);
+ this.textEdit3.Name = "textEdit3";
+ this.textEdit3.Size = new System.Drawing.Size(184, 24);
+ this.textEdit3.StyleController = this.layoutMx1;
+ this.textEdit3.TabIndex = 483;
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.textEdit3;
+ this.layoutControlItem19.Location = new System.Drawing.Point(550, 119);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem19.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem19.Text = "涓嶈壇鏁�";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // textEdit4
+ //
+ this.textEdit4.Location = new System.Drawing.Point(924, 191);
+ this.textEdit4.Name = "textEdit4";
+ this.textEdit4.Size = new System.Drawing.Size(184, 24);
+ this.textEdit4.StyleController = this.layoutMx1;
+ this.textEdit4.TabIndex = 484;
+ //
+ // textEdit5
+ //
+ this.textEdit5.Location = new System.Drawing.Point(374, 191);
+ this.textEdit5.Name = "textEdit5";
+ this.textEdit5.Size = new System.Drawing.Size(184, 24);
+ this.textEdit5.StyleController = this.layoutMx1;
+ this.textEdit5.TabIndex = 485;
+ //
+ // layoutControlItem36
+ //
+ this.layoutControlItem36.Control = this.textEdit5;
+ this.layoutControlItem36.Location = new System.Drawing.Point(275, 179);
+ this.layoutControlItem36.Name = "layoutControlItem36";
+ this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem36.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem36.Text = "妫�楠屼汉";
+ this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // textEdit6
+ //
+ this.textEdit6.Location = new System.Drawing.Point(649, 191);
+ this.textEdit6.Name = "textEdit6";
+ this.textEdit6.Size = new System.Drawing.Size(184, 24);
+ this.textEdit6.StyleController = this.layoutMx1;
+ this.textEdit6.TabIndex = 486;
+ //
+ // layoutControlItem37
+ //
+ this.layoutControlItem37.Control = this.textEdit6;
+ this.layoutControlItem37.Location = new System.Drawing.Point(550, 179);
+ this.layoutControlItem37.Name = "layoutControlItem37";
+ this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem37.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem37.Text = "妫�楠屾棩鏈�";
+ this.layoutControlItem37.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem21
+ //
+ this.layoutControlItem21.Control = this.textEdit4;
+ this.layoutControlItem21.Location = new System.Drawing.Point(825, 179);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem21.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem21.Text = "杩濊绫诲埆";
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_itemNo;
+ this.layoutControlItem11.Location = new System.Drawing.Point(550, 0);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(275, 29);
+ this.layoutControlItem11.Text = "浜у搧缂栫爜";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_itemName;
+ this.layoutControlItem12.Location = new System.Drawing.Point(550, 29);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem12.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem12.Text = "浜у搧鍚嶇О";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_itemModel;
+ this.layoutControlItem13.Location = new System.Drawing.Point(550, 59);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem13.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem13.Text = "浜у搧瑙勬牸";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.txt_chooseType;
+ this.layoutControlItem20.Location = new System.Drawing.Point(0, 179);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem20.Size = new System.Drawing.Size(275, 30);
+ this.layoutControlItem20.Text = "閫夊埆绫诲埆";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18);
+ //
// MesFqcExceptional
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1628,9 +1746,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chooseQty.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_handSuggestion.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chooseType.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_handResult.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
@@ -1640,30 +1756,15 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
this.grpTopMx2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
+ this.xtraTabPage6.ResumeLayout(false);
+ this.xtraTabPage7.ResumeLayout(false);
this.panTopMx2.ResumeLayout(false);
this.panTopMx2.PerformLayout();
this.grpTopMx3.ResumeLayout(false);
@@ -1690,6 +1791,33 @@
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit3.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit6.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
this.ResumeLayout(false);
}
@@ -1750,9 +1878,7 @@
private DevExpress.XtraEditors.TextEdit txt_gysName;
private DevExpress.XtraEditors.TextEdit txt_qty;
private DevExpress.XtraEditors.TextEdit txt_chooseQty;
- private DevExpress.XtraEditors.ComboBoxEdit txt_handSuggestion;
private DevExpress.XtraEditors.TextEdit txt_chooseType;
- private DevExpress.XtraEditors.ComboBoxEdit txt_handResult;
private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.TextEdit txt_createDate;
private DevExpress.XtraEditors.TextEdit txt_guid;
@@ -1762,27 +1888,10 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
private System.Windows.Forms.GroupBox grpTopMx3;
private DevExpress.XtraEditors.SplitContainerControl splitTopMx1;
private System.Windows.Forms.Panel panTopMx1;
@@ -1810,5 +1919,34 @@
private System.Windows.Forms.Label label2;
private UserControl.UcLookStaff ucLookStaff3;
private System.Windows.Forms.Label label1;
+ private UserControl.UCUpFileList ucUpFileList1;
+ private UserControl.UCUpFileList ucUpFileList2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraEditors.TextEdit textEdit1;
+ private DevExpress.XtraEditors.TextEdit textEdit2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
+ private DevExpress.XtraEditors.TextEdit textEdit3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraEditors.TextEdit textEdit4;
+ private DevExpress.XtraEditors.TextEdit textEdit5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
+ private DevExpress.XtraEditors.TextEdit textEdit6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.cs b/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.cs
index dfe64d0..6ed8353 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/MesFqcExceptional.cs
@@ -2,7 +2,6 @@
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
@@ -24,7 +23,7 @@
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
this.toolBarMenu1.getXmlConfig();
- // Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ // Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -137,7 +136,6 @@
}
-
/// <summary>
///
/// </summary>
@@ -184,57 +182,64 @@
}
private void getModel(string strGuid)
{
- // bool isEdit = false;
- // if (toolBarMenu1.currentAction == "add") return;
- // if (toolBarMenu1.currentAction == "edit") isEdit = true;
- // if (string.IsNullOrEmpty(strGuid))
- // {
- // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- // return;
- // }
- // 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;
- // lbGuid.Text = strGuid;
- // List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- // gvList.Add(gvMx1);
- // UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
- // JObject _job = JObject.Parse(strJson);
- // JArray array = new JArray();
- // foreach (var a in _job["rtnData"]["list"])
- // {
- // array.Add(a);
- // }
- // DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
- // if (dt.Rows.Count > 0)
- // {
- // gcMx1.BindingContext = new BindingContext();
- // gcMx1.DataSource = dt;
- // gcMx1.ForceInitialize();
- // gvMx1.BestFitColumns();
- // }
- // else
- // {
- // Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
- // }
- // }
- // else
- // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- // }
- // catch (Exception ex)
- // {
- // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- // }
+ ucUpFileList1.parentGroup = "闂鍥剧墖";
+ ucUpFileList1.pGuid= strGuid;
+ ucUpFileList1.getFileList();
+ ucUpFileList2.parentGroup = "鏀瑰杽鍥剧墖";
+ ucUpFileList2.pGuid = strGuid;
+ ucUpFileList2.getFileList();
+
+ // bool isEdit = false;
+ // if (toolBarMenu1.currentAction == "add") return;
+ // if (toolBarMenu1.currentAction == "edit") isEdit = true;
+ // if (string.IsNullOrEmpty(strGuid))
+ // {
+ // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ // return;
+ // }
+ // 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;
+ // lbGuid.Text = strGuid;
+ // List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ // gvList.Add(gvMx1);
+ // UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+ // JObject _job = JObject.Parse(strJson);
+ // JArray array = new JArray();
+ // foreach (var a in _job["rtnData"]["list"])
+ // {
+ // array.Add(a);
+ // }
+ // DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ // if (dt.Rows.Count > 0)
+ // {
+ // gcMx1.BindingContext = new BindingContext();
+ // gcMx1.DataSource = dt;
+ // gcMx1.ForceInitialize();
+ // gvMx1.BestFitColumns();
+ // }
+ // else
+ // {
+ // Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ // }
+ // }
+ // else
+ // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ // }
+ // catch (Exception ex)
+ // {
+ // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ // }
}
-
+
/// <summary>
/// 宸ュ叿鏉′簨浠�
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index eba22bf..dd3b61b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -30,25 +30,25 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.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.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition26 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition27 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition28 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition29 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition30 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions11 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject41 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject42 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject43 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject44 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions12 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject45 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject46 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject47 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject48 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -126,16 +126,16 @@
this.gvMx1ebeln = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1ebelnQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1subQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1ebelnQty = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1okRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -771,35 +771,35 @@
this.lab_paperBillNo});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition21.Width = 100D;
+ columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition22.Width = 100D;
+ columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition23.Width = 100D;
+ columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition24.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition21,
+ columnDefinition22,
+ columnDefinition23,
+ columnDefinition24});
+ rowDefinition26.Height = 100D;
+ rowDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition27.Height = 100D;
+ rowDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition28.Height = 100D;
+ rowDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition29.Height = 100D;
+ rowDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition30.Height = 100D;
+ rowDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5});
+ rowDefinition26,
+ rowDefinition27,
+ rowDefinition28,
+ rowDefinition29,
+ rowDefinition30});
this.Root.Size = new System.Drawing.Size(1231, 175);
this.Root.TextVisible = false;
//
@@ -1013,16 +1013,16 @@
this.gvMx1ebeln,
this.gridColumn8,
this.gvMx1boardStyle,
- this.gridColumn6,
+ this.gvMx1ebelnQty,
this.gvMx1subQty,
this.gvMx1quantity,
- this.gvMx1ebelnQty,
+ this.gvMx1memo,
this.gvMx1okRkqty,
this.gvMx1checkDate,
this.gridColumn3,
this.gridColumn9,
this.gridColumn7,
- this.gvMx1memo,
+ this.gridColumn6,
this.gridColumn10,
this.gridColumn12,
this.gridColumn13,
@@ -1116,8 +1116,6 @@
this.gvMx1isdepsIn.OptionsColumn.ReadOnly = true;
this.gvMx1isdepsIn.Tag = "query_a.isdeps_in";
this.gvMx1isdepsIn.UnboundDataType = typeof(bool);
- this.gvMx1isdepsIn.Visible = true;
- this.gvMx1isdepsIn.VisibleIndex = 2;
this.gvMx1isdepsIn.Width = 50;
//
// gvMx1checkStates
@@ -1130,7 +1128,7 @@
this.gvMx1checkStates.OptionsColumn.ReadOnly = true;
this.gvMx1checkStates.Tag = "query_a.check_states";
this.gvMx1checkStates.Visible = true;
- this.gvMx1checkStates.VisibleIndex = 3;
+ this.gvMx1checkStates.VisibleIndex = 2;
this.gvMx1checkStates.Width = 90;
//
// gvMx1checkRes
@@ -1143,20 +1141,20 @@
this.gvMx1checkRes.OptionsColumn.ReadOnly = true;
this.gvMx1checkRes.Tag = "query_a.check_res";
this.gvMx1checkRes.Visible = true;
- this.gvMx1checkRes.VisibleIndex = 4;
+ this.gvMx1checkRes.VisibleIndex = 3;
this.gvMx1checkRes.Width = 90;
//
// gvMx1ebeln
//
this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
- this.gvMx1ebeln.Caption = "ERP閲囪喘鍗曞彿";
+ this.gvMx1ebeln.Caption = "ERP鍗曞彿";
this.gvMx1ebeln.FieldName = "ebeln";
this.gvMx1ebeln.MinWidth = 120;
this.gvMx1ebeln.Name = "gvMx1ebeln";
this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
this.gvMx1ebeln.Tag = "query_a.ebeln";
this.gvMx1ebeln.Visible = true;
- this.gvMx1ebeln.VisibleIndex = 5;
+ this.gvMx1ebeln.VisibleIndex = 4;
this.gvMx1ebeln.Width = 120;
//
// gridColumn8
@@ -1166,7 +1164,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 6;
+ this.gridColumn8.VisibleIndex = 5;
this.gridColumn8.Width = 70;
//
// gvMx1boardStyle
@@ -1179,25 +1177,27 @@
this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
this.gvMx1boardStyle.Tag = "query_a.board_style";
this.gvMx1boardStyle.Visible = true;
- this.gvMx1boardStyle.VisibleIndex = 7;
+ this.gvMx1boardStyle.VisibleIndex = 6;
this.gvMx1boardStyle.Width = 180;
//
- // gridColumn6
+ // gvMx1ebelnQty
//
- this.gridColumn6.Caption = "鐗╂枡瑙勬牸";
- this.gridColumn6.FieldName = "itemModel";
- this.gridColumn6.MinWidth = 25;
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.OptionsColumn.ReadOnly = true;
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 8;
- this.gridColumn6.Width = 180;
+ this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
+ this.gvMx1ebelnQty.Caption = "閲囪喘鏁伴噺";
+ this.gvMx1ebelnQty.FieldName = "cgsl";
+ this.gvMx1ebelnQty.MinWidth = 25;
+ 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 = 80;
//
// gvMx1subQty
//
this.gvMx1subQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1subQty.Caption = "鏈搴旀敹鏁伴噺";
- this.gvMx1subQty.FieldName = "subQty";
+ this.gvMx1subQty.Caption = "鏈敹鏁伴噺";
+ this.gvMx1subQty.FieldName = "wssl";
this.gvMx1subQty.MinWidth = 25;
this.gvMx1subQty.Name = "gvMx1subQty";
this.gvMx1subQty.OptionsColumn.ReadOnly = true;
@@ -1213,7 +1213,7 @@
this.gvMx1quantity.AppearanceCell.Options.UseForeColor = true;
this.gvMx1quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gvMx1quantity.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1quantity.Caption = "鏈瀹炴敹鏁伴噺";
+ this.gvMx1quantity.Caption = "鏀惰揣鏁伴噺";
this.gvMx1quantity.FieldName = "quantity";
this.gvMx1quantity.MinWidth = 25;
this.gvMx1quantity.Name = "gvMx1quantity";
@@ -1222,30 +1222,34 @@
this.gvMx1quantity.VisibleIndex = 10;
this.gvMx1quantity.Width = 80;
//
- // gvMx1ebelnQty
+ // gvMx1memo
//
- this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1ebelnQty.Caption = "閲囪喘璁㈠崟鏁伴噺";
- this.gvMx1ebelnQty.FieldName = "ebelnQty";
- this.gvMx1ebelnQty.MinWidth = 25;
- this.gvMx1ebelnQty.Name = "gvMx1ebelnQty";
- this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
- this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
- this.gvMx1ebelnQty.Visible = true;
- this.gvMx1ebelnQty.VisibleIndex = 11;
- this.gvMx1ebelnQty.Width = 80;
+ this.gvMx1memo.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1memo.AppearanceCell.Options.UseFont = true;
+ this.gvMx1memo.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1memo.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1memo.AppearanceHeader.Options.UseForeColor = true;
+ this.gvMx1memo.Caption = "澶囨敞";
+ this.gvMx1memo.FieldName = "memo";
+ this.gvMx1memo.MinWidth = 50;
+ this.gvMx1memo.Name = "gvMx1memo";
+ this.gvMx1memo.OptionsColumn.ReadOnly = true;
+ this.gvMx1memo.Tag = "edit";
+ this.gvMx1memo.Visible = true;
+ this.gvMx1memo.VisibleIndex = 11;
+ this.gvMx1memo.Width = 180;
//
// gvMx1okRkqty
//
this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
- this.gvMx1okRkqty.Caption = "宸插叆搴撴暟閲�";
- this.gvMx1okRkqty.FieldName = "okRkqty";
+ this.gvMx1okRkqty.Caption = "宸叉敹鏁伴噺";
+ this.gvMx1okRkqty.FieldName = "yssl";
this.gvMx1okRkqty.MinWidth = 25;
this.gvMx1okRkqty.Name = "gvMx1okRkqty";
this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
this.gvMx1okRkqty.Visible = true;
- this.gvMx1okRkqty.VisibleIndex = 12;
+ this.gvMx1okRkqty.VisibleIndex = 8;
this.gvMx1okRkqty.Width = 80;
//
// gvMx1checkDate
@@ -1276,7 +1280,7 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 13;
+ this.gridColumn9.VisibleIndex = 12;
this.gridColumn9.Width = 50;
//
// gridColumn7
@@ -1287,25 +1291,19 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 14;
+ this.gridColumn7.VisibleIndex = 13;
this.gridColumn7.Width = 50;
//
- // gvMx1memo
+ // gridColumn6
//
- this.gvMx1memo.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1memo.AppearanceCell.Options.UseFont = true;
- this.gvMx1memo.AppearanceCell.Options.UseForeColor = true;
- this.gvMx1memo.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1memo.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1memo.Caption = "澶囨敞";
- this.gvMx1memo.FieldName = "memo";
- this.gvMx1memo.MinWidth = 50;
- this.gvMx1memo.Name = "gvMx1memo";
- this.gvMx1memo.OptionsColumn.ReadOnly = true;
- this.gvMx1memo.Tag = "edit";
- this.gvMx1memo.Visible = true;
- this.gvMx1memo.VisibleIndex = 15;
- this.gvMx1memo.Width = 180;
+ this.gridColumn6.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn6.FieldName = "itemModel";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.OptionsColumn.ReadOnly = true;
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 14;
+ this.gridColumn6.Width = 180;
//
// gridColumn10
//
@@ -1314,17 +1312,17 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 16;
+ this.gridColumn10.VisibleIndex = 15;
this.gridColumn10.Width = 94;
//
// gridColumn12
//
- this.gridColumn12.Caption = "閫�l鏂欐椂闂�";
+ this.gridColumn12.Caption = "閫�鏂欐椂闂�";
this.gridColumn12.FieldName = "returnDate";
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 17;
+ this.gridColumn12.VisibleIndex = 16;
this.gridColumn12.Width = 94;
//
// gridColumn13
@@ -1334,7 +1332,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 18;
+ this.gridColumn13.VisibleIndex = 17;
this.gridColumn13.Width = 94;
//
// gvBtnAlawys
@@ -1344,16 +1342,16 @@
this.gvBtnAlawys.MinWidth = 80;
this.gvBtnAlawys.Name = "gvBtnAlawys";
this.gvBtnAlawys.Visible = true;
- this.gvBtnAlawys.VisibleIndex = 19;
+ this.gvBtnAlawys.VisibleIndex = 18;
this.gvBtnAlawys.Width = 80;
//
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions11.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
+ editorButtonImageOptions11.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫�鏂�", -1, true, true, false, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "", 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);
@@ -1365,16 +1363,16 @@
this.gvMxDel.MinWidth = 80;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 20;
+ this.gvMxDel.VisibleIndex = 19;
this.gvMxDel.Width = 80;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions12.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions12.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions12, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject45, serializableAppearanceObject46, serializableAppearanceObject47, serializableAppearanceObject48, "", 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);
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 9a88451..e5ae8cb 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -112,6 +112,7 @@
};
frm.ShowDialog();
};
+
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 6a4c47c..45e47e2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -129,6 +129,7 @@
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -268,7 +269,8 @@
this.gridColumn4,
this.gridColumn5,
this.gridColumn7,
- this.gvcol6});
+ this.gvcol6,
+ this.gridColumn9});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -1351,6 +1353,16 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "鍚屾鏃堕棿";
+ this.gridColumn9.FieldName = "createDate";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 31;
+ this.gridColumn9.Width = 94;
+ //
// Frm_MesRohIn
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1491,5 +1503,6 @@
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 82c75bc..af6b082 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1692,7 +1692,7 @@
/// <param name="fileName">瀛楁</param>
/// <param name="icoName">鍥炬爣璺緞</param>
/// <param name="action"></param>
- public static void SetGridViewParameter(GridView gridView1, PictureBox picCheckBox = null, Form fm = null, string fileName = "checkStatus", string icoName = "", DelegateGetModel action = null, DevExpress.Utils.ToolTipController tips = null)
+ public static void SetGridViewParameter(GridView gridView1, PictureBox picCheckBox = null, Form fm = null, string fileName = "checkStatus", string icoName = "", DelegateGetModel action = null, DevExpress.Utils.ToolTipController tips = null,bool isSearch=true)
{
gridView1.PopupMenuShowing += (s, e) =>
{
@@ -1713,10 +1713,25 @@
}
}
};
- gridView1.OptionsView.ShowGroupPanel = false;
- gridView1.OptionsCustomization.AllowGroup = false;
- // gridView1.Appearance.HeaderPanel.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.ControlText;
gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
+
+ if (isSearch == true) {
+ gridView1.OptionsView.ShowGroupPanel = false;
+ gridView1.OptionsCustomization.AllowGroup = false;
+ gridView1.OptionsFilter.AllowAutoFilterConditionChange = DevExpress.Utils.DefaultBoolean.False;
+ gridView1.OptionsView.ShowAutoFilterRow = true;
+ gridView1.OptionsFilter.AllowFilterEditor = false;
+ gridView1.OptionsFilter.ShowCustomFunctions = DevExpress.Utils.DefaultBoolean.False;
+ gridView1.OptionsFilter.AllowColumnMRUFilterList = false;
+ gridView1.OptionsFilter.AllowMRUFilterList = false;
+ gridView1.OptionsCustomization.AllowFilter = false;
+ gridView1.OptionsFind.ShowSearchNavButtons = false;
+ gridView1.OptionsView.ShowGroupPanel = false;
+ //鏄惁鏄剧ず搴曢儴鐨勮繃婊ゆ潯
+ // gridView1.OptionsView.ShowFilterPanelMode = DevExpress.XtraGrid.Views.Base.ShowFilterPanelMode.Never;
+ }
+
+ // gridView1.Appearance.HeaderPanel.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.ControlText;
foreach (GridColumn column in gridView1.Columns)
{
column.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
@@ -1728,20 +1743,14 @@
column.OptionsColumn.ReadOnly = false;
else
column.OptionsColumn.ReadOnly = true;
- if (column.Tag == null || column.Tag.ToString().Length <= 0)
- column.OptionsFilter.AllowAutoFilter = false;
+
+ if (isSearch == true)
+ {
+ if (column.Tag == null || column.Tag.ToString().Length <= 0)
+ column.OptionsFilter.AllowAutoFilter = false;
+ }
}
- gridView1.OptionsFilter.AllowAutoFilterConditionChange = DevExpress.Utils.DefaultBoolean.False;
- gridView1.OptionsView.ShowAutoFilterRow = true;
- gridView1.OptionsFilter.AllowFilterEditor = false;
- gridView1.OptionsFilter.ShowCustomFunctions = DevExpress.Utils.DefaultBoolean.False;
- gridView1.OptionsFilter.AllowColumnMRUFilterList = false;
- gridView1.OptionsFilter.AllowMRUFilterList = false;
- gridView1.OptionsCustomization.AllowFilter = false;
- gridView1.OptionsFind.ShowSearchNavButtons = false;
- gridView1.OptionsView.ShowGroupPanel = false;
- //鏄惁鏄剧ず搴曢儴鐨勮繃婊ゆ潯
- // gridView1.OptionsView.ShowFilterPanelMode = DevExpress.XtraGrid.Views.Base.ShowFilterPanelMode.Never;
+
gridView1.IndicatorWidth = 50;
gridView1.CustomDrawRowIndicator += (s, e) =>
{
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index 19f70aa..708e1fe 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -38,23 +38,21 @@
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl3 = new DevExpress.XtraEditors.PanelControl();
this.label1 = new System.Windows.Forms.Label();
this.radioGroup1 = new DevExpress.XtraEditors.RadioGroup();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
- this.pageBar1 = new UserControls.Data.UcPageBar();
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
this.panelControl2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -80,7 +78,6 @@
// gcMain
//
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-
this.gcMain.Location = new System.Drawing.Point(2, 40);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
@@ -93,7 +90,6 @@
//
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -103,16 +99,15 @@
this.gridColumn3,
this.gv_supplierItemCode,
this.gv_supplierItemName,
- this.gridColumn5,
this.gridColumn6,
this.gridColumn9,
this.gridColumn7,
this.gv_purchaseUnit,
this.gv_remarks,
+ this.gridColumn5,
this.gridColumn10,
this.gridColumn2,
this.gridColumn4,
- this.gridColumn8,
this.gridColumn1});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
@@ -127,7 +122,6 @@
//
// gv_guid
//
-
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
this.gv_guid.FieldName = "guid";
@@ -140,7 +134,6 @@
//
// gv_ebelnK3id
//
-
this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
this.gv_ebelnK3id.Caption = "ERP琛孖D鍙�";
this.gv_ebelnK3id.FieldName = "erpMxId";
@@ -153,93 +146,78 @@
//
// gv_billNo
//
-
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "閲囪喘鍗曞彿";
this.gv_billNo.FieldName = "billNo";
- this.gv_billNo.MinWidth = 110;
+ this.gv_billNo.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+ this.gv_billNo.MinWidth = 10;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.OptionsColumn.ReadOnly = true;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
this.gv_billNo.VisibleIndex = 1;
- this.gv_billNo.Width = 110;
+ this.gv_billNo.Width = 10;
//
// gridColumn3
//
this.gridColumn3.Caption = "閲囪喘鏃堕棿";
this.gridColumn3.FieldName = "purchaseDate";
- this.gridColumn3.MinWidth = 125;
+ this.gridColumn3.MinWidth = 10;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 2;
- this.gridColumn3.Width = 125;
+ this.gridColumn3.Width = 10;
//
// gv_supplierItemCode
//
-
this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜";
this.gv_supplierItemCode.FieldName = "wlbm";
- this.gv_supplierItemCode.MinWidth = 100;
+ this.gv_supplierItemCode.MinWidth = 10;
this.gv_supplierItemCode.Name = "gv_supplierItemCode";
this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
this.gv_supplierItemCode.Visible = true;
this.gv_supplierItemCode.VisibleIndex = 3;
- this.gv_supplierItemCode.Width = 100;
+ this.gv_supplierItemCode.Width = 10;
//
// gv_supplierItemName
//
-
this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
this.gv_supplierItemName.Caption = "鐗╂枡鍚嶇О";
this.gv_supplierItemName.FieldName = "wlmc";
- this.gv_supplierItemName.MinWidth = 120;
+ this.gv_supplierItemName.MinWidth = 10;
this.gv_supplierItemName.Name = "gv_supplierItemName";
this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
this.gv_supplierItemName.Visible = true;
this.gv_supplierItemName.VisibleIndex = 4;
- this.gv_supplierItemName.Width = 120;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
- this.gridColumn5.FieldName = "wlgg";
- this.gridColumn5.MinWidth = 250;
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.OptionsColumn.ReadOnly = true;
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 5;
- this.gridColumn5.Width = 250;
+ this.gv_supplierItemName.Width = 10;
//
// gridColumn6
//
this.gridColumn6.Caption = "閲囪喘鏁伴噺";
this.gridColumn6.FieldName = "purchaseQty";
- this.gridColumn6.MaxWidth = 50;
- this.gridColumn6.MinWidth = 50;
+ this.gridColumn6.MinWidth = 10;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 6;
- this.gridColumn6.Width = 50;
+ this.gridColumn6.VisibleIndex = 5;
+ this.gridColumn6.Width = 11;
//
// gridColumn9
//
this.gridColumn9.Caption = "宸叉敹鏁伴噺";
this.gridColumn9.FieldName = "yssl";
- this.gridColumn9.MaxWidth = 50;
- this.gridColumn9.MinWidth = 50;
+ this.gridColumn9.MinWidth = 10;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 7;
+ this.gridColumn9.VisibleIndex = 6;
this.gridColumn9.Width = 50;
//
// gridColumn7
@@ -250,50 +228,57 @@
this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn7.Caption = "鏈敹鏁伴噺";
this.gridColumn7.FieldName = "wssl";
- this.gridColumn7.MaxWidth = 50;
- this.gridColumn7.MinWidth = 50;
+ this.gridColumn7.MinWidth = 10;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 8;
- this.gridColumn7.Width = 50;
+ this.gridColumn7.VisibleIndex = 7;
+ this.gridColumn7.Width = 10;
//
// gv_purchaseUnit
//
-
this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
this.gv_purchaseUnit.Caption = "閲囪喘鍗曚綅";
this.gv_purchaseUnit.FieldName = "fname";
- this.gv_purchaseUnit.MaxWidth = 50;
- this.gv_purchaseUnit.MinWidth = 50;
+ this.gv_purchaseUnit.MinWidth = 10;
this.gv_purchaseUnit.Name = "gv_purchaseUnit";
this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
this.gv_purchaseUnit.Visible = true;
- this.gv_purchaseUnit.VisibleIndex = 9;
+ this.gv_purchaseUnit.VisibleIndex = 8;
this.gv_purchaseUnit.Width = 50;
//
// gv_remarks
//
-
this.gv_remarks.AppearanceCell.Options.UseFont = true;
this.gv_remarks.Caption = "澶囨敞";
this.gv_remarks.FieldName = "remarks";
- this.gv_remarks.MinWidth = 100;
+ this.gv_remarks.MinWidth = 10;
this.gv_remarks.Name = "gv_remarks";
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.OptionsColumn.ReadOnly = true;
this.gv_remarks.Tag = "query_a.REMARKS";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 10;
- this.gv_remarks.Width = 100;
+ this.gv_remarks.VisibleIndex = 9;
+ this.gv_remarks.Width = 10;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn5.FieldName = "wlgg";
+ this.gridColumn5.MinWidth = 10;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.OptionsColumn.ReadOnly = true;
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 10;
+ this.gridColumn5.Width = 11;
//
// gridColumn10
//
this.gridColumn10.Caption = "渚涘簲鍟�";
this.gridColumn10.FieldName = "gysName";
- this.gridColumn10.MinWidth = 125;
+ this.gridColumn10.MinWidth = 10;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 11;
@@ -303,42 +288,32 @@
//
this.gridColumn2.Caption = "鏀舵枡缁勭粐";
this.gridColumn2.FieldName = "fSubsidiary";
- this.gridColumn2.MinWidth = 250;
+ this.gridColumn2.MinWidth = 10;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 12;
- this.gridColumn2.Width = 250;
+ this.gridColumn2.Width = 10;
//
// gridColumn4
//
this.gridColumn4.Caption = "閿�鍞鍗�";
this.gridColumn4.FieldName = "xxdd";
- this.gridColumn4.MinWidth = 120;
+ this.gridColumn4.MinWidth = 10;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 13;
this.gridColumn4.Width = 120;
//
- // gridColumn8
- //
- this.gridColumn8.Caption = "瀹炴敹鏁伴噺";
- this.gridColumn8.FieldName = "sssl";
- this.gridColumn8.MaxWidth = 50;
- this.gridColumn8.MinWidth = 50;
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.OptionsColumn.ReadOnly = true;
- this.gridColumn8.Width = 50;
- //
// gridColumn1
//
this.gridColumn1.Caption = "鍗曟嵁绫诲瀷";
this.gridColumn1.FieldName = "documentTypeTxt";
- this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.MinWidth = 10;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 14;
- this.gridColumn1.Width = 60;
+ this.gridColumn1.Width = 25;
//
// panelControl3
//
@@ -373,7 +348,6 @@
// panelControl1
//
this.panelControl1.Controls.Add(this.btnIn);
- this.panelControl1.Controls.Add(this.pageBar1);
this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panelControl1.Location = new System.Drawing.Point(2, 637);
this.panelControl1.Name = "panelControl1";
@@ -392,18 +366,6 @@
this.btnIn.TabIndex = 4;
this.btnIn.Text = "纭畾瀵煎叆";
//
- // pageBar1
- //
- this.pageBar1.CurrentPage = 1;
- this.pageBar1.Dock = System.Windows.Forms.DockStyle.Left;
- this.pageBar1.Location = new System.Drawing.Point(2, 2);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
- this.pageBar1.Name = "pageBar1";
- this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(984, 39);
- this.pageBar1.TabIndex = 3;
- this.pageBar1.TotalPages = 0;
- //
// SelectCgMx
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -415,7 +377,7 @@
this.MinimizeBox = false;
this.Name = "SelectCgMx";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏";
+ this.Text = "閫夋嫨鐗╂枡锛屽彧鏄剧ず鏈敹鏁伴噺澶т簬0鐨�";
this.TopMost = true;
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
this.panelControl2.ResumeLayout(false);
@@ -449,13 +411,11 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.PanelControl panelControl3;
private DevExpress.XtraEditors.RadioGroup radioGroup1;
private DevExpress.XtraEditors.PanelControl panelControl1;
private DevExpress.XtraEditors.SimpleButton btnIn;
- private UserControls.Data.UcPageBar pageBar1;
private System.Windows.Forms.Label label1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
index b8a335d..5c379e0 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -1,11 +1,8 @@
锘縰sing System;
using System.Collections.Generic;
using System.Data;
-using System.Text;
using System.Windows.Forms;
-using DevExpress.Utils.DirectXPaint;
using DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -31,11 +28,10 @@
radioGroup1.SelectedIndex = 0;
this.suppId = _suppId;
this.receiveOrgId = _receiveOrgId;
- pageBar1.PagerEvent += PageBar1_PagerEvent;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
- });
+ },null,false);
getPageList(1);
btnIn.Click += (s, e) =>
{
@@ -81,7 +77,7 @@
var _obj = new
{
currentPage = curPage,
- everyPageSize = this.pageBar1.RowsCount,
+ everyPageSize = 999999,
sortName = "",
keyWhere = "",
inBusType = (radioGroup1.SelectedIndex+1),//1鏄噰璐紝2鏄澶�
@@ -99,10 +95,6 @@
gcMain.DataSource = dt;
gcMain.ForceInitialize();
gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
- var dddd = dd.rtnData.pages; //鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
- pageBar1.CurrentPage = curPage; //褰撳墠椤�
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs b/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs
index 49bed15..84402df 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs
@@ -34,7 +34,6 @@
this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_msg = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UserControls.Data.UcPageBar();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
this.SuspendLayout();
@@ -42,7 +41,6 @@
// gcMain
//
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
@@ -53,7 +51,6 @@
//
// gridView1
//
-
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_operationTime,
@@ -68,7 +65,6 @@
//
// gv_operationTime
//
-
this.gv_operationTime.AppearanceCell.Options.UseFont = true;
this.gv_operationTime.Caption = "鎿嶄綔鏃堕棿";
this.gv_operationTime.FieldName = "operationTime";
@@ -82,7 +78,6 @@
//
// gv_userName
//
-
this.gv_userName.AppearanceCell.Options.UseFont = true;
this.gv_userName.Caption = "鎿嶄綔浜哄憳";
this.gv_userName.FieldName = "userName";
@@ -96,7 +91,6 @@
//
// gv_operationTable
//
-
this.gv_operationTable.AppearanceCell.Options.UseFont = true;
this.gv_operationTable.Caption = "鐩稿叧琛�";
this.gv_operationTable.FieldName = "operationTable";
@@ -108,7 +102,6 @@
//
// gv_msg
//
-
this.gv_msg.AppearanceCell.Options.UseFont = true;
this.gv_msg.Caption = "鎿嶄綔璇︽儏";
this.gv_msg.FieldName = "msg";
@@ -119,24 +112,11 @@
this.gv_msg.VisibleIndex = 2;
this.gv_msg.Width = 300;
//
- // pageBar1
- //
- this.pageBar1.CurrentPage = 1;
- this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 543);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6);
- this.pageBar1.Name = "pageBar1";
- this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(933, 47);
- this.pageBar1.TabIndex = 4;
- this.pageBar1.TotalPages = 0;
- //
// ShowLogcs
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(933, 590);
- this.Controls.Add(this.pageBar1);
this.Controls.Add(this.gcMain);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
@@ -159,6 +139,5 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable;
private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
private DevExpress.XtraGrid.Columns.GridColumn gv_msg;
- private UserControls.Data.UcPageBar pageBar1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs b/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
index 144a47a..29aeb8b 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
@@ -1,10 +1,7 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
-using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
@@ -22,25 +19,13 @@
{
this.guidKey = _guidKey;
InitializeComponent();
- getPageList(1, UtilityHelper.GetPageSize());
- pageBar1.PagerEvent += PageBar1_PagerEvent;
- gridView1.IndicatorWidth = 50;
- gridView1.CustomDrawRowIndicator += (s, e) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- };
+
+ }, null, false);
+ getPageList(1, UtilityHelper.GetPageSize());
}
- /// <summary>
- /// 鍒嗛〉浜嬩欢
- /// </summary>
- /// <param name="curPage"></param>
- /// <param name="pageSize"></param>
- private void PageBar1_PagerEvent(int curPage, int pageSize)
- {
- getPageList(curPage, pageSize);
- }
/// <summary>
/// </summary>
@@ -50,7 +35,7 @@
{
var _sbSqlWhere = new StringBuilder();
_sbSqlWhere.Append(" and ABT_GUID='"+this.guidKey + "'");
- var pgq = new PageQueryModel(curPage, pageSize, "OPERATION_TIME",
+ var pgq = new PageQueryModel(curPage, 999999, "OPERATION_TIME",
"desc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
@@ -65,10 +50,6 @@
gcMain.DataSource = dt;
gcMain.ForceInitialize();
gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
- int dddd = dd.rtnData.pages;//鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total;//璁板綍鎬绘暟
- pageBar1.CurrentPage = curPage;//褰撳墠椤�
}
else
{
diff --git a/DevApp/Gs.DevApp/UserControl/UCUpFile.cs b/DevApp/Gs.DevApp/UserControl/UCUpFile.cs
index 5fd57ad..5bb6164 100644
--- a/DevApp/Gs.DevApp/UserControl/UCUpFile.cs
+++ b/DevApp/Gs.DevApp/UserControl/UCUpFile.cs
@@ -25,7 +25,19 @@
btnUpSelect.Click += BtnUpSelect_Click;
btnUp.Click += BtnUp_Click;
}
+
+ /// <summary>
+ ///
+ /// </summary>
public string parentGuid
+ {
+ get;
+ set;
+ }
+ /// <summary>
+ ///
+ /// </summary>
+ public string parentGroup
{
get;
set;
@@ -69,7 +81,7 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- private async void BtnUp_Click(object sender, EventArgs e)
+ private async void BtnUp_Click(object sender, EventArgs e)
{
var WebApiUrl = ConfigurationSettings.AppSettings.Get("WebApiUrl");
var address = WebApiUrl + "MesFile/UploadFile";
@@ -84,9 +96,8 @@
if (UpChanged != null) UpChanged(this, e);
}
- private async Task UploadFileAsync(string url, string filePath)
+ private async Task UploadFileAsync(string url, string filePath)
{
-
string _parentGuid = parentGuid;
using (var httpClient = new HttpClient())
try
@@ -98,7 +109,7 @@
using (var fs = File.OpenRead(filePath))
using (var streamContent = new StreamContent(fs))
{
- form.Add(streamContent, "file", _parentGuid + "~" + Path.GetFileName(filePath));
+ form.Add(streamContent, "file", _parentGuid + "~" + Path.GetFileName(filePath) + "~" + parentGroup);
var response = await httpClient.PostAsync(url, form);
var responseString =
await response.Content.ReadAsStringAsync();
@@ -112,7 +123,7 @@
Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
}
-
+
}
#endregion
diff --git a/DevApp/Gs.DevApp/UserControl/UCUpFileList.cs b/DevApp/Gs.DevApp/UserControl/UCUpFileList.cs
index d5b93c4..8dad973 100644
--- a/DevApp/Gs.DevApp/UserControl/UCUpFileList.cs
+++ b/DevApp/Gs.DevApp/UserControl/UCUpFileList.cs
@@ -36,6 +36,21 @@
}
}
+
+ private string _Group;
+ /// <summary>
+ /// 鍒嗙被group
+ /// </summary>
+ public string parentGroup
+ {
+ get { return _Group; }
+ set
+ {
+ _Group = value;
+ this.ucUpFile1.parentGroup = value;
+ }
+ }
+
/// <summary>
/// 涓婁紶鍚庡埛鏂版枃浠跺垪琛�
/// </summary>
@@ -54,6 +69,8 @@
return;
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
_sbSqlWhere.Append(" and parent_Guid='" + pGuid.Trim() + "'");
+ if (!string.IsNullOrEmpty(parentGroup))
+ _sbSqlWhere.Append(" and file_Group='" + parentGroup + "'");
PageQueryModel pgq = new PageQueryModel(1, 100, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
--
Gitblit v1.9.3