From 1703db290a6ee6511d50efff6e67c716be2cdb58 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期四, 14 八月 2025 18:27:54 +0800
Subject: [PATCH] 1、来料检验申请增加需求单据号字段2、免检增加默认组织、新的对供应商的 维护校验3、新增底部汇总、保存刷新4、到货条码打印新增底部汇总、列表明细5、到货单按钮布局改变5、UtilityHelper类新增委托事件(列表显示明细)、快速配置GridView底部汇总(启用汇总行+设置列求和汇总)

---
 DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs |  144 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 96 insertions(+), 48 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index a0932ae..dde82b7 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -49,6 +49,10 @@
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_demandDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_sourceDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_remainingReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.panelControl3 = new DevExpress.XtraEditors.PanelControl();
             this.label1 = new System.Windows.Forms.Label();
             this.radioGroup1 = new DevExpress.XtraEditors.RadioGroup();
@@ -74,7 +78,7 @@
             this.panelControl2.Location = new System.Drawing.Point(0, 0);
             this.panelControl2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panelControl2.Name = "panelControl2";
-            this.panelControl2.Size = new System.Drawing.Size(987, 530);
+            this.panelControl2.Size = new System.Drawing.Size(1494, 833);
             this.panelControl2.TabIndex = 4;
             // 
             // gcMain
@@ -85,7 +89,7 @@
             this.gcMain.MainView = this.gridView1;
             this.gcMain.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMain.Name = "gcMain";
-            this.gcMain.Size = new System.Drawing.Size(983, 463);
+            this.gcMain.Size = new System.Drawing.Size(1490, 766);
             this.gcMain.TabIndex = 2;
             this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -113,7 +117,11 @@
             this.gridColumn10,
             this.gridColumn2,
             this.gridColumn4,
-            this.gridColumn1});
+            this.gridColumn1,
+            this.gridColumn8,
+            this.gv_demandDocumentId,
+            this.gv_sourceDocumentId,
+            this.gv_remainingReceivedQty});
             this.gridView1.DetailHeight = 272;
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 44;
@@ -140,14 +148,14 @@
             this.gv_billNo.Caption = "閲囪喘鍗曞彿";
             this.gv_billNo.FieldName = "billNo";
             this.gv_billNo.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
-            this.gv_billNo.MinWidth = 9;
+            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 = 9;
+            this.gv_billNo.Width = 10;
             // 
             // gv_guid
             // 
@@ -177,62 +185,62 @@
             // 
             this.gridColumn3.Caption = "閲囪喘鏃堕棿";
             this.gridColumn3.FieldName = "purchaseDate";
-            this.gridColumn3.MinWidth = 9;
+            this.gridColumn3.MinWidth = 10;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.OptionsColumn.ReadOnly = true;
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 2;
-            this.gridColumn3.Width = 9;
+            this.gridColumn3.VisibleIndex = 12;
+            this.gridColumn3.Width = 98;
             // 
             // gv_supplierItemCode
             // 
             this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
             this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜";
             this.gv_supplierItemCode.FieldName = "wlbm";
-            this.gv_supplierItemCode.MinWidth = 9;
+            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 = 9;
+            this.gv_supplierItemCode.VisibleIndex = 4;
+            this.gv_supplierItemCode.Width = 31;
             // 
             // gv_supplierItemName
             // 
             this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
             this.gv_supplierItemName.Caption = "鐗╂枡鍚嶇О";
             this.gv_supplierItemName.FieldName = "wlmc";
-            this.gv_supplierItemName.MinWidth = 9;
+            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 = 9;
+            this.gv_supplierItemName.VisibleIndex = 5;
+            this.gv_supplierItemName.Width = 29;
             // 
             // gridColumn6
             // 
             this.gridColumn6.Caption = "閲囪喘鏁伴噺";
             this.gridColumn6.FieldName = "purchaseQty";
