From d3dd87dbb75c485ca1c9431faffe2d9cae786e97 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 19 五月 2025 09:44:09 +0800
Subject: [PATCH] 其它入库

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs |   32 ++++++++++++++------------------
 1 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index b960d46..f2e01a5 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -49,8 +49,7 @@
             }, lbGuid);
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-
-            //杩欐槸鍗℃澘鐮�
+            //杩欐槸鎵樻澘鐮�
             this.ucBtnPrint1.btnDesignClick += (s, e) =>
             {
                 ucBtnPrint1.rptParameter = "rpt_daa{}";
@@ -58,6 +57,14 @@
             this.ucBtnPrint1.btnReportClick += (s, e) =>
             {
                 _print();
+            };
+            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);
             };
             //杩欐槸杩芥函鐮�
             this.ucBtnPrint98.btnDesignClick += (s, e) =>
@@ -77,17 +84,7 @@
             {
                 _print100();
             };
-            txt_psnQty_1.TextChanged += (s, e) =>
-            {
-                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
-            };
-
-            radOut.SelectedIndexChanged += (s, e) =>
-            {
-                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
-            };
         }
-
 
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
@@ -481,8 +478,7 @@
                     {
                         Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx4, gvMx4);
                     }
-                    txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = "";
-                    radOut.Properties.Items[0].Description = "鍏ㄨ嚜鍔�";
+                    txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text="";
                 }
                 else
                     ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -509,7 +505,7 @@
                     strMsg = "宸ュ崟鏆傚仠";
                     break;
                 case 3:
-                    strMsg = "鎾ゅ洖瀹屽伐";
+                    strMsg = "娓呭熬";
                     break;
                 case 4:
                     strMsg = "绱ф�ュ鏂�";
@@ -595,7 +591,7 @@
             }
             if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim()))
             {
-                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�");
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�");
                 txt_iCount_1.Focus();
                 this.ucBtnPrint1.rptParameter = "return false";
                 return;
@@ -610,7 +606,7 @@
             this.ucBtnPrint1.rptParameter = "rpt_daa{"
                   + txt_printRemark.Text.Trim()
                    + "," + ""
-                   + "," + Gs.DevApp.ToolBox.UtilityHelper.PrintYuLiang(radOut).ToString()
+                   + "," +  Gs.DevApp.ToolBox.UtilityHelper.ToDecimal( txt_yuliang_1.Text.Trim())
                    + "," + txt_iCount_1.Text.Trim()
                    + "," + txt_psnQty_1.Text.Trim()
                    + "}";
@@ -633,7 +629,7 @@
             }
             if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_98.Text.Trim()))
             {
-                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�");
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�");
                 txt_iCount_98.Focus();
                 this.ucBtnPrint98.rptParameter = "return false";
                 return;

--
Gitblit v1.9.3