From 930d5b50d08917d2c83069dc90a7fa96f2860712 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 26 Jul 2024 09:31:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:1.=E4=BF=AE=E6=94=B9=E6=A2=A6=E5=A4=A9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=98=E5=82=A8=E5=AD=97=E6=AE=B5=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factory/mt/service/impl/MtFactoryDataServiceImpl.java | 4 ++-- .../mt/service/impl/MtOrderLogFailRetryServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java index 6176a9ded..4d46c7edf 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtFactoryDataServiceImpl.java @@ -711,8 +711,8 @@ public class MtFactoryDataServiceImpl implements IMtFactoryDataService { mtOrderLogEntity.setType(type); mtOrderLogEntity.setRefCode(refCode); - Integer PUSH_STATUS_SUCCESS = 1; - Integer PUSH_STATUS_FAIL = 2; + Integer PUSH_STATUS_SUCCESS = 2; + Integer PUSH_STATUS_FAIL = 1; JSONObject jsonObject = JSONObject.parseObject(result); if (jsonObject == null || jsonObject.isEmpty() || 0 != jsonObject.getInteger("Result")) { diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtOrderLogFailRetryServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtOrderLogFailRetryServiceImpl.java index 35f4a09be..6f12d86ff 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtOrderLogFailRetryServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/service/impl/MtOrderLogFailRetryServiceImpl.java @@ -87,8 +87,8 @@ public class MtOrderLogFailRetryServiceImpl implements MtOrderLogFailRetryServic mtOrderLogEntity.setResBody(result); - Integer PUSH_STATUS_SUCCESS = 1; - Integer PUSH_STATUS_FAIL = 2; + Integer PUSH_STATUS_FAIL = 1; + Integer PUSH_STATUS_SUCCESS = 2; Integer PUSH_STATUS_EXPIRE = 3; JSONObject jsonObject = JSONObject.parseObject(result); From 39c6a17fcf6271f1873edb9df2b9e1c3006b5a59 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Fri, 26 Jul 2024 17:08:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:1.=E4=BF=AE=E6=94=B9=E5=BC=80=E5=8D=95?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8C=85=E4=BB=B6=E7=9A=84=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=93=81=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/exception/CustomerException.java | 5 +++++ .../mapper/TrunklineAdvanceDetailMapper.xml | 3 ++- .../WarehouseWarehousingEntryController.java | 12 ++++++++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/blade-biz-common/src/main/java/org/springblade/common/exception/CustomerException.java b/blade-biz-common/src/main/java/org/springblade/common/exception/CustomerException.java index 99e91ac76..ac6da613d 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/exception/CustomerException.java +++ b/blade-biz-common/src/main/java/org/springblade/common/exception/CustomerException.java @@ -1,5 +1,8 @@ package org.springblade.common.exception; +import lombok.Data; +import lombok.EqualsAndHashCode; + /** * *类说明： 自定义异常 @@ -7,6 +10,8 @@ package org.springblade.common.exception; * @author zhy * @date 2023年6月1日 */ +@EqualsAndHashCode(callSuper = true) +@Data public class CustomerException extends RuntimeException { /** * 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 0483f720e..fe03d5247 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 @@ -51,7 +51,8 @@ sum(ltad.weight) weight, sum(ltad.volume) volume from logpm_trunkline_advance_detail ltad - left join logpm_basicdata_factory_category lbfc on lbfc.brand = ltad.brand and lbfc.firsts = ltad.first_pack_name and lbfc.seconds = ltad.second_pack_name and lbfc.thirds = ltad.third_pack_name + left join logpm_basicdata_factory_category lbfc on lbfc.brand = ltad.brand and type=1 + and lbfc.firsts = ltad.first_pack_name and lbfc.seconds = ltad.second_pack_name and lbfc.thirds = ltad.third_pack_name and lbfc.materiel_name=ltad.material_name left join logpm_basicdata_category lbc on lbc.id = lbfc.category_id where ltad.is_deleted = 0 and ltad.advance_id in diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java index a6a1833d4..f7dc3bf5e 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWarehousingEntryController.java @@ -34,6 +34,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.common.exception.CustomerException; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.mp.support.Condition; @@ -62,6 +64,7 @@ import java.util.stream.Collectors; * @since 2023-07-10 */ @RestController +@Slf4j @AllArgsConstructor @RequestMapping("/warehouseWarehousingEntry") @Api(value = "仓库入库单", tags = "仓库入库单接口") @@ -181,8 +184,13 @@ public class WarehouseWarehousingEntryController extends BladeController { @ApiOperation(value = "导入入库数据", notes = "传入excel") public R importWarehousingEntry(MultipartFile file, Integer isCovered) { isCovered = 1; - WarehouseEntryImporter userImporter = new WarehouseEntryImporter(warehouseWarehousingEntryService, isCovered == 1); - ExcelUtil.save(file, userImporter, WarehousingEntryDetailExcel.class); + try { + WarehouseEntryImporter userImporter = new WarehouseEntryImporter(warehouseWarehousingEntryService, isCovered == 1); + ExcelUtil.save(file, userImporter, WarehousingEntryDetailExcel.class); + }catch (CustomerException e){ + log.error("导入失败",e); + return R.fail(e.getMessage()); + } return R.success("操作成功"); }