From af62767b86c19e8c2510765f8a5bb00b89bc68c8 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期四, 09 十月 2025 16:35:46 +0800
Subject: [PATCH] 成品检验报告修改
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs | 129 +++---------------------------------------
1 files changed, 11 insertions(+), 118 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
index 93230bb..4fc75e7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
@@ -58,7 +58,8 @@
if (string.IsNullOrEmpty(_orgId))
return;
txt_fCustId.getSuppler(_orgId, _ucKh);
- txt_fStockId.getSuppler(_orgId, _ucCk);
+ //2025-08-11鍔犱笂鍙兘鏄唬绠′粨
+ txt_fStockId.getSuppler(_orgId, _ucCk, " and a.depot_id in(select [浠撳簱Id] from [dbo].[浠撳簱灞炴� where [鏄惁浠ｇ鑹搧浠揮=1 )");
System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
sbWhere.Append(" and a.FSubsidiary ='" + _orgId + "'");
var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
@@ -75,92 +76,6 @@
{
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
- };
- gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
- this.ucBtnPrint1.btnPrintClick += (s, e) =>
- {
- ucBtnPrint1.guidKey = "";
- string rowGuid = lbMxGuid.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 (lbMxGuid.Text.Trim().Length < 10)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- this.ucBtnPrint1.rptParameter = "rpt_Strk{" + lbMxGuid.Text.Trim()
- + "," + ""
- + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
- + "," + txt_iCount_1.Text.Trim()
- + "," + txt_psnQty_1.Text.Trim()
- + "}";
- };
- this.ucBtnPrint1.btnAllClick += (s, e) =>
- {
- string rowGuid = lbMxGuid.Text.Trim();
- if (rowGuid.Length < 10)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
- this.ucBtnPrint1.rptParameter = "return false";
- return;
- }
- SelectDeleteBar frm = new SelectDeleteBar(rowGuid, QcSeason.鍙楁墭鍏ュ簱.ToString());
- string strCodeList = "";
- string strAction = "";
- frm.UpdateParent += (ss, ee) =>
- {
- strCodeList = ee.StringSingle;
- strAction = ee.Data;
- };
- frm.ShowDialog();
- if (string.IsNullOrEmpty(strCodeList))
- return;
- if (strAction == "print")
- {
- try
- {
- string rptParameter = "rpt_Strk{"
- + "100"
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + strCodeList
- + "}";
- using (Form rpt = new RptPreview(rowGuid, rptParameter))
- {
- rpt.ShowDialog();
- }
- frm.Close();
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError(ex.Message);
- }
- }
- };
- //鑷姩璁＄畻鎵撳嵃閲�
- txt_psnQty_1.TextChanged += (s, e) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
- };
- radOut.SelectedIndexChanged += (s, e) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -444,7 +359,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 a.FStockOrgId in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "billNo", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -702,9 +621,11 @@
{
getModel(lbGuid.Text.Trim());
}
- int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+ getPageList(this.pageBar1.CurrentPage);
+ int rowHandle = gridView1.LocateByValue("guid", rowGuid);
gridView1.FocusedRowHandle = rowHandle;
- UtilityHelper.SetCheckIco(gridView1, "isCheck", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
+
}
else
MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
@@ -712,34 +633,6 @@
catch (Exception ex)
{
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
- }
- }
- private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
- {
- if (e.FocusedRowHandle >= 0)
- {
- DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
- lbMxGuid.Text = row["guid"].ToString();
- ucBtnPrint1.guidKey = row["guid"].ToString();
- txtWlid.Text = row["itemNo"].ToString();
- txtWlgg.Text = row["itemModel"].ToString();
- txtWlmc.Text = row["itemName"].ToString();
- txtQuantity.Text = row["sqsl"].ToString();//鐢宠鎬婚噺
- txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
- txt_kQty.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
- }
- else
- {
- lbMxGuid.Text = "";
- ucBtnPrint1.guidKey = "";
- txtWlid.Text = "";
- txtWlgg.Text = "";
- txtWlmc.Text = "";
- txtQuantity.Text = "";
- txtYdy.Text = "";
- txt_kQty.Text = "";
- txt_psnQty_1.Text = "";
- txt_iCount_1.Text = "";
}
}
}
--
Gitblit v1.9.3