feat(wms):上架默认库位填充限定谷丰组织(id=2842)生效

This commit is contained in:
rcx
2026-08-22 16:38:18 +08:00
parent 2a4e39f755
commit c9520c65be
@@ -134,12 +134,14 @@ public class StockShelfOrderApplicationService {
private static final String VERIFY = "ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD";
/** 仅这些仓库的上架单在PC上传页默认填充上架库位(按仓库名匹配;需放开其他仓库时在此追加)。
* 生产环境:维他奶仓(warehouseId=14);测试环境为 青洲仓(warehouseId=13),需测试时切换 */
* 生产环境:维他奶仓(warehouseId=14,已对照线上库位树验证:库区id=20,库位id=33);测试环境为 青洲仓(warehouseId=13),需测试时切换 */
private static final Set<String> DEFAULT_STORAGE_LOCATION_WAREHOUSE_NAMES = new HashSet<>(Collections.singletonList("维他奶仓"));
/** 默认上架库位:指定库区名→库位名(精确匹配,须与基础资料名称完全一致,注意含繁体字)。
* 生产环境:維他奶2层冷凍A區 → 2层冷凍A區A01;测试环境为 4楼A区 → 4A-01-01,需测试时切换 */
private static final String DEFAULT_SHELF_STORAGE_NAME = "維他奶2层冷凍A區";
private static final String DEFAULT_SHELF_STORAGE_LOCATION_NAME = "2层冷凍A區A01";
/** 仅这些组织的上架单在PC上传页默认填充上架库位(按组织id精确匹配;测试与生产均为 谷丰=2842,若不一致需按环境切换) */
private static final Set<Long> DEFAULT_STORAGE_LOCATION_ORGANIZATION_IDS = new HashSet<>(Collections.singletonList(2842L));
/**
@@ -2476,6 +2478,10 @@ public class StockShelfOrderApplicationService {
|| !DEFAULT_STORAGE_LOCATION_WAREHOUSE_NAMES.contains(stockShelfOrderPO.getWarehouseName())) {
return;
}
// 仅指定组织生效(按组织id精确匹配)
if (!DEFAULT_STORAGE_LOCATION_ORGANIZATION_IDS.contains(stockShelfOrderPO.getOrganizationId())) {
return;
}
// 明细树中存在未填库位的行才发起查询
if (!hasEmptyStorageLocationRecursively(shelfMaterialDetailPOList)) {
return;