From 200b60701072ff421156d7fd3c4fecf1a3b5bdb3 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 07 九月 2025 10:58:58 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index 0e26bbc..e334ef9 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -32,6 +32,7 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.btnBaoGaoClick += ToolBarMenu1_btnBaoGaoClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -444,8 +445,12 @@
//2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
txt_lotNo.Enabled = false;
txt_kbList.Enabled = false;
- // txt_fPurchaserId.IsReadly = true;
-
+ //txt_fPurchaserId.IsReadly = true;
+ this.txt_msg.Enabled = true;
+ this.txt_fngHandle.Enabled = true;
+ this.txt_zrType.Enabled = true;
+ this.txt_fzrId.Enabled = true;
+ this.txt_fmrmode.Enabled = true;
}
/// <summary>
@@ -671,7 +676,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and daa.erp_sczz in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -762,11 +771,6 @@
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
getGxList(dy.aboutGuid.ToString());
-
- //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
- txt_lotNo.Enabled = false;
- txt_kbList.Enabled = false;
- // txt_fPurchaserId.IsReadly = true;
}
else
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -922,6 +926,37 @@
frm.ShowDialog();
}
+ //鐢熶骇鎶ュ憡
+ private void ToolBarMenu1_btnBaoGaoClick(object sender, EventArgs e)
+ {
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_releaseNo, gridView1, "releaseNo");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ var _obj = new
+ {
+ guid = rowGuid,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetBaoGao", JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ MsgHelper.ShowInformation("鐢熸垚鎴愬姛");
+ }
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
/// <summary>
/// 妫�楠屽拰鍙嶆楠�
--
Gitblit v1.9.3