|
|
|
|
@ -138,7 +138,7 @@ namespace Khd.Core.Wcs.Wcs
|
|
|
|
|
.ToList();
|
|
|
|
|
|
|
|
|
|
//浅库位退库单往前排序,尽量避免移库操作
|
|
|
|
|
if(rawOutStock!= null && rawOutStock.Count > 0)
|
|
|
|
|
if (rawOutStock != null && rawOutStock.Count > 0)
|
|
|
|
|
{
|
|
|
|
|
var locationOrder = dbContext.WmsBaseLocation
|
|
|
|
|
.Where(t => rawOutStock.Select(x => x.locationCode).Contains(t.locationCode))
|
|
|
|
|
@ -1623,6 +1623,15 @@ namespace Khd.Core.Wcs.Wcs
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(baseEquip.endStationCode) && baseEquip.ud3 == "1")
|
|
|
|
|
{
|
|
|
|
|
string endStationCode = baseEquip.endStationCode;
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
endStationCode = JsonConvert.DeserializeObject<List<string>>(endStationCode)[0];
|
|
|
|
|
}
|
|
|
|
|
catch
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
var wmsRawReturn = dbContext.WmsRawReturn
|
|
|
|
|
.Where(t => t.auditStatus == "1")
|
|
|
|
|
.Where(t => t.executeStatus == "0")
|
|
|
|
|
|