From 93ec2955713f40a50348b1990bbaeeee837f5378 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 12 四月 2025 09:09:40 +0800
Subject: [PATCH] 工单

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs |   66 +++++++++++++-------------------
 1 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 538b62a..c1b0f62 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -70,47 +70,26 @@
             //杩欐槸鍚庣洊鐮侊紝浠呬粎鎵撳嵃锛�
             this.ucBtnPrint100.btnDesignClick += (s, e) =>
             {
-                ucBtnPrint100.rptParameter = "rpt_trace{}";
+                ucBtnPrint100.rptParameter = "rpt_hgm{}";
             };
             this.ucBtnPrint100.btnReportClick += (s, e) =>
             {
                 _print100();
             };
-            txt_psnQty_1.TextChanged += Txt_psnQty_1_TextChanged;
-        }
-
-        private void Txt_psnQty_1_TextChanged(object sender, EventArgs e)
-        {
-            string sum = txt_kQty.Text.Trim();
-            string t1 = txt_psnQty_1.Text.Trim();
-            string t2 = txt_iCount_1.Text.Trim();
-            if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(sum))
-                sum = txt_kQty.Text = "0";
-
-            if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(t1))
-                t1 = txt_psnQty_1.Text = "0";
-
-            if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(t2))
-                t2 = txt_iCount_1.Text = "0";
-
-            if (t1 == "0")
+            txt_psnQty_1.TextChanged += (s, e) =>
             {
-                t2 = txt_iCount_1.Text = "0";
-                return;
-            }
-
-            decimal? dc = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(sum);
-            decimal? dc1 = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(t1);
-
-            int dividend = int.Parse(sum); // 琚櫎鏁�
-            int divisor = int.Parse(t1);   // 闄ゆ暟
-
-            int quotient = dividend / divisor; // 鏁存暟閮ㄥ垎
-            int remainder = dividend % divisor; // 浣欐暟
-
-            txt_iCount_1.Text = quotient.ToString();
-            radOut.Properties.Items[0].Description = "鍙﹀嵃" + remainder.ToString();
-
+                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(this, txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
+            };
+            txt_iCount_1.TextChanged += (s, e) =>
+            {
+                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(this, txt_iCount_1, txt_psnQty_1, txt_kQty.Text.Trim(), radOut);
+            };
+            radOut.SelectedIndexChanged += (s, e) =>
+            {
+                txt_psnQty_1.Text = "";
+                txt_iCount_1.Text = "";
+                radOut.Properties.Items[0].Description = "鍏ㄨ嚜鍔�";
+            };
         }
 
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -388,8 +367,14 @@
                     //string cjId = dy.daa013;
                     //string xjxt = dy.sjXt;
                     // txt_sjXt.getSuppler(cjId, xjxt);
+                    //鎵樻澘鐮�
+                    txt_zQty.Text = dy.daa008;
                     txt_yQty.Text = dy.yQty;
                     txt_kQty.Text = dy.kQty;
+                    //杩芥函鐮�
+                    txt_zQty98.Text = dy.daa008;
+                    txt_yQty98.Text = dy.yQty98;
+                    txt_kQty98.Text = dy.kQty98;
                     lbGuid.Text = strGuid;
                     List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                     gvList.Add(gvMx1);
@@ -468,6 +453,8 @@
                     {
                         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 = "鍏ㄨ嚜鍔�";
                 }
                 else
                     ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -597,7 +584,7 @@
             this.ucBtnPrint1.rptParameter = "rpt_daa{"
                   + txt_printRemark.Text.Trim()
                    + "," + ""
-                   + "," + ""
+                   + "," + Gs.DevApp.ToolBox.UtilityHelper.PrintYuLiang(radOut).ToString()
                    + "," + txt_iCount_1.Text.Trim()
                    + "," + txt_psnQty_1.Text.Trim()
                    + "}";
@@ -625,7 +612,8 @@
                 this.ucBtnPrint98.rptParameter = "return false";
                 return;
             }
-            this.ucBtnPrint98.rptParameter = "rpt_trace{" + ""
+            this.ucBtnPrint98.rptParameter = "rpt_trace{" 
+                   + ""
                    + "," + txt_printRemark98.Text.Trim()
                    + "," + ""
                    + "," + txt_iCount_98.Text.Trim()
@@ -649,8 +637,8 @@
                 return;
             }
 
-            this.ucBtnPrint100.rptParameter = "rpt_trace{"
-                  + lbGuid.Text.Trim()
+            this.ucBtnPrint100.rptParameter = "rpt_hgm{"
+                  + "100"
                    + "," + ""
                    + "," + ""
                    + "," + ""

--
Gitblit v1.9.3