From 91777cd07bb42802b2ac730cc6c35750ab7cc69e Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期二, 25 十一月 2025 15:13:32 +0800
Subject: [PATCH] 1、erp推送报表2、其他新增显示字段

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs |  471 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 238 insertions(+), 233 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index 15cfca1..bbcec6c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -33,14 +33,15 @@
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
-            }, tips, true, (strGuid) => {
+            }, tips, true, (strGuid) =>
+            {
                 getModelList(strGuid);
             });
             Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
             {
-               
+
                 getModel(value);
-           
+
 
             }, (value) =>
             {
@@ -48,130 +49,54 @@
             }, lbGuid);
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-            //鎵撳嵃浜嬩欢
+
+
+            #region 鎵撳嵃鐩稿叧 2025-10-18 
+
+            // -------------------- gvMx1 鎵撳嵃浜嬩欢 --------------------
+            //娴忚鎵撳嵃浜嬩欢
             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_Arrival{"
-                       + 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.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锛�  
             };
+
+      
 
             // -------------------- gvMx3 鎵撳嵃浜嬩欢 --------------------
-           
             this.ucBtnPrint2.btnPrintClick += (s, e) =>
             {
-                string rowGuid = txt_releaseNo.Text.Trim(); // 鏂板lbMxGuid3鐢ㄤ簬瀛樺偍gvMx3鐨勯�変腑琛孏UID
-                ucBtnPrint2.guidKey = rowGuid;
-
-                // 楠岃瘉杈撳叆锛堜娇鐢╣vMx3瀵瑰簲鐨勮緭鍏ユ帶浠讹級
-                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_2.Text.Trim(), txt_yuliang_2.Text.Trim()))
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�");
-                    txt_iCount_2.Focus();
-                    this.ucBtnPrint2.rptParameter = "return false";
-                    return;
-                }
-                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_2.Text.Trim()))
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�");
-                    txt_psnQty_2.Focus();
-                    this.ucBtnPrint2.rptParameter = "return false";
-                    return;
-                }
-                if (rowGuid.Length < 10)
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
-                    this.ucBtnPrint2.rptParameter = "return false";
-                    return;
-                }
-
-                // 缁勮鎵撳嵃鍙傛暟锛堜娇鐢╣vMx3鐨勬帶浠跺�硷級
-                this.ucBtnPrint2.rptParameter = "rpt_Arrival_Hb{"
-                       + rowGuid//鍏宠仈涓婚敭锛坓vMx3鐨凣UID锛�
-                       + "," + ""
-                       + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_2.Text.Trim())//浣欐暟
-                       + "," + txt_iCount_2.Text.Trim()//寮犳暟
-                       + "," + txt_psnQty_2.Text.Trim()//姣忓紶鏉$爜鏁伴噺
-                       + "}";
-
-                // 娓呯┖杈撳叆妗�
-                txt_iCount_2.Text = "";
-                txt_psnQty_2.Text = "";
+                _print2(0);
             };
-            // gvMx3 鎵归噺鎵撳嵃浜嬩欢
+            //鐩存帴鎵撳嵃浜嬩欢
+            this.ucBtnPrint2.btnZhiJieClick += (s, e) =>
+            {
+                _print2(1);
+            };
+            // 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) =>
@@ -206,104 +131,36 @@
                     }
                 }
 
+
             };
 
+            // --------------------gvMx1 ucBtnPrintOne1  鏄庣粏鎵撳嵃浜嬩欢锛堜紭鍖栫増锛�--------------------
 
