From 21b23802a3f32aebcfb77fcebda1e7cc956e21dd Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期二, 02 十二月 2025 10:26:00 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~kyy/LB_MesClient
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 196 +++++++++++++++++++++++++------------------------
1 files changed, 100 insertions(+), 96 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index 181488c..bbcec6c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -53,80 +53,50 @@
#region 鎵撳嵃鐩稿叧 2025-10-18
+ // -------------------- gvMx1 鎵撳嵃浜嬩欢 --------------------
//娴忚鎵撳嵃浜嬩欢
this.ucBtnPrint1.btnPrintClick += (s, e) =>
{
- _print(0);
+ _print(0);
};
-
+ //鐩存帴鎵撳嵃浜嬩欢
+ this.ucBtnPrint1.btnZhiJieClick += (s, e) =>
+ {
+ _print(1);
+ };
+
//鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
this.ucBtnPrint1.btnAllClick += (s, e) =>
{
string rowGuid = lbMxGuid.Text.Trim();
SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "閲囪喘鍏ュ簱");
- 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_Arrival{"
- + "100"//閲嶆墦閮芥槸浼�100锛�
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + strCodeList
- + "}";
- using (Form rpt = new RptPreview(rowGuid, rptParameter))
- {
- rpt.ShowDialog();
- }
- frm.Close();
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError(ex.Message);
- }
- }
-
+ _print100(rowGuid, frm);//閲嶆墦閮芥槸浼�100锛�
};
- //鐩存帴鎵撳嵃浜嬩欢
- this.ucBtnPrint1.btnZhiJieClick += (s, e) =>
- {
- _print(1);
-
- };
+
// -------------------- gvMx3 鎵撳嵃浜嬩欢 --------------------
this.ucBtnPrint2.btnPrintClick += (s, e) =>
{
_print2(0);
};
-
//鐩存帴鎵撳嵃浜嬩欢
this.ucBtnPrint2.btnZhiJieClick += (s, e) =>
{
_print2(1);
-
};
-
- // gvMx3 鎵归噺鎵撳嵃浜嬩欢
+ // gvMx1 1鎵撳嵃浜嬩欢
this.ucBtnPrint2.btnAllClick += (s, e) =>
{
// string rowGuid = lbMxGuid3.Text.Trim(); // 浣跨敤gvMx3鐨凣UID
string rowGuid = txt_releaseNo.Text.Trim();
SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "鍒拌揣鏉＄爜锛堝悎骞讹級鐮�"); // 鏍囬鍖哄垎鏉ユ簮
+
+
+ // _print100(rowGuid, frm);//閲嶆墦閮芥槸浼�100锛�
+
+
string strCodeList = "";
string strAction = "";
frm.UpdateParent += (ss, ee) =>
@@ -161,68 +131,36 @@
}
}
+
};
- // --------------------gvMx3 ucBtnPrintOne1 鎵归噺鎵撳嵃浜嬩欢锛堜紭鍖栫増锛�--------------------
+
+ // --------------------gvMx1 ucBtnPrintOne1 鏄庣粏鎵撳嵃浜嬩欢锛堜紭鍖栫増锛�--------------------
//涓�閿墦鍗颁簨浠�
this.ucBtnPrintOne1.btnPrintClick += (s, e) =>
{
- string mainGuid = lbGuid.Text.Trim();
- ucBtnPrintOne1.guidKey = mainGuid;
- this.ucBtnPrintOne1.rptParameter = "rpt_Arrival{"
- + "101"//涓�閿墦鍗�101
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + ""
- + "}";
-
- txt_iCount_1.Text = "";
- txt_psnQty_1.Text = "";
+ _print3(101); //涓�閿墦鍗�101
};
-
-
this.ucBtnPrintOne1.btnAllClick += (s, e) =>
{
string mainGuid = lbGuid.Text.Trim();
SelectDeleteBar frm = new SelectDeleteBar(mainGuid, "鎵归噺鏉＄爜"); // 鏍囬鍖哄垎鏉ユ簮
- 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_Arrival{"
- + "100"//閲嶆墦閮芥槸浼�100锛�
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + strCodeList
- + "}";
- using (Form rpt = new RptPreview(mainGuid, rptParameter))
- {
- rpt.ShowDialog();
- }
- frm.Close();
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError(ex.Message);
- }
- }
+ _print100(mainGuid, frm);//閲嶆墦閮芥槸浼�100锛�
};
+ // --------------------gvMx3 ucBtnPrintOne2 鍚堝苟鎵归噺鎵撳嵃浜嬩欢锛堜紭鍖栫増锛�--------------------
-
+ //涓�閿墦鍗颁簨浠�
+ this.ucBtnPrintOne2.btnPrintClick += (s, e) =>
+ {
+ _print4(102); //涓�閿悎骞舵墦鍗�102
+ };
+ this.ucBtnPrintOne2.btnAllClick += (s, e) =>
+ {
+ string mainGuid = lbGuid.Text.Trim();
+ SelectDeleteBar frm = new SelectDeleteBar(mainGuid, "鎵归噺鏉＄爜"); // 鏍囬鍖哄垎鏉ユ簮
+ _print100(mainGuid, frm);//閲嶆墦閮芥槸浼�100锛�
+ };
//鏄庣粏琛屽垏鎹簨浠�
// 鍏抽敭锛氱粦瀹歡vMx1鍜実vMx3鐨勭劍鐐硅鍙樺寲浜嬩欢
@@ -339,7 +277,6 @@
txt_iCount_1.Text = "";
txt_psnQty_1.Text = "";
}
-
private void _print2(int type)
{
string rowGuid = txt_releaseNo.Text.Trim(); // 鏂板lbMxGuid3鐢ㄤ簬瀛樺偍gvMx3鐨勯�変腑琛孏UID
@@ -380,7 +317,74 @@
txt_iCount_2.Text = "";
txt_psnQty_2.Text = "";
}
+ private void _print3(int type)
+ {
+ string mainGuid = lbGuid.Text.Trim();
+ ucBtnPrintOne1.guidKey = mainGuid;
+ this.ucBtnPrintOne1.rptParameter = "rpt_Arrival{"
+ + type
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "}";
+ txt_iCount_1.Text = "";
+ txt_psnQty_1.Text = "";
+ }
+ private void _print4(int type)
+ {
+ string mainGuid = lbGuid.Text.Trim();
+ ucBtnPrintOne2.guidKey = mainGuid;
+ this.ucBtnPrintOne2.rptParameter = "rpt_Arrival{"
+ + type
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "}";
+
+ txt_iCount_1.Text = "";
+ txt_psnQty_1.Text = "";
+ }
+ private void _print100(string mainGuid, SelectDeleteBar frm)
+ {
+
+ 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_Arrival{"
+ + "100"//閲嶆墦閮芥槸浼�100锛�
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(mainGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
+ }
+ }
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
--
Gitblit v1.9.3