From 3c6cad1224e7cb985f03d15cc98a4a2074a5af49 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 22 十二月 2025 22:25:33 +0800
Subject: [PATCH] 增加轮播看板
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 142 ++++++++++++++++++++++++++++++++++------------
1 files changed, 104 insertions(+), 38 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index cd949a4..a0c5e50 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -1,4 +1,3 @@
-using DevExpress.XtraEditors;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sales;
using Gs.DevApp.Entity;
@@ -34,6 +33,7 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -50,40 +50,11 @@
}, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //鎵撳嵃浜嬩欢
+ #region 鎵撳嵃鐩稿叧
+ //棰勮鎵撳嵃浜嬩欢
this.ucBtnPrint1.btnPrintClick += (s, e) =>
{
- 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_Xsth{"
- + lbMxGuid.Text.Trim()//鍏宠仈涓婚敭
- + "," + ""
- + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())//浣欐暟
- + "," + txt_iCount_1.Text.Trim()//寮犳暟
- + "," + txt_psnQty_1.Text.Trim()//姣忓紶鏉＄爜鏁伴噺
- + "}";
- txt_iCount_1.Text = "";
- txt_psnQty_1.Text = "";
+ _print(0);
};
//鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
this.ucBtnPrint1.btnAllClick += (s, e) =>
@@ -124,6 +95,11 @@
}
}
};
+ //鐩存帴鎵撳嵃浜嬩欢
+ this.ucBtnPrint1.btnZhiJieClick += (s, e) =>
+ {
+ _print(1);
+ };
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
//鎵撳嵃鑷姩璁＄畻
txt_psnQty_1.TextChanged += (s, e) =>
@@ -134,6 +110,46 @@
{
Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
+ //鍏ㄩ儴鎵撳嵃
+ ucBtnPrintAll1.btnPrintClick += (s, e) =>
+ {
+ this.ucBtnPrintAll1.rptType = "";
+ this.ucBtnPrintAll1.mxList = null;
+ if (string.IsNullOrEmpty(lbGuid.Text.Trim()))
+ {
+ MsgHelper.ShowError("鎻愮ず锛氭墦鍗板墠璇峰厛淇濆瓨鍗曟嵁锛�");
+ return;
+ }
+ getModel(lbGuid.Text.Trim());
+ List<dynamic> lst = new List<dynamic>();
+ DataTable dt = (DataTable)gcMx1.DataSource;
+ foreach (DataRow row in dt.Rows)
+ {
+ string guid = row["guid"].ToString();
+ string psnQty = row["kdy"].ToString();
+ if (string.IsNullOrEmpty(psnQty))
+ {
+ continue;
+ }
+ if (psnQty == "0")
+ {
+ continue;
+ }
+ lst.Add(new
+ {
+ guid = guid,
+ kdy = psnQty,
+ });
+ }
+ if (lst.Count <= 0)
+ {
+ MsgHelper.ShowError("鎻愮ず锛氭殏鏃犲彲鎵撳嵃鐨勭墿鏂欙紒");
+ return;
+ }
+ this.ucBtnPrintAll1.rptType = "rpt_Xsth";
+ this.ucBtnPrintAll1.mxList = lst;
+ };
+ #endregion
//閿�鍞粍缁�
txt_salesOrg.EditChanged += (s, e) =>
{
@@ -190,7 +206,7 @@
_row["itemModel"] = dym.itemModel;//瑙勬牸鍨嬪彿,
_row["xxDw"] = dym.xxDw;
_row["salesQuantity"] = dym.salesQuantity;
- _row["isFreeChk"] = dym.isFreeChk;
+ _row["isFreeChk"] = false;
_row["fhQuantity"] = dym.fhQuantity;
gvMx1.UpdateCurrentRow();
_Table.Rows.Add(_row);
@@ -233,7 +249,7 @@
_row["itemModel"] = dym.itemModel;//瑙勬牸鍨嬪彿,
_row["xxDw"] = dym.xxDw;
_row["salesQuantity"] = dym.salesQuantity;
- _row["isFreeChk"] = dym.isFreeChk;
+ _row["isFreeChk"] = false;
_row["fhQuantity"] = dym.fhQuantity;
gvMx1.UpdateCurrentRow();
_Table.Rows.Add(_row);
@@ -275,7 +291,7 @@
_row["itemModel"] = dym.itemModel;//瑙勬牸鍨嬪彿,
_row["xxDw"] = dym.xxDw;
_row["salesQuantity"] = dym.salesQuantity;
- _row["isFreeChk"] = dym.isFreeChk;
+ _row["isFreeChk"] = false;
_row["fhQuantity"] = dym.fhQuantity;
gvMx1.UpdateCurrentRow();
_Table.Rows.Add(_row);
@@ -306,6 +322,44 @@
};
}
+ /// <summary>
+ /// 鎵撳嵃
+ /// </summary>
+ /// <param name="type">0琛ㄧず棰勮鎵撳嵃锛�1琛ㄧず鐩存帴鎵撳嵃</param>
+ private void _print(int type)
+ {
+ 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_Xsth{"
+ + lbMxGuid.Text.Trim()//鍏宠仈涓婚敭
+ + "," + ""
+ + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())//浣欐暟
+ + "," + txt_iCount_1.Text.Trim()//寮犳暟
+ + "," + txt_psnQty_1.Text.Trim()//姣忓紶鏉＄爜鏁伴噺
+ + "}";
+ txt_iCount_1.Text = "";
+ txt_psnQty_1.Text = "";
+ }
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -606,6 +660,7 @@
Thlx = (row["returnType"].ToString()),
Thrq = (row["returnDate"].ToString()),
ItemId = (row["ItemId"].ToString()),
+ IsFreeChk = (row["IsFreeChk"].ToString()),
});
}
}
@@ -773,8 +828,16 @@
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
-
-
+ /// <summary>
+ /// 瀹岀粨
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
+ {
+ _toolCk(2);
+ }
/// <summary>
/// 瀹℃牳浜嬩欢
/// </summary>
@@ -811,6 +874,9 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
+ case 2:
+ strMsg = "瀹岀粨";
+ break;
}
;
toolBarMenu1.guidKey = "";
--
Gitblit v1.9.3