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

cdk

8 天以前 b7d9f2e23cbda587d814c7d07c1664c053c83dcb

 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs

@@ -20,7 +20,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,13 +47,28 @@
            //类型，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) =>
@@ -236,6 +251,8 @@
                gvList.Add(gvMx1);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
            }
            //2025/07/12加上修改状态下不能修改
            txt_itemId.Enabled = false;
        }

        /// <summary>
@@ -368,6 +385,7 @@
                            stationName = row["stationName"].ToString(),
                            FcheckType = row["FcheckType"].ToString(),
                            isRzxx = _isRzxx,
                            Funit = row["funit"].ToString(),
                        });
                    }
                }
@@ -576,6 +594,7 @@
                }
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
@@ -585,7 +604,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)
            {
@@ -828,12 +848,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);
                }
            }
        }