1、检验项目保存后根据检验标准计算样本数 2、检验项目复制新增物料类型选项 3、增加仓管员字段 4、采购到货新增（本次收量、需求单据号、源单单号、ER...

kyy

2025-08-06 5aab9b3b2af46e747c24709e88294cf5300d430a

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

@@ -326,12 +326,14 @@
                        string _FupAllow = row["FupAllow"].ToString();
                        string _FdownAllow = row["FdownAllow"].ToString();
                        string _isRzxxTxt = row["isRzxx"].ToString();
                        decimal _ycsl = 0;
                        bool _isRzxx = false;
                        if (_isRzxxTxt == "1" || _isRzxxTxt.ToUpper() == "true".ToUpper())
                            _isRzxx = true;
                        //假如三个都为空通过
                        if (string.IsNullOrEmpty(_Fstand) && string.IsNullOrEmpty(_FupAllow) && string.IsNullOrEmpty(_FdownAllow))
                        {
                              
                        }
                        else
                        {
@@ -340,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) { }

                                /*  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
                            {
@@ -367,7 +400,8 @@
                            Memo = row["memo"].ToString(),
                            FupAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FupAllow"].ToString()),
                            FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()),
                            ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),
                            //ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),
                            ypsl = _ycsl,
                            stationName = row["stationName"].ToString(),
                            FcheckType = row["FcheckType"].ToString(),
                            isRzxx = _isRzxx,