diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/SignForDeliveryInput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/SignForDeliveryInput.cs
index 75ddcae5..f41c5f38 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/SignForDeliveryInput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/SignForDeliveryInput.cs
@@ -18,10 +18,6 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
///
/// 载具ID
///
- public string carryId { get; set; }
- ///
- /// 服务模块
- ///
- public string serviceModule { get; set; }
+ public string carryId { get; set; }
}
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs
index bd13a658..95927b64 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs
@@ -124,7 +124,7 @@ namespace Tnb.WarehouseMgr
GenPreTaskUpInput genPreTaskAfterUpInput = new();
genPreTaskAfterUpInput.CarryIds = preTasks.Select(x => x.carry_id).ToList();
genPreTaskAfterUpInput.LocationIds = new HashSet(locIds).ToList();
- await _wareHouseService.GenInStockTaskHandleAfter(genPreTaskAfterUpInput, it => new WmsCarryH { is_lock = 1 }, it => new BasLocation { is_lock = 1 });
+ await _wareHouseService.GenInStockTaskHandleAfter(genPreTaskAfterUpInput, it => new WmsCarryH { is_lock = 1, carry_status = ((int)EnumCarryStatus.齐套分拣).ToString() }, it => new BasLocation { is_use = ((int)EnumCarryStatus.齐套分拣).ToString() });
}
}
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs
index 9242aa8d..8a82ceb9 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs
@@ -57,28 +57,40 @@ namespace Tnb.WarehouseMgr
{
_dicBizType = await _dictionaryDataService.GetDictionaryByTypeId(WmsWareHouseConst.WMS_BIZTYPE_ID);
}
- var carry = await _db.Queryable().SingleAsync(it => it.id == input.carryId);
- if (carry != null)
+ try
{
- var disTask = await _db.Queryable().SingleAsync(it => it.id == input.disTaskId);
- if (disTask != null)
+ await _db.Ado.BeginTranAsync();
+
+ var carry = await _db.Queryable().SingleAsync(it => it.id == input.carryId);
+ if (carry != null)
{
- if (_dicBizType.ContainsKey(disTask.biz_type))
+ var disTask = await _db.Queryable().SingleAsync(it => it.id == input.disTaskId);
+ if (disTask != null)
{
- switch (_dicBizType[disTask.biz_type])
+ if (_dicBizType.ContainsKey(disTask.biz_type))
{
- case "空载具出库":
- case "寄存出库":
- case "齐套出库":
- case "一般出库":
- await _wareCarryService.UpdateNullCarry(carry);
- break;
+ switch (_dicBizType[disTask.biz_type])
+ {
+ case "空载具出库":
+ case "寄存出库":
+ case "齐套出库":
+ case "一般出库":
+ await _wareCarryService.UpdateNullCarry(carry);
+ break;
+ }
}
}
+ var loc = await _db.Queryable().SingleAsync(it => it.id == carry.location_id);
+ loc.is_use = "0";
+ await _db.Updateable(loc).UpdateColumns(it => it.is_use).ExecuteCommandAsync();
}
- var loc = await _db.Queryable().SingleAsync(it => it.id == carry.location_id);
- loc.is_use = "0";
- await _db.Updateable(loc).UpdateColumns(it => it.is_use).ExecuteCommandAsync();
+
+ await _db.Ado.CommitTranAsync();
+ }
+ catch (Exception)
+ {
+ await _db.Ado.RollbackTranAsync();
+ throw;
}
}
}