From 1e52c7973d2a3c27012c7ce753ad8572e861999f Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 29 十月 2025 15:15:35 +0800
Subject: [PATCH] 询工单追溯码，增加两列数据，一列后盖码和一列托盘码

---
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs |   35 +++++++++++++++++++++--------------
 1 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index cf9d129..af9d495 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -124,27 +124,27 @@
                     ToolBox.MsgHelper.ShowError("璇锋鏌ョО閲嶈缃紒");
                     return;
                 }
-                if (txtW1.Text.Trim().Length <= 0)
+                if (txt_weight1.Text.Trim().Length <= 0)
                 {
                     _setWeigth(1, _strCurrent);
                     return;
                 }
-                if (txtW2.Text.Trim().Length <= 0)
+                if (txt_weight2.Text.Trim().Length <= 0)
                 {
                     _setWeigth(2, _strCurrent);
                     return;
                 }
-                if (txtW3.Text.Trim().Length <= 0)
+                if (txt_weight3.Text.Trim().Length <= 0)
                 {
                     _setWeigth(3, _strCurrent);
                     return;
                 }
-                if (txtW4.Text.Trim().Length <= 0)
+                if (txt_weight4.Text.Trim().Length <= 0)
                 {
                     _setWeigth(4, _strCurrent);
                     return;
                 }
-                if (txtW5.Text.Trim().Length <= 0)
+                if (txt_weight5.Text.Trim().Length <= 0)
                 {
                     _setWeigth(5, _strCurrent);
                     return;
@@ -188,32 +188,32 @@
                 {
                     if (_weightType == 1)
                     {
-                        txtW1.Text = _weight;
+                        txt_weight1.Text = _weight;
                         return;
                     }
                     if (_weightType == 2)
                     {
-                        txtW2.Text = _weight;
+                        txt_weight2.Text = _weight;
                         return;
                     }
                     if (_weightType == 3)
                     {
-                        txtW3.Text = _weight;
+                        txt_weight3.Text = _weight;
                         return;
                     }
                     if (_weightType == 4)
                     {
-                        txtW4.Text = _weight;
+                        txt_weight4.Text = _weight;
                         return;
                     }
                     if (_weightType == 5)
                     {
-                        txtW5.Text = _weight;
+                        txt_weight5.Text = _weight;
                         return;
                     }
                     if (_weightType == 99)
                     {
-                        this.txtW1.Text = this.txtW2.Text = this.txtW3.Text = this.txtW4.Text = this.txtW5.Text = "";
+                        this.txt_weight1.Text = this.txt_weight2.Text = this.txt_weight3.Text = this.txt_weight4.Text = this.txt_weight5.Text = "";
                         return;
                     }
                 }
@@ -546,20 +546,27 @@
             toolBarMenu1.isSetBtn = false;
             if (txt_fcheckResu.Text.Trim() == _strTag && string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim()))
             {
-                Gs.DevApp.ToolBox.MsgHelper.ShowError("褰撴楠岀粨鏋滀笉鍚堟牸鏃讹紝璇峰～鍐欏娉ㄨ鏄庯紒");
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("褰撴楠岀粨鏋滀笉鍚堟牸鏃讹紝璇峰～鍐欏紓甯告弿杩帮紒");
                 txt_fngDesc.Focus();
+                return;
+            }
+            if (txt_fcheckResu.Text.Trim() == _strTag && string.IsNullOrEmpty(txt_xblb.TextTxt.Trim()))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("褰撴楠岀粨鏋滀笉鍚堟牸鏃讹紝璇峰～鍐欓�夊埆绫诲埆锛�");
+                txt_xblb.Focus();
                 return;
             }
             var _obj = new
             {
                 guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
                 fngDesc = txt_fngDesc.TextTxt.Trim(),
+                iqcRemark= txt_iqcRemark.Text.Trim(),
+                iqcXblb = txt_xblb.TextTxt.Trim(),
             };
             try
             {
                 string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                 ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-
                 if (_rtn.rtnCode > 0)
                 {
                     ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -588,7 +595,7 @@
         {
             gcMain1.DataSource = null;
             System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
-            _sbSqlWhere.Append(" a.ReceiveOrgId in");
+            _sbSqlWhere.Append(" and a.ReceiveOrgId in");
             _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
             _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
             PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());

--
Gitblit v1.9.3