|
|
|
|
@ -365,7 +365,7 @@ namespace Khd.Core.Wcs.Wcs
|
|
|
|
|
{
|
|
|
|
|
dbContext.ChangeTracker.Clear();
|
|
|
|
|
List<WmsMove> wmsMoves = dbContext.WmsMove.Where(t => t.AuditStatus == "1" && t.ExecuteStatus == "0")
|
|
|
|
|
.Where(t => t.OperationType == "1").Where(t => wareHouseIds.Contains(t.WarehouseId)).ToList();
|
|
|
|
|
.Where(t => t.OperationType == "3").Where(t => wareHouseIds.Contains(t.WarehouseId)).ToList();
|
|
|
|
|
foreach (var item in wmsMoves)
|
|
|
|
|
{
|
|
|
|
|
BaseEquip agvEquip;
|
|
|
|
|
@ -399,15 +399,15 @@ namespace Khd.Core.Wcs.Wcs
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (toLocation != null && toLocation.locDeep == 1)
|
|
|
|
|
{
|
|
|
|
|
//查询浅库位状态
|
|
|
|
|
var lowerLocation = SystemData.GetLowerLocation(toLocation, dbContext);
|
|
|
|
|
if (lowerLocation != null && (lowerLocation == null || lowerLocation.locationStatus != "1" || !string.IsNullOrEmpty(lowerLocation.containerCode)))
|
|
|
|
|
{
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
//if (toLocation != null && toLocation.locDeep == 1)
|
|
|
|
|
//{
|
|
|
|
|
// //查询浅库位状态
|
|
|
|
|
// var lowerLocation = SystemData.GetLowerLocation(toLocation, dbContext);
|
|
|
|
|
// if (lowerLocation != null && (lowerLocation == null || lowerLocation.locationStatus != "1" || !string.IsNullOrEmpty(lowerLocation.containerCode)))
|
|
|
|
|
// {
|
|
|
|
|
// continue;
|
|
|
|
|
// }
|
|
|
|
|
//}
|
|
|
|
|
if (wmslocation != null && toLocation != null)
|
|
|
|
|
{
|
|
|
|
|
var RemoveTask = new WcsTask()
|
|
|
|
|
|