zuowei/erpnew
1
0
Fork 0
forked from erp-dev/erp
Code Pull Requests Activity

fix: order_description change to copy by rolling_warn of printing_order

Browse Source
This commit is contained in:
colaftc
2026-04-23 23:55:06 +08:00
parent d4fbb2c7fe
commit 80805ba312
6 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api_v1/views/shipment/test_api.py
View File

@@ -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(