feat(mcp): 新增仓库出入库明细与在库物品查询三工具

- warehouse.out.details.list.query / warehouse.in.details.list.query / warehouse.hardstock.list.query
- 出库明细硬过滤 query_flag=0 + order_state=3,入库明细 order_state=3,hardstock 固定 stock_state=0
- dateType 三态 + 缺省最近180天、跨度上限180天;固定排序不提供排序参数
- PermissionService 新增 details 级行权限变体与 HardSockLife 变体(对齐 getWarehouseAuth)
- REQ-20261105-0020
This commit is contained in:
my_local_kimi_dev2
2026-11-05 18:36:06 +08:00
parent 4e27f8137d
commit e818f59911
12 changed files with 1368 additions and 17 deletions
@@ -0,0 +1,63 @@
package me.iiv.agent.entity.m0;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import java.util.Date;
/** 库存物品生命周期视图(m0.hard_sock_life,VIEW),全列拷贝自 b0 参考实体。 */
@Getter
@Setter
@ToString
@TableName("hard_sock_life")
public class HardSockLife implements Serializable {
private static final long serialVersionUID = 1L;
@TableId("id")
private Long id;
private Long createId;
private Date createTime;
private Long modifyId;
private Date modifyTime;
private Integer softDelete;
/** 仓库管理公司ID */
private Long agentId;
private String agentName;
private Long warehouseId;
private String warehouseName;
/** 出入库单号 */
private String outInOrderNo;
private Long materielDefinitionId;
private String materialNo;
private String materielFullName;
private String materielSort;
private Long materielIndexId;
private String specifications;
private String snCode;
/** 出入库时间 */
private Date outInDate;
/** 库存状态(0:在库;1:已出库) */
private Integer stockState;
private Integer currentInventory;
/** 使用客户类型(0:内部人员;1:渠道商;2:直营客户) */
private Integer useCustomerType;
private Long useCustomerId;
private String useCustomerName;
/** 组装状态(0:未匹配;1:已匹配) */
private Integer assembleState;
/** 组装后设备编号 */
private String lifeSnCode;
private Long assetOwnerId;
private String assetOwnerName;
private Long warehouseOwnerId;
private String warehouseOwnerName;
/** 费用化标识(0:费用化;1:非费用化) */
private Integer chargeFlag;
/** 替换状态(0:未替换;1:已替换) */
private Integer replaceState;
}
@@ -11,7 +11,7 @@ import java.io.Serializable;
import java.time.LocalDate;
import java.util.Date;
/** 入库单明细(m2.warehouse_in_details),生命周期详情的入库/重工事件来源。 */
/** 入库单明细(m2.warehouse_in_details),全列拷贝自 b2 参考实体。 */
@Getter
@Setter
@ToString
@@ -22,17 +22,49 @@ public class WarehouseInDetails implements Serializable {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
private Long createId;
private Date createTime;
private Long modifyId;
private Date modifyTime;
private Integer softDelete;
private String snCode;
private Long agentId;
private String agentName;
private String inOrderNo;
private String allocationOrderNo;
private Long warehouseInId;
private Long materielDefinitionId;
private String materialNo;
private String materielFullName;
private String materielSort;
private Long materielIndexId;
private String specifications;
private String snCode;
private Integer inCount;
private Integer currentInventory;
private LocalDate inDate;
private Long warehouseId;
private String warehouseName;
private Long warehouseTypeId;
private String warehouseTypeName;
/** 单据状态,生命周期只取 3=已确认 */
/** 入库单状态(0:待审核;1:被驳回;2:待入库;3:已完成;4:已撤销;5:作废) */
private Integer orderState;
private Long applyUserId;
private String applyUserName;
private String inConfirmUserName;
/** 商品库存状态(0:入库中;1:已入库;2:已出库;3:已撤销) */
private Integer goodInState;
private Date inConfirmTime;
private LocalDate inDate;
private String inConfirmUserName;
private String outOrderNo;
private String mallOrderNo;
private Long jindieInternalId;
private Long jindiePurchaseInternalId;
private Integer assetDisposalType;
private Integer synchronizeState;
private Long outDetailsId;
private String deliveryOrderNo;
private String installOrderNo;
private String pickupOrderNo;
private String withdrawOrderNo;
private String memo;
private String lineMemo;
}
@@ -8,10 +8,11 @@ import lombok.Setter;
import lombok.ToString;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
/** 出库单明细(m2.warehouse_out_details),生命周期详情的出库/出厂事件来源。 */
/** 出库单明细(m2.warehouse_out_details),全列拷贝自 b2 参考实体。 */
@Getter
@Setter
@ToString
@@ -22,19 +23,58 @@ public class WarehouseOutDetails implements Serializable {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
private Long createId;
private Date createTime;
private Long modifyId;
private Date modifyTime;
private Integer softDelete;
private String snCode;
private String outOrderNo;
private String mallOrderNo;
private Long agentId;
private String agentName;
private Long warehouseId;
private String warehouseName;
private String warehouseTypeName;
/** 单据状态,生命周期只取 3=已确认 */
private Integer orderState;
private String applyUserName;
private String outConfirmUserName;
private Date outConfirmTime;
private Integer outCount;
private String outOrderNo;
private String allocationOrderNo;
private String mallOrderNo;
private Long warehouseOutId;
private Long materielDefinitionId;
private String materialNo;
private String materielFullName;
private String materielSort;
private Long materielIndexId;
private String specifications;
private String snCode;
private Integer currentInventory;
private LocalDate outDate;
private Long warehouseTypeId;
private String warehouseTypeName;
/** 出库单状态(0:待审核;1:被驳回;2:待出库;3:已完成;4:已撤销;5:作废) */
private Integer orderState;
/** 查询标志0:查询;1:不查询 如果有子子订单就不查该条记录 */
private Integer queryFlag;
private Long parentId;
private Long applyUserId;
private String applyUserName;
private Date outConfirmTime;
private String outConfirmUserName;
/** 使用客户类型(0:内部人员;1:渠道商;2:直营客户) */
private Integer useCustomerType;
private Long useCustomerId;
private String useCustomerName;
private Long mallOrderDetailId;
private Integer outOfStock;
private BigDecimal price;
private BigDecimal allMoney;
private String threeAttribute;
private Long jindieInternalId;
private String assetDisposalType;
private Integer synchronizeState;
private String jindieMaterialNo;
private Integer assetSynchronizeState;
private String jindieWarehouseTypeNo;
private Integer assembleFlag;
private String batteryMaterialNo;
private String deliveryOrderNo;
private String installOrderNo;
private String pickupOrderNo;
}
@@ -0,0 +1,7 @@
package me.iiv.agent.mapper.m0;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import me.iiv.agent.entity.m0.HardSockLife;
public interface HardSockLifeMapper extends BaseMapper<HardSockLife> {
}
@@ -0,0 +1,484 @@
package me.iiv.agent.mcp.tool;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import me.iiv.agent.entity.m0.HardSockLife;
import me.iiv.agent.entity.m0.User;
import me.iiv.agent.entity.m2.WarehouseInDetails;
import me.iiv.agent.entity.m2.WarehouseOutDetails;
import me.iiv.agent.mapper.m0.HardSockLifeMapper;
import me.iiv.agent.mapper.m2.WarehouseInDetailsMapper;
import me.iiv.agent.mapper.m2.WarehouseOutDetailsMapper;
import me.iiv.agent.mcp.ToolObject;
import me.iiv.agent.mcp.XqTool;
import me.iiv.agent.permission.PermissionService;
import me.iiv.agent.security.AuthContextHolder;
import org.springframework.ai.tool.annotation.Tool;
import org.springframework.ai.tool.annotation.ToolParam;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.time.format.ResolverStyle;
import java.time.temporal.ChronoUnit;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
* 仓库出入库明细与库存物品详情查询工具,参考老系统
* /warehouseOutStatis/listByPage、/warehouseInStatis/listByPage、/warehouseHardStock/listByPage。
* REQ-20261105-0020。拍板口径:hardstock 固定只查在库;出/入库明细缺省最近180天、跨度上限180天、
* 只查已完成订单(order_state=3);不返回 schedulePeople;固定排序不提供排序参数。
*/
@Component
public class WarehouseDetailsStatisTools implements ToolObject {
private static final int DEFAULT_ROWS = 20;
private static final int MAX_ROWS = 100;
private static final int MAX_SPAN_DAYS = 180;
private static final int ORDER_STATE_DONE = 3;
private static final ZoneId BUSINESS_ZONE = ZoneId.of("Asia/Shanghai");
private static final Pattern DATE_PATTERN = Pattern.compile("^\\d{4}-\\d{2}-\\d{2}$");
private static final DateTimeFormatter DATE_FORMATTER =
DateTimeFormatter.ISO_LOCAL_DATE.withResolverStyle(ResolverStyle.STRICT);
private static final DateTimeFormatter TIME_FORMATTER =
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").withZone(BUSINESS_ZONE);
private static final Map<Integer, String> OUT_ORDER_STATE_TEXT = Map.of(
0, "待审核", 1, "被驳回", 2, "待出库", 3, "已完成", 4, "已撤销", 5, "作废");
private static final Map<Integer, String> IN_ORDER_STATE_TEXT = Map.of(
0, "待审核", 1, "被驳回", 2, "待入库", 3, "已完成", 4, "已撤销", 5, "作废");
private static final Map<Integer, String> GOOD_IN_STATE_TEXT = Map.of(
0, "入库中", 1, "已入库", 2, "已出库", 3, "已撤销");
private static final Map<Integer, String> CUSTOMER_TYPE_TEXT = Map.of(
0, "内部人员", 1, "渠道商", 2, "直营客户");
private static final Map<Integer, String> STOCK_STATE_TEXT = Map.of(0, "在库", 1, "已出库");
private static final Map<Integer, String> ASSEMBLE_STATE_TEXT = Map.of(0, "未匹配", 1, "已匹配");
private static final Map<Integer, String> CHARGE_FLAG_TEXT = Map.of(0, "费用化", 1, "非费用化");
private static final Map<Integer, String> REPLACE_STATE_TEXT = Map.of(0, "未替换", 1, "已替换");
final WarehouseOutDetailsMapper outDetailsMapper;
final WarehouseInDetailsMapper inDetailsMapper;
final HardSockLifeMapper hardSockLifeMapper;
final PermissionService permissionService;
public WarehouseDetailsStatisTools(WarehouseOutDetailsMapper outDetailsMapper,
WarehouseInDetailsMapper inDetailsMapper,
HardSockLifeMapper hardSockLifeMapper,
PermissionService permissionService) {
this.outDetailsMapper = outDetailsMapper;
this.inDetailsMapper = inDetailsMapper;
this.hardSockLifeMapper = hardSockLifeMapper;
this.permissionService = permissionService;
}
@XqTool(category = "warehouse", kind = "read")
@Tool(name = "warehouse.out.details.list.query", description = "分页查询出库明细,参考老系统 /warehouseOutStatis/listByPage。"
+ "只查已完成订单(order_state=3)且 query_flag=0 的明细行。总部可看全部;代理身份可看所属代理范围、"
+ "可见仓库涉及、或本人参与审批的出库单明细。dateType:0出库日期(默认)、1创建时间、2确认出库时间;"
+ "缺省最近180天,跨度上限180天。分页 page 默认1,rows 默认20、上限100。固定按出库日期、id 倒序。")
public Map<String, Object> warehouseOutDetailsListQuery(
@ToolParam(required = false, description = "日期类型:0出库日期(默认) 1创建时间 2确认出库时间") Integer dateType,
@ToolParam(required = false, description = "开始日期,yyyy-MM-dd,缺省最近180天") String startDate,
@ToolParam(required = false, description = "结束日期,yyyy-MM-dd,含当天,缺省今天") String endDate,
@ToolParam(required = false, description = "仓库 id") Long warehouseId,
@ToolParam(required = false, description = "出库类型 id") Long warehouseTypeId,
@ToolParam(required = false, description = "出库单号") String outOrderNo,
@ToolParam(required = false, description = "调拨单号") String allocationOrderNo,
@ToolParam(required = false, description = "商城订单号") String mallOrderNo,
@ToolParam(required = false, description = "物品编号") String materialNo,
@ToolParam(required = false, description = "物品SN,模糊匹配") String snCode,
@ToolParam(required = false, description = "物品名称,模糊匹配") String materielFullName,
@ToolParam(required = false, description = "规格型号,模糊匹配") String specifications,
@ToolParam(required = false, description = "使用客户名称,模糊匹配") String useCustomerName,
@ToolParam(required = false, description = "送货单号,模糊匹配") String deliveryOrderNo,
@ToolParam(required = false, description = "装机单号,模糊匹配") String installOrderNo,
@ToolParam(required = false, description = "取货工单号") String pickupOrderNo,
@ToolParam(required = false, description = "物品分类 id 集合") List<Long> materielIndexIds,
@ToolParam(required = false, description = "所属代理商 id") Long agentId,
@ToolParam(required = false, description = "使用客户类型:0内部人员 1渠道商 2直营客户") Integer useCustomerType,
@ToolParam(required = false, description = "使用客户 id") Long useCustomerId,
@ToolParam(required = false, description = "页码,从1开始,默认1") Integer page,
@ToolParam(required = false, description = "每页条数,默认20,上限100") Integer rows) {
int dateTypeValue = validateDateType(dateType);
LocalDate start = parseLocalDate(startDate, "startDate");
LocalDate end = parseLocalDate(endDate, "endDate");
LocalDate[] range = resolveRange(start, end);
int pageNo = page == null || page < 1 ? 1 : page;
boolean truncated = rows != null && rows > MAX_ROWS;
int pageSize = rows == null || rows < 1 ? DEFAULT_ROWS : Math.min(rows, MAX_ROWS);
LambdaQueryWrapper<WarehouseOutDetails> wrapper = new LambdaQueryWrapper<WarehouseOutDetails>()
.eq(WarehouseOutDetails::getSoftDelete, 0)
.eq(WarehouseOutDetails::getQueryFlag, 0)
.eq(WarehouseOutDetails::getOrderState, ORDER_STATE_DONE)
.eq(warehouseId != null, WarehouseOutDetails::getWarehouseId, warehouseId)
.eq(warehouseTypeId != null, WarehouseOutDetails::getWarehouseTypeId, warehouseTypeId)
.eq(agentId != null, WarehouseOutDetails::getAgentId, agentId)
.eq(useCustomerType != null, WarehouseOutDetails::getUseCustomerType, useCustomerType)
.eq(useCustomerId != null, WarehouseOutDetails::getUseCustomerId, useCustomerId)
.in(materielIndexIds != null && !materielIndexIds.isEmpty(),
WarehouseOutDetails::getMaterielIndexId, materielIndexIds);
eqText(wrapper, WarehouseOutDetails::getOutOrderNo, outOrderNo);
eqText(wrapper, WarehouseOutDetails::getAllocationOrderNo, allocationOrderNo);
eqText(wrapper, WarehouseOutDetails::getMallOrderNo, mallOrderNo);
eqText(wrapper, WarehouseOutDetails::getMaterialNo, materialNo);
eqText(wrapper, WarehouseOutDetails::getPickupOrderNo, pickupOrderNo);
likeText(wrapper, WarehouseOutDetails::getSnCode, snCode);
likeText(wrapper, WarehouseOutDetails::getMaterielFullName, materielFullName);
likeText(wrapper, WarehouseOutDetails::getSpecifications, specifications);
likeText(wrapper, WarehouseOutDetails::getUseCustomerName, useCustomerName);
likeText(wrapper, WarehouseOutDetails::getDeliveryOrderNo, deliveryOrderNo);
likeText(wrapper, WarehouseOutDetails::getInstallOrderNo, installOrderNo);
applyOutDateRange(wrapper, dateTypeValue, range[0], range[1]);
User user = AuthContextHolder.get().getUser();
permissionService.applyWarehouseOutDetailsRowFilter(wrapper, user);
Long total = outDetailsMapper.selectCount(wrapper);
wrapper.orderByDesc(WarehouseOutDetails::getOutDate)
.orderByDesc(WarehouseOutDetails::getId)
.last("LIMIT " + (long) (pageNo - 1) * pageSize + "," + pageSize);
List<Map<String, Object>> records = outDetailsMapper.selectList(wrapper).stream()
.map(this::outRecord).collect(Collectors.toList());
return pageResult(total, pageNo, pageSize, truncated, records);
}
@XqTool(category = "warehouse", kind = "read")
@Tool(name = "warehouse.in.details.list.query", description = "分页查询入库明细,参考老系统 /warehouseInStatis/listByPage。"
+ "只查已完成订单(order_state=3)的明细行。总部可看全部;代理身份可看所属代理范围、"
+ "可见仓库涉及、或本人参与审批的入库单明细。dateType:0入库日期(默认)、1创建时间、2确认入库时间;"
+ "缺省最近180天,跨度上限180天。分页 page 默认1,rows 默认20、上限100。固定按入库日期、id 倒序。")
public Map<String, Object> warehouseInDetailsListQuery(
@ToolParam(required = false, description = "日期类型:0入库日期(默认) 1创建时间 2确认入库时间") Integer dateType,
@ToolParam(required = false, description = "开始日期,yyyy-MM-dd,缺省最近180天") String startDate,
@ToolParam(required = false, description = "结束日期,yyyy-MM-dd,含当天,缺省今天") String endDate,
@ToolParam(required = false, description = "仓库 id") Long warehouseId,
@ToolParam(required = false, description = "入库类型 id") Long warehouseTypeId,
@ToolParam(required = false, description = "入库单号") String inOrderNo,
@ToolParam(required = false, description = "调拨单号") String allocationOrderNo,
@ToolParam(required = false, description = "物品编号") String materialNo,
@ToolParam(required = false, description = "所属代理商 id") Long agentId,
@ToolParam(required = false, description = "装机单号") String installOrderNo,
@ToolParam(required = false, description = "取货工单号") String pickupOrderNo,
@ToolParam(required = false, description = "撤回工单号") String withdrawOrderNo,
@ToolParam(required = false, description = "物品SN,模糊匹配") String snCode,
@ToolParam(required = false, description = "物品名称,模糊匹配") String materielFullName,
@ToolParam(required = false, description = "规格型号,模糊匹配") String specifications,
@ToolParam(required = false, description = "商城订单号,模糊匹配") String mallOrderNo,
@ToolParam(required = false, description = "出库单号,模糊匹配") String outOrderNo,
@ToolParam(required = false, description = "行备注,模糊匹配") String lineMemo,
@ToolParam(required = false, description = "物品分类 id 集合") List<Long> materielIndexIds,
@ToolParam(required = false, description = "页码,从1开始,默认1") Integer page,
@ToolParam(required = false, description = "每页条数,默认20,上限100") Integer rows) {
int dateTypeValue = validateDateType(dateType);
LocalDate start = parseLocalDate(startDate, "startDate");
LocalDate end = parseLocalDate(endDate, "endDate");
LocalDate[] range = resolveRange(start, end);
int pageNo = page == null || page < 1 ? 1 : page;
boolean truncated = rows != null && rows > MAX_ROWS;
int pageSize = rows == null || rows < 1 ? DEFAULT_ROWS : Math.min(rows, MAX_ROWS);
LambdaQueryWrapper<WarehouseInDetails> wrapper = new LambdaQueryWrapper<WarehouseInDetails>()
.eq(WarehouseInDetails::getSoftDelete, 0)
.eq(WarehouseInDetails::getOrderState, ORDER_STATE_DONE)
.eq(warehouseId != null, WarehouseInDetails::getWarehouseId, warehouseId)
.eq(warehouseTypeId != null, WarehouseInDetails::getWarehouseTypeId, warehouseTypeId)
.eq(agentId != null, WarehouseInDetails::getAgentId, agentId)
.in(materielIndexIds != null && !materielIndexIds.isEmpty(),
WarehouseInDetails::getMaterielIndexId, materielIndexIds);
eqText(wrapper, WarehouseInDetails::getInOrderNo, inOrderNo);
eqText(wrapper, WarehouseInDetails::getAllocationOrderNo, allocationOrderNo);
eqText(wrapper, WarehouseInDetails::getMaterialNo, materialNo);
eqText(wrapper, WarehouseInDetails::getInstallOrderNo, installOrderNo);
eqText(wrapper, WarehouseInDetails::getPickupOrderNo, pickupOrderNo);
eqText(wrapper, WarehouseInDetails::getWithdrawOrderNo, withdrawOrderNo);
likeText(wrapper, WarehouseInDetails::getSnCode, snCode);
likeText(wrapper, WarehouseInDetails::getMaterielFullName, materielFullName);
likeText(wrapper, WarehouseInDetails::getSpecifications, specifications);
likeText(wrapper, WarehouseInDetails::getMallOrderNo, mallOrderNo);
likeText(wrapper, WarehouseInDetails::getOutOrderNo, outOrderNo);
likeText(wrapper, WarehouseInDetails::getLineMemo, lineMemo);
applyInDateRange(wrapper, dateTypeValue, range[0], range[1]);
User user = AuthContextHolder.get().getUser();
permissionService.applyWarehouseInDetailsRowFilter(wrapper, user);
Long total = inDetailsMapper.selectCount(wrapper);
wrapper.orderByDesc(WarehouseInDetails::getInDate)
.orderByDesc(WarehouseInDetails::getId)
.last("LIMIT " + (long) (pageNo - 1) * pageSize + "," + pageSize);
List<Map<String, Object>> records = inDetailsMapper.selectList(wrapper).stream()
.map(this::inRecord).collect(Collectors.toList());
return pageResult(total, pageNo, pageSize, truncated, records);
}
@XqTool(category = "warehouse", kind = "read")
@Tool(name = "warehouse.hardstock.list.query", description = "分页查询库存物品详情(在库物品),参考老系统 /warehouseHardStock/listByPage。"
+ "固定只查在库(stock_state=0),数据来自 m0 视图 hard_sock_life。总部可看全部;代理仅可看本公司或 "
+ "warehouse_agent_auth 授权代管公司作为管理公司/所属公司的物品。分页 page 默认1,rows 默认20、上限100。"
+ "固定按 id 倒序。")
public Map<String, Object> warehouseHardStockListQuery(
@ToolParam(required = false, description = "仓库管理公司 id") Long agentId,
@ToolParam(required = false, description = "资产所属公司 id") Long assetOwnerId,
@ToolParam(required = false, description = "仓库 id 集合") List<Long> warehouseIds,
@ToolParam(required = false, description = "物品分类 id 集合") List<Long> materielIndexIds,
@ToolParam(required = false, description = "物品编号,模糊匹配") String materialNo,
@ToolParam(required = false, description = "物品名称,模糊匹配") String materielFullName,
@ToolParam(required = false, description = "规格型号,模糊匹配") String specifications,
@ToolParam(required = false, description = "物品SN,模糊匹配") String snCode,
@ToolParam(required = false, description = "页码,从1开始,默认1") Integer page,
@ToolParam(required = false, description = "每页条数,默认20,上限100") Integer rows) {
int pageNo = page == null || page < 1 ? 1 : page;
boolean truncated = rows != null && rows > MAX_ROWS;
int pageSize = rows == null || rows < 1 ? DEFAULT_ROWS : Math.min(rows, MAX_ROWS);
LambdaQueryWrapper<HardSockLife> wrapper = new LambdaQueryWrapper<HardSockLife>()
.eq(HardSockLife::getSoftDelete, 0)
.eq(HardSockLife::getStockState, 0)
.eq(agentId != null, HardSockLife::getAgentId, agentId)
.eq(assetOwnerId != null, HardSockLife::getAssetOwnerId, assetOwnerId)
.in(warehouseIds != null && !warehouseIds.isEmpty(), HardSockLife::getWarehouseId, warehouseIds)
.in(materielIndexIds != null && !materielIndexIds.isEmpty(),
HardSockLife::getMaterielIndexId, materielIndexIds);
likeText(wrapper, HardSockLife::getMaterialNo, materialNo);
likeText(wrapper, HardSockLife::getMaterielFullName, materielFullName);
likeText(wrapper, HardSockLife::getSpecifications, specifications);
likeText(wrapper, HardSockLife::getSnCode, snCode);
User user = AuthContextHolder.get().getUser();
permissionService.applyHardSockLifeRowFilter(wrapper, user);
Long total = hardSockLifeMapper.selectCount(wrapper);
wrapper.orderByDesc(HardSockLife::getId)
.last("LIMIT " + (long) (pageNo - 1) * pageSize + "," + pageSize);
List<Map<String, Object>> records = hardSockLifeMapper.selectList(wrapper).stream()
.map(this::hardStockRecord).collect(Collectors.toList());
return pageResult(total, pageNo, pageSize, truncated, records);
}
private void applyOutDateRange(LambdaQueryWrapper<WarehouseOutDetails> wrapper, int dateType,
LocalDate start, LocalDate end) {
if (dateType == 0) {
wrapper.ge(WarehouseOutDetails::getOutDate, start).le(WarehouseOutDetails::getOutDate, end);
} else if (dateType == 1) {
wrapper.ge(WarehouseOutDetails::getCreateTime, startOfDay(start))
.lt(WarehouseOutDetails::getCreateTime, nextDayStart(end));
} else {
wrapper.ge(WarehouseOutDetails::getOutConfirmTime, startOfDay(start))
.lt(WarehouseOutDetails::getOutConfirmTime, nextDayStart(end));
}
}
private void applyInDateRange(LambdaQueryWrapper<WarehouseInDetails> wrapper, int dateType,
LocalDate start, LocalDate end) {
if (dateType == 0) {
wrapper.ge(WarehouseInDetails::getInDate, start).le(WarehouseInDetails::getInDate, end);
} else if (dateType == 1) {
wrapper.ge(WarehouseInDetails::getCreateTime, startOfDay(start))
.lt(WarehouseInDetails::getCreateTime, nextDayStart(end));
} else {
wrapper.ge(WarehouseInDetails::getInConfirmTime, startOfDay(start))
.lt(WarehouseInDetails::getInConfirmTime, nextDayStart(end));
}
}
private Map<String, Object> outRecord(WarehouseOutDetails detail) {
Map<String, Object> row = new LinkedHashMap<>();
row.put("id", detail.getId());
row.put("outOrderNo", detail.getOutOrderNo());
row.put("warehouseOutId", detail.getWarehouseOutId());
row.put("agentId", detail.getAgentId());
row.put("agentName", detail.getAgentName());
row.put("warehouseId", detail.getWarehouseId());
row.put("warehouseName", detail.getWarehouseName());
row.put("warehouseTypeId", detail.getWarehouseTypeId());
row.put("warehouseTypeName", detail.getWarehouseTypeName());
row.put("materialNo", detail.getMaterialNo());
row.put("materielFullName", detail.getMaterielFullName());
row.put("materielSort", detail.getMaterielSort());
row.put("specifications", detail.getSpecifications());
row.put("snCode", detail.getSnCode());
row.put("outCount", detail.getOutCount());
row.put("price", detail.getPrice());
row.put("allMoney", detail.getAllMoney());
row.put("outDate", detail.getOutDate() == null ? null : detail.getOutDate().toString());
row.put("orderState", detail.getOrderState());
row.put("orderStateText", text(OUT_ORDER_STATE_TEXT, detail.getOrderState()));
row.put("applyUserName", detail.getApplyUserName());
row.put("outConfirmTime", formatTime(detail.getOutConfirmTime()));
row.put("outConfirmUserName", detail.getOutConfirmUserName());
row.put("useCustomerType", detail.getUseCustomerType());
row.put("useCustomerTypeText", text(CUSTOMER_TYPE_TEXT, detail.getUseCustomerType()));
row.put("useCustomerName", detail.getUseCustomerName());
row.put("allocationOrderNo", detail.getAllocationOrderNo());
row.put("mallOrderNo", detail.getMallOrderNo());
row.put("deliveryOrderNo", detail.getDeliveryOrderNo());
row.put("installOrderNo", detail.getInstallOrderNo());
row.put("pickupOrderNo", detail.getPickupOrderNo());
row.put("createTime", formatTime(detail.getCreateTime()));
return row;
}
private Map<String, Object> inRecord(WarehouseInDetails detail) {
Map<String, Object> row = new LinkedHashMap<>();
row.put("id", detail.getId());
row.put("inOrderNo", detail.getInOrderNo());
row.put("warehouseInId", detail.getWarehouseInId());
row.put("agentId", detail.getAgentId());
row.put("agentName", detail.getAgentName());
row.put("warehouseId", detail.getWarehouseId());
row.put("warehouseName", detail.getWarehouseName());
row.put("warehouseTypeId", detail.getWarehouseTypeId());
row.put("warehouseTypeName", detail.getWarehouseTypeName());
row.put("materialNo", detail.getMaterialNo());
row.put("materielFullName", detail.getMaterielFullName());
row.put("materielSort", detail.getMaterielSort());
row.put("specifications", detail.getSpecifications());
row.put("snCode", detail.getSnCode());
row.put("inCount", detail.getInCount());
row.put("inDate", detail.getInDate() == null ? null : detail.getInDate().toString());
row.put("orderState", detail.getOrderState());
row.put("orderStateText", text(IN_ORDER_STATE_TEXT, detail.getOrderState()));
row.put("goodInState", detail.getGoodInState());
row.put("goodInStateText", text(GOOD_IN_STATE_TEXT, detail.getGoodInState()));
row.put("applyUserName", detail.getApplyUserName());
row.put("inConfirmTime", formatTime(detail.getInConfirmTime()));
row.put("inConfirmUserName", detail.getInConfirmUserName());
row.put("allocationOrderNo", detail.getAllocationOrderNo());
row.put("mallOrderNo", detail.getMallOrderNo());
row.put("outOrderNo", detail.getOutOrderNo());
row.put("deliveryOrderNo", detail.getDeliveryOrderNo());
row.put("installOrderNo", detail.getInstallOrderNo());
row.put("pickupOrderNo", detail.getPickupOrderNo());
row.put("withdrawOrderNo", detail.getWithdrawOrderNo());
row.put("memo", detail.getMemo());
row.put("lineMemo", detail.getLineMemo());
row.put("createTime", formatTime(detail.getCreateTime()));
return row;
}
private Map<String, Object> hardStockRecord(HardSockLife item) {
Map<String, Object> row = new LinkedHashMap<>();
row.put("id", item.getId());
row.put("snCode", item.getSnCode());
row.put("lifeSnCode", item.getLifeSnCode());
row.put("agentId", item.getAgentId());
row.put("agentName", item.getAgentName());
row.put("warehouseId", item.getWarehouseId());
row.put("warehouseName", item.getWarehouseName());
row.put("warehouseOwnerId", item.getWarehouseOwnerId());
row.put("warehouseOwnerName", item.getWarehouseOwnerName());
row.put("assetOwnerId", item.getAssetOwnerId());
row.put("assetOwnerName", item.getAssetOwnerName());
row.put("materialNo", item.getMaterialNo());
row.put("materielFullName", item.getMaterielFullName());
row.put("materielSort", item.getMaterielSort());
row.put("specifications", item.getSpecifications());
row.put("stockState", item.getStockState());
row.put("stockStateText", text(STOCK_STATE_TEXT, item.getStockState()));
row.put("currentInventory", item.getCurrentInventory());
row.put("assembleState", item.getAssembleState());
row.put("assembleStateText", text(ASSEMBLE_STATE_TEXT, item.getAssembleState()));
row.put("chargeFlag", item.getChargeFlag());
row.put("chargeFlagText", text(CHARGE_FLAG_TEXT, item.getChargeFlag()));
row.put("replaceState", item.getReplaceState());
row.put("replaceStateText", text(REPLACE_STATE_TEXT, item.getReplaceState()));
row.put("useCustomerType", item.getUseCustomerType());
row.put("useCustomerTypeText", text(CUSTOMER_TYPE_TEXT, item.getUseCustomerType()));
row.put("useCustomerName", item.getUseCustomerName());
row.put("outInOrderNo", item.getOutInOrderNo());
row.put("outInDate", formatTime(item.getOutInDate()));
row.put("createTime", formatTime(item.getCreateTime()));
return row;
}
private static Map<String, Object> pageResult(Long total, int pageNo, int pageSize,
boolean truncated, List<Map<String, Object>> records) {
Map<String, Object> result = new LinkedHashMap<>();
result.put("total", total);
result.put("page", pageNo);
result.put("rows", pageSize);
if (truncated) {
result.put("notice", "rows 超过上限 100,已截断为 100");
}
result.put("records", records);
return result;
}
private static int validateDateType(Integer dateType) {
if (dateType == null) {
return 0;
}
if (dateType < 0 || dateType > 2) {
throw new IllegalArgumentException("dateType 只支持 0(业务日期)、1(创建时间)、2(确认时间)");
}
return dateType;
}
private static LocalDate[] resolveRange(LocalDate start, LocalDate end) {
LocalDate today = LocalDate.now(BUSINESS_ZONE);
LocalDate resolvedEnd = end == null ? today : end;
LocalDate resolvedStart = start == null ? resolvedEnd.minusDays(MAX_SPAN_DAYS) : start;
if (resolvedStart.isAfter(resolvedEnd)) {
throw new IllegalArgumentException("startDate 不能晚于 endDate");
}
// 老口径 DateUtil.betweenDay(start, end) > 180 才拒绝:恰好 180 天放行
if (ChronoUnit.DAYS.between(resolvedStart, resolvedEnd) > MAX_SPAN_DAYS) {
throw new IllegalArgumentException("日期跨度不能超过 " + MAX_SPAN_DAYS + " 天");
}
return new LocalDate[]{resolvedStart, resolvedEnd};
}
private static LocalDate parseLocalDate(String value, String name) {
if (!StringUtils.hasText(value)) {
return null;
}
String trimmed = value.trim();
if (!DATE_PATTERN.matcher(trimmed).matches()) {
throw new IllegalArgumentException(name + " 格式必须为 yyyy-MM-dd");
}
try {
return LocalDate.parse(trimmed, DATE_FORMATTER);
} catch (DateTimeParseException e) {
throw new IllegalArgumentException(name + " 格式必须为 yyyy-MM-dd");
}
}
private static Date startOfDay(LocalDate date) {
return Date.from(date.atStartOfDay(BUSINESS_ZONE).toInstant());
}
private static Date nextDayStart(LocalDate date) {
return Date.from(date.plusDays(1).atStartOfDay(BUSINESS_ZONE).toInstant());
}
private static <T> void eqText(LambdaQueryWrapper<T> wrapper,
com.baomidou.mybatisplus.core.toolkit.support.SFunction<T, ?> column,
String value) {
if (StringUtils.hasText(value)) {
wrapper.eq(column, value.trim());
}
}
private static <T> void likeText(LambdaQueryWrapper<T> wrapper,
com.baomidou.mybatisplus.core.toolkit.support.SFunction<T, ?> column,
String value) {
if (StringUtils.hasText(value)) {
wrapper.like(column, value.trim());
}
}
private static String text(Map<Integer, String> texts, Integer code) {
return code == null ? null : texts.getOrDefault(code, "未知");
}
private static String formatTime(Date date) {
return date == null ? null : TIME_FORMATTER.format(date.toInstant());
}
}
@@ -9,6 +9,7 @@ import me.iiv.agent.entity.m0.DeviceLifeCycle;
import me.iiv.agent.entity.m0.DistrictDistrictStrategy;
import me.iiv.agent.entity.m0.HardwareCleanLog;
import me.iiv.agent.entity.m0.HardwareView;
import me.iiv.agent.entity.m0.HardSockLife;
import me.iiv.agent.entity.m0.Properyt;
import me.iiv.agent.entity.m0.ToiletAirquality;
import me.iiv.agent.entity.m0.User;
@@ -23,7 +24,9 @@ import me.iiv.agent.entity.m2.RelocationOrder;
import me.iiv.agent.entity.m2.WarehouseAgentAuth;
import me.iiv.agent.entity.m2.WithdrawOrder;
import me.iiv.agent.entity.m2.WarehouseIn;
import me.iiv.agent.entity.m2.WarehouseInDetails;
import me.iiv.agent.entity.m2.WarehouseOut;
import me.iiv.agent.entity.m2.WarehouseOutDetails;
import me.iiv.agent.entity.m2.WarehouseStockManage;
import me.iiv.agent.entity.svc.AgentApiKey;
import me.iiv.agent.mapper.m0.AgentManageDistrictAuthMapper;
@@ -255,6 +258,101 @@ public class PermissionService {
.or().apply(participantExists, user.getId()));
}
/**
* 出库明细权限(warehouse.out.details.list.query 专用,REQ-20261105-0020):
* 主单同口径的明细级变体——代理范围(visibleAgentIds)的明细行、
* 可见仓库(warehouse.agent_id/manager_agent_id 命中代理范围)涉及的明细行,
* 以及本人参与审批的主单下的明细行,三者取并集。明细行自带 warehouse_id/warehouse_out_id,
* EXISTS 直接落在明细表上,不回Join主单。
*/
public void applyWarehouseOutDetailsRowFilter(LambdaQueryWrapper<WarehouseOutDetails> wrapper, User user) {
List<Long> agentIds = visibleAgentIds(user);
if (agentIds == null) {
return;
}
if (agentIds.isEmpty()) {
wrapper.eq(WarehouseOutDetails::getId, 0L);
return;
}
String firstIds = placeholders(0, agentIds.size());
String secondIds = placeholders(agentIds.size(), agentIds.size());
Object[] warehouseArgs = new Object[agentIds.size() * 2];
for (int i = 0; i < agentIds.size(); i++) {
warehouseArgs[i] = agentIds.get(i);
warehouseArgs[i + agentIds.size()] = agentIds.get(i);
}
String visibleWarehouseExists = "EXISTS (SELECT 1 FROM warehouse w "
+ "WHERE w.id = warehouse_out_details.warehouse_id AND w.soft_delete = 0 "
+ "AND (w.agent_id IN (" + firstIds + ") OR w.manager_agent_id IN (" + secondIds + ")))";
String participantExists = "EXISTS (SELECT 1 FROM warehouse_out_audit_process woap "
+ "WHERE woap.warehouse_out_id = warehouse_out_details.warehouse_out_id "
+ "AND woap.soft_delete = 0 AND woap.user_id = {0})";
wrapper.and(w -> w.in(WarehouseOutDetails::getAgentId, agentIds)
.or().apply(visibleWarehouseExists, warehouseArgs)
.or().apply(participantExists, user.getId()));
}
/**
* 入库明细权限(warehouse.in.details.list.query 专用,REQ-20261105-0020):
* 与出库明细同口径,audit 表换 warehouse_in_audit_process。
*/
public void applyWarehouseInDetailsRowFilter(LambdaQueryWrapper<WarehouseInDetails> wrapper, User user) {
List<Long> agentIds = visibleAgentIds(user);
if (agentIds == null) {
return;
}
if (agentIds.isEmpty()) {
wrapper.eq(WarehouseInDetails::getId, 0L);
return;
}
String firstIds = placeholders(0, agentIds.size());
String secondIds = placeholders(agentIds.size(), agentIds.size());
Object[] warehouseArgs = new Object[agentIds.size() * 2];
for (int i = 0; i < agentIds.size(); i++) {
warehouseArgs[i] = agentIds.get(i);
warehouseArgs[i + agentIds.size()] = agentIds.get(i);
}
String visibleWarehouseExists = "EXISTS (SELECT 1 FROM warehouse w "
+ "WHERE w.id = warehouse_in_details.warehouse_id AND w.soft_delete = 0 "
+ "AND (w.agent_id IN (" + firstIds + ") OR w.manager_agent_id IN (" + secondIds + ")))";
String participantExists = "EXISTS (SELECT 1 FROM warehouse_in_audit_process wiap "
+ "WHERE wiap.warehouse_in_id = warehouse_in_details.warehouse_in_id "
+ "AND wiap.soft_delete = 0 AND wiap.user_id = {0})";
wrapper.and(w -> w.in(WarehouseInDetails::getAgentId, agentIds)
.or().apply(visibleWarehouseExists, warehouseArgs)
.or().apply(participantExists, user.getId()));
}
/**
* 库存物品详情(m0 视图 hard_sock_life)行权限,1:1 对齐老系统
* WrapperUtils.getWarehouseAuth(/warehouseHardStock/listByPage):总部/服务主体不加过滤;
* 代理可看本公司及 warehouse_agent_auth 授权代管公司作为管理公司(agent_id)
* 或所属公司(warehouse_owner_id)的物品。与 applyWarehouseStockRowFilter 同语义、
* 不同实体(HardwareCleanLog 变体模式)。
*/
public void applyHardSockLifeRowFilter(LambdaQueryWrapper<HardSockLife> wrapper, User user) {
if (servicePrincipalNoFilter(user)) {
return;
}
if (!isAgentAuthority(user.getAuthorityId())) {
return;
}
if (user.getAgentId() == null) {
throw new IllegalStateException("代理商用户未关联代理商,拒绝访问业务数据");
}
Set<Long> ids = new LinkedHashSet<>();
ids.add(user.getAgentId());
ids.addAll(managedAuths(user.getId()).stream()
.map(WarehouseAgentAuth::getManagerAgentId)
.collect(Collectors.toList()));
wrapper.and(w -> w.in(HardSockLife::getAgentId, ids)
.or().in(HardSockLife::getWarehouseOwnerId, ids));
}
/**
* 送货工单权限:1:1 复刻老系统 getWorkOrderAuth(type=1)。总部看全部;其余代理身份
* 可看申请代理、所属代理(本代理+授权代管,不含直属下级)、授权代管物业范围,