From f5570a2f60dc9b9c201dcc8b227510a89bf69042 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 01 七月 2025 11:29:32 +0800
Subject: [PATCH] 工序增加是否追溯码
---
DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
index c753744..7ee0e9c 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
@@ -18,17 +18,17 @@
string _strTag = "N:涓嶅悎鏍�";
List<FilterEntity> _filterList = new List<FilterEntity>();
- public string strType = "";//iqc type
+ public string strType = "";//鐢熶骇閫�鏂� type
public RkDetect01(string _strType)
{
InitializeComponent();
strType = _strType;
}
- protected override void OnCreateControl() {
+ protected override void OnCreateControl()
+ {
base.OnCreateControl();
if (Parent == null) return;
-
this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
@@ -60,6 +60,16 @@
xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
btnIpt.Click += BtnIpt_Click;
+ string rptName = "";
+ if (strType == QcSeason.鐢熶骇閫�鏂欏叆搴撴.ToString())
+ rptName = "rpt_SCTL";
+ else
+ if (strType == QcSeason.鍏跺畠鍏ュ簱妫�.ToString())
+ rptName = "rpt_Qtrk";
+ else
+ if (strType == QcSeason.閿�鍞��璐у叆搴撴.ToString())
+ rptName = "rpt_Xsth";
+
this.ucBtnPrint1.btnPrintClick += (s, e) =>
{
ucBtnPrint1.guidKey = "";
@@ -85,7 +95,8 @@
this.ucBtnPrint1.rptParameter = "return false";
return;
}
- this.ucBtnPrint1.rptParameter = "rpt_SCTL{" + rowGuid.Trim()
+
+ this.ucBtnPrint1.rptParameter = rptName + "{" + rowGuid.Trim()
+ "," + ""
+ "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
+ "," + txt_iCount_1.Text.Trim()
@@ -95,7 +106,7 @@
this.ucBtnPrint1.btnAllClick += (s, e) =>
{
string rowGuid = txt_aboutGuid.Text.Trim();
- SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "閲囪喘鍏ュ簱");
+ SelectDeleteBar frm = new SelectDeleteBar(rowGuid, strType);
string strCodeList = "";
frm.UpdateParent += (ss, ee) =>
{
@@ -106,7 +117,7 @@
return;
try
{
- string rptParameter = "rpt_SCTL{"
+ string rptParameter = rptName + "{"
+ "100"
+ "," + ""
+ "," + ""
@@ -410,7 +421,6 @@
txt_rkCkId.Focus();
return;
}
-
if (txt_fcheckResu.Text.Trim() == _strTag && string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim()))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("褰撴楠岀粨鏋滀笉鍚堟牸鏃讹紝璇峰～鍐欏娉ㄨ鏄庯紒");
@@ -455,7 +465,7 @@
private void getPageList(int curPage)
{
gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", " and a.order_type='"+ strType + "' " + _sbSqlWhere.ToString());
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", " and a.order_type='" + strType + "' " + _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
{
@@ -521,7 +531,7 @@
gvList.Add(gvMx1);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
string strCk = dy.rkCkId;
- txt_rkCkId.getSuppler(txt_tlOrg.Text.Trim(), strCk);
+ txt_rkCkId.getSuppler(txt_receiveOrgId.Text.Trim(), strCk);
setEable(isEdit);
txtQuantity.Text = dy["fbatchQty"].ToString();
txt_kQty.Text = dy["kdy"].ToString();
@@ -578,11 +588,11 @@
}
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
--
Gitblit v1.9.3