|
|
@@ -96,11 +96,16 @@ public class FqcInspectionService : IDynamicApiController, ITransient
|
|
|
sets.Append($"j{i}=@j{i},");
|
|
|
pars.Add(new SugarParameter($"@j{i}", string.IsNullOrWhiteSpace(v) ? null : v.Trim()));
|
|
|
}
|
|
|
- sets.Append("NonNumericalTypeOK=@ok, NonNumericalTypeNG=@ng, ybl=@ybl, pd=@pd");
|
|
|
+ // 录入类型由检验员在录入页当场选择(不依赖检规预配置):落检验单明细快照 lrlx,覆盖检规空值
|
|
|
+ var lrlx = ln.Lrlx?.Trim();
|
|
|
+ if (!string.IsNullOrEmpty(lrlx) && lrlx != "NUMERIC" && lrlx != "NON_NUMERIC")
|
|
|
+ throw Oops.Oh("录入类型仅支持 数值型(NUMERIC)/非数值型(NON_NUMERIC)");
|
|
|
+ sets.Append("NonNumericalTypeOK=@ok, NonNumericalTypeNG=@ng, ybl=@ybl, pd=@pd, lrlx=@lrlx");
|
|
|
pars.Add(new SugarParameter("@ok", (object?)ln.NonNumericalTypeOK ?? DBNull.Value));
|
|
|
pars.Add(new SugarParameter("@ng", (object?)ln.NonNumericalTypeNG ?? DBNull.Value));
|
|
|
pars.Add(new SugarParameter("@ybl", (object?)Nz(ln.Ybl) ?? DBNull.Value));
|
|
|
pars.Add(new SugarParameter("@pd", (object?)Nz(ln.Pd) ?? DBNull.Value));
|
|
|
+ pars.Add(new SugarParameter("@lrlx", string.IsNullOrEmpty(lrlx) ? (object)DBNull.Value : lrlx));
|
|
|
pars.Add(new SugarParameter("@id", ln.Id));
|
|
|
pars.Add(new SugarParameter("@g", input.InspBillId));
|
|
|
pars.Add(new SugarParameter("@t", tenantId));
|
|
|
@@ -198,6 +203,8 @@ public class FqcSaveDetailInput
|
|
|
public class FqcSaveDetailLine
|
|
|
{
|
|
|
public long Id { get; set; }
|
|
|
+ /// <summary>录入类型(检验员在录入页当场选择):NUMERIC 数值型 / NON_NUMERIC 非数值型 / 空=未定</summary>
|
|
|
+ public string? Lrlx { get; set; }
|
|
|
public List<string?>? Samples { get; set; }
|
|
|
public long? NonNumericalTypeOK { get; set; }
|
|
|
public long? NonNumericalTypeNG { get; set; }
|