From 5aab9b3b2af46e747c24709e88294cf5300d430a Mon Sep 17 00:00:00 2001 From: kyy <3283105747@qq.com> Date: 星期三, 06 八月 2025 11:41:26 +0800 Subject: [PATCH] 1、检验项目保存后根据检验标准计算样本数 2、检验项目复制新增物料类型选项 3、增加仓管员字段 4、采购到货新增(本次收量、需求单据号、源单单号、ERP剩余未收数量) --- DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs index 4de8d0c..a3330a8 100644 --- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs +++ b/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; + } + */ + + //浼樺寲鍚庣殑浠g爜锛屼富瑕佹槸鍦ㄧ粰_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 { -- Gitblit v1.9.3