- 模型/迁移:wms_order_delivery 新增 need_oms_waybill TINYINT(4) NOT NULL DEFAULT 0,
迁移覆盖基表与全部分表(含 _history/_dispatch/_outsourced),幂等且 down 可回滚
- 写入链路:openapi 请求根节点 need_oms_waybill(兼容 camelCase needOmsWaybill)→
openapiMethods/deliveryorder.js 透传;delivery_order.js 仅 API 来源可能为 1,
QM/MANUAL/STOCKOUT 一律强制 0(见相邻提交)
- 取号分流:need_oms_waybill=1 的订单不参与本地自动分配快递
1. asyncProcessOrderCreated 不入本地取号队列,写 ORDER_NEED_OMS_WAYBILL_WAIT 操作日志
2. express.createWaybillCodePipeline 按订单级标记过滤(同订单全部 business_key 一并跳过),
返回值新增 skipped_need_oms_waybill_order_ids
3. schedule/consume_waybill_allocate_queue 将对应队列行置终态 waiting_oms
(不再走 pending 重试 → failed)
- waybill_allocate_queue.status 注释补充 waiting_oms 语义(STRING(20),无需迁移)
- test: delivery_order.asyncProcessOrderCreated.test.js 新增分流/保持本地取号用例,
express.createWaybillCodePipeline.skipCancelled.test.js 补齐返回字段断言
117 lines
3.6 KiB
JavaScript
117 lines
3.6 KiB
JavaScript
'use strict';
|
||
|
||
const MainService = require('../main');
|
||
|
||
class OpenapiDeliveryorderService extends MainService {
|
||
/**
|
||
* 查询发货单。
|
||
* 上下文(storeId/warehouseId/appKey)已由 dispatchOpenapiMethod 统一注入。
|
||
* @param {Object} payload 调用参数。
|
||
* @param {Object} payload.body 请求体数据,需包含 deliveryOrderCode。
|
||
* @param {Object} payload.query 请求 query 数据。
|
||
* @return {Promise<Object>} 查询结果,成功时返回订单详情,失败时返回错误信息。
|
||
*/
|
||
async query(payload = {}) {
|
||
const { body = {} } = payload;
|
||
const { deliveryOrderCode } = body;
|
||
|
||
if (!deliveryOrderCode) {
|
||
return this.fail('deliveryOrderCode 参数缺失');
|
||
}
|
||
|
||
try {
|
||
const { storeId, warehouseId } = this.getInfo();
|
||
const DeliveryModel = await this.ctx.model.OrderDeliveryFactory.getCurrentModel(warehouseId);
|
||
const order = await DeliveryModel.findOne({
|
||
where: {
|
||
delivery_order_code: deliveryOrderCode,
|
||
store_id: storeId,
|
||
},
|
||
});
|
||
|
||
if (order) {
|
||
return this.success('成功', {
|
||
totalLines: 0,
|
||
deliveryOrder: {
|
||
deliveryOrderCode: order.delivery_order_code,
|
||
deliveryOrderId: order.delivery_order_code,
|
||
warehouseCode: order.warehouse_code,
|
||
orderType: order.order_type,
|
||
status: order.status,
|
||
orderConfirmTime: order.order_confirm_time,
|
||
operatorCode: 0,
|
||
operatorName: '',
|
||
operateTime: order.update_at,
|
||
},
|
||
packages: {
|
||
package: {},
|
||
},
|
||
orderLines: [],
|
||
});
|
||
}
|
||
|
||
return this.fail('未找到订单');
|
||
} catch (error) {
|
||
return this.fail(`查询失败: ${error.message}`);
|
||
}
|
||
}
|
||
|
||
/**
|
||
* 创建发货单。
|
||
* 上下文(storeId/warehouseId/appKey)已由 dispatchOpenapiMethod 统一注入。
|
||
* @param {Object} payload 调用参数。
|
||
* @param {Object} payload.body 请求体数据,需包含 deliveryOrder 与 orderLines。
|
||
* @param {Object} payload.query 请求 query 数据。
|
||
* @return {Promise<Object>} 创建结果,成功时返回订单ID等,失败时返回错误信息。
|
||
*/
|
||
async create(payload = {}) {
|
||
const { body = {} } = payload;
|
||
const {
|
||
deliveryOrder,
|
||
orderLines,
|
||
need_oms_waybill: needOmsWaybillSnake,
|
||
needOmsWaybill,
|
||
} = body;
|
||
|
||
if (!deliveryOrder || !deliveryOrder.deliveryOrderCode) {
|
||
return this.fail('deliveryOrder 参数缺失或不完整');
|
||
}
|
||
if (!orderLines) {
|
||
return this.fail('orderLines 参数缺失');
|
||
}
|
||
|
||
try {
|
||
// need_oms_waybill 在请求根节点传入(不在 deliveryOrder 内),
|
||
// 兼容 snake_case / camelCase 两种写法,仅 openapi(API) 来源会落库生效。
|
||
const data = {
|
||
request: {
|
||
deliveryOrder,
|
||
orderLines,
|
||
need_oms_waybill: needOmsWaybillSnake ?? needOmsWaybill,
|
||
},
|
||
};
|
||
|
||
const res = await this.ctx.service.systems.deliveryOrder.addOrder(
|
||
data,
|
||
this.getInfo(),
|
||
'API'
|
||
);
|
||
|
||
if (res.success) {
|
||
return this.success(res.message, {
|
||
createTime: this.app.formatDate(new Date()),
|
||
deliveryOrderId: res.data.orderId,
|
||
warehouseCode: this.warehouseCode,
|
||
logisticsCode: '',
|
||
});
|
||
}
|
||
|
||
return this.fail(res.message, { createTime: this.app.formatDate(new Date()) });
|
||
} catch (error) {
|
||
return this.fail(`创建失败: ${error.message}`);
|
||
}
|
||
}
|
||
}
|
||
|
||
module.exports = OpenapiDeliveryorderService;
|