From 062c6a8d88046f555a9d4e0bae0ec8cada7e216d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 03 七月 2025 11:28:14 +0800
Subject: [PATCH] 返工
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs | 125 +++++++++++++++++++++++++++--------------
DevApp/Gs.DevApp/UserControl/UcLookGx.cs | 5 -
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 2
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 2
4 files changed, 88 insertions(+), 46 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index 3d36ed3..a6fbbc1 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -117,6 +117,8 @@
};
// 璇诲彇缂洪櫡绛夌骇
getRptDefectLevel();
+ //宸ュ簭
+ txt_fmrmode.getSuppler("", " and isnull(isBack,0)=1");
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
index 4f5078f..03b9a8c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -29,16 +29,16 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -114,6 +114,7 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -131,6 +132,7 @@
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
@@ -473,38 +475,38 @@
this.layoutControlItem18});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6});
+ rowDefinition7,
+ rowDefinition8,
+ rowDefinition9,
+ rowDefinition10,
+ rowDefinition11,
+ rowDefinition12});
this.Root.Size = new System.Drawing.Size(828, 191);
this.Root.TextVisible = false;
//
@@ -925,7 +927,8 @@
this.gridColumn1,
this.gridColumn4,
this.gridColumn14,
- this.gridColumn15});
+ this.gridColumn15,
+ this.gridColumn24});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1004,6 +1007,7 @@
this.gridColumn3.FieldName = "quantity";
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 6;
this.gridColumn3.Width = 94;
@@ -1026,6 +1030,7 @@
this.gridColumn2.FieldName = "processNo";
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.OptionsColumn.ReadOnly = true;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 7;
this.gridColumn2.Width = 94;
@@ -1036,6 +1041,7 @@
this.gridColumn1.FieldName = "badDescription";
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Width = 94;
//
// gridColumn4
@@ -1044,6 +1050,7 @@
this.gridColumn4.FieldName = "checkResult";
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.ReadOnly = true;
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 8;
this.gridColumn4.Width = 94;
@@ -1054,6 +1061,7 @@
this.gridColumn14.FieldName = "createBy";
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 9;
this.gridColumn14.Width = 94;
@@ -1064,9 +1072,21 @@
this.gridColumn15.FieldName = "createDate";
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.OptionsColumn.ReadOnly = true;
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 10;
this.gridColumn15.Width = 94;
+ //
+ // gridColumn24
+ //
+ this.gridColumn24.Caption = "鏁版嵁鐘舵��";
+ this.gridColumn24.FieldName = "barCodeStatusTxt";
+ this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.Name = "gridColumn24";
+ this.gridColumn24.OptionsColumn.ReadOnly = true;
+ this.gridColumn24.Visible = true;
+ this.gridColumn24.VisibleIndex = 11;
+ this.gridColumn24.Width = 94;
//
// tabMxPage2
//
@@ -1103,7 +1123,8 @@
this.gridColumn20,
this.gridColumn21,
this.gridColumn22,
- this.gridColumn23});
+ this.gridColumn23,
+ this.gridColumn25});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1182,6 +1203,7 @@
this.gridColumn16.FieldName = "quantity";
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.OptionsColumn.ReadOnly = true;
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 6;
this.gridColumn16.Width = 94;
@@ -1204,6 +1226,7 @@
this.gridColumn18.FieldName = "processNo";
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.OptionsColumn.ReadOnly = true;
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 7;
this.gridColumn18.Width = 94;
@@ -1214,6 +1237,7 @@
this.gridColumn19.FieldName = "badDescription";
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.OptionsColumn.ReadOnly = true;
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 8;
this.gridColumn19.Width = 94;
@@ -1224,6 +1248,7 @@
this.gridColumn20.FieldName = "checkResult";
this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.OptionsColumn.ReadOnly = true;
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 9;
this.gridColumn20.Width = 94;
@@ -1234,6 +1259,7 @@
this.gridColumn21.FieldName = "createBy";
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.OptionsColumn.ReadOnly = true;
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 10;
this.gridColumn21.Width = 94;
@@ -1244,6 +1270,7 @@
this.gridColumn22.FieldName = "createDate";
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.OptionsColumn.ReadOnly = true;
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 11;
this.gridColumn22.Width = 94;
@@ -1254,7 +1281,19 @@
this.gridColumn23.FieldName = "badReson";
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
+ this.gridColumn23.OptionsColumn.ReadOnly = true;
this.gridColumn23.Width = 94;
+ //
+ // gridColumn25
+ //
+ this.gridColumn25.Caption = "鏁版嵁鐘舵��";
+ this.gridColumn25.FieldName = "barCodeStatus";
+ this.gridColumn25.MinWidth = 25;
+ this.gridColumn25.Name = "gridColumn25";
+ this.gridColumn25.OptionsColumn.ReadOnly = true;
+ this.gridColumn25.Visible = true;
+ this.gridColumn25.VisibleIndex = 12;
+ this.gridColumn25.Width = 94;
//
// Frm_Work01
//
@@ -1433,5 +1472,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
private DevExpress.XtraEditors.TextEdit txt_dianJianPath;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 42e941b..e5d074d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -273,7 +273,7 @@
}
/// <summary>
- /// 澧炲姞鐢垫鍙栨暟鐨勫垪
+ /// 澧炲姞鐢垫锛屾按妫�鐨勫垪
/// </summary>
public void addColumn()
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookGx.cs b/DevApp/Gs.DevApp/UserControl/UcLookGx.cs
index e7de230..d5ae8e4 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookGx.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookGx.cs
@@ -14,7 +14,7 @@
lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
lookSearchSupplier.EditValueChanged +=
LookSearchSupplier_EditValueChanged;
- getSuppler("");
+ //getSuppler("");
}
@@ -37,10 +37,9 @@
/// </summary>
/// <param name="orgId"></param>
/// <param name="_dftVale"></param>
- public void getSuppler(string _dftVale = "")
+ public void getSuppler(string _dftVale = "", string _keyWhere = "")
{
lookSearchSupplier.EditValue = null;
- string _keyWhere = "";
var pgq = new PageQueryModel(1, 999999, "a.processNo", "asc", "", " " + _keyWhere);
var json = JsonConvert.SerializeObject(pgq);
try
--
Gitblit v1.9.3