From 9dd9bf4fb5e8c64c52bf2c0632e5bf7cf577351c Mon Sep 17 00:00:00 2001 From: yangyufu Date: Wed, 12 Aug 2026 16:05:26 +0800 Subject: [PATCH] =?UTF-8?q?fix(wql):=20=E7=AE=A1=E5=88=B6=E5=8D=B7?= =?UTF-8?q?=E7=A7=BB=E5=BA=936=E6=94=B96=20=E9=99=90=E5=88=B6=E3=80=82?= =?UTF-8?q?=E7=AE=A1=E5=88=B6=E5=8D=B7=E7=A7=BB=E5=BA=93=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IStIvtLevelchangedtlService.java | 4 +- .../impl/StIvtLevelchangedtlServiceImpl.java | 41 ++++++++++++++++--- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/levelchange/service/IStIvtLevelchangedtlService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/levelchange/service/IStIvtLevelchangedtlService.java index 323c74946..6fab696c3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/levelchange/service/IStIvtLevelchangedtlService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/levelchange/service/IStIvtLevelchangedtlService.java @@ -1,10 +1,10 @@ package org.nl.wms.st.levelchange.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; import org.nl.common.domain.query.PageQuery; import org.nl.wms.st.levelchange.dao.StIvtLevelchangedtl; -import java.util.List; import java.util.Map; import java.util.Set; @@ -19,7 +19,7 @@ public interface IStIvtLevelchangedtlService { /** * 分页查询 */ - List queryAll(Map whereJson, PageQuery page); + IPage queryAll(Map whereJson, PageQuery page); /** * 新增 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/levelchange/service/impl/StIvtLevelchangedtlServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/levelchange/service/impl/StIvtLevelchangedtlServiceImpl.java index f6c67cc15..811e9e803 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/levelchange/service/impl/StIvtLevelchangedtlServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/levelchange/service/impl/StIvtLevelchangedtlServiceImpl.java @@ -1,7 +1,9 @@ package org.nl.wms.st.levelchange.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -11,6 +13,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.StringUtils; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.st.instor.service.HandMoveStorService; import org.nl.wms.st.levelchange.dao.StIvtLevelchangedtl; @@ -45,15 +48,36 @@ public class StIvtLevelchangedtlServiceImpl implements IStIvtLevelchangedtlServi @Override - public List queryAll(Map whereJson, PageQuery page) { + public IPage queryAll(Map whereJson, PageQuery page) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); // 根据 whereJson 动态添加查询条件，可按需扩展 wrapper.eq(StIvtLevelchangedtl::getIs_delete, "0"); + String move_bill_code = MapUtil.getStr(whereJson, "move_bill_code"); + String status = MapUtil.getStr(whereJson, "status"); + String container_name = MapUtil.getStr(whereJson, "container_name"); + String begin_time = MapUtil.getStr(whereJson, "begin_time"); + String end_time = MapUtil.getStr(whereJson, "end_time"); + if(StrUtil.isNotBlank(move_bill_code)){ + wrapper.eq(StIvtLevelchangedtl::getMove_bill_code, move_bill_code); + } + if(StrUtil.isNotBlank(status)){ + wrapper.eq(StIvtLevelchangedtl::getStatus, status); + } + if(StrUtil.isNotBlank(container_name)){ + wrapper.like(StIvtLevelchangedtl::getContainer_name, container_name); + } + if(StrUtil.isNotBlank(begin_time)){ + wrapper.ge(StIvtLevelchangedtl::getCreate_time, begin_time); + } + if(StrUtil.isNotBlank(end_time)){ + wrapper.le(StIvtLevelchangedtl::getCreate_time, end_time); + } + wrapper.orderByDesc(StIvtLevelchangedtl::getCreate_time); - IPage iPage = new Page<>(page.getPage(), page.getSize()); + IPage iPage = new Page<>(page.getPage()+1, page.getSize()); levelchangedtlMapper.selectPage(iPage, wrapper); - return iPage.getRecords(); + return iPage; } @Override @@ -119,8 +143,15 @@ public class StIvtLevelchangedtlServiceImpl implements IStIvtLevelchangedtlServi try{ //判断卷原来的级别是不是管制卷，如果不是，不走移库操作。 if(!"6".equals(oldLevel)){ - log.info("非管制卷改级，不需要进行实物移库！"); - throw new BadRequestException("非管制卷改级，不需要进行实物移库！！"); + log.info("非管制卷改级，不需要进行实物移库！containerName={}, newLevel={}, oldLevel={}, newResult={}, oldResult={}", + containerName, newLevel, oldLevel, newResult, oldResult); + return; + } + //判断新的级别是否是 A- A A+ 3 2 1 + if(!"3".equals(newLevel) && !"2".equals(newLevel) && !"1".equals(newLevel)){ + log.info("非A-/A/A+改级，不需要进行实物移库！containerName={}, newLevel={}, oldLevel={}, newResult={}, oldResult={}", + containerName, newLevel, oldLevel, newResult, oldResult); + return; } List> packages = levelchangedtlMapper.selectPackageInfoByContainerName(containerName); if(ObjectUtil.isEmpty(packages)){