桌面端密炼计划、胶料快检调整

2026-06-18 15:18:11 +08:00
parent 372dc10be2
commit c54d54b40f
20 changed files with 1509 additions and 311 deletions
--- a/yy-admin-master/YY.Admin.Core/Entity/MesXslMixingProductionPlan.cs
+++ b/yy-admin-master/YY.Admin.Core/Entity/MesXslMixingProductionPlan.cs
@@ -47,4 +47,18 @@ public class MesXslMixingProductionPlan
    };

    public string PlanDateText => PlanDate?.ToString("yyyy-MM-dd") ?? string.Empty;
+
+    /// <summary>计划+胶料号：计划号_胶料名称，如 SA0001_HB10001</summary>
+    public string PlanMaterialNo
+    {
+        get
+        {
+            var planNo = PlanNo?.Trim();
+            var materialName = MaterialName?.Trim();
+            if (string.IsNullOrEmpty(planNo) && string.IsNullOrEmpty(materialName)) return string.Empty;
+            if (string.IsNullOrEmpty(planNo)) return materialName ?? string.Empty;
+            if (string.IsNullOrEmpty(materialName)) return planNo;
+            return $"{planNo}_{materialName}";
+        }
+    }
 }