From f0ccfe6d323784333b7c08835b52a97c5233cfe2 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 08 四月 2025 16:31:55 +0800
Subject: [PATCH] fqc

---
 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs |   61 ++++++++++++++----------------
 1 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index 0337b88..7d1d737 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -270,7 +270,7 @@
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_releaseNo, gridView1, "lotNo");
+                lbGuid, txt_releaseNo, gridView1, "releaseNo");
             toolBarMenu1.guidKey = rowGuid;
             if (string.IsNullOrEmpty(rowGuid))
             {
@@ -281,9 +281,9 @@
                 return;
             if (txt_fcheckResu.Text.Trim() == "涓嶅悎鏍�")
             {
-                if (string.IsNullOrEmpty(txt_remarks.Text.Trim()))
+                if (string.IsNullOrEmpty(txt_msg.TextTxt.Trim()))
                 {
-                    MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃讹紝璇峰~鍐欏娉ㄨ鏄庯紒");
+                    MsgHelper.Warning("鍗曟嵁涓轰笉鍚堟牸鏃讹紝璇峰~鍐欒繚瑙勪俊鎭紒");
                     return;
                 }
             };
@@ -445,21 +445,18 @@
         private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
         {
             toolBarMenu1.isSetBtn = false;
-            string _txt_djType = txt_djType.Text.Trim();
-            string _txt_fbatchQty = txt_fbatchQty.Text.Trim();
-            string _txt_lifnr = txt_lifnr.Text.Trim();
-            string _txt_suppId = txt_suppId.GetId();
-            string _txt_lineId = txt_lineId.GetId();
-            string _txt_itemId = txt_itemId.Text.Trim();
-            string _txt_remarks = txt_remarks.Text.Trim();
-            string _txt_workNo = "";
-            string _txt_epTag = txt_epTag.Text.Trim();
-            string _txt_fzrId = "";
-            string _txt_msg = txt_msg.TextTxt;
-            string _txt_fmanageNo = txt_fmanageNo.Text.Trim();
-            string _txt_lotNo2 = txt_lotNo2.Text.Trim();
-            string _txt_lotNo1 = txt_lotNo1.Text.Trim();
-            string _txt_lotNo = txt_lotNo.Text.Trim();
+            string _txt_djType = txt_djType.Text.Trim();//鍗曟嵁绫诲瀷
+            string _txt_fbatchQty = txt_fbatchQty.Text.Trim();//鎶芥鏁伴噺
+            string _txt_lifnr = txt_lifnr.Text.Trim();//瀹㈡埛璁㈠崟
+            string _txt_suppId = txt_suppId.GetId();//瀹㈡埛id
+            string _txt_lineId = txt_lineId.GetId();//浜х嚎
+            string _txt_itemId = txt_itemId.Text.Trim();//浜у搧
+            string _txt_remarks = txt_remarks.Text.Trim();//澶囨敞
+            string _txt_epTag = txt_epTag.Text.Trim();//鐜繚
+            string _txt_msg = txt_msg.TextTxt;//寮傚父
+            string _txt_fmanageNo = txt_fmanageNo.Text.Trim();//娴佺▼缂栧彿
+            string _txt_lotNo1 = txt_lotNo1.Text.Trim();//閫佹鎵瑰彿
+            string _txt_lotNo = txt_lotNo.Text.Trim();//鐢熶骇宸ュ崟
             if (txt_djType.SelectedIndex <= 0)
             {
                 Gs.DevApp.ToolBox.MsgHelper.Warning("鍗曟嵁绫诲瀷涓嶈兘涓虹┖锛�");
@@ -493,21 +490,18 @@
             var _obj = new
             {
                 guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-                djType = _txt_djType,
-                fbatchQty = _txt_fbatchQty,
-                lifnr = _txt_lifnr,
-                suppId = _txt_suppId,
-                lineId = _txt_lineId,
-                itemId = _txt_itemId,
-                remarks = _txt_remarks,
-                workNo = _txt_workNo,
-                epTag = _txt_epTag,
-                fzrId = _txt_fzrId,
-                msg = _txt_msg,
-                fmanageNo = _txt_fmanageNo,
-                lotNo2 = _txt_lotNo2,
-                lotNo1 = _txt_lotNo1,
-                lotNo = _txt_lotNo
+                djType = _txt_djType,//鍗曟嵁绫诲瀷
+                fbatchQty = _txt_fbatchQty,//鎶芥鏁伴噺
+                lifnr = _txt_lifnr,//瀹㈡埛璁㈠崟
+                suppId = _txt_suppId,//瀹㈡埛id
+                lineId = _txt_lineId,//浜х嚎
+                itemId = _txt_itemId,//浜у搧
+                remarks = _txt_remarks,//澶囨敞
+                epTag = _txt_epTag,//鐜繚
+                msg = _txt_msg,//寮傚父
+                fmanageNo = _txt_fmanageNo,//娴佺▼缂栧彿
+                lotNo1 = _txt_lotNo1,//閫佹鎵瑰彿
+                lotNo = _txt_lotNo//鐢熶骇宸ュ崟
             };
             try
             {
@@ -523,6 +517,7 @@
                     this.setEable(false);
                     toolBarMenu1.currentAction = "";
                     Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+                    getModel(lbGuid.Text,"0");
                 }
             }
             catch (Exception ex)

--
Gitblit v1.9.3