From 64a6c4193199d15d7ac5aa67a9677df01a37a50d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 12 六月 2025 08:04:31 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs |   38 ++++++++++++++++++++++++++++----------
 1 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index 386adf5..f53b016 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -59,7 +59,8 @@
                 if (string.IsNullOrEmpty(daaId)) return;
                 txt_rwd.Text = txt_tbl002.GetRwd();
                 txt_workName.Text = txt_tbl002.GetWorkName();
-                txt_itemName.Text = txt_tbl002.GetPrdModel();
+                txt_itemName.Text = txt_tbl002.GetPrdName();
+                txt_itemNo.Text = txt_tbl002.GetPrdNo();
             };
             //閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
             btnSelect.Click += (s, e) =>
@@ -112,9 +113,9 @@
                 ucBtnPrint1.guidKey = "";
                 string rowGuid = lbMxGuid.Text.Trim();
                 ucBtnPrint1.guidKey = rowGuid;
-                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim()))
+                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
                 {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�");
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�");
                     txt_iCount_1.Focus();
                     this.ucBtnPrint1.rptParameter = "return false";
                     return;
@@ -134,7 +135,7 @@
                 }
                 this.ucBtnPrint1.rptParameter = "rpt_SCTL{" + lbMxGuid.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()
                        + "}";
@@ -143,11 +144,11 @@
             //鑷姩璁$畻鎵撳嵃閲�
             txt_psnQty_1.TextChanged += (s, e) =>
             {
-                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
+                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);
+                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
             };
         }
         private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -226,7 +227,7 @@
             }
             if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
             {
-                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�");
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�");
                 txt_iCount_1.Focus();
                 this.toolBarMenu1.rptParameter = "return false";
                 return;
@@ -450,11 +451,18 @@
                         MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�");
                         return;
                     }
+                    _sl = row["tld014"].ToString();
+                    if (string.IsNullOrEmpty(_sl))
+                    {
+                        MsgHelper.ShowError("閫�鏂欏娉ㄤ笉鑳戒负绌猴紒");
+                        return;
+                    }
                     _obj.list.Add(new
                     {
                         Guid = _guid,
                         AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
-                        Sl = _sl //鐢宠鏁伴噺
+                        Sl = _sl, //鐢宠鏁伴噺
+                        Remark = row["tld014"].ToString()
                     });
                 }
             }
@@ -489,7 +497,7 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage)
         {
-            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
             PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
             string json = JsonConvert.SerializeObject(pgq);
             try
@@ -755,7 +763,17 @@
                 txtYdy.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
                 txt_kQty.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
             }
+            else
+            {
+                lbMxGuid.Text = "";
+                toolBarMenu1.guidKey = "";
+                txtWlid.Text = "";
+                txtWlgg.Text = "";
+                txtWlmc.Text = "";
+                txtQuantity.Text = "";
+                txtYdy.Text = "";
+                txt_kQty.Text = "";
+            }
         }
-
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3