From 8366fcbfed5c66fa1fab4f6dba964a3451c24091 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 12 九月 2025 16:26:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
index c3d6eab..4d33c13 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
@@ -1,5 +1,8 @@
/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm
+
+using Gs.DevApp.UserControl;
+
+namespace Gs.DevApp.DevFrm.Ck
{
partial class Frm_MesCgthSq
{
@@ -70,7 +73,7 @@
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.pageBar1 = new UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -143,10 +146,10 @@
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptCk = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -1331,11 +1334,7 @@
//
// gridColumn8
//
- this.gridColumn8.AppearanceCell.ForeColor = System.Drawing.Color.Red;
- this.gridColumn8.AppearanceCell.Options.UseForeColor = true;
- this.gridColumn8.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
- this.gridColumn8.AppearanceHeader.Options.UseForeColor = true;
- this.gridColumn8.Caption = "Mes/Erp搴撳瓨";
+ this.gridColumn8.Caption = "褰撳墠鎬诲簱瀛�";
this.gridColumn8.FieldName = "kcQty";
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
@@ -1375,6 +1374,17 @@
this.rptCk.Name = "rptCk";
this.rptCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptCk_ButtonClick);
//
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(965, 64);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 8;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
// gridColumn12
//
this.gridColumn12.Caption = "SRM鏍囪瘑";
@@ -1394,17 +1404,6 @@
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 15;
this.gridColumn13.Width = 94;
- //
- // picCheckBox
- //
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(965, 64);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 8;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
//
// Frm_MesCgthSq
//
@@ -1501,7 +1500,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_returnType;
private DevExpress.XtraGrid.Columns.GridColumn gv_suppId;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private UserControls.Data.UcPageBar pageBar1;
+ private UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
--
Gitblit v1.9.3