2 Incheckningar 64633b0b4c ... ea5207da0b

Upphovsman SHA1 Meddelande Datum
  flower ea5207da0b 合并 1 vecka sedan
  flower 57c11fa0d4 小数问题 1 vecka sedan
2 ändrade filer med 11 tillägg och 1 borttagningar
  1. 8 0
      bound/views.py
  2. 3 1
      erp/views.py

+ 8 - 0
bound/views.py

@@ -841,8 +841,16 @@ class OutBoundBatchViewSet(viewsets.ModelViewSet):
         data['goods_out_qty'] = Decimal(str(data['goods_out_qty']))
 
         # 现在 data['goods_out_qty'] 是 Decimal 类型,可以进行减法操作
+        from decimal import Decimal
+
+        # 假设 data['goods_out_qty'] 是一个 float 类型的数值
+        data['goods_out_qty'] = Decimal(str(data['goods_out_qty']))
+
+        # 现在所有数值都是 Decimal 类型,可以安全地进行减法运算
         data['goods_qty'] = batch_obj.goods_qty - batch_obj.goods_reserve_qty - data['goods_out_qty']
 
+        # data['goods_qty'] = batch_obj.goods_qty - batch_obj.goods_reserve_qty - data['goods_out_qty']
+
         data['status'] = 0  #现在处于出库申请状态
    
         serializer = self.get_serializer(data=data)

+ 3 - 1
erp/views.py

@@ -780,7 +780,9 @@ class GenerateOutbound(APIView):
             # 计算重量 - 使用入库单件的重量进行计算
             unit_weight = batch_obj.goods_weight or 1  # 避免除零错误
             out_qty = material.goods_out_qty
-            total_weight = unit_weight * out_qty
+            from decimal import Decimal
+
+            total_weight = Decimal(unit_weight) * Decimal(out_qty)
 
             # 创建出库批次记录
             batch = OutBatchModel(