From d500401c004dc7713d63267e104c2b4c962341e2 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Mon, 18 Nov 2024 12:58:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat(all):=20=E5=B7=A5=E5=8E=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 迁移工厂的mq和xxljob到nacos中 --- .../src/main/resources/application-prod.yml | 32 ------------------- .../src/main/resources/application.yml | 14 -------- 2 files changed, 46 deletions(-) diff --git a/blade-service/logpm-factory/src/main/resources/application-prod.yml b/blade-service/logpm-factory/src/main/resources/application-prod.yml index a19689fdf..2030db820 100644 --- a/blade-service/logpm-factory/src/main/resources/application-prod.yml +++ b/blade-service/logpm-factory/src/main/resources/application-prod.yml @@ -3,12 +3,6 @@ server: port: 8200 #数据源配置 -#spring: -# datasource: -# url: ${blade.datasource.prod.url} -# username: ${blade.datasource.prod.username} -# password: ${blade.datasource.prod.password} - spring: #排除DruidDataSourceAutoConfigure autoconfigure: @@ -29,29 +23,3 @@ spring: url: ${blade.datasource.factory.627683.url} username: ${blade.datasource.factory.627683.username} password: ${blade.datasource.factory.627683.password} - #rabbitmq配置 - rabbitmq: - host: 172.16.128.145 - port: 5672 - username: admin - password: Slwk@123654 - #虚拟host 可以不设置,使用server默认host - virtual-host: / - #确认消息已发送到队列(Queue) - publisher-returns: true - publisher-confirm-type: correlated - # 手动提交消息 - listener: - simple: - acknowledge-mode: auto - default-requeue-rejected: false - retry: - enabled: true # 开启消费者失败重试 - initial-interval: 1000 # 初识的失败等待时长为1秒 - multiplier: 1 # 失败的等待时长倍数，下次等待时长 = multiplier * last-interval - max-attempts: 3 # 最大重试次数 - stateless: true # true无状态；false有状态。如果业务中包含事务，这里改为false - direct: - acknowledge-mode: manual - template: - mandatory: true diff --git a/blade-service/logpm-factory/src/main/resources/application.yml b/blade-service/logpm-factory/src/main/resources/application.yml index 6ccf9fc90..494d22300 100644 --- a/blade-service/logpm-factory/src/main/resources/application.yml +++ b/blade-service/logpm-factory/src/main/resources/application.yml @@ -28,20 +28,6 @@ blade: logging: config: classpath:logback.xml - spring: main: allow-circular-references: true - -xxl: - job: - accessToken: '' - admin: - addresses: http://127.0.0.1:7009/xxl-job-admin - executor: - appname: logpm-factory-xxljob - ip: 127.0.0.1 - logpath: ../data/applogs/logpm-factory-xxljob/jobhandler - logretentiondays: -1 - port: 7018 - From 5594149c3485aed4e78e080ff0125f2d0ff5a030 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 18 Nov 2024 14:58:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E5=93=81=E5=86=BB=E7=BB=93=E6=98=8E=E7=BB=86=E3=80=81BUG?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DistributionInventoryPlacnDetailVO.java | 50 +++++++++++++++++++ .../impl/AftersalesWorkOrderServiceImpl.java | 2 +- .../DistributionStockListInfoController.java | 12 +++++ .../DistributionStockListInfoMapper.java | 8 +++ .../DistributionStockListInfoMapper.xml | 39 +++++++++++++++ .../mapper/DistrilbutionBillLadingMapper.xml | 4 +- .../IDistributionStockListInfoService.java | 7 +++ .../DistributionStockListInfoServiceImpl.java | 6 +++ .../impl/WarehouseWaybillServiceImpl.java | 5 +- 9 files changed, 128 insertions(+), 5 deletions(-) create mode 100644 blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionInventoryPlacnDetailVO.java diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionInventoryPlacnDetailVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionInventoryPlacnDetailVO.java new file mode 100644 index 000000000..c1f7b0d80 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionInventoryPlacnDetailVO.java @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.vo; + +import com.logpm.distribution.entity.DistributionStockArticleEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; +import java.lang.reflect.Field; +import java.math.BigDecimal; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 库存品计划详情VO + * + * @author cyz + * @since 2023-06-13 + */ +@Data +public class DistributionInventoryPlacnDetailVO implements Serializable { + private static final long serialVersionUID = 1L; + + private String reservationCode; + private String consignee; + private String scanUser; + private String packageCode; + private Integer planNum; + + + +} diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java index a4dc46c25..25e09fd68 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java @@ -1718,7 +1718,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl inventoryPlanDetail = distributionStockListInfoService.planDetail(stockListId); + return R.data(inventoryPlanDetail); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.java index 00126736b..051c57395 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.java @@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.entity.DistributionStockListInfoEntity; +import com.logpm.distribution.vo.DistributionInventoryPlacnDetailVO; import com.logpm.distribution.vo.DistributionStockListInfoVO; import org.apache.ibatis.annotations.Param; @@ -61,4 +62,11 @@ public interface DistributionStockListInfoMapper extends BaseMapper parcelListIds, @Param("stockListId") Long stockListId); String findAllAllocationByNoParcelListIdsAndStockListId(@Param("parcelListIds") List parcelListIds, @Param("stockListId") Long stockListId); + + /** + * 查询计划详情 + * @param stockListId + * @return + */ + List planDetail(@Param("stockListId")Long stockListId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.xml index 22ef7cd55..986bc6d9b 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.xml @@ -145,5 +145,44 @@ #{item} + diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml index f6c823c85..35e8c6074 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml @@ -126,10 +126,10 @@ dsa.storage_fee FROM logpm_distrilbution_bill_lading aaa - LEFT JOIN logpm_distrilbution_bill_stock lds ON lds.bill_lading_id = aaa.id + LEFT JOIN logpm_distrilbution_bill_stock lds ON lds.bill_lading_id = aaa.id AND lds.order status != 2 LEFT JOIN logpm_distribution_stock_article dsa ON lds.stock_article_id = dsa.id WHERE - 1=1 + aaa.is_deleted = 0 and aaa.warehouse_id in diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListInfoService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListInfoService.java index a175dd4cf..54c466f72 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListInfoService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListInfoService.java @@ -19,6 +19,7 @@ package com.logpm.distribution.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.distribution.entity.DistributionStockListInfoEntity; import com.logpm.distribution.excel.DistributionStockListInfoExcel; +import com.logpm.distribution.vo.DistributionInventoryPlacnDetailVO; import com.logpm.distribution.vo.DistributionStockListInfoVO; import org.springblade.core.mp.base.BaseService; @@ -64,4 +65,10 @@ public interface IDistributionStockListInfoService extends BaseService parcelListIds, Long stockListId); + /** + * 查询计划详情 + * @param stockListId + * @return + */ + List planDetail(Long stockListId); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListInfoServiceImpl.java index 83f08f0e1..7c3e4b6af 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListInfoServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListInfoServiceImpl.java @@ -22,6 +22,7 @@ import com.logpm.distribution.entity.DistributionStockListInfoEntity; import com.logpm.distribution.excel.DistributionStockListInfoExcel; import com.logpm.distribution.mapper.DistributionStockListInfoMapper; import com.logpm.distribution.service.IDistributionStockListInfoService; +import com.logpm.distribution.vo.DistributionInventoryPlacnDetailVO; import com.logpm.distribution.vo.DistributionStockListInfoVO; import org.springblade.common.constant.DictBizConstant; import org.springblade.core.mp.base.BaseServiceImpl; @@ -98,4 +99,9 @@ public class DistributionStockListInfoServiceImpl extends BaseServiceImpl planDetail(Long stockListId) { + return baseMapper.planDetail(stockListId); + } + } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java index 891163a89..724dd924c 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java @@ -821,8 +821,9 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl0) { + num = num+1; + } // int totalPages = (int) Math.ceil((double) totalItems / itemsPerPage); for (int i = 1; i <= num; i++) { From a385a7a086b34fc6b0089f258110f562a9bc16d3 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Mon, 18 Nov 2024 18:02:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E5=9B=BE=E7=89=87BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AftersalesWorkOrderServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java index 25e09fd68..4a08ede96 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java @@ -343,7 +343,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl surveyRecordEntity.setProcessorId(aftersalesProcessorEntity.getId())); surveyRecordEntity.setAddDepartment(myCurrentWarehouse.getDepartmentName()); surveyRecordEntity.setProcessingResults(surveyRecordEntity.getContent()); + if (!Objects.isNull(surveyRecordDTO.getPictureUrl())){ + surveyRecordEntity.setPictureUrl(surveyRecordDTO.getPictureUrl()); + } } else { log.info("客服回复！！！{}", user.getUserName()); R deptName = sysClient.getDeptName(Long.valueOf(user.getDeptId()));