liufumingren 4d8297aecb fix(openapi): 入库单 ownerCode 补齐到 qimen_owner_code
- OpenAPI 合约上下文的 customerId 恒为 null,导致 API 来源入库单 qimen_owner_code
  为空、出站回传 entryorder.confirm 的 ownerCode 为空
- entryorder.create 改为用报文 entryOrder.ownerCode(trim 后)补齐 customerId,
  落库口径与奇门侧一致(奇门侧取请求上下文 customerId)
- 补充字段生效口径注释:warehouseCode 一律以 app_key 合约解析结果为准,
  operateTime / operatorName 当前未被底层消费,保留仅为兼容调用方
- 同步 methods/openapi.json 与 methods/changes/openapi.json(标准请求/响应 JSON
  示例 + 字段生效口径说明)
2026-09-15 16:19:10 +08:00

157 lines
6.2 KiB
JavaScript
Raw Permalink Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

'use strict';
const MainService = require('../main');
/**
* OpenAPI 入库单服务。
* 对外提供入库单的创建与查询能力,通过 openapi 通道对接外部系统。
*/
class OpenapiEntryorderService extends MainService {
/**
* 创建入库单。
* 上下文(storeId/warehouseId/appKey/warehouseCode)已由 dispatchOpenapiMethod 统一注入。
* 接收外部系统的入库单数据,校验后通过底层 entryOrder 服务完成入库单创建。
* @param {Object} payload 调用参数。
* @param {Object} payload.body 请求体数据,包含 entryOrder(入库单信息)和 orderLines(明细行)。
* @param {Object} payload.query 请求 query 数据。
* @return {Promise<Object>} 创建结果,成功时返回 entryOrderId、entryOrderCode、status 和 createTime。
*/
async create(payload = {}) {
const { body = {} } = payload;
const { entryOrder, orderLines } = body;
if (!entryOrder || !entryOrder.entryOrderCode) {
return this.fail('entryOrder.entryOrderCode 参数缺失');
}
if (!orderLines || !orderLines.orderLine) {
return this.fail('orderLines.orderLine 参数缺失');
}
// 字段映射:OpenAPI 风格字段名 → 底层 tryCreateEntryOrder 期望的字段名
// 注意(2026-09-14):以下字段当前未被底层消费,保留仅为兼容调用方,勿据此判断生效:
// - warehouseCode:仓库上下文一律以 app_key 合约解析结果为准,报文值被忽略
// - operateTime / operatorName:底层既不落库也不参与任何逻辑
// 另:ownerCode 不通过本映射生效,由下方显式作为 customerId 传入(落 qimen_owner_code)
const mappedEntryOrder = {
entryOrderCode: entryOrder.entryOrderCode,
orderType: entryOrder.entryOrderType || entryOrder.orderType || 'SCRK',
expectStartTime: entryOrder.expectedArriveTime || entryOrder.expectStartTime || '',
expectEndTime: entryOrder.expectEndTime || '',
supplierCode: entryOrder.supplierCode || '',
supplierName: entryOrder.supplierName || '',
warehouseCode: entryOrder.warehouseCode || '',
ownerCode: entryOrder.ownerCode || '',
remark: entryOrder.remark || '',
totalOrderLines: entryOrder.totalOrderLines || 0,
operateTime: entryOrder.operateTime || '',
operatorName: entryOrder.operatorName || '',
orderCreateTime: entryOrder.orderCreateTime || entryOrder.createTime || '',
logisticsCode: entryOrder.logisticsCode || '',
logisticsName: entryOrder.logisticsName || '',
expressCode: entryOrder.expressCode || '',
relatedOrders: entryOrder.relatedOrders || undefined,
};
try {
const data = {
request: {
entryOrder: mappedEntryOrder,
orderLines,
},
};
// 货主编码对齐奇门口径:奇门侧 qimen_owner_code 取自请求上下文 customerId
// (出站回传 entryorder.confirm 的 ownerCode 即取该列,见 buildEntryOrderConfirmRequest)。
// OpenAPI 合约上下文的 customerId 恒为 null,会导致 API 来源入库单 qimen_owner_code 为空、
// 回传 ownerCode 为空,故此处用报文 entryOrder.ownerCode 补齐(与奇门落库口径一致)。
const info = this.getInfo();
const ownerCode = String(entryOrder.ownerCode || '').trim();
const res = await this.ctx.service.systems.entryOrder.addOrder(
data,
{ ...info, customerId: ownerCode || info.customerId || '' },
'API'
);
if (res.success) {
return this.success(res.message, {
createTime: this.app.formatDate(new Date()),
entryOrderId: res.data.entryOrderId,
entryOrderCode: res.data.entryOrderCode,
status: res.data.status,
});
}
return this.fail(res.message, { createTime: this.app.formatDate(new Date()) });
} catch (error) {
return this.fail(`创建入库单失败: ${error.message}`);
}
}
/**
* 查询入库单。
* 上下文(storeId/warehouseId)已由 dispatchOpenapiMethod 统一注入。
* 根据入库单号查询入库单详情,包括基本信息与商品明细。
* @param {Object} payload 调用参数。
* @param {Object} payload.body 请求体数据,需包含 entryOrderCode(入库单号)。
* @param {Object} payload.query 请求 query 数据。
* @return {Promise<Object>} 查询结果,成功时返回入库单详情。
*/
async query(payload = {}) {
const { body = {} } = payload;
const { entryOrderCode } = body;
if (!entryOrderCode) {
return this.fail('entryOrderCode 参数缺失');
}
try {
const { storeId, warehouseId, warehouseCode } = this.getInfo();
const order = await this.ctx.service.systems.entryOrder.findByOrderCode(
entryOrderCode,
warehouseId,
storeId
);
if (!order) {
return this.fail('未找到入库单');
}
const orderLines = (order.items || []).map(item => ({
itemId: item.stock_id,
itemCode: (item.stock && item.stock.item_code) || '',
itemName: (item.stock && item.stock.item_name) || '',
planQty: item.count,
actualQty: item.actual_qty || 0,
inventoryType: item.inventory_type || 'ZP',
orderLineNo: item.order_line_no || '',
remark: item.remark || '',
}));
return this.success('查询成功', {
entryOrderCode: order.entry_order_code,
entryOrderId: order.id,
status: order.order_status,
entryOrderType: order.order_type || 'SCRK',
expectedArriveTime: order.expected_arrive_time || '',
supplierCode: order.supplier_code || '',
supplierName: order.supplier_name || '',
remark: order.remark || '',
createTime: order.created_at || '',
operateTime: order.updated_at || '',
operatorName: order.operator_name || '',
warehouseCode: order.warehouse_code || warehouseCode,
ownerCode: order.store_code || '',
totalOrderLines: order.total_order_lines || 0,
orderLines,
});
} catch (error) {
return this.fail(`查询入库单失败: ${error.message}`);
}
}
}
module.exports = OpenapiEntryorderService;