From c58f2d6dfc34e40a20ed960b0da61924d680b25f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 05 十二月 2024 08:10:36 +0800
Subject: [PATCH] 到货单
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 10 +
DevApp/Gs.DevApp/Resources/reset_16x16.png | 0
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs | 134 ++++++--------
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs | 4
DevApp/Gs.DevApp/Gs.DevApp.csproj | 1
DevApp/Gs.DevApp/Properties/Resources.resx | 103 +++++-----
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 188 +++++++++++---------
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 29 ++-
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 48 +++-
9 files changed, 285 insertions(+), 232 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
index f5664c8..eef724c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -34,6 +34,11 @@
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();
this.gvMx1returnFlag = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1okRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1isdepsIn = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -56,14 +61,14 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gvMxTui = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = 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.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
this.lb_fType = new DevExpress.XtraEditors.LabelControl();
- this.lb_urgentFlag = new DevExpress.XtraEditors.LabelControl();
this.lb_ischeck = new DevExpress.XtraEditors.LabelControl();
this.lb_paperBillNo = new DevExpress.XtraEditors.LabelControl();
this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
@@ -113,12 +118,10 @@
this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
this.txt_receiveOrgId = new Gs.DevApp.UserControl.UcLookOrg();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
- this.btnTui = new DevExpress.XtraEditors.SimpleButton();
this.txtDepotsCode = new DevExpress.XtraEditors.TextEdit();
this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
this.txtSupplierCode = new DevExpress.XtraEditors.TextEdit();
this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
- this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit();
this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
this.txt_depotsId = new Gs.DevApp.UserControl.UcLookCk();
this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
@@ -133,7 +136,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -148,7 +151,6 @@
((System.ComponentModel.ISupportInitialize)(this.txtDepotsCode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txtSupplierCode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
this.SuspendLayout();
@@ -165,7 +167,7 @@
this.gvMx1returnFlag.Tag = "query_a.return_flag";
this.gvMx1returnFlag.UnboundDataType = typeof(bool);
this.gvMx1returnFlag.Visible = true;
- this.gvMx1returnFlag.VisibleIndex = 2;
+ this.gvMx1returnFlag.VisibleIndex = 3;
this.gvMx1returnFlag.Width = 100;
//
// gvMx1okRkqty
@@ -179,7 +181,7 @@
this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
this.gvMx1okRkqty.Visible = true;
- this.gvMx1okRkqty.VisibleIndex = 11;
+ this.gvMx1okRkqty.VisibleIndex = 12;
this.gvMx1okRkqty.Width = 100;
//
// gvMx1isdepsIn
@@ -192,8 +194,9 @@
this.gvMx1isdepsIn.Name = "gvMx1isdepsIn";
this.gvMx1isdepsIn.OptionsColumn.ReadOnly = true;
this.gvMx1isdepsIn.Tag = "query_a.isdeps_in";
+ this.gvMx1isdepsIn.UnboundDataType = typeof(bool);
this.gvMx1isdepsIn.Visible = true;
- this.gvMx1isdepsIn.VisibleIndex = 4;
+ this.gvMx1isdepsIn.VisibleIndex = 5;
this.gvMx1isdepsIn.Width = 100;
//
// gvMx1boardStyle
@@ -207,7 +210,7 @@
this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
this.gvMx1boardStyle.Tag = "query_a.board_style";
this.gvMx1boardStyle.Visible = true;
- this.gvMx1boardStyle.VisibleIndex = 6;
+ this.gvMx1boardStyle.VisibleIndex = 7;
this.gvMx1boardStyle.Width = 180;
//
// gvMx1checkDate
@@ -221,7 +224,7 @@
this.gvMx1checkDate.OptionsColumn.ReadOnly = true;
this.gvMx1checkDate.Tag = "query_a.check_date";
this.gvMx1checkDate.Visible = true;
- this.gvMx1checkDate.VisibleIndex = 14;
+ this.gvMx1checkDate.VisibleIndex = 15;
this.gvMx1checkDate.Width = 180;
//
// gvMx1checkStates
@@ -235,7 +238,7 @@
this.gvMx1checkStates.OptionsColumn.ReadOnly = true;
this.gvMx1checkStates.Tag = "query_a.check_states";
this.gvMx1checkStates.Visible = true;
- this.gvMx1checkStates.VisibleIndex = 13;
+ this.gvMx1checkStates.VisibleIndex = 14;
this.gvMx1checkStates.Width = 100;
//
// gvMx1checkRes
@@ -249,7 +252,7 @@
this.gvMx1checkRes.OptionsColumn.ReadOnly = true;
this.gvMx1checkRes.Tag = "query_a.check_res";
this.gvMx1checkRes.Visible = true;
- this.gvMx1checkRes.VisibleIndex = 12;
+ this.gvMx1checkRes.VisibleIndex = 13;
this.gvMx1checkRes.Width = 100;
//
// gvMx1memo
@@ -263,7 +266,7 @@
this.gvMx1memo.OptionsColumn.ReadOnly = true;
this.gvMx1memo.Tag = "query_a.memo";
this.gvMx1memo.Visible = true;
- this.gvMx1memo.VisibleIndex = 18;
+ this.gvMx1memo.VisibleIndex = 19;
this.gvMx1memo.Width = 180;
//
// gvMx1urgentFlag
@@ -275,8 +278,9 @@
this.gvMx1urgentFlag.MinWidth = 60;
this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
+ this.gvMx1urgentFlag.UnboundDataType = typeof(bool);
this.gvMx1urgentFlag.Visible = true;
- this.gvMx1urgentFlag.VisibleIndex = 3;
+ this.gvMx1urgentFlag.VisibleIndex = 4;
this.gvMx1urgentFlag.Width = 100;
//
// gvMx1subQty
@@ -290,7 +294,7 @@
this.gvMx1subQty.OptionsColumn.ReadOnly = true;
this.gvMx1subQty.Tag = "query_a.sub_qty";
this.gvMx1subQty.Visible = true;
- this.gvMx1subQty.VisibleIndex = 8;
+ this.gvMx1subQty.VisibleIndex = 9;
this.gvMx1subQty.Width = 100;
//
// gvMx1quantity
@@ -305,9 +309,9 @@
this.gvMx1quantity.FieldName = "quantity";
this.gvMx1quantity.MinWidth = 90;
this.gvMx1quantity.Name = "gvMx1quantity";
- this.gvMx1quantity.Tag = "query_a.quantity";
+ this.gvMx1quantity.Tag = "yz_quantity_0";
this.gvMx1quantity.Visible = true;
- this.gvMx1quantity.VisibleIndex = 9;
+ this.gvMx1quantity.VisibleIndex = 10;
this.gvMx1quantity.Width = 100;
//
// gvMx1ebelnQty
@@ -321,7 +325,7 @@
this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
this.gvMx1ebelnQty.Visible = true;
- this.gvMx1ebelnQty.VisibleIndex = 10;
+ this.gvMx1ebelnQty.VisibleIndex = 11;
this.gvMx1ebelnQty.Width = 100;
//
// gvMx1ebelnLine
@@ -348,7 +352,7 @@
this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
this.gvMx1ebeln.Tag = "query_a.ebeln";
this.gvMx1ebeln.Visible = true;
- this.gvMx1ebeln.VisibleIndex = 1;
+ this.gvMx1ebeln.VisibleIndex = 2;
this.gvMx1ebeln.Width = 120;
//
// gvMx1guid
@@ -378,7 +382,7 @@
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
- this.repositoryItemCheckEdit1});
+ this.repositoryItemButtonEdit2});
this.gcMx1.Size = new System.Drawing.Size(1229, 376);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -392,6 +396,7 @@
this.gvMx1ebelnLine,
this.gridColumn1,
this.gvMxDel,
+ this.gvMxTui,
this.gvMx1ebeln,
this.gvMx1returnFlag,
this.gvMx1urgentFlag,
@@ -456,6 +461,27 @@
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
+ // gvMxTui
+ //
+ this.gvMxTui.Caption = "閫�璐�";
+ this.gvMxTui.ColumnEdit = this.repositoryItemButtonEdit2;
+ this.gvMxTui.MinWidth = 80;
+ this.gvMxTui.Name = "gvMxTui";
+ this.gvMxTui.Visible = true;
+ this.gvMxTui.VisibleIndex = 1;
+ this.gvMxTui.Width = 94;
+ //
+ // repositoryItemButtonEdit2
+ //
+ this.repositoryItemButtonEdit2.AutoHeight = false;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.reset_16x16;
+ editorButtonImageOptions2.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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);
+ //
// gridColumn8
//
this.gridColumn8.Caption = "鐗╂枡缂栧彿";
@@ -463,7 +489,7 @@
this.gridColumn8.MinWidth = 70;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 5;
+ this.gridColumn8.VisibleIndex = 6;
this.gridColumn8.Width = 70;
//
// gridColumn6
@@ -474,7 +500,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 7;
+ this.gridColumn6.VisibleIndex = 8;
this.gridColumn6.Width = 180;
//
// gridColumn3
@@ -485,7 +511,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 15;
+ this.gridColumn3.VisibleIndex = 16;
this.gridColumn3.Width = 180;
//
// gridColumn9
@@ -496,7 +522,7 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 16;
+ this.gridColumn9.VisibleIndex = 17;
this.gridColumn9.Width = 94;
//
// gridColumn7
@@ -507,13 +533,8 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 17;
+ this.gridColumn7.VisibleIndex = 18;
this.gridColumn7.Width = 94;
- //
- // repositoryItemCheckEdit1
- //
- this.repositoryItemCheckEdit1.AutoHeight = false;
- this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
//
// lb_fType
//
@@ -525,21 +546,11 @@
this.lb_fType.TabIndex = 378;
this.lb_fType.Text = "濮斿鏍囧織";
//
- // lb_urgentFlag
- //
- this.lb_urgentFlag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_urgentFlag.Appearance.Options.UseFont = true;
- this.lb_urgentFlag.Location = new System.Drawing.Point(632, 20);
- this.lb_urgentFlag.Name = "lb_urgentFlag";
- this.lb_urgentFlag.Size = new System.Drawing.Size(68, 21);
- this.lb_urgentFlag.TabIndex = 343;
- this.lb_urgentFlag.Text = "鎬ユ枡鏍囪瘑";
- //
// lb_ischeck
//
this.lb_ischeck.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ischeck.Appearance.Options.UseFont = true;
- this.lb_ischeck.Location = new System.Drawing.Point(759, 20);
+ this.lb_ischeck.Location = new System.Drawing.Point(631, 20);
this.lb_ischeck.Name = "lb_ischeck";
this.lb_ischeck.Size = new System.Drawing.Size(102, 21);
this.lb_ischeck.TabIndex = 319;
@@ -1048,12 +1059,10 @@
this.panel1.Controls.Add(this.labelControl5);
this.panel1.Controls.Add(this.txt_receiveOrgId);
this.panel1.Controls.Add(this.labelControl2);
- this.panel1.Controls.Add(this.btnTui);
this.panel1.Controls.Add(this.txtDepotsCode);
this.panel1.Controls.Add(this.labelControl4);
this.panel1.Controls.Add(this.txtSupplierCode);
this.panel1.Controls.Add(this.txt_fType);
- this.panel1.Controls.Add(this.txt_urgentFlag);
this.panel1.Controls.Add(this.txt_fstatus);
this.panel1.Controls.Add(this.txt_depotsId);
this.panel1.Controls.Add(this.labelControl3);
@@ -1063,7 +1072,6 @@
this.panel1.Controls.Add(this.labelControl11);
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_fType);
- this.panel1.Controls.Add(this.lb_urgentFlag);
this.panel1.Controls.Add(this.lb_ischeck);
this.panel1.Controls.Add(this.lb_paperBillNo);
this.panel1.Controls.Add(this.txt_paperBillNo);
@@ -1106,15 +1114,6 @@
this.labelControl2.TabIndex = 456;
this.labelControl2.Text = "鏀舵枡缁勭粐";
//
- // btnTui
- //
- this.btnTui.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.close_16x16;
- this.btnTui.Location = new System.Drawing.Point(187, 126);
- this.btnTui.Name = "btnTui";
- this.btnTui.Size = new System.Drawing.Size(116, 29);
- this.btnTui.TabIndex = 455;
- this.btnTui.Text = "纭閫�璐�";
- //
// txtDepotsCode
//
this.txtDepotsCode.Enabled = false;
@@ -1129,7 +1128,7 @@
//
this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl4.Appearance.Options.UseFont = true;
- this.labelControl4.Location = new System.Drawing.Point(327, 91);
+ this.labelControl4.Location = new System.Drawing.Point(329, 91);
this.labelControl4.Name = "labelControl4";
this.labelControl4.Size = new System.Drawing.Size(68, 21);
this.labelControl4.TabIndex = 453;
@@ -1153,19 +1152,10 @@
this.txt_fType.Size = new System.Drawing.Size(35, 24);
this.txt_fType.TabIndex = 450;
//
- // txt_urgentFlag
- //
- this.txt_urgentFlag.Enabled = false;
- this.txt_urgentFlag.Location = new System.Drawing.Point(709, 18);
- this.txt_urgentFlag.Name = "txt_urgentFlag";
- this.txt_urgentFlag.Properties.Caption = "";
- this.txt_urgentFlag.Size = new System.Drawing.Size(35, 24);
- this.txt_urgentFlag.TabIndex = 449;
- //
// txt_fstatus
//
this.txt_fstatus.Enabled = false;
- this.txt_fstatus.Location = new System.Drawing.Point(867, 18);
+ this.txt_fstatus.Location = new System.Drawing.Point(739, 18);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "";
this.txt_fstatus.Size = new System.Drawing.Size(47, 24);
@@ -1195,7 +1185,7 @@
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.btnSelect.Location = new System.Drawing.Point(14, 126);
this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(128, 29);
+ this.btnSelect.Size = new System.Drawing.Size(143, 29);
this.btnSelect.TabIndex = 443;
this.btnSelect.Text = "閫夊緟鍏ヤ粨鐗╂枡 ";
//
@@ -1241,7 +1231,7 @@
//
this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remark.Appearance.Options.UseFont = true;
- this.lb_remark.Location = new System.Drawing.Point(327, 130);
+ this.lb_remark.Location = new System.Drawing.Point(329, 130);
this.lb_remark.Name = "lb_remark";
this.lb_remark.Size = new System.Drawing.Size(68, 21);
this.lb_remark.TabIndex = 240;
@@ -1268,7 +1258,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
@@ -1284,7 +1274,6 @@
((System.ComponentModel.ISupportInitialize)(this.txtDepotsCode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txtSupplierCode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
this.ResumeLayout(false);
@@ -1322,8 +1311,6 @@
private DevExpress.XtraEditors.LabelControl lb_fType;
- private DevExpress.XtraEditors.LabelControl lb_urgentFlag;
-
private DevExpress.XtraEditors.LabelControl lb_ischeck;
private DevExpress.XtraEditors.LabelControl lb_paperBillNo;
@@ -1344,7 +1331,6 @@
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraEditors.CheckEdit txt_fType;
- private DevExpress.XtraEditors.CheckEdit txt_urgentFlag;
private DevExpress.XtraEditors.TextEdit txtSupplierCode;
private DevExpress.XtraEditors.LabelControl labelControl4;
private DevExpress.XtraEditors.TextEdit txtDepotsCode;
@@ -1385,11 +1371,11 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
- private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
- private DevExpress.XtraEditors.SimpleButton btnTui;
private UserControl.UcLookOrg txt_receiveOrgId;
private DevExpress.XtraEditors.LabelControl labelControl2;
private DevExpress.XtraEditors.LabelControl labelControl5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMxTui;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index aa905ac..4716658 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -3,6 +3,7 @@
using System.Data;
using System.Drawing;
using System.Text;
+using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
@@ -24,9 +25,6 @@
{
InitializeComponent();
pageBar1.PagerEvent += PageBar1_PagerEvent;
- this.gridView1.ColumnPanelRowHeight = 60;
- this.gridView1.OptionsView.AllowHtmlDrawHeaders = true;
- this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
@@ -38,19 +36,12 @@
toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
- getPageList(1, UtilityHelper.GetPageSize());
- gridView1.CustomDrawRowIndicator += (s, e) =>
+ getPageList(1);
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridSear(gridView1);
+ gvMx1.ValidatingEditor += (sender, e) =>
{
- if (e.Info.IsRowIndicator && e.RowHandle >= 0)
- e.Info.DisplayText = (e.RowHandle + 1).ToString();
- };
- gridView1.CustomDrawEmptyForeground += (s, e) =>
- {
- var str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
- var f = new Font("寰蒋闆呴粦", 16);
- var r = new Rectangle(gridView1.GridControl.Width / 2 - 100,
- e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
- e.Graphics.DrawString(str, f, Brushes.Gray, r);
+ Gs.DevApp.ToolBox.UtilityHelper.SetValidatingEditor(sender, e);
};
//璁剧疆浠撳簱閫夋嫨
this.txt_depotsId.EditChanged += (s, e) =>
@@ -80,7 +71,7 @@
lst = ee.StringList;
var _obj = lst;
var strReturn = UtilityHelper.HttpPost("",
- "MesInvItemArnDetailManager/GetListPageByCgmxGuid",
+ _webServiceName + "SelectDialogToView",
JsonConvert.SerializeObject(_obj));
var dt = UtilityHelper.ReturnToList(strReturn);
DataTable _newTable = dt.rtnData;
@@ -103,46 +94,13 @@
};
frm.ShowDialog();
};
- //楠岄��
- btnTui.Click += async (s, e) =>
- {
- if (string.IsNullOrEmpty(lbGuid.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("鏆傛湭淇濆瓨锛屼笉鑳介��璐э紒");
- return;
- }
- var lst = new List<string>();
- for (var i = 0; i < gvMx1.DataRowCount; i++)
- {
- var row = gvMx1.GetDataRow(i);
- if (row != null && row["gvChk"].ToString().ToUpper() == "true".ToUpper())
- lst.Add(row["guid"].ToString());
- }
- if (lst.Count <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浣犻渶瑕侀��鐨勭墿鏂欙紒");
- return;
- }
- UcLoading _loading = new UcLoading();
- var _obj = lst;
- try
- {
- var strJson = await UtilityHelper.HttpPostAsync("",
- _webServiceName + "TuiMx",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
-
- }
- MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- _loading.Stop();
- };
+
+ }
+ private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ await Task.Delay(100);
+ getPageList(1);
}
/// <summary>
/// 鍙屽嚮浜嬩欢
@@ -164,7 +122,7 @@
/// <param name="pageSize"></param>
private void PageBar1_PagerEvent(int curPage, int pageSize)
{
- getPageList(curPage, pageSize);
+ getPageList(curPage);
}
/// <summary>
@@ -174,6 +132,9 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
var frm = new ShowFilter(gridView1.Columns, _filterList);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
@@ -187,7 +148,7 @@
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
_filterList = e.FilterList;
- getPageList(1, pageBar1.RowsCount);
+ getPageList(1);
}
/// <summary>
/// 鏃ュ織
@@ -239,7 +200,7 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
else
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
}
catch (Exception ex)
@@ -285,7 +246,7 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
else
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
}
catch (Exception ex)
@@ -335,9 +296,8 @@
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ getPageList(1);
}
-
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
@@ -356,7 +316,16 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
else
- getPageList(1, UtilityHelper.GetPageSize());
+ {
+ _filterList.Clear();
+ if (gridView1.ActiveFilter.Count > 0)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ }
+ getPageList(1);
+ }
}
/// <summary>
@@ -401,15 +370,21 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
+ string _orgId = txt_receiveOrgId.GetId();
var _ckId = txt_depotsId.GetId(); //浠撳簱缂栧彿 depots_code
var _gysId = txt_suppId.GetId(); //渚涘簲鍟嗙紪鍙�
+ if (string.IsNullOrEmpty(_orgId))
+ {
+ MsgHelper.Warning("璇烽�夋嫨鏀舵枡缁勭粐锛�");
+ txt_receiveOrgId.Focus();
+ return;
+ }
if (string.IsNullOrEmpty(_gysId))
{
MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
txt_suppId.Focus();
return;
}
-
if (string.IsNullOrEmpty(_ckId))
{
MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
@@ -424,7 +399,7 @@
SuppId = _gysId, //渚涘簲鍟�
DepotsId = _ckId,//浠撳簱
FType = txt_fType.Checked,//0=閲囪喘锛�1=濮斿
- UrgentFlag = txt_urgentFlag.Checked,//0=涓嶆�ワ紝1=鎬�
+ UrgentFlag = false,
list = new List<MesInvItemArnDetail>(),
};
gvMx1.CloseEditor();
@@ -480,14 +455,11 @@
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
- private async void getPageList(int curPage, int pageSize)
+ private async void getPageList(int curPage)
{
UcLoading _loading = new UcLoading();
- var _sbSqlWhere = new StringBuilder();
- foreach (var itm in _filterList)
- _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
- itm.fileValue + "'");
- var pgq = new PageQueryModel(curPage, pageSize, "create_date",
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
@@ -495,15 +467,27 @@
var strReturn = await UtilityHelper.HttpPostAsync("",
_webServiceName + "GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- var dddd = dd.rtnData.pages; //鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
- pageBar1.CurrentPage = curPage; //褰撳墠椤�
- pageBar1.setTxt();
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
}
catch (Exception ex)
{
@@ -613,7 +597,49 @@
}
}
}
+ /// <summary>
+ /// 鏄庣粏閫�璐�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private async void repositoryItemButtonEdit2_ButtonClick(object sender, ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閫�璐у悧锛�"))
+ return;
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鏆傛湭淇濆瓨锛屼笉鑳介��璐э紒");
+ return;
+ }
+ var lst = new List<string>();
+ lst.Add(mxGuid);
+ UcLoading _loading = new UcLoading();
+ var _obj = lst;
+ try
+ {
+ var strJson = await UtilityHelper.HttpPostAsync("",
+ _webServiceName + "TuiMx",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
-
+ }
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ _loading.Stop();
+ }
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
index 2d0a67e..c73d317 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
@@ -123,20 +123,27 @@
var strReturn = await UtilityHelper.HttpPostAsync("",
_webServiceName + "GetListPage", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
- DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- if (dt.Rows.Count > 0)
+ if (dd.rtnCode > 0)
{
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
}
else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
- pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 2350ffe..0230a99 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1075,6 +1075,7 @@
<None Include="Resources\up2_16x16.png" />
<None Include="Resources\renamedatasource_16x161.png" />
<None Include="Resources\deletelist2_16x16.png" />
+ <None Include="Resources\reset_16x16.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index 20f645f..69edc3c 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -1303,6 +1303,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap reset_16x16 {
+ get {
+ object obj = ResourceManager.GetObject("reset_16x16", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap reviewingpane_32x32 {
get {
object obj = ResourceManager.GetObject("reviewingpane_32x32", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 940db9a..04b6481 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -124,11 +124,6 @@
<data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="usergroup_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\usergroup_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -140,18 +135,8 @@
<data name="checkbuttons_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbuttons_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="updatetableofcontents_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\updatetableofcontents_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sortbyinvoice_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortbyinvoice_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -213,6 +198,11 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="bouser_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bouser_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -237,9 +227,6 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="checkbox2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -247,6 +234,9 @@
</data>
<data name="checkbox2_32x323" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_32x323.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -275,6 +265,9 @@
<value>..\Resources\logo_png.png;System.Drawing.Bitmap, System.Drawing,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="renamedatasource_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\renamedatasource_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -296,21 +289,11 @@
<data name="sortasc_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortasc_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="checkbox2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -475,6 +458,9 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="deletelist2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\deletelist2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="editingfillleft_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\editingfillleft_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -543,6 +529,9 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="engineering_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\engineering_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -560,6 +549,11 @@
</data>
<data name="dropandhighlowlines_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dropandhighlowlines_16x16.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -605,11 +599,6 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="trackingchanges_next_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\trackingchanges_next_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -630,6 +619,9 @@
</data>
<data name="sortasc_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortasc_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="meeting_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\meeting_32x32.png;System.Drawing.Bitmap,
@@ -713,8 +705,10 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="doublenext_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\doublenext_16x16.png;System.Drawing.Bitmap,
@@ -730,8 +724,10 @@
<value>..\Resources\login_bg6.png;System.Drawing.Bitmap, System.Drawing,
Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\convert_32x32.png;System.Drawing.Bitmap,
@@ -743,22 +739,29 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
+ <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
<data name="printlayoutview_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\printlayoutview_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="checkbuttons_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbuttons_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
+ <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="changedatasourcepivottable_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\changedatasourcepivottable_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -776,13 +779,13 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
+ <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -816,8 +819,8 @@
<data name="add_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\add_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
+ <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -829,7 +832,7 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="deletelist2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\deletelist2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/reset_16x16.png b/DevApp/Gs.DevApp/Resources/reset_16x16.png
new file mode 100644
index 0000000..ef66973
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/reset_16x16.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index fecb3a4..d0c5883 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -193,7 +193,14 @@
{
var dt = new DataTable();
foreach (GridColumn col in gv.Columns)
- dt.Columns.Add(col.FieldName, typeof(string));
+ {
+ if (col.UnboundDataType == typeof(bool))
+ dt.Columns.Add(col.FieldName, typeof(System.Boolean));
+ else
+ {
+ dt.Columns.Add(col.FieldName, typeof(string));
+ }
+ }
gc.BindingContext = new BindingContext();
gc.DataSource = dt;
gc.ForceInitialize();
@@ -293,13 +300,16 @@
{
foreach (GridColumn colmn in gv.Columns)
{
- if (colmn.Name.ToString().Contains("gvMxDel"))
+ if (colmn.Name.ToString().Contains("gvMxDel") || colmn.Name.ToString().Contains("gvMxTui"))
{
- colmn.Visible = !isEdt;
- break;
+ // colmn.Visible = !isEdt;
+ // break;
+ colmn.OptionsColumn.AllowEdit =true;
}
+ else
+ colmn.OptionsColumn.AllowEdit = !isEdt;
}
- gv.OptionsBehavior.Editable = !isEdt;
+ //gv.OptionsBehavior.Editable = !isEdt;
}
var _btnAry = controls.Find("btnSelect", false);
if (_btnAry.Length > 0)
@@ -607,13 +617,16 @@
{
foreach (GridColumn colmn in gv.Columns)
{
- if (colmn.Name.ToString().Contains("gvMxDel"))
+ if (colmn.Name.ToString().Contains("gvMxDel") || colmn.Name.ToString().Contains("gvMxTui"))
{
- colmn.Visible = !isEdt;
- break;
+ // colmn.Visible = !isEdt;
+ // break;
+ colmn.OptionsColumn.AllowEdit = true;
}
+ else
+ colmn.OptionsColumn.AllowEdit = !isEdt;
}
- gv.OptionsBehavior.Editable = !isEdt;
+ //gv.OptionsBehavior.Editable = !isEdt;
}
foreach (Control ctrl in controls)
{
@@ -782,13 +795,16 @@
{
foreach (GridColumn colmn in gv.Columns)
{
- if (colmn.Name.ToString().Contains("gvMxDel"))
+ if (colmn.Name.ToString().Contains("gvMxDel") || colmn.Name.ToString().Contains("gvMxTui"))
{
- colmn.Visible = !isEdt;
- break;
+ // colmn.Visible = !isEdt;
+ // break;
+ colmn.OptionsColumn.AllowEdit = true;
}
+ else
+ colmn.OptionsColumn.AllowEdit = !isEdt;
}
- gv.OptionsBehavior.Editable = !isEdt;
+ //gv.OptionsBehavior.Editable = !isEdt;
}
foreach (Control ctrl in controls)
{
@@ -1356,7 +1372,11 @@
return regex.IsMatch(str);
}
-
+ /// <summary>
+ /// yz_quantity_0锛寉z_瀛楁_绫诲瀷
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
public static void SetValidatingEditor(object sender, BaseContainerValidateEditorEventArgs e)
{
//yz_quantity_0
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
index 12bfd8f..0bf98fc 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -15,7 +15,7 @@
private readonly List<FilterEntity> _filterList =
new List<FilterEntity>();
- private readonly string _webServiceName = "MesRohInDataManager/";
+ private readonly string _webServiceName = "MesInvItemArnManager/";
private string suppId = "";
/// <summary>
/// 渚涘簲鍟嗙紪鍙�
@@ -86,7 +86,7 @@
try
{
var strReturn = UtilityHelper.HttpPost("",
- _webServiceName + "GetListPage", json);
+ _webServiceName + "SelectDialog", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
var dt = dd.rtnData.list;
gcMain.BindingContext = new BindingContext();
--
Gitblit v1.9.3