From 122819b5dd643d82a730e549f99bd56fe90eed21 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 28 十一月 2024 12:30:25 +0800
Subject: [PATCH] 车间

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index 90b13f5..fc3e2b6 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -51,7 +51,7 @@
             {
                 if (string.IsNullOrEmpty(this.txt_pba013.Text))
                 {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨渚涘簲鍟嗭紝鎵嶈兘閫夋嫨鏉ユ枡鏄庣粏锛�");
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨杞﹂棿锛屾墠鑳介�夋嫨浠诲姟鍗曪紒");
                     return;
                 }
                 var frm = new SelectWompba(this.txt_pba013.Text);
@@ -138,14 +138,15 @@
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_hNo, gridView1);
+                lbGuid, txt_hNo, gridView1, "hNo");
             //toolBarMenu1.guidKey = rowGuid;
             if (string.IsNullOrEmpty(rowGuid))
             {
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
-            //MsgHelper.Warning(rowGuid);
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾瀹℃牳鍚楋紵"))
+                return;
             UcLoading _loading = new UcLoading();
             var _obj = new
             {
@@ -157,16 +158,13 @@
                     _webServiceName + "EditModelSubmit",
                     JsonConvert.SerializeObject(_obj));
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                 if (_rtn.rtnCode > 0)
                 {
                     if (xtraTabControl1.SelectedTabPageIndex == 1)
                         getModel(lbGuid.Text.Trim(), false, 999);
                     else
                         getPageList(1, UtilityHelper.GetPageSize());
-                }
-                else
-                {
-                    MsgHelper.Warning(_rtn.rtnMsg);
                 }
             }
             catch (Exception ex)
@@ -365,12 +363,12 @@
                     _obj.list.Add(new
                     {
                         Guid = _guid,
-                        AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
+                        AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["caaGuid"].ToString()),
                         LineId = int.Parse(row["daa015"].ToString()),//浜х嚎id
                         Yjkgsj = (row["mesStartProd"].ToString()),//棰勮寮�宸ユ椂闂�
-                        Jhrs = row["daa015"].ToString(),//璁″垝浜烘暟
+                        Jhrs = row["planPersonnel"].ToString(),//璁″垝浜烘暟
                         Hxsj = row["changeLinetime"].ToString(),//鎹㈢嚎鏃堕棿
-                        Bz = row["daa009"].ToString(),//鎹㈢嚎鏃堕棿
+                        Bz = row["daa009"].ToString(),//澶囨敞
                         Blsj = row["prepareTime"].ToString(),//棰勮澶囨枡鏃堕棿
                         Pcsl = row["daa008"].ToString()//鎺掍骇鏁伴噺
                     });

--
Gitblit v1.9.3