- 迁移:inbound_orders / outbound_orders 增加 subsidiary_id 与索引,按仓库回填 - 单据货主由仓库决定:创建写入、改仓库同步,接口不接受直写 subsidiary_id - 入库单/出库单列表返回 subsidiary_name 并新增货主筛选;详情/编辑/删除/审核/ 推送/完成/取消/恢复/作废/驳回与明细接口统一加货主越界 403 - 出入库记录按仓库归属货主:列表与导出收窄、返回 subsidiary_id/subsidiary_name、 新增货主列与筛选 - 导出:入库单/出库单/出入库记录新增货主列并按所在公司权限收窄 - 新增 resolveAccountNameMap:列表/详情返回 creator_name/auditor_name/voider_name, 创建人展示员工名称(principal_users.name),不再回退成邮箱账号 - 前端:三个列表新增货主列与筛选,创建人/作废人展示改为员工名称 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
75 lines
5.5 KiB
JavaScript
75 lines
5.5 KiB
JavaScript
'use strict';
|
||
|
||
/**
|
||
* 出库单模型,对应 outbound_orders 表(单据头)
|
||
* @param {Egg.Application} app egg application
|
||
* @return {object} outboundOrder model
|
||
*/
|
||
module.exports = app => {
|
||
const { BIGINT, STRING, TINYINT, DECIMAL, INTEGER, DATE, JSON } = app.Sequelize;
|
||
|
||
const OutboundOrder = app.model.define('outbound_order', {
|
||
id: { type: BIGINT.UNSIGNED, primaryKey: true, autoIncrement: true, comment: '主键' },
|
||
bill_no: { type: STRING(50), allowNull: false, comment: '出库单号' },
|
||
principal_id: { type: BIGINT.UNSIGNED, allowNull: false, comment: '所属主体ID' },
|
||
subsidiary_id: { type: BIGINT.UNSIGNED, comment: '所属货主(下属公司ID),跟随仓库' },
|
||
shop_id: { type: BIGINT.UNSIGNED, comment: '目标店铺/仓库ID' },
|
||
outbound_type: {
|
||
type: STRING(20),
|
||
allowNull: false,
|
||
defaultValue: 'PTCK',
|
||
comment: 'WMS 出库单类型:PTCK 普通出库单 / DBCK 调拨出库 / B2BCK B2B出库 / QTCK 其他出库 / CGTH 采购退货出库单',
|
||
},
|
||
status: { type: TINYINT, allowNull: false, defaultValue: 1, comment: '状态:1待出库 2已出库 3已取消' },
|
||
customer: { type: STRING(255), comment: '客户/收货方' },
|
||
operator: { type: STRING(50), comment: '操作人' },
|
||
created_by: { type: BIGINT.UNSIGNED, comment: '创建人ID(关联 users)' },
|
||
warehouse_id: { type: BIGINT.UNSIGNED, comment: '仓库ID(关联 warehouses)' },
|
||
item_total: { type: DECIMAL(12, 3), allowNull: false, defaultValue: 0, comment: '商品总数(明细数量合计)' },
|
||
item_kind: { type: INTEGER.UNSIGNED, allowNull: false, defaultValue: 0, comment: '商品种类数(不重复商品数)' },
|
||
total_amount: { type: DECIMAL(12, 2), allowNull: false, defaultValue: 0, comment: '单据总金额' },
|
||
remark: { type: STRING(255), comment: '备注' },
|
||
|
||
// ---------- 快递公司(推送 stockout.create 的 deliveryOrder.logisticsCode) ----------
|
||
express_code: { type: STRING(50), comment: '快递公司编码:推送为 deliveryOrder.logisticsCode,出库确认回传后按 WMS 实际承运覆盖(可能转快递)' },
|
||
express_name: { type: STRING(200), comment: '快递公司名称:推送时按字典解析,出库确认回传后按 WMS 实际承运覆盖' },
|
||
|
||
// ---------- 收件人(奇门 receiverInfo 扁平落库,列名对齐 WMS wms_order_stockout) ----------
|
||
receiver_name: { type: STRING(50), comment: '收件人姓名(receiverInfo.name)' },
|
||
receiver_company: { type: STRING(200), comment: '收件人公司名称(receiverInfo.company)' },
|
||
receiver_tel: { type: STRING(50), comment: '收件人固定电话(receiverInfo.tel)' },
|
||
receiver_mobile: { type: STRING(50), comment: '收件人移动电话(receiverInfo.mobile)' },
|
||
receiver_email: { type: STRING(100), comment: '收件人邮箱(receiverInfo.email)' },
|
||
receiver_country_code: { type: STRING(50), comment: '收件人国家二字码(receiverInfo.countryCode)' },
|
||
receiver_province: { type: STRING(50), comment: '收件人省份(receiverInfo.province)' },
|
||
receiver_city: { type: STRING(50), comment: '收件人城市(receiverInfo.city)' },
|
||
receiver_area: { type: STRING(50), comment: '收件人区县(receiverInfo.area)' },
|
||
receiver_town: { type: STRING(50), comment: '收件人街道/镇(receiverInfo.town)' },
|
||
receiver_detail_address: { type: STRING(200), comment: '收件人详细地址(receiverInfo.detailAddress)' },
|
||
receiver_zip_code: { type: STRING(50), comment: '收件人邮编(receiverInfo.zipCode)' },
|
||
receiver_id: { type: STRING(50), comment: '收件人证件号(receiverInfo.id)' },
|
||
|
||
stock_deducted: { type: TINYINT.UNSIGNED, allowNull: false, defaultValue: 0, comment: '发货通知(notify.delivery)是否已扣减库存:1是 0否(幂等)' },
|
||
stock_locked: { type: TINYINT.UNSIGNED, allowNull: false, defaultValue: 0, comment: '推送锁定库存标记:1=已锁定(重试不重复锁定,确认扣减/释放后置 0),0=未锁定' },
|
||
waybill_codes: { type: JSON, allowNull: true, comment: '运单号集合(WMS 出库确认 packages.package[].expressCode,多包裹时为数组;列名对齐 wms_order_stockout)' },
|
||
pushed_at: { type: DATE, allowNull: true, comment: 'WMS 推送时间' },
|
||
wms_push_result: { type: JSON, allowNull: true, comment: 'WMS 推送结果(外部单号/返回码/消息/原始报文)' },
|
||
void_at: { type: DATE, allowNull: true, comment: '作废时间(状态 5=已作废)' },
|
||
void_by: { type: BIGINT.UNSIGNED, allowNull: true, comment: '作废人ID(关联 users)' },
|
||
void_reason: { type: STRING(255), allowNull: true, comment: '作废原因' },
|
||
created_at: { type: DATE, comment: '创建时间' },
|
||
updated_at: { type: DATE, comment: '更新时间' },
|
||
});
|
||
|
||
OutboundOrder.associate = () => {
|
||
app.model.OutboundOrder.belongsTo(app.model.Principal, { foreignKey: 'principal_id', as: 'principal' });
|
||
app.model.OutboundOrder.belongsTo(app.model.PrincipalSubsidiary, { foreignKey: 'subsidiary_id', as: 'subsidiary' });
|
||
app.model.OutboundOrder.belongsTo(app.model.Shop, { foreignKey: 'shop_id', as: 'shop' });
|
||
app.model.OutboundOrder.belongsTo(app.model.Warehouse, { foreignKey: 'warehouse_id', as: 'warehouse' });
|
||
app.model.OutboundOrder.belongsTo(app.model.User, { foreignKey: 'created_by', as: 'creator' });
|
||
app.model.OutboundOrder.belongsTo(app.model.User, { foreignKey: 'void_by', as: 'voider' });
|
||
};
|
||
|
||
return OutboundOrder;
|
||
};
|