From cbbf98bea753fe99d904586726868d7cc0c6b394 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" <925258474@qq.com> Date: Mon, 12 May 2025 16:03:22 +0800 Subject: [PATCH] no message --- .../base/location/domain/{form => vo}/LocationsExcelVO.java | 4 +--- .../wms/base/location/service/LocationQueryService.java | 3 +-- .../base/location/service/impl/LocationQueryServiceImpl.java | 2 +- .../business/wms/base/stock/domain/vo/StocksExcelVO.java | 2 ++ .../wms/base/stock/service/impl/StockQueryServiceImpl.java | 5 ++++- .../resources/mapper/business/wms/base/stock/StockMapper.xml | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) rename nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/{form => vo}/LocationsExcelVO.java (94%) diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationsExcelVO.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/vo/LocationsExcelVO.java similarity index 94% rename from nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationsExcelVO.java rename to nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/vo/LocationsExcelVO.java index 7241b4c..b5cbb4f 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationsExcelVO.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/vo/LocationsExcelVO.java @@ -1,4 +1,4 @@ -package net.lab1024.sa.admin.module.business.wms.base.location.domain.form; +package net.lab1024.sa.admin.module.business.wms.base.location.domain.vo; import cn.idev.excel.annotation.ExcelProperty; import cn.idev.excel.annotation.write.style.ColumnWidth; @@ -7,8 +7,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.math.BigDecimal; - @Data @Builder @AllArgsConstructor diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/service/LocationQueryService.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/service/LocationQueryService.java index bb86774..bb6ceb9 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/service/LocationQueryService.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/service/LocationQueryService.java @@ -4,11 +4,10 @@ import jakarta.servlet.http.HttpServletResponse; import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; import net.lab1024.sa.admin.module.business.wms.base.location.domain.form.LocationQueryForm; import net.lab1024.sa.admin.module.business.wms.base.location.domain.form.LocationSelect; -import net.lab1024.sa.admin.module.business.wms.base.location.domain.form.LocationsExcelVO; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.vo.LocationsExcelVO; import net.lab1024.sa.admin.module.business.wms.base.location.domain.vo.LocationVO; import net.lab1024.sa.base.common.domain.PageResult; -import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/service/impl/LocationQueryServiceImpl.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/service/impl/LocationQueryServiceImpl.java index 5c9b887..5d4aa03 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/service/impl/LocationQueryServiceImpl.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/service/impl/LocationQueryServiceImpl.java @@ -14,7 +14,7 @@ import net.lab1024.sa.admin.module.business.wms.base.location.dao.LocationDao; import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; import net.lab1024.sa.admin.module.business.wms.base.location.domain.form.LocationQueryForm; import net.lab1024.sa.admin.module.business.wms.base.location.domain.form.LocationSelect; -import net.lab1024.sa.admin.module.business.wms.base.location.domain.form.LocationsExcelVO; +import net.lab1024.sa.admin.module.business.wms.base.location.domain.vo.LocationsExcelVO; import net.lab1024.sa.admin.module.business.wms.base.location.domain.vo.LocationVO; import net.lab1024.sa.admin.module.business.wms.base.location.manager.LocationManager; import net.lab1024.sa.admin.module.business.wms.base.location.service.LocationQueryService; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/vo/StocksExcelVO.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/vo/StocksExcelVO.java index 98dd6ed..771aa30 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/vo/StocksExcelVO.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/vo/StocksExcelVO.java @@ -1,6 +1,7 @@ package net.lab1024.sa.admin.module.business.wms.base.stock.domain.vo; import cn.idev.excel.annotation.ExcelProperty; +import cn.idev.excel.annotation.write.style.ColumnWidth; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -10,6 +11,7 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor +@ColumnWidth(20) public class StocksExcelVO { @ExcelProperty("容器编码") private String stockCode; diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/service/impl/StockQueryServiceImpl.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/service/impl/StockQueryServiceImpl.java index d6d4913..5535c7d 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/service/impl/StockQueryServiceImpl.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/service/impl/StockQueryServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Maps; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; +import lombok.extern.slf4j.Slf4j; import net.lab1024.sa.admin.module.business.wms.base.item.domain.vo.ItemVO; import net.lab1024.sa.admin.module.business.wms.base.item.domain.vo.ItemsExcelVO; import net.lab1024.sa.admin.module.business.wms.base.location.domain.entity.LocationEntity; @@ -35,6 +36,7 @@ import java.util.Objects; import java.util.stream.Collectors; @Service +@Slf4j public class StockQueryServiceImpl implements StockQueryService { @Resource private StockDao stockDao; @@ -235,7 +237,7 @@ public class StockQueryServiceImpl implements StockQueryService { stock -> StocksExcelVO.builder() .stockCode(stock.getStockCode()) .stockType(dictService.getDictDataLabel(DictConst.STOCK_TYPE.getValue(), stock.getStockType())) - .locationCode(locationManager.queryLocation(stock.getLocationId()) == null ? null : locationManager.queryLocation(stock.getLocationId()).getLocationCode()) + .locationCode(stock.getLocationId()==null?null:locationManager.queryLocation(stock.getLocationId()).getLocationCode()) .disabledFlag(stock.getDisabledFlag() ? "启用" : "禁用") .build(), StockVO::getStockId, @@ -243,6 +245,7 @@ public class StockQueryServiceImpl implements StockQueryService { (processed, progress) -> exportTaskService.updateProgress(taskId, progress) ); } catch (Exception e) { + log.error("导出失败", e); exportTaskService.updateProgress(taskId, -1); } finally { exportTaskService.updateProgress(taskId, 100); diff --git a/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/stock/StockMapper.xml b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/stock/StockMapper.xml index e25b04d..ef86bfa 100644 --- a/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/stock/StockMapper.xml +++ b/nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/stock/StockMapper.xml @@ -46,7 +46,7 @@ t_stock.stock_code, t_stock.location_id, t_stock.disabled_flag, - t_stock.stock_type, + t_stock.stock_type FROM t_stock t_stock.stock_id > #{lastId}