diff --git a/win-framework/win-spring-boot-starter-mq/src/main/java/com/win/framework/mq/core/stream/AbstractStreamMessageListener.java b/win-framework/win-spring-boot-starter-mq/src/main/java/com/win/framework/mq/core/stream/AbstractStreamMessageListener.java index 52a6feb4..12a21104 100644 --- a/win-framework/win-spring-boot-starter-mq/src/main/java/com/win/framework/mq/core/stream/AbstractStreamMessageListener.java +++ b/win-framework/win-spring-boot-starter-mq/src/main/java/com/win/framework/mq/core/stream/AbstractStreamMessageListener.java @@ -63,6 +63,8 @@ public abstract class AbstractStreamMessageListenerorg.apache.shardingsphere shardingsphere-jdbc-core-spring-boot-starter - com.github.yulichang mybatis-plus-join-boot-starter + + org.apache.shardingsphere + shardingsphere-jdbc-core-spring-boot-starter + diff --git a/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/enums/ShardingTableCacheEnum.java b/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/enums/ShardingTableCacheEnum.java new file mode 100644 index 00000000..2e5aae13 --- /dev/null +++ b/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/enums/ShardingTableCacheEnum.java @@ -0,0 +1,62 @@ +package com.win.framework.datasource.enums; + +import java.util.*; + +/** + *

@Title ShardingTableCacheEnum + *

@Description 分片表缓存枚举 + * + * @author liuchen + * @date 2022/12/23 20:17 + */ +public enum ShardingTableCacheEnum { + + /** + * 动态记录表 + */ + TRENDS("infra_trends", new HashSet<>()); + + /** + * 逻辑表名 + */ + private final String logicTableName; + /** + * 实际表名 + */ + private final Set resultTableNamesCache; + + private static Map valueMap = new HashMap<>(); + + static { + Arrays.stream(ShardingTableCacheEnum.values()).forEach(o -> valueMap.put(o.logicTableName, o)); + } + + ShardingTableCacheEnum(String logicTableName, Set resultTableNamesCache) { + this.logicTableName = logicTableName; + this.resultTableNamesCache = resultTableNamesCache; + } + + public static ShardingTableCacheEnum of(String value) { + return valueMap.get(value); + } + + public String logicTableName() { + return logicTableName; + } + + public Set resultTableNamesCache() { + return resultTableNamesCache; + } + + public static Set logicTableNames() { + return valueMap.keySet(); + } + + @Override + public String toString() { + return "ShardingTableCacheEnum{" + + "logicTableName='" + logicTableName + '\'' + + ", resultTableNamesCache=" + resultTableNamesCache + + '}'; + } +} \ No newline at end of file diff --git a/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/sharding/TimeShardingAlgorithm.java b/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/sharding/TimeShardingAlgorithm.java new file mode 100644 index 00000000..7699de92 --- /dev/null +++ b/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/sharding/TimeShardingAlgorithm.java @@ -0,0 +1,144 @@ +package com.win.framework.datasource.sharding; + + +import com.google.common.collect.Range; +import com.win.framework.datasource.enums.ShardingTableCacheEnum; +import com.win.framework.datasource.utils.ShardingAlgorithmTool; +import lombok.extern.slf4j.Slf4j; +import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue; +import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue; +import org.apache.shardingsphere.sharding.api.sharding.standard.StandardShardingAlgorithm; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.*; +import java.util.function.Function; + +/** + * 分片算法，按月分片 + */ +@Slf4j +public class TimeShardingAlgorithm implements StandardShardingAlgorithm { + + /** + * 分片时间格式 + */ + private static final DateTimeFormatter TABLE_SHARD_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyyMM"); + + /** + * 完整时间格式 + */ + private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd HH:mm:ss"); + + /** + * 表分片符号，例：t_contract_202201 中，分片符号为 "_" + */ + private final String TABLE_SPLIT_SYMBOL = "_"; + + /** + * 精准分片 + * @param tableNames 对应分片库中所有分片表的集合 + * @param preciseShardingValue 分片键值，其中 logicTableName 为逻辑表，columnName 分片键，value 为从 SQL 中解析出来的分片键的值 + * @return 表名 + */ + @Override + public String doSharding(Collection tableNames, PreciseShardingValue preciseShardingValue) { + String logicTableName = preciseShardingValue.getLogicTableName(); + ShardingTableCacheEnum logicTable = ShardingTableCacheEnum.of(logicTableName); + if (logicTable == null) { + log.error(">>>>>>>>>> 【ERROR】数据表类型错误，请稍后重试，logicTableNames：{}，logicTableName:{}", ShardingTableCacheEnum.logicTableNames(), logicTableName); + throw new IllegalArgumentException("数据表类型错误，请稍后重试"); + } + /// 打印分片信息 + log.info(">>>>>>>>>> 【INFO】精确分片，节点配置表名：{}，数据库缓存表名：{}", tableNames, logicTable.resultTableNamesCache()); + LocalDateTime dateTime = preciseShardingValue.getValue(); + String resultTableName = logicTableName + "_" + dateTime.format(TABLE_SHARD_TIME_FORMATTER); + // 检查分表获取的表名是否存在，不存在则自动建表 + if (!tableNames.contains(resultTableName)){ + tableNames.add(resultTableName); + } + return ShardingAlgorithmTool.getShardingTableAndCreate(logicTable, resultTableName); + } + + /** + * 范围分片 + * @param tableNames 对应分片库中所有分片表的集合 + * @param rangeShardingValue 分片范围 + * @return 表名集合 + */ + @Override + public Collection doSharding(Collection tableNames, RangeShardingValue rangeShardingValue) { + String logicTableName = rangeShardingValue.getLogicTableName(); + ShardingTableCacheEnum logicTable = ShardingTableCacheEnum.of(logicTableName); + if (logicTable == null) { + log.error(">>>>>>>>>> 【ERROR】逻辑表范围异常，请稍后重试，logicTableNames：{}，logicTableName:{}", ShardingTableCacheEnum.logicTableNames(), logicTableName); + throw new IllegalArgumentException("逻辑表范围异常，请稍后重试"); + } + /// 打印分片信息 + log.info(">>>>>>>>>> 【INFO】范围分片，节点配置表名：{}，数据库缓存表名：{}", tableNames, logicTable.resultTableNamesCache()); + // between and 的起始值 + Range valueRange = rangeShardingValue.getValueRange(); + boolean hasLowerBound = valueRange.hasLowerBound(); + boolean hasUpperBound = valueRange.hasUpperBound(); + // 获取最大值和最小值 + Set tableNameCache = logicTable.resultTableNamesCache(); + LocalDateTime min = hasLowerBound ? valueRange.lowerEndpoint() :getLowerEndpoint(tableNameCache); + LocalDateTime max = hasUpperBound ? valueRange.upperEndpoint() :getUpperEndpoint(tableNameCache); + // 循环计算分表范围 + Set resultTableNames = new LinkedHashSet<>(); + while (min.isBefore(max) || min.equals(max)) { + String tableName = logicTableName + TABLE_SPLIT_SYMBOL + min.format(TABLE_SHARD_TIME_FORMATTER); + resultTableNames.add(tableName); + min = min.plusMinutes(1); + } + return ShardingAlgorithmTool.getShardingTablesAndCreate(logicTable, resultTableNames); + } + + @Override + public void init() { + + } + + @Override + public String getType() { + return null; + } + + // -------------------------------------------------------------------------------------------------------------- + // 私有方法 + // -------------------------------------------------------------------------------------------------------------- + + /** + * 获取 最小分片值 + * @param tableNames 表名集合 + * @return 最小分片值 + */ + private LocalDateTime getLowerEndpoint(Collection tableNames) { + Optional optional = tableNames.stream() + .map(o -> LocalDateTime.parse(o.replace(TABLE_SPLIT_SYMBOL, "") + "01 00:00:00", DATE_TIME_FORMATTER)) + .min(Comparator.comparing(Function.identity())); + if (optional.isPresent()) { + return optional.get(); + } else { + log.error(">>>>>>>>>> 【ERROR】获取数据最小分表失败，请稍后重试，tableName：{}", tableNames); + throw new IllegalArgumentException("获取数据最小分表失败，请稍后重试"); + } + } + + /** + * 获取 最大分片值 + * @param tableNames 表名集合 + * @return 最大分片值 + */ + private LocalDateTime getUpperEndpoint(Collection tableNames) { + Optional optional = tableNames.stream() + .map(o -> LocalDateTime.parse(o.replace(TABLE_SPLIT_SYMBOL, "") + "01 00:00:00", DATE_TIME_FORMATTER)) + .max(Comparator.comparing(Function.identity())); + if (optional.isPresent()) { + return optional.get(); + } else { + log.error(">>>>>>>>>> 【ERROR】获取数据最大分表失败，请稍后重试，tableName：{}", tableNames); + throw new IllegalArgumentException("获取数据最大分表失败，请稍后重试"); + } + } +} \ No newline at end of file diff --git a/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/utils/ShardingAlgorithmTool.java b/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/utils/ShardingAlgorithmTool.java new file mode 100644 index 00000000..5f1ad6de --- /dev/null +++ b/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/utils/ShardingAlgorithmTool.java @@ -0,0 +1,247 @@ +package com.win.framework.datasource.utils; + +import cn.hutool.extra.spring.SpringUtil; +import com.win.framework.datasource.enums.ShardingTableCacheEnum; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource; +import org.apache.shardingsphere.infra.config.RuleConfiguration; +import org.apache.shardingsphere.mode.manager.ContextManager; +import org.apache.shardingsphere.sharding.algorithm.config.AlgorithmProvidedShardingRuleConfiguration; +import org.apache.shardingsphere.sharding.api.config.rule.ShardingTableRuleConfiguration; +import org.springframework.core.env.Environment; + +import java.sql.*; +import java.time.YearMonth; +import java.time.format.DateTimeFormatter; +import java.util.*; +import java.util.stream.Collectors; + +/** + *

@Title ShardingAlgorithmTool + *

@Description 按月分片算法工具 + * + * @author liuchen + * @date 2022/12/20 14:03 + */ +@Slf4j +public class ShardingAlgorithmTool { + + /** 表分片符号，例：t_user_202201 中，分片符号为 "_" */ + private static final String TABLE_SPLIT_SYMBOL = "_"; + + /** 数据库配置 */ + private static final Environment ENV = SpringUtil.getApplicationContext().getEnvironment(); + private static final String DATASOURCE_URL = ENV.getProperty("spring.shardingsphere.datasource.master.url"); + private static final String DATASOURCE_USERNAME = ENV.getProperty("spring.shardingsphere.datasource.master.username"); + private static final String DATASOURCE_PASSWORD = ENV.getProperty("spring.shardingsphere.datasource.master.password"); + + + /** + * 检查分表获取的表名是否存在，不存在则自动建表 + * @param logicTable 逻辑表 + * @param resultTableNames 真实表名，例：t_user_202201 + * @return 存在于数据库中的真实表名集合 + */ + public static Set getShardingTablesAndCreate(ShardingTableCacheEnum logicTable, Collection resultTableNames) { + return resultTableNames.stream().map(o -> getShardingTableAndCreate(logicTable, o)).collect(Collectors.toSet()); + } + + /** + * 检查分表获取的表名是否存在，不存在则自动建表 + * @param logicTable 逻辑表 + * @param resultTableName 真实表名，例：t_user_202201 + * @return 确认存在于数据库中的真实表名 + */ + public static String getShardingTableAndCreate(ShardingTableCacheEnum logicTable, String resultTableName) { + // 缓存中有此表则返回，没有则判断创建 + if (logicTable.resultTableNamesCache().contains(resultTableName)) { + return resultTableName; + } else { + // 未创建的表返回逻辑空表 + boolean isSuccess = createShardingTable(logicTable, resultTableName); + return isSuccess ? resultTableName : logicTable.logicTableName(); + } + } + + /** + * 重载全部缓存 + */ + public static void tableNameCacheReloadAll() { + Arrays.stream(ShardingTableCacheEnum.values()).forEach(ShardingAlgorithmTool::tableNameCacheReload); + } + + /** + * 重载指定分表缓存 + * @param logicTable 逻辑表，例：t_user + */ + public static void tableNameCacheReload(ShardingTableCacheEnum logicTable) { + // 读取数据库中|所有表名 + List tableNameList = getAllTableNameBySchema(logicTable); + // 动态更新配置 actualDataNodes（先更新后删除缓存，防止数据不一致） + actualDataNodesRefresh(logicTable.logicTableName(), new HashSet<>(tableNameList)); + // 删除旧的缓存（如果存在） + logicTable.resultTableNamesCache().clear(); + // 写入新的缓存 + logicTable.resultTableNamesCache().addAll(tableNameList); + } + + /** + * 获取所有表名 + * @return 表名集合 + * @param logicTable 逻辑表 + */ + public static List getAllTableNameBySchema(ShardingTableCacheEnum logicTable) { + List tableNames = new ArrayList<>(); + if (StringUtils.isEmpty(DATASOURCE_URL) || StringUtils.isEmpty(DATASOURCE_USERNAME) || StringUtils.isEmpty(DATASOURCE_PASSWORD)) { + log.error(">>>>>>>>>> 【ERROR】数据库连接配置有误，请稍后重试，URL:{}, username:{}, password:{}", DATASOURCE_URL, DATASOURCE_USERNAME, DATASOURCE_PASSWORD); + throw new IllegalArgumentException("数据库连接配置有误，请稍后重试"); + } + try (Connection conn = DriverManager.getConnection(DATASOURCE_URL, DATASOURCE_USERNAME, DATASOURCE_PASSWORD); + Statement st = conn.createStatement()) { + String logicTableName = logicTable.logicTableName(); + try (ResultSet rs = st.executeQuery("show TABLES like '" + logicTableName + TABLE_SPLIT_SYMBOL + "%'")) { + while (rs.next()) { + String tableName = rs.getString(1); + // 匹配分表格式 例：^(t\_contract_\d{6})$ + if (tableName != null && tableName.matches(String.format("^(%s\\d{6})$", logicTableName + TABLE_SPLIT_SYMBOL))) { + tableNames.add(rs.getString(1)); + } + } + } + } catch (SQLException e) { + log.error(">>>>>>>>>> 【ERROR】数据库连接失败，请稍后重试，原因：{}", e.getMessage(), e); + throw new IllegalArgumentException("数据库连接失败，请稍后重试"); + } + return tableNames; + } + + /** + * 动态更新配置 actualDataNodes + * + * @param logicTableName 逻辑表名 + * @param tableNamesCache 真实表名集合 + */ + public static void actualDataNodesRefresh(String logicTableName, Set tableNamesCache) { + try { + // 获取数据分片节点 + String dbName = "master"; + log.info(">>>>>>>>>> 【INFO】更新分表配置，logicTableName:{}，tableNamesCache:{}", logicTableName, tableNamesCache); + + // generate actualDataNodes + String newActualDataNodes = tableNamesCache.stream().map(o -> String.format("%s.%s", dbName, o)).collect(Collectors.joining(",")); + ShardingSphereDataSource shardingSphereDataSource = SpringUtil.getBean(ShardingSphereDataSource.class); + updateShardRuleActualDataNodes(shardingSphereDataSource, logicTableName, newActualDataNodes); + }catch (Exception e){ + log.error("初始化 动态表单失败，原因：{}", e.getMessage(), e); + } + } + + + // -------------------------------------------------------------------------------------------------------------- + // 私有方法 + // -------------------------------------------------------------------------------------------------------------- + + + /** + * 刷新ActualDataNodes + */ + private static void updateShardRuleActualDataNodes(ShardingSphereDataSource dataSource, String logicTableName, String newActualDataNodes) { + // Context manager. + ContextManager contextManager = dataSource.getContextManager(); + // Rule configuration. + String schemaName = "logic_db"; + Collection newRuleConfigList = new LinkedList<>(); + Collection oldRuleConfigList = dataSource.getContextManager() + .getMetaDataContexts() + .getMetaData(schemaName) + .getRuleMetaData() + .getConfigurations(); + for (RuleConfiguration oldRuleConfig : oldRuleConfigList) { + if (oldRuleConfig instanceof AlgorithmProvidedShardingRuleConfiguration) { + // Algorithm provided sharding rule configuration + AlgorithmProvidedShardingRuleConfiguration oldAlgorithmConfig = (AlgorithmProvidedShardingRuleConfiguration) oldRuleConfig; + AlgorithmProvidedShardingRuleConfiguration newAlgorithmConfig = new AlgorithmProvidedShardingRuleConfiguration(); + // Sharding table rule configuration Collection + Collection newTableRuleConfigList = new LinkedList<>(); + Collection oldTableRuleConfigList = oldAlgorithmConfig.getTables(); + oldTableRuleConfigList.forEach(oldTableRuleConfig -> { + if (logicTableName.equals(oldTableRuleConfig.getLogicTable())) { + ShardingTableRuleConfiguration newTableRuleConfig = new ShardingTableRuleConfiguration(oldTableRuleConfig.getLogicTable(), newActualDataNodes); + newTableRuleConfig.setTableShardingStrategy(oldTableRuleConfig.getTableShardingStrategy()); + newTableRuleConfig.setDatabaseShardingStrategy(oldTableRuleConfig.getDatabaseShardingStrategy()); + newTableRuleConfig.setKeyGenerateStrategy(oldTableRuleConfig.getKeyGenerateStrategy()); + newTableRuleConfigList.add(newTableRuleConfig); + } else { + newTableRuleConfigList.add(oldTableRuleConfig); + } + }); + newAlgorithmConfig.setTables(newTableRuleConfigList); + newAlgorithmConfig.setAutoTables(oldAlgorithmConfig.getAutoTables()); + newAlgorithmConfig.setBindingTableGroups(oldAlgorithmConfig.getBindingTableGroups()); + newAlgorithmConfig.setBroadcastTables(oldAlgorithmConfig.getBroadcastTables()); + newAlgorithmConfig.setDefaultDatabaseShardingStrategy(oldAlgorithmConfig.getDefaultDatabaseShardingStrategy()); + newAlgorithmConfig.setDefaultTableShardingStrategy(oldAlgorithmConfig.getDefaultTableShardingStrategy()); + newAlgorithmConfig.setDefaultKeyGenerateStrategy(oldAlgorithmConfig.getDefaultKeyGenerateStrategy()); + newAlgorithmConfig.setDefaultShardingColumn(oldAlgorithmConfig.getDefaultShardingColumn()); + newAlgorithmConfig.setShardingAlgorithms(oldAlgorithmConfig.getShardingAlgorithms()); + newAlgorithmConfig.setKeyGenerators(oldAlgorithmConfig.getKeyGenerators()); + newRuleConfigList.add(newAlgorithmConfig); + } + } + // update context + contextManager.alterRuleConfiguration(schemaName, newRuleConfigList); + } + + /** + * 创建分表 + * @param logicTable 逻辑表 + * @param resultTableName 真实表名，例：t_user_202201 + * @return 创建结果（true创建成功，false未创建） + */ + private static boolean createShardingTable(ShardingTableCacheEnum logicTable, String resultTableName) { + // 根据日期判断，当前月份之后分表不提前创建 + String month = resultTableName.replace(logicTable.logicTableName() + TABLE_SPLIT_SYMBOL,""); + YearMonth shardingMonth = YearMonth.parse(month, DateTimeFormatter.ofPattern("yyyyMM")); + if (shardingMonth.isAfter(YearMonth.now())) { + return false; + } + synchronized (logicTable.logicTableName().intern()) { + // 缓存中有此表 返回 + if (logicTable.resultTableNamesCache().contains(resultTableName)) { + return false; + } + // 缓存中无此表，则建表并添加缓存 + executeSql(Collections.singletonList("CREATE TABLE IF NOT EXISTS `" + resultTableName + "` LIKE `" + logicTable.logicTableName() + "`;")); + // 缓存重载 + tableNameCacheReload(logicTable); + } + return true; + } + + /** + * 执行SQL + * @param sqlList SQL集合 + */ + private static void executeSql(List sqlList) { + if (StringUtils.isEmpty(DATASOURCE_URL) || StringUtils.isEmpty(DATASOURCE_USERNAME) || StringUtils.isEmpty(DATASOURCE_PASSWORD)) { + log.error(">>>>>>>>>> 【ERROR】数据库连接配置有误，请稍后重试，URL:{}, username:{}, password:{}", DATASOURCE_URL, DATASOURCE_USERNAME, DATASOURCE_PASSWORD); + throw new IllegalArgumentException("数据库连接配置有误，请稍后重试"); + } + try (Connection conn = DriverManager.getConnection(DATASOURCE_URL, DATASOURCE_USERNAME, DATASOURCE_PASSWORD)) { + try (Statement st = conn.createStatement()) { + conn.setAutoCommit(false); + for (String sql : sqlList) { + st.execute(sql); + } + } catch (Exception e) { + conn.rollback(); + log.error(">>>>>>>>>> 【ERROR】数据表创建执行失败，请稍后重试，原因：{}", e.getMessage(), e); + throw new IllegalArgumentException("数据表创建执行失败，请稍后重试"); + } + } catch (SQLException e) { + log.error(">>>>>>>>>> 【ERROR】数据库连接失败，请稍后重试，原因：{}", e.getMessage(), e); + throw new IllegalArgumentException("数据库连接失败，请稍后重试"); + } + } +} diff --git a/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/utils/ShardingTablesLoadRunner.java b/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/utils/ShardingTablesLoadRunner.java new file mode 100644 index 00000000..2b277c6c --- /dev/null +++ b/win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/utils/ShardingTablesLoadRunner.java @@ -0,0 +1,24 @@ +package com.win.framework.datasource.utils; + +import org.springframework.boot.CommandLineRunner; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; + +/** + *

@Title ShardingTablesLoadRunner + *

@Description 项目启动后，读取已有分表，进行缓存 + * + * @author liuchen + * @date 2022/12/20 15:41 + */ +@Order(value = 1) // 数字越小，越先执行 +@Component +public class ShardingTablesLoadRunner implements CommandLineRunner { + + @Override + public void run(String... args) { + // 读取已有分表，进行缓存 + ShardingAlgorithmTool.tableNameCacheReloadAll(); + } + +} \ No newline at end of file diff --git a/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories b/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories index 4c2b1ed2..8e472fcd 100644 --- a/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories +++ b/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring.factories @@ -1,2 +1,3 @@ org.springframework.boot.env.EnvironmentPostProcessor=\ com.win.framework.mybatis.config.IdTypeEnvironmentPostProcessor + diff --git a/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 68f8a104..9c8f0dd1 100644 --- a/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/win-framework/win-spring-boot-starter-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,3 @@ com.win.framework.datasource.config.WinDataSourceAutoConfiguration -com.win.framework.mybatis.config.WinMybatisAutoConfiguration \ No newline at end of file +com.win.framework.mybatis.config.WinMybatisAutoConfiguration +com.win.framework.datasource.utils.ShardingTablesLoadRunner \ No newline at end of file diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiAccessLogApiImpl.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiAccessLogApiImpl.java index 36367eb6..6b2b6eee 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiAccessLogApiImpl.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiAccessLogApiImpl.java @@ -1,9 +1,8 @@ package com.win.module.infra.api.logger; import com.win.module.infra.api.logger.dto.ApiAccessLogCreateReqDTO; -import com.win.module.infra.convert.logger.ApiAccessLogConvert; -import com.win.module.infra.mq.message.logger.ApiAccessLogMessage; import com.win.module.infra.mq.producer.logger.ApiAccessLogProducer; +import com.win.module.infra.service.logger.ApiAccessLogService; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -18,13 +17,17 @@ import javax.annotation.Resource; @Validated public class ApiAccessLogApiImpl implements ApiAccessLogApi { + @Resource + private ApiAccessLogService apiAccessLogService; + @Resource private ApiAccessLogProducer apiAccessLogProducer; @Override public void createApiAccessLog(ApiAccessLogCreateReqDTO createDTO) { - ApiAccessLogMessage accessLogMessage = ApiAccessLogConvert.INSTANCE.convertMessage(createDTO); - apiAccessLogProducer.sendMessage(accessLogMessage); + apiAccessLogService.createApiAccessLog(createDTO); + // ApiAccessLogMessage accessLogMessage = ApiAccessLogConvert.INSTANCE.convertMessage(createDTO); + // apiAccessLogProducer.sendMessage(accessLogMessage); } } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiErrorLogApiImpl.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiErrorLogApiImpl.java index c3664cf1..3cf2423e 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiErrorLogApiImpl.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/logger/ApiErrorLogApiImpl.java @@ -1,9 +1,8 @@ package com.win.module.infra.api.logger; import com.win.module.infra.api.logger.dto.ApiErrorLogCreateReqDTO; -import com.win.module.infra.convert.logger.ApiErrorLogConvert; -import com.win.module.infra.mq.message.logger.ApiErrorLogMessage; import com.win.module.infra.mq.producer.logger.ApiErrorLogProducer; +import com.win.module.infra.service.logger.ApiErrorLogService; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -18,13 +17,17 @@ import javax.annotation.Resource; @Validated public class ApiErrorLogApiImpl implements ApiErrorLogApi { + @Resource + private ApiErrorLogService apiErrorLogService; + @Resource private ApiErrorLogProducer apiErrorLogProducer; @Override public void createApiErrorLog(ApiErrorLogCreateReqDTO createDTO) { - ApiErrorLogMessage errorLogMessage = ApiErrorLogConvert.INSTANCE.convertMessage(createDTO); - apiErrorLogProducer.sendMessage(errorLogMessage); + apiErrorLogService.createApiErrorLog(createDTO); + // ApiErrorLogMessage errorLogMessage = ApiErrorLogConvert.INSTANCE.convertMessage(createDTO); + // apiErrorLogProducer.sendMessage(errorLogMessage); } } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/trends/TrendsApiImpl.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/trends/TrendsApiImpl.java index 1aeb4681..de172c06 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/trends/TrendsApiImpl.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/api/trends/TrendsApiImpl.java @@ -1,9 +1,8 @@ package com.win.module.infra.api.trends; import com.win.module.infra.api.trends.dto.TrendsCreateReqDTO; -import com.win.module.infra.convert.trends.TrendsConvert; -import com.win.module.infra.mq.message.trends.TrendsMessage; import com.win.module.infra.mq.producer.trends.TrendsProducer; +import com.win.module.infra.service.trends.TrendsService; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -21,10 +20,14 @@ public class TrendsApiImpl implements TrendsApi { @Resource private TrendsProducer trendsProducer; + @Resource + private TrendsService trendsService; + @Override public void createTrends(TrendsCreateReqDTO createDTO) { - TrendsMessage trendsMessage = TrendsConvert.INSTANCE.convertMessage(createDTO); - trendsProducer.sendMessage(trendsMessage); + trendsService.createTrends(createDTO); + // TrendsMessage trendsMessage = TrendsConvert.INSTANCE.convertMessage(createDTO); + // trendsProducer.sendMessage(trendsMessage); } } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/RedisController.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/RedisController.java index 8c4ad7ae..bc5a48ed 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/RedisController.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/RedisController.java @@ -4,8 +4,9 @@ import com.win.framework.common.pojo.CommonResult; import com.win.framework.redis.util.RedisCache; import com.win.framework.security.core.LoginUser; import com.win.framework.security.core.util.SecurityFrameworkUtils; +import com.win.module.infra.controller.redis.vo.RedisGetReqVo; import com.win.module.infra.controller.redis.vo.RedisMonitorRespVO; -import com.win.module.infra.controller.redis.vo.RedisReqVo; +import com.win.module.infra.controller.redis.vo.RedisUpdateReqVo; import com.win.module.infra.convert.redis.RedisConvert; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -49,7 +50,7 @@ public class RedisController { */ @PostMapping("/set") @Operation(summary = "加入缓存") - public CommonResult setRedisHash(@Valid @RequestBody RedisReqVo reqVO) { + public CommonResult setRedisHash(@Valid @RequestBody RedisUpdateReqVo reqVO) { LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); redisCache.setCacheMapValue(reqVO.getKey(), String.valueOf(loginUser.getId()), reqVO.getValue()); return success(Boolean.TRUE); @@ -60,7 +61,7 @@ public class RedisController { */ @GetMapping("/get") @Operation(summary = "获取缓存") - public CommonResult getRedisHash(@Valid @RequestBody RedisReqVo reqVO) { + public CommonResult getRedisHash(@Valid RedisGetReqVo reqVO) { LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); String result = redisCache.getCacheMapValue(reqVO.getKey(), String.valueOf(loginUser.getId())); return success(result); @@ -71,7 +72,7 @@ public class RedisController { */ @DeleteMapping("/delete") @Operation(summary = "删除缓存") - public CommonResult deleteRedisHash(@Valid @RequestBody RedisReqVo reqVO) { + public CommonResult deleteRedisHash(@Valid RedisGetReqVo reqVO) { LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); Boolean result = redisCache.deleteCacheMapValue(reqVO.getKey(), String.valueOf(loginUser.getId())); return success(result); diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/vo/RedisGetReqVo.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/vo/RedisGetReqVo.java new file mode 100644 index 00000000..04219445 --- /dev/null +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/vo/RedisGetReqVo.java @@ -0,0 +1,22 @@ +package com.win.module.infra.controller.redis.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; + +/** + * 个性化设置增加缓存接口 + */ +@Data +public class RedisGetReqVo { + + @Schema(description = "缓存键", requiredMode = Schema.RequiredMode.REQUIRED, example = "basic_itembasic") + @NotBlank(message = "缓存键不能为空") + @Pattern(regexp = "^[a-zA-Z0-9]{4,30}$", message = "缓存键账号由 数字、字母 组成") + @Size(min = 4, max = 30, message = "缓存键长度为 4-30 个字符") + private String key; + +} diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/vo/RedisReqVo.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/vo/RedisUpdateReqVo.java similarity index 96% rename from win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/vo/RedisReqVo.java rename to win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/vo/RedisUpdateReqVo.java index ab553c71..9a1fe2cd 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/vo/RedisReqVo.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/redis/vo/RedisUpdateReqVo.java @@ -11,7 +11,7 @@ import javax.validation.constraints.Size; * 个性化设置增加缓存接口 */ @Data -public class RedisReqVo { +public class RedisUpdateReqVo { @Schema(description = "缓存键", requiredMode = Schema.RequiredMode.REQUIRED, example = "basic_itembasic") @NotBlank(message = "缓存键不能为空") diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsBaseVO.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsBaseVO.java index 40326ec8..516ec944 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsBaseVO.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsBaseVO.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull; @Data public class TrendsBaseVO { - @Schema(description = "表名", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @Schema(description = "表名", requiredMode = Schema.RequiredMode.REQUIRED, example = "infraTrends") @NotNull(message = "表名不能为空") private String tableName; diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsPageReqVO.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsPageReqVO.java index 5edf55c0..b4a6a59b 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsPageReqVO.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/trends/vo/TrendsPageReqVO.java @@ -17,7 +17,7 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY @ToString(callSuper = true) public class TrendsPageReqVO extends PageParam { - @Schema(description = "表名", example = "赵六") + @Schema(description = "表名", example = "infraTrends") private String tableName; @Schema(description = "表数据id", example = "9210") diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/consumer/trends/TrendsConsumer.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/consumer/trends/TrendsConsumer.java index a9af48e1..2dd3d7dd 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/consumer/trends/TrendsConsumer.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/consumer/trends/TrendsConsumer.java @@ -1,7 +1,6 @@ package com.win.module.infra.mq.consumer.trends; import com.win.framework.mq.core.stream.AbstractStreamMessageListener; -import com.win.framework.security.core.util.SecurityFrameworkUtils; import com.win.module.infra.api.trends.dto.TrendsCreateReqDTO; import com.win.module.infra.convert.trends.TrendsConvert; import com.win.module.infra.mq.message.trends.TrendsMessage; @@ -27,7 +26,6 @@ public class TrendsConsumer extends AbstractStreamMessageListener public void onMessage(TrendsMessage message) { log.info("[onMessage][消息内容({})]", message); TrendsCreateReqDTO trendsCreateReqDTO = TrendsConvert.INSTANCE.convert(message); - trendsCreateReqDTO.setCreator(String.valueOf(SecurityFrameworkUtils.getLoginUserId())); trendsService.createTrends(trendsCreateReqDTO); } diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/message/trends/TrendsMessage.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/message/trends/TrendsMessage.java index 4741a2db..c756bd82 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/message/trends/TrendsMessage.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/mq/message/trends/TrendsMessage.java @@ -27,6 +27,8 @@ public class TrendsMessage extends AbstractStreamMessage { @NotNull(message = "内容不能为空") private String content; + private String creator; + @Override public String getStreamKey() { return "trends.create"; diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/package-info.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/package-info.java deleted file mode 100644 index 70386fcc..00000000 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/** - * infra 模块，主要提供两块能力： - * 1. 我们放基础设施的运维与管理，支撑上层的通用与核心业务。 例如说：定时任务的管理、服务器的信息等等 - * 2. 研发工具，提升研发效率与质量。 例如说：代码生成器、接口文档等等 - * - * 1. Controller URL：以 /infra/ 开头，避免和其它 Module 冲突 - * 2. DataObject 表名：以 infra_ 开头，方便在数据库中区分 - */ -package com.win.module.infra; diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/service/trends/TrendsServiceImpl.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/service/trends/TrendsServiceImpl.java index b3ac0dac..df144ead 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/service/trends/TrendsServiceImpl.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/service/trends/TrendsServiceImpl.java @@ -29,6 +29,7 @@ public class TrendsServiceImpl implements TrendsService { @Override public void createTrends(TrendsCreateReqDTO createReqDTO) { TrendsDO trends = TrendsConvert.INSTANCE.convert(createReqDTO); + trends.setCreator(createReqDTO.getCreator()); trendsMapper.insert(trends); } diff --git a/win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/dict/DictDataApi.java b/win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/dict/DictDataApi.java index 09f24836..25fe44b6 100644 --- a/win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/dict/DictDataApi.java +++ b/win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/dict/DictDataApi.java @@ -47,5 +47,5 @@ public interface DictDataApi { */ String[] getDictDataByType(String type); - + DictDataRespDTO selectDictTypeAndLabel(String ptype, String plabel); } diff --git a/win-module-system/win-module-system-api/src/main/java/com/win/module/system/enums/ErrorCodeConstants.java b/win-module-system/win-module-system-api/src/main/java/com/win/module/system/enums/ErrorCodeConstants.java index ee19713d..445212df 100644 --- a/win-module-system/win-module-system-api/src/main/java/com/win/module/system/enums/ErrorCodeConstants.java +++ b/win-module-system/win-module-system-api/src/main/java/com/win/module/system/enums/ErrorCodeConstants.java @@ -65,6 +65,8 @@ public interface ErrorCodeConstants { ErrorCode DICT_TYPE_NAME_DUPLICATE = new ErrorCode(1_002_006_003, "已经存在该名字的字典类型"); ErrorCode DICT_TYPE_TYPE_DUPLICATE = new ErrorCode(1_002_006_004, "已经存在该类型的字典类型"); ErrorCode DICT_TYPE_HAS_CHILDREN = new ErrorCode(1_002_006_005, "无法删除，该字典类型还有字典数据"); + ErrorCode DICT_TYPE_TYPE_AND_LABEL_NOT_EXISTS = new ErrorCode(1_002_006_006, "字典类型与数据参数不存在"); + ErrorCode DICT_TYPE_LABEL_NOT_EXISTS = new ErrorCode(1_002_006_007, "数据参数不存在"); // ========== 字典数据 1-002-007-000 ========== ErrorCode DICT_DATA_NOT_EXISTS = new ErrorCode(1_002_007_001, "当前字典数据不存在"); diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/api/dict/DictDataApiImpl.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/api/dict/DictDataApiImpl.java index 22c3c0b4..758b5761 100644 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/api/dict/DictDataApiImpl.java +++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/api/dict/DictDataApiImpl.java @@ -50,5 +50,9 @@ public class DictDataApiImpl implements DictDataApi { } return result; } - + @Override + public DictDataRespDTO selectDictTypeAndLabel(String ptype, String plabel) { + DictDataDO dictDataDO = dictDataService.selectDictTypeAndLabel(ptype, plabel); + return DictDataConvert.INSTANCE.convert02(dictDataDO); + } } diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/notify/NotifyMessageController.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/notify/NotifyMessageController.java index 6fa557fd..e1a72749 100644 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/notify/NotifyMessageController.java +++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/notify/NotifyMessageController.java @@ -2,6 +2,7 @@ package com.win.module.system.controller.notify; import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.PageResult; +import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.controller.notify.vo.message.NotifyMessageMyPageReqVO; import com.win.module.system.controller.notify.vo.message.NotifyMessagePageReqVO; import com.win.module.system.controller.notify.vo.message.NotifyMessageRespVO; @@ -85,6 +86,7 @@ public class NotifyMessageController { @GetMapping("/get-unread-count") @Operation(summary = "获得当前用户的未读站内信数量") + @OperateLog(enable = false) public CommonResult getUnreadNotifyMessageCount() { return success(notifyMessageService.getUnreadNotifyMessageCount(getLoginUserId())); } diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataService.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataService.java index 8b243f82..2cb0eb66 100644 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataService.java +++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataService.java @@ -105,4 +105,6 @@ public interface DictDataService { * @return 字典数据 */ DictDataDO parseDictData(String dictType, String label); + + DictDataDO selectDictTypeAndLabel(String ptype, String plabel); } diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataServiceImpl.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataServiceImpl.java index 61289c3c..4826604f 100644 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataServiceImpl.java +++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.system.service.dict; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.enums.CommonStatusEnum; import com.win.framework.common.pojo.PageResult; import com.win.framework.common.util.collection.CollectionUtils; @@ -13,6 +14,7 @@ import com.win.module.system.dal.dataobject.dict.DictDataDO; import com.win.module.system.dal.dataobject.dict.DictTypeDO; import com.win.module.system.dal.mysql.dict.DictDataMapper; import com.google.common.annotations.VisibleForTesting; +import com.win.module.system.dal.mysql.dict.DictTypeMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -34,6 +36,9 @@ import static com.win.module.system.enums.ErrorCodeConstants.*; @Slf4j public class DictDataServiceImpl implements DictDataService { + @Resource + private DictTypeMapper dictTypeMapper; + /** * 排序 dictType > sort */ @@ -180,5 +185,24 @@ public class DictDataServiceImpl implements DictDataService { public DictDataDO parseDictData(String dictType, String label) { return dictDataMapper.selectByDictTypeAndLabel(dictType, label); } - + //调用公共方法 查询字典项 + @Override + public DictDataDO selectDictTypeAndLabel(String ptype,String plabel) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("type",ptype); + DictTypeDO dictTypeDO = dictTypeMapper.selectOne(queryWrapper); + if(dictTypeDO != null && 0 == dictTypeDO.getStatus()){ + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("dict_type",ptype); + queryWrapper1.eq("label",plabel); + DictDataDO dictDataDO = dictDataMapper.selectOne(queryWrapper1); + if(dictDataDO != null && 0 == dictDataDO.getStatus()){ + return dictDataDO; + }else { + throw exception(DICT_TYPE_LABEL_NOT_EXISTS); + } + }else { + throw exception(DICT_TYPE_TYPE_AND_LABEL_NOT_EXISTS); + } + } } diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java index 59bb4fdb..9d73bbaf 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java @@ -130,7 +130,7 @@ public interface ErrorCodeConstants { ErrorCode WAREHOUSE_AVAIABLE_NOT_EXISTS = new ErrorCode(1_033_000_003, "是否可用不存在"); ErrorCode WAREHOUSE_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_033_000_004, "导入仓库不能为空"); //月台ErrorCode - ErrorCode DOCK_NOT_EXISTS = new ErrorCode(1_000_034_000, "月台不存在"); + ErrorCode DOCK_NOT_EXISTS = new ErrorCode(1_000_034_000, "月台(收货口)不存在"); ErrorCode DOCK_CODE_NOT_EXISTS = new ErrorCode(1_000_034_001, "code不存在"); ErrorCode DOCK_CODE_EXISTS = new ErrorCode(1_000_034_002, "code已存在"); ErrorCode DOCK_TYPE_NOT_EXISTS = new ErrorCode(1_000_034_003, "类型不存在"); @@ -167,6 +167,7 @@ public interface ErrorCodeConstants { ErrorCode LOCATION_USER_GROUP_CODE_NOT_EXISTS = new ErrorCode(1_000_037_009, "用户组代码不存在"); ErrorCode LOCATION_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_037_010, "是否可用不存在"); ErrorCode LOCATION_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_037_011, "导入库位不能为空"); + ErrorCode LOCATION_ITEMCODE_AND_LOCATIONCODE_NOT_EXISTS = new ErrorCode(1_000_037_011, "未查找到零件item_code库位location_code对应的上架策略"); //车间ErrorCode ErrorCode WORKSHOP_NOT_EXISTS = new ErrorCode(1_038_000_000, "车间不存在"); ErrorCode WORKSHOP_CODE_EXISTS = new ErrorCode(1_039_000_001, "code已存在"); @@ -364,8 +365,9 @@ public interface ErrorCodeConstants { ErrorCode PURCHASE_CLOSED_NOT_EXISTS = new ErrorCode(1_000_063_001, "采购订单已关闭"); //采购订单子ErrorCode ErrorCode PURCHASE_DETAIL_NOT_EXISTS = new ErrorCode(1_000_063_001, "采购订单子不存在"); + ErrorCode PURCHASE_DETAIL_ARGUMENT_NOT_EXISTS = new ErrorCode(1_000_063_002, "采购订单明细：订单号ppo_number、订单行pline_number、零件号pitem_code无效"); + ErrorCode PURCHASE_DETAIL_NUMBER_NOT_EXISTS = new ErrorCode(1_000_063_003, "采购订单pnumber无效"); //采购订单ErrorCode - ErrorCode PURCHASE_DETAIL_NUMBER_NOT_EXISTS = new ErrorCode(1_000_063_001, "采购订单明细订单号不存在"); //采购索赔申请主ErrorCode ErrorCode PURCHASECLAIM_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_064_000, "采购索赔申请主不存在"); //采购索赔申请主ErrorCode @@ -399,7 +401,9 @@ public interface ErrorCodeConstants { //供应商发货记录主ErrorCode ErrorCode SUPPLIERDELIVER_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_071_000, "供应商发货记录主不存在"); //供应商发货记录子ErrorCode - ErrorCode SUPPLIERDELIVER_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_071_001, "供应商发货记录子不存在"); + ErrorCode SUPPLIERDELIVER_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_071_001, "供应商发货记录不存在"); + ErrorCode SUPPLIERDELIVER_RECORD_MAIN_NUMBER_NOT_EXISTS = new ErrorCode(1_000_071_002, "发货订单无效number无效"); + ErrorCode SUPPLIERDELIVER_RECORD_DETAIL_PONUMBER_AND_POLINE_AND_ITEMCODE_NOT_EXISTS = new ErrorCode(1_000_071_003, "订单号【pline_number】、订单行【pline_number】、零件号【pitem_code】无效"); //采购收货申请主ErrorCode ErrorCode PURCHASERECEIPT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_072_000, "采购收货申请主不存在"); //采购收货申请子ErrorCode @@ -408,6 +412,7 @@ public interface ErrorCodeConstants { ErrorCode PURCHASERECEIPT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_073_000, "采购收货任务主不存在"); //采购收货任务子ErrorCode ErrorCode PURCHASERECEIPT_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_073_001, "采购收货任务子不存在"); + ErrorCode PURCHASERECEIPT_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_073_002, "采购收货任务状态错误"); //采购收货记录主ErrorCode ErrorCode PURCHASERECEIPT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_074_000, "采购收货记录主不存在"); //采购收货记录子ErrorCode @@ -420,6 +425,7 @@ public interface ErrorCodeConstants { ErrorCode PURCHASERETURN_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_076_000, "采购退货任务主不存在"); //采购退货任务子ErrorCode ErrorCode PURCHASERETURN_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_076_001, "采购退货任务子不存在"); + ErrorCode PURCHASERETURN_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_076_002, "采购退货任务状态"); //采购退货记录主ErrorCode ErrorCode PURCHASERETURN_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_077_000, "采购退货记录主不存在"); //采购退货记录子ErrorCode @@ -432,6 +438,7 @@ public interface ErrorCodeConstants { ErrorCode INSPECT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_079_000, "检验任务主不存在"); //检验任务子ErrorCode ErrorCode INSPECT_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_079_001, "检验任务子不存在"); + ErrorCode INSPECT_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_079_002, "检验任务状态错误"); //检验记录主ErrorCode ErrorCode INSPECT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_080_000, "检验记录主不存在"); //检验记录子ErrorCode @@ -464,6 +471,7 @@ public interface ErrorCodeConstants { //补料任务子ErrorCode ErrorCode REPLEINSH_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_087_001, "补料任务子不存在"); + ErrorCode REPLEINSH_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_087_002, "补料任务状态错误"); //补料记录主ErrorCode ErrorCode REPLEINSH_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_088_000, "补料记录主不存在"); @@ -482,6 +490,7 @@ public interface ErrorCodeConstants { //拣料任务子ErrorCode ErrorCode PICK_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_088_001, "拣料任务子不存在"); + ErrorCode PICK_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_088_002, "拣料任务状态错误"); //拣料记录主ErrorCode ErrorCode PICK_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_089_000, "拣料记录主不存在"); @@ -500,6 +509,7 @@ public interface ErrorCodeConstants { //发料任务子ErrorCode ErrorCode ISSUE_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_091_001, "发料任务子不存在"); + ErrorCode ISSUE_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_091_002, "发料任务状态错误"); //发料记录主ErrorCode ErrorCode ISSUE_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_092_000, "发料记录主不存在"); @@ -511,6 +521,7 @@ public interface ErrorCodeConstants { //生产收料任务子ErrorCode ErrorCode PRODUCTIONRECEIPT_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_093_001, "生产收料任务子不存在"); + ErrorCode PRODUCTIONRECEIPT_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_093_002, "生产收料任务状态错误"); //生产收料记录主ErrorCode ErrorCode PRODUCTIONRECEIPT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_094_000, "生产收料记录主不存在"); @@ -533,6 +544,7 @@ public interface ErrorCodeConstants { ErrorCode PRODUCTIONRETURN_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_098_000, "生产退料任务主不存在"); //生产退料任务子ErrorCode ErrorCode PRODUCTIONRETURN_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_098_001, "生产退料任务子不存在"); + ErrorCode PRODUCTIONRETURN_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_098_002, "生产退料任务状态错误"); //生产退料记录主ErrorCode ErrorCode PRODUCTIONRETURN_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_099_000, "生产退料记录主不存在"); //生产退料任务子ErrorCode @@ -545,7 +557,10 @@ public interface ErrorCodeConstants { ErrorCode PRODUCTION_MAIN_NOT_EXISTS = new ErrorCode(1_001_101_000, "生产计划主不存在"); //生产计划子ErrorCode - ErrorCode PRODUCTION_DETAIL_NOT_EXISTS = new ErrorCode(1_001_100_001, "生产计划子不存在"); + ErrorCode PRODUCTION_DETAIL_NOT_EXISTS = new ErrorCode(1_001_101_001, "生产计划子不存在"); + ErrorCode PRODUCTION_MAIN_MASSAGE_EXISTS = new ErrorCode(1_001_101_002, "生产计明细:订单号pline_number、零件号pitem_code无效"); + ErrorCode PRODUCTION_MAIN_NUMBER_CLOSE_EXISTS = new ErrorCode(1_001_101_003, "生产计划number已经关闭"); + ErrorCode PRODUCTION_MAIN_NUMBER_NOT_EXISTS = new ErrorCode(1_001_101_004, "生产计划number无效"); //制品收货申请主ErrorCode ErrorCode PRODUCTRECEIPT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_102_000, "制品收货申请主不存在"); @@ -555,6 +570,7 @@ public interface ErrorCodeConstants { ErrorCode PRODUCTRECEIPT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_103_000, "制品收货任务主不存在"); //制品收货申请子ErrorCode ErrorCode PRODUCTRECEIPT_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_001_103_001, "制品收货任务子不存在"); + ErrorCode PRODUCTRECEIPT_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_103_002, "制品收货任务状态错误"); //制品收货记录主ErrorCode ErrorCode PRODUCTRECEIPT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_104_000, "制品收货记录主不存在"); //制品收货记录子ErrorCode @@ -572,6 +588,7 @@ public interface ErrorCodeConstants { ErrorCode PRODUCTDISMANTLE_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_106_000, "制品拆解任务主不存在"); //制品拆解任务子ErrorCode ErrorCode PRODUCTDISMANTLE_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_001_106_001, "制品拆解任务子不存在"); + ErrorCode PRODUCTDISMANTLE_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_106_002, "制品拆解任务状态错误"); //制品拆解记录主ErrorCode ErrorCode PRODUCTDISMANTLE_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_107_000, "制品拆解记录主不存在"); @@ -603,6 +620,7 @@ public interface ErrorCodeConstants { ErrorCode PRODUCTSCRAP_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_111_000, "制品报废任务主不存在"); //制品报废任务子ErrorCode ErrorCode PRODUCTSCRAP_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_001_110_001, "制品报废任务子不存在"); + ErrorCode PRODUCTSCRAP_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_111_002, "制品报废任务状态错误"); //制品报废记录ErrorCode ErrorCode PRODUCTSCRAP_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_111_000, "制品报废记录主不存在"); ErrorCode PRODUCTSCRAP_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_111_001, "制品报废记录子不存在"); @@ -612,6 +630,7 @@ public interface ErrorCodeConstants { //制品上架任务ErrorCode ErrorCode PRODUCTPUTAWAY_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_113_000, "制品上架任务主不存在"); ErrorCode PRODUCTPUTAWAY_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_113_001, "制品上架任务子不存在"); + ErrorCode PRODUCTPUTAWAY_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_113_002, "制品上架任务状态错误"); //制品上架任务ErrorCode ErrorCode PRODUCTPUTAWAY_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_114_000, "制品上架记录主不存在"); ErrorCode PRODUCTPUTAWAY_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_114_001, "制品上架记录子不存在"); @@ -624,6 +643,7 @@ public interface ErrorCodeConstants { //销售订单ErrorCode ErrorCode SALE_MAIN_NOT_EXISTS = new ErrorCode(1_000_117_000, "销售订单主不存在"); ErrorCode SALE_DETAIL_NOT_EXISTS = new ErrorCode(1_000_117_001, "销售订单子不存在"); + ErrorCode SALE_DETAIL_NUMBER_AND_LINE_NUMBER_AND_ITEMCODE_NOT_EXISTS = new ErrorCode(1_000_117_002, "订单号【pso_numbe】、订单行【pso_line】、零件号【pitem_code】无效"); //发货计划ErrorCode ErrorCode DELIVER_PLAN_MAIN_NOT_EXISTS = new ErrorCode(1_000_118_000, "发货计划主不存在"); ErrorCode DELIVER_PLAN_DETAIL_NOT_EXISTS = new ErrorCode(1_000_118_001, "发货计划子不存在"); @@ -633,6 +653,7 @@ public interface ErrorCodeConstants { //发货任务ErrorCode ErrorCode DELIVER_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_120_000, "发货任务主不存在"); ErrorCode DELIVER_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_120_001, "发货任务子不存在"); + ErrorCode DELIVER_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_120_003, "发货任务状态错误"); //发货记录ErrorCode ErrorCode DELIVER_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_122_000, "发货记录主不存在"); ErrorCode DELIVER_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_122_001, "发货记录子不存在"); @@ -648,6 +669,7 @@ public interface ErrorCodeConstants { //客户退货任务ErrorCode ErrorCode CUSTOMERRETURN_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_125_000, "客户退货任务主不存在"); ErrorCode CUSTOMERRETURN_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_125_001, "客户退货任务子不存在"); + ErrorCode CUSTOMERRETURN_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_125_003, "客户退货任务状态错误"); //客户退货记录ErrorCode ErrorCode CUSTOMERRETURN_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_126_000, "客户退货记录主不存在"); ErrorCode CUSTOMERRETURN_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_126_001, "客户退货记录子不存在"); @@ -669,6 +691,7 @@ public interface ErrorCodeConstants { //库存转移任务ErrorCode ErrorCode INVENTORYMOVE_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_132_000, "库存转移任务主不存在"); ErrorCode INVENTORYMOVE_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_132_001, "库存转移任务子不存在"); + ErrorCode INVENTORYMOVE_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_132_000, "库存转移任务状态错误"); //库存转移记录ErrorCode ErrorCode INVENTORYMOVE_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_133_000, "库存转移记录主不存在"); ErrorCode INVENTORYMOVE_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_133_001, "库存转移记录子不存在"); @@ -684,6 +707,7 @@ public interface ErrorCodeConstants { //调拨出库任务ErrorCode ErrorCode TRANSFERISSUE_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_137_000, "调拨出库任务主不存在"); ErrorCode TRANSFERISSUE_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_138_001, "调拨出库任务子不存在"); + ErrorCode TRANSFERISSUE_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_137_002, "调拨出库任务状态错误"); //调拨出库记录ErrorCode ErrorCode TRANSFERISSUE_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_139_000, "调拨出库记录主不存在"); ErrorCode TRANSFERISSUE_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_139_001, "调拨出库记录子不存在"); @@ -693,6 +717,7 @@ public interface ErrorCodeConstants { //调拨入库任务ErrorCode ErrorCode TRANSFERRECEIPT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_141_000, "调拨入库任务主不存在"); ErrorCode TRANSFERRECEIPT_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_141_001, "调拨入库任务子不存在"); + ErrorCode TRANSFERRECEIPT_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_141_002, "调拨入库任务状态错误"); //调拨入库记录ErrorCode ErrorCode TRANSFERRECEIPT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_142_000, "调拨入库记录主不存在"); ErrorCode TRANSFERRECEIPT_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_142_001, "调拨入库记录子不存在"); @@ -702,6 +727,7 @@ public interface ErrorCodeConstants { //计划外出库任务ErrorCode ErrorCode UNPLANNEDISSUE_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_144_000, "计划外出库任务主不存在"); ErrorCode UNPLANNEDISSUE_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_144_001, "计划外出库任务子不存在"); + ErrorCode UNPLANNEDISSUE_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_144_002, "计划外出库任务状态错误"); //计划外出库记录ErrorCode ErrorCode UNPLANNEDISSUE_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_145_000, "计划外出库记录主不存在"); ErrorCode UNPLANNEDISSUE_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_145_001, "计划外出库记录子不存在"); @@ -711,6 +737,7 @@ public interface ErrorCodeConstants { //计划外入库任务ErrorCode ErrorCode UNPLANNEDRECEIPT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_147_000, "计划外入库任务主不存在"); ErrorCode UNPLANNEDRECEIPT_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_147_001, "计划外入库任务子不存在"); + ErrorCode UNPLANNEDRECEIPT_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_147_002, "计划外入库任务状态错误"); //计划外入库记录ErrorCode ErrorCode UNPLANNEDRECEIPT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_148_000, "计划外入库记录主不存在"); ErrorCode UNPLANNEDRECEIPT_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_148_001, "计划外入库记录子不存在"); @@ -720,6 +747,7 @@ public interface ErrorCodeConstants { //报废出库任务ErrorCode ErrorCode SCRAP_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_150_000, "报废出库任务主不存在"); ErrorCode SCRAP_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_150_001, "报废出库任务子不存在"); + ErrorCode SCRAP_JOB_MAIN_STATUS_ERROR = new ErrorCode(1_000_150_002, "报废出库任务状态不存在"); //报废出库记录ErrorCode ErrorCode SCRAP_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_151_000, "报废出库记录主不存在"); ErrorCode SCRAP_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_151_001, "报废出库记录子不存在"); @@ -732,6 +760,7 @@ public interface ErrorCodeConstants { //盘点任务ErrorCode ErrorCode COUNT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_154_000, "盘点任务主不存在"); ErrorCode COUNT_JOB_DETAIL_NOT_EXISTS = new ErrorCode(1_000_154_001, "盘点任务子不存在"); + ErrorCode COUNT_JOB_MAIN_STATUS_ERROR= new ErrorCode(1_000_154_002, "盘点任务状态错误"); //盘点申请ErrorCode ErrorCode COUNT_RECORD_MAIN_NOT_EXISTS = new ErrorCode(1_000_155_000, "盘点申请主不存在"); ErrorCode COUNT_RECORD_DETAIL_NOT_EXISTS = new ErrorCode(1_000_155_001, "盘点申请子不存在"); @@ -761,8 +790,5 @@ public interface ErrorCodeConstants { //生产线与零件关系ErrorCode ErrorCode PRODUCTIONLINEITEM_PITEM_NOT_EXISTS = new ErrorCode(1_000_166_000, "生产线与零件关系无效"); - //生产线与零件关系ErrorCode - ErrorCode PDOCK_NOT_EXISTS = new ErrorCode(1_000_166_000, "收货口不存在"); - } diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/job/JobStatusEnum.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/job/JobStatusEnum.java new file mode 100644 index 00000000..f02292d4 --- /dev/null +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/job/JobStatusEnum.java @@ -0,0 +1,35 @@ +package com.win.module.wms.enums.job; + +import com.win.module.wms.enums.order.OrderStatusEnum; + +public enum JobStatusEnum { + OPEN(1), // 待处理 + DOING(2), // 执行中 + DONE(3), // 完成 + CLOSED(4), // 关闭 + CANCELLED(5); // 放弃 + + private final Integer code; + + JobStatusEnum(int code) { + this.code = code; + } + + public int getCode() { + return code; + } + + /** + * 用状态值获取枚举 + * @param status + * @return + */ + static JobStatusEnum getJobStatusEnum(int status) { + for (JobStatusEnum jobStatusEnum : values()) { + if (jobStatusEnum.getCode() == status) { + return jobStatusEnum; + } + } + return OPEN; + } +} diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/job/JobStatusState.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/job/JobStatusState.java new file mode 100644 index 00000000..ef8ef0df --- /dev/null +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/job/JobStatusState.java @@ -0,0 +1,97 @@ +package com.win.module.wms.enums.job; + +import com.win.module.wms.enums.job.JobStatusEnum; + +/** + * 订单状态机 + */ +public class JobStatusState { + + /** + * 当前状态枚举 + */ + private JobStatusEnum jobStatusEnum; + + /** + * 构造函数，默认创建 + */ + public JobStatusState() { + this.jobStatusEnum = jobStatusEnum.OPEN; + } + + /** + * 构造函数，当前状态 + * @param status + */ + public JobStatusState(int status) { + this.jobStatusEnum = jobStatusEnum.getJobStatusEnum(status); + } + + /** + * 构造函数，当前状态枚举 + * @param jobStatusEnum + */ + public JobStatusState(JobStatusEnum jobStatusEnum) { + this.jobStatusEnum = jobStatusEnum; + } + + /** + * 当前状态是否可以修改为执行中状态 + * @return + */ + public boolean doing() { + if(this.jobStatusEnum.getCode() == jobStatusEnum.OPEN.getCode()) { + this.jobStatusEnum = jobStatusEnum.DOING; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + /** + * 当前状态是否可以修改为关闭状态 + * @return + */ + public boolean closed() { + if(this.jobStatusEnum.getCode() == jobStatusEnum.OPEN.getCode()) { + this.jobStatusEnum = jobStatusEnum.CLOSED; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + /** + * 当前状态是否可以修改为完成状态 + * @return + */ + public boolean done() { + if(this.jobStatusEnum.getCode() == jobStatusEnum.DOING.getCode()) { + this.jobStatusEnum = jobStatusEnum.DONE; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + /** + * 当前状态是否可以修改为放弃状态 + * @return + */ + public boolean cancelled() { + if(this.jobStatusEnum.getCode() == jobStatusEnum.DOING.getCode()) { + this.jobStatusEnum = jobStatusEnum.CANCELLED; + return Boolean.TRUE; + } else { + return Boolean.FALSE; + } + } + + /** + * 获取可执行的状态机 + * @return + */ + public JobStatusEnum getState() { + return jobStatusEnum; + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java index bbacfe06..84242078 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java @@ -1,12 +1,18 @@ package com.win.module.wms.controller.accountcalendar; +import com.alibaba.druid.sql.ast.statement.SQLCreateDatabaseStatement; import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.accountcalendar.vo.*; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; import com.win.module.wms.convert.accountcalendar.AccountcalendarConvert; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.accountcalendar.AccountcalendarService; @@ -39,6 +45,9 @@ public class AccountcalendarController { @Resource private AccountcalendarService accountcalendarService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建账期日历") @PreAuthorize("@ss.hasPermission('wms:accountcalendar:create')") @@ -98,6 +107,11 @@ public class AccountcalendarController { List list = accountcalendarService.getAccountcalendarList(exportReqVO); // 导出 Excel List datas = AccountcalendarConvert.INSTANCE.convertList02(list); + for(AccountcalendarExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "账期日历.xls", "数据", AccountcalendarExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java index ba2ebe8a..c6c5d4d6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java @@ -5,6 +5,9 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.accountcalendar.vo.AccountcalendarExcelVO; import com.win.module.wms.controller.areabasic.vo.*; import com.win.module.wms.convert.areabasic.AreabasicConvert; import com.win.module.wms.dal.dataobject.areabasic.AreabasicDO; @@ -39,6 +42,9 @@ public class AreabasicController { @Resource private AreabasicService areabasicService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建库区") @PreAuthorize("@ss.hasPermission('wms:areabasic:create')") @@ -98,6 +104,11 @@ public class AreabasicController { List list = areabasicService.getAreabasicList(exportReqVO); // 导出 Excel List datas = AreabasicConvert.INSTANCE.convertList02(list); + for(AreabasicExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库区.xls", "数据", AreabasicExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/BackflushRecordDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/BackflushRecordDetailbController.java index 747de7fe..c8645819 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/BackflushRecordDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/BackflushRecordDetailbController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.backflushRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.areabasic.vo.AreabasicExcelVO; import com.win.module.wms.controller.backflushRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,8 @@ public class BackflushRecordDetailbController { @Resource private BackflushRecordDetailbService backflushRecordDetailbService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建制品收货记录子") @PreAuthorize("@ss.hasPermission('wms:backflush-record-detailb:create')") @@ -96,6 +101,11 @@ public class BackflushRecordDetailbController { List list = backflushRecordDetailbService.getBackflushRecordDetailbList(exportReqVO); // 导出 Excel List datas = BackflushRecordDetailbConvert.INSTANCE.convertList02(list); + for(BackflushRecordDetailbExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品收货记录子.xls", "数据", BackflushRecordDetailbExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbExcelVO.java index e35200ec..12a52584 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbExcelVO.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.backflushRecord.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -69,6 +70,7 @@ public class BackflushRecordDetailbExcelVO { private String remark; @ExcelProperty("创建时间") + @ColumnWidth(value = 16) private LocalDateTime createTime; @ExcelProperty("创建者Id") @@ -84,4 +86,5 @@ public class BackflushRecordDetailbExcelVO { @ExcelProperty("任务明细ID") private String jobDetailId; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/BalanceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/BalanceController.java index 619809b5..0753708e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/BalanceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/BalanceController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.balance; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbExcelVO; import com.win.module.wms.controller.balance.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +39,8 @@ public class BalanceController { @Resource private BalanceService balanceService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建库存余额") @@ -96,7 +101,11 @@ public class BalanceController { List list = balanceService.getBalanceList(exportReqVO); // 导出 Excel List datas = BalanceConvert.INSTANCE.convertList02(list); - ExcelUtils.write(response, "库存余额.xls", "数据", BalanceExcelVO.class, datas); + for (BalanceExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + ExcelUtils.write(response, "库存余额.xls", "数据", BalanceExcelVO.class, datas); + } } - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceExcelVO.java index 9c995987..c35cad1a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceExcelVO.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.balance.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -117,4 +118,11 @@ public class BalanceExcelVO { @ExcelProperty("体积") private BigDecimal volume; + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者Id") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/BarcodeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/BarcodeController.java index 0ef2c4ba..82b53a8a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/BarcodeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/BarcodeController.java @@ -5,6 +5,9 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbExcelVO; import com.win.module.wms.controller.barcode.vo.*; import com.win.module.wms.convert.barcode.BarcodeConvert; import com.win.module.wms.dal.dataobject.barcode.BarcodeDO; @@ -39,6 +42,9 @@ public class BarcodeController { @Resource private BarcodeService barcodeService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建条码片段") @PreAuthorize("@ss.hasPermission('label:barcode:create')") @@ -98,6 +104,11 @@ public class BarcodeController { List list = barcodeService.getBarcodeList(exportReqVO); // 导出 Excel List datas = BarcodeConvert.INSTANCE.convertList02(list); + for(BarcodeExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "条码片段.xls", "数据", BarcodeExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeExcelVO.java index 7c73ee27..7b2bb761 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeExcelVO.java @@ -1,8 +1,11 @@ package com.win.module.wms.controller.barcode.vo; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; +import java.time.LocalDateTime; + /** * 条码片段 Excel VO * @@ -50,4 +53,12 @@ public class BarcodeExcelVO { @ExcelProperty("是否加密") private String isEncypt; + + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者Id") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java index 88d5f417..6bd2f1f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java @@ -5,6 +5,9 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.barcode.vo.BarcodeExcelVO; import com.win.module.wms.controller.bom.vo.*; import com.win.module.wms.convert.bom.BomConvert; import com.win.module.wms.dal.dataobject.bom.BomDO; @@ -39,6 +42,9 @@ public class BomController { @Resource private BomService bomService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建物料清单") @PreAuthorize("@ss.hasPermission('wms:bom:create')") @@ -98,6 +104,11 @@ public class BomController { List list = bomService.getBomList(exportReqVO); // 导出 Excel List datas = BomConvert.INSTANCE.convertList02(list); + for(BomExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "物料清单.xls", "数据", BomExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java index d903c6d3..aa50da6d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java @@ -5,6 +5,9 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.bom.vo.BomExcelVO; import com.win.module.wms.controller.businesstype.vo.*; import com.win.module.wms.convert.businesstype.BusinesstypeConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; @@ -39,6 +42,9 @@ public class BusinesstypeController { @Resource private BusinesstypeService businesstypeService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建业务类型") @PreAuthorize("@ss.hasPermission('wms:businesstype:create')") @@ -98,6 +104,11 @@ public class BusinesstypeController { List list = businesstypeService.getBusinesstypeList(exportReqVO); // 导出 Excel List datas = BusinesstypeConvert.INSTANCE.convertList02(list); + for(BusinesstypeExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "业务类型.xls", "数据", BusinesstypeExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java index bf081cb2..1b337efc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java @@ -5,6 +5,9 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.businesstype.vo.BusinesstypeExcelVO; import com.win.module.wms.controller.carrier.vo.*; import com.win.module.wms.convert.carrier.CarrierConvert; import com.win.module.wms.dal.dataobject.carrier.CarrierDO; @@ -39,6 +42,9 @@ public class CarrierController { @Resource private CarrierService carrierService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建承运商") @PreAuthorize("@ss.hasPermission('wms:carrier:create')") @@ -98,6 +104,11 @@ public class CarrierController { List list = carrierService.getCarrierList(exportReqVO); // 导出 Excel List datas = CarrierConvert.INSTANCE.convertList02(list); + for(CarrierExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "承运商.xls", "数据", CarrierExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/ConditionController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/ConditionController.java index 1ada7220..57c00a6a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/ConditionController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/ConditionController.java @@ -5,6 +5,9 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.carrier.vo.CarrierExcelVO; import com.win.module.wms.controller.condition.vo.*; import com.win.module.wms.convert.condition.ConditionConvert; import com.win.module.wms.dal.dataobject.condition.ConditionDO; @@ -39,6 +42,9 @@ public class ConditionController { @Resource private ConditionService conditionService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建条件") @PreAuthorize("@ss.hasPermission('wms:condition:create')") @@ -98,6 +104,11 @@ public class ConditionController { List list = conditionService.getConditionList(exportReqVO); // 导出 Excel List datas = ConditionConvert.INSTANCE.convertList02(list); + for(ConditionExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "条件.xls", "数据", ConditionExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/vo/ConditionExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/vo/ConditionExcelVO.java index 2730eb19..761dd2e3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/vo/ConditionExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/vo/ConditionExcelVO.java @@ -1,7 +1,10 @@ package com.win.module.wms.controller.condition.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; + +import java.time.LocalDateTime; import java.util.*; import com.alibaba.excel.annotation.ExcelProperty; @@ -36,4 +39,12 @@ public class ConditionExcelVO { @ExcelProperty("条件分组") private String groupCode; + + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者Id") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/ConfigurationController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/ConfigurationController.java index 9dceeebf..ea5492d4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/ConfigurationController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/ConfigurationController.java @@ -4,6 +4,9 @@ import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.PageResult; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.condition.vo.ConditionExcelVO; import com.win.module.wms.controller.configuration.vo.*; import com.win.module.wms.convert.configuration.ConfigurationConvert; import com.win.module.wms.dal.dataobject.configuration.ConfigurationDO; @@ -37,6 +40,9 @@ public class ConfigurationController { @Resource private ConfigurationService configurationService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建配置") @PreAuthorize("@ss.hasPermission('wms:configuration:create')") @@ -96,6 +102,11 @@ public class ConfigurationController { List list = configurationService.getConfigurationList(exportReqVO); // 导出 Excel List datas = ConfigurationConvert.INSTANCE.convertList02(list); + for(ConfigurationExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "配置.xls", "数据", ConfigurationExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/vo/ConfigurationExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/vo/ConfigurationExcelVO.java index f0c56d9c..0ed025c3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/vo/ConfigurationExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/vo/ConfigurationExcelVO.java @@ -1,7 +1,10 @@ package com.win.module.wms.controller.configuration.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; + +import java.time.LocalDateTime; import java.util.*; import com.alibaba.excel.annotation.ExcelProperty; @@ -32,4 +35,12 @@ public class ConfigurationExcelVO { @ExcelProperty("配置分组") private String groupCode; + + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者Id") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/ConfigurationsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/ConfigurationsettingController.java index c26160fe..189980a3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/ConfigurationsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/ConfigurationsettingController.java @@ -5,6 +5,9 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.configuration.vo.ConfigurationExcelVO; import com.win.module.wms.controller.configurationsetting.vo.*; import com.win.module.wms.convert.configurationsetting.ConfigurationsettingConvert; import com.win.module.wms.dal.dataobject.configurationsetting.ConfigurationsettingDO; @@ -39,6 +42,9 @@ public class ConfigurationsettingController { @Resource private ConfigurationsettingService configurationsettingService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建配置设置") @PreAuthorize("@ss.hasPermission('wms:configurationsetting:create')") @@ -98,6 +104,11 @@ public class ConfigurationsettingController { List list = configurationsettingService.getConfigurationsettingList(exportReqVO); // 导出 Excel List datas = ConfigurationsettingConvert.INSTANCE.convertList02(list); + for(ConfigurationsettingExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "配置设置.xls", "数据", ConfigurationsettingExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingExcelVO.java index ad9852e6..70f14019 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingExcelVO.java @@ -1,7 +1,10 @@ package com.win.module.wms.controller.configurationsetting.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; + +import java.time.LocalDateTime; import java.util.*; import com.alibaba.excel.annotation.ExcelProperty; @@ -43,4 +46,11 @@ public class ConfigurationsettingExcelVO { @ExcelProperty("必填") private String isRequired; + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者Id") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/ConsumeRecordDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/ConsumeRecordDetailbController.java index ea07ecd8..261dd5f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/ConsumeRecordDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/ConsumeRecordDetailbController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.consumeRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.configurationsetting.vo.ConfigurationsettingExcelVO; import com.win.module.wms.controller.consumeRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class ConsumeRecordDetailbController { @Resource private ConsumeRecordDetailbService consumeRecordDetailbService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品返修记录子") @PreAuthorize("@ss.hasPermission('wms:consume-record-detailb:create')") @@ -96,6 +102,11 @@ public class ConsumeRecordDetailbController { List list = consumeRecordDetailbService.getConsumeRecordDetailbList(exportReqVO); // 导出 Excel List datas = ConsumeRecordDetailbConvert.INSTANCE.convertList02(list); + for(ConsumeRecordDetailbExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品返修记录子.xls", "数据", ConsumeRecordDetailbExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/ConsumereRequestDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/ConsumereRequestDetailbController.java index fcb9d962..a576cc59 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/ConsumereRequestDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/ConsumereRequestDetailbController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.consumereRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.consumeRecord.vo.ConsumeRecordDetailbExcelVO; import com.win.module.wms.controller.consumereRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class ConsumereRequestDetailbController { @Resource private ConsumereRequestDetailbService consumereRequestDetailbService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品返修申请子") @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:create')") @@ -96,6 +102,11 @@ public class ConsumereRequestDetailbController { List list = consumereRequestDetailbService.getConsumereRequestDetailbList(exportReqVO); // 导出 Excel List datas = ConsumereRequestDetailbConvert.INSTANCE.convertList02(list); + for(ConsumereRequestDetailbExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品返修申请子.xls", "数据", ConsumereRequestDetailbExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerDetailController.java index 23b6c495..34df8b2c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.container; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.container.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ContainerDetailController { @Resource private ContainerDetailService containerDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建器具子") @PreAuthorize("@ss.hasPermission('wms:container-detail:create')") @@ -96,6 +101,11 @@ public class ContainerDetailController { List list = containerDetailService.getContainerDetailList(exportReqVO); // 导出 Excel List datas = ContainerDetailConvert.INSTANCE.convertList02(list); + for(ContainerDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "器具子.xls", "数据", ContainerDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java index 46419b4d..b65089f6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.container; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbExcelVO; import com.win.module.wms.controller.container.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class ContainerMainController { @Resource private ContainerMainService containerMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建器具主") @PreAuthorize("@ss.hasPermission('wms:container-main:create')") @@ -96,6 +102,11 @@ public class ContainerMainController { List list = containerMainService.getContainerMainList(exportReqVO); // 导出 Excel List datas = ContainerMainConvert.INSTANCE.convertList02(list); + for(ContainerMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "器具主.xls", "数据", ContainerMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailExcelVO.java index 2e601a59..a7e0741c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailExcelVO.java @@ -1,7 +1,10 @@ package com.win.module.wms.controller.container.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; + +import java.time.LocalDateTime; import java.util.*; import java.math.BigDecimal; @@ -42,4 +45,11 @@ public class ContainerDetailExcelVO { @ExcelProperty("数量") private BigDecimal qty; + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者Id") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainExcelVO.java index 5355e5e0..8f33071c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainExcelVO.java @@ -1,7 +1,10 @@ package com.win.module.wms.controller.container.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; + +import java.time.LocalDateTime; import java.util.*; import java.math.BigDecimal; @@ -38,4 +41,11 @@ public class ContainerMainExcelVO { @ExcelProperty("货主代码") private String ownerCode; + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者Id") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobDetailController.java index ac6e81a9..6ca06476 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.countJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.countJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class CountJobDetailController { @Resource private CountJobDetailService countJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建盘点任务子") @PreAuthorize("@ss.hasPermission('wms:count-job-detail:create')") @@ -96,6 +101,11 @@ public class CountJobDetailController { List list = countJobDetailService.getCountJobDetailList(exportReqVO); // 导出 Excel List datas = CountJobDetailConvert.INSTANCE.convertList02(list); + for(CountJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "盘点任务子.xls", "数据", CountJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java index 2c272eb7..a5ed19d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java @@ -1,6 +1,9 @@ package com.win.module.wms.controller.countJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.countJob.vo.*; +import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainExcelVO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -37,6 +40,9 @@ public class CountJobMainController { @Resource private CountJobMainService countJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建盘点任务主") @PreAuthorize("@ss.hasPermission('wms:count-job-main:create')") @@ -96,6 +102,11 @@ public class CountJobMainController { List list = countJobMainService.getCountJobMainList(exportReqVO); // 导出 Excel List datas = CountJobMainConvert.INSTANCE.convertList02(list); + for(CountJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "盘点任务主.xls", "数据", CountJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanDetailController.java index b6744377..959d673b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.countPlan; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.countPlan.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class CountPlanDetailController { @Resource private CountPlanDetailService countPlanDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建盘点计划子") @PreAuthorize("@ss.hasPermission('wms:count-plan-detail:create')") @@ -96,6 +101,11 @@ public class CountPlanDetailController { List list = countPlanDetailService.getCountPlanDetailList(exportReqVO); // 导出 Excel List datas = CountPlanDetailConvert.INSTANCE.convertList02(list); + for(CountPlanDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "盘点计划子.xls", "数据", CountPlanDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java index c4a0d5e0..1f09bc6f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.countPlan; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.countJob.vo.CountJobMainExcelVO; import com.win.module.wms.controller.countPlan.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class CountPlanMainController { @Resource private CountPlanMainService countPlanMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建盘点计划主") @PreAuthorize("@ss.hasPermission('wms:count-plan-main:create')") @@ -96,6 +102,11 @@ public class CountPlanMainController { List list = countPlanMainService.getCountPlanMainList(exportReqVO); // 导出 Excel List datas = CountPlanMainConvert.INSTANCE.convertList02(list); + for(CountPlanMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "盘点计划主.xls", "数据", CountPlanMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordDetailController.java index cd374e90..704f94b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordDetailController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.countRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.countPlan.vo.CountPlanMainExcelVO; import com.win.module.wms.controller.countRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class CountRecordDetailController { @Resource private CountRecordDetailService countRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建盘点记录子") @PreAuthorize("@ss.hasPermission('wms:count-record-detail:create')") @@ -96,6 +102,11 @@ public class CountRecordDetailController { List list = countRecordDetailService.getCountRecordDetailList(exportReqVO); // 导出 Excel List datas = CountRecordDetailConvert.INSTANCE.convertList02(list); + for(CountRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "盘点记录子.xls", "数据", CountRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordMainController.java index d59c7e37..03a91088 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.countRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.countRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class CountRecordMainController { @Resource private CountRecordMainService countRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建盘点记录主") @PreAuthorize("@ss.hasPermission('wms:count-record-main:create')") @@ -96,6 +101,11 @@ public class CountRecordMainController { List list = countRecordMainService.getCountRecordMainList(exportReqVO); // 导出 Excel List datas = CountRecordMainConvert.INSTANCE.convertList02(list); + for(CountRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "盘点记录主.xls", "数据", CountRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExcelVO.java index e898ee02..4fde13ed 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExcelVO.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.countRecord.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -97,10 +98,11 @@ public class CountRecordDetailExcelVO { private String remark; @ExcelProperty("创建时间") + @ColumnWidth(value = 16) private LocalDateTime createTime; @ExcelProperty("创建者Id") - private String creatorId; + private String creator; @ExcelProperty("任务明细ID") private String jobDetailId; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainExcelVO.java index a60f922a..9c684b0d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainExcelVO.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.countRecord.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -76,6 +77,7 @@ public class CountRecordMainExcelVO { private String remark; @ExcelProperty("创建时间") + @ColumnWidth(value = 16) private LocalDateTime createTime; @ExcelProperty("创建者Id") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestDetailController.java index 38028298..f0d16cba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestDetailController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.countRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.countRecord.vo.CountRecordMainExcelVO; import com.win.module.wms.controller.countRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,10 @@ public class CountRequestDetailController { @Resource private CountRequestDetailService countRequestDetailService; + @Resource + private AdminUserApi userApi; + + @PostMapping("/create") @Operation(summary = "创建盘点申请子") @PreAuthorize("@ss.hasPermission('wms:count-request-detail:create')") @@ -96,6 +103,11 @@ public class CountRequestDetailController { List list = countRequestDetailService.getCountRequestDetailList(exportReqVO); // 导出 Excel List datas = CountRequestDetailConvert.INSTANCE.convertList02(list); + for(CountRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "盘点申请子.xls", "数据", CountRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java index 8d413ca1..27d7f1c3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.countRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.countRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,10 @@ public class CountRequestMainController { @Resource private CountRequestMainService countRequestMainService; + @Resource + private AdminUserApi userApi; + + @PostMapping("/create") @Operation(summary = "创建盘点申请主") @PreAuthorize("@ss.hasPermission('wms:count-request-main:create')") @@ -96,6 +102,11 @@ public class CountRequestMainController { List list = countRequestMainService.getCountRequestMainList(exportReqVO); // 导出 Excel List datas = CountRequestMainConvert.INSTANCE.convertList02(list); + for(CountRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "盘点申请主.xls", "数据", CountRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordDetailController.java index 6257da4a..ec13018f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.countadjustRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.countadjustRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class CountadjustRecordDetailController { @Resource private CountadjustRecordDetailService countadjustRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建盘点调整记录子") @PreAuthorize("@ss.hasPermission('wms:countadjust-record-detail:create')") @@ -96,6 +101,11 @@ public class CountadjustRecordDetailController { List list = countadjustRecordDetailService.getCountadjustRecordDetailList(exportReqVO); // 导出 Excel List datas = CountadjustRecordDetailConvert.INSTANCE.convertList02(list); + for(CountadjustRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "盘点调整记录子.xls", "数据", CountadjustRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordMainController.java index f9ae67cf..9c41c538 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordMainController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.countadjustRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.container.vo.ContainerMainExcelVO; import com.win.module.wms.controller.countadjustRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class CountadjustRecordMainController { @Resource private CountadjustRecordMainService countadjustRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建盘点调整记录主") @PreAuthorize("@ss.hasPermission('wms:countadjust-record-main:create')") @@ -96,6 +102,11 @@ public class CountadjustRecordMainController { List list = countadjustRecordMainService.getCountadjustRecordMainList(exportReqVO); // 导出 Excel List datas = CountadjustRecordMainConvert.INSTANCE.convertList02(list); + for(CountadjustRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "盘点调整记录主.xls", "数据", CountadjustRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestDetailController.java index 049dc422..6a736028 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.countadjustRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.countadjustRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class CountadjustRequestDetailController { @Resource private CountadjustRequestDetailService countadjustRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建盘点调整申请子") @PreAuthorize("@ss.hasPermission('wms:countadjust-request-detail:create')") @@ -96,6 +101,11 @@ public class CountadjustRequestDetailController { List list = countadjustRequestDetailService.getCountadjustRequestDetailList(exportReqVO); // 导出 Excel List datas = CountadjustRequestDetailConvert.INSTANCE.convertList02(list); + for(CountadjustRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "盘点调整申请子.xls", "数据", CountadjustRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java index 71838907..83a98050 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.countadjustRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainExcelVO; import com.win.module.wms.controller.countadjustRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class CountadjustRequestMainController { @Resource private CountadjustRequestMainService countadjustRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建盘点调整申请主") @PreAuthorize("@ss.hasPermission('wms:countadjust-request-main:create')") @@ -96,6 +102,11 @@ public class CountadjustRequestMainController { List list = countadjustRequestMainService.getCountadjustRequestMainList(exportReqVO); // 导出 Excel List datas = CountadjustRequestMainConvert.INSTANCE.convertList02(list); + for(CountadjustRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "盘点调整申请主.xls", "数据", CountadjustRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java index 4ac1b0cf..53de14d7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java @@ -5,6 +5,9 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.countRequest.vo.CountRequestMainExcelVO; import com.win.module.wms.controller.currencyexchange.vo.*; import com.win.module.wms.convert.currencyexchange.CurrencyexchangeConvert; import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO; @@ -39,6 +42,9 @@ public class CurrencyexchangeController { @Resource private CurrencyexchangeService currencyexchangeService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建货币转换") @PreAuthorize("@ss.hasPermission('wms:currencyexchange:create')") @@ -98,6 +104,11 @@ public class CurrencyexchangeController { List list = currencyexchangeService.getCurrencyexchangeList(exportReqVO); // 导出 Excel List datas = CurrencyexchangeConvert.INSTANCE.convertList02(list); + for(CurrencyexchangeExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "货币转换.xls", "数据", CurrencyexchangeExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java index 43a1ecab..21f1f469 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java @@ -5,6 +5,9 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.currencyexchange.vo.CurrencyexchangeExcelVO; import com.win.module.wms.controller.customer.vo.CustomerImportExcelVo; import com.win.module.wms.controller.customer.vo.*; import com.win.module.wms.convert.customer.CustomerConvert; @@ -40,6 +43,9 @@ public class CustomerController { @Resource private CustomerService customerService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建客户") @PreAuthorize("@ss.hasPermission('wms:customer:create')") @@ -99,6 +105,11 @@ public class CustomerController { List list = customerService.getCustomerList(exportReqVO); // 导出 Excel List datas = CustomerConvert.INSTANCE.convertList02(list); + for(CustomerExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "客户.xls", "数据", CustomerExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java index bd7fb774..59552b7a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java @@ -5,6 +5,9 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.customer.vo.CustomerExcelVO; import com.win.module.wms.controller.customer.vo.CustomerImportExcelVo; import com.win.module.wms.controller.customerdock.vo.*; import com.win.module.wms.convert.customerdock.CustomerdockConvert; @@ -40,6 +43,9 @@ public class CustomerdockController { @Resource private CustomerdockService customerdockService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建客户月台") @PreAuthorize("@ss.hasPermission('wms:customerdock:create')") @@ -99,6 +105,11 @@ public class CustomerdockController { List list = customerdockService.getCustomerdockList(exportReqVO); // 导出 Excel List datas = CustomerdockConvert.INSTANCE.convertList02(list); + for(CustomerdockExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "客户月台.xls", "数据", CustomerdockExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java index 5fd1c48b..dbf01db8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java @@ -5,6 +5,9 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.customerdock.vo.CustomerdockExcelVO; import com.win.module.wms.controller.customeritem.vo.*; import com.win.module.wms.convert.customeritem.CustomeritemConvert; import com.win.module.wms.dal.dataobject.customeritem.CustomeritemDO; @@ -39,6 +42,9 @@ public class CustomeritemController { @Resource private CustomeritemService customeritemService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建客户物品") @PreAuthorize("@ss.hasPermission('wms:customeritem:create')") @@ -98,6 +104,11 @@ public class CustomeritemController { List list = customeritemService.getCustomeritemList(exportReqVO); // 导出 Excel List datas = CustomeritemConvert.INSTANCE.convertList02(list); + for(CustomeritemExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "客户物品.xls", "数据", CustomeritemExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordDetailController.java index e3db5123..b8b56ecf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordDetailController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.customerreceiptRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.customeritem.vo.CustomeritemExcelVO; import com.win.module.wms.controller.customerreceiptRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class CustomerreceiptRecordDetailController { @Resource private CustomerreceiptRecordDetailService customerreceiptRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建客户收货记录子") @PreAuthorize("@ss.hasPermission('wms:customerreceipt-record-detail:create')") @@ -96,6 +102,11 @@ public class CustomerreceiptRecordDetailController { List list = customerreceiptRecordDetailService.getCustomerreceiptRecordDetailList(exportReqVO); // 导出 Excel List datas = CustomerreceiptRecordDetailConvert.INSTANCE.convertList02(list); + for(CustomerreceiptRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "客户收货记录子.xls", "数据", CustomerreceiptRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java index c47cf684..ad49c46e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.customerreceiptRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreceiptRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,8 @@ public class CustomerreceiptRecordMainController { @Resource private CustomerreceiptRecordMainService customerreceiptRecordMainService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建客户收货记录主") @PreAuthorize("@ss.hasPermission('wms:customerreceipt-record-main:create')") @@ -96,6 +100,11 @@ public class CustomerreceiptRecordMainController { List list = customerreceiptRecordMainService.getCustomerreceiptRecordMainList(exportReqVO); // 导出 Excel List datas = CustomerreceiptRecordMainConvert.INSTANCE.convertList02(list); + for(CustomerreceiptRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "客户收货记录主.xls", "数据", CustomerreceiptRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestDetailController.java index 83db41fc..6563f2a1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestDetailController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.customerreceiptRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailExcelVO; import com.win.module.wms.controller.customerreceiptRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class CustomerreceiptRequestDetailController { @Resource private CustomerreceiptRequestDetailService customerreceiptRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建客户收货申请子") @PreAuthorize("@ss.hasPermission('wms:customerreceipt-request-detail:create')") @@ -96,6 +102,11 @@ public class CustomerreceiptRequestDetailController { List list = customerreceiptRequestDetailService.getCustomerreceiptRequestDetailList(exportReqVO); // 导出 Excel List datas = CustomerreceiptRequestDetailConvert.INSTANCE.convertList02(list); + for(CustomerreceiptRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "客户收货申请子.xls", "数据", CustomerreceiptRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestMainController.java index 74be14d1..a2c7e438 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.customerreceiptRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreceiptRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class CustomerreceiptRequestMainController { @Resource private CustomerreceiptRequestMainService customerreceiptRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建客户收货申请主") @PreAuthorize("@ss.hasPermission('wms:customerreceipt-request-main:create')") @@ -96,6 +101,11 @@ public class CustomerreceiptRequestMainController { List list = customerreceiptRequestMainService.getCustomerreceiptRequestMainList(exportReqVO); // 导出 Excel List datas = CustomerreceiptRequestMainConvert.INSTANCE.convertList02(list); + for(CustomerreceiptRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "客户收货申请主.xls", "数据", CustomerreceiptRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobDetailController.java index 50a6d6ad..7d26bb35 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobDetailController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.customerreturnJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainExcelVO; import com.win.module.wms.controller.customerreturnJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class CustomerreturnJobDetailController { @Resource private CustomerreturnJobDetailService customerreturnJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建客户退货任务子") @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-detail:create')") @@ -96,6 +102,11 @@ public class CustomerreturnJobDetailController { List list = customerreturnJobDetailService.getCustomerreturnJobDetailList(exportReqVO); // 导出 Excel List datas = CustomerreturnJobDetailConvert.INSTANCE.convertList02(list); + for(CustomerreturnJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "客户退货任务子.xls", "数据", CustomerreturnJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java index 443abd72..4539a6b3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.customerreturnJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreturnJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class CustomerreturnJobMainController { @Resource private CustomerreturnJobMainService customerreturnJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建客户退货任务主") @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-main:create')") @@ -96,6 +101,11 @@ public class CustomerreturnJobMainController { List list = customerreturnJobMainService.getCustomerreturnJobMainList(exportReqVO); // 导出 Excel List datas = CustomerreturnJobMainConvert.INSTANCE.convertList02(list); + for(CustomerreturnJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "客户退货任务主.xls", "数据", CustomerreturnJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordDetailController.java index 85bcf368..c9507cc0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordDetailController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.customerreturnRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExcelVO; import com.win.module.wms.controller.customerreturnRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class CustomerreturnRecordDetailController { @Resource private CustomerreturnRecordDetailService customerreturnRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建客户退货记录子") @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-detail:create')") @@ -96,6 +102,11 @@ public class CustomerreturnRecordDetailController { List list = customerreturnRecordDetailService.getCustomerreturnRecordDetailList(exportReqVO); // 导出 Excel List datas = CustomerreturnRecordDetailConvert.INSTANCE.convertList02(list); + for(CustomerreturnRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "客户退货记录子.xls", "数据", CustomerreturnRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordMainController.java index 85822889..be0bdc20 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.customerreturnRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreturnRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class CustomerreturnRecordMainController { @Resource private CustomerreturnRecordMainService customerreturnRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建客户退货记录主") @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-main:create')") @@ -96,6 +101,11 @@ public class CustomerreturnRecordMainController { List list = customerreturnRecordMainService.getCustomerreturnRecordMainList(exportReqVO); // 导出 Excel List datas = CustomerreturnRecordMainConvert.INSTANCE.convertList02(list); + for(CustomerreturnRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "客户退货记录主.xls", "数据", CustomerreturnRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainExcelVO.java index 59890794..ca38ec14 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainExcelVO.java @@ -120,4 +120,9 @@ public class CustomerreturnRecordMainExcelVO { @ExcelProperty("从库区代码范围") private String fromAreaCodes; + + + @ExcelProperty("创建者ID") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestDetailController.java index 4830b51a..a613d32f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestDetailController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.customerreturnRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordMainExcelVO; import com.win.module.wms.controller.customerreturnRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class CustomerreturnRequestDetailController { @Resource private CustomerreturnRequestDetailService customerreturnRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建客户退货申请子") @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-detail:create')") @@ -96,6 +102,11 @@ public class CustomerreturnRequestDetailController { List list = customerreturnRequestDetailService.getCustomerreturnRequestDetailList(exportReqVO); // 导出 Excel List datas = CustomerreturnRequestDetailConvert.INSTANCE.convertList02(list); + for(CustomerreturnRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "客户退货申请子.xls", "数据", CustomerreturnRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java index a9b86586..55600d09 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.customerreturnRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreturnRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class CustomerreturnRequestMainController { @Resource private CustomerreturnRequestMainService customerreturnRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建客户退货申请主") @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-main:create')") @@ -96,6 +101,11 @@ public class CustomerreturnRequestMainController { List list = customerreturnRequestMainService.getCustomerreturnRequestMainList(exportReqVO); // 导出 Excel List datas = CustomerreturnRequestMainConvert.INSTANCE.convertList02(list); + for(CustomerreturnRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "客户退货申请主.xls", "数据", CustomerreturnRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordDetailController.java index 23dc4389..0bf15a5a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordDetailController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.customersettleRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestMainExcelVO; import com.win.module.wms.controller.customersettleRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class CustomersettleRecordDetailController { @Resource private CustomersettleRecordDetailService customersettleRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建客户结算记录子") @PreAuthorize("@ss.hasPermission('wms:customersettle-record-detail:create')") @@ -96,6 +102,11 @@ public class CustomersettleRecordDetailController { List list = customersettleRecordDetailService.getCustomersettleRecordDetailList(exportReqVO); // 导出 Excel List datas = CustomersettleRecordDetailConvert.INSTANCE.convertList02(list); + for(CustomersettleRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "客户结算记录子.xls", "数据", CustomersettleRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordMainController.java index 1d2740d4..51be8bd2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.customersettleRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customersettleRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,8 @@ public class CustomersettleRecordMainController { @Resource private CustomersettleRecordMainService customersettleRecordMainService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建客户结算记录主") @@ -96,6 +100,11 @@ public class CustomersettleRecordMainController { List list = customersettleRecordMainService.getCustomersettleRecordMainList(exportReqVO); // 导出 Excel List datas = CustomersettleRecordMainConvert.INSTANCE.convertList02(list); + for(CustomersettleRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "客户结算记录主.xls", "数据", CustomersettleRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestDetailController.java index 8b4d46e1..1036bb0b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.customersettleRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customersettleRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class CustomersettleRequestDetailController { @Resource private CustomersettleRequestDetailService customersettleRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建客户结算申请子") @PreAuthorize("@ss.hasPermission('wms:customersettle-request-detail:create')") @@ -96,6 +101,11 @@ public class CustomersettleRequestDetailController { List list = customersettleRequestDetailService.getCustomersettleRequestDetailList(exportReqVO); // 导出 Excel List datas = CustomersettleRequestDetailConvert.INSTANCE.convertList02(list); + for(CustomersettleRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "客户结算申请子.xls", "数据", CustomersettleRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestMainController.java index b3f943e3..9b3a00c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.customersettleRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customersettleRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,8 @@ public class CustomersettleRequestMainController { @Resource private CustomersettleRequestMainService customersettleRequestMainService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建客户结算申请主") @@ -96,6 +100,11 @@ public class CustomersettleRequestMainController { List list = customersettleRequestMainService.getCustomersettleRequestMainList(exportReqVO); // 导出 Excel List datas = CustomersettleRequestMainConvert.INSTANCE.convertList02(list); + for(CustomersettleRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "客户结算申请主.xls", "数据", CustomersettleRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobDetailController.java index f6c62896..874dbc70 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.deliverJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.deliverJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class DeliverJobDetailController { @Resource private DeliverJobDetailService deliverJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建发货任务子") @PreAuthorize("@ss.hasPermission('wms:deliver-job-detail:create')") @@ -96,6 +101,11 @@ public class DeliverJobDetailController { List list = deliverJobDetailService.getDeliverJobDetailList(exportReqVO); // 导出 Excel List datas = DeliverJobDetailConvert.INSTANCE.convertList02(list); + for(DeliverJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "发货任务子.xls", "数据", DeliverJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java index bf798f19..6b00a9dc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.deliverJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.deliverJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class DeliverJobMainController { @Resource private DeliverJobMainService deliverJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建发货任务主") @PreAuthorize("@ss.hasPermission('wms:deliver-job-main:create')") @@ -96,6 +101,11 @@ public class DeliverJobMainController { List list = deliverJobMainService.getDeliverJobMainList(exportReqVO); // 导出 Excel List datas = DeliverJobMainConvert.INSTANCE.convertList02(list); + for(DeliverJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "发货任务主.xls", "数据", DeliverJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java index 931f2875..68a9820f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.deliverPlan; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.deliverPlan.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class DeliverPlanDetailController { @Resource private DeliverPlanDetailService deliverPlanDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建发货计划子") @PreAuthorize("@ss.hasPermission('wms:deliver-plan-detail:create')") @@ -96,6 +101,12 @@ public class DeliverPlanDetailController { List list = deliverPlanDetailService.getDeliverPlanDetailList(exportReqVO); // 导出 Excel List datas = DeliverPlanDetailConvert.INSTANCE.convertList02(list); + + for(DeliverPlanDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "发货计划子.xls", "数据", DeliverPlanDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java index 0cf9aee0..89272de1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.deliverPlan; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.deliverPlan.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,8 @@ public class DeliverPlanMainController { @Resource private DeliverPlanMainService deliverPlanMainService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建发货计划主") @@ -96,6 +100,11 @@ public class DeliverPlanMainController { List list = deliverPlanMainService.getDeliverPlanMainList(exportReqVO); // 导出 Excel List datas = DeliverPlanMainConvert.INSTANCE.convertList02(list); + for(DeliverPlanMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "发货计划主.xls", "数据", DeliverPlanMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java index a0db60dd..d2f5124c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.deliverRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.deliverRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,8 @@ public class DeliverRecordDetailController { @Resource private DeliverRecordDetailService deliverRecordDetailService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建发货记录子") @@ -96,6 +100,11 @@ public class DeliverRecordDetailController { List list = deliverRecordDetailService.getDeliverRecordDetailList(exportReqVO); // 导出 Excel List datas = DeliverRecordDetailConvert.INSTANCE.convertList02(list); + for(DeliverRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "发货记录子.xls", "数据", DeliverRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordMainController.java index 1db86cfc..a62afd81 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.deliverRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.deliverRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class DeliverRecordMainController { @Resource private DeliverRecordMainService deliverRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建发货记录主") @PreAuthorize("@ss.hasPermission('wms:deliver-record-main:create')") @@ -96,6 +101,11 @@ public class DeliverRecordMainController { List list = deliverRecordMainService.getDeliverRecordMainList(exportReqVO); // 导出 Excel List datas = DeliverRecordMainConvert.INSTANCE.convertList02(list); + for(DeliverRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "发货记录主.xls", "数据", DeliverRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestDetailController.java index 43f7fa2e..f41effe7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.deliverRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.deliverRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class DeliverRequestDetailController { @Resource private DeliverRequestDetailService deliverRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建发货申请子") @PreAuthorize("@ss.hasPermission('wms:deliver-request-detail:create')") @@ -96,6 +101,11 @@ public class DeliverRequestDetailController { List list = deliverRequestDetailService.getDeliverRequestDetailList(exportReqVO); // 导出 Excel List datas = DeliverRequestDetailConvert.INSTANCE.convertList02(list); + for(DeliverRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "发货申请子.xls", "数据", DeliverRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java index ecbceff7..dc95aadc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.deliverRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.deliverRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class DeliverRequestMainController { @Resource private DeliverRequestMainService deliverRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建发货申请主") @PreAuthorize("@ss.hasPermission('wms:deliver-request-main:create')") @@ -96,6 +101,11 @@ public class DeliverRequestMainController { List list = deliverRequestMainService.getDeliverRequestMainList(exportReqVO); // 导出 Excel List datas = DeliverRequestMainConvert.INSTANCE.convertList02(list); + for(DeliverRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "发货申请主.xls", "数据", DeliverRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingDetailController.java index c013f3dd..a824b2f5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.demandforecasting; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.demandforecasting.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class DemandforecastingDetailController { @Resource private DemandforecastingDetailService demandforecastingDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建要货预测子") @PreAuthorize("@ss.hasPermission('wms:demandforecasting-detail:create')") @@ -96,6 +101,11 @@ public class DemandforecastingDetailController { List list = demandforecastingDetailService.getDemandforecastingDetailList(exportReqVO); // 导出 Excel List datas = DemandforecastingDetailConvert.INSTANCE.convertList02(list); + for(DemandforecastingDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "要货预测子.xls", "数据", DemandforecastingDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingMainController.java index fef591c0..be8439b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.demandforecasting; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.demandforecasting.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,9 @@ public class DemandforecastingMainController { @Resource private DemandforecastingMainService demandforecastingMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建要货预测主") @PreAuthorize("@ss.hasPermission('wms:demandforecasting-main:create')") @@ -95,6 +100,11 @@ public class DemandforecastingMainController { List list = demandforecastingMainService.getDemandforecastingMainList(exportReqVO); // 导出 Excel List datas = DemandforecastingMainConvert.INSTANCE.convertList02(list); + for(DemandforecastingMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "要货预测主.xls", "数据", DemandforecastingMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/DismantleRecordDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/DismantleRecordDetailbController.java index 82f9a065..228e4d62 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/DismantleRecordDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/DismantleRecordDetailbController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.dismantleRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.dismantleRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class DismantleRecordDetailbController { @Resource private DismantleRecordDetailbService dismantleRecordDetailbService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品拆解记录子") @PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:create')") @@ -96,6 +101,11 @@ public class DismantleRecordDetailbController { List list = dismantleRecordDetailbService.getDismantleRecordDetailbList(exportReqVO); // 导出 Excel List datas = DismantleRecordDetailbConvert.INSTANCE.convertList02(list); + for(DismantleRecordDetailbExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品拆解记录子.xls", "数据", DismantleRecordDetailbExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/DismantleRequestDetailbController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/DismantleRequestDetailbController.java index 82e30744..6ec55b89 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/DismantleRequestDetailbController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/DismantleRequestDetailbController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.dismantleRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.dismantleRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class DismantleRequestDetailbController { @Resource private DismantleRequestDetailbService dismantleRequestDetailbService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品拆解申请子") @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:create')") @@ -96,6 +101,11 @@ public class DismantleRequestDetailbController { List list = dismantleRequestDetailbService.getDismantleRequestDetailbList(exportReqVO); // 导出 Excel List datas = DismantleRequestDetailbConvert.INSTANCE.convertList02(list); + for(DismantleRequestDetailbExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品拆解申请子.xls", "数据", DismantleRequestDetailbExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java index 7edeb058..53cefe2e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.dock.vo.*; import com.win.module.wms.convert.dock.DockConvert; import com.win.module.wms.dal.dataobject.dock.DockDO; @@ -41,6 +43,9 @@ public class DockController { @Resource private DockService dockService; + @Resource + private AdminUserApi userApi; + @Resource private DockMapper dockMapper; @@ -103,6 +108,11 @@ public class DockController { List list = dockService.getDockList(exportReqVO); // 导出 Excel List datas = DockConvert.INSTANCE.convertList02(list); + for(DockExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "月台.xls", "数据", DockExcelVO.class, datas); } @@ -114,7 +124,7 @@ public class DockController { Map mapDropDown = new HashMap<>(); String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DOCK_TYPE); mapDropDown.put(5, type); - String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); + String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(10, available);; // 输出 ExcelUtils.write(response, "月台导入模板.xls", "月台列表", DockImportExcelVO.class, list,mapDropDown); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java index fe2cd732..cc8b9c10 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.documentsetting.vo.*; import com.win.module.wms.convert.documentsetting.DocumentsettingConvert; import com.win.module.wms.dal.dataobject.documentsetting.DocumentsettingDO; @@ -39,6 +41,9 @@ public class DocumentsettingController { @Resource private DocumentsettingService documentsettingService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建单据设置") @PreAuthorize("@ss.hasPermission('wms:documentsetting:create')") @@ -98,6 +103,11 @@ public class DocumentsettingController { List list = documentsettingService.getDocumentsettingList(exportReqVO); // 导出 Excel List datas = DocumentsettingConvert.INSTANCE.convertList02(list); + for(DocumentsettingExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "单据设置.xls", "数据", DocumentsettingExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java index 3aa11fc0..7954c44f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.expectin; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.expectin.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ExpectinController { @Resource private ExpectinService expectinService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建预计入库存") @PreAuthorize("@ss.hasPermission('wms:expectin:create')") @@ -96,6 +101,11 @@ public class ExpectinController { List list = expectinService.getExpectinList(exportReqVO); // 导出 Excel List datas = ExpectinConvert.INSTANCE.convertList02(list); + for(ExpectinExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "预计入库存.xls", "数据", ExpectinExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinExcelVO.java index 86c13bf7..6cdb8eb3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinExcelVO.java @@ -1,7 +1,10 @@ package com.win.module.wms.controller.expectin.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; + +import java.time.LocalDateTime; import java.util.*; import java.math.BigDecimal; @@ -50,4 +53,11 @@ public class ExpectinExcelVO { @ExcelProperty("货主代码") private String ownerCode; + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者ID") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java index 50bdcc6f..97159844 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.expectout; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.expectout.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ExpectoutController { @Resource private ExpectoutService expectoutService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建预计出库存") @PreAuthorize("@ss.hasPermission('wms:expectout:create')") @@ -96,6 +101,11 @@ public class ExpectoutController { List list = expectoutService.getExpectoutList(exportReqVO); // 导出 Excel List datas = ExpectoutConvert.INSTANCE.convertList02(list); + for(ExpectoutExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "预计出库存.xls", "数据", ExpectoutExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutExcelVO.java index 256c49d1..d8b0347b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutExcelVO.java @@ -1,7 +1,10 @@ package com.win.module.wms.controller.expectout.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; + +import java.time.LocalDateTime; import java.util.*; import java.math.BigDecimal; @@ -52,5 +55,11 @@ public class ExpectoutExcelVO { @ExcelProperty("货主代码") private String ownerCode; + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者ID") + private String creator; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java index f12e9c27..b1ff2f49 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inspectJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inspectJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class InspectJobDetailController { @Resource private InspectJobDetailService inspectJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建检验任务子") @PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:create')") @@ -96,6 +101,11 @@ public class InspectJobDetailController { List list = inspectJobDetailService.getInspectJobDetailList(exportReqVO); // 导出 Excel List datas = InspectJobDetailConvert.INSTANCE.convertList02(list); + for(InspectJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "检验任务子.xls", "数据", InspectJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java index a61a9044..851fa7aa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inspectJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inspectJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,9 @@ public class InspectJobMainController { @Resource private InspectJobMainService inspectJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建检验任务主") @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:create')") @@ -95,6 +100,11 @@ public class InspectJobMainController { List list = inspectJobMainService.getInspectJobMainList(exportReqVO); // 导出 Excel List datas = InspectJobMainConvert.INSTANCE.convertList02(list); + for(InspectJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "检验任务主.xls", "数据", InspectJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java index c9ff0117..3c7daf8a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inspectRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inspectRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class InspectRecordDetailController { @Resource private InspectRecordDetailService inspectRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建检验记录子") @PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:create')") @@ -96,6 +101,11 @@ public class InspectRecordDetailController { List list = inspectRecordDetailService.getInspectRecordDetailList(exportReqVO); // 导出 Excel List datas = InspectRecordDetailConvert.INSTANCE.convertList02(list); + for(InspectRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "检验记录子.xls", "数据", InspectRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java index b0f70a46..d036f068 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inspectRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inspectRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,9 @@ public class InspectRecordMainController { @Resource private InspectRecordMainService inspectRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建检验记录主") @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:create')") @@ -95,6 +100,11 @@ public class InspectRecordMainController { List list = inspectRecordMainService.getInspectRecordMainList(exportReqVO); // 导出 Excel List datas = InspectRecordMainConvert.INSTANCE.convertList02(list); + for(InspectRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "检验记录主.xls", "数据", InspectRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java index f9730184..9dfb2c6b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inspectRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inspectRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class InspectRequestDetailController { @Resource private InspectRequestDetailService inspectRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建检验申请子") @PreAuthorize("@ss.hasPermission('wms:inspect-request-detail:create')") @@ -96,6 +101,11 @@ public class InspectRequestDetailController { List list = inspectRequestDetailService.getInspectRequestDetailList(exportReqVO); // 导出 Excel List datas = InspectRequestDetailConvert.INSTANCE.convertList02(list); + for(InspectRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "检验申请子.xls", "数据", InspectRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java index 1619a7c1..94f80db6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inspectRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inspectRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -35,6 +37,8 @@ public class InspectRequestMainController { @Resource private InspectRequestMainService inspectRequestMainService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建检验申请主") @@ -95,6 +99,11 @@ public class InspectRequestMainController { List list = inspectRequestMainService.getInspectRequestMainList(exportReqVO); // 导出 Excel List datas = InspectRequestMainConvert.INSTANCE.convertList02(list); + for(InspectRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "检验申请主.xls", "数据", InspectRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExcelVO.java index e9566c73..f0b536c4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExcelVO.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.inspectRequest.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -60,4 +61,11 @@ public class InspectRequestDetailExcelVO { @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String uom; + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者ID") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordDetailController.java index 201f7fb0..4242914f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inventorychangeRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inventorychangeRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class InventorychangeRecordDetailController { @Resource private InventorychangeRecordDetailService inventorychangeRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建库存修改记录子") @PreAuthorize("@ss.hasPermission('wms:inventorychange-record-detail:create')") @@ -96,6 +101,11 @@ public class InventorychangeRecordDetailController { List list = inventorychangeRecordDetailService.getInventorychangeRecordDetailList(exportReqVO); // 导出 Excel List datas = InventorychangeRecordDetailConvert.INSTANCE.convertList02(list); + for(InventorychangeRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库存修改记录子.xls", "数据", InventorychangeRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordMainController.java index 913b62db..0f428a89 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inventorychangeRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inventorychangeRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class InventorychangeRecordMainController { @Resource private InventorychangeRecordMainService inventorychangeRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建库存修改记录主") @PreAuthorize("@ss.hasPermission('wms:inventorychange-record-main:create')") @@ -96,6 +101,11 @@ public class InventorychangeRecordMainController { List list = inventorychangeRecordMainService.getInventorychangeRecordMainList(exportReqVO); // 导出 Excel List datas = InventorychangeRecordMainConvert.INSTANCE.convertList02(list); + for(InventorychangeRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库存修改记录主.xls", "数据", InventorychangeRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestDetailController.java index b6a833cf..128a2134 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inventorychangeRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inventorychangeRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class InventorychangeRequestDetailController { @Resource private InventorychangeRequestDetailService inventorychangeRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建库存修改申请子") @PreAuthorize("@ss.hasPermission('wms:inventorychange-request-detail:create')") @@ -96,6 +101,11 @@ public class InventorychangeRequestDetailController { List list = inventorychangeRequestDetailService.getInventorychangeRequestDetailList(exportReqVO); // 导出 Excel List datas = InventorychangeRequestDetailConvert.INSTANCE.convertList02(list); + for(InventorychangeRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库存修改申请子.xls", "数据", InventorychangeRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestMainController.java index cd1ed3e6..7c8f3c15 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inventorychangeRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inventorychangeRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class InventorychangeRequestMainController { @Resource private InventorychangeRequestMainService inventorychangeRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建库存修改申请主") @PreAuthorize("@ss.hasPermission('wms:inventorychange-request-main:create')") @@ -96,6 +101,11 @@ public class InventorychangeRequestMainController { List list = inventorychangeRequestMainService.getInventorychangeRequestMainList(exportReqVO); // 导出 Excel List datas = InventorychangeRequestMainConvert.INSTANCE.convertList02(list); + for(InventorychangeRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库存修改申请主.xls", "数据", InventorychangeRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordDetailController.java index 69b685df..542672aa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inventoryinitRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inventoryinitRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class InventoryinitRecordDetailController { @Resource private InventoryinitRecordDetailService inventoryinitRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建库存初始化记录子") @PreAuthorize("@ss.hasPermission('wms:inventoryinit-record-detail:create')") @@ -96,6 +101,11 @@ public class InventoryinitRecordDetailController { List list = inventoryinitRecordDetailService.getInventoryinitRecordDetailList(exportReqVO); // 导出 Excel List datas = InventoryinitRecordDetailConvert.INSTANCE.convertList02(list); + for(InventoryinitRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库存初始化记录子.xls", "数据", InventoryinitRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordMainController.java index 8e435bb7..f34afe63 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inventoryinitRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inventoryinitRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class InventoryinitRecordMainController { @Resource private InventoryinitRecordMainService inventoryinitRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建库存初始化记录主") @PreAuthorize("@ss.hasPermission('wms:inventoryinit-record-main:create')") @@ -96,6 +101,11 @@ public class InventoryinitRecordMainController { List list = inventoryinitRecordMainService.getInventoryinitRecordMainList(exportReqVO); // 导出 Excel List datas = InventoryinitRecordMainConvert.INSTANCE.convertList02(list); + for(InventoryinitRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库存初始化记录主.xls", "数据", InventoryinitRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestDetailController.java index 10d0490f..52960e84 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inventoryinitRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inventoryinitRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class InventoryinitRequestDetailController { @Resource private InventoryinitRequestDetailService inventoryinitRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建库存初始化申请子") @PreAuthorize("@ss.hasPermission('wms:inventoryinit-request-detail:create')") @@ -96,6 +101,11 @@ public class InventoryinitRequestDetailController { List list = inventoryinitRequestDetailService.getInventoryinitRequestDetailList(exportReqVO); // 导出 Excel List datas = InventoryinitRequestDetailConvert.INSTANCE.convertList02(list); + for(InventoryinitRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库存初始化申请子.xls", "数据", InventoryinitRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestMainController.java index 06f1ac32..bc9a9dbc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inventoryinitRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inventoryinitRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class InventoryinitRequestMainController { @Resource private InventoryinitRequestMainService inventoryinitRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建库存初始化申请主") @PreAuthorize("@ss.hasPermission('wms:inventoryinit-request-main:create')") @@ -96,6 +101,11 @@ public class InventoryinitRequestMainController { List list = inventoryinitRequestMainService.getInventoryinitRequestMainList(exportReqVO); // 导出 Excel List datas = InventoryinitRequestMainConvert.INSTANCE.convertList02(list); + for(InventoryinitRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库存初始化申请主.xls", "数据", InventoryinitRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java index 20320873..7a7a523f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inventorymoveJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inventorymoveJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,8 @@ public class InventorymoveJobDetailController { @Resource private InventorymoveJobDetailService inventorymoveJobDetailService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建库存转移任务子") @@ -96,6 +100,11 @@ public class InventorymoveJobDetailController { List list = inventorymoveJobDetailService.getInventorymoveJobDetailList(exportReqVO); // 导出 Excel List datas = InventorymoveJobDetailConvert.INSTANCE.convertList02(list); + for(InventorymoveJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库存转移任务子.xls", "数据", InventorymoveJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java index 7f7d5ea6..e26e60e2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inventorymoveJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inventorymoveJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class InventorymoveJobMainController { @Resource private InventorymoveJobMainService inventorymoveJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建库存转移任务主") @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-main:create')") @@ -96,6 +101,11 @@ public class InventorymoveJobMainController { List list = inventorymoveJobMainService.getInventorymoveJobMainList(exportReqVO); // 导出 Excel List datas = InventorymoveJobMainConvert.INSTANCE.convertList02(list); + for(InventorymoveJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库存转移任务主.xls", "数据", InventorymoveJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java index 65b8a057..c95f0be8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inventorymoveRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inventorymoveRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,11 @@ public class InventorymoveRecordDetailController { @Resource private InventorymoveRecordDetailService inventorymoveRecordDetailService; + @Resource + private AdminUserApi userApi; + + + @PostMapping("/create") @Operation(summary = "创建库存转移记录子") @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-detail:create')") @@ -96,6 +103,11 @@ public class InventorymoveRecordDetailController { List list = inventorymoveRecordDetailService.getInventorymoveRecordDetailList(exportReqVO); // 导出 Excel List datas = InventorymoveRecordDetailConvert.INSTANCE.convertList02(list); + for(InventorymoveRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库存转移记录子.xls", "数据", InventorymoveRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java index b20b6a6d..88cc6211 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inventorymoveRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inventorymoveRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class InventorymoveRecordMainController { @Resource private InventorymoveRecordMainService inventorymoveRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建库存转移记录主") @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-main:create')") @@ -96,6 +101,11 @@ public class InventorymoveRecordMainController { List list = inventorymoveRecordMainService.getInventorymoveRecordMainList(exportReqVO); // 导出 Excel List datas = InventorymoveRecordMainConvert.INSTANCE.convertList02(list); + for(InventorymoveRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库存转移记录主.xls", "数据", InventorymoveRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestDetailController.java index 3914fa6d..585c24de 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inventorymoveRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inventorymoveRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,8 @@ public class InventorymoveRequestDetailController { @Resource private InventorymoveRequestDetailService inventorymoveRequestDetailService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建库存转移申请子") @@ -96,6 +100,11 @@ public class InventorymoveRequestDetailController { List list = inventorymoveRequestDetailService.getInventorymoveRequestDetailList(exportReqVO); // 导出 Excel List datas = InventorymoveRequestDetailConvert.INSTANCE.convertList02(list); + for(InventorymoveRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库存转移申请子.xls", "数据", InventorymoveRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java index 5a3dc911..2a4bc880 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.inventorymoveRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.inventorymoveRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class InventorymoveRequestMainController { @Resource private InventorymoveRequestMainService inventorymoveRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建库存转移申请主") @PreAuthorize("@ss.hasPermission('wms:inventorymove-request-main:create')") @@ -96,6 +101,11 @@ public class InventorymoveRequestMainController { List list = inventorymoveRequestMainService.getInventorymoveRequestMainList(exportReqVO); // 导出 Excel List datas = InventorymoveRequestMainConvert.INSTANCE.convertList02(list); + for(InventorymoveRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库存转移申请主.xls", "数据", InventorymoveRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobDetailController.java index d793eea2..2c0f9869 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.issueJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.issueJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,8 @@ public class IssueJobDetailController { @Resource private IssueJobDetailService issueJobDetailService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建发料任务子") @@ -96,6 +100,11 @@ public class IssueJobDetailController { List list = issueJobDetailService.getIssueJobDetailList(exportReqVO); // 导出 Excel List datas = IssueJobDetailConvert.INSTANCE.convertList02(list); + for(IssueJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "发料任务子.xls", "数据", IssueJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java index 8b6d8b97..6d9fe2b7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.issueJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.issueJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class IssueJobMainController { @Resource private IssueJobMainService issueJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建发料任务主") @PreAuthorize("@ss.hasPermission('wms:issue-job-main:create')") @@ -96,6 +101,11 @@ public class IssueJobMainController { List list = issueJobMainService.getIssueJobMainList(exportReqVO); // 导出 Excel List datas = IssueJobMainConvert.INSTANCE.convertList02(list); + for(IssueJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "发料任务主.xls", "数据", IssueJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordDetailController.java index feb83e1b..b5107747 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.issueRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.issueRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,8 @@ public class IssueRecordDetailController { @Resource private IssueRecordDetailService issueRecordDetailService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建发料记录子") @@ -96,6 +100,11 @@ public class IssueRecordDetailController { List list = issueRecordDetailService.getIssueRecordDetailList(exportReqVO); // 导出 Excel List datas = IssueRecordDetailConvert.INSTANCE.convertList02(list); + for(IssueRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "发料记录子.xls", "数据", IssueRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordMainController.java index 20583aaa..10dd6b8c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.issueRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.issueRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class IssueRecordMainController { @Resource private IssueRecordMainService issueRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建发料记录主") @PreAuthorize("@ss.hasPermission('wms:issue-record-main:create')") @@ -96,6 +101,11 @@ public class IssueRecordMainController { List list = issueRecordMainService.getIssueRecordMainList(exportReqVO); // 导出 Excel List datas = IssueRecordMainConvert.INSTANCE.convertList02(list); + for(IssueRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "发料记录主.xls", "数据", IssueRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestDetailController.java index 2e9fc9db..3c4f227d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.issueRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.issueRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class IssueRequestDetailController { @Resource private IssueRequestDetailService issueRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建发料申请子") @PreAuthorize("@ss.hasPermission('wms:issue-request-detail:create')") @@ -96,6 +101,11 @@ public class IssueRequestDetailController { List list = issueRequestDetailService.getIssueRequestDetailList(exportReqVO); // 导出 Excel List datas = IssueRequestDetailConvert.INSTANCE.convertList02(list); + for(IssueRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "发料申请子.xls", "数据", IssueRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestMainController.java index 550f1e4c..a1e5f78e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.issueRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.issueRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class IssueRequestMainController { @Resource private IssueRequestMainService issueRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建发料申请主") @PreAuthorize("@ss.hasPermission('wms:issue-request-main:create')") @@ -96,6 +101,11 @@ public class IssueRequestMainController { List list = issueRequestMainService.getIssueRequestMainList(exportReqVO); // 导出 Excel List datas = IssueRequestMainConvert.INSTANCE.convertList02(list); + for(IssueRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "发料申请主.xls", "数据", IssueRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java index f4a02925..895aff75 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.itempackaging.vo.*; import com.win.module.wms.convert.itempackaging.ItempackagingConvert; import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; @@ -39,6 +41,8 @@ public class ItempackagingController { @Resource private ItempackagingService itempackagingService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建物品包装信息 ") @PreAuthorize("@ss.hasPermission('wms:itempackaging:create')") @@ -98,6 +102,11 @@ public class ItempackagingController { List list = itempackagingService.getItempackagingList(exportReqVO); // 导出 Excel List datas = ItempackagingConvert.INSTANCE.convertList02(list); + for(ItempackagingExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "物品包装信息 .xls", "数据", ItempackagingExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/JobsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/JobsettingController.java index fbd5d8da..6524c936 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/JobsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/JobsettingController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.jobsetting.vo.*; import com.win.module.wms.convert.jobsetting.JobsettingConvert; import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO; @@ -39,6 +41,9 @@ public class JobsettingController { @Resource private JobsettingService jobsettingService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建任务设置") @PreAuthorize("@ss.hasPermission('wms:jobsetting:create')") @@ -98,6 +103,11 @@ public class JobsettingController { List list = jobsettingService.getJobsettingList(exportReqVO); // 导出 Excel List datas = JobsettingConvert.INSTANCE.convertList02(list); + for(JobsettingExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "任务设置.xls", "数据", JobsettingExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java index 5a5eff8d..e0ca7166 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/LabeltypeController.java @@ -4,6 +4,8 @@ import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.PageResult; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.labeltype.vo.*; import com.win.module.wms.convert.labeltype.LabeltypeConvert; import com.win.module.wms.dal.dataobject.labeltype.LabeltypeDO; @@ -34,6 +36,9 @@ public class LabeltypeController { @Resource private LabeltypeService labeltypeService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建标签定义") @PreAuthorize("@ss.hasPermission('wms:labeltypeService:create')") @@ -93,6 +98,11 @@ public class LabeltypeController { List list = labeltypeService.getLabeltypeList(exportReqVO); // 导出 Excel List datas = LabeltypeConvert.INSTANCE.convertList02(list); + for(LabeltypeExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "标签定义.xls", "数据", LabeltypeExcelVO.class, datas); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/vo/LabeltypeExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/vo/LabeltypeExcelVO.java index 65f5a0b1..57e0696b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/vo/LabeltypeExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labeltype/vo/LabeltypeExcelVO.java @@ -1,9 +1,12 @@ package com.win.module.wms.controller.labeltype.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.*; import com.alibaba.excel.annotation.ExcelProperty; +import java.time.LocalDateTime; + /** * 标签定义 Excel VO * @@ -66,4 +69,11 @@ public class LabeltypeExcelVO { @ExcelProperty("是否压缩") private String isCompress; + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者ID") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java index cac1405b..d9df1950 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java @@ -6,6 +6,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.location.vo.*; import com.win.module.wms.convert.location.LocationConvert; import com.win.module.wms.dal.dataobject.location.LocationDO; @@ -44,6 +46,8 @@ public class LocationController { private LocationService locationService; @Resource private LocationMapper locationMapper; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建库位") @@ -104,6 +108,11 @@ public class LocationController { List list = locationService.getLocationList(exportReqVO); // 导出 Excel List datas = LocationConvert.INSTANCE.convertList02(list); + for(LocationExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库位.xls", "数据", LocationExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/LocationcapacityController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/LocationcapacityController.java index 85c2f543..35a45950 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/LocationcapacityController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/LocationcapacityController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.locationcapacity; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.locationcapacity.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class LocationcapacityController { @Resource private LocationcapacityService locationcapacityService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建库位容量") @PreAuthorize("@ss.hasPermission('wms:locationcapacity:create')") @@ -96,6 +101,11 @@ public class LocationcapacityController { List list = locationcapacityService.getLocationcapacityList(exportReqVO); // 导出 Excel List datas = LocationcapacityConvert.INSTANCE.convertList02(list); + for(LocationcapacityExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库位容量.xls", "数据", LocationcapacityExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityExcelVO.java index a0e48c4f..a84e4a0b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityExcelVO.java @@ -1,7 +1,10 @@ package com.win.module.wms.controller.locationcapacity.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; + +import java.time.LocalDateTime; import java.util.*; import java.math.BigDecimal; import java.math.BigDecimal; @@ -34,5 +37,11 @@ public class LocationcapacityExcelVO { @ExcelProperty("是否无限容量") private String isInfinity; + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者ID") + private String creator; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java index 7bd8cac0..8e16c8f7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.locationgroup.vo.*; import com.win.module.wms.convert.locationgroup.LocationgroupConvert; import com.win.module.wms.dal.dataobject.locationgroup.LocationgroupDO; @@ -38,6 +40,8 @@ public class LocationgroupController { @Resource private LocationgroupService locationgroupService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建库位组") @@ -98,6 +102,11 @@ public class LocationgroupController { List list = locationgroupService.getLocationgroupList(exportReqVO); // 导出 Excel List datas = LocationgroupConvert.INSTANCE.convertList02(list); + for(LocationgroupExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库位组.xls", "数据", LocationgroupExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordDetailController.java index 327e8816..36377d6d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.offlinesettlementRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.offlinesettlementRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,8 @@ public class OfflinesettlementRecordDetailController { @Resource private OfflinesettlementRecordDetailService offlinesettlementRecordDetailService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建下线结算记录子") @@ -96,6 +100,11 @@ public class OfflinesettlementRecordDetailController { List list = offlinesettlementRecordDetailService.getOfflinesettlementRecordDetailList(exportReqVO); // 导出 Excel List datas = OfflinesettlementRecordDetailConvert.INSTANCE.convertList02(list); + for(OfflinesettlementRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "下线结算记录子.xls", "数据", OfflinesettlementRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordMainController.java index 35811517..c1ef89a9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/OfflinesettlementRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.offlinesettlementRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.offlinesettlementRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class OfflinesettlementRecordMainController { @Resource private OfflinesettlementRecordMainService offlinesettlementRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建下线结算记录主") @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-record-main:create')") @@ -96,6 +101,11 @@ public class OfflinesettlementRecordMainController { List list = offlinesettlementRecordMainService.getOfflinesettlementRecordMainList(exportReqVO); // 导出 Excel List datas = OfflinesettlementRecordMainConvert.INSTANCE.convertList02(list); + for(OfflinesettlementRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "下线结算记录主.xls", "数据", OfflinesettlementRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestDetailController.java index c6c12fc3..baa45795 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.offlinesettlementRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.offlinesettlementRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class OfflinesettlementRequestDetailController { @Resource private OfflinesettlementRequestDetailService offlinesettlementRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建下线结算申请子") @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-request-detail:create')") @@ -96,6 +101,11 @@ public class OfflinesettlementRequestDetailController { List list = offlinesettlementRequestDetailService.getOfflinesettlementRequestDetailList(exportReqVO); // 导出 Excel List datas = OfflinesettlementRequestDetailConvert.INSTANCE.convertList02(list); + for(OfflinesettlementRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "下线结算申请子.xls", "数据", OfflinesettlementRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestMainController.java index 7affdad8..50adf550 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/OfflinesettlementRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.offlinesettlementRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.offlinesettlementRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class OfflinesettlementRequestMainController { @Resource private OfflinesettlementRequestMainService offlinesettlementRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建下线结算申请主") @PreAuthorize("@ss.hasPermission('wms:offlinesettlement-request-main:create')") @@ -96,6 +101,11 @@ public class OfflinesettlementRequestMainController { List list = offlinesettlementRequestMainService.getOfflinesettlementRequestMainList(exportReqVO); // 导出 Excel List datas = OfflinesettlementRequestMainConvert.INSTANCE.convertList02(list); + for(OfflinesettlementRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "下线结算申请主.xls", "数据", OfflinesettlementRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordDetailController.java index 2affeb2b..0b3b0ef8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.onlinesettlementRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.onlinesettlementRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class OnlinesettlementRecordDetailController { @Resource private OnlinesettlementRecordDetailService onlinesettlementRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建上线结算记录子") @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-record-detail:create')") @@ -96,6 +101,11 @@ public class OnlinesettlementRecordDetailController { List list = onlinesettlementRecordDetailService.getOnlinesettlementRecordDetailList(exportReqVO); // 导出 Excel List datas = OnlinesettlementRecordDetailConvert.INSTANCE.convertList02(list); + for(OnlinesettlementRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "上线结算记录子.xls", "数据", OnlinesettlementRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordMainController.java index 90af4d3c..ab781efc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/OnlinesettlementRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.onlinesettlementRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.onlinesettlementRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class OnlinesettlementRecordMainController { @Resource private OnlinesettlementRecordMainService onlinesettlementRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建上线结算记录主") @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-record-main:create')") @@ -96,6 +101,11 @@ public class OnlinesettlementRecordMainController { List list = onlinesettlementRecordMainService.getOnlinesettlementRecordMainList(exportReqVO); // 导出 Excel List datas = OnlinesettlementRecordMainConvert.INSTANCE.convertList02(list); + for(OnlinesettlementRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "上线结算记录主.xls", "数据", OnlinesettlementRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestDetailController.java index ddaa0596..4849a238 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.onlinesettlementRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.onlinesettlementRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class OnlinesettlementRequestDetailController { @Resource private OnlinesettlementRequestDetailService onlinesettlementRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建上线结算申请子") @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-request-detail:create')") @@ -96,6 +101,11 @@ public class OnlinesettlementRequestDetailController { List list = onlinesettlementRequestDetailService.getOnlinesettlementRequestDetailList(exportReqVO); // 导出 Excel List datas = OnlinesettlementRequestDetailConvert.INSTANCE.convertList02(list); + for(OnlinesettlementRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "上线结算申请子.xls", "数据", OnlinesettlementRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestMainController.java index de7074b9..ecaf9821 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/OnlinesettlementRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.onlinesettlementRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.onlinesettlementRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class OnlinesettlementRequestMainController { @Resource private OnlinesettlementRequestMainService onlinesettlementRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建上线结算申请主") @PreAuthorize("@ss.hasPermission('wms:onlinesettlement-request-main:create')") @@ -96,6 +101,11 @@ public class OnlinesettlementRequestMainController { List list = onlinesettlementRequestMainService.getOnlinesettlementRequestMainList(exportReqVO); // 导出 Excel List datas = OnlinesettlementRequestMainConvert.INSTANCE.convertList02(list); + for(OnlinesettlementRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "上线结算申请主.xls", "数据", OnlinesettlementRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java index bb307759..f9955b09 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.owner.vo.*; import com.win.module.wms.convert.owner.OwnerConvert; import com.win.module.wms.dal.dataobject.owner.OwnerDO; @@ -39,6 +41,9 @@ public class OwnerController { @Resource private OwnerService ownerService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建货主") @PreAuthorize("@ss.hasPermission('wms:owner:create')") @@ -98,6 +103,11 @@ public class OwnerController { List list = ownerService.getOwnerList(exportReqVO); // 导出 Excel List datas = OwnerConvert.INSTANCE.convertList02(list); + for(OwnerExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "货主.xls", "数据", OwnerExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java index f5fb37be..fc047f03 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/PackageController.java @@ -1,6 +1,8 @@ package com.win.module.wms.controller.packageMassage; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.packageMassage.vo.*; import com.win.module.wms.dal.mysql.packageMassage.PackageMapper; import org.springframework.web.bind.annotation.*; @@ -42,6 +44,8 @@ public class PackageController { @Resource private PackageService packageService; @Resource + private AdminUserApi userApi; + @Resource private PackageMapper packageMapper; @PostMapping("/create") @Operation(summary = "创建包装") @@ -102,6 +106,11 @@ public class PackageController { // 导出 Excel List datas = PackageConvert.INSTANCE.convertList02(list); + for(PackageExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "包装.xls", "数据", PackageExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExcelVO.java index 1e3a86d3..e56a8e81 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExcelVO.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.packageMassage.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -149,4 +150,11 @@ public class PackageExcelVO { @ExcelProperty("体积") private String volume; + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者ID") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java index 48f6118b..68fa2d12 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/ParamsettingController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.paramsetting.vo.*; import com.win.module.wms.convert.paramsetting.ParamsettingConvert; import com.win.module.wms.dal.dataobject.paramsetting.ParamsettingDO; @@ -38,6 +40,9 @@ public class ParamsettingController { @Resource private ParamsettingService paramsettingService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建参数设置") @@ -98,6 +103,11 @@ public class ParamsettingController { List list = paramsettingService.getParamsettingList(exportReqVO); // 导出 Excel List datas = ParamsettingConvert.INSTANCE.convertList02(list); + for(ParamsettingExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "参数设置.xls", "数据", ParamsettingExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/vo/ParamsettingExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/vo/ParamsettingExcelVO.java index 9bf3dbd8..58334f37 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/vo/ParamsettingExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/paramsetting/vo/ParamsettingExcelVO.java @@ -1,7 +1,10 @@ package com.win.module.wms.controller.paramsetting.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; + +import java.time.LocalDateTime; import java.util.*; import com.alibaba.excel.annotation.ExcelProperty; @@ -47,4 +50,11 @@ public class ParamsettingExcelVO { @ExcelProperty("必填") private String isRequired; + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者ID") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobDetailController.java index 773e8cc3..4a06cda4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.pickJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.pickJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class PickJobDetailController { @Resource private PickJobDetailService pickJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建拣料任务子") @PreAuthorize("@ss.hasPermission('wms:pick-job-detail:create')") @@ -96,6 +101,11 @@ public class PickJobDetailController { List list = pickJobDetailService.getPickJobDetailList(exportReqVO); // 导出 Excel List datas = PickJobDetailConvert.INSTANCE.convertList02(list); + for(PickJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "拣料任务子.xls", "数据", PickJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java index fe064499..da114a53 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/PickJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.pickJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.pickJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,8 @@ public class PickJobMainController { @Resource private PickJobMainService pickJobMainService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建拣料任务主") @@ -96,6 +100,11 @@ public class PickJobMainController { List list = pickJobMainService.getPickJobMainList(exportReqVO); // 导出 Excel List datas = PickJobMainConvert.INSTANCE.convertList02(list); + for(PickJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "拣料任务主.xls", "数据", PickJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailExcelVO.java index 0134e83f..f1853631 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailExcelVO.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.pickJob.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -67,6 +68,7 @@ public class PickJobDetailExcelVO { private String remark; @ExcelProperty("创建时间") + @ColumnWidth(value = 16) private LocalDateTime createTime; @ExcelProperty("创建者Id") @@ -78,4 +80,9 @@ public class PickJobDetailExcelVO { @ExcelProperty("到货主代码") private String toOwnerCode; + + + @ExcelProperty("创建者ID") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordDetailController.java index 66fe9219..123be98d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.pickRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.pickRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class PickRecordDetailController { @Resource private PickRecordDetailService pickRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建拣料记录子") @PreAuthorize("@ss.hasPermission('wms:pick-record-detail:create')") @@ -96,6 +101,11 @@ public class PickRecordDetailController { List list = pickRecordDetailService.getPickRecordDetailList(exportReqVO); // 导出 Excel List datas = PickRecordDetailConvert.INSTANCE.convertList02(list); + for(PickRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "拣料记录子.xls", "数据", PickRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordMainController.java index 3e462552..b4745fc2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/PickRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.pickRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.pickRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class PickRecordMainController { @Resource private PickRecordMainService pickRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建拣料记录主") @PreAuthorize("@ss.hasPermission('wms:pick-record-main:create')") @@ -96,6 +101,11 @@ public class PickRecordMainController { List list = pickRecordMainService.getPickRecordMainList(exportReqVO); // 导出 Excel List datas = PickRecordMainConvert.INSTANCE.convertList02(list); + for(PickRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "拣料记录主.xls", "数据", PickRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestDetailController.java index bcd9616a..ea5740b0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.pickRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.pickRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class PickRequestDetailController { @Resource private PickRequestDetailService pickRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建拣料申请子") @PreAuthorize("@ss.hasPermission('wms:pick-request-detail:create')") @@ -96,6 +101,11 @@ public class PickRequestDetailController { List list = pickRequestDetailService.getPickRequestDetailList(exportReqVO); // 导出 Excel List datas = PickRequestDetailConvert.INSTANCE.convertList02(list); + for(PickRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "拣料申请子.xls", "数据", PickRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestMainController.java index b53105f7..4173d244 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/PickRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.pickRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.pickRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class PickRequestMainController { @Resource private PickRequestMainService pickRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建拣料申请主") @PreAuthorize("@ss.hasPermission('wms:pick-request-main:create')") @@ -96,6 +101,11 @@ public class PickRequestMainController { List list = pickRequestMainService.getPickRequestMainList(exportReqVO); // 导出 Excel List datas = PickRequestMainConvert.INSTANCE.convertList02(list); + for(PickRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "拣料申请主.xls", "数据", PickRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueDetailController.java index e599a5c3..a5db71a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.preparetoissue; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.preparetoissue.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class PreparetoissueDetailController { @Resource private PreparetoissueDetailService preparetoissueDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建备料计划子") @PreAuthorize("@ss.hasPermission('wms:preparetoissue-detail:create')") @@ -96,6 +101,11 @@ public class PreparetoissueDetailController { List list = preparetoissueDetailService.getPreparetoissueDetailList(exportReqVO); // 导出 Excel List datas = PreparetoissueDetailConvert.INSTANCE.convertList02(list); + for(PreparetoissueDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "备料计划子.xls", "数据", PreparetoissueDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueMainController.java index 81171555..a3ad13c7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/PreparetoissueMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.preparetoissue; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.preparetoissue.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -35,6 +37,8 @@ public class PreparetoissueMainController { @Resource private PreparetoissueMainService preparetoissueMainService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建备料计划主") @@ -95,6 +99,11 @@ public class PreparetoissueMainController { List list = preparetoissueMainService.getPreparetoissueMainList(exportReqVO); // 导出 Excel List datas = PreparetoissueMainConvert.INSTANCE.convertList02(list); + for(PreparetoissueMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "备料计划主.xls", "数据", PreparetoissueMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java index 96c37828..4eeaf2a5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.process.vo.*; import com.win.module.wms.convert.process.ProcessConvert; import com.win.module.wms.dal.dataobject.process.ProcessDO; @@ -39,6 +41,9 @@ public class ProcessController { @Resource private ProcessService processService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建工序") @PreAuthorize("@ss.hasPermission('wms:process:create')") @@ -98,6 +103,11 @@ public class ProcessController { List list = processService.getProcessList(exportReqVO); // 导出 Excel List datas = ProcessConvert.INSTANCE.convertList02(list); + for(ProcessExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "工序.xls", "数据", ProcessExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobDetailController.java index af89218b..bbe8daab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productdismantleJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productdismantleJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductdismantleJobDetailController { @Resource private ProductdismantleJobDetailService productdismantleJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品拆解任务子") @PreAuthorize("@ss.hasPermission('wms:productdismantle-job-detail:create')") @@ -96,6 +101,11 @@ public class ProductdismantleJobDetailController { List list = productdismantleJobDetailService.getProductdismantleJobDetailList(exportReqVO); // 导出 Excel List datas = ProductdismantleJobDetailConvert.INSTANCE.convertList02(list); + for(ProductdismantleJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品拆解任务子.xls", "数据", ProductdismantleJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java index bcc73ac0..35d852aa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/ProductdismantleJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productdismantleJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productdismantleJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,9 @@ public class ProductdismantleJobMainController { @Resource private ProductdismantleJobMainService productdismantleJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品拆解任务主") @PreAuthorize("@ss.hasPermission('wms:productdismantle-job-main:create')") @@ -95,6 +100,11 @@ public class ProductdismantleJobMainController { List list = productdismantleJobMainService.getProductdismantleJobMainList(exportReqVO); // 导出 Excel List datas = ProductdismantleJobMainConvert.INSTANCE.convertList02(list); + for(ProductdismantleJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品拆解任务主.xls", "数据", ProductdismantleJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/ProductdismantleRecordDetailaController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/ProductdismantleRecordDetailaController.java index 78bc717c..36e3d75a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/ProductdismantleRecordDetailaController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/ProductdismantleRecordDetailaController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productdismantleRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productdismantleRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductdismantleRecordDetailaController { @Resource private ProductdismantleRecordDetailaService productdismantleRecordDetailaService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品拆解记录子") @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-detaila:create')") @@ -96,6 +101,11 @@ public class ProductdismantleRecordDetailaController { List list = productdismantleRecordDetailaService.getProductdismantleRecordDetailaList(exportReqVO); // 导出 Excel List datas = ProductdismantleRecordDetailaConvert.INSTANCE.convertList02(list); + for(ProductdismantleRecordDetailaExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品拆解记录子.xls", "数据", ProductdismantleRecordDetailaExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/ProductdismantleRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/ProductdismantleRecordMainController.java index 018775d8..0ea6c569 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/ProductdismantleRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecordMain/ProductdismantleRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productdismantleRecordMain; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productdismantleRecordMain.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductdismantleRecordMainController { @Resource private ProductdismantleRecordMainService productdismantleRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品拆解记录主") @PreAuthorize("@ss.hasPermission('wms:productdismantle-record-main:create')") @@ -96,6 +101,11 @@ public class ProductdismantleRecordMainController { List list = productdismantleRecordMainService.getProductdismantleRecordMainList(exportReqVO); // 导出 Excel List datas = ProductdismantleRecordMainConvert.INSTANCE.convertList02(list); + for(ProductdismantleRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品拆解记录主.xls", "数据", ProductdismantleRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailaController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailaController.java index fdf70c14..5cc436fa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailaController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestDetailaController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productdismantleRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productdismantleRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductdismantleRequestDetailaController { @Resource private ProductdismantleRequestDetailaService productdismantleRequestDetailaService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品拆解申请子") @PreAuthorize("@ss.hasPermission('wms:productdismantle-request-detaila:create')") @@ -96,6 +101,11 @@ public class ProductdismantleRequestDetailaController { List list = productdismantleRequestDetailaService.getProductdismantleRequestDetailaList(exportReqVO); // 导出 Excel List datas = ProductdismantleRequestDetailaConvert.INSTANCE.convertList02(list); + for(ProductdismantleRequestDetailaExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品拆解申请子.xls", "数据", ProductdismantleRequestDetailaExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestMainController.java index fa1dcec3..1530c948 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/ProductdismantleRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productdismantleRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productdismantleRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductdismantleRequestMainController { @Resource private ProductdismantleRequestMainService productdismantleRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品拆解申请主") @PreAuthorize("@ss.hasPermission('wms:productdismantle-request-main:create')") @@ -96,6 +101,11 @@ public class ProductdismantleRequestMainController { List list = productdismantleRequestMainService.getProductdismantleRequestMainList(exportReqVO); // 导出 Excel List datas = ProductdismantleRequestMainConvert.INSTANCE.convertList02(list); + for(ProductdismantleRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品拆解申请主.xls", "数据", ProductdismantleRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionDetailController.java index 86ebc847..1dcfa47b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.production; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.production.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductionDetailController { @Resource private ProductionDetailService productionDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建生产计划子") @PreAuthorize("@ss.hasPermission('wms:production-detail:create')") @@ -96,6 +101,11 @@ public class ProductionDetailController { List list = productionDetailService.getProductionDetailList(exportReqVO); // 导出 Excel List datas = ProductionDetailConvert.INSTANCE.convertList02(list); + for(ProductionDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "生产计划子.xls", "数据", ProductionDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionMainController.java index 5e1c2951..9d72d587 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/ProductionMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.production; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.production.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductionMainController { @Resource private ProductionMainService productionMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建生产计划主") @PreAuthorize("@ss.hasPermission('wms:production-main:create')") @@ -96,6 +101,11 @@ public class ProductionMainController { List list = productionMainService.getProductionMainList(exportReqVO); // 导出 Excel List datas = ProductionMainConvert.INSTANCE.convertList02(list); + for(ProductionMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "生产计划主.xls", "数据", ProductionMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailBaseVO.java index 202d272a..cfa80526 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailBaseVO.java @@ -23,12 +23,6 @@ public class ProductionDetailBaseVO { @Schema(description = "id", example = "id") private Long id; - @Schema(description = "订单号") - private String woNumber; - - @Schema(description = "订单行") - private String woLine; - @Schema(description = "Bom版本") private String bomVersion; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExcelVO.java index 5658eb64..005fe746 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExcelVO.java @@ -22,12 +22,6 @@ import com.win.framework.excel.core.convert.DictConvert; @Data public class ProductionDetailExcelVO { - @ExcelProperty("订单号") - private String woNumber; - - @ExcelProperty("订单行") - private String woLine; - @ExcelProperty("Bom版本") private String bomVersion; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExportReqVO.java index 2a97c76b..cac5ce7d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExportReqVO.java @@ -15,12 +15,6 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY @Data public class ProductionDetailExportReqVO { - @Schema(description = "订单号") - private String woNumber; - - @Schema(description = "订单行") - private String woLine; - @Schema(description = "Bom版本") private String bomVersion; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailPageReqVO.java index 63b99baa..2205f60b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailPageReqVO.java @@ -17,12 +17,6 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY @ToString(callSuper = true) public class ProductionDetailPageReqVO extends PageParam { - @Schema(description = "订单号") - private String woNumber; - - @Schema(description = "订单行") - private String woLine; - @Schema(description = "Bom版本") private String bomVersion; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainBaseVO.java index a6467c1d..36d09875 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainBaseVO.java @@ -80,4 +80,10 @@ public class ProductionMainBaseVO { @Schema(description = "是否可用") private String available; + @Schema(description = "订单号") + private String woNumber; + + @Schema(description = "订单行") + private String woLine; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExcelVO.java index 8175e391..2bdaf20e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExcelVO.java @@ -74,4 +74,9 @@ public class ProductionMainExcelVO { @ExcelProperty("是否可用") private String available; + @ExcelProperty("订单号") + private String woNumber; + + @ExcelProperty("订单行") + private String woLine; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExportReqVO.java index 6785618a..cf86c928 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExportReqVO.java @@ -69,4 +69,10 @@ public class ProductionMainExportReqVO { @Schema(description = "是否可用") private String available; + @Schema(description = "订单号") + private String woNumber; + + @Schema(description = "订单行") + private String woLine; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainPageReqVO.java index 6ebd9f6d..80d1e028 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainPageReqVO.java @@ -71,4 +71,9 @@ public class ProductionMainPageReqVO extends PageParam { @Schema(description = "是否可用") private String available; + @Schema(description = "订单号") + private String woNumber; + + @Schema(description = "订单行") + private String woLine; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java index 9736f9f9..ff676f83 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionline.vo.ProductionlineImportExcelVO; import com.win.module.wms.controller.productionline.vo.*; import com.win.module.wms.convert.productionline.ProductionlineConvert; @@ -39,6 +41,8 @@ public class ProductionlineController { @Resource private ProductionlineService productionlineService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建生产线") @@ -99,6 +103,11 @@ public class ProductionlineController { List list = productionlineService.getProductionlineList(exportReqVO); // 导出 Excel List datas = ProductionlineConvert.INSTANCE.convertList02(list); + for(ProductionlineExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "生产线.xls", "数据", ProductionlineExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java index 44e0f3fb..7de06016 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/ProductionlineitemController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionlineitem.vo.ProductionlineItemImportExcelVO; import com.win.module.wms.controller.productionlineitem.vo.*; import com.win.module.wms.convert.productionlineitem.ProductionlineitemConvert; @@ -40,6 +42,9 @@ public class ProductionlineitemController { @Resource private ProductionlineitemService productionlineitemService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建生产线物料关系") @PreAuthorize("@ss.hasPermission('wms:productionlineitem:create')") @@ -99,6 +104,11 @@ public class ProductionlineitemController { List list = productionlineitemService.getProductionlineitemList(exportReqVO); // 导出 Excel List datas = ProductionlineitemConvert.INSTANCE.convertList02(list); + for(ProductionlineitemExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "生产线物料关系.xls", "数据", ProductionlineitemExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobDetailController.java index 464cf551..ccb2145d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productionreceiptJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreceiptJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductionreceiptJobDetailController { @Resource private ProductionreceiptJobDetailService productionreceiptJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建生产收料任务子") @PreAuthorize("@ss.hasPermission('wms:productionreceipt-job-detail:create')") @@ -96,6 +101,12 @@ public class ProductionreceiptJobDetailController { List list = productionreceiptJobDetailService.getProductionreceiptJobDetailList(exportReqVO); // 导出 Excel List datas = ProductionreceiptJobDetailConvert.INSTANCE.convertList02(list); + for(ProductionreceiptJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + ExcelUtils.write(response, "生产收料任务子.xls", "数据", ProductionreceiptJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java index 7c28b337..c0454fe3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/ProductionreceiptJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productionreceiptJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreceiptJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,8 @@ public class ProductionreceiptJobMainController { @Resource private ProductionreceiptJobMainService productionreceiptJobMainService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建生产收料任务主") @PreAuthorize("@ss.hasPermission('wms:productionreceipt-job-main:create')") @@ -96,6 +100,11 @@ public class ProductionreceiptJobMainController { List list = productionreceiptJobMainService.getProductionreceiptJobMainList(exportReqVO); // 导出 Excel List datas = ProductionreceiptJobMainConvert.INSTANCE.convertList02(list); + for(ProductionreceiptJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "生产收料任务主.xls", "数据", ProductionreceiptJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordDetailController.java index b2f5942c..5ddeef1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productionreceiptRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreceiptRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,8 @@ public class ProductionreceiptRecordDetailController { @Resource private ProductionreceiptRecordDetailService productionreceiptRecordDetailService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建生产收料记录子") @@ -96,6 +100,11 @@ public class ProductionreceiptRecordDetailController { List list = productionreceiptRecordDetailService.getProductionreceiptRecordDetailList(exportReqVO); // 导出 Excel List datas = ProductionreceiptRecordDetailConvert.INSTANCE.convertList02(list); + for(ProductionreceiptRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "生产收料记录子.xls", "数据", ProductionreceiptRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordMainController.java index c8829caf..cb8bc188 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/ProductionreceiptRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productionreceiptRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreceiptRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductionreceiptRecordMainController { @Resource private ProductionreceiptRecordMainService productionreceiptRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建生产收料记录主") @PreAuthorize("@ss.hasPermission('wms:productionreceipt-record-main:create')") @@ -96,6 +101,11 @@ public class ProductionreceiptRecordMainController { List list = productionreceiptRecordMainService.getProductionreceiptRecordMainList(exportReqVO); // 导出 Excel List datas = ProductionreceiptRecordMainConvert.INSTANCE.convertList02(list); + for(ProductionreceiptRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "生产收料记录主.xls", "数据", ProductionreceiptRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobDetailController.java index cbe1d24e..ecf36ca8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productionreturnJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreturnJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductionreturnJobDetailController { @Resource private ProductionreturnJobDetailService productionreturnJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建生产退料任务子") @PreAuthorize("@ss.hasPermission('wms:productionreturn-job-detail:create')") @@ -96,6 +101,11 @@ public class ProductionreturnJobDetailController { List list = productionreturnJobDetailService.getProductionreturnJobDetailList(exportReqVO); // 导出 Excel List datas = ProductionreturnJobDetailConvert.INSTANCE.convertList02(list); + for(ProductionreturnJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "生产退料任务子.xls", "数据", ProductionreturnJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java index 006d1b83..edd5a799 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/ProductionreturnJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productionreturnJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreturnJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductionreturnJobMainController { @Resource private ProductionreturnJobMainService productionreturnJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建生产退料任务主") @PreAuthorize("@ss.hasPermission('wms:productionreturn-job-main:create')") @@ -96,6 +101,11 @@ public class ProductionreturnJobMainController { List list = productionreturnJobMainService.getProductionreturnJobMainList(exportReqVO); // 导出 Excel List datas = ProductionreturnJobMainConvert.INSTANCE.convertList02(list); + for(ProductionreturnJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "生产退料任务主.xls", "数据", ProductionreturnJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordDetailController.java index 94a62e3f..e98013ab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productionreturnRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreturnRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductionreturnRecordDetailController { @Resource private ProductionreturnRecordDetailService productionreturnRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建生产退料记录子") @PreAuthorize("@ss.hasPermission('wms:productionreturn-record-detail:create')") @@ -96,6 +101,11 @@ public class ProductionreturnRecordDetailController { List list = productionreturnRecordDetailService.getProductionreturnRecordDetailList(exportReqVO); // 导出 Excel List datas = ProductionreturnRecordDetailConvert.INSTANCE.convertList02(list); + for(ProductionreturnRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "生产退料记录子.xls", "数据", ProductionreturnRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordMainController.java index f131cf87..d53902e2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/ProductionreturnRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productionreturnRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreturnRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductionreturnRecordMainController { @Resource private ProductionreturnRecordMainService productionreturnRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建生产退料记录主") @PreAuthorize("@ss.hasPermission('wms:productionreturn-record-main:create')") @@ -96,6 +101,11 @@ public class ProductionreturnRecordMainController { List list = productionreturnRecordMainService.getProductionreturnRecordMainList(exportReqVO); // 导出 Excel List datas = ProductionreturnRecordMainConvert.INSTANCE.convertList02(list); + for(ProductionreturnRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "生产退料记录主.xls", "数据", ProductionreturnRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestDetailController.java index 2270a673..af78e8b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productionreturnRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreturnRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductionreturnRequestDetailController { @Resource private ProductionreturnRequestDetailService productionreturnRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建生产退料申请子") @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-detail:create')") @@ -96,6 +101,11 @@ public class ProductionreturnRequestDetailController { List list = productionreturnRequestDetailService.getProductionreturnRequestDetailList(exportReqVO); // 导出 Excel List datas = ProductionreturnRequestDetailConvert.INSTANCE.convertList02(list); + for(ProductionreturnRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "生产退料申请子.xls", "数据", ProductionreturnRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java index b5339056..519e2fbd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/ProductionreturnRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productionreturnRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productionreturnRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductionreturnRequestMainController { @Resource private ProductionreturnRequestMainService productionreturnRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建生产退料申请主") @PreAuthorize("@ss.hasPermission('wms:productionreturn-request-main:create')") @@ -96,6 +101,11 @@ public class ProductionreturnRequestMainController { List list = productionreturnRequestMainService.getProductionreturnRequestMainList(exportReqVO); // 导出 Excel List datas = ProductionreturnRequestMainConvert.INSTANCE.convertList02(list); + for(ProductionreturnRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "生产退料申请主.xls", "数据", ProductionreturnRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobDetailController.java index 31ea48d7..7a9de4cd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productputawayJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productputawayJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,8 @@ public class ProductputawayJobDetailController { @Resource private ProductputawayJobDetailService productputawayJobDetailService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建制品上架任务子") @@ -96,6 +100,11 @@ public class ProductputawayJobDetailController { List list = productputawayJobDetailService.getProductputawayJobDetailList(exportReqVO); // 导出 Excel List datas = ProductputawayJobDetailConvert.INSTANCE.convertList02(list); + for(ProductputawayJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品上架任务子.xls", "数据", ProductputawayJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java index 0c40f721..9f18df24 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/ProductputawayJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productputawayJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productputawayJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductputawayJobMainController { @Resource private ProductputawayJobMainService productputawayJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品上架任务主") @PreAuthorize("@ss.hasPermission('wms:productputaway-job-main:create')") @@ -96,6 +101,11 @@ public class ProductputawayJobMainController { List list = productputawayJobMainService.getProductputawayJobMainList(exportReqVO); // 导出 Excel List datas = ProductputawayJobMainConvert.INSTANCE.convertList02(list); + for(ProductputawayJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品上架任务主.xls", "数据", ProductputawayJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordDetailController.java index 0890da61..a2206c96 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productputawayRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productputawayRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductputawayRecordDetailController { @Resource private ProductputawayRecordDetailService productputawayRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品上架记录子") @PreAuthorize("@ss.hasPermission('wms:productputaway-record-detail:create')") @@ -96,6 +101,11 @@ public class ProductputawayRecordDetailController { List list = productputawayRecordDetailService.getProductputawayRecordDetailList(exportReqVO); // 导出 Excel List datas = ProductputawayRecordDetailConvert.INSTANCE.convertList02(list); + for(ProductputawayRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品上架记录子.xls", "数据", ProductputawayRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordMainController.java index 777a1d3f..9294da5b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/ProductputawayRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productputawayRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productputawayRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductputawayRecordMainController { @Resource private ProductputawayRecordMainService productputawayRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品上架记录主") @PreAuthorize("@ss.hasPermission('wms:productputaway-record-main:create')") @@ -96,6 +101,11 @@ public class ProductputawayRecordMainController { List list = productputawayRecordMainService.getProductputawayRecordMainList(exportReqVO); // 导出 Excel List datas = ProductputawayRecordMainConvert.INSTANCE.convertList02(list); + for(ProductputawayRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品上架记录主.xls", "数据", ProductputawayRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestDetailController.java index a16d6eda..ea5e989a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productputawayRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productputawayRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductputawayRequestDetailController { @Resource private ProductputawayRequestDetailService productputawayRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品上架申请子") @PreAuthorize("@ss.hasPermission('wms:productputaway-request-detail:create')") @@ -96,6 +101,11 @@ public class ProductputawayRequestDetailController { List list = productputawayRequestDetailService.getProductputawayRequestDetailList(exportReqVO); // 导出 Excel List datas = ProductputawayRequestDetailConvert.INSTANCE.convertList02(list); + for(ProductputawayRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品上架申请子.xls", "数据", ProductputawayRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java index 8ac1a01d..21ffd7dc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/ProductputawayRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productputawayRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productputawayRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductputawayRequestMainController { @Resource private ProductputawayRequestMainService productputawayRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品上架申请主") @PreAuthorize("@ss.hasPermission('wms:productputaway-request-main:create')") @@ -96,6 +101,11 @@ public class ProductputawayRequestMainController { List list = productputawayRequestMainService.getProductputawayRequestMainList(exportReqVO); // 导出 Excel List datas = ProductputawayRequestMainConvert.INSTANCE.convertList02(list); + for(ProductputawayRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品上架申请主.xls", "数据", ProductputawayRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobDetailController.java index 95aaa4b5..788532f1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobDetailController.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.productreceiptJob; +import com.win.module.system.api.user.AdminUserApi; import com.win.module.wms.controller.productreceiptJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +38,9 @@ public class ProductreceiptJobDetailController { @Resource private ProductreceiptJobDetailService productreceiptJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品收货任务子") @PreAuthorize("@ss.hasPermission('wms:productreceipt-job-detail:create')") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java index 3b26d8ef..6abd3332 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/ProductreceiptJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productreceiptJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productreceiptJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductreceiptJobMainController { @Resource private ProductreceiptJobMainService productreceiptJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品收货任务主") @PreAuthorize("@ss.hasPermission('wms:productreceipt-job-main:create')") @@ -96,6 +101,11 @@ public class ProductreceiptJobMainController { List list = productreceiptJobMainService.getProductreceiptJobMainList(exportReqVO); // 导出 Excel List datas = ProductreceiptJobMainConvert.INSTANCE.convertList02(list); + for(ProductreceiptJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品收货任务主.xls", "数据", ProductreceiptJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java index baed4392..06aad426 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productreceiptRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productreceiptRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductreceiptRecordDetailController { @Resource private ProductreceiptRecordDetailService productreceiptRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品收货记录子") @PreAuthorize("@ss.hasPermission('wms:productreceipt-record-detail:create')") @@ -96,6 +101,11 @@ public class ProductreceiptRecordDetailController { List list = productreceiptRecordDetailService.getProductreceiptRecordDetailList(exportReqVO); // 导出 Excel List datas = ProductreceiptRecordDetailConvert.INSTANCE.convertList02(list); + for(ProductreceiptRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品收货记录子.xls", "数据", ProductreceiptRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java index 517a36cf..9779f29d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/ProductreceiptRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productreceiptRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productreceiptRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductreceiptRecordMainController { @Resource private ProductreceiptRecordMainService productreceiptRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品收货记录主") @PreAuthorize("@ss.hasPermission('wms:productreceipt-record-main:create')") @@ -96,6 +101,11 @@ public class ProductreceiptRecordMainController { List list = productreceiptRecordMainService.getProductreceiptRecordMainList(exportReqVO); // 导出 Excel List datas = ProductreceiptRecordMainConvert.INSTANCE.convertList02(list); + for(ProductreceiptRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品收货记录主.xls", "数据", ProductreceiptRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java index 813c8dcf..09a2092b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productreceiptRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productreceiptRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductreceiptRequestDetailController { @Resource private ProductreceiptRequestDetailService productreceiptRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品收货申请子") @PreAuthorize("@ss.hasPermission('wms:productreceipt-request-detail:create')") @@ -96,6 +101,11 @@ public class ProductreceiptRequestDetailController { List list = productreceiptRequestDetailService.getProductreceiptRequestDetailList(exportReqVO); // 导出 Excel List datas = ProductreceiptRequestDetailConvert.INSTANCE.convertList02(list); + for(ProductreceiptRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品收货申请子.xls", "数据", ProductreceiptRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java index 1f652ee6..b2dd4753 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/ProductreceiptRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productreceiptRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productreceiptRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,9 @@ public class ProductreceiptRequestMainController { @Resource private ProductreceiptRequestMainService productreceiptRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品收货申请主") @PreAuthorize("@ss.hasPermission('wms:productreceipt-request-main:create')") @@ -95,6 +100,11 @@ public class ProductreceiptRequestMainController { List list = productreceiptRequestMainService.getProductreceiptRequestMainList(exportReqVO); // 导出 Excel List datas = ProductreceiptRequestMainConvert.INSTANCE.convertList02(list); + for(ProductreceiptRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品收货申请主.xls", "数据", ProductreceiptRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java index 824729c8..dac7f27a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productrepairRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productrepairRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductrepairRecordDetailController { @Resource private ProductrepairRecordDetailService productrepairRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品返修记录子") @PreAuthorize("@ss.hasPermission('wms:productrepair-record-detail:create')") @@ -96,6 +101,12 @@ public class ProductrepairRecordDetailController { List list = productrepairRecordDetailService.getProductrepairRecordDetailList(exportReqVO); // 导出 Excel List datas = ProductrepairRecordDetailConvert.INSTANCE.convertList02(list); + + for(ProductrepairRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品返修记录子.xls", "数据", ProductrepairRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordMainController.java index 0b2f5aec..26c8380e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/ProductrepairRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productrepairRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productrepairRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,8 @@ public class ProductrepairRecordMainController { @Resource private ProductrepairRecordMainService productrepairRecordMainService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建制品返修记录主") @@ -96,6 +100,11 @@ public class ProductrepairRecordMainController { List list = productrepairRecordMainService.getProductrepairRecordMainList(exportReqVO); // 导出 Excel List datas = ProductrepairRecordMainConvert.INSTANCE.convertList02(list); + for(ProductrepairRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品返修记录主.xls", "数据", ProductrepairRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailaController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailaController.java index df8c013c..a9442636 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailaController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestDetailaController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productrepairRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productrepairRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductrepairRequestDetailaController { @Resource private ProductrepairRequestDetailaService productrepairRequestDetailaService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品返修申请子") @PreAuthorize("@ss.hasPermission('wms:productrepair-request-detaila:create')") @@ -96,6 +101,11 @@ public class ProductrepairRequestDetailaController { List list = productrepairRequestDetailaService.getProductrepairRequestDetailaList(exportReqVO); // 导出 Excel List datas = ProductrepairRequestDetailaConvert.INSTANCE.convertList02(list); + for(ProductrepairRequestDetailaExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品返修申请子.xls", "数据", ProductrepairRequestDetailaExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java index dda986be..c78bdf38 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/ProductrepairRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productrepairRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productrepairRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductrepairRequestMainController { @Resource private ProductrepairRequestMainService productrepairRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品返修申请主") @PreAuthorize("@ss.hasPermission('wms:productrepair-request-main:create')") @@ -96,6 +101,11 @@ public class ProductrepairRequestMainController { List list = productrepairRequestMainService.getProductrepairRequestMainList(exportReqVO); // 导出 Excel List datas = ProductrepairRequestMainConvert.INSTANCE.convertList02(list); + for(ProductrepairRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品返修申请主.xls", "数据", ProductrepairRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobDetailController.java index a310ccf0..f9e45adc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productscrapJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productscrapJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductscrapJobDetailController { @Resource private ProductscrapJobDetailService productscrapJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品报废任务子") @PreAuthorize("@ss.hasPermission('wms:productscrap-job-detail:create')") @@ -96,6 +101,11 @@ public class ProductscrapJobDetailController { List list = productscrapJobDetailService.getProductscrapJobDetailList(exportReqVO); // 导出 Excel List datas = ProductscrapJobDetailConvert.INSTANCE.convertList02(list); + for(ProductscrapJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品报废任务子.xls", "数据", ProductscrapJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobMainController.java index 1be3b6ed..394d2019 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobMainController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.productscrapJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.inspectRecord.vo.InspectRecordMainExcelVO; import com.win.module.wms.controller.productscrapJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class ProductscrapJobMainController { @Resource private ProductscrapJobMainService productscrapJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品报废任务主") @PreAuthorize("@ss.hasPermission('wms:productscrap-job-main:create')") @@ -96,6 +102,11 @@ public class ProductscrapJobMainController { List list = productscrapJobMainService.getProductscrapJobMainList(exportReqVO); // 导出 Excel List datas = ProductscrapJobMainConvert.INSTANCE.convertList02(list); + for(ProductscrapJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品报废任务主.xls", "数据", ProductscrapJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordDetailController.java index 59bdf257..03ba3916 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productscrapRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productscrapRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductscrapRecordDetailController { @Resource private ProductscrapRecordDetailService productscrapRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品报废记录子") @PreAuthorize("@ss.hasPermission('wms:productscrap-record-detail:create')") @@ -96,6 +101,11 @@ public class ProductscrapRecordDetailController { List list = productscrapRecordDetailService.getProductscrapRecordDetailList(exportReqVO); // 导出 Excel List datas = ProductscrapRecordDetailConvert.INSTANCE.convertList02(list); + for(ProductscrapRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品报废记录子.xls", "数据", ProductscrapRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordMainController.java index b7140bbb..ded20bf4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productscrapRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productscrapRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductscrapRecordMainController { @Resource private ProductscrapRecordMainService productscrapRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品报废记录主") @PreAuthorize("@ss.hasPermission('wms:productscrap-record-main:create')") @@ -96,6 +101,11 @@ public class ProductscrapRecordMainController { List list = productscrapRecordMainService.getProductscrapRecordMainList(exportReqVO); // 导出 Excel List datas = ProductscrapRecordMainConvert.INSTANCE.convertList02(list); + for(ProductscrapRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品报废记录主.xls", "数据", ProductscrapRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestDetailController.java index dd892138..1b780959 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productscrapRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productscrapRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductscrapRequestDetailController { @Resource private ProductscrapRequestDetailService productscrapRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品报废申请子") @PreAuthorize("@ss.hasPermission('wms:productscrap-request-detail:create')") @@ -96,6 +101,11 @@ public class ProductscrapRequestDetailController { List list = productscrapRequestDetailService.getProductscrapRequestDetailList(exportReqVO); // 导出 Excel List datas = ProductscrapRequestDetailConvert.INSTANCE.convertList02(list); + for(ProductscrapRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品报废申请子.xls", "数据", ProductscrapRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java index 1769092d..994f69d6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.productscrapRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.productscrapRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ProductscrapRequestMainController { @Resource private ProductscrapRequestMainService productscrapRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建制品报废申请主") @PreAuthorize("@ss.hasPermission('wms:productscrap-request-main:create')") @@ -96,6 +101,11 @@ public class ProductscrapRequestMainController { List list = productscrapRequestMainService.getProductscrapRequestMainList(exportReqVO); // 导出 Excel List datas = ProductscrapRequestMainConvert.INSTANCE.convertList02(list); + for(ProductscrapRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "制品报废申请主.xls", "数据", ProductscrapRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java index 9a6a46aa..1bcd4b6b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.project.vo.*; import com.win.module.wms.convert.project.ProjectConvert; import com.win.module.wms.dal.dataobject.project.ProjectDO; @@ -38,6 +40,8 @@ public class ProjectController { @Resource private ProjectService projectService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建项目") @@ -98,6 +102,11 @@ public class ProjectController { List list = projectService.getProjectList(exportReqVO); // 导出 Excel List datas = ProjectConvert.INSTANCE.convertList02(list); + for(ProjectExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "项目.xls", "数据", ProjectExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java index 533d4d11..476ad78a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchase; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchase.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class PurchaseDetailController { @Resource private PurchaseDetailService purchaseDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建采购订单子") @PreAuthorize("@ss.hasPermission('wms:purchase-detail:create')") @@ -96,6 +101,11 @@ public class PurchaseDetailController { List list = purchaseDetailService.getPurchaseDetailList(exportReqVO); // 导出 Excel List datas = PurchaseDetailConvert.INSTANCE.convertList02(list); + for(PurchaseDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "采购订单子.xls", "数据", PurchaseDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseMainController.java index 061be00f..cc401a08 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchase; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchase.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,9 @@ public class PurchaseMainController { @Resource private PurchaseMainService purchaseMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建采购订单主") @PreAuthorize("@ss.hasPermission('wms:purchase-main:create')") @@ -95,6 +100,11 @@ public class PurchaseMainController { List list = purchaseMainService.getPurchaseMainList(exportReqVO); // 导出 Excel List datas = PurchaseMainConvert.INSTANCE.convertList02(list); + for(PurchaseMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "采购订单主.xls", "数据", PurchaseMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java index ff66ad8e..c4e1c710 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchasePlan; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasePlan.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,8 @@ public class PurchasePlanDetailController { @Resource private PurchasePlanDetailService purchasePlanDetailService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建要货计划子") @@ -96,6 +100,11 @@ public class PurchasePlanDetailController { List list = purchasePlanDetailService.getPurchasePlanDetailList(exportReqVO); // 导出 Excel List datas = PurchasePlanDetailConvert.INSTANCE.convertList02(list); + for(PurchasePlanDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "要货计划子.xls", "数据", PurchasePlanDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanMainController.java index 102d74f1..980492b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchasePlan; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasePlan.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,9 @@ public class PurchasePlanMainController { @Resource private PurchasePlanMainService purchasePlanMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建要货计划主") @PreAuthorize("@ss.hasPermission('wms:purchase-plan-main:create')") @@ -95,6 +100,11 @@ public class PurchasePlanMainController { List list = purchasePlanMainService.getPurchasePlanMainList(exportReqVO); // 导出 Excel List datas = PurchasePlanMainConvert.INSTANCE.convertList02(list); + for(PurchasePlanMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "要货计划主.xls", "数据", PurchasePlanMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordDetailController.java index 218110eb..9b61c463 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchaseclaimRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchaseclaimRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class PurchaseclaimRecordDetailController { @Resource private PurchaseclaimRecordDetailService purchaseclaimRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建采购索赔记录子") @PreAuthorize("@ss.hasPermission('wms:purchaseclaim-record-detail:create')") @@ -96,6 +101,11 @@ public class PurchaseclaimRecordDetailController { List list = purchaseclaimRecordDetailService.getPurchaseclaimRecordDetailList(exportReqVO); // 导出 Excel List datas = PurchaseclaimRecordDetailConvert.INSTANCE.convertList02(list); + for(PurchaseclaimRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "采购索赔记录子.xls", "数据", PurchaseclaimRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordMainController.java index fa013e00..8c975fd7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchaseclaimRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchaseclaimRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -35,6 +37,8 @@ public class PurchaseclaimRecordMainController { @Resource private PurchaseclaimRecordMainService purchaseclaimRecordMainService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建采购索赔记录主") @@ -95,6 +99,11 @@ public class PurchaseclaimRecordMainController { List list = purchaseclaimRecordMainService.getPurchaseclaimRecordMainList(exportReqVO); // 导出 Excel List datas = PurchaseclaimRecordMainConvert.INSTANCE.convertList02(list); + for(PurchaseclaimRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "采购索赔记录主.xls", "数据", PurchaseclaimRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java index 91639c05..bbc87c34 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/PurchaseclaimRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchaseclaimRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchaseclaimRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class PurchaseclaimRequestDetailController { @Resource private PurchaseclaimRequestDetailService purchaseclaimRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建采购索赔申请子") @PreAuthorize("@ss.hasPermission('wms:purchaseclaim-request-detail:create')") @@ -96,6 +101,11 @@ public class PurchaseclaimRequestDetailController { List list = purchaseclaimRequestDetailService.getPurchaseclaimRequestDetailList(exportReqVO); // 导出 Excel List datas = PurchaseclaimRequestDetailConvert.INSTANCE.convertList02(list); + for(PurchaseclaimRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "采购索赔申请子.xls", "数据", PurchaseclaimRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java index a92ecf7b..90579b4c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/PurchasepriceController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchaseprice.vo.*; import com.win.module.wms.convert.purchaseprice.PurchasepriceConvert; import com.win.module.wms.dal.dataobject.purchaseprice.PurchasepriceDO; @@ -38,6 +40,8 @@ public class PurchasepriceController { @Resource private PurchasepriceService purchasepriceService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建采购价格单") @@ -98,6 +102,11 @@ public class PurchasepriceController { List list = purchasepriceService.getPurchasepriceList(exportReqVO); // 导出 Excel List datas = PurchasepriceConvert.INSTANCE.convertList02(list); + for(PurchasepriceExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "采购价格单.xls", "数据", PurchasepriceExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java index a6c1f482..cc089c59 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchasereceiptJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -37,6 +39,9 @@ public class PurchasereceiptJobDetailController { @Resource private PurchasereceiptJobDetailService purchasereceiptJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建采购收货任务子") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-detail:create')") @@ -96,6 +101,11 @@ public class PurchasereceiptJobDetailController { List list = purchasereceiptJobDetailService.getPurchasereceiptJobDetailList(exportReqVO); // 导出 Excel List datas = PurchasereceiptJobDetailConvert.INSTANCE.convertList02(list); + for(PurchasereceiptJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "采购收货任务子.xls", "数据", PurchasereceiptJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java index 302a6ff8..85152938 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchasereceiptJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -37,6 +39,9 @@ public class PurchasereceiptJobMainController { @Resource private PurchasereceiptJobMainService purchasereceiptJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建采购收货任务主") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-main:create')") @@ -96,6 +101,11 @@ public class PurchasereceiptJobMainController { List list = purchasereceiptJobMainService.getPurchasereceiptJobMainList(exportReqVO); // 导出 Excel List datas = PurchasereceiptJobMainConvert.INSTANCE.convertList02(list); + for(PurchasereceiptJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "采购收货任务主.xls", "数据", PurchasereceiptJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java index 17351bc1..73b6a875 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchasereceiptRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasereceiptRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class PurchasereceiptRecordDetailController { @Resource private PurchasereceiptRecordDetailService purchasereceiptRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建采购收货记录子") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-detail:create')") @@ -96,6 +101,11 @@ public class PurchasereceiptRecordDetailController { List list = purchasereceiptRecordDetailService.getPurchasereceiptRecordDetailList(exportReqVO); // 导出 Excel List datas = PurchasereceiptRecordDetailConvert.INSTANCE.convertList02(list); + for(PurchasereceiptRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "采购收货记录子.xls", "数据", PurchasereceiptRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java index 87012a57..3b431bb7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/PurchasereceiptRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchasereceiptRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasereceiptRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,9 @@ public class PurchasereceiptRecordMainController { @Resource private PurchasereceiptRecordMainService purchasereceiptRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建采购收货记录主") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-record-main:create')") @@ -95,6 +100,11 @@ public class PurchasereceiptRecordMainController { List list = purchasereceiptRecordMainService.getPurchasereceiptRecordMainList(exportReqVO); // 导出 Excel List datas = PurchasereceiptRecordMainConvert.INSTANCE.convertList02(list); + for(PurchasereceiptRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "采购收货记录主.xls", "数据", PurchasereceiptRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java index d7a71a5c..ddcad895 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchasereceiptRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasereceiptRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -38,6 +40,9 @@ public class PurchasereceiptRequestDetailController { @Resource private PurchasereceiptRequestDetailService purchasereceiptRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建采购收货申请子") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-detail:create')") @@ -97,6 +102,11 @@ public class PurchasereceiptRequestDetailController { List list = purchasereceiptRequestDetailService.getPurchasereceiptRequestDetailList(exportReqVO); // 导出 Excel List datas = PurchasereceiptRequestDetailConvert.INSTANCE.convertList02(list); + for(PurchasereceiptRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "采购收货申请子.xls", "数据", PurchasereceiptRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java index 33c25b09..d5cad708 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchasereceiptRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasereceiptRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class PurchasereceiptRequestMainController { @Resource private PurchasereceiptRequestMainService purchasereceiptRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建采购收货申请主") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-main:create')") @@ -96,6 +101,11 @@ public class PurchasereceiptRequestMainController { List list = purchasereceiptRequestMainService.getPurchasereceiptRequestMainList(exportReqVO); // 导出 Excel List datas = PurchasereceiptRequestMainConvert.INSTANCE.convertList02(list); + for(PurchasereceiptRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "采购收货申请主.xls", "数据", PurchasereceiptRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobDetailController.java index 8b5a255c..80f471a8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobDetailController.java @@ -1,5 +1,8 @@ package com.win.module.wms.controller.purchasereturnJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestMainExcelVO; import com.win.module.wms.controller.purchasereturnJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class PurchasereturnJobDetailController { @Resource private PurchasereturnJobDetailService purchasereturnJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建采购退货任务子") @PreAuthorize("@ss.hasPermission('wms:purchasereturn-job-detail:create')") @@ -96,6 +102,11 @@ public class PurchasereturnJobDetailController { List list = purchasereturnJobDetailService.getPurchasereturnJobDetailList(exportReqVO); // 导出 Excel List datas = PurchasereturnJobDetailConvert.INSTANCE.convertList02(list); + for(PurchasereturnJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + + } ExcelUtils.write(response, "采购退货任务子.xls", "数据", PurchasereturnJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordDetailController.java index 6819de64..3fefb4f0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchasereturnRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasereturnRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class PurchasereturnRecordDetailController { @Resource private PurchasereturnRecordDetailService purchasereturnRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建采购退货记录子") @PreAuthorize("@ss.hasPermission('wms:purchasereturn-record-detail:create')") @@ -96,6 +101,11 @@ public class PurchasereturnRecordDetailController { List list = purchasereturnRecordDetailService.getPurchasereturnRecordDetailList(exportReqVO); // 导出 Excel List datas = PurchasereturnRecordDetailConvert.INSTANCE.convertList02(list); + for(PurchasereturnRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "采购退货记录子.xls", "数据", PurchasereturnRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java index 640b88e4..42ee8099 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchasereturnRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasereturnRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,9 @@ public class PurchasereturnRecordMainController { @Resource private PurchasereturnRecordMainService purchasereturnRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建采购退货记录主") @PreAuthorize("@ss.hasPermission('wms:purchasereturn-record-main:create')") @@ -95,6 +100,11 @@ public class PurchasereturnRecordMainController { List list = purchasereturnRecordMainService.getPurchasereturnRecordMainList(exportReqVO); // 导出 Excel List datas = PurchasereturnRecordMainConvert.INSTANCE.convertList02(list); + for(PurchasereturnRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "采购退货记录主.xls", "数据", PurchasereturnRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestDetailController.java index 4a4dbdbe..9dedee3d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchasereturnRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasereturnRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class PurchasereturnRequestDetailController { @Resource private PurchasereturnRequestDetailService purchasereturnRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建采购退货申请子") @PreAuthorize("@ss.hasPermission('wms:purchasereturn-request-detail:create')") @@ -96,6 +101,11 @@ public class PurchasereturnRequestDetailController { List list = purchasereturnRequestDetailService.getPurchasereturnRequestDetailList(exportReqVO); // 导出 Excel List datas = PurchasereturnRequestDetailConvert.INSTANCE.convertList02(list); + for(PurchasereturnRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "采购退货申请子.xls", "数据", PurchasereturnRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java index ebf0f8dd..bd26965e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchasereturnRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasereturnRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,9 @@ public class PurchasereturnRequestMainController { @Resource private PurchasereturnRequestMainService purchasereturnRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建采购退货申请主") @PreAuthorize("@ss.hasPermission('wms:purchasereturn-request-main:create')") @@ -95,6 +100,11 @@ public class PurchasereturnRequestMainController { List list = purchasereturnRequestMainService.getPurchasereturnRequestMainList(exportReqVO); // 导出 Excel List datas = PurchasereturnRequestMainConvert.INSTANCE.convertList02(list); + for(PurchasereturnRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "采购退货申请主.xls", "数据", PurchasereturnRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java index f1513066..94ad9682 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.putawayJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.putawayJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class PutawayJobDetailController { @Resource private PutawayJobDetailService putawayJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建上架任务子") @PreAuthorize("@ss.hasPermission('wms:putaway-job-detail:create')") @@ -96,6 +101,11 @@ public class PutawayJobDetailController { List list = putawayJobDetailService.getPutawayJobDetailList(exportReqVO); // 导出 Excel List datas = PutawayJobDetailConvert.INSTANCE.convertList02(list); + for(PutawayJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "上架任务子.xls", "数据", PutawayJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java index ac9bd527..541696b9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.putawayJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.putawayJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,9 @@ public class PutawayJobMainController { @Resource private PutawayJobMainService putawayJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建上架任务主") @PreAuthorize("@ss.hasPermission('wms:putaway-job-main:create')") @@ -95,6 +100,11 @@ public class PutawayJobMainController { List list = putawayJobMainService.getPutawayJobMainList(exportReqVO); // 导出 Excel List datas = PutawayJobMainConvert.INSTANCE.convertList02(list); + for(PutawayJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "上架任务主.xls", "数据", PutawayJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java index 1a02251d..61ebf829 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.putawayRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.putawayRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class PutawayRecordDetailController { @Resource private PutawayRecordDetailService putawayRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建上架记录子") @PreAuthorize("@ss.hasPermission('wms:putaway-record-detail:create')") @@ -96,6 +101,12 @@ public class PutawayRecordDetailController { List list = putawayRecordDetailService.getPutawayRecordDetailList(exportReqVO); // 导出 Excel List datas = PutawayRecordDetailConvert.INSTANCE.convertList02(list); + + for(PutawayRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "上架记录子.xls", "数据", PutawayRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java index f4e1e478..82131623 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.putawayRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.putawayRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,9 @@ public class PutawayRecordMainController { @Resource private PutawayRecordMainService putawayRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建上架记录主") @PreAuthorize("@ss.hasPermission('wms:putaway-record-main:create')") @@ -95,6 +100,11 @@ public class PutawayRecordMainController { List list = putawayRecordMainService.getPutawayRecordMainList(exportReqVO); // 导出 Excel List datas = PutawayRecordMainConvert.INSTANCE.convertList02(list); + for(PutawayRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "上架记录主.xls", "数据", PutawayRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestDetailController.java index 079a94b5..f2ba07be 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.putawayRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.putawayRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class PutawayRequestDetailController { @Resource private PutawayRequestDetailService putawayRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建上架申请子") @PreAuthorize("@ss.hasPermission('wms:putaway-request-detail:create')") @@ -96,6 +101,11 @@ public class PutawayRequestDetailController { List list = putawayRequestDetailService.getPutawayRequestDetailList(exportReqVO); // 导出 Excel List datas = PutawayRequestDetailConvert.INSTANCE.convertList02(list); + for(PutawayRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "上架申请子.xls", "数据", PutawayRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java index 864f96fe..a7fd6400 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.putawayRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.putawayRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -35,6 +37,8 @@ public class PutawayRequestMainController { @Resource private PutawayRequestMainService putawayRequestMainService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建上架申请主") @@ -95,6 +99,11 @@ public class PutawayRequestMainController { List list = putawayRequestMainService.getPutawayRequestMainList(exportReqVO); // 导出 Excel List datas = PutawayRequestMainConvert.INSTANCE.convertList02(list); + for(PutawayRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "上架申请主.xls", "数据", PutawayRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainExcelVO.java index 0169042e..3ad1e34b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainExcelVO.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.putawayRequest.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -44,6 +45,7 @@ public class PutawayRequestMainExcelVO { private String remark; @ExcelProperty("创建时间") + @ColumnWidth(value = 16) private LocalDateTime createTime; @ExcelProperty("创建者用户名") @@ -92,4 +94,6 @@ public class PutawayRequestMainExcelVO { + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java index e93951e5..78c0b6dd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.recordsetting.vo.*; import com.win.module.wms.convert.recordsetting.RecordsettingConvert; import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO; @@ -39,6 +41,9 @@ public class RecordsettingController { @Resource private RecordsettingService recordsettingService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建记录设置") @PreAuthorize("@ss.hasPermission('wms:recordsetting:create')") @@ -98,6 +103,11 @@ public class RecordsettingController { List list = recordsettingService.getRecordsettingList(exportReqVO); // 导出 Excel List datas = RecordsettingConvert.INSTANCE.convertList02(list); + for(RecordsettingExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "记录设置.xls", "数据", RecordsettingExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/vo/RecordsettingExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/vo/RecordsettingExcelVO.java index a240c361..6ad124f1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/vo/RecordsettingExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/vo/RecordsettingExcelVO.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.recordsetting.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -39,6 +40,7 @@ public class RecordsettingExcelVO { private String remark; @ExcelProperty("创建时间") + @ColumnWidth(value = 16) private LocalDateTime createTime; @ExcelProperty("创建者ID") @@ -50,4 +52,5 @@ public class RecordsettingExcelVO { @ExcelProperty("是否软删除") private String isSoftDeleted; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobDetailController.java index 32704525..8140b472 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobDetailController.java @@ -2,6 +2,8 @@ package com.win.module.wms.controller.repleinshJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.repleinshJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -39,6 +41,9 @@ public class RepleinshJobDetailController { @Resource private RepleinshJobDetailService repleinshJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建补料任务子") @PreAuthorize("@ss.hasPermission('job:repleinsh-job-detail:create')") @@ -98,6 +103,11 @@ public class RepleinshJobDetailController { List list = repleinshJobDetailService.getRepleinshJobDetailList(exportReqVO); // 导出 Excel List datas = RepleinshJobDetailConvert.INSTANCE.convertList02(list); + for(RepleinshJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "补料任务子.xls", "数据", RepleinshJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java index 8c317d7e..077aed04 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.repleinshJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -37,6 +39,9 @@ public class RepleinshJobMainController { @Resource private RepleinshJobMainService repleinshJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建补料任务主") @PreAuthorize("@ss.hasPermission('wms:repleinsh-job-main:create')") @@ -96,6 +101,11 @@ public class RepleinshJobMainController { List list = repleinshJobMainService.getRepleinshJobMainList(exportReqVO); // 导出 Excel List datas = RepleinshJobMainConvert.INSTANCE.convertList02(list); + for(RepleinshJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "补料任务主.xls", "数据", RepleinshJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordDetailController.java index fe9a4bfd..435607a8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.repleinshRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -37,6 +39,9 @@ public class RepleinshRecordDetailController { @Resource private RepleinshRecordDetailService repleinshRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建补料记录子") @PreAuthorize("@ss.hasPermission('wms:repleinsh-record-detail:create')") @@ -96,6 +101,11 @@ public class RepleinshRecordDetailController { List list = repleinshRecordDetailService.getRepleinshRecordDetailList(exportReqVO); // 导出 Excel List datas = RepleinshRecordDetailConvert.INSTANCE.convertList02(list); + for(RepleinshRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "补料记录子.xls", "数据", RepleinshRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordMainController.java index 14b488c4..03373bff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.repleinshRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -37,6 +39,9 @@ public class RepleinshRecordMainController { @Resource private RepleinshRecordMainService repleinshRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建补料记录主") @PreAuthorize("@ss.hasPermission('wms:repleinsh-record-main:create')") @@ -96,6 +101,11 @@ public class RepleinshRecordMainController { List list = repleinshRecordMainService.getRepleinshRecordMainList(exportReqVO); // 导出 Excel List datas = RepleinshRecordMainConvert.INSTANCE.convertList02(list); + for(RepleinshRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "补料记录主.xls", "数据", RepleinshRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestDetailController.java index e1d23904..d72edd95 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.repleinshRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.repleinshRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class RepleinshRequestDetailController { @Resource private RepleinshRequestDetailService repleinshRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建补料申请子") @PreAuthorize("@ss.hasPermission('wms:repleinsh-request-detail:create')") @@ -96,6 +101,11 @@ public class RepleinshRequestDetailController { List list = repleinshRequestDetailService.getRepleinshRequestDetailList(exportReqVO); // 导出 Excel List datas = RepleinshRequestDetailConvert.INSTANCE.convertList02(list); + for(RepleinshRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "补料申请子.xls", "数据", RepleinshRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestMainController.java index e4928323..caa814dd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.repleinshRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.repleinshRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class RepleinshRequestMainController { @Resource private RepleinshRequestMainService repleinshRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建补料申请主") @PreAuthorize("@ss.hasPermission('wms:repleinsh-request-main:create')") @@ -96,6 +101,11 @@ public class RepleinshRequestMainController { List list = repleinshRequestMainService.getRepleinshRequestMainList(exportReqVO); // 导出 Excel List datas = RepleinshRequestMainConvert.INSTANCE.convertList02(list); + for(RepleinshRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "补料申请主.xls", "数据", RepleinshRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java index 58a4fc64..8bf7f0c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.requestsetting.vo.*; import com.win.module.wms.convert.requestsetting.RequestsettingConvert; import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; @@ -39,6 +41,9 @@ public class RequestsettingController { @Resource private RequestsettingService requestsettingService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建申请设置") @PreAuthorize("@ss.hasPermission('wms:requestsetting:create')") @@ -98,6 +103,11 @@ public class RequestsettingController { List list = requestsettingService.getRequestsettingList(exportReqVO); // 导出 Excel List datas = RequestsettingConvert.INSTANCE.convertList02(list); + for(RequestsettingExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "申请设置.xls", "数据", RequestsettingExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java index 6a8d903c..67bcd88b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java @@ -1,6 +1,8 @@ package com.win.module.wms.controller.rule; import com.win.framework.dict.core.util.DictFrameworkUtils; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.rule.vo.*; import com.win.module.wms.controller.rule.vo.RuleImportExcelVo; import com.win.module.wms.enums.DictTypeConstants; @@ -44,6 +46,9 @@ public class RuleController { @Resource private RuleService ruleService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建规则") @PreAuthorize("@ss.hasPermission('wms:rule:create')") @@ -103,6 +108,11 @@ public class RuleController { List list = ruleService.getRuleList(exportReqVO); // 导出 Excel List datas = RuleConvert.INSTANCE.convertList02(list); + for(RuleExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "规则.xls", "数据", RuleExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleExcelVO.java index ede3c38a..a97b73dc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleExcelVO.java @@ -1,7 +1,10 @@ package com.win.module.wms.controller.rule.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; + +import java.time.LocalDateTime; import java.util.*; import com.alibaba.excel.annotation.ExcelProperty; @@ -35,4 +38,11 @@ public class RuleExcelVO { @ExcelProperty("配置") private String configuration; + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者ID") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleDetailController.java index 1f21a10c..e7e77bc8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.sale; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.sale.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class SaleDetailController { @Resource private SaleDetailService saleDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建销售订单子") @PreAuthorize("@ss.hasPermission('wms:sale-detail:create')") @@ -96,6 +101,11 @@ public class SaleDetailController { List list = saleDetailService.getSaleDetailList(exportReqVO); // 导出 Excel List datas = SaleDetailConvert.INSTANCE.convertList02(list); + for(SaleDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "销售订单子.xls", "数据", SaleDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleMainController.java index b2ff67cb..d585710c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.sale; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.sale.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class SaleMainController { @Resource private SaleMainService saleMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建销售订单主") @PreAuthorize("@ss.hasPermission('wms:sale-main:create')") @@ -96,6 +101,11 @@ public class SaleMainController { List list = saleMainService.getSaleMainList(exportReqVO); // 导出 Excel List datas = SaleMainConvert.INSTANCE.convertList02(list); + for(SaleMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "销售订单主.xls", "数据", SaleMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java index 7d94bd01..7bc89f01 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/SalepriceController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.saleprice.vo.*; import com.win.module.wms.controller.saleprice.vo.SalepriceImportExcelVo; import com.win.module.wms.convert.saleprice.SalepriceConvert; @@ -40,6 +42,9 @@ public class SalepriceController { @Resource private SalepriceService salepriceService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建销售价格单") @PreAuthorize("@ss.hasPermission('wms:saleprice:create')") @@ -99,6 +104,11 @@ public class SalepriceController { List list = salepriceService.getSalepriceList(exportReqVO); // 导出 Excel List datas = SalepriceConvert.INSTANCE.convertList02(list); + for(SalepriceExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "销售价格单.xls", "数据", SalepriceExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceBaseVO.java index a8c12723..6a8d2205 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceBaseVO.java @@ -22,11 +22,11 @@ public class SalepriceBaseVO { @Schema(description = "客户代码", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "客户代码不能为空") - private String customercode; + private String customerCode; @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "物料代码不能为空") - private String itemcode; + private String itemCode; @Schema(description = "货币", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "货币不能为空") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceExcelVO.java index b2cf4e61..d9aa96f8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceExcelVO.java @@ -19,10 +19,10 @@ import java.time.LocalDateTime; public class SalepriceExcelVO { @ExcelProperty("客户代码") - private String customercode; + private String customerCode; @ExcelProperty("物料代码") - private String itemcode; + private String itemCode; @ExcelProperty(value = "货币", converter = DictConvert.class) @DictFormat("currency") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceExportReqVO.java index f0a53277..efa57c19 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceExportReqVO.java @@ -14,10 +14,10 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY public class SalepriceExportReqVO { @Schema(description = "客户代码") - private String customercode; + private String customerCode; @Schema(description = "物料代码") - private String itemcode; + private String itemCode; @Schema(description = "货币") private String currency; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceImportExcelVo.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceImportExcelVo.java index 99c9ff90..00d77053 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceImportExcelVo.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceImportExcelVo.java @@ -28,10 +28,10 @@ public class SalepriceImportExcelVo { @ExcelProperty("客户代码") - private String customercode; + private String customerCode; @ExcelProperty("物料代码") - private String itemcode; + private String itemCode; @ExcelProperty(value = "货币", converter = DictConvert.class) @DictFormat(DictTypeConstants.CURRENCY) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepricePageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepricePageReqVO.java index 93d2b4db..99355ef4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepricePageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepricePageReqVO.java @@ -19,10 +19,10 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY public class SalepricePageReqVO extends PageParam { @Schema(description = "客户代码") - private String customercode; + private String customerCode; @Schema(description = "物料代码") - private String itemcode; + private String itemCode; @Schema(description = "货币") private String currency; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobDetailController.java index 0ca33f74..c6a5056f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.scrapJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.scrapJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ScrapJobDetailController { @Resource private ScrapJobDetailService scrapJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建报废出库任务子") @PreAuthorize("@ss.hasPermission('wms:scrap-job-detail:create')") @@ -96,6 +101,11 @@ public class ScrapJobDetailController { List list = scrapJobDetailService.getScrapJobDetailList(exportReqVO); // 导出 Excel List datas = ScrapJobDetailConvert.INSTANCE.convertList02(list); + for(ScrapJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "报废出库任务子.xls", "数据", ScrapJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java index fa456188..4aaab40c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.scrapJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.scrapJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class ScrapJobMainController { @Resource private ScrapJobMainService scrapJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建报废出库任务主") @PreAuthorize("@ss.hasPermission('wms:scrap-job-main:create')") @@ -96,6 +101,11 @@ public class ScrapJobMainController { List list = scrapJobMainService.getScrapJobMainList(exportReqVO); // 导出 Excel List datas = ScrapJobMainConvert.INSTANCE.convertList02(list); + for(ScrapJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "报废出库任务主.xls", "数据", ScrapJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java index deb374a8..3a3d30fe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.shift.vo.*; import com.win.module.wms.controller.shift.vo.ShiftImportExcelVo; import com.win.module.wms.convert.shift.ShiftConvert; @@ -40,6 +42,9 @@ public class ShiftController { @Resource private ShiftService shiftService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建班次") @PreAuthorize("@ss.hasPermission('wms:shift:create')") @@ -99,6 +104,11 @@ public class ShiftController { List list = shiftService.getShiftList(exportReqVO); // 导出 Excel List datas = ShiftConvert.INSTANCE.convertList02(list); + for(ShiftExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "班次.xls", "数据", ShiftExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java index 33d63938..4b88b1d6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/StdcostpriceController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.stdcostprice.vo.*; import com.win.module.wms.controller.stdcostprice.vo.StdcostpriceImportExcelVo; import com.win.module.wms.convert.stdcostprice.StdcostpriceConvert; @@ -40,6 +42,9 @@ public class StdcostpriceController { @Resource private StdcostpriceService stdcostpriceService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建标准成本价格单") @PreAuthorize("@ss.hasPermission('wms:stdcostprice:create')") @@ -99,6 +104,11 @@ public class StdcostpriceController { List list = stdcostpriceService.getStdcostpriceList(exportReqVO); // 导出 Excel List datas = StdcostpriceConvert.INSTANCE.convertList02(list); + for(StdcostpriceExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "标准成本价格单.xls", "数据", StdcostpriceExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/StrategyController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/StrategyController.java index 30720556..f7840aea 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/StrategyController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/StrategyController.java @@ -4,6 +4,8 @@ import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.PageResult; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.strategy.vo.*; import com.win.module.wms.convert.strategy.StrategyConvert; import com.win.module.wms.dal.dataobject.strategy.StrategyDO; @@ -34,6 +36,9 @@ public class StrategyController { @Resource private StrategyService strategyService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建策略") @PreAuthorize("@ss.hasPermission('wms:strategy:create')") @@ -93,6 +98,11 @@ public class StrategyController { List list = strategyService.getStrategyList(exportReqVO); // 导出 Excel List datas = StrategyConvert.INSTANCE.convertList02(list); + for(StrategyExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "策略.xls", "数据", StrategyExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyExcelVO.java index 8a71061e..a5282ab6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyExcelVO.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.strategy.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -48,4 +49,11 @@ public class StrategyExcelVO { @ExcelProperty("是否生效") private String isActive; + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者ID") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java index 740700be..faf06965 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplier.vo.*; import com.win.module.wms.convert.supplier.SupplierConvert; import com.win.module.wms.dal.dataobject.supplier.SupplierDO; @@ -39,6 +41,9 @@ public class SupplierController { @Resource private SupplierService supplierService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建供应商") @PreAuthorize("@ss.hasPermission('wms:supplier:create')") @@ -98,6 +103,11 @@ public class SupplierController { List list = supplierService.getSupplierList(exportReqVO); // 导出 Excel List datas = SupplierConvert.INSTANCE.convertList02(list); + for(SupplierExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "供应商.xls", "数据", SupplierExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java index 55e7e2dd..35ca478c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.supplierdeliverRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplierdeliverRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,9 @@ public class SupplierdeliverRecordDetailController { @Resource private SupplierdeliverRecordDetailService supplierdeliverRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建供应商发货记录子") @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-detail:create')") @@ -95,6 +100,11 @@ public class SupplierdeliverRecordDetailController { List list = supplierdeliverRecordDetailService.getSupplierdeliverRecordDetailList(exportReqVO); // 导出 Excel List datas = SupplierdeliverRecordDetailConvert.INSTANCE.convertList02(list); + for(SupplierdeliverRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "供应商发货记录子.xls", "数据", SupplierdeliverRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java index 81c18451..f0ebda86 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.supplierdeliverRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplierdeliverRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class SupplierdeliverRequestDetailController { @Resource private SupplierdeliverRequestDetailService supplierdeliverRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建供应商发货申请子") @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-request-detail:create')") @@ -96,6 +101,11 @@ public class SupplierdeliverRequestDetailController { List list = supplierdeliverRequestDetailService.getSupplierdeliverRequestDetailList(exportReqVO); // 导出 Excel List datas = SupplierdeliverRequestDetailConvert.INSTANCE.convertList02(list); + for(SupplierdeliverRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "供应商发货申请子.xls", "数据", SupplierdeliverRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java index 61fc3f91..a58275c4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.supplierdeliverRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplierdeliverRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,9 @@ public class SupplierdeliverRequestMainController { @Resource private SupplierdeliverRequestMainService supplierdeliverRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建供应商发货申请主") @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-request-main:create')") @@ -95,6 +100,11 @@ public class SupplierdeliverRequestMainController { List list = supplierdeliverRequestMainService.getSupplierdeliverRequestMainList(exportReqVO); // 导出 Excel List datas = SupplierdeliverRequestMainConvert.INSTANCE.convertList02(list); + for(SupplierdeliverRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "供应商发货申请主.xls", "数据", SupplierdeliverRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordDeatilController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordDeatilController.java index 0375e72e..f6f9d9ff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordDeatilController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordDeatilController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.supplierinvoiceRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,9 @@ public class SupplierinvoiceRecordDeatilController { @Resource private SupplierinvoiceRecordDeatilService supplierinvoiceRecordDeatilService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建供应商发票记录子") @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-record-deatil:create')") @@ -95,6 +100,11 @@ public class SupplierinvoiceRecordDeatilController { List list = supplierinvoiceRecordDeatilService.getSupplierinvoiceRecordDeatilList(exportReqVO); // 导出 Excel List datas = SupplierinvoiceRecordDeatilConvert.INSTANCE.convertList02(list); + for(SupplierinvoiceRecordDeatilExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "供应商发票记录子.xls", "数据", SupplierinvoiceRecordDeatilExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordMainController.java index 08e74b80..db48ac79 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.supplierinvoiceRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplierinvoiceRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,9 @@ public class SupplierinvoiceRecordMainController { @Resource private SupplierinvoiceRecordMainService supplierinvoiceRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建供应商发票记录主") @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-record-main:create')") @@ -95,6 +100,11 @@ public class SupplierinvoiceRecordMainController { List list = supplierinvoiceRecordMainService.getSupplierinvoiceRecordMainList(exportReqVO); // 导出 Excel List datas = SupplierinvoiceRecordMainConvert.INSTANCE.convertList02(list); + for(SupplierinvoiceRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "供应商发票记录主.xls", "数据", SupplierinvoiceRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java index 363b0368..0f89900d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.supplierinvoiceRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,9 @@ public class SupplierinvoiceRequestDetailController { @Resource private SupplierinvoiceRequestDetailService supplierinvoiceRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建供应商发票申请子") @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-request-detail:create')") @@ -95,6 +100,11 @@ public class SupplierinvoiceRequestDetailController { List list = supplierinvoiceRequestDetailService.getSupplierinvoiceRequestDetailList(exportReqVO); // 导出 Excel List datas = SupplierinvoiceRequestDetailConvert.INSTANCE.convertList02(list); + for(SupplierinvoiceRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "供应商发票申请子.xls", "数据", SupplierinvoiceRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java index f299be4f..91c869ec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.supplierinvoiceRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,9 @@ public class SupplierinvoiceRequestMainController { @Resource private SupplierinvoiceRequestMainService supplierinvoiceRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建供应商发票申请主") @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-request-main:create')") @@ -95,6 +100,11 @@ public class SupplierinvoiceRequestMainController { List list = supplierinvoiceRequestMainService.getSupplierinvoiceRequestMainList(exportReqVO); // 导出 Excel List datas = SupplierinvoiceRequestMainConvert.INSTANCE.convertList02(list); + for(SupplierinvoiceRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "供应商发票申请主.xls", "数据", SupplierinvoiceRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java index 720ec668..8a1c6150 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplieritem.vo.*; import com.win.module.wms.convert.supplieritem.SupplieritemConvert; @@ -40,6 +42,9 @@ public class SupplieritemController { @Resource private SupplieritemService supplieritemService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建供应商物品") @PreAuthorize("@ss.hasPermission('wms:supplieritem:create')") @@ -99,6 +104,11 @@ public class SupplieritemController { List list = supplieritemService.getSupplieritemList(exportReqVO); // 导出 Excel List datas = SupplieritemConvert.INSTANCE.convertList02(list); + for(SupplieritemExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "供应商物品.xls", "数据", SupplieritemExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/PurchaseclaimRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/PurchaseclaimRequestMainController.java index 6cfd8309..d17f04f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/PurchaseclaimRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/suppliermanage/PurchaseclaimRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.suppliermanage; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.suppliermanage.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class PurchaseclaimRequestMainController { @Resource private PurchaseclaimRequestMainService purchaseclaimRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建采购索赔申请主") @PreAuthorize("@ss.hasPermission('wms:purchaseclaim-request-main:create')") @@ -96,6 +101,11 @@ public class PurchaseclaimRequestMainController { List list = purchaseclaimRequestMainService.getPurchaseclaimRequestMainList(exportReqVO); // 导出 Excel List datas = PurchaseclaimRequestMainConvert.INSTANCE.convertList02(list); + for(PurchaseclaimRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "采购索赔申请主.xls", "数据", PurchaseclaimRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java index 6486dd0c..f0c7b036 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.systemcalendar.vo.*; import com.win.module.wms.controller.systemcalendar.vo.SystemcalendarImportExcelVo; import com.win.module.wms.convert.systemcalendar.SystemcalendarConvert; @@ -40,6 +42,9 @@ public class SystemcalendarController { @Resource private SystemcalendarService systemcalendarService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建系统日历") @PreAuthorize("@ss.hasPermission('wms:systemcalendar:create')") @@ -99,6 +104,11 @@ public class SystemcalendarController { List list = systemcalendarService.getSystemcalendarList(exportReqVO); // 导出 Excel List datas = SystemcalendarConvert.INSTANCE.convertList02(list); + for(SystemcalendarExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "系统日历.xls", "数据", SystemcalendarExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java index 3832e00c..8a70810b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java @@ -1,6 +1,8 @@ package com.win.module.wms.controller.team; import com.win.framework.dict.core.util.DictFrameworkUtils; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.team.vo.*; import com.win.module.wms.enums.DictTypeConstants; import io.swagger.v3.oas.annotations.Parameters; @@ -42,6 +44,9 @@ public class TeamController { @Resource private TeamService teamService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建班组") @PreAuthorize("@ss.hasPermission('wms:team:create')") @@ -101,6 +106,11 @@ public class TeamController { List list = teamService.getTeamList(exportReqVO); // 导出 Excel List datas = TeamConvert.INSTANCE.convertList02(list); + for(TeamExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "班组.xls", "数据", TeamExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java index 717778eb..8860cb9c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.transaction; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transaction.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class TransactionController { @Resource private TransactionService transactionService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建库存事务") @PreAuthorize("@ss.hasPermission('wms:transaction:create')") @@ -96,6 +101,11 @@ public class TransactionController { List list = transactionService.getTransactionList(exportReqVO); // 导出 Excel List datas = TransactionConvert.INSTANCE.convertList02(list); + for(TransactionExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库存事务.xls", "数据", TransactionExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionExcelVO.java index 3ab54de4..5322a605 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionExcelVO.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transaction.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -104,5 +105,11 @@ public class TransactionExcelVO { @ExcelProperty("货主代码") private String ownerCode; + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者ID") + private String creator; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java index 98f03b1c..da208526 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java @@ -1,6 +1,8 @@ package com.win.module.wms.controller.transactiontype; import com.win.framework.dict.core.util.DictFrameworkUtils; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transactiontype.vo.*; import com.win.module.wms.enums.DictTypeConstants; import io.swagger.v3.oas.annotations.Parameters; @@ -42,6 +44,9 @@ public class TransactiontypeController { @Resource private TransactiontypeService transactiontypeService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建事务类型") @PreAuthorize("@ss.hasPermission('wms:transactiontype:create')") @@ -101,6 +106,11 @@ public class TransactiontypeController { List list = transactiontypeService.getTransactiontypeList(exportReqVO); // 导出 Excel List datas = TransactiontypeConvert.INSTANCE.convertList02(list); + for(TransactiontypeExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "事务类型.xls", "数据", TransactiontypeExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobDetailController.java index 6e9c1866..f92af4ba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.transferissueJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferissueJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class TransferissueJobDetailController { @Resource private TransferissueJobDetailService transferissueJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建调拨出库任务子") @PreAuthorize("@ss.hasPermission('wms:transferissue-job-detail:create')") @@ -96,6 +101,11 @@ public class TransferissueJobDetailController { List list = transferissueJobDetailService.getTransferissueJobDetailList(exportReqVO); // 导出 Excel List datas = TransferissueJobDetailConvert.INSTANCE.convertList02(list); + for(TransferissueJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "调拨出库任务子.xls", "数据", TransferissueJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java index ae29dbc9..e54c3d5b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.transferissueJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferissueJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class TransferissueJobMainController { @Resource private TransferissueJobMainService transferissueJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建调拨出库任务主") @PreAuthorize("@ss.hasPermission('wms:transferissue-job-main:create')") @@ -96,6 +101,11 @@ public class TransferissueJobMainController { List list = transferissueJobMainService.getTransferissueJobMainList(exportReqVO); // 导出 Excel List datas = TransferissueJobMainConvert.INSTANCE.convertList02(list); + for(TransferissueJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "调拨出库任务主.xls", "数据", TransferissueJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordDetailController.java index f47d0070..b7d9e86f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.transferissueRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferissueRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,6 +38,8 @@ public class TransferissueRecordDetailController { @Resource private TransferissueRecordDetailService transferissueRecordDetailService; + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建调拨出库记录子") @@ -96,6 +100,11 @@ public class TransferissueRecordDetailController { List list = transferissueRecordDetailService.getTransferissueRecordDetailList(exportReqVO); // 导出 Excel List datas = TransferissueRecordDetailConvert.INSTANCE.convertList02(list); + for(TransferissueRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "调拨出库记录子.xls", "数据", TransferissueRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/TransferlogController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/TransferlogController.java index 4f8a8d5c..4f3e7eef 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/TransferlogController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/TransferlogController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.transferlog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferlog.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class TransferlogController { @Resource private TransferlogService transferlogService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建库存转移日志") @PreAuthorize("@ss.hasPermission('wms:transferlog:create')") @@ -96,6 +101,11 @@ public class TransferlogController { List list = transferlogService.getTransferlogList(exportReqVO); // 导出 Excel List datas = TransferlogConvert.INSTANCE.convertList02(list); + for(TransferlogExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "库存转移日志.xls", "数据", TransferlogExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/vo/TransferlogExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/vo/TransferlogExcelVO.java index 2662afc2..f0e7d308 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/vo/TransferlogExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/vo/TransferlogExcelVO.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.transferlog.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -131,5 +132,12 @@ public class TransferlogExcelVO { @ExcelProperty("到货主代码") private String toOwnerCode; + @ExcelProperty("创建时间") + @ColumnWidth(value = 16) + private LocalDateTime createTime; + + @ExcelProperty("创建者ID") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobDetailController.java index f2c8dd15..6ea03222 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.transferreceiptJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferreceiptJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class TransferreceiptJobDetailController { @Resource private TransferreceiptJobDetailService transferreceiptJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建调拨入库任务子") @PreAuthorize("@ss.hasPermission('wms:transferreceipt-job-detail:create')") @@ -96,6 +101,11 @@ public class TransferreceiptJobDetailController { List list = transferreceiptJobDetailService.getTransferreceiptJobDetailList(exportReqVO); // 导出 Excel List datas = TransferreceiptJobDetailConvert.INSTANCE.convertList02(list); + for(TransferreceiptJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "调拨入库任务子.xls", "数据", TransferreceiptJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java index b132ac02..ee8c0c4b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.transferreceiptJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferreceiptJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class TransferreceiptJobMainController { @Resource private TransferreceiptJobMainService transferreceiptJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建调拨入库任务主") @PreAuthorize("@ss.hasPermission('wms:transferreceipt-job-main:create')") @@ -96,6 +101,11 @@ public class TransferreceiptJobMainController { List list = transferreceiptJobMainService.getTransferreceiptJobMainList(exportReqVO); // 导出 Excel List datas = TransferreceiptJobMainConvert.INSTANCE.convertList02(list); + for(TransferreceiptJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "调拨入库任务主.xls", "数据", TransferreceiptJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordDetailController.java index 6e8b60fa..20a9e13f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.transferreceiptRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferreceiptRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class TransferreceiptRecordDetailController { @Resource private TransferreceiptRecordDetailService transferreceiptRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建调拨入库记录子") @PreAuthorize("@ss.hasPermission('wms:transferreceipt-record-detail:create')") @@ -96,6 +101,11 @@ public class TransferreceiptRecordDetailController { List list = transferreceiptRecordDetailService.getTransferreceiptRecordDetailList(exportReqVO); // 导出 Excel List datas = TransferreceiptRecordDetailConvert.INSTANCE.convertList02(list); + for(TransferreceiptRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "调拨入库记录子.xls", "数据", TransferreceiptRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java index a5027ff9..91ac5b2b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.transferreceiptRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferreceiptRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class TransferreceiptRecordMainController { @Resource private TransferreceiptRecordMainService transferreceiptRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建调拨入库记录主") @PreAuthorize("@ss.hasPermission('wms:transferreceipt-record-main:create')") @@ -96,6 +101,11 @@ public class TransferreceiptRecordMainController { List list = transferreceiptRecordMainService.getTransferreceiptRecordMainList(exportReqVO); // 导出 Excel List datas = TransferreceiptRecordMainConvert.INSTANCE.convertList02(list); + for(TransferreceiptRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "调拨入库记录主.xls", "数据", TransferreceiptRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestDetailController.java index cc5df615..bdb786b9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.transferreceiptRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferreceiptRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class TransferreceiptRequestDetailController { @Resource private TransferreceiptRequestDetailService transferreceiptRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建调拨入库申请子") @PreAuthorize("@ss.hasPermission('wms:transferreceipt-request-detail:create')") @@ -96,6 +101,11 @@ public class TransferreceiptRequestDetailController { List list = transferreceiptRequestDetailService.getTransferreceiptRequestDetailList(exportReqVO); // 导出 Excel List datas = TransferreceiptRequestDetailConvert.INSTANCE.convertList02(list); + for(TransferreceiptRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "调拨入库申请子.xls", "数据", TransferreceiptRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestMainController.java index 93a089f4..e2607109 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.transferreceiptRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.transferreceiptRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class TransferreceiptRequestMainController { @Resource private TransferreceiptRequestMainService transferreceiptRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建调拨入库申请主") @PreAuthorize("@ss.hasPermission('wms:transferreceipt-request-main:create')") @@ -96,6 +101,11 @@ public class TransferreceiptRequestMainController { List list = transferreceiptRequestMainService.getTransferreceiptRequestMainList(exportReqVO); // 导出 Excel List datas = TransferreceiptRequestMainConvert.INSTANCE.convertList02(list); + for(TransferreceiptRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "调拨入库申请主.xls", "数据", TransferreceiptRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobDetailController.java index 29d443be..67fe4efd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.unplannedissueJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedissueJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class UnplannedissueJobDetailController { @Resource private UnplannedissueJobDetailService unplannedissueJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建计划外出库任务子") @PreAuthorize("@ss.hasPermission('wms:unplannedissue-job-detail:create')") @@ -96,6 +101,11 @@ public class UnplannedissueJobDetailController { List list = unplannedissueJobDetailService.getUnplannedissueJobDetailList(exportReqVO); // 导出 Excel List datas = UnplannedissueJobDetailConvert.INSTANCE.convertList02(list); + for(UnplannedissueJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "计划外出库任务子.xls", "数据", UnplannedissueJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java index e756c343..b8dd868a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.unplannedissueJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedissueJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class UnplannedissueJobMainController { @Resource private UnplannedissueJobMainService unplannedissueJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建计划外出库任务主") @PreAuthorize("@ss.hasPermission('wms:unplannedissue-job-main:create')") @@ -96,6 +101,11 @@ public class UnplannedissueJobMainController { List list = unplannedissueJobMainService.getUnplannedissueJobMainList(exportReqVO); // 导出 Excel List datas = UnplannedissueJobMainConvert.INSTANCE.convertList02(list); + for(UnplannedissueJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "计划外出库任务主.xls", "数据", UnplannedissueJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordDetailController.java index b942ccb8..feb6ab81 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.unplannedissueRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedissueRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class UnplannedissueRecordDetailController { @Resource private UnplannedissueRecordDetailService unplannedissueRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建计划外出库记录子") @PreAuthorize("@ss.hasPermission('wms:unplannedissue-record-detail:create')") @@ -96,6 +101,11 @@ public class UnplannedissueRecordDetailController { List list = unplannedissueRecordDetailService.getUnplannedissueRecordDetailList(exportReqVO); // 导出 Excel List datas = UnplannedissueRecordDetailConvert.INSTANCE.convertList02(list); + for(UnplannedissueRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "计划外出库记录子.xls", "数据", UnplannedissueRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java index 6809029c..aa7ae890 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.unplannedissueRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedissueRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class UnplannedissueRecordMainController { @Resource private UnplannedissueRecordMainService unplannedissueRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建计划外出库记录主") @PreAuthorize("@ss.hasPermission('wms:unplannedissue-record-main:create')") @@ -96,6 +101,11 @@ public class UnplannedissueRecordMainController { List list = unplannedissueRecordMainService.getUnplannedissueRecordMainList(exportReqVO); // 导出 Excel List datas = UnplannedissueRecordMainConvert.INSTANCE.convertList02(list); + for(UnplannedissueRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "计划外出库记录主.xls", "数据", UnplannedissueRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainExcelVO.java index aaa54b25..29f7eb49 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordMainExcelVO.java @@ -1,5 +1,6 @@ package com.win.module.wms.controller.unplannedissueRecord.vo; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -66,6 +67,7 @@ public class UnplannedissueRecordMainExcelVO { private String remark; @ExcelProperty("创建时间") + @ColumnWidth(value = 16) private LocalDateTime createTime; @ExcelProperty("创建者Id") @@ -87,4 +89,8 @@ public class UnplannedissueRecordMainExcelVO { @ExcelProperty("是否可用") private String available; + + @ExcelProperty("创建者ID") + private String creator; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestDetailController.java index bbab4c06..7d7ef502 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.unplannedissueRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedissueRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class UnplannedissueRequestDetailController { @Resource private UnplannedissueRequestDetailService unplannedissueRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建计划外出库申请子") @PreAuthorize("@ss.hasPermission('wms:unplannedissue-request-detail:create')") @@ -96,6 +101,11 @@ public class UnplannedissueRequestDetailController { List list = unplannedissueRequestDetailService.getUnplannedissueRequestDetailList(exportReqVO); // 导出 Excel List datas = UnplannedissueRequestDetailConvert.INSTANCE.convertList02(list); + for(UnplannedissueRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "计划外出库申请子.xls", "数据", UnplannedissueRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java index aaeb659c..19ba43bf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.unplannedissueRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedissueRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class UnplannedissueRequestMainController { @Resource private UnplannedissueRequestMainService unplannedissueRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建计划外出库申请主") @PreAuthorize("@ss.hasPermission('wms:unplannedissue-request-main:create')") @@ -96,6 +101,11 @@ public class UnplannedissueRequestMainController { List list = unplannedissueRequestMainService.getUnplannedissueRequestMainList(exportReqVO); // 导出 Excel List datas = UnplannedissueRequestMainConvert.INSTANCE.convertList02(list); + for(UnplannedissueRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "计划外出库申请主.xls", "数据", UnplannedissueRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobDetailController.java index 7ed65326..829866a8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.unplannedreceiptJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedreceiptJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class UnplannedreceiptJobDetailController { @Resource private UnplannedreceiptJobDetailService unplannedreceiptJobDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建计划外入库任务子") @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-job-detail:create')") @@ -96,6 +101,11 @@ public class UnplannedreceiptJobDetailController { List list = unplannedreceiptJobDetailService.getUnplannedreceiptJobDetailList(exportReqVO); // 导出 Excel List datas = UnplannedreceiptJobDetailConvert.INSTANCE.convertList02(list); + for(UnplannedreceiptJobDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "计划外入库任务子.xls", "数据", UnplannedreceiptJobDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java index 1cdd6ea8..1777fc9e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.unplannedreceiptJob; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedreceiptJob.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class UnplannedreceiptJobMainController { @Resource private UnplannedreceiptJobMainService unplannedreceiptJobMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建计划外入库任务主") @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-job-main:create')") @@ -96,6 +101,11 @@ public class UnplannedreceiptJobMainController { List list = unplannedreceiptJobMainService.getUnplannedreceiptJobMainList(exportReqVO); // 导出 Excel List datas = UnplannedreceiptJobMainConvert.INSTANCE.convertList02(list); + for(UnplannedreceiptJobMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "计划外入库任务主.xls", "数据", UnplannedreceiptJobMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordDetailController.java index 8b7a57fc..5956df0d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.unplannedreceiptRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class UnplannedreceiptRecordDetailController { @Resource private UnplannedreceiptRecordDetailService unplannedreceiptRecordDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建计划外入库记录子") @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-record-detail:create')") @@ -96,6 +101,11 @@ public class UnplannedreceiptRecordDetailController { List list = unplannedreceiptRecordDetailService.getUnplannedreceiptRecordDetailList(exportReqVO); // 导出 Excel List datas = UnplannedreceiptRecordDetailConvert.INSTANCE.convertList02(list); + for(UnplannedreceiptRecordDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "计划外入库记录子.xls", "数据", UnplannedreceiptRecordDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java index 67dc6c10..e3348eab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.unplannedreceiptRecord; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedreceiptRecord.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class UnplannedreceiptRecordMainController { @Resource private UnplannedreceiptRecordMainService unplannedreceiptRecordMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建计划外入库记录主") @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-record-main:create')") @@ -96,6 +101,11 @@ public class UnplannedreceiptRecordMainController { List list = unplannedreceiptRecordMainService.getUnplannedreceiptRecordMainList(exportReqVO); // 导出 Excel List datas = UnplannedreceiptRecordMainConvert.INSTANCE.convertList02(list); + for(UnplannedreceiptRecordMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "计划外入库记录主.xls", "数据", UnplannedreceiptRecordMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java index ee49804e..952678a2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.unplannedreceiptRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class UnplannedreceiptRequestDetailController { @Resource private UnplannedreceiptRequestDetailService unplannedreceiptRequestDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建计划外入库申请子") @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-request-detail:create')") @@ -96,6 +101,11 @@ public class UnplannedreceiptRequestDetailController { List list = unplannedreceiptRequestDetailService.getUnplannedreceiptRequestDetailList(exportReqVO); // 导出 Excel List datas = UnplannedreceiptRequestDetailConvert.INSTANCE.convertList02(list); + for(UnplannedreceiptRequestDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "计划外入库申请子.xls", "数据", UnplannedreceiptRequestDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java index 220acd39..fca26ad1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.unplannedreceiptRequest; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.unplannedreceiptRequest.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class UnplannedreceiptRequestMainController { @Resource private UnplannedreceiptRequestMainService unplannedreceiptRequestMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建计划外入库申请主") @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-request-main:create')") @@ -96,6 +101,11 @@ public class UnplannedreceiptRequestMainController { List list = unplannedreceiptRequestMainService.getUnplannedreceiptRequestMainList(exportReqVO); // 导出 Excel List datas = UnplannedreceiptRequestMainConvert.INSTANCE.convertList02(list); + for(UnplannedreceiptRequestMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "计划外入库申请主.xls", "数据", UnplannedreceiptRequestMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java index 6e782ba5..aab5effb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java @@ -6,6 +6,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.itembasic.vo.ItembasicImportExcelVo; import com.win.module.wms.controller.warehouse.vo.*; @@ -47,6 +49,9 @@ public class WarehouseController { private WarehouseService warehouseService; @Resource private WarehouseMapper warehouseMapper; + + @Resource + private AdminUserApi userApi; @PostMapping("/create") @Operation(summary = "创建仓库") @PreAuthorize("@ss.hasPermission('wms:warehouse:create')") @@ -106,6 +111,11 @@ public class WarehouseController { List list = warehouseService.getWarehouseList(exportReqVO); // 导出 Excel List datas = WarehouseConvert.INSTANCE.convertList02(list); + for(WarehouseExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "仓库.xls", "数据", WarehouseExcelVO.class, datas); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkDetailController.java index 57c011ff..61cd6199 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkDetailController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.work; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.work.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class WorkDetailController { @Resource private WorkDetailService workDetailService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建生产订单子") @PreAuthorize("@ss.hasPermission('wms:work-detail:create')") @@ -96,6 +101,11 @@ public class WorkDetailController { List list = workDetailService.getWorkDetailList(exportReqVO); // 导出 Excel List datas = WorkDetailConvert.INSTANCE.convertList02(list); + for(WorkDetailExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "生产订单子.xls", "数据", WorkDetailExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkMainController.java index 1aa80927..81f3232d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkMainController.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.work; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.work.vo.*; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,6 +39,9 @@ public class WorkMainController { @Resource private WorkMainService workMainService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建生产订单主") @PreAuthorize("@ss.hasPermission('wms:work-main:create')") @@ -96,6 +101,11 @@ public class WorkMainController { List list = workMainService.getWorkMainList(exportReqVO); // 导出 Excel List datas = WorkMainConvert.INSTANCE.convertList02(list); + for(WorkMainExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "生产订单主.xls", "数据", WorkMainExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java index abf1c9a7..5e8e3c82 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.workshop.vo.*; import com.win.module.wms.convert.workshop.WorkshopConvert; import com.win.module.wms.dal.dataobject.workshop.WorkshopDO; @@ -39,6 +41,9 @@ public class WorkshopController { @Resource private WorkshopService workshopService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建车间") @PreAuthorize("@ss.hasPermission('wms:workshop:create')") @@ -98,6 +103,11 @@ public class WorkshopController { List list = workshopService.getWorkshopList(exportReqVO); // 导出 Excel List datas = WorkshopConvert.INSTANCE.convertList02(list); + for(WorkshopExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "车间.xls", "数据", WorkshopExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java index b99d73fe..c759d444 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java @@ -5,6 +5,8 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; +import com.win.module.system.api.user.AdminUserApi; +import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.workstation.vo.*; import com.win.module.wms.convert.workstation.WorkstationConvert; import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; @@ -39,6 +41,9 @@ public class WorkstationController { @Resource private WorkstationService workstationService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建工位") @PreAuthorize("@ss.hasPermission('wms:workstation:create')") @@ -98,6 +103,11 @@ public class WorkstationController { List list = workstationService.getWorkstationList(exportReqVO); // 导出 Excel List datas = WorkstationConvert.INSTANCE.convertList02(list); + for(WorkstationExcelVO vo : datas) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } ExcelUtils.write(response, "工位.xls", "数据", WorkstationExcelVO.class, datas); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/location/LocationDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/location/LocationDO.java index 097d3a37..c4ad28a1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/location/LocationDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/location/LocationDO.java @@ -1,14 +1,8 @@ package com.win.module.wms.dal.dataobject.location; +import com.sun.xml.bind.v2.TODO; import lombok.*; -import java.util.*; import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; import com.win.framework.mybatis.core.dataobject.BaseDO; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionDetailDO.java index f8f9109f..5cf0b23e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionDetailDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.production; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.math.BigDecimal; @@ -29,14 +30,6 @@ public class ProductionDetailDO extends BaseDO { */ @TableId private Long id; - /** - * 订单号 - */ - private String woNumber; - /** - * 订单行 - */ - private String woLine; /** * Bom版本 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionMainDO.java index f694e119..39da10bd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionMainDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.production; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -108,4 +109,13 @@ public class ProductionMainDO extends BaseDO { */ private String available; + /** + * 订单号 + */ + private String woNumber; + /** + * 订单行 + */ + private String woLine; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/rule/RuleDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/rule/RuleDO.java index 47544cc8..9ae06553 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/rule/RuleDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/rule/RuleDO.java @@ -35,10 +35,12 @@ public class RuleDO extends BaseDO { /** * 代码 */ + @TableField(value = "`code`") private String code; /** * 名称 */ + @TableField(value = "`name`") private String name; /** * 描述 @@ -47,6 +49,7 @@ public class RuleDO extends BaseDO { /** * 条件 */ + @TableField(value = "`condition`") private String condition; /** * 配置 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/saleprice/SalepriceDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/saleprice/SalepriceDO.java index 66aeaa97..bad6c32d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/saleprice/SalepriceDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/saleprice/SalepriceDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.saleprice; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.math.BigDecimal; @@ -34,11 +35,11 @@ public class SalepriceDO extends BaseDO { /** * 客户代码 */ - private String customercode; + private String customerCode; /** * 物料代码 */ - private String itemcode; + private String itemCode; /** * 货币 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java index 5c9784d6..ebbd8983 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionDetailMapper.java @@ -20,8 +20,6 @@ public interface ProductionDetailMapper extends BaseMapperX default PageResult selectPage(ProductionDetailPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ProductionDetailDO::getWoNumber, reqVO.getWoNumber()) - .eqIfPresent(ProductionDetailDO::getWoLine, reqVO.getWoLine()) .eqIfPresent(ProductionDetailDO::getBomVersion, reqVO.getBomVersion()) .eqIfPresent(ProductionDetailDO::getGoodQty, reqVO.getGoodQty()) .eqIfPresent(ProductionDetailDO::getNotGoodQty, reqVO.getNotGoodQty()) @@ -40,8 +38,6 @@ public interface ProductionDetailMapper extends BaseMapperX default List selectList(ProductionDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() - .eqIfPresent(ProductionDetailDO::getWoNumber, reqVO.getWoNumber()) - .eqIfPresent(ProductionDetailDO::getWoLine, reqVO.getWoLine()) .eqIfPresent(ProductionDetailDO::getBomVersion, reqVO.getBomVersion()) .eqIfPresent(ProductionDetailDO::getGoodQty, reqVO.getGoodQty()) .eqIfPresent(ProductionDetailDO::getNotGoodQty, reqVO.getNotGoodQty()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionMainMapper.java index b995c38b..4b908faa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/production/ProductionMainMapper.java @@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; import com.win.module.wms.controller.production.vo.ProductionMainExportReqVO; import com.win.module.wms.controller.production.vo.ProductionMainPageReqVO; +import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.production.ProductionMainDO; import org.apache.ibatis.annotations.Mapper; @@ -37,6 +38,8 @@ public interface ProductionMainMapper extends BaseMapperX { .betweenIfPresent(ProductionMainDO::getUpdateTime, reqVO.getUpdateTime()) .eqIfPresent(ProductionMainDO::getUpdater, reqVO.getUpdater()) .eqIfPresent(ProductionMainDO::getAvailable, reqVO.getAvailable()) + .eqIfPresent(ProductionMainDO::getWoNumber, reqVO.getWoNumber()) + .eqIfPresent(ProductionMainDO::getWoLine, reqVO.getWoLine()) .orderByDesc(ProductionMainDO::getId)); } @@ -59,6 +62,8 @@ public interface ProductionMainMapper extends BaseMapperX { .betweenIfPresent(ProductionMainDO::getUpdateTime, reqVO.getUpdateTime()) .eqIfPresent(ProductionMainDO::getUpdater, reqVO.getUpdater()) .eqIfPresent(ProductionMainDO::getAvailable, reqVO.getAvailable()) + .eqIfPresent(ProductionMainDO::getWoNumber, reqVO.getWoNumber()) + .eqIfPresent(ProductionMainDO::getWoLine, reqVO.getWoLine()) .orderByDesc(ProductionMainDO::getId)); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.java index 0b383400..91ee4123 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/saleprice/SalepriceMapper.java @@ -19,13 +19,13 @@ import java.util.List; public interface SalepriceMapper extends BaseMapperX { default SalepriceDO selectByItemCode(String itemcode) { - return selectOne(SalepriceDO::getItemcode, itemcode); + return selectOne(SalepriceDO::getItemCode, itemcode); } default PageResult selectPage(SalepricePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(SalepriceDO::getCustomercode, reqVO.getCustomercode()) - .eqIfPresent(SalepriceDO::getItemcode, reqVO.getItemcode()) + .eqIfPresent(SalepriceDO::getCustomerCode, reqVO.getCustomerCode()) + .eqIfPresent(SalepriceDO::getItemCode, reqVO.getItemCode()) .eqIfPresent(SalepriceDO::getCurrency, reqVO.getCurrency()) .eqIfPresent(SalepriceDO::getPrice, reqVO.getPrice()) .eqIfPresent(SalepriceDO::getAvailable, reqVO.getAvailable()) @@ -39,8 +39,8 @@ public interface SalepriceMapper extends BaseMapperX { default List selectList(SalepriceExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() - .eqIfPresent(SalepriceDO::getCustomercode, reqVO.getCustomercode()) - .eqIfPresent(SalepriceDO::getItemcode, reqVO.getItemcode()) + .eqIfPresent(SalepriceDO::getCustomerCode, reqVO.getCustomerCode()) + .eqIfPresent(SalepriceDO::getItemCode, reqVO.getItemCode()) .eqIfPresent(SalepriceDO::getCurrency, reqVO.getCurrency()) .eqIfPresent(SalepriceDO::getPrice, reqVO.getPrice()) .eqIfPresent(SalepriceDO::getAvailable, reqVO.getAvailable()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java index be82ea1c..b2255090 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainService.java @@ -70,5 +70,12 @@ public interface CountJobMainService { * @return 盘点任务主列表 */ List getCountJobMainList(CountJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 盘点任务主列表 + */ + public CountJobMainDO countJobMainDoStatusRight(String pnumber,String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java index 5516c01d..c10b8da1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.countJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.countJob.vo.CountJobMainCreateReqVO; import com.win.module.wms.controller.countJob.vo.CountJobMainExportReqVO; import com.win.module.wms.controller.countJob.vo.CountJobMainPageReqVO; @@ -82,5 +83,15 @@ public class CountJobMainServiceImpl implements CountJobMainService { public List getCountJobMainList(CountJobMainExportReqVO exportReqVO) { return countJobMainMapper.selectList(exportReqVO); } - + public CountJobMainDO countJobMainDoStatusRight(String pnumber,String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + CountJobMainDO countJobMainDO = countJobMainMapper.selectOne(queryWrapper); + if(countJobMainDO != null){ + return countJobMainDO; + }else { + throw exception(COUNT_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java index d22caba5..b8d6bd07 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerService.java @@ -70,6 +70,11 @@ public interface CustomerService { List getCustomerList(CustomerExportReqVO exportReqVO); List importCustomerList(List customers, Integer mode, Boolean updatePart); - - public CustomerDO CustomerExist(String code); + /** + * 校验客户信息有效 + * + * @param pcustomerCode 客户代码 + * @return 客户列表 + */ + public CustomerDO selectCustomerExist(String pcustomerCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java index 73ab8a5c..7aaea3a3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customer/CustomerServiceImpl.java @@ -11,6 +11,7 @@ import com.win.module.wms.controller.customer.vo.*; import com.win.module.wms.convert.customer.CustomerConvert; import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO; import com.win.module.wms.dal.dataobject.customer.CustomerDO; +import com.win.module.wms.dal.dataobject.customeritem.CustomeritemDO; import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.mysql.customer.CustomerMapper; import org.springframework.stereotype.Service; @@ -171,18 +172,15 @@ public class CustomerServiceImpl implements CustomerService { throw exception(CUSTOMER_AVAILABLE_NOT_EXISTS); } } - - public CustomerDO CustomerExist(String code) { + @Override + public CustomerDO selectCustomerExist(String pcustomerCode) { QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("code",code); - CustomerDO customerDO =customerMapper.selectOne(queryWrapper); - if(customerDO != null&& customerDO.getAvailable().equals("TRUE")){ + queryWrapper.eq("customer_code",pcustomerCode); + CustomerDO customerDO = customerMapper.selectOne(queryWrapper); + if(customerDO != null && "TRUE".equals(customerDO.getAvailable())){ return customerDO; }else { - throw exception(WAREHOUSE_NOT_EXISTS); + throw exception(CUSTOMER_NOT_EXISTS); } } - - - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java index c3fdc324..3bb42457 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockService.java @@ -70,4 +70,12 @@ public interface CustomerdockService { List getCustomerdockList(CustomerdockExportReqVO exportReqVO); List importCustomerdockList(List customerdocks, Integer mode, Boolean updatePart); + + /** + * 客户地点(月台)有效,状态正确 + * + * @param code 代码 + * @return 客户月台列表 + */ + public CustomerdockDO CustomerExist(String code); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java index c4eb86df..af75bc11 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerdock/CustomerdockServiceImpl.java @@ -10,7 +10,6 @@ import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.customerdock.vo.*; import com.win.module.wms.convert.customerdock.CustomerdockConvert; import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO; -import com.win.module.wms.dal.dataobject.customer.CustomerDO; import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO; import com.win.module.wms.dal.mysql.customerdock.CustomerdockMapper; import org.springframework.stereotype.Service; @@ -185,11 +184,12 @@ public class CustomerdockServiceImpl implements CustomerdockService { throw exception(CUSTOMERDOCK_AVAILABLE_NOT_EXISTS); } } + @Override public CustomerdockDO CustomerExist(String code) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("code",code); CustomerdockDO customerdockDO =customerdockMapper.selectOne(queryWrapper); - if(customerdockDO != null&& customerdockDO.getAvailable().equals("TRUE")){ + if(customerdockDO != null&& "TRUE".equals(customerdockDO.getAvailable())){ return customerdockDO; }else { throw exception(CUSTOMERDOCK_NOT_EXISTS); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java index 89f4e33a..d408794a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java @@ -9,6 +9,8 @@ import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainP import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; +import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; /** * 客户退货任务主 Service 接口 @@ -70,5 +72,31 @@ public interface CustomerreturnJobMainService { * @return 客户退货任务主列表 */ List getCustomerreturnJobMainList(CustomerreturnJobMainExportReqVO exportReqVO); - + /** + * 校验采购订单明细 + * + * @param pnumber 单据号 + * @param psupplierCode 供应商代码 + * @param pitemCode 物品代码 + * @param plineNumber 行号 + * @return 采购订单子列表 + */ + public PurchaseDetailDO productionDetailExist(String pnumber, String pitemCode, String psupplierCode, String plineNumber); + /** + * 校验销售订单明细 + * + * @param psoNumber 单据号 + * @param psoLine 行号 + * @param pitemCode 物品代码 + * @return 采购订单子列表 + */ + public SaleDetailDO saleDetailExist(String psoNumber, String psoLine, String pitemCode); + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public CustomerreturnJobMainDO customerreturnJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java index 72509360..eb4cce47 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java @@ -1,9 +1,14 @@ package com.win.module.wms.service.customerreturnJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainCreateReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExportReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainPageReqVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; +import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; +import com.win.module.wms.service.purchase.PurchaseMainService; +import com.win.module.wms.service.sale.SaleMainService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -31,6 +36,10 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe @Resource private CustomerreturnJobMainMapper customerreturnJobMainMapper; + @Resource + private PurchaseMainService purchaseMainService; + @Resource + private SaleMainService saleMainService; @Override public Long createCustomerreturnJobMain(CustomerreturnJobMainCreateReqVO createReqVO) { // 插入 @@ -82,5 +91,27 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe public List getCustomerreturnJobMainList(CustomerreturnJobMainExportReqVO exportReqVO) { return customerreturnJobMainMapper.selectList(exportReqVO); } - + //校验采购订单明细 + @Override + public PurchaseDetailDO productionDetailExist(String pnumber, String pitemCode, String psupplierCode, String plineNumber) { + PurchaseDetailDO purchaseDetailDO = purchaseMainService.selectPurchaseDetailDoExist(pnumber, psupplierCode, pitemCode, plineNumber); + return purchaseDetailDO; + } + @Override + public SaleDetailDO saleDetailExist(String psoNumber,String psoLine,String pitemCode) { + SaleDetailDO saleDetailDO = saleMainService.selectSaleDetailDoExist(psoNumber, psoLine, pitemCode); + return saleDetailDO; + } + @Override + public CustomerreturnJobMainDO customerreturnJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + CustomerreturnJobMainDO customerreturnJobMainDO = customerreturnJobMainMapper.selectOne(queryWrapper); + if(customerreturnJobMainDO != null){ + return customerreturnJobMainDO; + }else { + throw exception(CUSTOMERRETURN_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java index 455c893d..76717da3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java @@ -9,6 +9,8 @@ import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainPageReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainUpdateReqVO; import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobMainDO; import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; +import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; /** * 发货任务主 Service 接口 @@ -70,5 +72,31 @@ public interface DeliverJobMainService { * @return 发货任务主列表 */ List getDeliverJobMainList(DeliverJobMainExportReqVO exportReqVO); - + /** + * 校验采购订单明细 + * + * @param pnumber 单据号 + * @param psupplierCode 供应商代码 + * @param pitemCode 物品代码 + * @param plineNumber 行号 + * @return 采购订单子列表 + */ + public PurchaseDetailDO productionDetailExist(String pnumber, String pitemCode, String psupplierCode, String plineNumber); + /** + * 校验采销售订单明细 + * + * @param psoNumber 单据号 + * @param pitemCode 物品代码 + * @param psoLine 行号 + * @return 销售订单子列表 + */ + public SaleDetailDO saleDetailExist(String psoNumber, String psoLine, String pitemCode); + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 发货任务主列表 + */ + public DeliverJobMainDO deliverJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java index 97385423..ac1da7b9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainServiceImpl.java @@ -1,9 +1,16 @@ package com.win.module.wms.service.deliverJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainCreateReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExportReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainPageReqVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; +import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; +import com.win.module.wms.service.purchase.PurchaseMainService; +import com.win.module.wms.service.sale.SaleMainService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -31,6 +38,11 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService { @Resource private DeliverJobMainMapper deliverJobMainMapper; + @Resource + private PurchaseMainService purchaseMainService; + @Resource + private SaleMainService saleMainService; + @Override public Long createDeliverJobMain(DeliverJobMainCreateReqVO createReqVO) { // 插入 @@ -83,4 +95,27 @@ public class DeliverJobMainServiceImpl implements DeliverJobMainService { return deliverJobMainMapper.selectList(exportReqVO); } + //校验采购订单明细 + @Override + public PurchaseDetailDO productionDetailExist(String pnumber, String pitemCode,String psupplierCode,String plineNumber) { + PurchaseDetailDO purchaseDetailDO = purchaseMainService.selectPurchaseDetailDoExist(pnumber, psupplierCode, pitemCode, plineNumber); + return purchaseDetailDO; + } + @Override + public SaleDetailDO saleDetailExist(String psoNumber, String psoLine, String pitemCode) { + SaleDetailDO saleDetailDO = saleMainService.selectSaleDetailDoExist(psoNumber, psoLine, pitemCode); + return saleDetailDO; + } + @Override + public DeliverJobMainDO deliverJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + DeliverJobMainDO deliverJobMainDO = deliverJobMainMapper.selectOne(queryWrapper); + if(deliverJobMainDO != null){ + return deliverJobMainDO; + }else { + throw exception(DELIVER_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java index 2ae4d02b..8a8515cb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java @@ -70,6 +70,12 @@ public interface DockService { List getDockList(DockExportReqVO exportReqVO); List dockimportDockList(List docks, Integer mode, Boolean updatePart); - //收货口有效，状态正确 - public DockDO DockExist(String code); + + /** + * 校验收货口有效，状态正确 + * + * @param code 代码 + * @return 月台列表 + */ + DockDO DockExist(String code); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java index d8f39d6a..e3a73759 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java @@ -10,7 +10,6 @@ import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.dock.vo.*; import com.win.module.wms.convert.dock.DockConvert; import com.win.module.wms.dal.dataobject.dock.DockDO; -import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; import com.win.module.wms.dal.mysql.dock.DockMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.interceptor.TransactionAspectSupport; @@ -185,15 +184,15 @@ public class DockServiceImpl implements DockService { } } - //收货口有效，状态正确 + @Override public DockDO DockExist(String code) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("code",code); DockDO dockDO = dockMapper.selectOne(queryWrapper); - if(dockDO != null&& dockDO.getAvailable().equals("TRUE")){ + if(dockDO != null&& "TRUE".equals(dockDO.getAvailable())){ return dockDO; }else { - throw exception(PDOCK_NOT_EXISTS); + throw exception(DOCK_NOT_EXISTS); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java index 181afeab..c3177fc8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainService.java @@ -70,5 +70,12 @@ public interface InspectJobMainService { * @return 检验任务主列表 */ List getInspectJobMainList(InspectJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public InspectJobMainDO inspectJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java index 66a9c21e..05e86117 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.inspectJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainCreateReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainExportReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainPageReqVO; import com.win.module.wms.controller.inspectJob.vo.InspectJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { public List getInspectJobMainList(InspectJobMainExportReqVO exportReqVO) { return inspectJobMainMapper.selectList(exportReqVO); } - + @Override + public InspectJobMainDO inspectJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + InspectJobMainDO inspectJobMainDO = inspectJobMainMapper.selectOne(queryWrapper); + if(inspectJobMainDO != null){ + return inspectJobMainDO; + }else { + throw exception(INSPECT_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java index c520d5be..bc146903 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainService.java @@ -70,5 +70,12 @@ public interface InventorymoveJobMainService { * @return 库存转移任务主列表 */ List getInventorymoveJobMainList(InventorymoveJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public InventorymoveJobMainDO inventorymoveJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java index a529a2bb..44ce1a36 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveJob/InventorymoveJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.inventorymoveJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainCreateReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainExportReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainPageReqVO; import com.win.module.wms.controller.inventorymoveJob.vo.InventorymoveJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class InventorymoveJobMainServiceImpl implements InventorymoveJobMainServ public List getInventorymoveJobMainList(InventorymoveJobMainExportReqVO exportReqVO) { return inventorymoveJobMainMapper.selectList(exportReqVO); } - + @Override + public InventorymoveJobMainDO inventorymoveJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + InventorymoveJobMainDO inventorymoveJobMainDO = inventorymoveJobMainMapper.selectOne(queryWrapper); + if(inventorymoveJobMainDO != null){ + return inventorymoveJobMainDO; + }else { + throw exception(INVENTORYMOVE_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java index 675bcfec..ce9b332b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainService.java @@ -70,5 +70,12 @@ public interface IssueJobMainService { * @return 发料任务主列表 */ List getIssueJobMainList(IssueJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public IssueJobMainDO issueJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java index f2880092..deb2791e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.issueJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.issueJob.vo.IssueJobMainCreateReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainExportReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainPageReqVO; import com.win.module.wms.controller.issueJob.vo.IssueJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class IssueJobMainServiceImpl implements IssueJobMainService { public List getIssueJobMainList(IssueJobMainExportReqVO exportReqVO) { return issueJobMainMapper.selectList(exportReqVO); } - + @Override + public IssueJobMainDO issueJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + IssueJobMainDO issueJobMainDO = issueJobMainMapper.selectOne(queryWrapper); + if(issueJobMainDO != null){ + return issueJobMainDO; + }else { + throw exception(ISSUE_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java index 6401aaa6..755e48ee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java @@ -79,6 +79,11 @@ public interface ItembasicService { List importItembasicList(List importItembasics, Integer mode,boolean updatePart); public ItembasicDO selectItembasic(String code); - + /** + * 校验物料有效，状态正确 + * + * @param itemCode 物品代码 + * @return 物品基本信息列表 + */ public ItembasicDO itemCodeExist(String itemCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java index b6dc09e4..f76c283c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java @@ -251,7 +251,7 @@ public class ItembasicServiceImpl implements ItembasicService { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("code",code); ItembasicDO itembasicDO = itembasicMapper.selectOne(queryWrapper); - if(itembasicDO != null && itembasicDO.getAvailable().equals("TRUE")){ + if(itembasicDO != null && "ENABLE".equals(itembasicDO.getStatus())){ return itembasicDO; }else { throw exception(ITEMBASIC_NOT_EXISTS); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java index ff121a63..a2d8cb25 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java @@ -2,6 +2,7 @@ package com.win.module.wms.service.location; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.location.vo.*; +import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.dal.dataobject.location.LocationDO; import javax.validation.Valid; @@ -70,5 +71,31 @@ public interface LocationService { List getLocationList(LocationExportReqVO exportReqVO); List importLocationList(List locations, Integer mode, Boolean updatePart); - + /** + * 库位验证 + * 从库位号有效，状态正确，开关正确 + * 到库位号有效，状态正确，开关正确 + * 共用同一个方法 + * @param locationCode 库位 + * @return 库位信息 + */ + public LocationDO selectLocationExist(String locationCode); + /** + * 获取当前库位采用的获取库位存储策略信息 + * + * @param warehouseCode 仓库代码 + * @param areaCode 区域代码 + * @param locationGroupCode 库位组code + * @param plocationCode 库位 + * @return 库位存储策略信息 + */ + //TODO 后期具体业务时需判断策略相关标签状态(还没写) + public RuleRespVO selectLocationStrategyRule(String warehouseCode, String areaCode, String locationGroupCode, String plocationCode); + /** + * 零件库位关系有效 + * + * @param pitemCode 物品代码 + * @return 上架策略信息 + */ + public RuleRespVO selectLocationAndModRelation(String pitemCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java index e08001cc..9be11678 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java @@ -8,10 +8,12 @@ import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.location.vo.*; +import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.convert.location.LocationConvert; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.mysql.location.LocationMapper; +import com.win.module.wms.service.rule.RuleService; import org.springframework.stereotype.Service; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.validation.annotation.Validated; @@ -35,6 +37,8 @@ public class LocationServiceImpl implements LocationService { @Resource private LocationMapper locationMapper; + @Resource + private RuleService ruleService; @Override public Long createLocation(LocationCreateReqVO createReqVO) { @@ -216,6 +220,31 @@ public class LocationServiceImpl implements LocationService { throw exception(LOCATION_AVAILABLE_NOT_EXISTS); } } - - + //调用公共方法查询库位信息 + public LocationDO selectLocation(String pcode) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("code",pcode); + LocationDO locationDO = locationMapper.selectOne(queryWrapper); + if(locationDO != null && "TRUE".equals(locationDO.getAvailable())){ + return locationDO; + }else { + throw exception(LOCATION_NOT_EXISTS); + } + } + public LocationDO selectLocationExist(String locationCode) { + LocationDO locationDO = selectLocation(locationCode); + return locationDO; + } + public RuleRespVO selectLocationStrategyRule(String warehouseCode, String areaCode, String locationGroupCode, String plocationCode) { + RuleRespVO ruleRespVO = ruleService.warehouseStorage(warehouseCode,areaCode,locationGroupCode,plocationCode); + return ruleRespVO; + } + public RuleRespVO selectLocationAndModRelation(String pitemCode) { + RuleRespVO grounding = ruleService.grounding(null, null, null, null, null, null, pitemCode, null, null, null, null, null, null); + if(grounding != null){ + return grounding; + }else { + throw exception(LOCATION_ITEMCODE_AND_LOCATIONCODE_NOT_EXISTS); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java index 433a6711..d3099f77 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageService.java @@ -70,8 +70,11 @@ public interface PackageService { * @return 包装列表 */ List getPackageList(PackageExportReqVO exportReqVO); - - PackageDO LabelExist(String number); - - + /** + * 校验标签有效 + * + * @param pnumber 包装好 + * @return 包装列表 + */ + PackageDO LabelExist(String pnumber); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java index 14ff885b..06408550 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java @@ -86,9 +86,9 @@ public class PackageServiceImpl implements PackageService { return packageMapper.selectList(exportReqVO); } @Override - public PackageDO LabelExist(String number) { + public PackageDO LabelExist(String pnumber) { QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("number",number); + queryWrapper.eq("number",pnumber); PackageDO packageDO = packageMapper.selectOne(queryWrapper); if(packageDO != null){ return packageDO; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java index 1346e41f..60eec383 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainService.java @@ -70,5 +70,12 @@ public interface PickJobMainService { * @return 拣料任务主列表 */ List getPickJobMainList(PickJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public PickJobMainDO ipickJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java index 767efd54..1950a3ab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/pickJob/PickJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.pickJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.pickJob.vo.PickJobMainCreateReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainExportReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainPageReqVO; import com.win.module.wms.controller.pickJob.vo.PickJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.issueJob.IssueJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class PickJobMainServiceImpl implements PickJobMainService { public List getPickJobMainList(PickJobMainExportReqVO exportReqVO) { return pickJobMainMapper.selectList(exportReqVO); } - + @Override + public PickJobMainDO ipickJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + PickJobMainDO pickJobMainDO = pickJobMainMapper.selectOne(queryWrapper); + if(pickJobMainDO != null){ + return pickJobMainDO; + }else { + throw exception(PICK_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java index a39935aa..979745be 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainService.java @@ -70,5 +70,13 @@ public interface ProductdismantleJobMainService { * @return 制品拆解任务主列表 */ List getProductdismantleJobMainList(ProductdismantleJobMainExportReqVO exportReqVO); + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public ProductdismantleJobMainDO productdismantleJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java index 1b641cd9..286107d7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleJob/ProductdismantleJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.productdismantleJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainCreateReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainExportReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainPageReqVO; import com.win.module.wms.controller.productdismantleJob.vo.ProductdismantleJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class ProductdismantleJobMainServiceImpl implements ProductdismantleJobMa public List getProductdismantleJobMainList(ProductdismantleJobMainExportReqVO exportReqVO) { return productdismantleJobMainMapper.selectList(exportReqVO); } - + @Override + public ProductdismantleJobMainDO productdismantleJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + ProductdismantleJobMainDO productdismantleJobMainDO = productdismantleJobMainMapper.selectOne(queryWrapper); + if(productdismantleJobMainDO != null){ + return productdismantleJobMainDO; + }else { + throw exception(PRODUCTDISMANTLE_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java index 3bfce589..0ff47f0e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java @@ -7,6 +7,7 @@ import com.win.module.wms.controller.production.vo.ProductionMainCreateReqVO; import com.win.module.wms.controller.production.vo.ProductionMainExportReqVO; import com.win.module.wms.controller.production.vo.ProductionMainPageReqVO; import com.win.module.wms.controller.production.vo.ProductionMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.production.ProductionMainDO; import com.win.framework.common.pojo.PageResult; @@ -70,5 +71,13 @@ public interface ProductionMainService { * @return 生产计划主列表 */ List getProductionMainList(ProductionMainExportReqVO exportReqVO); + /** + * 校验生产计划 + * + * @param pnumber 单据号 + * @param pitemCode 物品代码 + * @return 生产计划子列表 + */ + ProductionDetailDO planProductionDetailDoExist(String pnumber, String pitemCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java index 63027478..9da997ad 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java @@ -1,9 +1,17 @@ package com.win.module.wms.service.production; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.production.vo.ProductionMainCreateReqVO; import com.win.module.wms.controller.production.vo.ProductionMainExportReqVO; import com.win.module.wms.controller.production.vo.ProductionMainPageReqVO; import com.win.module.wms.controller.production.vo.ProductionMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; +import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobDetailDO; +import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; +import com.win.module.wms.dal.dataobject.purchase.PurchaseMainDO; +import com.win.module.wms.dal.mysql.production.ProductionDetailMapper; +import com.win.module.wms.dal.mysql.productreceiptJob.ProductreceiptJobDetailMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -15,6 +23,7 @@ import com.win.framework.common.pojo.PageResult; import com.win.module.wms.convert.production.ProductionMainConvert; import com.win.module.wms.dal.mysql.production.ProductionMainMapper; +import org.springframework.web.bind.annotation.GetMapping; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.*; @@ -31,6 +40,11 @@ public class ProductionMainServiceImpl implements ProductionMainService { @Resource private ProductionMainMapper productionMainMapper; + @Resource + private ProductionDetailMapper productionDetailMapper; + @Resource + private ProductreceiptJobDetailMapper productreceiptJobDetailMapper; + @Override public Long createProductionMain(ProductionMainCreateReqVO createReqVO) { // 插入 @@ -82,5 +96,29 @@ public class ProductionMainServiceImpl implements ProductionMainService { public List getProductionMainList(ProductionMainExportReqVO exportReqVO) { return productionMainMapper.selectList(exportReqVO); } - + //公共方法 校验生产计划 + @Override + public ProductionDetailDO planProductionDetailDoExist(String pnumber, String pitemCode) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number", pnumber); + ProductionMainDO productionMainDO = productionMainMapper.selectOne(queryWrapper); + if (productionMainDO != null && "TRUE".equals(productionMainDO.getAvailable())) { + if (null != productionMainDO.getStatus() && !"CLOSED".equals(productionMainDO.getStatus())) { + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("master_id", productionMainDO.getId()); + queryWrapper1.eq("item_code", pitemCode); + queryWrapper1.eq("number", pnumber); + ProductionDetailDO productionDetailDO = productionDetailMapper.selectOne(queryWrapper1); + if (productionDetailDO != null && "TRUE".equals(productionDetailDO.getAvailable())) { + return productionDetailDO; + } else { + throw exception(PRODUCTION_MAIN_MASSAGE_EXISTS); + } + } else{ + throw exception(PRODUCTION_MAIN_NUMBER_CLOSE_EXISTS); + } + } else { + throw exception(PRODUCTION_MAIN_NUMBER_NOT_EXISTS); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java index c56cbf9f..1917c357 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java @@ -180,4 +180,15 @@ public class ProductionlineServiceImpl implements ProductionlineService { + //生产线有效，状态正确 + public ProductionlineDO pcodeExist(String pcode) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("code",pcode); + ProductionlineDO productionlineDO = productionlineMapper.selectOne(queryWrapper); + if(productionlineDO != null && productionlineDO.getAvailable().equals("TRUE")){ + return productionlineDO; + }else { + throw exception(PRODUCTIONLINE_CODE_NOT_EXISTS); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java index 0fd5a2b6..06dfccc2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java @@ -2,7 +2,6 @@ package com.win.module.wms.service.productionlineitem; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.productionlineitem.vo.*; -import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO; import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO; import javax.validation.Valid; @@ -71,5 +70,12 @@ public interface ProductionlineitemService { List getProductionlineitemList(ProductionlineitemExportReqVO exportReqVO); List importProductionlineItemList(List productionlineItems, Integer mode, Boolean updatePart); - public ProductionlineitemDO ProductionlineitemExist(String code, String linecode); + /** + * 零件生产线关系有效 + * + * @param pproductionLineCode 产线代码 + * @param pitemCode 物品代码 + * @return 生产线物料关系 + */ + public List pProductionLineCodeAndpItemCodeExist(String pproductionLineCode,String pitemCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java index c34f71a0..aeb09207 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemServiceImpl.java @@ -8,7 +8,6 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.productionlineitem.vo.*; import com.win.module.wms.convert.productionlineitem.ProductionlineitemConvert; -import com.win.module.wms.dal.dataobject.customerdock.CustomerdockDO; import com.win.module.wms.dal.dataobject.owner.OwnerDO; import com.win.module.wms.dal.dataobject.productionlineitem.ProductionlineitemDO; import com.win.module.wms.dal.mysql.productionlineitem.ProductionlineitemMapper; @@ -113,13 +112,12 @@ public class ProductionlineitemServiceImpl implements ProductionlineitemService } }); //错误不为空并非部分更新，手工回滚 - if (!errorList.isEmpty() && !updatePart) { + if(!errorList.isEmpty() && !updatePart) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); } return errorList; } - - private void validateProcessForCreateOrUpdate(Long id, String fgLocationCode, String productionLineCode, String itemCode, String available) { + private void validateProcessForCreateOrUpdate(Long id, String fgLocationCode,String productionLineCode,String itemCode,String available) { // 关闭数据权限，避免因为没有数据权限，查询不到数据，进而导致唯一校验不正确 DataPermissionUtils.executeIgnore(() -> { validateProductionlineitemExists(id); @@ -167,19 +165,21 @@ public class ProductionlineitemServiceImpl implements ProductionlineitemService throw exception(PRODUCTIONLINEITEM_AVAILABLE_NOT_EXISTS); } } - - public ProductionlineitemDO ProductionlineitemExist(String code, String linecode) { + //零件生产线关系有效 + public List pProductionLineCodeAndpItemCodeExist(String pproductionLineCode,String pitemCode) { QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("code", code); - queryWrapper.eq("linecode", linecode); - ProductionlineitemDO productionlineitemDO = productionlineitemMapper.selectOne(queryWrapper); - if (productionlineitemDO != null && productionlineitemDO.getAvailable().equals("TRUE")) { - return productionlineitemDO; - } else { - throw exception(CUSTOMERDOCK_NOT_EXISTS); + queryWrapper.eq("production_line_code",pproductionLineCode); + queryWrapper.eq("item_code",pitemCode); + List productionlineitemDO = productionlineitemMapper.selectList(queryWrapper); + if( productionlineitemDO != null){ + for (ProductionlineitemDO aDo : productionlineitemDO) { + if("TRUE".equals(aDo.getAvailable())){ + return productionlineitemDO; + } + } + }else { + throw exception(PRODUCTIONLINEITEM_NOT_EXISTS); } + return productionlineitemDO; } - - - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java index 0e49c928..7143b5a7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainService.java @@ -70,5 +70,12 @@ public interface ProductionreceiptJobMainService { * @return 生产收料任务主列表 */ List getProductionreceiptJobMainList(ProductionreceiptJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public ProductionreceiptJobMainDO productionreceiptJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java index db51e23e..18a3eeee 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.productionreceiptJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainCreateReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainExportReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainPageReqVO; import com.win.module.wms.controller.productionreceiptJob.vo.ProductionreceiptJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -83,4 +85,16 @@ public class ProductionreceiptJobMainServiceImpl implements ProductionreceiptJob return productionreceiptJobMainMapper.selectList(exportReqVO); } + @Override + public ProductionreceiptJobMainDO productionreceiptJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + ProductionreceiptJobMainDO productionreceiptJobMainDO = productionreceiptJobMainMapper.selectOne(queryWrapper); + if(productionreceiptJobMainDO != null){ + return productionreceiptJobMainDO; + }else { + throw exception(CUSTOMERRETURN_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java index 10abf843..21e1effb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainService.java @@ -70,5 +70,12 @@ public interface ProductionreturnJobMainService { * @return 生产退料任务主列表 */ List getProductionreturnJobMainList(ProductionreturnJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public ProductionreturnJobMainDO productionreturnJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java index 6f85c384..6e10fbd1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnJob/ProductionreturnJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.productionreturnJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainCreateReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainExportReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainPageReqVO; import com.win.module.wms.controller.productionreturnJob.vo.ProductionreturnJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.countJob.CountJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,17 @@ public class ProductionreturnJobMainServiceImpl implements ProductionreturnJobMa public List getProductionreturnJobMainList(ProductionreturnJobMainExportReqVO exportReqVO) { return productionreturnJobMainMapper.selectList(exportReqVO); } + @Override + public ProductionreturnJobMainDO productionreturnJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + ProductionreturnJobMainDO productionreturnJobMainDO = productionreturnJobMainMapper.selectOne(queryWrapper); + if(productionreturnJobMainDO != null){ + return productionreturnJobMainDO; + }else { + throw exception(PRODUCTIONRETURN_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java index ddd94dfe..44e00239 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainService.java @@ -70,5 +70,12 @@ public interface ProductputawayJobMainService { * @return 制品上架任务主列表 */ List getProductputawayJobMainList(ProductputawayJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public ProductputawayJobMainDO customerreturnJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java index a12d1ba3..745e32b1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayJob/ProductputawayJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.productputawayJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainCreateReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainExportReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainPageReqVO; import com.win.module.wms.controller.productputawayJob.vo.ProductputawayJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class ProductputawayJobMainServiceImpl implements ProductputawayJobMainSe public List getProductputawayJobMainList(ProductputawayJobMainExportReqVO exportReqVO) { return productputawayJobMainMapper.selectList(exportReqVO); } - + @Override + public ProductputawayJobMainDO customerreturnJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + ProductputawayJobMainDO productputawayJobMainDO = productputawayJobMainMapper.selectOne(queryWrapper); + if(productputawayJobMainDO != null){ + return productputawayJobMainDO; + }else { + throw exception(PRODUCTPUTAWAY_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java index 370db3d2..1ab31259 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java @@ -7,6 +7,7 @@ import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainC import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainExportReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainPageReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; import com.win.module.wms.dal.dataobject.productreceiptJob.ProductreceiptJobMainDO; import com.win.framework.common.pojo.PageResult; @@ -70,5 +71,20 @@ public interface ProductreceiptJobMainService { * @return 制品收货任务主列表 */ List getProductreceiptJobMainList(ProductreceiptJobMainExportReqVO exportReqVO); - + /** + * /生产(明细)有效，状态正确 + * + * @param pnumber 单据号 + * @param pitemCode 物品代码 + * @return 生产计划子表信息列表 + */ + public ProductionDetailDO planProductionDetailExist(String pnumber, String pitemCode); + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public ProductreceiptJobMainDO productreceiptJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java index 15f560c9..480aea44 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java @@ -1,9 +1,13 @@ package com.win.module.wms.service.productreceiptJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainCreateReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainExportReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainPageReqVO; import com.win.module.wms.controller.productreceiptJob.vo.ProductreceiptJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.module.wms.dal.dataobject.production.ProductionDetailDO; +import com.win.module.wms.service.production.ProductionMainService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -31,6 +35,9 @@ public class ProductreceiptJobMainServiceImpl implements ProductreceiptJobMainSe @Resource private ProductreceiptJobMainMapper productreceiptJobMainMapper; + @Resource + private ProductionMainService productionMainService; + @Override public Long createProductreceiptJobMain(ProductreceiptJobMainCreateReqVO createReqVO) { // 插入 @@ -82,5 +89,22 @@ public class ProductreceiptJobMainServiceImpl implements ProductreceiptJobMainSe public List getProductreceiptJobMainList(ProductreceiptJobMainExportReqVO exportReqVO) { return productreceiptJobMainMapper.selectList(exportReqVO); } - + //生产(明细)有效，状态正确 + @Override + public ProductionDetailDO planProductionDetailExist(String pnumber, String pitemCode) { + ProductionDetailDO productionDetailDO = productionMainService.planProductionDetailDoExist(pnumber, pitemCode); + return productionDetailDO; + } + @Override + public ProductreceiptJobMainDO productreceiptJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + ProductreceiptJobMainDO productreceiptJobMainDO = productreceiptJobMainMapper.selectOne(queryWrapper); + if(productreceiptJobMainDO != null){ + return productreceiptJobMainDO; + }else { + throw exception(PRODUCTRECEIPT_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java index 80091510..35f945ef 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainService.java @@ -70,5 +70,12 @@ public interface ProductscrapJobMainService { * @return 制品报废任务主列表 */ List getProductscrapJobMainList(ProductscrapJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public ProductscrapJobMainDO productscrapJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java index 1b3beccf..2338c8f7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapJob/ProductscrapJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.productscrapJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainCreateReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainExportReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainPageReqVO; import com.win.module.wms.controller.productscrapJob.vo.ProductscrapJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class ProductscrapJobMainServiceImpl implements ProductscrapJobMainServic public List getProductscrapJobMainList(ProductscrapJobMainExportReqVO exportReqVO) { return productscrapJobMainMapper.selectList(exportReqVO); } - + @Override + public ProductscrapJobMainDO productscrapJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + ProductscrapJobMainDO productscrapJobMainDO = productscrapJobMainMapper.selectOne(queryWrapper); + if(productscrapJobMainDO != null){ + return productscrapJobMainDO; + }else { + throw exception(PRODUCTSCRAP_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java index 71971a33..da14ac22 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java @@ -7,6 +7,7 @@ import com.win.module.wms.controller.purchase.vo.PurchaseMainCreateReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainExportReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainPageReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.purchase.PurchaseMainDO; import com.win.framework.common.pojo.PageResult; @@ -70,5 +71,15 @@ public interface PurchaseMainService { * @return 采购订单主列表 */ List getPurchaseMainList(PurchaseMainExportReqVO exportReqVO); + /** + * 校验采购订单明细 + * + * @param pnumber 单据号 + * @param psupplierCode 供应商代码 + * @param pitemCode 物品代码 + * @param plineNumber 行号 + * @return 采购订单子列表 + */ + public PurchaseDetailDO selectPurchaseDetailDoExist(String pnumber, String psupplierCode, String pitemCode, String plineNumber); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java index 375de850..c1648292 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java @@ -1,9 +1,12 @@ package com.win.module.wms.service.purchase; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.purchase.vo.PurchaseMainCreateReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainExportReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainPageReqVO; import com.win.module.wms.controller.purchase.vo.PurchaseMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; +import com.win.module.wms.dal.mysql.purchase.PurchaseDetailMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -31,6 +34,8 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { @Resource private PurchaseMainMapper purchaseMainMapper; + @Resource + private PurchaseDetailMapper purchaseDetailMapper; @Override public Long createPurchaseMain(PurchaseMainCreateReqVO createReqVO) { // 插入 @@ -82,5 +87,31 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { public List getPurchaseMainList(PurchaseMainExportReqVO exportReqVO) { return purchaseMainMapper.selectList(exportReqVO); } - + //公共方法 校验采购订单明细 + @Override + public PurchaseDetailDO selectPurchaseDetailDoExist(String pnumber, String psupplierCode, String pitemCode, String plineNumber) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("supplier_code",psupplierCode); + PurchaseMainDO purchaseMainDO = purchaseMainMapper.selectOne(queryWrapper); + if(purchaseMainDO != null && "TRUE".equals(purchaseMainDO.getAvailable())){ + if(!"CLOSED".equals(purchaseMainDO.getStatus())){ + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("master_id",purchaseMainDO.getId()); + queryWrapper1.eq("number",pnumber); + queryWrapper1.eq("item_code",pitemCode); + queryWrapper1.eq("line_number",plineNumber); + PurchaseDetailDO purchaseDetailDO = purchaseDetailMapper.selectOne(queryWrapper1); + if(purchaseDetailDO != null && "TRUE".equals(purchaseDetailDO.getAvailable())){ + return purchaseDetailDO; + }else { + throw exception(PURCHASE_DETAIL_ARGUMENT_NOT_EXISTS); + } + }else { + throw exception(PURCHASE_DETAIL_NUMBER_NOT_EXISTS); + } + }else { + throw exception(PURCHASE_DETAIL_NOT_EXISTS); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java index 27f33a9a..af02e362 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java @@ -5,6 +5,7 @@ import javax.validation.*; import com.win.module.wms.controller.purchasereceiptJob.vo.*; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO; import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; /** * 采购收货任务主 Service 接口 @@ -66,5 +67,12 @@ public interface PurchasereceiptJobMainService { * @return 采购收货任务主列表 */ List getPurchasereceiptJobMainList(PurchasereceiptJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public PurchasereceiptJobMainDO purchasereceiptJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index a2d64f46..73398f2c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java @@ -1,5 +1,9 @@ package com.win.module.wms.service.purchasereceiptJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; +import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -26,6 +30,8 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain @Resource private PurchasereceiptJobMainMapper purchasereceiptJobMainMapper; + @Resource + private SupplierdeliverRecordMainService supplierdeliverRecordMainService; @Override public Long createPurchasereceiptJobMain(PurchasereceiptJobMainCreateReqVO createReqVO) { @@ -78,5 +84,33 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain public List getPurchasereceiptJobMainList(PurchasereceiptJobMainExportReqVO exportReqVO) { return purchasereceiptJobMainMapper.selectList(exportReqVO); } - + /** + * 调用校验供应商发货记录方法 + * + * @param pasnNumber 发货单号 + * @param pitemCode 物品代码 + * @param ppoNumber 订单号 + * @param ppoLine 订单行 + * @return 供应商发货记录子 + */ + public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordDetailDoExist(String pasnNumber,String pitemCode,String ppoNumber,String ppoLine) { + SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordMainService.selectSupplierdeliverRecordMainDO(pasnNumber, pitemCode, ppoNumber, ppoLine); + if(supplierdeliverRecordDetailDO != null){ + return supplierdeliverRecordDetailDO; + }else { + throw exception(SUPPLIERDELIVER_RECORD_DETAIL_NOT_EXISTS); + } + } + @Override + public PurchasereceiptJobMainDO purchasereceiptJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + PurchasereceiptJobMainDO purchasereceiptJobMainDO = purchasereceiptJobMainMapper.selectOne(queryWrapper); + if(purchasereceiptJobMainDO != null){ + return purchasereceiptJobMainDO; + }else { + throw exception(PURCHASERECEIPT_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java index c92d9de0..4da1d26c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainService.java @@ -70,5 +70,12 @@ public interface PurchasereturnJobMainService { * @return 采购退货任务主列表 */ List getPurchasereturnJobMainList(PurchasereturnJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public PurchasereturnJobMainDO purchasereturnJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java index 5377edd9..55339151 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java @@ -1,9 +1,13 @@ package com.win.module.wms.service.purchasereturnJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainCreateReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainExportReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainPageReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; +import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; +import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -30,7 +34,8 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe @Resource private PurchasereturnJobMainMapper purchasereturnJobMainMapper; - + @Resource + private SupplierdeliverRecordMainService supplierdeliverRecordMainService; @Override public String createPurchasereturnJobMain(PurchasereturnJobMainCreateReqVO createReqVO) { // 插入 @@ -82,5 +87,33 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe public List getPurchasereturnJobMainList(PurchasereturnJobMainExportReqVO exportReqVO) { return purchasereturnJobMainMapper.selectList(exportReqVO); } - + /** + * 调用校验供应商发货记录方法 + * + * @param pasnNumber 发货单号 + * @param pitemCode 物品代码 + * @param ppoNumber 订单号 + * @param ppoLine 订单行 + * @return 供应商发货记录子 + */ + public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordDetailDoExist(String pasnNumber, String pitemCode, String ppoNumber, String ppoLine) { + SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordMainService.selectSupplierdeliverRecordMainDO(pasnNumber, pitemCode, ppoNumber, ppoLine); + if(supplierdeliverRecordDetailDO != null){ + return supplierdeliverRecordDetailDO; + }else { + throw exception(SUPPLIERDELIVER_RECORD_DETAIL_NOT_EXISTS); + } + } + @Override + public PurchasereturnJobMainDO purchasereturnJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + PurchasereturnJobMainDO purchasereturnJobMainDO = purchasereturnJobMainMapper.selectOne(queryWrapper); + if(purchasereturnJobMainDO != null){ + return purchasereturnJobMainDO; + }else { + throw exception(PURCHASERETURN_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java index ab046a74..f6cd9213 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainService.java @@ -70,5 +70,12 @@ public interface PutawayJobMainService { * @return 上架任务主列表 */ List getPutawayJobMainList(PutawayJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public PutawayJobMainDO putawayJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java index a3c8959d..3de7cf41 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayJob/PutawayJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.putawayJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainCreateReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainExportReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainPageReqVO; import com.win.module.wms.controller.putawayJob.vo.PutawayJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { public List getPutawayJobMainList(PutawayJobMainExportReqVO exportReqVO) { return putawayJobMainMapper.selectList(exportReqVO); } - + @Override + public PutawayJobMainDO putawayJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + PutawayJobMainDO putawayJobMainDO = putawayJobMainMapper.selectOne(queryWrapper); + if(putawayJobMainDO != null){ + return putawayJobMainDO; + }else { + throw exception(CUSTOMERRETURN_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java index 02ec7963..2e16a5f4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainService.java @@ -70,5 +70,12 @@ public interface RepleinshJobMainService { * @return 补料任务主列表 */ List getRepleinshJobMainList(RepleinshJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public RepleinshJobMainDO repleinshJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java index 81486897..4ce95608 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshJob/RepleinshJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.repleinshJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainCreateReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainExportReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainPageReqVO; import com.win.module.wms.controller.repleinshJob.vo.RepleinshJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class RepleinshJobMainServiceImpl implements RepleinshJobMainService { public List getRepleinshJobMainList(RepleinshJobMainExportReqVO exportReqVO) { return repleinshJobMainMapper.selectList(exportReqVO); } - + @Override + public RepleinshJobMainDO repleinshJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + RepleinshJobMainDO repleinshJobMainDO = repleinshJobMainMapper.selectOne(queryWrapper); + if(repleinshJobMainDO != null){ + return repleinshJobMainDO; + }else { + throw exception(REPLEINSH_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java index c175f999..b0a8b3a7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java @@ -7,6 +7,7 @@ import com.win.module.wms.controller.sale.vo.SaleMainCreateReqVO; import com.win.module.wms.controller.sale.vo.SaleMainExportReqVO; import com.win.module.wms.controller.sale.vo.SaleMainPageReqVO; import com.win.module.wms.controller.sale.vo.SaleMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; import com.win.module.wms.dal.dataobject.sale.SaleMainDO; import com.win.framework.common.pojo.PageResult; @@ -70,5 +71,13 @@ public interface SaleMainService { * @return 销售订单主列表 */ List getSaleMainList(SaleMainExportReqVO exportReqVO); - + /** + * 校验销售订单 + * + * @param psoNumber 单据号 + * @param psoLine 行号 + * @param pitemCode 物品代码 + * @return 销售订单子列表 + */ + public SaleDetailDO selectSaleDetailDoExist(String psoNumber, String psoLine, String pitemCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java index 16c4eb97..54800ac1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java @@ -1,9 +1,12 @@ package com.win.module.wms.service.sale; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.sale.vo.SaleMainCreateReqVO; import com.win.module.wms.controller.sale.vo.SaleMainExportReqVO; import com.win.module.wms.controller.sale.vo.SaleMainPageReqVO; import com.win.module.wms.controller.sale.vo.SaleMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.sale.SaleDetailDO; +import com.win.module.wms.dal.mysql.sale.SaleDetailMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -30,7 +33,8 @@ public class SaleMainServiceImpl implements SaleMainService { @Resource private SaleMainMapper saleMainMapper; - + @Resource + private SaleDetailMapper saleDetailMapper; @Override public Long createSaleMain(SaleMainCreateReqVO createReqVO) { // 插入 @@ -82,5 +86,25 @@ public class SaleMainServiceImpl implements SaleMainService { public List getSaleMainList(SaleMainExportReqVO exportReqVO) { return saleMainMapper.selectList(exportReqVO); } - + @Override + public SaleDetailDO selectSaleDetailDoExist(String psoNumber,String psoLine,String pitemCode) { + QueryWrapper saleMainDOQueryWrapper = new QueryWrapper<>(); + saleMainDOQueryWrapper.eq("number",psoNumber); + SaleMainDO saleMainDO = saleMainMapper.selectOne(saleMainDOQueryWrapper); + if(saleMainDO != null && "TRUE".equals(saleMainDO.getAvailable())){ + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("master_id",saleMainDO.getId()); + queryWrapper.eq("item_code",pitemCode); + queryWrapper.eq("number",psoNumber); + queryWrapper.eq("line_number",psoLine); + SaleDetailDO saleDetailDO = saleDetailMapper.selectOne(queryWrapper); + if(saleDetailDO != null){ + return saleDetailDO; + }else { + throw exception(SALE_DETAIL_NUMBER_AND_LINE_NUMBER_AND_ITEMCODE_NOT_EXISTS); + } + }else { + throw exception(SALE_MAIN_NOT_EXISTS); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java index 6346c143..9e81291f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceServiceImpl.java @@ -37,7 +37,7 @@ public class SalepriceServiceImpl implements SalepriceService { @Override public Long createSaleprice(SalepriceCreateReqVO createReqVO) { - validateSalepriceForCreateOrUpdate(createReqVO.getId(),createReqVO.getCustomercode(),createReqVO.getItemcode(),createReqVO.getCurrency() + validateSalepriceForCreateOrUpdate(createReqVO.getId(),createReqVO.getCustomerCode(),createReqVO.getItemCode(),createReqVO.getCurrency() ,createReqVO.getPrice(),createReqVO.getAvailable()); // 插入 SalepriceDO saleprice = SalepriceConvert.INSTANCE.convert(createReqVO); @@ -49,7 +49,7 @@ public class SalepriceServiceImpl implements SalepriceService { @Override public void updateSaleprice(SalepriceUpdateReqVO updateReqVO) { // 校验存在 - validateSalepriceForCreateOrUpdate(updateReqVO.getId(),updateReqVO.getCustomercode(),updateReqVO.getItemcode(),updateReqVO.getCurrency() + validateSalepriceForCreateOrUpdate(updateReqVO.getId(),updateReqVO.getCustomerCode(),updateReqVO.getItemCode(),updateReqVO.getCurrency() ,updateReqVO.getPrice(),updateReqVO.getAvailable()); // 更新 SalepriceDO updateObj = SalepriceConvert.INSTANCE.convert(updateReqVO); @@ -93,7 +93,7 @@ public class SalepriceServiceImpl implements SalepriceService { // 校验，判断是否有不符合的原因 try { if(mode != null){ - validateSalepriceForCreateOrUpdate(null,saleprice.getCustomercode(),saleprice.getItemcode(),saleprice.getCurrency() + validateSalepriceForCreateOrUpdate(null,saleprice.getCustomerCode(),saleprice.getItemCode(),saleprice.getCurrency() ,saleprice.getPrice(),saleprice.getAvailable()); } } catch (ServiceException ex) { @@ -102,7 +102,7 @@ public class SalepriceServiceImpl implements SalepriceService { } // 判断如果不存在，在进行插入 - SalepriceDO existSaleprice = salepriceMapper.selectByItemCode(saleprice.getItemcode()); + SalepriceDO existSaleprice = salepriceMapper.selectByItemCode(saleprice.getItemCode()); if (existSaleprice == null&& mode != 3) { salepriceMapper.insert(SalepriceConvert.INSTANCE.convert(saleprice)); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java index b61dea6d..987f53b4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainService.java @@ -70,5 +70,12 @@ public interface ScrapJobMainService { * @return 报废出库任务主列表 */ List getScrapJobMainList(ScrapJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public ScrapJobMainDO scrapJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java index c5426884..d1322de0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.scrapJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainCreateReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainExportReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainPageReqVO; import com.win.module.wms.controller.scrapJob.vo.ScrapJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class ScrapJobMainServiceImpl implements ScrapJobMainService { public List getScrapJobMainList(ScrapJobMainExportReqVO exportReqVO) { return scrapJobMainMapper.selectList(exportReqVO); } - + @Override + public ScrapJobMainDO scrapJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + ScrapJobMainDO scrapJobMainDO = scrapJobMainMapper.selectOne(queryWrapper); + if(scrapJobMainDO != null){ + return scrapJobMainDO; + }else { + throw exception(SCRAP_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java index 056ccf26..3d92f034 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierService.java @@ -70,5 +70,18 @@ public interface SupplierService { List getSupplierList(SupplierExportReqVO exportReqVO); List importSupplierList(List importTeam, Integer mode, boolean updatePart); - public SupplierDO supplierExist(String Supplier); + /** + * 查询供应商信息 + * + * @param code 代码 + * @return 供应商列表 + */ + public SupplierDO selectSupplier(String code); + /** + * 校验供应商有效，状态正确 + * + * @param supplierCode 代码 + * @return 供应商列表 + */ + public SupplierDO supplierExist(String supplierCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java index 88ef1d76..c2068878 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplier/SupplierServiceImpl.java @@ -9,7 +9,6 @@ import com.win.framework.common.pojo.PageResult; import com.win.framework.datapermission.core.util.DataPermissionUtils; import com.win.module.wms.controller.supplier.vo.*; import com.win.module.wms.convert.supplier.SupplierConvert; -import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.supplier.SupplierDO; import com.win.module.wms.dal.mysql.supplier.SupplierMapper; import org.springframework.stereotype.Service; @@ -171,7 +170,7 @@ public class SupplierServiceImpl implements SupplierService { throw exception(SUPPLIER_AVAILABLE_NOT_EXISTS); } } - + @Override public SupplierDO selectSupplier(String code) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("code",code); @@ -182,16 +181,13 @@ public class SupplierServiceImpl implements SupplierService { throw exception(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS); } } - //物料有效，状态正确 - public SupplierDO supplierExist(String Supplier) { - SupplierDO supplierDO = selectSupplier(Supplier); + @Override + public SupplierDO supplierExist(String supplierCode) { + SupplierDO supplierDO = selectSupplier(supplierCode); if(supplierDO != null){ return supplierDO; }else { throw exception(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS); } } - - - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java index dd9c0965..f91bcfad 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java @@ -7,6 +7,7 @@ import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRec import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainPageReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordMainDO; import com.win.framework.common.pojo.PageResult; @@ -71,4 +72,14 @@ public interface SupplierdeliverRecordMainService { */ List getSupplierdeliverRecordMainList(SupplierdeliverRecordMainExportReqVO exportReqVO); + /** + * 校验供应商发货记录 + * + * @param pasnNumber 发货单号 + * @param pitemCode 物品代码 + * @param ppoNumber 订单号 + * @param ppoLine 订单行 + * @return 供应商发货记录子 + */ + public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordMainDO(String pasnNumber, String pitemCode, String ppoNumber, String ppoLine); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java index eeacd8ec..df36e7fc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java @@ -1,9 +1,12 @@ package com.win.module.wms.service.supplierdeliverRecord; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainCreateReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainExportReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainPageReqVO; import com.win.module.wms.controller.supplierdeliverRecord.vo.SupplierdeliverRecordMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; +import com.win.module.wms.dal.mysql.supplierdeliverRecord.SupplierdeliverRecordDetailMapper; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -30,6 +33,8 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco @Resource private SupplierdeliverRecordMainMapper supplierdeliverRecordMainMapper; + @Resource + private SupplierdeliverRecordDetailMapper supplierdeliverRecordDetailMapper; @Override public Long createSupplierdeliverRecordMain(SupplierdeliverRecordMainCreateReqVO createReqVO) { @@ -82,5 +87,25 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco public List getSupplierdeliverRecordMainList(SupplierdeliverRecordMainExportReqVO exportReqVO) { return supplierdeliverRecordMainMapper.selectList(exportReqVO); } - + @Override + public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordMainDO(String pasnNumber, String pitemCode, String ppoNumber, String ppoLine) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("asn_number",pasnNumber); + SupplierdeliverRecordMainDO supplierdeliverRecordMainDO = supplierdeliverRecordMainMapper.selectOne(queryWrapper); + if(supplierdeliverRecordMainDO != null && "TRUE".equals(supplierdeliverRecordMainDO.getAvailable())){ + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("master_id",supplierdeliverRecordMainDO.getId()); + queryWrapper1.eq("item_code",pitemCode); + queryWrapper1.eq("po_number",ppoNumber); + queryWrapper1.eq("po_line",ppoLine); + SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordDetailMapper.selectOne(queryWrapper1); + if(supplierdeliverRecordDetailDO != null){ + return supplierdeliverRecordDetailDO; + }else { + throw exception(SUPPLIERDELIVER_RECORD_DETAIL_PONUMBER_AND_POLINE_AND_ITEMCODE_NOT_EXISTS); + } + }else { + throw exception(SUPPLIERDELIVER_RECORD_MAIN_NUMBER_NOT_EXISTS); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java index 5d923e94..dfb7cb3f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainService.java @@ -70,5 +70,12 @@ public interface TransferissueJobMainService { * @return 调拨出库任务主列表 */ List getTransferissueJobMainList(TransferissueJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public TransferissueJobMainDO transferissueJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java index 3629b348..7b01caf0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.transferissueJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainCreateReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainExportReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainPageReqVO; import com.win.module.wms.controller.transferissueJob.vo.TransferissueJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class TransferissueJobMainServiceImpl implements TransferissueJobMainServ public List getTransferissueJobMainList(TransferissueJobMainExportReqVO exportReqVO) { return transferissueJobMainMapper.selectList(exportReqVO); } - + @Override + public TransferissueJobMainDO transferissueJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + TransferissueJobMainDO transferissueJobMainDO = transferissueJobMainMapper.selectOne(queryWrapper); + if(transferissueJobMainDO != null){ + return transferissueJobMainDO; + }else { + throw exception(TRANSFERISSUE_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java index 727823ed..773308c3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainService.java @@ -70,5 +70,12 @@ public interface TransferreceiptJobMainService { * @return 调拨入库任务主列表 */ List getTransferreceiptJobMainList(TransferreceiptJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public TransferreceiptJobMainDO transferreceiptJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java index e78e4d50..653e39a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptJob/TransferreceiptJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.transferreceiptJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainCreateReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainExportReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainPageReqVO; import com.win.module.wms.controller.transferreceiptJob.vo.TransferreceiptJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class TransferreceiptJobMainServiceImpl implements TransferreceiptJobMain public List getTransferreceiptJobMainList(TransferreceiptJobMainExportReqVO exportReqVO) { return transferreceiptJobMainMapper.selectList(exportReqVO); } - + @Override + public TransferreceiptJobMainDO transferreceiptJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + TransferreceiptJobMainDO transferreceiptJobMainDO = transferreceiptJobMainMapper.selectOne(queryWrapper); + if(transferreceiptJobMainDO != null){ + return transferreceiptJobMainDO; + }else { + throw exception(TRANSFERRECEIPT_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java index b086914e..984878d3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainService.java @@ -70,5 +70,12 @@ public interface UnplannedissueJobMainService { * @return 计划外出库任务主列表 */ List getUnplannedissueJobMainList(UnplannedissueJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public UnplannedissueJobMainDO unplannedissueJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java index 901a1a46..7ced0576 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueJob/UnplannedissueJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.unplannedissueJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainCreateReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainExportReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainPageReqVO; import com.win.module.wms.controller.unplannedissueJob.vo.UnplannedissueJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class UnplannedissueJobMainServiceImpl implements UnplannedissueJobMainSe public List getUnplannedissueJobMainList(UnplannedissueJobMainExportReqVO exportReqVO) { return unplannedissueJobMainMapper.selectList(exportReqVO); } - + @Override + public UnplannedissueJobMainDO unplannedissueJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + UnplannedissueJobMainDO unplannedissueJobMainDO = unplannedissueJobMainMapper.selectOne(queryWrapper); + if(unplannedissueJobMainDO != null){ + return unplannedissueJobMainDO; + }else { + throw exception(UNPLANNEDISSUE_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainService.java index ea1575c7..2d09a578 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainService.java @@ -3,6 +3,7 @@ package com.win.module.wms.service.unplannedissueRequest; import java.util.*; import javax.validation.*; +import com.win.module.system.api.dict.dto.DictDataRespDTO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainCreateReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainExportReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainPageReqVO; @@ -70,5 +71,13 @@ public interface UnplannedissueRequestMainService { * @return 计划外出库申请主列表 */ List getUnplannedissueRequestMainList(UnplannedissueRequestMainExportReqVO exportReqVO); + /** + * 获取字典数据(原因是否有效) + * + * @param ptype 字典类型 + * @param plabel 字典标签 + * @return 字典数据信息 + */ + public DictDataRespDTO selectLabelExist(String ptype, String plabel); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java index b4246a76..497a4fb0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java @@ -1,5 +1,7 @@ package com.win.module.wms.service.unplannedissueRequest; +import com.win.module.system.api.dict.DictDataApi; +import com.win.module.system.api.dict.dto.DictDataRespDTO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainCreateReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainExportReqVO; import com.win.module.wms.controller.unplannedissueRequest.vo.UnplannedissueRequestMainPageReqVO; @@ -30,7 +32,8 @@ public class UnplannedissueRequestMainServiceImpl implements UnplannedissueReque @Resource private UnplannedissueRequestMainMapper unplannedissueRequestMainMapper; - + @Resource + private DictDataApi dictDataApi; @Override public Long createUnplannedissueRequestMain(UnplannedissueRequestMainCreateReqVO createReqVO) { // 插入 @@ -82,5 +85,10 @@ public class UnplannedissueRequestMainServiceImpl implements UnplannedissueReque public List getUnplannedissueRequestMainList(UnplannedissueRequestMainExportReqVO exportReqVO) { return unplannedissueRequestMainMapper.selectList(exportReqVO); } - + @Override + public DictDataRespDTO selectLabelExist(String ptype, String plabel){ + ptype = "unplanned_issue_reason"; + DictDataRespDTO dictDataRespDTO = dictDataApi.selectDictTypeAndLabel(ptype, plabel); + return dictDataRespDTO; + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java index 4203913d..e02a5622 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainService.java @@ -70,5 +70,12 @@ public interface UnplannedreceiptJobMainService { * @return 计划外入库任务主列表 */ List getUnplannedreceiptJobMainList(UnplannedreceiptJobMainExportReqVO exportReqVO); - + /** + * 校验任务状态正确 + * + * @param pnumber 单据号 + * @param pstatus 状态 + * @return 采购订单主列表 + */ + public UnplannedreceiptJobMainDO unplannedreceiptJobMainDoStatusRight(String pnumber, String pstatus); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java index 1e383daf..15cbf16b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptJob/UnplannedreceiptJobMainServiceImpl.java @@ -1,9 +1,11 @@ package com.win.module.wms.service.unplannedreceiptJob; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainCreateReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainExportReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainPageReqVO; import com.win.module.wms.controller.unplannedreceiptJob.vo.UnplannedreceiptJobMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -82,5 +84,16 @@ public class UnplannedreceiptJobMainServiceImpl implements UnplannedreceiptJobMa public List getUnplannedreceiptJobMainList(UnplannedreceiptJobMainExportReqVO exportReqVO) { return unplannedreceiptJobMainMapper.selectList(exportReqVO); } - + @Override + public UnplannedreceiptJobMainDO unplannedreceiptJobMainDoStatusRight(String pnumber, String pstatus) { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("number",pnumber); + queryWrapper.eq("status",pstatus); + UnplannedreceiptJobMainDO unplannedreceiptJobMainDO = unplannedreceiptJobMainMapper.selectOne(queryWrapper); + if(unplannedreceiptJobMainDO != null){ + return unplannedreceiptJobMainDO; + }else { + throw exception(UNPLANNEDRECEIPT_JOB_MAIN_STATUS_ERROR); + } + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java index 98bb73d6..980a5da7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java @@ -73,7 +73,12 @@ public interface WarehouseService { List importWarehouseList(List warehouses, Integer mode, boolean updatePart); - //仓库有效，状态正确 - public WarehouseDO WarehouseExist(String code); + /** + * 校验仓库有效，状态正确 + * + * @param code 代码 + * @return 仓库列表 + */ + WarehouseDO WarehouseExist(String code); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java index 0b460925..b070a7c5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java @@ -167,7 +167,7 @@ public class WarehouseServiceImpl implements WarehouseService { throw exception(WAREHOUSE_AVAIABLE_NOT_EXISTS); } } - //仓库有效，状态正确 + @Override public WarehouseDO WarehouseExist(String code) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("code",code); diff --git a/win-server/src/main/resources/application-dev.yaml b/win-server/src/main/resources/application-dev.yaml index 98d56264..d94294c3 100644 --- a/win-server/src/main/resources/application-dev.yaml +++ b/win-server/src/main/resources/application-dev.yaml @@ -52,6 +52,31 @@ spring: load-balancers: alg_round: type: ROUND_ROBIN + sharding: + # 表策略配置 + tables: + # t_user 是逻辑表 + infra_trends: + # 配置数据节点，这里是按月分表 + actualDataNodes: master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}},master.infra_trends_$->{2024..2030}${(1..12).collect{t->t.toString().padLeft(2,'0')}} + tableStrategy: + # 使用标准分片策略 + standard: + # 配置分片字段 + shardingColumn: create_time + # 分片算法名称，不支持大写字母和下划线，否则启动就会报错 + shardingAlgorithmName: time-sharding-altorithm + # 分片算法配置 + shardingAlgorithms: + # 分片算法名称，不支持大写字母和下划线，否则启动就会报错 + time-sharding-altorithm: + # 类型：自定义策略 + type: CLASS_BASED + props: + # 分片策略 + strategy: standard + # 分片算法类 + algorithmClassName: com.win.framework.datasource.sharding.TimeShardingAlgorithm # 不创建此数据源，用于生成代码 datasource: dynamic: diff --git a/win-server/src/main/resources/application-prod.yaml b/win-server/src/main/resources/application-prod.yaml index 2a3beb53..1eac7ae9 100644 --- a/win-server/src/main/resources/application-prod.yaml +++ b/win-server/src/main/resources/application-prod.yaml @@ -52,6 +52,20 @@ spring: load-balancers: alg_round: type: ROUND_ROBIN + sharding: + # 表策略配置 + tables: + # t_user 是逻辑表 + infra_trends: + # 配置数据节点，这里是按月分表 + actualDataNodes: master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}},master.infra_trends_$->{2024..2030}${(1..12).collect{t->t.toString().padLeft(2,'0')}} + tableStrategy: + # 使用标准分片策略 + standard: + # 配置分片字段 + shardingColumn: create_time + # 分片算法名称，不支持大写字母和下划线，否则启动就会报错 + shardingAlgorithmName: time-sharding-altorithm datasource: dynamic: strict: true diff --git a/win-server/src/main/resources/application-test.yaml b/win-server/src/main/resources/application-test.yaml index 088a0150..485af7d2 100644 --- a/win-server/src/main/resources/application-test.yaml +++ b/win-server/src/main/resources/application-test.yaml @@ -52,6 +52,20 @@ spring: load-balancers: alg_round: type: ROUND_ROBIN + sharding: + # 表策略配置 + tables: + # t_user 是逻辑表 + infra_trends: + # 配置数据节点，这里是按月分表 + actualDataNodes: master.infra_trends_$->{2023}${(10..12).collect{t->t.toString().padLeft(2,'0')}},master.infra_trends_$->{2024..2030}${(1..12).collect{t->t.toString().padLeft(2,'0')}} + tableStrategy: + # 使用标准分片策略 + standard: + # 配置分片字段 + shardingColumn: create_time + # 分片算法名称，不支持大写字母和下划线，否则启动就会报错 + shardingAlgorithmName: time-sharding-altorithm datasource: dynamic: strict: true diff --git a/win-server/src/main/resources/application.yaml b/win-server/src/main/resources/application.yaml index fb8fb185..d89f0b25 100644 --- a/win-server/src/main/resources/application.yaml +++ b/win-server/src/main/resources/application.yaml @@ -139,7 +139,7 @@ win: pubsub: enable: false # 是否开启 Redis pubsub 广播消费，默认为 true。这里设置成 false，可以按需开启 stream: - enable: true # 是否开启 Redis stream 集群消费，默认为 true。这里设置成 false，可以按需开启 + enable: false # 是否开启 Redis stream 集群消费，默认为 true。这里设置成 false，可以按需开启 tenant: # 多租户相关配置项 enable: true ignore-urls: