From 13e0b579eb4ad6151e2f27b822837be81d3f6143 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 13 十一月 2024 08:10:48 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/UserControl/ShowLogcs.cs | 6 ++
DevApp/Gs.DevApp/UserControl/UcLookItems.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 1
DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs | 1
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookCk.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs | 2 +
DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs | 18 ++++----
DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 3 +
DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs | 18 ++++----
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 16 ++++++--
12 files changed, 46 insertions(+), 27 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 532dd93..ad44d89 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -1478,6 +1478,7 @@
// txt_suppId
//
this.txt_suppId.Enabled = false;
+ this.txt_suppId.IsReadly = true;
this.txt_suppId.KeyFile = "";
this.txt_suppId.Location = new System.Drawing.Point(706, 92);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
@@ -1517,11 +1518,13 @@
// txt_itemId
//
this.txt_itemId.Enabled = false;
+ this.txt_itemId.IsReadly = true;
this.txt_itemId.KeyFile = "";
this.txt_itemId.Location = new System.Drawing.Point(97, 48);
this.txt_itemId.Name = "txt_itemId";
this.txt_itemId.Size = new System.Drawing.Size(266, 33);
this.txt_itemId.TabIndex = 791;
+ this.txt_itemId.Tag = "no";
//
// lb_itemModel
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index bc7044e..d7c81a4 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -63,6 +63,7 @@
this.btnLoad.Click += BtnLoad_Click;
ucUpFile1.UpChanged += UcUpFile1_UpChanged;
xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
+
}
private void GcMx1_MouseClick(object sender, MouseEventArgs e)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
index f82c92f..03a6427 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -1170,6 +1170,7 @@
//
// txt_depotsId
//
+ this.txt_depotsId.IsReadly = true;
this.txt_depotsId.KeyFile = "";
this.txt_depotsId.Location = new System.Drawing.Point(421, 50);
this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0);
@@ -1198,6 +1199,7 @@
//
// txt_suppId
//
+ this.txt_suppId.IsReadly = true;
this.txt_suppId.KeyFile = "";
this.txt_suppId.Location = new System.Drawing.Point(98, 50);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 428834f..5b0c13b 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -12,7 +12,6 @@
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows.Forms;
-using DevExpress.Office.Model;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid;
@@ -475,7 +474,10 @@
{
var txt = colType as UcLookCk;
txt.SetIdOrCode(strVal);
- txt.Enabled = !isEdt;
+ if (txt.IsReadly == false)
+ txt.Enabled = !isEdt;
+ else
+ txt.Enabled = false;
continue;
}
//鑷畾涔変緵搴斿晢
@@ -483,7 +485,10 @@
{
var txt = colType as UcLookSupplier;
txt.SetIdOrCode(strVal);
- txt.Enabled = !isEdt;
+ if (txt.IsReadly == false)
+ txt.Enabled = !isEdt;
+ else
+ txt.Enabled = false;
continue;
}
//鑷畾涔夌墿鏂�
@@ -491,7 +496,10 @@
{
var txt = colType as UcLookItems;
txt.SetIdOrCode(strVal);
- txt.Enabled = !isEdt;
+ if (txt.IsReadly == false)
+ txt.Enabled = !isEdt;
+ else
+ txt.Enabled = false;
continue;
}
if (colType is SimpleButton)
diff --git a/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs b/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
index 8c20122..87eb360 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
@@ -16,8 +16,11 @@
{
public partial class ShowLogcs : DevExpress.XtraEditors.XtraForm
{
- public ShowLogcs()
+
+ public string guidKey;
+ public ShowLogcs(string _guidKey)
{
+ this.guidKey = _guidKey;
InitializeComponent();
getPageList(1, UtilityHelper.GetPageSize());
pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -46,6 +49,7 @@
private void getPageList(int curPage, int pageSize)
{
var _sbSqlWhere = new StringBuilder();
+ _sbSqlWhere.Append(" and ABT_GUID='"+this.guidKey + "'");
var pgq = new PageQueryModel(curPage, pageSize, "OPERATION_TIME",
"desc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs
index ab8ee87..c5b0349 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookCk.Designer.cs
@@ -30,11 +30,11 @@
{
this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
this.SuspendLayout();
@@ -65,6 +65,14 @@
this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "浣跨敤缁勭粐";
+ this.gridColumn5.FieldName = "fSubsidiary";
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 0;
//
// gridColumn1
//
@@ -104,14 +112,6 @@
this.gridColumn4.Caption = "guid";
this.gridColumn4.FieldName = "guid";
this.gridColumn4.Name = "gridColumn4";
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "浣跨敤缁勭粐";
- this.gridColumn5.FieldName = "fSubsidiary";
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 0;
//
// UcLookCk
//
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookCk.cs b/DevApp/Gs.DevApp/UserControl/UcLookCk.cs
index 0abcedc..cea9eca 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookCk.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookCk.cs
@@ -17,7 +17,7 @@
LookSearchSupplier_EditValueChanged;
}
-
+ public bool IsReadly { get; set; }
private string _KeyFile = "";
public string KeyFile
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs
index 7acc0b8..7d47851 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs
@@ -120,6 +120,7 @@
this.Controls.Add(this.lookSearchSupplier);
this.Name = "UcLookItems";
this.Size = new System.Drawing.Size(266, 33);
+ this.Tag = "no";
((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
this.ResumeLayout(false);
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
index f201939..016b744 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
@@ -24,7 +24,7 @@
LookSearchSupplier_EditValueChanged;
}
-
+ public bool IsReadly { get; set; }
private string _KeyFile = "";
public string KeyFile
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs
index f829c8a..e2f75e3 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.Designer.cs
@@ -30,11 +30,11 @@
{
this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
this.SuspendLayout();
@@ -64,6 +64,14 @@
this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "浣跨敤缁勭粐";
+ this.gridColumn5.FieldName = "fSubsidiary";
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 0;
//
// gridColumn1
//
@@ -102,14 +110,6 @@
this.gridColumn4.Caption = "guid";
this.gridColumn4.FieldName = "guid";
this.gridColumn4.Name = "gridColumn4";
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "浣跨敤缁勭粐";
- this.gridColumn5.FieldName = "fSubsidiary";
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 0;
//
// UcLookSupplier
//
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
index 0f2f795..2e37a12 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
@@ -18,7 +18,7 @@
LookSearchSupplier_EditValueChanged;
getSuppler();
}
-
+ public bool IsReadly { get; set; }
private string _KeyFile = "";
public string KeyFile
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index b2d40cb..6f07343 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -229,7 +229,7 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- UserControl.ShowLogcs frm = new ShowLogcs();
+ UserControl.ShowLogcs frm = new ShowLogcs(this.guidKey);
frm.ShowDialog();
}
--
Gitblit v1.9.3