-            this.gridColumn6.MinWidth = 9;
+            this.gridColumn6.MinWidth = 10;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.OptionsColumn.ReadOnly = true;
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 5;
-            this.gridColumn6.Width = 10;
+            this.gridColumn6.VisibleIndex = 8;
+            this.gridColumn6.Width = 109;
             // 
             // gridColumn9
             // 
             this.gridColumn9.Caption = "宸叉敹鏁伴噺";
             this.gridColumn9.FieldName = "yssl";
-            this.gridColumn9.MinWidth = 9;
+            this.gridColumn9.MinWidth = 10;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.OptionsColumn.ReadOnly = true;
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 6;
-            this.gridColumn9.Width = 44;
+            this.gridColumn9.VisibleIndex = 9;
+            this.gridColumn9.Width = 39;
             // 
             // gridColumn7
             // 
@@ -242,92 +250,128 @@
             this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn7.Caption = "鏈敹鏁伴噺";
             this.gridColumn7.FieldName = "wssl";
-            this.gridColumn7.MinWidth = 9;
+            this.gridColumn7.MinWidth = 10;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.OptionsColumn.ReadOnly = true;
             this.gridColumn7.Visible = true;
             this.gridColumn7.VisibleIndex = 7;
-            this.gridColumn7.Width = 9;
+            this.gridColumn7.Width = 23;
             // 
             // gv_purchaseUnit
             // 
             this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
             this.gv_purchaseUnit.Caption = "閲囪喘鍗曚綅";
             this.gv_purchaseUnit.FieldName = "fname";
-            this.gv_purchaseUnit.MinWidth = 9;
+            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 = 8;
-            this.gv_purchaseUnit.Width = 44;
+            this.gv_purchaseUnit.VisibleIndex = 14;
+            this.gv_purchaseUnit.Width = 181;
             // 
             // gv_remarks
             // 
             this.gv_remarks.AppearanceCell.Options.UseFont = true;
             this.gv_remarks.Caption = "澶囨敞";
             this.gv_remarks.FieldName = "remarks";
-            this.gv_remarks.MinWidth = 9;
+            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 = 9;
-            this.gv_remarks.Width = 9;
+            this.gv_remarks.VisibleIndex = 11;
+            this.gv_remarks.Width = 26;
             // 
             // gridColumn5
             // 
             this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
             this.gridColumn5.FieldName = "wlgg";
-            this.gridColumn5.MinWidth = 9;
+            this.gridColumn5.MinWidth = 10;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.OptionsColumn.ReadOnly = true;
             this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 10;
-            this.gridColumn5.Width = 10;
+            this.gridColumn5.VisibleIndex = 6;
+            this.gridColumn5.Width = 31;
             // 
             // gridColumn10
             // 
             this.gridColumn10.Caption = "渚涘簲鍟�";
             this.gridColumn10.FieldName = "gysName";
-            this.gridColumn10.MinWidth = 9;
+            this.gridColumn10.MinWidth = 10;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 11;
-            this.gridColumn10.Width = 109;
+            this.gridColumn10.VisibleIndex = 13;
+            this.gridColumn10.Width = 112;
             // 
             // gridColumn2
             // 
             this.gridColumn2.Caption = "鏀舵枡缁勭粐";
             this.gridColumn2.FieldName = "fSubsidiary";
-            this.gridColumn2.MinWidth = 9;
+            this.gridColumn2.MinWidth = 10;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 12;
-            this.gridColumn2.Width = 9;
+            this.gridColumn2.VisibleIndex = 15;
+            this.gridColumn2.Width = 46;
             // 
             // gridColumn4
             // 
             this.gridColumn4.Caption = "閿�鍞鍗�";
             this.gridColumn4.FieldName = "xxdd";
-            this.gridColumn4.MinWidth = 9;
+            this.gridColumn4.MinWidth = 10;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.OptionsColumn.ReadOnly = true;
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 13;
-            this.gridColumn4.Width = 105;
+            this.gridColumn4.VisibleIndex = 3;
+            this.gridColumn4.Width = 62;
             // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "鍗曟嵁绫诲瀷";
             this.gridColumn1.FieldName = "documentTypeTxt";
