From c2e1de823e648ca7e62bc868d8aaf9ad5c65a287 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 14 九月 2025 09:17:28 +0800
Subject: [PATCH] 到货单版本冲突
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.Designer.cs | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.Designer.cs
index b805315..4c96bd5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNoticeSelectLink.Designer.cs
@@ -123,7 +123,7 @@
// gridColumn1
//
this.gridColumn1.Caption = "浣跨敤缁勭粐";
- this.gridColumn1.FieldName = "fSubsidiary2";
+ this.gridColumn1.FieldName = "fSubsidiary";
this.gridColumn1.MinWidth = 50;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
@@ -154,6 +154,10 @@
//
// gridColumn3
//
+ this.gridColumn3.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn3.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn3.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn3.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn3.Caption = "搴撳瓨";
this.gridColumn3.FieldName = "kcQty";
this.gridColumn3.MinWidth = 25;
@@ -184,7 +188,7 @@
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
- // SelectMesCgthSqLink
+ // Frm_SalesReturnNoticeSelectLink
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -193,9 +197,9 @@
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
this.MinimizeBox = false;
- this.Name = "SelectMesCgthSqLink";
+ this.Name = "Frm_SalesReturnNoticeSelectLink";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "閫夋嫨鐗╂枡鏃犳簮鍗�";
+ this.Text = "閿�鍞��璐х敵璇峰崟锛堟棤婧愬崟锛岄�夋嫨鐗╂枡鏄庣粏锛�";
this.TopMost = true;
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
this.panelControl2.ResumeLayout(false);
--
Gitblit v1.9.3