From e643ea9ca8f1279d50958f6854b273c521d9e232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E9=BE=99?= Date: Wed, 2 Apr 2025 11:10:37 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=8D=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionSplitOrderTaskController.java | 10 ++++ .../IDistributionSplitOrderTaskService.java | 4 ++ ...DistributionSplitOrderTaskServiceImpl.java | 53 ++++++++++++++++--- 3 files changed, 61 insertions(+), 6 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSplitOrderTaskController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSplitOrderTaskController.java index 08ea01f8e..44cc33aa4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSplitOrderTaskController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSplitOrderTaskController.java @@ -117,6 +117,11 @@ public class DistributionSplitOrderTaskController { return distributionSplitOrderTaskService.checkOrderCode(orderCode); } + @GetMapping("/check-order-code-by-stock-article-id") + public R checkOrderCode(Long stockArticleId) { + return distributionSplitOrderTaskService.checkOrderCode(stockArticleId); + } + @GetMapping("/get-package-code-by-order-code") public R> getPackageCodeByOrderCode(Query query, String orderCode) { return distributionSplitOrderTaskService.getPackageCodeByOrderCode(query, orderCode); @@ -126,4 +131,9 @@ public class DistributionSplitOrderTaskController { public R> getPackageCodeByTaskId(Long taskId) { return distributionSplitOrderTaskService.getPackageCodeByTaskId( taskId); } + + @GetMapping("/get-allow-split-order-number") + public R getAllowSplitOrderNumber(Long stockArticleId){ + return R.data(distributionSplitOrderTaskService.getSplitOrderAllowCount(stockArticleId)); + } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSplitOrderTaskService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSplitOrderTaskService.java index 3362b6689..c5531b703 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSplitOrderTaskService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionSplitOrderTaskService.java @@ -117,6 +117,10 @@ public interface IDistributionSplitOrderTaskService extends BaseService checkOrderCode(String orderCode); + R checkOrderCode(Long stockArticleId); + + long getSplitOrderAllowCount(Long stockArticleId); + R> getPackageCodeByTaskId(Long taskId); R> getPackageCodeByOrderCode(Query query, String orderCode); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java index 673907ea5..c606a7598 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java @@ -34,7 +34,6 @@ import org.springblade.common.constant.order.OrderSplitStateConstant; import org.springblade.common.constant.order.OrderStatusConstant; import org.springblade.common.constant.orderpackage.*; import org.springblade.common.exception.CustomerException; -import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; @@ -42,9 +41,7 @@ import org.springblade.core.redis.lock.LockType; import org.springblade.core.redis.lock.RedisLockClient; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; -import org.springblade.system.cache.UserCache; import org.springblade.system.entity.User; -import org.springblade.system.feign.ISysClient; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -136,7 +133,8 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpl= taskNumber) { + return R.fail("拆单数需要小于订单总数量，请重新填写，目前可拆单数量：" + (packageAllowCount - 1)); } taskLock(stockArticleId, () -> { @@ -933,7 +934,7 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpl> maps = baseMapper.selectMaps( Wrappers.query() .select("split_order_all_task_id", "SUM(number) as number") - .eq("split_order_all_task_id", taskIds) + .in("split_order_all_task_id", taskIds) .in("state", OrderSplitStateConstant.InProgress.getValue(), OrderSplitStateConstant.finish.getValue()) .groupBy("split_order_all_task_id") ); @@ -993,6 +994,46 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpl checkOrderCode(Long stockArticleId){ + DistributionStockArticleEntity distributionStockArticle = distributionStockArticleService.getById(stockArticleId); + if (distributionStockArticle == null) { + return R.fail("原订单信息错误"); + } + if (distributionStockArticle.getOrderStatus().equals(OrderStatusConstant.chuku.getValue()) + || distributionStockArticle.getOrderStatus().equals(OrderStatusConstant.qianshou.getValue()) + || Objects.equals(distributionStockArticle.getReservationStatus(), OrderReservationStatusConstant.yiyueyue.getValue())) { + return R.fail("订单"+ distributionStockArticle.getOrderCode() +"不允许拆单"); + } + + long packageAllowCount = getSplitOrderAllowCount(stockArticleId); + long packageAllCount = getSplitOrderAllCount(stockArticleId); + + if (packageAllowCount == 0 || packageAllCount == 1) { + return R.fail("订单"+ distributionStockArticle.getOrderCode() +"包件数量不足，不允许拆单"); + } + + boolean exists = exists( + Wrappers.lambdaQuery() + .eq(DistributionSplitOrderTaskEntity::getStockArticleId, stockArticleId) + .eq(DistributionSplitOrderTaskEntity::getState, OrderSplitStateConstant.InProgress.getValue()) + ); + if (exists) { + return R.fail("订单"+ distributionStockArticle.getOrderCode() +"正在拆单中，不允许重复拆单"); + } + + boolean hasSplit = exists( + Wrappers.lambdaQuery() + .eq(DistributionSplitOrderTaskEntity::getNewStockArticleId, stockArticleId) + ); + + if (hasSplit){ + return R.fail("订单"+ distributionStockArticle.getOrderCode() +"已是拆单订单，不允许再次拆单"); + } + + return R.success(""); + } + @Override public R> getPackageCodeByOrderCode(Query query, String orderCode) { IPage page = Condition.getPage(query); From 6306618e5aa9ed532c14dc4b0b3690d5b8163165 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 2 Apr 2025 15:05:21 +0800 Subject: [PATCH 02/12] =?UTF-8?q?feat(all):=20=E7=99=BE=E5=BE=97=E8=83=9C?= =?UTF-8?q?=E5=B7=A5=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 增加百得胜工厂数据对接 --- .../FactoryAccountsInterceptor.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-paterson/src/main/java/com/logpm/factorydata/paterson/interceptor/FactoryAccountsInterceptor.java b/blade-service/logpm-factory-data/logpm-factory-data-paterson/src/main/java/com/logpm/factorydata/paterson/interceptor/FactoryAccountsInterceptor.java index 7097255c3..3b7abf9f9 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-paterson/src/main/java/com/logpm/factorydata/paterson/interceptor/FactoryAccountsInterceptor.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-paterson/src/main/java/com/logpm/factorydata/paterson/interceptor/FactoryAccountsInterceptor.java @@ -1,6 +1,9 @@ package com.logpm.factorydata.paterson.interceptor; import cn.hutool.core.codec.Base64; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.digest.MD5; @@ -35,7 +38,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; -import java.time.Instant; import java.util.Objects; import java.util.concurrent.TimeUnit; @@ -93,13 +95,23 @@ public class FactoryAccountsInterceptor implements HandlerInterceptor { FactoryAuthVO authVO = jpFactoryShipmentService.findFactoryAuth(companyCode); if (ObjectUtil.isNotEmpty(authVO)) { Long authTime1 = authVO.getAuthTime(); - long secondTimestamp = Instant.now().getEpochSecond(); - // 验证时间 不能大于5秒 + long secondTimestamp = DateUtil.current(); + DateTime currentDate = DateUtil.date(); + // 验证时间 if (secondTimestamp - authTime > authTime1) { log.info("##########preHandle: 时间戳过期"); returnJson(response, JSONObject.toJSONString(R.fail("认证不通过,时间戳过期"))); return false; } + // 将 authTime 转换为时间并与当前时间比较 + DateTime authDateTime = DateUtil.date(authTime * 1000); // 将时间戳转换为 DateTime + // 将 authTime 转换为时间并与当前时间比较 + long timeDifferenceInSeconds = DateUtil.between(authDateTime, currentDate, DateUnit.MS); + if (timeDifferenceInSeconds > authTime1) { + log.info("##########preHandle: 认证时间过期"); + returnJson(response, JSONObject.toJSONString(R.fail("认证不通过,认证时间过期"))); + return false; + } // 验证签名 String auth = authVO.getAppKey(); String md5Hex = Base64.encode(MD5.create().digestHex(params + auth + authTime)).toUpperCase(); From 2fe1e29e02f66beeb9c26152bcd8f35a7baea89d Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 2 Apr 2025 15:29:29 +0800 Subject: [PATCH 03/12] =?UTF-8?q?feat(all):=20=E7=99=BE=E5=BE=97=E8=83=9C?= =?UTF-8?q?=E5=B7=A5=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 增加百得胜工厂数据对接 --- .../paterson/interceptor/FactoryAccountsInterceptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-factory-data/logpm-factory-data-paterson/src/main/java/com/logpm/factorydata/paterson/interceptor/FactoryAccountsInterceptor.java b/blade-service/logpm-factory-data/logpm-factory-data-paterson/src/main/java/com/logpm/factorydata/paterson/interceptor/FactoryAccountsInterceptor.java index 3b7abf9f9..ac71ee9ab 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-paterson/src/main/java/com/logpm/factorydata/paterson/interceptor/FactoryAccountsInterceptor.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-paterson/src/main/java/com/logpm/factorydata/paterson/interceptor/FactoryAccountsInterceptor.java @@ -104,7 +104,7 @@ public class FactoryAccountsInterceptor implements HandlerInterceptor { return false; } // 将 authTime 转换为时间并与当前时间比较 - DateTime authDateTime = DateUtil.date(authTime * 1000); // 将时间戳转换为 DateTime + DateTime authDateTime = DateUtil.date(authTime); // 将时间戳转换为 DateTime // 将 authTime 转换为时间并与当前时间比较 long timeDifferenceInSeconds = DateUtil.between(authDateTime, currentDate, DateUnit.MS); if (timeDifferenceInSeconds > authTime1) { From 153f19b6d87047db544bf19397bca8fccaa2d589 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 2 Apr 2025 16:32:42 +0800 Subject: [PATCH 04/12] =?UTF-8?q?feat(all):=202B=E9=85=8D=E9=80=81?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改数据不正确问题 --- .../main/java/com/logpm/report/mapper/TrunklinePickupMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/TrunklinePickupMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/TrunklinePickupMapper.xml index 82dceb980..52b9a0fbc 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/TrunklinePickupMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/TrunklinePickupMapper.xml @@ -295,7 +295,7 @@ when ifnull(ldsa.type_service, '1') = '4' then '三方中转' end as type_service, count(distinct t.order_code) orderNum, sum(t.quantity) num from logpm_distribution_parcel_list t - join logpm_distribution_stock_article ldsa on ldsa.order_code = t.order_code and ldsa.is_deleted = 0 + join logpm_distribution_stock_article ldsa on ldsa.id = t.stock_article_id and ldsa.is_deleted = 0 left join logpm_warehouse_warehouse lww on lww.id = t.warehouse_id where t.warehouse_entry_time_end >= #{query.startCreateTime} and t.warehouse_entry_time_end <= #{query.endCreateTime} and t.is_transfer = 0 and ldsa.type_service != '2' From 343d9801d6deb7dd8f67f05a7d12c38847aae3e1 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 2 Apr 2025 16:43:01 +0800 Subject: [PATCH 05/12] =?UTF-8?q?feat(all):=202B=E9=85=8D=E9=80=81?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改查询总页数不正确问题 --- .../main/java/com/logpm/report/config/MybatisPlusConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/config/MybatisPlusConfig.java b/blade-service/logpm-report/src/main/java/com/logpm/report/config/MybatisPlusConfig.java index 53c8a37e5..10998183b 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/config/MybatisPlusConfig.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/config/MybatisPlusConfig.java @@ -63,7 +63,7 @@ public class MybatisPlusConfig implements WebMvcConfigurer { AnnotationAwareOrderComparator.sort(queryInterceptorArray); paginationInterceptor.setQueryInterceptors(queryInterceptorArray); } - paginationInterceptor.setMaxLimit(mybatisPlusProperties.getPageLimit()); + paginationInterceptor.setMaxLimit(-1L); paginationInterceptor.setOverflow(mybatisPlusProperties.getOverflow()); paginationInterceptor.setOptimizeJoin(mybatisPlusProperties.getOptimizeJoin()); paginationInterceptor.setDbType(DbType.MYSQL); From 039513e4f39675e13c07b06fb0662fd9d648c66b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E9=BE=99?= Date: Wed, 2 Apr 2025 16:44:47 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=8D=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/OrderSplitStatusConstant.java | 24 +++++++++++++++++ .../DistributionStockArticleEntity.java | 3 +++ ...DistributionSplitOrderTaskServiceImpl.java | 27 ++++++++++++++----- 3 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 blade-biz-common/src/main/java/org/springblade/common/constant/order/OrderSplitStatusConstant.java diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/order/OrderSplitStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/order/OrderSplitStatusConstant.java new file mode 100644 index 000000000..7953b447a --- /dev/null +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/order/OrderSplitStatusConstant.java @@ -0,0 +1,24 @@ +package org.springblade.common.constant.order; + + +import lombok.Getter; + +/** + * 订单拆单状态 + * 状态：0=无，1=进行中 + */ +@Getter +public enum OrderSplitStatusConstant { + + No("无",0), + InProgress("进行中",1); + + private final String name; + private final Integer value; + + OrderSplitStatusConstant(String name, Integer value) { + this.name = name; + this.value = value; + } + +} diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java index ddf0681fb..b131a3808 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockArticleEntity.java @@ -454,6 +454,9 @@ public class DistributionStockArticleEntity extends TenantEntity { @ApiModelProperty(value = "备注") private String remark; + + @ApiModelProperty(value = "拆单状态") + private Integer splitStatus; /** /* * 未入库数量 *//* diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java index c606a7598..fda556a3c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java @@ -28,10 +28,7 @@ import com.logpm.distribution.vo.DistributionSplitOrderTaskVO; import com.logpm.distribution.vo.SplitPackageOrderVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springblade.common.constant.order.OrderReservationStatusConstant; -import org.springblade.common.constant.order.OrderSplitAllTaskStateConstant; -import org.springblade.common.constant.order.OrderSplitStateConstant; -import org.springblade.common.constant.order.OrderStatusConstant; +import org.springblade.common.constant.order.*; import org.springblade.common.constant.orderpackage.*; import org.springblade.common.exception.CustomerException; import org.springblade.core.mp.base.BaseServiceImpl; @@ -160,11 +157,12 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpl packageAllowCount ? packageAllowCount : packageAllowCount - 1; if (packageAllowCount < taskNumber) { - return R.fail("拆单包件数量不足，请重新填写，目前可拆单数量：" + (packageAllowCount - 1)); + return R.fail("拆单包件数量不足，请重新填写，目前可拆单数量：" + tipNumber); } - if (packageAllCount >= taskNumber) { - return R.fail("拆单数需要小于订单总数量，请重新填写，目前可拆单数量：" + (packageAllowCount - 1)); + if (packageAllCount <= taskNumber) { + return R.fail("拆单数需要小于订单总数量，请重新填写，目前可拆单数量：" + tipNumber); } taskLock(stockArticleId, () -> { @@ -191,6 +189,9 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpllambdaUpdate() + .eq(DistributionStockArticleEntity::getId, allTask.getStockArticleId()) + .set(DistributionStockArticleEntity::getSplitStatus, OrderSplitStatusConstant.No.getValue()) + ); + return R.success("success"); } @@ -823,6 +830,12 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpllambdaUpdate() + .eq(DistributionStockArticleEntity::getId, allTask.getStockArticleId()) + .set(DistributionStockArticleEntity::getSplitStatus, OrderSplitStatusConstant.No.getValue()) + ); + return R.success("success"); } From 0f11d604590142a864b6062a95c3a0874d682018 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 2 Apr 2025 17:08:51 +0800 Subject: [PATCH 07/12] =?UTF-8?q?feat(all):=202B=E9=85=8D=E9=80=81?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改查询总页数不正确问题 --- .../com/logpm/report/service/impl/ReportDeliverServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java index b492fd558..77a30b2ac 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java @@ -457,7 +457,7 @@ public class ReportDeliverServiceImpl implements ReportDeliverService { @Override public void exportDetailsV3(HttpServletResponse response, DevilerDetailsQuery query) { IPage page = Condition.getPage(query); - page.setPages(1); + page.setPages(-1); page.setSize(-1); Integer more = 1; if (StrUtil.isEmpty(query.getWarehouseNameRange())) { From f2e1e4443c1e48c6d07a9729052c6a3b916746bb Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 2 Apr 2025 17:17:15 +0800 Subject: [PATCH 08/12] =?UTF-8?q?1.bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/vo/app/queryOrderVO.java | 10 ++++- .../feign/ITrunklineAdvanceDetailClient.java | 4 +- .../DistributionStockArticleServiceImpl.java | 23 ++++++++-- .../logpm/report/mapper/ReportTimeMapper.xml | 26 ++++++++---- .../feign/TrunklineAdvanceDetailClient.java | 7 +++- .../mapper/TrunklineAdvanceDetailMapper.java | 1 + .../mapper/TrunklineAdvanceDetailMapper.xml | 11 +++++ .../ITrunklineAdvanceDetailService.java | 2 + .../TrunklineAdvanceDetailServiceImpl.java | 5 +++ .../impl/TrunklineCarsLoadServiceImpl.java | 42 +++++++++++++------ 10 files changed, 104 insertions(+), 27 deletions(-) diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/queryOrderVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/queryOrderVO.java index c5141e58a..528f4c602 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/queryOrderVO.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/queryOrderVO.java @@ -1,9 +1,8 @@ package com.logpm.distribution.vo.app; +import com.alibaba.fastjson.JSONObject; import com.logpm.distribution.entity.DistributionParcelListEntity; import com.logpm.distribution.entity.DistributionStockArticleEntity; -import com.logpm.distribution.vo.DistributionParcelListVO; -import com.logpm.distribution.vo.DistributionStockListInfoVO; import com.logpm.distribution.vo.DistributionStockListVO; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -42,4 +41,11 @@ public class queryOrderVO extends DistributionStockArticleEntity { private Integer inventoryNum; + /** + * 未入库包件列表 + */ + @ApiModelProperty(value = "未入库包件列表") + private List noIncomingList; + + } diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java index ac642dcee..473b63039 100644 --- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java +++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/feign/ITrunklineAdvanceDetailClient.java @@ -1,7 +1,6 @@ package com.logpm.trunkline.feign; import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; -import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO; import org.springblade.common.constant.ModuleNameConstant; import org.springblade.core.tool.api.R; import org.springframework.cloud.openfeign.FeignClient; @@ -48,4 +47,7 @@ public interface ITrunklineAdvanceDetailClient { @PostMapping(API_PREFIX + "/maintainMaterial") R maintainMaterial(@RequestBody Map map); + + @GetMapping(API_PREFIX+"/findListByStockArticleId") + List findListByStockArticleId(@RequestParam Long stockArticleId, @RequestParam Long warehouseId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java index 10a3bc900..7bb62fb18 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java @@ -1189,10 +1189,16 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl myWarehouseList = warehouseClient.getMyWatchWarehouse(); - List collect = myWarehouseList.stream() - .map(BasicdataWarehouseEntity::getId) - .collect(Collectors.toList()); +// List myWarehouseList = warehouseClient.getMyWatchWarehouse(); +// List collect = myWarehouseList.stream() +// .map(BasicdataWarehouseEntity::getId) +// .collect(Collectors.toList()); + List collect = new ArrayList<>(); + + BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); + Long warehouseId = myCurrentWarehouse.getId(); + collect.add(warehouseId); + //查询包条(库存品)所在订单 queryOrderVO queryOrderVO; if (i == 1) { @@ -1207,12 +1213,21 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl distributionParcelListEntitys = distributionParcelListMapper.selectListByOderId(id, collect); + //查询订单下的所有库存品 List distributionStockListVOS = distributionParcelListMapper.selectStockListByOderId(id, collect); + //查询订单下所有未入库的包件 + List advanceDetailEntities = trunklineAdvanceDetailClient.findListByStockArticleId(id,warehouseId); + List noIncomingPackage = new ArrayList<>(); + advanceDetailEntities.forEach(advanceDetailEntity -> { + noIncomingPackage.add(JSONObject.parseObject(JSONObject.toJSONString(advanceDetailEntity))); + }); + queryOrderVO.setWrapNum(distributionParcelListEntitys.size()); queryOrderVO.setInventoryNum(distributionStockListVOS.size()); queryOrderVO.setList(distributionParcelListEntitys); queryOrderVO.setStockList(distributionStockListVOS); + queryOrderVO.setNoIncomingList(noIncomingPackage); return queryOrderVO; } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml index 1ca670eb3..976703731 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml @@ -238,14 +238,20 @@ count(lta.waybill_id) openNum, sum( IF(ltcls.id IS NOT NULL AND ltcll.start_date is not null,1,0) ) startNum, count(lta.id)-sum( IF(ltcls.id IS NOT NULL AND ltcll.start_date is not null,1,0) ) noOutNum, - sum(if( ltcls.id is null and now() > DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0)) noOutOverNum, + sum(if( (ltcls.id IS NULL OR ltcll.start_date IS NULL) and now() > DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0)) noOutOverNum, sum(if(ltcll.start_date <= DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0)) onTimeNum, IFNULL(round(sum(if(ltcll.start_date <= DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0))/count(lta.id)*100,2),'0.00') onTimeRate, round(sum(TIMESTAMPDIFF(SECOND, lta.create_time, ltcll.start_date))/count(ltcls.id)/3600,1) avgTime from logpm_trunkline_advance_detail lta left join logpm_warehouse_waybill lww on lww.id = lta.waybill_id left join logpm_warehouse_warehouse waw on waw.id = lta.warehouse_id - left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = lta.order_package_code and ltcls.warehouse_id = lta.warehouse_id and ltcls.type = 1 and ltcls.scan_status != 4 + left join ( + SELECT + t1.* + FROM logpm_trunkline_cars_load_scan t1 + LEFT JOIN logpm_trunkline_cars_load_scan t2 ON t1.scan_code = t2.scan_code AND t1.create_time < t2.create_time + WHERE t2.scan_code IS NULL + ) ltcls on ltcls.scan_code = lta.order_package_code and ltcls.warehouse_id = lta.warehouse_id and ltcls.type = 1 and ltcls.scan_status != 4 left join logpm_trunkline_cars_load_line ltcll on ltcll.load_id = ltcls.load_id and ltcll.node_id = ltcls.warehouse_id where lta.create_time > '2024-10-22 00:00:00' and lww.document_making_time > '2024-10-22 00:00:00' @@ -299,14 +305,20 @@ count(lta.waybill_id) openNum, sum( IF(ltcls.id IS NOT NULL AND ltcll.start_date is not null,1,0) ) startNum, count(lta.id)-sum( IF(ltcls.id IS NOT NULL AND ltcll.start_date is not null,1,0) ) noOutNum, - sum(if( ltcls.id is null and now() > DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0)) noOutOverNum, + sum(if( (ltcls.id IS NULL OR ltcll.start_date IS NULL) and now() > DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0)) noOutOverNum, sum(if(ltcll.start_date <= DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0)) onTimeNum, - IFNULL(concat(round(sum(if(ltcll.start_date <= DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0))/count(ltcls.id)*100,2),'%'),'0.00%') onTimeRate, + IFNULL(concat(round(sum(if(ltcll.start_date <= DATE_ADD( lta.create_time, INTERVAL #{param.hoursTime} HOUR ),1,0))/count(lta.id)*100,2),'%'),'0.00%') onTimeRate, round(sum(TIMESTAMPDIFF(SECOND, lta.create_time, ltcll.start_date))/count(ltcls.id)/3600,1) avgTime from logpm_trunkline_advance_detail lta left join logpm_warehouse_waybill lww on lww.id = lta.waybill_id left join logpm_warehouse_warehouse waw on waw.id = lta.warehouse_id - left join logpm_trunkline_cars_load_scan ltcls on ltcls.scan_code = lta.order_package_code and ltcls.warehouse_id = lta.warehouse_id and ltcls.type = 1 and ltcls.scan_status != 4 + left join ( + SELECT + t1.* + FROM logpm_trunkline_cars_load_scan t1 + LEFT JOIN logpm_trunkline_cars_load_scan t2 ON t1.scan_code = t2.scan_code AND t1.create_time < t2.create_time + WHERE t2.scan_code IS NULL + ) ltcls on ltcls.scan_code = lta.order_package_code and ltcls.warehouse_id = lta.warehouse_id and ltcls.type = 1 and ltcls.scan_status != 4 left join logpm_trunkline_cars_load_line ltcll on ltcll.load_id = ltcls.load_id and ltcll.node_id = ltcls.warehouse_id where lta.create_time > '2024-10-22 00:00:00' and lww.document_making_time > '2024-10-22 00:00:00' @@ -2826,7 +2838,7 @@ and ltcls.id is null - and now() <= DATE_ADD( ltad.create_time, INTERVAL #{param.hoursTime} HOUR ) + and now() > DATE_ADD( ltad.create_time, INTERVAL #{param.hoursTime} HOUR ) group by ltad.id @@ -2928,7 +2940,7 @@ and ltcls.id is null - and now() <= DATE_ADD( ltad.create_time, INTERVAL #{param.hoursTime} HOUR ) + and now() > DATE_ADD( ltad.create_time, INTERVAL #{param.hoursTime} HOUR ) group by ltad.id diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceDetailClient.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceDetailClient.java index 870e7df29..bff5ed14a 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceDetailClient.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/TrunklineAdvanceDetailClient.java @@ -5,13 +5,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.trunkline.entity.TrunklineAdvanceDetailEntity; import com.logpm.trunkline.service.ITrunklineAdvanceDetailService; -import com.logpm.trunkline.vo.TrunklineAdvanceDetailVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -72,4 +72,9 @@ public class TrunklineAdvanceDetailClient implements ITrunklineAdvanceDetailClie return advanceDetailService.maintainMaterial(map); } + + @Override + public List findListByStockArticleId(Long stockArticleId, Long warehouseId) { + return advanceDetailService.findListByStockArticleId(stockArticleId,warehouseId); + } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java index 185a5b37b..a716d1717 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.java @@ -107,4 +107,5 @@ public interface TrunklineAdvanceDetailMapper extends BaseMapper advanceDetailIdList); + List findListByStockArticleId(@Param("stockArticleId") Long stockArticleId, @Param("warehouseId") Long warehouseId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml index fd3e6fe5d..49d7a0b35 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml @@ -748,4 +748,15 @@ + + diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java index 9be8e14e1..500c555fc 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineAdvanceDetailService.java @@ -129,4 +129,6 @@ public interface ITrunklineAdvanceDetailService extends BaseService map); + + List findListByStockArticleId(Long stockArticleId, Long warehouseId); } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java index 9b807483e..32b9fc63f 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java @@ -974,4 +974,9 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl findListByStockArticleId(Long stockArticleId, Long warehouseId) { + return baseMapper.findListByStockArticleId(stockArticleId,warehouseId); + } } diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index 42a9e2c92..8aa67349c 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -2267,39 +2267,39 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl qualityList = carsLoadLinePhotoService.findListByLoadIdAndWarehouseId(loadId, warehouseId, 30, null); //把qualityList通过position=2进行过滤生成新的list List qualityListHou = qualityList.stream().filter(item -> item.getPosition().equals(2)).collect(Collectors.toList()); if(qualityListHou.size() == 0){ - updateEntity.setIsUnloadPhoto(0); - trunklineCarsLoadLineService.updateById(updateEntity); + carsLoadLine.setIsUnloadPhoto(0); + trunklineCarsLoadLineService.updateById(carsLoadLine); return R.success("上传成功"); } List qualityListZuo = qualityList.stream().filter(item -> item.getPosition().equals(3)).collect(Collectors.toList()); if(qualityListZuo.size() == 0){ - updateEntity.setIsUnloadPhoto(0); - trunklineCarsLoadLineService.updateById(updateEntity); + carsLoadLine.setIsUnloadPhoto(0); + trunklineCarsLoadLineService.updateById(carsLoadLine); return R.success("上传成功"); } List qualityListYou = qualityList.stream().filter(item -> item.getPosition().equals(4)).collect(Collectors.toList()); if(qualityListYou.size() == 0){ - updateEntity.setIsUnloadPhoto(0); - trunklineCarsLoadLineService.updateById(updateEntity); + carsLoadLine.setIsUnloadPhoto(0); + trunklineCarsLoadLineService.updateById(carsLoadLine); return R.success("上传成功"); } List protectionList = carsLoadLinePhotoService.findListByLoadIdAndWarehouseId(loadId, warehouseId, 31, 2); if(protectionList.size() == 0){ - updateEntity.setIsUnloadPhoto(0); - trunklineCarsLoadLineService.updateById(updateEntity); + carsLoadLine.setIsUnloadPhoto(0); + trunklineCarsLoadLineService.updateById(carsLoadLine); return R.success("上传成功"); } - updateEntity.setIsUnloadPhoto(1); - trunklineCarsLoadLineService.updateById(updateEntity); + carsLoadLine.setIsUnloadPhoto(1); + trunklineCarsLoadLineService.updateById(carsLoadLine); return R.success("上传成功"); } @@ -12582,7 +12582,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl orderPackageCodes = new ArrayList<>(); orderPackageCodes.add(orderPackageCode); + String content = "包件在 " + warehouseName + "卸车，车次号："+carsLoadEntity.getCarsNo()+" 卸车方式：" + IncomingTypeEnum.getValue(incomingType)+ (StringUtil.isNotBlank(unloadTrayName)?"托盘："+unloadTrayName:""); + if(NumberUtil.equals(isData,0)){ + content = "包件在 " + warehouseName + "卸车，车次号："+carsLoadEntity.getCarsNo()+" 卸车方式：系统无编码 卸车（只记录未入库）"; + } packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, warehouseName, WorkNodeEnums.UNLOAD_INCOMING_WAREHOUSE.getCode(), content); carsLoadAsyncService.sendFactoryData(orderCode,orderPackageCode,warehouseId,warehouseName); @@ -13802,6 +13806,19 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl Date: Wed, 2 Apr 2025 17:24:49 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 93806ef2d..54d57c937 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -6881,7 +6881,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl map = new HashMap<>(); map.put("1", Collections.singletonList(reservationPackageEntity)); - NodeFanoutMsg nodeFanoutMsg = distributionReservationService.buildNodeFanoutMsgByReservation(reservationEntity, map, BizOperationEnums.MODIFY); + NodeFanoutMsg nodeFanoutMsg = distributionReservationService.buildNodeFanoutMsgByReservation(reservationEntity, map, BizOperationEnums.ADD); distributionNodeWorkService.planReservation(nodeFanoutMsg,AuthUtil.getUser()); //维护包件的预约状态 DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(distributionLoadscanAbnormalEntity.getPackageId()); From 81ec914403de9ec2162e7936167078952fa0fac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E9=BE=99?= Date: Wed, 2 Apr 2025 17:47:30 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E5=8D=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSplitOrderTaskServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java index fda556a3c..c2c84e910 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSplitOrderTaskServiceImpl.java @@ -191,7 +191,7 @@ public class DistributionSplitOrderTaskServiceImpl extends BaseServiceImpl Date: Wed, 2 Apr 2025 18:19:19 +0800 Subject: [PATCH 11/12] =?UTF-8?q?feat(all):=202B=E9=85=8D=E9=80=81?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改查询总页数不正确问题 --- .../main/java/com/logpm/report/config/MybatisPlusConfig.java | 2 +- .../logpm/report/service/impl/ReportDeliverServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/config/MybatisPlusConfig.java b/blade-service/logpm-report/src/main/java/com/logpm/report/config/MybatisPlusConfig.java index 10998183b..cbed4465d 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/config/MybatisPlusConfig.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/config/MybatisPlusConfig.java @@ -21,7 +21,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * @create 2024-03-08 13:59 */ @Configuration -@MapperScan("com.baomidou.cloud.service.*.mapper*r") +@MapperScan("com.baomidou.cloud.service.*.mapper*") public class MybatisPlusConfig implements WebMvcConfigurer { // @Bean diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java index 77a30b2ac..640f70301 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java @@ -457,8 +457,8 @@ public class ReportDeliverServiceImpl implements ReportDeliverService { @Override public void exportDetailsV3(HttpServletResponse response, DevilerDetailsQuery query) { IPage page = Condition.getPage(query); - page.setPages(-1); - page.setSize(-1); + page.setPages(1); + page.setSize(Integer.MAX_VALUE); Integer more = 1; if (StrUtil.isEmpty(query.getWarehouseNameRange())) { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); From 35d7aa013a17d872d9e91f5dc9c401945225db20 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 2 Apr 2025 18:21:37 +0800 Subject: [PATCH 12/12] =?UTF-8?q?feat(all):=202B=E9=85=8D=E9=80=81?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改查询总页数不正确问题 --- .../service/impl/QualityDispatchNumberServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/QualityDispatchNumberServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/QualityDispatchNumberServiceImpl.java index 935229cc3..13ecf79e7 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/QualityDispatchNumberServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/QualityDispatchNumberServiceImpl.java @@ -57,7 +57,7 @@ public class QualityDispatchNumberServiceImpl implements QualityDispatchNumberSe throw new ServiceException("时间不能为空"); } page.setPages(1); - page.setSize(-1); + page.setSize(Integer.MAX_VALUE); if (StrUtil.isEmpty(query.getWarehouseName())) { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); if (ObjectUtil.isNotEmpty(myCurrentWarehouse)) { @@ -128,7 +128,7 @@ public class QualityDispatchNumberServiceImpl implements QualityDispatchNumberSe throw new ServiceException("时间不能为空"); } page.setPages(1); - page.setSize(-1); + page.setSize(Integer.MAX_VALUE); if (StrUtil.isEmpty(query.getWarehouseName())) { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); if (ObjectUtil.isNotEmpty(myCurrentWarehouse)) { @@ -204,7 +204,7 @@ public class QualityDispatchNumberServiceImpl implements QualityDispatchNumberSe public void exporTask(HttpServletResponse response, QualityDispatchTaskQuery query) { IPage page = Condition.getPage(query); page.setPages(1); - page.setSize(-1); + page.setSize(Integer.MAX_VALUE); List list = getQualityDispatchTaskVOS(query, page); ExcelUtil.export(response, list, QualityDispatchTaskVO.class); }