From 0e9ba4ee9ee5c37a9379de1d352fd4973d3691f7 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 02 八月 2025 08:56:20 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 11 ++++++++---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs | 32 ++++++++++++++++----------------
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 4 +++-
3 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
index 04c4e34..531952a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
@@ -84,6 +84,7 @@
this.txt_fSubsidiary = new DevExpress.XtraEditors.TextEdit();
this.txt_depotId = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -99,7 +100,6 @@
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.sp_fSubsidiary = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -166,6 +166,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -181,7 +182,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.sp_fSubsidiary)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -497,7 +497,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 16;
+ this.gridColumn11.VisibleIndex = 17;
this.gridColumn11.Width = 94;
//
// gridColumn9
@@ -507,7 +507,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 17;
+ this.gridColumn9.VisibleIndex = 16;
this.gridColumn9.Width = 94;
//
// gridColumn10
@@ -741,6 +741,17 @@
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem13.TextVisible = false;
//
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_depotId;
+ this.layoutControlItem15.Location = new System.Drawing.Point(828, 87);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(278, 30);
+ this.layoutControlItem15.Text = "浠撳簱ID";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -938,17 +949,6 @@
this.sp_fSubsidiary.Size = new System.Drawing.Size(276, 30);
this.sp_fSubsidiary.Text = "鐢熶骇缁勭粐";
this.sp_fSubsidiary.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_depotId;
- this.layoutControlItem15.Location = new System.Drawing.Point(828, 87);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(278, 30);
- this.layoutControlItem15.Text = "浠撳簱ID";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// tabMx
//
@@ -1342,6 +1342,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1357,7 +1358,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.sp_fSubsidiary)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index b7e3ad6..bff9872 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -47,7 +47,12 @@
//绫诲瀷锛宨qc,ipqc宸℃锛宨pqc棣栨鏌�,fqc锛宨qc鐨勬牱鍝佸�奸粯璁や负5锛屽叾瀹冧负1
txt_ftype.Text = strType;
if (strType == QcSeason.iqc.ToString())
- dfValue = 5;
+ {
+ dfValue = 5;
+ gvMx1.Columns["funit"].Visible = true;
+ gvMx1.Columns["funit"].VisibleIndex = 13;
+ gvMx1.Columns["fcheckType"].Visible = false;
+ }
if (strType == QcSeason.fqc.ToString())
{
dfValue = 0;
@@ -57,13 +62,13 @@
{
dfValue = 0;
gvMx1.Columns["ypsl"].Visible = false;
- gvMx1.Columns["funit"].Visible = true;
- gvMx1.Columns["funit"].VisibleIndex = 13;
+
}
//濡傛灉鏄痠pqc宸℃锛屾樉绀哄伐浣�
if (strType != QcSeason.ipqc宸℃.ToString())
{
gvMx1.Columns["stationName"].Visible = false;
+ gvMx1.Columns["fcheckType"].Visible = false;
}
//鏂拌鍒濆鍊�
this.gvMx1.InitNewRow += (s, e) =>
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 9e8b054..d0799b7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -256,8 +256,10 @@
lbSum3.Text = dy.lbSum3;
lbSum4.Text = dy.lbSum4;
prog1.Position = dy.jd;
- //鑹搧鍒楄〃
txt_barCode.ReadOnly = false;
+ if (txt_gx.Text.Trim() == fGxShouJian)
+ txt_gongWei.ReadOnly = false;
+ //鑹搧鍒楄〃
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
--
Gitblit v1.9.3