fix: order_description change to copy by rolling_warn of printing_order

api_v1/views/shipment/serializers.py

@@ -101,7 +101,8 @@ def _resolve_shipment_order_description(shipment: Shipment) -> str | None:
     )
     if printing_job is None or printing_job.printing_order is None:
         return None
-    return printing_job.printing_order.description
+    # 目前滚筒预警字段被放在了 printing_order 上，暂时沿用这个字段来返回订单描述；
+    return printing_job.printing_order.rolling_warn
 
 
 class ShipmentSerializer(serializers.ModelSerializer):

api_v1/views/shipment/test_api.py

@@ -1634,6 +1634,7 @@ class ShipmentQueryAPITestCase(TestCase):
             created_by=self.user1,
             external_order_id="QUERY-PO-001",
             description="查询订单备注",
+            rolling_warn="查询滚筒预警",
         )
         self.printing_job1 = printing_models.PrintingJob.objects.create(
             merchant=self.merchant1,
@@ -1694,7 +1695,7 @@ class ShipmentQueryAPITestCase(TestCase):
         self.assertIn("delivery_id", item)
         self.assertIsNone(item["delivery_id"])
         self.assertEqual(item["fabric"], "查询面料")
-        self.assertEqual(item["order_description"], "查询订单备注")
+        self.assertEqual(item["order_description"], "查询滚筒预警")
         self.assertEqual(item["area"], "A1")
         self.assertEqual(item["status"], shipment_models.ShipmentStatus.DRAFT)
         self.assertEqual(item["status_display"], "草稿(未发布)")
@@ -1841,7 +1842,7 @@ class ShipmentQueryAPITestCase(TestCase):
         self.assertIn("delivery_id", result)
         self.assertIsNone(result["delivery_id"])
         self.assertEqual(result["fabric"], "查询面料")
-        self.assertEqual(result["order_description"], "查询订单备注")
+        self.assertEqual(result["order_description"], "查询滚筒预警")
         self.assertEqual(result["id"], self.shipment1.id)
         self.assertIn("area", result)
         self.assertEqual(result["area"], "A1")
@@ -3052,6 +3053,8 @@ class ShipmentDeliveryAPITestCase(APITestCase):
             vehicle_trip="KD-007-D",
             created_by=self.user,
         )
+        self.shipment1.delivery = delivery
+        self.shipment1.save(update_fields=["delivery", "updated_at"])
         permission = Permission.objects.get(codename="cancel_shipmentdelivery")
         self.user.user_permissions.add(permission)
 
@@ -3071,9 +3074,11 @@ class ShipmentDeliveryAPITestCase(APITestCase):
         self.assertIsNotNone(data["cancelled_at"])
 
         delivery.refresh_from_db()
+        self.shipment1.refresh_from_db()
         self.assertEqual(delivery.status, shipment_models.ShipmentDeliveryStatus.CANCELLED)
         self.assertEqual(delivery.cancelled_by_id, self.user.id)
         self.assertIsNotNone(delivery.cancelled_at)
+        self.assertEqual(self.shipment1.delivery_id, delivery.id)
 
     def test_bind_shipments_to_existing_delivery_success(self):
         delivery = shipment_models.ShipmentDelivery.objects.create(