b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复基础数据

Browse Source
This commit is contained in:
b2894lxlx
2026-09-03 18:24:11 +08:00
parent a8d866231b
commit 7f87cd8c27
18 changed files with 131 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CommonAddressController.java
+3 -3
View File
@@ -41,7 +41,7 @@ import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.Func;
import org.springblade.transport.excel.CommonAddressExcel; import org.springblade.transport.excel.CommonAddressExportExcel;
import org.springblade.transport.pojo.entity.CommonAddress; import org.springblade.transport.pojo.entity.CommonAddress;
import org.springblade.transport.pojo.vo.CommonAddressRemoveResultVO; import org.springblade.transport.pojo.vo.CommonAddressRemoveResultVO;
import org.springblade.transport.pojo.vo.CommonAddressVO; import org.springblade.transport.pojo.vo.CommonAddressVO;
@@ -136,8 +136,8 @@ public class CommonAddressController extends BladeController {
public void exportCommonAddress(CommonAddressVO commonAddress, public void exportCommonAddress(CommonAddressVO commonAddress,
@RequestParam(required = false) String ids, @RequestParam(required = false) String ids,
HttpServletResponse response) { HttpServletResponse response) {
List<CommonAddressExcel> list = commonAddressService.exportCommonAddress(buildExportQuery(commonAddress, ids)); List<CommonAddressExportExcel> list = commonAddressService.exportCommonAddress(buildExportQuery(commonAddress, ids));
ExcelUtil.export(response, "常用地址" + DateUtil.time(), "常用地址", list, CommonAddressExcel.class); ExcelUtil.export(response, "常用地址" + DateUtil.time(), "常用地址", list, CommonAddressExportExcel.class);
} }
private Query normalizeQuery(Query query) { private Query normalizeQuery(Query query) {
blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CommonCargoController.java
+1 -1
View File
@@ -112,7 +112,7 @@ public class CommonCargoController extends BladeController {
public R importCommonCargo(MultipartFile file, HttpServletResponse response) { public R importCommonCargo(MultipartFile file, HttpServletResponse response) {
List<CommonCargoImportFailureExcel> failureList = commonCargoService.importCommonCargo(ExcelUtil.read(file, CommonCargoExcel.class)); List<CommonCargoImportFailureExcel> failureList = commonCargoService.importCommonCargo(ExcelUtil.read(file, CommonCargoExcel.class));
if (Func.isNotEmpty(failureList)) { if (Func.isNotEmpty(failureList)) {
ImportFailureExcelUtil.export(response, "常用货物导入失败明细" + DateUtil.time(), "导入失败明细", failureList, CommonCargoExcel.class); ImportFailureExcelUtil.export(response, "常用货物导入失败明细" + DateUtil.time(), "导入失败明细", failureList, CommonCargoImportFailureExcel.class);
return null; return null;
} }
return R.success("导入数据成功"); return R.success("导入数据成功");
blade-service/blade-transport/src/main/java/org/springblade/transport/controller/CommonRouteController.java
+3 -3
View File
@@ -38,7 +38,7 @@ import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.Func;
import org.springblade.common.excel.ImportFailureExcelUtil; import org.springblade.common.excel.ImportFailureExcelUtil;
import org.springblade.transport.excel.CommonRouteExcel; import org.springblade.transport.excel.CommonRouteExportExcel;
import org.springblade.transport.excel.CommonRouteImportExcel; import org.springblade.transport.excel.CommonRouteImportExcel;
import org.springblade.transport.pojo.entity.CommonRoute; import org.springblade.transport.pojo.entity.CommonRoute;
import org.springblade.transport.pojo.vo.BusinessRemoveResultVO; import org.springblade.transport.pojo.vo.BusinessRemoveResultVO;
@@ -101,8 +101,8 @@ public class CommonRouteController extends BladeController {
@ApiOperationSupport(order = 5) @ApiOperationSupport(order = 5)
@Operation(summary = "导出常用线路") @Operation(summary = "导出常用线路")
public void exportCommonRoute(CommonRouteVO commonRoute, @RequestParam(required = false) String ids, HttpServletResponse response) { public void exportCommonRoute(CommonRouteVO commonRoute, @RequestParam(required = false) String ids, HttpServletResponse response) {
List<CommonRouteExcel> list = commonRouteService.exportCommonRoute(commonRoute, ids); List<CommonRouteExportExcel> list = commonRouteService.exportCommonRoute(commonRoute, ids);
ExcelUtil.export(response, "常用线路" + DateUtil.time(), "常用线路", list, CommonRouteExcel.class); ExcelUtil.export(response, "常用线路" + DateUtil.time(), "常用线路", list, CommonRouteExportExcel.class);
} }
@PostMapping("/import-common-route") @PostMapping("/import-common-route")
blade-service/blade-transport/src/main/java/org/springblade/transport/controller/ProcessConfigController.java
+3 -3
View File
@@ -39,7 +39,7 @@ import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.Func;
import org.springblade.transport.excel.ProcessConfigExcel; import org.springblade.transport.excel.ProcessConfigExportExcel;
import org.springblade.transport.mapper.VoucherImageMapper; import org.springblade.transport.mapper.VoucherImageMapper;
import org.springblade.transport.pojo.entity.ProcessConfig; import org.springblade.transport.pojo.entity.ProcessConfig;
import org.springblade.transport.pojo.entity.VoucherImage; import org.springblade.transport.pojo.entity.VoucherImage;
@@ -151,8 +151,8 @@ public class ProcessConfigController extends BladeController {
@ApiOperationSupport(order = 5) @ApiOperationSupport(order = 5)
@Operation(summary = "导出过程配置") @Operation(summary = "导出过程配置")
public void exportProcessConfig(ProcessConfigVO processConfig, @RequestParam(required = false) String ids, HttpServletResponse response) { public void exportProcessConfig(ProcessConfigVO processConfig, @RequestParam(required = false) String ids, HttpServletResponse response) {
List<ProcessConfigExcel> list = processConfigService.exportProcessConfig(processConfig, ids); List<ProcessConfigExportExcel> list = processConfigService.exportProcessConfig(processConfig, ids);
ExcelUtil.export(response, "过程配置" + DateUtil.time(), "过程配置", list, ProcessConfigExcel.class); ExcelUtil.export(response, "过程配置" + DateUtil.time(), "过程配置", list, ProcessConfigExportExcel.class);
} }
@PostMapping("/copy") @PostMapping("/copy")
blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonAddressExcel.java → blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonAddressExportExcel.java
+5 -5
View File
@@ -32,10 +32,10 @@ import lombok.Data;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.util.Date;
/** /**
* 常用地址 Excel * 常用地址导出 Excel
* *
* @author Chill * @author Chill
*/ */
@@ -43,7 +43,7 @@ import java.time.LocalDateTime;
@ColumnWidth(18) @ColumnWidth(18)
@HeadRowHeight(20) @HeadRowHeight(20)
@ContentRowHeight(18) @ContentRowHeight(18)
public class CommonAddressExcel implements Serializable { public class CommonAddressExportExcel implements Serializable {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -88,9 +88,9 @@ public class CommonAddressExcel implements Serializable {
private String remark; private String remark;
@ExcelProperty("更新时间") @ExcelProperty("更新时间")
private LocalDateTime updateTime; private Date updateTime;
@ExcelProperty("创建时间") @ExcelProperty("创建时间")
private LocalDateTime createTime; private Date createTime;
} }
blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExcel.java
+18 -21
View File
@@ -49,46 +49,43 @@ public class CommonCargoExcel implements Serializable {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ExcelProperty("*一级货物类型")
private String firstCargoTypeName;
@ExcelProperty("*二级货物类型编码")
private String secondCargoTypeCode;
@ExcelProperty("*货物名称") @ExcelProperty("*货物名称")
private String cargoName; private String cargoName;
@ExcelProperty("*货物编号后缀") @ExcelProperty("*货物编号后缀")
private String cargoCodeSuffix; private String cargoCodeSuffix;
@ExcelProperty("品牌") @ExcelProperty("*一级货物类型")
private String brand; private String firstCargoTypeName;
@ExcelProperty("*二级货物类型")
private String secondCargoTypeName;
@ExcelProperty("*二级货物类型编码")
private String secondCargoTypeCode;
@ExcelProperty("包装") @ExcelProperty("包装")
private String packageType; private String packageType;
@ExcelProperty("品牌")
private String brand;
@ExcelProperty("规格")
private String specification;
@ExcelProperty("型号")
private String model;
@ExcelProperty("单价") @ExcelProperty("单价")
@NumberFormat("0.00") @NumberFormat("0.00")
private BigDecimal cargoValue; private BigDecimal cargoValue;
@ExcelProperty("规格")
private String specification;
@ExcelProperty("计价单位") @ExcelProperty("计价单位")
private String priceUnit; private String priceUnit;
@ExcelProperty("型号") @ExcelProperty("说明")
private String model;
@ExcelProperty("说明1")
private String descriptionOne; private String descriptionOne;
@ExcelProperty("尺寸")
private String sizeText;
@ExcelProperty("说明2")
private String descriptionTwo;
@ExcelProperty("备注") @ExcelProperty("备注")
private String remark; private String remark;
blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoExportExcel.java
+11 -14
View File
@@ -33,7 +33,7 @@ import lombok.Data;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.util.Date;
/** /**
* 常用货物导出 Excel * 常用货物导出 Excel
@@ -52,8 +52,8 @@ public class CommonCargoExportExcel implements Serializable {
@ExcelProperty("货物名称") @ExcelProperty("货物名称")
private String cargoName; private String cargoName;
@ExcelProperty("货物编号") @ExcelProperty("货物编号后缀")
private String cargoCode; private String cargoCodeSuffix;
@ExcelProperty("一级货物类型") @ExcelProperty("一级货物类型")
private String firstCargoTypeName; private String firstCargoTypeName;
@@ -64,8 +64,11 @@ public class CommonCargoExportExcel implements Serializable {
@ExcelProperty("二级货物类型编码") @ExcelProperty("二级货物类型编码")
private String secondCargoTypeCode; private String secondCargoTypeCode;
@ExcelProperty("包装品牌") @ExcelProperty("包装")
private String packageBrand; private String packageType;
@ExcelProperty("品牌")
private String brand;
@ExcelProperty("规格") @ExcelProperty("规格")
private String specification; private String specification;
@@ -80,15 +83,9 @@ public class CommonCargoExportExcel implements Serializable {
@ExcelProperty("计价单位") @ExcelProperty("计价单位")
private String priceUnit; private String priceUnit;
@ExcelProperty("尺寸") @ExcelProperty("说明")
private String sizeText;
@ExcelProperty("其他说明1")
private String descriptionOne; private String descriptionOne;
@ExcelProperty("其他说明2")
private String descriptionTwo;
@ExcelProperty("备注") @ExcelProperty("备注")
private String remark; private String remark;
@@ -96,9 +93,9 @@ public class CommonCargoExportExcel implements Serializable {
private String deptName; private String deptName;
@ExcelProperty("更新时间") @ExcelProperty("更新时间")
private LocalDateTime updateTime; private Date updateTime;
@ExcelProperty("创建时间") @ExcelProperty("创建时间")
private LocalDateTime createTime; private Date createTime;
} }
blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonCargoImportFailureExcel.java
+18 -21
View File
@@ -49,46 +49,43 @@ public class CommonCargoImportFailureExcel implements Serializable {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ExcelProperty("*一级货物类型")
private String firstCargoTypeName;
@ExcelProperty("*二级货物类型编码")
private String secondCargoTypeCode;
@ExcelProperty("*货物名称") @ExcelProperty("*货物名称")
private String cargoName; private String cargoName;
@ExcelProperty("*货物编号后缀") @ExcelProperty("*货物编号后缀")
private String cargoCodeSuffix; private String cargoCodeSuffix;
@ExcelProperty("品牌") @ExcelProperty("*一级货物类型")
private String brand; private String firstCargoTypeName;
@ExcelProperty("*二级货物类型")
private String secondCargoTypeName;
@ExcelProperty("*二级货物类型编码")
private String secondCargoTypeCode;
@ExcelProperty("包装") @ExcelProperty("包装")
private String packageType; private String packageType;
@ExcelProperty("品牌")
private String brand;
@ExcelProperty("规格")
private String specification;
@ExcelProperty("型号")
private String model;
@ExcelProperty("单价") @ExcelProperty("单价")
@NumberFormat("0.00") @NumberFormat("0.00")
private BigDecimal cargoValue; private BigDecimal cargoValue;
@ExcelProperty("规格")
private String specification;
@ExcelProperty("计价单位") @ExcelProperty("计价单位")
private String priceUnit; private String priceUnit;
@ExcelProperty("型号") @ExcelProperty("说明")
private String model;
@ExcelProperty("说明1")
private String descriptionOne; private String descriptionOne;
@ExcelProperty("尺寸")
private String sizeText;
@ExcelProperty("说明2")
private String descriptionTwo;
@ExcelProperty("备注") @ExcelProperty("备注")
private String remark; private String remark;
blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonRouteExcel.java → blade-service/blade-transport/src/main/java/org/springblade/transport/excel/CommonRouteExportExcel.java
+6 -6
View File
@@ -30,10 +30,10 @@ import lombok.Data;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.util.Date;
/** /**
* 常用线路 Excel * 常用线路导出 Excel
* *
* @author Chill * @author Chill
*/ */
@@ -41,7 +41,7 @@ import java.time.LocalDateTime;
@ColumnWidth(22) @ColumnWidth(22)
@HeadRowHeight(20) @HeadRowHeight(20)
@ContentRowHeight(18) @ContentRowHeight(18)
public class CommonRouteExcel implements Serializable { public class CommonRouteExportExcel implements Serializable {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -74,9 +74,9 @@ public class CommonRouteExcel implements Serializable {
private String createUserName; private String createUserName;
@ExcelProperty("更新人") @ExcelProperty("更新人")
private String updateUserName; private String updateUserName;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("更新时间") @ExcelProperty("更新时间")
private LocalDateTime updateTime; private Date updateTime;
@ExcelProperty("创建时间")
private Date createTime;
} }
blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ProcessConfigExcel.java → blade-service/blade-transport/src/main/java/org/springblade/transport/excel/ProcessConfigExportExcel.java
+6 -6
View File
@@ -30,10 +30,10 @@ import lombok.Data;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.util.Date;
/** /**
* 过程配置 Excel * 过程配置导出 Excel
* *
* @author Chill * @author Chill
*/ */
@@ -41,7 +41,7 @@ import java.time.LocalDateTime;
@ColumnWidth(22) @ColumnWidth(22)
@HeadRowHeight(20) @HeadRowHeight(20)
@ContentRowHeight(18) @ContentRowHeight(18)
public class ProcessConfigExcel implements Serializable { public class ProcessConfigExportExcel implements Serializable {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@@ -68,9 +68,9 @@ public class ProcessConfigExcel implements Serializable {
private String createUserName; private String createUserName;
@ExcelProperty("更新人") @ExcelProperty("更新人")
private String updateUserName; private String updateUserName;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@ExcelProperty("更新时间") @ExcelProperty("更新时间")
private LocalDateTime updateTime; private Date updateTime;
@ExcelProperty("创建时间")
private Date createTime;
} }
blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICommonAddressService.java
+2 -2
View File
@@ -25,7 +25,7 @@ package org.springblade.transport.service;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.base.BaseService;
import org.springblade.transport.excel.CommonAddressExcel; import org.springblade.transport.excel.CommonAddressExportExcel;
import org.springblade.transport.pojo.entity.CommonAddress; import org.springblade.transport.pojo.entity.CommonAddress;
import org.springblade.transport.pojo.vo.CommonAddressRemoveResultVO; import org.springblade.transport.pojo.vo.CommonAddressRemoveResultVO;
import org.springblade.transport.pojo.vo.CommonAddressVO; import org.springblade.transport.pojo.vo.CommonAddressVO;
@@ -87,6 +87,6 @@ public interface ICommonAddressService extends BaseService<CommonAddress> {
* @param queryWrapper 查询条件 * @param queryWrapper 查询条件
* @return 导出数据 * @return 导出数据
*/ */
List<CommonAddressExcel> exportCommonAddress(Wrapper<CommonAddress> queryWrapper); List<CommonAddressExportExcel> exportCommonAddress(Wrapper<CommonAddress> queryWrapper);
} }
blade-service/blade-transport/src/main/java/org/springblade/transport/service/ICommonRouteService.java
+2 -2
View File
@@ -24,7 +24,7 @@ package org.springblade.transport.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.base.BaseService;
import org.springblade.transport.excel.CommonRouteExcel; import org.springblade.transport.excel.CommonRouteExportExcel;
import org.springblade.transport.excel.CommonRouteImportExcel; import org.springblade.transport.excel.CommonRouteImportExcel;
import org.springblade.transport.pojo.entity.CommonRoute; import org.springblade.transport.pojo.entity.CommonRoute;
import org.springblade.transport.pojo.vo.BusinessRemoveResultVO; import org.springblade.transport.pojo.vo.BusinessRemoveResultVO;
@@ -43,7 +43,7 @@ public interface ICommonRouteService extends BaseService<CommonRoute> {
CommonRouteVO detail(Long id); CommonRouteVO detail(Long id);
boolean submit(CommonRoute commonRoute); boolean submit(CommonRoute commonRoute);
BusinessRemoveResultVO removeCommonRoute(String ids); BusinessRemoveResultVO removeCommonRoute(String ids);
List<CommonRouteExcel> exportCommonRoute(CommonRouteVO commonRoute, String ids); List<CommonRouteExportExcel> exportCommonRoute(CommonRouteVO commonRoute, String ids);
List<CommonRouteImportExcel> importCommonRoute(List<CommonRouteImportExcel> data); List<CommonRouteImportExcel> importCommonRoute(List<CommonRouteImportExcel> data);
} }
blade-service/blade-transport/src/main/java/org/springblade/transport/service/IProcessConfigService.java
+2 -2
View File
@@ -24,7 +24,7 @@ package org.springblade.transport.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.base.BaseService;
import org.springblade.transport.excel.ProcessConfigExcel; import org.springblade.transport.excel.ProcessConfigExportExcel;
import org.springblade.transport.pojo.entity.ProcessConfig; import org.springblade.transport.pojo.entity.ProcessConfig;
import org.springblade.transport.pojo.vo.BusinessRemoveResultVO; import org.springblade.transport.pojo.vo.BusinessRemoveResultVO;
import org.springblade.transport.pojo.vo.ProcessConfigVO; import org.springblade.transport.pojo.vo.ProcessConfigVO;
@@ -42,7 +42,7 @@ public interface IProcessConfigService extends BaseService<ProcessConfig> {
ProcessConfigVO detail(Long id); ProcessConfigVO detail(Long id);
boolean submit(ProcessConfig processConfig); boolean submit(ProcessConfig processConfig);
BusinessRemoveResultVO removeProcessConfig(String ids); BusinessRemoveResultVO removeProcessConfig(String ids);
List<ProcessConfigExcel> exportProcessConfig(ProcessConfigVO processConfig, String ids); List<ProcessConfigExportExcel> exportProcessConfig(ProcessConfigVO processConfig, String ids);
ProcessConfigVO copy(Long id); ProcessConfigVO copy(Long id);
boolean enable(Long id); boolean enable(Long id);
boolean disable(Long id); boolean disable(Long id);
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonAddressServiceImpl.java
+3 -3
View File
@@ -32,7 +32,7 @@ import org.springblade.core.tool.utils.Func;
import org.springblade.system.cache.SysCache; import org.springblade.system.cache.SysCache;
import org.springblade.system.cache.UserCache; import org.springblade.system.cache.UserCache;
import org.springblade.system.pojo.entity.Dept; import org.springblade.system.pojo.entity.Dept;
import org.springblade.transport.excel.CommonAddressExcel; import org.springblade.transport.excel.CommonAddressExportExcel;
import org.springblade.transport.mapper.CommonAddressMapper; import org.springblade.transport.mapper.CommonAddressMapper;
import org.springblade.transport.pojo.entity.CommonAddress; import org.springblade.transport.pojo.entity.CommonAddress;
import org.springblade.transport.pojo.vo.CommonAddressRemoveResultVO; import org.springblade.transport.pojo.vo.CommonAddressRemoveResultVO;
@@ -156,9 +156,9 @@ public class CommonAddressServiceImpl extends BaseServiceImpl<CommonAddressMappe
} }
@Override @Override
public List<CommonAddressExcel> exportCommonAddress(Wrapper<CommonAddress> queryWrapper) { public List<CommonAddressExportExcel> exportCommonAddress(Wrapper<CommonAddress> queryWrapper) {
return list(queryWrapper).stream().map(address -> { return list(queryWrapper).stream().map(address -> {
CommonAddressExcel excel = Objects.requireNonNull(BeanUtil.copyProperties(address, CommonAddressExcel.class)); CommonAddressExportExcel excel = Objects.requireNonNull(BeanUtil.copyProperties(address, CommonAddressExportExcel.class));
excel.setSiteCodeDisplay(TYPE_NORMAL.equals(address.getAddressType()) ? NORMAL_SITE_CODE : address.getSiteCode()); excel.setSiteCodeDisplay(TYPE_NORMAL.equals(address.getAddressType()) ? NORMAL_SITE_CODE : address.getSiteCode());
return excel; return excel;
}).toList(); }).toList();
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonCargoServiceImpl.java
+41 -28
View File
@@ -70,15 +70,18 @@ public class CommonCargoServiceImpl extends BaseServiceImpl<CommonCargoMapper, C
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean submit(CommonCargo commonCargo) { public boolean submit(CommonCargo commonCargo) {
return submit(commonCargo, true);
}
private boolean submit(CommonCargo commonCargo, boolean requireModel) {
boolean created = Func.isEmpty(commonCargo.getId()); boolean created = Func.isEmpty(commonCargo.getId());
if (!created) { if (!created) {
CommonCargo oldRecord = loadEditable(commonCargo.getId(), true); CommonCargo oldRecord = loadEditable(commonCargo.getId(), true);
commonCargo.setCargoCode(oldRecord.getCargoCode());
commonCargo.setDeptId(oldRecord.getDeptId()); commonCargo.setDeptId(oldRecord.getDeptId());
commonCargo.setDeptName(oldRecord.getDeptName()); commonCargo.setDeptName(oldRecord.getDeptName());
} }
prepare(commonCargo); prepare(commonCargo);
validate(commonCargo); validate(commonCargo, requireModel);
return saveOrUpdate(commonCargo); return saveOrUpdate(commonCargo);
} }
@@ -116,15 +119,24 @@ public class CommonCargoServiceImpl extends BaseServiceImpl<CommonCargoMapper, C
return list(queryWrapper).stream().map(record -> { return list(queryWrapper).stream().map(record -> {
CommonCargoExportExcel excel = new CommonCargoExportExcel(); CommonCargoExportExcel excel = new CommonCargoExportExcel();
BeanUtil.copyProperties(record, excel); BeanUtil.copyProperties(record, excel);
excel.setCargoCodeSuffix(cargoCodeSuffix(record));
excel.setCargoValue(normalizeCargoValue(record.getCargoValue())); excel.setCargoValue(normalizeCargoValue(record.getCargoValue()));
excel.setPackageBrand(String.join(" / ", List.of(
Func.isEmpty(record.getPackageType()) ? "" : record.getPackageType(),
Func.isEmpty(record.getBrand()) ? "" : record.getBrand()
).stream().filter(value -> !value.isEmpty()).toList()));
return excel; return excel;
}).toList(); }).toList();
} }
private String cargoCodeSuffix(CommonCargo commonCargo) {
String cargoCode = commonCargo.getCargoCode();
if (Func.isEmpty(cargoCode)) {
return null;
}
String prefix = commonCargo.getSecondCargoTypeCode();
if (Func.isNotEmpty(prefix) && cargoCode.startsWith(prefix.substring(0, Math.min(4, prefix.length())))) {
return cargoCode.substring(Math.min(4, prefix.length()));
}
return cargoCode;
}
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public List<CommonCargoImportFailureExcel> importCommonCargo(List<CommonCargoExcel> data) { public List<CommonCargoImportFailureExcel> importCommonCargo(List<CommonCargoExcel> data) {
@@ -154,11 +166,9 @@ public class CommonCargoServiceImpl extends BaseServiceImpl<CommonCargoMapper, C
commonCargo.setPriceUnit(TransportBusinessSupport.trimToNull(excel.getPriceUnit())); commonCargo.setPriceUnit(TransportBusinessSupport.trimToNull(excel.getPriceUnit()));
commonCargo.setModel(TransportBusinessSupport.trimToNull(excel.getModel())); commonCargo.setModel(TransportBusinessSupport.trimToNull(excel.getModel()));
commonCargo.setDescriptionOne(TransportBusinessSupport.trimToNull(excel.getDescriptionOne())); commonCargo.setDescriptionOne(TransportBusinessSupport.trimToNull(excel.getDescriptionOne()));
commonCargo.setSizeText(TransportBusinessSupport.trimToNull(excel.getSizeText()));
commonCargo.setDescriptionTwo(TransportBusinessSupport.trimToNull(excel.getDescriptionTwo()));
commonCargo.setRemark(TransportBusinessSupport.trimToNull(excel.getRemark())); commonCargo.setRemark(TransportBusinessSupport.trimToNull(excel.getRemark()));
commonCargo.setDataSource("批量导入"); commonCargo.setDataSource("批量导入");
submit(commonCargo); submit(commonCargo, false);
} catch (Exception exception) { } catch (Exception exception) {
CommonCargoImportFailureExcel failureExcel = new CommonCargoImportFailureExcel(); CommonCargoImportFailureExcel failureExcel = new CommonCargoImportFailureExcel();
BeanUtil.copyProperties(excel, failureExcel); BeanUtil.copyProperties(excel, failureExcel);
@@ -252,7 +262,7 @@ public class CommonCargoServiceImpl extends BaseServiceImpl<CommonCargoMapper, C
if (Func.isNotEmpty(commonCargo.getRemark())) { if (Func.isNotEmpty(commonCargo.getRemark())) {
queryWrapper.like(CommonCargo::getRemark, commonCargo.getRemark()); queryWrapper.like(CommonCargo::getRemark, commonCargo.getRemark());
} }
queryWrapper.orderByDesc(CommonCargo::getUpdateTime).orderByDesc(CommonCargo::getCreateTime); queryWrapper.orderByDesc(CommonCargo::getCreateTime).orderByDesc(CommonCargo::getUpdateTime);
return queryWrapper; return queryWrapper;
} }
@@ -287,28 +297,31 @@ public class CommonCargoServiceImpl extends BaseServiceImpl<CommonCargoMapper, C
return cargoValue != null && cargoValue.compareTo(BigDecimal.ONE.negate()) == 0 ? null : cargoValue; return cargoValue != null && cargoValue.compareTo(BigDecimal.ONE.negate()) == 0 ? null : cargoValue;
} }
private void validate(CommonCargo commonCargo) { private void validate(CommonCargo commonCargo, boolean requireModel) {
TransportBusinessSupport.validateRequired(commonCargo.getFirstCargoTypeName(), "请选择一级货物类型"); TransportBusinessSupport.validateRequired(commonCargo.getFirstCargoTypeName(), "请选择一级货物类型");
TransportBusinessSupport.validateRequired(commonCargo.getSecondCargoTypeCode(), "请选择二级货物类型"); TransportBusinessSupport.validateRequired(commonCargo.getSecondCargoTypeCode(), "请选择二级货物类型");
TransportBusinessSupport.validateRequired(commonCargo.getCargoName(), "请输入货物名称"); TransportBusinessSupport.validateRequired(commonCargo.getCargoName(), "请输入货物名称");
TransportBusinessSupport.validateRequired(commonCargo.getCargoCode(), "请输入货物编号"); TransportBusinessSupport.validateRequired(commonCargo.getCargoCode(), "请输入货物编号");
TransportBusinessSupport.validateLength(commonCargo.getFirstCargoTypeName(), 255, "一级货物类型不能超过255字"); if (requireModel) {
TransportBusinessSupport.validateLength(commonCargo.getFirstCargoTypeCode(), 255, "一级货物类型编码不能超过255字"); TransportBusinessSupport.validateRequired(commonCargo.getModel(), "请输入型号");
TransportBusinessSupport.validateLength(commonCargo.getSecondCargoTypeName(), 255, "二级货物类型不能超过255字"); }
TransportBusinessSupport.validateLength(commonCargo.getSecondCargoTypeCode(), 255, "二级货物类型编码不能超过255字"); TransportBusinessSupport.validateLength(commonCargo.getFirstCargoTypeName(), 100, "一级货物类型不能超过100字");
TransportBusinessSupport.validateLength(commonCargo.getCargoName(), 255, "货物名称不能超过255字"); TransportBusinessSupport.validateLength(commonCargo.getFirstCargoTypeCode(), 100, "一级货物类型编码不能超过100字");
TransportBusinessSupport.validateLength(commonCargo.getCargoCode(), 255, "货物编号不能超过255字"); TransportBusinessSupport.validateLength(commonCargo.getSecondCargoTypeName(), 100, "二级货物类型不能超过100字");
TransportBusinessSupport.validateLength(commonCargo.getBrand(), 255, "品牌不能超过255字"); TransportBusinessSupport.validateLength(commonCargo.getSecondCargoTypeCode(), 100, "二级货物类型编码不能超过100字");
TransportBusinessSupport.validateLength(commonCargo.getPackageType(), 255, "包装不能超过255字"); TransportBusinessSupport.validateLength(commonCargo.getCargoName(), 100, "货物名称不能超过100字");
TransportBusinessSupport.validateLength(commonCargo.getSpecification(), 255, "规格不能超过255字"); TransportBusinessSupport.validateLength(commonCargo.getCargoCode(), 20, "货物编号不能超过20字");
TransportBusinessSupport.validateLength(commonCargo.getPriceUnit(), 255, "计价单位不能超过255字"); TransportBusinessSupport.validateLength(commonCargo.getBrand(), 50, "品牌不能超过50字");
TransportBusinessSupport.validateLength(commonCargo.getModel(), 255, "型号不能超过255字"); TransportBusinessSupport.validateLength(commonCargo.getPackageType(), 100, "包装不能超过100字");
TransportBusinessSupport.validateLength(commonCargo.getDescriptionOne(), 255, "说明1不能超过255字"); TransportBusinessSupport.validateLength(commonCargo.getSpecification(), 50, "规格不能超过50字");
TransportBusinessSupport.validateLength(commonCargo.getSizeText(), 255, "尺寸不能超过255字"); TransportBusinessSupport.validateLength(commonCargo.getPriceUnit(), 100, "计价单位不能超过100字");
TransportBusinessSupport.validateLength(commonCargo.getDescriptionTwo(), 255, "说明2不能超过255字"); TransportBusinessSupport.validateLength(commonCargo.getModel(), 50, "型号不能超过50字");
TransportBusinessSupport.validateLength(commonCargo.getDataSource(), 255, "数据来源不能超过255字"); TransportBusinessSupport.validateLength(commonCargo.getDescriptionOne(), 100, "说明不能超过100字");
TransportBusinessSupport.validateLength(commonCargo.getDeptName(), 255, "所属组织不能超过255字"); TransportBusinessSupport.validateLength(commonCargo.getSizeText(), 100, "尺寸不能超过100字");
TransportBusinessSupport.validateLength(commonCargo.getRemark(), 500, "备注不能超过500字"); TransportBusinessSupport.validateLength(commonCargo.getDescriptionTwo(), 100, "说明2不能超过100字");
TransportBusinessSupport.validateLength(commonCargo.getDataSource(), 100, "数据来源不能超过100字");
TransportBusinessSupport.validateLength(commonCargo.getDeptName(), 100, "所属组织不能超过100字");
TransportBusinessSupport.validateLength(commonCargo.getRemark(), 200, "备注不能超过200字");
validateCommonCargo(commonCargo); validateCommonCargo(commonCargo);
TransportBusinessSupport.validateNonNegative(commonCargo.getCargoValue(), "货值"); TransportBusinessSupport.validateNonNegative(commonCargo.getCargoValue(), "货值");
if (count(Wrappers.<CommonCargo>lambdaQuery().eq(CommonCargo::getCargoCode, commonCargo.getCargoCode()).ne(Func.isNotEmpty(commonCargo.getId()), CommonCargo::getId, commonCargo.getId()).eq(CommonCargo::getIsDeleted, 0)) > 0) { throw new ServiceException("该货物编号已存在"); } if (count(Wrappers.<CommonCargo>lambdaQuery().eq(CommonCargo::getCargoCode, commonCargo.getCargoCode()).ne(Func.isNotEmpty(commonCargo.getId()), CommonCargo::getId, commonCargo.getId()).eq(CommonCargo::getIsDeleted, 0)) > 0) { throw new ServiceException("该货物编号已存在"); }
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CommonRouteServiceImpl.java
+3 -3
View File
@@ -31,7 +31,7 @@ import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.Func;
import org.springblade.system.cache.UserCache; import org.springblade.system.cache.UserCache;
import org.springblade.system.pojo.entity.Dept; import org.springblade.system.pojo.entity.Dept;
import org.springblade.transport.excel.CommonRouteExcel; import org.springblade.transport.excel.CommonRouteExportExcel;
import org.springblade.transport.excel.CommonRouteImportExcel; import org.springblade.transport.excel.CommonRouteImportExcel;
import org.springblade.transport.mapper.CommonRouteMapper; import org.springblade.transport.mapper.CommonRouteMapper;
import org.springblade.transport.pojo.entity.CommonRoute; import org.springblade.transport.pojo.entity.CommonRoute;
@@ -110,13 +110,13 @@ public class CommonRouteServiceImpl extends BaseServiceImpl<CommonRouteMapper, C
} }
@Override @Override
public List<CommonRouteExcel> exportCommonRoute(CommonRouteVO commonRoute, String ids) { public List<CommonRouteExportExcel> exportCommonRoute(CommonRouteVO commonRoute, String ids) {
LambdaQueryWrapper<CommonRoute> queryWrapper = buildQuery(commonRoute); LambdaQueryWrapper<CommonRoute> queryWrapper = buildQuery(commonRoute);
if (Func.isNotEmpty(ids)) { if (Func.isNotEmpty(ids)) {
queryWrapper.in(CommonRoute::getId, Func.toLongList(ids)); queryWrapper.in(CommonRoute::getId, Func.toLongList(ids));
} }
return list(queryWrapper).stream().map(record -> { return list(queryWrapper).stream().map(record -> {
CommonRouteExcel excel = new CommonRouteExcel(); CommonRouteExportExcel excel = new CommonRouteExportExcel();
BeanUtil.copyProperties(record, excel); BeanUtil.copyProperties(record, excel);
excel.setCreateUserName(UserCache.getUserRealName(record.getCreateUser())); excel.setCreateUserName(UserCache.getUserRealName(record.getCreateUser()));
excel.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser())); excel.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser()));
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ProcessConfigServiceImpl.java
+3 -3
View File
@@ -31,7 +31,7 @@ import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.Func;
import org.springblade.system.cache.UserCache; import org.springblade.system.cache.UserCache;
import org.springblade.system.pojo.entity.Dept; import org.springblade.system.pojo.entity.Dept;
import org.springblade.transport.excel.ProcessConfigExcel; import org.springblade.transport.excel.ProcessConfigExportExcel;
import org.springblade.transport.mapper.ProcessConfigMapper; import org.springblade.transport.mapper.ProcessConfigMapper;
import org.springblade.transport.pojo.entity.ProcessConfig; import org.springblade.transport.pojo.entity.ProcessConfig;
import org.springblade.transport.pojo.vo.BusinessRemoveResultVO; import org.springblade.transport.pojo.vo.BusinessRemoveResultVO;
@@ -109,13 +109,13 @@ public class ProcessConfigServiceImpl extends BaseServiceImpl<ProcessConfigMappe
} }
@Override @Override
public List<ProcessConfigExcel> exportProcessConfig(ProcessConfigVO processConfig, String ids) { public List<ProcessConfigExportExcel> exportProcessConfig(ProcessConfigVO processConfig, String ids) {
LambdaQueryWrapper<ProcessConfig> queryWrapper = buildQuery(processConfig); LambdaQueryWrapper<ProcessConfig> queryWrapper = buildQuery(processConfig);
if (Func.isNotEmpty(ids)) { if (Func.isNotEmpty(ids)) {
queryWrapper.in(ProcessConfig::getId, Func.toLongList(ids)); queryWrapper.in(ProcessConfig::getId, Func.toLongList(ids));
} }
return list(queryWrapper).stream().map(record -> { return list(queryWrapper).stream().map(record -> {
ProcessConfigExcel excel = new ProcessConfigExcel(); ProcessConfigExportExcel excel = new ProcessConfigExportExcel();
BeanUtil.copyProperties(record, excel); BeanUtil.copyProperties(record, excel);
excel.setCreateUserName(UserCache.getUserRealName(record.getCreateUser())); excel.setCreateUserName(UserCache.getUserRealName(record.getCreateUser()));
excel.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser())); excel.setUpdateUserName(UserCache.getUserRealName(record.getUpdateUser()));
doc/sql/transport/blade_tms_business.sql
+1 -1
View File
@@ -72,7 +72,7 @@ CREATE TABLE `blade_common_cargo` (
`specification` varchar(100) DEFAULT NULL COMMENT '规格', `specification` varchar(100) DEFAULT NULL COMMENT '规格',
`price_unit` varchar(100) DEFAULT NULL COMMENT '计价单位', `price_unit` varchar(100) DEFAULT NULL COMMENT '计价单位',
`model` varchar(100) DEFAULT NULL COMMENT '型号', `model` varchar(100) DEFAULT NULL COMMENT '型号',
`description_one` varchar(100) DEFAULT NULL COMMENT '说明1', `description_one` varchar(100) DEFAULT NULL COMMENT '说明',
`size_text` varchar(100) DEFAULT NULL COMMENT '尺寸', `size_text` varchar(100) DEFAULT NULL COMMENT '尺寸',
`description_two` varchar(100) DEFAULT NULL COMMENT '说明2', `description_two` varchar(100) DEFAULT NULL COMMENT '说明2',
`data_source` varchar(100) DEFAULT NULL COMMENT '数据来源', `data_source` varchar(100) DEFAULT NULL COMMENT '数据来源',