From 3bfbb2e22e9ee3b54c51e83a7262d907657e48c9 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 17 一月 2025 11:30:08 +0800
Subject: [PATCH] 细节
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 6 ++-
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 78 ++++++++++++++++++++-------------------
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 2
3 files changed, 45 insertions(+), 41 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 0552f35..e2c6d33 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions 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();
this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -125,7 +125,7 @@
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
- this.txt_percentage = new DevExpress.XtraEditors.TextEdit();
+ this.txt_barcodeProgress = new DevExpress.XtraEditors.TextEdit();
this.lbGuid = new System.Windows.Forms.Label();
this.lb_urgentFlag = new DevExpress.XtraEditors.LabelControl();
this.lb_fstatus = new DevExpress.XtraEditors.LabelControl();
@@ -172,7 +172,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_percentage.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_barcodeProgress.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_insDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
@@ -234,7 +234,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1342, 383);
+ this.tabMxPage2.Size = new System.Drawing.Size(1342, 395);
this.tabMxPage2.Text = "宸叉墦鏉＄爜淇℃伅";
//
// gcMx2
@@ -245,7 +245,7 @@
this.gcMx2.Name = "gcMx2";
this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMx2.Size = new System.Drawing.Size(1342, 383);
+ this.gcMx2.Size = new System.Drawing.Size(1342, 395);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -343,10 +343,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", 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);
@@ -679,7 +679,9 @@
this.txtKdy.Location = new System.Drawing.Point(430, 65);
this.txtKdy.Name = "txtKdy";
this.txtKdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txtKdy.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txtKdy.Properties.Appearance.Options.UseFont = true;
+ this.txtKdy.Properties.Appearance.Options.UseForeColor = true;
this.txtKdy.Properties.ReadOnly = true;
this.txtKdy.Size = new System.Drawing.Size(96, 28);
this.txtKdy.TabIndex = 224;
@@ -846,7 +848,7 @@
this.gv_insDate.AppearanceCell.Options.UseFont = true;
this.gv_insDate.Caption = "鏉ユ枡鏃ユ湡";
this.gv_insDate.FieldName = "insDate";
- this.gv_insDate.MinWidth = 180;
+ this.gv_insDate.MinWidth = 50;
this.gv_insDate.Name = "gv_insDate";
this.gv_insDate.OptionsColumn.AllowEdit = false;
this.gv_insDate.Tag = "query_a.ins_date";
@@ -860,7 +862,7 @@
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "鎻愪氦鏃ユ湡";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 180;
+ this.gv_checkDate.MinWidth = 50;
this.gv_checkDate.Name = "gv_checkDate";
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
@@ -917,7 +919,7 @@
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鍒拌揣鍗曞彿";
this.gv_billNo.FieldName = "billNo";
- this.gv_billNo.MinWidth = 120;
+ this.gv_billNo.MinWidth = 50;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.bill_no";
@@ -989,7 +991,7 @@
//
this.gridColumn13.Caption = "鏀舵枡缁勭粐";
this.gridColumn13.FieldName = "receivingOrg";
- this.gridColumn13.MinWidth = 250;
+ this.gridColumn13.MinWidth = 50;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Tag = "org.fnamber";
this.gridColumn13.Visible = true;
@@ -1012,7 +1014,7 @@
//
this.gridColumn2.Caption = "渚涘簲鍟嗗悕绉�";
this.gridColumn2.FieldName = "suppName";
- this.gridColumn2.MinWidth = 200;
+ this.gridColumn2.MinWidth = 50;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
@@ -1116,7 +1118,7 @@
this.panel1.Controls.Add(this.labelControl1);
this.panel1.Controls.Add(this.labelControl2);
this.panel1.Controls.Add(this.labelControl3);
- this.panel1.Controls.Add(this.txt_percentage);
+ this.panel1.Controls.Add(this.txt_barcodeProgress);
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_urgentFlag);
this.panel1.Controls.Add(this.lb_fstatus);
@@ -1143,7 +1145,7 @@
this.txt_dptName.Name = "txt_dptName";
this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
- this.txt_dptName.Size = new System.Drawing.Size(215, 28);
+ this.txt_dptName.Size = new System.Drawing.Size(228, 28);
this.txt_dptName.TabIndex = 468;
//
// txt_gysNo
@@ -1152,7 +1154,7 @@
this.txt_gysNo.Name = "txt_gysNo";
this.txt_gysNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_gysNo.Properties.Appearance.Options.UseFont = true;
- this.txt_gysNo.Size = new System.Drawing.Size(230, 28);
+ this.txt_gysNo.Size = new System.Drawing.Size(234, 28);
this.txt_gysNo.TabIndex = 467;
//
// txt_fstatus
@@ -1187,7 +1189,7 @@
this.txt_paperBillNo.Name = "txt_paperBillNo";
this.txt_paperBillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_paperBillNo.Size = new System.Drawing.Size(215, 28);
+ this.txt_paperBillNo.Size = new System.Drawing.Size(228, 28);
this.txt_paperBillNo.TabIndex = 463;
//
// txt_depotsCode
@@ -1196,7 +1198,7 @@
this.txt_depotsCode.Name = "txt_depotsCode";
this.txt_depotsCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_depotsCode.Properties.Appearance.Options.UseFont = true;
- this.txt_depotsCode.Size = new System.Drawing.Size(215, 28);
+ this.txt_depotsCode.Size = new System.Drawing.Size(228, 28);
this.txt_depotsCode.TabIndex = 462;
//
// labelControl4
@@ -1224,7 +1226,7 @@
this.txt_gysName.Name = "txt_gysName";
this.txt_gysName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_gysName.Properties.Appearance.Options.UseFont = true;
- this.txt_gysName.Size = new System.Drawing.Size(230, 28);
+ this.txt_gysName.Size = new System.Drawing.Size(234, 28);
this.txt_gysName.TabIndex = 459;
//
// labelControl1
@@ -1251,20 +1253,20 @@
//
this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl3.Appearance.Options.UseFont = true;
- this.labelControl3.Location = new System.Drawing.Point(884, 87);
+ this.labelControl3.Location = new System.Drawing.Point(653, 116);
this.labelControl3.Name = "labelControl3";
this.labelControl3.Size = new System.Drawing.Size(102, 21);
this.labelControl3.TabIndex = 341;
this.labelControl3.Text = "鏉＄爜鎵撳嵃姣旂巼";
//
- // txt_percentage
+ // txt_barcodeProgress
//
- this.txt_percentage.Location = new System.Drawing.Point(993, 83);
- this.txt_percentage.Name = "txt_percentage";
- this.txt_percentage.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_percentage.Properties.Appearance.Options.UseFont = true;
- this.txt_percentage.Size = new System.Drawing.Size(60, 28);
- this.txt_percentage.TabIndex = 342;
+ this.txt_barcodeProgress.Location = new System.Drawing.Point(761, 112);
+ this.txt_barcodeProgress.Name = "txt_barcodeProgress";
+ this.txt_barcodeProgress.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_barcodeProgress.Properties.Appearance.Options.UseFont = true;
+ this.txt_barcodeProgress.Size = new System.Drawing.Size(143, 28);
+ this.txt_barcodeProgress.TabIndex = 342;
//
// lbGuid
//
@@ -1310,7 +1312,7 @@
this.txt_insDate.Name = "txt_insDate";
this.txt_insDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_insDate.Properties.Appearance.Options.UseFont = true;
- this.txt_insDate.Size = new System.Drawing.Size(150, 28);
+ this.txt_insDate.Size = new System.Drawing.Size(180, 28);
this.txt_insDate.TabIndex = 258;
//
// lb_checkDate
@@ -1329,7 +1331,7 @@
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(150, 28);
+ this.txt_checkDate.Size = new System.Drawing.Size(180, 28);
this.txt_checkDate.TabIndex = 252;
//
// lb_remark
@@ -1348,7 +1350,7 @@
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(527, 28);
+ this.txt_remark.Size = new System.Drawing.Size(540, 28);
this.txt_remark.TabIndex = 235;
//
// lb_createBy
@@ -1367,7 +1369,7 @@
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(150, 28);
+ this.txt_createBy.Size = new System.Drawing.Size(180, 28);
this.txt_createBy.TabIndex = 217;
//
// lb_billNo
@@ -1386,7 +1388,7 @@
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(230, 28);
+ this.txt_billNo.Size = new System.Drawing.Size(234, 28);
this.txt_billNo.TabIndex = 211;
//
// Frm_ArrivalBarcode
@@ -1433,7 +1435,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depotsCode.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_percentage.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_barcodeProgress.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_insDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
@@ -1487,7 +1489,7 @@
private DevExpress.XtraEditors.LabelControl lb_billNo;
private DevExpress.XtraEditors.TextEdit txt_billNo;
private DevExpress.XtraEditors.LabelControl labelControl3;
- private DevExpress.XtraEditors.TextEdit txt_percentage;
+ private DevExpress.XtraEditors.TextEdit txt_barcodeProgress;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index 8670f76..9ffc834 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -6,7 +6,6 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -35,7 +34,6 @@
getPageList(this.pageBar1.CurrentPage);
});
getPageList(1);
-
pageBar1.PagerEvent += PageBar1_PagerEvent;
this.ucBtnPrint1.btnDesignClick += (s, e) =>
{
@@ -71,6 +69,8 @@
+ "," + txt_iCount_1.Text.Trim()
+ "," + txt_psnQty_1.Text.Trim()
+ "}";
+ txt_iCount_1.Text = "";
+ txt_psnQty_1.Text = "";
};
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
}
@@ -233,6 +233,7 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt1;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
}
else
{
@@ -249,6 +250,7 @@
gcMx2.BindingContext = new BindingContext();
gcMx2.DataSource = dt2;
gcMx2.ForceInitialize();
+ gvMx2.BestFitColumns();
}
else
{
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 3ab67e7..25b4264 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1785,7 +1785,7 @@
string _isRed = row["isRed"].ToString();
if (_isRed == "1")
{
- e.Appearance.BackColor = Color.LightPink;
+ e.Appearance.ForeColor = Color.Tomato;
}
}
// 璁剧疆鐒︾偣琛岀殑鑳屾櫙鑹�
--
Gitblit v1.9.3