Compare commits
6 Commits
2817d17fc7
...
223e42fcf6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
223e42fcf6 | ||
|
|
897328a4f4 | ||
|
|
7d92522c2f | ||
|
|
525e222351 | ||
|
|
70ad3153a1 | ||
|
|
276d76f65d |
@ -4186,7 +4186,10 @@ class WaveService extends OrderBaseService {
|
||||
SUM(CASE WHEN od.print_status = 'fin' THEN 1 ELSE 0 END) AS print_fin_count,
|
||||
SUM(CASE WHEN od.inspection_status = 'fin' THEN 1 ELSE 0 END) AS review_fin_count,
|
||||
SUM(CASE WHEN od.inspection_status = 'error' THEN 1 ELSE 0 END) AS review_error_count,
|
||||
SUM(CASE WHEN od.inspection_status NOT IN ('fin', 'error') THEN 1 ELSE 0 END) AS review_none_count
|
||||
SUM(CASE WHEN od.inspection_status NOT IN ('fin', 'error') THEN 1 ELSE 0 END) AS review_none_count,
|
||||
SUM(CASE WHEN od.pick_status = 'none' THEN 1 ELSE 0 END) AS pick_none_count,
|
||||
SUM(CASE WHEN od.pick_status = 'fin' THEN 1 ELSE 0 END) AS pick_fin_count,
|
||||
SUM(CASE WHEN od.pick_status = 'error' THEN 1 ELSE 0 END) AS pick_error_count
|
||||
FROM (
|
||||
SELECT wave_id
|
||||
FROM wms_wave_batch
|
||||
@ -4232,7 +4235,10 @@ class WaveService extends OrderBaseService {
|
||||
COALESCE(wave_order_stats.print_fin_count, 0) AS print_fin_count,
|
||||
COALESCE(wave_order_stats.review_fin_count, 0) AS review_fin_count,
|
||||
COALESCE(wave_order_stats.review_error_count, 0) AS review_error_count,
|
||||
COALESCE(wave_order_stats.review_none_count, 0) AS review_none_count
|
||||
COALESCE(wave_order_stats.review_none_count, 0) AS review_none_count,
|
||||
COALESCE(wave_order_stats.pick_none_count, 0) AS pick_none_count,
|
||||
COALESCE(wave_order_stats.pick_fin_count, 0) AS pick_fin_count,
|
||||
COALESCE(wave_order_stats.pick_error_count, 0) AS pick_error_count
|
||||
${batchListFromSql}
|
||||
ORDER BY wb.total_orders DESC, wb.wave_id DESC
|
||||
LIMIT :limit OFFSET :offset
|
||||
@ -4300,6 +4306,9 @@ class WaveService extends OrderBaseService {
|
||||
const expressErrorCount = Number(batch && batch.post_error_count || 0);
|
||||
const printNoneCount = Number(batch && batch.print_none_count || 0);
|
||||
const printFinCount = Number(batch && batch.print_fin_count || 0);
|
||||
const pickNoneCount = Number(batch && batch.pick_none_count || 0);
|
||||
const pickFinCount = Number(batch && batch.pick_fin_count || 0);
|
||||
const pickErrorCount = Number(batch && batch.pick_error_count || 0);
|
||||
const reviewFinCount = Number(batch && batch.review_fin_count || 0);
|
||||
const reviewErrorCount = Number(batch && batch.review_error_count || 0);
|
||||
const unreviewedOrderCount = orderCount - reviewFinCount;
|
||||
@ -4341,6 +4350,12 @@ class WaveService extends OrderBaseService {
|
||||
partial: '部分打印',
|
||||
finished: '已打印',
|
||||
}),
|
||||
pick_assignment_status: this.resolveAssignmentStatus(orderCount, pickNoneCount, pickFinCount, pickErrorCount, {
|
||||
none: '未拣货',
|
||||
partial: '部分拣货',
|
||||
finished: '已拣货',
|
||||
error: '拣货异常',
|
||||
}),
|
||||
review_assignment_status: reviewAssignmentStatus,
|
||||
unreviewed_order_count: unreviewedOrderCount,
|
||||
};
|
||||
|
||||
@ -317,15 +317,17 @@ class DeliveryOrderService extends Service {
|
||||
*
|
||||
* 优先级:
|
||||
* 1. 先匹配平台列表里的基础平台项;
|
||||
* 2. 再匹配平台列表里的系统设置项。
|
||||
* 2. 再匹配平台列表里的系统设置项;
|
||||
* 3. 兜底:签约策略 default_platform_code(货主-仓库级)→ 货主 subject_config.default_platform_code。
|
||||
*
|
||||
* @param {string} sourcePlatformCode 外部平台编码。
|
||||
* @param {Object} storeSubjectConfig 货主签约配置。
|
||||
* @param {Object} [policyConfig={}] 货主-仓库签约策略配置。
|
||||
* @param {Object} [info={}] 上下文信息。
|
||||
* @param {Array<Object>} [operationLogs=[]] 待写入的操作日志数组。
|
||||
* @return {Promise<Object>} 平台快照。
|
||||
*/
|
||||
async resolvePlatformSnapshot(sourcePlatformCode, storeSubjectConfig, info = {}, operationLogs = []) {
|
||||
async resolvePlatformSnapshot(sourcePlatformCode, storeSubjectConfig, policyConfig = {}, info = {}, operationLogs = []) {
|
||||
const platformList = await this.ctx.service.systems.platform.getPlatformList(
|
||||
false,
|
||||
false,
|
||||
@ -348,24 +350,29 @@ class DeliveryOrderService extends Service {
|
||||
sourcePlatformCode: externalCode,
|
||||
});
|
||||
|
||||
const defaultCode = String(storeSubjectConfig && storeSubjectConfig.default_platform_code || '').trim();
|
||||
// 兜底优先级:签约策略(货主-仓库级)→ 货主 subject_config
|
||||
const policyDefaultCode = String(policyConfig && policyConfig.default_platform_code || '').trim();
|
||||
const ownerDefaultCode = String(storeSubjectConfig && storeSubjectConfig.default_platform_code || '').trim();
|
||||
const defaultCode = policyDefaultCode || ownerDefaultCode;
|
||||
const fallbackPlatform = defaultCode ? this.findPlatformOptionByCode(platformList, defaultCode) : null;
|
||||
const fallbackPlatformName = this.getPlatformSnapshotName(fallbackPlatform) || defaultCode;
|
||||
|
||||
if (defaultCode) {
|
||||
const fallbackSource = policyDefaultCode ? 'policy_config' : 'subject_config';
|
||||
this.appendOrderOperationLog(
|
||||
operationLogs,
|
||||
ORDER_OPERATION_CODES.PLATFORM_FALLBACK,
|
||||
`平台编码${externalCode}匹配不到平台,已转为默认平台:${fallbackPlatformName}`
|
||||
`平台编码${externalCode}匹配不到平台,已转为默认平台:${fallbackPlatformName}(来源:${fallbackSource})`
|
||||
);
|
||||
|
||||
if (fallbackPlatform) {
|
||||
this.ctx.logger.warn('[DeliveryOrderService.prepareOrderData] platform code fallback to store default', {
|
||||
this.ctx.logger.warn('[DeliveryOrderService.prepareOrderData] platform code fallback to default', {
|
||||
deliveryOrderCode: info.deliveryOrderCode,
|
||||
warehouseId: info.warehouseId,
|
||||
storeId: info.storeId,
|
||||
sourcePlatformCode: externalCode,
|
||||
defaultPlatformCode: defaultCode,
|
||||
fallbackSource,
|
||||
});
|
||||
|
||||
return {
|
||||
@ -1020,7 +1027,7 @@ class DeliveryOrderService extends Service {
|
||||
const storeSubjectConfig = await this.getStoreSubjectConfig(info.storeId);
|
||||
const policyConfig = await this.getStoreWarehousePolicyConfig(info.storeId, info.warehouseId);
|
||||
const enableExternalExpressCode = this.resolveEnableExternalExpressCode(storeSubjectConfig, policyConfig);
|
||||
const platformSnapshot = await this.resolvePlatformSnapshot(sourcePlatformCode, storeSubjectConfig, {
|
||||
const platformSnapshot = await this.resolvePlatformSnapshot(sourcePlatformCode, storeSubjectConfig, policyConfig, {
|
||||
deliveryOrderCode,
|
||||
warehouseId: info.warehouseId,
|
||||
storeId: info.storeId,
|
||||
|
||||
@ -61,6 +61,9 @@ const ORDER_EXPORT_COLUMNS = Object.freeze([
|
||||
{ header: '复核完成状态', key: 'recheck_status', width: 16 },
|
||||
{ header: '配货状态', key: 'post_status', width: 14 },
|
||||
{ header: '打包状态', key: 'pack_status', width: 14 },
|
||||
{ header: '备注', key: 'remark', width: 30 },
|
||||
{ header: '买家留言', key: 'buyer_message', width: 30 },
|
||||
{ header: '卖家留言', key: 'seller_message', width: 30 },
|
||||
{ header: '归档时间', key: 'archive_time', width: 20 },
|
||||
]);
|
||||
|
||||
@ -107,6 +110,9 @@ const ORDER_EXPORT_ITEM_COLUMNS = Object.freeze([
|
||||
{ header: '复核完成状态', key: 'recheck_status', width: 16 },
|
||||
{ header: '配货状态', key: 'post_status', width: 14 },
|
||||
{ header: '打包状态', key: 'pack_status', width: 14 },
|
||||
{ header: '备注', key: 'remark', width: 30 },
|
||||
{ header: '买家留言', key: 'buyer_message', width: 30 },
|
||||
{ header: '卖家留言', key: 'seller_message', width: 30 },
|
||||
{ header: '归档时间', key: 'archive_time', width: 20 },
|
||||
]);
|
||||
|
||||
@ -412,6 +418,9 @@ class OrderExportService extends OrderBaseService {
|
||||
items_weight: this.normalizeExportCellValue(safeOrderRow.items_weight),
|
||||
total_amount: this.normalizeExportCellValue(safeOrderRow.total_amount),
|
||||
got_amount: this.normalizeExportCellValue(safeOrderRow.got_amount),
|
||||
remark: this.normalizeExportCellValue(safeOrderRow.remark),
|
||||
buyer_message: this.normalizeExportCellValue(safeOrderRow.buyer_message),
|
||||
seller_message: this.normalizeExportCellValue(safeOrderRow.seller_message),
|
||||
create_at: formatDateSafe(safeOrderRow.create_at),
|
||||
pay_time: formatDateSafe(safeOrderRow.pay_time),
|
||||
delivery_time: formatDateSafe(safeOrderRow.delivery_time),
|
||||
|
||||
@ -149,6 +149,36 @@ class PickSystemService extends Service {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 解析订单商品快照 JSON。
|
||||
*
|
||||
* item_snapshot 是下单时从 wms_stock_warehouse 抓取的库存快照,
|
||||
* 其 item_code / item_name 代表下单时的商品信息,比 order_items 列更准确。
|
||||
*
|
||||
* @param {*} rawSnapshot 原始快照数据。
|
||||
* @return {Object} 解析后的快照对象。
|
||||
*/
|
||||
parseItemSnapshot(rawSnapshot) {
|
||||
if (!rawSnapshot) {
|
||||
return {};
|
||||
}
|
||||
|
||||
if (typeof rawSnapshot === 'string') {
|
||||
try {
|
||||
const parsed = JSON.parse(rawSnapshot);
|
||||
return parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? parsed : {};
|
||||
} catch (_) {
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
if (typeof rawSnapshot === 'object' && !Array.isArray(rawSnapshot)) {
|
||||
return rawSnapshot;
|
||||
}
|
||||
|
||||
return {};
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成拣货明细汇总信息。
|
||||
*
|
||||
@ -1143,6 +1173,29 @@ class PickSystemService extends Service {
|
||||
warehouseId,
|
||||
orderItemIds,
|
||||
});
|
||||
|
||||
// 通过 stock_warehouse 带缓存的公用链路(getStockDetails)批量查询商品资料,
|
||||
// 以 stock_id 为准获取 item_code / item_name,与 order/base.js 等链路保持一致。
|
||||
const stockIdsForDetail = [ ...new Set(
|
||||
[ ...orderItemMap.values() ]
|
||||
.map(row => Number(row && row.stock_id || 0))
|
||||
.filter(sid => Number.isInteger(sid) && sid > 0)
|
||||
) ];
|
||||
const stockDetailMap = new Map();
|
||||
if (stockIdsForDetail.length > 0) {
|
||||
try {
|
||||
const stockWarehouseSvc = ctx.service && ctx.service.systems && ctx.service.systems.stockWarehouse;
|
||||
if (stockWarehouseSvc && typeof stockWarehouseSvc.getStockDetails === 'function') {
|
||||
const stockDetails = await stockWarehouseSvc.getStockDetails(stockIdsForDetail, { warehouseId });
|
||||
for (const detail of (Array.isArray(stockDetails) ? stockDetails : [])) {
|
||||
stockDetailMap.set(Number(detail && detail.id || 0), detail);
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
ctx.logger.warn(`[pick.wavePickTaskDetail] getStockDetails 查询失败,将降级使用 order_items 列值: ${error.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
const normalizedBoxRows = Array.isArray(boxRows) ? boxRows : [];
|
||||
const boxMapByNo = new Map(normalizedBoxRows
|
||||
.map(row => [ Number(row && row.box_no || 0), row ])
|
||||
@ -1153,6 +1206,22 @@ class PickSystemService extends Service {
|
||||
const currentSpaceId = Number(row && row.space_id || 0);
|
||||
const locationRow = locationMap.get(currentSpaceId) || {};
|
||||
const orderItemRow = orderItemMap.get(orderItemId) || {};
|
||||
const stockId = Number(orderItemRow.stock_id || 0);
|
||||
const stockDetail = stockDetailMap.get(stockId) || null;
|
||||
const itemSnapshot = this.parseItemSnapshot(orderItemRow.item_snapshot);
|
||||
|
||||
// 构建 stock 字段:优先 getStockDetails 完整对象,兜底用 item_snapshot + order_items 拼装
|
||||
const stock = stockDetail
|
||||
? { ...stockDetail }
|
||||
: {
|
||||
id: stockId || null,
|
||||
item_code: String(itemSnapshot.item_code || orderItemRow.item_code || '').trim(),
|
||||
item_name: String(itemSnapshot.item_name || orderItemRow.item_name || '').trim(),
|
||||
sku_property: String(itemSnapshot.sku_property || '').trim(),
|
||||
stock_unit: String(itemSnapshot.stock_unit || '').trim(),
|
||||
barcodes: [],
|
||||
image_url: [],
|
||||
};
|
||||
|
||||
return {
|
||||
order_id: Number(row && row.order_id || 0),
|
||||
@ -1168,11 +1237,13 @@ class PickSystemService extends Service {
|
||||
pick_sequence: Number(locationRow.pick_sequence || 0),
|
||||
pick_priority: Number(locationRow.pick_priority || 0),
|
||||
},
|
||||
item_code: String(orderItemRow.item_code || '').trim(),
|
||||
item_name: String(orderItemRow.item_name || '').trim(),
|
||||
stock_id: Number(orderItemRow.stock_id || 0),
|
||||
// 优先 stock_warehouse(getStockDetails),兜底 item_snapshot,最终 order_items 列
|
||||
item_code: stock.item_code,
|
||||
item_name: stock.item_name,
|
||||
stock_id: stockId,
|
||||
plan_qty: Number(orderItemRow.plan_qty || 0),
|
||||
item_snapshot: orderItemRow.item_snapshot || null,
|
||||
stock,
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
@ -331,11 +331,17 @@ class StorageReportService extends Service {
|
||||
storeIds = [],
|
||||
spaceIds = [],
|
||||
includeBarcode = false,
|
||||
entryOrderIds = [],
|
||||
orderIds = [],
|
||||
warehouseId = null,
|
||||
} = {}) {
|
||||
const { ctx } = this;
|
||||
const { ctx, app } = this;
|
||||
const normalizedStockIds = [ ...new Set((stockIds || []).map(item => Number(item)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const normalizedStoreIds = [ ...new Set((storeIds || []).map(item => Number(item)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const normalizedSpaceIds = [ ...new Set((spaceIds || []).map(item => Number(item)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const normalizedEntryOrderIds = [ ...new Set((entryOrderIds || []).map(item => Number(item)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const normalizedOrderIds = [ ...new Set((orderIds || []).map(item => Number(item)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const normalizedWarehouseId = Number(warehouseId);
|
||||
|
||||
// 从 getStockDetails 获取商品名称、条码信息
|
||||
const stockMap = new Map();
|
||||
@ -366,7 +372,7 @@ class StorageReportService extends Service {
|
||||
}
|
||||
}
|
||||
|
||||
const [ storeRows, spaceRows ] = await Promise.all([
|
||||
const [ storeRows, spaceRows, entryOrderRows, orderDeliveryRows, orderExpressRows, storeWarehouseRows ] = await Promise.all([
|
||||
normalizedStoreIds.length > 0
|
||||
? ctx.model.Store.findAll({
|
||||
where: {
|
||||
@ -385,16 +391,87 @@ class StorageReportService extends Service {
|
||||
raw: true,
|
||||
})
|
||||
: [],
|
||||
normalizedEntryOrderIds.length > 0
|
||||
? ctx.model.query(
|
||||
'SELECT id, entry_order_code, express_code, logistics_code, logistics_name, source_type FROM wms_entry_order WHERE id IN (:ids)',
|
||||
{
|
||||
replacements: { ids: normalizedEntryOrderIds },
|
||||
type: app.Sequelize.QueryTypes.SELECT,
|
||||
}
|
||||
)
|
||||
: [],
|
||||
normalizedOrderIds.length > 0
|
||||
? ctx.model.query(
|
||||
'SELECT id, source_order_codes FROM wms_order_delivery WHERE id IN (:ids)',
|
||||
{
|
||||
replacements: { ids: normalizedOrderIds },
|
||||
type: app.Sequelize.QueryTypes.SELECT,
|
||||
}
|
||||
)
|
||||
: [],
|
||||
normalizedOrderIds.length > 0
|
||||
? ctx.model.query(
|
||||
'SELECT order_id, waybill_code FROM wms_order_express WHERE order_id IN (:ids)',
|
||||
{
|
||||
replacements: { ids: normalizedOrderIds },
|
||||
type: app.Sequelize.QueryTypes.SELECT,
|
||||
}
|
||||
)
|
||||
: [],
|
||||
normalizedStoreIds.length > 0 && Number.isInteger(normalizedWarehouseId) && normalizedWarehouseId > 0
|
||||
? ctx.model.StoreWarehouse.findAll({
|
||||
where: {
|
||||
store_id: { [app.Sequelize.Op.in]: normalizedStoreIds },
|
||||
warehouse_id: normalizedWarehouseId,
|
||||
},
|
||||
attributes: [ 'store_id', 'store_remask' ],
|
||||
raw: true,
|
||||
})
|
||||
: [],
|
||||
]);
|
||||
|
||||
const storeMap = new Map((storeRows || []).map(item => [ Number(item.id), item ]));
|
||||
const spaceMap = new Map((spaceRows || []).map(item => [ Number(item.id), item ]));
|
||||
|
||||
// 入库单映射:entry_order_id → { entry_order_code, express_code, logistics_code, logistics_name, source_type }
|
||||
const entryOrderMap = new Map();
|
||||
for (const eo of (Array.isArray(entryOrderRows) ? entryOrderRows : [])) {
|
||||
entryOrderMap.set(Number(eo.id), eo);
|
||||
}
|
||||
|
||||
// 发货单映射:order_id → source_order_codes
|
||||
const orderDeliveryMap = new Map();
|
||||
for (const od of (Array.isArray(orderDeliveryRows) ? orderDeliveryRows : [])) {
|
||||
orderDeliveryMap.set(Number(od.id), od);
|
||||
}
|
||||
|
||||
// 运单映射:order_id → waybill_code(取第一条)
|
||||
const orderExpressMap = new Map();
|
||||
for (const oe of (Array.isArray(orderExpressRows) ? orderExpressRows : [])) {
|
||||
const oid = Number(oe.order_id);
|
||||
if (oid > 0 && !orderExpressMap.has(oid)) {
|
||||
orderExpressMap.set(oid, String(oe.waybill_code || '').trim());
|
||||
}
|
||||
}
|
||||
|
||||
// 货主自定义名称映射:store_id → store_remask
|
||||
const storeWarehouseMap = new Map();
|
||||
for (const sw of (Array.isArray(storeWarehouseRows) ? storeWarehouseRows : [])) {
|
||||
const sid = Number(sw.store_id);
|
||||
if (sid > 0 && !storeWarehouseMap.has(sid)) {
|
||||
storeWarehouseMap.set(sid, String(sw.store_remask || '').trim());
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
stockMap,
|
||||
storeMap,
|
||||
spaceMap,
|
||||
barcodeMap,
|
||||
entryOrderMap,
|
||||
orderDeliveryMap,
|
||||
orderExpressMap,
|
||||
storeWarehouseMap,
|
||||
};
|
||||
}
|
||||
|
||||
@ -511,6 +588,8 @@ class StorageReportService extends Service {
|
||||
const detailStockIds = [ ...new Set(safeDetailRows.map(item => Number(item.stock_id)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const detailStoreIds = [ ...new Set(safeDetailRows.map(item => Number(item.store_id)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const detailSpaceIds = [ ...new Set(safeDetailRows.map(item => Number(item.space_id)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const detailEntryOrderIds = [ ...new Set(safeDetailRows.map(item => Number(item.entry_order_id)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const detailOrderIds = [ ...new Set(safeDetailRows.map(item => Number(item.order_id)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
|
||||
const summaryStockIds = [ ...new Set(summaryList.map(item => Number(item.stock_id)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const summaryStoreIds = [ ...new Set(summaryList.map(item => Number(item.store_id)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
@ -523,6 +602,9 @@ class StorageReportService extends Service {
|
||||
storeIds: [ ...new Set([ ...summaryStoreIds, ...detailStoreIds ]) ],
|
||||
spaceIds: [ ...new Set([ ...summarySpaceIds, ...detailSpaceIds ]) ],
|
||||
includeBarcode: true,
|
||||
entryOrderIds: detailEntryOrderIds,
|
||||
orderIds: detailOrderIds,
|
||||
warehouseId,
|
||||
});
|
||||
|
||||
const summaryColumns = [
|
||||
@ -576,11 +658,24 @@ class StorageReportService extends Service {
|
||||
const space = maps.spaceMap.get(spaceId) || {};
|
||||
const barcodeSet = maps.barcodeMap.get(stockId);
|
||||
|
||||
const entryOrderId = toNumber(item.entry_order_id);
|
||||
const entryOrder = entryOrderId > 0 ? (maps.entryOrderMap.get(entryOrderId) || {}) : {};
|
||||
const isQimenEntry = entryOrder.source_type === 'QM';
|
||||
|
||||
const orderId = toNumber(item.order_id);
|
||||
const orderDelivery = orderId > 0 ? (maps.orderDeliveryMap.get(orderId) || {}) : {};
|
||||
const waybillCode = maps.orderExpressMap.get(orderId) || '';
|
||||
|
||||
// 运单号:出库取 order_express.waybill_code,入库取 entry_order.express_code
|
||||
const generalWaybillNo = waybillCode
|
||||
|| (entryOrderId > 0 ? String(entryOrder.express_code || '').trim() : '');
|
||||
|
||||
return {
|
||||
created_at: formatDateTime(item.created_at),
|
||||
transaction_type: formatTransactionType(item.transaction_type),
|
||||
store_id: storeId,
|
||||
store_name: store.company_name || '',
|
||||
store_remask: maps.storeWarehouseMap.get(storeId) || '',
|
||||
stock_id: stockId,
|
||||
item_code: stock.item_code || '',
|
||||
item_name: stock.item_name || '',
|
||||
@ -596,11 +691,17 @@ class StorageReportService extends Service {
|
||||
inventory_type: item.inventory_type || '',
|
||||
order_type: item.order_type || '',
|
||||
order_no: item.order_no || '',
|
||||
order_id: toNumber(item.order_id),
|
||||
order_id: orderId,
|
||||
receiving_id: toNumber(item.receiving_id),
|
||||
entry_order_id: toNumber(item.entry_order_id),
|
||||
entry_order_id: entryOrderId,
|
||||
operator_name: item.operator_name || '',
|
||||
remark: item.remark || '',
|
||||
// 新增字段
|
||||
qimen_entry_order_code: isQimenEntry ? String(entryOrder.entry_order_code || '').trim() : '',
|
||||
platform_trade_no: String(orderDelivery.source_order_codes || item.order_no || '').trim(),
|
||||
entry_order_waybill_no: entryOrderId > 0 ? String(entryOrder.express_code || '').trim() : '',
|
||||
entry_order_express_company: entryOrderId > 0 ? String(entryOrder.logistics_name || '').trim() : '',
|
||||
waybill_no: String(generalWaybillNo || '').trim(),
|
||||
};
|
||||
});
|
||||
|
||||
@ -608,6 +709,7 @@ class StorageReportService extends Service {
|
||||
{ header: '时间', key: 'created_at' },
|
||||
{ header: '类型', key: 'transaction_type' },
|
||||
{ header: '货主名称', key: 'store_name' },
|
||||
{ header: '自定义店铺名称', key: 'store_remask' },
|
||||
{ header: '商品库存ID', key: 'stock_id' },
|
||||
{ header: '商品编码', key: 'item_code' },
|
||||
{ header: '商品名称', key: 'item_name' },
|
||||
@ -624,6 +726,11 @@ class StorageReportService extends Service {
|
||||
{ header: '单据类型', key: 'order_type' },
|
||||
{ header: '单据号', key: 'order_no' },
|
||||
{ header: '单据ID', key: 'order_id' },
|
||||
{ header: '奇门入库单号', key: 'qimen_entry_order_code' },
|
||||
{ header: '平台交易单号', key: 'platform_trade_no' },
|
||||
{ header: '运单号', key: 'waybill_no' },
|
||||
{ header: '入库单运单号', key: 'entry_order_waybill_no' },
|
||||
{ header: '入库单快递公司', key: 'entry_order_express_company' },
|
||||
{ header: '收货单ID', key: 'receiving_id' },
|
||||
{ header: '入库单ID', key: 'entry_order_id' },
|
||||
{ header: '操作人', key: 'operator_name' },
|
||||
|
||||
@ -1,4 +1,19 @@
|
||||
[
|
||||
{
|
||||
"version": "2026.07.06-system-01",
|
||||
"date": "2026-07-06",
|
||||
"type": "updated",
|
||||
"summary": "order.wave.batchList:响应新增 pick_assignment_status(拣货分配状态),按订单 pick_status 聚合判定",
|
||||
"methods": [
|
||||
"order.wave.batchList"
|
||||
],
|
||||
"notes": [
|
||||
"响应 list 每项新增字段 pick_assignment_status (string):拣货分配状态,按波次下订单的 pick_status 聚合判定。",
|
||||
"取值语义与 resolveAssignmentStatus 一致,自定义标签:未拣货(全 none)、部分拣货(混合且无 error)、已拣货(全 fin)、拣货异常(含 error)。",
|
||||
"SQL 子查询新增 pick_none_count / pick_fin_count / pick_error_count 聚合列。"
|
||||
],
|
||||
"module": "order.wave"
|
||||
},
|
||||
{
|
||||
"version": "2026.07.05-system-01",
|
||||
"date": "2026-07-05",
|
||||
|
||||
@ -24083,7 +24083,7 @@
|
||||
"list": [
|
||||
{
|
||||
"method": "order.wave.batchList",
|
||||
"description": "波次列表查询。仅使用当前登录操作者仓库上下文(禁止传入 warehouse_id/warehouseId)。支持 where 白名单过滤,固定查询 wave_status=0/1;返回波次基础信息及分配状态汇总。支持 only_todo=1 仅返回仍有未复核订单的波次,并返回复核状态汇总(review_assignment_status)与未复核数量(unreviewed_order_count)。",
|
||||
"description": "波次列表查询。仅使用当前登录操作者仓库上下文(禁止传入 warehouse_id/warehouseId)。支持 where 白名单过滤,固定查询 wave_status=0/1;返回波次基础信息及分配状态汇总(storage_assignment_status / express_assignment_status / print_assignment_status / pick_assignment_status / review_assignment_status)。支持 only_todo=1 仅返回仍有未复核订单的波次,并返回复核状态汇总(review_assignment_status)与未复核数量(unreviewed_order_count)。",
|
||||
"isNeedAuth": false,
|
||||
"isNeedLogin": true,
|
||||
"headers": [
|
||||
@ -24122,7 +24122,7 @@
|
||||
"name": "list",
|
||||
"type": "array",
|
||||
"required": true,
|
||||
"description": "波次列表,包含波次基础信息与状态汇总(order_count / storage_assignment_status / express_assignment_status / print_assignment_status / review_assignment_status / unreviewed_order_count)。每条记录新增字段 source(number):来源标识,0=普通波次(正常后台操作),1=管理后台策略任务,2=PDA策略任务。"
|
||||
"description": "波次列表,包含波次基础信息与状态汇总(order_count / storage_assignment_status / express_assignment_status / print_assignment_status / pick_assignment_status / review_assignment_status / unreviewed_order_count)。其中 pick_assignment_status 按订单 pick_status 聚合判定,取值:未拣货/部分拣货/已拣货/拣货异常。每条记录新增字段 source(number):来源标识,0=普通波次(正常后台操作),1=管理后台策略任务,2=PDA策略任务。"
|
||||
},
|
||||
{
|
||||
"name": "pagination",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user