-            // --------------------gvMx3 ucBtnPrintOne1 鎵归噺鎵撳嵃浜嬩欢锛堜紭鍖栫増锛�--------------------
+            //涓�閿墦鍗颁簨浠�
             this.ucBtnPrintOne1.btnPrintClick += (s, e) =>
             {
-                // 1. 鍩虹楠岃瘉锛氫富琛ㄨ閫夋嫨
+                _print3(101); //涓�閿墦鍗�101
+            };
+            this.ucBtnPrintOne1.btnAllClick += (s, e) =>
+            {
                 string mainGuid = lbGuid.Text.Trim();
-                if (string.IsNullOrEmpty(mainGuid) || mainGuid.Length < 10)
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛鍦ㄤ富琛ㄤ腑閫夋嫨鏁版嵁琛岋紒");
-                    this.ucBtnPrintOne1.rptParameter = "return false";
-                    return;
-                }
-
-                // 2. 鑾峰彇鏄庣粏鏁版嵁婧�
-                DataTable dtDetails = gcMx3.DataSource as DataTable;
-                if (dtDetails == null || dtDetails.Rows.Count == 0)
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("褰撳墠涓昏〃鏃犲叧鑱旂殑鏄庣粏鏁版嵁锛岃鍏堝姞杞芥槑缁嗭紒");
-                    this.ucBtnPrintOne1.rptParameter = "return false";
-                    return;
-                }
-
-                // 3. 绛涢�夊彲鎵撳嵃鏄庣粏锛堥�昏緫涓嶅彉锛�
-                List<string> validReleaseNos = new List<string>();
-                List<string> validPrintQtys = new List<string>();
-                string releaseNoField = "releaseNo";
-
-                if (!dtDetails.Columns.Contains(releaseNoField))
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError($"鏄庣粏鏁版嵁婧愮己灏戝繀瑕佸瓧娈碉細{releaseNoField}");
-                    this.ucBtnPrintOne1.rptParameter = "return false";
-                    return;
-                }
-
-                foreach (DataRow row in dtDetails.Rows)
-                {
-                    string rowReleaseNo = row[releaseNoField]?.ToString()?.Trim() ?? "";
-                    if (string.IsNullOrEmpty(rowReleaseNo) || rowReleaseNo.Length < 5)
-                    {
-                        Gs.DevApp.ToolBox.MsgHelper.ShowError($"璺宠繃鏃犳晥鏄庣粏琛岋細缂哄皯鎴栨棤鏁堢殑releaseNo");
-                        continue;
-                    }
-
-                    string kQtyStr = row["kQty"]?.ToString()?.Trim() ?? "0";
-                    if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(kQtyStr)
-                        || !decimal.TryParse(kQtyStr, out decimal kQty)
-                        || kQty <= 0)
-                    {
-                        Gs.DevApp.ToolBox.MsgHelper.ShowError($"璺宠繃鏄庣粏琛岋紙releaseNo锛歿rowReleaseNo}锛夛細鍙墦鍗版暟閲忔棤鏁堟垨<=0");
-                        continue;
-                    }
-
-                    if (!validReleaseNos.Contains(rowReleaseNo))
-                    {
-                        validReleaseNos.Add(rowReleaseNo);
-                        validPrintQtys.Add(kQty.ToString("F2"));
-                    }
-                    else
-                    {
-                        Gs.DevApp.ToolBox.MsgHelper.ShowError($"璺宠繃閲嶅鏄庣粏琛岋紙releaseNo锛歿rowReleaseNo}锛夛細宸插寘鍚releaseNo");
-                    }
-                }
-
-                if (validReleaseNos.Count == 0)
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("娌℃湁鍙壒閲忔墦鍗扮殑鏄庣粏琛岋紙鎵�鏈夎鍧囦负鏃犳晥鏁版嵁鎴栧彲鎵撳嵃鏁伴噺<=0锛�");
-                    this.ucBtnPrintOne1.rptParameter = "return false";
-                    return;
-                }
-
-                // 4. 缁勮鍙傛暟锛堥�傞厤_rptGetParameterP瑙f瀽閫昏緫锛�
-                string releaseNosStr = string.Join("|", validReleaseNos);
-                string printQtysStr = string.Join("|", validPrintQtys);
-
-                // 浠呬紶6涓叧閿弬鏁帮紝瀵瑰簲瑙f瀽鏂规硶鐨剆0-s5
-                string[] reportParams = new string[]
-                {
-        "batch",       // s0 鈫� @in1锛氭壒閲忔爣璇�
-        "0",           // s1 鈫� @in2锛氬崰浣�
-        "0",           // s2 鈫� @in3锛氫綑閲�
-        "1",           // s3 鈫� @in4锛氬紶鏁�
-        printQtysStr,  // s4 鈫� @in5锛氭暟閲忓垪琛�
-        releaseNosStr  // s5 鈫� @in6锛歳eleaseNo鍒楄〃
-                };
-
-
-                this.ucBtnPrintOne1.guidKey = mainGuid;
-                this.ucBtnPrintOne1.rptParameter = "rpt_Arrival_One{"
-                    + string.Join(",", reportParams)  // 鎷兼帴reportParams鏁扮粍鍏冪礌
-                    + "}";
-                // 6. 娓呯┖鎺т欢
-                txt_iCount_2.Text = "";
-                txt_psnQty_2.Text = "";
-                txt_releaseNo.Text = "";
+                SelectDeleteBar frm = new SelectDeleteBar(mainGuid, "鎵归噺鏉$爜"); // 鏍囬鍖哄垎鏉ユ簮
+                _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鐨勭劍鐐硅鍙樺寲浜嬩欢
@@ -327,8 +184,7 @@
             {
                 Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_2, txt_iCount_2, radOut2, txt_yuliang_2);
             };
-
-
+            #endregion
 
             ////搴曢儴姹囨�诲惎鐢�
             //gvMx1.OptionsView.ShowFooter = true;
