Browse Source

feat(automatedWarehouse): 实现托盘合并查询接口分页功能

- 在PalletMergeQueryData实体类中新增maxPositionCount字段,支持前端传入最大已用数量筛选条件
- 更新controller层searchPalletMergeList方法,返回分页数据格式,接收page和limit参数
- 新增mapper接口searchPalletMergeListPage方法,使用MyBatis-Plus分页插件实现数据库分页查询
- 完善service层实现,支持前端传入maxPositionCount或后端自动计算最大已用位置数
- 添加分页参数校验,默认页码为1,每页限制20条记录
- 更新XML映射文件,实现分页查询SQL逻辑,支持maxPositionCount条件筛选
master
常熟吴彦祖 2 months ago
parent
commit
845b1df8e6
  1. 12
      src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/PalletAutoGoToWCSImpl.java

12
src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/PalletAutoGoToWCSImpl.java

@ -132,7 +132,17 @@ public class PalletAutoGoToWCSImpl implements PalletAutoGoToWCS {
//组盘里面判断 结束组盘 才会修改栈板不可用标记
if("Y".equals(endFlag)) {
String username = ((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUsername();
// 获取当前用户定时任务场景下使用默认值 - rqrq
String username = "sys_wms";
try {
SysUserEntity currentUser = (SysUserEntity) SecurityUtils.getSubject().getPrincipal();
if (currentUser != null) {
username = currentUser.getUsername();
}
} catch (Exception e) {
// 定时任务或异步线程中无法获取Shiro上下文使用默认用户 - rqrq
username = "sys_wms";
}
// 更新栈板calling_flag为Y
wcsIntegrationMapper.updatePalletCallingFlag(site, palletId, "Y", "组盘操作", username);
palletOperationLogService.logPalletOperation(palletId, site,"调用托盘","组盘操作","是否调用","N","Y",username,"");

Loading…
Cancel
Save