DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -342,12 +342,43 @@
                                decimal _Fstand_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_Fstand);
                                decimal _FupAllow_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_FupAllow);
                                decimal _FdownAllow_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_FdownAllow);
                                if (_Fstand_f >= _FdownAllow_f && _Fstand_f <= _FupAllow_f) {   _ycsl = 5; }
                                /*  if (_Fstand_f >= _FdownAllow_f && _Fstand_f <= _FupAllow_f) {   _ycsl = 5; }
                                  else
                                  {
                                      MsgHelper.ShowError("标准值必须在上限和下限之间!");
                                      return;
                                  }
                             */
                                //优化后的代码,主要是在给_ycsl赋值的部分增加了对SampleSizeNo的判断
                                if (_Fstand_f >= _FdownAllow_f && _Fstand_f <= _FupAllow_f)
                                {
                                    string sampleSizeNo = row["SampleSizeNo"].ToString().ToUpper();
                                    if (sampleSizeNo.StartsWith("GB"))
                                    {
                                        _ycsl = 5;
                                    }
                                    else if (sampleSizeNo.StartsWith("PC"))
                                    {
                                        string[] parts = sampleSizeNo.Split('=');
                                        if (parts.Length > 1 && int.TryParse(parts[1], out int value))
                                        {
                                            _ycsl = value;
                                        }
                                        else
                                        {
                                            MsgHelper.ShowError("PCS格式不正确");
                                            return;
                                        }
                                    }
                                }
                                else
                                {
                                    MsgHelper.ShowError("标准值必须在上限和下限之间!");
                                    return;
                                }
                            }
                            else
                            {