|
|
@@ -4504,7 +4504,7 @@ namespace Business.ResourceExamineManagement
|
|
|
var productOpList = _productStructureOp.Select(x => orderCode.Contains(x.ProductItem) && x.Domain == param.factoryId.ToString());
|
|
|
//获取物料主数据
|
|
|
List<ItemMaster> itemMasters = _itemMaster.Select(p => p.Domain == param.factoryId.ToString() && orderCode.Contains(p.ItemNum)).ToList();
|
|
|
- var dbworklist = _workOrdMaster.Select(x => string.IsNullOrEmpty(x.Status) || x.Status == "p" || x.Status == "P").ToList();
|
|
|
+ var dbworklist = _workOrdMaster.Select(x => (string.IsNullOrEmpty(x.Status) || x.Status == "p" || x.Status == "P") && (string.IsNullOrEmpty(x.Typed) || (!string.IsNullOrEmpty(x.Typed) && x.Typed.ToUpper() != "PW" && x.BusinessID > 0))).ToList();
|
|
|
decimal Priority = 0;
|
|
|
if (dbworklist.Any())
|
|
|
{
|
