Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTask.cs

@@ -197,5 +197,10 @@ public partial class PrdMoTask : BaseEntity<string>
     /// 物料清单id
     /// </summary>
     public string? ebom_id { get; set; }
+    
+    /// <summary>
+    /// 批号
+    /// </summary>
+    public string? batch { get; set; }
 
 }

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOutPackMarkLabel.cs

@@ -17,12 +17,12 @@ public partial class PrdOutPackMarkLabel : BaseEntity<string>
     /// <summary>
     /// 是否喷码 0 否 1 是
     /// </summary>
-    public int is_mark { get; set; }
+    public int? is_mark { get; set; }
 
     /// <summary>
     /// 是否贴标 0 否 1 是
     /// </summary>
-    public int is_label { get; set; }
+    public int? is_label { get; set; }
 
     /// <summary>
     /// 任务单号