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

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryD.cs

@@ -37,7 +37,7 @@ public partial class WmsCarryD : BaseEntity<string>, IWmsCarryEntity
     /// <summary>
     /// 位置
     /// </summary>
-    public string loc { get; set; } = string.Empty;
+    public int loc { get; set; }
 
     /// <summary>
     /// 创建用户

WarehouseMgr/Tnb.WarehouseMgr/WmsCarryBindService.cs

@@ -74,7 +74,7 @@ namespace Tnb.WarehouseMgr
                     org_id = carry?.org_id!,
                     membercarry_id = subCarry.id,
                     membercarry_code = subCarry.carry_code,
-                    loc = input.data[nameof(WmsCarrybindH.loc)]?.ToString()!,
+                    loc = input.data[nameof(WmsCarrybindH.loc)].ParseToInt(1),
                     create_id = _userManager.UserId,
                     create_time = DateTime.Now
                 };

WarehouseMgr/Tnb.WarehouseMgr/WmsPDACarryBindService.cs

@@ -74,7 +74,7 @@ namespace Tnb.WarehouseMgr
                     org_id = carry?.org_id!,
                     membercarry_id = subCarry.id,
                     membercarry_code = subCarry.carry_code,
-                    loc = input.data[nameof(WmsCarrybindH.loc)]?.ToString()!,
+                    loc = input.data[nameof(WmsCarrybindH.loc)].ParseToInt(1),
                     create_id = _userManager.UserId,
                     create_time = DateTime.Now
                 };