-            this.gridColumn1.MinWidth = 9;
+            this.gridColumn1.MinWidth = 10;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 14;
-            this.gridColumn1.Width = 22;
+            this.gridColumn1.VisibleIndex = 16;
+            this.gridColumn1.Width = 134;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "鏈鏀堕噺";
+            this.gridColumn8.FieldName = "bcsl";
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 17;
+            this.gridColumn8.Width = 186;
+            // 
+            // gv_demandDocumentId
+            // 
+            this.gv_demandDocumentId.Caption = "闇�姹傚崟鎹彿";
+            this.gv_demandDocumentId.FieldName = "demandDocumentId";
+            this.gv_demandDocumentId.Name = "gv_demandDocumentId";
+            this.gv_demandDocumentId.Visible = true;
+            this.gv_demandDocumentId.VisibleIndex = 2;
+            this.gv_demandDocumentId.Width = 60;
+            // 
+            // gv_sourceDocumentId
+            // 
+            this.gv_sourceDocumentId.Caption = "婧愬崟鍗曞彿";
+            this.gv_sourceDocumentId.FieldName = "sourceDocumentId";
+            this.gv_sourceDocumentId.Name = "gv_sourceDocumentId";
+            this.gv_sourceDocumentId.Visible = true;
+            this.gv_sourceDocumentId.VisibleIndex = 18;
+            this.gv_sourceDocumentId.Width = 79;
+            // 
+            // gv_remainingReceivedQty
+            // 
+            this.gv_remainingReceivedQty.Caption = "ERP鍓╀綑鏈敹鏁伴噺";
+            this.gv_remainingReceivedQty.FieldName = "remainingReceivedQty";
+            this.gv_remainingReceivedQty.Name = "gv_remainingReceivedQty";
+            this.gv_remainingReceivedQty.Visible = true;
+            this.gv_remainingReceivedQty.VisibleIndex = 10;
+            this.gv_remainingReceivedQty.Width = 104;
             // 
             // panelControl3
             // 
@@ -337,7 +381,7 @@
             this.panelControl3.Location = new System.Drawing.Point(2, 2);
             this.panelControl3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panelControl3.Name = "panelControl3";
-            this.panelControl3.Size = new System.Drawing.Size(983, 30);
+            this.panelControl3.Size = new System.Drawing.Size(1490, 30);
             this.panelControl3.TabIndex = 6;
             // 
             // label1
@@ -368,10 +412,10 @@
             // 
             this.panelControl1.Controls.Add(this.btnIn);
             this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panelControl1.Location = new System.Drawing.Point(2, 495);
+            this.panelControl1.Location = new System.Drawing.Point(2, 798);
             this.panelControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panelControl1.Name = "panelControl1";
-            this.panelControl1.Size = new System.Drawing.Size(983, 33);
+            this.panelControl1.Size = new System.Drawing.Size(1490, 33);
             this.panelControl1.TabIndex = 5;
             // 
             // btnIn
@@ -380,7 +424,7 @@
             this.btnIn.Appearance.Options.UseBackColor = true;
             this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
             this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
-            this.btnIn.Location = new System.Drawing.Point(899, 2);
+            this.btnIn.Location = new System.Drawing.Point(1406, 2);
             this.btnIn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnIn.Name = "btnIn";
             this.btnIn.Size = new System.Drawing.Size(82, 29);
@@ -391,7 +435,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(987, 530);
+            this.ClientSize = new System.Drawing.Size(1494, 833);
             this.Controls.Add(this.panelControl2);
             this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
             this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
@@ -440,5 +484,9 @@
         private DevExpress.XtraEditors.SimpleButton btnIn;
         private System.Windows.Forms.Label label1;
         private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_demandDocumentId;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_sourceDocumentId;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_remainingReceivedQty;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3