出站回调:
- 新增 warehouse_notify.json 文档(notify.ping/notify.reply),与 warehouse.json 互跳
- 回调体统一 { method, code, data },method 放 query,body 为业务数据
- MD5 签名: sign=MD5(appSecret+timestamp+bodyJson)
- 回调响应: {code:200} 成功,非200/非code:200 视为失败
- docs 页面支持模拟推送调试
搜索增强(searchStock/searchWarehouseStock):
- 直接查 stock_warehouse,不再依赖 stock_store
- 新增字段: gross_weight/box_spec/packing_requirements/prohibited_type
- 管理标识: is_sn_mgmt/is_shelf_life_mgmt/is_batch_mgmt
- 条码关联: wms_stock_barcodes
- 图片: wms_file_reference(business_type=stock)+wms_file,返回数组
- id 修正为 stock_warehouse.id
推送状态完善:
- handleApiMessage 增加 push_status 更新(2成功/3失败)
- 未配回调地址 → push_status=3 + error 原因
- 回调异常 catch 也更新 push_status=3 + 写日志
- 出站日志写入 wms_warehouse_log 表(WN-前缀)
消息列表:
- keyword 兼容 content/keyword,支持数组
- keyword 搜索 content/group_name/user_name 三列
- 支持 where+operator 结构化查询(parseWhereConditions)
- storeId=-1 查询无货主消息; storeId=0→IS NULL
- 日期范围: startDate/endDate
其他:
- silent 动作: AI 识别无需回复时跳过回执
- ai_enabled 灰度开关(群级)
- bindCode 文档修正
- store_name 改用 StoreWarehouse.store_remask
228 lines
7.7 KiB
JavaScript
228 lines
7.7 KiB
JavaScript
'use strict';
|
|
|
|
const MainService = require('../main');
|
|
|
|
/**
|
|
* 奇门出库单服务。
|
|
*
|
|
* 处理 stockout.create / stockout.query 接口,
|
|
* 使用专用表 `wms_order_stockout` + `wms_order_stockout_items`。
|
|
*/
|
|
class stockoutServer extends MainService {
|
|
|
|
/**
|
|
* 创建出库单。
|
|
*
|
|
* 将奇门 stockout.create 请求的 deliveryOrder / orderLines 写入
|
|
* `wms_order_stockout` 主表和 `wms_order_stockout_items` 明细表,
|
|
* 整个过程在一个数据库事务内完成,失败自动回滚。
|
|
*
|
|
* @param {object} data - 奇门 stockout.create 请求体
|
|
* @param {object} data.request - 请求数据
|
|
* @param {object} data.request.deliveryOrder - 出库单头信息
|
|
* @param {object} data.request.orderLines - 出库单明细
|
|
* @param {object|object[]} data.request.orderLines.orderLine - 明细行(单条为对象,多条为数组)
|
|
* @return {Promise<object>} 返回 success / fail 结果
|
|
*/
|
|
async create(data) {
|
|
const { app, ctx, storeId, warehouseId, warehouseCode } = this;
|
|
const { deliveryOrder, orderLines } = data.request;
|
|
|
|
// 单条 orderLine 转为数组
|
|
let orderLine = orderLines && orderLines.orderLine;
|
|
if (orderLine && orderLine.orderLineNo) {
|
|
orderLine = [ orderLine ];
|
|
}
|
|
|
|
if (!orderLine || !Array.isArray(orderLine) || orderLine.length === 0) {
|
|
return this.fail('创建出库单失败,失败原因:\n没有有效的订单明细数据');
|
|
}
|
|
|
|
const totalOrderLines = deliveryOrder.totalOrderLines || orderLine.length;
|
|
|
|
// 第一步:校验所有商品是否在 StockStore 中存在,并收集有效明细
|
|
const errors = [];
|
|
const items = [];
|
|
for (let i = 0; i < orderLine.length; i++) {
|
|
const line = orderLine[i];
|
|
const wmsStock = await app.model.StockStore.findByPk(line.itemId);
|
|
// 校验 StockStore 记录的 store_id 与当前上下文一致,防止跨货主越权
|
|
if (wmsStock && Number(wmsStock.store_id) !== Number(this.storeId)) {
|
|
errors.push(
|
|
`SKU${line.itemId}商品《${line.itemName}》编码《${line.itemCode}》\n未同步推送到仓库`
|
|
);
|
|
continue;
|
|
}
|
|
if (!wmsStock) {
|
|
errors.push(
|
|
`SKU${line.itemId}商品《${line.itemName}》编码《${line.itemCode}》\n未同步推送到仓库`
|
|
);
|
|
continue;
|
|
}
|
|
if (!wmsStock.stock_id) {
|
|
errors.push(
|
|
`SKU${line.itemId}商品《${line.itemName}》编码《${line.itemCode}》wms无对应关系\n请联系仓库关联创建商品`
|
|
);
|
|
continue;
|
|
}
|
|
const planQty = parseInt(line.planQty) || 0;
|
|
if (planQty <= 0) {
|
|
errors.push(
|
|
`SKU${line.itemId}商品《${line.itemName}》编码《${line.itemCode}》\n计划数量必须大于0`
|
|
);
|
|
continue;
|
|
}
|
|
items.push({
|
|
orderLineNo: line.orderLineNo,
|
|
ownerCode: line.ownerCode,
|
|
itemCode: line.itemCode,
|
|
itemId: line.itemId,
|
|
itemName: line.itemName,
|
|
planQty,
|
|
inventoryType: line.inventoryType,
|
|
stockId: wmsStock.stock_id,
|
|
});
|
|
}
|
|
|
|
if (errors.length > 0) {
|
|
return this.fail(`创建出库单失败,失败原因:\n${errors.join('\n')}`);
|
|
}
|
|
|
|
// 预取超卖配置,避免每次 lockItemStorages 在锁内回退查 DB
|
|
const oversellConfig = await ctx.service.systems.stockStore
|
|
.getStoreWarehousePolicyByStoreAndWarehouse(storeId, warehouseId);
|
|
|
|
// 第二步:在事务中写入主表 + 库存锁定 + 明细表
|
|
const transaction = await ctx.model.transaction();
|
|
try {
|
|
const order = await ctx.model.OrderStockout.create(
|
|
{
|
|
stockout_order_code: deliveryOrder.deliveryOrderCode,
|
|
order_type: deliveryOrder.orderType,
|
|
total_order_lines: totalOrderLines,
|
|
order_create_time: deliveryOrder.createTime
|
|
? new Date(deliveryOrder.createTime)
|
|
: null,
|
|
remark: deliveryOrder.remark || null,
|
|
warehouse_id: warehouseId,
|
|
store_id: storeId,
|
|
qimen_owner_code: items[0].ownerCode,
|
|
qimen_warehouse_code: warehouseCode,
|
|
source_type: 'QM',
|
|
created_at: new Date(),
|
|
updated_at: new Date(),
|
|
},
|
|
{ transaction }
|
|
);
|
|
|
|
const orderId = order.id;
|
|
|
|
// 库存锁定:按 stockId 升序排序后逐个加锁,避免死锁
|
|
const sortedItems = [ ...items ].sort((a, b) => a.stockId - b.stockId);
|
|
for (const item of sortedItems) {
|
|
const lockResult = await ctx.service.systems.stockStore.lockItemStorages(
|
|
item.stockId,
|
|
item.planQty,
|
|
transaction,
|
|
oversellConfig,
|
|
{ orderType: 'QM_STOCKOUT', orderNo: deliveryOrder.deliveryOrderCode, orderId }
|
|
);
|
|
if (!lockResult.success) {
|
|
throw new Error(
|
|
`SKU${item.itemId}商品《${item.itemName}》编码《${item.itemCode}》\n库存锁定失败: ${lockResult.error}`
|
|
);
|
|
}
|
|
}
|
|
|
|
// 批量创建明细
|
|
const now = new Date();
|
|
const itemRecords = items.map(item => ({
|
|
order_id: orderId,
|
|
order_line_no: item.orderLineNo,
|
|
owner_code: item.ownerCode,
|
|
item_code: item.itemCode,
|
|
item_id: item.itemId,
|
|
item_name: item.itemName,
|
|
plan_qty: item.planQty,
|
|
inventory_type: item.inventoryType,
|
|
stock_id: item.stockId,
|
|
created_at: now,
|
|
updated_at: now,
|
|
}));
|
|
|
|
await ctx.model.OrderStockoutItems.bulkCreate(itemRecords, {
|
|
transaction,
|
|
validate: true,
|
|
});
|
|
|
|
await transaction.commit();
|
|
|
|
return this.success('出库单创建成功', {
|
|
stockoutOrderId: order.id,
|
|
stockoutOrderCode: order.stockout_order_code,
|
|
});
|
|
} catch (err) {
|
|
await transaction.rollback();
|
|
ctx.logger.error('[stockout.create] 事务写入失败:', err);
|
|
return this.fail(`创建出库单失败,失败原因:\n${err.message}`);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* 查询出库单。
|
|
*
|
|
* 根据 deliveryOrderCode 查 `wms_order_stockout` 主表,
|
|
* 然后关联查 `wms_order_stockout_items` 明细,按奇门标准响应格式返回。
|
|
*
|
|
* @param {object} data - 奇门 stockout.query 请求体
|
|
* @param {object} data.request - 请求数据
|
|
* @param {object} data.request.deliveryOrder - 出库单查询条件
|
|
* @param {string} data.request.deliveryOrder.deliveryOrderCode - 出库单号
|
|
* @return {Promise<object>} 返回 success / fail 结果
|
|
*/
|
|
async query(data) {
|
|
const { app, ctx } = this;
|
|
const { deliveryOrderCode } = data.request.deliveryOrder;
|
|
|
|
// 查主表
|
|
const order = await ctx.model.OrderStockout.findOne({
|
|
where: { stockout_order_code: deliveryOrderCode },
|
|
});
|
|
if (!order) {
|
|
return this.fail('未找到出库单');
|
|
}
|
|
|
|
// 查明细
|
|
const items = await ctx.model.OrderStockoutItems.findAll({
|
|
where: { order_id: order.id },
|
|
order: [[ 'order_line_no', 'ASC' ]],
|
|
});
|
|
|
|
return this.success('成功', {
|
|
totalLines: items.length,
|
|
deliveryOrder: {
|
|
deliveryOrderCode: order.stockout_order_code,
|
|
deliveryOrderId: order.id,
|
|
warehouseCode: order.qimen_warehouse_code,
|
|
orderType: order.order_type,
|
|
status: order.order_status,
|
|
createTime: order.order_create_time ? app.formatDate(order.order_create_time) : null,
|
|
remark: order.remark || '',
|
|
},
|
|
orderLines: {
|
|
orderLine: items.map(item => ({
|
|
orderLineNo: item.order_line_no,
|
|
ownerCode: item.owner_code,
|
|
itemCode: item.item_code,
|
|
itemId: item.item_id,
|
|
itemName: item.item_name,
|
|
planQty: item.plan_qty,
|
|
inventoryType: item.inventory_type,
|
|
})),
|
|
},
|
|
});
|
|
}
|
|
|
|
}
|
|
module.exports = stockoutServer;
|