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

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDistaskH.part.cs

@@ -9,5 +9,9 @@ namespace Tnb.WarehouseMgr.Entities;
 /// </summary>
 public partial class WmsDistaskH
 {
-
+    /// <summary>
+    /// 载具状态
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public string carry_status { get; set; }
 }

WarehouseMgr/Tnb.WarehouseMgr/WareHouseService.cs

@@ -425,7 +425,7 @@ namespace Tnb.WarehouseMgr
                 //更新任务执行表，单据状态为 完成
                 await _db.Updateable<WmsDistaskH>().SetColumns(it => new WmsDistaskH { status = WmsWareHouseConst.TASK_BILL_STATUS_COMPLE_ID }).Where(it => input.disTaskIds.Contains(it.id)).ExecuteCommandAsync();
                 //更新预任务申请表，单据状态为 已完成
-                var disTasks = await _db.Queryable<WmsDistaskH>().Where(it => input.disTaskIds.Contains(it.id)).ToListAsync();
+                var disTasks = await _db.Queryable<WmsDistaskH>().InnerJoin<WmsCarryH>((a, b) => a.carry_id == b.id).Where(a => input.disTaskIds.Contains(a.id)).Select((a, b) => new WmsDistaskH { carry_status = b.carry_status }, true).ToListAsync();
                 if (disTasks?.Count > 0)
                 {
                     var preTaskIds = disTasks.Select(x => x.pretask_id).ToList();
@@ -444,7 +444,15 @@ namespace Tnb.WarehouseMgr
                 if (disTasks?.Count > 0)
                 {
                     var destLocIds = disTasks.Select(it => it.endlocation_id).ToList();
-                    await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_use = "1", is_lock = 0 }).Where(it => destLocIds.Contains(it.id)).ExecuteCommandAsync();
+                    var multis = disTasks.Select(it => (it.endlocation_id, it.carry_status)).ToList();
+                    for (int i = 0; i < multis.Count; i++)
+                    {
+                        var carryStatus = multis[i].carry_status;
+                        if (multis[i].carry_status == "0")
+                        {
+                            carryStatus = "1";
+                        }
+                        await _db.Updateable<BasLocation>().SetColumns(it => new BasLocation { is_use = carryStatus, is_lock = 0 }).Where(it => it.id == multis[i].endlocation_id).ExecuteCommandAsync();
                     }
                     //更新业务主表的单据状态
                     if (disTasks?.Count > 0)

WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs

@@ -32,6 +32,7 @@ namespace Tnb.WarehouseMgr
 
         private async Task<dynamic> OutStockApplyFor(VisualDevModelDataCrInput input)
         {
+
             return Task.FromResult(0);
         }