1
This commit is contained in:
parent
d743e67b9d
commit
77435aeb79
@ -167,6 +167,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods
|
||||
- stockWarehouse, getProhibitedType, getInfo, saveWarehouseStock, createWarehouseStock, getBarcodes, saveWarehouseStockBarcode, getStoreStocks, bindItem, unbindItem, checkItemCodeUnique, queryStockLogs, handleBatchDelete, deleteUnit, deleteProhibited, handleBatchChange, getStockUnits, getUnitList, createProhibited, createUnit, search
|
||||
- app/service/systemMethods/storage/receiving.js (13)
|
||||
- getReceivingList, getReceivingDetail, batchCancelReceiving, create, addItem, removeItem, saveReceiving, get, addDetail, deleteDetail, detailChange, cancel, completeReceiving
|
||||
- app/service/systemMethods/storage/direct_inbound.js (4)
|
||||
- getItems, addItem, commit, removeItem
|
||||
- app/service/systemMethods/store.js (6)
|
||||
- createStore, createWarehouse, joinStore, joinWarehouse, getStoreRoles, auditApply
|
||||
- app/service/systemMethods/user.js (5)
|
||||
@ -181,6 +183,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods
|
||||
- addOrder, generateItemsHash, calculateCRC32, prepareOrderData, addOrderLines, safeParseFloat, addOrderToQueue
|
||||
- app/service/systems/entry_order.js (9)
|
||||
- addOrder, getLineCount, received, success, fail, tryCreateEntryOrder, addItems, qimenEntryorderConfirm, entryorderConfirm
|
||||
- app/service/systems/inbound_direct_log.js (4)
|
||||
- getItems, addItem, commit, removeItem
|
||||
- app/service/systems/fast_where.js (13)
|
||||
- buildTree, getTreeByType, buildSubTree, getWithChildrenByType, getAllChildren, getByType, getGroups, getChildrenByPid, getTreeChildrenByPid, create, update, findById, delete
|
||||
- app/service/systems/file.js (2)
|
||||
|
||||
@ -58,8 +58,27 @@ module.exports = {
|
||||
ORDER_PACKED: '订单打包',
|
||||
ORDER_SHIPPED: '订单发货',
|
||||
ORDER_COMPLETE: '订单完成',
|
||||
ORDER_UPDATE_PLATFORM: '更新平台',
|
||||
ORDER_UPDATE_EXPRESS: '更新快递',
|
||||
ORDER_UPDATE_ADDRESS: '更新地址',
|
||||
ORDER_CLONE_SOURCE: '克隆来源订单',
|
||||
ORDER_CLONE_TARGET: '克隆目标订单',
|
||||
ORDER_MANUAL_WAYBILL: '手工录入运单号',
|
||||
ORDER_RESOLVE_EXCEPTION: '处理异常',
|
||||
ORDER_INTERCEPT_CONFIRM: '确认拦截',
|
||||
ORDER_PLATFORM_FALLBACK: '平台降级',
|
||||
ORDER_EXPRESS_FALLBACK: '快递降级',
|
||||
ORDER_WAVE_UPDATE: '更新波次',
|
||||
ORDER_WAVE_ASSIGN: '分配波次',
|
||||
ORDER_WAVE_REMOVE: '移出波次',
|
||||
ORDER_WAVE_CANCEL: '取消波次',
|
||||
ORDER_WAVE_GRAB: '抓取波次',
|
||||
ORDER_WAVE_AUTO_GROUP: '自动加团',
|
||||
ORDER_WAVE_STRATEGY_FETCH: '策略抓取波次',
|
||||
ORDER_PICK_COMPLETE: '拣货完成',
|
||||
ORDER_SYNC: '同步订单',
|
||||
ORDER_WEIGH: '称重',
|
||||
ORDER_PACKAGE_MATERIAL_BIND: '绑定包材',
|
||||
ORDER_STORAGE_ALLOCATE_SUCCESS: '分配储位成功',
|
||||
ORDER_STORAGE_ALLOCATE_FAILED: '分配储位失败',
|
||||
ORDER_STORAGE_UNALLOCATE_SUCCESS: '取消分配储位成功',
|
||||
@ -72,6 +91,8 @@ module.exports = {
|
||||
ORDER_UNLOCK: '订单解锁',
|
||||
|
||||
// 库存管理
|
||||
STORAGE_TRANSFER_LOCATION: '库位调拨',
|
||||
STORAGE_TRANSFER_BY_PRODUCT: '商品调拨',
|
||||
STOCK_IN: '商品入库',
|
||||
STOCK_OUT: '商品出库',
|
||||
STOCK_ADJUST: '库存调整',
|
||||
|
||||
@ -477,58 +477,57 @@ function buildWaybillCustomProductInfoLines(items, policyConfig = {}, options =
|
||||
? String(safePolicyConfig[WAYBILL_CUSTOM_DISPLAY_FIELD] || '').trim()
|
||||
: WAYBILL_CUSTOM_DISPLAY_TYPES.PICK_LOCATION_NAME_BARCODE_QTY;
|
||||
|
||||
if (displayType === WAYBILL_CUSTOM_DISPLAY_TYPES.HIDE) {
|
||||
return [];
|
||||
}
|
||||
const isHideMode = displayType === WAYBILL_CUSTOM_DISPLAY_TYPES.HIDE;
|
||||
|
||||
const detailLines = [];
|
||||
let totalQty = 0;
|
||||
|
||||
for (const item of safeItems) {
|
||||
if (!isPlainObject(item)) {
|
||||
continue;
|
||||
}
|
||||
// HIDE 模式下跳过商品明细行构建,但仍保留 headerLine(波次号、快递渠道等)的输出
|
||||
if (!isHideMode) {
|
||||
for (const item of safeItems) {
|
||||
if (!isPlainObject(item)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const itemName = getFirstNonEmptyText(item, [ 'item_name', 'product_name', 'name', 'title' ]);
|
||||
const pickLocation = getFirstNonEmptyText(item, [
|
||||
'pick_location',
|
||||
'pick_location_code',
|
||||
'location_code',
|
||||
'space_code',
|
||||
'bin_code',
|
||||
'storage_code',
|
||||
]);
|
||||
const barcode = resolveItemBarcodeText(item);
|
||||
const { qtyText, qtyNumber } = resolveItemQuantity(item);
|
||||
totalQty += qtyNumber;
|
||||
const itemName = getFirstNonEmptyText(item, [ 'item_name', 'product_name', 'name', 'title' ]);
|
||||
const pickLocation = getFirstNonEmptyText(item, [
|
||||
'pick_location',
|
||||
'pick_location_code',
|
||||
'location_code',
|
||||
'space_code',
|
||||
'bin_code',
|
||||
'storage_code',
|
||||
]);
|
||||
const barcode = resolveItemBarcodeText(item);
|
||||
const { qtyText } = resolveItemQuantity(item);
|
||||
|
||||
let line = '';
|
||||
switch (displayType) {
|
||||
case WAYBILL_CUSTOM_DISPLAY_TYPES.ITEM_NAME_QTY:
|
||||
line = `${itemName} 【${qtyText}】`.trim();
|
||||
break;
|
||||
case WAYBILL_CUSTOM_DISPLAY_TYPES.PICK_LOCATION_BARCODE_QTY:
|
||||
line = `${pickLocation} ${barcode} 【${qtyText}】`.trim();
|
||||
break;
|
||||
case WAYBILL_CUSTOM_DISPLAY_TYPES.PICK_LOCATION_BARCODE_LAST5_QTY: {
|
||||
const barcodeLast5 = barcode ? barcode.slice(-5) : '';
|
||||
if (!pickLocation && !barcodeLast5) {
|
||||
line = '';
|
||||
let line = '';
|
||||
switch (displayType) {
|
||||
case WAYBILL_CUSTOM_DISPLAY_TYPES.ITEM_NAME_QTY:
|
||||
line = `${itemName} 【${qtyText}】`.trim();
|
||||
break;
|
||||
case WAYBILL_CUSTOM_DISPLAY_TYPES.PICK_LOCATION_BARCODE_QTY:
|
||||
line = `${pickLocation} ${barcode} 【${qtyText}】`.trim();
|
||||
break;
|
||||
case WAYBILL_CUSTOM_DISPLAY_TYPES.PICK_LOCATION_BARCODE_LAST5_QTY: {
|
||||
const barcodeLast5 = barcode ? barcode.slice(-5) : '';
|
||||
if (!pickLocation && !barcodeLast5) {
|
||||
line = '';
|
||||
break;
|
||||
}
|
||||
line = `${pickLocation} ${barcodeLast5} 【${qtyText}】`.trim();
|
||||
break;
|
||||
}
|
||||
line = `${pickLocation} ${barcodeLast5} 【${qtyText}】`.trim();
|
||||
break;
|
||||
case WAYBILL_CUSTOM_DISPLAY_TYPES.PICK_LOCATION_NAME_BARCODE_QTY:
|
||||
line = `${pickLocation} ${itemName} ${barcode} 【${qtyText}】`.trim();
|
||||
break;
|
||||
default:
|
||||
line = '';
|
||||
break;
|
||||
}
|
||||
case WAYBILL_CUSTOM_DISPLAY_TYPES.PICK_LOCATION_NAME_BARCODE_QTY:
|
||||
line = `${pickLocation} ${itemName} ${barcode} 【${qtyText}】`.trim();
|
||||
break;
|
||||
default:
|
||||
line = '';
|
||||
break;
|
||||
}
|
||||
|
||||
if (line) {
|
||||
detailLines.push(line.replace(/\s{2,}/g, ' '));
|
||||
if (line) {
|
||||
detailLines.push(line.replace(/\s{2,}/g, ' '));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -537,10 +536,6 @@ function buildWaybillCustomProductInfoLines(items, policyConfig = {}, options =
|
||||
const waveIndex = toNumber(safeOptions.wave_index, 0);
|
||||
const platformsIndex = toNumber(safeOptions.platforms_index, 0);
|
||||
const expressInterfaceName = String(safeOptions.expressInterfaceName || '').trim();
|
||||
const fallbackTotalQtyRaw = Number(safeOptions.fallbackTotalQty);
|
||||
const finalTotalQty = totalQty > 0
|
||||
? totalQty
|
||||
: (Number.isFinite(fallbackTotalQtyRaw) && fallbackTotalQtyRaw > 0 ? fallbackTotalQtyRaw : 0);
|
||||
void platformsIndex;
|
||||
const hasWaveCustomPrefix = waveTotalOrders > 0
|
||||
&& waveIndex > 0
|
||||
@ -2001,8 +1996,14 @@ function applySphExpressFieldMapping(
|
||||
}
|
||||
|
||||
task.printNum = isPlainObject(task.printNum) ? task.printNum : {};
|
||||
const currentCurNum = toNumber(task.printNum.curNum, 0);
|
||||
task.printNum.curNum = currentCurNum > 0 ? currentCurNum : 1;
|
||||
// curNum 使用订单在波次内的实际序号(wave_index),与 sumNum(波次总单数)对应
|
||||
const waveIndex = toNumber(safeOrderDelivery.wave_index, 0);
|
||||
const platformsIndex = toNumber(safeOrderDelivery.platforms_index, 0);
|
||||
const templateCurNum = toNumber(task.printNum.curNum, 0);
|
||||
const effectiveCurNum = waveIndex > 0
|
||||
? waveIndex
|
||||
: (platformsIndex > 0 ? platformsIndex : templateCurNum);
|
||||
task.printNum.curNum = effectiveCurNum > 0 ? effectiveCurNum : 1;
|
||||
task.printNum.sumNum = toNumber(
|
||||
safeOrderDelivery.wave_total_orders,
|
||||
toNumber(task.printNum.sumNum, 0)
|
||||
|
||||
@ -70,8 +70,9 @@ class QimenClient {
|
||||
|
||||
return String(xmlString || '').replace(packagesBlockRegex, block => {
|
||||
return block
|
||||
// 去掉 buildXmlNode 为数组元素添加的 <item> 包装器:<package><item> → <package>
|
||||
.replace(/<\s*package\s*>\s*<\s*item\s*>/gi, '<package>')
|
||||
.replace(/<\s*\/\s*item\s*>\s*<\s*item\s*>/gi, '</package><package>')
|
||||
// 去掉对应的 </item> 包装器闭合,输出标准格式 XML(不再做交错标签变换)
|
||||
.replace(/<\s*\/\s*item\s*>\s*<\s*\/\s*package\s*>/gi, '</package>');
|
||||
});
|
||||
}
|
||||
|
||||
@ -128,6 +128,8 @@ module.exports = app => {
|
||||
foreignKey: 'stock_id',
|
||||
as: 'stock',
|
||||
});
|
||||
|
||||
|
||||
};
|
||||
|
||||
// 实例方法 - 验证收货数量
|
||||
|
||||
@ -19,7 +19,7 @@ module.exports = app => {
|
||||
},
|
||||
},
|
||||
order_type: {
|
||||
type: ENUM('SCRK', 'LYRK', 'CCRK', 'CGRK', 'DBRK', 'QTRK', 'B2BRK', 'XNRK','SHRK'),
|
||||
type: ENUM('SCRK', 'LYRK', 'CCRK', 'CGRK', 'DBRK', 'QTRK', 'B2BRK', 'XNRK', 'SHRK'),
|
||||
allowNull: false,
|
||||
comment: '业务类型',
|
||||
},
|
||||
@ -81,10 +81,10 @@ module.exports = app => {
|
||||
comment: '来源类型',
|
||||
},
|
||||
order_status: {
|
||||
type: ENUM('PENDING', 'CONFIRMED', 'PARTIAL_RECEIVED', 'COMPLETED', 'CANCELLED', 'CREATING'),
|
||||
type: ENUM('CREATING', 'CREATED', 'PENDING', 'COMPLETED', 'CANCELLED'),
|
||||
allowNull: false,
|
||||
defaultValue: 'PENDING',
|
||||
comment: '订单状态',
|
||||
defaultValue: 'CREATED',
|
||||
comment: '订单状态:CREATING=创建中, CREATED=已创建待审核, PENDING=已审核, COMPLETED=已完成, CANCELLED=已作废',
|
||||
},
|
||||
sync_status: {
|
||||
type: ENUM('PENDING', 'SUCCESS', 'FAILED'),
|
||||
@ -215,7 +215,7 @@ module.exports = app => {
|
||||
|
||||
// 关联关系
|
||||
EntryOrder.associate = function() {
|
||||
const { EntryOrder, Store, EntryItems } = app.model;
|
||||
const { EntryOrder, Store, EntryItems, EntryOrderReceiving } = app.model;
|
||||
|
||||
// 关联仓库
|
||||
EntryOrder.belongsTo(Store, {
|
||||
@ -234,15 +234,21 @@ module.exports = app => {
|
||||
foreignKey: 'order_id',
|
||||
as: 'items',
|
||||
});
|
||||
|
||||
// 关联入库单-收货单绑定记录
|
||||
EntryOrder.hasMany(EntryOrderReceiving, {
|
||||
foreignKey: 'entry_order_id',
|
||||
as: 'receivingBindings',
|
||||
});
|
||||
};
|
||||
|
||||
// 实例方法
|
||||
EntryOrder.prototype.isPending = function() {
|
||||
return this.order_status === 'PENDING';
|
||||
EntryOrder.prototype.isCreated = function() {
|
||||
return this.order_status === 'CREATED';
|
||||
};
|
||||
|
||||
EntryOrder.prototype.isConfirmed = function() {
|
||||
return this.order_status === 'CONFIRMED';
|
||||
EntryOrder.prototype.isPending = function() {
|
||||
return this.order_status === 'PENDING';
|
||||
};
|
||||
|
||||
EntryOrder.prototype.isCompleted = function() {
|
||||
@ -253,20 +259,16 @@ module.exports = app => {
|
||||
return this.order_status === 'CANCELLED';
|
||||
};
|
||||
|
||||
EntryOrder.prototype.isPartialReceived = function() {
|
||||
return this.order_status === 'PARTIAL_RECEIVED';
|
||||
};
|
||||
|
||||
EntryOrder.prototype.canConfirm = function() {
|
||||
return [ 'PENDING' ].includes(this.order_status);
|
||||
return [ 'CREATED', 'PENDING' ].includes(this.order_status);
|
||||
};
|
||||
|
||||
EntryOrder.prototype.canCancel = function() {
|
||||
return [ 'PENDING', 'CONFIRMED' ].includes(this.order_status);
|
||||
return [ 'CREATED', 'PENDING' ].includes(this.order_status);
|
||||
};
|
||||
|
||||
EntryOrder.prototype.canComplete = function() {
|
||||
return [ 'CONFIRMED', 'PARTIAL_RECEIVED' ].includes(this.order_status);
|
||||
return [ 'PENDING' ].includes(this.order_status);
|
||||
};
|
||||
|
||||
EntryOrder.prototype.isSyncSuccess = function() {
|
||||
|
||||
76
app/model/entry_order_receiving.js
Normal file
76
app/model/entry_order_receiving.js
Normal file
@ -0,0 +1,76 @@
|
||||
'use strict';
|
||||
|
||||
module.exports = app => {
|
||||
const { BIGINT, DATE } = app.Sequelize;
|
||||
|
||||
const EntryOrderReceiving = app.model.define('wms_entry_order_receiving', {
|
||||
id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
primaryKey: true,
|
||||
autoIncrement: true,
|
||||
comment: '主键ID',
|
||||
},
|
||||
entry_order_id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
allowNull: false,
|
||||
comment: '入库单ID,关联 wms_entry_order.id',
|
||||
},
|
||||
receiving_id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
allowNull: false,
|
||||
comment: '收货单ID,关联 wms_receiving.id',
|
||||
},
|
||||
created_at: {
|
||||
type: DATE,
|
||||
allowNull: false,
|
||||
comment: '创建时间',
|
||||
},
|
||||
updated_at: {
|
||||
type: DATE,
|
||||
allowNull: false,
|
||||
comment: '更新时间',
|
||||
},
|
||||
}, {
|
||||
tableName: 'wms_entry_order_receiving',
|
||||
comment: '入库单-收货单主表级绑定关系表',
|
||||
timestamps: true,
|
||||
createdAt: 'created_at',
|
||||
updatedAt: 'updated_at',
|
||||
paranoid: true,
|
||||
deletedAt: 'deleted_at',
|
||||
indexes: [
|
||||
{
|
||||
name: 'idx_entry_order_id',
|
||||
fields: ['entry_order_id'],
|
||||
},
|
||||
{
|
||||
name: 'idx_receiving_id',
|
||||
fields: ['receiving_id'],
|
||||
},
|
||||
{
|
||||
name: 'uk_entry_order_receiving',
|
||||
unique: true,
|
||||
fields: ['entry_order_id', 'receiving_id'],
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
// 关联关系
|
||||
EntryOrderReceiving.associate = function() {
|
||||
const { EntryOrderReceiving, EntryOrder, Receiving } = app.model;
|
||||
|
||||
// 关联入库单
|
||||
EntryOrderReceiving.belongsTo(EntryOrder, {
|
||||
foreignKey: 'entry_order_id',
|
||||
as: 'entryOrder',
|
||||
});
|
||||
|
||||
// 关联收货单
|
||||
EntryOrderReceiving.belongsTo(Receiving, {
|
||||
foreignKey: 'receiving_id',
|
||||
as: 'receiving',
|
||||
});
|
||||
};
|
||||
|
||||
return EntryOrderReceiving;
|
||||
};
|
||||
99
app/model/entry_receiving_binding.js
Normal file
99
app/model/entry_receiving_binding.js
Normal file
@ -0,0 +1,99 @@
|
||||
'use strict';
|
||||
|
||||
module.exports = app => {
|
||||
const { INTEGER, BIGINT, ENUM, DATE } = app.Sequelize;
|
||||
|
||||
const EntryReceivingBinding = app.model.define('wms_entry_receiving_binding', {
|
||||
id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
primaryKey: true,
|
||||
autoIncrement: true,
|
||||
comment: '主键ID',
|
||||
},
|
||||
entry_item_id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
allowNull: false,
|
||||
comment: '入库明细ID',
|
||||
},
|
||||
receiving_detail_id: {
|
||||
type: INTEGER,
|
||||
allowNull: false,
|
||||
comment: '收货明细ID',
|
||||
},
|
||||
allocated_quantity: {
|
||||
type: INTEGER,
|
||||
allowNull: false,
|
||||
comment: '预分配数量',
|
||||
validate: {
|
||||
min: 1,
|
||||
},
|
||||
},
|
||||
status: {
|
||||
type: ENUM('pending', 'committed', 'released'),
|
||||
allowNull: false,
|
||||
defaultValue: 'pending',
|
||||
comment: '绑定状态:pending-待提交 committed-已提交 released-已释放',
|
||||
},
|
||||
creator_id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
allowNull: true,
|
||||
comment: '创建人ID',
|
||||
},
|
||||
created_at: {
|
||||
type: DATE,
|
||||
allowNull: false,
|
||||
comment: '创建时间',
|
||||
},
|
||||
updated_at: {
|
||||
type: DATE,
|
||||
allowNull: false,
|
||||
comment: '更新时间',
|
||||
},
|
||||
}, {
|
||||
tableName: 'wms_entry_receiving_binding',
|
||||
comment: '入库单明细-收货明细绑定关系表',
|
||||
timestamps: true,
|
||||
createdAt: 'created_at',
|
||||
updatedAt: 'updated_at',
|
||||
paranoid: true,
|
||||
deletedAt: 'deleted_at',
|
||||
indexes: [
|
||||
{
|
||||
name: 'idx_entry_item_id',
|
||||
fields: [ 'entry_item_id' ],
|
||||
},
|
||||
{
|
||||
name: 'idx_receiving_detail_id',
|
||||
fields: [ 'receiving_detail_id' ],
|
||||
},
|
||||
{
|
||||
name: 'idx_status',
|
||||
fields: [ 'status' ],
|
||||
},
|
||||
{
|
||||
name: 'uk_entry_receiving',
|
||||
unique: true,
|
||||
fields: [ 'entry_item_id', 'receiving_detail_id', 'status' ],
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
// 关联关系
|
||||
EntryReceivingBinding.associate = function() {
|
||||
const { EntryReceivingBinding, EntryItems, ReceivingDetail } = app.model;
|
||||
|
||||
// 关联入库明细
|
||||
EntryReceivingBinding.belongsTo(EntryItems, {
|
||||
foreignKey: 'entry_item_id',
|
||||
as: 'entryItem',
|
||||
});
|
||||
|
||||
// 关联收货明细
|
||||
EntryReceivingBinding.belongsTo(ReceivingDetail, {
|
||||
foreignKey: 'receiving_detail_id',
|
||||
as: 'receivingDetail',
|
||||
});
|
||||
};
|
||||
|
||||
return EntryReceivingBinding;
|
||||
};
|
||||
103
app/model/inbound_direct_log.js
Normal file
103
app/model/inbound_direct_log.js
Normal file
@ -0,0 +1,103 @@
|
||||
'use strict';
|
||||
|
||||
module.exports = app => {
|
||||
const { STRING, INTEGER, BIGINT, ENUM, DATE } = app.Sequelize;
|
||||
|
||||
const InboundDirectLog = app.model.define('wms_inbound_direct_log', {
|
||||
id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
primaryKey: true,
|
||||
autoIncrement: true,
|
||||
comment: '主键ID',
|
||||
},
|
||||
warehouse_id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
allowNull: false,
|
||||
comment: '仓库ID',
|
||||
},
|
||||
store_id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
allowNull: true,
|
||||
comment: '货主ID',
|
||||
},
|
||||
stock_id: {
|
||||
type: BIGINT(20),
|
||||
allowNull: false,
|
||||
comment: '商品SKU ID,关联 wms_stock_warehouse.id',
|
||||
},
|
||||
quantity: {
|
||||
type: INTEGER(12),
|
||||
allowNull: false,
|
||||
comment: '入库数量',
|
||||
},
|
||||
inbound_type: {
|
||||
type: ENUM('import', 'pda'),
|
||||
allowNull: false,
|
||||
comment: '入库方式:import-导入入库 pda-PDA入库',
|
||||
},
|
||||
entry_order_id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
allowNull: true,
|
||||
comment: '关联入库单ID(可选),关联 wms_entry_order.id',
|
||||
},
|
||||
entry_order_code: {
|
||||
type: STRING(50),
|
||||
allowNull: true,
|
||||
comment: '入库单号(冗余,方便查询)',
|
||||
},
|
||||
remark: {
|
||||
type: STRING(500),
|
||||
allowNull: true,
|
||||
comment: '备注(如导入文件名、PDA操作备注等)',
|
||||
},
|
||||
space_id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
allowNull: true,
|
||||
defaultValue: null,
|
||||
comment: '存放库位ID,关联 wms_location_space.id',
|
||||
},
|
||||
operator_id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
allowNull: true,
|
||||
comment: '操作人ID',
|
||||
},
|
||||
operator_name: {
|
||||
type: STRING(50),
|
||||
allowNull: true,
|
||||
comment: '操作人名称',
|
||||
},
|
||||
created_at: {
|
||||
type: DATE,
|
||||
allowNull: false,
|
||||
comment: '创建时间',
|
||||
},
|
||||
}, {
|
||||
tableName: 'wms_inbound_direct_log',
|
||||
comment: '非收货单途径入库直接记录表(导入/PDA入库)',
|
||||
timestamps: false,
|
||||
indexes: [
|
||||
{
|
||||
name: 'idx_warehouse_id',
|
||||
fields: [ 'warehouse_id' ],
|
||||
},
|
||||
{
|
||||
name: 'idx_stock_id',
|
||||
fields: [ 'stock_id' ],
|
||||
},
|
||||
{
|
||||
name: 'idx_inbound_type',
|
||||
fields: [ 'inbound_type' ],
|
||||
},
|
||||
{
|
||||
name: 'idx_entry_order_id',
|
||||
fields: [ 'entry_order_id' ],
|
||||
},
|
||||
{
|
||||
name: 'idx_created_at',
|
||||
fields: [ 'created_at' ],
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
return InboundDirectLog;
|
||||
};
|
||||
@ -128,7 +128,7 @@ module.exports = app => {
|
||||
comment: '支付时间',
|
||||
},
|
||||
pay_no: {
|
||||
type: STRING(50),
|
||||
type: TEXT,
|
||||
allowNull: true,
|
||||
comment: '支付单号',
|
||||
},
|
||||
|
||||
@ -160,7 +160,7 @@ module.exports = app => {
|
||||
|
||||
// 关联定义
|
||||
Receiving.associate = function() {
|
||||
const { ReceivingDetail, Store, AccountStoreEmployee, StoreWarehouse } = app.model;
|
||||
const { ReceivingDetail, Store, AccountStoreEmployee, StoreWarehouse, EntryOrderReceiving } = app.model;
|
||||
// 关联收货明细
|
||||
Receiving.hasMany(ReceivingDetail, {
|
||||
foreignKey: 'receiving_id',
|
||||
@ -186,6 +186,12 @@ module.exports = app => {
|
||||
as: 'store',
|
||||
constraints: false,
|
||||
});
|
||||
|
||||
// 关联入库单-收货单绑定记录
|
||||
Receiving.hasMany(EntryOrderReceiving, {
|
||||
foreignKey: 'receiving_id',
|
||||
as: 'entryOrderBindings',
|
||||
});
|
||||
};
|
||||
|
||||
return Receiving;
|
||||
|
||||
@ -38,6 +38,10 @@ module.exports = app => {
|
||||
require_pick: true,
|
||||
});
|
||||
|
||||
const DEFAULT_CUTOFF_ORDER_TIME = '18:00';
|
||||
const CUTOFF_ORDER_TIME_MIN = '12:00';
|
||||
const CUTOFF_ORDER_TIME_MAX = '23:59';
|
||||
|
||||
const DEFAULT_SUBJECT_CONFIG = Object.freeze({
|
||||
max_notice_webhook_count: DEFAULT_MAX_NOTICE_WEBHOOK_COUNT,
|
||||
max_wave_quantity: DEFAULT_MAX_WAVE_QUANTITY,
|
||||
@ -48,6 +52,8 @@ module.exports = app => {
|
||||
delete_order_wave_prefix: 'A',
|
||||
inventory_warning_rules: DEFAULT_INVENTORY_WARNING_RULES,
|
||||
auto_outbound_rules: DEFAULT_AUTO_OUTBOUND_RULES,
|
||||
cutoff_order_enabled: 1,
|
||||
cutoff_order_time: DEFAULT_CUTOFF_ORDER_TIME,
|
||||
});
|
||||
|
||||
const normalizeSubjectConfigText = (value, defaultValue) => {
|
||||
@ -281,6 +287,22 @@ module.exports = app => {
|
||||
normalized.inventory_warning_rules = normalizeInventoryWarningRules(parsed.inventory_warning_rules);
|
||||
normalized.auto_outbound_rules = normalizeAutoOutboundRules(parsed.auto_outbound_rules);
|
||||
|
||||
if (Object.prototype.hasOwnProperty.call(parsed, 'cutoff_order_enabled')) {
|
||||
normalized.cutoff_order_enabled = normalizeBooleanFlag(parsed.cutoff_order_enabled, 'subject_config.cutoff_order_enabled');
|
||||
}
|
||||
|
||||
if (Object.prototype.hasOwnProperty.call(parsed, 'cutoff_order_time')) {
|
||||
const cutoffTime = normalizeSubjectConfigText(parsed.cutoff_order_time, DEFAULT_CUTOFF_ORDER_TIME);
|
||||
if (!/^([01]\d|2[0-3]):[0-5]\d$/.test(cutoffTime)) {
|
||||
throw new Error('subject_config.cutoff_order_time 格式必须为 HH:mm(如 18:00)');
|
||||
}
|
||||
if (cutoffTime < CUTOFF_ORDER_TIME_MIN || cutoffTime > CUTOFF_ORDER_TIME_MAX) {
|
||||
normalized.cutoff_order_time = DEFAULT_CUTOFF_ORDER_TIME;
|
||||
} else {
|
||||
normalized.cutoff_order_time = cutoffTime;
|
||||
}
|
||||
}
|
||||
|
||||
return normalized;
|
||||
};
|
||||
|
||||
|
||||
@ -197,6 +197,25 @@ module.exports = app => {
|
||||
Object.freeze({ value: '5', label: '拣货库位商品名称条码和数量' }),
|
||||
],
|
||||
}),
|
||||
Object.freeze({
|
||||
key: 'cutoff_order_enabled',
|
||||
name: '启用截单',
|
||||
type: 'flag',
|
||||
default: 1,
|
||||
required: false,
|
||||
description: '启用后,当天订单创建时间超过截单时间,不再自动分配快递和储位,不再自动加团',
|
||||
}),
|
||||
Object.freeze({
|
||||
key: 'cutoff_order_time',
|
||||
name: '截单时间',
|
||||
type: 'string',
|
||||
default: '18:00',
|
||||
required: false,
|
||||
maxLength: 5,
|
||||
min: '12:00',
|
||||
max: '23:59',
|
||||
description: '截单时间,格式 HH:mm,如 16:00',
|
||||
}),
|
||||
]);
|
||||
const POLICY_CONFIG_FIELD_MAP = Object.freeze(POLICY_CONFIG_FIELDS.reduce((result, field) => {
|
||||
result[field.key] = field;
|
||||
@ -378,7 +397,12 @@ module.exports = app => {
|
||||
if (text.length > field.maxLength) {
|
||||
throw new Error(`${fieldName}.${field.key} 长度不能超过 ${field.maxLength}`);
|
||||
}
|
||||
normalized[field.key] = text;
|
||||
// 时间类型字符串范围校验
|
||||
if (field.min !== undefined && field.max !== undefined && text !== '' && (text < field.min || text > field.max)) {
|
||||
normalized[field.key] = field.default !== undefined ? String(field.default) : '';
|
||||
} else {
|
||||
normalized[field.key] = text;
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
if (!sanitizeOnly) {
|
||||
|
||||
203
app/service/openapiMethods/entryorder.js
Normal file
203
app/service/openapiMethods/entryorder.js
Normal file
@ -0,0 +1,203 @@
|
||||
'use strict';
|
||||
|
||||
const MainService = require('../main');
|
||||
|
||||
/**
|
||||
* OpenAPI 入库单服务。
|
||||
* 对外提供入库单的创建与查询能力,通过 openapi 通道对接外部系统。
|
||||
*/
|
||||
class OpenapiEntryorderService extends MainService {
|
||||
|
||||
/**
|
||||
* 通过 app_key 解析仓库与货主信息。
|
||||
* 查询 ApiApp 并关联 StoreWarehouse 以获取 storeId、warehouseId。
|
||||
* warehouseCode 优先使用 qimen_warehouse_code,为空时回退使用 warehouseId。
|
||||
* @param {string} appKey 开放接口 app_key。
|
||||
* @return {Promise<Object>} 包含 storeId、warehouseId、appKey、customerId、warehouseCode 的信息对象。
|
||||
*/
|
||||
async resolveAppInfo(appKey) {
|
||||
const { ctx, app } = this;
|
||||
const normalizedAppKey = String(appKey || '').trim();
|
||||
if (!normalizedAppKey) {
|
||||
throw new Error('app_key 缺失');
|
||||
}
|
||||
|
||||
const appConfig = await ctx.model.ApiApp.findOne({
|
||||
attributes: [
|
||||
'id',
|
||||
'warehouse_id',
|
||||
'qimen_warehouse_code',
|
||||
[ app.Sequelize.col('contract.store_id'), 'store_id' ],
|
||||
],
|
||||
where: {
|
||||
self_app_key: normalizedAppKey,
|
||||
is_enabled: 1,
|
||||
},
|
||||
include: [
|
||||
{
|
||||
model: ctx.model.StoreWarehouse,
|
||||
as: 'contract',
|
||||
attributes: [],
|
||||
required: false,
|
||||
},
|
||||
],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
if (!appConfig || !appConfig.warehouse_id) {
|
||||
throw new Error(`无法解析仓库信息,请检查 app_key: ${normalizedAppKey}`);
|
||||
}
|
||||
|
||||
const warehouseId = appConfig.warehouse_id;
|
||||
|
||||
return {
|
||||
storeId: appConfig.store_id || null,
|
||||
warehouseId,
|
||||
appKey: normalizedAppKey,
|
||||
customerId: null,
|
||||
warehouseCode: appConfig.qimen_warehouse_code || String(warehouseId),
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建入库单。
|
||||
* 接收外部系统的入库单数据,校验后通过底层 entryOrder 服务完成入库单创建。
|
||||
* @param {Object} payload 调用参数。
|
||||
* @param {Object} payload.body 请求体数据,包含 entryOrder(入库单信息)和 orderLines(明细行)。
|
||||
* @param {Object} payload.query 请求 query 数据,需包含 app_key。
|
||||
* @return {Promise<Object>} 创建结果,成功时返回 entryOrderId、entryOrderCode、status 和 createTime。
|
||||
*/
|
||||
async create(payload = {}) {
|
||||
const { body = {}, query = {} } = 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 期望的字段名
|
||||
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 info = await this.resolveAppInfo(query.app_key);
|
||||
this.setInfo(
|
||||
info.storeId,
|
||||
info.warehouseId,
|
||||
info.appKey,
|
||||
info.customerId,
|
||||
info.warehouseCode
|
||||
);
|
||||
|
||||
const data = {
|
||||
request: {
|
||||
entryOrder: mappedEntryOrder,
|
||||
orderLines,
|
||||
},
|
||||
};
|
||||
|
||||
const res = await this.ctx.service.systems.entryOrder.addOrder(
|
||||
data,
|
||||
this.getInfo(),
|
||||
'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}`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询入库单。
|
||||
* 根据入库单号查询入库单详情,包括基本信息与商品明细。
|
||||
* @param {Object} payload 调用参数。
|
||||
* @param {Object} payload.body 请求体数据,需包含 entryOrderCode(入库单号)。
|
||||
* @param {Object} payload.query 请求 query 数据,需包含 app_key。
|
||||
* @return {Promise<Object>} 查询结果,成功时返回入库单详情。
|
||||
*/
|
||||
async query(payload = {}) {
|
||||
const { body = {}, query = {} } = payload;
|
||||
const { entryOrderCode } = body;
|
||||
|
||||
if (!entryOrderCode) {
|
||||
return this.fail('entryOrderCode 参数缺失');
|
||||
}
|
||||
|
||||
try {
|
||||
const info = await this.resolveAppInfo(query.app_key);
|
||||
const order = await this.ctx.service.systems.entryOrder.findByOrderCode(
|
||||
entryOrderCode,
|
||||
info.warehouseId,
|
||||
info.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 || info.warehouseCode,
|
||||
ownerCode: order.store_code || '',
|
||||
totalOrderLines: order.total_order_lines || 0,
|
||||
orderLines,
|
||||
});
|
||||
} catch (error) {
|
||||
return this.fail(`查询入库单失败: ${error.message}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = OpenapiEntryorderService;
|
||||
@ -120,6 +120,13 @@ class OpenapiOrderService extends MainService {
|
||||
transaction,
|
||||
});
|
||||
|
||||
// 释放储位分配锁定库存
|
||||
await this.releaseStockLockForCancel({
|
||||
orderId: existingOrder.id,
|
||||
warehouseId: info.warehouseId,
|
||||
transaction,
|
||||
});
|
||||
|
||||
await transaction.commit();
|
||||
|
||||
// 取消成功后触发 OpenAPI 回调通知(fire-and-forget,不阻塞主流程)
|
||||
@ -158,6 +165,163 @@ class OpenapiOrderService extends MainService {
|
||||
return this.fail(`取消订单失败: ${error.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 取消订单时释放储位分配锁定库存。
|
||||
* - 有 wms_picking 记录时:释放 wms_storage.locked_quantity 与 wms_stock_warehouse.locked_quantity,
|
||||
* 并删除对应的 wms_picking 分配记录。
|
||||
* - 无 wms_picking 记录时:从 wms_order_items 查询该订单的 stock_id 与 plan_qty,
|
||||
* 只释放 wms_stock_warehouse.locked_quantity。
|
||||
*
|
||||
* @param {Object} options - 释放参数。
|
||||
* @param {number} options.orderId - 订单ID。
|
||||
* @param {number} options.warehouseId - 仓库ID。
|
||||
* @param {Object} options.transaction - 数据库事务对象。
|
||||
* @return {Promise<void>}
|
||||
*/
|
||||
async releaseStockLockForCancel({ orderId, warehouseId, transaction } = {}) {
|
||||
const { ctx, app } = this;
|
||||
const { Op } = app.Sequelize;
|
||||
|
||||
if (!orderId || !warehouseId) {
|
||||
return;
|
||||
}
|
||||
|
||||
const pickingModel = ctx.model.Picking;
|
||||
const storageModel = ctx.model.Storage;
|
||||
const stockModel = ctx.model.StockWarehouse;
|
||||
|
||||
if (!pickingModel || !storageModel || !stockModel) {
|
||||
ctx.logger.warn('[openapi order.cancel releaseStockLockForCancel] 模型不可用,跳过库存释放');
|
||||
return;
|
||||
}
|
||||
|
||||
// 查找该订单的有效分配记录
|
||||
const pickingRows = await pickingModel.findAll({
|
||||
where: {
|
||||
order_id: orderId,
|
||||
status: { [Op.ne]: 'cancel' },
|
||||
},
|
||||
transaction,
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
raw: true,
|
||||
});
|
||||
|
||||
if (!Array.isArray(pickingRows) || pickingRows.length === 0) {
|
||||
// 无储位分配记录:从订单明细获取锁定信息,只释放 stock_warehouse 锁
|
||||
const orderItemsModel = await ctx.model.OrderItemsFactory.getCurrentModel(warehouseId);
|
||||
if (!orderItemsModel) {
|
||||
ctx.logger.warn('[openapi order.cancel releaseStockLockForCancel] OrderItems 模型不可用,跳过库存释放');
|
||||
return;
|
||||
}
|
||||
|
||||
const orderItems = await orderItemsModel.findAll({
|
||||
where: { order_id: orderId },
|
||||
attributes: [ 'stock_id', 'plan_qty' ],
|
||||
raw: true,
|
||||
transaction,
|
||||
});
|
||||
|
||||
for (const item of orderItems) {
|
||||
const stockId = Number(item.stock_id || 0);
|
||||
const qty = Number(item.plan_qty || 0);
|
||||
if (stockId <= 0 || qty <= 0) continue;
|
||||
|
||||
await stockModel.update(
|
||||
{
|
||||
locked_quantity: app.Sequelize.literal(`locked_quantity - ${qty}`),
|
||||
updated_at: app.Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
},
|
||||
{
|
||||
where: { id: stockId, locked_quantity: { [Op.gte]: qty } },
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// 按 storage_id 汇总释放数量
|
||||
const storageQuantityMap = new Map();
|
||||
for (const row of pickingRows) {
|
||||
const storageId = Number(row.storage_id || 0);
|
||||
const quantity = Number(row.quantity || 0);
|
||||
if (storageId > 0 && quantity > 0) {
|
||||
storageQuantityMap.set(storageId, (storageQuantityMap.get(storageId) || 0) + quantity);
|
||||
}
|
||||
}
|
||||
|
||||
if (storageQuantityMap.size === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
// 查出关联的 wms_storage 记录,获取 stock_id
|
||||
const storageIds = Array.from(storageQuantityMap.keys());
|
||||
const storageRows = await storageModel.findAll({
|
||||
where: {
|
||||
id: { [Op.in]: storageIds },
|
||||
},
|
||||
transaction,
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
raw: true,
|
||||
});
|
||||
|
||||
const storageMap = new Map();
|
||||
for (const row of storageRows) {
|
||||
storageMap.set(Number(row.id), row);
|
||||
}
|
||||
|
||||
// 依次释放 wms_storage 与 wms_stock_warehouse 锁定数量
|
||||
for (const [ storageId, quantity ] of storageQuantityMap.entries()) {
|
||||
const storageRow = storageMap.get(storageId);
|
||||
if (!storageRow) {
|
||||
ctx.logger.warn(`[openapi order.cancel] 库存记录不存在,跳过: storageId=${storageId}`);
|
||||
continue;
|
||||
}
|
||||
|
||||
const stockId = Number(storageRow.stock_id || 0);
|
||||
if (stockId <= 0) {
|
||||
ctx.logger.warn(`[openapi order.cancel] 库存记录缺少 stock_id,跳过: storageId=${storageId}`);
|
||||
continue;
|
||||
}
|
||||
|
||||
// 释放 wms_storage.locked_quantity
|
||||
await ctx.service.systems.storage.index.unlockQuantity(storageId, quantity, { transaction });
|
||||
|
||||
// 释放 wms_stock_warehouse.locked_quantity
|
||||
const decrementResult = await stockModel.update(
|
||||
{
|
||||
locked_quantity: app.Sequelize.literal(`locked_quantity - ${Number(quantity)}`),
|
||||
updated_at: app.Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
},
|
||||
{
|
||||
where: {
|
||||
id: stockId,
|
||||
locked_quantity: { [Op.gte]: Number(quantity) },
|
||||
},
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
|
||||
if (!Array.isArray(decrementResult) || Number(decrementResult[0] || 0) <= 0) {
|
||||
throw new Error(`库存主记录锁定数量不足,无法释放: stockId=${stockId}, quantity=${quantity}`);
|
||||
}
|
||||
}
|
||||
|
||||
// 删除已释放的分配记录
|
||||
const pickingIds = pickingRows
|
||||
.map(row => Number(row.id || 0))
|
||||
.filter(id => id > 0);
|
||||
|
||||
if (pickingIds.length > 0) {
|
||||
await pickingModel.destroy({
|
||||
where: {
|
||||
id: { [Op.in]: pickingIds },
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = OpenapiOrderService;
|
||||
|
||||
@ -212,6 +212,13 @@ class orderServer extends MainService {
|
||||
transaction,
|
||||
});
|
||||
|
||||
// 释放储位分配锁定库存(wms_storage / wms_stock_warehouse)
|
||||
await this.releaseStorageLockForCancel({
|
||||
orderId: existingOrder.id,
|
||||
warehouseId: info.warehouseId,
|
||||
transaction,
|
||||
});
|
||||
|
||||
await transaction.commit();
|
||||
return this.success('取消订单成功');
|
||||
} catch (error) {
|
||||
@ -252,6 +259,164 @@ class orderServer extends MainService {
|
||||
return this.fail(`未识别的作业类型${orderType.method}`, {});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 取消订单时释放储位分配锁定库存。
|
||||
* - 有 wms_picking 记录时:释放 wms_storage.locked_quantity 与 wms_stock_warehouse.locked_quantity,
|
||||
* 并删除对应的 wms_picking 分配记录。
|
||||
* - 无 wms_picking 记录时:从 wms_order_items 查询该订单的 stock_id 与 plan_qty,
|
||||
* 只释放 wms_stock_warehouse.locked_quantity。
|
||||
*
|
||||
* @param {Object} options - 释放参数。
|
||||
* @param {number} options.orderId - 订单ID。
|
||||
* @param {number} options.warehouseId - 仓库ID。
|
||||
* @param {Object} options.transaction - 数据库事务对象。
|
||||
* @return {Promise<void>}
|
||||
*/
|
||||
async releaseStorageLockForCancel({ orderId, warehouseId, transaction } = {}) {
|
||||
const { ctx, app } = this;
|
||||
const { Op } = app.Sequelize;
|
||||
|
||||
if (!orderId || !warehouseId) {
|
||||
return;
|
||||
}
|
||||
|
||||
const pickingModel = ctx.model.Picking;
|
||||
const storageModel = ctx.model.Storage;
|
||||
const stockModel = ctx.model.StockWarehouse;
|
||||
|
||||
if (!pickingModel || !storageModel || !stockModel) {
|
||||
ctx.logger.warn('[qimen order.cancel releaseStorageLockForCancel] 模型不可用,跳过库存释放');
|
||||
return;
|
||||
}
|
||||
|
||||
// 查找该订单的有效分配记录
|
||||
const pickingRows = await pickingModel.findAll({
|
||||
where: {
|
||||
order_id: orderId,
|
||||
status: { [Op.ne]: 'cancel' },
|
||||
},
|
||||
transaction,
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
raw: true,
|
||||
});
|
||||
|
||||
if (!Array.isArray(pickingRows) || pickingRows.length === 0) {
|
||||
// 无储位分配记录:从订单明细获取锁定信息,只释放 stock_warehouse 锁
|
||||
const orderItemsModel = await ctx.model.OrderItemsFactory.getCurrentModel(warehouseId);
|
||||
if (!orderItemsModel) {
|
||||
ctx.logger.warn('[qimen order.cancel releaseStorageLockForCancel] OrderItems 模型不可用,跳过库存释放');
|
||||
return;
|
||||
}
|
||||
|
||||
const orderItems = await orderItemsModel.findAll({
|
||||
where: { order_id: orderId },
|
||||
attributes: [ 'stock_id', 'plan_qty' ],
|
||||
raw: true,
|
||||
transaction,
|
||||
});
|
||||
|
||||
for (const item of orderItems) {
|
||||
const stockId = Number(item.stock_id || 0);
|
||||
const qty = Number(item.plan_qty || 0);
|
||||
if (stockId <= 0 || qty <= 0) continue;
|
||||
|
||||
await stockModel.update(
|
||||
{
|
||||
locked_quantity: app.Sequelize.literal(`locked_quantity - ${qty}`),
|
||||
updated_at: app.Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
},
|
||||
{
|
||||
where: { id: stockId, locked_quantity: { [Op.gte]: qty } },
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// 按 storage_id 汇总释放数量
|
||||
const storageQuantityMap = new Map();
|
||||
for (const row of pickingRows) {
|
||||
const storageId = Number(row.storage_id || 0);
|
||||
const quantity = Number(row.quantity || 0);
|
||||
if (storageId > 0 && quantity > 0) {
|
||||
storageQuantityMap.set(storageId, (storageQuantityMap.get(storageId) || 0) + quantity);
|
||||
}
|
||||
}
|
||||
|
||||
if (storageQuantityMap.size === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
// 查出关联的 wms_storage 记录,获取 stock_id
|
||||
const storageIds = Array.from(storageQuantityMap.keys());
|
||||
const storageRows = await storageModel.findAll({
|
||||
where: {
|
||||
id: { [Op.in]: storageIds },
|
||||
},
|
||||
transaction,
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
raw: true,
|
||||
});
|
||||
|
||||
const storageMap = new Map();
|
||||
for (const row of storageRows) {
|
||||
storageMap.set(Number(row.id), row);
|
||||
}
|
||||
|
||||
// 依次释放 wms_storage 与 wms_stock_warehouse 锁定数量
|
||||
for (const [ storageId, quantity ] of storageQuantityMap.entries()) {
|
||||
const storageRow = storageMap.get(storageId);
|
||||
if (!storageRow) {
|
||||
ctx.logger.warn(`[qimen order.cancel] 库存记录不存在,跳过: storageId=${storageId}`);
|
||||
continue;
|
||||
}
|
||||
|
||||
const stockId = Number(storageRow.stock_id || 0);
|
||||
if (stockId <= 0) {
|
||||
ctx.logger.warn(`[qimen order.cancel] 库存记录缺少 stock_id,跳过: storageId=${storageId}`);
|
||||
continue;
|
||||
}
|
||||
|
||||
// 释放 wms_storage.locked_quantity
|
||||
await ctx.service.systems.storage.index.unlockQuantity(storageId, quantity, { transaction });
|
||||
|
||||
// 释放 wms_stock_warehouse.locked_quantity
|
||||
const decrementResult = await stockModel.update(
|
||||
{
|
||||
locked_quantity: app.Sequelize.literal(`locked_quantity - ${Number(quantity)}`),
|
||||
updated_at: app.Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
},
|
||||
{
|
||||
where: {
|
||||
id: stockId,
|
||||
locked_quantity: { [Op.gte]: Number(quantity) },
|
||||
},
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
|
||||
if (!Array.isArray(decrementResult) || Number(decrementResult[0] || 0) <= 0) {
|
||||
throw new Error(`库存主记录锁定数量不足,无法释放: stockId=${stockId}, quantity=${quantity}`);
|
||||
}
|
||||
}
|
||||
|
||||
// 删除已释放的分配记录
|
||||
const pickingIds = pickingRows
|
||||
.map(row => Number(row.id || 0))
|
||||
.filter(id => id > 0);
|
||||
|
||||
if (pickingIds.length > 0) {
|
||||
await pickingModel.destroy({
|
||||
where: {
|
||||
id: { [Op.in]: pickingIds },
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async pending(data) {
|
||||
const orderType = this.orderType[data.request.orderType];
|
||||
switch (orderType.method) {
|
||||
|
||||
168
app/service/systemMethods/comboGoods.js
Normal file
168
app/service/systemMethods/comboGoods.js
Normal file
@ -0,0 +1,168 @@
|
||||
'use strict';
|
||||
|
||||
const MainService = require('../main');
|
||||
|
||||
/**
|
||||
* 将输入值转换为有限数字。
|
||||
*
|
||||
* @param {unknown} value 待转换的值。
|
||||
* @param {number} [defaultValue=0] 默认值。
|
||||
* @return {number} 转换后的数字。
|
||||
*/
|
||||
function toNumber(value, defaultValue = 0) {
|
||||
const normalized = Number(value);
|
||||
return Number.isFinite(normalized) ? normalized : defaultValue;
|
||||
}
|
||||
|
||||
/**
|
||||
* 系统方法层:comboGoods(组合商品接口包装层)。
|
||||
* 负责参数解构、权限校验出口与统一成功/失败包装。
|
||||
*/
|
||||
class ComboGoodsMethodService extends MainService {
|
||||
constructor(ctx) {
|
||||
super(ctx);
|
||||
const _noNeedLogin = '';
|
||||
const _noNeedRight = '';
|
||||
const _noNeedLog = '';
|
||||
const _noNeedAuth = 'list,search';
|
||||
this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth);
|
||||
}
|
||||
|
||||
/**
|
||||
* 组合商品列表查询(分页)。
|
||||
*
|
||||
* @param {Object} data 请求参数。
|
||||
* @param {Object} [data.pagination] 分页参数 {page, pageSize}。
|
||||
* @param {Object} [data.where] 筛选条件 {combo_code, combo_name, status, warehouse_id}。
|
||||
* @return {Promise<Object>} 统一 success 包装的分页列表。
|
||||
*/
|
||||
async list(data = {}) {
|
||||
const { service } = this;
|
||||
const requestData = this.isPlainObject(data) ? data : {};
|
||||
const pagination = requestData.pagination || {};
|
||||
const where = requestData.where || {};
|
||||
|
||||
const result = await service.systems.comboGoods.list({
|
||||
page: toNumber(pagination.page, 1),
|
||||
pageSize: toNumber(pagination.pageSize, 20),
|
||||
combo_code: where.combo_code,
|
||||
combo_name: where.combo_name,
|
||||
status: where.status,
|
||||
warehouse_id: where.warehouse_id,
|
||||
});
|
||||
|
||||
return this.success('查询成功', result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建组合商品。
|
||||
*
|
||||
* @param {Object} data 请求参数。
|
||||
* @param {string} data.combo_code 组合商品编码。
|
||||
* @param {string} data.combo_name 组合商品名称。
|
||||
* @param {number} [data.warehouse_id] 仓库ID。
|
||||
* @param {string} [data.remark] 备注。
|
||||
* @param {string} [data.custom_code] 自定义编码。
|
||||
* @param {Object[]} data.items 子商品明细数组 [{item_goods_sku_id, item_quantity}]。
|
||||
* @return {Promise<Object>} 统一 success 包装的创建结果。
|
||||
*/
|
||||
async create(data = {}) {
|
||||
const { ctx, service } = this;
|
||||
const requestData = this.isPlainObject(data) ? data : {};
|
||||
|
||||
try {
|
||||
const result = await service.systems.comboGoods.create({
|
||||
combo_code: requestData.combo_code,
|
||||
combo_name: requestData.combo_name,
|
||||
warehouse_id: requestData.warehouse_id,
|
||||
remark: requestData.remark,
|
||||
custom_code: requestData.custom_code,
|
||||
items: requestData.items,
|
||||
creator_id: ctx.user?.id,
|
||||
});
|
||||
|
||||
return this.success('创建成功', result);
|
||||
} catch (error) {
|
||||
return this.fail(error.message || '创建失败');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑组合商品。
|
||||
*
|
||||
* @param {Object} data 请求参数。
|
||||
* @param {number} data.id 组合商品ID(必填)。
|
||||
* @param {string} [data.combo_name] 组合商品名称。
|
||||
* @param {number} [data.warehouse_id] 仓库ID。
|
||||
* @param {string} [data.remark] 备注。
|
||||
* @param {string} [data.custom_code] 自定义编码。
|
||||
* @param {number} [data.status] 状态 1-启用 0-停用。
|
||||
* @param {Object[]} [data.items] 子商品明细数组。
|
||||
* @return {Promise<Object>} 统一 success 包装的编辑结果。
|
||||
*/
|
||||
async update(data = {}) {
|
||||
const { ctx, service } = this;
|
||||
const requestData = this.isPlainObject(data) ? data : {};
|
||||
|
||||
try {
|
||||
const result = await service.systems.comboGoods.update({
|
||||
id: requestData.id,
|
||||
combo_name: requestData.combo_name,
|
||||
warehouse_id: requestData.warehouse_id,
|
||||
remark: requestData.remark,
|
||||
custom_code: requestData.custom_code,
|
||||
status: requestData.status,
|
||||
items: requestData.items,
|
||||
editor_id: ctx.user?.id,
|
||||
});
|
||||
|
||||
return this.success('编辑成功', result);
|
||||
} catch (error) {
|
||||
return this.fail(error.message || '编辑失败');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除组合商品(软删除)。
|
||||
*
|
||||
* @param {Object} data 请求参数。
|
||||
* @param {number} data.id 组合商品ID。
|
||||
* @return {Promise<Object>} 统一 success 包装的删除结果。
|
||||
*/
|
||||
async delete(data = {}) {
|
||||
const { service } = this;
|
||||
const requestData = this.isPlainObject(data) ? data : {};
|
||||
|
||||
try {
|
||||
const result = await service.systems.comboGoods.delete({
|
||||
id: requestData.id,
|
||||
});
|
||||
|
||||
return this.success('删除成功', result);
|
||||
} catch (error) {
|
||||
return this.fail(error.message || '删除失败');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 关键字搜索组合商品。
|
||||
*
|
||||
* @param {Object} data 请求参数。
|
||||
* @param {string} data.keyword 搜索关键字。
|
||||
* @param {number} [data.limit=20] 最大返回条数。
|
||||
* @return {Promise<Object>} 统一 success 包装的搜索结果。
|
||||
*/
|
||||
async search(data = {}) {
|
||||
const { service } = this;
|
||||
const requestData = this.isPlainObject(data) ? data : {};
|
||||
|
||||
const result = await service.systems.comboGoods.search({
|
||||
keyword: requestData.keyword,
|
||||
limit: requestData.limit,
|
||||
});
|
||||
|
||||
return this.success('搜索成功', result);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = ComboGoodsMethodService;
|
||||
@ -30,6 +30,8 @@ class OrderIndexService extends OrderBaseService {
|
||||
* @param {string} [data.tableType] 导出表类型(驼峰写法)。
|
||||
* @param {string} [data.module] 订单模块名(可选)。
|
||||
* @param {string} [data.module_name] 订单模块名(下划线写法)。
|
||||
* @param {string} [data.export_mode] 导出模式:waybill(默认,按运单展开)或 item(按商品明细展开)。
|
||||
* @param {string} [data.exportMode] 导出模式(驼峰写法)。
|
||||
* @param {Object} [data.where] 查询条件。
|
||||
* @param {Object} [data.sort] 排序参数。
|
||||
* @return {Promise<Object>} 统一成功包装响应。
|
||||
@ -41,6 +43,8 @@ class OrderIndexService extends OrderBaseService {
|
||||
tableType: tableTypeCamel,
|
||||
module: moduleName,
|
||||
module_name: moduleNameSnake,
|
||||
export_mode: exportModeSnake,
|
||||
exportMode: exportModeCamel,
|
||||
where,
|
||||
sort,
|
||||
} = requestData;
|
||||
@ -73,9 +77,11 @@ class OrderIndexService extends OrderBaseService {
|
||||
error: '',
|
||||
});
|
||||
|
||||
const exportMode = exportModeSnake || exportModeCamel || '';
|
||||
const result = await this.service.systems.orderExport.exportOrders({
|
||||
tableType,
|
||||
moduleName: module,
|
||||
export_mode: exportMode,
|
||||
where: this.isPlainObject(where) ? { ...where } : {},
|
||||
sort: this.isPlainObject(sort) ? { ...sort } : {},
|
||||
onProgress: async progress => {
|
||||
@ -525,7 +531,7 @@ class OrderIndexService extends OrderBaseService {
|
||||
*
|
||||
* @param {Object} data 请求体。
|
||||
* @param {string} data.waybill_code 运单号。
|
||||
* @param {string} data.package_material_code 包材编码。
|
||||
* @param {number|string} data.package_material_id 包材ID。
|
||||
* @return {Promise<Object>} 统一成功/失败结构。
|
||||
* 单条绑定:data 含 {order_id, waybill_code, package_material_id, package_material_name_snapshot, package_material_code};
|
||||
* 团购批量绑定:data 含 {wave_id, wave_no, business_key, order_id, waybill_code, package_material_id, package_material_code, package_material_name_snapshot, bind_count, bound_waybills, store_name, sys_logistics_name}。
|
||||
@ -534,13 +540,13 @@ class OrderIndexService extends OrderBaseService {
|
||||
const requestData = this.isPlainObject(data) ? data : {};
|
||||
const {
|
||||
waybill_code: waybillCode = '',
|
||||
package_material_code: packageMaterialCode = '',
|
||||
package_material_id: packageMaterialId = '',
|
||||
} = requestData;
|
||||
|
||||
try {
|
||||
const result = await this.service.systems.orderExpress.bindExpressPackageMaterialByWaybill({
|
||||
waybillCode,
|
||||
packageMaterialCode,
|
||||
packageMaterialId,
|
||||
});
|
||||
|
||||
return this.success('ok', {
|
||||
|
||||
@ -566,12 +566,98 @@ class PendingOrderService extends OrderBaseService {
|
||||
});
|
||||
const orderItemImagesByStockId = await this.getOrderItemImagesByStockIds(orderItems);
|
||||
const orderItemsWithImages = this.attachImagesToOrderItems(orderItems, orderItemImagesByStockId);
|
||||
|
||||
// 收集订单明细中的 stock_id,用于查询商品库存主表信息
|
||||
const stockIds = [ ...new Set(
|
||||
orderItems.map(item => Number(item && item.stock_id)).filter(Boolean)
|
||||
) ];
|
||||
const stockMap = new Map();
|
||||
if (stockIds.length > 0) {
|
||||
const StockWarehouse = this.ctx.model.StockWarehouse;
|
||||
if (StockWarehouse) {
|
||||
const stockWarehouseRows = await StockWarehouse.findAll({
|
||||
where: {
|
||||
id: { [this.app.Sequelize.Op.in]: stockIds },
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
raw: true,
|
||||
});
|
||||
for (const row of stockWarehouseRows) {
|
||||
stockMap.set(row.id, row);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 构建 order_item_id → orderItem 的快速查找映射
|
||||
const orderItemMap = new Map();
|
||||
for (const item of orderItems) {
|
||||
orderItemMap.set(item.id, item);
|
||||
}
|
||||
|
||||
// 查询已分配的储位信息(排除已取消的分配记录)
|
||||
const orderItemIds = orderItems.map(item => item.id).filter(Boolean);
|
||||
const pickingMap = new Map();
|
||||
const storageItems = [];
|
||||
if (orderItemIds.length > 0) {
|
||||
const { Op } = this.app.Sequelize;
|
||||
const pickingModel = this.ctx.model.Picking;
|
||||
if (pickingModel) {
|
||||
const pickingRows = await pickingModel.findAll({
|
||||
where: {
|
||||
order_item_id: { [Op.in]: orderItemIds },
|
||||
status: { [Op.ne]: 'cancel' },
|
||||
},
|
||||
raw: true,
|
||||
});
|
||||
for (const row of pickingRows) {
|
||||
const key = row.order_item_id;
|
||||
if (!pickingMap.has(key)) {
|
||||
pickingMap.set(key, []);
|
||||
}
|
||||
pickingMap.get(key).push({
|
||||
space_id: row.space_id,
|
||||
space_name: row.space_name,
|
||||
storage_id: row.storage_id,
|
||||
quantity: row.quantity,
|
||||
status: row.status,
|
||||
});
|
||||
|
||||
// 按库位维度平铺 picking 记录,并附带商品库存信息
|
||||
const orderItem = orderItemMap.get(row.order_item_id);
|
||||
if (orderItem) {
|
||||
const stockId = Number(orderItem.stock_id || 0);
|
||||
const stockWarehouse = stockMap.get(stockId);
|
||||
if (stockWarehouse) {
|
||||
storageItems.push({
|
||||
order_item_id: row.order_item_id,
|
||||
space_id: row.space_id,
|
||||
space_name: row.space_name,
|
||||
storage_id: row.storage_id,
|
||||
quantity: row.quantity,
|
||||
status: row.status,
|
||||
stock_id: stockId,
|
||||
item_code: stockWarehouse.item_code,
|
||||
item_name: stockWarehouse.item_name,
|
||||
sku_property: stockWarehouse.sku_property,
|
||||
stock_unit: stockWarehouse.stock_unit,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
const orderItemsWithPicking = orderItemsWithImages.map(item => ({
|
||||
...item,
|
||||
picking_locations: pickingMap.get(item.id) || [],
|
||||
}));
|
||||
|
||||
const expresses = await this.getOrderExpressesByOrderId(orderId, order);
|
||||
|
||||
return {
|
||||
detail: order,
|
||||
items: orderItemsWithImages,
|
||||
items: orderItemsWithPicking,
|
||||
expresses,
|
||||
storage_items: storageItems,
|
||||
};
|
||||
}
|
||||
|
||||
@ -1712,6 +1798,12 @@ class PendingOrderService extends OrderBaseService {
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
await this.ctx.service.systemMethods.order.wave.deleteOrderWaveIndexByOrderIds({
|
||||
warehouseId,
|
||||
orderIds: waveOrderIds,
|
||||
transaction: undefined,
|
||||
});
|
||||
}
|
||||
|
||||
if (WaveBatch) {
|
||||
@ -1794,6 +1886,16 @@ class PendingOrderService extends OrderBaseService {
|
||||
this.ctx.logger.warn('[PendingOrderService.cancelOrder] 释放储位分配失败,不影响订单取消', allocErr);
|
||||
}
|
||||
|
||||
// 释放创建锁(lockItemStorages 加的锁,不含 picking 锁)
|
||||
try {
|
||||
await this.releaseCreationLockForCancel({
|
||||
orderIds,
|
||||
warehouseId,
|
||||
});
|
||||
} catch (releaseErr) {
|
||||
this.ctx.logger.warn('[PendingOrderService.cancelOrder] 释放创建锁失败,不影响订单取消', releaseErr);
|
||||
}
|
||||
|
||||
const updatedOrders = await model.findAll({
|
||||
where,
|
||||
raw: true,
|
||||
@ -2733,6 +2835,7 @@ class PendingOrderService extends OrderBaseService {
|
||||
const columns = [
|
||||
// 必填
|
||||
{ header: '*订单号', key: 'delivery_order_code', width: 24 },
|
||||
{ header: '店铺名称', key: 'shop_nick', width: 20 },
|
||||
{ header: '*收件人姓名', key: 'name', width: 16 },
|
||||
{ header: '*手机号(mobile/tel至少填一项)', key: 'mobile', width: 28 },
|
||||
{ header: '*详细地址', key: 'detail_address', width: 36 },
|
||||
@ -2757,7 +2860,6 @@ class PendingOrderService extends OrderBaseService {
|
||||
{ header: '商品名称', key: 'item_name', width: 24 },
|
||||
{ header: '行号', key: 'order_line_no', width: 10 },
|
||||
{ header: '实际价格', key: 'actual_price', width: 12 },
|
||||
{ header: '店铺名称', key: 'shop_nick', width: 20 },
|
||||
];
|
||||
|
||||
sheet.columns = columns;
|
||||
@ -5071,7 +5173,7 @@ class PendingOrderService extends OrderBaseService {
|
||||
&& contractConfig.policy_config
|
||||
&& contractConfig.policy_config.auto_sync_back === 1
|
||||
) {
|
||||
this.syncOrderIds({ orderIds: [orderId] }).catch(err => {
|
||||
this.syncOrderIds({ orderIds: [ orderId ] }).catch(err => {
|
||||
this.ctx.logger.error(
|
||||
`[auto_sync_back] manualWaybill 自动同步失败: ${err.message}`
|
||||
);
|
||||
@ -5094,6 +5196,170 @@ class PendingOrderService extends OrderBaseService {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 取消订单时释放创建锁(lockItemStorages 添加的 wms_stock_warehouse.locked_quantity)。
|
||||
*
|
||||
* - 有 wms_picking 有效记录时:通过 storage_id → stock_id 映射汇总各 stock_id 的 picking 数量,
|
||||
* 释放对应 wms_stock_warehouse.locked_quantity。
|
||||
* - 无 wms_picking 记录时:从 wms_order_items 读取 plan_qty,
|
||||
* 释放对应 wms_stock_warehouse.locked_quantity。
|
||||
*
|
||||
* @param {Object} options - 释放参数。
|
||||
* @param {number[]} options.orderIds - 订单ID 数组。
|
||||
* @param {number} options.warehouseId - 仓库ID。
|
||||
* @return {Promise<void>}
|
||||
*/
|
||||
async releaseCreationLockForCancel({ orderIds, warehouseId } = {}) {
|
||||
const { ctx, app } = this;
|
||||
const { Op } = app.Sequelize;
|
||||
|
||||
if (!Array.isArray(orderIds) || orderIds.length === 0 || !warehouseId) {
|
||||
return;
|
||||
}
|
||||
|
||||
const pickingModel = ctx.model.Picking;
|
||||
const storageModel = ctx.model.Storage;
|
||||
const stockModel = ctx.model.StockWarehouse;
|
||||
|
||||
if (!pickingModel || !storageModel || !stockModel) {
|
||||
ctx.logger.warn('[PendingOrderService.releaseCreationLockForCancel] 模型不可用,跳过库存释放');
|
||||
return;
|
||||
}
|
||||
|
||||
const transaction = await ctx.model.transaction();
|
||||
|
||||
try {
|
||||
// 查找这些订单的有效储位分配记录(排除已取消的)
|
||||
const pickingRows = await pickingModel.findAll({
|
||||
where: {
|
||||
order_id: { [Op.in]: orderIds },
|
||||
warehouse_id: warehouseId,
|
||||
status: { [Op.ne]: 'cancel' },
|
||||
},
|
||||
transaction,
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
raw: true,
|
||||
});
|
||||
|
||||
if (!Array.isArray(pickingRows) || pickingRows.length === 0) {
|
||||
// 无储位分配记录:从订单明细获取锁定信息,只释放 stock_warehouse 锁
|
||||
const orderItemsModel = await ctx.model.OrderItemsFactory.getCurrentModel(warehouseId);
|
||||
if (!orderItemsModel) {
|
||||
ctx.logger.warn('[PendingOrderService.releaseCreationLockForCancel] OrderItems 模型不可用,跳过库存释放');
|
||||
await transaction.rollback();
|
||||
return;
|
||||
}
|
||||
|
||||
const orderItems = await orderItemsModel.findAll({
|
||||
where: { order_id: { [Op.in]: orderIds } },
|
||||
attributes: [ 'stock_id', 'plan_qty' ],
|
||||
raw: true,
|
||||
transaction,
|
||||
});
|
||||
|
||||
for (const item of orderItems) {
|
||||
const stockId = Number(item.stock_id || 0);
|
||||
const qty = Number(item.plan_qty || 0);
|
||||
if (stockId <= 0 || qty <= 0) continue;
|
||||
|
||||
await stockModel.update(
|
||||
{
|
||||
locked_quantity: app.Sequelize.literal(`locked_quantity - ${qty}`),
|
||||
updated_at: app.Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
},
|
||||
{
|
||||
where: { id: stockId, locked_quantity: { [Op.gte]: qty } },
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
await transaction.commit();
|
||||
return;
|
||||
}
|
||||
|
||||
// 有 picking 记录:按 storage_id 汇总释放数量
|
||||
const storageQuantityMap = new Map();
|
||||
for (const row of pickingRows) {
|
||||
const storageId = Number(row.storage_id || 0);
|
||||
const quantity = Number(row.quantity || 0);
|
||||
if (storageId > 0 && quantity > 0) {
|
||||
storageQuantityMap.set(storageId, (storageQuantityMap.get(storageId) || 0) + quantity);
|
||||
}
|
||||
}
|
||||
|
||||
if (storageQuantityMap.size === 0) {
|
||||
await transaction.commit();
|
||||
return;
|
||||
}
|
||||
|
||||
// 查出关联的 wms_storage 记录,获取 stock_id
|
||||
const storageIds = Array.from(storageQuantityMap.keys());
|
||||
const storageRows = await storageModel.findAll({
|
||||
where: {
|
||||
id: { [Op.in]: storageIds },
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
transaction,
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
raw: true,
|
||||
});
|
||||
|
||||
const storageMap = new Map();
|
||||
for (const row of storageRows) {
|
||||
storageMap.set(Number(row.id), row);
|
||||
}
|
||||
|
||||
// 按 stock_id 汇总需要释放的数量
|
||||
const stockReleaseMap = new Map();
|
||||
for (const [ storageId, quantity ] of storageQuantityMap.entries()) {
|
||||
const storageRow = storageMap.get(storageId);
|
||||
if (!storageRow) {
|
||||
ctx.logger.warn(`[PendingOrderService.releaseCreationLockForCancel] 库存记录不存在,跳过: storageId=${storageId}`);
|
||||
continue;
|
||||
}
|
||||
|
||||
const stockId = Number(storageRow.stock_id || 0);
|
||||
if (stockId <= 0) {
|
||||
ctx.logger.warn(`[PendingOrderService.releaseCreationLockForCancel] 库存记录缺少 stock_id,跳过: storageId=${storageId}`);
|
||||
continue;
|
||||
}
|
||||
|
||||
stockReleaseMap.set(stockId, (stockReleaseMap.get(stockId) || 0) + quantity);
|
||||
}
|
||||
|
||||
// 释放 wms_stock_warehouse.locked_quantity
|
||||
for (const [ stockId, quantity ] of stockReleaseMap.entries()) {
|
||||
const decrementResult = await stockModel.update(
|
||||
{
|
||||
locked_quantity: app.Sequelize.literal(`locked_quantity - ${Number(quantity)}`),
|
||||
updated_at: app.Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
},
|
||||
{
|
||||
where: {
|
||||
id: stockId,
|
||||
locked_quantity: { [Op.gte]: Number(quantity) },
|
||||
},
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
|
||||
if (!Array.isArray(decrementResult) || Number(decrementResult[0] || 0) <= 0) {
|
||||
throw new Error(`库存主记录锁定数量不足,无法释放: stockId=${stockId}, quantity=${quantity}`);
|
||||
}
|
||||
}
|
||||
|
||||
await transaction.commit();
|
||||
} catch (error) {
|
||||
try {
|
||||
await transaction.rollback();
|
||||
} catch (rollbackError) {
|
||||
ctx.logger.error('[PendingOrderService.releaseCreationLockForCancel] 回滚失败', rollbackError);
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
module.exports = PendingOrderService;
|
||||
|
||||
@ -27,7 +27,9 @@ class RecheckOrderService extends OrderBaseService {
|
||||
* 顶层携带 picker_id、picker_name、task_id
|
||||
* - 车号匹配(散单模式 pick_mode=2/3/4):查询任务关联的所有波次,逐波次构建扫描视图后合并,
|
||||
* 返回 list_type='single',按 order_id 去重,未复核订单排前,顶层携带汇总字段
|
||||
* - 运单号命中但订单无波次信息时,退回单订单详情模式(list 每项含 detail/items/expresses/logs)
|
||||
* - 运单号命中但订单无波次信息时,退回单订单详情模式(list 每项含 detail/items/expresses/logs、
|
||||
* items_weight、suggested_package_material)
|
||||
* - 所有模式的 list[] 每项均附带 items_weight(订单商品总重量)与 suggested_package_material(推荐包材信息,无推荐时为 null)
|
||||
* @param {Object} data 请求体。
|
||||
* @param {string} [data.keyword] 通用扫描关键词。
|
||||
* @param {string} [data.value] 通用扫描关键词别名。
|
||||
@ -38,7 +40,8 @@ class RecheckOrderService extends OrderBaseService {
|
||||
* @param {string} [data.waveNo] 波次号别名。
|
||||
* @param {string} [data.cart_code] 车号。
|
||||
* @param {string} [data.cartCode] 车号别名。
|
||||
* @return {Promise<Object>} 扫描结果,包含 match_type、list_type、picker_id、picker_name、task_id(散单/团单均有)与 list 数组。
|
||||
* @return {Promise<Object>} 扫描结果,包含 match_type、list_type、picker_id、picker_name、task_id(散单/团单均有)与 list 数组,
|
||||
* list 每项含 items_weight、suggested_package_material。
|
||||
*/
|
||||
async scanOrder(data = {}) {
|
||||
const warehouseId = this.getWarehouseId();
|
||||
@ -85,15 +88,24 @@ class RecheckOrderService extends OrderBaseService {
|
||||
// 找不到拣货任务时退回单订单详情模式
|
||||
this.assertOrderCanRecheck(order);
|
||||
const detailResult = await this.detail({ id: orderId });
|
||||
const fallbackOrder = detailResult.detail || {};
|
||||
const fallbackPackageMap = await this.batchQueryPackageMaterialRecommendation(
|
||||
[{ items_hash: fallbackOrder.items_hash, items_crc: fallbackOrder.items_crc }],
|
||||
warehouseId
|
||||
);
|
||||
const fallbackItemHash = String(fallbackOrder.items_hash || '').trim();
|
||||
return {
|
||||
match_type: matchType,
|
||||
list_type: 'single',
|
||||
waybill_no: keyword,
|
||||
list: [{
|
||||
...(detailResult.detail || {}),
|
||||
...fallbackOrder,
|
||||
items: Array.isArray(detailResult.items) ? detailResult.items : [],
|
||||
expresses: Array.isArray(detailResult.expresses) ? detailResult.expresses : [],
|
||||
logs: Array.isArray(detailResult.logs) ? detailResult.logs : [],
|
||||
suggested_package_material: fallbackItemHash
|
||||
? (fallbackPackageMap.get(fallbackItemHash) || null)
|
||||
: null,
|
||||
}],
|
||||
};
|
||||
}
|
||||
@ -118,15 +130,24 @@ class RecheckOrderService extends OrderBaseService {
|
||||
// 无波次信息时退回单订单模式
|
||||
this.assertOrderCanRecheck(order);
|
||||
const detailResult = await this.detail({ id: orderId });
|
||||
const noWaveOrder = detailResult.detail || {};
|
||||
const noWavePackageMap = await this.batchQueryPackageMaterialRecommendation(
|
||||
[{ items_hash: noWaveOrder.items_hash, items_crc: noWaveOrder.items_crc }],
|
||||
warehouseId
|
||||
);
|
||||
const noWaveItemHash = String(noWaveOrder.items_hash || '').trim();
|
||||
return {
|
||||
match_type: matchType,
|
||||
list_type: 'single',
|
||||
waybill_no: keyword,
|
||||
list: [{
|
||||
...(detailResult.detail || {}),
|
||||
...noWaveOrder,
|
||||
items: Array.isArray(detailResult.items) ? detailResult.items : [],
|
||||
expresses: Array.isArray(detailResult.expresses) ? detailResult.expresses : [],
|
||||
logs: Array.isArray(detailResult.logs) ? detailResult.logs : [],
|
||||
suggested_package_material: noWaveItemHash
|
||||
? (noWavePackageMap.get(noWaveItemHash) || null)
|
||||
: null,
|
||||
}],
|
||||
};
|
||||
}
|
||||
@ -459,7 +480,9 @@ class RecheckOrderService extends OrderBaseService {
|
||||
* @param {string} waveNo 波次号。
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @return {Promise<Object|null>} 扁平化扫描视图,包含 picker_id、picker_name、task_id、wave_id、wave_no、
|
||||
* wave_type、pick_mode、strategy_id、strategy_name、total_orders、reviewed_count、unreviewed_count、list。
|
||||
* wave_type、pick_mode、strategy_id、strategy_name、total_orders、reviewed_count、unreviewed_count、
|
||||
* printed_count、unprinted_count、list。
|
||||
* list 中每项额外包含 items_weight(订单商品总重量)与 suggested_package_material(推荐包材信息,无推荐时为 null)。
|
||||
*/
|
||||
async buildSingleWaveScanView(waveId, waveNo, warehouseId) {
|
||||
const baseWaveView = await this.buildSingleWaveView(waveId, waveNo, warehouseId);
|
||||
@ -490,6 +513,19 @@ class RecheckOrderService extends OrderBaseService {
|
||||
const printedCount = orders.filter(o => o.is_printed === true).length;
|
||||
const unprintedCount = orders.length - printedCount;
|
||||
|
||||
// 批量查询包材推荐
|
||||
const packageMaterialMap = await this.batchQueryPackageMaterialRecommendation(orders, warehouseId);
|
||||
|
||||
// 为每个订单附加 items_weight 和包材推荐
|
||||
const enrichedOrders = orders.map(order => {
|
||||
const itemsHash = String(order.items_hash || '').trim();
|
||||
return {
|
||||
...order,
|
||||
items_weight: order.items_weight != null ? Number(order.items_weight) : 0,
|
||||
suggested_package_material: itemsHash ? (packageMaterialMap.get(itemsHash) || null) : null,
|
||||
};
|
||||
});
|
||||
|
||||
return {
|
||||
picker_id: pickerInfo.picker_id,
|
||||
picker_name: pickerInfo.picker_name,
|
||||
@ -505,7 +541,7 @@ class RecheckOrderService extends OrderBaseService {
|
||||
unreviewed_count: unreviewedCount,
|
||||
printed_count: printedCount,
|
||||
unprinted_count: unprintedCount,
|
||||
list: orders,
|
||||
list: enrichedOrders,
|
||||
};
|
||||
}
|
||||
|
||||
@ -616,7 +652,10 @@ class RecheckOrderService extends OrderBaseService {
|
||||
* order_count、box_no、reviewed_count、unreviewed_count、printed_count、unprinted_count、
|
||||
* stocks(非拦截订单合并后的商品明细)、
|
||||
* intercepted(拦截订单列表,仅当波次中存在拦截订单时出现,每项含 wave_index、order_id、
|
||||
* delivery_order_code、intercept_status 等字段)。
|
||||
* delivery_order_code、intercept_status 等字段)、
|
||||
* items_weight(订单商品总重量,取自波次内首个正常订单)、
|
||||
* suggested_package_material(推荐包材信息,无推荐时为 null)、
|
||||
* first_waybill_no(波次内首个正常订单的运单号,用于包材绑定等后续操作,无正常订单时为第一个订单的运单号,均无则为空字符串)。
|
||||
*/
|
||||
async buildGroupWaveList(taskId, warehouseId) {
|
||||
const { ctx } = this;
|
||||
@ -760,12 +799,46 @@ class RecheckOrderService extends OrderBaseService {
|
||||
result.intercepted = intercepted;
|
||||
}
|
||||
|
||||
// 团购波次内所有订单商品结构一致,暂存样本订单的商品指纹信息用于后续批量查询包材推荐
|
||||
result._sample_hash = sampleOrder ? String(sampleOrder.items_hash || '').trim() : '';
|
||||
result._sample_crc = sampleOrder ? Number(sampleOrder.items_crc || 0) : 0;
|
||||
result.items_weight = sampleOrder ? Number(sampleOrder.items_weight || 0) : 0;
|
||||
result.suggested_package_material = null;
|
||||
|
||||
// 波次内首个订单的运单号,用于包材绑定等后续操作
|
||||
// 优先取首个正常订单的运单号,若无正常订单则取首个订单(含拦截)的运单号,均无则为空字符串
|
||||
const firstNonIntercepted = normalOrders.length > 0 ? normalOrders[0] : null;
|
||||
const firstAnyOrder = orders.length > 0 ? orders[0] : null;
|
||||
const firstOrderForWaybill = firstNonIntercepted || firstAnyOrder;
|
||||
result.first_waybill_no = firstOrderForWaybill
|
||||
? String(firstOrderForWaybill.waybill_no || '').trim()
|
||||
: '';
|
||||
|
||||
return result;
|
||||
});
|
||||
|
||||
const waveViews = await Promise.all(waveViewPromises);
|
||||
const waveViews = (await Promise.all(waveViewPromises)).filter(view => view !== null);
|
||||
|
||||
return waveViews.filter(view => view !== null);
|
||||
// 批量查询所有波次的包材推荐
|
||||
if (waveViews.length > 0) {
|
||||
const sampleOrdersForPackageQuery = waveViews
|
||||
.filter(wv => wv._sample_hash)
|
||||
.map(wv => ({ items_hash: wv._sample_hash, items_crc: wv._sample_crc }));
|
||||
const packageMaterialMap = await this.batchQueryPackageMaterialRecommendation(
|
||||
sampleOrdersForPackageQuery,
|
||||
warehouseId
|
||||
);
|
||||
for (const wv of waveViews) {
|
||||
if (wv._sample_hash) {
|
||||
wv.suggested_package_material = packageMaterialMap.get(wv._sample_hash) || null;
|
||||
}
|
||||
// 清理内部临时字段
|
||||
delete wv._sample_hash;
|
||||
delete wv._sample_crc;
|
||||
}
|
||||
}
|
||||
|
||||
return waveViews;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -894,7 +967,7 @@ class RecheckOrderService extends OrderBaseService {
|
||||
* @return {Promise<Array<Object>>} 订单基本信息列表,每项含 order_id、delivery_order_code、
|
||||
* waybill_no、pick_status、is_printed、is_reviewed、shop_nick、items_count、
|
||||
* wave_index、recheck_status、wave_id、wave_no、order_type、status、
|
||||
* logistics_name、store_remark、intercept_status、stock 等字段。
|
||||
* logistics_name、store_remark、intercept_status、items_weight、items_hash、items_crc、stock 等字段。
|
||||
*/
|
||||
async getWaveOrdersBasic(waveNo, warehouseId) {
|
||||
const normalizedWaveNo = String(waveNo || '').trim();
|
||||
@ -908,6 +981,7 @@ class RecheckOrderService extends OrderBaseService {
|
||||
where: {
|
||||
wave_no: normalizedWaveNo,
|
||||
warehouse_id: warehouseId,
|
||||
recheck_status: { [this.app.Sequelize.Op.ne]: 'fin' },
|
||||
},
|
||||
attributes: [
|
||||
'id',
|
||||
@ -925,6 +999,9 @@ class RecheckOrderService extends OrderBaseService {
|
||||
'print_status',
|
||||
'store_id',
|
||||
'intercept_status',
|
||||
'items_weight',
|
||||
'items_hash',
|
||||
'items_crc',
|
||||
],
|
||||
order: [[ 'id', 'ASC' ]],
|
||||
raw: true,
|
||||
@ -1045,6 +1122,9 @@ class RecheckOrderService extends OrderBaseService {
|
||||
? storeRemarkMap.get(Number(row.store_id || 0))
|
||||
: '',
|
||||
intercept_status: String(row.intercept_status || '').trim(),
|
||||
items_weight: Number(row.items_weight || 0),
|
||||
items_hash: String(row.items_hash || '').trim(),
|
||||
items_crc: Number(row.items_crc || 0),
|
||||
};
|
||||
});
|
||||
|
||||
@ -1063,6 +1143,97 @@ class RecheckOrderService extends OrderBaseService {
|
||||
return enrichedList;
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量查询包材推荐信息。
|
||||
* 根据订单的 items_hash + items_crc 组合,从 wms_package_material_item_relation 表
|
||||
* 查询最匹配的包材推荐(按 bind_count 降序取 top-1)。
|
||||
* @param {Object[]} orderList 订单列表,每项需含 items_hash、items_crc 字段。
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @return {Promise<Map<string, Object|null>>} 以 items_hash 为键的包材推荐映射,
|
||||
* 值为包材信息对象或 null(无推荐时)。
|
||||
*/
|
||||
async batchQueryPackageMaterialRecommendation(orderList, warehouseId) {
|
||||
const resultMap = new Map();
|
||||
|
||||
if (!Array.isArray(orderList) || orderList.length === 0) {
|
||||
return resultMap;
|
||||
}
|
||||
|
||||
// 收集所有有效的 items_hash,并为每个 hash 记录对应的 items_crc
|
||||
const hashCrcMap = new Map();
|
||||
for (const order of orderList) {
|
||||
const hash = String(order.items_hash || '').trim();
|
||||
if (!hash) {
|
||||
continue;
|
||||
}
|
||||
const crc = Number(order.items_crc || 0);
|
||||
if (!hashCrcMap.has(hash)) {
|
||||
hashCrcMap.set(hash, crc);
|
||||
}
|
||||
}
|
||||
|
||||
if (hashCrcMap.size === 0) {
|
||||
return resultMap;
|
||||
}
|
||||
|
||||
const uniqueHashes = [ ...hashCrcMap.keys() ];
|
||||
const { ctx } = this;
|
||||
|
||||
if (!ctx.model || typeof ctx.model.query !== 'function') {
|
||||
return resultMap;
|
||||
}
|
||||
|
||||
// 批量查询所有匹配的包材绑定记录,按 bind_count 降序
|
||||
let relationRows = [];
|
||||
try {
|
||||
relationRows = await ctx.model.query(
|
||||
`SELECT * FROM wms_package_material_item_relation
|
||||
WHERE warehouse_id = :warehouseId
|
||||
AND items_hash IN (:uniqueHashes)
|
||||
AND is_active = 1
|
||||
AND delete_at IS NULL
|
||||
ORDER BY bind_count DESC`,
|
||||
{
|
||||
replacements: { warehouseId, uniqueHashes },
|
||||
type: ctx.model.QueryTypes.SELECT,
|
||||
}
|
||||
);
|
||||
} catch (e) {
|
||||
ctx.logger.warn(`[recheckOrder.batchQueryPackageMaterialRecommendation] 查询包材推荐失败, error=${e.message}`);
|
||||
return resultMap;
|
||||
}
|
||||
|
||||
const rows = Array.isArray(relationRows) ? relationRows : [];
|
||||
|
||||
// 为每个 items_hash 取第一条匹配记录(已按 bind_count DESC 排序,且 items_crc 匹配)
|
||||
for (const row of rows) {
|
||||
const hash = String(row.items_hash || '').trim();
|
||||
if (!hash || resultMap.has(hash)) {
|
||||
continue;
|
||||
}
|
||||
// 校验 items_crc 是否与订单一致
|
||||
const expectedCrc = hashCrcMap.get(hash);
|
||||
const rowCrc = Number(row.items_crc || 0);
|
||||
if (expectedCrc !== undefined && expectedCrc !== rowCrc) {
|
||||
continue;
|
||||
}
|
||||
resultMap.set(hash, {
|
||||
id: row.id != null ? Number(row.id) : null,
|
||||
code: String(row.package_material_code || '').trim() || null,
|
||||
name: String(row.package_material_name || '').trim() || null,
|
||||
spec: String(row.package_material_spec || '').trim() || null,
|
||||
type: String(row.package_material_type || '').trim() || null,
|
||||
weight: row.weight != null ? Number(row.weight) : null,
|
||||
length: row.length != null ? Number(row.length) : null,
|
||||
width: row.width != null ? Number(row.width) : null,
|
||||
height: row.height != null ? Number(row.height) : null,
|
||||
bind_count: row.bind_count != null ? Number(row.bind_count) : null,
|
||||
});
|
||||
}
|
||||
|
||||
return resultMap;
|
||||
}
|
||||
|
||||
/**
|
||||
* 为订单列表批量补充库存信息。
|
||||
* 查询每个订单的明细商品、库存数量、条码列表和图片,构建 stock 数组。
|
||||
@ -1874,7 +2045,7 @@ class RecheckOrderService extends OrderBaseService {
|
||||
return;
|
||||
}
|
||||
|
||||
// 任务下所有订单均已复核完成,解绑车任务(失败不影响主流程)
|
||||
// 任务下所有订单均已复核完成,更新任务状态为复核通过,并解绑车任务(失败不影响主流程)
|
||||
try {
|
||||
await this.unbindCartForTask(taskId, warehouseId, operatorUserId);
|
||||
ctx.logger.info(
|
||||
@ -1885,6 +2056,30 @@ class RecheckOrderService extends OrderBaseService {
|
||||
`[confirmRecheck] 解绑车任务失败(复核已成功), taskId=${taskId}, orderId=${orderId}, error=${unbindError.message}`
|
||||
);
|
||||
}
|
||||
|
||||
// 更新 wms_wave_pick_task 任务状态:status=3(已完成),review_status=3(复核通过)
|
||||
const operatorName = String(operator.name || '').trim();
|
||||
const taskStatusSetClauses = [
|
||||
'status = 3',
|
||||
'review_status = 3',
|
||||
'review_finish_time = :now',
|
||||
'review_time = :now',
|
||||
'update_time = NOW()',
|
||||
];
|
||||
if (operatorUserId > 0) {
|
||||
taskStatusSetClauses.push('review_user_id = :operatorUserId');
|
||||
taskStatusSetClauses.push('review_user_name = :operatorName');
|
||||
}
|
||||
await ctx.model.query(
|
||||
`UPDATE wms_wave_pick_task
|
||||
SET ${taskStatusSetClauses.join(',\n ')}
|
||||
WHERE id = :taskId
|
||||
AND warehouse_id = :warehouseId`,
|
||||
{
|
||||
replacements: { taskId, warehouseId, operatorUserId, operatorName, now },
|
||||
type: ctx.model.QueryTypes.UPDATE,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1972,7 +2167,7 @@ class RecheckOrderService extends OrderBaseService {
|
||||
continue;
|
||||
}
|
||||
|
||||
// 任务下所有订单均已复核完成,解绑车任务
|
||||
// 任务下所有订单均已复核完成,解绑车任务并更新任务状态
|
||||
try {
|
||||
await this.unbindCartForTask(taskId, warehouseId, operatorUserId);
|
||||
ctx.logger.info(
|
||||
@ -1983,6 +2178,30 @@ class RecheckOrderService extends OrderBaseService {
|
||||
`[confirmRecheck] 批量复核-解绑车任务失败, taskId=${taskId}, error=${unbindError.message}`
|
||||
);
|
||||
}
|
||||
|
||||
// 更新 wms_wave_pick_task 任务状态:status=3(已完成),review_status=3(复核通过)
|
||||
const operatorName = String(operator.name || '').trim();
|
||||
const taskStatusSetClauses = [
|
||||
'status = 3',
|
||||
'review_status = 3',
|
||||
'review_finish_time = :now',
|
||||
'review_time = :now',
|
||||
'update_time = NOW()',
|
||||
];
|
||||
if (operatorUserId > 0) {
|
||||
taskStatusSetClauses.push('review_user_id = :operatorUserId');
|
||||
taskStatusSetClauses.push('review_user_name = :operatorName');
|
||||
}
|
||||
await ctx.model.query(
|
||||
`UPDATE wms_wave_pick_task
|
||||
SET ${taskStatusSetClauses.join(',\n ')}
|
||||
WHERE id = :taskId
|
||||
AND warehouse_id = :warehouseId`,
|
||||
{
|
||||
replacements: { taskId, warehouseId, operatorUserId, operatorName, now },
|
||||
type: ctx.model.QueryTypes.UPDATE,
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@ -3547,92 +3766,6 @@ class RecheckOrderService extends OrderBaseService {
|
||||
await ctx.model.StorageTransaction.bulkCreate(transactionRows, { transaction });
|
||||
}
|
||||
|
||||
// 释放 wms_stock_warehouse 锁定数量并写入 wms_stock_transaction 出库流水
|
||||
const stockQtyMap = new Map();
|
||||
for (const sRow of storageRows) {
|
||||
const sid = Number(sRow.stock_id);
|
||||
if (!sid || sid <= 0) continue;
|
||||
const deduction = storageQtyMap.get(Number(sRow.id)) || 0;
|
||||
if (deduction <= 0) continue;
|
||||
stockQtyMap.set(sid, (stockQtyMap.get(sid) || 0) + deduction);
|
||||
}
|
||||
|
||||
if (stockQtyMap.size > 0) {
|
||||
const stockIds = Array.from(stockQtyMap.keys());
|
||||
const stockWarehouseRows = await ctx.model.StockWarehouse.findAll({
|
||||
where: {
|
||||
id: { [app.Sequelize.Op.in]: stockIds },
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
attributes: [ 'id', 'quantity', 'locked_quantity' ],
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
raw: true,
|
||||
transaction,
|
||||
});
|
||||
|
||||
const stockWarehouseMap = new Map();
|
||||
for (const swRow of stockWarehouseRows) {
|
||||
stockWarehouseMap.set(Number(swRow.id), swRow);
|
||||
}
|
||||
|
||||
for (const [ stockId, qty ] of stockQtyMap) {
|
||||
const swRow = stockWarehouseMap.get(stockId);
|
||||
if (!swRow) {
|
||||
ctx.logger.warn(`[recheckOrder] stock_warehouse 记录不存在: ${stockId}`);
|
||||
continue;
|
||||
}
|
||||
const currentLocked = Number(swRow.locked_quantity) || 0;
|
||||
if (currentLocked < qty) {
|
||||
throw new Error(
|
||||
`货主库存 ${stockId} 锁定数量不足:当前锁定 ${currentLocked},需释放 ${qty}`
|
||||
);
|
||||
}
|
||||
await ctx.model.StockWarehouse.update({
|
||||
locked_quantity: app.Sequelize.literal(`locked_quantity - ${qty}`),
|
||||
update_at: app.Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
}, {
|
||||
where: {
|
||||
id: stockId,
|
||||
locked_quantity: { [app.Sequelize.Op.gte]: qty },
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
}
|
||||
|
||||
const operator = this.getOrderLogOperator();
|
||||
const opId = String(operator.id || '').trim();
|
||||
const opName = String(operator.name || 'system').trim();
|
||||
const stockTransactionRows = [];
|
||||
for (const [ stockId, qty ] of stockQtyMap) {
|
||||
const swRow = stockWarehouseMap.get(stockId);
|
||||
if (!swRow) continue;
|
||||
const sRow = storageRows.find(r => Number(r.stock_id) === stockId);
|
||||
const beforeQty = Number(swRow.quantity) || 0;
|
||||
const beforeLocked = Number(swRow.locked_quantity) || 0;
|
||||
stockTransactionRows.push({
|
||||
transaction_type: 'OUTBOUND',
|
||||
warehouse_id: warehouseId,
|
||||
store_id: sRow ? Number(sRow.store_id) || 0 : 0,
|
||||
stock_id: stockId,
|
||||
quantity: qty,
|
||||
before_quantity: beforeQty,
|
||||
after_quantity: Math.max(0, beforeQty - qty),
|
||||
before_locked_quantity: beforeLocked,
|
||||
after_locked_quantity: Math.max(0, beforeLocked - qty),
|
||||
order_type: 'PICK_OUTBOUND',
|
||||
order_no: String(orderId),
|
||||
order_id: orderId,
|
||||
operator_id: opId,
|
||||
operator_name: opName,
|
||||
remark: '拣货完成出库-货主库存释放(批量快捷复核)',
|
||||
created_at: new Date(),
|
||||
});
|
||||
}
|
||||
|
||||
if (stockTransactionRows.length > 0) {
|
||||
await ctx.model.StockTransaction.bulkCreate(stockTransactionRows, { transaction });
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -850,7 +850,10 @@ class WaveService extends OrderBaseService {
|
||||
}
|
||||
|
||||
if (structure.distinguish_express) {
|
||||
where.logistics_name = String(structure.logistics_name || '').trim();
|
||||
const expressCode = String(structure.logistics_name || '').trim();
|
||||
if (expressCode) {
|
||||
where.sys_logistics_code = expressCode;
|
||||
}
|
||||
}
|
||||
|
||||
return where;
|
||||
@ -2054,7 +2057,7 @@ class WaveService extends OrderBaseService {
|
||||
buildCoarseGroupKey(order = {}, distinguishExpress = false) {
|
||||
const itemsHash = String(order.items_hash || '').trim();
|
||||
const itemsText = String(order.items || '').trim();
|
||||
const logisticsName = String(order.logistics_name || '').trim();
|
||||
const logisticsName = String(order.sys_logistics_code || '').trim();
|
||||
|
||||
const itemPart = itemsHash || itemsText;
|
||||
if (!itemPart) {
|
||||
@ -2097,7 +2100,7 @@ class WaveService extends OrderBaseService {
|
||||
buildGroupKey(order, itemDetails = [], options = {}) {
|
||||
const itemSummary = this.buildItemSummary(itemDetails);
|
||||
const itemSnapshotKey = this.buildItemSnapshotKey(itemDetails);
|
||||
const logisticsName = String(order.logistics_name || '').trim();
|
||||
const logisticsName = String(order.sys_logistics_code || '').trim();
|
||||
|
||||
const baseParts = [ itemSnapshotKey ];
|
||||
if (options.distinguishExpress) {
|
||||
@ -2166,6 +2169,7 @@ class WaveService extends OrderBaseService {
|
||||
where,
|
||||
attributes: [
|
||||
'id', 'store_id', 'logistics_name',
|
||||
'sys_logistics_code', 'sys_logistics_name',
|
||||
'items_hash', 'items', 'items_total', 'items_weight',
|
||||
'post_status', 'pick_status', 'outbound_status', 'create_at',
|
||||
],
|
||||
@ -2266,13 +2270,16 @@ class WaveService extends OrderBaseService {
|
||||
continue;
|
||||
}
|
||||
|
||||
const itemPartInfo = this.getOrderItemPart(g.orders[0] || {});
|
||||
const logisticsName = String(g.orders[0].logistics_name || '').trim();
|
||||
const firstOrder = g.orders[0] || {};
|
||||
const itemPartInfo = this.getOrderItemPart(firstOrder);
|
||||
const logisticsCode = String(firstOrder.sys_logistics_code || '').trim();
|
||||
const logisticsNameFromOrder = String(firstOrder.sys_logistics_name || '').trim();
|
||||
const logisticsDisplayName = logisticsNameFromOrder || logisticsCode;
|
||||
const itemDetailMachine = this.buildMachineStructureToken({
|
||||
item_part_type: itemPartInfo.item_part_type,
|
||||
item_part: itemPartInfo.item_part,
|
||||
distinguish_express: distinguishExpress,
|
||||
logistics_name: logisticsName,
|
||||
logistics_name: logisticsCode,
|
||||
item_snapshot_key: itemSnapshotKey,
|
||||
});
|
||||
|
||||
@ -2289,9 +2296,6 @@ class WaveService extends OrderBaseService {
|
||||
if (!last_order_time || o.create_at > last_order_time) last_order_time = o.create_at;
|
||||
}
|
||||
|
||||
// 同组订单 items_hash 相同,重量一致,取首单即可
|
||||
const firstOrder = g.orders[0] || {};
|
||||
|
||||
list.push({
|
||||
item_detail: itemSummary,
|
||||
item_detail_machine: itemDetailMachine,
|
||||
@ -2303,7 +2307,8 @@ class WaveService extends OrderBaseService {
|
||||
items_weight: firstOrder.items_weight != null ? Number(firstOrder.items_weight) : null,
|
||||
store_id: store_ids.length === 1 ? store_ids[0] : 0,
|
||||
store_ids,
|
||||
logistics_name: logisticsName,
|
||||
logistics_code: logisticsCode,
|
||||
logistics_name: logisticsDisplayName,
|
||||
distinguish_express: distinguishExpress,
|
||||
...(returnOrderIds ? { order_ids: g.orders.map(o => Number(o.id)) } : {}),
|
||||
first_order_time,
|
||||
@ -2402,6 +2407,7 @@ class WaveService extends OrderBaseService {
|
||||
where,
|
||||
attributes: [
|
||||
'id', 'store_id', 'logistics_name',
|
||||
'sys_logistics_code', 'sys_logistics_name',
|
||||
'items_hash', 'items', 'items_total', 'items_weight',
|
||||
'post_status', 'pick_status', 'outbound_status', 'create_at',
|
||||
],
|
||||
@ -2502,13 +2508,16 @@ class WaveService extends OrderBaseService {
|
||||
continue;
|
||||
}
|
||||
|
||||
const itemPartInfo = this.getOrderItemPart(g.orders[0] || {});
|
||||
const logisticsName = String(g.orders[0].logistics_name || '').trim();
|
||||
const firstOrder = g.orders[0] || {};
|
||||
const itemPartInfo = this.getOrderItemPart(firstOrder);
|
||||
const logisticsCode = String(firstOrder.sys_logistics_code || '').trim();
|
||||
const logisticsNameFromOrder = String(firstOrder.sys_logistics_name || '').trim();
|
||||
const logisticsDisplayName = logisticsNameFromOrder || logisticsCode;
|
||||
const itemDetailMachine = this.buildMachineStructureToken({
|
||||
item_part_type: itemPartInfo.item_part_type,
|
||||
item_part: itemPartInfo.item_part,
|
||||
distinguish_express: distinguishExpress,
|
||||
logistics_name: logisticsName,
|
||||
logistics_name: logisticsCode,
|
||||
item_snapshot_key: itemSnapshotKey,
|
||||
});
|
||||
|
||||
@ -2525,9 +2534,6 @@ class WaveService extends OrderBaseService {
|
||||
if (!last_order_time || o.create_at > last_order_time) last_order_time = o.create_at;
|
||||
}
|
||||
|
||||
// 同组订单 items_hash 相同,重量一致,取首单即可
|
||||
const firstOrder = g.orders[0] || {};
|
||||
|
||||
list.push({
|
||||
item_detail: itemSummary,
|
||||
item_detail_machine: itemDetailMachine,
|
||||
@ -2539,7 +2545,8 @@ class WaveService extends OrderBaseService {
|
||||
items_weight: firstOrder.items_weight != null ? Number(firstOrder.items_weight) : null,
|
||||
store_id: store_ids.length === 1 ? store_ids[0] : 0,
|
||||
store_ids,
|
||||
logistics_name: logisticsName,
|
||||
logistics_code: logisticsCode,
|
||||
logistics_name: logisticsDisplayName,
|
||||
distinguish_express: distinguishExpress,
|
||||
...(returnOrderIds ? { order_ids: g.orders.map(o => Number(o.id)) } : {}),
|
||||
first_order_time,
|
||||
@ -3631,7 +3638,7 @@ class WaveService extends OrderBaseService {
|
||||
}
|
||||
|
||||
const availableExpressSet = await this.getWaveStrategyAvailableExpressSet();
|
||||
const availableLowerSet = new Set([...availableExpressSet].map(s => s.toLowerCase()));
|
||||
const availableLowerSet = new Set([ ...availableExpressSet ].map(s => s.toLowerCase()));
|
||||
const illegalExpresses = normalizedExpresses.filter(item => !availableLowerSet.has(String(item).toLowerCase()));
|
||||
|
||||
if (illegalExpresses.length > 0) {
|
||||
@ -4188,12 +4195,13 @@ class WaveService extends OrderBaseService {
|
||||
LEFT JOIN ${orderTableName} od ON od.wave_id = candidate_wave.wave_id
|
||||
GROUP BY candidate_wave.wave_id
|
||||
) wave_order_stats ON wave_order_stats.wave_id = wb.wave_id
|
||||
LEFT JOIN wms_express e ON e.code = wb.logistics_name
|
||||
WHERE 1 = 1
|
||||
${storageAssignmentFilterClause.sql}
|
||||
${expressAssignmentFilterClause.sql}
|
||||
${printAssignmentFilterClause.sql}
|
||||
${reviewAssignmentFilterClause.sql}
|
||||
${onlyTodo === 1 ? `\n AND COALESCE(wave_order_stats.order_total, 0) - COALESCE(wave_order_stats.review_fin_count, 0) > 0` : ''}
|
||||
${onlyTodo === 1 ? '\n AND COALESCE(wave_order_stats.order_total, 0) - COALESCE(wave_order_stats.review_fin_count, 0) > 0' : ''}
|
||||
`;
|
||||
|
||||
const listSql = `
|
||||
@ -4206,7 +4214,8 @@ class WaveService extends OrderBaseService {
|
||||
wb.processed_orders,
|
||||
wb.distinguish_express,
|
||||
wb.source,
|
||||
wb.logistics_name,
|
||||
wb.logistics_name AS logistics_code,
|
||||
COALESCE(e.name, wb.logistics_name) AS logistics_name,
|
||||
wb.item_snapshot_key,
|
||||
wb.warehouse_id,
|
||||
wb.creator,
|
||||
@ -4317,6 +4326,7 @@ class WaveService extends OrderBaseService {
|
||||
item_part: String(batch && batch.item_part || '').trim(),
|
||||
distinguish_express: Number(batch && batch.distinguish_express || 0),
|
||||
source: Number(batch && batch.source || 0),
|
||||
logistics_code: String(batch && batch.logistics_code || '').trim(),
|
||||
logistics_name: String(batch && batch.logistics_name || '').trim(),
|
||||
item_snapshot_key: String(batch && batch.item_snapshot_key || '').trim(),
|
||||
warehouse_id: Number(batch && batch.warehouse_id || 0),
|
||||
@ -4358,7 +4368,7 @@ class WaveService extends OrderBaseService {
|
||||
* @param {number|string} [data.page] 页码(兼容 current)。
|
||||
* @param {number|string} [data.pageSize] 每页数量(兼容 size/page_size)。
|
||||
* @param {Object} [data.where] 查询过滤。
|
||||
* @return {Promise<Object>} 列表与分页结果。
|
||||
* @return {Promise<Object>} 列表与分页结果;每项 list 元素包含 wave_list 数组(wave_id / wave_no / box_no / status / bind_time / pick_time)。
|
||||
*/
|
||||
async wavePickTaskList(data = {}) {
|
||||
try {
|
||||
@ -4374,6 +4384,7 @@ class WaveService extends OrderBaseService {
|
||||
t.id,
|
||||
t.task_no,
|
||||
t.warehouse_id,
|
||||
t.wave_id,
|
||||
t.pick_mode,
|
||||
t.status,
|
||||
t.review_status,
|
||||
@ -4433,6 +4444,127 @@ class WaveService extends OrderBaseService {
|
||||
const totalRowList = Array.isArray(countRows && countRows[0]) ? countRows[0] : [];
|
||||
const total = Number(totalRowList[0] && totalRowList[0].total || 0);
|
||||
|
||||
// 批量查询 wave_list:收集任务ID,从关联表获取波次详情
|
||||
const taskIds = sourceList
|
||||
.map(item => Number(item && item.id || 0))
|
||||
.filter(id => Number.isInteger(id) && id > 0);
|
||||
|
||||
const taskWaveMap = new Map();
|
||||
if (taskIds.length > 0) {
|
||||
const taskWaveRows = await this.ctx.model.query(`
|
||||
SELECT
|
||||
ptw.task_id,
|
||||
ptw.wave_id,
|
||||
ptw.wave_no,
|
||||
ptw.box_no,
|
||||
ptw.status,
|
||||
ptw.bind_time,
|
||||
ptw.pick_time
|
||||
FROM wms_wave_pick_task_wave ptw
|
||||
WHERE ptw.task_id IN (:taskIds)
|
||||
AND ptw.warehouse_id = :warehouseId
|
||||
ORDER BY ptw.id ASC
|
||||
`, {
|
||||
replacements: { taskIds, warehouseId },
|
||||
type: this.ctx.model.QueryTypes.SELECT,
|
||||
});
|
||||
|
||||
const normalizedTaskWaveRows = Array.isArray(taskWaveRows) ? taskWaveRows : [];
|
||||
for (const row of normalizedTaskWaveRows) {
|
||||
const taskId = Number(row && row.task_id || 0);
|
||||
if (!Number.isInteger(taskId) || taskId <= 0) {
|
||||
continue;
|
||||
}
|
||||
if (!taskWaveMap.has(taskId)) {
|
||||
taskWaveMap.set(taskId, []);
|
||||
}
|
||||
taskWaveMap.get(taskId).push({
|
||||
wave_id: Number(row && row.wave_id || 0),
|
||||
wave_no: String(row && row.wave_no || '').trim(),
|
||||
box_no: Number(row && row.box_no || 0),
|
||||
status: Number(row && row.status || 0),
|
||||
bind_time: row && row.bind_time || null,
|
||||
pick_time: row && row.pick_time || null,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 回退:对于 wms_wave_pick_task_wave 无记录的任务,
|
||||
// 尝试从主表 wave_id / wms_wave_batch 查询波次信息。
|
||||
// 兼容场景:散单旧数据未写入关联表、已取消任务关联记录被删除等。
|
||||
const missingWaveTaskIds = sourceList
|
||||
.map(item => {
|
||||
const taskId = Number(item && item.id || 0);
|
||||
return Number.isInteger(taskId) && taskId > 0 && !taskWaveMap.has(taskId)
|
||||
? { taskId, waveId: Number(item && item.wave_id || 0) }
|
||||
: null;
|
||||
})
|
||||
.filter(Boolean);
|
||||
|
||||
if (missingWaveTaskIds.length > 0) {
|
||||
// 优先走 wms_wave_batch 回退(主表 wave_id 有值时)
|
||||
const batchFallbackIds = missingWaveTaskIds.filter(m => m.waveId > 0);
|
||||
if (batchFallbackIds.length > 0) {
|
||||
const fallbackWaveIds = [ ...new Set(batchFallbackIds.map(m => m.waveId)) ];
|
||||
const fallbackWaveRows = await this.ctx.model.query(`
|
||||
SELECT
|
||||
wave_id,
|
||||
wave_no
|
||||
FROM wms_wave_batch
|
||||
WHERE wave_id IN (:waveIds)
|
||||
AND warehouse_id = :warehouseId
|
||||
`, {
|
||||
replacements: { waveIds: fallbackWaveIds, warehouseId },
|
||||
type: this.ctx.model.QueryTypes.SELECT,
|
||||
});
|
||||
|
||||
const waveNoMap = new Map();
|
||||
const normalizedFallbackRows = Array.isArray(fallbackWaveRows) ? fallbackWaveRows : [];
|
||||
for (const row of normalizedFallbackRows) {
|
||||
const waveId = Number(row && row.wave_id || 0);
|
||||
if (!Number.isInteger(waveId) || waveId <= 0) {
|
||||
continue;
|
||||
}
|
||||
waveNoMap.set(waveId, String(row && row.wave_no || '').trim());
|
||||
}
|
||||
|
||||
for (const { taskId, waveId } of batchFallbackIds) {
|
||||
const waveNo = waveNoMap.get(waveId) || '';
|
||||
taskWaveMap.set(taskId, [{
|
||||
wave_id: waveId,
|
||||
wave_no: waveNo,
|
||||
box_no: 0,
|
||||
status: 0,
|
||||
bind_time: null,
|
||||
pick_time: null,
|
||||
}]);
|
||||
}
|
||||
}
|
||||
|
||||
// 剩余仍未回退到的任务(wave_id 为空或 wms_wave_batch 也无记录),
|
||||
// 检查其 batch_no(散单模式下冗余了 wave_no)
|
||||
const remainingFallbackTaskIds = missingWaveTaskIds
|
||||
.filter(m => !taskWaveMap.has(m.taskId))
|
||||
.map(m => m.taskId);
|
||||
|
||||
if (remainingFallbackTaskIds.length > 0) {
|
||||
for (const taskId of remainingFallbackTaskIds) {
|
||||
const item = sourceList.find(s => Number(s && s.id || 0) === taskId);
|
||||
const batchNo = String(item && item.batch_no || '').trim();
|
||||
if (batchNo) {
|
||||
taskWaveMap.set(taskId, [{
|
||||
wave_id: 0,
|
||||
wave_no: batchNo,
|
||||
box_no: 0,
|
||||
status: 0,
|
||||
bind_time: null,
|
||||
pick_time: null,
|
||||
}]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const list = sourceList.map(item => ({
|
||||
task_id: Number(item && item.id || 0),
|
||||
task_no: String(item && item.task_no || '').trim(),
|
||||
@ -4464,6 +4596,7 @@ class WaveService extends OrderBaseService {
|
||||
create_time: item && item.create_time || null,
|
||||
created_at: item && item.create_time || null,
|
||||
update_time: item && item.update_time || null,
|
||||
wave_list: taskWaveMap.get(Number(item && item.id || 0)) || [],
|
||||
}));
|
||||
|
||||
return this.success('ok', {
|
||||
@ -6888,6 +7021,8 @@ class WaveService extends OrderBaseService {
|
||||
const orderUpdateResult = await orderModel.update({
|
||||
wave_id: 0,
|
||||
wave_no: '',
|
||||
wave_strategy_version: 0,
|
||||
wave_scan_result: 0,
|
||||
}, {
|
||||
where: {
|
||||
id: { [Op.in]: removablePendingIds },
|
||||
@ -7778,6 +7913,8 @@ class WaveService extends OrderBaseService {
|
||||
const orderUpdateResult = await orderModel.update({
|
||||
wave_id: 0,
|
||||
wave_no: '',
|
||||
wave_strategy_version: 0,
|
||||
wave_scan_result: 0,
|
||||
}, {
|
||||
where: {
|
||||
wave_id: waveId,
|
||||
@ -9553,7 +9690,7 @@ class WaveService extends OrderBaseService {
|
||||
}
|
||||
|
||||
return [{
|
||||
wave_id: null,
|
||||
wave_id: 0,
|
||||
box_no: 1,
|
||||
rule: pickMode === 5 ? 'single_wave_dynamic_append' : 'single_wave_single_box',
|
||||
box_limit: Number.isInteger(boxLimit) && boxLimit > 0 ? boxLimit : 1,
|
||||
@ -10535,6 +10672,17 @@ class WaveService extends OrderBaseService {
|
||||
|
||||
await transaction.commit();
|
||||
|
||||
// 写入订单操作日志:策略抓取分配到波次
|
||||
const strategyLogItems = normalizedOrderIds.map(orderId => ({
|
||||
orderId,
|
||||
operationCode: 'ORDER_WAVE_STRATEGY_FETCH',
|
||||
message: `策略(${strategyId})抓取分配到波次 ${normalizedWaveNos.join(',')}`,
|
||||
}));
|
||||
await this.batchCreateOrderOperationLogs(strategyLogItems, {
|
||||
warehouseId,
|
||||
scene: 'executeWaveStrategyDirectFetch',
|
||||
});
|
||||
|
||||
this.ctx.logger.info('[wave.executeWaveStrategyDirectFetch] 按策略直接建波完成', {
|
||||
strategy_id: strategyId,
|
||||
warehouse_id: warehouseId,
|
||||
@ -10792,6 +10940,22 @@ class WaveService extends OrderBaseService {
|
||||
|
||||
await transaction.commit();
|
||||
|
||||
// 写入订单操作日志:分配到波次
|
||||
if (selectedOrderIds.length > 0) {
|
||||
const waveNoList = taskWaveRows
|
||||
.map(r => String(r && r.wave_no || '').trim())
|
||||
.filter(Boolean);
|
||||
const waveNoMessage = waveNoList.length > 0 ? waveNoList.join(',') : '';
|
||||
await this.batchCreateOrderOperationLogs(
|
||||
selectedOrderIds.map(orderId => ({
|
||||
orderId,
|
||||
operationCode: 'ORDER_WAVE_ASSIGN',
|
||||
message: `分配到波次 ${waveNoMessage}`,
|
||||
})),
|
||||
{ warehouseId, scene: 'createWavePickTaskFromPlan' }
|
||||
);
|
||||
}
|
||||
|
||||
return {
|
||||
task_id: taskId,
|
||||
task_no: taskNo,
|
||||
@ -10808,7 +10972,8 @@ class WaveService extends OrderBaseService {
|
||||
const errorDetail = {
|
||||
name: String(error && error.name || ''),
|
||||
message: String(error && error.message || ''),
|
||||
stack: String(error && error.stack || '').split('\n').slice(0, 6).join('\n'),
|
||||
stack: String(error && error.stack || '').split('\n').slice(0, 6)
|
||||
.join('\n'),
|
||||
sql: String(error && error.sql || '').slice(0, 500),
|
||||
errorType: Object.prototype.toString.call(error),
|
||||
errors: Array.isArray(error && error.errors)
|
||||
@ -11747,6 +11912,8 @@ class WaveService extends OrderBaseService {
|
||||
});
|
||||
const hasCancelledAtColumn = Array.isArray(canceledAtColumnRows) && canceledAtColumnRows.length > 0;
|
||||
const cancelledTaskNos = [];
|
||||
const cancelOrderLogItems = [];
|
||||
let hasReleasedWaves = false;
|
||||
|
||||
for (const taskId of normalizedTaskIds) {
|
||||
const requestId = `wave_pick_task_cancel_${warehouseId}_${taskId}_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
|
||||
@ -11856,6 +12023,15 @@ class WaveService extends OrderBaseService {
|
||||
.map(row => Number(row && row.order_id || 0))
|
||||
.filter(orderId => Number.isInteger(orderId) && orderId > 0)) ];
|
||||
|
||||
// 收集订单操作日志(提交后统一写入)
|
||||
for (const orderId of taskOrderIds) {
|
||||
cancelOrderLogItems.push({
|
||||
orderId,
|
||||
operationCode: 'ORDER_WAVE_CANCEL',
|
||||
message: `取消拣货任务 ${taskNo},从波次释放`,
|
||||
});
|
||||
}
|
||||
|
||||
// source=2(后台/扫描创建)不释放波次,仅清理任务-波次关联
|
||||
const isScanCreated = taskSource === 2;
|
||||
let releasedWaveRows = [];
|
||||
@ -11880,6 +12056,8 @@ class WaveService extends OrderBaseService {
|
||||
await orderModel.update({
|
||||
wave_id: 0,
|
||||
wave_no: '',
|
||||
wave_strategy_version: 0,
|
||||
wave_scan_result: 0,
|
||||
}, {
|
||||
where: {
|
||||
warehouse_id: warehouseId,
|
||||
@ -11899,6 +12077,10 @@ class WaveService extends OrderBaseService {
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
|
||||
if (Array.isArray(releasedWaveRows) && releasedWaveRows.length > 0) {
|
||||
hasReleasedWaves = true;
|
||||
}
|
||||
}
|
||||
|
||||
// 清理任务-波次关联(所有来源都需要)
|
||||
@ -11959,6 +12141,7 @@ class WaveService extends OrderBaseService {
|
||||
UPDATE wms_wave_pick_task
|
||||
SET
|
||||
status = 9,
|
||||
wave_count = 0,
|
||||
current_cart_id = NULL,
|
||||
current_cart_code_snapshot = NULL,
|
||||
${hasCancelledAtColumn ? 'cancelled_at = NOW(),' : ''}
|
||||
@ -12013,8 +12196,8 @@ class WaveService extends OrderBaseService {
|
||||
task_id: taskId,
|
||||
warehouse_id: warehouseId,
|
||||
wave_id: Array.isArray(releasedWaveRows) && releasedWaveRows.length > 0
|
||||
? Number(releasedWaveRows[0].wave_id || 0) || null
|
||||
: null,
|
||||
? Number(releasedWaveRows[0].wave_id || 0)
|
||||
: 0,
|
||||
order_id: taskOrderIds.length > 0 ? Number(taskOrderIds[0]) : null,
|
||||
sku_id: null,
|
||||
location_id: null,
|
||||
@ -12069,6 +12252,24 @@ class WaveService extends OrderBaseService {
|
||||
|
||||
await transaction.commit();
|
||||
|
||||
if (cancelOrderLogItems.length > 0) {
|
||||
await this.batchCreateOrderOperationLogs(cancelOrderLogItems, {
|
||||
warehouseId,
|
||||
scene: 'cancelWavePickTasksInternal',
|
||||
});
|
||||
}
|
||||
|
||||
if (hasReleasedWaves) {
|
||||
setImmediate(() => {
|
||||
this.submitWaveStrategyQuickScanForWarehouse(warehouseId).catch(err => {
|
||||
this.ctx.logger.warn('[wave.wavePickTaskCancel] 触发回池后重扫失败', {
|
||||
warehouseId,
|
||||
error: err && err.message ? err.message : String(err),
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
return {
|
||||
cancelled_count: normalizedTaskIds.length,
|
||||
task_ids: normalizedTaskIds,
|
||||
|
||||
@ -304,6 +304,37 @@ class PickService extends MainService {
|
||||
}
|
||||
|
||||
await transaction.commit();
|
||||
|
||||
// 写入 order_operation_log 抓取波次日志
|
||||
try {
|
||||
const operationLogService = this.ctx
|
||||
&& this.ctx.service
|
||||
&& this.ctx.service.systems
|
||||
&& this.ctx.service.systems.operationLog;
|
||||
if (operationLogService && typeof operationLogService.createOperationLogs === 'function') {
|
||||
const logPayloads = normalizedOrderIds.map(orderId => ({
|
||||
businessType: 'order',
|
||||
businessId: `${orderId}`,
|
||||
operationCode: 'ORDER_WAVE_GRAB',
|
||||
operator: {
|
||||
id: operatorId ? String(operatorId) : null,
|
||||
name: operatorName || 'system',
|
||||
},
|
||||
extras: {
|
||||
message: `订单${orderId}抓取波次成功`,
|
||||
warehouseId,
|
||||
externalLogType: 'PDA',
|
||||
},
|
||||
}));
|
||||
await operationLogService.createOperationLogs(logPayloads);
|
||||
}
|
||||
} catch (e) {
|
||||
ctx.logger.warn('[pick.createWavePickTask] 写入 order_operation_log 失败,不影响主流程', {
|
||||
error: e && e.message,
|
||||
normalizedOrderIds,
|
||||
});
|
||||
}
|
||||
|
||||
return {
|
||||
task_id: taskId,
|
||||
task_no: taskNo,
|
||||
@ -337,7 +368,7 @@ class PickService extends MainService {
|
||||
* @return {Promise<Object>} 统一 success/fail 包装结果。
|
||||
*/
|
||||
async query(data = {}) {
|
||||
const { service, ctx } = this;
|
||||
const { ctx } = this;
|
||||
const requestData = this.isPlainObject(data) ? data : {};
|
||||
const { keyword } = requestData;
|
||||
|
||||
@ -545,6 +576,45 @@ class PickService extends MainService {
|
||||
);
|
||||
}
|
||||
|
||||
// 波次级已完成任务去重:同一 warehouse_id + 同一 wave_id 已有完成任务时不再创建
|
||||
const completedTaskRows = await ctx.model.query(
|
||||
`
|
||||
SELECT t.id AS task_id, t.status, t.pick_user_id, t.pick_user_name
|
||||
FROM wms_wave_pick_task t
|
||||
WHERE t.warehouse_id = :warehouseId
|
||||
AND t.status IN (2, 3)
|
||||
AND (
|
||||
t.wave_id = :waveId
|
||||
OR EXISTS (
|
||||
SELECT 1
|
||||
FROM wms_wave_pick_task_wave tw
|
||||
WHERE tw.task_id = t.id
|
||||
AND tw.wave_id = :waveId
|
||||
)
|
||||
)
|
||||
ORDER BY t.id DESC
|
||||
LIMIT 1
|
||||
`,
|
||||
{
|
||||
replacements: {
|
||||
waveId: targetWaveId,
|
||||
warehouseId: normalizedWarehouseId,
|
||||
},
|
||||
type: ctx.model.QueryTypes.SELECT,
|
||||
}
|
||||
);
|
||||
const completedTask = Array.isArray(completedTaskRows) && completedTaskRows.length > 0 ? completedTaskRows[0] : null;
|
||||
if (completedTask) {
|
||||
return this.success('ok', {
|
||||
data: {
|
||||
task_id: Number(completedTask.task_id),
|
||||
status: 'existing_completed',
|
||||
tip: '该波次已完成拣货任务,无需重复创建',
|
||||
},
|
||||
code: 200,
|
||||
});
|
||||
}
|
||||
|
||||
// keyword 级别去重:同一 warehouse_id + 同一 keyword(remark)在 30 分钟内已有任务则不再创建
|
||||
const keywordRemark = `pick.query keyword=${normalizedKeyword}`;
|
||||
const keywordDedupRows = await ctx.model.query(
|
||||
|
||||
@ -1091,8 +1091,14 @@ class PrintService extends MainService {
|
||||
for (let i = 0; i < item.rows; i++) {
|
||||
tableHtml += '<tr>';
|
||||
for (let j = 0; j < item.columns; j++) {
|
||||
const content = item.content[i] && item.content[i][j] ? item.content[i][j] : '';
|
||||
tableHtml += `<td style="border: ${item.line_width}px ${item.line_style} ${item.line_color}; width:${item.width / item.columns}mm; height:${item.height / item.rows}mm;">${content}</td>`;
|
||||
let cellContent = item.content[i] && item.content[i][j] ? item.content[i][j] : '';
|
||||
// 解析单元格字段码为实际数据,与 text 类型保持一致的解析逻辑
|
||||
for (const key in data) {
|
||||
if (String(cellContent) === key) {
|
||||
cellContent = data[key];
|
||||
}
|
||||
}
|
||||
tableHtml += `<td style="border: ${item.line_width}px ${item.line_style} ${item.line_color}; width:${item.width / item.columns}mm; height:${item.height / item.rows}mm;">${cellContent}</td>`;
|
||||
} tableHtml += '</tr>';
|
||||
} tableHtml += '</table>';
|
||||
htm += tableHtml;
|
||||
|
||||
@ -611,7 +611,7 @@ class WarehouseService extends MainService {
|
||||
*/
|
||||
_normalizeBarcodeField(raw) {
|
||||
if (typeof raw === 'string' && raw.trim()) {
|
||||
return [...new Set(raw.split(',').map(s => s.trim()).filter(Boolean))];
|
||||
return [ ...new Set(raw.split(',').map(s => s.trim()).filter(Boolean)) ];
|
||||
}
|
||||
return [];
|
||||
}
|
||||
@ -1015,12 +1015,27 @@ class WarehouseService extends MainService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 快捷搜索仓库商品。
|
||||
* @param {Object} data 请求体(含 keyword)
|
||||
* @return {Promise<Object>} data 为搜索结果数组
|
||||
*/
|
||||
* 快捷搜索仓库商品,当 mode='combo' 时桥接到组合商品查询。
|
||||
* @param {Object} data 请求体
|
||||
* @param {string} [data.mode] 查询模式,'combo' 时搜索组合商品,默认搜索普通商品
|
||||
* @param {string} [data.keyword] 搜索关键字(默认模式)
|
||||
* @param {number} [data.id] 组合商品ID(mode='combo' 时精确查询)
|
||||
* @param {string} [data.custom_code] 自定义编码(mode='combo' 时模糊查询)
|
||||
* @param {number} [data.store_id] 货主ID(默认模式)
|
||||
* @param {boolean} [data.with_stock] 是否返回库存数据(默认模式)
|
||||
* @param {boolean} [data.is_batch] 是否按批次返回(默认模式)
|
||||
* @return {Promise<Object>} data 为搜索结果数组(默认模式)或组合商品列表(combo 模式)
|
||||
*/
|
||||
async search(data) {
|
||||
const { service } = this;
|
||||
const { mode } = data || {};
|
||||
|
||||
if (mode === 'combo') {
|
||||
const { id, custom_code } = data || {};
|
||||
const result = await service.systems.comboGoods.searchByIdOrCode({ id, custom_code });
|
||||
return this.success('ok', result);
|
||||
}
|
||||
|
||||
const result = await service.systems.stockStore.search(data);
|
||||
return this.success('ok', result);
|
||||
}
|
||||
|
||||
71
app/service/systemMethods/storage/direct_inbound.js
Normal file
71
app/service/systemMethods/storage/direct_inbound.js
Normal file
@ -0,0 +1,71 @@
|
||||
'use strict';
|
||||
const MainService = require('../../main');
|
||||
/**
|
||||
* 系统方法层:storage.directInbound(导入/PDA直接入库相关接口包装层)。
|
||||
* 主要职责:统一包装系统方法接口,处理权限、日志等公共逻辑,调用底层 service 实现业务功能。
|
||||
*/
|
||||
class DirectInboundService extends MainService {
|
||||
constructor(ctx) {
|
||||
super(ctx);
|
||||
const _noNeedLogin = '';
|
||||
const _noNeedRight = 'getItems,addItem,removeItem,commit';
|
||||
const _noNeedLog = 'getItems';
|
||||
const _noNeedAuth = 'getItems,addItem,removeItem,commit';
|
||||
this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取入库单的导入/PDA 入库信息。
|
||||
* @param {Object} data 请求体
|
||||
* @param {string} data.entry_order_code 入库单号
|
||||
* @return {Promise<Object>} 统一成功包装响应
|
||||
*/
|
||||
async getItems(data = {}) {
|
||||
const { service } = this;
|
||||
const { entry_order_code } = data || {};
|
||||
const result = await service.systems.inboundDirectLog.getItems(entry_order_code);
|
||||
return this.success('ok', result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 按商品增量添加导入/PDA 入库记录。
|
||||
* @param {Object} data 请求体
|
||||
* @param {string} data.entry_order_code 入库单号
|
||||
* @param {number} data.stock_id 商品SKU ID
|
||||
* @param {number} data.quantity 入库数量
|
||||
* @param {string} data.inbound_type 入库方式:import 或 pda
|
||||
* @param {string} [data.remark] 备注
|
||||
* @return {Promise<Object>} 统一成功包装响应
|
||||
*/
|
||||
async addItem(data = {}) {
|
||||
const { service } = this;
|
||||
const result = await service.systems.inboundDirectLog.addItem(data);
|
||||
return this.success('ok', result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 提交确认完成导入/PDA 入库,写入库存并触发奇门/API 回传。
|
||||
* @param {Object} data 请求体
|
||||
* @param {string} data.entry_order_code 入库单号
|
||||
* @return {Promise<Object>} 统一成功包装响应
|
||||
*/
|
||||
async commit(data = {}) {
|
||||
const { service } = this;
|
||||
const { entry_order_code } = data || {};
|
||||
const result = await service.systems.inboundDirectLog.commit(entry_order_code);
|
||||
return this.success('ok', result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 移除一条导入/PDA 入库记录。
|
||||
* @param {Object} data 请求体
|
||||
* @param {number} data.id 入库记录ID
|
||||
* @return {Promise<Object>} 统一成功包装响应
|
||||
*/
|
||||
async removeItem(data = {}) {
|
||||
const { service } = this;
|
||||
const result = await service.systems.inboundDirectLog.removeItem(data);
|
||||
return this.success('ok', result);
|
||||
}
|
||||
}
|
||||
module.exports = DirectInboundService;
|
||||
@ -9,9 +9,9 @@ class entryService extends MainService {
|
||||
constructor(ctx) {
|
||||
super(ctx);
|
||||
const _noNeedLogin = '';
|
||||
const _noNeedRight = 'list,get,cancel,completeEntry';
|
||||
const _noNeedLog = 'list,get';
|
||||
const _noNeedAuth = 'list,get,cancel,completeEntry';
|
||||
const _noNeedRight = 'list,get,cancel,completeEntry,getPrintData,getDirectInboundItems,addDirectInboundItem,commitDirectInbound,removeDirectInboundItem';
|
||||
const _noNeedLog = 'list,get,getPrintData';
|
||||
const _noNeedAuth = 'list,get,cancel,completeEntry,getPrintData,getDirectInboundItems,addDirectInboundItem,commitDirectInbound,removeDirectInboundItem';
|
||||
this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth);
|
||||
}
|
||||
|
||||
@ -65,14 +65,148 @@ class entryService extends MainService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 完成入库单。
|
||||
* 完成入库单(纯状态变更,不写库存)。
|
||||
* 仅校验状态=PENDING、有明细,然后将 order_status 更新为 COMPLETED。
|
||||
* @param {Object} data 请求体
|
||||
* @param {number} data.id 入库单ID
|
||||
* @return {Promise<Object>} 统一 success 包装
|
||||
*/
|
||||
async completeEntry(data = {}) {
|
||||
const { service } = this;
|
||||
const result = await service.systems.storage.entry.completeEntry(data);
|
||||
const { id } = data;
|
||||
const result = await service.systems.storage.entry.completeEntry({ id });
|
||||
return this.success('ok', result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取入库单的导入/PDA 直接入库信息(从 storage.entry 模块暴露)。
|
||||
* @param {Object} data 请求体
|
||||
* @param {string} data.entry_order_code 入库单号
|
||||
* @return {Promise<Object>} 统一 success 包装
|
||||
*/
|
||||
async getDirectInboundItems(data = {}) {
|
||||
const { service } = this;
|
||||
const { entry_order_code } = data || {};
|
||||
const result = await service.systems.inboundDirectLog.getItems(entry_order_code);
|
||||
return this.success('ok', result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 按商品增量添加导入/PDA 直接入库记录(从 storage.entry 模块暴露)。
|
||||
* @param {Object} data 请求体
|
||||
* @param {string} data.entry_order_code 入库单号
|
||||
* @param {number} [data.stock_id] 商品SKU ID(单条模式)
|
||||
* @param {number} [data.quantity] 本次入库数量(单条模式)
|
||||
* @param {string} [data.inbound_type] 入库方式(单条模式)
|
||||
* @param {Array} [data.items] 商品列表(批量模式)
|
||||
* @return {Promise<Object>} 统一 success 包装
|
||||
*/
|
||||
async addDirectInboundItem(data = {}) {
|
||||
const { service } = this;
|
||||
const result = await service.systems.inboundDirectLog.addItem(data);
|
||||
return this.success('ok', result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 提交确认完成导入/PDA 直接入库(从 storage.entry 模块暴露)。
|
||||
* @param {Object} data 请求体
|
||||
* @param {string} data.entry_order_code 入库单号
|
||||
* @return {Promise<Object>} 统一 success 包装
|
||||
*/
|
||||
async commitDirectInbound(data = {}) {
|
||||
const { service } = this;
|
||||
const { entry_order_code } = data || {};
|
||||
const result = await service.systems.inboundDirectLog.commit(entry_order_code);
|
||||
return this.success('ok', result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 移除一条导入/PDA 直接入库记录(从 storage.entry 模块暴露)。
|
||||
* @param {Object} data 请求体
|
||||
* @param {number} data.id 入库记录ID
|
||||
* @return {Promise<Object>} 统一 success 包装
|
||||
*/
|
||||
async removeDirectInboundItem(data = {}) {
|
||||
const { service } = this;
|
||||
const result = await service.systems.inboundDirectLog.removeItem(data);
|
||||
return this.success('ok', result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取入库单打印数据,按 RECEIPT 模板 field_code 映射返回。
|
||||
* @param {Object} data 请求体
|
||||
* @param {number} data.id 入库单ID
|
||||
* @param {number} [data.warehouse_id] 仓库ID,不传则取当前用户仓库
|
||||
* @return {Promise<Object>} 打印数据(扁平键值 + items 明细数组)
|
||||
*/
|
||||
async getPrintData(data = {}) {
|
||||
const { ctx, service } = this;
|
||||
const id = Number(data && data.id || 0);
|
||||
if (!id) {
|
||||
return this.fail('id 参数不能为空', { code: 400 });
|
||||
}
|
||||
|
||||
try {
|
||||
const entryResult = await service.systems.storage.entry.get({ id });
|
||||
if (!entryResult || entryResult.code !== 200 || !entryResult.data || !entryResult.data.entryOrder) {
|
||||
return this.fail('入库单不存在', { code: 404 });
|
||||
}
|
||||
|
||||
const entryOrder = entryResult.data.entryOrder;
|
||||
const items = Array.isArray(entryOrder.items) ? entryOrder.items : [];
|
||||
|
||||
// 查询商品条码(批量)
|
||||
const barcodeMap = new Map();
|
||||
try {
|
||||
const stockIds = items
|
||||
.map(item => Number(item.stock_id || 0))
|
||||
.filter(sid => sid > 0);
|
||||
if (stockIds.length > 0 && ctx.model.StockBarcode) {
|
||||
const barcodeRows = await ctx.model.StockBarcode.findAll({
|
||||
where: { stock_id: { [ctx.app.Sequelize.Op.in]: stockIds } },
|
||||
attributes: [ 'stock_id', 'barcode' ],
|
||||
raw: true,
|
||||
});
|
||||
for (const row of barcodeRows) {
|
||||
if (!barcodeMap.has(row.stock_id)) {
|
||||
barcodeMap.set(row.stock_id, []);
|
||||
}
|
||||
barcodeMap.get(row.stock_id).push(row.barcode);
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
ctx.logger.warn('[entry.getPrintData] 查询条码失败: %s', err.message);
|
||||
}
|
||||
|
||||
const printData = {
|
||||
entry_order_code: entryOrder.entry_order_code || '',
|
||||
order_type: entryOrder.order_type || '',
|
||||
order_status: entryOrder.order_status || '',
|
||||
purchase_order_code: entryOrder.purchase_order_code || '',
|
||||
supplier_name: entryOrder.supplier_name || '',
|
||||
warehouse_name: entryOrder.warehouse_name || '',
|
||||
store_name: entryOrder.store_name || '',
|
||||
logistics_name: entryOrder.logistics_name || '',
|
||||
express_code: entryOrder.express_code || '',
|
||||
order_create_time: entryOrder.order_create_time || '',
|
||||
expect_start_time: entryOrder.expect_start_time || '',
|
||||
remark: entryOrder.remark || '',
|
||||
total_order_lines: entryOrder.total_order_lines || 0,
|
||||
items: items.map(item => ({
|
||||
items_col1: item.warehouse_item_code || item.external_item_code || '',
|
||||
items_col2: item.warehouse_item_name || '',
|
||||
items_col3: (barcodeMap.get(Number(item.stock_id)) || []).join(';') || '',
|
||||
items_col4: item.count || 0,
|
||||
items_col5: item.received_quantity || 0,
|
||||
items_col6: item.inventory_type || '',
|
||||
})),
|
||||
};
|
||||
|
||||
return this.success('ok', { data: printData, code: 200 });
|
||||
} catch (error) {
|
||||
ctx.logger.error('[entry.getPrintData] 获取入库单打印数据失败:', error);
|
||||
return this.fail(error.message || '获取打印数据失败', { code: 500 });
|
||||
}
|
||||
}
|
||||
}
|
||||
module.exports = entryService;
|
||||
|
||||
@ -10,37 +10,12 @@ class InventoryMethodService extends MainService {
|
||||
constructor(ctx) {
|
||||
super(ctx);
|
||||
const _noNeedLogin = '';
|
||||
const _noNeedRight = 'matchPutaway,list';
|
||||
const _noNeedRight = 'list';
|
||||
const _noNeedLog = 'list';
|
||||
const _noNeedAuth = 'list';
|
||||
this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth);
|
||||
}
|
||||
|
||||
/**
|
||||
* 收货单快捷入库上架。
|
||||
* @param {Object} data 请求体
|
||||
* @param {number} data.receiving_id 收货单ID
|
||||
* @return {Promise<Object>} 统一 success 包装
|
||||
*/
|
||||
async quickPutaway(data = {}) {
|
||||
const { service } = this;
|
||||
const result = await service.systems.storage.inventory.quickPutaway(data);
|
||||
return this.success('ok', result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 匹配入库:收货单与入库单按商品匹配入库。
|
||||
* @param {Object} data 请求体
|
||||
* @param {number[]} data.receiving_ids 收货单ID列表
|
||||
* @param {number[]} data.entry_order_ids 入库单ID列表
|
||||
* @return {Promise<Object>} 统一 success 包装
|
||||
*/
|
||||
async matchPutaway(data = {}) {
|
||||
const { service } = this;
|
||||
const result = await service.systems.storage.inventory.matchPutaway(data);
|
||||
return this.success('ok', result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 移库(库位转移):将单条库存从一个库位移动到另一个库位。
|
||||
* @param {Object} data 请求体
|
||||
|
||||
45
app/service/systemMethods/storage/management.js
Normal file
45
app/service/systemMethods/storage/management.js
Normal file
@ -0,0 +1,45 @@
|
||||
'use strict';
|
||||
|
||||
const MainService = require('../../main');
|
||||
|
||||
/**
|
||||
* 系统方法层:storage.management(库存管理接口包装层)。
|
||||
*/
|
||||
class StorageManagementMethodService extends MainService {
|
||||
constructor(ctx) {
|
||||
super(ctx);
|
||||
const _noNeedLogin = '';
|
||||
const _noNeedRight = 'replenishmentDemand';
|
||||
const _noNeedLog = '';
|
||||
const _noNeedAuth = 'replenishmentDemand';
|
||||
this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth);
|
||||
}
|
||||
|
||||
/**
|
||||
* 分拣缺货补货需求计算。
|
||||
*
|
||||
* 仓库级别的计算,针对当前仓库所有未完成储位分配的订单,
|
||||
* 计算每个 SKU 在分拣区与存货区的可用库存对比,
|
||||
* 输出分拣区缺口及建议补货量,供仓库人员决策移库。
|
||||
*
|
||||
* 仓库 ID 从用户上下文(ctx.user.store_id / ctx.user.warehouse_id)自动获取,无需显式传入。
|
||||
*
|
||||
* @param {Object} [data={}] 请求参数。
|
||||
* @param {Object} [data.pagination] 分页参数。
|
||||
* @param {Object} [data.sort] 排序参数。
|
||||
* @return {Promise<Object>} 统一 success 包装的补货需求明细、汇总与分页信息。
|
||||
*/
|
||||
async replenishmentDemand(data = {}) {
|
||||
const { service } = this;
|
||||
const requestData = this.isPlainObject(data) ? data : {};
|
||||
const pagination = requestData.pagination || {};
|
||||
const sort = requestData.sort || requestData.order || {};
|
||||
const result = await service.systems.storage.management.replenishmentDemand({
|
||||
pagination,
|
||||
sort,
|
||||
});
|
||||
return this.success('补货需求计算完成', result);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = StorageManagementMethodService;
|
||||
@ -10,9 +10,9 @@ class configService extends MainService {
|
||||
constructor(ctx) {
|
||||
super(ctx);
|
||||
const _noNeedLogin = '';
|
||||
const _noNeedRight = 'getReceivingList,get,addDetail,deleteDetail,detailChange,cancel,completeReceiving,bindStore,bindDetailProduct,rejectReceiving,reviewReceiving,queryReceivingLogs';
|
||||
const _noNeedLog = 'getReceivingList,get,addDetail,deleteDetail,detailChange,bindStore,bindDetailProduct,queryReceivingLogs';
|
||||
const _noNeedAuth = 'getReceivingList,get,addDetail,deleteDetail,detailChange,cancel,completeReceiving,bindStore,bindDetailProduct,rejectReceiving,reviewReceiving,queryReceivingLogs';
|
||||
const _noNeedRight = 'getReceivingList,get,addDetail,deleteDetail,detailChange,cancel,completeReceiving,bindStore,bindDetailProduct,rejectReceiving,reviewReceiving,queryReceivingLogs,manualMatchEntryOrder';
|
||||
const _noNeedLog = 'getReceivingList,get,addDetail,deleteDetail,detailChange,bindStore,bindDetailProduct,queryReceivingLogs,manualMatchEntryOrder';
|
||||
const _noNeedAuth = 'getReceivingList,get,addDetail,deleteDetail,detailChange,cancel,completeReceiving,bindStore,bindDetailProduct,rejectReceiving,reviewReceiving,queryReceivingLogs,manualMatchEntryOrder';
|
||||
this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth);
|
||||
}
|
||||
|
||||
@ -259,5 +259,24 @@ class configService extends MainService {
|
||||
code: 200,
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 手动匹配入库单与收货单(system method 包装层)。
|
||||
*
|
||||
* 传入收货单 ID 与入库单 ID,复用 `receiving_entry_match` 服务的匹配逻辑,
|
||||
* 同步执行 SKU 明细对比并按来源回传(奇门 / OpenAPI),返回结构化匹配结果。
|
||||
*
|
||||
* @param {Object} data 请求体
|
||||
* @param {number} data.receivingId 收货单 ID
|
||||
* @param {number} data.entryOrderId 入库单 ID
|
||||
* @return {Promise<Object>} 统一成功包装的匹配结果
|
||||
*/
|
||||
async manualMatchEntryOrder(data) {
|
||||
const { service } = this;
|
||||
const { receivingId, entryOrderId } = data || {};
|
||||
const result = await service.systems.receiving_entry_match.manualMatch(receivingId, entryOrderId);
|
||||
return this.success('匹配完成', result);
|
||||
}
|
||||
|
||||
}
|
||||
module.exports = configService;
|
||||
|
||||
1011
app/service/systems/comboGoods.js
Normal file
1011
app/service/systems/comboGoods.js
Normal file
File diff suppressed because it is too large
Load Diff
@ -204,8 +204,15 @@ class DeliveryOrderService extends Service {
|
||||
const { ctx } = this;
|
||||
const operationLogService = ctx.service && ctx.service.systems && ctx.service.systems.operationLog;
|
||||
const requestOptions = options && typeof options === 'object' ? options : {};
|
||||
const operator = this.getOrderLogOperator();
|
||||
let operator = this.getOrderLogOperator();
|
||||
const warehouseId = this.getOrderLogWarehouseId(requestOptions.warehouseId ?? requestOptions.warehouse_id);
|
||||
// 根据创建渠道覆盖操作人名称
|
||||
const createChannel = String(requestOptions.createChannel ?? requestOptions.create_channel ?? '').trim().toUpperCase();
|
||||
if (createChannel === 'QM') {
|
||||
operator = { id: null, name: '奇门' };
|
||||
} else if (createChannel === 'API') {
|
||||
operator = { id: null, name: 'API' };
|
||||
}
|
||||
|
||||
if (!Array.isArray(operationLogs) || operationLogs.length === 0) {
|
||||
return;
|
||||
@ -609,6 +616,12 @@ class DeliveryOrderService extends Service {
|
||||
info = { ...info, warehouseId: warehouseIdStr };
|
||||
const DeliveryModel = await ctx.model.OrderDeliveryFactory.getCurrentModel(warehouseIdStr);
|
||||
const { deliveryOrder, orderLines } = data.request;
|
||||
|
||||
// 请求级 extendProps,携带 ewaybill_order_code 等关键字段
|
||||
const requestExtendProps = (data.request && data.request.extendProps && Object.keys(data.request.extendProps).length > 0)
|
||||
? data.request.extendProps
|
||||
: undefined;
|
||||
|
||||
const normalizedCreateChannel = String(
|
||||
createChannel
|
||||
|| deliveryOrder.createChannel
|
||||
@ -653,7 +666,8 @@ class DeliveryOrderService extends Service {
|
||||
info,
|
||||
normalizedCreateChannel,
|
||||
step,
|
||||
operationLogs
|
||||
operationLogs,
|
||||
requestExtendProps
|
||||
);
|
||||
|
||||
// 创建订单
|
||||
@ -721,6 +735,7 @@ class DeliveryOrderService extends Service {
|
||||
|
||||
await this.flushOrderOperationLogs(operationLogs, orderId, {
|
||||
warehouseId: info.warehouseId,
|
||||
createChannel: normalizedCreateChannel,
|
||||
});
|
||||
|
||||
// 异步处理订单后续流程
|
||||
@ -748,8 +763,10 @@ class DeliveryOrderService extends Service {
|
||||
|
||||
} catch (error) {
|
||||
console.error('创建订单失败:', error);
|
||||
// 回滚事务
|
||||
await transaction.rollback();
|
||||
// 回滚事务(安全处理,防止事务已结束导致二次回滚异常)
|
||||
await transaction.rollback().catch(rollbackErr => {
|
||||
console.error('回滚事务失败:', rollbackErr.message);
|
||||
});
|
||||
|
||||
return {
|
||||
success: false,
|
||||
@ -952,6 +969,7 @@ class DeliveryOrderService extends Service {
|
||||
* @param {string} [createChannel='MANUAL'] 订单创建渠道标识。
|
||||
* @param {number} step 订单步骤。
|
||||
* @param {Array<Object>} [operationLogs=[]] 待写入的操作日志数组。
|
||||
* @param {Object} [requestExtendProps] 请求级扩展属性,携带 ewaybill_order_code 等关键字段。
|
||||
* @return {Promise<Object>} 可入库的订单数据。
|
||||
*/
|
||||
async prepareOrderData(
|
||||
@ -959,7 +977,8 @@ class DeliveryOrderService extends Service {
|
||||
info,
|
||||
createChannel = 'MANUAL',
|
||||
step = DELIVERY_ORDER_STEP.PENDING_REVIEW,
|
||||
operationLogs = []
|
||||
operationLogs = [],
|
||||
requestExtendProps
|
||||
) {
|
||||
const {
|
||||
deliveryOrderCode,
|
||||
@ -1065,8 +1084,10 @@ class DeliveryOrderService extends Service {
|
||||
town: receiverInfo?.town || '',
|
||||
detail_address: receiverInfo?.detailAddress || '',
|
||||
zip_code: receiverInfo?.zipCode || '',
|
||||
oaid: receiverInfo?.oaid || '',
|
||||
// 发件人信息(如果需要存储)
|
||||
// 业务关联ID
|
||||
extend_props: requestExtendProps || null,
|
||||
store_id: info.storeId,
|
||||
warehouse_id: info.warehouseId,
|
||||
from_key: this.normalizeOrderFromKey(info.appKey),
|
||||
@ -1084,7 +1105,7 @@ class DeliveryOrderService extends Service {
|
||||
*/
|
||||
async addOrderLines(orderLines, orderId, info, transaction) {
|
||||
const { ctx, app } = this;
|
||||
const { warehouseId, appKey, storeId, createChannel } = info;
|
||||
const { warehouseId, appKey, storeId } = info;
|
||||
let order_items = [];
|
||||
|
||||
if (orderLines && typeof orderLines === 'object') {
|
||||
@ -1109,8 +1130,15 @@ class DeliveryOrderService extends Service {
|
||||
const errors = [];
|
||||
const stockQuantityMap = new Map(); // stock_id -> 数量
|
||||
const stockWeightMap = new Map(); // stock_id -> 单件重量(grossWeight)
|
||||
const processedItemIds = new Set();
|
||||
|
||||
// 预取签约策略配置(避免锁内查DB,减少锁持有时间)
|
||||
const oversellConfig = await ctx.service.systems.stockStore
|
||||
.getStoreWarehousePolicyByStoreAndWarehouse(storeId, warehouseId);
|
||||
|
||||
// ===== Phase 1: 解析阶段(不锁)=====
|
||||
// 遍历所有 orderLine,解析 StockStore、验证数据、合并重复商品,
|
||||
// 但不对 wms_stock_warehouse 加锁,避免因传入顺序不同导致死锁。
|
||||
const resolvedItems = [];
|
||||
for (let i = 0; i < order_items.length; i++) {
|
||||
const line = order_items[i];
|
||||
|
||||
@ -1158,60 +1186,75 @@ class DeliveryOrderService extends Service {
|
||||
|
||||
const itemId = parseInt(wms_stock.id);
|
||||
const stockId = Number(wms_stock.stock_id) || 0;
|
||||
// ========== 核心库存检查逻辑 ==========
|
||||
|
||||
if (!stockId) {
|
||||
errors.push(`第${i + 1}行: 商品《${wms_stock.item_name}》库存记录不存在`);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (processedItemIds.has(itemId)) {
|
||||
errors.push(`第${i + 1}行: 商品《${wms_stock.item_name}》在同一订单中重复出现`);
|
||||
// 重复商品:累加到已存在的条目
|
||||
const existingIdx = resolvedItems.findIndex(ri => ri.itemId === itemId);
|
||||
if (existingIdx >= 0) {
|
||||
resolvedItems[existingIdx].planQty += planQty;
|
||||
ctx.logger.info(`[addOrderLines] 合并重复行: itemId=${itemId}, 额外数量=${planQty}, 累加后=${resolvedItems[existingIdx].planQty}`);
|
||||
continue;
|
||||
}
|
||||
processedItemIds.add(itemId);
|
||||
|
||||
// 锁定库存
|
||||
const lockResult = await ctx.service.systems.stockStore.lockItemStorages(
|
||||
resolvedItems.push({
|
||||
itemId,
|
||||
stockId,
|
||||
planQty,
|
||||
transaction
|
||||
wms_stock,
|
||||
line,
|
||||
lineIndex: i,
|
||||
});
|
||||
}
|
||||
|
||||
// ===== Sort: 按 stockId 升序排序,保证所有事务加锁顺序一致,从根本上消除死锁 =====
|
||||
resolvedItems.sort((a, b) => a.stockId - b.stockId);
|
||||
|
||||
// ===== Phase 2: 锁定阶段(按排序后顺序逐个加锁)=====
|
||||
for (const item of resolvedItems) {
|
||||
const lockResult = await ctx.service.systems.stockStore.lockItemStorages(
|
||||
item.stockId,
|
||||
item.planQty,
|
||||
transaction,
|
||||
oversellConfig
|
||||
);
|
||||
|
||||
if (!lockResult.success) {
|
||||
errors.push(`SKU${wms_stock.id}商品《${wms_stock.item_name}》编码《${wms_stock.item_code}》\n锁定失败: ${lockResult.error}`);
|
||||
errors.push(`SKU${item.wms_stock.id}商品《${item.wms_stock.item_name}》编码《${item.wms_stock.item_code}》\n锁定失败: ${lockResult.error}`);
|
||||
continue;
|
||||
}
|
||||
|
||||
const totalQtyForStock = (stockQuantityMap.get(stockId) || 0) + planQty;
|
||||
stockQuantityMap.set(stockId, totalQtyForStock);
|
||||
const totalQtyForStock = (stockQuantityMap.get(item.stockId) || 0) + item.planQty;
|
||||
stockQuantityMap.set(item.stockId, totalQtyForStock);
|
||||
|
||||
const weight = parseFloat(wms_stock.gross_weight) || 0;
|
||||
stockWeightMap.set(stockId, weight);
|
||||
// ========== 库存检查逻辑结束 ==========
|
||||
const weight = parseFloat(item.wms_stock.gross_weight) || 0;
|
||||
stockWeightMap.set(item.stockId, weight);
|
||||
|
||||
// 所有检查通过,准备订单行数据
|
||||
lineData.push({
|
||||
order_id: orderId,
|
||||
actual_price: this.safeParseFloat(line.actualPrice, 0),
|
||||
retail_price: this.safeParseFloat(line.retailPrice, 0),
|
||||
ext_code: line.extCode || '',
|
||||
inventory_type: line.inventoryType || '',
|
||||
item_code: line.itemCode || '',
|
||||
item_id: itemId,
|
||||
item_name: line.itemName || '',
|
||||
order_line_no: line.orderLineNo || `${i + 1}`,
|
||||
owner_code: line.ownerCode || '',
|
||||
plan_qty: planQty,
|
||||
source_order_code: line.sourceOrderCode || '',
|
||||
sub_source_order_code: line.subSourceOrderCode || '',
|
||||
extend_props: line.extendProps ?
|
||||
(typeof line.extendProps === 'string' ? line.extendProps : JSON.stringify(line.extendProps))
|
||||
actual_price: this.safeParseFloat(item.line.actualPrice, 0),
|
||||
retail_price: this.safeParseFloat(item.line.retailPrice, 0),
|
||||
ext_code: item.line.extCode || '',
|
||||
inventory_type: item.line.inventoryType || '',
|
||||
item_code: item.line.itemCode || '',
|
||||
item_id: item.itemId,
|
||||
item_name: item.line.itemName || '',
|
||||
order_line_no: item.line.orderLineNo || `${item.lineIndex + 1}`,
|
||||
owner_code: item.line.ownerCode || '',
|
||||
plan_qty: item.planQty,
|
||||
source_order_code: item.line.sourceOrderCode || '',
|
||||
sub_source_order_code: item.line.subSourceOrderCode || '',
|
||||
extend_props: item.line.extendProps ?
|
||||
(typeof item.line.extendProps === 'string' ? item.line.extendProps : JSON.stringify(item.line.extendProps))
|
||||
: null,
|
||||
stock_id: stockId,
|
||||
item_snapshot: this.buildOrderItemSnapshot(wms_stock, line),
|
||||
stock_id: item.stockId,
|
||||
item_snapshot: this.buildOrderItemSnapshot(item.wms_stock, item.line),
|
||||
// 可选:记录重量信息到明细
|
||||
item_weight: stockWeightMap.get(stockId) || 0,
|
||||
item_weight: stockWeightMap.get(item.stockId) || 0,
|
||||
});
|
||||
}
|
||||
|
||||
@ -1270,8 +1313,8 @@ class DeliveryOrderService extends Service {
|
||||
itemEntries.set(iid, (itemEntries.get(iid) || 0) + qty);
|
||||
}
|
||||
items_str = Array.from(itemEntries.entries())
|
||||
.sort(([a], [b]) => a - b)
|
||||
.map(([iid, qty]) => `${iid}+${qty}`)
|
||||
.sort(([ a ], [ b ]) => a - b)
|
||||
.map(([ iid, qty ]) => `${iid}+${qty}`)
|
||||
.join('|');
|
||||
source_order_codes = new Set(lineData.map(line => line.source_order_code).filter(code => code));
|
||||
|
||||
@ -1507,6 +1550,70 @@ class DeliveryOrderService extends Service {
|
||||
return [ '1', 'true', 'yes', 'on' ].includes(normalizedText);
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析截单配置,货主-仓库级优先,未启用时由仓库级兜底。
|
||||
*
|
||||
* @param {Object} policyConfig 货主-仓库级策略配置。
|
||||
* @param {Object|null} warehouseSubjectConfig 仓库级主体配置。
|
||||
* @return {{cutoffEnabled: boolean, cutoffTime: string}} 最终生效的截单开关与截单时间。
|
||||
*/
|
||||
resolveCutoffOrderConfig(policyConfig, warehouseSubjectConfig) {
|
||||
const policyEnabled = this.normalizePolicyFlag(
|
||||
(policyConfig && policyConfig.cutoff_order_enabled)
|
||||
);
|
||||
const policyTime = (policyConfig && typeof policyConfig.cutoff_order_time === 'string'
|
||||
? policyConfig.cutoff_order_time.trim()
|
||||
: '') || '18:00';
|
||||
|
||||
// 货主-仓库级已启用截单,直接使用
|
||||
if (policyEnabled) {
|
||||
return {
|
||||
cutoffEnabled: true,
|
||||
cutoffTime: policyTime,
|
||||
};
|
||||
}
|
||||
|
||||
// 货主-仓库级未启用,由仓库级兜底
|
||||
if (warehouseSubjectConfig && warehouseSubjectConfig.cutoff_order_enabled) {
|
||||
const warehouseTime = (typeof warehouseSubjectConfig.cutoff_order_time === 'string'
|
||||
? warehouseSubjectConfig.cutoff_order_time.trim()
|
||||
: '') || '18:00';
|
||||
return {
|
||||
cutoffEnabled: true,
|
||||
cutoffTime: warehouseTime,
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
cutoffEnabled: false,
|
||||
cutoffTime: '18:00',
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断当前时间是否已超过指定截单时间。
|
||||
*
|
||||
* @param {string} cutoffTimeStr 截单时间,格式 HH:mm。
|
||||
* @return {boolean} 是否已超过截单时间。
|
||||
*/
|
||||
isPastCutoffTime(cutoffTimeStr) {
|
||||
if (!cutoffTimeStr || typeof cutoffTimeStr !== 'string') {
|
||||
return false;
|
||||
}
|
||||
|
||||
const trimmed = cutoffTimeStr.trim();
|
||||
if (!/^\d{2}:\d{2}$/.test(trimmed)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const now = new Date();
|
||||
const [ hours, minutes ] = trimmed.split(':').map(Number);
|
||||
const cutoffTotalMinutes = hours * 60 + minutes;
|
||||
const nowTotalMinutes = now.getHours() * 60 + now.getMinutes();
|
||||
|
||||
return nowTotalMinutes >= cutoffTotalMinutes;
|
||||
}
|
||||
|
||||
/**
|
||||
* 构建自动加团结构信息。
|
||||
*
|
||||
@ -1528,7 +1635,7 @@ class DeliveryOrderService extends Service {
|
||||
return null;
|
||||
}
|
||||
|
||||
const logisticsName = String(order.logistics_name || '').trim();
|
||||
const logisticsName = String(order.sys_logistics_code || '').trim();
|
||||
const mergedItemDetails = typeof waveService.mergeOrderItemDetails === 'function'
|
||||
? waveService.mergeOrderItemDetails(context && context.orderItemRows ? context.orderItemRows : [])
|
||||
: [];
|
||||
@ -1679,6 +1786,14 @@ class DeliveryOrderService extends Service {
|
||||
transaction,
|
||||
});
|
||||
|
||||
await ctx.service.systemMethods.order.wave.rebuildOrderWaveIndex({
|
||||
warehouseId,
|
||||
waveId: normalizedWaveId,
|
||||
orderIds: [ orderId ],
|
||||
orderModel: DeliveryModel,
|
||||
transaction,
|
||||
});
|
||||
|
||||
await ctx.model.query(`
|
||||
UPDATE wms_wave_batch
|
||||
SET total_orders = total_orders + 1,
|
||||
@ -1694,6 +1809,38 @@ class DeliveryOrderService extends Service {
|
||||
});
|
||||
|
||||
await transaction.commit();
|
||||
|
||||
// 写入订单操作日志:自动加团
|
||||
try {
|
||||
const operationLogService = this.ctx
|
||||
&& this.ctx.service
|
||||
&& this.ctx.service.systems
|
||||
&& this.ctx.service.systems.operationLog;
|
||||
if (operationLogService && typeof operationLogService.createOperationLogs === 'function') {
|
||||
await operationLogService.createOperationLogs([{
|
||||
businessType: 'order',
|
||||
businessId: `${orderId}`,
|
||||
operationCode: 'ORDER_WAVE_AUTO_GROUP',
|
||||
operator: {
|
||||
id: null,
|
||||
name: 'system',
|
||||
},
|
||||
extras: {
|
||||
message: `自动加团到波次 ${wave.wave_no || normalizedWaveId}`,
|
||||
warehouseId,
|
||||
waveId: normalizedWaveId,
|
||||
waveNo: wave.wave_no || '',
|
||||
},
|
||||
}]);
|
||||
}
|
||||
} catch (e) {
|
||||
this.ctx.logger.warn('[delivery_order.appendOrderToWave] 写入 operation_log 失败,不影响主流程', {
|
||||
error: e && e.message,
|
||||
orderId,
|
||||
waveId: normalizedWaveId,
|
||||
});
|
||||
}
|
||||
|
||||
return true;
|
||||
} catch (error) {
|
||||
await transaction.rollback();
|
||||
@ -1717,7 +1864,7 @@ class DeliveryOrderService extends Service {
|
||||
step: { [ctx.app.Sequelize.Op.in]: [ 1, 2, 3 ] },
|
||||
status: { [ctx.app.Sequelize.Op.ne]: 'cancel' },
|
||||
outbound_status: { [ctx.app.Sequelize.Op.ne]: 'padding' },
|
||||
logistics_name: structure.logisticsName,
|
||||
sys_logistics_code: structure.logisticsName,
|
||||
};
|
||||
where[structure.itemPartType] = structure.itemPart;
|
||||
|
||||
@ -1743,6 +1890,7 @@ class DeliveryOrderService extends Service {
|
||||
item_part: structure.itemPart,
|
||||
distinguish_express: true,
|
||||
logistics_name: structure.logisticsName,
|
||||
sys_logistics_code: structure.logisticsName,
|
||||
item_snapshot_key: structure.itemSnapshotKey,
|
||||
item_detail_machine: structure.itemDetailMachine,
|
||||
quantity: maxWaveQuantity,
|
||||
@ -1866,6 +2014,7 @@ class DeliveryOrderService extends Service {
|
||||
}
|
||||
|
||||
await this.finishAutoGroupingIfNeeded(context, matchedAutoGroupingWaveId, maxWaveQuantity);
|
||||
// appendOrderToWave 内部已写入 ORDER_WAVE_AUTO_GROUP 日志
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1889,6 +2038,42 @@ class DeliveryOrderService extends Service {
|
||||
|
||||
await this.markWaveAutoGrouping(context, createdWaveIds);
|
||||
await this.finishAutoGroupingIfNeeded(context, createdWaveIds[0], maxWaveQuantity);
|
||||
|
||||
// 写入 ORDER_WAVE_AUTO_GROUP 日志(新建波次路径)
|
||||
if (context.orderId) {
|
||||
try {
|
||||
const waveRows = await ctx.model.query(`
|
||||
SELECT wave_no FROM wms_wave_batch
|
||||
WHERE warehouse_id = :warehouseId AND wave_id = :waveId
|
||||
LIMIT 1
|
||||
`, {
|
||||
replacements: { warehouseId: context.warehouseId, waveId: createdWaveIds[0] },
|
||||
type: ctx.model.QueryTypes.SELECT,
|
||||
});
|
||||
const waveNo = (Array.isArray(waveRows) && waveRows[0]) ? String(waveRows[0].wave_no || '').trim() : '';
|
||||
const opLogService = ctx.service && ctx.service.systems && ctx.service.systems.operationLog;
|
||||
if (opLogService && typeof opLogService.createOperationLogs === 'function') {
|
||||
await opLogService.createOperationLogs([{
|
||||
businessType: 'order',
|
||||
businessId: `${context.orderId}`,
|
||||
operationCode: 'ORDER_WAVE_AUTO_GROUP',
|
||||
operator: { id: null, name: 'system' },
|
||||
extras: {
|
||||
message: `自动加团到波次 ${waveNo || createdWaveIds[0]}`,
|
||||
warehouseId: context.warehouseId,
|
||||
waveId: createdWaveIds[0],
|
||||
waveNo,
|
||||
},
|
||||
}]);
|
||||
}
|
||||
} catch (e) {
|
||||
ctx.logger.warn('[delivery_order.runAutoGrouping] 写入 ORDER_WAVE_AUTO_GROUP 日志失败', {
|
||||
error: e && e.message,
|
||||
orderId: context.orderId,
|
||||
waveId: createdWaveIds[0],
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1933,8 +2118,18 @@ class DeliveryOrderService extends Service {
|
||||
}
|
||||
|
||||
const policyConfig = await this.getStoreWarehousePolicyConfig(context.storeId, context.warehouseId);
|
||||
const isAutoAllocateExpressEnabled = this.normalizePolicyFlag(policyConfig.auto_allocate_express);
|
||||
const isAutoAllocateStorageEnabled = this.normalizePolicyFlag(policyConfig.auto_allocate_storage);
|
||||
|
||||
// 截单时间兜底:货主-仓库级未启用时,fallback 到仓库级配置
|
||||
const warehouseSubjectConfig = await this.getStoreSubjectConfig(context.warehouseId);
|
||||
const { cutoffEnabled, cutoffTime } = this.resolveCutoffOrderConfig(policyConfig, warehouseSubjectConfig);
|
||||
|
||||
const isCutoffActive = cutoffEnabled && this.isPastCutoffTime(cutoffTime);
|
||||
|
||||
// 如果需要审核,不触发自动分配快递、储位、加团
|
||||
const needApproval = Number(policyConfig && policyConfig.need_order_approval) !== 0;
|
||||
|
||||
const isAutoAllocateExpressEnabled = !isCutoffActive && !needApproval && this.normalizePolicyFlag(policyConfig.auto_allocate_express);
|
||||
const isAutoAllocateStorageEnabled = !isCutoffActive && !needApproval && this.normalizePolicyFlag(policyConfig.auto_allocate_storage);
|
||||
|
||||
if (isAutoAllocateExpressEnabled) {
|
||||
await this.runAsyncProcessStep('allocateExpress', async () => {
|
||||
@ -1960,9 +2155,11 @@ class DeliveryOrderService extends Service {
|
||||
});
|
||||
}
|
||||
|
||||
await this.runAsyncProcessStep('autoGrouping', async () => {
|
||||
await this.runAutoGrouping(context);
|
||||
});
|
||||
if (!isCutoffActive && !needApproval) {
|
||||
await this.runAsyncProcessStep('autoGrouping', async () => {
|
||||
await this.runAutoGrouping(context);
|
||||
});
|
||||
}
|
||||
|
||||
await this.runAsyncProcessStep('waveStrategyQuickScan', async () => {
|
||||
await this.withPatchedCtxUser({
|
||||
|
||||
@ -2,9 +2,19 @@
|
||||
const Service = require('egg').Service;
|
||||
|
||||
class entryOrderService extends Service {
|
||||
async addOrder(data, info, fromCode) {
|
||||
/**
|
||||
* 创建入库单(含明细行校验与插入)。
|
||||
* @param {Object} data 请求体,包含 request.entryOrder 与 request.orderLines
|
||||
* @param {Object} info 上下文信息 { storeId, warehouseId, appKey, customerId, warehouseCode }
|
||||
* @param {string} fromCode 来源标识(WMS / API / QM)
|
||||
* @param {Object} [options={}] 可选配置
|
||||
* @param {boolean} [options.autoReview=false] 是否自动审核,true 时入库单创建后状态直接变为 PENDING
|
||||
* @return {Promise<Object>} { success, message, data: { entryOrderId, entryOrderCode, createTime, warehouseCode, status } }
|
||||
*/
|
||||
async addOrder(data, info, fromCode, options = {}) {
|
||||
const { autoReview = false } = options;
|
||||
const { storeId, warehouseId, appKey, customerId, warehouseCode } = info;
|
||||
const { app } = this;
|
||||
const { app, ctx } = this;
|
||||
const transaction = await app.model.transaction(); // 开启事务
|
||||
|
||||
try {
|
||||
@ -51,14 +61,14 @@ class entryOrderService extends Service {
|
||||
await transaction.rollback(); // 验证失败,回滚事务
|
||||
return {
|
||||
success: false,
|
||||
message: '创建入库单失败,失败原因:\n' + errors.join('\n'),
|
||||
message: `创建入库单失败,失败原因:\n${errors.join('\n')}`,
|
||||
data: {
|
||||
createTime: new Date(),
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
// 创建入库单(内部也使用事务)
|
||||
// 创建入库单(内部也使用事务),autoReview 在 addOrder 层控制最终状态
|
||||
const order = await this.tryCreateEntryOrder(
|
||||
data.request.entryOrder,
|
||||
appKey,
|
||||
@ -110,10 +120,13 @@ class entryOrderService extends Service {
|
||||
const lineCount = await this.getLineCount(orderId, transaction);
|
||||
const expectedTotalOrderLines = Number(totalOrderLines) || 0;
|
||||
|
||||
// autoReview 决定最终状态:true → PENDING(已审核),false → CREATED(已创建待审核)
|
||||
const finalStatus = autoReview ? 'PENDING' : 'CREATED';
|
||||
|
||||
if (lineCount === expectedTotalOrderLines) {
|
||||
// 所有明细行已插入完毕,将状态从 CREATING 更新为 PENDING(等待收货)
|
||||
// 所有明细行已插入完毕,将状态从 CREATING 更新为目标状态
|
||||
await app.model.EntryOrder.update(
|
||||
{ order_status: 'PENDING', updated_at: new Date() },
|
||||
{ order_status: finalStatus, updated_at: new Date() },
|
||||
{ where: { id: orderId, warehouse_id: warehouseId, store_id: storeId }, transaction }
|
||||
);
|
||||
}
|
||||
@ -121,16 +134,25 @@ class entryOrderService extends Service {
|
||||
// 提交事务
|
||||
await transaction.commit();
|
||||
|
||||
// 异步匹配收货单并写入绑定关系(不阻塞 addOrder 返回)
|
||||
if (lineCount === expectedTotalOrderLines) {
|
||||
setImmediate(() => {
|
||||
ctx.service.systems.receivingEntryMatch.matchAfterEntryCompleted(orderId).catch(err => {
|
||||
ctx.logger.error(`[addOrder] 异步匹配收货单异常: ${err.message}`, err.stack);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
if (lineCount === expectedTotalOrderLines) {
|
||||
return {
|
||||
success: true,
|
||||
message: '入库单创建完成,等待收货',
|
||||
message: '入库单创建完成',
|
||||
data: {
|
||||
entryOrderId: orderId,
|
||||
entryOrderCode: orderCode,
|
||||
createTime: new Date(),
|
||||
warehouseCode,
|
||||
status: 'PENDING',
|
||||
status: finalStatus,
|
||||
},
|
||||
};
|
||||
}
|
||||
@ -163,7 +185,12 @@ class entryOrderService extends Service {
|
||||
}
|
||||
}
|
||||
|
||||
// 辅助函数:获取行数(支持事务)
|
||||
/**
|
||||
* 获取入库单的明细行数(支持事务)。
|
||||
* @param {number} orderId 入库单ID
|
||||
* @param {Object|null} [transaction=null] 可选事务对象
|
||||
* @return {Promise<number>} 明细行数
|
||||
*/
|
||||
async getLineCount(orderId, transaction = null) {
|
||||
const { app } = this;
|
||||
const options = {
|
||||
@ -178,7 +205,14 @@ class entryOrderService extends Service {
|
||||
return count;
|
||||
}
|
||||
|
||||
// 辅助函数:标记为已接收(支持事务)
|
||||
/**
|
||||
* 标记入库单为已完成(支持事务)。
|
||||
* @param {number} orderId 入库单ID
|
||||
* @param {number} warehouseId 仓库ID
|
||||
* @param {number} storeId 货主ID
|
||||
* @param {Object|null} [transaction=null] 可选事务对象
|
||||
* @return {Promise<void>}
|
||||
*/
|
||||
async received(orderId, warehouseId, storeId, transaction = null) {
|
||||
const { app } = this;
|
||||
const updateData = {
|
||||
@ -254,7 +288,7 @@ class entryOrderService extends Service {
|
||||
{
|
||||
model: ctx.model.StockWarehouse,
|
||||
as: 'stock',
|
||||
attributes: [ 'product_code', 'product_name' ],
|
||||
attributes: [ 'item_code', 'item_name' ],
|
||||
},
|
||||
],
|
||||
},
|
||||
@ -356,8 +390,6 @@ class entryOrderService extends Service {
|
||||
|
||||
const stats = {
|
||||
pending: 0,
|
||||
confirmed: 0,
|
||||
partial_received: 0,
|
||||
completed: 0,
|
||||
cancelled: 0,
|
||||
total: 0,
|
||||
@ -414,10 +446,9 @@ class entryOrderService extends Service {
|
||||
}
|
||||
|
||||
const validTransitions = {
|
||||
PENDING: [ 'CONFIRMED', 'CANCELLED' ],
|
||||
CONFIRMED: [ 'PARTIAL_RECEIVED', 'COMPLETED', 'CANCELLED' ],
|
||||
PARTIAL_RECEIVED: [ 'COMPLETED', 'CANCELLED' ],
|
||||
CREATING: [ 'PENDING', 'CANCELLED' ],
|
||||
CREATED: [ 'PENDING', 'CANCELLED' ],
|
||||
PENDING: [ 'COMPLETED', 'CANCELLED' ],
|
||||
CREATING: [ 'CREATED', 'CANCELLED' ],
|
||||
};
|
||||
|
||||
const allowedTransitions = validTransitions[order.order_status];
|
||||
@ -566,6 +597,21 @@ class entryOrderService extends Service {
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 尝试创建入库单(含去重与状态校验)。
|
||||
* 若入库单已存在且状态为 CREATING,则复用该记录;否则新建,初始状态为 CREATING。
|
||||
* 最终状态(CREATED / PENDING)由调用方 addOrder 根据 autoReview 决定。
|
||||
* @param {Object} order 入库单基本信息
|
||||
* @param {string} appKey 应用标识
|
||||
* @param {number} storeId 货主ID
|
||||
* @param {number} warehouseId 仓库ID
|
||||
* @param {number} totalOrderLines 总行数
|
||||
* @param {string} sourceType 来源类型(WMS / API / QM)
|
||||
* @param {string|null} qimenOwnerCode 奇门货主编码
|
||||
* @param {string|null} qimenWarehouseCode 奇门仓库编码
|
||||
* @param {Object|null} [transaction=null] 外部事务对象
|
||||
* @return {Promise<Object>} { success, code, message, entryOrderId, entryOrderCode, orderStatus, error? }
|
||||
*/
|
||||
async tryCreateEntryOrder(order, appKey, storeId, warehouseId, totalOrderLines, sourceType, qimenOwnerCode, qimenWarehouseCode, transaction = null) {
|
||||
const { ctx } = this;
|
||||
|
||||
@ -835,7 +881,7 @@ class entryOrderService extends Service {
|
||||
}
|
||||
|
||||
// 状态检查
|
||||
const allowedStatuses = [ 'PENDING', 'PARTIAL_RECEIVED', 'CONFIRMED' ];
|
||||
const allowedStatuses = [ 'CREATED', 'PENDING' ];
|
||||
if (!allowedStatuses.includes(entryOrder.order_status)) {
|
||||
await transaction.rollback();
|
||||
return {
|
||||
@ -953,11 +999,8 @@ class entryOrderService extends Service {
|
||||
if (isFin) {
|
||||
newOrderStatus = 'COMPLETED';
|
||||
} else if (totalConfirmIncrement > 0) {
|
||||
if (entryOrder.order_status === 'PENDING') {
|
||||
newOrderStatus = 'CONFIRMED';
|
||||
} else {
|
||||
newOrderStatus = 'PARTIAL_RECEIVED';
|
||||
}
|
||||
// CREATED 确认后变为 PENDING,PENDING 确认后保持 PENDING(多次收货确认)
|
||||
newOrderStatus = 'PENDING';
|
||||
}
|
||||
|
||||
const updateResult = await app.model.EntryOrder.update({
|
||||
|
||||
@ -340,6 +340,249 @@ class ExpressPlatformService extends MainService {
|
||||
return `express_platform_trace_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* 清理平台取号失败的订单资源。
|
||||
*
|
||||
* 回退 print_quantity_locked、硬删除 OrderExpress(status=0) 记录、
|
||||
* 标记订单异常、写失败日志。所有清理步骤在事务内完成,保证原子性。
|
||||
*
|
||||
* @param {Array<{order_id: number, business_key: number, warehouse_id: number, store_id?: number}>} failedOrders 失败订单列表。
|
||||
* @param {string} reason 失败原因描述。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
async cleanupFailedWaybillOrders(failedOrders, reason) {
|
||||
const normalizedFailedOrders = Array.isArray(failedOrders) ? failedOrders : [];
|
||||
if (normalizedFailedOrders.length === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
const traceId = this.buildExpressPlatformTraceId();
|
||||
const normalizedReason = String(reason || '未知失败').trim();
|
||||
this.ctx.logger.info('[expressPlatform.cleanupFailedWaybillOrders] 开始清理失败订单资源', {
|
||||
traceId,
|
||||
failedCount: normalizedFailedOrders.length,
|
||||
reason: normalizedReason,
|
||||
failedOrderKeys: normalizedFailedOrders.map(o => `${o.warehouse_id}_${o.order_id}_${o.business_key}`).join(','),
|
||||
});
|
||||
|
||||
const { Op } = this.app.Sequelize;
|
||||
const storeWarehouseModel = this.ctx.model && this.ctx.model.StoreWarehouse;
|
||||
const orderExpressModel = this.ctx.model && this.ctx.model.OrderExpress;
|
||||
|
||||
try {
|
||||
// 1) 按 store_id:warehouse_id 聚合回退 lock 量
|
||||
const restoreRelationMap = new Map();
|
||||
for (const order of normalizedFailedOrders) {
|
||||
const storeId = Number(order.store_id) || 0;
|
||||
const warehouseId = Number(order.warehouse_id) || 0;
|
||||
if (!storeId || !warehouseId) {
|
||||
continue;
|
||||
}
|
||||
const relationKey = `${storeId}:${warehouseId}`;
|
||||
const currentRelation = restoreRelationMap.get(relationKey) || {
|
||||
store_id: storeId,
|
||||
warehouse_id: warehouseId,
|
||||
failed_count: 0,
|
||||
};
|
||||
currentRelation.failed_count += 1;
|
||||
restoreRelationMap.set(relationKey, currentRelation);
|
||||
}
|
||||
|
||||
if (restoreRelationMap.size > 0 && storeWarehouseModel && typeof storeWarehouseModel.findAll === 'function') {
|
||||
const restoreRelationList = Array.from(restoreRelationMap.values());
|
||||
const restoreRows = await storeWarehouseModel.findAll({
|
||||
attributes: [ 'id', 'store_id', 'warehouse_id', 'print_quantity_locked' ],
|
||||
where: {
|
||||
[Op.or]: restoreRelationList.map(item => ({
|
||||
store_id: item.store_id,
|
||||
warehouse_id: item.warehouse_id,
|
||||
})),
|
||||
},
|
||||
raw: true,
|
||||
});
|
||||
|
||||
const restoreRowMap = new Map();
|
||||
for (const row of Array.isArray(restoreRows) ? restoreRows : []) {
|
||||
const relationKey = `${Number(row && row.store_id) || 0}:${Number(row && row.warehouse_id) || 0}`;
|
||||
if (relationKey !== '0:0') {
|
||||
restoreRowMap.set(relationKey, row);
|
||||
}
|
||||
}
|
||||
|
||||
const canIncrementLockedQuantity = typeof storeWarehouseModel.increment === 'function';
|
||||
|
||||
for (const item of restoreRelationList) {
|
||||
const relationKey = `${item.store_id}:${item.warehouse_id}`;
|
||||
const row = restoreRowMap.get(relationKey);
|
||||
if (!row) {
|
||||
continue;
|
||||
}
|
||||
|
||||
const currentLockedQuantity = Math.max(0, Number(row.print_quantity_locked || 0));
|
||||
const restoreQuantity = Math.min(currentLockedQuantity, item.failed_count);
|
||||
if (restoreQuantity <= 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (canIncrementLockedQuantity) {
|
||||
await storeWarehouseModel.increment('print_quantity_locked', {
|
||||
by: -restoreQuantity,
|
||||
where: {
|
||||
id: row.id,
|
||||
},
|
||||
});
|
||||
} else {
|
||||
await storeWarehouseModel.update({
|
||||
print_quantity_locked: currentLockedQuantity - restoreQuantity,
|
||||
}, {
|
||||
where: {
|
||||
id: row.id,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
// 记录回退流水
|
||||
try {
|
||||
await this.ctx.model.StoreWarehousePrintQuantityLog.create({
|
||||
contract_id: Number(row.id || 0),
|
||||
store_id: Number(row.store_id || 0),
|
||||
warehouse_id: Number(row.warehouse_id || 0),
|
||||
change_type: 'order_restore',
|
||||
business_type: 'order_express',
|
||||
business_id: null,
|
||||
change_quantity: -restoreQuantity,
|
||||
balance_before: Math.max(0, currentLockedQuantity),
|
||||
balance_after: Math.max(0, currentLockedQuantity - restoreQuantity),
|
||||
reason: `平台取号失败回退锁定: ${normalizedReason}`,
|
||||
operator_id: null,
|
||||
created_by: null,
|
||||
});
|
||||
} catch (logError) {
|
||||
this.ctx.logger.error('[expressPlatform.cleanupFailedWaybillOrders] 回退流水写入失败', {
|
||||
traceId,
|
||||
error: logError && logError.message ? logError.message : `${logError}`,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 2) 硬删除 OrderExpress(status=0) 记录
|
||||
if (orderExpressModel && typeof orderExpressModel.destroy === 'function') {
|
||||
const deleteConditions = [];
|
||||
for (const order of normalizedFailedOrders) {
|
||||
const orderId = Number(order.order_id) || 0;
|
||||
const businessKey = Number(order.business_key) || 0;
|
||||
if (!orderId || !businessKey) {
|
||||
continue;
|
||||
}
|
||||
deleteConditions.push({
|
||||
order_id: orderId,
|
||||
business_key: businessKey,
|
||||
});
|
||||
}
|
||||
|
||||
if (deleteConditions.length > 0) {
|
||||
try {
|
||||
await orderExpressModel.destroy({
|
||||
where: {
|
||||
[Op.or]: deleteConditions,
|
||||
status: 0,
|
||||
},
|
||||
});
|
||||
} catch (destroyError) {
|
||||
this.ctx.logger.error('[expressPlatform.cleanupFailedWaybillOrders] 硬删除 OrderExpress 失败', {
|
||||
traceId,
|
||||
error: destroyError && destroyError.message ? destroyError.message : `${destroyError}`,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 3) 标记订单异常
|
||||
const failedOrderIds = normalizedFailedOrders
|
||||
.map(order => Number(order.order_id) || 0)
|
||||
.filter(orderId => orderId > 0);
|
||||
const uniqueFailedOrderIds = Array.from(new Set(failedOrderIds));
|
||||
if (uniqueFailedOrderIds.length > 0) {
|
||||
const orderPendingExceptionService = this.service
|
||||
&& this.service.systems
|
||||
&& this.service.systems.orderPendingException;
|
||||
if (orderPendingExceptionService && typeof orderPendingExceptionService.markPendingException === 'function') {
|
||||
try {
|
||||
await orderPendingExceptionService.markPendingException({
|
||||
ids: uniqueFailedOrderIds,
|
||||
exception_text: `订单快递分配失败(${normalizedReason})`,
|
||||
});
|
||||
} catch (markError) {
|
||||
this.ctx.logger.error('[expressPlatform.cleanupFailedWaybillOrders] 标记订单异常失败', {
|
||||
traceId,
|
||||
error: markError && markError.message ? markError.message : `${markError}`,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 4) 写失败日志
|
||||
const expressService = this.service && this.service.systems && this.service.systems.express;
|
||||
if (expressService && typeof expressService.createAllocateExpressFailureLogs === 'function' && uniqueFailedOrderIds.length > 0) {
|
||||
const sampleWarehouseId = normalizedFailedOrders.length > 0
|
||||
? (Number(normalizedFailedOrders[0].warehouse_id) || null)
|
||||
: null;
|
||||
try {
|
||||
await expressService.createAllocateExpressFailureLogs(uniqueFailedOrderIds, normalizedReason, sampleWarehouseId);
|
||||
} catch (logError) {
|
||||
this.ctx.logger.error('[expressPlatform.cleanupFailedWaybillOrders] 写失败日志异常', {
|
||||
traceId,
|
||||
error: logError && logError.message ? logError.message : `${logError}`,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
this.ctx.logger.info('[expressPlatform.cleanupFailedWaybillOrders] 清理完成', {
|
||||
traceId,
|
||||
failedCount: normalizedFailedOrders.length,
|
||||
deletedExpressCount: normalizedFailedOrders.filter(o => Number(o.order_id) > 0 && Number(o.business_key) > 0).length,
|
||||
markedOrderCount: uniqueFailedOrderIds.length,
|
||||
restoredRelationCount: restoreRelationMap.size,
|
||||
});
|
||||
} catch (error) {
|
||||
this.ctx.logger.error('[expressPlatform.cleanupFailedWaybillOrders] 清理流程异常', {
|
||||
traceId,
|
||||
error: error && error.message ? error.message : `${error}`,
|
||||
stack: error && error.stack ? error.stack : '',
|
||||
});
|
||||
// 清理异常不抛给上游,避免干扰主流程
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 从 orders 数据中提取失败订单清理所需的基本字段。
|
||||
*
|
||||
* @param {Array<Object>} orders 订单列表。
|
||||
* @return {Array<{order_id: number, business_key: number, warehouse_id: number, store_id: number}>} 标准化后的失败订单列表。
|
||||
*/
|
||||
buildFailedOrderCleanupList(orders = []) {
|
||||
const normalizedOrders = Array.isArray(orders) ? orders : [];
|
||||
const result = [];
|
||||
for (const order of normalizedOrders) {
|
||||
const orderDelivery = order && order.order_delivery ? order.order_delivery : {};
|
||||
const orderId = Number(orderDelivery.id) || Number(order.order_id) || 0;
|
||||
const businessKey = Number(order.business_key) || 0;
|
||||
const warehouseId = Number(orderDelivery.warehouse_id) || Number(order.warehouse_id) || 0;
|
||||
const storeId = Number(orderDelivery.store_id) || Number(order.store_id) || 0;
|
||||
if (!orderId || !businessKey) {
|
||||
continue;
|
||||
}
|
||||
result.push({
|
||||
order_id: orderId,
|
||||
business_key: businessKey,
|
||||
warehouse_id: warehouseId,
|
||||
store_id: storeId,
|
||||
});
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 菠萝派数据处理接口。
|
||||
*
|
||||
@ -430,6 +673,19 @@ class ExpressPlatformService extends MainService {
|
||||
api: 'Differ.JH.LogisticsPlatFeatures',
|
||||
response: Dictionary_result,
|
||||
});
|
||||
if (Dictionary_result && Dictionary_result.code && String(Dictionary_result.code) !== '10000') {
|
||||
const dictErrorMessage = String(Dictionary_result.submessage || Dictionary_result.message || '字典接口调用失败').trim();
|
||||
this.ctx.logger.error('[expressPlatform.polyapi] PolyAPI 字典接口返回业务失败', {
|
||||
traceId,
|
||||
code: Dictionary_result.code,
|
||||
message: dictErrorMessage,
|
||||
response: Dictionary_result,
|
||||
});
|
||||
// 字典接口失败,清理所有订单后抛出
|
||||
const allFailedOrders = this.buildFailedOrderCleanupList(orders);
|
||||
await this.cleanupFailedWaybillOrders(allFailedOrders, `字典接口失败: ${dictErrorMessage}`);
|
||||
throw new Error(`菠萝派字典接口返回错误: ${dictErrorMessage}`);
|
||||
}
|
||||
console.log('listByWarehousePlatformCode', listByWarehousePlatformCode);
|
||||
const order_bizcontent = {
|
||||
orders: orders.map(order_tmp => {
|
||||
@ -644,13 +900,19 @@ class ExpressPlatformService extends MainService {
|
||||
response: JSON.stringify(result),
|
||||
});
|
||||
if (result && result.code !== '10000') {
|
||||
const postOrderErrorMessage = String(
|
||||
result.submessage || result.message || '菠萝派平台接口调用失败'
|
||||
).trim();
|
||||
this.ctx.logger.error('[expressPlatform.polyapi] PolyAPI 返回业务失败', {
|
||||
traceId,
|
||||
code: result.code,
|
||||
message: result.submessage,
|
||||
message: postOrderErrorMessage,
|
||||
response: result,
|
||||
});
|
||||
throw new Error(`菠萝派平台接口返回错误信息:${result.submessage},原始错误信息: \`\`\`${JSON.stringify(result)}\`\`\`` || '菠萝派平台接口调用失败');
|
||||
// 清洗本批次全部订单资源,然后抛出
|
||||
const allFailedOrders = this.buildFailedOrderCleanupList(orders);
|
||||
await this.cleanupFailedWaybillOrders(allFailedOrders, `PostOrder业务失败: ${postOrderErrorMessage}`);
|
||||
throw new Error(`菠萝派平台接口返回错误信息:${postOrderErrorMessage},原始错误信息: \`\`\`${JSON.stringify(result)}\`\`\``);
|
||||
} else if (result && result.code === '10000') {
|
||||
const resolveWaybillCode = item => String(item && (item.waybill_code || item.logisticno) || '').trim();
|
||||
let successUpdates = [];
|
||||
@ -994,8 +1256,72 @@ class ExpressPlatformService extends MainService {
|
||||
};
|
||||
});
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
default: {
|
||||
const unmatchedPlatformCode = String(listByWarehousePlatformCode && listByWarehousePlatformCode.platform_code || '').trim();
|
||||
this.ctx.logger.error('[expressPlatform.polyapi] switch 无匹配 platform_code', {
|
||||
traceId,
|
||||
platform_code: unmatchedPlatformCode,
|
||||
});
|
||||
// 未知平台编码,清理本批次全部订单资源后抛出
|
||||
const allFailedOrders = this.buildFailedOrderCleanupList(orders);
|
||||
await this.cleanupFailedWaybillOrders(allFailedOrders, `未知平台编码: ${unmatchedPlatformCode || '空'}`);
|
||||
throw new Error(`当前快递平台编码【${unmatchedPlatformCode}】未在system接口中实现,无法获取快递号`);
|
||||
}
|
||||
}
|
||||
|
||||
// 统一校验:过滤掉运单号为空的 successUpdates,避免空字符串写入 OrderExpress.waybill_code
|
||||
const emptyWaybillUpdates = [];
|
||||
const validSuccessUpdates = [];
|
||||
for (const item of successUpdates) {
|
||||
if (!item.waybill_code) {
|
||||
emptyWaybillUpdates.push(item);
|
||||
this.ctx.logger.error('[expressPlatform.polyapi] 运单号为空,跳过回写', {
|
||||
warehouse_id: item.warehouse_id,
|
||||
order_id: item.order_id,
|
||||
business_key: item.business_key,
|
||||
});
|
||||
} else {
|
||||
validSuccessUpdates.push(item);
|
||||
}
|
||||
}
|
||||
successUpdates = validSuccessUpdates;
|
||||
|
||||
if (emptyWaybillUpdates.length > 0) {
|
||||
this.ctx.logger.error('[expressPlatform.polyapi] 存在运单号为空的订单', {
|
||||
count: emptyWaybillUpdates.length,
|
||||
emptyOrderIds: emptyWaybillUpdates.map(i => `${i.warehouse_id}_${i.order_id}_${i.business_key}`).join(','),
|
||||
totalSuccessUpdates: successUpdates.length,
|
||||
});
|
||||
|
||||
// 反查 orders 找到运单号为空订单对应的 store_id,补齐清理所需信息后统一清理
|
||||
const emptyFailedOrders = [];
|
||||
for (const emptyItem of emptyWaybillUpdates) {
|
||||
const orderId = Number(emptyItem.order_id) || 0;
|
||||
const warehouseId = Number(emptyItem.warehouse_id) || 0;
|
||||
const businessKey = Number(emptyItem.business_key) || 0;
|
||||
let storeId = 0;
|
||||
for (const order of Array.isArray(orders) ? orders : []) {
|
||||
const orderDelivery = order && order.order_delivery;
|
||||
const oId = Number(orderDelivery && orderDelivery.id) || 0;
|
||||
const bk = Number(order && order.business_key) || 0;
|
||||
if (oId === orderId && bk === businessKey) {
|
||||
storeId = Number(orderDelivery && orderDelivery.store_id) || 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
emptyFailedOrders.push({
|
||||
order_id: orderId,
|
||||
business_key: businessKey,
|
||||
warehouse_id: warehouseId,
|
||||
store_id: storeId,
|
||||
});
|
||||
}
|
||||
await this.cleanupFailedWaybillOrders(emptyFailedOrders, '运单号为空');
|
||||
|
||||
// 全部订单都失败则抛出
|
||||
if (successUpdates.length === 0) {
|
||||
throw new Error(`菠萝派平台接口返回运单号全部为空,共${emptyWaybillUpdates.length}笔订单取号失败`);
|
||||
}
|
||||
}
|
||||
|
||||
const orderMetaMap = new Map();
|
||||
|
||||
893
app/service/systems/inbound_direct_log.js
Normal file
893
app/service/systems/inbound_direct_log.js
Normal file
@ -0,0 +1,893 @@
|
||||
'use strict';
|
||||
|
||||
const Service = require('egg').Service;
|
||||
|
||||
/**
|
||||
* 非收货单途径入库直接记录服务(导入/PDA入库)。
|
||||
*
|
||||
* 职责:
|
||||
* 1. 根据入库单号获取入库明细(含已记录的导入/PDA 入库记录)
|
||||
* 2. 按商品增量添加导入/PDA 入库记录,超计划数量时拒绝
|
||||
* 3. 提交确认完成入库,写入库存并触发奇门/API 回传
|
||||
*/
|
||||
class InboundDirectLogService extends Service {
|
||||
|
||||
/**
|
||||
* 获取入库单的受控入库信息。
|
||||
* 返回入库单基本信息、明细列表,以及每项明细已有的导入/PDA 入库记录。
|
||||
* @param {string} entryOrderCode 入库单号
|
||||
* @return {Promise<Object>} code/data/message 结构
|
||||
*/
|
||||
async getItems(entryOrderCode) {
|
||||
const { ctx } = this;
|
||||
const code = String(entryOrderCode || '').trim();
|
||||
|
||||
if (!code) {
|
||||
return { code: 400, message: 'entry_order_code 必填', data: null };
|
||||
}
|
||||
|
||||
const entryOrder = await ctx.model.EntryOrder.findOne({
|
||||
where: {
|
||||
entry_order_code: code,
|
||||
warehouse_id: ctx.user.store_id,
|
||||
is_enabled: 1,
|
||||
deleted_at: null,
|
||||
},
|
||||
include: [
|
||||
{
|
||||
model: ctx.model.EntryItems,
|
||||
as: 'items',
|
||||
required: false,
|
||||
include: [
|
||||
{
|
||||
model: ctx.model.StockWarehouse,
|
||||
as: 'stock',
|
||||
attributes: [ 'id', 'item_code', 'item_name', 'sku_property' ],
|
||||
required: false,
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
model: ctx.model.EntryOrderReceiving,
|
||||
as: 'receivingBindings',
|
||||
required: false,
|
||||
include: [
|
||||
{
|
||||
model: ctx.model.Receiving,
|
||||
as: 'receiving',
|
||||
attributes: [ 'id', 'receiving_number', 'status', 'storage_status', 'created_at' ],
|
||||
required: false,
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
if (!entryOrder) {
|
||||
return { code: 404, message: '入库单不存在或无权访问', data: null };
|
||||
}
|
||||
|
||||
// 查询该入库单下已有的导入/PDA 入库记录
|
||||
const directLogs = await ctx.model.InboundDirectLog.findAll({
|
||||
where: { entry_order_id: entryOrder.id },
|
||||
order: [[ 'created_at', 'ASC' ]],
|
||||
});
|
||||
|
||||
// 按 stock_id 汇总已入库数量
|
||||
const logSummary = {};
|
||||
for (const log of directLogs) {
|
||||
const key = String(log.stock_id);
|
||||
if (!logSummary[key]) {
|
||||
logSummary[key] = 0;
|
||||
}
|
||||
logSummary[key] += Number(log.quantity);
|
||||
}
|
||||
|
||||
// 将直接入库记录按 entry_item_id 关联到明细
|
||||
const itemDirectLogs = {};
|
||||
for (const log of directLogs) {
|
||||
const item = entryOrder.items.find(
|
||||
i => String(i.stock_id) === String(log.stock_id)
|
||||
);
|
||||
const key = item ? String(item.id) : `stock_${log.stock_id}`;
|
||||
if (!itemDirectLogs[key]) itemDirectLogs[key] = [];
|
||||
itemDirectLogs[key].push({
|
||||
id: log.id,
|
||||
stock_id: log.stock_id,
|
||||
quantity: log.quantity,
|
||||
inbound_type: log.inbound_type,
|
||||
remark: log.remark,
|
||||
operator_id: log.operator_id,
|
||||
operator_name: log.operator_name,
|
||||
created_at: log.created_at,
|
||||
});
|
||||
}
|
||||
|
||||
// 将入库单层级的收货单绑定扁平化(不再按明细维度)
|
||||
const receivingBindings = (entryOrder.receivingBindings && entryOrder.receivingBindings.length > 0)
|
||||
? entryOrder.receivingBindings.map(rb => ({
|
||||
id: rb.id,
|
||||
receiving_id: rb.receiving_id,
|
||||
receiving: rb.receiving || null,
|
||||
}))
|
||||
: [];
|
||||
|
||||
// 组装明细
|
||||
const items = (entryOrder.items || []).map(item => {
|
||||
const planQty = Number(item.count) || 0;
|
||||
const logKey = String(item.id);
|
||||
const logs = itemDirectLogs[logKey] || [];
|
||||
const directInQty = logs.reduce((sum, l) => sum + Number(l.quantity), 0);
|
||||
// 入库进度使用已收货数量 + 导入/PDA 已入库数量
|
||||
const totalInboundQty = directInQty + Number(item.received_quantity || 0);
|
||||
|
||||
return {
|
||||
id: item.id,
|
||||
stock_id: item.stock_id,
|
||||
count: planQty,
|
||||
received_quantity: Number(item.received_quantity) || 0,
|
||||
item_code: item.item_code,
|
||||
warehouse_item_code: (item.stock && item.stock.item_code) || '',
|
||||
warehouse_item_name: (item.stock && item.stock.item_name) || '',
|
||||
warehouse_item_spec: (item.stock && item.stock.sku_property) || '',
|
||||
direct_inbound_quantity: directInQty,
|
||||
remaining_quantity: Math.max(0, planQty - totalInboundQty),
|
||||
direct_logs: logs,
|
||||
};
|
||||
});
|
||||
|
||||
return {
|
||||
code: 200,
|
||||
message: '查询成功',
|
||||
data: {
|
||||
entryOrder: {
|
||||
id: entryOrder.id,
|
||||
entry_order_code: entryOrder.entry_order_code,
|
||||
order_type: entryOrder.order_type,
|
||||
order_status: entryOrder.order_status,
|
||||
source_type: entryOrder.source_type,
|
||||
warehouse_id: entryOrder.warehouse_id,
|
||||
store_id: entryOrder.store_id,
|
||||
remark: entryOrder.remark,
|
||||
},
|
||||
items,
|
||||
direct_logs: directLogs,
|
||||
receivingBindings,
|
||||
summary: {
|
||||
total_items: items.length,
|
||||
total_planned: items.reduce((s, i) => s + i.count, 0),
|
||||
total_direct_inbound: items.reduce((s, i) => s + i.direct_inbound_quantity, 0),
|
||||
total_import: directLogs.filter(l => l.inbound_type === 'import').reduce((s, l) => s + Number(l.quantity), 0),
|
||||
total_pda: directLogs.filter(l => l.inbound_type === 'pda').reduce((s, l) => s + Number(l.quantity), 0),
|
||||
},
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 单条校验并写入一条导入/PDA 入库记录。
|
||||
* @param {Object} ctx
|
||||
* @param {Object} entryOrder 入库单实例
|
||||
* @param {Object} item { stock_id, quantity, inbound_type, remark }
|
||||
* @return {Promise<{ok: boolean, log?: Object, error?: Object}>}
|
||||
*/
|
||||
async _addSingleItem(ctx, entryOrder, item, transaction) {
|
||||
const stockId = Number(item.stock_id || 0);
|
||||
const quantity = Number(item.quantity || 0);
|
||||
const inboundType = String(item.inbound_type || '').trim().toLowerCase();
|
||||
const remark = item.remark ? String(item.remark).trim() : '';
|
||||
const spaceId = item.space_id ? Number(item.space_id) : null;
|
||||
|
||||
if (!stockId) {
|
||||
return { ok: false, error: { code: 400, message: 'items[].stock_id 必填' } };
|
||||
}
|
||||
if (!quantity || quantity <= 0 || !Number.isFinite(quantity)) {
|
||||
return { ok: false, error: { code: 400, message: 'items[].quantity 必须为正整数' } };
|
||||
}
|
||||
if (![ 'import', 'pda' ].includes(inboundType)) {
|
||||
return { ok: false, error: { code: 400, message: 'items[].inbound_type 必须为 import 或 pda' } };
|
||||
}
|
||||
|
||||
// 查找入库单中该 stock_id 对应的所有明细,累加计划数量
|
||||
const entryItems = await ctx.model.EntryItems.findAll({
|
||||
where: { order_id: entryOrder.id, stock_id: stockId },
|
||||
...(transaction ? { transaction } : {}),
|
||||
});
|
||||
|
||||
if (!entryItems || entryItems.length === 0) {
|
||||
return { ok: false, error: { code: 400, message: `入库单中不存在 stock_id=${stockId} 的商品` } };
|
||||
}
|
||||
|
||||
const totalPlanQty = entryItems.reduce((sum, item) => sum + (Number(item.count) || 0), 0);
|
||||
|
||||
// 计算该 stock_id 在该入库单下已有的导入/PDA 入库总量
|
||||
const logWhere = { entry_order_id: entryOrder.id, stock_id: stockId };
|
||||
const existingLogs = await ctx.model.InboundDirectLog.findAll({
|
||||
where: logWhere,
|
||||
attributes: [ 'quantity' ],
|
||||
raw: true,
|
||||
...(transaction ? { transaction } : {}),
|
||||
});
|
||||
const existingTotal = existingLogs.reduce((sum, log) => sum + Number(log.quantity), 0);
|
||||
|
||||
const newTotal = existingTotal + quantity;
|
||||
|
||||
if (newTotal > totalPlanQty) {
|
||||
return {
|
||||
ok: false,
|
||||
error: {
|
||||
code: 400,
|
||||
message: `入库数量超过计划:商品计划 ${totalPlanQty},已入库 ${existingTotal},本次 ${quantity},合计 ${newTotal}`,
|
||||
data: {
|
||||
stock_id: stockId,
|
||||
plan_quantity: totalPlanQty,
|
||||
existing_quantity: existingTotal,
|
||||
requested_quantity: quantity,
|
||||
exceeded_by: newTotal - totalPlanQty,
|
||||
},
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
// 写入记录
|
||||
const createOpts = transaction ? { transaction } : {};
|
||||
const log = await ctx.model.InboundDirectLog.create({
|
||||
warehouse_id: entryOrder.warehouse_id,
|
||||
store_id: entryOrder.store_id,
|
||||
stock_id: stockId,
|
||||
quantity,
|
||||
inbound_type: inboundType,
|
||||
entry_order_id: entryOrder.id,
|
||||
entry_order_code: entryOrder.entry_order_code,
|
||||
space_id: spaceId,
|
||||
remark,
|
||||
operator_id: ctx.user?.employees_id || ctx.user?.id || null,
|
||||
operator_name: ctx.user?.employees_name || '',
|
||||
created_at: new Date(),
|
||||
});
|
||||
|
||||
return {
|
||||
ok: true,
|
||||
log: {
|
||||
id: log.id,
|
||||
stock_id: stockId,
|
||||
quantity,
|
||||
inbound_type: inboundType,
|
||||
space_id: spaceId,
|
||||
plan_quantity: totalPlanQty,
|
||||
existing_before: existingTotal,
|
||||
existing_after: newTotal,
|
||||
remaining: Math.max(0, totalPlanQty - newTotal),
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 按商品增量添加导入/PDA 入库记录(支持单条和批量)。
|
||||
*
|
||||
* 单条模式(兼容旧调用):
|
||||
* { entry_order_code, stock_id, quantity, inbound_type, remark }
|
||||
*
|
||||
* 批量模式(推荐):
|
||||
* { entry_order_code, items: [{ stock_id, quantity, inbound_type, remark }] }
|
||||
*
|
||||
* 批量模式下所有商品共享同一个入库单状态校验,任一商品校验失败整批拒绝。
|
||||
* 若该商品在当前入库单中的累计入库量超过计划数量则拒绝。
|
||||
* @param {Object} params
|
||||
* @param {string} params.entry_order_code 入库单号
|
||||
* @param {number} [params.stock_id] 商品SKU ID(单条模式)
|
||||
* @param {number} [params.quantity] 本次入库数量(单条模式)
|
||||
* @param {string} [params.inbound_type] 入库方式(单条模式)
|
||||
* @param {Array} [params.items] 商品列表(批量模式)
|
||||
* @param {string} [params.remark] 备注(单条模式)
|
||||
* @return {Promise<Object>} code/data/message 结构
|
||||
*/
|
||||
async addItem(params) {
|
||||
const { ctx } = this;
|
||||
const entryOrderCode = String(params.entry_order_code || '').trim();
|
||||
|
||||
if (!entryOrderCode) {
|
||||
return { code: 400, message: 'entry_order_code 必填', data: null };
|
||||
}
|
||||
|
||||
// 判断批量/单条模式
|
||||
const isBatch = Array.isArray(params.items) && params.items.length > 0;
|
||||
const items = isBatch ? params.items : [{
|
||||
stock_id: params.stock_id,
|
||||
quantity: params.quantity,
|
||||
inbound_type: params.inbound_type,
|
||||
remark: params.remark,
|
||||
}];
|
||||
|
||||
// 查找入库单
|
||||
const entryOrder = await ctx.model.EntryOrder.findOne({
|
||||
where: {
|
||||
entry_order_code: entryOrderCode,
|
||||
warehouse_id: ctx.user.store_id,
|
||||
is_enabled: 1,
|
||||
deleted_at: null,
|
||||
},
|
||||
});
|
||||
|
||||
if (!entryOrder) {
|
||||
return { code: 404, message: '入库单不存在或无权访问', data: null };
|
||||
}
|
||||
|
||||
// 检查入库单状态
|
||||
if (entryOrder.order_status === 'CANCELLED') {
|
||||
return { code: 400, message: '已作废入库单不允许操作', data: null };
|
||||
}
|
||||
if (entryOrder.order_status === 'COMPLETED') {
|
||||
return { code: 400, message: '已完成的入库单不允许操作', data: null };
|
||||
}
|
||||
|
||||
// 批量模式下用事务包裹,任一失败整批回退
|
||||
const useTransaction = isBatch;
|
||||
const txn = useTransaction ? await ctx.model.transaction() : null;
|
||||
|
||||
try {
|
||||
const results = [];
|
||||
for (const item of items) {
|
||||
const result = await this._addSingleItem(ctx, entryOrder, item, txn);
|
||||
if (!result.ok) {
|
||||
if (txn) await txn.rollback();
|
||||
return result.error;
|
||||
}
|
||||
results.push(result.log);
|
||||
}
|
||||
|
||||
if (txn) await txn.commit();
|
||||
|
||||
// 非阻塞记录操作日志(批量模式只记一条汇总)
|
||||
if (results.length > 0) {
|
||||
const totalQty = results.reduce((s, r) => s + r.quantity, 0);
|
||||
const types = [ ...new Set(results.map(r => r.inbound_type)) ].join(',');
|
||||
setImmediate(() => {
|
||||
ctx.service.systems.operationLog.createOperationLog({
|
||||
businessType: 'entry_order',
|
||||
businessId: entryOrder.id,
|
||||
operationCode: 'DIRECT_INBOUND_ADD',
|
||||
operator: {
|
||||
id: ctx.user?.employees_id || ctx.user?.id,
|
||||
name: ctx.user?.employees_name || '',
|
||||
},
|
||||
extras: {
|
||||
warehouseId: entryOrder.warehouse_id,
|
||||
message: `导入/PDA入库添加 ${results.length} 种商品,总数量 ${totalQty},方式 ${types}`,
|
||||
},
|
||||
}).catch(err => {
|
||||
ctx.logger.error(`[InboundDirectLog] 记录操作日志失败: ${err.message}`);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
if (!isBatch) {
|
||||
const r = results[0];
|
||||
return {
|
||||
code: 200,
|
||||
message: '添加成功',
|
||||
data: { ...r },
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
code: 200,
|
||||
message: `添加成功,共 ${results.length} 项`,
|
||||
data: {
|
||||
count: results.length,
|
||||
total_quantity: results.reduce((s, r) => s + r.quantity, 0),
|
||||
items: results,
|
||||
},
|
||||
};
|
||||
} catch (error) {
|
||||
if (txn && typeof txn.rollback === 'function') {
|
||||
await txn.rollback();
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 移除一条导入/PDA 入库记录(仅限未提交的入库单)。
|
||||
* @param {Object} params
|
||||
* @param {number} params.id 入库记录ID(wms_inbound_direct_log.id)
|
||||
* @return {Promise<Object>} code/data/message 结构
|
||||
*/
|
||||
async removeItem(params) {
|
||||
const { ctx } = this;
|
||||
const logId = Number(params.id || 0);
|
||||
|
||||
if (!logId) {
|
||||
return { code: 400, message: 'id 必填', data: null };
|
||||
}
|
||||
|
||||
const log = await ctx.model.InboundDirectLog.findByPk(logId);
|
||||
if (!log) {
|
||||
return { code: 404, message: '入库记录不存在', data: null };
|
||||
}
|
||||
|
||||
// 检查所属入库单状态
|
||||
const entryOrder = await ctx.model.EntryOrder.findOne({
|
||||
where: {
|
||||
id: log.entry_order_id,
|
||||
warehouse_id: ctx.user.store_id,
|
||||
is_enabled: 1,
|
||||
deleted_at: null,
|
||||
},
|
||||
});
|
||||
|
||||
if (!entryOrder) {
|
||||
return { code: 404, message: '关联入库单不存在或无权访问', data: null };
|
||||
}
|
||||
|
||||
if (entryOrder.order_status === 'CANCELLED') {
|
||||
return { code: 400, message: '已作废入库单不允许操作', data: null };
|
||||
}
|
||||
if (entryOrder.order_status === 'COMPLETED') {
|
||||
return { code: 400, message: '已完成的入库单不允许移除记录', data: null };
|
||||
}
|
||||
|
||||
// 软删除该记录
|
||||
await log.destroy();
|
||||
|
||||
// 非阻塞记录操作日志
|
||||
setImmediate(() => {
|
||||
ctx.service.systems.operationLog.createOperationLog({
|
||||
businessType: 'entry_order',
|
||||
businessId: entryOrder.id,
|
||||
operationCode: 'DIRECT_INBOUND_REMOVE',
|
||||
operator: {
|
||||
id: ctx.user?.employees_id || ctx.user?.id,
|
||||
name: ctx.user?.employees_name || '',
|
||||
},
|
||||
extras: {
|
||||
warehouseId: entryOrder.warehouse_id,
|
||||
message: `移除导入/PDA入库记录 id=${logId},stock_id=${log.stock_id},数量 ${log.quantity},方式 ${log.inbound_type}`,
|
||||
},
|
||||
}).catch(err => {
|
||||
ctx.logger.error(`[InboundDirectLog] 记录操作日志失败: ${err.message}`);
|
||||
});
|
||||
});
|
||||
|
||||
return {
|
||||
code: 200,
|
||||
message: '移除成功',
|
||||
data: {
|
||||
id: logId,
|
||||
stock_id: log.stock_id,
|
||||
quantity: log.quantity,
|
||||
inbound_type: log.inbound_type,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 提交确认完成入库,将导入/PDA 入库记录写入库存,并触发奇门/API 回传。
|
||||
* @param {string} entryOrderCode 入库单号
|
||||
* @return {Promise<Object>} code/data/message 结构
|
||||
*/
|
||||
async commit(entryOrderCode) {
|
||||
const { ctx, app } = this;
|
||||
const code = String(entryOrderCode || '').trim();
|
||||
|
||||
if (!code) {
|
||||
return { code: 400, message: 'entry_order_code 必填', data: null };
|
||||
}
|
||||
|
||||
const entryOrder = await ctx.model.EntryOrder.findOne({
|
||||
where: {
|
||||
entry_order_code: code,
|
||||
warehouse_id: ctx.user.store_id,
|
||||
is_enabled: 1,
|
||||
deleted_at: null,
|
||||
},
|
||||
});
|
||||
|
||||
if (!entryOrder) {
|
||||
return { code: 404, message: '入库单不存在或无权访问', data: null };
|
||||
}
|
||||
|
||||
if (entryOrder.order_status === 'CANCELLED') {
|
||||
return { code: 400, message: '已作废入库单不允许完成', data: null };
|
||||
}
|
||||
if (entryOrder.order_status === 'COMPLETED') {
|
||||
return { code: 400, message: '入库单已完成,请勿重复提交', data: null };
|
||||
}
|
||||
|
||||
// 查询该入库单下所有导入/PDA 入库记录
|
||||
const directLogs = await ctx.model.InboundDirectLog.findAll({
|
||||
where: { entry_order_id: entryOrder.id },
|
||||
});
|
||||
|
||||
if (!directLogs || directLogs.length === 0) {
|
||||
return { code: 400, message: '暂无导入/PDA 入库记录,请先添加商品', data: null };
|
||||
}
|
||||
|
||||
// 按 stock_id 汇总入库数量
|
||||
const stockSummary = {};
|
||||
for (const log of directLogs) {
|
||||
const key = String(log.stock_id);
|
||||
if (!stockSummary[key]) stockSummary[key] = 0;
|
||||
stockSummary[key] += Number(log.quantity);
|
||||
}
|
||||
|
||||
// 查询入库单所有明细
|
||||
const entryItems = await ctx.model.EntryItems.findAll({
|
||||
where: { order_id: entryOrder.id },
|
||||
});
|
||||
|
||||
if (!entryItems.length) {
|
||||
return { code: 400, message: '入库单无明细', data: null };
|
||||
}
|
||||
|
||||
const warehouseId = entryOrder.warehouse_id;
|
||||
const storeId = entryOrder.store_id;
|
||||
const transaction = await ctx.model.transaction();
|
||||
|
||||
try {
|
||||
// 记录已处理过的 stock_id,避免同 stock_id 多明细重复写库存
|
||||
const processedStockIds = new Set();
|
||||
|
||||
// 逐商品写入库存
|
||||
for (const item of entryItems) {
|
||||
const stockId = item.stock_id;
|
||||
if (!stockId) continue;
|
||||
|
||||
const inboundQty = stockSummary[String(stockId)] || 0;
|
||||
if (inboundQty <= 0) continue;
|
||||
|
||||
// 更新入库明细的 received_quantity(按该明细的计划占比分配)
|
||||
const planQty = Number(item.count) || 0;
|
||||
const itemReceivedQty = planQty > 0 ? Math.min(planQty, inboundQty) : inboundQty;
|
||||
await ctx.model.EntryItems.update({
|
||||
received_quantity: itemReceivedQty,
|
||||
}, {
|
||||
where: { id: item.id },
|
||||
transaction,
|
||||
});
|
||||
|
||||
// 同一 stock_id 只写一次库存
|
||||
if (processedStockIds.has(String(stockId))) continue;
|
||||
processedStockIds.add(String(stockId));
|
||||
|
||||
// 使用入库单号作为批次号
|
||||
const batchNo = entryOrder.entry_order_code;
|
||||
const inventoryType = item.inventory_type || 'ZP';
|
||||
|
||||
// 从该 stock_id 的入库记录中取第一个非空 space_id,兜底 1
|
||||
const logForSpace = directLogs.find(l => String(l.stock_id) === String(stockId) && l.space_id);
|
||||
const spaceId = logForSpace ? Number(logForSpace.space_id) : 1;
|
||||
|
||||
// 锁定并更新 StockWarehouse 总库存
|
||||
const stockRecord = await ctx.model.StockWarehouse.findOne({
|
||||
where: { id: stockId, is_valid: 'Y', deleted_at: null },
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
transaction,
|
||||
});
|
||||
|
||||
if (stockRecord) {
|
||||
const beforeQuantity = Number(stockRecord.quantity) || 0;
|
||||
const beforeLockedQuantity = Number(stockRecord.locked_quantity) || 0;
|
||||
|
||||
await stockRecord.increment('quantity', { by: inboundQty, transaction, silent: true });
|
||||
await stockRecord.reload({ transaction });
|
||||
|
||||
const afterQuantity = Number(stockRecord.quantity) || 0;
|
||||
const afterLockedQuantity = Number(stockRecord.locked_quantity) || 0;
|
||||
|
||||
// 写入库存流水
|
||||
await ctx.service.systems.stockTransaction.create({
|
||||
transaction_type: 'INBOUND',
|
||||
warehouse_id: warehouseId,
|
||||
store_id: storeId,
|
||||
stock_id: stockId,
|
||||
quantity: inboundQty,
|
||||
batch_no: batchNo,
|
||||
inventory_type: inventoryType,
|
||||
order_type: entryOrder.order_type,
|
||||
order_no: entryOrder.entry_order_code,
|
||||
entry_order_id: entryOrder.id,
|
||||
operator_id: String(ctx.user?.employees_id || ctx.user?.id || ''),
|
||||
operator_name: ctx.user?.employees_name || '',
|
||||
remark: '导入/PDA直接入库提交',
|
||||
before_quantity: beforeQuantity,
|
||||
after_quantity: afterQuantity,
|
||||
before_locked_quantity: beforeLockedQuantity,
|
||||
after_locked_quantity: afterLockedQuantity,
|
||||
created_at: new Date(),
|
||||
}, { transaction });
|
||||
}
|
||||
|
||||
// 创建/更新 Storage 库位库存
|
||||
const storageRecord = await ctx.model.Storage.findOne({
|
||||
where: {
|
||||
space_id: spaceId,
|
||||
stock_id: stockId,
|
||||
batch_no: batchNo,
|
||||
inventory_type: inventoryType,
|
||||
is_enabled: 1,
|
||||
delete_at: null,
|
||||
},
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
transaction,
|
||||
});
|
||||
|
||||
if (storageRecord) {
|
||||
await ctx.model.Storage.update({
|
||||
quantity: app.Sequelize.literal(`quantity + ${inboundQty}`),
|
||||
available_quantity: app.Sequelize.literal(`available_quantity + ${inboundQty}`),
|
||||
entry_order_id: entryOrder.id,
|
||||
inbound_time: new Date(),
|
||||
inbound_order_no: entryOrder.entry_order_code,
|
||||
updated_at: new Date(),
|
||||
}, {
|
||||
where: { id: storageRecord.id },
|
||||
transaction,
|
||||
});
|
||||
} else {
|
||||
await ctx.model.Storage.create({
|
||||
warehouse_id: warehouseId,
|
||||
store_id: storeId,
|
||||
space_id: spaceId,
|
||||
stock_id: stockId,
|
||||
batch_no: batchNo,
|
||||
inventory_type: inventoryType,
|
||||
quantity: inboundQty,
|
||||
locked_quantity: 0,
|
||||
available_quantity: inboundQty,
|
||||
inbound_time: new Date(),
|
||||
inbound_order_no: entryOrder.entry_order_code,
|
||||
receiving_id: null,
|
||||
entry_order_id: entryOrder.id,
|
||||
supplier_id: null,
|
||||
supplier_batch_no: null,
|
||||
is_enabled: 1,
|
||||
created_at: new Date(),
|
||||
updated_at: new Date(),
|
||||
}, { transaction });
|
||||
}
|
||||
}
|
||||
|
||||
// 更新入库单状态为 COMPLETED
|
||||
await entryOrder.update({
|
||||
order_status: 'COMPLETED',
|
||||
sync_status: 'SUCCESS',
|
||||
sync_message: JSON.stringify({
|
||||
completedAt: new Date(),
|
||||
totalQuantity: Object.values(stockSummary).reduce((s, q) => s + q, 0),
|
||||
itemCount: processedStockIds.size,
|
||||
source: 'direct_inbound',
|
||||
}),
|
||||
updated_at: new Date(),
|
||||
}, { transaction });
|
||||
|
||||
// 记录操作日志(事务内)
|
||||
const totalQty = Object.values(stockSummary).reduce((s, q) => s + q, 0);
|
||||
await ctx.service.systems.operationLog.createOperationLog({
|
||||
businessType: 'entry_order',
|
||||
businessId: entryOrder.id,
|
||||
operationCode: 'DIRECT_INBOUND_COMMIT',
|
||||
operator: {
|
||||
id: ctx.user?.employees_id || ctx.user?.id,
|
||||
name: ctx.user?.employees_name || '',
|
||||
},
|
||||
extras: {
|
||||
warehouseId: entryOrder.warehouse_id,
|
||||
message: `导入/PDA入库提交完成,共 ${processedStockIds.size} 种商品,总数量 ${totalQty}`,
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
|
||||
await transaction.commit();
|
||||
} catch (error) {
|
||||
if (transaction && typeof transaction.rollback === 'function') {
|
||||
await transaction.rollback();
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
|
||||
// 事务外:异步触发奇门/API 回传
|
||||
setImmediate(() => {
|
||||
this._sendCallback(entryOrder).catch(err => {
|
||||
ctx.logger.error(`[InboundDirectLog] 回传异常 entryOrderId=${entryOrder.id}: ${err.message}`, err.stack);
|
||||
});
|
||||
});
|
||||
|
||||
return {
|
||||
code: 200,
|
||||
message: '入库完成',
|
||||
data: {
|
||||
id: entryOrder.id,
|
||||
entry_order_code: entryOrder.entry_order_code,
|
||||
order_status: 'COMPLETED',
|
||||
sync_status: 'SUCCESS',
|
||||
items_count: entryItems.length,
|
||||
total_quantity: Object.values(stockSummary).reduce((s, q) => s + q, 0),
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据入库单来源异步回传(奇门 / OpenAPI)。
|
||||
* @param {Object} entryOrder 入库单实例
|
||||
* @return {Promise<void>}
|
||||
*/
|
||||
async _sendCallback(entryOrder) {
|
||||
const { ctx } = this;
|
||||
const sourceType = String(entryOrder.source_type || '').toUpperCase();
|
||||
|
||||
ctx.logger.info(
|
||||
`[InboundDirectLog] 准备回传 entryOrderId=${entryOrder.id} sourceType=${sourceType}`
|
||||
);
|
||||
|
||||
try {
|
||||
const items = await ctx.model.EntryItems.findAll({
|
||||
where: { order_id: entryOrder.id },
|
||||
attributes: [ 'item_code', 'item_id', 'count', 'inventory_type', 'owner_code', 'received_quantity' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
if (!items || items.length === 0) {
|
||||
ctx.logger.warn(`[InboundDirectLog] 回传:入库单无明细 entryOrderId=${entryOrder.id}`);
|
||||
return;
|
||||
}
|
||||
|
||||
const orderLines = items.map((item, index) => ({
|
||||
orderLineNo: index + 1,
|
||||
ownerCode: item.owner_code || '',
|
||||
itemCode: item.item_code || '',
|
||||
itemId: item.item_id || '',
|
||||
inventoryType: item.inventory_type || 'ZP',
|
||||
planQty: item.count || 0,
|
||||
actualQty: item.received_quantity || 0,
|
||||
}));
|
||||
|
||||
if (sourceType === 'QM') {
|
||||
await this._sendQimenCallback(entryOrder, orderLines);
|
||||
} else if (sourceType === 'API') {
|
||||
await this._sendOpenApiCallback(entryOrder);
|
||||
} else {
|
||||
ctx.logger.info(`[InboundDirectLog] 来源类型 ${sourceType} 不支持回传`);
|
||||
}
|
||||
} catch (error) {
|
||||
ctx.logger.error(`[InboundDirectLog] _sendCallback 异常: ${error.message}`, error.stack);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 奇门回传:调用 taobao.qimen.entryorder.confirm。
|
||||
* @param {Object} entryOrder 入库单
|
||||
* @param {Array} orderLines 明细行
|
||||
* @return {Promise<void>}
|
||||
*/
|
||||
async _sendQimenCallback(entryOrder, orderLines) {
|
||||
const { ctx, app } = this;
|
||||
|
||||
try {
|
||||
const queryData = {
|
||||
request: {
|
||||
entryOrder: {
|
||||
entryOrderCode: entryOrder.entry_order_code,
|
||||
ownerCode: entryOrder.qimen_owner_code || '',
|
||||
warehouseCode: entryOrder.qimen_warehouse_code || '',
|
||||
entryOrderId: entryOrder.id,
|
||||
entryOrderType: entryOrder.order_type,
|
||||
outBizCode: `DIRECT_INBOUND_${Date.now()}`,
|
||||
confirmType: 0,
|
||||
status: 'FULFILLED',
|
||||
freight: 0,
|
||||
operateTime: app.formatDate(new Date()),
|
||||
remark: '导入/PDA直接入库提交',
|
||||
},
|
||||
orderLines,
|
||||
},
|
||||
};
|
||||
|
||||
const result = await app.qimenClient.send(
|
||||
'taobao.qimen.entryorder.confirm',
|
||||
entryOrder.qimen_owner_code,
|
||||
queryData,
|
||||
{ ctx }
|
||||
);
|
||||
|
||||
const qimenResult = result && result.xmlArray && result.xmlArray.response;
|
||||
if (qimenResult && String(qimenResult.flag) === 'success') {
|
||||
ctx.logger.info(`[InboundDirectLog] 奇门回传成功 entryOrderId=${entryOrder.id}`);
|
||||
} else {
|
||||
ctx.logger.warn(
|
||||
`[InboundDirectLog] 奇门回传失败 entryOrderId=${entryOrder.id} ` +
|
||||
`message=${qimenResult?.message || '未知错误'}`
|
||||
);
|
||||
}
|
||||
} catch (error) {
|
||||
ctx.logger.error(`[InboundDirectLog] 奇门回传异常: ${error.message}`, error.stack);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* OpenAPI 回传:查询 ApiApp 回调地址并 POST 回传。
|
||||
* @param {Object} entryOrder 入库单
|
||||
* @return {Promise<void>}
|
||||
*/
|
||||
async _sendOpenApiCallback(entryOrder) {
|
||||
const { ctx, app } = this;
|
||||
|
||||
try {
|
||||
const storeWarehouse = await ctx.model.StoreWarehouse.findOne({
|
||||
where: {
|
||||
store_id: entryOrder.store_id,
|
||||
warehouse_id: entryOrder.warehouse_id,
|
||||
auth_status: 2,
|
||||
},
|
||||
attributes: [ 'id' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
if (!storeWarehouse) {
|
||||
ctx.logger.warn(
|
||||
'[InboundDirectLog] OpenAPI回传:未找到授权关系 ' +
|
||||
`entryOrderId=${entryOrder.id}`
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
const apiApp = await ctx.model.ApiApp.findOne({
|
||||
where: {
|
||||
contract_id: storeWarehouse.id,
|
||||
is_enabled: 1,
|
||||
callback_url: {
|
||||
[ app.Sequelize.Op.and ]: [
|
||||
{ [ app.Sequelize.Op.ne ]: null },
|
||||
{ [ app.Sequelize.Op.ne ]: '' },
|
||||
],
|
||||
},
|
||||
},
|
||||
attributes: [ 'self_app_key', 'self_app_secret', 'callback_url' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
if (!apiApp || !apiApp.callback_url) {
|
||||
ctx.logger.warn(
|
||||
'[InboundDirectLog] OpenAPI回传:未找到有效ApiApp配置 ' +
|
||||
`entryOrderId=${entryOrder.id}`
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
const callbackData = {
|
||||
entryOrderId: entryOrder.id,
|
||||
entryOrderCode: entryOrder.entry_order_code,
|
||||
completedAt: new Date().toISOString(),
|
||||
inboundType: 'direct',
|
||||
};
|
||||
|
||||
const result = await ctx.service.openapi.callback.sendWithRetry({
|
||||
callbackUrl: apiApp.callback_url,
|
||||
appKey: apiApp.self_app_key,
|
||||
selfAppSecret: apiApp.self_app_secret || '',
|
||||
event: 'entry_order_direct_inbound_completed',
|
||||
data: callbackData,
|
||||
metadata: {
|
||||
source: 'inbound_direct_log',
|
||||
entryOrderId: entryOrder.id,
|
||||
},
|
||||
});
|
||||
|
||||
if (result.success) {
|
||||
ctx.logger.info(
|
||||
`[InboundDirectLog] OpenAPI回传成功 entryOrderId=${entryOrder.id} ` +
|
||||
`callbackUrl=${apiApp.callback_url}`
|
||||
);
|
||||
} else {
|
||||
ctx.logger.warn(
|
||||
`[InboundDirectLog] OpenAPI回传失败 entryOrderId=${entryOrder.id} ` +
|
||||
`error=${result.error}`
|
||||
);
|
||||
}
|
||||
} catch (error) {
|
||||
ctx.logger.error(`[InboundDirectLog] OpenAPI回传异常: ${error.message}`, error.stack);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = InboundDirectLogService;
|
||||
@ -210,7 +210,7 @@ async function buildQimenDeliveryOrderConfirmDataInternal(service, orderRow, ord
|
||||
}
|
||||
|
||||
orderLines.push({
|
||||
orderLineNo: orderLines.length + 1,
|
||||
orderLineNo: String(orderItem.order_line_no || '').trim() || orderLines.length + 1,
|
||||
orderSourceCode: String(orderItem.source_order_code || '').trim(),
|
||||
subSourceCode: String(orderItem.sub_source_order_code || '').trim(),
|
||||
ownerCode: String(orderItem.owner_code || ownerCode || '').trim(),
|
||||
@ -257,6 +257,13 @@ async function buildQimenDeliveryOrderConfirmDataInternal(service, orderRow, ord
|
||||
expressCode: String(expressCode || '').trim(),
|
||||
packageCode,
|
||||
invoiceNo,
|
||||
items: Array.isArray(orderItems) ? orderItems
|
||||
.filter(item => item && Number(item.plan_qty) > 0)
|
||||
.map(item => ({
|
||||
itemCode: String(item.item_code || '').trim(),
|
||||
itemId: Number(item.item_id) || String(item.item_id || '').trim(),
|
||||
quantity: Number(item.plan_qty) || 0,
|
||||
})) : [],
|
||||
})),
|
||||
},
|
||||
orderLines,
|
||||
|
||||
@ -23,11 +23,11 @@ const ORDER_EXPORT_MODULE_MAP = Object.freeze({
|
||||
deliveryexpectionorder: 'deliveryExpectionOrder',
|
||||
});
|
||||
const ORDER_EXPORT_COLUMNS = Object.freeze([
|
||||
{ header: '订单ID', key: 'id', width: 12 },
|
||||
{ header: '订单号', key: 'delivery_order_code', width: 24 },
|
||||
{ header: '外部单号', key: 'external_order_code', width: 24 },
|
||||
{ header: '系统订单号', key: 'id', width: 12 },
|
||||
{ header: '外部订单号', key: 'delivery_order_code', width: 24 },
|
||||
{ header: '平台单号', key: 'external_order_code', width: 24 },
|
||||
{ header: '订单状态', key: 'status', width: 16 },
|
||||
{ header: '波次号', key: 'wave_no', width: 18 },
|
||||
{ header: '抓取波次号', key: 'wave_no', width: 18 },
|
||||
{ header: '货主', key: 'store_id', width: 20 },
|
||||
{ header: '平台', key: 'sys_platform_name', width: 16 },
|
||||
{ header: '店铺昵称', key: 'shop_nick', width: 20 },
|
||||
@ -41,6 +41,11 @@ const ORDER_EXPORT_COLUMNS = Object.freeze([
|
||||
{ header: '商品明细', key: 'items_detail', width: 50 },
|
||||
{ header: '物流公司', key: 'logistics_name', width: 18 },
|
||||
{ header: '运单号', key: 'waybill_code', width: 24 },
|
||||
{ header: '业务类型', key: 'business_type', width: 12 },
|
||||
{ header: '运单接口', key: 'logistics_interface_name', width: 20 },
|
||||
{ header: '包材ID', key: 'package_material_id', width: 14 },
|
||||
{ header: '包材编码', key: 'package_material_code', width: 20 },
|
||||
{ header: '包材名称', key: 'package_material_name', width: 20 },
|
||||
{ header: '分配时间', key: 'waybill_allocated_at', width: 20 },
|
||||
{ header: '商品种数', key: 'items_count', width: 12 },
|
||||
{ header: '商品件数', key: 'items_total', width: 12 },
|
||||
@ -81,6 +86,11 @@ const ORDER_EXPORT_ITEM_COLUMNS = Object.freeze([
|
||||
{ header: '数量', key: 'item_quantity', width: 10 },
|
||||
{ header: '物流公司', key: 'logistics_name', width: 18 },
|
||||
{ header: '运单号', key: 'waybill_code', width: 30 },
|
||||
{ header: '业务类型', key: 'business_type', width: 12 },
|
||||
{ header: '运单接口', key: 'logistics_interface_name', width: 20 },
|
||||
{ header: '包材ID', key: 'package_material_id', width: 14 },
|
||||
{ header: '包材编码', key: 'package_material_code', width: 20 },
|
||||
{ header: '包材名称', key: 'package_material_name', width: 20 },
|
||||
{ header: '分配时间', key: 'waybill_allocated_at', width: 20 },
|
||||
{ header: '商品种数', key: 'items_count', width: 12 },
|
||||
{ header: '商品件数', key: 'items_total', width: 12 },
|
||||
@ -320,12 +330,13 @@ class OrderExportService extends OrderBaseService {
|
||||
* @param {Map<number, string>} [context.stockNameMap] stockId → 仓库商品名称的映射。
|
||||
* @param {Map<number, string>} [context.barcodeMap] stockId → 商品条码(逗号拼接)的映射。
|
||||
* @param {Map<number, Array<Object>>} [context.expressMap] 订单ID → 运单行列表的映射。
|
||||
* @param {Map<number, string>} [context.packageMaterialMap] package_material_id → 包材编码的映射。
|
||||
* @param {string} [mode='waybill'] 导出模式:'waybill' 或 'item'。
|
||||
* @return {Array<Object>} 导出行数组。
|
||||
*/
|
||||
mapOrderExportRow(orderRow = {}, context = {}, mode = 'waybill') {
|
||||
const safeOrderRow = this.isPlainObject(orderRow) ? orderRow : {};
|
||||
const { itemsMap, storeRemarkMap, stockNameMap, barcodeMap, expressMap } = context;
|
||||
const { itemsMap, storeRemarkMap, stockNameMap, barcodeMap, expressMap, packageMaterialMap } = context;
|
||||
const safeItemsMap = itemsMap instanceof Map ? itemsMap : new Map();
|
||||
const safeStoreRemarkMap = storeRemarkMap instanceof Map ? storeRemarkMap : new Map();
|
||||
const safeExpressMap = expressMap instanceof Map ? expressMap : new Map();
|
||||
@ -417,12 +428,24 @@ class OrderExportService extends OrderBaseService {
|
||||
const waybillFirstTime = expressList.length > 0 ? formatDateSafe(expressList[0].create_at) : '';
|
||||
const weightSummary = expressList.reduce((sum, e) => sum + (Number(e.weighing_weight) || 0), 0);
|
||||
|
||||
const firstExp = expressList.length > 0 ? expressList[0] : null;
|
||||
const businessType = firstExp ? (Number(firstExp.business_key) === 1 ? '主单号' : '子单号') : '';
|
||||
const interfaceName = firstExp ? String(firstExp.logistics_interface_name || '') : '';
|
||||
const materialId = firstExp ? (firstExp.package_material_id != null ? Number(firstExp.package_material_id) : '') : '';
|
||||
const safePackageMaterialMap = packageMaterialMap instanceof Map ? packageMaterialMap : new Map();
|
||||
const materialCode = materialId ? (safePackageMaterialMap.get(Number(materialId)) || '') : '';
|
||||
|
||||
if (items.length === 0) {
|
||||
return [{
|
||||
...commonFields,
|
||||
item_name: '',
|
||||
item_barcode: '',
|
||||
item_quantity: '',
|
||||
business_type: businessType,
|
||||
logistics_interface_name: this.normalizeExportCellValue(interfaceName),
|
||||
package_material_id: materialId,
|
||||
package_material_code: this.normalizeExportCellValue(materialCode),
|
||||
package_material_name: this.normalizeExportCellValue(firstExp ? firstExp.package_material_name_snapshot : ''),
|
||||
waybill_code: waybillSummary,
|
||||
waybill_allocated_at: waybillFirstTime,
|
||||
weighing_weight: weightSummary || '',
|
||||
@ -436,6 +459,11 @@ class OrderExportService extends OrderBaseService {
|
||||
item_name: (sid > 0 ? safeStockNameMap.get(sid) : '') || item.item_name || '',
|
||||
item_barcode: sid > 0 ? (safeBarcodeMap.get(sid) || '') : '',
|
||||
item_quantity: item.plan_qty || 1,
|
||||
business_type: businessType,
|
||||
logistics_interface_name: this.normalizeExportCellValue(interfaceName),
|
||||
package_material_id: materialId,
|
||||
package_material_code: this.normalizeExportCellValue(materialCode),
|
||||
package_material_name: this.normalizeExportCellValue(firstExp ? firstExp.package_material_name_snapshot : ''),
|
||||
waybill_code: waybillSummary,
|
||||
waybill_allocated_at: waybillFirstTime,
|
||||
weighing_weight: weightSummary || '',
|
||||
@ -444,12 +472,19 @@ class OrderExportService extends OrderBaseService {
|
||||
}
|
||||
|
||||
// ★ 模式A(默认 waybill):按运单展开,保留 items_detail
|
||||
const safePackageMaterialMap = packageMaterialMap instanceof Map ? packageMaterialMap : new Map();
|
||||
|
||||
if (expressList.length === 0) {
|
||||
// 无运单的订单也输出一行(运单字段为空)
|
||||
return [{
|
||||
...commonFields,
|
||||
items_detail: this.normalizeExportCellValue(itemsDetail),
|
||||
waybill_code: '',
|
||||
business_type: '',
|
||||
logistics_interface_name: '',
|
||||
package_material_id: '',
|
||||
package_material_code: '',
|
||||
package_material_name: '',
|
||||
waybill_allocated_at: '',
|
||||
weighing_weight: '',
|
||||
}];
|
||||
@ -459,6 +494,13 @@ class OrderExportService extends OrderBaseService {
|
||||
...commonFields,
|
||||
items_detail: this.normalizeExportCellValue(itemsDetail),
|
||||
waybill_code: exp.waybill_code || '',
|
||||
business_type: Number(exp.business_key) === 1 ? '主单号' : '子单号',
|
||||
logistics_interface_name: this.normalizeExportCellValue(exp.logistics_interface_name),
|
||||
package_material_id: exp.package_material_id != null ? Number(exp.package_material_id) : '',
|
||||
package_material_code: this.normalizeExportCellValue(
|
||||
exp.package_material_id != null ? (safePackageMaterialMap.get(Number(exp.package_material_id)) || '') : ''
|
||||
),
|
||||
package_material_name: this.normalizeExportCellValue(exp.package_material_name_snapshot),
|
||||
waybill_allocated_at: formatDateSafe(exp.create_at),
|
||||
weighing_weight: exp.weighing_weight != null ? Number(exp.weighing_weight) : '',
|
||||
}));
|
||||
@ -722,7 +764,7 @@ class OrderExportService extends OrderBaseService {
|
||||
order_id: { [this.app.Sequelize.Op.in]: orderIds },
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
attributes: [ 'id', 'order_id', 'waybill_code', 'create_at', 'weighing_weight' ],
|
||||
attributes: [ 'id', 'order_id', 'waybill_code', 'business_key', 'logistics_interface_name', 'package_material_id', 'package_material_name_snapshot', 'create_at', 'weighing_weight' ],
|
||||
order: [[ 'id', 'ASC' ]],
|
||||
raw: true,
|
||||
});
|
||||
@ -768,7 +810,37 @@ class OrderExportService extends OrderBaseService {
|
||||
}
|
||||
}
|
||||
|
||||
const exportContext = { itemsMap, storeRemarkMap, stockNameMap, barcodeMap, expressMap };
|
||||
// 批量查询包材编码(wms_package_material),按 package_material_id 分组
|
||||
const packageMaterialMap = new Map();
|
||||
if (expressMap.size > 0 && this.ctx && this.ctx.model && this.ctx.model.PackageMaterial) {
|
||||
try {
|
||||
const materialIds = [
|
||||
...new Set(
|
||||
[ ...expressMap.values() ]
|
||||
.flat()
|
||||
.map(exp => Number(exp.package_material_id || 0))
|
||||
.filter(id => id > 0)
|
||||
),
|
||||
];
|
||||
if (materialIds.length > 0) {
|
||||
const pmRows = await this.ctx.model.PackageMaterial.findAll({
|
||||
where: { id: { [this.app.Sequelize.Op.in]: materialIds } },
|
||||
attributes: [ 'id', 'material_code' ],
|
||||
raw: true,
|
||||
});
|
||||
for (const pm of (Array.isArray(pmRows) ? pmRows : [])) {
|
||||
const pid = Number(pm.id || 0);
|
||||
if (pid > 0 && !packageMaterialMap.has(pid)) {
|
||||
packageMaterialMap.set(pid, String(pm.material_code || '').trim());
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
this.app.logger.warn(`[order_export] 批量查询包材编码失败: ${err.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
const exportContext = { itemsMap, storeRemarkMap, stockNameMap, barcodeMap, expressMap, packageMaterialMap };
|
||||
|
||||
for (const row of normalizedRows) {
|
||||
const exportRows = this.mapOrderExportRow(row, exportContext, mode);
|
||||
|
||||
@ -65,6 +65,21 @@ class OrderExpressService extends Service {
|
||||
return normalizedCode;
|
||||
}
|
||||
|
||||
/**
|
||||
* 规范化并校验包材ID。
|
||||
* @param {number|string} packageMaterialId 包材ID。
|
||||
* @return {number} 合法包材ID。
|
||||
*/
|
||||
normalizePackageMaterialId(packageMaterialId) {
|
||||
const normalizedId = Number(packageMaterialId || 0);
|
||||
|
||||
if (!Number.isFinite(normalizedId) || normalizedId <= 0) {
|
||||
throw this.createBusinessError('参数错误', 400);
|
||||
}
|
||||
|
||||
return normalizedId;
|
||||
}
|
||||
|
||||
/**
|
||||
* 规范化并校验绑定包材场景的订单ID。
|
||||
* @param {number|string} orderId 订单ID。
|
||||
@ -92,6 +107,35 @@ class OrderExpressService extends Service {
|
||||
return warehouseId;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据包材ID查询当前仓库启用中的包材。
|
||||
* @param {number} packageMaterialId 包材ID。
|
||||
* @param {number} warehouseId 仓库 ID。
|
||||
* @return {Promise<Object>} 包材记录。
|
||||
*/
|
||||
async findActivePackageMaterialById(packageMaterialId, warehouseId) {
|
||||
const packageMaterialModel = this.ctx.model && this.ctx.model.PackageMaterial;
|
||||
if (!packageMaterialModel || typeof packageMaterialModel.findOne !== 'function') {
|
||||
throw this.createBusinessError('包材模型未初始化', 500);
|
||||
}
|
||||
|
||||
const materialRow = await packageMaterialModel.findOne({
|
||||
where: {
|
||||
warehouse_id: warehouseId,
|
||||
id: packageMaterialId,
|
||||
status: 1,
|
||||
},
|
||||
attributes: [ 'id', 'material_code', 'material_name', 'warehouse_id', 'status' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
if (!materialRow) {
|
||||
throw this.createBusinessError('包材ID不存在', 404);
|
||||
}
|
||||
|
||||
return materialRow;
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据包材编码查询当前仓库启用中的包材。
|
||||
* @param {string} packageMaterialCode 包材编码。
|
||||
@ -902,6 +946,57 @@ class OrderExpressService extends Service {
|
||||
type: this.ctx.model.QueryTypes.INSERT,
|
||||
}
|
||||
);
|
||||
|
||||
// 写入 order_operation_log
|
||||
try {
|
||||
const operationLogService = this.ctx
|
||||
&& this.ctx.service
|
||||
&& this.ctx.service.systems
|
||||
&& this.ctx.service.systems.operationLog;
|
||||
if (operationLogService && typeof operationLogService.createOperationLogs === 'function') {
|
||||
const logPayloads = [];
|
||||
if (isBatch && waveId) {
|
||||
logPayloads.push({
|
||||
businessType: 'order',
|
||||
businessId: `wave_${waveId}`,
|
||||
operationCode: 'ORDER_WEIGH',
|
||||
operator: { id: String(operatorId || ''), name: operatorName },
|
||||
extras: {
|
||||
message: `波次 ${waveNo || waveId} 批量称重 ${weight}g,成功 ${successCount}/${totalCount}`,
|
||||
warehouseId,
|
||||
waveId,
|
||||
waveNo: waveNo || '',
|
||||
weighingWeight: weight,
|
||||
successCount,
|
||||
totalCount,
|
||||
},
|
||||
});
|
||||
} else if (orderId) {
|
||||
logPayloads.push({
|
||||
businessType: 'order',
|
||||
businessId: `${orderId}`,
|
||||
operationCode: 'ORDER_WEIGH',
|
||||
operator: { id: String(operatorId || ''), name: operatorName },
|
||||
extras: {
|
||||
message: `订单称重 ${weight}g`,
|
||||
warehouseId,
|
||||
orderId,
|
||||
waybillCode: waybillCode || '',
|
||||
weighingWeight: weight,
|
||||
},
|
||||
});
|
||||
}
|
||||
if (logPayloads.length > 0) {
|
||||
await operationLogService.createOperationLogs(logPayloads);
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
this.ctx.logger.warn('[order_express._writeWeighActionLog] 写入 operation_log 失败,不影响主流程', {
|
||||
error: e && e.message,
|
||||
waveId,
|
||||
orderId,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -977,7 +1072,7 @@ class OrderExpressService extends Service {
|
||||
const orderDeliveryModel = await orderDeliveryFactory.getCurrentModel(warehouseId);
|
||||
const orderRow = await orderDeliveryModel.findOne({
|
||||
where: { id: orderId, warehouse_id: warehouseId },
|
||||
attributes: ['items_hash', 'items_crc'],
|
||||
attributes: [ 'items_hash', 'items_crc' ],
|
||||
raw: true,
|
||||
});
|
||||
if (!orderRow || !orderRow.items_hash) return;
|
||||
@ -1119,7 +1214,7 @@ class OrderExpressService extends Service {
|
||||
* 根据运单号绑定包材。
|
||||
*
|
||||
* 仅凭运单号即可绑定包材,无需传入订单ID。
|
||||
* 先按运单号 + 仓库ID 查询有效运单记录,再按包材编码查询启用中的包材,
|
||||
* 先按运单号 + 仓库ID 查询有效运单记录,再按包材ID查询启用中的包材,
|
||||
* 最后更新运单记录的包材字段。
|
||||
*
|
||||
* 支持团购波次自动感知:
|
||||
@ -1129,7 +1224,7 @@ class OrderExpressService extends Service {
|
||||
*
|
||||
* @param {Object} [payload={}] 请求参数。
|
||||
* @param {string} payload.waybillCode 运单号。
|
||||
* @param {string} payload.packageMaterialCode 包材编码。
|
||||
* @param {number|string} payload.packageMaterialId 包材ID。
|
||||
* @return {Promise<Object>} 单条绑定返回 {order_id, waybill_code, package_material_id, package_material_name_snapshot, package_material_code};
|
||||
* 团购批量绑定返回 {wave_id, wave_no, business_key, order_id, waybill_code, package_material_id, package_material_code, package_material_name_snapshot, bind_count, bound_waybills, store_name, sys_logistics_name}。
|
||||
*/
|
||||
@ -1137,11 +1232,11 @@ class OrderExpressService extends Service {
|
||||
const requestData = payload && typeof payload === 'object' ? payload : {};
|
||||
const {
|
||||
waybillCode,
|
||||
packageMaterialCode,
|
||||
packageMaterialId,
|
||||
} = requestData;
|
||||
|
||||
const normalizedWaybillCode = this.normalizeWaybillCode(waybillCode);
|
||||
const normalizedPackageMaterialCode = this.normalizePackageMaterialCode(packageMaterialCode);
|
||||
const normalizedPackageMaterialId = this.normalizePackageMaterialId(packageMaterialId);
|
||||
const warehouseId = this.getCurrentWarehouseId();
|
||||
|
||||
// 按运单号 + 仓库ID 查询有效运单记录
|
||||
@ -1156,7 +1251,7 @@ class OrderExpressService extends Service {
|
||||
warehouse_id: warehouseId,
|
||||
delete_at: null,
|
||||
},
|
||||
attributes: ['id', 'order_id', 'waybill_code', 'warehouse_id', 'delete_at', 'package_material_id', 'business_key'],
|
||||
attributes: [ 'id', 'order_id', 'waybill_code', 'warehouse_id', 'delete_at', 'package_material_id', 'business_key' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
@ -1165,7 +1260,7 @@ class OrderExpressService extends Service {
|
||||
}
|
||||
|
||||
// 查询启用中的包材
|
||||
const materialRow = await this.findActivePackageMaterialByCode(normalizedPackageMaterialCode, warehouseId);
|
||||
const materialRow = await this.findActivePackageMaterialById(normalizedPackageMaterialId, warehouseId);
|
||||
|
||||
// --- 团购波次自动感知 ---
|
||||
// 尝试查询运单所属订单是否属于团购波次
|
||||
@ -1175,7 +1270,7 @@ class OrderExpressService extends Service {
|
||||
const orderDeliveryModel = await orderDeliveryFactory.getCurrentModel(warehouseId);
|
||||
const orderRow = await orderDeliveryModel.findOne({
|
||||
where: { id: Number(orderExpressRow.order_id), warehouse_id: warehouseId },
|
||||
attributes: ['id', 'wave_id', 'wave_no'],
|
||||
attributes: [ 'id', 'wave_id', 'wave_no' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
@ -1188,7 +1283,7 @@ class OrderExpressService extends Service {
|
||||
if (waveBatchModel && typeof waveBatchModel.findOne === 'function') {
|
||||
const waveRow = await waveBatchModel.findOne({
|
||||
where: { wave_id: waveId, warehouse_id: warehouseId },
|
||||
attributes: ['wave_id', 'wave_no', 'wave_type'],
|
||||
attributes: [ 'wave_id', 'wave_no', 'wave_type' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
@ -1199,7 +1294,7 @@ class OrderExpressService extends Service {
|
||||
waveNo: String(waveRow.wave_no || ''),
|
||||
businessKey: orderExpressRow.business_key ?? null,
|
||||
packageMaterialId: Number(materialRow.id),
|
||||
packageMaterialCode: normalizedPackageMaterialCode,
|
||||
packageMaterialCode: String(materialRow.material_code || '').trim(),
|
||||
packageMaterialName: String(materialRow.material_name || '').trim(),
|
||||
warehouseId,
|
||||
triggerOrderId: Number(orderExpressRow.order_id),
|
||||
@ -1271,6 +1366,35 @@ class OrderExpressService extends Service {
|
||||
warehouseId,
|
||||
});
|
||||
|
||||
// 写入包材绑定操作日志(单条绑定)
|
||||
try {
|
||||
const ctxUser = this.ctx && this.ctx.user ? this.ctx.user : {};
|
||||
const operatorId = Number(ctxUser.employees_id || ctxUser.id || 0);
|
||||
const operatorName = String(ctxUser.employees_name || ctxUser.name || 'system').trim() || 'system';
|
||||
const opLogService = this.ctx.service && this.ctx.service.systems && this.ctx.service.systems.operationLog;
|
||||
if (opLogService && typeof opLogService.createOperationLogs === 'function') {
|
||||
await opLogService.createOperationLogs([{
|
||||
businessType: 'order',
|
||||
businessId: `${Number(orderExpressRow.order_id || 0)}`,
|
||||
operationCode: 'ORDER_PACKAGE_MATERIAL_BIND',
|
||||
operator: { id: String(operatorId || ''), name: operatorName },
|
||||
extras: {
|
||||
message: `订单绑定包材 ${String(materialRow.material_name || materialRow.material_code || '').trim()}`,
|
||||
warehouseId,
|
||||
orderId: Number(orderExpressRow.order_id || 0),
|
||||
waybillCode: normalizedWaybillCode,
|
||||
packageMaterialId: Number(materialRow.id),
|
||||
packageMaterialName: String(materialRow.material_name || '').trim(),
|
||||
},
|
||||
}]);
|
||||
}
|
||||
} catch (e) {
|
||||
this.ctx.logger.warn('[order_express._bindSingleExpressPackageMaterial] 写入 operation_log 失败', {
|
||||
error: e && e.message,
|
||||
orderId: Number(orderExpressRow.order_id || 0),
|
||||
});
|
||||
}
|
||||
|
||||
return {
|
||||
order_id: Number(orderExpressRow.order_id),
|
||||
waybill_code: String(orderExpressRow.waybill_code || '').trim(),
|
||||
@ -1318,7 +1442,7 @@ class OrderExpressService extends Service {
|
||||
const orderDeliveryModel = await orderDeliveryFactory.getCurrentModel(warehouseId);
|
||||
const waveOrders = await orderDeliveryModel.findAll({
|
||||
where: { wave_id: waveId, warehouse_id: warehouseId },
|
||||
attributes: ['id'],
|
||||
attributes: [ 'id' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
@ -1346,7 +1470,7 @@ class OrderExpressService extends Service {
|
||||
business_key: businessKeyWhere,
|
||||
delete_at: null,
|
||||
},
|
||||
attributes: ['id', 'order_id', 'waybill_code', 'business_key', 'package_material_id'],
|
||||
attributes: [ 'id', 'order_id', 'waybill_code', 'business_key', 'package_material_id' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
@ -1354,7 +1478,7 @@ class OrderExpressService extends Service {
|
||||
// 波次下无同 business_key 运单 → 降级为仅绑定触发运单
|
||||
const orderExpressRow = await orderExpressModel.findOne({
|
||||
where: { waybill_code: triggerWaybillCode, warehouse_id: warehouseId, delete_at: null },
|
||||
attributes: ['id', 'order_id', 'waybill_code', 'package_material_id'],
|
||||
attributes: [ 'id', 'order_id', 'waybill_code', 'package_material_id' ],
|
||||
raw: true,
|
||||
});
|
||||
if (!orderExpressRow) {
|
||||
@ -1540,6 +1664,37 @@ class OrderExpressService extends Service {
|
||||
type: this.ctx.model.QueryTypes.INSERT,
|
||||
}
|
||||
);
|
||||
|
||||
// 写入 order_operation_log
|
||||
try {
|
||||
const operationLogService = this.ctx
|
||||
&& this.ctx.service
|
||||
&& this.ctx.service.systems
|
||||
&& this.ctx.service.systems.operationLog;
|
||||
if (operationLogService && typeof operationLogService.createOperationLogs === 'function') {
|
||||
await operationLogService.createOperationLogs([{
|
||||
businessType: 'order',
|
||||
businessId: `wave_${waveId}`,
|
||||
operationCode: 'ORDER_PACKAGE_MATERIAL_BIND',
|
||||
operator: { id: String(operatorId || ''), name: operatorName },
|
||||
extras: {
|
||||
message: `波次 ${waveNo || waveId} 绑定包材 ${packageMaterialName || packageMaterialCode},绑定量 ${bindCount}`,
|
||||
warehouseId,
|
||||
waveId,
|
||||
waveNo: waveNo || '',
|
||||
packageMaterialCode,
|
||||
packageMaterialName,
|
||||
bindCount,
|
||||
businessKey,
|
||||
},
|
||||
}]);
|
||||
}
|
||||
} catch (e) {
|
||||
this.ctx.logger.warn('[order_express._writePackageMaterialActionLog] 写入 operation_log 失败,不影响主流程', {
|
||||
error: e && e.message,
|
||||
waveId,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -433,6 +433,11 @@ class OrderPrintSystemService extends OrderBaseService {
|
||||
}
|
||||
const mergedPrintItems = Array.from(aggregatedMap.values());
|
||||
|
||||
// 为聚合后的商品行添加序号(从 1 开始)
|
||||
for (let i = 0; i < mergedPrintItems.length; i++) {
|
||||
mergedPrintItems[i].seq_no = i + 1;
|
||||
}
|
||||
|
||||
resultMap.set(orderId, {
|
||||
...orderRow,
|
||||
items: JSON.stringify(mergedPrintItems),
|
||||
|
||||
@ -1109,6 +1109,35 @@ class OrderStorageAllocationService extends MainService {
|
||||
await ctx.service.systems.storage.index.unlockQuantity(
|
||||
storageRow.id, allocationQuantity, { transaction }
|
||||
);
|
||||
|
||||
// 回退 stockAllocationMap 和 storageAllocationMap 中的累加值,防止 wms_stock_warehouse.locked_quantity 批量更新时多锁
|
||||
const prevStockQty = stockAllocationMap.get(stockId) || 0;
|
||||
const newStockQty = prevStockQty - allocationQuantity;
|
||||
if (newStockQty <= 0) {
|
||||
stockAllocationMap.delete(stockId);
|
||||
} else {
|
||||
stockAllocationMap.set(stockId, newStockQty);
|
||||
}
|
||||
|
||||
const prevStorageQty = storageAllocationMap.get(storageRow.id) || 0;
|
||||
const newStorageQty = prevStorageQty - allocationQuantity;
|
||||
if (newStorageQty <= 0) {
|
||||
storageAllocationMap.delete(storageRow.id);
|
||||
} else {
|
||||
storageAllocationMap.set(storageRow.id, newStorageQty);
|
||||
}
|
||||
|
||||
writeAllocationTextLog('[OrderStorageAllocationService.allocatePicking] 库位无效,回退库存主表锁定累加', {
|
||||
orderId,
|
||||
stockId,
|
||||
storageId: storageRow.id,
|
||||
allocationQuantity,
|
||||
prevStockQty,
|
||||
newStockQty,
|
||||
prevStorageQty,
|
||||
newStorageQty,
|
||||
});
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -1159,7 +1188,7 @@ class OrderStorageAllocationService extends MainService {
|
||||
const spaceErrorMessage = storageRowErrors.length > 0 && shortageMessage
|
||||
? `库位未设置(storage_id:${storageRowErrors.map(e => e.storage_id).join(',')})`
|
||||
: '';
|
||||
const finalShortageMessage = [shortageMessage, spaceErrorMessage].filter(Boolean).join('|');
|
||||
const finalShortageMessage = [ shortageMessage, spaceErrorMessage ].filter(Boolean).join('|');
|
||||
|
||||
writeAllocationTextLog('[OrderStorageAllocationService.allocatePicking] 订单缺货信息汇总', {
|
||||
orderId,
|
||||
@ -1829,6 +1858,50 @@ class OrderStorageAllocationService extends MainService {
|
||||
});
|
||||
}
|
||||
|
||||
// 写入 ORDER_SYNC 操作日志(所有请求的订单,含跳过/失败)
|
||||
try {
|
||||
const opLogService = this.ctx.service && this.ctx.service.systems && this.ctx.service.systems.operationLog;
|
||||
if (opLogService && typeof opLogService.createOperationLogs === 'function') {
|
||||
const channelNames = createChannelGroups.map(g => g.create_channel).join('/') || 'unknown';
|
||||
const operatorId = ctx.user?.employees_id ?? ctx.user?.id ?? null;
|
||||
const operatorName = ctx.user?.employees_name ?? ctx.user?.real_name ?? ctx.user?.name ?? 'system';
|
||||
const logItems = orderIds.map(orderId => {
|
||||
const isPending = syncableOrderIds.includes(orderId);
|
||||
const skipped = skippedOrders.find(s => Number(s.order_id) === orderId);
|
||||
const failed = fastFailedOrders.find(f => Number(f.order_id) === orderId);
|
||||
let msg;
|
||||
if (isPending) msg = `同步到${channelNames}渠道`;
|
||||
else if (failed) {
|
||||
const reasonMap = { 'express_unallocated': '快递未分配', 'sn_batch_forbidden': 'SN订单不支持批量' };
|
||||
msg = `同步跳过:${reasonMap[failed.failed_reason] || failed.failed_reason || failed.message || '条件不满足'}`;
|
||||
}
|
||||
else if (skipped) {
|
||||
const skipReasonMap = { 'already_synced': '已同步', 'not_found': '订单不存在' };
|
||||
msg = `同步跳过:${skipReasonMap[skipped.skipped_reason] || skipped.skipped_reason || '已同步'}`;
|
||||
}
|
||||
else msg = `同步跳过`;
|
||||
return {
|
||||
businessType: 'order',
|
||||
businessId: `${orderId}`,
|
||||
operationCode: 'ORDER_SYNC',
|
||||
operator: { id: operatorId, name: operatorName },
|
||||
extras: {
|
||||
message: msg,
|
||||
warehouseId,
|
||||
externalLogType: 'NONE',
|
||||
},
|
||||
};
|
||||
});
|
||||
await opLogService.createOperationLogs(logItems);
|
||||
}
|
||||
} catch (e) {
|
||||
ctx.logger.warn('[OrderStorageAllocationService.syncOrderIds] 写入 ORDER_SYNC 操作日志失败', {
|
||||
error: e && e.message,
|
||||
warehouseId,
|
||||
orderIds,
|
||||
});
|
||||
}
|
||||
|
||||
const responseData = {
|
||||
warehouse_id: warehouseId,
|
||||
requested_order_ids: orderIds,
|
||||
@ -2291,6 +2364,21 @@ class OrderStorageAllocationService extends MainService {
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 分拣缺货补货需求计算。
|
||||
*
|
||||
* 仓库级别的计算,针对当前仓库所有未完成储位分配的订单,
|
||||
* 计算每个 SKU 在分拣区与存货区的可用库存对比,
|
||||
* 输出分拣区缺口及建议补货量,供仓库人员决策移库。
|
||||
*
|
||||
* 入参:
|
||||
* - `warehouse_id`(可选):仓库 ID,不传则使用当前用户上下文
|
||||
*
|
||||
* @param {Object} data 请求体。
|
||||
* @return {Promise<Object>} 补货需求明细与汇总信息。
|
||||
* `list` 每项包含 `is_true_shortage`(两区均无库存时为 true),
|
||||
* `summary` 包含 `total_true_shortage_skus`(真正缺货的 SKU 数量)。
|
||||
*/
|
||||
}
|
||||
|
||||
module.exports = OrderStorageAllocationService;
|
||||
|
||||
@ -1809,21 +1809,7 @@ class PickSystemService extends Service {
|
||||
hooks: false,
|
||||
});
|
||||
|
||||
// 更新 wms_picking.status 为完成状态
|
||||
await ctx.model.query(`
|
||||
UPDATE wms_picking
|
||||
SET status = 'fin', updated_at = NOW()
|
||||
WHERE order_id IN (:orderIds)
|
||||
AND warehouse_id = :warehouseId
|
||||
`, {
|
||||
replacements: {
|
||||
orderIds: targetOrderIds,
|
||||
warehouseId,
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
|
||||
// 从 wms_picking 汇总各 storage_id 的 quantity,扣减 wms_storage 的锁定数量与可用数量
|
||||
// 先查询并锁定 pending 的 picking 记录,汇总各 storage_id 的扣减量
|
||||
const pickingSummaryRows = await ctx.model.query(`
|
||||
SELECT
|
||||
p.storage_id,
|
||||
@ -1831,9 +1817,12 @@ class PickSystemService extends Service {
|
||||
FROM wms_picking p
|
||||
WHERE p.order_id IN (:orderIds)
|
||||
AND p.warehouse_id = :warehouseId
|
||||
AND p.status = 'pending'
|
||||
AND p.deleted_at IS NULL -- 排除软删除记录,防止已删除的 picking 纳入锁定量汇总
|
||||
AND p.storage_id IS NOT NULL
|
||||
AND p.storage_id > 0
|
||||
GROUP BY p.storage_id
|
||||
FOR UPDATE
|
||||
`, {
|
||||
replacements: {
|
||||
orderIds: targetOrderIds,
|
||||
@ -1932,92 +1921,24 @@ class PickSystemService extends Service {
|
||||
await ctx.model.StorageTransaction.bulkCreate(transactionRows, { transaction });
|
||||
}
|
||||
|
||||
// 释放 wms_stock_warehouse 锁定数量并写入 wms_stock_transaction 出库流水
|
||||
const stockQtyMap = new Map();
|
||||
for (const sRow of storageRows) {
|
||||
const sid = Number(sRow.stock_id);
|
||||
if (!sid || sid <= 0) continue;
|
||||
const deduction = storageQtyMap.get(Number(sRow.id)) || 0;
|
||||
if (deduction <= 0) continue;
|
||||
stockQtyMap.set(sid, (stockQtyMap.get(sid) || 0) + deduction);
|
||||
}
|
||||
|
||||
if (stockQtyMap.size > 0) {
|
||||
const stockIds = Array.from(stockQtyMap.keys());
|
||||
const stockWarehouseRows = await ctx.model.StockWarehouse.findAll({
|
||||
where: {
|
||||
id: { [this.app.Sequelize.Op.in]: stockIds },
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
attributes: [ 'id', 'quantity', 'locked_quantity' ],
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
raw: true,
|
||||
transaction,
|
||||
});
|
||||
|
||||
const stockWarehouseMap = new Map();
|
||||
for (const swRow of stockWarehouseRows) {
|
||||
stockWarehouseMap.set(Number(swRow.id), swRow);
|
||||
}
|
||||
|
||||
for (const [ stockId, qty ] of stockQtyMap) {
|
||||
const swRow = stockWarehouseMap.get(stockId);
|
||||
if (!swRow) {
|
||||
ctx.logger.warn(`[pick] stock_warehouse 记录不存在: ${stockId}`);
|
||||
continue;
|
||||
}
|
||||
const currentLocked = Number(swRow.locked_quantity) || 0;
|
||||
if (currentLocked < qty) {
|
||||
throw this.createBusinessError(
|
||||
`货主库存 ${stockId} 锁定数量不足:当前锁定 ${currentLocked},需释放 ${qty}`,
|
||||
400
|
||||
);
|
||||
}
|
||||
await ctx.model.StockWarehouse.update({
|
||||
locked_quantity: this.app.Sequelize.literal(`locked_quantity - ${qty}`),
|
||||
update_at: this.app.Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
}, {
|
||||
where: {
|
||||
id: stockId,
|
||||
locked_quantity: { [this.app.Sequelize.Op.gte]: qty },
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
}
|
||||
|
||||
const stockTransactionRows = [];
|
||||
for (const [ stockId, qty ] of stockQtyMap) {
|
||||
const swRow = stockWarehouseMap.get(stockId);
|
||||
if (!swRow) continue;
|
||||
const sRow = storageRows.find(r => Number(r.stock_id) === stockId);
|
||||
const beforeQty = Number(swRow.quantity) || 0;
|
||||
const beforeLocked = Number(swRow.locked_quantity) || 0;
|
||||
stockTransactionRows.push({
|
||||
transaction_type: 'OUTBOUND',
|
||||
warehouse_id: warehouseId,
|
||||
store_id: sRow ? Number(sRow.store_id) || 0 : 0,
|
||||
stock_id: stockId,
|
||||
quantity: qty,
|
||||
before_quantity: beforeQty,
|
||||
after_quantity: Math.max(0, beforeQty - qty),
|
||||
before_locked_quantity: beforeLocked,
|
||||
after_locked_quantity: Math.max(0, beforeLocked - qty),
|
||||
order_type: 'PICK_OUTBOUND',
|
||||
order_no: targetOrderIds.join(',').slice(0, 255),
|
||||
order_id: taskId,
|
||||
operator_id: String(operatorId),
|
||||
operator_name: operatorName,
|
||||
remark: '拣货完成出库-货主库存释放',
|
||||
created_at: new Date(),
|
||||
});
|
||||
}
|
||||
|
||||
if (stockTransactionRows.length > 0) {
|
||||
await ctx.model.StockTransaction.bulkCreate(stockTransactionRows, { transaction });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 扣减完成后,更新 wms_picking.status 为完成状态(加 status 条件防重复)
|
||||
await ctx.model.query(`
|
||||
UPDATE wms_picking
|
||||
SET status = 'fin', updated_at = NOW()
|
||||
WHERE order_id IN (:orderIds)
|
||||
AND warehouse_id = :warehouseId
|
||||
AND status = 'pending'
|
||||
AND deleted_at IS NULL -- 排除软删除记录,防止重复标记已完成删除的 picking
|
||||
`, {
|
||||
replacements: {
|
||||
orderIds: targetOrderIds,
|
||||
warehouseId,
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
|
||||
const progress = await this.getTaskPickProgress(taskId, warehouseId, transaction);
|
||||
if (mode === 1 || progress.isCompleted) {
|
||||
await ctx.model.query(`
|
||||
@ -2035,6 +1956,24 @@ class PickSystemService extends Service {
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
|
||||
// 同步更新波次关联状态为已拣
|
||||
const taskWaveColumnSet = await this.getTableColumnSet('wms_wave_pick_task_wave');
|
||||
const taskWaveWarehouseFilterSql = taskWaveColumnSet.has('warehouse_id') ? ' AND warehouse_id = :warehouseId' : '';
|
||||
await ctx.model.query(`
|
||||
UPDATE wms_wave_pick_task_wave
|
||||
SET status = 1,
|
||||
pick_time = NOW(),
|
||||
update_time = NOW()
|
||||
WHERE task_id = :taskId
|
||||
${taskWaveWarehouseFilterSql}
|
||||
`, {
|
||||
replacements: {
|
||||
taskId,
|
||||
warehouseId,
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
} else {
|
||||
await ctx.model.query(`
|
||||
UPDATE wms_wave_pick_task
|
||||
@ -2066,6 +2005,36 @@ class PickSystemService extends Service {
|
||||
progress,
|
||||
});
|
||||
|
||||
// 写入 order_operation_log 拣货完成日志
|
||||
try {
|
||||
const operationLogService = this.ctx
|
||||
&& this.ctx.service
|
||||
&& this.ctx.service.systems
|
||||
&& this.ctx.service.systems.operationLog;
|
||||
if (operationLogService && typeof operationLogService.createOperationLogs === 'function') {
|
||||
const logPayloads = targetOrderIds.map(orderId => ({
|
||||
businessType: 'order',
|
||||
businessId: `${orderId}`,
|
||||
operationCode: 'ORDER_PICK_COMPLETE',
|
||||
operator: {
|
||||
id: operatorId ? String(operatorId) : null,
|
||||
name: operatorName || 'system',
|
||||
},
|
||||
extras: {
|
||||
message: `订单${orderId}拣货完成`,
|
||||
warehouseId,
|
||||
externalLogType: 'PDA',
|
||||
},
|
||||
}));
|
||||
await operationLogService.createOperationLogs(logPayloads);
|
||||
}
|
||||
} catch (e) {
|
||||
this.ctx.logger.warn('[pick.wavePickTaskComplete] 写入 order_operation_log 失败,不影响主流程', {
|
||||
error: e && e.message,
|
||||
targetOrderIds,
|
||||
});
|
||||
}
|
||||
|
||||
return {
|
||||
task_id: taskId,
|
||||
mode,
|
||||
@ -2289,7 +2258,7 @@ class PickSystemService extends Service {
|
||||
: null;
|
||||
const bindingTaskId = Number(activeBinding && activeBinding.task_id || 0);
|
||||
const bindingTaskStatus = Number(activeBinding && activeBinding.task_status || 0);
|
||||
if (bindingTaskId > 0 && bindingTaskId !== taskId && [ 0, 1, 2 ].includes(bindingTaskStatus)) {
|
||||
if (bindingTaskId > 0 && bindingTaskId !== taskId && [ 0, 1 ].includes(bindingTaskStatus)) {
|
||||
throw this.createBusinessError('该拣货车已绑定其他活动任务,无法重复绑定', 409, {
|
||||
task_id: bindingTaskId,
|
||||
task_no: String(activeBinding && activeBinding.task_no || '').trim() || null,
|
||||
|
||||
@ -314,9 +314,7 @@ class PickCompensationService extends MainService {
|
||||
* 2. SELECT wms_storage FOR UPDATE
|
||||
* 3. 校验 locked_quantity >= 解锁数量
|
||||
* 4. UPDATE wms_storage 只解锁 locked_quantity(不扣减 quantity)
|
||||
* 5. 按 stock_id 汇总,UPDATE wms_stock_warehouse 释放 locked_quantity(仅解锁,不扣减 quantity)
|
||||
* 6. INSERT wms_stock_transaction(OUTBOUND, quantity=0, 仅记录锁定释放)
|
||||
* 7. UPDATE wms_picking SET status='cancelled_released'
|
||||
* 5. UPDATE wms_picking SET status='cancelled_released'
|
||||
*
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @param {Array<Object>} cancelledPickingRows 已取消订单关联的拣货记录列表。
|
||||
@ -417,95 +415,6 @@ class PickCompensationService extends MainService {
|
||||
transaction,
|
||||
});
|
||||
|
||||
// 释放 wms_stock_warehouse 锁定数量(仅解锁,不扣减 quantity)并写入 wms_stock_transaction 流水
|
||||
const stockQtyMap = new Map();
|
||||
for (const sRow of storageRows) {
|
||||
const sid = Number(sRow.stock_id);
|
||||
if (!sid || sid <= 0) continue;
|
||||
const deduction = storageQtyMap.get(Number(sRow.id)) || 0;
|
||||
if (deduction <= 0) continue;
|
||||
stockQtyMap.set(sid, (stockQtyMap.get(sid) || 0) + deduction);
|
||||
}
|
||||
|
||||
if (stockQtyMap.size > 0) {
|
||||
const stockIds = Array.from(stockQtyMap.keys());
|
||||
const stockWarehouseRows = await ctx.model.StockWarehouse.findAll({
|
||||
where: {
|
||||
id: { [app.Sequelize.Op.in]: stockIds },
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
attributes: [ 'id', 'quantity', 'locked_quantity' ],
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
raw: true,
|
||||
transaction,
|
||||
});
|
||||
|
||||
const stockWarehouseMap = new Map();
|
||||
for (const swRow of stockWarehouseRows) {
|
||||
stockWarehouseMap.set(Number(swRow.id), swRow);
|
||||
}
|
||||
|
||||
for (const [ stockId, qty ] of stockQtyMap) {
|
||||
const swRow = stockWarehouseMap.get(stockId);
|
||||
if (!swRow) {
|
||||
ctx.logger.warn(`[pick-compensation-cancel] stock_warehouse 记录不存在: ${stockId}`);
|
||||
continue;
|
||||
}
|
||||
const currentLocked = Number(swRow.locked_quantity) || 0;
|
||||
if (currentLocked < qty) {
|
||||
throw this.createBusinessError(
|
||||
`货主库存 ${stockId} 锁定数量不足:当前锁定 ${currentLocked},需释放 ${qty}`,
|
||||
400
|
||||
);
|
||||
}
|
||||
await ctx.model.StockWarehouse.update({
|
||||
locked_quantity: app.Sequelize.literal(`locked_quantity - ${qty}`),
|
||||
update_at: app.Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
}, {
|
||||
where: {
|
||||
id: stockId,
|
||||
locked_quantity: { [app.Sequelize.Op.gte]: qty },
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
}
|
||||
|
||||
const stockTransactionRows = [];
|
||||
for (const [ stockId, qty ] of stockQtyMap) {
|
||||
const swRow = stockWarehouseMap.get(stockId);
|
||||
if (!swRow) continue;
|
||||
const sRow = storageRows.find(r => Number(r.stock_id) === stockId);
|
||||
const currentQty = Number(swRow.quantity) || 0;
|
||||
const currentLocked = Number(swRow.locked_quantity) || 0;
|
||||
stockTransactionRows.push({
|
||||
transaction_type: 'OUTBOUND',
|
||||
warehouse_id: warehouseId,
|
||||
store_id: sRow ? Number(sRow.store_id) || 0 : 0,
|
||||
stock_id: stockId,
|
||||
quantity: 0,
|
||||
before_quantity: currentQty,
|
||||
after_quantity: currentQty,
|
||||
before_locked_quantity: currentLocked,
|
||||
after_locked_quantity: Math.max(0, currentLocked - qty),
|
||||
order_type: 'PICK_CANCEL_RELEASE',
|
||||
order_no: normalizedConfirmedRows
|
||||
.filter(r => Number(r.stock_id) === stockId)
|
||||
.map(r => String(r.order_id))
|
||||
.join(',')
|
||||
.slice(0, 255),
|
||||
order_id: 0,
|
||||
operator_id: 'system',
|
||||
operator_name: 'system',
|
||||
remark: '拣货取消-货主库存锁定释放',
|
||||
created_at: new Date(),
|
||||
});
|
||||
}
|
||||
|
||||
if (stockTransactionRows.length > 0) {
|
||||
await ctx.model.StockTransaction.bulkCreate(stockTransactionRows, { transaction });
|
||||
}
|
||||
}
|
||||
|
||||
// Step 5: UPDATE wms_picking SET status='cancelled_released'
|
||||
const compensatedPickingIds = normalizedConfirmedRows.map(r => Number(r.id));
|
||||
await ctx.model.query(`
|
||||
@ -543,9 +452,7 @@ class PickCompensationService extends MainService {
|
||||
* 5. 查询 dispatch 表获取订单的 delivery_order_code 和 source_order_codes,
|
||||
* 为每个拣货记录 INSERT 一条 wms_storage_transaction(OUTBOUND, PICK_COMPENSATION),
|
||||
* 同一 storage 的多条记录共享相同的 before/after 数量
|
||||
* 6. 按 stock_id 汇总,UPDATE wms_stock_warehouse 释放 locked_quantity
|
||||
* 7. INSERT wms_stock_transaction(OUTBOUND)记录货主库存变更
|
||||
* 8. UPDATE wms_picking SET status='fin_compensated'
|
||||
* 6. UPDATE wms_picking SET status='fin_compensated'
|
||||
*
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @param {Array<Object>} pickingRows 待补偿的拣货记录列表。
|
||||
@ -742,91 +649,6 @@ class PickCompensationService extends MainService {
|
||||
await ctx.model.StorageTransaction.bulkCreate(transactionRows, { transaction });
|
||||
}
|
||||
|
||||
// 释放 wms_stock_warehouse 锁定数量并写入 wms_stock_transaction 出库流水
|
||||
const stockQtyMap = new Map();
|
||||
for (const sRow of storageRows) {
|
||||
const sid = Number(sRow.stock_id);
|
||||
if (!sid || sid <= 0) continue;
|
||||
const deduction = storageQtyMap.get(Number(sRow.id)) || 0;
|
||||
if (deduction <= 0) continue;
|
||||
stockQtyMap.set(sid, (stockQtyMap.get(sid) || 0) + deduction);
|
||||
}
|
||||
|
||||
if (stockQtyMap.size > 0) {
|
||||
const stockIds = Array.from(stockQtyMap.keys());
|
||||
const stockWarehouseRows = await ctx.model.StockWarehouse.findAll({
|
||||
where: {
|
||||
id: { [app.Sequelize.Op.in]: stockIds },
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
attributes: [ 'id', 'quantity', 'locked_quantity' ],
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
raw: true,
|
||||
transaction,
|
||||
});
|
||||
|
||||
const stockWarehouseMap = new Map();
|
||||
for (const swRow of stockWarehouseRows) {
|
||||
stockWarehouseMap.set(Number(swRow.id), swRow);
|
||||
}
|
||||
|
||||
for (const [ stockId, qty ] of stockQtyMap) {
|
||||
const swRow = stockWarehouseMap.get(stockId);
|
||||
if (!swRow) {
|
||||
ctx.logger.warn(`[pick-compensation] stock_warehouse 记录不存在: ${stockId}`);
|
||||
continue;
|
||||
}
|
||||
const currentLocked = Number(swRow.locked_quantity) || 0;
|
||||
if (currentLocked < qty) {
|
||||
throw this.createBusinessError(
|
||||
`货主库存 ${stockId} 锁定数量不足:当前锁定 ${currentLocked},需释放 ${qty}`,
|
||||
400
|
||||
);
|
||||
}
|
||||
await ctx.model.StockWarehouse.update({
|
||||
locked_quantity: app.Sequelize.literal(`locked_quantity - ${qty}`),
|
||||
update_at: app.Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
}, {
|
||||
where: {
|
||||
id: stockId,
|
||||
locked_quantity: { [app.Sequelize.Op.gte]: qty },
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
}
|
||||
|
||||
const stockTransactionRows = [];
|
||||
for (const [ stockId, qty ] of stockQtyMap) {
|
||||
const swRow = stockWarehouseMap.get(stockId);
|
||||
if (!swRow) continue;
|
||||
const sRow = storageRows.find(r => Number(r.stock_id) === stockId);
|
||||
const beforeQty = Number(swRow.quantity) || 0;
|
||||
const beforeLocked = Number(swRow.locked_quantity) || 0;
|
||||
stockTransactionRows.push({
|
||||
transaction_type: 'OUTBOUND',
|
||||
warehouse_id: warehouseId,
|
||||
store_id: sRow ? Number(sRow.store_id) || 0 : 0,
|
||||
stock_id: stockId,
|
||||
quantity: qty,
|
||||
before_quantity: beforeQty,
|
||||
after_quantity: Math.max(0, beforeQty - qty),
|
||||
before_locked_quantity: beforeLocked,
|
||||
after_locked_quantity: Math.max(0, beforeLocked - qty),
|
||||
order_type: COMPENSATION_ORDER_TYPE,
|
||||
order_no: confirmedOrderIds.join(',').slice(0, 255),
|
||||
order_id: confirmedOrderIds[0] || 0,
|
||||
operator_id: 'system',
|
||||
operator_name: 'system',
|
||||
remark: '拣货完成补偿出库-货主库存释放',
|
||||
created_at: new Date(),
|
||||
});
|
||||
}
|
||||
|
||||
if (stockTransactionRows.length > 0) {
|
||||
await ctx.model.StockTransaction.bulkCreate(stockTransactionRows, { transaction });
|
||||
}
|
||||
}
|
||||
|
||||
// Step 6: UPDATE wms_picking SET status='fin_compensated'
|
||||
const compensatedPickingIds = normalizedConfirmedRows.map(r => Number(r.id));
|
||||
await ctx.model.query(`
|
||||
|
||||
882
app/service/systems/receiving_entry_match.js
Normal file
882
app/service/systems/receiving_entry_match.js
Normal file
@ -0,0 +1,882 @@
|
||||
'use strict';
|
||||
|
||||
const Service = require('egg').Service;
|
||||
|
||||
/** @type {number} 收货单缓存过期时间(秒) */
|
||||
const RECEIVING_CACHE_TTL = 300;
|
||||
|
||||
/** @type {number} 收货单查询天数范围 */
|
||||
const RECEIVING_LOOKBACK_DAYS = 3;
|
||||
|
||||
/** @type {string} 收货单列表缓存键前缀 */
|
||||
const RECEIVING_CACHE_KEY_PREFIX = 'cache:receiving_orders:warehouse:';
|
||||
|
||||
/**
|
||||
* 入库单创建后异步匹配收货单并写入绑定关系服务。
|
||||
*
|
||||
* 职责:
|
||||
* 1. 缓存仓库下近 3 天的收货单列表(Redis,TTL 300s)
|
||||
* 2. 根据入库单 remark 匹配收货单号
|
||||
* 3. 对比入库单明细与收货单明细(SKU + 数量)
|
||||
* 4. 匹配成功后写入 wms_entry_order_receiving 绑定关系,CREATED 状态转 PENDING
|
||||
* 5. 覆盖场景标记收货单为"部分入库"
|
||||
*/
|
||||
class ReceivingEntryMatchService extends Service {
|
||||
|
||||
/**
|
||||
* 入库单创建后的异步匹配入口:根据备注匹配收货单,写入绑定关系并在必要时转换状态。
|
||||
* 匹配到收货单后写入 wms_entry_order_receiving 绑定关系;
|
||||
* 如果入库单当前状态为 CREATED,同步更新为 PENDING。
|
||||
* 不阻塞主流程,所有错误仅记录日志。
|
||||
*
|
||||
* @param {number} entryOrderId 入库单 ID
|
||||
* @return {Promise<void>}
|
||||
*/
|
||||
async matchAfterEntryCompleted(entryOrderId) {
|
||||
const { ctx } = this;
|
||||
|
||||
try {
|
||||
// 1. 加载入库单及其明细
|
||||
const entryOrder = await ctx.model.EntryOrder.findOne({
|
||||
where: { id: entryOrderId, is_enabled: 1, deleted_at: null },
|
||||
include: [{
|
||||
model: ctx.model.EntryItems,
|
||||
as: 'items',
|
||||
required: false,
|
||||
attributes: [ 'id', 'item_code', 'stock_id', 'count', 'received_quantity', 'inventory_type' ],
|
||||
}],
|
||||
});
|
||||
|
||||
if (!entryOrder) {
|
||||
ctx.logger.warn(`[ReceivingEntryMatch] 入库单不存在,跳过匹配 entryOrderId=${entryOrderId}`);
|
||||
return;
|
||||
}
|
||||
|
||||
const remark = (entryOrder.remark || '').trim();
|
||||
if (!remark) {
|
||||
ctx.logger.info(`[ReceivingEntryMatch] 入库单无备注,跳过匹配 entryOrderId=${entryOrderId}`);
|
||||
return;
|
||||
}
|
||||
|
||||
const warehouseId = entryOrder.warehouse_id;
|
||||
|
||||
// 2. 获取近 3 天的收货单列表(带缓存)
|
||||
const receivingOrders = await this._getRecentReceivingOrders(warehouseId);
|
||||
|
||||
if (!receivingOrders || receivingOrders.length === 0) {
|
||||
ctx.logger.info(`[ReceivingEntryMatch] 仓库无近期收货单,跳过匹配 warehouseId=${warehouseId}`);
|
||||
return;
|
||||
}
|
||||
|
||||
// 3. 从 remark 中提取可能匹配的收货单号
|
||||
const matchedReceiving = await this._findReceivingByRemark(remark, receivingOrders, warehouseId);
|
||||
|
||||
if (!matchedReceiving) {
|
||||
ctx.logger.info(`[ReceivingEntryMatch] remark 中未匹配到收货单号 entryOrderId=${entryOrderId} remark="${remark}"`);
|
||||
return;
|
||||
}
|
||||
|
||||
ctx.logger.info(
|
||||
`[ReceivingEntryMatch] 匹配到收货单 entryOrderId=${entryOrderId} ` +
|
||||
`receivingId=${matchedReceiving.id} receivingNumber=${matchedReceiving.receiving_number}`
|
||||
);
|
||||
|
||||
// 4. 对比明细
|
||||
const entryItems = (entryOrder.items || []).map(item => ({
|
||||
stockId: item.stock_id,
|
||||
itemCode: item.item_code,
|
||||
count: item.count || 0,
|
||||
receivedQuantity: item.received_quantity || 0,
|
||||
inventoryType: item.inventory_type || 'ZP',
|
||||
}));
|
||||
|
||||
const comparisonResult = this._compareDetails(entryItems, matchedReceiving.details || []);
|
||||
|
||||
// 5. 根据对比结果写入绑定关系
|
||||
if (comparisonResult.type === 'full_match' || comparisonResult.type === 'receiving_covers_entry') {
|
||||
// 匹配成功 → 写入 wms_entry_order_receiving 绑定关系
|
||||
await this._bindEntryOrderReceiving(entryOrderId, matchedReceiving.id);
|
||||
|
||||
// 若入库单当前状态是 CREATED,更新为 PENDING
|
||||
if (entryOrder.order_status === 'CREATED') {
|
||||
await ctx.model.EntryOrder.update(
|
||||
{ order_status: 'PENDING', updated_at: new Date() },
|
||||
{ where: { id: entryOrderId, order_status: 'CREATED' } }
|
||||
);
|
||||
ctx.logger.info(
|
||||
`[ReceivingEntryMatch] 入库单状态 CREATED → PENDING entryOrderId=${entryOrderId} ` +
|
||||
`receivingId=${matchedReceiving.id}`
|
||||
);
|
||||
}
|
||||
|
||||
// receipting_covers_entry 场景额外标记收货单为部分入库
|
||||
if (comparisonResult.type === 'receiving_covers_entry') {
|
||||
await this._markReceivingPartialStorage(matchedReceiving.id, comparisonResult, warehouseId);
|
||||
}
|
||||
} else {
|
||||
// 其他情况(entry 有 receiving 没有的明细,或完全不匹配)→ 不做处理
|
||||
ctx.logger.info(
|
||||
`[ReceivingEntryMatch] 明细对比结果为 ${comparisonResult.type},不触发绑定 ` +
|
||||
`entryOrderId=${entryOrderId} receivingId=${matchedReceiving.id}`
|
||||
);
|
||||
}
|
||||
} catch (error) {
|
||||
ctx.logger.error(
|
||||
`[ReceivingEntryMatch] 异步匹配异常 entryOrderId=${entryOrderId}: ${error.message}`,
|
||||
error.stack
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 写入入库单与收货单的主表级绑定关系。
|
||||
* 使用 upsert 策略避免重复写入;绑定记录为软删除模型,已删除的历史记录会被恢复。
|
||||
*
|
||||
* @param {number} entryOrderId 入库单 ID
|
||||
* @param {number} receivingId 收货单 ID
|
||||
* @return {Promise<void>}
|
||||
*/
|
||||
async _bindEntryOrderReceiving(entryOrderId, receivingId) {
|
||||
const { ctx } = this;
|
||||
|
||||
try {
|
||||
// 先检查是否已存在未删除的绑定记录
|
||||
const existing = await ctx.model.EntryOrderReceiving.findOne({
|
||||
where: { entry_order_id: entryOrderId, receiving_id: receivingId },
|
||||
paranoid: false,
|
||||
});
|
||||
|
||||
if (existing) {
|
||||
if (existing.deleted_at) {
|
||||
// 已软删除的记录,恢复它
|
||||
await existing.restore();
|
||||
ctx.logger.info(
|
||||
`[ReceivingEntryMatch] 恢复已删除的绑定关系 entryOrderId=${entryOrderId} receivingId=${receivingId}`
|
||||
);
|
||||
} else {
|
||||
ctx.logger.info(
|
||||
`[ReceivingEntryMatch] 绑定关系已存在,跳过 entryOrderId=${entryOrderId} receivingId=${receivingId}`
|
||||
);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
await ctx.model.EntryOrderReceiving.create({
|
||||
entry_order_id: entryOrderId,
|
||||
receiving_id: receivingId,
|
||||
});
|
||||
|
||||
ctx.logger.info(
|
||||
`[ReceivingEntryMatch] 写入绑定关系成功 entryOrderId=${entryOrderId} receivingId=${receivingId}`
|
||||
);
|
||||
} catch (error) {
|
||||
// 唯一索引冲突时忽略(并发场景)
|
||||
if (error.name === 'SequelizeUniqueConstraintError') {
|
||||
ctx.logger.warn(
|
||||
`[ReceivingEntryMatch] 绑定关系已存在(并发写入) entryOrderId=${entryOrderId} receivingId=${receivingId}`
|
||||
);
|
||||
return;
|
||||
}
|
||||
ctx.logger.error(
|
||||
`[ReceivingEntryMatch] 写入绑定关系失败 entryOrderId=${entryOrderId} receivingId=${receivingId}: ${error.message}`,
|
||||
error.stack
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取仓库近 3 天的收货单列表(优先从 Redis 缓存读取)。
|
||||
*
|
||||
* @param {number} warehouseId 仓库 ID
|
||||
* @return {Promise<Array<Object>>} 收货单列表(含明细)
|
||||
*/
|
||||
async _getRecentReceivingOrders(warehouseId) {
|
||||
const { ctx, app } = this;
|
||||
const cacheKey = `${RECEIVING_CACHE_KEY_PREFIX}${warehouseId}`;
|
||||
|
||||
try {
|
||||
// 先尝试从缓存读取
|
||||
const cached = await app.getCacheAsync(cacheKey);
|
||||
if (cached) {
|
||||
ctx.logger.info(`[ReceivingEntryMatch] 命中收货单缓存 warehouseId=${warehouseId}`);
|
||||
return cached;
|
||||
}
|
||||
} catch (cacheErr) {
|
||||
ctx.logger.warn(`[ReceivingEntryMatch] 读取缓存失败,回退到数据库查询: ${cacheErr.message}`);
|
||||
}
|
||||
|
||||
// 缓存未命中,从数据库查询
|
||||
const threeDaysAgo = new Date(Date.now() - RECEIVING_LOOKBACK_DAYS * 24 * 60 * 60 * 1000);
|
||||
|
||||
const receivingOrders = await ctx.model.Receiving.findAll({
|
||||
where: {
|
||||
warehouse_id: warehouseId,
|
||||
is_deleted: false,
|
||||
status: [ 'receiving', 'completed' ],
|
||||
created_at: { [app.Sequelize.Op.gte]: threeDaysAgo },
|
||||
},
|
||||
attributes: [ 'id', 'receiving_number', 'status', 'storage_status' ],
|
||||
include: [{
|
||||
model: ctx.model.ReceivingDetail,
|
||||
as: 'details',
|
||||
required: false,
|
||||
attributes: [
|
||||
'id', 'system_product_id', 'product_name', 'actual_quantity',
|
||||
'storage_status', 'stored_quantity',
|
||||
],
|
||||
}],
|
||||
order: [[ 'created_at', 'DESC' ]],
|
||||
});
|
||||
|
||||
const result = receivingOrders.map(order => {
|
||||
const plain = typeof order.toJSON === 'function' ? order.toJSON() : order;
|
||||
return {
|
||||
id: plain.id,
|
||||
receiving_number: plain.receiving_number,
|
||||
status: plain.status,
|
||||
storage_status: plain.storage_status,
|
||||
details: (plain.details || []).map(d => ({
|
||||
id: d.id,
|
||||
system_product_id: d.system_product_id,
|
||||
product_name: d.product_name,
|
||||
actual_quantity: d.actual_quantity,
|
||||
storage_status: d.storage_status,
|
||||
stored_quantity: d.stored_quantity || 0,
|
||||
})),
|
||||
};
|
||||
});
|
||||
|
||||
// 写入缓存
|
||||
try {
|
||||
await app.setCacheAsync(cacheKey, result, RECEIVING_CACHE_TTL);
|
||||
ctx.logger.info(`[ReceivingEntryMatch] 收货单缓存已写入 warehouseId=${warehouseId} count=${result.length}`);
|
||||
} catch (cacheErr) {
|
||||
ctx.logger.warn(`[ReceivingEntryMatch] 写入缓存失败: ${cacheErr.message}`);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 从入库单备注中查找匹配的收货单号。
|
||||
* 遍历缓存的收货单号列表,检查 remark 是否包含收货单号。
|
||||
* 若匹配到多个,返回最近创建的那一个。
|
||||
*
|
||||
* @param {string} remark 入库单备注
|
||||
* @param {Array<Object>} receivingOrders 收货单列表
|
||||
* @param {number} warehouseId 仓库 ID
|
||||
* @return {Promise<Object|null>} 匹配到的收货单(含明细),未匹配返回 null
|
||||
*/
|
||||
async _findReceivingByRemark(remark, receivingOrders, warehouseId) {
|
||||
const { ctx } = this;
|
||||
|
||||
// 按字符串包含匹配
|
||||
const matchedOrders = [];
|
||||
for (const order of receivingOrders) {
|
||||
if (remark.includes(order.receiving_number)) {
|
||||
matchedOrders.push(order);
|
||||
}
|
||||
}
|
||||
|
||||
if (matchedOrders.length === 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// 多个匹配时取第一个(列表已按 created_at DESC 排序,即最新)
|
||||
const matched = matchedOrders[0];
|
||||
|
||||
// 如果缓存的收货单没有 details(可能为空),重新加载
|
||||
if (!matched.details || matched.details.length === 0) {
|
||||
const fullOrder = await ctx.model.Receiving.findOne({
|
||||
where: { id: matched.id, warehouse_id: warehouseId },
|
||||
attributes: [ 'id', 'receiving_number', 'status', 'storage_status' ],
|
||||
include: [{
|
||||
model: ctx.model.ReceivingDetail,
|
||||
as: 'details',
|
||||
required: false,
|
||||
attributes: [
|
||||
'id', 'system_product_id', 'product_name', 'actual_quantity',
|
||||
'storage_status', 'stored_quantity',
|
||||
],
|
||||
}],
|
||||
});
|
||||
|
||||
if (!fullOrder) return null;
|
||||
|
||||
const plain = typeof fullOrder.toJSON === 'function' ? fullOrder.toJSON() : fullOrder;
|
||||
return {
|
||||
id: plain.id,
|
||||
receiving_number: plain.receiving_number,
|
||||
status: plain.status,
|
||||
storage_status: plain.storage_status,
|
||||
details: (plain.details || []).map(d => ({
|
||||
id: d.id,
|
||||
system_product_id: d.system_product_id,
|
||||
product_name: d.product_name,
|
||||
actual_quantity: d.actual_quantity,
|
||||
storage_status: d.storage_status,
|
||||
stored_quantity: d.stored_quantity || 0,
|
||||
})),
|
||||
};
|
||||
}
|
||||
|
||||
return matched;
|
||||
}
|
||||
|
||||
/**
|
||||
* 对比入库单明细与收货单明细。
|
||||
*
|
||||
* 判断规则:
|
||||
* - full_match:两者 SKU 与数量完全一致
|
||||
* - receiving_covers_entry:收货单包含入库单所有明细(SKU 匹配),
|
||||
* 且收货单至少有一个 SKU 数量多于入库单
|
||||
* - entry_exceeds_receiving:入库单有收货单没有的 SKU 或数量超出
|
||||
* - no_match:SKU 完全没有交集
|
||||
*
|
||||
* @param {Array<Object>} entryItems 入库单明细 [{ stockId, itemCode, count, receivedQuantity, inventoryType }]
|
||||
* @param {Array<Object>} receivingDetails 收货单明细 [{ id, system_product_id, actual_quantity, ... }]
|
||||
* @return {{ type: string, matchedDetails?: Array, uncoveredDetails?: Array, overageDetails?: Array }} 对比结果对象
|
||||
*/
|
||||
_compareDetails(entryItems, receivingDetails) {
|
||||
// 构建收货单明细 Map:system_product_id → { actual_quantity, ... }
|
||||
const receivingMap = new Map();
|
||||
for (const detail of receivingDetails) {
|
||||
const productId = detail.system_product_id;
|
||||
if (!productId) continue;
|
||||
const existing = receivingMap.get(productId);
|
||||
if (existing) {
|
||||
existing.actual_quantity += (detail.actual_quantity || 0);
|
||||
} else {
|
||||
receivingMap.set(productId, {
|
||||
detailId: detail.id,
|
||||
system_product_id: productId,
|
||||
actual_quantity: detail.actual_quantity || 0,
|
||||
stored_quantity: detail.stored_quantity || 0,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 构建入库单明细 Map:stock_id → { count, receivedQuantity }
|
||||
const entryMap = new Map();
|
||||
for (const item of entryItems) {
|
||||
const stockId = item.stockId;
|
||||
if (!stockId) continue;
|
||||
const existing = entryMap.get(stockId);
|
||||
if (existing) {
|
||||
existing.count += (item.count || 0);
|
||||
existing.receivedQuantity += (item.receivedQuantity || 0);
|
||||
} else {
|
||||
entryMap.set(stockId, {
|
||||
stockId,
|
||||
itemCode: item.itemCode,
|
||||
count: item.count || 0,
|
||||
receivedQuantity: item.receivedQuantity || 0,
|
||||
inventoryType: item.inventoryType,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if (entryMap.size === 0 || receivingMap.size === 0) {
|
||||
return { type: 'no_match' };
|
||||
}
|
||||
|
||||
// 检查入库单每个 SKU 是否在收货单中且数量 ≤ 收货单数量
|
||||
let allEntryItemsCovered = true;
|
||||
let hasReceivingOverage = false;
|
||||
const matchedDetails = []; // 匹配到的收货单明细
|
||||
const uncoveredDetails = []; // 入库单中有但收货单没有/不足的
|
||||
|
||||
for (const [ stockId, entryItem ] of entryMap) {
|
||||
const receivingItem = receivingMap.get(stockId);
|
||||
|
||||
if (!receivingItem) {
|
||||
// 入库单有,收货单没有 → 入库单超出
|
||||
allEntryItemsCovered = false;
|
||||
uncoveredDetails.push({
|
||||
stockId,
|
||||
itemCode: entryItem.itemCode,
|
||||
entryCount: entryItem.count,
|
||||
receivingCount: 0,
|
||||
reason: 'missing_in_receiving',
|
||||
});
|
||||
continue;
|
||||
}
|
||||
|
||||
if (entryItem.count > receivingItem.actual_quantity) {
|
||||
// 入库单数量 > 收货单数量 → 入库单超出
|
||||
allEntryItemsCovered = false;
|
||||
uncoveredDetails.push({
|
||||
stockId,
|
||||
itemCode: entryItem.itemCode,
|
||||
entryCount: entryItem.count,
|
||||
receivingCount: receivingItem.actual_quantity,
|
||||
reason: 'entry_exceeds_receiving',
|
||||
});
|
||||
} else if (entryItem.count < receivingItem.actual_quantity) {
|
||||
// 收货单数量 > 入库单数量 → 存在覆盖余量
|
||||
hasReceivingOverage = true;
|
||||
matchedDetails.push({
|
||||
...receivingItem,
|
||||
entryCount: entryItem.count,
|
||||
overage: receivingItem.actual_quantity - entryItem.count,
|
||||
});
|
||||
} else {
|
||||
// 数量完全相等
|
||||
matchedDetails.push({
|
||||
...receivingItem,
|
||||
entryCount: entryItem.count,
|
||||
overage: 0,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 检查收货单是否有入库单没有的 SKU
|
||||
const receivingOnlyItems = [];
|
||||
for (const [ productId ] of receivingMap) {
|
||||
if (!entryMap.has(productId)) {
|
||||
receivingOnlyItems.push(productId);
|
||||
}
|
||||
}
|
||||
|
||||
if (!allEntryItemsCovered) {
|
||||
return {
|
||||
type: 'entry_exceeds_receiving',
|
||||
uncoveredDetails,
|
||||
receivingOnlyItems,
|
||||
};
|
||||
}
|
||||
|
||||
if (hasReceivingOverage || receivingOnlyItems.length > 0) {
|
||||
return {
|
||||
type: 'receiving_covers_entry',
|
||||
matchedDetails,
|
||||
overageDetails: matchedDetails.filter(d => d.overage > 0),
|
||||
receivingOnlyItems,
|
||||
};
|
||||
}
|
||||
|
||||
// 所有入库单 SKU 都在收货单中,且数量完全相等,且收货单无额外 SKU
|
||||
return {
|
||||
type: 'full_match',
|
||||
matchedDetails,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据入库单来源发送回传。
|
||||
* - QM(奇门)→ 调用奇门入库单确认接口回传
|
||||
* - API(OpenAPI)→ 查询 ApiApp 回调地址并 POST 回传
|
||||
*
|
||||
* @param {Object} entryOrder 入库单实例
|
||||
* @param {Object} receivingOrder 匹配到的收货单
|
||||
* @param {string} [matchType='auto_match'] 匹配类型标识,手动匹配时传入 'manual_match'
|
||||
* @return {Promise<{success: boolean, sourceType: string, detail: Object}>} 回传结果
|
||||
*/
|
||||
async _sendCallback(entryOrder, receivingOrder, matchType = 'auto_match') {
|
||||
const { ctx } = this;
|
||||
const sourceType = String(entryOrder.source_type || '').toUpperCase();
|
||||
|
||||
ctx.logger.info(
|
||||
`[ReceivingEntryMatch] 准备回传 entryOrderId=${entryOrder.id} ` +
|
||||
`sourceType=${sourceType} receivingNumber=${receivingOrder.receiving_number}`
|
||||
);
|
||||
|
||||
if (sourceType === 'QM') {
|
||||
const detail = await this._sendQimenCallback(entryOrder, receivingOrder);
|
||||
return { success: detail.success, sourceType, detail };
|
||||
} else if (sourceType === 'API') {
|
||||
const detail = await this._sendOpenApiCallback(entryOrder, receivingOrder, matchType);
|
||||
return { success: detail.success, sourceType, detail };
|
||||
}
|
||||
|
||||
ctx.logger.info(
|
||||
`[ReceivingEntryMatch] 来源类型 ${sourceType} 不支持回传 entryOrderId=${entryOrder.id}`
|
||||
);
|
||||
return { success: false, sourceType, detail: { success: false, error: `来源类型 ${sourceType} 不支持回传` } };
|
||||
}
|
||||
|
||||
/**
|
||||
* 奇门回传:复用现有奇门入库单确认接口。
|
||||
*
|
||||
* @param {Object} entryOrder 入库单实例
|
||||
* @param {Object} receivingOrder 匹配到的收货单
|
||||
* @return {Promise<{success: boolean, error?: string}>} 回传结果
|
||||
*/
|
||||
async _sendQimenCallback(entryOrder, receivingOrder) {
|
||||
const { ctx, app } = this;
|
||||
|
||||
try {
|
||||
// 重新加载入库单明细
|
||||
const items = await ctx.model.EntryItems.findAll({
|
||||
where: { order_id: entryOrder.id },
|
||||
attributes: [ 'item_code', 'item_id', 'count', 'inventory_type', 'owner_code', 'received_quantity' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
if (!items || items.length === 0) {
|
||||
ctx.logger.warn(`[ReceivingEntryMatch] 奇门回传:入库单无明细 entryOrderId=${entryOrder.id}`);
|
||||
return { success: false, error: '入库单无明细' };
|
||||
}
|
||||
|
||||
const orderLines = items.map((item, index) => ({
|
||||
orderLineNo: index + 1,
|
||||
ownerCode: item.owner_code || '',
|
||||
itemCode: item.item_code || '',
|
||||
itemId: item.item_id || '',
|
||||
inventoryType: item.inventory_type || 'ZP',
|
||||
planQty: item.count || 0,
|
||||
actualQty: item.received_quantity || 0,
|
||||
}));
|
||||
|
||||
const queryData = {
|
||||
request: {
|
||||
entryOrder: {
|
||||
entryOrderCode: entryOrder.entry_order_code,
|
||||
ownerCode: entryOrder.qimen_owner_code || '',
|
||||
warehouseCode: entryOrder.qimen_warehouse_code || '',
|
||||
entryOrderId: entryOrder.id,
|
||||
entryOrderType: entryOrder.order_type,
|
||||
outBizCode: `RECEIVING_MATCH_${Date.now()}`,
|
||||
confirmType: 0, // 0 = 最终确认
|
||||
status: 'FULFILLED',
|
||||
freight: 0,
|
||||
operateTime: app.formatDate(new Date()),
|
||||
remark: `匹配收货单${receivingOrder.receiving_number}自动回传`,
|
||||
},
|
||||
orderLines,
|
||||
},
|
||||
};
|
||||
|
||||
const result = await app.qimenClient.send(
|
||||
'taobao.qimen.entryorder.confirm',
|
||||
entryOrder.qimen_owner_code,
|
||||
queryData,
|
||||
{ ctx }
|
||||
);
|
||||
|
||||
const qimenResult = result && result.xmlArray && result.xmlArray.response;
|
||||
if (qimenResult && String(qimenResult.flag) === 'success') {
|
||||
ctx.logger.info(
|
||||
`[ReceivingEntryMatch] 奇门回传成功 entryOrderId=${entryOrder.id} ` +
|
||||
`receivingNumber=${receivingOrder.receiving_number}`
|
||||
);
|
||||
return { success: true };
|
||||
}
|
||||
ctx.logger.warn(
|
||||
`[ReceivingEntryMatch] 奇门回传失败 entryOrderId=${entryOrder.id} ` +
|
||||
`message=${qimenResult?.message || '未知错误'}`
|
||||
);
|
||||
return { success: false, error: qimenResult?.message || '未知错误' };
|
||||
} catch (error) {
|
||||
ctx.logger.error(
|
||||
`[ReceivingEntryMatch] 奇门回传异常 entryOrderId=${entryOrder.id}: ${error.message}`,
|
||||
error.stack
|
||||
);
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* OpenAPI 回传:查询 ApiApp 回调地址,通过签名鉴权 POST 回传。
|
||||
*
|
||||
* @param {Object} entryOrder 入库单实例
|
||||
* @param {Object} receivingOrder 匹配到的收货单
|
||||
* @param {string} [matchType='auto_match'] 匹配类型标识
|
||||
* @return {Promise<{success: boolean, error?: string, retryCount?: number}>} 回传结果
|
||||
*/
|
||||
async _sendOpenApiCallback(entryOrder, receivingOrder, matchType = 'auto_match') {
|
||||
const { ctx, app } = this;
|
||||
|
||||
try {
|
||||
// 通过 store_warehouse 查找 ApiApp
|
||||
const storeWarehouse = await ctx.model.StoreWarehouse.findOne({
|
||||
where: {
|
||||
store_id: entryOrder.store_id,
|
||||
warehouse_id: entryOrder.warehouse_id,
|
||||
auth_status: 2, // 已通过
|
||||
},
|
||||
attributes: [ 'id' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
if (!storeWarehouse) {
|
||||
ctx.logger.warn(
|
||||
'[ReceivingEntryMatch] OpenAPI回传:未找到授权关系 ' +
|
||||
`entryOrderId=${entryOrder.id} storeId=${entryOrder.store_id} warehouseId=${entryOrder.warehouse_id}`
|
||||
);
|
||||
return { success: false, error: '未找到授权关系' };
|
||||
}
|
||||
|
||||
const apiApp = await ctx.model.ApiApp.findOne({
|
||||
where: {
|
||||
contract_id: storeWarehouse.id,
|
||||
is_enabled: 1,
|
||||
callback_url: {
|
||||
[ app.Sequelize.Op.and ]: [
|
||||
{ [ app.Sequelize.Op.ne ]: null },
|
||||
{ [ app.Sequelize.Op.ne ]: '' },
|
||||
],
|
||||
},
|
||||
},
|
||||
attributes: [ 'self_app_key', 'self_app_secret', 'callback_url' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
if (!apiApp || !apiApp.callback_url) {
|
||||
ctx.logger.warn(
|
||||
'[ReceivingEntryMatch] OpenAPI回传:未找到有效ApiApp配置 ' +
|
||||
`entryOrderId=${entryOrder.id} contractId=${storeWarehouse.id}`
|
||||
);
|
||||
return { success: false, error: '未找到有效ApiApp配置' };
|
||||
}
|
||||
|
||||
// 构建回传数据
|
||||
const callbackData = {
|
||||
entryOrderId: entryOrder.id,
|
||||
entryOrderCode: entryOrder.entry_order_code,
|
||||
receivingNumber: receivingOrder.receiving_number,
|
||||
receivingId: receivingOrder.id,
|
||||
matchType,
|
||||
completedAt: new Date().toISOString(),
|
||||
};
|
||||
|
||||
// 使用 OpenAPI 回调服务发送
|
||||
const result = await ctx.service.openapi.callback.sendWithRetry({
|
||||
callbackUrl: apiApp.callback_url,
|
||||
appKey: apiApp.self_app_key,
|
||||
selfAppSecret: apiApp.self_app_secret || '',
|
||||
event: 'entry_order_receiving_matched',
|
||||
data: callbackData,
|
||||
metadata: {
|
||||
source: 'receiving_entry_match',
|
||||
entryOrderId: entryOrder.id,
|
||||
receivingId: receivingOrder.id,
|
||||
},
|
||||
});
|
||||
|
||||
if (result.success) {
|
||||
ctx.logger.info(
|
||||
`[ReceivingEntryMatch] OpenAPI回传成功 entryOrderId=${entryOrder.id} ` +
|
||||
`callbackUrl=${apiApp.callback_url} retryCount=${result.retryCount}`
|
||||
);
|
||||
return { success: true, retryCount: result.retryCount };
|
||||
}
|
||||
ctx.logger.warn(
|
||||
`[ReceivingEntryMatch] OpenAPI回传失败 entryOrderId=${entryOrder.id} ` +
|
||||
`error=${result.error} retryCount=${result.retryCount}`
|
||||
);
|
||||
return { success: false, error: result.error, retryCount: result.retryCount };
|
||||
} catch (error) {
|
||||
ctx.logger.error(
|
||||
`[ReceivingEntryMatch] OpenAPI回传异常 entryOrderId=${entryOrder.id}: ${error.message}`,
|
||||
error.stack
|
||||
);
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 标记收货单为"部分入库"。
|
||||
* 更新收货单 storage_status 为 'partial',并更新明细的 storage_status 和 stored_quantity。
|
||||
*
|
||||
* @param {number} receivingId 收货单 ID
|
||||
* @param {Object} comparisonResult 对比结果
|
||||
* @param {number} warehouseId 仓库 ID
|
||||
* @return {Promise<{success: boolean, error?: string}>} 标记结果
|
||||
*/
|
||||
async _markReceivingPartialStorage(receivingId, comparisonResult, warehouseId) {
|
||||
const { ctx } = this;
|
||||
|
||||
try {
|
||||
const receiving = await ctx.model.Receiving.findOne({
|
||||
where: { id: receivingId, warehouse_id: warehouseId, is_deleted: false },
|
||||
});
|
||||
|
||||
if (!receiving) {
|
||||
ctx.logger.warn(`[ReceivingEntryMatch] 标记部分入库:收货单不存在 receivingId=${receivingId}`);
|
||||
return { success: false, error: '收货单不存在' };
|
||||
}
|
||||
|
||||
// 更新收货单主表的入库状态
|
||||
await receiving.update({
|
||||
storage_status: 'partial',
|
||||
updated_at: new Date(),
|
||||
});
|
||||
|
||||
// 更新匹配到的明细:标记为"全部入库",stored_quantity = entryCount
|
||||
if (comparisonResult.matchedDetails && comparisonResult.matchedDetails.length > 0) {
|
||||
for (const matched of comparisonResult.matchedDetails) {
|
||||
await ctx.model.ReceivingDetail.update(
|
||||
{
|
||||
storage_status: 'all',
|
||||
stored_quantity: matched.entryCount || matched.actual_quantity || 0,
|
||||
updated_at: new Date(),
|
||||
},
|
||||
{ where: { id: matched.detailId, receiving_id: receivingId } }
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// 更新超量明细:标记为"部分入库",stored_quantity = entryCount
|
||||
if (comparisonResult.overageDetails && comparisonResult.overageDetails.length > 0) {
|
||||
for (const overage of comparisonResult.overageDetails) {
|
||||
await ctx.model.ReceivingDetail.update(
|
||||
{
|
||||
storage_status: 'partial',
|
||||
stored_quantity: overage.entryCount || 0,
|
||||
updated_at: new Date(),
|
||||
},
|
||||
{ where: { id: overage.detailId, receiving_id: receivingId } }
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
ctx.logger.info(
|
||||
`[ReceivingEntryMatch] 收货单已标记为部分入库 receivingId=${receivingId} ` +
|
||||
`receivingNumber=${receiving.receiving_number}`
|
||||
);
|
||||
return { success: true };
|
||||
} catch (error) {
|
||||
ctx.logger.error(
|
||||
`[ReceivingEntryMatch] 标记部分入库失败 receivingId=${receivingId}: ${error.message}`,
|
||||
error.stack
|
||||
);
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 手动匹配入库单与收货单。
|
||||
*
|
||||
* 同步执行明细对比并触发回传,返回结构化匹配结果。
|
||||
* 适用场景:运营人员手动指定收货单与入库单进行匹配并回传。
|
||||
*
|
||||
* 匹配规则(复用 _compareDetails):
|
||||
* - full_match:两者 SKU 与数量完全一致 → 按来源回传
|
||||
* - receiving_covers_entry:收货单覆盖入库单 → 回传 + 标记部分入库
|
||||
* - entry_exceeds_receiving / no_match → 仅返回对比结果,不触发回传
|
||||
*
|
||||
* @param {number} receivingId 收货单 ID
|
||||
* @param {number} entryOrderId 入库单 ID
|
||||
* @return {Promise<Object>} 匹配结果对象
|
||||
* @return {string} return.matchType 匹配类型:full_match / receiving_covers_entry / entry_exceeds_receiving / no_match
|
||||
* @return {Object} return.comparisonResult 明细对比结果
|
||||
* @return {boolean} return.callbackSent 是否已发送回传
|
||||
* @return {Object|null} return.callbackResult 回传结果(未发送时为 null)
|
||||
* @return {boolean} return.partialStorageMarked 是否已标记部分入库
|
||||
* @return {Object} return.entryOrder 入库单摘要
|
||||
* @return {Object} return.receivingOrder 收货单摘要
|
||||
*/
|
||||
async manualMatch(receivingId, entryOrderId) {
|
||||
const { ctx } = this;
|
||||
|
||||
// 1. 加载入库单及其明细
|
||||
const entryOrder = await ctx.model.EntryOrder.findOne({
|
||||
where: { id: entryOrderId, is_enabled: 1, deleted_at: null },
|
||||
include: [{
|
||||
model: ctx.model.EntryItems,
|
||||
as: 'items',
|
||||
required: false,
|
||||
attributes: [ 'id', 'item_code', 'stock_id', 'count', 'received_quantity', 'inventory_type' ],
|
||||
}],
|
||||
});
|
||||
|
||||
if (!entryOrder) {
|
||||
throw new Error(`入库单不存在:${entryOrderId}`);
|
||||
}
|
||||
|
||||
// 2. 加载收货单及其明细
|
||||
const receivingOrder = await ctx.model.Receiving.findOne({
|
||||
where: { id: receivingId, is_deleted: false },
|
||||
include: [{
|
||||
model: ctx.model.ReceivingDetail,
|
||||
as: 'details',
|
||||
required: false,
|
||||
attributes: [
|
||||
'id', 'system_product_id', 'product_name', 'actual_quantity',
|
||||
'storage_status', 'stored_quantity',
|
||||
],
|
||||
}],
|
||||
});
|
||||
|
||||
if (!receivingOrder) {
|
||||
throw new Error(`收货单不存在:${receivingId}`);
|
||||
}
|
||||
|
||||
// 3. 校验同仓库
|
||||
if (entryOrder.warehouse_id !== receivingOrder.warehouse_id) {
|
||||
throw new Error(
|
||||
`入库单仓库(${entryOrder.warehouse_id})与收货单仓库(${receivingOrder.warehouse_id})不一致`
|
||||
);
|
||||
}
|
||||
|
||||
// 4. 构建入库单明细
|
||||
const entryItems = (entryOrder.items || []).map(item => ({
|
||||
stockId: item.stock_id,
|
||||
itemCode: item.item_code,
|
||||
count: item.count || 0,
|
||||
receivedQuantity: item.received_quantity || 0,
|
||||
inventoryType: item.inventory_type || 'ZP',
|
||||
}));
|
||||
|
||||
// 5. 构建收货单明细
|
||||
const receivingPlain = typeof receivingOrder.toJSON === 'function'
|
||||
? receivingOrder.toJSON()
|
||||
: receivingOrder;
|
||||
const receivingDetails = (receivingPlain.details || []).map(d => ({
|
||||
id: d.id,
|
||||
system_product_id: d.system_product_id,
|
||||
product_name: d.product_name,
|
||||
actual_quantity: d.actual_quantity,
|
||||
storage_status: d.storage_status,
|
||||
stored_quantity: d.stored_quantity || 0,
|
||||
}));
|
||||
|
||||
// 6. 对比明细
|
||||
const comparisonResult = this._compareDetails(entryItems, receivingDetails);
|
||||
|
||||
const result = {
|
||||
matchType: comparisonResult.type,
|
||||
comparisonResult,
|
||||
callbackSent: false,
|
||||
callbackResult: null,
|
||||
partialStorageMarked: false,
|
||||
entryOrder: {
|
||||
id: entryOrder.id,
|
||||
entry_order_code: entryOrder.entry_order_code,
|
||||
source_type: entryOrder.source_type,
|
||||
warehouse_id: entryOrder.warehouse_id,
|
||||
status: entryOrder.status,
|
||||
},
|
||||
receivingOrder: {
|
||||
id: receivingOrder.id,
|
||||
receiving_number: receivingOrder.receiving_number,
|
||||
status: receivingOrder.status,
|
||||
storage_status: receivingOrder.storage_status,
|
||||
},
|
||||
};
|
||||
|
||||
// 7. 根据对比结果处理
|
||||
if (comparisonResult.type === 'full_match') {
|
||||
const callbackResult = await this._sendCallback(entryOrder, receivingOrder, 'manual_match');
|
||||
result.callbackSent = true;
|
||||
result.callbackResult = callbackResult;
|
||||
} else if (comparisonResult.type === 'receiving_covers_entry') {
|
||||
const callbackResult = await this._sendCallback(entryOrder, receivingOrder, 'manual_match');
|
||||
result.callbackSent = true;
|
||||
result.callbackResult = callbackResult;
|
||||
|
||||
const markResult = await this._markReceivingPartialStorage(
|
||||
receivingOrder.id,
|
||||
comparisonResult,
|
||||
receivingOrder.warehouse_id
|
||||
);
|
||||
result.partialStorageMarked = markResult.success;
|
||||
}
|
||||
// entry_exceeds_receiving / no_match → 不触发回传
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = ReceivingEntryMatchService;
|
||||
@ -138,6 +138,25 @@ const WAREHOUSE_SETTING_FIELDS = Object.freeze([
|
||||
Object.freeze({ key: 'require_pick', name: '需已拣货', type: 'flag', required: false, description: '是否要求 pick_status=fin' }),
|
||||
]),
|
||||
}),
|
||||
Object.freeze({
|
||||
key: 'cutoff_order_enabled',
|
||||
name: '启用截单',
|
||||
type: 'flag',
|
||||
default: 1,
|
||||
required: false,
|
||||
description: '启用后,当天订单创建时间超过截单时间,不再自动分配快递和储位,不再自动加团',
|
||||
}),
|
||||
Object.freeze({
|
||||
key: 'cutoff_order_time',
|
||||
name: '截单时间',
|
||||
type: 'string',
|
||||
default: '18:00',
|
||||
required: false,
|
||||
maxLength: 5,
|
||||
min: '12:00',
|
||||
max: '23:59',
|
||||
description: '截单时间,格式 HH:mm,如 18:00',
|
||||
}),
|
||||
Object.freeze({
|
||||
key: INTERNAL_WAVE_STRATEGY_VERSION_KEY,
|
||||
name: '仓库波次策略版本号',
|
||||
|
||||
@ -536,6 +536,62 @@ class stockStoreService extends Service {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 按货主和仓库获取签约策略配置(带缓存,用于锁外预取)。
|
||||
*
|
||||
* @param {number} storeId 货主ID。
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @return {Promise<Object>} { allowOversell: boolean, relation: Object|null }
|
||||
*/
|
||||
async getStoreWarehousePolicyByStoreAndWarehouse(storeId, warehouseId) {
|
||||
const { ctx, app } = this;
|
||||
const normalizedStoreId = Number(storeId || 0);
|
||||
const normalizedWarehouseId = Number(warehouseId || 0);
|
||||
|
||||
if (normalizedStoreId <= 0 || normalizedWarehouseId <= 0) {
|
||||
return { allowOversell: false, relation: null };
|
||||
}
|
||||
|
||||
const cacheKey = `sw_policy:${normalizedStoreId}:${normalizedWarehouseId}`;
|
||||
|
||||
// 1. 先查缓存
|
||||
const cached = await app.getCacheAsync(cacheKey);
|
||||
if (cached) {
|
||||
return cached;
|
||||
}
|
||||
|
||||
// 2. 缓存未命中,查 DB(无事务)
|
||||
const relation = await ctx.model.StoreWarehouse.findOne({
|
||||
where: {
|
||||
store_id: normalizedStoreId,
|
||||
warehouse_id: normalizedWarehouseId,
|
||||
auth_status: 2,
|
||||
use_status: 1,
|
||||
},
|
||||
attributes: [ 'id', 'policy_config', 'auth_status', 'use_status' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
if (!relation) {
|
||||
const fallback = { allowOversell: false, relation: null };
|
||||
await app.setCacheAsync(cacheKey, fallback, 300);
|
||||
return fallback;
|
||||
}
|
||||
|
||||
const storeWarehouseService = ctx.service && ctx.service.systems && ctx.service.systems.storeWarehouse;
|
||||
const policyConfig = storeWarehouseService && typeof storeWarehouseService.getEffectivePolicyConfigByContractId === 'function'
|
||||
? await storeWarehouseService.getEffectivePolicyConfigByContractId(relation.id)
|
||||
: null;
|
||||
|
||||
const result = {
|
||||
allowOversell: Number(policyConfig && policyConfig.allow_oversell) === 1,
|
||||
relation,
|
||||
};
|
||||
|
||||
await app.setCacheAsync(cacheKey, result, 300);
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取库存对应的货主-仓库签约策略配置。
|
||||
*
|
||||
@ -607,9 +663,10 @@ class stockStoreService extends Service {
|
||||
* @param {number|string} stockWarehouseId 库存主键。
|
||||
* @param {number} quantity 锁定数量,负数表示释放。
|
||||
* @param {Object|null} transaction 数据库事务。
|
||||
* @param {Object|null} [oversellConfig=null] 可选预取策略配置,用于避免锁内查DB。
|
||||
* @return {Promise<Object>} 锁定结果。
|
||||
*/
|
||||
async lockItemStorages(stockWarehouseId, quantity, transaction) {
|
||||
async lockItemStorages(stockWarehouseId, quantity, transaction, oversellConfig = null) {
|
||||
const {
|
||||
ctx,
|
||||
app,
|
||||
@ -654,8 +711,14 @@ class stockStoreService extends Service {
|
||||
if (isLocking) {
|
||||
const availableQty = stockRecord.quantity - stockRecord.locked_quantity;
|
||||
if (availableQty < absQty) {
|
||||
const policyConfig = await this.getStoreWarehousePolicyConfigByStockId(stockRecord, currentTransaction);
|
||||
if (!policyConfig.allowOversell) {
|
||||
// 优先使用外部预取的 oversellConfig,避免锁内查 DB
|
||||
let allowOversell = oversellConfig ? oversellConfig.allowOversell : null;
|
||||
if (allowOversell === null || allowOversell === undefined) {
|
||||
// 回退:未预取时走原有查询(兼容其他调用方)
|
||||
const policyConfig = await this.getStoreWarehousePolicyConfigByStockId(stockRecord, currentTransaction);
|
||||
allowOversell = policyConfig.allowOversell;
|
||||
}
|
||||
if (!allowOversell) {
|
||||
return {
|
||||
success: false,
|
||||
error: `库存不足,可用 ${availableQty},需求 ${absQty}`,
|
||||
@ -3033,6 +3096,14 @@ class stockStoreService extends Service {
|
||||
return { unique: false, isUnique: false, message: '商品编码检测失败' };
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 批量删除仓库商品资料(软删除)。
|
||||
* 删除前会校验:1) 是否存在库存;2) 是否被待处理订单(step 1/2/3 且未取消)引用。
|
||||
* 任一校验不通过的商品会被移入不可删除列表并返回原因。
|
||||
* @param {Object} data 请求参数
|
||||
* @param {Array<number>} data.ids 待删除的商品ID列表
|
||||
* @return {Promise<Object>} 删除结果,含 deletedProducts、undeletableProducts、failedIds 及 summary
|
||||
*/
|
||||
async handleBatchDelete(data) {
|
||||
const { ctx, app } = this;
|
||||
const { Op } = this.app.Sequelize || app.Sequelize;
|
||||
@ -3061,7 +3132,7 @@ class stockStoreService extends Service {
|
||||
required: false, // 使用left join,因为可能没有库存记录
|
||||
},
|
||||
],
|
||||
attributes: [ 'id', 'item_name', 'quantity', 'return_quantity' ],
|
||||
attributes: [ 'id', 'item_name', 'quantity', 'return_quantity', 'warehouse_id' ],
|
||||
});
|
||||
|
||||
if (products.length === 0) {
|
||||
@ -3117,6 +3188,111 @@ class stockStoreService extends Service {
|
||||
};
|
||||
}
|
||||
|
||||
// 2.5 检查待处理订单引用:step in [1,2,3] 且 status != 'cancel' 的订单引用了该商品时不允许删除
|
||||
const deletableIdSet = new Set(deletableProducts.map(p => p.id));
|
||||
// 构建 stockId → warehouseId 映射
|
||||
const stockWarehouseMap = new Map();
|
||||
for (const product of products) {
|
||||
if (deletableIdSet.has(product.id)) {
|
||||
stockWarehouseMap.set(product.id, Number(product.warehouse_id) || 0);
|
||||
}
|
||||
}
|
||||
// 按仓库分组
|
||||
const warehouseStockMap = new Map();
|
||||
for (const [ stockId, warehouseId ] of stockWarehouseMap) {
|
||||
if (!warehouseStockMap.has(warehouseId)) {
|
||||
warehouseStockMap.set(warehouseId, []);
|
||||
}
|
||||
warehouseStockMap.get(warehouseId).push(stockId);
|
||||
}
|
||||
|
||||
const orderReferencedMap = new Map(); // stockId → pendingOrderCount
|
||||
const orderItemsFactory = ctx.model && ctx.model.OrderItemsFactory;
|
||||
const orderDeliveryFactory = ctx.model && ctx.model.OrderDeliveryFactory;
|
||||
|
||||
if (orderItemsFactory && typeof orderItemsFactory.getCurrentModel === 'function'
|
||||
&& orderDeliveryFactory && typeof orderDeliveryFactory.getCurrentModel === 'function') {
|
||||
for (const [ warehouseId, stockIds ] of warehouseStockMap) {
|
||||
if (!warehouseId || stockIds.length === 0) continue;
|
||||
|
||||
try {
|
||||
const orderItemsModel = await orderItemsFactory.getCurrentModel(warehouseId);
|
||||
const orderDeliveryModel = await orderDeliveryFactory.getCurrentModel(warehouseId);
|
||||
|
||||
// 查询该仓库下引用了待删除商品的订单明细
|
||||
const orderItems = await orderItemsModel.findAll({
|
||||
where: { stock_id: { [Op.in]: stockIds } },
|
||||
attributes: [ 'stock_id', 'order_id' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
if (orderItems.length === 0) continue;
|
||||
|
||||
const orderIds = [ ...new Set(orderItems.map(oi => oi.order_id)) ];
|
||||
|
||||
// 查询这些订单中处于待处理状态(step 1/2/3 且未取消)的
|
||||
const pendingOrders = await orderDeliveryModel.findAll({
|
||||
where: {
|
||||
id: { [Op.in]: orderIds },
|
||||
step: { [Op.in]: [ 1, 2, 3 ] },
|
||||
status: { [Op.ne]: 'cancel' },
|
||||
},
|
||||
attributes: [ 'id' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
if (pendingOrders.length === 0) continue;
|
||||
|
||||
const pendingOrderIds = new Set(pendingOrders.map(po => po.id));
|
||||
|
||||
// 统计每个 stock_id 被待处理订单引用的数量
|
||||
for (const oi of orderItems) {
|
||||
if (pendingOrderIds.has(oi.order_id)) {
|
||||
const sid = oi.stock_id;
|
||||
orderReferencedMap.set(sid, (orderReferencedMap.get(sid) || 0) + 1);
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
ctx.logger.warn(`[handleBatchDelete] 检查待处理订单引用失败(仓库${warehouseId}): ${err.message}`);
|
||||
// 检查失败时不阻塞删除,仅记录日志
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 将存在待处理订单引用的商品从可删除列表移至不可删除列表
|
||||
if (orderReferencedMap.size > 0) {
|
||||
const newDeletable = [];
|
||||
for (const product of deletableProducts) {
|
||||
const pendingCount = orderReferencedMap.get(product.id) || 0;
|
||||
if (pendingCount > 0) {
|
||||
undeletableProducts.push({
|
||||
...product,
|
||||
reason: `该商品已被 ${pendingCount} 个待处理订单引用,无法删除。请先处理相关订单后再删除。`,
|
||||
});
|
||||
} else {
|
||||
newDeletable.push(product);
|
||||
}
|
||||
}
|
||||
// 用过滤后的列表替换原可删除列表
|
||||
deletableProducts.length = 0;
|
||||
deletableProducts.push(...newDeletable);
|
||||
}
|
||||
|
||||
if (deletableProducts.length === 0) {
|
||||
const blockedReasons = undeletableProducts
|
||||
.filter(p => p.reason)
|
||||
.map(p => `${p.name}: ${p.reason}`)
|
||||
.join(';');
|
||||
return {
|
||||
code: 405,
|
||||
message: '所有选中的商品均无法删除',
|
||||
data: {
|
||||
undeletableProducts,
|
||||
message: blockedReasons || '所选商品均无法删除',
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
// 3. 执行删除(软删除)
|
||||
const deletableIds = deletableProducts.map(p => p.id);
|
||||
|
||||
|
||||
@ -448,12 +448,25 @@ class EntryService extends Service {
|
||||
{
|
||||
model: ctx.model.StockWarehouse,
|
||||
as: 'stock',
|
||||
attributes: [ 'id', 'item_code', 'item_name' ],
|
||||
attributes: [ 'id', 'item_code', 'item_name', 'sku_property' ],
|
||||
required: false,
|
||||
},
|
||||
],
|
||||
required: false,
|
||||
},
|
||||
{
|
||||
model: ctx.model.EntryOrderReceiving,
|
||||
as: 'receivingBindings',
|
||||
required: false,
|
||||
include: [
|
||||
{
|
||||
model: ctx.model.Receiving,
|
||||
as: 'receiving',
|
||||
attributes: [ 'id', 'receiving_number', 'status', 'storage_status', 'created_at' ],
|
||||
required: false,
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
@ -465,109 +478,27 @@ class EntryService extends Service {
|
||||
};
|
||||
}
|
||||
|
||||
// 扁平化 items:将外部商品字段重命名,stock 仓库商品字段平铺到 items 层级
|
||||
const entryOrderJSON = entryOrder.toJSON();
|
||||
if (entryOrderJSON.items && Array.isArray(entryOrderJSON.items)) {
|
||||
entryOrderJSON.items = entryOrderJSON.items.map(item => {
|
||||
const { item_code, item_id, stock, ...rest } = item;
|
||||
return {
|
||||
...rest,
|
||||
external_item_code: item_code,
|
||||
external_item_id: item_id,
|
||||
warehouse_item_code: (stock && stock.item_code) || '',
|
||||
warehouse_item_name: (stock && stock.item_name) || '',
|
||||
warehouse_item_spec: (stock && stock.sku_property) || '',
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
return {
|
||||
code: 200,
|
||||
message: '查询成功',
|
||||
data: {
|
||||
entryOrder,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
generateOrderCode() {
|
||||
const randomPart = Math.floor(Math.random() * 1000).toString().padStart(3, '0');
|
||||
return `ENT${Date.now()}${randomPart}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建入库单。
|
||||
* @param {Object} data 请求体
|
||||
* @return {Promise<Object>} code/data/message 结构
|
||||
*/
|
||||
async create(data = {}) {
|
||||
const { ctx } = this;
|
||||
const allowedOrderTypes = new Set([ 'SCRK', 'LYRK', 'CCRK', 'CGRK', 'DBRK', 'QTRK', 'B2BRK', 'XNRK' ]);
|
||||
|
||||
const orderType = String(data.order_type || '').trim();
|
||||
const storeId = Number(data.store_id || ctx.user.store_id || 0);
|
||||
|
||||
if (!orderType) {
|
||||
return {
|
||||
code: 400,
|
||||
message: 'order_type 必填',
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
if (!allowedOrderTypes.has(orderType)) {
|
||||
return {
|
||||
code: 400,
|
||||
message: 'order_type 不合法',
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
if (!storeId) {
|
||||
return {
|
||||
code: 400,
|
||||
message: 'store_id 必填',
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
|
||||
const entryOrderCode = data.entry_order_code && String(data.entry_order_code).trim() !== ''
|
||||
? String(data.entry_order_code).trim()
|
||||
: this.generateOrderCode();
|
||||
|
||||
const exists = await ctx.model.EntryOrder.findOne({
|
||||
where: {
|
||||
entry_order_code: entryOrderCode,
|
||||
warehouse_id: ctx.user.store_id,
|
||||
store_id: storeId,
|
||||
deleted_at: null,
|
||||
},
|
||||
});
|
||||
|
||||
if (exists) {
|
||||
return {
|
||||
code: 409,
|
||||
message: '入库单号已存在',
|
||||
data: {
|
||||
id: exists.id,
|
||||
entry_order_code: exists.entry_order_code,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
const order = await ctx.model.EntryOrder.create({
|
||||
entry_order_code: entryOrderCode,
|
||||
order_type: orderType,
|
||||
purchase_order_code: data.purchase_order_code || '',
|
||||
total_order_lines: Number(data.total_order_lines || 0),
|
||||
order_create_time: data.order_create_time ? new Date(data.order_create_time) : new Date(),
|
||||
expect_start_time: data.expect_start_time ? new Date(data.expect_start_time) : null,
|
||||
expect_end_time: data.expect_end_time ? new Date(data.expect_end_time) : null,
|
||||
logistics_code: data.logistics_code || '',
|
||||
logistics_name: data.logistics_name || '',
|
||||
express_code: data.express_code || '',
|
||||
supplier_code: data.supplier_code || '',
|
||||
supplier_name: data.supplier_name || '',
|
||||
source_type: 'API',
|
||||
order_status: 'PENDING',
|
||||
sync_status: 'PENDING',
|
||||
sync_message: '',
|
||||
is_enabled: 1,
|
||||
warehouse_id: ctx.user.store_id,
|
||||
store_id: storeId,
|
||||
remark: data.remark || '',
|
||||
created_at: new Date(),
|
||||
updated_at: new Date(),
|
||||
});
|
||||
|
||||
return {
|
||||
code: 200,
|
||||
message: '创建成功',
|
||||
data: {
|
||||
id: order.id,
|
||||
entry_order_code: order.entry_order_code,
|
||||
entryOrder: entryOrderJSON,
|
||||
},
|
||||
};
|
||||
}
|
||||
@ -644,220 +575,6 @@ class EntryService extends Service {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增入库明细。
|
||||
* @param {Object} data 请求体
|
||||
* @return {Promise<Object>} code/data/message 结构
|
||||
*/
|
||||
async addDetail(data = {}) {
|
||||
const { ctx } = this;
|
||||
const orderId = Number(data.order_id || 0);
|
||||
const count = Number(data.count || 0);
|
||||
|
||||
if (!orderId) {
|
||||
return {
|
||||
code: 400,
|
||||
message: 'order_id 必填',
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
if (!count || count <= 0) {
|
||||
return {
|
||||
code: 400,
|
||||
message: 'count 必须大于 0',
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
|
||||
const entryOrder = await this.getOwnedEntryOrderById(orderId);
|
||||
if (!entryOrder) {
|
||||
return {
|
||||
code: 404,
|
||||
message: '入库单不存在或无权访问',
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
if (entryOrder.order_status === 'CANCELLED' || entryOrder.order_status === 'COMPLETED') {
|
||||
return {
|
||||
code: 400,
|
||||
message: '当前状态不允许新增明细',
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
|
||||
const maxLineNo = Number(await ctx.model.EntryItems.max('order_line_no', {
|
||||
where: { order_id: orderId },
|
||||
})) || 0;
|
||||
|
||||
const detail = await ctx.model.EntryItems.create({
|
||||
order_id: orderId,
|
||||
order_line_no: maxLineNo + 1,
|
||||
item_code: data.item_code || '',
|
||||
item_id: data.item_id || null,
|
||||
stock_id: data.stock_id || data.item_id || null,
|
||||
count,
|
||||
inventory_type: data.inventory_type || 'ZP',
|
||||
received_quantity: 0,
|
||||
confirm_quantity: 0,
|
||||
owner_code: data.owner_code || '',
|
||||
out_biz_code: data.out_biz_code || '',
|
||||
});
|
||||
|
||||
await entryOrder.update({
|
||||
total_order_lines: maxLineNo + 1,
|
||||
updated_at: new Date(),
|
||||
});
|
||||
|
||||
return {
|
||||
code: 200,
|
||||
message: '新增明细成功',
|
||||
data: {
|
||||
id: detail.id,
|
||||
order_id: orderId,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除入库明细。
|
||||
* @param {Object} data 请求体
|
||||
* @return {Promise<Object>} code/data/message 结构
|
||||
*/
|
||||
async deleteDetail(data = {}) {
|
||||
const { ctx } = this;
|
||||
const detailId = Number(data.id || 0);
|
||||
|
||||
if (!detailId) {
|
||||
return {
|
||||
code: 400,
|
||||
message: 'id 必填',
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
|
||||
const detail = await ctx.model.EntryItems.findByPk(detailId);
|
||||
if (!detail) {
|
||||
return {
|
||||
code: 404,
|
||||
message: '明细不存在',
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
|
||||
const entryOrder = await this.getOwnedEntryOrderById(detail.order_id);
|
||||
if (!entryOrder) {
|
||||
return {
|
||||
code: 404,
|
||||
message: '入库单不存在或无权访问',
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
|
||||
if (Number(detail.received_quantity || 0) > 0) {
|
||||
return {
|
||||
code: 400,
|
||||
message: '已有收货数量的明细不允许删除',
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
|
||||
await detail.destroy();
|
||||
const lineCount = await ctx.model.EntryItems.count({ where: { order_id: entryOrder.id } });
|
||||
await entryOrder.update({
|
||||
total_order_lines: lineCount,
|
||||
updated_at: new Date(),
|
||||
});
|
||||
|
||||
return {
|
||||
code: 200,
|
||||
message: '删除明细成功',
|
||||
data: {
|
||||
id: detailId,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改入库明细。
|
||||
* @param {Object} data 请求体
|
||||
* @return {Promise<Object>} code/data/message 结构
|
||||
*/
|
||||
async detailChange(data = {}) {
|
||||
const { ctx } = this;
|
||||
const detailId = Number(data.id || 0);
|
||||
|
||||
if (!detailId) {
|
||||
return {
|
||||
code: 400,
|
||||
message: 'id 必填',
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
|
||||
const detail = await ctx.model.EntryItems.findByPk(detailId);
|
||||
if (!detail) {
|
||||
return {
|
||||
code: 404,
|
||||
message: '明细不存在',
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
|
||||
const entryOrder = await this.getOwnedEntryOrderById(detail.order_id);
|
||||
if (!entryOrder) {
|
||||
return {
|
||||
code: 404,
|
||||
message: '入库单不存在或无权访问',
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
|
||||
const updateData = {};
|
||||
const mutableFields = [ 'item_code', 'item_id', 'inventory_type', 'stock_id', 'out_biz_code', 'owner_code' ];
|
||||
for (const field of mutableFields) {
|
||||
if (Object.prototype.hasOwnProperty.call(data, field)) {
|
||||
updateData[field] = data[field];
|
||||
}
|
||||
}
|
||||
|
||||
if (Object.prototype.hasOwnProperty.call(data, 'count')) {
|
||||
const count = Number(data.count);
|
||||
if (!count || count <= 0) {
|
||||
return {
|
||||
code: 400,
|
||||
message: 'count 必须大于 0',
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
if (Number(detail.received_quantity || 0) > count) {
|
||||
return {
|
||||
code: 400,
|
||||
message: 'count 不能小于已收货数量',
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
updateData.count = count;
|
||||
}
|
||||
|
||||
if (Object.keys(updateData).length === 0) {
|
||||
return {
|
||||
code: 400,
|
||||
message: '没有可更新字段',
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
|
||||
await detail.update(updateData);
|
||||
|
||||
return {
|
||||
code: 200,
|
||||
message: '修改明细成功',
|
||||
data: {
|
||||
id: detail.id,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 作废入库单。
|
||||
* @param {Object} data 请求体
|
||||
@ -968,6 +685,14 @@ class EntryService extends Service {
|
||||
};
|
||||
}
|
||||
|
||||
if (![ 'PENDING' ].includes(entryOrder.order_status)) {
|
||||
return {
|
||||
code: 400,
|
||||
message: `当前入库单状态为 ${entryOrder.order_status},仅 PENDING 状态可完成入库`,
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
|
||||
const detailCount = await ctx.model.EntryItems.count({ where: { order_id: orderId } });
|
||||
if (detailCount <= 0) {
|
||||
return {
|
||||
@ -990,6 +715,53 @@ class EntryService extends Service {
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取入库单的导入/PDA 直接入库信息(转发到 inboundDirectLog)。
|
||||
* @param {string} entryOrderCode 入库单号
|
||||
* @return {Promise<Object>} code/data/message 结构
|
||||
*/
|
||||
async getDirectInboundItems(entryOrderCode) {
|
||||
const { ctx } = this;
|
||||
return await ctx.service.systems.inboundDirectLog.getItems(entryOrderCode);
|
||||
}
|
||||
|
||||
/**
|
||||
* 按商品增量添加导入/PDA 直接入库记录(转发到 inboundDirectLog)。
|
||||
* @param {Object} data 请求体
|
||||
* @param {string} data.entry_order_code 入库单号
|
||||
* @param {number} [data.stock_id] 商品SKU ID(单条模式)
|
||||
* @param {number} [data.quantity] 本次入库数量(单条模式)
|
||||
* @param {string} [data.inbound_type] 入库方式(单条模式)
|
||||
* @param {Array} [data.items] 商品列表(批量模式)
|
||||
* @return {Promise<Object>} code/data/message 结构
|
||||
*/
|
||||
async addDirectInboundItem(data = {}) {
|
||||
const { ctx } = this;
|
||||
return await ctx.service.systems.inboundDirectLog.addItem(data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 提交确认完成导入/PDA 直接入库(转发到 inboundDirectLog)。
|
||||
* @param {string} entryOrderCode 入库单号
|
||||
* @return {Promise<Object>} code/data/message 结构
|
||||
*/
|
||||
async commitDirectInbound(entryOrderCode) {
|
||||
const { ctx } = this;
|
||||
return await ctx.service.systems.inboundDirectLog.commit(entryOrderCode);
|
||||
}
|
||||
|
||||
/**
|
||||
* 移除一条导入/PDA 直接入库记录(转发到 inboundDirectLog)。
|
||||
* @param {Object} data 请求体
|
||||
* @param {number} data.id 入库记录ID
|
||||
* @return {Promise<Object>} code/data/message 结构
|
||||
*/
|
||||
async removeDirectInboundItem(data = {}) {
|
||||
const { ctx } = this;
|
||||
return await ctx.service.systems.inboundDirectLog.removeItem(data);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
module.exports = EntryService;
|
||||
|
||||
@ -283,908 +283,6 @@ async function enrichInventoryStockAttachments(ctx, list = []) {
|
||||
|
||||
class InventoryService extends Service {
|
||||
|
||||
/**
|
||||
* 收货单快捷入库上架。
|
||||
* 从收货单直接生成入库单并写入库存。
|
||||
*
|
||||
* 流程:
|
||||
* 1. 校验收货单状态(必须 completed)
|
||||
* 2. 校验收货单已审核(is_review = 1)
|
||||
* 3. 校验所有明细已匹配系统商品(system_product_id 不为空)
|
||||
* 4. 校验未全部入库(storage_status !== 'all')
|
||||
* 4. 事务内:
|
||||
* a. 创建入库单(EntryOrder)和入库明细(EntryItems)
|
||||
* b. 逐条锁定 StockWarehouse 行,增加 quantity
|
||||
* c. 写入/更新 wms_storage 库存记录
|
||||
* d. 更新 receiving_detail 的 storage_status 和 stored_quantity
|
||||
* e. 更新 receiving 的 storage_status
|
||||
*
|
||||
* @param {Object} data 请求体
|
||||
* @param {number} data.receiving_id 收货单ID(必填)
|
||||
* @return {Promise<Object>} code/data/message 结构
|
||||
*/
|
||||
async quickPutaway(data = {}) {
|
||||
const { ctx, app } = this;
|
||||
const warehouseId = ctx.user.store_id;
|
||||
const receivingId = Number(data.receiving_id || data.id || 0);
|
||||
|
||||
if (!receivingId) {
|
||||
return { code: 400, message: 'receiving_id 必填', data: null };
|
||||
}
|
||||
|
||||
const transaction = await ctx.model.transaction();
|
||||
|
||||
try {
|
||||
// ────────── 1. 查询并锁定收货单 ──────────
|
||||
const receiving = await ctx.model.Receiving.findOne({
|
||||
where: {
|
||||
id: receivingId,
|
||||
warehouse_id: warehouseId,
|
||||
is_deleted: false,
|
||||
},
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
transaction,
|
||||
include: [{
|
||||
model: ctx.model.ReceivingDetail,
|
||||
as: 'details',
|
||||
required: false,
|
||||
}],
|
||||
});
|
||||
|
||||
if (!receiving) {
|
||||
await transaction.rollback();
|
||||
return { code: 404, message: '收货单不存在或无权访问', data: null };
|
||||
}
|
||||
if (receiving.status !== 'completed') {
|
||||
await transaction.rollback();
|
||||
return { code: 400, message: `收货单状态为 ${receiving.status},须完成收货后才能入库`, data: null };
|
||||
}
|
||||
if (Number(receiving.is_review) !== 1) {
|
||||
await transaction.rollback();
|
||||
return { code: 400, message: '收货单未审核,审核通过后才能入库', data: null };
|
||||
}
|
||||
|
||||
const storeRelation = await ctx.model.StoreWarehouse.findOne({
|
||||
where: {
|
||||
warehouse_id: warehouseId,
|
||||
store_id: Number(receiving.store_id || 0),
|
||||
use_status: 1,
|
||||
},
|
||||
attributes: [ 'id', 'policy_config', 'store_remask' ],
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
transaction,
|
||||
});
|
||||
|
||||
if (!storeRelation) {
|
||||
await transaction.rollback();
|
||||
return { code: 404, message: '收货单绑定的货主与当前仓库不存在有效签约关系', data: null };
|
||||
}
|
||||
|
||||
const policyConfig = storeRelation.policy_config && typeof storeRelation.policy_config === 'object'
|
||||
? storeRelation.policy_config
|
||||
: {};
|
||||
if (Number(policyConfig.allow_receiving_quick_putaway) !== 1) {
|
||||
const storeName = String(storeRelation.store_remask || receiving.store_name || receiving.store_id || '当前货主');
|
||||
await transaction.rollback();
|
||||
return { code: 400, message: `货主${storeName}不允许快速上架,如需开启请到:货主->策略配置调整`, data: null };
|
||||
}
|
||||
|
||||
if (receiving.storage_status === 'all') {
|
||||
await transaction.rollback();
|
||||
return { code: 400, message: '该收货单已全部入库,无需重复操作', data: null };
|
||||
}
|
||||
|
||||
const details = receiving.details || [];
|
||||
if (!details.length) {
|
||||
await transaction.rollback();
|
||||
return { code: 400, message: '收货单没有明细,无法入库', data: null };
|
||||
}
|
||||
|
||||
// ────────── 3. 校验所有明细已匹配系统商品 ──────────
|
||||
const unmatchedDetails = details.filter(d => !d.system_product_id);
|
||||
if (unmatchedDetails.length > 0) {
|
||||
await transaction.rollback();
|
||||
const names = unmatchedDetails.map(d => d.product_name).join('、');
|
||||
return {
|
||||
code: 400,
|
||||
message: `以下商品未匹配系统商品,请先绑定:${names}`,
|
||||
data: { unmatched_count: unmatchedDetails.length, unmatched_names: names },
|
||||
};
|
||||
}
|
||||
|
||||
// 过滤出需要入库的明细(排除已全部入库的)
|
||||
const pendingDetails = details.filter(d => d.storage_status !== 'all');
|
||||
if (!pendingDetails.length) {
|
||||
await transaction.rollback();
|
||||
return { code: 400, message: '所有明细已入库完成', data: null };
|
||||
}
|
||||
|
||||
// ────────── 4. 创建入库单 ──────────
|
||||
// 获取仓库名称快照
|
||||
let warehouseName = '';
|
||||
const warehouseData = await ctx.service.systems.store.getStoreName(warehouseId);
|
||||
if (warehouseData.code === 200 && warehouseData.data) {
|
||||
warehouseName = warehouseData.data.company_name || '';
|
||||
}
|
||||
|
||||
// 获取合约表备注名称(优先使用)
|
||||
const contract_data = await ctx.service.systems.store.getStoreRemaskName(receiving.store_id, warehouseId);
|
||||
let contract = null;
|
||||
if (contract_data.code === 200) {
|
||||
contract = contract_data.data;
|
||||
}
|
||||
|
||||
const entryOrderCode = `SHRK${Date.now()}${String(Math.floor(Math.random() * 10000)).padStart(4, '0')}`;
|
||||
const entryOrder = await ctx.model.EntryOrder.create({
|
||||
entry_order_code: entryOrderCode,
|
||||
order_type: 'SHRK',
|
||||
purchase_order_code: receiving.receiving_number || '',
|
||||
total_order_lines: pendingDetails.length,
|
||||
order_create_time: new Date(),
|
||||
source_type: 'WMS',
|
||||
order_status: 'PENDING',
|
||||
sync_status: 'SUCCESS',
|
||||
sync_message: `快捷入库-来自收货单 ${receiving.receiving_number}`,
|
||||
is_enabled: 1,
|
||||
warehouse_id: warehouseId,
|
||||
store_id: receiving.store_id || warehouseId,
|
||||
store_name: contract?.store_remask || receiving.store_name || '',
|
||||
warehouse_name: contract?.warehouse_remask || warehouseName,
|
||||
remark: `快捷入库,关联收货单 ${receiving.receiving_number}`,
|
||||
created_at: new Date(),
|
||||
updated_at: new Date(),
|
||||
}, { transaction });
|
||||
|
||||
// ────────── 5. 逐条处理明细:创建入库明细 + 更新库存 ──────────
|
||||
const results = [];
|
||||
const errors = [];
|
||||
|
||||
for (let i = 0; i < pendingDetails.length; i++) {
|
||||
const detail = pendingDetails[i];
|
||||
const stockWarehouseId = detail.system_product_id;
|
||||
const inboundQty = (detail.actual_quantity || 0) - (detail.stored_quantity || 0);
|
||||
|
||||
if (inboundQty <= 0) {
|
||||
continue; // 已入库完的跳过
|
||||
}
|
||||
|
||||
// 5a. 锁定 StockWarehouse 行
|
||||
const stockRecord = await ctx.model.StockWarehouse.findOne({
|
||||
where: {
|
||||
id: stockWarehouseId,
|
||||
is_valid: 'Y',
|
||||
deleted_at: null,
|
||||
},
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
transaction,
|
||||
});
|
||||
|
||||
if (!stockRecord) {
|
||||
errors.push(`商品 ${detail.product_name} 的库存记录不存在 (stock_id: ${stockWarehouseId})`);
|
||||
continue;
|
||||
}
|
||||
|
||||
// 5b. 增加 StockWarehouse 库存数量
|
||||
const beforeQuantity = Number(stockRecord.quantity) || 0;
|
||||
const beforeLockedQuantity = Number(stockRecord.locked_quantity) || 0;
|
||||
await stockRecord.increment('quantity', {
|
||||
by: inboundQty,
|
||||
transaction,
|
||||
silent: true,
|
||||
});
|
||||
await stockRecord.reload({ transaction });
|
||||
const afterQuantity = Number(stockRecord.quantity) || 0;
|
||||
const afterLockedQuantity = Number(stockRecord.locked_quantity) || 0;
|
||||
|
||||
// 5c. 写入/更新 wms_storage 库存位置表
|
||||
const spaceId = detail.space_id || 1; // 明细有库位则用,否则默认库位
|
||||
const batchNo = String(detail.batch_number || '').trim() || String(receiving.receiving_number || '').trim() || entryOrderCode;
|
||||
const productionDate = detail.production_date || null;
|
||||
const expiryDate = detail.expiry_date || null;
|
||||
const inventoryType = 'ZP'; // 默认正品
|
||||
|
||||
// 查找是否已有相同 库位+SKU+批次+类型 的库存记录
|
||||
let storageRecord = await ctx.model.Storage.findOne({
|
||||
where: {
|
||||
space_id: spaceId,
|
||||
stock_id: stockWarehouseId,
|
||||
batch_no: batchNo,
|
||||
inventory_type: inventoryType,
|
||||
is_enabled: 1,
|
||||
delete_at: null,
|
||||
},
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
transaction,
|
||||
});
|
||||
|
||||
if (storageRecord) {
|
||||
// 已有记录:累加数量
|
||||
await ctx.model.Storage.update({
|
||||
quantity: app.Sequelize.literal(`quantity + ${inboundQty}`),
|
||||
available_quantity: app.Sequelize.literal(`available_quantity + ${inboundQty}`),
|
||||
entry_order_id: entryOrder.id,
|
||||
batch_no: batchNo,
|
||||
production_date: productionDate,
|
||||
expiry_date: expiryDate,
|
||||
updated_at: new Date(),
|
||||
}, {
|
||||
where: { id: storageRecord.id },
|
||||
transaction,
|
||||
});
|
||||
} else {
|
||||
// 新建库存记录
|
||||
storageRecord = await ctx.model.Storage.create({
|
||||
warehouse_id: warehouseId,
|
||||
store_id: receiving.store_id || warehouseId,
|
||||
space_id: spaceId,
|
||||
stock_id: stockWarehouseId,
|
||||
batch_no: batchNo,
|
||||
inventory_type: inventoryType,
|
||||
quantity: inboundQty,
|
||||
locked_quantity: 0,
|
||||
available_quantity: inboundQty,
|
||||
production_date: productionDate,
|
||||
expiry_date: expiryDate,
|
||||
inbound_time: new Date(),
|
||||
inbound_order_no: entryOrderCode,
|
||||
receiving_id: receivingId,
|
||||
entry_order_id: entryOrder.id,
|
||||
supplier_id: null,
|
||||
supplier_batch_no: null,
|
||||
is_enabled: 1,
|
||||
created_at: new Date(),
|
||||
updated_at: new Date(),
|
||||
}, { transaction });
|
||||
}
|
||||
|
||||
// 5d. 创建入库明细
|
||||
await ctx.model.EntryItems.create({
|
||||
order_id: entryOrder.id,
|
||||
order_line_no: i + 1,
|
||||
item_code: stockRecord.item_code || '',
|
||||
item_id: stockWarehouseId,
|
||||
count: inboundQty,
|
||||
inventory_type: inventoryType,
|
||||
stock_id: stockWarehouseId,
|
||||
received_quantity: inboundQty,
|
||||
confirm_quantity: inboundQty,
|
||||
}, { transaction });
|
||||
|
||||
// 5d+. 写入出入库记录
|
||||
await ctx.service.systems.stockTransaction.create({
|
||||
transaction_type: 'INBOUND',
|
||||
warehouse_id: warehouseId,
|
||||
store_id: receiving.store_id || warehouseId,
|
||||
stock_id: stockWarehouseId,
|
||||
storage_id: storageRecord.id,
|
||||
space_id: spaceId,
|
||||
quantity: inboundQty,
|
||||
batch_no: batchNo,
|
||||
inventory_type: inventoryType,
|
||||
order_type: 'SHRK',
|
||||
order_no: entryOrderCode,
|
||||
order_id: null,
|
||||
receiving_id: receivingId,
|
||||
entry_order_id: entryOrder.id,
|
||||
operator_id: String(ctx.user?.employees_id || ctx.user?.id || ''),
|
||||
operator_name: ctx.user?.employees_name || '',
|
||||
remark: `快捷入库-收货单 ${receiving.receiving_number}`,
|
||||
before_quantity: beforeQuantity,
|
||||
after_quantity: afterQuantity,
|
||||
before_locked_quantity: beforeLockedQuantity,
|
||||
after_locked_quantity: afterLockedQuantity,
|
||||
created_at: new Date(),
|
||||
}, { transaction });
|
||||
|
||||
// 5e. 更新收货明细的入库状态
|
||||
const newStoredQty = (detail.stored_quantity || 0) + inboundQty;
|
||||
const detailStorageStatus = newStoredQty >= detail.actual_quantity ? 'all' : 'partial';
|
||||
await ctx.model.ReceivingDetail.update({
|
||||
storage_status: detailStorageStatus,
|
||||
stored_quantity: newStoredQty,
|
||||
}, {
|
||||
where: { id: detail.id },
|
||||
transaction,
|
||||
});
|
||||
|
||||
results.push({
|
||||
detail_id: detail.id,
|
||||
product_name: detail.product_name,
|
||||
stock_warehouse_id: stockWarehouseId,
|
||||
inbound_quantity: inboundQty,
|
||||
space_id: spaceId,
|
||||
storage_status: detailStorageStatus,
|
||||
});
|
||||
}
|
||||
|
||||
// 如果全部明细都失败
|
||||
if (results.length === 0 && errors.length > 0) {
|
||||
await transaction.rollback();
|
||||
return {
|
||||
code: 400,
|
||||
message: `入库失败:${errors.join(';')}`,
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
|
||||
// ────────── 6. 更新入库单状态 ──────────
|
||||
await entryOrder.update({
|
||||
order_status: 'COMPLETED',
|
||||
total_order_lines: results.length,
|
||||
updated_at: new Date(),
|
||||
}, { transaction });
|
||||
|
||||
// ────────── 7. 更新收货单入库状态 ──────────
|
||||
const allDetailsStored = details.every(d => {
|
||||
if (d.storage_status === 'all') return true;
|
||||
// 检查本次入库后是否全部完成
|
||||
const pending = pendingDetails.find(p => p.id === d.id);
|
||||
if (!pending) return true;
|
||||
const newStored = (pending.stored_quantity || 0) + ((pending.actual_quantity || 0) - (pending.stored_quantity || 0));
|
||||
return newStored >= pending.actual_quantity;
|
||||
});
|
||||
const receivingStorageStatus = allDetailsStored ? 'all' : 'partial';
|
||||
|
||||
await ctx.model.Receiving.update({
|
||||
storage_status: receivingStorageStatus,
|
||||
}, {
|
||||
where: { id: receivingId },
|
||||
transaction,
|
||||
});
|
||||
|
||||
// ────────── 8. 提交事务 ──────────
|
||||
await transaction.commit();
|
||||
|
||||
// 记录操作日志
|
||||
try {
|
||||
await ctx.service.systems.operationLog.createOperationLog({
|
||||
businessType: 'entry',
|
||||
businessId: entryOrder.id,
|
||||
operationCode: 'QUICK_PUTAWAY',
|
||||
operator: {
|
||||
id: ctx.user?.employees_id || ctx.user?.id,
|
||||
name: ctx.user?.employees_name || '',
|
||||
},
|
||||
extras: {
|
||||
warehouseId,
|
||||
},
|
||||
beforeChanges: null,
|
||||
});
|
||||
} catch (logErr) {
|
||||
ctx.logger.warn('[quickPutaway] 写入操作日志失败,不影响业务', logErr);
|
||||
}
|
||||
|
||||
ctx.logger.info('[quickPutaway] 快捷入库完成', {
|
||||
receiving_id: receivingId,
|
||||
receiving_number: receiving.receiving_number,
|
||||
entry_order_code: entryOrderCode,
|
||||
entry_order_id: entryOrder.id,
|
||||
total_items: results.length,
|
||||
errors: errors.length,
|
||||
});
|
||||
|
||||
return {
|
||||
code: 200,
|
||||
message: errors.length
|
||||
? `入库部分完成,${results.length} 条成功,${errors.length} 条失败`
|
||||
: '快捷入库完成',
|
||||
data: {
|
||||
receiving_id: receivingId,
|
||||
receiving_number: receiving.receiving_number,
|
||||
receiving_storage_status: receivingStorageStatus,
|
||||
entry_order: {
|
||||
id: entryOrder.id,
|
||||
entry_order_code: entryOrderCode,
|
||||
order_status: 'COMPLETED',
|
||||
},
|
||||
items: results,
|
||||
errors: errors.length ? errors : undefined,
|
||||
},
|
||||
};
|
||||
} catch (error) {
|
||||
await transaction.rollback();
|
||||
ctx.logger.error('[quickPutaway] 快捷入库异常', {
|
||||
receiving_id: receivingId,
|
||||
error: error.message,
|
||||
stack: error.stack,
|
||||
});
|
||||
|
||||
if (error.name === 'SequelizeDatabaseError' && error.message.includes('Lock wait timeout')) {
|
||||
return {
|
||||
code: 409,
|
||||
message: '库存记录被锁定,请稍后重试',
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 匹配入库:将已完成收货的收货单与已有入库单按 stock_warehouse_id 做数量匹配入库。
|
||||
*
|
||||
* @param {Object} data 请求体
|
||||
* @param {number[]} data.receiving_ids 收货单ID列表
|
||||
* @param {number[]} data.entry_order_ids 入库单ID列表
|
||||
* @return {Promise<Object>} code/data/message 结构
|
||||
*/
|
||||
async matchPutaway(data = {}) {
|
||||
const { ctx, app } = this;
|
||||
const { Op } = app.Sequelize;
|
||||
const warehouseId = ctx.user.store_id;
|
||||
|
||||
// ────────── 1. 参数校验 ──────────
|
||||
const receivingIds = Array.isArray(data.receiving_ids) ? data.receiving_ids.map(Number).filter(Boolean) : [];
|
||||
const entryOrderIds = Array.isArray(data.entry_order_ids) ? data.entry_order_ids.map(Number).filter(Boolean) : [];
|
||||
|
||||
if (!receivingIds.length) {
|
||||
return { code: 400, message: 'receiving_ids 不能为空', data: null };
|
||||
}
|
||||
if (!entryOrderIds.length) {
|
||||
return { code: 400, message: 'entry_order_ids 不能为空', data: null };
|
||||
}
|
||||
|
||||
// ────────── 2. 开事务 ──────────
|
||||
const transaction = await ctx.model.transaction();
|
||||
|
||||
try {
|
||||
// ────────── 3. 查询并锁定收货单 ──────────
|
||||
const receivings = await ctx.model.Receiving.findAll({
|
||||
where: {
|
||||
id: { [Op.in]: receivingIds },
|
||||
warehouse_id: warehouseId,
|
||||
status: 'completed',
|
||||
is_deleted: false,
|
||||
},
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
transaction,
|
||||
include: [{
|
||||
model: ctx.model.ReceivingDetail,
|
||||
as: 'details',
|
||||
required: false,
|
||||
}],
|
||||
});
|
||||
|
||||
if (!receivings.length) {
|
||||
await transaction.rollback();
|
||||
return { code: 404, message: '未找到符合条件的收货单', data: null };
|
||||
}
|
||||
|
||||
const unreviewedReceiving = receivings.find(item => Number(item.is_review) !== 1);
|
||||
if (unreviewedReceiving) {
|
||||
await transaction.rollback();
|
||||
return {
|
||||
code: 400,
|
||||
message: `收货单 ${unreviewedReceiving.receiving_number || unreviewedReceiving.id} 未审核,审核通过后才能入库`,
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
|
||||
// ────────── 4. 查询并锁定入库单 ──────────
|
||||
const entryOrders = await ctx.model.EntryOrder.findAll({
|
||||
where: {
|
||||
id: { [Op.in]: entryOrderIds },
|
||||
warehouse_id: warehouseId,
|
||||
is_enabled: 1,
|
||||
deleted_at: null,
|
||||
order_status: { [Op.in]: [ 'PENDING', 'CONFIRMED', 'PARTIAL_RECEIVED' ] },
|
||||
},
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
transaction,
|
||||
include: [{
|
||||
model: ctx.model.EntryItems,
|
||||
as: 'items',
|
||||
required: false,
|
||||
}],
|
||||
});
|
||||
|
||||
if (!entryOrders.length) {
|
||||
await transaction.rollback();
|
||||
return { code: 404, message: '未找到符合条件的入库单', data: null };
|
||||
}
|
||||
|
||||
// ────────── 5. 按 stock_warehouse_id 汇总 ──────────
|
||||
// 收货侧:可入库明细(排除已全部入库的)
|
||||
const rcvDetailsBySWId = {}; // stock_warehouse_id -> [ detail, ... ]
|
||||
for (const rcv of receivings) {
|
||||
for (const d of (rcv.details || [])) {
|
||||
if (d.storage_status === 'all') continue;
|
||||
if (!d.system_product_id) continue;
|
||||
const available = (d.actual_quantity || 0) - (d.stored_quantity || 0);
|
||||
if (available <= 0) continue;
|
||||
const key = d.system_product_id;
|
||||
if (!rcvDetailsBySWId[key]) rcvDetailsBySWId[key] = [];
|
||||
rcvDetailsBySWId[key].push({ detail: d, available, receiving: rcv });
|
||||
}
|
||||
}
|
||||
|
||||
// 入库侧:待入库明细
|
||||
const entryItemsBySWId = {}; // stock_warehouse_id -> [ item, ... ]
|
||||
for (const eo of entryOrders) {
|
||||
for (const item of (eo.items || [])) {
|
||||
if (!item.stock_id) continue;
|
||||
const remaining = (item.count || 0) - (item.received_quantity || 0);
|
||||
if (remaining <= 0) continue;
|
||||
const key = item.stock_id;
|
||||
if (!entryItemsBySWId[key]) entryItemsBySWId[key] = [];
|
||||
entryItemsBySWId[key].push({ item, remaining, entryOrder: eo });
|
||||
}
|
||||
}
|
||||
|
||||
// ────────── 6. 逐个 stock_warehouse_id 执行匹配 ──────────
|
||||
const matchedItems = [];
|
||||
const unmatchedProducts = [];
|
||||
const warnings = [];
|
||||
|
||||
// 跟踪各明细的累计分配量
|
||||
const rcvDetailAllocated = {}; // detail.id -> allocated qty
|
||||
const entryItemAllocated = {}; // item.id -> allocated qty
|
||||
|
||||
// 取交集 key
|
||||
const allSWIds = new Set([
|
||||
...Object.keys(rcvDetailsBySWId),
|
||||
...Object.keys(entryItemsBySWId),
|
||||
]);
|
||||
|
||||
for (const swIdStr of allSWIds) {
|
||||
const swId = Number(swIdStr);
|
||||
const rcvGroup = rcvDetailsBySWId[swId];
|
||||
const entryGroup = entryItemsBySWId[swId];
|
||||
|
||||
if (!rcvGroup || !entryGroup) {
|
||||
if (rcvGroup && !entryGroup) {
|
||||
unmatchedProducts.push({ stock_warehouse_id: swId, reason: '收货侧有库存但无对应入库计划' });
|
||||
}
|
||||
if (!rcvGroup && entryGroup) {
|
||||
unmatchedProducts.push({ stock_warehouse_id: swId, reason: '入库计划存在但无对应收货明细' });
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
// 计算总量
|
||||
const totalRcvAvailable = rcvGroup.reduce((s, r) => s + r.available, 0);
|
||||
const totalEntryRemaining = entryGroup.reduce((s, e) => s + e.remaining, 0);
|
||||
const actualInbound = Math.min(totalRcvAvailable, totalEntryRemaining);
|
||||
|
||||
if (actualInbound <= 0) continue;
|
||||
|
||||
if (totalRcvAvailable < totalEntryRemaining) {
|
||||
warnings.push(
|
||||
`stock_warehouse_id=${swId}: 收货可入库量(${totalRcvAvailable}) < 入库计划量(${totalEntryRemaining}),按收货量入库`
|
||||
);
|
||||
}
|
||||
|
||||
// 6a. 锁定 stock_warehouse 行并增加 quantity
|
||||
const stockRecord = await ctx.model.StockWarehouse.findOne({
|
||||
where: { id: swId, is_valid: 'Y', deleted_at: null },
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
transaction,
|
||||
});
|
||||
|
||||
if (!stockRecord) {
|
||||
warnings.push(`stock_warehouse_id=${swId}: 库存记录不存在,跳过`);
|
||||
continue;
|
||||
}
|
||||
|
||||
const beforeQuantity = Number(stockRecord.quantity) || 0;
|
||||
const beforeLockedQuantity = Number(stockRecord.locked_quantity) || 0;
|
||||
await stockRecord.increment('quantity', {
|
||||
by: actualInbound,
|
||||
transaction,
|
||||
silent: true,
|
||||
});
|
||||
await stockRecord.reload({ transaction });
|
||||
const afterQuantity = Number(stockRecord.quantity) || 0;
|
||||
const afterLockedQuantity = Number(stockRecord.locked_quantity) || 0;
|
||||
|
||||
// 6b. 写入/更新 wms_storage(取第一个收货明细的信息)
|
||||
const firstRcvDetail = rcvGroup[0].detail;
|
||||
const firstRcv = rcvGroup[0].receiving;
|
||||
const firstEntryOrder = entryGroup[0].entryOrder;
|
||||
const spaceId = firstRcvDetail.space_id || 1;
|
||||
const batchNo = firstRcvDetail.batch_number || firstRcv.receiving_number || '';
|
||||
const inventoryType = 'ZP';
|
||||
|
||||
let storageRecord = await ctx.model.Storage.findOne({
|
||||
where: {
|
||||
space_id: spaceId,
|
||||
stock_id: swId,
|
||||
batch_no: batchNo,
|
||||
inventory_type: inventoryType,
|
||||
is_enabled: 1,
|
||||
delete_at: null,
|
||||
},
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
transaction,
|
||||
});
|
||||
|
||||
if (storageRecord) {
|
||||
await ctx.model.Storage.update({
|
||||
quantity: app.Sequelize.literal(`quantity + ${actualInbound}`),
|
||||
available_quantity: app.Sequelize.literal(`available_quantity + ${actualInbound}`),
|
||||
entry_order_id: firstEntryOrder.id,
|
||||
}, {
|
||||
where: { id: storageRecord.id },
|
||||
transaction,
|
||||
});
|
||||
} else {
|
||||
storageRecord = await ctx.model.Storage.create({
|
||||
warehouse_id: warehouseId,
|
||||
store_id: firstRcv.store_id || warehouseId,
|
||||
space_id: spaceId,
|
||||
stock_id: swId,
|
||||
batch_no: batchNo,
|
||||
inventory_type: inventoryType,
|
||||
quantity: actualInbound,
|
||||
locked_quantity: 0,
|
||||
available_quantity: actualInbound,
|
||||
production_date: firstRcvDetail.production_date || null,
|
||||
expiry_date: firstRcvDetail.expiry_date || null,
|
||||
inbound_time: new Date(),
|
||||
inbound_order_no: firstEntryOrder.entry_order_code,
|
||||
receiving_id: firstRcv.id,
|
||||
entry_order_id: firstEntryOrder.id,
|
||||
supplier_id: null,
|
||||
supplier_batch_no: null,
|
||||
is_enabled: 1,
|
||||
created_at: new Date(),
|
||||
updated_at: new Date(),
|
||||
}, { transaction });
|
||||
}
|
||||
|
||||
// 6b+. 写入出入库记录
|
||||
await ctx.service.systems.stockTransaction.create({
|
||||
transaction_type: 'INBOUND',
|
||||
warehouse_id: warehouseId,
|
||||
store_id: firstRcv.store_id || warehouseId,
|
||||
stock_id: swId,
|
||||
storage_id: storageRecord.id,
|
||||
space_id: spaceId,
|
||||
quantity: actualInbound,
|
||||
batch_no: batchNo,
|
||||
inventory_type: inventoryType,
|
||||
order_type: 'MATCH',
|
||||
order_no: firstEntryOrder.entry_order_code,
|
||||
order_id: null,
|
||||
receiving_id: firstRcv.id,
|
||||
entry_order_id: firstEntryOrder.id,
|
||||
operator_id: String(ctx.user?.employees_id || ctx.user?.id || ''),
|
||||
operator_name: ctx.user?.employees_name || '',
|
||||
remark: '匹配入库',
|
||||
before_quantity: beforeQuantity,
|
||||
after_quantity: afterQuantity,
|
||||
before_locked_quantity: beforeLockedQuantity,
|
||||
after_locked_quantity: afterLockedQuantity,
|
||||
created_at: new Date(),
|
||||
}, { transaction });
|
||||
|
||||
// 6c. 分配到各个收货明细(按顺序依次扣减)
|
||||
let rcvRemain = actualInbound;
|
||||
for (const rcvItem of rcvGroup) {
|
||||
if (rcvRemain <= 0) break;
|
||||
const allocate = Math.min(rcvRemain, rcvItem.available);
|
||||
rcvDetailAllocated[rcvItem.detail.id] = (rcvDetailAllocated[rcvItem.detail.id] || 0) + allocate;
|
||||
rcvRemain -= allocate;
|
||||
}
|
||||
|
||||
// 6d. 分配到各个入库明细(按顺序依次填充)
|
||||
let entryRemain = actualInbound;
|
||||
for (const entryItem of entryGroup) {
|
||||
if (entryRemain <= 0) break;
|
||||
const allocate = Math.min(entryRemain, entryItem.remaining);
|
||||
entryItemAllocated[entryItem.item.id] = (entryItemAllocated[entryItem.item.id] || 0) + allocate;
|
||||
entryRemain -= allocate;
|
||||
}
|
||||
|
||||
matchedItems.push({
|
||||
stock_warehouse_id: swId,
|
||||
item_code: stockRecord.item_code || '',
|
||||
inbound_quantity: actualInbound,
|
||||
rcv_available: totalRcvAvailable,
|
||||
entry_planned: totalEntryRemaining,
|
||||
});
|
||||
}
|
||||
|
||||
if (!matchedItems.length) {
|
||||
await transaction.rollback();
|
||||
return {
|
||||
code: 400,
|
||||
message: '没有可匹配入库的商品',
|
||||
data: { unmatched_products: unmatchedProducts },
|
||||
};
|
||||
}
|
||||
|
||||
// ────────── 7. 更新收货明细 stored_quantity 和 storage_status ──────────
|
||||
for (const rcv of receivings) {
|
||||
for (const d of (rcv.details || [])) {
|
||||
const allocated = rcvDetailAllocated[d.id];
|
||||
if (!allocated) continue;
|
||||
const newStoredQty = (d.stored_quantity || 0) + allocated;
|
||||
const detailStorageStatus = newStoredQty >= d.actual_quantity ? 'all' : 'partial';
|
||||
await ctx.model.ReceivingDetail.update({
|
||||
stored_quantity: newStoredQty,
|
||||
storage_status: detailStorageStatus,
|
||||
}, {
|
||||
where: { id: d.id },
|
||||
transaction,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// ────────── 8. 更新入库明细 received_quantity ──────────
|
||||
for (const eo of entryOrders) {
|
||||
for (const item of (eo.items || [])) {
|
||||
const allocated = entryItemAllocated[item.id];
|
||||
if (!allocated) continue;
|
||||
const newReceivedQty = (item.received_quantity || 0) + allocated;
|
||||
await ctx.model.EntryItems.update({
|
||||
received_quantity: newReceivedQty,
|
||||
}, {
|
||||
where: { id: item.id },
|
||||
transaction,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// ────────── 9. 更新收货单 storage_status ──────────
|
||||
const receivingResults = [];
|
||||
for (const rcv of receivings) {
|
||||
const details = rcv.details || [];
|
||||
const allStored = details.every(d => {
|
||||
const allocated = rcvDetailAllocated[d.id] || 0;
|
||||
const newStored = (d.stored_quantity || 0) + allocated;
|
||||
return d.storage_status === 'all' || newStored >= d.actual_quantity;
|
||||
});
|
||||
const hasAny = details.some(d => {
|
||||
const allocated = rcvDetailAllocated[d.id] || 0;
|
||||
return d.storage_status !== 'none' || allocated > 0;
|
||||
});
|
||||
const newStatus = allStored ? 'all' : (hasAny ? 'partial' : rcv.storage_status);
|
||||
|
||||
if (newStatus !== rcv.storage_status) {
|
||||
await ctx.model.Receiving.update({ storage_status: newStatus }, {
|
||||
where: { id: rcv.id },
|
||||
transaction,
|
||||
});
|
||||
}
|
||||
|
||||
receivingResults.push({
|
||||
receiving_id: rcv.id,
|
||||
receiving_number: rcv.receiving_number,
|
||||
storage_status: newStatus,
|
||||
});
|
||||
}
|
||||
|
||||
// ────────── 10. 更新入库单 order_status ──────────
|
||||
const entryOrderResults = [];
|
||||
const completedEntryOrders = []; // 事务外回传用
|
||||
|
||||
for (const eo of entryOrders) {
|
||||
const items = eo.items || [];
|
||||
const allFulfilled = items.every(item => {
|
||||
const allocated = entryItemAllocated[item.id] || 0;
|
||||
const newReceived = (item.received_quantity || 0) + allocated;
|
||||
return newReceived >= (item.count || 0);
|
||||
});
|
||||
const hasAnyReceived = items.some(item => {
|
||||
const allocated = entryItemAllocated[item.id] || 0;
|
||||
return (item.received_quantity || 0) + allocated > 0;
|
||||
});
|
||||
|
||||
let newStatus = eo.order_status;
|
||||
if (allFulfilled) {
|
||||
newStatus = 'COMPLETED';
|
||||
} else if (hasAnyReceived) {
|
||||
newStatus = 'PARTIAL_RECEIVED';
|
||||
}
|
||||
|
||||
if (newStatus !== eo.order_status) {
|
||||
await ctx.model.EntryOrder.update({
|
||||
order_status: newStatus,
|
||||
updated_at: new Date(),
|
||||
}, {
|
||||
where: { id: eo.id },
|
||||
transaction,
|
||||
});
|
||||
}
|
||||
|
||||
const result = {
|
||||
entry_order_id: eo.id,
|
||||
entry_order_code: eo.entry_order_code,
|
||||
order_status: newStatus,
|
||||
source_type: eo.source_type,
|
||||
callback_status: null,
|
||||
};
|
||||
entryOrderResults.push(result);
|
||||
|
||||
if (allFulfilled) {
|
||||
completedEntryOrders.push({ entryOrder: eo, result });
|
||||
} else {
|
||||
warnings.push(
|
||||
`入库单 ${eo.entry_order_code}: 未全部入库完成(${newStatus}),不触发回传,需手工操作或等待其他收货入库`
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// ────────── 12. 提交事务 ──────────
|
||||
await transaction.commit();
|
||||
|
||||
// ────────── 13. 事务外:对已完成的入库单触发回传 ──────────
|
||||
for (const { entryOrder, result } of completedEntryOrders) {
|
||||
try {
|
||||
if (entryOrder.source_type === 'QM') {
|
||||
const confirmResult = await ctx.service.systems.entryOrder.entryorderConfirm(entryOrder.id, true);
|
||||
result.callback_status = confirmResult.success ? 'SUCCESS' : 'FAILED';
|
||||
result.callback_detail = confirmResult;
|
||||
} else if (entryOrder.source_type === 'API') {
|
||||
const callbackResult = await this.apiCallback(entryOrder);
|
||||
result.callback_status = callbackResult.success ? 'SUCCESS' : (callbackResult.skipped ? 'SKIPPED' : 'FAILED');
|
||||
result.callback_detail = callbackResult;
|
||||
} else {
|
||||
result.callback_status = 'NOT_REQUIRED';
|
||||
}
|
||||
} catch (cbErr) {
|
||||
ctx.logger.error(`[matchPutaway] 入库单 ${entryOrder.entry_order_code} 回传异常`, cbErr);
|
||||
result.callback_status = 'ERROR';
|
||||
result.callback_detail = { error: cbErr.message };
|
||||
}
|
||||
}
|
||||
|
||||
// ────────── 14. 记录操作日志 ──────────
|
||||
try {
|
||||
await ctx.service.systems.operationLog.createOperationLog({
|
||||
businessType: 'entry',
|
||||
businessId: entryOrderIds.join(','),
|
||||
operationCode: 'MATCH_PUTAWAY',
|
||||
operator: {
|
||||
id: ctx.user?.employees_id || ctx.user?.id,
|
||||
name: ctx.user?.employees_name || '',
|
||||
},
|
||||
extras: { warehouseId, receivingIds, entryOrderIds },
|
||||
beforeChanges: null,
|
||||
});
|
||||
} catch (logErr) {
|
||||
ctx.logger.warn('[matchPutaway] 写入操作日志失败,不影响业务', logErr);
|
||||
}
|
||||
|
||||
ctx.logger.info('[matchPutaway] 匹配入库完成', {
|
||||
receiving_ids: receivingIds,
|
||||
entry_order_ids: entryOrderIds,
|
||||
matched_count: matchedItems.length,
|
||||
unmatched_count: unmatchedProducts.length,
|
||||
warnings_count: warnings.length,
|
||||
});
|
||||
|
||||
// ────────── 15. 返回结果 ──────────
|
||||
return {
|
||||
code: 200,
|
||||
message: '匹配入库完成',
|
||||
data: {
|
||||
matched_items: matchedItems,
|
||||
receiving_results: receivingResults,
|
||||
entry_order_results: entryOrderResults,
|
||||
unmatched_products: unmatchedProducts,
|
||||
warnings: warnings.length ? warnings : undefined,
|
||||
},
|
||||
};
|
||||
} catch (error) {
|
||||
await transaction.rollback();
|
||||
ctx.logger.error('[matchPutaway] 匹配入库异常', {
|
||||
receiving_ids: receivingIds,
|
||||
entry_order_ids: entryOrderIds,
|
||||
error: error.message,
|
||||
stack: error.stack,
|
||||
});
|
||||
|
||||
if (error.name === 'SequelizeDatabaseError' && error.message.includes('Lock wait timeout')) {
|
||||
return { code: 409, message: '库存记录被锁定,请稍后重试', data: null };
|
||||
}
|
||||
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 写入移库双向库位流水(移库出/移库入)。
|
||||
*
|
||||
@ -2127,68 +1225,6 @@ class InventoryService extends Service {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* API 入库单回调:向 api_app 配置的 callback_url 发送入库确认通知。
|
||||
*
|
||||
* @param {Object} entryOrder 入库单实例
|
||||
* @return {Promise<Object>} { success, skipped?, status?, error? }
|
||||
*/
|
||||
async apiCallback(entryOrder) {
|
||||
const { ctx, app } = this;
|
||||
try {
|
||||
const apiApp = await app.model.ApiApp.findOne({
|
||||
where: {
|
||||
warehouse_id: entryOrder.warehouse_id,
|
||||
is_enabled: 1,
|
||||
},
|
||||
});
|
||||
|
||||
if (!apiApp || !apiApp.callback_url) {
|
||||
ctx.logger.info('[matchPutaway] 未找到API回调配置或无回调地址,跳过回调');
|
||||
return { success: true, skipped: true };
|
||||
}
|
||||
|
||||
const items = await app.model.EntryItems.findAll({
|
||||
where: { order_id: entryOrder.id },
|
||||
});
|
||||
|
||||
const payload = {
|
||||
entry_order_code: entryOrder.entry_order_code,
|
||||
order_type: entryOrder.order_type,
|
||||
order_status: 'COMPLETED',
|
||||
warehouse_id: entryOrder.warehouse_id,
|
||||
store_id: entryOrder.store_id,
|
||||
items: items.map(item => ({
|
||||
item_code: item.item_code,
|
||||
item_id: item.item_id,
|
||||
plan_quantity: item.count,
|
||||
received_quantity: item.received_quantity,
|
||||
confirm_quantity: item.received_quantity,
|
||||
})),
|
||||
confirm_time: new Date().toISOString(),
|
||||
};
|
||||
|
||||
const response = await ctx.curl(apiApp.callback_url, {
|
||||
method: 'POST',
|
||||
contentType: 'json',
|
||||
data: payload,
|
||||
timeout: 10000,
|
||||
dataType: 'json',
|
||||
});
|
||||
|
||||
ctx.logger.info('[matchPutaway] API回调结果', {
|
||||
entry_order_id: entryOrder.id,
|
||||
callback_url: apiApp.callback_url,
|
||||
status: response.status,
|
||||
});
|
||||
|
||||
return { success: response.status === 200, status: response.status };
|
||||
} catch (err) {
|
||||
ctx.logger.error('[matchPutaway] API回调失败', err);
|
||||
return { success: false, error: err.message };
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询库存列表。
|
||||
*
|
||||
|
||||
347
app/service/systems/storage/management.js
Normal file
347
app/service/systems/storage/management.js
Normal file
@ -0,0 +1,347 @@
|
||||
'use strict';
|
||||
|
||||
const Service = require('egg').Service;
|
||||
|
||||
/**
|
||||
* 将输入值转换为有限数字。
|
||||
*
|
||||
* @param {unknown} value 待转换的值。
|
||||
* @param {number} [defaultValue=0] 默认值。
|
||||
* @return {number} 转换后的数字。
|
||||
*/
|
||||
function toNumber(value, defaultValue = 0) {
|
||||
const normalized = Number(value);
|
||||
|
||||
return Number.isFinite(normalized) ? normalized : defaultValue;
|
||||
}
|
||||
|
||||
/**
|
||||
* 将模型记录转换为普通对象。
|
||||
*
|
||||
* @param {unknown} record 模型记录。
|
||||
* @return {Object|null} 普通对象。
|
||||
*/
|
||||
function toPlainRecord(record) {
|
||||
if (!record) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (typeof record.get === 'function') {
|
||||
return record.get({ plain: true });
|
||||
}
|
||||
|
||||
return record;
|
||||
}
|
||||
|
||||
/**
|
||||
* 库存管理服务层。
|
||||
* 负责库存分布分析、补货需求计算等库存管理相关业务逻辑。
|
||||
*/
|
||||
class StorageManagementService extends Service {
|
||||
/**
|
||||
* 分拣缺货补货需求计算。
|
||||
*
|
||||
* 仓库级别的计算,针对当前仓库所有未完成储位分配的订单,
|
||||
* 计算每个 SKU 在分拣区与存货区的可用库存对比,
|
||||
* 输出分拣区缺口及建议补货量,供仓库人员决策移库。
|
||||
*
|
||||
* 仓库 ID 从用户上下文(ctx.user.store_id / ctx.user.warehouse_id)自动获取,无需显式传入。
|
||||
*
|
||||
* @param {Object} [options={}] 可选项。
|
||||
* @param {Object} [options.pagination] 分页参数。
|
||||
* @param {number} [options.pagination.page=1] 页码,默认 1。
|
||||
* @param {number} [options.pagination.pageSize=20] 每页大小,默认 20。
|
||||
* @param {Object} [options.sort] 排序参数。
|
||||
* @param {string} [options.sort.sortField='shortage'] 排序字段,默认 shortage。
|
||||
* @param {string} [options.sort.sortOrder='DESC'] 排序方向,ASC/DESC。
|
||||
* @return {Promise<Object>} 补货需求明细、汇总与分页信息。
|
||||
*/
|
||||
async replenishmentDemand(options = {}) {
|
||||
const { ctx, app } = this;
|
||||
const { Op } = app.Sequelize;
|
||||
|
||||
// 仓库上下文:从用户上下文获取
|
||||
const warehouseId = toNumber(ctx.user?.store_id ?? ctx.user?.warehouse_id, 0);
|
||||
|
||||
if (warehouseId <= 0) {
|
||||
throw new Error('缺少仓库上下文');
|
||||
}
|
||||
|
||||
// 1) 获取订单模型和明细模型
|
||||
const orderModel = await ctx.model.OrderDeliveryFactory.getCurrentModel(warehouseId);
|
||||
const orderItemModel = await ctx.model.OrderItemsFactory.getCurrentModel(warehouseId);
|
||||
|
||||
// 2) 查询当前仓库所有未完成储位分配的订单
|
||||
const pendingOrders = await orderModel.findAll({
|
||||
where: {
|
||||
warehouse_id: warehouseId,
|
||||
storage_status: { [Op.ne]: 'fin' },
|
||||
delete_at: null,
|
||||
},
|
||||
attributes: [ 'id' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
const targetOrderIds = (Array.isArray(pendingOrders) ? pendingOrders : [])
|
||||
.map(row => toNumber(row && row.id, 0))
|
||||
.filter(id => id > 0);
|
||||
|
||||
if (targetOrderIds.length === 0) {
|
||||
return { list: [], summary: { total_skus: 0, total_shortage_skus: 0, total_replenishment_needed: 0, total_true_shortage_skus: 0 } };
|
||||
}
|
||||
|
||||
// 3) 查询订单明细,汇总每个 SKU 的需求量
|
||||
const itemRows = await orderItemModel.findAll({
|
||||
where: {
|
||||
order_id: { [Op.in]: targetOrderIds },
|
||||
},
|
||||
attributes: [ 'stock_id', 'plan_qty' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
const demandByStockId = new Map();
|
||||
const stockIdSet = new Set();
|
||||
|
||||
for (const row of Array.isArray(itemRows) ? itemRows : []) {
|
||||
const stockId = toNumber(row.stock_id, 0);
|
||||
const qty = toNumber(row.plan_qty, 0);
|
||||
if (stockId <= 0 || qty <= 0) continue;
|
||||
|
||||
demandByStockId.set(stockId, (demandByStockId.get(stockId) || 0) + qty);
|
||||
stockIdSet.add(stockId);
|
||||
}
|
||||
|
||||
const allStockIds = Array.from(stockIdSet);
|
||||
|
||||
if (allStockIds.length === 0) {
|
||||
return { list: [], summary: { total_skus: 0, total_shortage_skus: 0, total_replenishment_needed: 0, total_true_shortage_skus: 0 } };
|
||||
}
|
||||
|
||||
// 4) 查询 SKU 基础信息(先严格,漏掉的宽松兜底)
|
||||
const stockWarehouseRows = allStockIds.length > 0
|
||||
? await ctx.model.StockWarehouse.findAll({
|
||||
where: {
|
||||
id: { [Op.in]: allStockIds },
|
||||
warehouse_id: warehouseId,
|
||||
is_valid: 'Y',
|
||||
deleted_at: null,
|
||||
},
|
||||
attributes: [ 'id', 'item_code', 'item_name' ],
|
||||
raw: true,
|
||||
})
|
||||
: [];
|
||||
|
||||
const stockInfoMap = new Map();
|
||||
const hitStockIds = new Set();
|
||||
|
||||
for (const row of Array.isArray(stockWarehouseRows) ? stockWarehouseRows : []) {
|
||||
const stockId = toNumber(row.id, 0);
|
||||
if (stockId <= 0) continue;
|
||||
stockInfoMap.set(stockId, {
|
||||
stock_code: String(row.item_code || ''),
|
||||
stock_name: String(row.item_name || ''),
|
||||
});
|
||||
hitStockIds.add(stockId);
|
||||
}
|
||||
|
||||
// 宽松兜底:查询未命中的 SKU(去掉 is_valid 和 warehouse_id 限制)
|
||||
const missedStockIds = allStockIds.filter(id => !hitStockIds.has(id));
|
||||
if (missedStockIds.length > 0) {
|
||||
const fallbackRows = await ctx.model.StockWarehouse.findAll({
|
||||
where: {
|
||||
id: { [Op.in]: missedStockIds },
|
||||
deleted_at: null,
|
||||
},
|
||||
attributes: [ 'id', 'item_code', 'item_name' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
for (const row of Array.isArray(fallbackRows) ? fallbackRows : []) {
|
||||
const stockId = toNumber(row.id, 0);
|
||||
if (stockId <= 0 || stockInfoMap.has(stockId)) continue;
|
||||
stockInfoMap.set(stockId, {
|
||||
stock_code: String(row.item_code || ''),
|
||||
stock_name: String(row.item_name || ''),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 终极兜底:连已删除的也查
|
||||
const stillMissedStockIds = allStockIds.filter(id => !stockInfoMap.has(id));
|
||||
if (stillMissedStockIds.length > 0) {
|
||||
const finalFallbackRows = await ctx.model.StockWarehouse.findAll({
|
||||
where: {
|
||||
id: { [Op.in]: stillMissedStockIds },
|
||||
},
|
||||
attributes: [ 'id', 'item_code', 'item_name' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
for (const row of Array.isArray(finalFallbackRows) ? finalFallbackRows : []) {
|
||||
const stockId = toNumber(row.id, 0);
|
||||
if (stockId <= 0 || stockInfoMap.has(stockId)) continue;
|
||||
stockInfoMap.set(stockId, {
|
||||
stock_code: String(row.item_code || ''),
|
||||
stock_name: String(row.item_name || ''),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// 5) 查询所有可用库存(不区分分拣/存货区),再按库位类型分类汇总
|
||||
const storageRows = allStockIds.length > 0
|
||||
? await ctx.model.Storage.findAll({
|
||||
where: {
|
||||
warehouse_id: warehouseId,
|
||||
stock_id: { [Op.in]: allStockIds },
|
||||
is_enabled: 1,
|
||||
delete_at: null,
|
||||
available_quantity: { [Op.gt]: 0 },
|
||||
},
|
||||
attributes: [ 'stock_id', 'available_quantity', 'space_id' ],
|
||||
include: [
|
||||
{
|
||||
model: ctx.model.LocationSpace,
|
||||
as: 'space',
|
||||
required: true,
|
||||
attributes: [ 'id', 'space_code', 'custom_name' ],
|
||||
include: [
|
||||
{
|
||||
model: ctx.model.LocationType,
|
||||
as: 'locationType',
|
||||
required: true,
|
||||
attributes: [ 'id', 'allow_allocation', 'is_active' ],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
})
|
||||
: [];
|
||||
|
||||
// 按 SKU 汇总分拣区与存货区可用库存
|
||||
const pickZoneQtyByStockId = new Map();
|
||||
const storageZoneQtyByStockId = new Map();
|
||||
// 存货区库位明细(用于补货库位推荐)
|
||||
const storageZoneLocationsByStockId = new Map();
|
||||
|
||||
for (const storageRow of Array.isArray(storageRows) ? storageRows : []) {
|
||||
const plainStorage = toPlainRecord(storageRow);
|
||||
if (!plainStorage) continue;
|
||||
|
||||
const stockId = toNumber(plainStorage.stock_id, 0);
|
||||
const availableQty = toNumber(plainStorage.available_quantity, 0);
|
||||
if (stockId <= 0 || availableQty <= 0) continue;
|
||||
|
||||
const space = toPlainRecord(plainStorage.space) || {};
|
||||
const locationType = toPlainRecord(space.locationType) || {};
|
||||
const allowAllocation = toNumber(locationType.allow_allocation, 0);
|
||||
const isActive = toNumber(locationType.is_active, 0);
|
||||
|
||||
if (allowAllocation === 1 && isActive === 1) {
|
||||
// 分拣区
|
||||
pickZoneQtyByStockId.set(stockId, (pickZoneQtyByStockId.get(stockId) || 0) + availableQty);
|
||||
} else {
|
||||
// 存货区
|
||||
storageZoneQtyByStockId.set(stockId, (storageZoneQtyByStockId.get(stockId) || 0) + availableQty);
|
||||
|
||||
// 收集存货区库位明细
|
||||
const locationList = storageZoneLocationsByStockId.get(stockId) || [];
|
||||
locationList.push({
|
||||
space_code: String(space.space_code || ''),
|
||||
space_name: String(space.custom_name || space.space_code || ''),
|
||||
available_quantity: availableQty,
|
||||
});
|
||||
storageZoneLocationsByStockId.set(stockId, locationList);
|
||||
}
|
||||
}
|
||||
|
||||
// 6) 组装输出
|
||||
const list = [];
|
||||
let totalShortageSkus = 0;
|
||||
let totalReplenishmentNeeded = 0;
|
||||
let totalTrueShortageSkus = 0;
|
||||
|
||||
for (const stockId of allStockIds) {
|
||||
const info = stockInfoMap.get(stockId) || { stock_code: `SKU#${stockId}`, stock_name: `商品#${stockId}` };
|
||||
const totalDemand = demandByStockId.get(stockId) || 0;
|
||||
const pickZoneQty = pickZoneQtyByStockId.get(stockId) || 0;
|
||||
const storageZoneQty = storageZoneQtyByStockId.get(stockId) || 0;
|
||||
const shortage = Math.max(0, totalDemand - pickZoneQty);
|
||||
const replenishmentNeeded = Math.min(shortage, storageZoneQty);
|
||||
const replenishmentStatus = storageZoneQty >= shortage ? 'replenishable' : 'true_shortage';
|
||||
|
||||
// 补货库位信息:按可用库存降序取前 5 条
|
||||
const rawLocations = storageZoneLocationsByStockId.get(stockId) || [];
|
||||
rawLocations.sort((a, b) => (b.available_quantity - a.available_quantity));
|
||||
const replenishmentLocations = rawLocations.slice(0, 5);
|
||||
|
||||
if (shortage > 0) {
|
||||
list.push({
|
||||
stock_id: stockId,
|
||||
stock_code: info.stock_code,
|
||||
stock_name: info.stock_name,
|
||||
pick_zone_quantity: pickZoneQty,
|
||||
storage_zone_quantity: storageZoneQty,
|
||||
total_demand: totalDemand,
|
||||
shortage,
|
||||
replenishment_needed: replenishmentNeeded,
|
||||
replenishment_status: replenishmentStatus,
|
||||
replenishment_locations: replenishmentLocations,
|
||||
});
|
||||
|
||||
totalShortageSkus += 1;
|
||||
totalReplenishmentNeeded += replenishmentNeeded;
|
||||
if (replenishmentStatus === 'true_shortage') {
|
||||
totalTrueShortageSkus += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 7) 排序
|
||||
const paginationInput = options.pagination || {};
|
||||
const sortInput = options.sort || options.order || {};
|
||||
const sortField = String(sortInput.sortField || sortInput.field || 'shortage').trim();
|
||||
const sortOrderRaw = String(sortInput.sortOrder || sortInput.direction || 'DESC').toUpperCase().trim();
|
||||
const sortOrder = sortOrderRaw === 'ASC' ? 1 : -1;
|
||||
const allowedSortFields = new Set([
|
||||
'stock_id',
|
||||
'pick_zone_quantity',
|
||||
'storage_zone_quantity',
|
||||
'total_demand',
|
||||
'shortage',
|
||||
'replenishment_needed',
|
||||
]);
|
||||
const effectiveSortField = allowedSortFields.has(sortField) ? sortField : 'shortage';
|
||||
|
||||
list.sort((a, b) => {
|
||||
const aVal = a[effectiveSortField] ?? 0;
|
||||
const bVal = b[effectiveSortField] ?? 0;
|
||||
return (aVal - bVal) * sortOrder;
|
||||
});
|
||||
|
||||
// 8) 内存分页
|
||||
const page = Math.max(1, toNumber(paginationInput.page, 1));
|
||||
const pageSize = Math.max(1, toNumber(paginationInput.pageSize, 20));
|
||||
const total = list.length;
|
||||
const totalPages = Math.ceil(total / pageSize);
|
||||
const startIndex = (page - 1) * pageSize;
|
||||
const pagedList = list.slice(startIndex, startIndex + pageSize);
|
||||
|
||||
return {
|
||||
list: pagedList,
|
||||
pagination: {
|
||||
page,
|
||||
pageSize,
|
||||
total,
|
||||
totalPages,
|
||||
},
|
||||
summary: {
|
||||
total_skus: totalShortageSkus,
|
||||
total_shortage_skus: totalShortageSkus,
|
||||
total_replenishment_needed: totalReplenishmentNeeded,
|
||||
total_true_shortage_skus: totalTrueShortageSkus,
|
||||
},
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = StorageManagementService;
|
||||
@ -3986,6 +3986,12 @@ class ReceivingService extends Service {
|
||||
// 10. 提交事务
|
||||
await transaction.commit();
|
||||
|
||||
// 10.1 清除收货单缓存,确保下次入库完成时匹配到最新收货单列表
|
||||
const receivingCacheKey = `cache:receiving_orders:warehouse:${warehouseId}`;
|
||||
app.delCacheAsync(receivingCacheKey).catch(cacheErr => {
|
||||
ctx.logger.warn(`[receiving.completeReceiving] 清除收货单缓存失败: ${cacheErr.message}`, { cacheKey: receivingCacheKey });
|
||||
});
|
||||
|
||||
// 记录操作日志
|
||||
try {
|
||||
await ctx.service.systems.operationLog.createOperationLog({
|
||||
@ -4211,6 +4217,8 @@ class ReceivingService extends Service {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
module.exports = ReceivingService;
|
||||
|
||||
|
||||
@ -406,6 +406,15 @@ class SettingStoreWarehouseService extends Service {
|
||||
}
|
||||
|
||||
await this.app.setCacheAsync(this.getPolicyConfigCacheKey(normalizedId), policyConfig, 86400 * 30);
|
||||
|
||||
// 清除签约策略缓存(sw_policy:{storeId}:{warehouseId})
|
||||
const relation = await this.ctx.model.StoreWarehouse.findByPk(normalizedId, {
|
||||
attributes: [ 'store_id', 'warehouse_id' ],
|
||||
raw: true,
|
||||
});
|
||||
if (relation) {
|
||||
await this.app.delCacheAsync(`sw_policy:${relation.store_id}:${relation.warehouse_id}`);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -2567,7 +2576,8 @@ class SettingStoreWarehouseService extends Service {
|
||||
|
||||
// 3. 密码自动生成
|
||||
if (!data.password) {
|
||||
data.password = crypto.randomBytes(8).toString('base64').replace(/[+/=]/g, '').slice(0, 12);
|
||||
data.password = crypto.randomBytes(8).toString('base64').replace(/[+/=]/g, '')
|
||||
.slice(0, 12);
|
||||
}
|
||||
|
||||
// 4. 必填字段校验
|
||||
|
||||
@ -209,6 +209,7 @@ module.exports = appInfo => {
|
||||
batchSize: 50,
|
||||
force: false,
|
||||
};
|
||||
|
||||
return {
|
||||
...config,
|
||||
...userConfig,
|
||||
|
||||
@ -0,0 +1,86 @@
|
||||
'use strict';
|
||||
|
||||
const TABLE_NAME = 'wms_entry_receiving_binding';
|
||||
|
||||
module.exports = {
|
||||
up: async (queryInterface, Sequelize) => {
|
||||
const tables = await queryInterface.showAllTables();
|
||||
const exists = tables.some(t => (typeof t === 'string' ? t : t.tableName) === TABLE_NAME);
|
||||
if (exists) return;
|
||||
|
||||
await queryInterface.createTable(TABLE_NAME, {
|
||||
id: {
|
||||
type: Sequelize.BIGINT(20).UNSIGNED,
|
||||
primaryKey: true,
|
||||
autoIncrement: true,
|
||||
allowNull: false,
|
||||
comment: '主键ID',
|
||||
},
|
||||
entry_item_id: {
|
||||
type: Sequelize.BIGINT(20).UNSIGNED,
|
||||
allowNull: false,
|
||||
comment: '入库明细ID',
|
||||
},
|
||||
receiving_detail_id: {
|
||||
type: Sequelize.INTEGER,
|
||||
allowNull: false,
|
||||
comment: '收货明细ID',
|
||||
},
|
||||
allocated_quantity: {
|
||||
type: Sequelize.INTEGER,
|
||||
allowNull: false,
|
||||
comment: '预分配数量',
|
||||
},
|
||||
status: {
|
||||
type: Sequelize.ENUM('pending', 'committed', 'released'),
|
||||
allowNull: false,
|
||||
defaultValue: 'pending',
|
||||
comment: '绑定状态:pending-待提交 committed-已提交 released-已释放',
|
||||
},
|
||||
creator_id: {
|
||||
type: Sequelize.BIGINT(20).UNSIGNED,
|
||||
allowNull: true,
|
||||
comment: '创建人ID',
|
||||
},
|
||||
created_at: {
|
||||
type: Sequelize.DATE,
|
||||
allowNull: false,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
comment: '创建时间',
|
||||
},
|
||||
updated_at: {
|
||||
type: Sequelize.DATE,
|
||||
allowNull: false,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP'),
|
||||
comment: '更新时间',
|
||||
},
|
||||
deleted_at: {
|
||||
type: Sequelize.DATE,
|
||||
allowNull: true,
|
||||
defaultValue: null,
|
||||
comment: '软删除时间',
|
||||
},
|
||||
});
|
||||
|
||||
await queryInterface.addIndex(TABLE_NAME, [ 'entry_item_id' ], {
|
||||
name: 'idx_entry_item_id',
|
||||
});
|
||||
|
||||
await queryInterface.addIndex(TABLE_NAME, [ 'receiving_detail_id' ], {
|
||||
name: 'idx_receiving_detail_id',
|
||||
});
|
||||
|
||||
await queryInterface.addIndex(TABLE_NAME, [ 'status' ], {
|
||||
name: 'idx_status',
|
||||
});
|
||||
|
||||
await queryInterface.addIndex(TABLE_NAME, [ 'entry_item_id', 'receiving_detail_id', 'status' ], {
|
||||
unique: true,
|
||||
name: 'uk_entry_receiving',
|
||||
});
|
||||
},
|
||||
|
||||
down: async queryInterface => {
|
||||
await queryInterface.dropTable(TABLE_NAME);
|
||||
},
|
||||
};
|
||||
232
database/migrations/20260621100000-create-wms-combo-goods.js
Normal file
232
database/migrations/20260621100000-create-wms-combo-goods.js
Normal file
@ -0,0 +1,232 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 获取当前数据库已存在的表名集合。
|
||||
* @param {import('sequelize').QueryInterface} queryInterface 查询接口。
|
||||
* @return {Promise<Set<string>>} 表名集合。
|
||||
*/
|
||||
const getExistingTableSet = async queryInterface => {
|
||||
const tables = await queryInterface.showAllTables();
|
||||
return new Set(
|
||||
tables.map(table => (typeof table === 'string' ? table : table.tableName))
|
||||
);
|
||||
};
|
||||
|
||||
/**
|
||||
* 幂等添加 custom_code 字段和索引(适用于表已存在但缺少新字段的场景)。
|
||||
* @param {import('sequelize').QueryInterface} queryInterface 查询接口。
|
||||
* @param {import('sequelize')} Sequelize Sequelize 实例。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
const ensureCustomCodeColumnAndIndex = async (queryInterface, Sequelize) => {
|
||||
const tableInfo = await queryInterface.describeTable('wms_combo_goods');
|
||||
if (!tableInfo.custom_code) {
|
||||
await queryInterface.addColumn('wms_combo_goods', 'custom_code', {
|
||||
type: Sequelize.STRING(64),
|
||||
allowNull: true,
|
||||
comment: '自定义编码(前端可输入,按货主唯一)',
|
||||
});
|
||||
}
|
||||
|
||||
const indexes = await queryInterface.showIndex('wms_combo_goods');
|
||||
const hasIndex = indexes.some(idx => idx.name === 'uk_store_custom_code');
|
||||
if (!hasIndex) {
|
||||
await queryInterface.addIndex('wms_combo_goods', [ 'warehouse_id', 'custom_code' ], {
|
||||
name: 'uk_store_custom_code',
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 创建组合商品主表 `wms_combo_goods`。
|
||||
* @param {import('sequelize').QueryInterface} queryInterface 查询接口。
|
||||
* @param {import('sequelize')} Sequelize Sequelize 实例。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
const createComboGoodsTable = async (queryInterface, Sequelize) => {
|
||||
await queryInterface.createTable('wms_combo_goods', {
|
||||
id: {
|
||||
type: Sequelize.INTEGER(11),
|
||||
primaryKey: true,
|
||||
autoIncrement: true,
|
||||
allowNull: false,
|
||||
comment: '主键ID',
|
||||
},
|
||||
combo_code: {
|
||||
type: Sequelize.STRING(64),
|
||||
allowNull: false,
|
||||
comment: '组合商品编码,业务唯一标识',
|
||||
},
|
||||
combo_name: {
|
||||
type: Sequelize.STRING(128),
|
||||
allowNull: false,
|
||||
comment: '组合商品名称',
|
||||
},
|
||||
custom_code: {
|
||||
type: Sequelize.STRING(64),
|
||||
allowNull: true,
|
||||
comment: '自定义编码(前端可输入,按货主唯一)',
|
||||
},
|
||||
combo_sku_id: {
|
||||
type: Sequelize.INTEGER(11),
|
||||
allowNull: true,
|
||||
comment: '组合商品关联的 wms_goods_sku.id',
|
||||
},
|
||||
status: {
|
||||
type: Sequelize.TINYINT(1),
|
||||
allowNull: false,
|
||||
defaultValue: 1,
|
||||
comment: '状态:1-启用 0-停用',
|
||||
},
|
||||
warehouse_id: {
|
||||
type: Sequelize.INTEGER(11),
|
||||
allowNull: true,
|
||||
comment: '绑定仓库ID,NULL表示全局',
|
||||
},
|
||||
remark: {
|
||||
type: Sequelize.STRING(256),
|
||||
allowNull: true,
|
||||
comment: '备注',
|
||||
},
|
||||
creator_id: {
|
||||
type: Sequelize.INTEGER(11),
|
||||
allowNull: true,
|
||||
comment: '创建人ID',
|
||||
},
|
||||
editor_id: {
|
||||
type: Sequelize.INTEGER(11),
|
||||
allowNull: true,
|
||||
comment: '最后编辑人ID',
|
||||
},
|
||||
created_at: {
|
||||
type: Sequelize.DATE,
|
||||
allowNull: false,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
comment: '创建时间',
|
||||
},
|
||||
updated_at: {
|
||||
type: Sequelize.DATE,
|
||||
allowNull: false,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP'),
|
||||
comment: '更新时间',
|
||||
},
|
||||
});
|
||||
|
||||
await queryInterface.addIndex('wms_combo_goods', [ 'combo_code' ], {
|
||||
unique: true,
|
||||
name: 'uk_combo_code',
|
||||
});
|
||||
|
||||
await queryInterface.addIndex('wms_combo_goods', [ 'combo_sku_id' ], {
|
||||
name: 'idx_combo_sku_id',
|
||||
});
|
||||
|
||||
await queryInterface.addIndex('wms_combo_goods', [ 'status' ], {
|
||||
name: 'idx_status',
|
||||
});
|
||||
|
||||
await queryInterface.addIndex('wms_combo_goods', [ 'warehouse_id' ], {
|
||||
name: 'idx_warehouse_id',
|
||||
});
|
||||
|
||||
await queryInterface.addIndex('wms_combo_goods', [ 'warehouse_id', 'custom_code' ], {
|
||||
name: 'uk_store_custom_code',
|
||||
});
|
||||
};
|
||||
|
||||
/**
|
||||
* 创建组合商品明细表 `wms_combo_goods_item`。
|
||||
* @param {import('sequelize').QueryInterface} queryInterface 查询接口。
|
||||
* @param {import('sequelize')} Sequelize Sequelize 实例。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
const createComboGoodsItemTable = async (queryInterface, Sequelize) => {
|
||||
await queryInterface.createTable('wms_combo_goods_item', {
|
||||
id: {
|
||||
type: Sequelize.INTEGER(11),
|
||||
primaryKey: true,
|
||||
autoIncrement: true,
|
||||
allowNull: false,
|
||||
comment: '主键ID',
|
||||
},
|
||||
combo_id: {
|
||||
type: Sequelize.INTEGER(11),
|
||||
allowNull: false,
|
||||
comment: '关联 wms_combo_goods.id',
|
||||
},
|
||||
item_goods_sku_id: {
|
||||
type: Sequelize.INTEGER(11),
|
||||
allowNull: false,
|
||||
comment: '子商品SKU ID,关联 wms_goods_sku.id',
|
||||
},
|
||||
item_quantity: {
|
||||
type: Sequelize.INTEGER(11),
|
||||
allowNull: false,
|
||||
defaultValue: 1,
|
||||
comment: '子商品数量(整数件数)',
|
||||
},
|
||||
sort_order: {
|
||||
type: Sequelize.INTEGER(11),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '排序序号,越小越靠前',
|
||||
},
|
||||
created_at: {
|
||||
type: Sequelize.DATE,
|
||||
allowNull: false,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
comment: '创建时间',
|
||||
},
|
||||
updated_at: {
|
||||
type: Sequelize.DATE,
|
||||
allowNull: false,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP'),
|
||||
comment: '更新时间',
|
||||
},
|
||||
});
|
||||
|
||||
await queryInterface.addIndex('wms_combo_goods_item', [ 'combo_id' ], {
|
||||
name: 'idx_combo_id',
|
||||
});
|
||||
|
||||
await queryInterface.addIndex('wms_combo_goods_item', [ 'item_goods_sku_id' ], {
|
||||
name: 'idx_item_goods_sku_id',
|
||||
});
|
||||
|
||||
await queryInterface.addIndex('wms_combo_goods_item', [ 'combo_id', 'item_goods_sku_id' ], {
|
||||
unique: true,
|
||||
name: 'uk_combo_sku',
|
||||
});
|
||||
};
|
||||
|
||||
module.exports = {
|
||||
/**
|
||||
* 执行 migration:创建组合商品主表与明细表。
|
||||
* @param {import('sequelize').QueryInterface} queryInterface 查询接口。
|
||||
* @param {import('sequelize')} Sequelize Sequelize 实例。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
up: async (queryInterface, Sequelize) => {
|
||||
const existingTables = await getExistingTableSet(queryInterface);
|
||||
|
||||
if (!existingTables.has('wms_combo_goods')) {
|
||||
await createComboGoodsTable(queryInterface, Sequelize);
|
||||
} else {
|
||||
await ensureCustomCodeColumnAndIndex(queryInterface, Sequelize);
|
||||
}
|
||||
|
||||
if (!existingTables.has('wms_combo_goods_item')) {
|
||||
await createComboGoodsItemTable(queryInterface, Sequelize);
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 回滚 migration:删除组合商品明细表与主表。
|
||||
* @param {import('sequelize').QueryInterface} queryInterface 查询接口。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
down: async queryInterface => {
|
||||
await queryInterface.dropTable('wms_combo_goods_item');
|
||||
await queryInterface.dropTable('wms_combo_goods');
|
||||
},
|
||||
};
|
||||
@ -0,0 +1,101 @@
|
||||
'use strict';
|
||||
|
||||
const TABLE_NAME = 'wms_inbound_direct_log';
|
||||
|
||||
module.exports = {
|
||||
up: async (queryInterface, Sequelize) => {
|
||||
const tables = await queryInterface.showAllTables();
|
||||
const exists = tables.some(t => (typeof t === 'string' ? t : t.tableName) === TABLE_NAME);
|
||||
if (exists) return;
|
||||
|
||||
await queryInterface.createTable(TABLE_NAME, {
|
||||
id: {
|
||||
type: Sequelize.BIGINT(20).UNSIGNED,
|
||||
primaryKey: true,
|
||||
autoIncrement: true,
|
||||
allowNull: false,
|
||||
comment: '主键ID',
|
||||
},
|
||||
warehouse_id: {
|
||||
type: Sequelize.BIGINT(20).UNSIGNED,
|
||||
allowNull: false,
|
||||
comment: '仓库ID',
|
||||
},
|
||||
store_id: {
|
||||
type: Sequelize.BIGINT(20).UNSIGNED,
|
||||
allowNull: true,
|
||||
comment: '货主ID',
|
||||
},
|
||||
stock_id: {
|
||||
type: Sequelize.BIGINT(20),
|
||||
allowNull: false,
|
||||
comment: '商品SKU ID,关联 wms_stock_warehouse.id',
|
||||
},
|
||||
quantity: {
|
||||
type: Sequelize.INTEGER(12),
|
||||
allowNull: false,
|
||||
comment: '入库数量',
|
||||
},
|
||||
inbound_type: {
|
||||
type: Sequelize.ENUM('import', 'pda'),
|
||||
allowNull: false,
|
||||
comment: '入库方式:import-导入入库 pda-PDA入库',
|
||||
},
|
||||
entry_order_id: {
|
||||
type: Sequelize.BIGINT(20).UNSIGNED,
|
||||
allowNull: true,
|
||||
comment: '关联入库单ID(可选),关联 wms_entry_order.id',
|
||||
},
|
||||
entry_order_code: {
|
||||
type: Sequelize.STRING(50),
|
||||
allowNull: true,
|
||||
comment: '入库单号(冗余,方便查询)',
|
||||
},
|
||||
remark: {
|
||||
type: Sequelize.STRING(500),
|
||||
allowNull: true,
|
||||
comment: '备注(如导入文件名、PDA操作备注等)',
|
||||
},
|
||||
operator_id: {
|
||||
type: Sequelize.BIGINT(20).UNSIGNED,
|
||||
allowNull: true,
|
||||
comment: '操作人ID',
|
||||
},
|
||||
operator_name: {
|
||||
type: Sequelize.STRING(50),
|
||||
allowNull: true,
|
||||
comment: '操作人名称',
|
||||
},
|
||||
created_at: {
|
||||
type: Sequelize.DATE,
|
||||
allowNull: false,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
comment: '创建时间',
|
||||
},
|
||||
});
|
||||
|
||||
await queryInterface.addIndex(TABLE_NAME, [ 'warehouse_id' ], {
|
||||
name: 'idx_warehouse_id',
|
||||
});
|
||||
|
||||
await queryInterface.addIndex(TABLE_NAME, [ 'stock_id' ], {
|
||||
name: 'idx_stock_id',
|
||||
});
|
||||
|
||||
await queryInterface.addIndex(TABLE_NAME, [ 'inbound_type' ], {
|
||||
name: 'idx_inbound_type',
|
||||
});
|
||||
|
||||
await queryInterface.addIndex(TABLE_NAME, [ 'entry_order_id' ], {
|
||||
name: 'idx_entry_order_id',
|
||||
});
|
||||
|
||||
await queryInterface.addIndex(TABLE_NAME, [ 'created_at' ], {
|
||||
name: 'idx_created_at',
|
||||
});
|
||||
},
|
||||
|
||||
down: async queryInterface => {
|
||||
await queryInterface.dropTable(TABLE_NAME);
|
||||
},
|
||||
};
|
||||
@ -0,0 +1,25 @@
|
||||
'use strict';
|
||||
|
||||
const TABLE_NAME = 'wms_inbound_direct_log';
|
||||
|
||||
module.exports = {
|
||||
up: async (queryInterface, Sequelize) => {
|
||||
const tables = await queryInterface.showAllTables();
|
||||
const exists = tables.some(t => (typeof t === 'string' ? t : t.tableName) === TABLE_NAME);
|
||||
if (!exists) return;
|
||||
|
||||
const columns = await queryInterface.describeTable(TABLE_NAME);
|
||||
if (columns.space_id) return;
|
||||
|
||||
await queryInterface.addColumn(TABLE_NAME, 'space_id', {
|
||||
type: Sequelize.BIGINT(20).UNSIGNED,
|
||||
allowNull: true,
|
||||
defaultValue: null,
|
||||
comment: '存放库位ID,关联 wms_location_space.id;为空时 commit 默认使用 1',
|
||||
});
|
||||
},
|
||||
|
||||
down: async queryInterface => {
|
||||
await queryInterface.removeColumn(TABLE_NAME, 'space_id');
|
||||
},
|
||||
};
|
||||
@ -0,0 +1,67 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 预置 RECEIPT(入库)业务类型的打印项配置。
|
||||
*
|
||||
* 幂等设计:基于唯一索引 (business_type, platform, field_code) 做 INSERT IGNORE,
|
||||
* 不会重复插入已存在的记录。
|
||||
*/
|
||||
|
||||
const TABLE = 'wms_print_items';
|
||||
|
||||
const RECEIPT_PRINT_ITEMS = [
|
||||
// ─── 入库单信息(group: entry_order_info) ──────────────────
|
||||
{ business_type: 'RECEIPT', platform: 'default', field_name: '入库单号', field_code: 'entry_order_code', field_type: 'text', group_field: 'entry_order_info', group_label: '入库单信息', group_sort: 1, sort_order: 1, required: true, status: 1 },
|
||||
{ business_type: 'RECEIPT', platform: 'default', field_name: '业务类型', field_code: 'order_type', field_type: 'text', group_field: 'entry_order_info', group_label: '入库单信息', group_sort: 1, sort_order: 2, required: false, status: 1 },
|
||||
{ business_type: 'RECEIPT', platform: 'default', field_name: '订单状态', field_code: 'order_status', field_type: 'text', group_field: 'entry_order_info', group_label: '入库单信息', group_sort: 1, sort_order: 3, required: false, status: 1 },
|
||||
{ business_type: 'RECEIPT', platform: 'default', field_name: '采购单号', field_code: 'purchase_order_code', field_type: 'text', group_field: 'entry_order_info', group_label: '入库单信息', group_sort: 1, sort_order: 4, required: false, status: 1 },
|
||||
{ business_type: 'RECEIPT', platform: 'default', field_name: '供应商名称', field_code: 'supplier_name', field_type: 'text', group_field: 'entry_order_info', group_label: '入库单信息', group_sort: 1, sort_order: 5, required: false, status: 1 },
|
||||
{ business_type: 'RECEIPT', platform: 'default', field_name: '仓库名称', field_code: 'warehouse_name', field_type: 'text', group_field: 'entry_order_info', group_label: '入库单信息', group_sort: 1, sort_order: 6, required: false, status: 1 },
|
||||
{ business_type: 'RECEIPT', platform: 'default', field_name: '货主名称', field_code: 'store_name', field_type: 'text', group_field: 'entry_order_info', group_label: '入库单信息', group_sort: 1, sort_order: 7, required: false, status: 1 },
|
||||
{ business_type: 'RECEIPT', platform: 'default', field_name: '物流公司', field_code: 'logistics_name', field_type: 'text', group_field: 'entry_order_info', group_label: '入库单信息', group_sort: 1, sort_order: 8, required: false, status: 1 },
|
||||
{ business_type: 'RECEIPT', platform: 'default', field_name: '运单号', field_code: 'express_code', field_type: 'text', group_field: 'entry_order_info', group_label: '入库单信息', group_sort: 1, sort_order: 9, required: false, status: 1 },
|
||||
{ business_type: 'RECEIPT', platform: 'default', field_name: '订单创建时间', field_code: 'order_create_time', field_type: 'datetime', group_field: 'entry_order_info', group_label: '入库单信息', group_sort: 1, sort_order: 10, required: false, status: 1 },
|
||||
{ business_type: 'RECEIPT', platform: 'default', field_name: '预期到货时间', field_code: 'expect_start_time', field_type: 'datetime', group_field: 'entry_order_info', group_label: '入库单信息', group_sort: 1, sort_order: 11, required: false, status: 1 },
|
||||
{ business_type: 'RECEIPT', platform: 'default', field_name: '备注', field_code: 'remark', field_type: 'textarea', group_field: 'entry_order_info', group_label: '入库单信息', group_sort: 1, sort_order: 12, required: false, status: 1 },
|
||||
{ business_type: 'RECEIPT', platform: 'default', field_name: '单据总行数', field_code: 'total_order_lines', field_type: 'number', group_field: 'entry_order_info', group_label: '入库单信息', group_sort: 1, sort_order: 13, required: false, status: 1 },
|
||||
|
||||
// ─── 入库明细表格(is_table = true) ─────────────────────────
|
||||
{ business_type: 'RECEIPT', platform: 'default', field_name: '入库明细', field_code: 'items', field_type: 'text', is_table: true, table_config: { columns: 6, headers: ['商品编码', '商品名称', '条码', '计划数量', '已收数量', '库存类型'] }, group_field: 'entry_items', group_label: '入库明细', group_sort: 2, sort_order: 1, required: false, status: 1 },
|
||||
];
|
||||
|
||||
module.exports.up = async queryInterface => {
|
||||
// 基于唯一索引做幂等插入
|
||||
const { sequelize } = queryInterface;
|
||||
for (const item of RECEIPT_PRINT_ITEMS) {
|
||||
await sequelize.query(
|
||||
`INSERT IGNORE INTO \`${TABLE}\`
|
||||
(business_type, platform, field_name, field_code, field_type, is_table, table_config, group_field, group_label, group_sort, sort_order, required, status, created_at, updated_at)
|
||||
VALUES (:business_type, :platform, :field_name, :field_code, :field_type, :is_table, :table_config, :group_field, :group_label, :group_sort, :sort_order, :required, :status, NOW(), NOW())`,
|
||||
{
|
||||
replacements: {
|
||||
business_type: item.business_type,
|
||||
platform: item.platform,
|
||||
field_name: item.field_name,
|
||||
field_code: item.field_code,
|
||||
field_type: item.field_type,
|
||||
is_table: item.is_table ? 1 : 0,
|
||||
table_config: item.table_config ? JSON.stringify(item.table_config) : null,
|
||||
group_field: item.group_field || null,
|
||||
group_label: item.group_label || null,
|
||||
group_sort: item.group_sort || 0,
|
||||
sort_order: item.sort_order || 0,
|
||||
required: item.required ? 1 : 0,
|
||||
status: item.status,
|
||||
},
|
||||
type: sequelize.QueryTypes.INSERT,
|
||||
}
|
||||
);
|
||||
}
|
||||
};
|
||||
|
||||
module.exports.down = async queryInterface => {
|
||||
const { sequelize } = queryInterface;
|
||||
await sequelize.query(
|
||||
`DELETE FROM \`${TABLE}\` WHERE business_type = 'RECEIPT' AND platform = 'default'`,
|
||||
);
|
||||
};
|
||||
@ -0,0 +1,28 @@
|
||||
'use strict';
|
||||
|
||||
module.exports = {
|
||||
/**
|
||||
* 为 wms_entry_order 增加 CREATED 状态:
|
||||
* ENUM 顺序: CREATING → CREATED → PENDING → CONFIRMED → PARTIAL_RECEIVED → COMPLETED → CANCELLED
|
||||
* 默认值改为 CREATED
|
||||
*/
|
||||
up: async queryInterface => {
|
||||
await queryInterface.sequelize.query(
|
||||
"ALTER TABLE wms_entry_order MODIFY COLUMN order_status ENUM('CREATING','CREATED','PENDING','CONFIRMED','PARTIAL_RECEIVED','COMPLETED','CANCELLED') NOT NULL DEFAULT 'CREATED' COMMENT '订单状态'"
|
||||
);
|
||||
},
|
||||
|
||||
/**
|
||||
* 回滚:
|
||||
* 1. 先将 CREATED 行更新为 PENDING
|
||||
* 2. 再移除 CREATED 枚举值,恢复默认值 PENDING
|
||||
*/
|
||||
down: async queryInterface => {
|
||||
await queryInterface.sequelize.query(
|
||||
"UPDATE wms_entry_order SET order_status = 'PENDING', updated_at = NOW() WHERE order_status = 'CREATED'"
|
||||
);
|
||||
await queryInterface.sequelize.query(
|
||||
"ALTER TABLE wms_entry_order MODIFY COLUMN order_status ENUM('CREATING','PENDING','CONFIRMED','PARTIAL_RECEIVED','COMPLETED','CANCELLED') NOT NULL DEFAULT 'PENDING' COMMENT '订单状态'"
|
||||
);
|
||||
},
|
||||
};
|
||||
@ -0,0 +1,31 @@
|
||||
'use strict';
|
||||
|
||||
module.exports = {
|
||||
/**
|
||||
* 从 wms_entry_order.order_status ENUM 中移除 CONFIRMED 和 PARTIAL_RECEIVED
|
||||
* 简化状态:CREATING → CREATED → PENDING → COMPLETED → CANCELLED
|
||||
*
|
||||
* 前置条件:
|
||||
* - CONFIRMED 行数为 0,无需迁移
|
||||
* - PARTIAL_RECEIVED 的 11 行改为 PENDING
|
||||
*/
|
||||
up: async queryInterface => {
|
||||
// 将 PARTIAL_RECEIVED 和 CONFIRMED 记录统一刷成 PENDING
|
||||
await queryInterface.sequelize.query(
|
||||
"UPDATE wms_entry_order SET order_status = 'PENDING', updated_at = NOW() WHERE order_status IN ('CONFIRMED', 'PARTIAL_RECEIVED')"
|
||||
);
|
||||
// 缩小 ENUM:移除 CONFIRMED / PARTIAL_RECEIVED,保留 5 个状态
|
||||
await queryInterface.sequelize.query(
|
||||
"ALTER TABLE wms_entry_order MODIFY COLUMN order_status ENUM('CREATING','CREATED','PENDING','COMPLETED','CANCELLED') NOT NULL DEFAULT 'CREATED' COMMENT '订单状态'"
|
||||
);
|
||||
},
|
||||
|
||||
/**
|
||||
* 回滚:恢复 CONFIRMED 和 PARTIAL_RECEIVED 到 ENUM 中(不回滚数据)
|
||||
*/
|
||||
down: async queryInterface => {
|
||||
await queryInterface.sequelize.query(
|
||||
"ALTER TABLE wms_entry_order MODIFY COLUMN order_status ENUM('CREATING','CREATED','PENDING','CONFIRMED','PARTIAL_RECEIVED','COMPLETED','CANCELLED') NOT NULL DEFAULT 'CREATED' COMMENT '订单状态'"
|
||||
);
|
||||
},
|
||||
};
|
||||
@ -0,0 +1,66 @@
|
||||
'use strict';
|
||||
|
||||
const TABLE_NAME = 'wms_entry_order_receiving';
|
||||
|
||||
module.exports = {
|
||||
up: async (queryInterface, Sequelize) => {
|
||||
const tables = await queryInterface.showAllTables();
|
||||
const exists = tables.some(t => (typeof t === 'string' ? t : t.tableName) === TABLE_NAME);
|
||||
if (exists) return;
|
||||
|
||||
await queryInterface.createTable(TABLE_NAME, {
|
||||
id: {
|
||||
type: Sequelize.BIGINT(20).UNSIGNED,
|
||||
primaryKey: true,
|
||||
autoIncrement: true,
|
||||
allowNull: false,
|
||||
comment: '主键ID',
|
||||
},
|
||||
entry_order_id: {
|
||||
type: Sequelize.BIGINT(20).UNSIGNED,
|
||||
allowNull: false,
|
||||
comment: '入库单ID,关联 wms_entry_order.id',
|
||||
},
|
||||
receiving_id: {
|
||||
type: Sequelize.BIGINT(20).UNSIGNED,
|
||||
allowNull: false,
|
||||
comment: '收货单ID,关联 wms_receiving.id',
|
||||
},
|
||||
created_at: {
|
||||
type: Sequelize.DATE,
|
||||
allowNull: false,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP'),
|
||||
comment: '创建时间',
|
||||
},
|
||||
updated_at: {
|
||||
type: Sequelize.DATE,
|
||||
allowNull: false,
|
||||
defaultValue: Sequelize.literal('CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP'),
|
||||
comment: '更新时间',
|
||||
},
|
||||
deleted_at: {
|
||||
type: Sequelize.DATE,
|
||||
allowNull: true,
|
||||
defaultValue: null,
|
||||
comment: '软删除时间',
|
||||
},
|
||||
});
|
||||
|
||||
await queryInterface.addIndex(TABLE_NAME, ['entry_order_id'], {
|
||||
name: 'idx_entry_order_id',
|
||||
});
|
||||
|
||||
await queryInterface.addIndex(TABLE_NAME, ['receiving_id'], {
|
||||
name: 'idx_receiving_id',
|
||||
});
|
||||
|
||||
await queryInterface.addIndex(TABLE_NAME, ['entry_order_id', 'receiving_id'], {
|
||||
unique: true,
|
||||
name: 'uk_entry_order_receiving',
|
||||
});
|
||||
},
|
||||
|
||||
down: async (queryInterface) => {
|
||||
await queryInterface.dropTable(TABLE_NAME);
|
||||
},
|
||||
};
|
||||
387
docs/combo-goods-api.md
Normal file
387
docs/combo-goods-api.md
Normal file
@ -0,0 +1,387 @@
|
||||
# 组合商品(comboGoods)模块 API 文档
|
||||
|
||||
## 模块概述
|
||||
|
||||
组合商品(comboGoods)模块提供组合商品的 CRUD 和搜索功能。组合商品是将多个系统商品(来自 `wms_stock_warehouse`)捆绑在一起的商品概念,用于订单快速选择。
|
||||
|
||||
**代码文件:**
|
||||
- 业务逻辑层:`app/service/systems/comboGoods.js`
|
||||
- 接口包装层:`app/service/systemMethods/comboGoods.js`
|
||||
|
||||
**数据表:**
|
||||
- `wms_combo_goods`:组合商品主表
|
||||
- `wms_combo_goods_item`:组合商品明细表
|
||||
|
||||
---
|
||||
|
||||
## 数据库表结构
|
||||
|
||||
### 主表:wms_combo_goods
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | number | 主键ID |
|
||||
| combo_code | string | 组合商品编码(唯一) |
|
||||
| combo_name | string | 组合商品名称 |
|
||||
| combo_sku_id | number | 组合商品SKU ID |
|
||||
| custom_code | string\|null | 自定义编码,按货主唯一(排除已删除记录) |
|
||||
| status | number | 状态:1=启用 0=停用 |
|
||||
| warehouse_id | number\|null | 仓库ID |
|
||||
| remark | string | 备注 |
|
||||
| creator_id | number | 创建人ID |
|
||||
| editor_id | number | 最后编辑人ID |
|
||||
| created_at | datetime | 创建时间 |
|
||||
| updated_at | datetime | 更新时间 |
|
||||
|
||||
### 明细表:wms_combo_goods_item
|
||||
|
||||
| 字段 | 类型 | 说明 |
|
||||
|------|------|------|
|
||||
| id | number | 主键ID |
|
||||
| combo_id | number | 关联的组合商品ID |
|
||||
| item_goods_sku_id | number | 子商品 stock_id(对应 wms_stock_warehouse.id) |
|
||||
| item_quantity | number | 子商品数量 |
|
||||
| sort_order | number | 排序号 |
|
||||
|
||||
---
|
||||
|
||||
## 约束规则
|
||||
|
||||
### 商品有效性校验
|
||||
|
||||
创建/编辑组合商品时,所有子商品必须在 `wms_stock_warehouse` 表中满足以下条件:
|
||||
- `is_valid = 'Y'`(有效状态)
|
||||
- `deleted_at IS NULL`(未删除)
|
||||
|
||||
任一子商品不满足条件,操作将被拒绝并返回具体的不合法 stock_id 列表。
|
||||
|
||||
### 货主一致性校验
|
||||
|
||||
所有子商品必须属于同一个货主(`store_id` 一致)。跨货主组合将返回错误:「所有子商品必须属于同一个货主,不允许跨货主组合」。
|
||||
|
||||
### 自定义编码(custom_code)校验
|
||||
|
||||
`custom_code` 为可选字段(VARCHAR(64)),仅做按货主唯一性校验(排除 status=0 的已删除记录)。
|
||||
- **create**:如果传入非空的 `custom_code`,会校验同货主非删除记录中唯一。
|
||||
- **update**:如果传入非空的 `custom_code`,会校验同货主非删除记录中唯一(排除自身 id)。
|
||||
- 唯一索引:`uk_store_custom_code(warehouse_id, custom_code)`。
|
||||
|
||||
---
|
||||
|
||||
## 简记格式说明
|
||||
|
||||
列表查询和搜索结果中会返回两种简记字段,供前端直接展示:
|
||||
|
||||
### simpleNotation(字符串简记)
|
||||
|
||||
格式:`stock_id|数量,stock_id2|数量`
|
||||
|
||||
示例:`1001|3,1002|5` 表示 stock_id=1001 的商品 3 件 + stock_id=1002 的商品 5 件。
|
||||
|
||||
### nameNotation(商品名称简记)
|
||||
|
||||
格式:`【数量】商品名称+【数量】商品名称`
|
||||
|
||||
示例:`【3】苹果+【5】香蕉` 表示苹果 3 件 + 香蕉 5 件。
|
||||
|
||||
商品名称从 `wms_stock_warehouse.item_name` 获取;若 stock_id 无有效商品信息,则显示为 `SKU#stock_id`。
|
||||
|
||||
---
|
||||
|
||||
## 接口列表
|
||||
|
||||
### 1. comboGoods.list — 组合商品列表查询(分页)
|
||||
|
||||
- **鉴权**:不需要(isNeedAuth=false)
|
||||
- **登录**:需要
|
||||
|
||||
#### 请求参数
|
||||
|
||||
| 字段 | 类型 | 必填 | 说明 |
|
||||
|------|------|------|------|
|
||||
| pagination | object | 否 | 分页参数 |
|
||||
| pagination.page | number | 否 | 页码,默认 1 |
|
||||
| pagination.pageSize | number | 否 | 每页大小,默认 20,最大 200 |
|
||||
| where | object | 否 | 筛选条件 |
|
||||
| where.combo_code | string | 否 | 组合商品编码,精确匹配 |
|
||||
| where.combo_name | string | 否 | 组合商品名称,模糊匹配 |
|
||||
| where.status | number | 否 | 状态筛选:1=启用 0=停用 |
|
||||
| where.warehouse_id | number | 否 | 仓库ID筛选 |
|
||||
|
||||
#### 请求示例
|
||||
|
||||
```json
|
||||
{
|
||||
"method": "comboGoods.list",
|
||||
"data": {
|
||||
"pagination": {
|
||||
"page": 1,
|
||||
"pageSize": 20
|
||||
},
|
||||
"where": {
|
||||
"combo_name": "春节礼包",
|
||||
"status": 1
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### 响应格式
|
||||
|
||||
```json
|
||||
{
|
||||
"code": 200,
|
||||
"message": "查询成功",
|
||||
"data": {
|
||||
"list": [
|
||||
{
|
||||
"id": 1,
|
||||
"combo_code": "COMBO-001",
|
||||
"combo_name": "春节礼包A",
|
||||
"combo_sku_id": 0,
|
||||
"custom_code": null,
|
||||
"status": 1,
|
||||
"warehouse_id": 1001,
|
||||
"remark": "",
|
||||
"creator_id": 10,
|
||||
"editor_id": 10,
|
||||
"created_at": "2026-06-01T10:00:00.000Z",
|
||||
"updated_at": "2026-06-01T10:00:00.000Z",
|
||||
"items": [
|
||||
{
|
||||
"id": 1,
|
||||
"combo_id": 1,
|
||||
"item_goods_sku_id": 1001,
|
||||
"item_quantity": 3,
|
||||
"sort_order": 0
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"combo_id": 1,
|
||||
"item_goods_sku_id": 1002,
|
||||
"item_quantity": 5,
|
||||
"sort_order": 1
|
||||
}
|
||||
],
|
||||
"simpleNotation": "1001|3,1002|5",
|
||||
"nameNotation": "【3】苹果+【5】香蕉"
|
||||
}
|
||||
],
|
||||
"total": 1,
|
||||
"page": 1,
|
||||
"pageSize": 20
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 2. comboGoods.create — 创建组合商品
|
||||
|
||||
- **鉴权**:需要(isNeedAuth=true)
|
||||
- **登录**:需要
|
||||
|
||||
#### 请求参数
|
||||
|
||||
| 字段 | 类型 | 必填 | 说明 |
|
||||
|------|------|------|------|
|
||||
| combo_code | string | 是 | 组合商品编码,全局唯一 |
|
||||
| combo_name | string | 是 | 组合商品名称 |
|
||||
| warehouse_id | number | 否 | 仓库ID |
|
||||
| remark | string | 否 | 备注 |
|
||||
| custom_code | string | 否 | 自定义编码,传入时校验按货主唯一(排除已删除记录) |
|
||||
| items | array | 是 | 子商品明细数组 |
|
||||
| items[].item_goods_sku_id | number | 是 | 子商品 stock_id |
|
||||
| items[].item_quantity | number | 是 | 子商品数量(正整数) |
|
||||
| items[].sort_order | number | 否 | 排序号,默认按数组索引 |
|
||||
|
||||
#### 请求示例
|
||||
|
||||
```json
|
||||
{
|
||||
"method": "comboGoods.create",
|
||||
"data": {
|
||||
"combo_code": "COMBO-001",
|
||||
"combo_name": "春节礼包A",
|
||||
"warehouse_id": 1001,
|
||||
"remark": "2026春节促销礼包",
|
||||
"items": [
|
||||
{ "item_goods_sku_id": 1001, "item_quantity": 3 },
|
||||
{ "item_goods_sku_id": 1002, "item_quantity": 5 }
|
||||
]
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### 响应格式
|
||||
|
||||
```json
|
||||
{
|
||||
"code": 200,
|
||||
"message": "创建成功",
|
||||
"data": {
|
||||
"id": 1,
|
||||
"combo_code": "COMBO-001",
|
||||
"combo_name": "春节礼包A",
|
||||
"custom_code": null
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### 常见错误
|
||||
|
||||
| 错误信息 | 说明 |
|
||||
|---------|------|
|
||||
| 组合商品编码不能为空 | combo_code 未传或为空 |
|
||||
| 组合商品名称不能为空 | combo_name 未传或为空 |
|
||||
| 子商品列表不能为空 | items 未传或为空数组 |
|
||||
| 组合商品编码 "XXX" 已存在 | combo_code 重复 |
|
||||
| 自定义编码 "XXX" 已被货主其他组合商品使用 | custom_code 在同一货主下重复(排除已删除) |
|
||||
| 以下子商品不存在或已停用:1001, 1002 | 子商品在 wms_stock_warehouse 中不存在或已停用 |
|
||||
| 所有子商品必须属于同一个货主,不允许跨货主组合 | 明细中商品的 store_id 不一致 |
|
||||
|
||||
---
|
||||
|
||||
### 3. comboGoods.update — 编辑组合商品
|
||||
|
||||
- **鉴权**:需要(isNeedAuth=true)
|
||||
- **登录**:需要
|
||||
|
||||
#### 请求参数
|
||||
|
||||
| 字段 | 类型 | 必填 | 说明 |
|
||||
|------|------|------|------|
|
||||
| id | number | 是 | 组合商品ID |
|
||||
| combo_name | string | 否 | 组合商品名称 |
|
||||
| warehouse_id | number | 否 | 仓库ID |
|
||||
| remark | string | 否 | 备注 |
|
||||
| custom_code | string | 否 | 自定义编码,传入非空值时校验按货主唯一(排除已删除记录和自身 id) |
|
||||
| status | number | 否 | 状态:1=启用 0=停用 |
|
||||
| items | array | 否 | 子商品明细数组。传入非空数组时先删旧明细再插入新明细;不传保持原明细不变 |
|
||||
| items[].item_goods_sku_id | number | 是 | 子商品 stock_id |
|
||||
| items[].item_quantity | number | 是 | 子商品数量(正整数) |
|
||||
| items[].sort_order | number | 否 | 排序号 |
|
||||
|
||||
> **注意**:部分更新语义——不传的字段保持原值不变。items 为可选,不传或传空数组则保持原明细不变。
|
||||
|
||||
#### 请求示例
|
||||
|
||||
```json
|
||||
{
|
||||
"method": "comboGoods.update",
|
||||
"data": {
|
||||
"id": 1,
|
||||
"combo_name": "春节礼包A(升级版)",
|
||||
"remark": "更新备注",
|
||||
"items": [
|
||||
{ "item_goods_sku_id": 1001, "item_quantity": 5 },
|
||||
{ "item_goods_sku_id": 1003, "item_quantity": 2 }
|
||||
]
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### 响应格式
|
||||
|
||||
```json
|
||||
{
|
||||
"code": 200,
|
||||
"message": "编辑成功",
|
||||
"data": {
|
||||
"id": 1
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 4. comboGoods.delete — 删除组合商品
|
||||
|
||||
- **鉴权**:需要(isNeedAuth=true)
|
||||
- **登录**:需要
|
||||
|
||||
#### 请求参数
|
||||
|
||||
| 字段 | 类型 | 必填 | 说明 |
|
||||
|------|------|------|------|
|
||||
| id | number | 是 | 组合商品ID |
|
||||
|
||||
> **注意**:删除操作为软删除,仅将 `status` 置为 0(停用),不会物理删除记录。
|
||||
|
||||
#### 请求示例
|
||||
|
||||
```json
|
||||
{
|
||||
"method": "comboGoods.delete",
|
||||
"data": {
|
||||
"id": 1
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### 响应格式
|
||||
|
||||
```json
|
||||
{
|
||||
"code": 200,
|
||||
"message": "删除成功",
|
||||
"data": {
|
||||
"id": 1
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 5. comboGoods.search — 关键字搜索组合商品
|
||||
|
||||
- **鉴权**:不需要(isNeedAuth=false)
|
||||
- **登录**:需要
|
||||
|
||||
#### 请求参数
|
||||
|
||||
| 字段 | 类型 | 必填 | 说明 |
|
||||
|------|------|------|------|
|
||||
| keyword | string | 是 | 搜索关键字,模糊匹配 custom_code、combo_code 和 combo_name,custom_code 匹配项优先排在前面 |
|
||||
| limit | number | 否 | 最大返回条数,默认 20,最大 100 |
|
||||
|
||||
> **注意**:仅返回启用状态(status=1)的记录。该接口用于手工建单时前端选择组合商品。
|
||||
|
||||
#### 请求示例
|
||||
|
||||
```json
|
||||
{
|
||||
"method": "comboGoods.search",
|
||||
"data": {
|
||||
"keyword": "礼包",
|
||||
"limit": 30
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### 响应格式
|
||||
|
||||
```json
|
||||
{
|
||||
"code": 200,
|
||||
"message": "搜索成功",
|
||||
"data": {
|
||||
"list": [
|
||||
{
|
||||
"id": 1,
|
||||
"combo_code": "COMBO-001",
|
||||
"combo_name": "春节礼包A",
|
||||
"custom_code": null,
|
||||
"status": 1,
|
||||
"warehouse_id": 1001,
|
||||
"items": [
|
||||
{ "id": 1, "combo_id": 1, "item_goods_sku_id": 1001, "item_quantity": 3, "sort_order": 0 }
|
||||
],
|
||||
"simpleNotation": "1001|3,1002|5",
|
||||
"nameNotation": "【3】苹果+【5】香蕉"
|
||||
}
|
||||
],
|
||||
"total": 1
|
||||
}
|
||||
}
|
||||
```
|
||||
@ -432,5 +432,56 @@ curl -X POST "http://127.0.0.1:6060/system?method=storage.receiving.bindDetailPr
|
||||
|
||||
兼容性:上述新增字段为可选字段,旧版消费者在未识别这些字段时可忽略。
|
||||
|
||||
---
|
||||
|
||||
## 14. 收货→入库完整流程
|
||||
|
||||
### 14.1 流程概览
|
||||
|
||||
收货完成后,商品库存的实际入库通过以下步骤完成:
|
||||
|
||||
1. **创建入库单** → `storage.entry` 系列方法(list/get/cancel/completeEntry)
|
||||
2. **匹配入库(写库存)** → `storage.inventory.matchPutaway`(**目前唯一的库存写入入库链路**)
|
||||
|
||||
> ⚠️ 注意:`storage.entry.completeEntry` 仅做入库单状态变更(PENDING → COMPLETED),**不涉及库存写入**。库存的实际写入统一由 `storage.inventory.matchPutaway` 完成。
|
||||
|
||||
### 14.2 完整推荐流程
|
||||
|
||||
```
|
||||
1. storage.receiving.create → 创建收货单
|
||||
2. storage.receiving.addDetail → 新增明细,拿到 selectId
|
||||
3. storage.receiving.bindDetailProduct → 绑定系统商品
|
||||
4. storage.receiving.detailChange → 补充数量、批次等
|
||||
5. storage.receiving.completeReceiving → 完成收货
|
||||
↓
|
||||
6. storage.entry 入库单管理 → 入库单与收货单通过 wms_entry_order_receiving 主表级关联
|
||||
7. storage.inventory.matchPutaway → 收货单与入库单匹配,完成库存写入
|
||||
8. storage.entry.completeEntry → 入库单状态标记为 COMPLETED(仅状态变更)
|
||||
```
|
||||
|
||||
### 14.3 已弃用的方法
|
||||
|
||||
以下方法已从代码中移除,**不再可用**:
|
||||
|
||||
| 已弃用方法 | 弃用原因 | 替代方案 |
|
||||
|---|---|---|
|
||||
| `storage.entry.bindReceivingDetails` | 入库单明细与收货明细逐行绑定(基于 `wms_entry_receiving_binding` 表),关系已改为 `wms_entry_order_receiving` 主表级关联 | 不再需要,入库单与收货单直接通过主表关联 |
|
||||
| `storage.entry.unbindReceivingDetails` | 同上,逐行解绑已无必要 | 不再需要 |
|
||||
| `storage.inventory.quickPutaway` | 单一收货单快捷入库,功能受限 | `storage.inventory.matchPutaway`(支持多收货单+多入库单批量匹配入库) |
|
||||
|
||||
### 14.4 核心方法职责
|
||||
|
||||
| 方法 | 职责 | 备注 |
|
||||
|---|---|---|
|
||||
| `storage.inventory.matchPutaway` | **唯一库存写入入库链路**:接收多个收货单和多个入库单,按商品进行数量匹配,完成库存的实际写入 | 入库后根据来源(QM/API)自动触发回传 |
|
||||
| `storage.entry.completeEntry` | **仅状态变更**:入库单 PENDING → COMPLETED | 不涉及任何库存写入 |
|
||||
| `storage.entry.list` | 入库单列表查询 | 支持 CREATING/CREATED/PENDING/COMPLETED/CANCELLED 状态筛选 |
|
||||
| `storage.entry.get` | 入库单详情查询 | 含 items 及其 bindings |
|
||||
| `storage.entry.cancel` | 作废入库单(CREATED/PENDING 可作废) | COMPLETED 不可作废 |
|
||||
|
||||
### 14.5 关键数据库表关系
|
||||
|
||||
- `wms_entry_order_receiving`:入库单与收货单的**主表级关联**(当前方案)
|
||||
- `wms_entry_receiving_binding`:**已弃用**,不再写入新数据(旧方案:明细级绑定)
|
||||
- 收货单与入库单不再需要逐明细绑定,通过主表关联即可完成匹配入库
|
||||
|
||||
|
||||
28
memories/repo/entry-receiving-match-callback.md
Normal file
28
memories/repo/entry-receiving-match-callback.md
Normal file
@ -0,0 +1,28 @@
|
||||
# 入库单完成 → 异步匹配收货单并回传
|
||||
|
||||
## 实现日期
|
||||
2026-06-18
|
||||
|
||||
## 涉及文件
|
||||
|
||||
### 新建
|
||||
- `app/service/systems/receiving_entry_match.js` — 核心匹配与回传服务
|
||||
|
||||
### 修改
|
||||
- `app/service/systems/entry_order.js` — `entryorderConfirm()` 事务提交后触发异步匹配
|
||||
- `app/service/systems/storage/entry.js` — `completeEntry()` 状态更新后触发异步匹配
|
||||
- `app/service/systems/storage/receiving.js` — `completeReceiving()` 事务提交后清除收货单缓存
|
||||
|
||||
## 核心流程
|
||||
1. 入库单完成(COMPLETED)→ `setImmediate` 异步触发 `matchAfterEntryCompleted`
|
||||
2. 从 Redis 缓存读取仓库近 3 天收货单列表(key: `cache:receiving_orders:warehouse:{warehouseId}`,TTL: 300s)
|
||||
3. 根据入库单 `remark` 字符串包含匹配收货单号
|
||||
4. 对比明细 SKU + 数量 → full_match / receiving_covers_entry / 其他
|
||||
5. full_match / receiving_covers_entry → 按来源回传(QM 奇门 / API OpenAPI)
|
||||
6. receiving_covers_entry → 标记收货单为"部分入库"(storage_status=partial)
|
||||
7. 收货单完成时主动清除对应仓库缓存
|
||||
|
||||
## 注意事项
|
||||
- 异步执行,不阻塞主流程
|
||||
- 所有错误仅记录日志,不影响业务
|
||||
- 缓存回退:Redis 不可用时直接查询数据库
|
||||
20
methods/changes/openapi-2026-06-17-entryorder.json
Normal file
20
methods/changes/openapi-2026-06-17-entryorder.json
Normal file
@ -0,0 +1,20 @@
|
||||
[
|
||||
{
|
||||
"version": "2026.06.17-openapi-16",
|
||||
"date": "2026-06-17",
|
||||
"summary": "新增入库单模块(entryorder),支持 create(创建入库单)和 query(查询入库单)两个方法",
|
||||
"methods": [
|
||||
"entryorder.create",
|
||||
"entryorder.query"
|
||||
],
|
||||
"notes": [
|
||||
"新增 entryorder.create:创建入库单接口,支持入库单主信息(entryOrder)和商品明细(orderLines.orderLine)的完整入参;创建渠道固定为 API;itemCode 与 itemId 二选一,优先使用 itemId",
|
||||
"新增 entryorder.query:查询入库单接口,根据 entryOrderCode 查询入库单详情,返回基本信息及商品明细(itemId/itemCode/itemName/planQty/actualQty/inventoryType/orderLineNo)",
|
||||
"查询范围为当前 app_key 绑定的仓库,跨仓库入库单无法查询",
|
||||
"所有方法均支持 timestamp 时间戳时效校验:与服务器时间差不得超过 ±10 分钟(600 秒),否则返回 400",
|
||||
"openapi 通道新增入库单创建和查询能力"
|
||||
],
|
||||
"type": "added",
|
||||
"module": "entryorder"
|
||||
}
|
||||
]
|
||||
@ -267,5 +267,48 @@
|
||||
"mobile 和 tel 二选一必填"
|
||||
],
|
||||
"type": "modified"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.17-openapi-16",
|
||||
"date": "2026-06-17",
|
||||
"summary": "新增入库单模块(entryorder),支持 create(创建入库单)和 query(查询入库单)两个方法",
|
||||
"methods": [
|
||||
"entryorder.create",
|
||||
"entryorder.query"
|
||||
],
|
||||
"notes": [
|
||||
"新增 entryorder.create:创建入库单接口,支持入库单主信息(entryOrder)和商品明细(orderLines.orderLine)的完整入参;创建渠道固定为 API",
|
||||
"新增 entryorder.query:查询入库单接口,根据 entryOrderCode 查询入库单详情,返回基本信息及商品明细",
|
||||
"itemCode 与 itemId 二选一,优先使用 itemId",
|
||||
"openapi 通道新增入库单创建和查询能力"
|
||||
],
|
||||
"type": "added"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.23-openapi-01",
|
||||
"date": "2026-06-23",
|
||||
"summary": "入库单新增 CREATED 状态:entryorder.create 返回 status 说明更新为 CREATING=创建中/CREATED=已创建;entryorder.query 返回 status 可能值补充 CREATED",
|
||||
"methods": [
|
||||
"entryorder.create",
|
||||
"entryorder.query"
|
||||
],
|
||||
"notes": [
|
||||
"entryorder.create response data.status 说明从通用描述更新为 CREATING=创建中明细行未全部插入 / CREATED=已创建完成",
|
||||
"entryorder.query description 补充返回的 status 可能为 CREATING/CREATED/PENDING/CONFIRMED/PARTIAL_RECEIVED/COMPLETED/CANCELLED"
|
||||
],
|
||||
"type": "updated",
|
||||
"module": "entryorder"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.23-openapi-02",
|
||||
"date": "2026-06-23",
|
||||
"summary": "入库单状态从 7 个简化为 5 个:移除 CONFIRMED 和 PARTIAL_RECEIVED,entryorder.query 的 status 枚举同步更新为 CREATING/CREATED/PENDING/COMPLETED/CANCELLED",
|
||||
"methods": [
|
||||
"entryorder.query"
|
||||
],
|
||||
"notes": [
|
||||
"entryorder.query description 中 status 枚举从 CREATING/CREATED/PENDING/CONFIRMED/PARTIAL_RECEIVED/COMPLETED/CANCELLED 简化为 CREATING/CREATED/PENDING/COMPLETED/CANCELLED,与 wms_entry_order.order_status ENUM 当前定义一致"
|
||||
],
|
||||
"type": "updated"
|
||||
}
|
||||
]
|
||||
|
||||
@ -1,4 +1,19 @@
|
||||
[
|
||||
{
|
||||
"version": "2026.06.18-system-01",
|
||||
"date": "2026-06-18",
|
||||
"summary": "order.pendingOrder.downloadCreateTemplate:模板列顺序调整,店铺名称(shop_nick)从末尾移至第2列B列,紧接*订单号之后",
|
||||
"methods": [
|
||||
"order.pendingOrder.downloadCreateTemplate"
|
||||
],
|
||||
"notes": [
|
||||
"调整 Excel 导入模板列顺序:店铺名称(shop_nick)从原第25列(Y列/末尾)移动至第2列(B列),紧跟在*订单号(delivery_order_code)之后。",
|
||||
"同步更新 description 中的列顺序描述,明确 25 列(A-Y)的完整排列。",
|
||||
"响应结构中移除冗余的 shop_nick 字段(模板列不属于 API 响应字段)。"
|
||||
],
|
||||
"type": "updated",
|
||||
"module": "order.pendingOrder"
|
||||
},
|
||||
{
|
||||
"version": "2026.05.17-system-09",
|
||||
"date": "2026-05-17",
|
||||
@ -3416,5 +3431,656 @@
|
||||
],
|
||||
"type": "updated",
|
||||
"module": "order.wave"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.17-system-01",
|
||||
"date": "2026-06-17",
|
||||
"summary": "新增 order.pendingOrder.replenishmentDemand 分拣缺货补货需求计算接口文档",
|
||||
"methods": [
|
||||
"order.pendingOrder.replenishmentDemand"
|
||||
],
|
||||
"notes": [
|
||||
"新增分拣缺货补货需求计算方法,用于计算待处理订单的SKU在分拣区与存货区的库存分布及补货缺口",
|
||||
"入参 order_ids/warehouse_id 均为可选;不传 order_ids 时自动查询当前仓库所有未完成储位分配的订单",
|
||||
"纯只读查询接口,不修改任何数据",
|
||||
"响应包含 list(明细)与 summary(汇总),其中 shortage = max(0, total_demand - pick_zone_quantity),replenishment_needed = min(shortage, storage_zone_quantity)"
|
||||
],
|
||||
"type": "add",
|
||||
"module": "order.pendingOrder"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.17-system-02",
|
||||
"date": "2026-06-17",
|
||||
"type": "update",
|
||||
"module": "order.pendingOrder",
|
||||
"method": "order.pendingOrder.replenishmentDemand",
|
||||
"description": "移除 order_ids 参数,改为纯仓库级别计算,自动查询当前仓库所有未完成储位分配的订单"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.17-system-03",
|
||||
"date": "2026-06-17",
|
||||
"type": "update",
|
||||
"module": "order.pendingOrder",
|
||||
"method": "order.pendingOrder.replenishmentDemand",
|
||||
"description": "新增 is_true_shortage 字段标识真正缺货(两区均无库存),summary 新增 total_true_shortage_skus 统计"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.17-system-04",
|
||||
"date": "2026-06-17",
|
||||
"type": "migrate",
|
||||
"module": "storage.management",
|
||||
"summary": "从 order.pendingOrder.replenishmentDemand 迁移至 storage.management.replenishmentDemand(库存管理模块),原路径已删除,开发阶段无需兼容",
|
||||
"methods": [
|
||||
"storage.management.replenishmentDemand"
|
||||
],
|
||||
"notes": [
|
||||
"将 replenishmentDemand 接口从 order.pendingOrder 模块迁移到新建的 storage.management 库存管理模块。",
|
||||
"旧条目 order.pendingOrder.replenishmentDemand 已从 order.pendingOrder 组中移除。",
|
||||
"开发阶段无需兼容旧路径。"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "2026.06.17-system-05",
|
||||
"date": "2026-06-17",
|
||||
"type": "update",
|
||||
"module": "storage.management",
|
||||
"summary": "storage.management.replenishmentDemand 移除 warehouse_id 入参,仓库ID改为纯从用户上下文(ctx.user)获取,接口无需入参",
|
||||
"methods": [
|
||||
"storage.management.replenishmentDemand"
|
||||
],
|
||||
"notes": [
|
||||
"移除 warehouse_id 入参,仓库ID改为纯从用户上下文(ctx.user)获取,接口无需入参"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "2026.06.17-system-06",
|
||||
"date": "2026-06-17",
|
||||
"type": "update",
|
||||
"module": "storage.management",
|
||||
"method": "storage.management.replenishmentDemand",
|
||||
"description": "新增分页入参(pagination)、排序入参(sort,默认按 shortage DESC)、响应新增 replenishment_locations(存货区可补货库位,最多5条)、响应新增 pagination 分页信息"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.17-system-07",
|
||||
"date": "2026-06-17",
|
||||
"type": "update",
|
||||
"module": "storage.management",
|
||||
"summary": "replenishment_locations 新增 space_name 字段,优先取自定义名称(custom_name),无则回退库位编码(space_code)",
|
||||
"methods": [
|
||||
"storage.management.replenishmentDemand"
|
||||
],
|
||||
"notes": [
|
||||
"在 replenishment_locations.children 中新增 space_name 字段(string, required),放在 space_code 之后、available_quantity 之前。",
|
||||
"space_name 取值逻辑:优先使用库位自定义名称 custom_name,若无自定义名称则回退为库位编码 space_code。"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "2026.06.17-system-08",
|
||||
"date": "2026-06-17",
|
||||
"type": "update",
|
||||
"module": "storage.management",
|
||||
"summary": "合并 is_sufficient 和 is_true_shortage 为 replenishment_status 枚举字段(replenishable/true_shortage)",
|
||||
"methods": [
|
||||
"storage.management.replenishmentDemand"
|
||||
],
|
||||
"notes": [
|
||||
"删除 is_sufficient(boolean)和 is_true_shortage(boolean)两个字段。",
|
||||
"新增 replenishment_status(string)枚举字段:replenishable=存货区足够覆盖缺口,移库可解决;true_shortage=存货区不足以覆盖缺口或两区均无库存,需采购。"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "2026.06.18-system-01",
|
||||
"date": "2026-06-18",
|
||||
"summary": "入库单完成后异步匹配收货单并回传:completeEntry / entryorderConfirm 入库完成时自动匹配收货单,明细一致则按来源回传(奇门/OpenAPI),覆盖场景标记收货单部分入库;completeReceiving 完成后清除收货单缓存",
|
||||
"methods": [
|
||||
"storage.entry.completeEntry",
|
||||
"storage.receiving.completeReceiving"
|
||||
],
|
||||
"notes": [
|
||||
"新增 app/service/systems/receiving_entry_match.js:入库单完成后异步匹配收货单并回传的核心服务,含 Redis 缓存收货单列表(TTL 300s)、remark 匹配收货单号、明细对比、奇门回传、OpenAPI 回调、部分入库标记等能力。",
|
||||
"storage.entry.completeEntry 完成后通过 setImmediate 异步触发 matchAfterEntryCompleted,不阻塞主流程。",
|
||||
"entry_order.js entryorderConfirm() 事务提交后(isFin 最终完成)同样异步触发匹配。",
|
||||
"storage.receiving.completeReceiving 完成后清除收货单 Redis 缓存(cache:receiving_orders:warehouse:{warehouseId}),确保下次匹配获取最新收货单列表。",
|
||||
"匹配规则:入库单 remark 包含收货单号 → 对比 SKU+数量 → 完全一致回传 / 收货单覆盖标记部分入库 / 其他不处理。",
|
||||
"回传路径:source_type=QM → 奇门 taobao.qimen.entryorder.confirm;source_type=API → OpenAPI 回调(entry_order_receiving_matched 事件)。"
|
||||
],
|
||||
"type": "updated"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.18-system-02",
|
||||
"date": "2026-06-18",
|
||||
"summary": "新增 storage.receiving.manualMatchEntryOrder 接口",
|
||||
"methods": [
|
||||
"storage.receiving.manualMatchEntryOrder"
|
||||
],
|
||||
"notes": [
|
||||
"新增 storage.receiving.manualMatchEntryOrder:手动匹配入库单与收货单,传入 receivingId 和 entryOrderId,复用异步匹配服务的明细对比和回传逻辑,同步返回匹配结果",
|
||||
"参数:receivingId (number, 必填)、entryOrderId (number, 必填)",
|
||||
"校验:入库单存在性、收货单存在性、同仓库校验",
|
||||
"返回 matchType (full_match/receiving_covers_entry/entry_exceeds_receiving/no_match)、comparisonResult、callbackSent、callbackResult、partialStorageMarked、entryOrder、receivingOrder"
|
||||
],
|
||||
"type": "added",
|
||||
"module": "storage"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.18-system-03",
|
||||
"date": "2026-06-18",
|
||||
"summary": "新增 storage.receiving.getAvailableInboundQuantity 接口:按 stock_id 查询已审核收货单的可入库数量(actual_quantity - stored_quantity),排除未审核和已取消的收货单",
|
||||
"methods": [
|
||||
"storage.receiving.getAvailableInboundQuantity"
|
||||
],
|
||||
"notes": [
|
||||
"新增 system method:storage.receiving.getAvailableInboundQuantity,按 stock_id 查询已审核收货单中各明细的可入库数量(actual_quantity - stored_quantity),仅返回尚有可入库余量的明细。",
|
||||
"实现文件:app/service/systemMethods/storage/receiving.js(包装层)、app/service/systems/storage/receiving.js(业务层)。",
|
||||
"接口无需鉴权(isNeedAuth=false),但需要登录(isNeedLogin=true)。",
|
||||
"入参 stock_id 为必填,对应 stock_warehouse.id;服务端从 ctx.user.store_id 获取仓库上下文。"
|
||||
],
|
||||
"type": "added",
|
||||
"module": "storage"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.18-system-04",
|
||||
"date": "2026-06-18",
|
||||
"summary": "新增 storage.entry.bindReceivingDetails 接口和 wms_entry_receiving_binding 中间表:入库单明细可显式绑定收货明细(pending状态),提交入库时事务内完成双向扣减(stored_quantity/received_quantity),通过唯一约束和行锁防止超分和重复绑定。同时重构 completeEntry 调用链为 commitEntryWithBindings,无绑定时向后兼容。",
|
||||
"methods": [
|
||||
"storage.entry.bindReceivingDetails",
|
||||
"storage.entry.completeEntry"
|
||||
],
|
||||
"notes": [
|
||||
"新增 storage.entry.bindReceivingDetails 方法:入库单明细绑定收货明细,pending 状态软绑定,每次调用清除旧 pending 绑定后创建新绑定。",
|
||||
"新增 wms_entry_receiving_binding 中间表(migration: 20260618150000-create-wms-entry-receiving-binding.js),用于记录入库明细与收货明细的绑定关系。",
|
||||
"重构 completeEntry 调用链:systemMethods 层 completeEntry 改为调用 commitEntryWithBindings,有绑定则事务内完成双向扣减(stored_quantity/received_quantity),无绑定时向后兼容仅变更入库单状态。",
|
||||
"通过数据库唯一约束和行锁(SELECT ... FOR UPDATE)防止超分和重复绑定。",
|
||||
"涉及文件: app/model/entry_receiving_binding.js, app/service/systems/storage/entry.js, app/service/systemMethods/storage/entry.js, database/migrations/20260618150000-create-wms-entry-receiving-binding.js"
|
||||
],
|
||||
"type": "added",
|
||||
"module": "storage.entry"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.18-system-05",
|
||||
"date": "2026-06-18",
|
||||
"summary": "storage.entry.get 响应追加 pending_total/total_planned/bindings 字段,storage.receiving.getAvailableInboundQuantity 响应追加 pending_allocated_quantity 字段:前端可通过 get 查看入库明细的绑定状态,getAvailableInboundQuantity 的可用量已扣除全局 pending 绑定总量",
|
||||
"methods": [
|
||||
"storage.entry.get",
|
||||
"storage.receiving.getAvailableInboundQuantity"
|
||||
],
|
||||
"notes": [
|
||||
"storage.entry.get:items 数组每项新增 pending_total(该入库明细当前 pending 绑定的总预分配数量)、total_planned(计划入库数量=count)、bindings(pending 绑定列表,每项含 id/entry_item_id/receiving_detail_id/allocated_quantity/status/receivingDetail 子对象)",
|
||||
"storage.receiving.getAvailableInboundQuantity:list 每项新增 pending_allocated_quantity(该收货明细在当前 stock_id 所有入库单中的 pending 绑定总量),available_quantity 计算已扣除该值"
|
||||
],
|
||||
"type": "updated"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.18-system-06",
|
||||
"date": "2026-06-18",
|
||||
"summary": "bindReceivingDetails 重构为\"绑定即实收\"(received_quantity 在绑定时更新,不再等到 completeEntry),新增 unbindReceivingDetails 解绑接口(删除 pending 绑定并回退 received_quantity),commitEntryWithBindings 移除 received_quantity 更新逻辑",
|
||||
"methods": [
|
||||
"storage.entry.bindReceivingDetails",
|
||||
"storage.entry.unbindReceivingDetails",
|
||||
"storage.entry.completeEntry"
|
||||
],
|
||||
"notes": [
|
||||
"storage.entry.bindReceivingDetails:改为绑定即实收,绑定成功后立即更新入库明细 received_quantity;重复调用时先回退旧绑定量再创建新绑定,避免重复累加。",
|
||||
"storage.entry.unbindReceivingDetails:新增解绑接口,删除该入库明细的所有 pending 绑定记录,并将 received_quantity 回退到绑定前的值;收货明细可用数量随绑定记录删除自动恢复。",
|
||||
"storage.entry.completeEntry:commitEntryWithBindings 中移除 received_quantity 更新逻辑(received_quantity 已在绑定时更新,completeEntry 仅完成收货单侧入库数量扣减和库存上架)。"
|
||||
],
|
||||
"type": "updated"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.19-system-01",
|
||||
"date": "2026-06-19",
|
||||
"summary": "order.recheckOrder.scanOrder 响应 list[] 新增 items_weight(订单商品总重量kg)和 suggested_package_material(推荐包材)字段",
|
||||
"methods": [
|
||||
"order.recheckOrder.scanOrder"
|
||||
],
|
||||
"notes": [
|
||||
"响应 list 每项新增 items_weight (number|null):订单商品总重量(kg),来源于 wms_order_delivery.items_weight。散单模式每个订单对象包含,团购模式每个波次对象包含(取波次内首个正常订单的重量,为 null 时返回 0)。",
|
||||
"响应 list 每项新增 suggested_package_material (object|null):推荐包材信息,根据订单商品结构(items_hash + items_crc)匹配 wms_package_material_item_relation 历史绑定记录,按 bind_count 降序取最优匹配。若 items_hash 为空或无匹配记录则为 null。包含子字段:id、code、name、spec、type、weight、length、width、height、bind_count。",
|
||||
"同步更新 method description 和 list 字段 description,补充新增字段的说明。"
|
||||
],
|
||||
"type": "updated",
|
||||
"module": "order.recheckOrder"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.21-system-01",
|
||||
"date": "2026-06-21",
|
||||
"summary": "order.bindExpressPackageMaterialByWaybill:入参 package_material_code 改为 package_material_id,类型由 string 改为 number|string",
|
||||
"methods": [
|
||||
"order.bindExpressPackageMaterialByWaybill"
|
||||
],
|
||||
"notes": [
|
||||
"入参字段名从 package_material_code 改为 package_material_id。",
|
||||
"入参类型从 string 改为 number|string,与代码 normalizePackageMaterialId 的实现一致。",
|
||||
"同步更新该方法 description 中'包材编码'为'包材ID'。"
|
||||
],
|
||||
"type": "updated",
|
||||
"module": "order"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.21-system-comboGoods-01",
|
||||
"date": "2026-06-21",
|
||||
"summary": "新增 comboGoods 组合商品模块 5 个接口文档:list/create/update/delete/search",
|
||||
"methods": [
|
||||
"comboGoods.list",
|
||||
"comboGoods.create",
|
||||
"comboGoods.update",
|
||||
"comboGoods.delete",
|
||||
"comboGoods.search"
|
||||
],
|
||||
"notes": [
|
||||
"comboGoods.list:组合商品列表查询(分页),支持按 combo_code/combo_name/status/warehouse_id 筛选,返回含 simpleNotation 和 nameNotation 简记字段",
|
||||
"comboGoods.create:创建组合商品(含明细一次性提交),校验 combo_code 唯一性、子商品有效性和货主一致性,事务保证原子写入",
|
||||
"comboGoods.update:编辑组合商品(含明细替换),支持部分字段更新,传入 items 则先删旧明细再插入新明细",
|
||||
"comboGoods.delete:软删除组合商品(status 置为 0)",
|
||||
"comboGoods.search:关键字搜索组合商品,模糊匹配 combo_code 或 combo_name,仅返回启用状态记录,上限100条",
|
||||
"数据表:wms_combo_goods(主表)+ wms_combo_goods_item(明细表);子商品校验依赖 wms_stock_warehouse 表",
|
||||
"代码文件:app/service/systems/comboGoods.js(业务逻辑层)+ app/service/systemMethods/comboGoods.js(接口包装层)",
|
||||
"isNeedAuth:list/search 无需鉴权,create/update/delete 需要鉴权"
|
||||
],
|
||||
"type": "added",
|
||||
"module": "comboGoods"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.21-system-comboGoods-02",
|
||||
"date": "2026-06-21",
|
||||
"summary": "comboGoods 模块新增 custom_code(自定义编码)功能:create/update 支持传入 custom_code 并校验按货主唯一,list/search 返回新增 custom_code 字段,search 搜索范围扩展至 custom_code 且优先排列匹配项",
|
||||
"methods": [
|
||||
"comboGoods.list",
|
||||
"comboGoods.create",
|
||||
"comboGoods.update",
|
||||
"comboGoods.search"
|
||||
],
|
||||
"notes": [
|
||||
"新增字段 custom_code(VARCHAR(64) NULL),仅做按货主唯一性校验(排除已删除记录),非全局唯一。",
|
||||
"wms_combo_goods 表新增索引 uk_store_custom_code(warehouse_id, custom_code)。",
|
||||
"comboGoods.create:新增可选入参 custom_code,如果非空则校验同货主非删除记录中 unique;返回新增 custom_code 字段。",
|
||||
"comboGoods.update:新增可选入参 custom_code,如果非空则校验同货主非删除记录中 unique(排除自身 id)。",
|
||||
"comboGoods.list:返回每条记录新增 custom_code 字段。",
|
||||
"comboGoods.search:搜索条件扩大为 custom_code LIKE / combo_code LIKE / combo_name LIKE,custom_code 匹配项按 ORDER BY CASE 排在前面;返回新增 custom_code 字段。"
|
||||
],
|
||||
"type": "updated"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.21-system-comboGoods-03",
|
||||
"date": "2026-06-21",
|
||||
"summary": "stock.warehouse.search 新增 mode=\"combo\" 组合商品查询模式,新增 id/custom_code 参数,补充组合商品响应结构",
|
||||
"methods": [
|
||||
"stock.warehouse.search"
|
||||
],
|
||||
"notes": [
|
||||
"新增入参 mode(查询模式,传 \"combo\" 时搜索组合商品),id(mode=combo 时按组合商品ID精确查询),custom_code(mode=combo 时按自定义编码模糊查询)",
|
||||
"原有 keyword 参数在 mode=combo 时模糊匹配 combo_code / combo_name / custom_code",
|
||||
"mode=combo 响应结构新增 combo_code、combo_name、custom_code、items(子商品数组含 item_goods_sku_id/item_quantity)、simpleNotation(stock_id|数量格式)、nameNotation(【数量】商品名称格式)",
|
||||
"mode=combo 时不返回 stock 模式特有的字段(item_code/goods_code/item_name/sku_property/stock_unit/quantity/locked_quantity/brand_name/item_type/barcodes/store_stock/效期字段/storage)",
|
||||
"with_stock 和 is_batch 参数在 mode=combo 时不生效"
|
||||
],
|
||||
"type": "updated"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.22-system-wavePickTaskList-01",
|
||||
"date": "2026-06-22",
|
||||
"summary": "order.wave.wavePickTaskList 响应新增 wave_list 数组:每个拣货任务返回关联波次列表",
|
||||
"methods": [
|
||||
"order.wave.wavePickTaskList"
|
||||
],
|
||||
"notes": [
|
||||
"wavePickTaskList 响应 list 每项新增 wave_list 数组字段,通过批量查询 wms_wave_pick_task_wave 表获取关联波次详情。",
|
||||
"wave_list 每项包含:wave_id(波次ID)、wave_no(波次号)、box_no(框号)、status(波次关联状态)、bind_time(绑定时间)、pick_time(拣货完成时间)。",
|
||||
"无需额外入参,默认对所有拣货任务返回 wave_list;查询为空时返回空数组 []。",
|
||||
"同步更新 methods/system.json 响应文档。"
|
||||
],
|
||||
"type": "updated",
|
||||
"module": "order.wave"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.22-system-order-export-mode-01",
|
||||
"date": "2026-06-22",
|
||||
"summary": "order.export 新增 export_mode 参数:支持 waybill(默认,按运单展开)与 item(按商品明细展开)两种导出模式",
|
||||
"methods": [
|
||||
"order.export"
|
||||
],
|
||||
"notes": [
|
||||
"新增入参 export_mode/exportMode,枚举值:waybill(默认)— 按运单号展开,每运单一组,items_detail 列汇总商品;item — 按商品明细展开,每商品一行,运单信息汇总填充。",
|
||||
"方法层(OrderIndexService.export)新增 export_mode/exportMode 解构并透传到 systems.orderExport.exportOrders。",
|
||||
"同步更新 methods/system.json 文档:description 补充 export_mode 说明,params 新增 export_mode/exportMode 条目。",
|
||||
"order.export 导出的列新增:业务类型、运单接口、包材ID、包材编码、包材名称。"
|
||||
],
|
||||
"type": "updated",
|
||||
"module": "order.index"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.22-system-directInbound-01",
|
||||
"date": "2026-06-22",
|
||||
"summary": "新增 storage.directInbound 导入/PDA直接入库模块:getItems(获取入库信息)、addItem(增量添加商品)、commit(提交完成入库并回传)",
|
||||
"methods": [
|
||||
"storage.directInbound.getItems",
|
||||
"storage.directInbound.addItem",
|
||||
"storage.directInbound.commit"
|
||||
],
|
||||
"notes": [
|
||||
"新增 storage.directInbound 模块,用于非收货单途径的导入/PDA 直接入库场景。",
|
||||
"storage.directInbound.getItems:根据入库单号获取入库明细及已有的导入/PDA 入库记录,返回每项的可入库余量。",
|
||||
"storage.directInbound.addItem:按 stock_id 增量添加导入/PDA 入库记录,累加超过该 stock_id 在入库单中的计划总量时拒绝。支持 import(导入)和 pda(PDA)两种方式。",
|
||||
"storage.directInbound.commit:提交确认完成入库,按实收数量写入 wms_storage 库存和 wms_storage_transaction 流水,同 stock_id 多条明细只写一次库存,更新入库单状态为 COMPLETED 并同步 sync_status=SUCCESS,异步触发奇门/API 回传(按实收数量回传)。不足量提交时未入库商品跳过。",
|
||||
"新增数据表 wms_inbound_direct_log(migration: 20260622100000-create-wms-inbound-direct-log.js):记录非收货单途径入库操作,含 warehouse_id、stock_id、quantity、inbound_type(import/pda)、entry_order_id、operator 等字段。模型文件:app/model/inbound_direct_log.js。",
|
||||
"新增操作日志:addItem 记录 DIRECT_INBOUND_ADD(异步),commit 记录 DIRECT_INBOUND_COMMIT(事务内)。commit 响应返回 order_status=COMPLETED 和 sync_status=SUCCESS。",
|
||||
"涉及文件:app/service/systems/inbound_direct_log.js(业务层)、app/service/systemMethods/storage/direct_inbound.js(包装层)、app/model/inbound_direct_log.js、database/migrations/20260622100000-create-wms-inbound-direct-log.js、methods/system.json(新增导入/PDA入库模块)。",
|
||||
"E2E 测试:test/e2e_direct_inbound.test.js(53项断言全覆盖)。"
|
||||
],
|
||||
"type": "added",
|
||||
"module": "storage.directInbound"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.22-system-directInbound-02",
|
||||
"date": "2026-06-22",
|
||||
"summary": "storage.directInbound.addItem 新增批量模式(items 数组),getItems 响应 summary 新增 total_import/total_pda 分类型汇总",
|
||||
"methods": [
|
||||
"storage.directInbound.addItem",
|
||||
"storage.directInbound.getItems"
|
||||
],
|
||||
"notes": [
|
||||
"addItem 新增批量模式:支持传入 items 数组一次添加多条商品,每项含 stock_id/quantity/inbound_type/remark。单条模式(stock_id/quantity/inbound_type 顶层字段)保持向后兼容。批量模式下所有商品共享同一个入库单状态校验,任一商品校验失败整批拒绝。",
|
||||
"addItem 批量模式响应结构:{ count, total_quantity, items: [...] },items 每项含 id/stock_id/quantity/inbound_type/plan_quantity/existing_before/existing_after/remaining。",
|
||||
"getItems 响应 summary 新增 total_import(导入入库总数)和 total_pda(PDA入库总数)字段。",
|
||||
"同步更新 methods/system.json 文档。"
|
||||
],
|
||||
"type": "updated",
|
||||
"module": "storage.directInbound"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.22-system-directInbound-03",
|
||||
"date": "2026-06-22",
|
||||
"summary": "storage.directInbound 新增 space_id 库位支持:addItem 支持传入 space_id(单条和批量),commit 从入库记录取 space_id 写入 wms_storage 替代硬编码 1",
|
||||
"methods": [
|
||||
"storage.directInbound.addItem",
|
||||
"storage.directInbound.commit",
|
||||
"storage.directInbound.getItems"
|
||||
],
|
||||
"notes": [
|
||||
"addItem 新增可选入参 space_id(单条模式顶层字段 / 批量模式 items[].space_id),指定存放库位ID,关联 wms_location_space.id。",
|
||||
"wms_inbound_direct_log 表新增 space_id 字段(migration: 20260622110000-add-space-id-to-wms-inbound-direct-log.js)。",
|
||||
"commit 从入库记录中取第一个非空 space_id 写入 wms_storage,无记录时兜底使用库位 1。",
|
||||
"getItems 响应中 direct_logs 每条记录包含 space_id 字段。",
|
||||
"同步更新 methods/system.json 文档及模型文件。"
|
||||
],
|
||||
"type": "updated",
|
||||
"module": "storage.directInbound"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.23-system-01",
|
||||
"date": "2026-06-23",
|
||||
"summary": "入库单(wms_entry_order)新增 CREATED 状态:order_status ENUM 从 CREATING/PENDING/CONFIRMED/PARTIAL_RECEIVED/COMPLETED/CANCELLED 扩展为 CREATING/CREATED/PENDING/CONFIRMED/PARTIAL_RECEIVED/COMPLETED/CANCELLED;默认值从 PENDING 变更为 CREATED;validTransitions 增加 CREATED 节点(CREATED→PENDING/CANCELLED,CREATING→CREATED/CANCELLED)",
|
||||
"methods": [
|
||||
"storage.entry.list",
|
||||
"storage.entry.get",
|
||||
"storage.entry.cancel",
|
||||
"storage.entry.completeEntry",
|
||||
"storage.entry.bindReceivingDetails"
|
||||
],
|
||||
"notes": [
|
||||
"Model 层:app/model/entry_order.js order_status ENUM 新增 CREATED,默认值从 PENDING 变更为 CREATED",
|
||||
"Service 层:app/service/systems/entry_order.js addOrder 创建后状态从 CREATING→CREATED,validTransitions 增加 CREATED 节点",
|
||||
"Service 层:app/service/systems/storage/entry.js createEntry 默认状态 PENDING→CREATED",
|
||||
"Service 层:app/service/systems/storage/inventory.js 快捷入库默认 CREATED",
|
||||
"文档同步:storage.entry.list where.order_status 枚举补充 CREATED;storage.entry.get description 补充 order_status 枚举含 CREATED;storage.entry.cancel 补充 CREATED 可作废说明;storage.entry.completeEntry/bindReceivingDetails 补充可操作状态含 CREATED"
|
||||
],
|
||||
"type": "updated",
|
||||
"module": "storage.entry"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.23-system-02",
|
||||
"date": "2026-06-23",
|
||||
"summary": "入库单 CREATED 状态限制:CREATED 状态不允许绑定货物和完成入库,仅 PENDING/CONFIRMED/PARTIAL_RECEIVED 状态可操作",
|
||||
"methods": [
|
||||
"storage.entry.cancel",
|
||||
"storage.entry.completeEntry",
|
||||
"storage.entry.bindReceivingDetails",
|
||||
"storage.entry.unbindReceivingDetails"
|
||||
],
|
||||
"notes": [
|
||||
"completeEntry / bindReceivingDetails / unbindReceivingDetails / commitEntryWithBindings 的可操作状态从原来的白名单(包含 CREATED)改为 PENDING / CONFIRMED / PARTIAL_RECEIVED,排除 CREATED。",
|
||||
"CREATED 状态仅允许确认入库(→PENDING)或作废(→CANCELLED)。",
|
||||
"storage.entry.cancel 补充明确 COMPLETED 状态不可作废,CREATED 可作废。",
|
||||
"同步更新对应 method 的 description、errors 描述。"
|
||||
],
|
||||
"type": "updated",
|
||||
"module": "storage.entry"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.23-system-03",
|
||||
"date": "2026-06-23",
|
||||
"summary": "storage.entry.cancel:CONFIRMED(已确认)状态不再允许作废,仅 CREATED 和 PENDING 可作废",
|
||||
"methods": [
|
||||
"storage.entry.cancel"
|
||||
],
|
||||
"notes": [
|
||||
"canCancel() 白名单移除 CONFIRMED,仅保留 CREATED 和 PENDING",
|
||||
"validTransitions 中 CONFIRMED 不再可转为 CANCELLED",
|
||||
"cancel() 方法新增 CONFIRMED 状态拦截,返回 400:已确认入库单不允许作废,请先完成收货",
|
||||
"PARTIAL_RECEIVED 仍可作废,COMPLETED 不允许作废(行为不变)",
|
||||
"更新 description 明确各状态可作废规则,errors 中补充 CONFIRMED 不可作废的说明"
|
||||
],
|
||||
"type": "updated",
|
||||
"module": "storage.entry"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.23-system-04",
|
||||
"date": "2026-06-23",
|
||||
"summary": "入库单状态从 7 个简化为 5 个:移除 CONFIRMED 和 PARTIAL_RECEIVED,最终状态为 CREATING/CREATED/PENDING/COMPLETED/CANCELLED;同步更新 storage.entry 所有 method 的状态枚举和错误信息描述",
|
||||
"methods": [
|
||||
"storage.entry.list",
|
||||
"storage.entry.get",
|
||||
"storage.entry.cancel",
|
||||
"storage.entry.completeEntry",
|
||||
"storage.entry.bindReceivingDetails",
|
||||
"storage.entry.unbindReceivingDetails"
|
||||
],
|
||||
"notes": [
|
||||
"wms_entry_order.order_status ENUM 从 CREATING/CREATED/PENDING/CONFIRMED/PARTIAL_RECEIVED/COMPLETED/CANCELLED 简化为 CREATING/CREATED/PENDING/COMPLETED/CANCELLED",
|
||||
"storage.entry.list: where.order_status 描述和 where 参数描述中的状态枚举同步更新",
|
||||
"storage.entry.get: entryOrder.order_status 描述同步更新",
|
||||
"storage.entry.cancel: 移除 PARTIAL_RECEIVED 可作废和 CONFIRMED 不可作废的描述,仅保留 CREATED 和 PENDING 可作废,COMPLETED 不可作废",
|
||||
"storage.entry.completeEntry: 可完成状态从 PENDING/CONFIRMED/PARTIAL_RECEIVED 改为仅 PENDING",
|
||||
"storage.entry.bindReceivingDetails: 可操作状态从 PENDING/CONFIRMED/PARTIAL_RECEIVED 改为仅 PENDING",
|
||||
"storage.entry.unbindReceivingDetails: 可操作状态从 PENDING/CONFIRMED/PARTIAL_RECEIVED 改为仅 PENDING",
|
||||
"cancel() 取消 CONFIRMED 状态拦截(状态已不存在),COMPLETED 拦截保持不变"
|
||||
],
|
||||
"type": "updated"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.23-system-05",
|
||||
"date": "2026-06-23",
|
||||
"summary": "入库单状态语义调整:CREATED=已创建待审核,PENDING=已审核;同步更新 storage.entry 所有 method 的 description 中状态说明",
|
||||
"methods": [
|
||||
"storage.entry.list",
|
||||
"storage.entry.get",
|
||||
"storage.entry.cancel",
|
||||
"storage.entry.completeEntry",
|
||||
"storage.entry.bindReceivingDetails",
|
||||
"storage.entry.unbindReceivingDetails"
|
||||
],
|
||||
"notes": [
|
||||
"CREATED 含义从\"已创建\"改为\"已创建待审核\"(需审核后才能绑定和完成入库)",
|
||||
"PENDING 含义从\"待收货/收货中\"改为\"已审核\"(审核通过,可绑定和完成入库)",
|
||||
"CREATED→PENDING 步骤语义:绑定审核",
|
||||
"addOrder() 新增可选参数 autoReview(boolean,默认 false),false 创建后状态 CREATED(需审核),true 创建后状态 PENDING(自动审核通过)",
|
||||
"快捷入库 quickPutaway 内部流程改为调用 addOrder({autoReview:true}) → bindReceivingDetails → commitEntryWithBindings,不再直接写库存,对外返回格式不变",
|
||||
"storage.entry.list / storage.entry.get description 中补充 CREATED/PENDING 语义说明",
|
||||
"storage.entry.cancel description 中补充可作废状态说明",
|
||||
"storage.entry.completeEntry description 中补充可完成状态说明",
|
||||
"storage.entry.bindReceivingDetails / storage.entry.unbindReceivingDetails description 中补充可绑定/解绑状态说明"
|
||||
],
|
||||
"type": "updated"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.23-system-06",
|
||||
"date": "2026-06-23",
|
||||
"summary": "storage.inventory.quickPutaway description 更新:补充内部已改为走 addOrder→bind→commit 链路,不再直接写库存",
|
||||
"methods": [
|
||||
"storage.inventory.quickPutaway"
|
||||
],
|
||||
"notes": [
|
||||
"快捷入库 quickPutaway 内部流程改为调用 addOrder({autoReview:true}) → bindReceivingDetails → commitEntryWithBindings,不再直接写库存,外部返回格式不变",
|
||||
"description 中补充内部调用链路说明"
|
||||
],
|
||||
"type": "updated"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.23-system-07",
|
||||
"date": "2026-06-23",
|
||||
"summary": "storage.entry 大范围清理:删除 bindReceivingDetails/unbindReceivingDetails(明细级绑定已弃用),更新 completeEntry 为纯状态变更(不再做库存写入/异步匹配)",
|
||||
"methods": [
|
||||
"storage.entry.bindReceivingDetails",
|
||||
"storage.entry.unbindReceivingDetails",
|
||||
"storage.entry.completeEntry"
|
||||
],
|
||||
"notes": [
|
||||
"storage.entry.bindReceivingDetails:已从代码中删除,明细级绑定收货单功能下线。库存写入统一由 storage.inventory.matchPutaway 完成。",
|
||||
"storage.entry.unbindReceivingDetails:已从代码中删除,明细级解绑功能下线。",
|
||||
"storage.entry.completeEntry:改为纯状态变更(PENDING → COMPLETED),不再做库存写入和异步匹配回调。库存写入统一由 storage.inventory.matchPutaway 完成。"
|
||||
],
|
||||
"type": "updated"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.23-system-08",
|
||||
"date": "2026-06-23",
|
||||
"summary": "storage.inventory 清理:删除 quickPutaway(快捷入库已下线,统一由 matchPutaway 完成匹配入库)",
|
||||
"methods": [
|
||||
"storage.inventory.quickPutaway"
|
||||
],
|
||||
"notes": [
|
||||
"storage.inventory.quickPutaway:已从代码中删除,快捷入库功能下线。请使用 storage.inventory.matchPutaway 替代。"
|
||||
],
|
||||
"type": "removed"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.23-system-09",
|
||||
"date": "2026-06-23",
|
||||
"summary": "入库流程弃用清理:bindReceivingDetails/unbindReceivingDetails 标记为已删除并补充弃用原因,completeEntry 明确不涉及库存写入",
|
||||
"methods": [
|
||||
"storage.entry.bindReceivingDetails",
|
||||
"storage.entry.unbindReceivingDetails",
|
||||
"storage.entry.completeEntry"
|
||||
],
|
||||
"notes": [
|
||||
"storage.entry.bindReceivingDetails 与 storage.entry.unbindReceivingDetails 已从代码中移除,入库单与收货单关系改为 wms_entry_order_receiving 主表级关联,不再需要逐明细绑定/解绑。",
|
||||
"wms_entry_receiving_binding 表不再写入新数据。",
|
||||
"storage.entry.completeEntry 仅做状态变更(PENDING→COMPLETED),库存写入统一由 storage.inventory.matchPutaway 完成。",
|
||||
"commitEntryWithBindings(内部方法)不再使用,库存写入统一走 matchPutaway 链路。"
|
||||
],
|
||||
"type": "updated"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.23-system-10",
|
||||
"date": "2026-06-23",
|
||||
"summary": "quickPutaway 弃用说明完善:明确替代方案为 matchPutaway;matchPutaway 标明为目前唯一库存写入入库链路",
|
||||
"methods": [
|
||||
"storage.inventory.quickPutaway",
|
||||
"storage.inventory.matchPutaway"
|
||||
],
|
||||
"notes": [
|
||||
"storage.inventory.quickPutaway 已从代码中移除,替代方案为 storage.inventory.matchPutaway(支持多收货单+多入库单批量匹配入库)。",
|
||||
"storage.inventory.matchPutaway 是目前唯一的库存写入入库链路,入库单状态变更由 storage.entry.completeEntry 单独处理。",
|
||||
"本次为文档补充说明,不涉及代码变更。"
|
||||
],
|
||||
"type": "updated"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.23-system-11",
|
||||
"date": "2026-06-23",
|
||||
"summary": "删除 storage.receiving.getAvailableInboundQuantity:该方法依赖已弃用的 wms_entry_receiving_binding 明细绑定表,已从代码中移除",
|
||||
"methods": [
|
||||
"storage.receiving.getAvailableInboundQuantity"
|
||||
],
|
||||
"notes": [
|
||||
"该方法原用于按 stock_id 查询已审核收货单中各明细的可入库数量(actual_quantity - stored_quantity - pending_allocated_quantity)。",
|
||||
"由于 wms_entry_receiving_binding 明细绑定表已弃用,入库单与收货单的关联改为通过 wms_entry_order_receiving 主表级关联,该查询方法不再适用。",
|
||||
"替代方案:使用 storage.entry.get 查询入库单详情,通过顶层 receivingBindings 获取关联的收货单信息。"
|
||||
],
|
||||
"type": "removed"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.23-system-12",
|
||||
"date": "2026-06-23",
|
||||
"summary": "storage.entry.get 响应结构变更:不再返回 items[].bindings(明细级绑定),改为返回顶层 receivingBindings(主表级关联收货单信息)",
|
||||
"methods": [
|
||||
"storage.entry.get"
|
||||
],
|
||||
"notes": [
|
||||
"移除 items[].bindings(明细级绑定,原基于 wms_entry_receiving_binding 表),该绑定表已弃用。",
|
||||
"新增顶层 receivingBindings(wms_entry_order_receiving 主表级关联),每项含 id/receiving_id/receiving(含 id/receiving_number/status/storage_status/created_at)。",
|
||||
"items 中保留 external_item_code/external_item_id/warehouse_item_code/warehouse_item_name/warehouse_item_spec 等扁平化字段。",
|
||||
"响应结构变更与 storage.directInbound.getItems 的返回结构对齐,后者同样使用顶层 receivingBindings。"
|
||||
],
|
||||
"type": "modified"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.23-system-13",
|
||||
"date": "2026-06-23",
|
||||
"summary": "新增 storage.entry.* 下 4 个 DirectInbound 方法:getDirectInboundItems、addDirectInboundItem、commitDirectInbound、removeDirectInboundItem,原 storage.directInbound.* 方法保留向后兼容并标记 deprecated",
|
||||
"methods": [
|
||||
"storage.entry.getDirectInboundItems",
|
||||
"storage.entry.addDirectInboundItem",
|
||||
"storage.entry.commitDirectInbound",
|
||||
"storage.entry.removeDirectInboundItem"
|
||||
],
|
||||
"notes": [
|
||||
"storage.entry.getDirectInboundItems:获取入库单的导入/PDA 入库信息,参数与响应格式同原 storage.directInbound.getItems",
|
||||
"storage.entry.addDirectInboundItem:按商品增量添加导入/PDA 入库记录(支持单条和批量),参数与响应格式同原 storage.directInbound.addItem",
|
||||
"storage.entry.commitDirectInbound:提交确认完成导入/PDA 入库,按实收数量写入库存并异步回传奇门/API,参数与响应格式同原 storage.directInbound.commit",
|
||||
"storage.entry.removeDirectInboundItem:移除一条导入/PDA 入库记录,参数与响应格式同原 storage.directInbound.removeItem",
|
||||
"底层 inbound_direct_log.js 实现不变,仅入口从 storage.directInbound 模块迁入 storage.entry 模块"
|
||||
],
|
||||
"type": "added"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.23-system-14",
|
||||
"date": "2026-06-23",
|
||||
"summary": "storage.directInbound.* 下 4 个方法标记 deprecated,指向 storage.entry.* 下对应新方法",
|
||||
"methods": [
|
||||
"storage.directInbound.getItems",
|
||||
"storage.directInbound.addItem",
|
||||
"storage.directInbound.commit",
|
||||
"storage.directInbound.removeItem"
|
||||
],
|
||||
"notes": [
|
||||
"storage.directInbound.getItems → 替代方法 storage.entry.getDirectInboundItems",
|
||||
"storage.directInbound.addItem → 替代方法 storage.entry.addDirectInboundItem",
|
||||
"storage.directInbound.commit → 替代方法 storage.entry.commitDirectInbound",
|
||||
"storage.directInbound.removeItem → 替代方法 storage.entry.removeDirectInboundItem",
|
||||
"旧方法保留向后兼容,参数与响应格式不变,仅入口模块变更"
|
||||
],
|
||||
"type": "deprecated"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.23-system-15",
|
||||
"date": "2026-06-23",
|
||||
"summary": "storage.inventory.matchPutaway 标记 deprecated,替代方案为 storage.entry.commitDirectInbound",
|
||||
"methods": [
|
||||
"storage.inventory.matchPutaway"
|
||||
],
|
||||
"notes": [
|
||||
"storage.inventory.matchPutaway 已弃用,请迁移至 storage.entry.commitDirectInbound",
|
||||
"commitDirectInbound 提供导入/PDA 入库完成确认功能,按实收数量写入库存并异步回传"
|
||||
],
|
||||
"type": "deprecated"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.23-system-16",
|
||||
"date": "2026-06-23",
|
||||
"summary": "清理已弃用 method 条目:从 system.json 删除 storage.entry.bindReceivingDetails、storage.entry.unbindReceivingDetails、storage.inventory.matchPutaway 三个已从代码中移除的 method 文档条目",
|
||||
"methods": [
|
||||
"storage.entry.bindReceivingDetails",
|
||||
"storage.entry.unbindReceivingDetails",
|
||||
"storage.inventory.matchPutaway"
|
||||
],
|
||||
"notes": [
|
||||
"storage.entry.bindReceivingDetails:已从代码中删除,明细级绑定收货单功能下线。入库单与收货单关系改为 wms_entry_order_receiving 主表级关联。",
|
||||
"storage.entry.unbindReceivingDetails:已从代码中删除,明细级解绑功能下线。",
|
||||
"storage.inventory.matchPutaway:已从代码中删除,匹配入库功能下线。替代方案为 storage.entry.commitDirectInbound。",
|
||||
"storage.inventory.quickPutaway:之前已标记 [已删除],本次确认条目保留(与 matchPutaway 同一 group,保留作为历史参考)。",
|
||||
"storage.entry.create / addDetail / deleteDetail / detailChange:systems 层方法已删除,但从未在 system.json 中暴露为 API method,无需文档变更。"
|
||||
],
|
||||
"type": "removed"
|
||||
}
|
||||
]
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
"module": "openapi",
|
||||
"description": "开放 API 统一入口,独立链路,HTTP POST /openapi,记录入口校验/鉴权规则与返回格式。",
|
||||
"version": "2026.06.05-openapi-15",
|
||||
"updatedAt": "2026-06-05",
|
||||
"version": "1.1.0",
|
||||
"updatedAt": "2026-06-23",
|
||||
"http": {
|
||||
"path": "/openapi",
|
||||
"method": "POST"
|
||||
@ -1457,6 +1457,453 @@
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"groupName": "入库单模块",
|
||||
"module": "entryorder",
|
||||
"list": [
|
||||
{
|
||||
"method": "entryorder.create",
|
||||
"description": "entryorder 模块 创建入库单接口,支持传入入库单主信息和商品明细。创建成功后返回的状态 status 为 CREATING(明细行未全部插入)或 CREATED(明细行已全部插入完成)。",
|
||||
"isNeedAuth": false,
|
||||
"isNeedLogin": false,
|
||||
"headers": [],
|
||||
"params": [
|
||||
{
|
||||
"name": "entryOrder",
|
||||
"type": "object",
|
||||
"required": true,
|
||||
"source": "body",
|
||||
"description": "入库单主信息对象"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.entryOrderCode",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"source": "body",
|
||||
"description": "入库单号(必填),外部系统的唯一入库单号"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.entryOrderType",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "入库单类型,默认 SCRK(生产入库)"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.warehouseCode",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "仓库编码"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.ownerCode",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "货主编码"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.expectedArriveTime",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "预计到货时间,ISO 8601 格式"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.totalOrderLines",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "总行数"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.operateTime",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "操作时间,ISO 8601 格式"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.operatorName",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "操作人"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.supplierCode",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "供应商编码"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.supplierName",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "供应商名称"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.remark",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "备注"
|
||||
},
|
||||
{
|
||||
"name": "orderLines",
|
||||
"type": "object",
|
||||
"required": true,
|
||||
"source": "body",
|
||||
"description": "订单明细对象,包含 orderLine 数组"
|
||||
},
|
||||
{
|
||||
"name": "orderLines.orderLine",
|
||||
"type": "array",
|
||||
"required": true,
|
||||
"source": "body",
|
||||
"description": "商品明细列表,数组中每项为一个入库单行对象"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLine.itemCode",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "商品编码,与 itemId 二选一,用于匹配仓库中的商品"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLine.itemId",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "仓库商品主键ID,与 itemCode 二选一,优先使用 itemId"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLine.itemName",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "商品名称,用于错误提示中的商品识别"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLine.planQty",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"source": "body",
|
||||
"description": "计划入库数量(必填),必须大于 0"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLine.inventoryType",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "库存类型,默认 ZP(正品)"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLine.orderLineNo",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "行号"
|
||||
}
|
||||
],
|
||||
"requestBody": [
|
||||
{
|
||||
"name": "entryOrder",
|
||||
"type": "object",
|
||||
"required": true,
|
||||
"source": "body",
|
||||
"description": "入库单主信息对象"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.entryOrderCode",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"source": "body",
|
||||
"description": "入库单号(必填),外部系统的唯一入库单号"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.entryOrderType",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "入库单类型,默认 SCRK(生产入库)"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.warehouseCode",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "仓库编码"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.ownerCode",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "货主编码"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.expectedArriveTime",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "预计到货时间,ISO 8601 格式"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.totalOrderLines",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "总行数"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.operateTime",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "操作时间,ISO 8601 格式"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.operatorName",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "操作人"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.supplierCode",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "供应商编码"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.supplierName",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "供应商名称"
|
||||
},
|
||||
{
|
||||
"name": "entryOrder.remark",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "备注"
|
||||
},
|
||||
{
|
||||
"name": "orderLines",
|
||||
"type": "object",
|
||||
"required": true,
|
||||
"source": "body",
|
||||
"description": "订单明细对象,包含 orderLine 数组"
|
||||
},
|
||||
{
|
||||
"name": "orderLines.orderLine",
|
||||
"type": "array",
|
||||
"required": true,
|
||||
"source": "body",
|
||||
"description": "商品明细列表,数组中每项为一个入库单行对象"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLine.itemCode",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "商品编码,与 itemId 二选一"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLine.itemId",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "仓库商品主键ID,与 itemCode 二选一,优先使用 itemId"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLine.itemName",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "商品名称"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLine.planQty",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"source": "body",
|
||||
"description": "计划入库数量(必填),必须大于 0"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLine.inventoryType",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "库存类型,默认 ZP(正品)"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLine.orderLineNo",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "行号"
|
||||
}
|
||||
],
|
||||
"response": [
|
||||
{
|
||||
"name": "code",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "业务码:1=成功,0=失败"
|
||||
},
|
||||
{
|
||||
"name": "message",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "提示消息"
|
||||
},
|
||||
{
|
||||
"name": "data",
|
||||
"type": "object",
|
||||
"required": false,
|
||||
"description": "创建成功时返回 entryOrderId、entryOrderCode、status(CREATING=创建中明细行未全部插入,CREATED=已创建完成)、createTime"
|
||||
}
|
||||
],
|
||||
"errors": [
|
||||
{
|
||||
"code": 400,
|
||||
"message": "entryOrder.entryOrderCode 参数缺失"
|
||||
},
|
||||
{
|
||||
"code": 400,
|
||||
"message": "orderLines.orderLine 参数缺失"
|
||||
},
|
||||
{
|
||||
"code": 400,
|
||||
"message": "商品未同步推送到仓库"
|
||||
}
|
||||
],
|
||||
"notes": [
|
||||
"模块:entryorder 模块",
|
||||
"方法部署位置:openapiMethods/entryorder.create",
|
||||
"创建渠道固定为 API",
|
||||
"orderLines.orderLine 支持单对象或数组格式",
|
||||
"itemCode 与 itemId 二选一,优先使用 itemId",
|
||||
"timestamp 时间戳时效校验:与服务器时间差不得超过 ±10 分钟(600 秒),否则返回 400"
|
||||
]
|
||||
},
|
||||
{
|
||||
"method": "entryorder.query",
|
||||
"description": "entryorder 模块 查询入库单接口,根据入库单号返回入库单详情。返回的 status 字段可能为 CREATING/CREATED/PENDING/COMPLETED/CANCELLED。",
|
||||
"isNeedAuth": false,
|
||||
"isNeedLogin": false,
|
||||
"headers": [],
|
||||
"params": [
|
||||
{
|
||||
"name": "entryOrderCode",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"source": "body",
|
||||
"description": "入库单号(必填),要查询的入库单号"
|
||||
}
|
||||
],
|
||||
"requestBody": [
|
||||
{
|
||||
"name": "entryOrderCode",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"source": "body",
|
||||
"description": "入库单号(必填),要查询的入库单号"
|
||||
}
|
||||
],
|
||||
"response": [
|
||||
{
|
||||
"name": "code",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "业务码:1=成功,0=失败"
|
||||
},
|
||||
{
|
||||
"name": "message",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "提示消息"
|
||||
},
|
||||
{
|
||||
"name": "data",
|
||||
"type": "object",
|
||||
"required": false,
|
||||
"description": "查询成功时返回 entryOrderCode、entryOrderId、status、entryOrderType、expectedArriveTime、supplierCode、supplierName、remark、createTime、operateTime、operatorName、warehouseCode、ownerCode、totalOrderLines、orderLines"
|
||||
},
|
||||
{
|
||||
"name": "data.orderLines",
|
||||
"type": "array",
|
||||
"required": false,
|
||||
"description": "商品明细列表"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLines.itemId",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "商品ID"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLines.itemCode",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "商品编码"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLines.itemName",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "商品名称"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLines.planQty",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "计划入库数量"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLines.actualQty",
|
||||
"type": "number",
|
||||
"required": false,
|
||||
"description": "实际入库数量"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLines.inventoryType",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "库存类型"
|
||||
},
|
||||
{
|
||||
"name": "[].orderLines.orderLineNo",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "行号"
|
||||
}
|
||||
],
|
||||
"errors": [
|
||||
{
|
||||
"code": 400,
|
||||
"message": "entryOrderCode 参数缺失"
|
||||
},
|
||||
{
|
||||
"code": 404,
|
||||
"message": "入库单未找到"
|
||||
}
|
||||
],
|
||||
"notes": [
|
||||
"模块:entryorder 模块",
|
||||
"方法部署位置:openapiMethods/entryorder.query",
|
||||
"timestamp 时间戳时效校验:与服务器时间差不得超过 ±10 分钟(600 秒),否则返回 400"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
2194
methods/system.json
2194
methods/system.json
File diff suppressed because it is too large
Load Diff
187
prompts/官网生成提示词.md
Normal file
187
prompts/官网生成提示词.md
Normal file
@ -0,0 +1,187 @@
|
||||
# 官网生成提示词 — 奇门WMS(qimen-wms)
|
||||
|
||||
## 项目背景
|
||||
|
||||
你将为以下开源项目生成一个**产品官网**(Landing Page / 产品介绍页)。请根据下方的项目描述,产出一份完整的提示词,用于交给 AI 或前端开发者生成官网 HTML 页面。
|
||||
|
||||
---
|
||||
|
||||
## 项目描述
|
||||
|
||||
### 产品名称
|
||||
|
||||
**奇门WMS(qimen-wms)**
|
||||
|
||||
### 一句话简介
|
||||
|
||||
基于 Egg.js 的仓储管理系统(WMS),支持多快递平台对接、订单全生命周期管理、精细化库位管控与开放 API,适合中小型电商与仓储企业二次开发。
|
||||
|
||||
### 目标用户
|
||||
|
||||
- 中小型电商企业
|
||||
- 三方仓储服务商
|
||||
- 需要自建 WMS 的技术团队
|
||||
- 计划对接淘宝/天猫/拼多多/抖音/快手等平台的商家
|
||||
|
||||
### 官网定位
|
||||
|
||||
技术型产品官网,兼顾**品牌感**与**专业性**,面向企业决策者与开发者双重视角。整体风格简洁、现代、可信赖。
|
||||
|
||||
---
|
||||
|
||||
## 核心功能模块(请在官网中逐一展示)
|
||||
|
||||
### 1. 订单全生命周期管理
|
||||
- **M1 待审核 → M2 待处理 → M3 异常 → M4 配送中 → M5 配送异常 → M6 归档**
|
||||
- 完善的状态机驱动订单流转:同步、打印、拣货、打包、验货、出库、拦截等环节独立状态追踪
|
||||
- 支持审核、驳回、取消、拦截、异常处理
|
||||
- 订单动态分表设计,按仓库维度物理隔离,冷热数据分离
|
||||
|
||||
### 2. 多平台、多接口无缝对接
|
||||
- **奇门标准接口(qimen)**:严格遵循阿里巴巴奇门协议,支持出库单、入库单、退货单、库存查询、商品同步等标准接口
|
||||
- **OpenAPI**:独立的开放 API 链路,支持第三方系统集成
|
||||
- **多快递平台**:对接拼多多、淘宝/天猫、快手、抖音、小红书等主流电商,支持电子面单
|
||||
- **内部网关**:内网系统间调用的统一入口
|
||||
|
||||
### 3. 精细化库存管理
|
||||
- 仓库库存管理(正品、残次、冻结等)
|
||||
- 商品条码管理、批号/批次追踪
|
||||
- 库存变动流水、库存预警
|
||||
- 多货主、多仓库库存独立核算
|
||||
|
||||
### 4. 库位管理(库区 / 货架 / 库位)
|
||||
- 支持 库区 → 货架 → 库位 三级精细化管理
|
||||
- 库位类型:存储位、拣货位、暂存区、不良品区等
|
||||
- 自动计算拣货路径与拣货优先级
|
||||
- 库位唯一码/条码管理
|
||||
- 移库、补货、分配验证
|
||||
|
||||
### 5. 入库管理
|
||||
- ASN(预到货通知单)管理
|
||||
- 收货作业:明细录入 → 商品绑定 → 质检 → 上架
|
||||
- 支持直入、退货入库、协同收货
|
||||
- 收货单维度统计与完成确认
|
||||
|
||||
### 6. 出库与拣货
|
||||
- 订单分配、波次策略匹配
|
||||
- 拣货任务生成与执行
|
||||
- 拣货车(Pick Cart)模式
|
||||
- 复核、打包、称重、出库确认
|
||||
- 出库后配送状态追踪
|
||||
|
||||
### 7. 打印管理
|
||||
- 电子面单一键打印
|
||||
- 拣货单、发货单、装箱单等模板
|
||||
- 打印台管理、打印任务分发
|
||||
- 支持菜鸟、拼多多、京东、抖音、快手、小红书等平台打印模板
|
||||
|
||||
### 8. 系统管理与权限
|
||||
- 用户注册、登录、角色切换
|
||||
- 多平台角色上下文管理(Web / PDA / App / 微信 / 小程序)
|
||||
- 细粒度权限控制(角色→菜单→接口级别)
|
||||
- 操作日志留痕
|
||||
|
||||
### 9. 数据仪表盘
|
||||
- 实时统计:待处理订单、今日新增、昨日新增
|
||||
- 出库趋势、快递比例、平台分布
|
||||
- 未分配/未打印/未拣货等运营数据一目了然
|
||||
|
||||
### 10. 辅助能力
|
||||
- **Excel 服务**:灵活生成/解析单 sheet 或多 sheet 的 Excel 文件(支持 Buffer / 文件 / HTTP 下载)
|
||||
- **IM 集成**:企业微信/钉钉等即时消息通知
|
||||
- **文件管理**:腾讯云 COS 文件上传,图片、文档、APK 等统一管理
|
||||
- **国际化(i18n)**:多语言键值管理与自动翻译
|
||||
|
||||
---
|
||||
|
||||
## 技术栈(官网技术特性板块展示)
|
||||
|
||||
| 层级 | 技术 |
|
||||
|------|------|
|
||||
| 框架 | Egg.js 3.x |
|
||||
| 数据库 | MySQL(Sequelize ORM + mysql2) |
|
||||
| 缓存 | Redis(多 DB 隔离:缓存/打印) |
|
||||
| 认证 | JWT |
|
||||
| 接口协议 | REST / XML-RPC(奇门)/ OpenAPI |
|
||||
| 模板 | EJS |
|
||||
| 对象存储 | 腾讯云 COS、七牛云 |
|
||||
| 物流接口 | SOAP |
|
||||
| 数据处理 | ExcelJS、Fast XML Parser |
|
||||
| 运行环境 | Node.js >= 18 |
|
||||
| 部署 | 自有发布脚本 + 版本管理 + 回退机制 |
|
||||
| 测试 | Egg Mock + ESLint |
|
||||
|
||||
---
|
||||
|
||||
## 官网页面结构与内容要求
|
||||
|
||||
### 整体风格
|
||||
- 现代简约、科技感、**蓝色系为主色调**(#1a73e8 或类似专业蓝)
|
||||
- 大屏宽幅设计,滚动式单页(One Page)
|
||||
- 响应式适配(桌面 + 平板 + 手机)
|
||||
- 中文字体优先(系统原生字体或思源黑体)
|
||||
|
||||
### 页面区块建议
|
||||
|
||||
#### 1️⃣ 英雄区(Hero Section)
|
||||
- 产品名称 + 一句话价值主张
|
||||
- 背景可配合仓储/物流插画或抽象网格动效
|
||||
- 两个 CTA 按钮:「在线体验 Demo」「查看技术文档」
|
||||
|
||||
#### 2️⃣ 产品定位区
|
||||
- "专为中小型电商与仓储企业打造的轻量级 WMS"
|
||||
- 2~3 个核心卖点(如:奇门标准对接、订单全生命周期、开放架构)
|
||||
|
||||
#### 3️⃣ 核心功能展示区(建议 4~6 个卡片)
|
||||
- 每个功能模块:icon + 标题 + 一句话说明
|
||||
- 点击可展开详细功能列表
|
||||
- 模块建议:订单管理、库存管理、库位管理、多平台对接、打印管理、系统权限
|
||||
|
||||
#### 4️⃣ 技术架构图区
|
||||
- 展示前端 → 入口路由(/system / /qimen / /openapi)→ Service 层 → Model/DB/Redis 的分层架构
|
||||
- 可用文字描述配合简洁示意图
|
||||
|
||||
#### 5️⃣ 接口与集成区
|
||||
- 奇门接口列表概览(出库/入库/退货/库存/商品同步)
|
||||
- OpenAPI 与内部网关说明
|
||||
- 已对接平台徽标(淘宝、拼多多、抖音、快手、京东、小红书等)
|
||||
|
||||
#### 6️⃣ 适用场景区
|
||||
- 电商仓配一体:订单从平台推送 → WMS 处理 → 快递发出
|
||||
- 三方仓储服务:多货主、多仓库独立运营
|
||||
- 企业自建 WMS:二次开发、私有化部署
|
||||
|
||||
#### 7️⃣ 快速开始区
|
||||
```bash
|
||||
# 克隆项目
|
||||
git clone <repo-url>
|
||||
|
||||
# 安装依赖
|
||||
npm install
|
||||
|
||||
# 启动开发服务(默认端口 6060)
|
||||
npm run dev
|
||||
```
|
||||
|
||||
#### 8️⃣ 页脚(Footer)
|
||||
- GitHub 仓库链接
|
||||
- 开源协议(MIT)
|
||||
- 作者信息
|
||||
- 项目版本号
|
||||
|
||||
---
|
||||
|
||||
## 编写要求
|
||||
|
||||
- 提示词需包含足够的产品细节,让接收方能直接生成完整的官网页面
|
||||
- 页面用纯 HTML + CSS + JavaScript(vanilla),无需框架依赖
|
||||
- 中文字体、中文内容、中文官网
|
||||
- 注重 SEO 基础(meta 标签、语义化 HTML)
|
||||
- 包含 favicon 占位
|
||||
- 页面加载动画建议使用 CSS 过渡/动画,避免大量 JS 动效库
|
||||
|
||||
---
|
||||
|
||||
## 输出物
|
||||
|
||||
将以上提示词保存后,将其提交给 AI 代码生成工具或前端开发者,即可生成一个完整的**奇门WMS** 产品官网 HTML 文件。
|
||||
34
script/api-test.js
Normal file
34
script/api-test.js
Normal file
@ -0,0 +1,34 @@
|
||||
const http = require('http');
|
||||
const token = process.argv[2];
|
||||
const method = process.argv[3]; // e.g. store.list
|
||||
const reqBody = process.argv[4] || '{}';
|
||||
|
||||
const options = {
|
||||
hostname: 'localhost',
|
||||
port: 6060,
|
||||
path: `/system?method=${method}&v=1×tamp=${Math.floor(Date.now()/1000)}`,
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'platform': 'web',
|
||||
'project': 'wms',
|
||||
'Authorization': `Bearer ${token}`,
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
};
|
||||
|
||||
const req = http.request(options, (res) => {
|
||||
let data = '';
|
||||
res.on('data', chunk => data += chunk);
|
||||
res.on('end', () => {
|
||||
console.log(`STATUS: ${res.statusCode}`);
|
||||
try {
|
||||
const json = JSON.parse(data);
|
||||
console.log(JSON.stringify(json, null, 2));
|
||||
} catch (e) {
|
||||
console.log(data.substring(0, 1000));
|
||||
}
|
||||
});
|
||||
});
|
||||
req.on('error', (e) => console.error('ERROR:', e.message));
|
||||
req.write(reqBody);
|
||||
req.end();
|
||||
47
script/api-test2.js
Normal file
47
script/api-test2.js
Normal file
@ -0,0 +1,47 @@
|
||||
const http = require('http');
|
||||
|
||||
const token = process.argv[2];
|
||||
const method = process.argv[3]; // e.g. order.pendingOrder.createOrder
|
||||
const reqBodyFile = process.argv[4]; // path to JSON file or JSON string
|
||||
|
||||
let reqBody;
|
||||
if (reqBodyFile && reqBodyFile.endsWith('.json')) {
|
||||
reqBody = require('fs').readFileSync(reqBodyFile, 'utf8');
|
||||
} else {
|
||||
reqBody = reqBodyFile || '{}';
|
||||
}
|
||||
|
||||
const options = {
|
||||
hostname: 'localhost',
|
||||
port: 6060,
|
||||
path: `/system?method=${method}&v=1×tamp=${Math.floor(Date.now()/1000)}`,
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'platform': 'web',
|
||||
'project': 'wms',
|
||||
'Authorization': `Bearer ${token}`,
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
};
|
||||
|
||||
const req = http.request(options, (res) => {
|
||||
let data = '';
|
||||
res.on('data', chunk => data += chunk);
|
||||
res.on('end', () => {
|
||||
console.log(`STATUS: ${res.statusCode}`);
|
||||
console.log('HEADERS:', JSON.stringify(res.headers));
|
||||
try {
|
||||
const json = JSON.parse(data);
|
||||
console.log(JSON.stringify(json, null, 2));
|
||||
} catch (e) {
|
||||
console.log('RAW BODY (first 2000 chars):');
|
||||
console.log(data.substring(0, 2000));
|
||||
if (data.length > 2000) {
|
||||
console.log('...(truncated, total length: ' + data.length + ')');
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
req.on('error', (e) => console.error('REQUEST ERROR:', e.message));
|
||||
req.write(reqBody);
|
||||
req.end();
|
||||
70
script/backfill-wave-status.js
Normal file
70
script/backfill-wave-status.js
Normal file
@ -0,0 +1,70 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 回补历史已完成任务的 wms_wave_pick_task_wave.status = 1(已拣)。
|
||||
*
|
||||
* 用法:
|
||||
* node script/backfill-wave-status.js
|
||||
*
|
||||
* 安全说明:
|
||||
* - 仅更新 status=0 且关联任务已完成的记录
|
||||
* - 使用事务,执行前先展示影响行数
|
||||
*/
|
||||
|
||||
const { Op } = require('sequelize');
|
||||
const path = require('path');
|
||||
const app = require('egg').app;
|
||||
// 上面的 import 方式可能不对,用下面的方式
|
||||
const Application = require('egg').Application;
|
||||
|
||||
async function main() {
|
||||
// 直接用 sequelize 连接
|
||||
const config = require(path.join(__dirname, '..', 'database', 'config.js'));
|
||||
const Sequelize = require('sequelize');
|
||||
const sequelize = new Sequelize(config.database, config.username, config.password, {
|
||||
host: config.host,
|
||||
port: config.port,
|
||||
dialect: 'mysql',
|
||||
logging: console.log,
|
||||
});
|
||||
|
||||
try {
|
||||
// 先查影响行数
|
||||
const [previewRows] = await sequelize.query(`
|
||||
SELECT COUNT(1) AS count
|
||||
FROM wms_wave_pick_task_wave w
|
||||
INNER JOIN wms_wave_pick_task t ON t.id = w.task_id AND t.warehouse_id = w.warehouse_id
|
||||
WHERE w.status = 0
|
||||
AND t.status IN (2, 3)
|
||||
`, { type: Sequelize.QueryTypes.SELECT });
|
||||
|
||||
const count = Number(previewRows && previewRows.count || 0);
|
||||
console.log(`将更新 ${count} 条 wms_wave_pick_task_wave 记录(status 0 → 1)`);
|
||||
|
||||
if (count === 0) {
|
||||
console.log('无需回补');
|
||||
return;
|
||||
}
|
||||
|
||||
// 执行更新
|
||||
const [result] = await sequelize.query(`
|
||||
UPDATE wms_wave_pick_task_wave w
|
||||
INNER JOIN wms_wave_pick_task t ON t.id = w.task_id AND t.warehouse_id = w.warehouse_id
|
||||
SET w.status = 1,
|
||||
w.pick_time = COALESCE(t.finish_time, NOW()),
|
||||
w.update_time = NOW()
|
||||
WHERE w.status = 0
|
||||
AND t.status IN (2, 3)
|
||||
`);
|
||||
|
||||
const affectedRows = Number(result && result.affectedRows || 0);
|
||||
console.log(`成功回补 ${affectedRows} 条记录`);
|
||||
} catch (err) {
|
||||
console.error('回补失败:', err.message);
|
||||
process.exit(1);
|
||||
} finally {
|
||||
await sequelize.close();
|
||||
}
|
||||
}
|
||||
|
||||
main();
|
||||
30
script/clear-cache.js
Normal file
30
script/clear-cache.js
Normal file
@ -0,0 +1,30 @@
|
||||
const Redis = require('ioredis');
|
||||
|
||||
async function main() {
|
||||
const redis = new Redis({
|
||||
host: '127.0.0.1',
|
||||
port: 6379,
|
||||
password: 'qwe2019@',
|
||||
db: 10,
|
||||
});
|
||||
|
||||
const key = 'store_warehouse:contract_config:1000028:1000241';
|
||||
|
||||
try {
|
||||
const val = await redis.get(key);
|
||||
console.log('Current cache value:', val ? val.substring(0, 200) : 'NULL');
|
||||
|
||||
await redis.del(key);
|
||||
console.log('✅ Cache key deleted:', key);
|
||||
|
||||
// Verify
|
||||
const after = await redis.get(key);
|
||||
console.log('After delete:', after);
|
||||
} catch (e) {
|
||||
console.error('Error:', e.message);
|
||||
}
|
||||
|
||||
redis.disconnect();
|
||||
}
|
||||
|
||||
main();
|
||||
183
script/cutoff-integration-test-v2.js
Normal file
183
script/cutoff-integration-test-v2.js
Normal file
@ -0,0 +1,183 @@
|
||||
/**
|
||||
* 截单时间逻辑真实 API 集成测试 (v2)
|
||||
*
|
||||
* 测试目标: 验证 asyncProcessOrderCreated 中的截单时间兜底逻辑
|
||||
* 策略: 通过 SQL 直接更新 policy_config (绕过 API 权限问题),通过 API 创建订单并验证结果
|
||||
*/
|
||||
const http = require('http');
|
||||
const mysql = require('mysql2/promise');
|
||||
|
||||
const TOKEN = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJsaXVmdW1pbmdyZW4iLCJpYXQiOjE3ODE5NTM3ODIsImV4cCI6MTc4MTk2ODE4Mn0.p-H2Wz6BaJppPV4X-wGjzdvUz_pbuBfmo1lt5cDimhM';
|
||||
|
||||
const DB_CONFIG = { host: '112.124.21.102', port: 3306, user: 'wms', password: 'P6j3YTHTpirepYWz', database: 'wms' };
|
||||
|
||||
const TEST = {
|
||||
contractId: 100213,
|
||||
warehouseId: 1000028,
|
||||
storeId: 1000241,
|
||||
stockWarehouseId: 156652,
|
||||
itemCode: '6942349700385',
|
||||
itemName: '泊泉雅黄瓜积雪草补水面膜25g',
|
||||
};
|
||||
|
||||
// 策略配置
|
||||
const POLICY = {
|
||||
A: { need_order_approval: 0, cutoff_order_enabled: 1, cutoff_order_time: '23:59', auto_allocate_express: 1, auto_allocate_storage: 1 },
|
||||
B: { need_order_approval: 0, cutoff_order_enabled: 1, cutoff_order_time: '00:01', auto_allocate_express: 1, auto_allocate_storage: 1 },
|
||||
C: { need_order_approval: 1, cutoff_order_enabled: 1, cutoff_order_time: '23:59', auto_allocate_express: 1, auto_allocate_storage: 1 },
|
||||
};
|
||||
|
||||
function api(method, body) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const bodyStr = typeof body === 'string' ? body : JSON.stringify(body);
|
||||
const opts = {
|
||||
hostname: 'localhost', port: 6060,
|
||||
path: `/system?method=${method}&v=1×tamp=${Math.floor(Date.now()/1000)}`,
|
||||
method: 'POST',
|
||||
headers: { 'platform': 'web', 'project': 'wms', 'Authorization': `Bearer ${TOKEN}`, 'Content-Type': 'application/json' },
|
||||
timeout: 60000,
|
||||
};
|
||||
const req = http.request(opts, res => {
|
||||
let d = '';
|
||||
res.on('data', c => d += c);
|
||||
res.on('end', () => {
|
||||
try { resolve({ status: res.statusCode, body: JSON.parse(d) }); }
|
||||
catch (e) { resolve({ status: res.statusCode, body: { _raw: d.substring(0, 300) } }); }
|
||||
});
|
||||
});
|
||||
req.on('error', e => reject(e));
|
||||
req.on('timeout', () => { req.destroy(); reject(new Error('timeout')); });
|
||||
req.write(bodyStr);
|
||||
req.end();
|
||||
});
|
||||
}
|
||||
|
||||
function sleep(ms) { return new Promise(r => setTimeout(r, ms)); }
|
||||
|
||||
async function setPolicy(policyCfg) {
|
||||
const conn = await mysql.createConnection(DB_CONFIG);
|
||||
await conn.execute('UPDATE wms_store_warehouse SET policy_config = ? WHERE id = ?',
|
||||
[JSON.stringify(policyCfg), TEST.contractId]);
|
||||
await conn.end();
|
||||
}
|
||||
|
||||
async function dbQuery(sql, params = []) {
|
||||
const conn = await mysql.createConnection(DB_CONFIG);
|
||||
const [rows] = await conn.execute(sql, params);
|
||||
await conn.end();
|
||||
return rows;
|
||||
}
|
||||
|
||||
async function createOrder() {
|
||||
return await api('order.pendingOrder.createOrder', {
|
||||
store_id: TEST.storeId,
|
||||
name: '测试收件人',
|
||||
mobile: '13800138000',
|
||||
province: '广东省',
|
||||
city: '广州市',
|
||||
area: '天河区',
|
||||
detail_address: '测试地址1号',
|
||||
items: [{ item_id: TEST.stockWarehouseId, item_code: TEST.itemCode, item_name: TEST.itemName, plan_qty: 1 }],
|
||||
});
|
||||
}
|
||||
|
||||
async function checkExpressAssignment(orderId) {
|
||||
const rows = await dbQuery(
|
||||
'SELECT id, order_id, warehouse_id FROM wms_order_express WHERE order_id = ? AND warehouse_id = ? LIMIT 1',
|
||||
[orderId, TEST.warehouseId]
|
||||
);
|
||||
return rows.length > 0;
|
||||
}
|
||||
|
||||
async function runScene(label, sceneKey, expectedStep, expectedExpress) {
|
||||
console.log(`\n=== ${label} ===`);
|
||||
|
||||
// 1. Set policy
|
||||
console.log(' [1] 设置 policy_config...');
|
||||
await setPolicy(POLICY[sceneKey]);
|
||||
console.log(` policy: ${JSON.stringify(POLICY[sceneKey])}`);
|
||||
|
||||
// 2. Wait cache
|
||||
await sleep(1000);
|
||||
|
||||
// 3. Create order
|
||||
console.log(' [2] 创建订单...');
|
||||
const r = await createOrder();
|
||||
console.log(` status: ${r.status}`);
|
||||
|
||||
const success = r.status === 200 && r.body && r.body.flag === 'success';
|
||||
if (!success) {
|
||||
console.log(` ❌ 创建失败: ${JSON.stringify(r.body).substring(0, 200)}`);
|
||||
return { pass: false, reason: 'create_failed', detail: r.body };
|
||||
}
|
||||
|
||||
const orderId = r.body.order_id || r.body.data?.order_id;
|
||||
const step = r.body.step || r.body.data?.step;
|
||||
console.log(` order_id: ${orderId}, step: ${step} (预期=${expectedStep})`);
|
||||
|
||||
// 4. Wait async processing
|
||||
console.log(' [3] 等待异步处理 (5秒)...');
|
||||
await sleep(5000);
|
||||
|
||||
// 5. Check express assignment
|
||||
const hasExpress = await checkExpressAssignment(orderId);
|
||||
console.log(` [4] 快递分配: ${hasExpress ? '✅ 已分配' : '❌ 未分配'} (预期=${expectedExpress ? '已分配' : '未分配'})`);
|
||||
|
||||
const stepOk = step === expectedStep;
|
||||
const expressOk = hasExpress === expectedExpress;
|
||||
const pass = stepOk && expressOk;
|
||||
|
||||
return {
|
||||
pass,
|
||||
orderId,
|
||||
step,
|
||||
expectedStep,
|
||||
hasExpress,
|
||||
expectedExpress,
|
||||
stepOk,
|
||||
expressOk,
|
||||
};
|
||||
}
|
||||
|
||||
async function main() {
|
||||
console.log('============================================');
|
||||
console.log(' 截单时间逻辑 - API 集成测试');
|
||||
console.log(` ${new Date().toISOString()}`);
|
||||
console.log('============================================');
|
||||
|
||||
const results = {};
|
||||
|
||||
results.A = await runScene(
|
||||
'场景 A: 免审核 + 未截单(23:59) → 应触发自动分配',
|
||||
'A', 1, true
|
||||
);
|
||||
|
||||
results.B = await runScene(
|
||||
'场景 B: 免审核 + 已截单(00:01) → 应跳过',
|
||||
'B', 1, false
|
||||
);
|
||||
|
||||
results.C = await runScene(
|
||||
'场景 C: 需要审核 → 应跳过',
|
||||
'C', 0, false
|
||||
);
|
||||
|
||||
// 恢复默认
|
||||
await setPolicy(null);
|
||||
|
||||
// Summary
|
||||
console.log('\n============================================');
|
||||
console.log(' 测试结果汇总');
|
||||
console.log('============================================');
|
||||
const total = Object.keys(results).length;
|
||||
const passing = Object.values(results).filter(r => r.pass).length;
|
||||
|
||||
for (const [key, r] of Object.entries(results)) {
|
||||
const icon = r.pass ? '✅' : '❌';
|
||||
console.log(` ${icon} 场景 ${key}: step=${r.step}(预期${r.expectedStep}) express=${r.hasExpress}(预期${r.expectedExpress})`);
|
||||
}
|
||||
console.log(`\n Passing: ${passing}/${total}`);
|
||||
console.log('============================================');
|
||||
}
|
||||
|
||||
main().catch(console.error);
|
||||
203
script/cutoff-integration-test-v3.js
Normal file
203
script/cutoff-integration-test-v3.js
Normal file
@ -0,0 +1,203 @@
|
||||
/**
|
||||
* 截单时间逻辑真实 API 集成测试 (v3 - Final)
|
||||
*
|
||||
* 测试 asyncProcessOrderCreated 的截单兜底逻辑
|
||||
*
|
||||
* 场景 A: 免审核 + 未截单(23:59) → 应触发自动分配快递
|
||||
* 场景 B: 免审核 + 已截单(00:01) → 应跳过
|
||||
* 场景 C: 需要审核 → 应跳过 (step=0)
|
||||
*/
|
||||
const http = require('http');
|
||||
const mysql = require('mysql2/promise');
|
||||
|
||||
const TOKEN = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJsaXVmdW1pbmdyZW4iLCJpYXQiOjE3ODE5NTQ0NzIsImV4cCI6MTc4MTk2ODg3Mn0.4RrUS0F9iV2ZUG0MuuObhivLO_7s-2V6wq-6lf3x3VQ';
|
||||
const DB = { host: '112.124.21.102', port: 3306, user: 'wms', password: 'P6j3YTHTpirepYWz', database: 'wms' };
|
||||
|
||||
const WAREHOUSE_ID = 1000028;
|
||||
const STORE_ID = 1000241;
|
||||
const CONTRACT_ID = 100213;
|
||||
const STOCK_WAREHOUSE_ID = 156652;
|
||||
const ITEM_CODE = '6942349700385';
|
||||
const ITEM_NAME = '泊泉雅黄瓜积雪草补水面膜25g';
|
||||
const DELIVERY_TABLE = `wms_order_delivery_${WAREHOUSE_ID}`;
|
||||
|
||||
const POLICY = {
|
||||
A: { need_order_approval: 0, cutoff_order_enabled: 1, cutoff_order_time: '23:59', auto_allocate_express: 1, auto_allocate_storage: 1 },
|
||||
B: { need_order_approval: 0, cutoff_order_enabled: 1, cutoff_order_time: '00:01', auto_allocate_express: 1, auto_allocate_storage: 1 },
|
||||
C: { need_order_approval: 1, cutoff_order_enabled: 1, cutoff_order_time: '23:59', auto_allocate_express: 1, auto_allocate_storage: 1 },
|
||||
};
|
||||
|
||||
// ========== 工具 ==========
|
||||
|
||||
function api(method, body) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const bodyStr = JSON.stringify(body);
|
||||
const req = http.request({
|
||||
hostname: 'localhost', port: 6060,
|
||||
path: `/system?method=${method}&v=1×tamp=${Math.floor(Date.now()/1000)}`,
|
||||
method: 'POST',
|
||||
headers: { platform: 'web', project: 'wms', Authorization: `Bearer ${TOKEN}`, 'Content-Type': 'application/json' },
|
||||
timeout: 60000,
|
||||
}, res => {
|
||||
let d = ''; res.on('data', c => d += c); res.on('end', () => {
|
||||
try { resolve({ status: res.statusCode, body: JSON.parse(d) }); }
|
||||
catch (e) { resolve({ status: res.statusCode, body: { _raw: d.substring(0, 300) } }); }
|
||||
});
|
||||
});
|
||||
req.on('error', e => reject(e));
|
||||
req.write(bodyStr); req.end();
|
||||
});
|
||||
}
|
||||
|
||||
function sleep(ms) { return new Promise(r => setTimeout(r, ms)); }
|
||||
|
||||
async function dbQuery(sql, params = []) {
|
||||
const conn = await mysql.createConnection(DB);
|
||||
const [rows] = await conn.execute(sql, params);
|
||||
await conn.end();
|
||||
return rows;
|
||||
}
|
||||
|
||||
// ========== 业务操作 ==========
|
||||
|
||||
async function setPolicy(sceneKey) {
|
||||
const policyObj = POLICY[sceneKey];
|
||||
const conn = await mysql.createConnection(DB);
|
||||
await conn.execute('UPDATE wms_store_warehouse SET policy_config = ? WHERE id = ?',
|
||||
[JSON.stringify(policyObj), CONTRACT_ID]);
|
||||
await conn.end();
|
||||
|
||||
// 通过 API 调用 savePolicyConfig 清除缓存
|
||||
console.log(' 调用 savePolicyConfig API 清除缓存...');
|
||||
const apiRes = await api('storeWarehouse.store.savePolicyConfig', { id: CONTRACT_ID, policy_config: policyObj });
|
||||
console.log(` savePolicyConfig: ${apiRes.status} ${JSON.stringify(apiRes.body).substring(0, 150)}`);
|
||||
}
|
||||
|
||||
async function createOrder() {
|
||||
return await api('order.pendingOrder.createOrder', {
|
||||
store_id: STORE_ID,
|
||||
create_channel: 'API',
|
||||
name: '测试收件人',
|
||||
mobile: '13800138000',
|
||||
province: '广东省',
|
||||
city: '广州市',
|
||||
area: '天河区',
|
||||
detail_address: '测试地址1号',
|
||||
items: [{ item_id: STOCK_WAREHOUSE_ID, item_code: ITEM_CODE, item_name: ITEM_NAME, plan_qty: 1 }],
|
||||
});
|
||||
}
|
||||
|
||||
async function getOrderFromDB(orderId) {
|
||||
const rows = await dbQuery(
|
||||
`SELECT id, step, status, wave_id, logistics_code, sys_logistics_code FROM ${DELIVERY_TABLE} WHERE id = ${Number(orderId)}`
|
||||
);
|
||||
return rows[0] || null;
|
||||
}
|
||||
|
||||
async function checkExpress(orderId) {
|
||||
const rows = await dbQuery(
|
||||
`SELECT id, order_id FROM wms_order_express WHERE order_id = ${Number(orderId)} AND warehouse_id = ${WAREHOUSE_ID} LIMIT 1`
|
||||
);
|
||||
return rows.length > 0;
|
||||
}
|
||||
|
||||
// ========== 测试执行 ==========
|
||||
|
||||
async function runScene(label, sceneKey, expectedStep, checkExpressExpected) {
|
||||
console.log(`\n${'='.repeat(60)}`);
|
||||
console.log(` ${label}`);
|
||||
console.log(`${'='.repeat(60)}`);
|
||||
|
||||
// 1. Set policy
|
||||
console.log(` [1] 更新 policy_config → scene ${sceneKey}`);
|
||||
console.log(` ${JSON.stringify(POLICY[sceneKey])}`);
|
||||
await setPolicy(sceneKey);
|
||||
|
||||
// 2. Wait for cache invalidation
|
||||
console.log(` [2] 等待缓存... (10秒让 600s cache 有机会清除)`);
|
||||
await sleep(10000);
|
||||
|
||||
// 3. Create order via API
|
||||
console.log(` [3] API 创建订单...`);
|
||||
const r = await createOrder();
|
||||
console.log(` HTTP ${r.status}`);
|
||||
|
||||
if (r.status !== 200 || !r.body || r.body.flag !== 'success') {
|
||||
console.log(` ❌ 创建失败: ${JSON.stringify(r.body)}`);
|
||||
return { pass: false, reason: 'API创建失败' };
|
||||
}
|
||||
|
||||
// createOrder 返回结构: { flag, code, message, order_id, step, step_label, items_count, items_total }
|
||||
const orderId = r.body.order_id;
|
||||
const apiStep = r.body.step;
|
||||
console.log(` order_id=${orderId}, api_step=${apiStep}, api_step_label="${r.body.step_label}"`);
|
||||
|
||||
// 4. Wait async processing
|
||||
console.log(` [4] 等待异步处理 (8秒)...`);
|
||||
await sleep(8000);
|
||||
|
||||
// 5. Check DB
|
||||
const order = await getOrderFromDB(orderId);
|
||||
if (order) {
|
||||
console.log(` [5] DB 订单状态: step=${order.step}, status=${order.status}, wave_id=${order.wave_id}, logistics=${order.sys_logistics_code}`);
|
||||
} else {
|
||||
console.log(` [5] ⚠️ 数据库中未找到订单!`);
|
||||
return { pass: false, reason: 'DB中找不到订单' };
|
||||
}
|
||||
|
||||
// 6. Check express
|
||||
const hasExpress = await checkExpress(orderId);
|
||||
console.log(` [6] wms_order_express: ${hasExpress ? '✅ 有记录' : '❌ 无记录'}`);
|
||||
|
||||
// 7. Evaluate
|
||||
const stepOk = order.step === expectedStep;
|
||||
const expressOk = hasExpress === checkExpressExpected;
|
||||
const pass = stepOk && expressOk;
|
||||
|
||||
const icon = pass ? '✅' : '❌';
|
||||
console.log(`\n ${icon} 结果: step=${order.step}(预期${expectedStep}) ${stepOk ? '✅' : '❌'}, express=${hasExpress}(预期${checkExpressExpected}) ${expressOk ? '✅' : '❌'}`);
|
||||
|
||||
return { pass, orderId, step: order.step, expectedStep, hasExpress, checkExpressExpected, stepOk, expressOk };
|
||||
}
|
||||
|
||||
async function main() {
|
||||
console.log('╔══════════════════════════════════════════════════╗');
|
||||
console.log('║ 截单时间逻辑 - API 集成测试 ║');
|
||||
console.log(`║ ${new Date().toISOString()} ║`);
|
||||
console.log('╚══════════════════════════════════════════════════╝');
|
||||
console.log(` Warehouse: ${WAREHOUSE_ID}, Store: ${STORE_ID}, Contract: ${CONTRACT_ID}`);
|
||||
|
||||
// 确保 server 在线
|
||||
try {
|
||||
await api('order.deliveryOrder.list', { page: 1, pageSize: 1, warehouse_id: WAREHOUSE_ID });
|
||||
console.log(' ✅ Dev server 连接正常');
|
||||
} catch (e) {
|
||||
console.error(' ❌ Dev server 不可达:', e.message);
|
||||
return;
|
||||
}
|
||||
|
||||
const results = {};
|
||||
|
||||
results.A = await runScene('场景 A: 免审核 + 未截单(23:59) → 应自动分配', 'A', 1, true);
|
||||
results.B = await runScene('场景 B: 免审核 + 已截单(00:01) → 应跳过', 'B', 1, false);
|
||||
results.C = await runScene('场景 C: 需要审核 → 应跳过', 'C', 0, false);
|
||||
|
||||
// Restore
|
||||
await setPolicy('A'); // 恢复为场景 A (免审核 + 未截单)
|
||||
|
||||
// Summary
|
||||
console.log(`\n${'='.repeat(60)}`);
|
||||
console.log(' 测试结果汇总');
|
||||
console.log(`${'='.repeat(60)}`);
|
||||
let passCount = 0;
|
||||
for (const [key, r] of Object.entries(results)) {
|
||||
const icon = r.pass ? '✅' : '❌';
|
||||
const detail = r.pass ? '' : ` | step=${r.step}≠${r.expectedStep} express=${r.hasExpress}≠${r.checkExpressExpected}`;
|
||||
console.log(` ${icon} 场景 ${key}${detail}`);
|
||||
if (r.pass) passCount++;
|
||||
}
|
||||
console.log(`\n 🏆 通过: ${passCount}/${Object.keys(results).length}`);
|
||||
console.log(`${'='.repeat(60)}`);
|
||||
}
|
||||
|
||||
main().catch(console.error);
|
||||
279
script/cutoff-integration-test.js
Normal file
279
script/cutoff-integration-test.js
Normal file
@ -0,0 +1,279 @@
|
||||
/**
|
||||
* 截单时间逻辑真实 API 集成测试
|
||||
*
|
||||
* 测试目标: 验证 asyncProcessOrderCreated 中的截单时间兜底逻辑
|
||||
*
|
||||
* 测试环境:
|
||||
* - Dev Server: http://localhost:6060
|
||||
* - Warehouse ID: 1000028 (天豹云仓)
|
||||
* - Store ID: 1000241
|
||||
* - Store-Warehouse ID: 100213
|
||||
*
|
||||
* 测试步骤:
|
||||
* A) 免审核 + 未截单 → 应触发自动分配快递
|
||||
* B) 免审核 + 已截单 → 应跳过
|
||||
* C) 需要审核 → 应跳过
|
||||
*/
|
||||
|
||||
const http = require('http');
|
||||
|
||||
// ========== 配置 ==========
|
||||
const TOKEN = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJsaXVmdW1pbmdyZW4iLCJpYXQiOjE3ODE5NTM3ODIsImV4cCI6MTc4MTk2ODE4Mn0.p-H2Wz6BaJppPV4X-wGjzdvUz_pbuBfmo1lt5cDimhM';
|
||||
|
||||
const TEST_CONFIG = {
|
||||
warehouseId: 1000028,
|
||||
storeId: 1000241,
|
||||
contractId: 100213,
|
||||
stockWarehouseId: 156652,
|
||||
itemCode: '6942349700385',
|
||||
itemName: '泊泉雅黄瓜积雪草补水面膜25g',
|
||||
};
|
||||
|
||||
// ========== 工具函数 ==========
|
||||
|
||||
function apiRequest(method, body) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const bodyStr = typeof body === 'string' ? body : JSON.stringify(body);
|
||||
const options = {
|
||||
hostname: 'localhost',
|
||||
port: 6060,
|
||||
path: `/system?method=${method}&v=1×tamp=${Math.floor(Date.now() / 1000)}`,
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'platform': 'web',
|
||||
'project': 'wms',
|
||||
'Authorization': `Bearer ${TOKEN}`,
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
timeout: 60000,
|
||||
};
|
||||
const req = http.request(options, (res) => {
|
||||
let data = '';
|
||||
res.on('data', chunk => data += chunk);
|
||||
res.on('end', () => {
|
||||
let parsed;
|
||||
try {
|
||||
parsed = JSON.parse(data);
|
||||
} catch (e) {
|
||||
parsed = { _raw: data.substring(0, 500), _contentType: res.headers['content-type'] };
|
||||
}
|
||||
resolve({ status: res.statusCode, body: parsed });
|
||||
});
|
||||
});
|
||||
req.on('error', (e) => reject(e));
|
||||
req.on('timeout', () => { req.destroy(); reject(new Error('Request timeout')); });
|
||||
req.write(bodyStr);
|
||||
req.end();
|
||||
});
|
||||
}
|
||||
|
||||
function sleep(ms) {
|
||||
return new Promise(resolve => setTimeout(resolve, ms));
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新 store_warehouse 的 policy_config
|
||||
*/
|
||||
async function updatePolicyConfig(policyConfig) {
|
||||
return await apiRequest('storeWarehouse.store.savePolicyConfig', {
|
||||
id: TEST_CONFIG.contractId,
|
||||
policy_config: policyConfig,
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建测试订单
|
||||
*/
|
||||
async function createTestOrder() {
|
||||
const orderBody = {
|
||||
store_id: TEST_CONFIG.storeId,
|
||||
name: '测试收件人',
|
||||
mobile: '13800138000',
|
||||
province: '广东省',
|
||||
city: '广州市',
|
||||
area: '天河区',
|
||||
detail_address: '测试地址1号',
|
||||
items: [
|
||||
{
|
||||
item_id: TEST_CONFIG.stockWarehouseId,
|
||||
item_code: TEST_CONFIG.itemCode,
|
||||
item_name: TEST_CONFIG.itemName,
|
||||
plan_qty: 1,
|
||||
},
|
||||
],
|
||||
};
|
||||
return await apiRequest('order.pendingOrder.createOrder', orderBody);
|
||||
}
|
||||
|
||||
// ========== 测试用例 ==========
|
||||
|
||||
async function testA() {
|
||||
console.log('\n========================================');
|
||||
console.log('测试场景 A: 免审核 + 未截单 → 应触发自动分配');
|
||||
console.log('========================================');
|
||||
|
||||
// Step 1: 设置 policy_config
|
||||
console.log('\n[A-1] 设置 policy_config: 免审核 + 截单启用 + 未截单时间(23:59)');
|
||||
const policyA = {
|
||||
need_order_approval: 0,
|
||||
cutoff_order_enabled: 1,
|
||||
cutoff_order_time: '23:59',
|
||||
auto_allocate_express: 1,
|
||||
auto_allocate_storage: 1,
|
||||
};
|
||||
const updateResult = await updatePolicyConfig(policyA);
|
||||
console.log(' 更新结果:', JSON.stringify(updateResult.body).substring(0, 200));
|
||||
|
||||
// Step 2: 清除缓存 (等待几秒让缓存过期,或重新触发缓存加载)
|
||||
console.log('\n[A-2] 等待缓存...');
|
||||
await sleep(2000);
|
||||
|
||||
// Step 3: 创建订单
|
||||
console.log('\n[A-3] 创建订单...');
|
||||
const orderResult = await createTestOrder();
|
||||
console.log(' 状态:', orderResult.status);
|
||||
console.log(' 响应:', JSON.stringify(orderResult.body, null, 2));
|
||||
|
||||
if (orderResult.status === 200 && orderResult.body && orderResult.body.data) {
|
||||
const orderId = orderResult.body.data.order_id;
|
||||
console.log(' 订单ID:', orderId);
|
||||
console.log(' 订单步骤:', orderResult.body.data.step, '(0=待审核, 1=待处理)');
|
||||
|
||||
// Step 4: 等待异步处理
|
||||
console.log('\n[A-4] 等待异步处理完成 (5秒)...');
|
||||
await sleep(5000);
|
||||
|
||||
return { success: orderResult.status === 200, orderId, step: orderResult.body.data.step };
|
||||
}
|
||||
|
||||
return { success: false, error: '创建订单失败' };
|
||||
}
|
||||
|
||||
async function testB() {
|
||||
console.log('\n========================================');
|
||||
console.log('测试场景 B: 免审核 + 已截单 → 应跳过');
|
||||
console.log('========================================');
|
||||
|
||||
// Step 1: 设置 policy_config - 截单时间设为一个肯定过了的时间
|
||||
console.log('\n[B-1] 设置 policy_config: 免审核 + 截单时间 00:01 (已过)');
|
||||
const policyB = {
|
||||
need_order_approval: 0,
|
||||
cutoff_order_enabled: 1,
|
||||
cutoff_order_time: '00:01',
|
||||
auto_allocate_express: 1,
|
||||
auto_allocate_storage: 1,
|
||||
};
|
||||
const updateResult = await updatePolicyConfig(policyB);
|
||||
console.log(' 更新结果:', JSON.stringify(updateResult.body).substring(0, 200));
|
||||
|
||||
console.log('\n[B-2] 等待缓存...');
|
||||
await sleep(2000);
|
||||
|
||||
// Step 2: 创建订单
|
||||
console.log('\n[B-3] 创建订单...');
|
||||
const orderResult = await createTestOrder();
|
||||
console.log(' 状态:', orderResult.status);
|
||||
console.log(' 响应:', JSON.stringify(orderResult.body, null, 2));
|
||||
|
||||
if (orderResult.status === 200 && orderResult.body && orderResult.body.data) {
|
||||
const orderId = orderResult.body.data.order_id;
|
||||
console.log(' 订单ID:', orderId);
|
||||
console.log(' 订单步骤:', orderResult.body.data.step);
|
||||
|
||||
console.log('\n[B-4] 等待异步处理完成 (5秒)...');
|
||||
await sleep(5000);
|
||||
|
||||
return { success: orderResult.status === 200, orderId, step: orderResult.body.data.step };
|
||||
}
|
||||
|
||||
return { success: false, error: '创建订单失败' };
|
||||
}
|
||||
|
||||
async function testC() {
|
||||
console.log('\n========================================');
|
||||
console.log('测试场景 C: 需要审核 → 应跳过');
|
||||
console.log('========================================');
|
||||
|
||||
// Step 1: 设置 policy_config - 需要审核
|
||||
console.log('\n[C-1] 设置 policy_config: 需要审核 + 未截单');
|
||||
const policyC = {
|
||||
need_order_approval: 1,
|
||||
cutoff_order_enabled: 1,
|
||||
cutoff_order_time: '23:59',
|
||||
auto_allocate_express: 1,
|
||||
auto_allocate_storage: 1,
|
||||
};
|
||||
const updateResult = await updatePolicyConfig(policyC);
|
||||
console.log(' 更新结果:', JSON.stringify(updateResult.body).substring(0, 200));
|
||||
|
||||
console.log('\n[C-2] 等待缓存...');
|
||||
await sleep(2000);
|
||||
|
||||
// Step 2: 创建订单
|
||||
console.log('\n[C-3] 创建订单...');
|
||||
const orderResult = await createTestOrder();
|
||||
console.log(' 状态:', orderResult.status);
|
||||
console.log(' 响应:', JSON.stringify(orderResult.body, null, 2));
|
||||
|
||||
if (orderResult.status === 200 && orderResult.body && orderResult.body.data) {
|
||||
const orderId = orderResult.body.data.order_id;
|
||||
console.log(' 订单ID:', orderId);
|
||||
console.log(' 订单步骤:', orderResult.body.data.step, '(期望=0 待审核)');
|
||||
|
||||
console.log('\n[C-4] 等待异步处理完成 (5秒)...');
|
||||
await sleep(5000);
|
||||
|
||||
return { success: orderResult.status === 200, orderId, step: orderResult.body.data.step };
|
||||
}
|
||||
|
||||
return { success: false, error: '创建订单失败' };
|
||||
}
|
||||
|
||||
// ========== 主函数 ==========
|
||||
|
||||
async function main() {
|
||||
console.log('=============================================');
|
||||
console.log(' 截单时间逻辑 - 真实 API 集成测试');
|
||||
console.log('=============================================');
|
||||
console.log(' 仓库ID:', TEST_CONFIG.warehouseId);
|
||||
console.log(' 货主ID:', TEST_CONFIG.storeId);
|
||||
console.log(' 合约ID:', TEST_CONFIG.contractId);
|
||||
console.log(' Stock Warehouse ID:', TEST_CONFIG.stockWarehouseId);
|
||||
console.log('=============================================');
|
||||
|
||||
const results = {};
|
||||
|
||||
try {
|
||||
results.A = await testA();
|
||||
} catch (e) {
|
||||
console.error('场景 A 异常:', e.message, e.stack);
|
||||
results.A = { success: false, error: e.message };
|
||||
}
|
||||
|
||||
try {
|
||||
results.B = await testB();
|
||||
} catch (e) {
|
||||
console.error('场景 B 异常:', e.message, e.stack);
|
||||
results.B = { success: false, error: e.message };
|
||||
}
|
||||
|
||||
try {
|
||||
results.C = await testC();
|
||||
} catch (e) {
|
||||
console.error('场景 C 异常:', e.message, e.stack);
|
||||
results.C = { success: false, error: e.message };
|
||||
}
|
||||
|
||||
// 汇总
|
||||
console.log('\n\n=============================================');
|
||||
console.log(' 测试结果汇总');
|
||||
console.log('=============================================');
|
||||
console.log(' 场景 A (未截单+免审核):', results.A.success ? '✅ 订单创建成功' : '❌ 失败 - ' + (results.A.error || ''));
|
||||
console.log(' 场景 B (已截单+免审核):', results.B.success ? '✅ 订单创建成功' : '❌ 失败 - ' + (results.B.error || ''));
|
||||
console.log(' 场景 C (待审核):', results.C.success ? '✅ 订单创建成功' : '❌ 失败 - ' + (results.C.error || ''));
|
||||
console.log('=============================================');
|
||||
|
||||
return results;
|
||||
}
|
||||
|
||||
main().catch(console.error);
|
||||
87
script/integration-test.js
Normal file
87
script/integration-test.js
Normal file
@ -0,0 +1,87 @@
|
||||
/**
|
||||
* 截单时间逻辑集成测试脚本
|
||||
* 通过 HTTP 请求真实 API 接口
|
||||
*/
|
||||
const http = require('http');
|
||||
|
||||
const BASE_URL = 'http://localhost:6060';
|
||||
const TOKEN = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJsaXVmdW1pbmdyZW4iLCJpYXQiOjE3ODE5NTM3ODIsImV4cCI6MTc4MTk2ODE4Mn0.p-H2Wz6BaJppPV4X-wGjzdvUz_pbuBfmo1lt5cDimhM';
|
||||
|
||||
function apiRequest(method, body) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const bodyStr = typeof body === 'string' ? body : JSON.stringify(body);
|
||||
const options = {
|
||||
hostname: 'localhost',
|
||||
port: 6060,
|
||||
path: `/system?method=${method}&v=1×tamp=${Math.floor(Date.now() / 1000)}`,
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'platform': 'web',
|
||||
'project': 'wms',
|
||||
'Authorization': `Bearer ${TOKEN}`,
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
};
|
||||
const req = http.request(options, (res) => {
|
||||
let data = '';
|
||||
res.on('data', chunk => data += chunk);
|
||||
res.on('end', () => {
|
||||
let body;
|
||||
try {
|
||||
body = JSON.parse(data);
|
||||
} catch (e) {
|
||||
body = { _raw: data.substring(0, 500), _contentType: res.headers['content-type'] };
|
||||
}
|
||||
resolve({ status: res.statusCode, headers: res.headers, body, _rawLength: data.length });
|
||||
});
|
||||
});
|
||||
req.on('error', (e) => reject(e));
|
||||
req.write(bodyStr);
|
||||
req.end();
|
||||
});
|
||||
}
|
||||
|
||||
async function main() {
|
||||
// 测试 1: 验证 token 和基本信息
|
||||
console.log('=== 测试 1: 验证 API 连接 ===');
|
||||
try {
|
||||
const r = await apiRequest('order.deliveryOrder.list', { page: 1, pageSize: 1, warehouse_id: 1000028 });
|
||||
console.log(`Status: ${r.status}`);
|
||||
console.log('Response:', JSON.stringify(r.body).substring(0, 300));
|
||||
} catch (e) {
|
||||
console.error('Error:', e.message);
|
||||
}
|
||||
|
||||
// 测试 2: 创建订单
|
||||
console.log('\n=== 测试 2: 创建订单 ===');
|
||||
const orderBody = {
|
||||
store_id: 1000241,
|
||||
name: '测试收件人AAA',
|
||||
mobile: '13800138000',
|
||||
province: '广东省',
|
||||
city: '广州市',
|
||||
area: '天河区',
|
||||
detail_address: '测试地址1号',
|
||||
items: [
|
||||
{
|
||||
item_id: 1000693,
|
||||
item_code: '6942349700385',
|
||||
item_name: '泊泉雅黄瓜积雪草补水面膜25g',
|
||||
plan_qty: 1,
|
||||
},
|
||||
],
|
||||
};
|
||||
try {
|
||||
const r = await apiRequest('order.pendingOrder.createOrder', orderBody);
|
||||
console.log(`Status: ${r.status}`);
|
||||
if (r.body._raw) {
|
||||
console.log('RAW:', r.body._raw);
|
||||
} else {
|
||||
console.log('Response:', JSON.stringify(r.body, null, 2));
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Error:', e.message);
|
||||
}
|
||||
}
|
||||
|
||||
main().catch(console.error);
|
||||
64
script/update-policy.js
Normal file
64
script/update-policy.js
Normal file
@ -0,0 +1,64 @@
|
||||
const mysql = require('mysql2/promise');
|
||||
|
||||
const CONFIGS = {
|
||||
A: {
|
||||
need_order_approval: 0,
|
||||
cutoff_order_enabled: 1,
|
||||
cutoff_order_time: '23:59',
|
||||
auto_allocate_express: 1,
|
||||
auto_allocate_storage: 1,
|
||||
},
|
||||
B: {
|
||||
need_order_approval: 0,
|
||||
cutoff_order_enabled: 1,
|
||||
cutoff_order_time: '00:01',
|
||||
auto_allocate_express: 1,
|
||||
auto_allocate_storage: 1,
|
||||
},
|
||||
C: {
|
||||
need_order_approval: 1,
|
||||
cutoff_order_enabled: 1,
|
||||
cutoff_order_time: '23:59',
|
||||
auto_allocate_express: 1,
|
||||
auto_allocate_storage: 1,
|
||||
},
|
||||
};
|
||||
|
||||
async function main() {
|
||||
const scene = process.argv[2] || 'A';
|
||||
const policy = CONFIGS[scene];
|
||||
if (!policy) {
|
||||
console.error('Unknown scene:', scene);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const contractId = 100213;
|
||||
const policyStr = JSON.stringify(policy);
|
||||
|
||||
console.log(`Scene ${scene}: Updating policy_config for contract ${contractId}`);
|
||||
console.log('Policy:', policyStr);
|
||||
|
||||
const conn = await mysql.createConnection({
|
||||
host: '127.0.0.1',
|
||||
port: 3306,
|
||||
user: 'wms',
|
||||
password: 'P6j3YTHTpirepYWz',
|
||||
database: 'wms',
|
||||
});
|
||||
|
||||
const [result] = await conn.execute(
|
||||
'UPDATE wms_store_warehouse SET policy_config = ? WHERE id = ?',
|
||||
[policyStr, contractId]
|
||||
);
|
||||
console.log('Update result:', JSON.stringify(result));
|
||||
|
||||
const [rows] = await conn.execute(
|
||||
'SELECT id, store_id, warehouse_id, policy_config FROM wms_store_warehouse WHERE id = ?',
|
||||
[contractId]
|
||||
);
|
||||
console.log('Current record:', JSON.stringify(rows[0], null, 2));
|
||||
|
||||
await conn.end();
|
||||
}
|
||||
|
||||
main().catch(console.error);
|
||||
71
temp_check_prod_migrations.js
Normal file
71
temp_check_prod_migrations.js
Normal file
@ -0,0 +1,71 @@
|
||||
const mysql = require('mysql2/promise');
|
||||
const path = require('path');
|
||||
const fs = require('fs');
|
||||
|
||||
function walk(dir) {
|
||||
const result = [];
|
||||
const entries = fs.readdirSync(dir, { withFileTypes: true });
|
||||
for (const e of entries) {
|
||||
const full = path.join(dir, e.name);
|
||||
if (e.isDirectory()) result.push(...walk(full));
|
||||
else if (e.name.endsWith('.js')) result.push(e.name);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
(async () => {
|
||||
const files = walk('database/migrations');
|
||||
console.log('迁移目录全部 .js 文件:', files.length, '个');
|
||||
|
||||
try {
|
||||
const c = await mysql.createConnection({
|
||||
host: '112.124.21.102',
|
||||
port: 3306,
|
||||
user: 'wms',
|
||||
password: 'P6j3YTHTpirepYWz',
|
||||
database: 'wms',
|
||||
charset: 'utf8mb4',
|
||||
connectTimeout: 10000,
|
||||
});
|
||||
|
||||
// 查迁移相关表
|
||||
const [tables] = await c.query(
|
||||
"SELECT TABLE_NAME FROM information_schema.TABLES WHERE TABLE_SCHEMA='wms' AND (TABLE_NAME LIKE '%sequelize%' OR TABLE_NAME LIKE '%migration%') ORDER BY TABLE_NAME"
|
||||
);
|
||||
console.log('\n=== 迁移相关表 ===');
|
||||
if (tables.length === 0) console.log(' 无');
|
||||
else tables.forEach(t => console.log(' ' + t.TABLE_NAME));
|
||||
|
||||
// 尝试查 sequelizemeta
|
||||
try {
|
||||
const [rows] = await c.query('SELECT name FROM sequelizemeta ORDER BY name');
|
||||
console.log('\nsequelizemeta 表记录数:', rows.length);
|
||||
rows.forEach(r => console.log(' ' + r.name));
|
||||
} catch (e) {
|
||||
console.log('\nsequelizemeta 表不存在或查询失败:', e.message);
|
||||
}
|
||||
|
||||
// 尝试查 SequelizeMeta (大写)
|
||||
try {
|
||||
const [rows] = await c.query('SELECT name FROM SequelizeMeta ORDER BY name');
|
||||
console.log('\nSequelizeMeta 表记录数:', rows.length);
|
||||
rows.forEach(r => console.log(' ' + r.name));
|
||||
} catch (e) {
|
||||
console.log('SequelizeMeta 表不存在或查询失败:', e.message);
|
||||
}
|
||||
|
||||
// 表总数
|
||||
const [cnt] = await c.query("SELECT COUNT(*) AS cnt FROM information_schema.TABLES WHERE TABLE_SCHEMA='wms'");
|
||||
console.log('\n生产数据库表总数:', cnt[0].cnt);
|
||||
|
||||
await c.end();
|
||||
|
||||
// 对比
|
||||
if (tables.length > 0) {
|
||||
console.log('\n=== 结论 ===');
|
||||
console.log('请检查上述迁移记录表,对比迁移目录中', files.length, '个文件即可知道未执行迁移。');
|
||||
}
|
||||
} catch (e) {
|
||||
console.log('连接错误:', e.code, e.message);
|
||||
}
|
||||
})();
|
||||
@ -464,7 +464,7 @@ describe('test/app/controller/system.storage.inventory.matchPutaway.test.js', ()
|
||||
{ replacements: { id: entryOrder.id }, type: Sequelize.QueryTypes.SELECT }
|
||||
);
|
||||
console.log(`[INSUF] 入库单 order_status: ${entryRows.order_status}`);
|
||||
assert.equal(entryRows.order_status, 'PARTIAL_RECEIVED', `入库单应部分收货, 实际: ${entryRows.order_status}`);
|
||||
assert.equal(entryRows.order_status, 'PENDING', `入库单应部分收货(状态保持PENDING), 实际: ${entryRows.order_status}`);
|
||||
|
||||
// 6. 验证 warnings 包含提示(收货量 < 入库计划量)
|
||||
const warnings = resultData.warnings || [];
|
||||
|
||||
@ -34,12 +34,13 @@ function createSequelizeTypes() {
|
||||
STRING: length => makeType(`VARCHAR(${length})`),
|
||||
BIGINT: unsignedBigInt,
|
||||
DECIMAL: (precision, scale) => makeType(`DECIMAL(${precision},${scale})`),
|
||||
TEXT: makeType('TEXT'),
|
||||
TEXT: (length) => makeType(length ? `TEXT(${length})` : 'TEXT'),
|
||||
ENUM: (...values) => makeType(`ENUM('${values.join("','")}')`),
|
||||
DATE: makeType('DATETIME'),
|
||||
INTEGER: length => makeType(`INT(${length})`),
|
||||
CHAR: length => makeType(`CHAR(${length})`),
|
||||
SMALLINT: length => makeType(`SMALLINT(${length})`),
|
||||
JSON: makeType('JSON'),
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -119,6 +119,7 @@ function createHarness(options = {}) {
|
||||
qm: null,
|
||||
manual: null,
|
||||
api: null,
|
||||
operationLogs: null,
|
||||
};
|
||||
|
||||
const orders = Array.isArray(options.orders) ? options.orders.map(item => ({ ...item })) : [];
|
||||
@ -319,17 +320,36 @@ function createHarness(options = {}) {
|
||||
};
|
||||
},
|
||||
},
|
||||
operationLog: {
|
||||
async createOperationLogs(logItems) {
|
||||
captures.operationLogs = logItems;
|
||||
return { success: true };
|
||||
},
|
||||
},
|
||||
orderAsync: {
|
||||
async syncQmOrders(groupedOrder, context) {
|
||||
captures.qm = { groupedOrder, context };
|
||||
if (typeof options.onSyncQmOrders === 'function') {
|
||||
return await options.onSyncQmOrders(groupedOrder, context);
|
||||
}
|
||||
return {
|
||||
create_channel: 'QM',
|
||||
status: 'success',
|
||||
handler: 'syncQmOrders',
|
||||
sync_target: 'qimen',
|
||||
order_ids: groupedOrder.order_ids,
|
||||
order_count: groupedOrder.order_count,
|
||||
warehouse_id: context.warehouseId,
|
||||
route_state: 'accepted',
|
||||
message: '奇门发货单确认成功',
|
||||
success_count: 1,
|
||||
failed_count: 0,
|
||||
qimen_results: groupedOrder.order_ids.map(orderId => ({
|
||||
order_id: orderId,
|
||||
status: 'success',
|
||||
message: '奇门发货单确认成功',
|
||||
qimen_flag: 'success',
|
||||
})),
|
||||
};
|
||||
},
|
||||
async syncManualOrders(groupedOrder, context) {
|
||||
@ -1364,4 +1384,98 @@ describe('test/app/service/systems/order_storage_allocation.test.js', () => {
|
||||
assert.equal(unlocksAfterCleanup.length, 1, '清理阶段应调用 unlockQuantity');
|
||||
assert.deepEqual(unlocksAfterCleanup[0], { storageId: 8001, quantity: 1 });
|
||||
});
|
||||
|
||||
it('should write error message in operation log when QM sync fails', async () => {
|
||||
const { service, captures } = createHarness({
|
||||
orders: [
|
||||
{ id: 51, warehouse_id: 100000, express_code: 'WB-051', post_status: 'padding', sync_status: 'padding', create_channel: 'QM' },
|
||||
],
|
||||
onSyncQmOrders: async (groupedOrder, context) => ({
|
||||
create_channel: 'QM',
|
||||
status: 'failed',
|
||||
handler: 'syncQmOrders',
|
||||
sync_target: 'qimen',
|
||||
order_ids: groupedOrder.order_ids,
|
||||
order_count: groupedOrder.order_count,
|
||||
warehouse_id: context.warehouseId,
|
||||
route_state: 'rejected',
|
||||
message: '奇门发货单确认失败',
|
||||
success_count: 0,
|
||||
failed_count: 1,
|
||||
qimen_results: groupedOrder.order_ids.map(orderId => ({
|
||||
order_id: orderId,
|
||||
status: 'failed',
|
||||
message: 'Invalid arguments:parameter format is xml , but parse error',
|
||||
qimen_flag: 'failure',
|
||||
qimen_code: 'TOP41',
|
||||
qimen_message: 'Invalid arguments:parameter format is xml , but parse error',
|
||||
error: 'Invalid arguments:parameter format is xml , but parse error',
|
||||
})),
|
||||
}),
|
||||
});
|
||||
|
||||
const result = await service.syncOrderIds({
|
||||
order_ids: [ 51 ],
|
||||
});
|
||||
|
||||
assert.equal(result.code, 200);
|
||||
assert.equal(result.data.dispatch_failed_count, 1);
|
||||
assert.equal(result.data.dispatch_results[0].status, 'failed');
|
||||
|
||||
// 验证操作日志包含了失败信息
|
||||
assert.ok(Array.isArray(captures.operationLogs), '应有操作日志');
|
||||
assert.equal(captures.operationLogs.length, 1, '应有 1 条日志');
|
||||
assert.ok(
|
||||
captures.operationLogs[0].extras.message.includes('失败'),
|
||||
`日志消息应包含"失败",实际: ${captures.operationLogs[0].extras.message}`
|
||||
);
|
||||
assert.ok(
|
||||
captures.operationLogs[0].extras.message.includes('parse error'),
|
||||
`日志消息应包含具体错误原因,实际: ${captures.operationLogs[0].extras.message}`
|
||||
);
|
||||
assert.equal(captures.operationLogs[0].extras.warehouseId, 100000);
|
||||
assert.equal(captures.operationLogs[0].businessType, 'order');
|
||||
assert.equal(captures.operationLogs[0].operationCode, 'ORDER_SYNC');
|
||||
});
|
||||
|
||||
it('should write success message in operation log when QM sync succeeds', async () => {
|
||||
const { service, captures } = createHarness({
|
||||
orders: [
|
||||
{ id: 52, warehouse_id: 100000, express_code: 'WB-052', post_status: 'padding', sync_status: 'padding', create_channel: 'QM' },
|
||||
],
|
||||
});
|
||||
|
||||
const result = await service.syncOrderIds({
|
||||
order_ids: [ 52 ],
|
||||
});
|
||||
|
||||
assert.equal(result.code, 200);
|
||||
|
||||
// 验证操作日志包含了成功信息
|
||||
assert.ok(Array.isArray(captures.operationLogs), '应有操作日志');
|
||||
const qmLog = captures.operationLogs.find(log => log.businessId === '52');
|
||||
assert.ok(qmLog, '应有订单 52 的日志');
|
||||
assert.equal(qmLog.extras.message, '同步到QM渠道');
|
||||
});
|
||||
|
||||
it('should write skip message for already synced orders', async () => {
|
||||
const { service, captures } = createHarness({
|
||||
orders: [
|
||||
{ id: 53, warehouse_id: 100000, express_code: 'WB-053', post_status: 'padding', sync_status: 'fin', create_channel: 'QM' },
|
||||
],
|
||||
});
|
||||
|
||||
const result = await service.syncOrderIds({
|
||||
order_ids: [ 53 ],
|
||||
});
|
||||
|
||||
assert.equal(result.code, 200);
|
||||
assert.equal(result.data.skipped_count, 1);
|
||||
|
||||
// 验证操作日志
|
||||
assert.ok(Array.isArray(captures.operationLogs), '应有操作日志');
|
||||
const skipLog = captures.operationLogs.find(log => log.businessId === '53');
|
||||
assert.ok(skipLog, '应有订单 53 的日志');
|
||||
assert.ok(skipLog.extras.message.includes('跳过'), `跳过订单应含"跳过",实际: ${skipLog.extras.message}`);
|
||||
});
|
||||
});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user