- 出入库记录(库存流水):新增 stock_records 表/模型/只读接口(列表 + 业务动作选项)与「出入库记录」菜单; 库存变动统一收敛到 app/utils/stockRecord.js#applyStockChange,与流水写入同事务(含变动前后总/锁定/可用数量) - 发货单:审核(1→2) 按明细锁定库存、发货确认(3→4) 扣减、推送失败退回/驳回/取消/作废释放(新增 stock_locked 列); 恢复(9→1) 时曾推送过的单据换号(WMS 取消后原单号仍被占用,沿用旧号重推会被判「订单已存在」) - 出库单:新增快递(express_code/express_name)、收件人(receiver_*) 与多运单号(express_codes) 字段; 推送报文补齐 logisticsCode/receiverInfo;新增出库单推送服务与定时任务 - 快递:多运单号回填、仓库快递映射(warehouse_express_mappings) 与快递字典补录等迁移 - 契约:补充出入库记录、出库单快递/收件人等定义(swagger.json 为本地生成、不入库)
49 lines
2.8 KiB
JavaScript
49 lines
2.8 KiB
JavaScript
'use strict';
|
||
|
||
/**
|
||
* 仓库快递映射模型,对应 warehouse_express_mappings 表
|
||
*
|
||
* 用途:外部(WMS)回传的快递编码可能是仓库维度的「自定义编码」(对齐 WMS `wms_express_setting`:
|
||
* `code`=业务自定义编码如 SF.KY/KYSF,`express_code`=系统标准编码),本表把
|
||
* `custom_code`(自定义编码)映射到 `express_code`(OMS/标准编码,关联 express_companies.code)。
|
||
*
|
||
* 出库确认(stockout.confirm)/ 发货确认(deliveryorder.confirm)回传时按以下顺序解析:
|
||
* ① 命中本表映射(warehouse_id + custom_code,且 status=1)→ 用映射到的默认快递编码;
|
||
* ② 未命中 → 外部编码本身若在快递公司字典里,直接兜底;
|
||
* ③ 都没有 → 报错「外部传入的快递编码(xxx)没有关联映射,请到 OMS 外部仓库完成映射配置」。
|
||
*
|
||
* @param {Egg.Application} app egg application
|
||
* @return {object} warehouseExpressMapping model
|
||
*/
|
||
module.exports = app => {
|
||
const { BIGINT, STRING, TINYINT, DATE } = app.Sequelize;
|
||
|
||
const WarehouseExpressMapping = app.model.define('warehouse_express_mapping', {
|
||
id: { type: BIGINT.UNSIGNED, primaryKey: true, autoIncrement: true, comment: '主键' },
|
||
principal_id: { type: BIGINT.UNSIGNED, allowNull: false, comment: '所属主体ID(冗余仓库主体,便于隔离)' },
|
||
warehouse_id: { type: BIGINT.UNSIGNED, allowNull: false, comment: '仓库ID(关联 warehouses,映射按仓库维度)' },
|
||
express_code: { type: STRING(50), allowNull: false, comment: '默认快递编码(OMS/标准编码,关联 express_companies.code)' },
|
||
custom_code: { type: STRING(50), allowNull: false, comment: '自定义编码(外部传入的快递编码,如 SF.KY/KYSF)' },
|
||
status: { type: TINYINT, allowNull: false, defaultValue: 1, comment: '状态:1启用 0禁用(仅启用参与回传解析)' },
|
||
remark: { type: STRING(255), comment: '备注' },
|
||
created_at: { type: DATE, comment: '创建时间' },
|
||
updated_at: { type: DATE, comment: '更新时间' },
|
||
}, {
|
||
tableName: 'warehouse_express_mappings',
|
||
comment: '仓库快递映射表(外部快递编码 → OMS 默认快递编码)',
|
||
});
|
||
|
||
WarehouseExpressMapping.associate = () => {
|
||
app.model.WarehouseExpressMapping.belongsTo(app.model.Warehouse, { foreignKey: 'warehouse_id', as: 'warehouse' });
|
||
app.model.WarehouseExpressMapping.belongsTo(app.model.Principal, { foreignKey: 'principal_id', as: 'principal' });
|
||
// 默认快递编码 → 快递公司字典(express_companies.code 全局唯一),用于表格展示「快递名称」
|
||
app.model.WarehouseExpressMapping.belongsTo(app.model.ExpressCompany, {
|
||
foreignKey: 'express_code',
|
||
targetKey: 'code',
|
||
as: 'expressCompany',
|
||
});
|
||
};
|
||
|
||
return WarehouseExpressMapping;
|
||
};
|