1
0
forked from erp-dev/erp

fix: order_description change to copy by rolling_warn of printing_order

This commit is contained in:
2026-04-23 23:55:06 +08:00
parent d4fbb2c7fe
commit 80805ba312
6 changed files with 16 additions and 9 deletions

View File

@@ -46,7 +46,7 @@ Authorization: <AGENT_ACCESS_KEY>
"customer": 5,
"customer_name": "客户A",
"fabric": "棉布 40S",
"order_description": "订单备注",
"order_description": "滚筒预警",
"shipment_date": "2026-04-14",
"address": "广州市天河区",
"contact_name": "张三",
@@ -157,7 +157,7 @@ Authorization: <AGENT_ACCESS_KEY>
- "未出货"定义:`delivery` 为空,即尚未关联送货单
- `delivery_id` 始终返回送货单ID未关联时为 `null`
- `fabric` 来自该出货单所关联销售品对应生产订单的 `fabric`;若当前出货单没有销售品则返回 `null`
- `order_description` 来自该出货单所关联销售品对应生产订单的 `description`;若当前出货单没有销售品则返回 `null`
- `order_description` 当前来自该出货单所关联销售品对应生产订单的 `rolling_warn`;若当前出货单没有销售品则返回 `null`
- 结果按 `created_at` 降序排列
- 只返回 `merchant_id` 对应商户的数据
- `sales_items` 包含该出货单的所有销售品(软删除的条目自动排除)

View File

@@ -54,7 +54,7 @@
"customer": 1,
"customer_name": "客户A",
"fabric": "棉布 40S",
"order_description": "订单备注",
"order_description": "滚筒预警",
"shipment_date": "2026-01-14",
"status": 1,
"status_display": "草稿(未发布)",
@@ -82,7 +82,7 @@
- `sales_items` 现在返回的是带图片字段的销售品详情结构
- `delivery_id` 始终返回送货单ID未绑定送货单时为 `null`
- `fabric` 来自该出货单所关联销售品对应生产订单的 `fabric`;若当前出货单没有销售品,则返回 `null`
- `order_description` 来自该出货单所关联销售品对应生产订单的 `description`;若当前出货单没有销售品,则返回 `null`
- `order_description` 当前返回该出货单所关联销售品对应生产订单的 `rolling_warn`;若当前出货单没有销售品,则返回 `null`
- `delivery_id=null` 不会触发过滤;如需按是否绑定送货单筛选,请使用 `delivery_isnull`
- 若销售品关联的 `PrintingJob.product` 存在主图,则会返回 `product_image_url`
- 若无关联图片,则 `product_image_url``null`
@@ -231,7 +231,7 @@
| customer | int | 客户ID |
| customer_name | string | 客户名称 |
| fabric | string/null | 面料;来自关联生产订单,若当前出货单没有销售品则为 null |
| order_description | string/null | 订单备注;来自关联生产订单的 `description`,若当前出货单没有销售品则为 null |
| order_description | string/null | 滚筒预警;来自关联生产订单的 `rolling_warn`,若当前出货单没有销售品则为 null |
| shipment_date | string | 出货日期 |
| delivery_id | int/null | 关联送货单ID未绑定时为 null |
| address | string | 地址 |

View File

@@ -273,6 +273,7 @@ GET /api/v1/shipment/deliveries/?status=2&driver_name=张&vehicle_trip=001&limit
- 写入 `cancelled_at`
- 写入 `cancelled_by`
- 同时会根据 `request.user.employee` 更新 `operator`
- 取消不会释放或解绑当前已关联的出货单;如需解绑,需显式删除送货单或通过修改接口改绑
- 已取消的送货单再次取消保持幂等
### 8. 追加绑定出货单到已有送货单