huojin
/
YouChain_WMS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2025-05-12 16:03:22 +08:00
parent 0af18033e9
commit cbbf98bea7
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/form/LocationsExcelVO.java → nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/vo/LocationsExcelVO.java
View File

@ -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

3
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/service/LocationQueryService.java
View File

@ -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;

2
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/service/impl/LocationQueryServiceImpl.java
View File

@ -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;

2
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/vo/StocksExcelVO.java
View File

@ -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;

5
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/service/impl/StockQueryServiceImpl.java
View File

@ -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);

2
nc_wms_java/sa-admin/src/main/resources/mapper/business/wms/base/stock/StockMapper.xml
View File

@ -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
<where>
t_stock.stock_id > #{lastId}