From ae28c33700e413d5acf60d1e48bbc9870bdef5a5 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 15 八月 2025 11:27:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 57e13fd..eb74041 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -21,6 +21,7 @@
         public Frm_Womdaa()
         {
             InitializeComponent();
+            //鍏堥殣钘�4绉嶆墦鍗�
             this.splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
             this.splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
             this.splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
@@ -45,7 +46,6 @@
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx6);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx7);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx8);
-            txt_daa015.getSuppler("");
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -610,6 +610,8 @@
                 if (_rtn.rtnCode > 0)
                 {
                     dynamic dy = _rtn.rtnData;
+                    string lineId = dy.daa013;
+                    txt_daa015.getSuppler(txt_daa013.Text.Trim(), lineId);
                     //鎵樻澘鐮�
                     txt_zQty.Text = dy.daa008;
                     txt_yQty.Text = dy.yQty;
@@ -622,7 +624,6 @@
                     txt_zQty100.Text = dy.daa008;
                     txt_yQty100.Text = dy.yQty100;
                     txt_kQty100.Text = dy.kQty100;
-
                     lbGuid.Text = strGuid;
                     List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                     gvList.Add(gvMx1);
@@ -784,6 +785,7 @@
                     txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
                     txt_iCount_98.Text = txt_kQty98.Text;//杩芥函鐮�
                     txt_iCount_100.Text = txt_kQty100.Text;//鍚庣洊鐮�
+                  
                 }
                 else
                     ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);

--
Gitblit v1.9.3