From dd0af4a5532c251fd655024ba475f72eaf9c93a0 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 18 八月 2025 16:20:10 +0800
Subject: [PATCH] 汇总

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

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 6ce4c57..d2f96cd 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,3 +1,6 @@
+using DevExpress.Data;
+using DevExpress.Utils;
+using DevExpress.XtraGrid.Views.Grid;
 using Gs.DevApp.DevFrm.Rpt;
 using Gs.DevApp.DevFrm.Sys;
 using Gs.DevApp.DevFrm.WOM;
@@ -9,6 +12,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Drawing;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -21,6 +25,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;
@@ -38,6 +43,9 @@
             this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
             this.toolBarMenu1.btnGxClick += ToolBarMenu1_btnGxClick;
             this.toolBarMenu1.getXmlConfig();
+            gvMx1.Columns["barbl"].DisplayFormat.FormatType = FormatType.Numeric;
+            gvMx1.Columns["barbl"].DisplayFormat.FormatString = "p0";
+            Gs.DevApp.ToolBox.UtilityHelper.CustomProgressBarColumn(gvMx1, "barbl", 90, Brushes.OrangeRed, Brushes.DodgerBlue);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
@@ -45,7 +53,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 +617,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 +631,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 +792,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);
@@ -1007,5 +1016,26 @@
                    + "}";
         }
         #endregion
+
+        /// <summary>
+        /// 鍙樻洿鍐呭寘瑁呮暟閲�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void rptTuoBanNbz_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+        {
+            var rowhandle = gvMx2.FocusedRowHandle;
+            if (rowhandle < 0)
+                return;
+            if (e.Button.Index == 0)
+            {
+                var dr = gvMx2.GetDataRow(rowhandle);
+                var mxGuid = dr["guid"].ToString();
+                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍙樻洿鍐呭寘瑁呮暟閲忓悧锛�"))
+                    return;
+                var frm = new Frm_WomdaaNbz(mxGuid);
+                frm.ShowDialog();
+            }
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3