src_0nline/ShwasherSys/ShwasherSys.Application/Order/OrderItemsApplicationService.cs

@@ -678,7 +678,7 @@ namespace ShwasherSys.Order
             int completeStatus = OrderItemStatusEnum.NegotiationComplete.ToInt();
             //过滤掉结束和协商完成的
             var notEndItems = Repository.GetAllList(i =>
-                i.OrderNo == pcOrderNo && i.OrderItemStatusId != endstatus&&i.OrderItemStatusId!= completeStatus);
+                i.OrderNo == pcOrderNo && i.OrderItemStatusId != endstatus && i.OrderItemStatusId != completeStatus);
             if (piExOrderItemId != 0)
             {
                 notEndItems = notEndItems.Where(i => i.Id != piExOrderItemId).ToList();
@@ -751,7 +751,7 @@ namespace ShwasherSys.Order
                 await Repository.UpdateAsync(item);
             }
             OrderItemsCallAndEnd loResult = new OrderItemsCallAndEnd();
-            if (items.Any() && input.OrderItemStatusId == OrderItemStatusEnum.End.ToInt())
+            if (items.Any() && (input.OrderItemStatusId == OrderItemStatusEnum.End.ToInt() || input.OrderItemStatusId == OrderItemStatusEnum.NegotiationComplete.ToInt()))
             {
                 string lcOrderNo = items[0].OrderNo;
                 var isHasExItems = IsExOrderItem(lcOrderNo, poExOrderItems: items);//是否有其它订单明细