From 86b1ac119ea8f84ec32d4e4366c8ee0957412c6f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 24 六月 2025 14:41:44 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.cs | 20 +++++++++++++-------
DevApp/Gs.DevApp/App.config | 4 ++--
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs | 11 +++++++----
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs | 15 ++++++++++++++-
4 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index f77fd81..3d80851 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,9 +28,9 @@
</assemblyBinding>
</runtime>
<appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+ <add key="WebApiUrl" value="http://localhost:5263/" />
<!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs
index b8236e3..1f2f5c5 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.cs
@@ -224,6 +224,9 @@
{
lbGuid.Text = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
+ UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
+ frm_CqfaItems1.Clean();
+ frm_CqfaItems2.Clean();
//澧炲姞鏃讹紝榛樿缁勭粐
string deftOrg = UtilityHelper.GetFirstOrg(txt_fSubsidiary);
}
@@ -384,8 +387,8 @@
dynamic dy = _rtn.rtnData;
lbGuid.Text = strGuid;
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
- frm_CqfaItems1.Initialize(QcSeason.cqcjyes.ToString(), txt_fSubsidiary.GetId());
- frm_CqfaItems2.Initialize(QcSeason.cqcjno.ToString(), txt_fSubsidiary.GetId());
+ frm_CqfaItems1.Initialize(lbGuid.Text.Trim(), QcSeason.cqcjyes.ToString(), txt_fSubsidiary.GetId());
+ frm_CqfaItems2.Initialize(lbGuid.Text.Trim(), QcSeason.cqcjno.ToString(), txt_fSubsidiary.GetId());
}
else
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -493,8 +496,8 @@
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg.ToString());
- frm_CqfaItems1.Initialize(QcSeason.cqcjyes.ToString(), txt_fSubsidiary.GetId());
- frm_CqfaItems2.Initialize(QcSeason.cqcjno.ToString(), txt_fSubsidiary.GetId());
+ frm_CqfaItems1.Initialize(lbGuid.Text.Trim(), QcSeason.cqcjyes.ToString(), txt_fSubsidiary.GetId());
+ frm_CqfaItems2.Initialize(lbGuid.Text.Trim(), QcSeason.cqcjno.ToString(), txt_fSubsidiary.GetId());
}
else
MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs
index 7db4b40..899819a 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.Designer.cs
@@ -39,6 +39,7 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMain)).BeginInit();
this.SuspendLayout();
@@ -68,7 +69,8 @@
this.gv_salesOrderId,
this.gv_orderLineId,
this.gridColumn1,
- this.gv_itemId});
+ this.gv_itemId,
+ this.gridColumn3});
this.gvMain.GridControl = this.gcMain;
this.gvMain.IndicatorWidth = 50;
this.gvMain.Name = "gvMain";
@@ -176,6 +178,16 @@
this.pageBar1.TabIndex = 10;
this.pageBar1.TotalPages = 0;
//
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鏂规缂栫爜";
+ this.gridColumn3.FieldName = "fabm";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 6;
+ this.gridColumn3.Width = 94;
+ //
// Frm_CqfaItems
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -203,5 +215,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.cs
index 18f4e7d..af73aae 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_CqfaItems.cs
@@ -15,6 +15,7 @@
{
string strType = "";
string orgId = "";
+ string pGuid = "";
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesQmCheckitemManager/";
public Frm_CqfaItems()
@@ -31,13 +32,17 @@
pageBar1.PagerEvent += PageBar1_PagerEvent;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gvMain);
}
- public void Initialize(string _strType,string _orgId)
+ public void Initialize(string _pGuid, string _strType, string _orgId)
{
- strType=_strType;
- orgId=_orgId;
+ strType = _strType;
+ orgId = _orgId;
+ pGuid = _pGuid;
getPageList(1);
}
-
+ public void Clean()
+ {
+ gcMain.DataSource = null;
+ }
#region 婧愮墿鏂欐暟鎹粦瀹�
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -65,8 +70,9 @@
{
gcMain.DataSource = null;
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- _sbSqlWhere += " and org.fid=" + orgId + "";
- var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), strType);
+ _sbSqlWhere += " and org.fid=" + orgId + "";
+ //杩欎釜pguid锛屼綔涓烘柟妗堢殑涓婚敭
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", pGuid, _sbSqlWhere.ToString(), strType);
var json = JsonConvert.SerializeObject(pgq);
try
{
@@ -126,6 +132,6 @@
}
-
+
}
}
--
Gitblit v1.9.3