|
@@ -422,10 +422,9 @@ namespace wms.service.Service
|
|
|
//后续一个配方会有多个垛型
|
|
|
if (reqDto.MatCode.StartsWith("57")) //是芯股
|
|
|
{
|
|
|
- stack = _billBomsetgrpRepository.GetList(p =>
|
|
|
+ stack = _billBomsetgrpRepository.AsQueryable().Where(p =>
|
|
|
(p.BomCode == procode || procode.Contains(p.BomCode)) && p.ProMaterCode.StartsWith("57") &&
|
|
|
- p.IsStop == 0)
|
|
|
- .OrderBy(x => x.EditTime).First();
|
|
|
+ p.IsStop == 0).OrderBy(x => x.EditTime).First();
|
|
|
if (stack == null)
|
|
|
{
|
|
|
res.ResCode = ResponseStatusCodeEnum.ErrParam.GetHashCode();
|
|
@@ -436,11 +435,9 @@ namespace wms.service.Service
|
|
|
}
|
|
|
else //不是芯股
|
|
|
{
|
|
|
- var stackList = _billBomsetgrpRepository.GetList(p =>
|
|
|
+ stack = _billBomsetgrpRepository.GetList(p =>
|
|
|
(p.BomCode == procode || procode.Contains(p.BomCode)) && !p.ProMaterCode.StartsWith("57") &&
|
|
|
- p.IsStop == 0).ToList();
|
|
|
-
|
|
|
- stack = stackList.OrderBy(x => x.EditTime).First();
|
|
|
+ p.IsStop == 0).OrderBy(x => x.EditTime).First(); ;
|
|
|
|
|
|
if (stack == null)
|
|
|
{
|