From defcac44117c17ad729e71dc3d54b087d5b46cf9 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 28 八月 2025 17:40:49 +0800
Subject: [PATCH] 销售

---
 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs |   40 ++++++++++++++++++++++++++++++----------
 1 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index b7e3ad6..8df823b 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -9,6 +9,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
+using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -47,7 +48,12 @@
             //绫诲瀷锛宨qc,ipqc宸℃锛宨pqc棣栨鏌�,fqc锛宨qc鐨勬牱鍝佸�奸粯璁や负5锛屽叾瀹冧负1
             txt_ftype.Text = strType;
             if (strType == QcSeason.iqc.ToString())
+            {
                 dfValue = 5;
+                gvMx1.Columns["funit"].Visible = true;
+                gvMx1.Columns["funit"].VisibleIndex = 13;
+                gvMx1.Columns["fcheckType"].Visible = false;
+            }
             if (strType == QcSeason.fqc.ToString())
             {
                 dfValue = 0;
@@ -57,13 +63,12 @@
             {
                 dfValue = 0;
                 gvMx1.Columns["ypsl"].Visible = false;
-                gvMx1.Columns["funit"].Visible = true;
-                gvMx1.Columns["funit"].VisibleIndex = 13;
             }
             //濡傛灉鏄痠pqc宸℃锛屾樉绀哄伐浣�
             if (strType != QcSeason.ipqc宸℃.ToString())
             {
                 gvMx1.Columns["stationName"].Visible = false;
+                gvMx1.Columns["fcheckType"].Visible = false;
             }
             //鏂拌鍒濆鍊�
             this.gvMx1.InitNewRow += (s, e) =>
@@ -246,6 +251,8 @@
                 gvList.Add(gvMx1);
                 UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
             }
+            //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+            txt_itemId.Enabled = false;
         }
 
         /// <summary>
@@ -261,6 +268,7 @@
             gridViews.Add(gvMx1);
             UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
             UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+            this.txt_itemId.ReadOnly = true;
         }
 
         /// <summary>
@@ -430,9 +438,14 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage)
         {
-            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
-            _sbSqlWhere += " and b.guid is not null";
-            _sbSqlWhere += " and a.FTYPE='" + this.strType + "'";
+            gcMain1.DataSource = null;
+
+            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+            _sbSqlWhere.Append(" and b.guid is not null");
+            _sbSqlWhere.Append(" and a.FTYPE='" + this.strType + "'");
+            _sbSqlWhere.Append(" and org.fid in");
+            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
             var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,
                 "org.FNumber asc ,b.item_no asc,a.FVERSION desc", "", "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
@@ -587,6 +600,7 @@
                 }
                 if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                 {
+                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                     if (xtraTabControl1.SelectedTabPageIndex == 1)
                     {
                         getModel(lbGuid.Text.Trim());
@@ -596,7 +610,8 @@
                     Form parentForm = this.FindForm();
                     UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, parentForm, _inFieldValue.ToString());
                 }
-                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+                else
+                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
             }
             catch (Exception ex)
             {
@@ -607,7 +622,7 @@
         #region 浠ヤ笅涓虹绉嶄笅鎷�
         private void _setIno()
         {
-            txt_itemId.Click += (s, e) =>
+            txt_itemId.ButtonClick += (s, e) =>
             {
                 var frm = new JyxmShow(this.strType);
                 frm.UpdateParent += (ss, ee) =>
@@ -839,12 +854,17 @@
                         _webServiceName + "DeleteModelMx",
                         JsonConvert.SerializeObject(lst));
                     var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
-                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                    if (_rtn.rtnCode > 0)
+                    {
+                        getModel(lbGuid.Text);
+                        MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+                    }
+                    else
+                        MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
                 }
                 catch (Exception ex)
                 {
-                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                    MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
                 }
             }
         }

--
Gitblit v1.9.3