fix: mio_saleout时正确计算delivered_count

apps/sam/services.py

@@ -13,21 +13,25 @@ class SamService:
         order = mio.order
         if order is None:
             return
-        for i in MIOItem.objects.filter(mio=mio):
+        orderitem_qs = OrderItem.objects.filter(order=order)
-            orderitem = OrderItem.objects.get(order=order, material=i.material)
+        matIds = list(MIOItem.objects.filter(mio=mio).values_list('material__id', flat=True).distinct())
-            if is_reverse:
+        matIds2 = list(orderitem_qs.values_list('material__id', flat=True).distinct())
-                delivered_count = orderitem.delivered_count - i.count
+        if set(matIds) != set(matIds2):
-            else:
+            raise ValidationError('订单与发货单物料不一致')
-                delivered_count = orderitem.delivered_count + i.count
+        for orderitem in orderitem_qs:
+            material = orderitem.material
+            delivered_count = MIOItem.objects.filter(
+                mio__order=order, material=material, mio__type='sale_out', mio__submit_time__isnull=False).values('count').aggregate(Sum('count'))['count__sum']
+            delivered_count = delivered_count if delivered_count else 0
             if delivered_count > orderitem.count:
-                raise ValidationError((f'{i.material.name}-超出订单所需数量'))
+                raise ValidationError((f'{str(material)}-超出订单所需数量'))
             elif delivered_count < 0:
-                raise ValidationError((f'{i.material.name}-数量小于0'))
+                raise ValidationError((f'{str(material)}-数量小于0'))
             orderitem.delivered_count = delivered_count
-            orderitem.save()
+            orderitem.save(update_fields=['delivered_count'])
         # 更新order的状态
         qs = OrderItem.objects.filter(
-            order=order, count__gte=F('delivered_count'))
+            order=order, count__gt=F('delivered_count'))
         order_state = Order.ORDER_DOING
         if qs.exists():
             pass