From 1e70760fdbd1b09a8b697e97906d86235095d6c3 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 26 五月 2025 15:55:18 +0800
Subject: [PATCH] 工单

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs |  161 ++++++++++++++++++++++++++++++-----------------------
 1 files changed, 92 insertions(+), 69 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 3148c76..67ae4c0 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,4 +1,5 @@
 using DevExpress.XtraPivotGrid.Data;
+using Gs.DevApp.DevFrm.WOM;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Gs.DevApp.UserControl;
@@ -26,12 +27,11 @@
             this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             this.toolBarMenu1.btnZhongTaiClick += ToolBarMenu1_btnZhongTaiClick;
             this.toolBarMenu1.btnTzblClick += ToolBarMenu1_btnTzblClick;
-            this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
+           // this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
             this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
-            this.toolBarMenu1.btnJieAnClick += ToolBarMenu1_btnJieAnClick1;
-            this.toolBarMenu1.btnFjieAnClick += ToolBarMenu1_btnFjieAnClick;
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
             this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick;
+            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
             this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -50,8 +50,7 @@
             }, lbGuid);
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-
-            //杩欐槸鍗℃澘鐮�
+            //杩欐槸鎵樻澘鐮�
             this.ucBtnPrint1.btnDesignClick += (s, e) =>
             {
                 ucBtnPrint1.rptParameter = "rpt_daa{}";
@@ -59,6 +58,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) =>
@@ -78,18 +85,9 @@
             {
                 _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)
         {
             _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -132,6 +130,49 @@
         }
 
         /// <summary>
+        /// 鍒犻櫎宸ュ崟
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnDelClick(object sender, EventArgs e)
+        {
+            string rowGuid = "", rowName = "";
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1, "daa001");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+                return;
+            var _obj = new
+            {
+                guid = rowGuid,
+                mxGuid = Guid.Empty.ToString(),
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("",
+                    _webServiceName + "DeleteModelOrMx",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    if (xtraTabControl1.SelectedTabPageIndex == 0)
+                    { }
+                    else
+                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+                    getPageList(this.pageBar1.CurrentPage);
+                }
+                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+        /// <summary>
         /// 鐢熸垚棣栨
         /// </summary>
         /// <param name="sender"></param>
@@ -152,7 +193,7 @@
             var _obj = new
             {
                 guid = rowGuid,
-                inFieldValue ="",
+                inFieldValue = "",
             };
             try
             {
@@ -181,40 +222,24 @@
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
-
-        /// <summary>
-        /// 缁撴
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <exception cref="NotImplementedException"></exception>
-        private void ToolBarMenu1_btnFjieAnClick(object sender, EventArgs e)
-        {
-
-        }
-        /// <summary>
-        /// 鍙嶇粨妗�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <exception cref="NotImplementedException"></exception>
-
-        private void ToolBarMenu1_btnJieAnClick1(object sender, EventArgs e)
-        {
-            _toolCk(99);
-        }
+      
         private void ToolBarMenu1_btnTzblClick(object sender, EventArgs e)
         {
             _toolCk(7);
         }
-        private void ToolBarMenu1_btnKgClick(object sender, EventArgs e)
-        {
-            _toolCk(8);
-        }
+        //private void ToolBarMenu1_btnKgClick(object sender, EventArgs e)
+        //{
+        //    _toolCk(8);
+        //}
         private void ToolBarMenu1_btnWgClick(object sender, EventArgs e)
         {
             _toolCk(9);
         }
+        /// <summary>
+        /// 宸ュ崟鐘舵�侊紝鏍规嵁鍒嗗彿鎶婁腑鏂囧幓浜�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void ToolBarMenu1_btnZhongTaiClick(object sender, EventArgs e)
         {
             var frm = new showZhongTai();
@@ -224,14 +249,6 @@
                 _toolCk(_zt);
             };
             frm.ShowDialog();
-        }
-        private void ToolBarMenu1_btnJieAnClick(object sender, EventArgs e)
-        {
-            _toolCk(7);
-        }
-        private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
-        {
-            _toolCk(8);
         }
         /// <summary>
         /// 鏃ュ織
@@ -353,7 +370,7 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage)
         {
-            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
             PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "desc", "", _sbSqlWhere.ToString());
             string json = JsonConvert.SerializeObject(pgq);
             try
@@ -503,8 +520,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);
@@ -524,14 +540,14 @@
             string strMsg = "";
             switch (_inFieldValue)
             {
-                case 1:
-                    strMsg = "寰呭紑宸�";
-                    break;
+                //case 1:
+                //    strMsg = "寰呭紑宸�";
+                //    break;
                 case 2:
                     strMsg = "宸ュ崟鏆傚仠";
                     break;
                 case 3:
-                    strMsg = "鎾ゅ洖瀹屽伐";
+                    strMsg = "娓呭熬";
                     break;
                 case 4:
                     strMsg = "绱ф�ュ鏂�";
@@ -539,20 +555,17 @@
                 case 5:
                     strMsg = "鏆傚仠澶囨枡";
                     break;
-                case 6:
-                    strMsg = "鎾ゅ洖澶囨枡";
-                    break;
+                //case 6:
+                //    strMsg = "鎾ゅ洖澶囨枡";
+                //    break;
                 case 7:
                     strMsg = "閫氱煡澶囨枡";
                     break;
-                case 8:
-                    strMsg = "寮�宸�";
-                    break;
+                //case 8:
+                //    strMsg = "寮�宸�";
+                //    break;
                 case 9:
                     strMsg = "鎵嬪姩瀹屽伐";
-                    break;
-                case 99:
-                    strMsg = "缁撴";
                     break;
             };
             toolBarMenu1.guidKey = "";
@@ -566,6 +579,7 @@
             }
             if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
                 return;
+
             var _obj = new
             {
                 guid = rowGuid,
@@ -619,7 +633,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;
@@ -634,7 +648,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()
                    + "}";
@@ -657,7 +671,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;
@@ -694,8 +708,17 @@
                    + "," + ""
                    + "}";
         }
+
+        /// <summary>
+        /// 閲嶆墦
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
+
+            MsgHelper.ShowInformation("鍔熻兘寮�鍙戜腑锛�");
+            return;
             var rowhandle = gvMx2.FocusedRowHandle;
             if (rowhandle < 0)
                 return;

--
Gitblit v1.9.3