From fc6d76c183e2becbb7433f0caa11af4d08eeec50 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 24 七月 2025 15:31:35 +0800
Subject: [PATCH] 增加工资和连班按钮

---
 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs |   41 ++++++++++++++++++++++-------------------
 1 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 063fc36..54ea4a2 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -48,15 +48,12 @@
             txt_ftype.Text = strType;
             if (strType == QcSeason.iqc.ToString())
                 dfValue = 5;
+            if (strType == QcSeason.fqc.ToString())
+                dfValue = 999;
             //濡傛灉鏄痠pqc宸℃锛屾樉绀哄伐浣�
             if (strType != QcSeason.ipqc宸℃.ToString())
             {
                 gvMx1.Columns["stationName"].Visible = false;
-            }
-            //濡傛灉鏄痠pqc棣栨锛屾樉绀鸿璇�
-            if (strType != QcSeason.ipqc棣栨.ToString())
-            {
-                gvMx1.Columns["isRzxx"].Visible = false;
             }
             //鏂拌鍒濆鍊�
             this.gvMx1.InitNewRow += (s, e) =>
@@ -319,7 +316,7 @@
                         }
                         if (string.IsNullOrEmpty(row["ypsl"].ToString()))
                         {
-                            MsgHelper.ShowError("鏍峰搧鏁伴噺骞充笉鑳戒负绌猴紒");
+                            MsgHelper.ShowError("鏍峰搧鏁伴噺涓嶈兘涓虹┖锛�");
                             return;
                         }
                         string _Fstand = row["Fstand"].ToString();
@@ -391,9 +388,9 @@
                         JsonConvert.SerializeObject(_obj));
                     var _rtn =
                         UtilityHelper.ReturnToDynamic(strJson);
-                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
                     if (_rtn.rtnCode > 0)
                     {
+                        MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
                         lbGuid.Text = _rtn.rtnData;
                         toolBarMenu1.isSetBtn = true;
                         var gridViews = new List<GridView>();
@@ -402,10 +399,12 @@
                         toolBarMenu1.currentAction = "";
                         Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                     }
+                    else
+                        MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
                 }
                 catch (Exception ex)
                 {
-                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                    MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
                 }
             }
             catch (Exception ex)
@@ -458,7 +457,7 @@
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
         /// <summary>
@@ -472,7 +471,7 @@
             if (toolBarMenu1.currentAction == "edit") isEdit = true;
             if (string.IsNullOrEmpty(strGuid))
             {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
             var _obj = new
@@ -512,12 +511,12 @@
                 }
                 else
                 {
-                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                    MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
                 }
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
 
@@ -542,13 +541,14 @@
                 case 2:
                     strMsg = "鎵瑰噯";
                     break;
-            };
+            }
+            ;
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
             if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -589,7 +589,7 @@
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
 
@@ -645,7 +645,7 @@
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
         /// <summary>
@@ -671,7 +671,7 @@
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
         /// <summary>
@@ -692,7 +692,7 @@
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
         /// <summary>
@@ -716,7 +716,7 @@
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
         /// <summary>
@@ -739,6 +739,9 @@
                 ,"1.50---(AQL_0_150)"
                 ,"2.00---(AQL_0_200)"
                 ,"2.50---(AQL_0_250)"
+                ,"4.00---(AQL_0_400)"
+                ,"6.50---(AQL_0_650)"
+                ,"10.00---(AQL_1_000)"
             });
         }
         /// <summary>

--
Gitblit v1.9.3