From d4e0269da1cc87d42918cdda6afaa005b6c47a0e Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期三, 19 十一月 2025 13:40:46 +0800
Subject: [PATCH] 按大类维护
---
DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs | 87 +++++++++++++++++++++++++++----------------
1 files changed, 54 insertions(+), 33 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
index bfab458..b3d3f5a 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
@@ -1,4 +1,5 @@
-锘縰sing Gs.DevApp.DevFrm.QC;
+锘縰sing DevExpress.XtraLayout.Customization;
+using Gs.DevApp.DevFrm.QC;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -91,40 +92,11 @@
layoutControlItem27.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
tabMxPage3.PageVisible = false;
}
-
+ #region 鎵撳嵃鐩稿叧
this.ucBtnPrint1.btnPrintClick += (s, e) =>
- {
- ucBtnPrint1.guidKey = "";
- string rowGuid = txt_aboutGuid.Text.Trim();
- ucBtnPrint1.guidKey = rowGuid;
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
- txt_iCount_1.Focus();
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
- txt_psnQty_1.Focus();
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- if (rowGuid.Length < 10)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
-
- this.ucBtnPrint1.rptParameter = rptName + "{" + rowGuid.Trim()
- + "," + ""
- + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
- + "," + txt_iCount_1.Text.Trim()
- + "," + txt_psnQty_1.Text.Trim()
- + "}";
- };
+ _print(0, rptName);
+ };
this.ucBtnPrint1.btnAllClick += (s, e) =>
{
string rowGuid = txt_aboutGuid.Text.Trim();
@@ -163,6 +135,10 @@
}
}
};
+ this.ucBtnPrint1.btnZhiJieClick += (s, e) =>
+ {
+ _print(1, rptName);
+ };
//鑷姩璁＄畻鎵撳嵃閲�
txt_psnQty_1.TextChanged += (s, e) =>
{
@@ -172,6 +148,45 @@
{
Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
+ #endregion
+
+ }
+ /// <summary>
+ /// 鎵撳嵃
+ /// </summary>
+ /// <param name="type">0琛ㄧず棰勮鎵撳嵃锛�1琛ㄧず鐩存帴鎵撳嵃</param>
+ private void _print(int type, string rptName)
+ {
+ ucBtnPrint1.guidKey = "";
+ string rowGuid = txt_aboutGuid.Text.Trim();
+ ucBtnPrint1.guidKey = rowGuid;
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
+ txt_iCount_1.Focus();
+ this.ucBtnPrint1.rptParameter = "return false";
+ return;
+ }
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
+ txt_psnQty_1.Focus();
+ this.ucBtnPrint1.rptParameter = "return false";
+ return;
+ }
+ if (rowGuid.Length < 10)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
+ this.ucBtnPrint1.rptParameter = "return false";
+ return;
+ }
+
+ this.ucBtnPrint1.rptParameter = rptName + "{" + rowGuid.Trim()
+ + "," + ""
+ + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
+ + "," + txt_iCount_1.Text.Trim()
+ + "," + txt_psnQty_1.Text.Trim()
+ + "}";
}
/// <summary>
/// 鎵归噺褰曞叆
@@ -502,11 +517,17 @@
{
gcMain1.DataSource = null;
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.ReceiveOrgId in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
if (strType == QcSeason.鍏跺畠鍏ュ簱妫�.ToString())
{
_sbSqlWhere.Append(" and isnull(qtrk.qt028,0)=1 and isnull(qtrk.qt032,0)=1 and isnull(qtrk.qt015,0)=1 ");
}
+ if (strType == QcSeason.鍙楁墭鍏ュ簱.ToString())
+ {
+ _sbSqlWhere.Append(" and isnull(st.isCheck,0)=1 and isnull(st.qt032,0)=1");
+ }
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", " and a.order_type='" + strType + "' " + _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
--
Gitblit v1.9.3