baogq
/
JYHB-WCS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/ericxinstar/jywcs

Browse Source
master
范 1 year ago
parent 8bb61cd5f2 7fd89e1136
commit 3f1dacb272
1 changed files with 74 additions and 66 deletions
Show Stats Download Patch File Download Diff File

22
src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs
Unescape Escape View File

@ -1408,7 +1408,7 @@ namespace Khd.Core.Wcs.Wcs
WmsBaseLocation? wmsBaseLocation = dbContext.WmsBaseLocation.Where(t => t.locRow == row) WmsBaseLocation? wmsBaseLocation = dbContext.WmsBaseLocation.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")
{ {
WmsProductStock? wmsProductStock = dbContext.WmsProductStock.FirstOrDefault(t => t.locationCode == wmsBaseLocation.locationCode); WmsProductStock? wmsProductStock = dbContext.WmsProductStock.FirstOrDefault(t => t.locationCode == wmsBaseLocation.locationCode);
@ -1559,7 +1559,7 @@ namespace Khd.Core.Wcs.Wcs
} }
else else
{ {
continue; // break;
} }
} }
else else
@ -2479,7 +2479,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)
@ -2569,7 +2569,8 @@ namespace Khd.Core.Wcs.Wcs
} }
else else
{ {
continue; // 可以出库
// continue;
} }
} }
else if (wmsBaseLocation != null && wmsBaseLocation.locationStatus != "1") else if (wmsBaseLocation != null && wmsBaseLocation.locationStatus != "1")
@ -2701,12 +2702,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;
@ -2786,6 +2787,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")
{ {

Write Preview
Loading…
Cancel
Save