From 200b60701072ff421156d7fd3c4fecf1a3b5bdb3 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 07 九月 2025 10:58:58 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs |   46 ++++++++++++++++++++++++++++++----------------
 1 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index e5fee83..80bd659 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -26,10 +26,20 @@
         /// <summary>
         /// 瀹氭椂鍒锋柊
         /// </summary>
-        System.Timers.Timer timer = new System.Timers.Timer(1000);
+        System.Timers.Timer timer;
+
         public Frm_MesQaItemsDetect01()
         {
             InitializeComponent();
+
+            #region 璁剧疆鏃堕棿
+            int int32 = 3000;
+            string _vanishingSeconds = ConfigurationManager.AppSettings["IqcGetWeight"];
+            if (!string.IsNullOrEmpty(_vanishingSeconds))
+                int32 = int.Parse(_vanishingSeconds);
+            timer = new System.Timers.Timer(int32);
+            #endregion
+
             this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
             this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
             this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
@@ -93,7 +103,7 @@
                 }
                 catch (Exception ex)
                 {
-
+                    Gs.DevApp.ToolBox.LogHelper.Debug(this.ToString(), "WorkWeight/GetIqcWeight:" + ex.Message);
                 }
             };
             timer.AutoReset = true; // 璁剧疆涓簍rue琛ㄧず閲嶅鎵ц锛宖alse琛ㄧず鎵ц涓�娆″悗鍋滄
@@ -114,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;
@@ -168,7 +178,7 @@
             };
             try
             {
-                var strReturn = UtilityHelper.HttpPost("", "WorkWeight/EditIqc", JsonConvert.SerializeObject(_obj), false);
+                var strReturn = UtilityHelper.HttpPost("", "WorkWeight/EditIqcWeight", JsonConvert.SerializeObject(_obj), false);
                 var dd = UtilityHelper.ReturnToDynamic(strReturn);
                 if (dd.rtnCode <= 0)
                 {
@@ -178,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;
                     }
                 }
@@ -544,12 +554,12 @@
             {
                 guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
                 fngDesc = txt_fngDesc.TextTxt.Trim(),
+                iqcRemark= txt_iqcRemark.Text.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);
@@ -576,7 +586,11 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage)
         {
-            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            gcMain1.DataSource = null;
+            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+            _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());
             string json = JsonConvert.SerializeObject(pgq);
             try

--
Gitblit v1.9.3