Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

lu

2025-08-25 014916bf6294dff044014cb7de4f0a334478cf72

 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;

@@ -20,7 +21,7 @@
        private List<FilterEntity> _filterList = new List<FilterEntity>();
        private readonly string _webServiceName = "MesQmCheckitemManager/";
        public string strType = "";//iqc type
        public decimal dfValue = 1;  //iqc的样品数量默认5，否则1
        public decimal dfValue = 1;  //iqc的样品数量默认5，否则看下面
        private string dftSsampleSizeName = "GB/T2828.1-2012/ISO";//默认
        private string dftSsampleSizeNo = "GB/T2828.1-2012/ISO";//默认
        private string dftFcheckLevel = "2.一般检验水平(II)";//默认检验水平
@@ -47,11 +48,27 @@
            //类型，iqc,ipqc巡检，ipqc首检查,fqc，iqc的样品值默认为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;
                gvMx1.Columns["ypsl"].Visible = false;
            }
            if (strType == QcSeason.ipqc首检.ToString())
            {
                dfValue = 0;
                gvMx1.Columns["ypsl"].Visible = false;
            }
            //如果是ipqc巡检，显示工位
            if (strType != QcSeason.ipqc巡检.ToString())
            {
                gvMx1.Columns["stationName"].Visible = false;
                gvMx1.Columns["fcheckType"].Visible = false;
            }
            //新行初始值
            this.gvMx1.InitNewRow += (s, e) =>
@@ -234,6 +251,8 @@
                gvList.Add(gvMx1);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
            }
            //2025/07/12加上修改状态下不能修改
            txt_itemId.Enabled = false;
        }

        /// <summary>
@@ -249,6 +268,7 @@
            gridViews.Add(gvMx1);
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
            UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            this.txt_itemId.ReadOnly = true;
        }

        /// <summary>
@@ -366,6 +386,7 @@
                            stationName = row["stationName"].ToString(),
                            FcheckType = row["FcheckType"].ToString(),
                            isRzxx = _isRzxx,
                            Funit = row["funit"].ToString(),
                        });
                    }
                }
@@ -417,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);
@@ -539,7 +565,8 @@
                case 2:
                    strMsg = "批准";
                    break;
            };
            }
            ;
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemNo");
@@ -573,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());
@@ -582,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)
            {
@@ -593,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) =>
@@ -736,6 +765,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>
@@ -822,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);
                }
            }
        }