Merge remote-tracking branch 'origin/dev' into dev

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.cs

@@ -144,4 +144,9 @@ public partial class WmsCarryH : BaseEntity<string>
     /// 入库时间
     /// </summary>
     public DateTime? instock_time { get; set; }
+
+    /// <summary>
+    /// 转库单ID
+    /// </summary>
+    public string? material_tranfer_billid { get; set; }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPrdInstockD.cs

@@ -54,4 +54,9 @@ public partial class WmsPrdInstockD : BaseEntity<string>
     /// </summary>
     public string? status { get; set; }
 
+    /// <summary>
+    /// 生产仓库
+    /// </summary>
+    public string? scwarehouse_id { get; set; }
+
 }