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

feat: app verion && some field modify (printing & shipment)

Browse Source
This commit is contained in:
colaftc
2026-07-08 20:36:51 +08:00
parent ddbf798665
commit 36e4bb6de6
32 changed files with 3465 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -295,6 +295,81 @@ class SalesItemByPrintingOrderAPITestCase(TestCase):
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn("匹配到多个生产订单", response.json()["detail"])
def test_get_sales_items_by_printing_order_group_groups_by_printing_job(self):
url = (
f"/api/v1/shipment/sales-items/by-printing-order/{self.printing_order.id}/"
"group/"
)
response = self.client.get(url)
self.assertEqual(response.status_code, status.HTTP_200_OK)
data = response.json()
self.assertEqual(data["count"], 1)
self.assertEqual(len(data["results"]), 1)
group = data["results"][0]
self.assertEqual(group["printing_job_id"], self.printing_job1.id)
self.assertEqual(group["count"], 2)
self.assertEqual(
{item["id"] for item in group["items"]},
{self.sales_item1.id, self.sales_item2.id},
)
def test_get_sales_items_by_printing_order_group_supports_external_order_id(self):
response = self.client.get(
"/api/v1/shipment/sales-items/by-printing-order/EXT-PO-001/group/"
)
self.assertEqual(response.status_code, status.HTTP_200_OK)
data = response.json()
self.assertEqual(data["count"], 1)
self.assertEqual(data["results"][0]["printing_job_id"], self.printing_job1.id)
def test_get_sales_items_by_printing_order_group_paginates_printing_job_groups(self):
url = (
f"/api/v1/shipment/sales-items/by-printing-order/{self.printing_order.id}/"
"group/?include_already_has_shipment=true&limit=1&offset=1"
)
response = self.client.get(url)
self.assertEqual(response.status_code, status.HTTP_200_OK)
data = response.json()
self.assertEqual(data["count"], 2)
self.assertEqual(len(data["results"]), 1)
self.assertEqual(data["results"][0]["printing_job_id"], self.printing_job2.id)
self.assertEqual(data["results"][0]["count"], 1)
self.assertEqual(data["results"][0]["items"][0]["id"], self.sales_item3.id)
def test_get_sales_items_by_printing_order_group_multiple_external_matches(self):
printing_models.PrintingOrder.objects.create(
merchant=self.merchant,
customer=self.customer,
fabric="测试面料3",
width="160cm",
process=self.process,
created_by=self.user,
external_order_id="EXT-DUPLICATED-GROUP",
)
printing_models.PrintingOrder.objects.create(
merchant=self.merchant,
customer=self.customer,
fabric="测试面料4",
width="170cm",
process=self.process,
created_by=self.user,
external_order_id="EXT-DUPLICATED-GROUP",
)
response = self.client.get(
"/api/v1/shipment/sales-items/by-printing-order/EXT-DUPLICATED-GROUP/group/"
)
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn("匹配到多个生产订单", response.json()["detail"])
def test_get_sales_items_printing_order_not_found(self):
"""测试生产订单不存在"""
url = "/api/v1/shipment/sales-items/by-printing-order/99999/"
@@ -351,6 +426,252 @@ class SalesItemByPrintingOrderAPITestCase(TestCase):
self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
class ShipmentDeliveryByPrintingOrderAPITestCase(TestCase):
"""测试按生产订单查询送货单 API"""
def setUp(self):
self.client = APIClient()
self.merchant = basic_models.Merchant.objects.create(
name="送货查询商户", type=basic_models.MerchantTypeEnum.FACTORY
)
self.other_merchant = basic_models.Merchant.objects.create(
name="其它送货查询商户", type=basic_models.MerchantTypeEnum.FACTORY
)
self.user = User.objects.create_user(
username="delivery_by_order_user", password="testpass123"
)
self.employee = basic_models.Employee.objects.create(
sys_user=self.user,
merchant=self.merchant,
name="送货查询员工",
status=basic_models.EmployeeStatusEnum.ACTIVE,
)
self.customer = basic_models.Customer.objects.create(
merchant=self.merchant,
name="送货查询客户",
created_by=self.employee,
)
self.state = stateflow_models.State.objects.create(name="待送货查询")
self.process = stateflow_models.Process.objects.create(name="送货查询流程")
self.process.replace_nodes([self.state])
self.product = basic_models.Product.objects.create(
merchant=self.merchant,
category=basic_models.ProductCategory.objects.create(
merchant=self.merchant,
name="送货查询分类",
),
name="送货查询产品",
)
self.printing_order = printing_models.PrintingOrder.objects.create(
merchant=self.merchant,
customer=self.customer,
fabric="送货查询面料",
width="150cm",
process=self.process,
created_by=self.user,
external_order_id="EXT-DELIVERY-001",
)
self.printing_job1 = printing_models.PrintingJob.objects.create(
merchant=self.merchant,
printing_order=self.printing_order,
product=self.product,
quantity=100,
unit="米",
created_by=self.user,
)
self.printing_job2 = printing_models.PrintingJob.objects.create(
merchant=self.merchant,
printing_order=self.printing_order,
product=self.product,
quantity=80,
unit="米",
created_by=self.user,
)
self.delivery1 = shipment_models.ShipmentDelivery.objects.create(
merchant=self.merchant,
driver_name="张司机",
vehicle_trip="KD-001",
contact_phone="13800138000",
vehicle_capacity="9.6米厢车",
remark="外部备注A",
internal_remark="内部备注A",
status=shipment_models.ShipmentDeliveryStatus.IN_TRANSIT,
started_at=timezone.datetime(2026, 7, 1, 9, 0, tzinfo=timezone.get_current_timezone()),
created_by=self.user,
)
self.delivery2 = shipment_models.ShipmentDelivery.objects.create(
merchant=self.merchant,
driver_name="李司机",
vehicle_trip="KD-002",
contact_phone="13900139000",
vehicle_capacity="13米高栏",
remark="外部备注B",
internal_remark="内部备注B",
status=shipment_models.ShipmentDeliveryStatus.DELIVERED,
delivered_at=timezone.datetime(2026, 7, 3, 18, 0, tzinfo=timezone.get_current_timezone()),
created_by=self.user,
)
self.shipment1 = shipment_models.Shipment.objects.create(
merchant=self.merchant,
customer=self.customer,
shipment_date="2026-07-01",
delivery=self.delivery1,
created_by=self.user,
)
self.shipment2 = shipment_models.Shipment.objects.create(
merchant=self.merchant,
customer=self.customer,
shipment_date="2026-07-03",
delivery=self.delivery2,
created_by=self.user,
)
self.sales_item1 = shipment_models.SalesItem.objects.create(
merchant=self.merchant,
name="送货销售品1",
quantity=Decimal("10.00"),
unit=shipment_models.UnitChoices.METER,
printing_job_id=self.printing_job1.id,
shipment=self.shipment1,
customer_id=self.customer.id,
created_by=self.user,
)
self.sales_item2 = shipment_models.SalesItem.objects.create(
merchant=self.merchant,
name="送货销售品2",
quantity=Decimal("20.00"),
unit=shipment_models.UnitChoices.METER,
printing_job_id=self.printing_job1.id,
shipment=self.shipment1,
customer_id=self.customer.id,
created_by=self.user,
)
self.sales_item3 = shipment_models.SalesItem.objects.create(
merchant=self.merchant,
name="送货销售品3",
quantity=Decimal("30.00"),
unit=shipment_models.UnitChoices.METER,
printing_job_id=self.printing_job2.id,
shipment=self.shipment2,
customer_id=self.customer.id,
created_by=self.user,
)
other_order = printing_models.PrintingOrder.objects.create(
merchant=self.merchant,
customer=self.customer,
fabric="其它面料",
width="160cm",
process=self.process,
created_by=self.user,
external_order_id="EXT-OTHER-DELIVERY",
)
other_job = printing_models.PrintingJob.objects.create(
merchant=self.merchant,
printing_order=other_order,
product=self.product,
quantity=50,
unit="米",
created_by=self.user,
)
other_delivery = shipment_models.ShipmentDelivery.objects.create(
merchant=self.merchant,
driver_name="王司机",
vehicle_trip="KD-999",
created_by=self.user,
)
other_shipment = shipment_models.Shipment.objects.create(
merchant=self.merchant,
customer=self.customer,
shipment_date="2026-07-04",
delivery=other_delivery,
created_by=self.user,
)
shipment_models.SalesItem.objects.create(
merchant=self.merchant,
name="其它订单销售品",
quantity=Decimal("40.00"),
unit=shipment_models.UnitChoices.METER,
printing_job_id=other_job.id,
shipment=other_shipment,
customer_id=self.customer.id,
created_by=self.user,
)
self.client.force_authenticate(user=self.user)
def test_list_deliveries_by_internal_printing_order_id(self):
resp = self.client.get(
f"/api/v1/shipment/deliveries/by-printing-order/{self.printing_order.id}/"
)
self.assertEqual(resp.status_code, status.HTTP_200_OK)
data = resp.json()
self.assertEqual(data["count"], 2)
ids = {item["id"] for item in data["results"]}
self.assertEqual(ids, {self.delivery1.id, self.delivery2.id})
def test_list_deliveries_by_external_order_id(self):
resp = self.client.get(
"/api/v1/shipment/deliveries/by-printing-order/EXT-DELIVERY-001/"
)
self.assertEqual(resp.status_code, status.HTTP_200_OK)
data = resp.json()
self.assertEqual(data["count"], 2)
self.assertEqual(data["results"][0]["driver_name"], "李司机")
def test_list_deliveries_filters_driver_status_and_time_ranges(self):
resp = self.client.get(
f"/api/v1/shipment/deliveries/by-printing-order/{self.printing_order.id}/"
"?status=2&driver_name=张&vehicle_trip=KD-001&contact_phone=138"
"&vehicle_capacity=9.6&remark=外部备注A&internal_remark=内部备注A"
"&started_at_from=2026-07-01&started_at_to=2026-07-01"
"&shipment_date_from=2026-07-01&shipment_date_to=2026-07-01"
)
self.assertEqual(resp.status_code, status.HTTP_200_OK)
data = resp.json()
self.assertEqual(data["count"], 1)
self.assertEqual(data["results"][0]["id"], self.delivery1.id)
def test_list_deliveries_supports_pagination_and_ordering(self):
resp = self.client.get(
f"/api/v1/shipment/deliveries/by-printing-order/{self.printing_order.id}/"
"?ordering=id&limit=1&offset=1"
)
self.assertEqual(resp.status_code, status.HTTP_200_OK)
data = resp.json()
self.assertEqual(data["count"], 2)
self.assertEqual(len(data["results"]), 1)
self.assertEqual(data["results"][0]["id"], self.delivery2.id)
def test_list_deliveries_duplicate_external_order_id_returns_500(self):
printing_models.PrintingOrder.objects.create(
merchant=self.merchant,
customer=self.customer,
fabric="重复面料1",
width="150cm",
process=self.process,
created_by=self.user,
external_order_id="EXT-DELIVERY-DUP",
)
printing_models.PrintingOrder.objects.create(
merchant=self.merchant,
customer=self.customer,
fabric="重复面料2",
width="150cm",
process=self.process,
created_by=self.user,
external_order_id="EXT-DELIVERY-DUP",
)
resp = self.client.get(
"/api/v1/shipment/deliveries/by-printing-order/EXT-DELIVERY-DUP/"
)
self.assertEqual(resp.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
self.assertIn("匹配到多个生产订单", resp.json()["message"])
class ShipmentSalesItemCustomersAPITestCase(TestCase):
"""测试由未出货销售品汇总客户 API"""
@@ -483,6 +804,39 @@ class ShipmentSalesItemCustomersAPITestCase(TestCase):
self.assertEqual(len(data["results"]), 1)
self.assertEqual(data["results"][0]["customer_id"], self.customer2.id)
def test_list_customers_with_unshipped_sales_items_filters_by_customer_name(self):
resp = self.client.get(
"/api/v1/shipment/sales-items/customers/?customer_name=客户A"
)
self.assertEqual(resp.status_code, status.HTTP_200_OK)
data = resp.json()
self.assertEqual(data["count"], 1)
self.assertEqual(data["results"][0]["customer_id"], self.customer1.id)
self.assertEqual(data["results"][0]["unshipped_sales_items_count"], 2)
def test_list_customers_with_unshipped_sales_items_filters_by_missing_customer_name(self):
resp = self.client.get(
"/api/v1/shipment/sales-items/customers/?customer_name=不存在"
)
self.assertEqual(resp.status_code, status.HTTP_200_OK)
data = resp.json()
self.assertEqual(data["count"], 0)
self.assertEqual(data["results"], [])
def test_list_customers_with_unshipped_sales_items_ignores_blank_customer_name(self):
resp = self.client.get(
"/api/v1/shipment/sales-items/customers/?customer_name=++"
)
self.assertEqual(resp.status_code, status.HTTP_200_OK)
data = resp.json()
self.assertEqual(data["count"], 2)
def test_list_customers_with_unshipped_sales_items_unauthenticated(self):
self.client.logout()
@@ -684,6 +1038,141 @@ class SalesItemByCustomerAPITestCase(TestCase):
self.assertEqual(set(result_ids), {self.sales_item1.id, self.sales_item2.id})
self.assertNotIn(other_sales_item.id, result_ids)
def test_get_sales_items_by_customer_group_groups_by_external_order_id_and_name(self):
duplicate_sales_item = shipment_models.SalesItem.objects.create(
merchant=self.merchant,
name="销售品1",
quantity=Decimal("11.00"),
unit=shipment_models.UnitChoices.METER,
printing_job_id=self.printing_job.id,
customer_id=self.customer.id,
created_by=self.user,
)
resp = self.client.get(
f"/api/v1/shipment/sales-items/by-customer/{self.customer.id}/group/"
)
self.assertEqual(resp.status_code, status.HTTP_200_OK)
data = resp.json()
self.assertEqual(data["count"], 1)
self.assertEqual(len(data["results"]), 1)
external_group = data["results"][0]
self.assertEqual(external_group["external_order_id"], "EXT-CUST-001")
self.assertEqual(external_group["count"], 3)
by_name = {group["name"]: group for group in external_group["name_groups"]}
self.assertEqual(by_name["销售品1"]["count"], 2)
self.assertEqual(by_name["销售品2"]["count"], 1)
self.assertEqual(
{item["id"] for item in by_name["销售品1"]["items"]},
{self.sales_item1.id, duplicate_sales_item.id},
)
def test_get_sales_items_by_customer_group_paginates_external_order_id_groups_with_null_last(self):
other_printing_order = printing_models.PrintingOrder.objects.create(
merchant=self.merchant,
customer=self.customer,
fabric="其它面料",
width="160cm",
process=self.process,
created_by=self.user,
external_order_id="EXT-CUST-OTHER",
)
other_printing_job = printing_models.PrintingJob.objects.create(
merchant=self.merchant,
printing_order=other_printing_order,
product=self.product,
quantity=50,
unit="米",
created_by=self.user,
)
shipment_models.SalesItem.objects.create(
merchant=self.merchant,
name="其它外部订单销售品",
quantity=Decimal("66.00"),
unit=shipment_models.UnitChoices.METER,
printing_job_id=other_printing_job.id,
customer_id=self.customer.id,
created_by=self.user,
)
shipment_models.SalesItem.objects.create(
merchant=self.merchant,
name="无外部订单销售品",
quantity=Decimal("77.00"),
unit=shipment_models.UnitChoices.METER,
customer_id=self.customer.id,
created_by=self.user,
)
first_page = self.client.get(
f"/api/v1/shipment/sales-items/by-customer/{self.customer.id}/group/"
"?limit=1&offset=0"
)
second_page = self.client.get(
f"/api/v1/shipment/sales-items/by-customer/{self.customer.id}/group/"
"?limit=1&offset=1"
)
third_page = self.client.get(
f"/api/v1/shipment/sales-items/by-customer/{self.customer.id}/group/"
"?limit=1&offset=2"
)
self.assertEqual(first_page.status_code, status.HTTP_200_OK)
self.assertEqual(second_page.status_code, status.HTTP_200_OK)
self.assertEqual(third_page.status_code, status.HTTP_200_OK)
self.assertEqual(first_page.json()["count"], 3)
self.assertEqual(
first_page.json()["results"][0]["external_order_id"], "EXT-CUST-001"
)
self.assertEqual(
second_page.json()["results"][0]["external_order_id"], "EXT-CUST-OTHER"
)
self.assertIsNone(third_page.json()["results"][0]["external_order_id"])
def test_get_sales_items_by_customer_group_supports_external_order_id_filter(self):
other_printing_order = printing_models.PrintingOrder.objects.create(
merchant=self.merchant,
customer=self.customer,
fabric="其它面料",
width="160cm",
process=self.process,
created_by=self.user,
external_order_id="EXT-CUST-OTHER",
)
other_printing_job = printing_models.PrintingJob.objects.create(
merchant=self.merchant,
printing_order=other_printing_order,
product=self.product,
quantity=50,
unit="米",
created_by=self.user,
)
other_sales_item = shipment_models.SalesItem.objects.create(
merchant=self.merchant,
name="其它外部订单销售品",
quantity=Decimal("66.00"),
unit=shipment_models.UnitChoices.METER,
printing_job_id=other_printing_job.id,
customer_id=self.customer.id,
created_by=self.user,
)
resp = self.client.get(
f"/api/v1/shipment/sales-items/by-customer/{self.customer.id}/group/"
"?external_order_id=EXT-CUST-OTHER"
)
self.assertEqual(resp.status_code, status.HTTP_200_OK)
data = resp.json()
self.assertEqual(data["count"], 1)
self.assertEqual(data["results"][0]["external_order_id"], "EXT-CUST-OTHER")
self.assertEqual(
data["results"][0]["name_groups"][0]["items"][0]["id"],
other_sales_item.id,
)
def test_get_sales_items_by_customer_not_found(self):
resp = self.client.get("/api/v1/shipment/sales-items/by-customer/99999/")
@@ -1283,7 +1772,9 @@ class ShipmentCreateAPITestCase(TestCase):
"address": "杭州市测试路 1 号",
"contact_name": "张三",
"contact_phone": "13800138000",
"area": "华东",
"area": "华东" * 25,
"coordinates": "120.1551,30.2741",
"extra": {"source": "customer_address", "tags": ["snapshot"]},
"remark": "测试备注",
"sales_items": [self.sales_item1.id, self.sales_item2.id],
}
@@ -1301,7 +1792,9 @@ class ShipmentCreateAPITestCase(TestCase):
self.assertEqual(result["address"], "杭州市测试路 1 号")
self.assertEqual(result["contact_name"], "张三")
self.assertEqual(result["contact_phone"], "13800138000")
self.assertEqual(result.get("area", ""), "华东")
self.assertEqual(result.get("area", ""), "华东" * 25)
self.assertEqual(result["coordinates"], "120.1551,30.2741")
self.assertEqual(result["extra"], {"source": "customer_address", "tags": ["snapshot"]})
self.assertEqual(result["remark"], "测试备注")
self.assertEqual(result["status"], shipment_models.ShipmentStatus.DRAFT)
self.assertEqual(result["status_display"], "草稿(未发布)")
@@ -1314,6 +1807,105 @@ class ShipmentCreateAPITestCase(TestCase):
self.assertEqual(self.sales_item1.shipment_id, result["id"])
self.assertEqual(self.sales_item2.shipment_id, result["id"])
def test_create_shipment_with_address_id_keeps_address_snapshot(self):
customer_address = basic_models.CustomerAddress.objects.create(
merchant=self.merchant,
customer=self.customer,
address="客户地址表地址",
contact_name="地址联系人",
contact_phone="13900139000",
area="地址地区",
created_by=self.employee,
)
data = {
"customer": self.customer.id,
"address_id": customer_address.id,
"shipment_date": "2026-01-14",
"address": "出货单快照地址",
"contact_name": "快照联系人",
"contact_phone": "13800138000",
"area": "快照地区",
"coordinates": "121.0000,31.0000",
"extra": {"floor": "3F"},
"sales_items": [self.sales_item1.id, self.sales_item2.id],
}
response = self.client.post("/api/v1/shipment/shipments/", data, format="json")
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
result = response.json()
self.assertEqual(result["address_id"], customer_address.id)
self.assertEqual(result["address"], "出货单快照地址")
self.assertEqual(result["contact_name"], "快照联系人")
self.assertEqual(result["contact_phone"], "13800138000")
self.assertEqual(result["area"], "快照地区")
self.assertEqual(result["coordinates"], "121.0000,31.0000")
self.assertEqual(result["extra"], {"floor": "3F"})
shipment = shipment_models.Shipment.objects.get(id=result["id"])
self.assertEqual(shipment.customer_address_id, customer_address.id)
self.assertEqual(shipment.coordinates, "121.0000,31.0000")
self.assertEqual(shipment.extra, {"floor": "3F"})
def test_create_shipment_accepts_status(self):
data = {
"customer": self.customer.id,
"shipment_date": "2026-01-14",
"status": shipment_models.ShipmentStatus.APPROVED,
}
response = self.client.post("/api/v1/shipment/shipments/", data, format="json")
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
result = response.json()
self.assertEqual(result["status"], shipment_models.ShipmentStatus.APPROVED)
self.assertEqual(result["status_display"], "已审核")
shipment = shipment_models.Shipment.objects.get(id=result["id"])
self.assertEqual(shipment.status, shipment_models.ShipmentStatus.APPROVED)
def test_create_shipment_rejects_mismatched_address_id(self):
other_customer = basic_models.Customer.objects.create(
merchant=self.merchant,
name="其它客户",
)
customer_address = basic_models.CustomerAddress.objects.create(
merchant=self.merchant,
customer=other_customer,
address="其它客户地址",
created_by=self.employee,
)
data = {
"customer": self.customer.id,
"address_id": customer_address.id,
"shipment_date": "2026-01-14",
}
response = self.client.post("/api/v1/shipment/shipments/", data, format="json")
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn("客户地址与客户不匹配", response.json()["detail"])
def test_create_shipment_rejects_deleted_address_id(self):
customer_address = basic_models.CustomerAddress.objects.create(
merchant=self.merchant,
customer=self.customer,
address="已删除客户地址",
deleted_at=timezone.now(),
deleted_by=self.employee,
created_by=self.employee,
)
data = {
"customer": self.customer.id,
"address_id": customer_address.id,
"shipment_date": "2026-01-14",
}
response = self.client.post("/api/v1/shipment/shipments/", data, format="json")
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn("已删除", response.json()["detail"])
@override_settings(TESTING=False, SHIPMENT_CREATED_WECOM_NOTIFY_ENABLED=True)
def test_create_shipment_enqueues_wecom_notification_task(self):
"""测试创建出货单后投递企业微信通知任务"""
@@ -1387,8 +1979,8 @@ class ShipmentCreateAPITestCase(TestCase):
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn("已关联", response.json()["detail"])
def test_create_shipment_rejects_sales_items_from_different_printing_orders(self):
"""测试销售品来自不同生产订单时拒绝创建"""
def test_create_shipment_allows_sales_items_from_different_printing_orders(self):
"""测试销售品可以来自不同生产订单"""
data = {
"customer": self.customer.id,
"shipment_date": "2026-01-14",
@@ -1397,8 +1989,14 @@ class ShipmentCreateAPITestCase(TestCase):
response = self.client.post("/api/v1/shipment/shipments/", data, format="json")
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertIn("同一个生产订单", response.json()["detail"])
self.assertEqual(response.status_code, status.HTTP_201_CREATED)
result = response.json()
self.assertEqual(result["items_count"], 2)
self.sales_item1.refresh_from_db()
self.sales_item_other_order.refresh_from_db()
self.assertEqual(self.sales_item1.shipment_id, result["id"])
self.assertEqual(self.sales_item_other_order.shipment_id, result["id"])
def test_create_shipment_rejects_sales_item_without_printing_job(self):
"""测试销售品缺少生产任务时拒绝创建"""
@@ -1846,6 +2444,8 @@ class ShipmentQueryAPITestCase(TestCase):
self.assertEqual(result["id"], self.shipment1.id)
self.assertIn("area", result)
self.assertEqual(result["area"], "A1")
self.assertIn("coordinates", result)
self.assertIn("extra", result)
self.assertEqual(result["status"], shipment_models.ShipmentStatus.DRAFT)
self.assertEqual(result["status_display"], "草稿(未发布)")
self.assertIn("sales_items", result)
@@ -1865,6 +2465,8 @@ class ShipmentQueryAPITestCase(TestCase):
"address": "宁波市滨海路 9 号",
"contact_name": "王五",
"contact_phone": "13700137000",
"coordinates": "120.2000,30.3000",
"extra": {"dock": "A"},
},
format="json",
)
@@ -1875,12 +2477,16 @@ class ShipmentQueryAPITestCase(TestCase):
self.assertEqual(result["address"], "宁波市滨海路 9 号")
self.assertEqual(result["contact_name"], "王五")
self.assertEqual(result["contact_phone"], "13700137000")
self.assertEqual(result["coordinates"], "120.2000,30.3000")
self.assertEqual(result["extra"], {"dock": "A"})
self.shipment1.refresh_from_db()
self.assertEqual(getattr(self.shipment1, "area", ""), "更新地区")
self.assertEqual(self.shipment1.address, "宁波市滨海路 9 号")
self.assertEqual(self.shipment1.contact_name, "王五")
self.assertEqual(self.shipment1.contact_phone, "13700137000")
self.assertEqual(self.shipment1.coordinates, "120.2000,30.3000")
self.assertEqual(self.shipment1.extra, {"dock": "A"})
def test_patch_shipment_allows_approved_shipment_without_delivery(self):
"""
@@ -1911,6 +2517,24 @@ class ShipmentQueryAPITestCase(TestCase):
self.shipment1.refresh_from_db()
self.assertEqual(self.shipment1.area, "审核后可修改")
def test_patch_shipment_allows_cancelled_shipment_without_delivery(self):
self.shipment1.status = shipment_models.ShipmentStatus.CANCELLED
self.shipment1.save(update_fields=["status", "updated_at"])
resp = self.client.patch(
f"/api/v1/shipment/shipments/{self.shipment1.id}/",
data={"area": "取消后可修改"},
format="json",
)
self.assertEqual(resp.status_code, status.HTTP_200_OK)
self.assertEqual(resp.json()["area"], "取消后可修改")
self.assertEqual(resp.json()["status"], shipment_models.ShipmentStatus.CANCELLED)
self.shipment1.refresh_from_db()
self.assertEqual(self.shipment1.area, "取消后可修改")
self.assertEqual(self.shipment1.status, shipment_models.ShipmentStatus.CANCELLED)
def test_patch_shipment_rejects_when_bound_to_delivery(self):
delivery = shipment_models.ShipmentDelivery.objects.create(
merchant=self.merchant1,