Переглянути джерело

fix(s0): show standard bom item codes from imported fields

- Controller 列表 parentItemNum 改用 m.ParentItem(53032 行已 100% 有值的字符串编码字段)
- Controller 列表 componentItemNum 改用 m.ComponentItem
- 不依赖 ParentMaterialId / ComponentMaterialId 数字 ID(当前全 0/NULL)
- 父子项名称仍走 matMap(命中部分天然恢复,等 ItemMaster 补导独立批次)
- bump server version 1.0.128 → 1.0.129
YY968XX 2 днів тому
батько
коміт
ffbbf477ed

+ 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.128</AssemblyVersion>
-    <FileVersion>1.0.128</FileVersion>
-    <Version>1.0.128</Version>
+    <AssemblyVersion>1.0.129</AssemblyVersion>
+    <FileVersion>1.0.129</FileVersion>
+    <Version>1.0.129</Version>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -106,10 +106,10 @@ public class AdoS0ProductStructuresController : ControllerBase
                 m.CompanyRefId,
                 m.FactoryRefId,
                 parentMaterialId = m.ParentMaterialId,
-                parentItemNum = pm?.ItemNum ?? "",
+                parentItemNum = m.ParentItem ?? "",
                 parentDescr = pm?.Descr ?? "",
                 componentMaterialId = m.ComponentMaterialId,
-                componentItemNum = cm?.ItemNum ?? "",
+                componentItemNum = m.ComponentItem ?? "",
                 componentDescr = cm?.Descr ?? "",
                 descr = cm?.Descr ?? "",
                 preStructureType,