Просмотр исходного кода

fix(s0): handle null standard staff count for line materials

YY968XX 1 день назад
Родитель
Сommit
b5e5dbb8e0

+ 3 - 3
server/Admin.NET.Web.Entry/Admin.NET.Web.Entry.csproj

@@ -11,9 +11,9 @@
     <GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>
     <Copyright>Admin.NET</Copyright>
     <Description>Admin.NET ͨÓÃȨÏÞ¿ª·¢Æ½Ì¨</Description>
-    <AssemblyVersion>1.0.171</AssemblyVersion>
-    <FileVersion>1.0.171</FileVersion>
-    <Version>1.0.171</Version>
+    <AssemblyVersion>1.0.172</AssemblyVersion>
+    <FileVersion>1.0.172</FileVersion>
+    <Version>1.0.172</Version>
   </PropertyGroup>
 
   <ItemGroup>

+ 2 - 2
server/Plugins/Admin.NET.Plugin.AiDOP/Controllers/S0/Manufacturing/AdoS0MfgLineMaterialsController.cs

@@ -140,7 +140,7 @@ public class AdoS0MfgLineMaterialsController : ControllerBase
             SkillNo = dto.SkillNo,
             InternalEquipmentTypeCode = dto.InternalEquipmentTypeCode,
             MoldTypeCode = dto.MoldTypeCode,
-            StandardStaffCount = dto.StandardStaffCount,
+            StandardStaffCount = dto.StandardStaffCount ?? 0m,
             Start = dto.Start,
             IsActive = dto.IsActive,
             IsConfirm = dto.IsConfirm,
@@ -174,7 +174,7 @@ public class AdoS0MfgLineMaterialsController : ControllerBase
         entity.SkillNo = dto.SkillNo;
         entity.InternalEquipmentTypeCode = dto.InternalEquipmentTypeCode;
         entity.MoldTypeCode = dto.MoldTypeCode;
-        entity.StandardStaffCount = dto.StandardStaffCount;
+        entity.StandardStaffCount = dto.StandardStaffCount ?? 0m;
         entity.Start = dto.Start;
         entity.IsActive = dto.IsActive;
         entity.IsConfirm = dto.IsConfirm;

+ 2 - 1
server/Plugins/Admin.NET.Plugin.AiDOP/Dto/S0/Manufacturing/AdoS0ManufacturingDtos.cs

@@ -632,7 +632,8 @@ public class AdoS0ProdLineDetailUpsertDto
     public string? SkillNo { get; set; }
     public string? InternalEquipmentTypeCode { get; set; }
     public string? MoldTypeCode { get; set; }
-    public decimal StandardStaffCount { get; set; }
+    /// <summary>标准人数。可空:前端 el-input-number 清空时传 null,反序列化不报错;控制器写入时 null 视为 0(与字段省略行为一致)。</summary>
+    public decimal? StandardStaffCount { get; set; }
     public int? Start { get; set; }
     public bool IsActive { get; set; } = true;
     public bool IsConfirm { get; set; }