From cf95dc505c812f4f348aca371946dfc70149491a Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Tue, 18 Jun 2024 15:33:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=8F=91=E8=B4=A7=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E6=9C=A8=E7=AE=B1=E5=8F=B7=E8=A7=A3=E6=9E=90=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=9F=A5=E4=B8=8D=E5=88=B0=E5=AD=90=E5=8D=B7?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iostorInv/util/impl/InBussManageServiceImpl.java | 6 +----- .../util/impl/SendOutManageServiceImpl.java | 12 +++++++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java index 17cfb5c40..6f9d65c40 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBussManageServiceImpl.java @@ -215,11 +215,7 @@ public class InBussManageServiceImpl implements InBussManageService { } List pcsnList = Arrays.asList(material_barcode.split(",")); // 查询子卷包装关系 -// List subList = subTab.query("container_name ='B2512402242302B1A1' and status in ('0','1')") -// .getResultJSONArray(0).toJavaList(JSONObject.class); -// List subList = subTab.query("container_name ='B2512402242302B1A1' and status in ('0','1')") -// .getResultJSONArray(0).toJavaList(JSONObject.class); - List subList = subTab.query("container_name in ('" + String.join("','", pcsnList) + "') and status in ('0','1')") + List subList = subTab.query("container_name in ('" + String.join("','", pcsnList) + "') and status in ('0','1','99')") .getResultJSONArray(0).toJavaList(JSONObject.class); if (ObjectUtil.isEmpty(subList)) { throw new BadRequestException("未查询到子卷包装信息!"); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java index 09408f133..99e8645dc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/SendOutManageServiceImpl.java @@ -1,11 +1,13 @@ package org.nl.b_lms.storage_manage.ios.service.iostorInv.util.impl; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.nl.b_lms.sch.point.dao.SchBasePoint; import org.nl.b_lms.sch.point.dao.mapper.SchBasePointMapper; import org.nl.b_lms.sch.point.service.IschBasePointService; @@ -20,6 +22,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Arrays; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; @@ -69,13 +72,16 @@ public class SendOutManageServiceImpl implements SendOutManageService { .eq(SchBasePoint::getIs_used, IOSEnum.IS_NOTANDYES.code("是")) .eq(SchBasePoint::getIs_delete, IOSEnum.IS_NOTANDYES.code("否")) ); - // 1.查询此木箱号的子卷包装关系 - JSONObject jsonSub = subTab.query("package_box_sn = '" + whereJson.getString("vehicle_code") + "'").uniqueResult(0); + if(StringUtils.isEmpty(whereJson.getString("vehicle_code"))){ + throw new BadRequestException("木箱号不能为空！"); + } + //木箱号可能用逗号隔开 + String vehicleCode = Arrays.asList(whereJson.getString("vehicle_code").split(",")).get(0); + JSONObject jsonSub = subTab.query("package_box_sn = '" + vehicleCode + "'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonSub)) { throw new BadRequestException("未查询到该木箱对应的包装关系！"); } - // 2.找相同订单号的所有排 jsonSub.put("region_id", RegionTypeEnum.TWO_FH01.getId()); List pointLikeOrder = schBasePointMapper.queryLikeOrderRow(jsonSub); From 41cf6d7466e9aa4641ab39a138bb09d04a931b17 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Tue, 18 Jun 2024 16:00:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?opt:=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E7=82=B9=E4=BD=8D=E7=9A=84=E5=AD=90=E5=8D=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/PdmBiSubpackagerelationMapper.java | 2 ++ .../mapper/PdmBiSubpackagerelationMapper.xml | 12 +++++++++++ .../PdmBiSubpackagerelationServiceImpl.java | 20 +------------------ 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java index 315554a65..c269fc620 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.java @@ -28,4 +28,6 @@ public interface PdmBiSubpackagerelationMapper extends BaseMapper queryContainerNameBySaleOrder( @Param("sale_order_name") String sale_order_name); + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml index b2dd6d33c..032d3abad 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml @@ -72,5 +72,17 @@ ORDER BY MAX(create_time) DESC + + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java index bb2774e37..f4c885abc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java @@ -153,25 +153,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl queryContainerNameBySaleOrder(Map whereJson) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (whereJson.containsKey("customer_description")) { - queryWrapper.like(PdmBiSubpackagerelation::getCustomer_description, whereJson.get("customer_description")); - } - if (whereJson.containsKey("sale_order_name")) { - queryWrapper.eq(PdmBiSubpackagerelation::getSale_order_name, whereJson.get("sale_order_name")); - } - if (whereJson.containsKey("customer_name")) { - queryWrapper.like(PdmBiSubpackagerelation::getCustomer_name, whereJson.get("customer_name")); - } - if (whereJson.containsKey("status")) { - if ("99".equals(whereJson.get("status"))) { - queryWrapper.eq(PdmBiSubpackagerelation::getStatus, whereJson.get("status")); - } else { - queryWrapper.ge(PdmBiSubpackagerelation::getStatus, whereJson.get("status")); - } - } - queryWrapper.orderByDesc(PdmBiSubpackagerelation::getBox_group); - List pdmBiSubpackagerelationList = pdmBiSubpackagerelationMapper.selectList(queryWrapper); + List pdmBiSubpackagerelationList = pdmBiSubpackagerelationMapper.queryContainerNameBySaleOrder(whereJson.get("sale_order_name").toString()); Map countByGroup = pdmBiSubpackagerelationList.stream() .filter(item -> item.getBox_group() != null) .collect(Collectors.groupingBy(PdmBiSubpackagerelation::getBox_group, Collectors.counting()));