fix(order): 复核共享条码判定收窄到订单货主并过滤失效商品
- has_shared_barcode 判定范围从全仓库改为订单 store_id 维度(wms_stock_warehouse.store_id) - 排除已删除(delete_at/deleted_at 非空)与弃用(is_valid≠'Y')的商品资料 - 跨货主同码不再提示;无货主(store_id<=0)订单不做共享判定
This commit is contained in:
parent
f2d1ed0849
commit
a499298670
@ -1382,8 +1382,11 @@ class RecheckOrderService extends OrderBaseService {
|
||||
}
|
||||
}
|
||||
|
||||
// 5. 检测共享条码:查询当前所有条码是否也出现在其他 stock_id 中
|
||||
const sharedBarcodeSet = new Set();
|
||||
// 5. 检测共享条码:以订单货主(store_id)为判定范围,
|
||||
// 仅当条码在订单货主下(wms_stock_warehouse.store_id = 订单 store_id)绑定到多个不同 stock_id 时视为共享;
|
||||
// 跨货主同码不提示。无货主(store_id<=0)的订单不做共享判定。
|
||||
// 已删除(delete_at/deleted_at 非空)或弃用(is_valid≠'Y')的商品资料不参与共享判定。
|
||||
const sharedBarcodeMap = new Map();
|
||||
if (barcodeMap.size > 0) {
|
||||
const allBarcodes = [];
|
||||
for (const [ , barcodes ] of barcodeMap) {
|
||||
@ -1391,21 +1394,44 @@ class RecheckOrderService extends OrderBaseService {
|
||||
allBarcodes.push(bc);
|
||||
}
|
||||
}
|
||||
if (allBarcodes.length > 0 && this.ctx.model && this.ctx.model.StockBarcode) {
|
||||
const orderStoreIds = [ ...new Set(
|
||||
orderList
|
||||
.map(order => Number(order.store_id || 0))
|
||||
.filter(storeId => storeId > 0)
|
||||
) ];
|
||||
if (allBarcodes.length > 0
|
||||
&& orderStoreIds.length > 0
|
||||
&& this.ctx.model
|
||||
&& this.ctx.model.StockBarcode) {
|
||||
const sharedRows = await this.ctx.model.query(
|
||||
`SELECT barcode, COUNT(DISTINCT stock_id) AS cnt
|
||||
FROM wms_stock_barcodes
|
||||
WHERE barcode IN (:barcodes)
|
||||
AND warehouse_id = :warehouseId
|
||||
GROUP BY barcode
|
||||
`SELECT sb.barcode, sw.store_id, COUNT(DISTINCT sb.stock_id) AS cnt
|
||||
FROM wms_stock_barcodes sb
|
||||
INNER JOIN wms_stock_warehouse sw
|
||||
ON sw.id = sb.stock_id
|
||||
AND sw.is_valid = 'Y'
|
||||
AND sw.delete_at IS NULL
|
||||
AND sw.deleted_at IS NULL
|
||||
WHERE sb.barcode IN (:barcodes)
|
||||
AND sb.warehouse_id = :warehouseId
|
||||
AND sw.warehouse_id = :warehouseId
|
||||
AND sw.store_id IN (:orderStoreIds)
|
||||
GROUP BY sb.barcode, sw.store_id
|
||||
HAVING cnt > 1`,
|
||||
{
|
||||
replacements: { barcodes: allBarcodes, warehouseId },
|
||||
replacements: { barcodes: allBarcodes, warehouseId, orderStoreIds },
|
||||
type: this.ctx.model.QueryTypes.SELECT,
|
||||
}
|
||||
);
|
||||
for (const row of (Array.isArray(sharedRows) ? sharedRows : [])) {
|
||||
sharedBarcodeSet.add(String(row.barcode || '').trim());
|
||||
const rowStoreId = Number(row.store_id || 0);
|
||||
const rowBarcode = String(row.barcode || '').trim();
|
||||
if (rowStoreId <= 0 || !rowBarcode) {
|
||||
continue;
|
||||
}
|
||||
if (!sharedBarcodeMap.has(rowStoreId)) {
|
||||
sharedBarcodeMap.set(rowStoreId, new Set());
|
||||
}
|
||||
sharedBarcodeMap.get(rowStoreId).add(rowBarcode);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1438,7 +1464,9 @@ class RecheckOrderService extends OrderBaseService {
|
||||
|
||||
const hasSharedBarcode = (() => {
|
||||
const arr = barcodeMap.get(sid);
|
||||
if (Array.isArray(arr) && arr.length > 0) {
|
||||
const orderStoreId = Number(order.store_id || 0);
|
||||
const sharedBarcodeSet = orderStoreId > 0 ? sharedBarcodeMap.get(orderStoreId) : null;
|
||||
if (Array.isArray(arr) && arr.length > 0 && sharedBarcodeSet) {
|
||||
return arr.some(bc => sharedBarcodeSet.has(bc));
|
||||
}
|
||||
return false;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user