|
|
|
@ -2475,7 +2475,7 @@ namespace Khd.Core.Wcs.Wcs
|
|
|
|
.Where(t => t.locRow == row)
|
|
|
|
.Where(t => t.locRow == row)
|
|
|
|
.Where(t => t.locColumn == location.locColumn)
|
|
|
|
.Where(t => t.locColumn == location.locColumn)
|
|
|
|
.Where(t => t.warehouseId == location.warehouseId).FirstOrDefault();
|
|
|
|
.Where(t => t.warehouseId == location.warehouseId).FirstOrDefault();
|
|
|
|
if (!string.IsNullOrEmpty(wmsBaseLocation.containerCode) && wmsBaseLocation.locationStatus == "1")
|
|
|
|
if ( wmsBaseLocation.locationStatus == "1")
|
|
|
|
{
|
|
|
|
{
|
|
|
|
WmsRawStock? wmsRawStock = dbContext.WmsRawStock.FirstOrDefault(t => t.locationCode == wmsBaseLocation.locationCode);
|
|
|
|
WmsRawStock? wmsRawStock = dbContext.WmsRawStock.FirstOrDefault(t => t.locationCode == wmsBaseLocation.locationCode);
|
|
|
|
if (wmsRawStock != null)
|
|
|
|
if (wmsRawStock != null)
|
|
|
|
@ -2565,7 +2565,8 @@ namespace Khd.Core.Wcs.Wcs
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
// 可以出库
|
|
|
|
|
|
|
|
// continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (wmsBaseLocation != null && wmsBaseLocation.locationStatus != "1")
|
|
|
|
else if (wmsBaseLocation != null && wmsBaseLocation.locationStatus != "1")
|
|
|
|
@ -2697,12 +2698,12 @@ namespace Khd.Core.Wcs.Wcs
|
|
|
|
.Where(t => t.locColumn == location.locColumn)
|
|
|
|
.Where(t => t.locColumn == location.locColumn)
|
|
|
|
.Where(t => t.warehouseId == location.warehouseId).FirstOrDefault();
|
|
|
|
.Where(t => t.warehouseId == location.warehouseId).FirstOrDefault();
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(wmsBaseLocation.containerCode) && wmsBaseLocation.locationStatus == "1")
|
|
|
|
if (wmsBaseLocation.locationStatus == "1")
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// 浅库位有库存
|
|
|
|
// 浅库位有库存
|
|
|
|
WmsRawStock? wmsRawStock = dbContext.WmsRawStock.FirstOrDefault(t => t.locationCode == wmsBaseLocation.locationCode);
|
|
|
|
WmsRawStock? wmsRawStock = dbContext.WmsRawStock.FirstOrDefault(t => t.locationCode == wmsBaseLocation.locationCode);
|
|
|
|
|
|
|
|
if (wmsRawStock != null)
|
|
|
|
|
|
|
|
{
|
|
|
|
// 寻找移库目的库位
|
|
|
|
// 寻找移库目的库位
|
|
|
|
WmsBaseLocation? toLocation = null;
|
|
|
|
WmsBaseLocation? toLocation = null;
|
|
|
|
|
|
|
|
|
|
|
|
@ -2782,6 +2783,13 @@ namespace Khd.Core.Wcs.Wcs
|
|
|
|
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(RemoveTask);
|
|
|
|
WcsTaskLog wcsTaskLog = CoreMapper.Map<WcsTaskLog>(RemoveTask);
|
|
|
|
dbContext.Add(wcsTaskLog);
|
|
|
|
dbContext.Add(wcsTaskLog);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
//直接出
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (wmsBaseLocation.locationStatus != "1")
|
|
|
|
else if (wmsBaseLocation.locationStatus != "1")
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|