@@ -339,47 +195,196 @@
             // 涓轰簡鏂逛究浣跨敤鏁村悎鍒�  UtilityHelper 绫讳腑鐨� SetupGridSummary 鏂规硶
             UtilityHelper.SetupGridSummary(gvMx1, "quantity", "okRkqty");
             UtilityHelper.SetupGridSummary(gvMxL1, "quantity", "okRkqty");
-
+            UtilityHelper.SetupGridSummary(gvMx2, "quantity", "okRkqty");
+            UtilityHelper.SetupGridSummary(gvMxL2, "quantity", "okRkqty");
+            UtilityHelper.SetupGridSummary(gvMx3, "quantity", "okRkqty");
+            UtilityHelper.SetupGridSummary(gvMxL3, "quantity", "okRkqty");
             // 妫�鏌ユ暟鎹姞杞藉悗鍐嶈缃鑹�
-            this.Load += (s, e) => {
-
-               
+            this.Load += (s, e) =>
+            {
                 System.Windows.Forms.Timer timer = new System.Windows.Forms.Timer();
                 timer.Interval = 1000; // 1绉掑悗鎵ц锛岀‘淇濇暟鎹凡鍔犺浇
-                timer.Tick += (sender, args) => {
+                timer.Tick += (sender, args) =>
+                {
                     timer.Stop();
                     timer.Dispose();
-                    
+
                     // 浣跨敤鏂扮殑绠�鍖栨牸寮忚缃楠岀粨鏋滈鑹�
-                    UtilityHelper.SetSimpleGridColor(gvMxL1, "jyjg", "contains涓嶅悎鏍�", "Cell", Color.Red);
-                    UtilityHelper.SetSimpleGridColor(gvMxL1, "jyjg", "contains鍚堟牸", "Cell", Color.Green);
-                    UtilityHelper.SetSimpleGridColor(gvMxL1, "jyjg", "contains鍏嶆", "Cell", Color.Green);
-                    
-                    UtilityHelper.SetSimpleGridColor(gvMxL2, "jyjg", "contains涓嶅悎鏍�", "Cell", Color.Red);
-                    UtilityHelper.SetSimpleGridColor(gvMxL2, "jyjg", "contains鍚堟牸", "Cell", Color.Green);
-                    UtilityHelper.SetSimpleGridColor(gvMxL2, "jyjg", "contains鍏嶆", "Cell", Color.Green);
-                    
-                    UtilityHelper.SetSimpleGridColor(gvMx1, "jyjg", "contains涓嶅悎鏍�", "Cell", Color.Red);
-                    UtilityHelper.SetSimpleGridColor(gvMx1, "jyjg", "contains鍚堟牸", "Cell", Color.Green);
-                    UtilityHelper.SetSimpleGridColor(gvMx1, "jyjg", "contains鍏嶆", "Cell", Color.Green);
-                    
-                    UtilityHelper.SetSimpleGridColor(gvMx3, "jyjg", "contains涓嶅悎鏍�", "Cell", Color.Red);
-                    UtilityHelper.SetSimpleGridColor(gvMx3, "jyjg", "contains鍚堟牸", "Cell", Color.Green);
-                    UtilityHelper.SetSimpleGridColor(gvMx3, "jyjg", "contains鍏嶆", "Cell", Color.Green);
+                    //UtilityHelper.SetSimpleGridColor(gvMxL1, "jyjg", "contains涓嶅悎鏍�", "Cell", Color.Red);
+                    //UtilityHelper.SetSimpleGridColor(gvMxL1, "jyjg", "contains鍚堟牸", "Cell", Color.Green);
+                    //UtilityHelper.SetSimpleGridColor(gvMxL1, "jyjg", "contains鍏嶆", "Cell", Color.Green);
+
+                    //UtilityHelper.SetSimpleGridColor(gvMxL2, "jyjg", "contains涓嶅悎鏍�", "Cell", Color.Red);
+                    //UtilityHelper.SetSimpleGridColor(gvMxL2, "jyjg", "contains鍚堟牸", "Cell", Color.Green);
+                    //UtilityHelper.SetSimpleGridColor(gvMxL2, "jyjg", "contains鍏嶆", "Cell", Color.Green);
+
+                    //UtilityHelper.SetSimpleGridColor(gvMx1, "jyjg", "contains涓嶅悎鏍�", "Cell", Color.Red);
+                    //UtilityHelper.SetSimpleGridColor(gvMx1, "jyjg", "contains鍚堟牸", "Cell", Color.Green);
+                    //UtilityHelper.SetSimpleGridColor(gvMx1, "jyjg", "contains鍏嶆", "Cell", Color.Green);
+
+                    //UtilityHelper.SetSimpleGridColor(gvMx3, "jyjg", "contains涓嶅悎鏍�", "Cell", Color.Red);
+                    //UtilityHelper.SetSimpleGridColor(gvMx3, "jyjg", "contains鍚堟牸", "Cell", Color.Green);
+                    //UtilityHelper.SetSimpleGridColor(gvMx3, "jyjg", "contains鍏嶆", "Cell", Color.Green);
 
                     //  褰撴敹璐ф暟閲�(quantity)澶т簬宸插叆搴撴暟閲�(okRkqty)鏃讹紝鏁磋鏄剧ず姗欒壊
                     // UtilityHelper.SetSimpleGridColor(gvMx1, "", "quantity-okRkqty>0", "Row", Color.Orange);
 
                     //  褰撳彲鎵撳嵃鏁伴噺(kQty)灏忎簬绛変簬0鏃讹紝鏁磋鏄剧ず鐏拌壊
                     //UtilityHelper.SetSimpleGridColor(gvMx1, "", "kQty<=0", "Row", Color.Gray);
-                    UtilityHelper.SetSimpleGridColor(gridView1, "barRatio", "=100.00%", "Cell", Color.Green);
-                    //鍏ュ簱姣斾緥
-                    UtilityHelper.SetSimpleGridColor(gridView1, "rkbl", "=100.00%", "Cell", Color.Green);
+                    //UtilityHelper.SetSimpleGridColor(gridView1, "barRatio", "=100.00%", "Cell", Color.Green);
+                    ////鍏ュ簱姣斾緥
+                    //UtilityHelper.SetSimpleGridColor(gridView1, "rkbl", "=100.00%", "Cell", Color.Green);
                 };
                 timer.Start();
             };
 
         }
+        /// <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_Arrival{"
+                   + 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 _print2(int type)
+        {
+            string rowGuid = txt_releaseNo.Text.Trim(); // 鏂板lbMxGuid3鐢ㄤ簬瀛樺偍gvMx3鐨勯�変腑琛孏UID
+            ucBtnPrint2.guidKey = rowGuid;
+
+            // 楠岃瘉杈撳叆锛堜娇鐢╣vMx3瀵瑰簲鐨勮緭鍏ユ帶浠讹級
+            if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_2.Text.Trim(), txt_yuliang_2.Text.Trim()))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�");
+                txt_iCount_2.Focus();
+                this.ucBtnPrint2.rptParameter = "return false";
+                return;
+            }
+            if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_2.Text.Trim()))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�");
+                txt_psnQty_2.Focus();
+                this.ucBtnPrint2.rptParameter = "return false";
+                return;
+            }
+            if (rowGuid.Length < 10)
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
+                this.ucBtnPrint2.rptParameter = "return false";
+                return;
+            }
+
+            // 缁勮鎵撳嵃鍙傛暟锛堜娇鐢╣vMx3鐨勬帶浠跺�硷級
+            this.ucBtnPrint2.rptParameter = "rpt_Arrival_Hb{"
+                   + rowGuid//鍏宠仈涓婚敭锛坓vMx3鐨凣UID锛�
+                   + "," + ""
+                   + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_2.Text.Trim())//浣欐暟
+                   + "," + txt_iCount_2.Text.Trim()//寮犳暟
+                   + "," + txt_psnQty_2.Text.Trim()//姣忓紶鏉$爜鏁伴噺
+                   + "}";
+
+            // 娓呯┖杈撳叆妗�
+            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);
@@ -419,7 +424,7 @@
         }
 
         //鏄庣粏琛屽垏鎹簨浠�
-         
+
         private void GvMx3_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
         {
             if (e.FocusedRowHandle >= 0)
@@ -555,7 +560,7 @@
             gcMx3.DataSource = null;
             gcMx1.DataSource = null;
             gcMx2.DataSource = null;
-            
+
             bool isEdit = false;
             if (toolBarMenu1.currentAction == "add") return;
             if (toolBarMenu1.currentAction == "edit") isEdit = true;
@@ -572,7 +577,7 @@
             {
                 string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
                 ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-             
+
                 if (_rtn.rtnCode > 0)
                 {
                     dynamic dy = _rtn.rtnData;
@@ -622,7 +627,7 @@
                     {
                         Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                     }
-                 
+
                     JArray array2 = new JArray();
                     foreach (var a in dy["list2"])
                     {
@@ -641,10 +646,10 @@
                     {
                         Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
                     }
-                  
-                       }
 
-           
+                }
+
+
                 else
                     ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
             }
@@ -657,7 +662,7 @@
         ///  鏂板鏂规硶锛氬垪琛ㄦ樉绀�   
         /// </summary>
         /// <param name="strGuid">涓昏〃id</param>
-         
+
         private void getModelList(string strGuid)
         {
             gcMxL1.DataSource = null;
@@ -674,7 +679,7 @@
                 if (_rtn.rtnCode > 0)
                 {
                     dynamic dy = _rtn.rtnData;
-                   
+
                     JArray array1 = new JArray();
                     foreach (var a in dy["list1"])
                     {

--
Gitblit v1.9.3