From 35867dd07f099097879f57bd0657bd88aed011d7 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 31 十月 2025 17:45:53 +0800
Subject: [PATCH] 完结

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs |  128 +++++++++++++++++++++++++++---------------
 1 files changed, 81 insertions(+), 47 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index 8758067..e8a0d3e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -36,6 +36,7 @@
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
             toolBarMenu1.btnPingZhiClick += ToolBarMenu1_btnPingZhiClick;
             toolBarMenu1.btnFPingZhiClick += ToolBarMenu1_btnFPingZhiClick;
+            toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -68,10 +69,12 @@
                 txt_workName.Text = txt_tbl002.GetWorkName();
                 txt_itemName.Text = txt_tbl002.GetPrdName();
                 txt_itemNo.Text = txt_tbl002.GetPrdNo();
+                txt_line.Text = txt_tbl002.GetWorkXb();
             };
             //閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
             btnSelect.Click += (s, e) =>
             {
+                tabMx.SelectedTabPageIndex = 0;
                 string _tbl002 = txt_tbl002.GetId();
                 if (string.IsNullOrEmpty(_tbl002))
                 {
@@ -105,7 +108,7 @@
                         gvMx1.CloseEditor();
                         gvMx1.PostEditor();
                         gvMx1.UpdateCurrentRow();
-                        gridView1.BestFitColumns();
+                        gvMx1.BestFitColumns();
                     }
                     catch (Exception ex)
                     {
@@ -114,40 +117,11 @@
                 };
                 frm.ShowDialog();
             };
-            //鎵撳嵃浜嬩欢
+            #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_SCTL{"
-                       + 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) =>
@@ -188,6 +162,11 @@
                     }
                 }
             };
+            //鐩存帴鎵撳嵃浜嬩欢
+            this.ucBtnPrint1.btnZhiJieClick += (s, e) =>
+            {
+                _print(1);
+            };
             gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
             //鎵撳嵃鑷姩璁$畻
             txt_psnQty_1.TextChanged += (s, e) =>
@@ -198,8 +177,50 @@
             {
                 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 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_SCTL{"
+                   + 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 async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
             _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -252,7 +273,16 @@
             _filterList = e.FilterList;
             getPageList(1);
         }
-
+        /// <summary>
+        /// 瀹岀粨
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
+        {
+            _toolCk(199);
+        }
         /// <summary>
         /// 鎵瑰噯
         /// </summary>
@@ -273,23 +303,24 @@
             _toolCk(3);
         }
         /// <summary>
-        /// 鍝佽川
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnFPingZhiClick(object sender, EventArgs e)
-        {
-            _toolCk(4);
-        }
-        /// <summary>
         /// 鍙嶅搧璐�
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void ToolBarMenu1_btnPingZhiClick(object sender, EventArgs e)
         {
+            _toolCk(4);
+        }
+        /// <summary>
+        /// 鍝佽川
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnFPingZhiClick(object sender, EventArgs e)
+        {
             _toolCk(5);
         }
+
         /// <summary>
         ///     瀹℃牳浜嬩欢
         /// </summary>
@@ -465,7 +496,7 @@
                 txt_tbl005.Focus();
                 return;
             }
-            if ((txt_tbl005.Text.Trim()=="鑹搧閫�鏂�") && txt_chkOut.Checked)
+            if ((txt_tbl005.Text.Trim() == "鑹搧閫�鏂�") && txt_chkOut.Checked)
             {
                 Gs.DevApp.ToolBox.MsgHelper.ShowError("鑹搧閫�鏂欎笉鑳借嚜鍔ㄧ敓鎴愯ˉ鏂欏崟锛孿n鍙湁浣滀笟涓嶈壇绫诲瀷鎵嶈兘鐢熸垚琛ユ枡鍗曪紝\n 璇锋鏌ワ紒");
                 txt_tbl005.Focus();
@@ -711,7 +742,7 @@
                         getModel(lbGuid.Text);
                     }
                     else
-                    MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+                        MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
                 }
                 catch (Exception ex)
                 {
@@ -747,6 +778,9 @@
                 case 5:
                     strMsg = "鍝佽川鍙嶅鏍�";
                     break;
+                case 199:
+                    strMsg = "瀹岀粨";
+                    break;
             }
             ;
             toolBarMenu1.guidKey = "";
@@ -763,7 +797,7 @@
             {
                 guid = rowGuid,
                 inFieldValue = _inFieldValue,
-             
+
             };
             try
             {

--
Gitblit v1.9.3