From c5d5555b6296281b800550483e993af60a4ac182 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 7 Dec 2023 13:57:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1=E3=80=81=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E3=80=81=E7=9B=98=E7=82=B9=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=8E=E7=9B=98=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E9=9D=99=E6=80=81=E8=B5=84=E6=BA=90=E5=8E=BB=E6=8E=89=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E6=9D=83=E9=99=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/SecurityConfiguration.java | 2 ++ .../module/wms/enums/ErrorCodeConstants.java | 1 + .../countJob/vo/CountJobMainBaseVO.java | 3 +++ .../countJob/vo/CountJobMainExcelVO.java | 4 +++ .../countJob/vo/CountJobMainExportReqVO.java | 3 +++ .../countJob/vo/CountJobMainPageReqVO.java | 3 +++ .../countPlan/vo/CountPlanMainBaseVO.java | 2 +- .../countRecord/vo/CountRecordMainBaseVO.java | 14 +++++------ .../vo/CountRecordMainExcelVO.java | 4 +++ .../vo/CountRecordMainExportReqVO.java | 10 +++++--- .../vo/CountRecordMainPageReqVO.java | 11 +++++--- .../vo/CountRequestMainBaseVO.java | 3 +++ .../vo/CountRequestMainExcelVO.java | 4 +++ .../vo/CountRequestMainExportReqVO.java | 3 +++ .../vo/CountRequestMainPageReqVO.java | 3 +++ .../dataobject/countJob/CountJobMainDO.java | 4 +++ .../countRecord/CountRecordMainDO.java | 16 ++++++------ .../countRequest/CountRequestMainDO.java | 4 +++ .../mysql/countJob/CountJobMainMapper.java | 2 ++ .../countRecord/CountRecordMainMapper.java | 8 +++--- .../countRequest/CountRequestMainMapper.java | 8 +++--- .../com/win/module/wms/job/CountPlanJob.java | 23 +++++++++++++++++ .../countPlan/CountPlanMainService.java | 5 ++++ .../countPlan/CountPlanMainServiceImpl.java | 25 +++++++++++++++++-- .../CountRequestMainServiceImpl.java | 3 --- .../src/main/resources/application.yaml | 1 + 26 files changed, 133 insertions(+), 36 deletions(-) create mode 100644 win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/job/CountPlanJob.java diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/framework/security/config/SecurityConfiguration.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/framework/security/config/SecurityConfiguration.java index 17a39a61..6ecb8836 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/framework/security/config/SecurityConfiguration.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/framework/security/config/SecurityConfiguration.java @@ -42,6 +42,8 @@ public class SecurityConfiguration { // magic-api 允许匿名访问 registry.antMatchers("/magic/web/**").anonymous() .antMatchers("/magic-api/**").anonymous(); + //静态资源 + registry.antMatchers("/profile/**").anonymous(); // 文件读取 registry.antMatchers(buildAdminApi("/infra/file/*/get/**")).permitAll(); } 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 84549d02..2f6b20bf 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 @@ -933,6 +933,7 @@ public interface ErrorCodeConstants { ErrorCode COUNT_PLAN_CANNOT_PUBLISH = new ErrorCode(1_000_152_008, "盘点计划状态不支持发布"); ErrorCode COUNT_PLAN_CANNOT_OPEN = new ErrorCode(1_000_152_009, "盘点计划状态不支持打开"); ErrorCode COUNT_PLAN_CANNOT_RESETTING = new ErrorCode(1_000_152_010, "盘点计划状态不支持重置"); + ErrorCode COUNT_PLAN_CRON_ERROR = new ErrorCode(1_000_152_010, "盘点计划加入定时任务失败"); //盘点申请ErrorCode ErrorCode COUNT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_153_000, "盘点申请主不存在"); ErrorCode COUNT_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_153_001, "盘点申请子不存在"); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainBaseVO.java index 98ca2947..85fab90e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainBaseVO.java @@ -27,6 +27,9 @@ public class CountJobMainBaseVO { @Schema(description = "阶段") private String stage; + @Schema(description = "明盘") + private String isOpenCount; + @Schema(description = "仓库代码") private String warehouseCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExcelVO.java index 4dd47de5..15179e67 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExcelVO.java @@ -5,6 +5,7 @@ import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.enums.request.RequestStatusConverter; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.math.BigDecimal; @@ -29,6 +30,9 @@ public class CountJobMainExcelVO { @DictFormat(DictTypeConstants.COUNT_STAGE) private String stage; + @ExcelProperty("明盘") + private String isOpenCount; + @ExcelProperty("仓库代码") private String warehouseCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExportReqVO.java index 6c6d968c..bf5c1a48 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExportReqVO.java @@ -21,6 +21,9 @@ public class CountJobMainExportReqVO { @Schema(description = "阶段") private String stage; + @Schema(description = "明盘") + private String isOpenCount; + @Schema(description = "仓库代码") private String warehouseCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainPageReqVO.java index 79c41bb9..d292976f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainPageReqVO.java @@ -26,6 +26,9 @@ public class CountJobMainPageReqVO extends PageParam { @Schema(description = "阶段") private String stage; + @Schema(description = "明盘") + private String isOpenCount; + @Schema(description = "仓库代码") private String warehouseCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainBaseVO.java index 8815d67e..058b8c7d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainBaseVO.java @@ -86,7 +86,7 @@ public class CountPlanMainBaseVO { @Schema(description = "盘点负库存") private String isCountNegativeInventory; - @Schema(description = "明盘", example = "2367") + @Schema(description = "明盘", example = "TRUE") private String isOpenCount; @Schema(description = "是否可用") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainBaseVO.java index aa4279b0..6f7e3e1b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainBaseVO.java @@ -1,16 +1,11 @@ package com.win.module.wms.controller.countRecord.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import javax.validation.constraints.*; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** @@ -35,6 +30,9 @@ public class CountRecordMainBaseVO { @Schema(description = "阶段") private String stage; + @Schema(description = "明盘") + private String isOpenCount; + @Schema(description = "仓库代码") private String warehouseCode; 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 210ddacd..a1c332ff 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 @@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; import com.win.module.wms.enums.DictTypeConstants; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.math.BigDecimal; @@ -32,6 +33,9 @@ public class CountRecordMainExcelVO { @DictFormat(DictTypeConstants.COUNT_STAGE) private String stage; + @ExcelProperty("明盘") + private String isOpenCount; + @ExcelProperty("仓库代码") private String warehouseCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainExportReqVO.java index e8435d9a..3efa4af1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainExportReqVO.java @@ -1,12 +1,11 @@ package com.win.module.wms.controller.countRecord.vo; -import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; -import com.win.framework.common.pojo.PageParam; -import java.time.LocalDateTime; +import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @Schema(description = "管理后台 - 盘点记录主 Excel 导出 Request VO，参数和 CountRecordMainPageReqVO 是一致的") @@ -25,6 +24,9 @@ public class CountRecordMainExportReqVO { @Schema(description = "阶段") private String stage; + @Schema(description = "明盘") + private String isOpenCount; + @Schema(description = "仓库代码") private String warehouseCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainPageReqVO.java index 4abc42a7..f3418881 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainPageReqVO.java @@ -1,10 +1,12 @@ package com.win.module.wms.controller.countRecord.vo; -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; import com.win.framework.common.pojo.PageParam; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; + import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -30,6 +32,9 @@ public class CountRecordMainPageReqVO extends PageParam { @Schema(description = "仓库代码") private String warehouseCode; + @Schema(description = "明盘") + private String isOpenCount; + @Schema(description = "出库事务类型") private String outTransactionType; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainBaseVO.java index 5220488e..67d5f1f4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainBaseVO.java @@ -26,6 +26,9 @@ public class CountRequestMainBaseVO { @Schema(description = "阶段") private String stage; + @Schema(description = "明盘") + private String isOpenCount; + @Schema(description = "仓库代码") private String warehouseCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExcelVO.java index 22158198..04b32b34 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExcelVO.java @@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; import com.win.module.wms.enums.DictTypeConstants; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.math.BigDecimal; @@ -25,6 +26,9 @@ public class CountRequestMainExcelVO { @DictFormat(DictTypeConstants.COUNT_STAGE) private String stage; + @ExcelProperty("明盘") + private String isOpenCount; + @ExcelProperty("仓库代码") private String warehouseCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExportReqVO.java index 747e6e67..376287cf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExportReqVO.java @@ -18,6 +18,9 @@ public class CountRequestMainExportReqVO { @Schema(description = "阶段") private String stage; + @Schema(description = "明盘") + private String isOpenCount; + @Schema(description = "仓库代码") private String warehouseCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainPageReqVO.java index 86804515..b91f1065 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainPageReqVO.java @@ -23,6 +23,9 @@ public class CountRequestMainPageReqVO extends PageParam { @Schema(description = "阶段") private String stage; + @Schema(description = "明盘") + private String isOpenCount; + @Schema(description = "仓库代码") private String warehouseCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobMainDO.java index 42b82486..e47fba1b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobMainDO.java @@ -41,6 +41,10 @@ public class CountJobMainDO extends BaseDO { * 枚举 {@link TODO count_stage 对应的类} */ private String stage; + /** + * 明盘 + */ + private String isOpenCount; /** * 仓库代码 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRecord/CountRecordMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRecord/CountRecordMainDO.java index d5d63d2b..0864b750 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRecord/CountRecordMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRecord/CountRecordMainDO.java @@ -1,14 +1,12 @@ package com.win.module.wms.dal.dataobject.countRecord; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.sun.xml.bind.v2.TODO; +import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; -import java.util.*; -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; /** * 盘点记录主 DO @@ -47,6 +45,10 @@ public class CountRecordMainDO extends BaseDO { * 枚举 {@link TODO count_stage 对应的类} */ private String stage; + /** + * 明盘 + */ + private String isOpenCount; /** * 仓库代码 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestMainDO.java index a362b088..3078179c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestMainDO.java @@ -37,6 +37,10 @@ public class CountRequestMainDO extends BaseDO { * 枚举 {@link TODO count_stage 对应的类} */ private String stage; + /** + * 明盘 + */ + private String isOpenCount; /** * 仓库代码 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobMainMapper.java index ae9edf4f..1cdad109 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countJob/CountJobMainMapper.java @@ -27,6 +27,7 @@ public interface CountJobMainMapper extends BaseMapperX { .eqIfPresent(CountJobMainDO::getRequestNumber, reqVO.getRequestNumber()) .eqIfPresent(CountJobMainDO::getPlanNumber, reqVO.getPlanNumber()) .eqIfPresent(CountJobMainDO::getStage, reqVO.getStage()) + .eqIfPresent(CountJobMainDO::getIsOpenCount, reqVO.getIsOpenCount()) .eqIfPresent(CountJobMainDO::getWarehouseCode, reqVO.getWarehouseCode()) .eqIfPresent(CountJobMainDO::getLocationCode, reqVO.getLocationCode()) .betweenIfPresent(CountJobMainDO::getRequestTime, reqVO.getRequestTime()) @@ -79,6 +80,7 @@ public interface CountJobMainMapper extends BaseMapperX { .eqIfPresent(CountJobMainDO::getRequestNumber, reqVO.getRequestNumber()) .eqIfPresent(CountJobMainDO::getPlanNumber, reqVO.getPlanNumber()) .eqIfPresent(CountJobMainDO::getStage, reqVO.getStage()) + .eqIfPresent(CountJobMainDO::getIsOpenCount, reqVO.getIsOpenCount()) .eqIfPresent(CountJobMainDO::getWarehouseCode, reqVO.getWarehouseCode()) .eqIfPresent(CountJobMainDO::getLocationCode, reqVO.getLocationCode()) .betweenIfPresent(CountJobMainDO::getRequestTime, reqVO.getRequestTime()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordMainMapper.java index 670d3416..709b8984 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordMainMapper.java @@ -26,6 +26,7 @@ public interface CountRecordMainMapper extends BaseMapperX { .eqIfPresent(CountRecordMainDO::getJobNumber, reqVO.getJobNumber()) .eqIfPresent(CountRecordMainDO::getPlanNumber, reqVO.getPlanNumber()) .eqIfPresent(CountRecordMainDO::getStage, reqVO.getStage()) + .eqIfPresent(CountRecordMainDO::getIsOpenCount, reqVO.getIsOpenCount()) .eqIfPresent(CountRecordMainDO::getWarehouseCode, reqVO.getWarehouseCode()) .eqIfPresent(CountRecordMainDO::getOutTransactionType, reqVO.getOutTransactionType()) .eqIfPresent(CountRecordMainDO::getInTransactionType, reqVO.getInTransactionType()) @@ -41,8 +42,7 @@ public interface CountRecordMainMapper extends BaseMapperX { .eqIfPresent(CountRecordMainDO::getRemark, reqVO.getRemark()) .betweenIfPresent(CountRecordMainDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(CountRecordMainDO::getCreator, reqVO.getCreator()) - .eqIfPresent(CountRecordMainDO::getAvailable, reqVO.getAvailable()) - .orderByDesc(CountRecordMainDO::getId)); + .eqIfPresent(CountRecordMainDO::getAvailable, reqVO.getAvailable())); } default PageResult selectSenior(CustomConditions conditions) { return selectPage(conditions, QueryWrapperUtils.structure(conditions)); @@ -53,6 +53,7 @@ public interface CountRecordMainMapper extends BaseMapperX { .eqIfPresent(CountRecordMainDO::getJobNumber, reqVO.getJobNumber()) .eqIfPresent(CountRecordMainDO::getPlanNumber, reqVO.getPlanNumber()) .eqIfPresent(CountRecordMainDO::getStage, reqVO.getStage()) + .eqIfPresent(CountRecordMainDO::getIsOpenCount, reqVO.getIsOpenCount()) .eqIfPresent(CountRecordMainDO::getWarehouseCode, reqVO.getWarehouseCode()) .eqIfPresent(CountRecordMainDO::getOutTransactionType, reqVO.getOutTransactionType()) .eqIfPresent(CountRecordMainDO::getInTransactionType, reqVO.getInTransactionType()) @@ -68,8 +69,7 @@ public interface CountRecordMainMapper extends BaseMapperX { .eqIfPresent(CountRecordMainDO::getRemark, reqVO.getRemark()) .betweenIfPresent(CountRecordMainDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(CountRecordMainDO::getCreator, reqVO.getCreator()) - .eqIfPresent(CountRecordMainDO::getAvailable, reqVO.getAvailable()) - .orderByDesc(CountRecordMainDO::getId)); + .eqIfPresent(CountRecordMainDO::getAvailable, reqVO.getAvailable())); } default List selectList(CustomConditions conditions) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestMainMapper.java index 82cbfa4a..226b9a9e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRequest/CountRequestMainMapper.java @@ -25,6 +25,7 @@ public interface CountRequestMainMapper extends BaseMapperX return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(CountRequestMainDO::getPlanNumber, reqVO.getPlanNumber()) .eqIfPresent(CountRequestMainDO::getStage, reqVO.getStage()) + .eqIfPresent(CountRequestMainDO::getIsOpenCount, reqVO.getIsOpenCount()) .eqIfPresent(CountRequestMainDO::getWarehouseCode, reqVO.getWarehouseCode()) .eqIfPresent(CountRequestMainDO::getNumber, reqVO.getNumber()) .eqIfPresent(CountRequestMainDO::getBusinessType, reqVO.getBusinessType()) @@ -40,8 +41,7 @@ public interface CountRequestMainMapper extends BaseMapperX .eqIfPresent(CountRequestMainDO::getAutoCommit, reqVO.getAutoCommit()) .eqIfPresent(CountRequestMainDO::getAutoAgree, reqVO.getAutoAgree()) .eqIfPresent(CountRequestMainDO::getAutoExecute, reqVO.getAutoExecute()) - .eqIfPresent(CountRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord()) - .orderByDesc(CountRequestMainDO::getId)); + .eqIfPresent(CountRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())); } default CountRequestMainDO selectByPlanNumber(String planNumber) { @@ -65,6 +65,7 @@ public interface CountRequestMainMapper extends BaseMapperX return selectList(new LambdaQueryWrapperX() .eqIfPresent(CountRequestMainDO::getPlanNumber, reqVO.getPlanNumber()) .eqIfPresent(CountRequestMainDO::getStage, reqVO.getStage()) + .eqIfPresent(CountRequestMainDO::getIsOpenCount, reqVO.getIsOpenCount()) .eqIfPresent(CountRequestMainDO::getWarehouseCode, reqVO.getWarehouseCode()) .eqIfPresent(CountRequestMainDO::getNumber, reqVO.getNumber()) .eqIfPresent(CountRequestMainDO::getBusinessType, reqVO.getBusinessType()) @@ -80,8 +81,7 @@ public interface CountRequestMainMapper extends BaseMapperX .eqIfPresent(CountRequestMainDO::getAutoCommit, reqVO.getAutoCommit()) .eqIfPresent(CountRequestMainDO::getAutoAgree, reqVO.getAutoAgree()) .eqIfPresent(CountRequestMainDO::getAutoExecute, reqVO.getAutoExecute()) - .eqIfPresent(CountRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord()) - .orderByDesc(CountRequestMainDO::getId)); + .eqIfPresent(CountRequestMainDO::getDirectCreateRecord, reqVO.getDirectCreateRecord())); } default List selectList(CustomConditions conditions) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/job/CountPlanJob.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/job/CountPlanJob.java new file mode 100644 index 00000000..b47950d9 --- /dev/null +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/job/CountPlanJob.java @@ -0,0 +1,23 @@ +package com.win.module.wms.job; + +import com.win.framework.quartz.core.handler.JobHandler; +import com.win.module.wms.dal.dataobject.countPlan.CountPlanMainDO; +import com.win.module.wms.service.countPlan.CountPlanMainService; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +@Component +public class CountPlanJob implements JobHandler { + + @Resource + private CountPlanMainService countPlanMainService; + + @Override + public String execute(String param) { + CountPlanMainDO countPlanMainDO = countPlanMainService.getCountPlanMain(Long.parseLong(param)); + countPlanMainService.generateRequest(countPlanMainDO); + return "盘点计划 " + countPlanMainDO.getNumber()+ " 生成了盘点申请"; + } + +} diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainService.java index f2e06b52..d81f28f4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainService.java @@ -139,4 +139,9 @@ public interface CountPlanMainService { */ Integer resettingCountPlanMain(Long id); + /** + * 生成盘点申请 + * @param mainDO 盘点申请主 + */ + void generateRequest(CountPlanMainDO mainDO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java index c30b210f..9b4f39d3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; +import com.win.framework.quartz.core.scheduler.SchedulerManager; +import com.win.framework.quartz.core.util.CronUtils; import com.win.module.infra.api.trends.TrendsApi; import com.win.module.infra.enums.TrendsTypeEnum; import com.win.module.system.api.serialnumber.SerialNumberApi; @@ -33,6 +35,7 @@ import com.win.module.wms.service.countRequest.CountRequestMainService; import com.win.module.wms.service.itembasic.ItembasicService; import com.win.module.wms.service.location.LocationService; import com.win.module.wms.util.JobUtils; +import org.quartz.SchedulerException; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -44,6 +47,7 @@ import java.time.LocalDateTime; import java.util.*; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.win.module.infra.enums.ErrorCodeConstants.JOB_CRON_EXPRESSION_VALID; import static com.win.module.wms.enums.ErrorCodeConstants.*; /** @@ -75,9 +79,16 @@ public class CountPlanMainServiceImpl implements CountPlanMainService { private CountRequestMainService countRequestMainService; @Resource private LocationService locationService; + @Resource + private SchedulerManager schedulerManager; @Override public Long createCountPlanMain(CountPlanMainCreateReqVO createReqVO) { + if(!createReqVO.getType().equals("MANUAL")) { + if (!CronUtils.isValid(createReqVO.getCrontab())) { + throw exception(JOB_CRON_EXPRESSION_VALID); + } + } // 插入 CountPlanMainDO countPlanMain = CountPlanMainConvert.INSTANCE.convert(createReqVO); String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_PLAN.getCode()); @@ -262,7 +273,16 @@ public class CountPlanMainServiceImpl implements CountPlanMainService { } mainDO.setStatus(planStatusState.getState().getCode());//增加操作记录 trendsApi.createTrends(id, "countPlan", "发布了盘点计划", TrendsTypeEnum.UPDATE); - this.generateRequest(mainDO); + if(mainDO.getType().equals("MANUAL")) {//指定盘点 + this.generateRequest(mainDO); + } else if (mainDO.getType().equals("CYCLE")) {//循环盘点 + // 添加 Job 到 Quartz 中 + try { + schedulerManager.addJob(mainDO.getId() + 10000, "countPlanJob", String.valueOf(mainDO.getId()), mainDO.getCrontab(), 3, 60*10); + } catch (SchedulerException e) { + throw new ServiceException(COUNT_PLAN_CRON_ERROR); + } + } return countPlanMainMapper.updateById(mainDO); } @@ -285,7 +305,8 @@ public class CountPlanMainServiceImpl implements CountPlanMainService { * 生成盘点申请 * @param mainDO 盘点申请主 */ - private void generateRequest(CountPlanMainDO mainDO) { + @Override + public void generateRequest(CountPlanMainDO mainDO) { List detailDOList = countPlanDetailMapper.selectList(mainDO.getId()); List balanceDOList = this.getBalanceDOList(detailDOList); CountRequestMainCreateReqVO countRequestMainCreateReqVO = new CountRequestMainCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java index 96bb4e6d..f5e945a2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java @@ -402,16 +402,13 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { countJobMainMapper.insert(countJobMainDO); List countJobDetailDOList = new ArrayList<>(); List countRequestDetailDOList = listMap.get(mapKey); - int countDetailNumber = 1; for (CountRequestDetailDO countRequestDetailDO : countRequestDetailDOList) { //空库位时itemCode为空，不加入子表 if(countRequestDetailDO.getItemCode() != null && !countRequestDetailDO.getItemCode().isEmpty()) { CountJobDetailDO countJobDetailDO = CountJobDetailConvert.INSTANCE.convert(countRequestDetailDO); - countJobDetailDO.setCountDetailNumber(String.valueOf(countDetailNumber)); countJobDetailDO.setNumber(number); countJobDetailDO.setMasterId(countJobMainDO.getId()); countJobDetailDOList.add(countJobDetailDO); - countDetailNumber++; } } if(!countJobDetailDOList.isEmpty()) { diff --git a/win-server/src/main/resources/application.yaml b/win-server/src/main/resources/application.yaml index d89f0b25..8c0c30ac 100644 --- a/win-server/src/main/resources/application.yaml +++ b/win-server/src/main/resources/application.yaml @@ -148,6 +148,7 @@ win: - /admin-api/infra/file/*/get/** # 获取图片，和租户无关 - /magic/web/* # magic-api 和租户无关 - /magic-api/* # magic-api 和租户无关 + - profile/* # 静态资源 和租户无关 ignore-tables: - system_tenant - system_tenant_package From fdb653cab266eda206472c7f577392366ce08ab7 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 7 Dec 2023 15:41:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8F=91=E8=BF=90=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=88=9B=E5=BB=BA=E8=80=85=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/enums/DictTypeConstants.java | 1 + ...CustomerreceiptRecordDetailController.java | 8 ++- .../CustomerreceiptRecordMainController.java | 9 +++- ...ustomerreceiptRequestDetailController.java | 9 +++- .../CustomerreceiptRequestMainController.java | 10 +++- .../CustomerreturnJobDetailController.java | 10 +++- .../CustomerreturnJobMainController.java | 10 +++- .../CustomerreturnRecordDetailController.java | 10 +++- .../CustomerreturnRecordMainController.java | 10 +++- ...CustomerreturnRequestDetailController.java | 9 +++- .../CustomerreturnRequestMainController.java | 10 +++- .../CustomersettleRecordDetailController.java | 9 +++- .../CustomersettleRecordMainController.java | 9 +++- ...CustomersettleRequestDetailController.java | 10 +++- .../CustomersettleRequestMainController.java | 15 ++++-- .../DeliverJobDetailController.java | 9 +++- .../deliverJob/DeliverJobMainController.java | 10 +++- .../DeliverPlanDetailController.java | 9 +++- .../DeliverPlanMainController.java | 2 +- .../DeliverRecordDetailController.java | 9 +++- .../DeliverRecordMainController.java | 9 +++- .../DeliverRequestDetailController.java | 10 +++- .../DeliverRequestMainController.java | 9 +++- .../itembasic/ItembasicController.java | 10 ++-- .../labelBarbasic/BarbasicController.java | 51 +++++++++++++++++++ .../labelBarbasic/vo/BarbasicExcelVO.java | 12 +++-- .../labelBarbasic/vo/BarbasicRespVO.java | 7 +++ .../packageMassage/PackageController.java | 42 +++++++++++---- .../packageMassage/vo/PackageExcelVO.java | 3 ++ .../packageMassage/vo/PackageExportReqVO.java | 6 +++ .../packageMassage/PackageConvert.java | 2 +- .../dataobject/packageMassage/PackageDO.java | 2 +- .../mysql/labelBarbasic/BarbasicMapper.java | 9 ++++ .../mysql/packageMassage/PackageMapper.java | 6 +++ .../CustomerreturnRequestMainServiceImpl.java | 2 + .../labelBarbasic/BarbasicService.java | 11 ++++ .../labelBarbasic/BarbasicServiceImpl.java | 12 ++++- .../packageMassage/PackageService.java | 9 ++++ .../packageMassage/PackageServiceImpl.java | 6 +++ 39 files changed, 348 insertions(+), 48 deletions(-) diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java index 50535caf..32be3bd7 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java @@ -63,6 +63,7 @@ public interface DictTypeConstants { String INTERFACE_TYPE = "interface_type";//接口类型 String REQUEST_MODE = "reqeust_mode";//申请模式 String LABEL_TYPE = "label_type";//标签类型 + String LABEL_STATUS = "label_status";//标签状态 String CARRIER_TYPE = "carrier_type";//承运商类型 String INVENTORY_STATUS = "inventory_status";//库存状态 String REQUEST_STATUS = "request_status";//请求状态 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 a117237f..4a5cb2b5 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 @@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CustomConditions; 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 com.win.module.wms.convert.customerreceiptRecord.CustomerreceiptRecordMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,7 +91,12 @@ public class CustomerreceiptRecordDetailController { @PreAuthorize("@ss.hasPermission('wms:customerreceipt-record-detail:query')") public CommonResult> getCustomerreceiptRecordDetailPage(@Valid CustomerreceiptRecordDetailPageReqVO pageVO) { PageResult pageResult = customerreceiptRecordDetailService.getCustomerreceiptRecordDetailPage(pageVO); - return success(CustomerreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomerreceiptRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomerreceiptRecordDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得账期日历分页") 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 2324ecaf..fd4d738b 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 @@ -7,7 +7,9 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreceiptRecord.vo.*; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExcelVO; import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExportReqVO; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; import com.win.module.wms.convert.customerreturnJob.CustomerreturnJobMainConvert; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.dal.dataobject.customerreceiptRecord.CustomerreceiptRecordDetailDO; import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobDetailDO; import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobMainDO; @@ -100,7 +102,12 @@ public class CustomerreceiptRecordMainController { @PreAuthorize("@ss.hasPermission('wms:customerreceipt-record-main:query')") public CommonResult> getCustomerreceiptRecordMainPage(@Valid CustomerreceiptRecordMainPageReqVO pageVO) { PageResult pageResult = customerreceiptRecordMainService.getCustomerreceiptRecordMainPage(pageVO); - return success(CustomerreceiptRecordMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomerreceiptRecordMainConvert.INSTANCE.convertPage(pageResult); + for(CustomerreceiptRecordMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户收货记录主分页") 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 24585f1f..707fa4f4 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 @@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CustomConditions; 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 com.win.module.wms.convert.customerreceiptRequest.CustomerreceiptRequestMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,7 +91,13 @@ public class CustomerreceiptRequestDetailController { @PreAuthorize("@ss.hasPermission('wms:customerreceipt-request-detail:query')") public CommonResult> getCustomerreceiptRequestDetailPage(@Valid CustomerreceiptRequestDetailPageReqVO pageVO) { PageResult pageResult = customerreceiptRequestDetailService.getCustomerreceiptRequestDetailPage(pageVO); - return success(CustomerreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomerreceiptRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomerreceiptRequestDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户收货申请子分页") 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 a0740874..79a3fa01 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 @@ -5,6 +5,8 @@ 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.customerreceiptRequest.vo.*; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.dal.dataobject.customerreceiptRequest.CustomerreceiptRequestDetailDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.customerreceiptRequest.CustomerreceiptRequestDetailService; @@ -95,7 +97,13 @@ public class CustomerreceiptRequestMainController { @PreAuthorize("@ss.hasPermission('wms:customerreceipt-request-main:query')") public CommonResult> getCustomerreceiptRequestMainPage(@Valid CustomerreceiptRequestMainPageReqVO pageVO) { PageResult pageResult = customerreceiptRequestMainService.getCustomerreceiptRequestMainPage(pageVO); - return success(CustomerreceiptRequestMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomerreceiptRequestMainConvert.INSTANCE.convertPage(pageResult); + for(CustomerreceiptRequestMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户收货申请主分页") 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 ca92c7e9..639a17b5 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 @@ -4,6 +4,8 @@ import com.win.framework.common.pojo.CustomConditions; 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 com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,8 +92,12 @@ public class CustomerreturnJobDetailController { @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-detail:query')") public CommonResult> getCustomerreturnJobDetailPage(@Valid CustomerreturnJobDetailPageReqVO pageVO) { PageResult pageResult = customerreturnJobDetailService.getCustomerreturnJobDetailPage(pageVO); - return success(CustomerreturnJobDetailConvert.INSTANCE.convertPage(pageResult)); - } + PageResult result = CustomerreturnJobDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomerreturnJobDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户退货任务子分页") @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-detail:query')") 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 cdf14e7e..022417b7 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 @@ -7,8 +7,10 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.customerreturnJob.vo.*; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExcelVO; import com.win.module.wms.controller.deliverJob.vo.DeliverJobMainExportReqVO; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; import com.win.module.wms.convert.customerreturnJob.CustomerreturnJobDetailConvert; import com.win.module.wms.convert.deliverJob.DeliverJobMainConvert; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.dal.dataobject.customerreturnJob.CustomerreturnJobDetailDO; import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobDetailDO; import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobMainDO; @@ -104,7 +106,13 @@ public class CustomerreturnJobMainController { @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-main:query')") public CommonResult> getCustomerreturnJobMainPage(@Valid CustomerreturnJobMainPageReqVO pageVO) { PageResult pageResult = customerreturnJobMainService.getCustomerreturnJobMainPage(pageVO); - return success(CustomerreturnJobMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomerreturnJobMainConvert.INSTANCE.convertPage(pageResult); + for(CustomerreturnJobMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") 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 82fff5c5..b8dbf14d 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 @@ -4,6 +4,8 @@ import com.win.framework.common.pojo.CustomConditions; 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 com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,8 +92,12 @@ public class CustomerreturnRecordDetailController { @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-detail:query')") public CommonResult> getCustomerreturnRecordDetailPage(@Valid CustomerreturnRecordDetailPageReqVO pageVO) { PageResult pageResult = customerreturnRecordDetailService.getCustomerreturnRecordDetailPage(pageVO); - return success(CustomerreturnRecordDetailConvert.INSTANCE.convertPage(pageResult)); - } + PageResult result = CustomerreturnRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomerreturnRecordDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户退货记录子分页") @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-detail:query')") 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 926aa8b7..537e79d2 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 @@ -8,7 +8,9 @@ import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRe import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordMainExcelVO; import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordMainExportReqVO; import com.win.module.wms.controller.customerreturnRecord.vo.*; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; import com.win.module.wms.convert.customerreturnRecord.CustomerreturnRecordMainConvert; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.dal.dataobject.customerreturnRecord.CustomerreturnRecordDetailDO; import com.win.module.wms.dal.dataobject.customerreturnRecord.CustomerreturnRecordMainDO; import com.win.module.wms.enums.DictTypeConstants; @@ -98,8 +100,12 @@ public class CustomerreturnRecordMainController { @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-main:query')") public CommonResult> getCustomerreturnRecordMainPage(@Valid CustomerreturnRecordMainPageReqVO pageVO) { PageResult pageResult = customerreturnRecordMainService.getCustomerreturnRecordMainPage(pageVO); - return success(CustomerreturnRecordMainConvert.INSTANCE.convertPage(pageResult)); - } + PageResult result = CustomerreturnRecordMainConvert.INSTANCE.convertPage(pageResult); + for(CustomerreturnRecordMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户退货记录主分页") @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-main:query')") 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 6cd49d99..aa86eec8 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 @@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CustomConditions; 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 com.win.module.wms.convert.customerreturnRequest.CustomerreturnRequestMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -90,7 +91,13 @@ public class CustomerreturnRequestDetailController { @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-detail:query')") public CommonResult> getCustomerreturnRequestDetailPage(@Valid CustomerreturnRequestDetailPageReqVO pageVO) { PageResult pageResult = customerreturnRequestDetailService.getCustomerreturnRequestDetailPage(pageVO); - return success(CustomerreturnRequestDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomerreturnRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomerreturnRequestDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户退货申请子分页") 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 b6099174..0edb3e46 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 @@ -6,7 +6,9 @@ import com.win.framework.excel.core.util.ConvertUtil; 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.DeliverPlanMainRespVO; import com.win.module.wms.convert.customerreturnRequest.CustomerreturnRequestDetailConvert; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestDetailDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.customerreturnRequest.CustomerreturnRequestDetailService; @@ -103,7 +105,13 @@ public class CustomerreturnRequestMainController { @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-main:query')") public CommonResult> getCustomerreturnRequestMainPage(@Valid CustomerreturnRequestMainPageReqVO pageVO) { PageResult pageResult = customerreturnRequestMainService.getCustomerreturnRequestMainPage(pageVO); - return success(CustomerreturnRequestMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomerreturnRequestMainConvert.INSTANCE.convertPage(pageResult); + for(CustomerreturnRequestMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户退货申请主分页") 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 0cf578f0..2b53eef3 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 @@ -3,6 +3,8 @@ package com.win.module.wms.controller.customersettleRecord; import com.win.framework.common.pojo.CustomConditions; 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.DeliverPlanMainRespVO; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -89,7 +91,12 @@ public class CustomersettleRecordDetailController { @PreAuthorize("@ss.hasPermission('wms:customersettle-record-detail:query')") public CommonResult> getCustomersettleRecordDetailPage(@Valid CustomersettleRecordDetailPageReqVO pageVO) { PageResult pageResult = customersettleRecordDetailService.getCustomersettleRecordDetailPage(pageVO); - return success(CustomersettleRecordDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomersettleRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomersettleRecordDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户结算记录子分页") 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 a101a51c..21f213b1 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 @@ -4,6 +4,8 @@ import com.win.framework.common.pojo.CustomConditions; 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.deliverPlan.vo.DeliverPlanMainRespVO; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.dal.dataobject.customersettleRecord.CustomersettleRecordDetailDO; import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.customersettleRecord.CustomersettleRecordDetailService; @@ -94,7 +96,12 @@ public class CustomersettleRecordMainController { @PreAuthorize("@ss.hasPermission('wms:customersettle-record-main:query')") public CommonResult> getCustomersettleRecordMainPage(@Valid CustomersettleRecordMainPageReqVO pageVO) { PageResult pageResult = customersettleRecordMainService.getCustomersettleRecordMainPage(pageVO); - return success(CustomersettleRecordMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomersettleRecordMainConvert.INSTANCE.convertPage(pageResult); + for(CustomersettleRecordMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户结算记录主分页") 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 f1c5ebaf..a3db9f2c 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 @@ -3,6 +3,8 @@ package com.win.module.wms.controller.customersettleRequest; import com.win.framework.common.pojo.CustomConditions; 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.DeliverPlanMainRespVO; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -89,7 +91,13 @@ public class CustomersettleRequestDetailController { @PreAuthorize("@ss.hasPermission('wms:customersettle-request-detail:query')") public CommonResult> getCustomersettleRequestDetailPage(@Valid CustomersettleRequestDetailPageReqVO pageVO) { PageResult pageResult = customersettleRequestDetailService.getCustomersettleRequestDetailPage(pageVO); - return success(CustomersettleRequestDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomersettleRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(CustomersettleRequestDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户结算申请子分页") 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 4195bcc9..0d799651 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 @@ -7,7 +7,10 @@ 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.customersettleRequest.vo.CustomersettleRequestMainCreateReqVO; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; import com.win.module.wms.convert.customerreturnRequest.CustomerreturnRequestMainConvert; +import com.win.module.wms.convert.customersettleRequest.CustomersettleRequestDetailConvert; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestDetailDO; import com.win.module.wms.dal.dataobject.customerreturnRequest.CustomerreturnRequestMainDO; import com.win.module.wms.dal.dataobject.customersettleRequest.CustomersettleRequestDetailDO; @@ -104,7 +107,13 @@ public class CustomersettleRequestMainController { @PreAuthorize("@ss.hasPermission('wms:customersettle-request-main:query')") public CommonResult> getCustomersettleRequestMainPage(@Valid CustomersettleRequestMainPageReqVO pageVO) { PageResult pageResult = customersettleRequestMainService.getCustomersettleRequestMainPage(pageVO); - return success(CustomersettleRequestMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = CustomersettleRequestMainConvert.INSTANCE.convertPage(pageResult); + for(CustomersettleRequestMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得客户结算申请主分页") @@ -113,9 +122,9 @@ public class CustomersettleRequestMainController { PageResult pageResult = customersettleRequestMainService.getCustomersettleRequestMainSenior(conditions); PageResult result = CustomersettleRequestMainConvert.INSTANCE.convertPage(pageResult); for(CustomersettleRequestMainRespVO vo : result.getList()) { - AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 - vo.setCreator(user.getNickname()); + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); } return success(result); } 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 cdb93eb2..a0fe64ff 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 @@ -3,6 +3,8 @@ package com.win.module.wms.controller.deliverJob; import com.win.framework.common.pojo.CustomConditions; 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.DeliverPlanMainRespVO; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -89,7 +91,12 @@ public class DeliverJobDetailController { @PreAuthorize("@ss.hasPermission('wms:deliver-job-detail:query')") public CommonResult> getDeliverJobDetailPage(@Valid DeliverJobDetailPageReqVO pageVO) { PageResult pageResult = deliverJobDetailService.getDeliverJobDetailPage(pageVO); - return success(DeliverJobDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = DeliverJobDetailConvert.INSTANCE.convertPage(pageResult); + for(DeliverJobDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得发货任务子分页") 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 6a0e533e..acdba6f8 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 @@ -4,7 +4,9 @@ import com.win.framework.common.pojo.CustomConditions; 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.deliverPlan.vo.DeliverPlanMainRespVO; import com.win.module.wms.convert.deliverJob.DeliverJobDetailConvert; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.dal.dataobject.deliverJob.DeliverJobDetailDO; import com.win.module.wms.dal.dataobject.issueJob.IssueJobDetailDO; import com.win.module.wms.enums.DictTypeConstants; @@ -99,7 +101,13 @@ public class DeliverJobMainController { @PreAuthorize("@ss.hasPermission('wms:deliver-job-main:query')") public CommonResult> getDeliverJobMainPage(@Valid DeliverJobMainPageReqVO pageVO) { PageResult pageResult = deliverJobMainService.getDeliverJobMainPage(pageVO); - return success(DeliverJobMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = DeliverJobMainConvert.INSTANCE.convertPage(pageResult); + for(DeliverJobMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得发货任务主分页") 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 bab97336..cb59f091 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 @@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CustomConditions; 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.DeliverRequestDetailRespVO; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.convert.deliverRequest.DeliverRequestDetailConvert; import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO; import org.springframework.web.bind.annotation.*; @@ -92,7 +93,13 @@ public class DeliverPlanDetailController { @PreAuthorize("@ss.hasPermission('wms:deliver-plan-detail:query')") public CommonResult> getDeliverPlanDetailPage(@Valid DeliverPlanDetailPageReqVO pageVO) { PageResult pageResult = deliverPlanDetailService.getDeliverPlanDetailPage(pageVO); - return success(DeliverPlanDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = DeliverPlanDetailConvert.INSTANCE.convertPage(pageResult); + for(DeliverPlanDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得发货计划子分页") 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 793686fb..35fc34d5 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 @@ -158,7 +158,7 @@ public class DeliverPlanMainController { vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); } - return success(DeliverPlanMainConvert.INSTANCE.convertPage(pageResult)); + return success(result); } @PostMapping("/senior") @Operation(summary = "高级搜索获得发货计划主分页") 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 c8d40924..d84b3dcb 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 @@ -3,7 +3,9 @@ package com.win.module.wms.controller.deliverRecord; import com.win.framework.common.pojo.CustomConditions; 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.DeliverPlanMainRespVO; import com.win.module.wms.controller.deliverRecord.vo.*; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -87,7 +89,12 @@ public class DeliverRecordDetailController { @PreAuthorize("@ss.hasPermission('wms:deliver-record-detail:query')") public CommonResult> getDeliverRecordDetailPage(@Valid DeliverRecordDetailPageReqVO pageVO) { PageResult pageResult = deliverRecordDetailService.getDeliverRecordDetailPage(pageVO); - return success(DeliverRecordDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = DeliverRecordDetailConvert.INSTANCE.convertPage(pageResult); + for(DeliverRecordDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") 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 f5919e80..29e0491b 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 @@ -4,9 +4,11 @@ import com.win.framework.common.pojo.CustomConditions; 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.deliverPlan.vo.DeliverPlanMainRespVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainExcelVO; import com.win.module.wms.controller.deliverRecord.vo.DeliverRecordMainExportReqVO; import com.win.module.wms.controller.deliverRecord.vo.*; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.convert.deliverRecord.DeliverRecordMainConvert; import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordDetailDO; import com.win.module.wms.dal.dataobject.deliverRecord.DeliverRecordMainDO; @@ -97,7 +99,12 @@ public class DeliverRecordMainController { @PreAuthorize("@ss.hasPermission('wms:deliver-record-main:query')") public CommonResult> getDeliverRecordMainPage(@Valid DeliverRecordMainPageReqVO pageVO) { PageResult pageResult = deliverRecordMainService.getDeliverRecordMainPage(pageVO); - return success(DeliverRecordMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = DeliverRecordMainConvert.INSTANCE.convertPage(pageResult); + for(DeliverRecordMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior") 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 7bfafe8a..09f0e615 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 @@ -3,6 +3,8 @@ package com.win.module.wms.controller.deliverRequest; import com.win.framework.common.pojo.CustomConditions; 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.DeliverPlanMainRespVO; +import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -89,7 +91,13 @@ public class DeliverRequestDetailController { @PreAuthorize("@ss.hasPermission('wms:deliver-request-detail:query')") public CommonResult> getDeliverRequestDetailPage(@Valid DeliverRequestDetailPageReqVO pageVO) { PageResult pageResult = deliverRequestDetailService.getDeliverRequestDetailPage(pageVO); - return success(DeliverRequestDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = DeliverRequestDetailConvert.INSTANCE.convertPage(pageResult); + for(DeliverRequestDetailRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") 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 9c5f3e08..8cb05718 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 @@ -6,6 +6,7 @@ import com.win.framework.excel.core.util.ConvertUtil; 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.DeliverPlanMainExcelVO; +import com.win.module.wms.controller.deliverPlan.vo.DeliverPlanMainRespVO; import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.convert.deliverPlan.DeliverPlanMainConvert; import com.win.module.wms.convert.deliverRequest.DeliverRequestDetailConvert; @@ -107,7 +108,13 @@ public class DeliverRequestMainController { @PreAuthorize("@ss.hasPermission('wms:deliver-request-main:query')") public CommonResult> getDeliverRequestMainPage(@Valid DeliverRequestMainPageReqVO pageVO) { PageResult pageResult = deliverRequestMainService.getDeliverRequestMainPage(pageVO); - return success(DeliverRequestMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = DeliverRequestMainConvert.INSTANCE.convertPage(pageResult); + for(DeliverRequestMainRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + vo.setUpdater(userApi.getUser(Long.valueOf(vo.getUpdater())).getNickname()); + } + return success(result); } @PostMapping("/senior") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java index 8184fb04..7ad3fb96 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java @@ -274,11 +274,11 @@ public class ItembasicController { @RequestParam(value = "updatePart", required = false, defaultValue = "false") Boolean updatePart) throws Exception { List list = ExcelUtils.read(file, ItembasicImportExcelVo.class); List errorList = itembasicService.importItembasicList(list, mode, updatePart); - Map returnMap = new HashMap<>(); - returnMap.put("errorCount", errorList.size()); - if(!errorList.isEmpty()) { - String url = ExcelUtils.writeLocalFile("物品基本信息导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xls", "错误列表", errorList); - returnMap.put("errorFile", url); + Map returnMap = new HashMap<>(); + returnMap.put("errorCount", errorList.size()); + if(!errorList.isEmpty()) { + String url = ExcelUtils.writeLocalFile("物品基本信息导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xls", "错误列表", errorList); + returnMap.put("errorFile", url); } return success(returnMap); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/BarbasicController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/BarbasicController.java index 171d9e6a..53720780 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/BarbasicController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/BarbasicController.java @@ -1,5 +1,13 @@ package com.win.module.wms.controller.labelBarbasic; +import com.win.framework.common.pojo.CustomConditions; +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.itembasic.vo.ItembasicExcelVO; +import com.win.module.wms.convert.itembasic.ItembasicConvert; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; +import com.win.module.wms.enums.DictTypeConstants; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -32,6 +40,9 @@ public class BarbasicController { @Resource private BarbasicService barbasicService; + @Resource + private AdminUserApi userApi; + @PostMapping("/create") @Operation(summary = "创建条码实体基类") @PreAuthorize("@ss.hasPermission('wms:barbasic:create')") @@ -79,9 +90,29 @@ public class BarbasicController { @PreAuthorize("@ss.hasPermission('wms:barbasic:query')") public CommonResult> getBarbasicPage(@Valid BarbasicPageReqVO pageVO) { PageResult pageResult = barbasicService.getBarbasicPage(pageVO); + PageResult result = BarbasicConvert.INSTANCE.convertPage(pageResult); + for(BarbasicRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } return success(BarbasicConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") + @Operation(summary = "高级搜索条码实体基类分页") + @PreAuthorize("@ss.hasPermission('wms:barbasic:query')") + public CommonResult> getBarbasicSenior(@Valid @RequestBody CustomConditions conditions) { + PageResult pageResult = barbasicService.getBarbasicSenior(conditions); + PageResult result = BarbasicConvert.INSTANCE.convertPage(pageResult); + for(BarbasicRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + } + return success(result); + } + @GetMapping("/export-excel") @Operation(summary = "导出条码实体基类 Excel") @PreAuthorize("@ss.hasPermission('wms:barbasic:export')") @@ -94,6 +125,26 @@ public class BarbasicController { ExcelUtils.write(response, "条码实体基类.xls", "数据", BarbasicExcelVO.class, datas); } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出物品基本信息 Excel") + @PreAuthorize("@ss.hasPermission('wms:itembasic:export')") + @OperateLog(type = EXPORT) + public void exportItembasicExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = barbasicService.getBarbasicList(conditions); + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + ExcelUtils.write(response, "物品基本信息.xlsx", "数据", BarbasicExcelVO.class, resultList, mapDropDown); + } + private List getExcelVo(List list, Map mapDropDown) { + String[] labelType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LABEL_TYPE); + mapDropDown.put(1, labelType); + String[] labelStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LABEL_STATUS); + mapDropDown.put(3, labelStatus); + // 导出 Excel + List resultList = BarbasicConvert.INSTANCE.convertList02(list); + return resultList; + } + @GetMapping("/get-import-template") @Operation(summary = "获得导入条码实体基类模板") public void importTemplate(HttpServletResponse response) throws IOException { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicExcelVO.java index 66562c67..37b04de2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicExcelVO.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.labelBarbasic.vo; +import com.win.framework.excel.core.annotations.DictFormat; +import com.win.framework.excel.core.convert.DictConvert; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -14,19 +16,21 @@ import com.alibaba.excel.annotation.ExcelProperty; @Data public class BarbasicExcelVO { - @ExcelProperty("id") - private Long id; +// @ExcelProperty("id") +// private Long id; @ExcelProperty("标签号") private String number; - @ExcelProperty("标签类型") + @ExcelProperty(value = "标签类型", converter = DictConvert.class) + @DictFormat("label_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String type; @ExcelProperty("标签模板") private String template; - @ExcelProperty("标签状态") + @ExcelProperty(value = "标签状态", converter = DictConvert.class) + @DictFormat("label_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String status; @ExcelProperty("关联号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicRespVO.java index 698cd996..518ae0a4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/vo/BarbasicRespVO.java @@ -3,6 +3,8 @@ package com.win.module.wms.controller.labelBarbasic.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.time.LocalDateTime; + @Schema(description = "管理后台 - 条码实体基类 Response VO") @Data @EqualsAndHashCode(callSuper = true) @@ -12,4 +14,9 @@ public class BarbasicRespVO extends BarbasicBaseVO { @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29175") private Long id; + @Schema(description = "创建时间") + private LocalDateTime createTime; + + @Schema(description = "创建者ID") + private String creator; } 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 56d2a751..aa00f71f 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 @@ -3,14 +3,17 @@ package com.win.module.wms.controller.packageMassage; import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.CustomConditions; 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.packageMassage.vo.*; import com.win.module.wms.convert.packageMassage.PackageConvert; +import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO; import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; import com.win.module.wms.dal.mysql.packageMassage.PackageMapper; +import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.packageMassage.PackageService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -23,8 +26,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.util.Collection; -import java.util.List; +import java.util.*; import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; @@ -104,17 +106,39 @@ public class PackageController { public void exportPackageExcel(@Valid PackageExportReqVO exportReqVO, HttpServletResponse response) throws IOException { List list = packageService.getPackageList(exportReqVO); + // 导出 Excel + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); + // 导出 Excel + ExcelUtils.write(response, "发货申请.xlsx", "数据", PackageExcelVO.class, resultList, mapDropDown); + } + @PostMapping("/export-excel-senior") + @Operation(summary = "导出包装 Excel") + @PreAuthorize("@ss.hasPermission('wms:deliver-request-main:export')") + @OperateLog(type = EXPORT) + public void exportPackageSeniorExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { + List list = packageService.getPackageList(conditions); + //组装vo + Map mapDropDown = new HashMap<>(); + List resultList = this.getExcelVo(list, mapDropDown); // 导出 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); + ExcelUtils.write(response, "发货申请.xlsx", "数据", PackageExcelVO.class, resultList, mapDropDown); } + private List getExcelVo(List list, Map mapDropDown) { + String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); + mapDropDown.put(10, uom); + mapDropDown.put(12, uom); + String[] packUnit = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT); + mapDropDown.put(16, packUnit); + List resultList = PackageConvert.INSTANCE.convertList02(list); + // 导出 + for (PackageExcelVO vo : resultList) { + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return resultList; + } @PostMapping("/senior") @Operation(summary = "高级搜索获得包装分页") @PreAuthorize("@ss.hasPermission('wms:package:query')") 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 e56a8e81..7baa733c 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 @@ -46,12 +46,15 @@ public class PackageExcelVO { private String altBatch; @ExcelProperty("生产日期") + @ColumnWidth(value = 22) private LocalDateTime produceDate; @ExcelProperty("有效期(日)") private Integer validityDays; @ExcelProperty("失效日期") + @ColumnWidth(value = 22) + private LocalDateTime expireDate; @ExcelProperty(value = "计量单位", converter = DictConvert.class) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExportReqVO.java index e416f564..74b7ad1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExportReqVO.java @@ -138,4 +138,10 @@ public class PackageExportReqVO { @Schema(description = "体积") private String volume; + @Schema(description = "创建者id") + private String creator; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime createTime; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageMassage/PackageConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageMassage/PackageConvert.java index 326b90a9..42d7e7ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageMassage/PackageConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/packageMassage/PackageConvert.java @@ -8,6 +8,7 @@ import com.win.module.wms.controller.packageMassage.vo.PackageCreateReqVO; import com.win.module.wms.controller.packageMassage.vo.PackageExcelVO; import com.win.module.wms.controller.packageMassage.vo.PackageRespVO; import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO; +import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestDetailDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; @@ -33,5 +34,4 @@ public interface PackageConvert { PageResult convertPage(PageResult page); List convertList02(List list); - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java index f6ae080a..974c734e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java @@ -24,7 +24,7 @@ import com.win.framework.mybatis.core.dataobject.BaseDO; @Builder @NoArgsConstructor @AllArgsConstructor -public class PackageDO{ +public class PackageDO extends BaseDO { /** * id diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labelBarbasic/BarbasicMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labelBarbasic/BarbasicMapper.java index 7d284111..41c3bcf0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labelBarbasic/BarbasicMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/labelBarbasic/BarbasicMapper.java @@ -2,9 +2,11 @@ package com.win.module.wms.dal.mysql.labelBarbasic; import java.util.*; +import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.mapper.BaseMapperX; +import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.labelBarbasic.vo.BarbasicExportReqVO; import com.win.module.wms.controller.labelBarbasic.vo.BarbasicPageReqVO; import com.win.module.wms.dal.dataobject.labelBarbasic.BarbasicDO; @@ -48,4 +50,11 @@ public interface BarbasicMapper extends BaseMapperX { .orderByDesc(BarbasicDO::getId)); } + default PageResult selectSenior(CustomConditions conditions){ + return selectPage(conditions, QueryWrapperUtils.structure(conditions)); + } + + default List selectSeniorList(CustomConditions conditions){ + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java index d4ba53fe..e28366b2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/packageMassage/PackageMapper.java @@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX; import com.win.framework.mybatis.core.util.QueryWrapperUtils; import com.win.module.wms.controller.packageMassage.vo.PackageExportReqVO; import com.win.module.wms.controller.packageMassage.vo.PackagePageReqVO; +import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestMainDO; import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; import org.apache.ibatis.annotations.Mapper; @@ -83,7 +84,12 @@ public interface PackageMapper extends BaseMapperX { .eqIfPresent(PackageDO::getWeight, reqVO.getWeight()) .eqIfPresent(PackageDO::getArea, reqVO.getArea()) .eqIfPresent(PackageDO::getVolume, reqVO.getVolume()) + .eqIfPresent(PackageDO::getCreateTime, reqVO.getCreateTime()) + .eqIfPresent(PackageDO::getCreator, reqVO.getCreator()) .orderByDesc(PackageDO::getId)); } + default List selectSeniorList(CustomConditions conditions){ + return selectList(QueryWrapperUtils.structure(conditions)); + } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java index 56975809..25af7f3f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java @@ -324,6 +324,8 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque customerreturnJobMainDO.setCreateTime(null); customerreturnJobMainDO.setUpdater(null); customerreturnJobMainDO.setUpdateTime(null); + customerreturnJobMainDO.setInInventoryStatuses(mainDO.getInInventoryStatuses()); + customerreturnJobMainDO.setOutInventoryStatuses(mainDO.getOutInventoryStatuses()); // 获取任务单据设置 JobsettingDO jobsettingDO = jobsettingService.selectJobsettingExist("CustomerRejectJob"); customerreturnJobMainDO.setRequestDueTime(mainDO.getDueTime()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicService.java index 080f3288..5a76732c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicService.java @@ -2,6 +2,8 @@ package com.win.module.wms.service.labelBarbasic; import java.util.*; import javax.validation.*; + +import com.win.framework.common.pojo.CustomConditions; import com.win.module.wms.controller.labelBarbasic.vo.*; import com.win.module.wms.dal.dataobject.labelBarbasic.BarbasicDO; import com.win.framework.common.pojo.PageResult; @@ -51,6 +53,14 @@ public interface BarbasicService { */ List getBarbasicList(Collection ids); + /** + * 获得条码实体基类列表 + * + * @param ids 编号 + * @return 条码实体基类列表 + */ + List getBarbasicList(CustomConditions conditions); + /** * 获得条码实体基类分页 * @@ -68,4 +78,5 @@ public interface BarbasicService { List getBarbasicList(BarbasicExportReqVO exportReqVO); + PageResult getBarbasicSenior(CustomConditions conditions); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicServiceImpl.java index 46f3f206..0d29c5e6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/labelBarbasic/BarbasicServiceImpl.java @@ -1,6 +1,8 @@ package com.win.module.wms.service.labelBarbasic; +import com.win.framework.common.pojo.CustomConditions; +import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -70,6 +72,11 @@ public class BarbasicServiceImpl implements BarbasicService { return barbasicMapper.selectBatchIds(ids); } + @Override + public List getBarbasicList(CustomConditions conditions) { + return barbasicMapper.selectSeniorList(conditions); + } + @Override public PageResult getBarbasicPage(BarbasicPageReqVO pageReqVO) { return barbasicMapper.selectPage(pageReqVO); @@ -80,5 +87,8 @@ public class BarbasicServiceImpl implements BarbasicService { return barbasicMapper.selectList(exportReqVO); } - + @Override + public PageResult getBarbasicSenior(CustomConditions conditions) { + return barbasicMapper.selectSenior(conditions); + } } 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 4bb95486..da40a146 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 @@ -6,6 +6,7 @@ import com.win.module.wms.controller.packageMassage.vo.PackageCreateReqVO; import com.win.module.wms.controller.packageMassage.vo.PackageExportReqVO; import com.win.module.wms.controller.packageMassage.vo.PackagePageReqVO; import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO; +import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestMainDO; import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; import javax.validation.Valid; @@ -95,4 +96,12 @@ public interface PackageService { * @param packageDO */ void generateLabel(PackageDO packageDO); + + /** + * 获得包装列表, 用于 Excel 导出 + * + * @param conditions 查询条件 + * @return 包装列表 + */ + List getPackageList(CustomConditions conditions); } 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 e4f4e291..a4565865 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 @@ -12,6 +12,7 @@ import com.win.module.wms.controller.packageMassage.vo.PackagePageReqVO; import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO; import com.win.module.wms.convert.packageMassage.PackageConvert; import com.win.module.wms.dal.dataobject.barcode.BarcodeDO; +import com.win.module.wms.dal.dataobject.deliverRequest.DeliverRequestMainDO; import com.win.module.wms.dal.dataobject.itempackaging.ItempackagingDO; import com.win.module.wms.dal.dataobject.labelBarbasic.BarbasicDO; import com.win.module.wms.dal.dataobject.labeltype.LabeltypeDO; @@ -231,4 +232,9 @@ public class PackageServiceImpl implements PackageService { barbasicDO.setBarcodeString(headerStr + contentStr); barbasicMapper.insert(barbasicDO); } + + @Override + public List getPackageList(CustomConditions conditions) { + return packageMapper.selectSeniorList(conditions); + } } From 22a4bee0d6bcbe9a278182d67297f1a1b9da184a Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 7 Dec 2023 18:35:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/SecurityConfiguration.java | 2 +- .../module/wms/enums/ErrorCodeConstants.java | 1 + .../inspectJob/InspectJobMainController.java | 8 +++++++ .../InspectRequestMainController.java | 15 ++++++++++--- .../countJob/CountJobMainServiceImpl.java | 4 ++++ .../inspectJob/InspectJobMainService.java | 7 ++++++ .../inspectJob/InspectJobMainServiceImpl.java | 19 ++++++++++++++-- .../InspectRequestMainService.java | 10 ++++++++- .../InspectRequestMainServiceImpl.java | 21 +++++++++++++++++- .../purchase/PurchaseMainServiceImpl.java | 4 ++-- .../PurchasereceiptJobMainServiceImpl.java | 3 +++ .../PurchasereturnJobMainServiceImpl.java | 22 +++++++++---------- .../putawayJob/PutawayJobMainServiceImpl.java | 4 +++- .../src/main/resources/application.yaml | 2 +- 14 files changed, 99 insertions(+), 23 deletions(-) diff --git a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/framework/security/config/SecurityConfiguration.java b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/framework/security/config/SecurityConfiguration.java index 6ecb8836..8e33559a 100644 --- a/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/framework/security/config/SecurityConfiguration.java +++ b/win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/framework/security/config/SecurityConfiguration.java @@ -43,7 +43,7 @@ public class SecurityConfiguration { registry.antMatchers("/magic/web/**").anonymous() .antMatchers("/magic-api/**").anonymous(); //静态资源 - registry.antMatchers("/profile/**").anonymous(); + registry.antMatchers("/admin-api/profile/**").anonymous(); // 文件读取 registry.antMatchers(buildAdminApi("/infra/file/*/get/**")).permitAll(); } 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 2f6b20bf..4b352a6a 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 @@ -476,6 +476,7 @@ public interface ErrorCodeConstants { ErrorCode INSPECT_REQUEST_CANNOT_AGREE = new ErrorCode(1_000_078_006, "到货检验申请状态不支持审批同意"); ErrorCode INSPECT_REQUEST_CANNOT_HANDLE = new ErrorCode(1_000_078_007, "到货检验申请状态不支持处理"); ErrorCode INSPECT_REQUEST_CANNOT_ABORT = new ErrorCode(1_000_078_008, "到货检验申请状态不支持审批拒绝"); + ErrorCode INSPECT_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_073_010, "到货检验状态不支持重新添加"); //检验任务主ErrorCode ErrorCode INSPECT_JOB_MAIN_NOT_EXISTS = new ErrorCode(1_000_079_000, "检验任务主不存在"); //检验任务子ErrorCode 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 edc0187d..67c73a24 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 @@ -207,6 +207,14 @@ public class InspectJobMainController { return success(result > 0); } + @PutMapping(value = "/close") + @Operation(summary = "关闭任务") + @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:close')") + public CommonResult closeInspectJobMain(@RequestParam("id") Long id) { + int result = inspectJobMainService.closeInspectJobMain(id); + return success(result > 0); + } + @PutMapping("/execute") @Operation(summary = "执行任务") @Parameter(name = "id", description = "编号", required = true) 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 6f1fd3d3..6cf01548 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 @@ -227,6 +227,15 @@ public class InspectRequestMainController { return success(count > 0); } + @PutMapping("/reAdd") + @Operation(summary = "重新添加到货检验申请主") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:reAdd')") + public CommonResult openInspectRequestMain(@RequestParam("id") Long id) { + Integer count = inspectRequestMainService.reAddInspectRequestMain(id); + return success(count > 0); + } + @PutMapping("/agree") @Operation(summary = "审批通过到货检验申请主") @Parameter(name = "id", description = "编号", required = true) @@ -245,12 +254,12 @@ public class InspectRequestMainController { return success(count > 0); } - @PutMapping("/abort") + @PutMapping("/refused") @Operation(summary = "审批拒绝到货检验申请主") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:inspect-request-main:abort')") - public CommonResult abortInspectRequestMain(@RequestParam("id") Long id) { - Integer count = inspectRequestMainService.abortInspectRequestMain(id); + public CommonResult refusedInspectRequestMain(@RequestParam("id") Long id) { + Integer count = inspectRequestMainService.refusedInspectRequestMain(id); return success(count > 0); } 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 c4d7f064..18a9a625 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 @@ -14,10 +14,13 @@ import com.win.module.wms.controller.countJob.vo.CountJobDetailUpdateReqVO; import com.win.module.wms.controller.countJob.vo.CountJobMainExportReqVO; import com.win.module.wms.controller.countJob.vo.CountJobMainPageReqVO; import com.win.module.wms.controller.countJob.vo.CountJobMainUpdateReqVO; +import com.win.module.wms.convert.countJob.CountJobDetailConvert; +import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.countJob.CountJobMainDO; import com.win.module.wms.dal.dataobject.countRecord.CountRecordDetailDO; import com.win.module.wms.dal.dataobject.countRecord.CountRecordMainDO; import com.win.module.wms.dal.dataobject.countRequest.CountRequestMainDO; +import com.win.module.wms.dal.mysql.countJob.CountJobDetailMapper; import com.win.module.wms.dal.mysql.countJob.CountJobMainMapper; import com.win.module.wms.dal.mysql.countRecord.CountRecordDetailMapper; import com.win.module.wms.dal.mysql.countRecord.CountRecordMainMapper; @@ -25,6 +28,7 @@ import com.win.module.wms.dal.mysql.countRequest.CountRequestMainMapper; import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.job.JobStatusState; import com.win.module.wms.enums.request.RequestStatusEnum; +import com.win.module.wms.util.JobUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; 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 fd5d5946..dadae0ad 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 @@ -98,6 +98,13 @@ public interface InspectJobMainService { */ Integer abandonInspectJobMain(Long id); + /** + * 关闭任务 + * @param id + * @return + */ + Integer closeInspectJobMain(Long id); + /** * 执行任务 * @param inspectJobMainUpdateReqVO 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 aa15557e..8c3daa33 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 @@ -181,6 +181,19 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { return inspectJobMainMapper.updateById(inspectJobMainDO); } + @Override + @Transactional + public Integer closeInspectJobMain(Long id) { + InspectJobMainDO inspectJobMainDO = this.validateInspectJobMainExists(id); + JobStatusState jobStatusState = new JobStatusState(inspectJobMainDO.getStatus()); + if(!jobStatusState.close()) { + throw exception(INSPECT_JOB_MAIN_STATUS_ERROR); + } + inspectJobMainDO.setStatus(jobStatusState.getState().getCode()); + trendsApi.createTrends(id, "inspectJob", "关闭了到货检验任务", TrendsTypeEnum.UPDATE); + return inspectJobMainMapper.updateById(inspectJobMainDO); + } + @Override @Transactional public String executeInspectJobMain(InspectJobMainUpdateReqVO inspectJobMainUpdateReqVO) { @@ -195,6 +208,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { Long userId = getLoginUserId(); AdminUserRespDTO userRespDTO = userApi.getUser(userId); inspectJobMainDO.setStatus(jobStatusState.getState().getCode()); + inspectJobMainDO.setNextAction(inspectJobMainUpdateReqVO.getNextAction()); inspectJobMainDO.setCompleteTime(LocalDateTime.now()); inspectJobMainDO.setCompleteUserId(String.valueOf(userRespDTO.getId())); inspectJobMainDO.setCompleteUserName(userRespDTO.getNickname()); @@ -217,6 +231,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { BigDecimal failedQty = BigDecimal.ZERO; BigDecimal crackQty = BigDecimal.ZERO; BigDecimal notPassedQty = BigDecimal.ZERO; + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectJob"); //库存事务 List transactionCreateReqVOList = new ArrayList<>(); List inspectJobDetailUpdateReqVOList = inspectJobMainUpdateReqVO.getSubList(); @@ -228,6 +243,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { failedQty = failedQty.add(inspectRecordDetailDO.getFailedQty()); crackQty = crackQty.add(inspectRecordDetailDO.getCrackQty()); notPassedQty = notPassedQty.add(inspectRecordDetailDO.getNotPassedQty()); + inspectRecordDetailDO.setNotPassedQty(inspectJobDetailUpdateReqVO.getNotPassedQty()); inspectRecordDetailDO.setMasterId(inspectRecordMainDO.getId()); inspectRecordDetailDO.setNumber(number); inspectRecordDetailDO.setJobDetailId(String.valueOf(inspectJobDetailUpdateReqVO.getId())); @@ -243,7 +259,6 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); BeanUtils.copyProperties(inspectRecordDetailDO, transactionCreateReqVOIn); //增加业务入类型 - BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InspectJob"); transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); @@ -362,7 +377,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { //上架申请子 SwitchDO switchDO = switchService.selectSwitchExist("CreatePutawayRequestAfterInspectRecordCreated"); //检验合格生成上架申请 - if(switchDO.getEffectiveSetValue().equals("TRUE")) { + if(switchDO.getEffectiveSetValue().equals("TRUE") && !inspectJobMainUpdateReqVO.getNextAction().equals("FULL_INSPECT")) { PutawayRequestMainCreateReqVO putawayRequestMainCreateReqVO = new PutawayRequestMainCreateReqVO(); BeanUtils.copyProperties(inspectRecordMainDO, putawayRequestMainCreateReqVO); List putawayRequestDetailCreateReqVOList = new ArrayList<>(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java index fbecee90..1f9a3042 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainService.java @@ -111,6 +111,14 @@ public interface InspectRequestMainService { */ Integer submitInspectRequestMain(Long id); + /** + * 重新添加到货检验申请主 + * + * @param id 到货检验申请主ID + * @return 更新数量 + */ + Integer reAddInspectRequestMain(Long id); + /** * 审批通过到货检验申请主 * @@ -131,6 +139,6 @@ public interface InspectRequestMainService { * @param id 到货检验申请主ID * @return 更新数量 */ - Integer abortInspectRequestMain(Long id); + Integer refusedInspectRequestMain(Long id); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java index e33b76e2..f11eac63 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java @@ -295,6 +295,25 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService return inspectRequestMainMapper.updateById(mainDO); } + @Override + @Transactional + public Integer reAddInspectRequestMain(Long id) { + // 校验存在存在下级单据 + InspectRequestMainDO mainDO = validateInspectRequestMainExists(id); + Long count = inspectJobMainMapper.selectByRequestNumber(mainDO.getNumber()); + if(count > 0) { + throw new ServiceException(INSPECT_REQUEST_JOB_EXISTS); + } + RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); + boolean flag = requestStatusState.reAdd(); + if(!flag) { + throw new ServiceException(INSPECT_REQUEST_CANNOT_RE_ADD); + } + mainDO.setStatus(requestStatusState.getState().getCode());//增加操作记录 + trendsApi.createTrends(id, "inspectRequest", "打开了到货校验申请", TrendsTypeEnum.UPDATE); + return inspectRequestMainMapper.updateById(mainDO); + } + @Override @Transactional public Integer agreeInspectRequestMain(Long id) { @@ -333,7 +352,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService @Override @Transactional - public Integer abortInspectRequestMain(Long id) { + public Integer refusedInspectRequestMain(Long id) { // 校验存在 InspectRequestMainDO mainDO = validateInspectRequestMainExists(id); RequestStatusState requestStatusState = new RequestStatusState(mainDO.getStatus()); 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 8be055c7..e30387dd 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 @@ -26,7 +26,6 @@ import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; import com.win.module.wms.dal.dataobject.purchase.PurchaseMainDO; import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanDetailDO; import com.win.module.wms.dal.dataobject.purchasePlan.PurchasePlanMainDO; -import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; import com.win.module.wms.dal.dataobject.shift.ShiftDO; import com.win.module.wms.dal.dataobject.stdcostprice.StdcostpriceDO; import com.win.module.wms.dal.dataobject.supplier.SupplierDO; @@ -197,7 +196,8 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { queryWrapper1.eq("line_number", poLine); queryWrapper1.eq("item_code", pitemCode); PurchaseDetailDO purchaseDetailDO = purchaseDetailMapper.selectOne(queryWrapper1); - if (purchaseDetailDO != null && "TRUE".equals(purchaseDetailDO.getAvailable())) { + //if (purchaseDetailDO != null && "TRUE".equals(purchaseDetailDO.getAvailable())) { + if (purchaseDetailDO != null) { return purchaseDetailDO; } else { throw new UtilException("采购订单明细:订单号" + pnumber + "、订单行" + poLine + "、零件号" + pitemCode + "、无效"); 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 d9702b7b..d65d630e 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 @@ -34,6 +34,7 @@ import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchaseshortageD import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO; import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; +import com.win.module.wms.dal.mysql.purchasereceiptJob.PurchasereceiptJobDetailMapper; import com.win.module.wms.dal.mysql.purchasereceiptJob.PurchasereceiptJobMainMapper; import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordDetailMapper; import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordMainMapper; @@ -122,6 +123,8 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain private PutawayRequestMainService putawayRequestMainService; @Resource private RequestsettingService requestsettingService; + @Resource + private PurchasereceiptJobDetailMapper purchasereceiptJobDetailMapper; @Override public PageResult getPurchasereceiptJobMainSenior(CustomConditions conditions) { 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 0ec2c969..22a0048a 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 @@ -15,10 +15,8 @@ import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainE import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainPageReqVO; import com.win.module.wms.controller.purchasereturnJob.vo.PurchasereturnJobMainUpdateReqVO; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; -import com.win.module.wms.convert.purchasereturnJob.PurchasereturnJobDetailConvert; import com.win.module.wms.dal.dataobject.balance.BalanceDO; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; -import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobDetailDO; import com.win.module.wms.dal.dataobject.purchasereturnJob.PurchasereturnJobMainDO; import com.win.module.wms.dal.dataobject.purchasereturnRecord.PurchasereturnRecordDetailDO; import com.win.module.wms.dal.dataobject.purchasereturnRecord.PurchasereturnRecordMainDO; @@ -26,6 +24,7 @@ import com.win.module.wms.dal.dataobject.purchasereturnRequest.PurchasereturnReq import com.win.module.wms.dal.dataobject.supplierdeliverRecord.SupplierdeliverRecordDetailDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; import com.win.module.wms.dal.mysql.balance.BalanceMapper; +import com.win.module.wms.dal.mysql.purchasereturnJob.PurchasereturnJobDetailMapper; import com.win.module.wms.dal.mysql.purchasereturnJob.PurchasereturnJobMainMapper; import com.win.module.wms.dal.mysql.purchasereturnRecord.PurchasereturnRecordDetailMapper; import com.win.module.wms.dal.mysql.purchasereturnRecord.PurchasereturnRecordMainMapper; @@ -91,6 +90,8 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe private JobUtils jobUtils; @Resource private BalanceMapper balanceMapper; + @Resource + private PurchasereturnJobDetailMapper purchasereturnJobDetailMapper; @Override public PageResult getPurchasereturnJobMainSenior(CustomConditions conditions) { @@ -235,24 +236,24 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe purchasereturnRecordMainDO.setUpdateTime(null); purchasereturnRecordMainDO.setUpdater(null); purchasereturnRecordMainMapper.insert(purchasereturnRecordMainDO); + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest"); List purchasereturnJobDetailUpdateReqVOList = purchasereturnJobMainUpdateReqVO.getSubList(); //退货记录子 List purchasereturnRecordDetailDOList = new ArrayList<>(); //库存事务 List transactionCreateReqVOList = new ArrayList<>(); for(PurchasereturnJobDetailUpdateReqVO purchasereturnJobDetailUpdateReqVO : purchasereturnJobDetailUpdateReqVOList) { - PurchasereturnJobDetailDO purchasereturnJobDetailDO = PurchasereturnJobDetailConvert.INSTANCE.convert(purchasereturnJobDetailUpdateReqVO); PurchasereturnRecordDetailDO purchasereturnRecordDetailDO = new PurchasereturnRecordDetailDO(); - BeanUtils.copyProperties(purchasereturnJobDetailDO, purchasereturnRecordDetailDO); + BeanUtils.copyProperties(purchasereturnJobDetailUpdateReqVO, purchasereturnRecordDetailDO); purchasereturnRecordDetailDO.setMasterId(purchasereturnRecordMainDO.getId()); purchasereturnRecordDetailDO.setNumber(number); - purchasereturnRecordDetailDO.setJobDetailId(String.valueOf(purchasereturnJobDetailDO.getId())); - purchasereturnRecordDetailDO.setFromPackingNumber(purchasereturnJobDetailDO.getPackingNumber()); + purchasereturnRecordDetailDO.setJobDetailId(String.valueOf(purchasereturnJobDetailUpdateReqVO.getId())); + purchasereturnRecordDetailDO.setFromPackingNumber(purchasereturnJobDetailUpdateReqVO.getPackingNumber()); purchasereturnRecordDetailDO.setToPackingNumber(purchasereturnJobDetailUpdateReqVO.getToPackingNumber()); - purchasereturnRecordDetailDO.setFromContainerNumber(purchasereturnJobDetailDO.getContainerNumber()); + purchasereturnRecordDetailDO.setFromContainerNumber(purchasereturnJobDetailUpdateReqVO.getContainerNumber()); purchasereturnRecordDetailDO.setToContainerNumber(purchasereturnJobDetailUpdateReqVO.getToContainerNumber()); purchasereturnRecordDetailDO.setQty(purchasereturnJobDetailUpdateReqVO.getHandleQty()); - purchasereturnRecordDetailDO.setFromBatch(purchasereturnJobDetailDO.getBatch()); + purchasereturnRecordDetailDO.setFromBatch(purchasereturnJobDetailUpdateReqVO.getBatch()); purchasereturnRecordDetailDO.setToBatch(purchasereturnJobDetailUpdateReqVO.getToBatch()); purchasereturnRecordDetailDO.setInventoryStatus(purchasereturnJobDetailUpdateReqVO.getToInventoryStatus()); purchasereturnRecordDetailDO.setToLocationCode(purchasereturnJobDetailUpdateReqVO.getToLocationCode()); @@ -270,13 +271,12 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe TransactionCreateReqVO transactionCreateReqVOOut = new TransactionCreateReqVO(); BeanUtils.copyProperties(purchasereturnRecordDetailDO, transactionCreateReqVOOut); //增加业务类型 - BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest"); transactionCreateReqVOOut.setBusinessType(businesstypeDO.getCode()); TransactiontypeDO transactionTypeDOOut = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getOutTransactionType()); transactionCreateReqVOOut.setInventoryAction(transactionTypeDOOut.getInventoryAction()); transactionCreateReqVOOut.setTransactionType(transactionTypeDOOut.getCode()); transactionCreateReqVOOut.setBusinessType(purchasereturnRecordMainDO.getBusinessType()); - transactionCreateReqVOOut.setLocationCode(purchasereturnJobDetailDO.getFromLocationCode()); + transactionCreateReqVOOut.setLocationCode(purchasereturnJobDetailUpdateReqVO.getFromLocationCode()); transactionCreateReqVOOut.setOwnerCode(purchasereturnRecordDetailDO.getFromOwnerCode()); transactionCreateReqVOOut.setSinglePrice(balanceDO.getSinglePrice()); transactionCreateReqVOOut.setAmount(balanceDO.getAmount()); @@ -301,7 +301,7 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe transactionCreateReqVOIn.setInventoryAction(transactionTypeDOIn.getInventoryAction()); transactionCreateReqVOIn.setTransactionType(transactionTypeDOIn.getCode()); transactionCreateReqVOIn.setBusinessType(purchasereturnRecordMainDO.getBusinessType()); - transactionCreateReqVOIn.setLocationCode(purchasereturnJobDetailDO.getToLocationCode()); + transactionCreateReqVOIn.setLocationCode(purchasereturnJobDetailUpdateReqVO.getToLocationCode()); transactionCreateReqVOIn.setOwnerCode(purchasereturnRecordDetailDO.getToOwnerCode()); transactionCreateReqVOIn.setSinglePrice(balanceDO.getSinglePrice()); transactionCreateReqVOIn.setAmount(balanceDO.getAmount()); 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 1d7b8dc4..b722c8e7 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 @@ -15,12 +15,14 @@ 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.controller.transaction.vo.TransactionCreateReqVO; +import com.win.module.wms.convert.putawayJob.PutawayJobDetailConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.putawayJob.PutawayJobMainDO; import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordDetailDO; import com.win.module.wms.dal.dataobject.putawayRecord.PutawayRecordMainDO; import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestMainDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; +import com.win.module.wms.dal.mysql.putawayJob.PutawayJobDetailMapper; import com.win.module.wms.dal.mysql.putawayJob.PutawayJobMainMapper; import com.win.module.wms.dal.mysql.putawayRecord.PutawayRecordDetailMapper; import com.win.module.wms.dal.mysql.putawayRecord.PutawayRecordMainMapper; @@ -186,6 +188,7 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { putawayRecordMainDO.setUpdater(null); putawayRecordMainDO.setUpdateTime(null); putawayRecordMainMapper.insert(putawayRecordMainDO); + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayJob"); //库存事务 List transactionCreateReqVOList = new ArrayList<>(); List putawayJobDetailUpdateReqVOList = putawayJobMainUpdateReqVO.getSubList(); @@ -214,7 +217,6 @@ public class PutawayJobMainServiceImpl implements PutawayJobMainService { TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); BeanUtils.copyProperties(putawayRecordDetailDO, transactionCreateReqVOIn); //增加业务入类型 - BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchasePutawayJob"); transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); TransactiontypeDO transactiontypeDOIn = jobUtils.selectDocumentFromTransactionType(businesstypeDO.getInTransactionType()); transactionCreateReqVOIn.setInventoryAction(transactiontypeDOIn.getInventoryAction()); diff --git a/win-server/src/main/resources/application.yaml b/win-server/src/main/resources/application.yaml index 8c0c30ac..111f4563 100644 --- a/win-server/src/main/resources/application.yaml +++ b/win-server/src/main/resources/application.yaml @@ -148,7 +148,7 @@ win: - /admin-api/infra/file/*/get/** # 获取图片，和租户无关 - /magic/web/* # magic-api 和租户无关 - /magic-api/* # magic-api 和租户无关 - - profile/* # 静态资源 和租户无关 + - /admin-api/profile/* # 静态资源 和租户无关 ignore-tables: - system_tenant - system_tenant_package From c5f45df6058aec12ff3c297a132d51cde068e1c1 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 7 Dec 2023 18:58:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=B1=95=E7=A4=BA=E5=88=9B=E5=BB=BA=E4=BA=BA?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/controller/balance/BalanceController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 30f624a6..743706ca 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 @@ -45,7 +45,12 @@ public class BalanceController { @PreAuthorize("@ss.hasPermission('wms:balance:query')") public CommonResult> getBalancePage(@Valid BalancePageReqVO pageVO) { PageResult pageResult = balanceService.getBalancePage(pageVO); - return success(BalanceConvert.INSTANCE.convertPage(pageResult)); + PageResult result = BalanceConvert.INSTANCE.convertPage(pageResult); + for (BalanceRespVO vo : result.getList()) { + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(userApi.getUser(Long.valueOf(vo.getCreator())).getNickname()); + } + return success(result); } @PostMapping("/senior")