From e328c2f3a19591e00b6281691bbc13b03858fb3f Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Fri, 1 Dec 2023 11:09:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countJob/vo/CountJobMainExportReqVO.java | 3 --- .../countJob/vo/CountJobMainPageReqVO.java | 3 --- .../countPlan/CountPlanDetailController.java | 8 ++++---- .../countPlan/CountPlanMainController.java | 17 ++++------------- .../dal/dataobject/countJob/CountJobMainDO.java | 4 ---- .../dal/mysql/countJob/CountJobMainMapper.java | 9 --------- .../countPlan/CountPlanDetailService.java | 5 +++-- .../countPlan/CountPlanDetailServiceImpl.java | 8 ++++---- .../service/countPlan/CountPlanMainService.java | 9 --------- .../countPlan/CountPlanMainServiceImpl.java | 5 ----- 10 files changed, 15 insertions(+), 56 deletions(-) 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 0c213aab..6c6d968c 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 @@ -130,7 +130,4 @@ public class CountJobMainExportReqVO { @Schema(description = "允许修改箱码") private String allowModifyPackingNumber; - @Schema(description = "主表ID") - private String masterId; - } 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 32846ed2..79c41bb9 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 @@ -135,7 +135,4 @@ public class CountJobMainPageReqVO extends PageParam { @Schema(description = "允许修改箱码") private String allowModifyPackingNumber; - @Schema(description = "主表ID") - private String masterId; - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanDetailController.java index 6fa02061..cbe45244 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanDetailController.java @@ -42,8 +42,8 @@ public class CountPlanDetailController { @Operation(summary = "更新盘点计划子") @PreAuthorize("@ss.hasPermission('wms:count-plan-detail:update')") public CommonResult updateCountPlanDetail(@Valid @RequestBody CountPlanDetailUpdateReqVO updateReqVO) { - countPlanDetailService.updateCountPlanDetail(updateReqVO); - return success(true); + int result = countPlanDetailService.updateCountPlanDetail(updateReqVO); + return success(result > 0); } @DeleteMapping("/delete") @@ -51,8 +51,8 @@ public class CountPlanDetailController { @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:count-plan-detail:delete')") public CommonResult deleteCountPlanDetail(@RequestParam("id") Long id) { - countPlanDetailService.deleteCountPlanDetail(id); - return success(true); + int result = countPlanDetailService.deleteCountPlanDetail(id); + return success(result > 0); } @GetMapping("/get") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java index c0b73ca9..c6596343 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java @@ -56,8 +56,8 @@ public class CountPlanMainController { @Operation(summary = "更新盘点计划主") @PreAuthorize("@ss.hasPermission('wms:count-plan-main:update')") public CommonResult updateCountPlanMain(@Valid @RequestBody CountPlanMainUpdateReqVO updateReqVO) { - countPlanMainService.updateCountPlanMain(updateReqVO); - return success(true); + int result = countPlanMainService.updateCountPlanMain(updateReqVO); + return success(result > 0); } @DeleteMapping("/delete") @@ -65,8 +65,8 @@ public class CountPlanMainController { @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:count-plan-main:delete')") public CommonResult deleteCountPlanMain(@RequestParam("id") Long id) { - countPlanMainService.deleteCountPlanMain(id); - return success(true); + int result = countPlanMainService.deleteCountPlanMain(id); + return success(result > 0); } @GetMapping("/get") @@ -78,15 +78,6 @@ public class CountPlanMainController { return success(CountPlanMainConvert.INSTANCE.convert(countPlanMain)); } - @GetMapping("/list") - @Operation(summary = "获得盘点计划主列表") - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") - @PreAuthorize("@ss.hasPermission('wms:count-plan-main:query')") - public CommonResult> getCountPlanMainList(@RequestParam("ids") Collection ids) { - List list = countPlanMainService.getCountPlanMainList(ids); - return success(CountPlanMainConvert.INSTANCE.convertList(list)); - } - @GetMapping("/page") @Operation(summary = "获得盘点计划主分页") @PreAuthorize("@ss.hasPermission('wms:count-plan-main:query')") 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 3907b898..46e497da 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 @@ -201,10 +201,6 @@ public class CountJobMainDO extends BaseDO { * 允许修改箱码 */ private String allowModifyPackingNumber; - /** - * 主表ID - */ - private Long masterId; /** * 入库库存状态范围 */ 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 1eda058b..ae9edf4f 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 @@ -24,7 +24,6 @@ public interface CountJobMainMapper extends BaseMapperX { default PageResult selectPage(CountJobMainPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .eq(CountJobMainDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(CountJobMainDO::getRequestNumber, reqVO.getRequestNumber()) .eqIfPresent(CountJobMainDO::getPlanNumber, reqVO.getPlanNumber()) .eqIfPresent(CountJobMainDO::getStage, reqVO.getStage()) @@ -77,7 +76,6 @@ public interface CountJobMainMapper extends BaseMapperX { default List selectList(CountJobMainExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() - .eq(CountJobMainDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(CountJobMainDO::getRequestNumber, reqVO.getRequestNumber()) .eqIfPresent(CountJobMainDO::getPlanNumber, reqVO.getPlanNumber()) .eqIfPresent(CountJobMainDO::getStage, reqVO.getStage()) @@ -118,11 +116,6 @@ public interface CountJobMainMapper extends BaseMapperX { .orderByDesc(CountJobMainDO::getId)); } - default List selectList(Long masterId) { - return selectList(new LambdaQueryWrapperX() - .eq(CountJobMainDO::getMasterId, masterId)); - } - default List selectList(CustomConditions conditions) { return selectList(QueryWrapperUtils.structure(conditions)); } @@ -135,7 +128,6 @@ public interface CountJobMainMapper extends BaseMapperX { default Long selectListCount(Collection types) { return selectCount(new LambdaQueryWrapperX() .inIfPresent(CountJobMainDO::getStatus, types)); - } /** @@ -148,7 +140,6 @@ public interface CountJobMainMapper extends BaseMapperX { return selectCount(new LambdaQueryWrapperX() .in(CountJobMainDO::getStatus, types) .eq(CountJobMainDO::getRequestNumber, requestNumber)); - } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanDetailService.java index 4b14a647..798fb90e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanDetailService.java @@ -30,14 +30,14 @@ public interface CountPlanDetailService { * * @param updateReqVO 更新信息 */ - void updateCountPlanDetail(@Valid CountPlanDetailUpdateReqVO updateReqVO); + int updateCountPlanDetail(@Valid CountPlanDetailUpdateReqVO updateReqVO); /** * 删除盘点计划子 * * @param id 编号 */ - void deleteCountPlanDetail(Long id); + int deleteCountPlanDetail(Long id); /** * 获得盘点计划子 @@ -62,6 +62,7 @@ public interface CountPlanDetailService { * @return 盘点计划子分页 */ PageResult getCountPlanDetailPage(CountPlanDetailPageReqVO pageReqVO); + /** * 获得用高级搜索盘点计划子分页列表 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanDetailServiceImpl.java index 1f88d886..3babda19 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanDetailServiceImpl.java @@ -39,20 +39,20 @@ public class CountPlanDetailServiceImpl implements CountPlanDetailService { } @Override - public void updateCountPlanDetail(CountPlanDetailUpdateReqVO updateReqVO) { + public int updateCountPlanDetail(CountPlanDetailUpdateReqVO updateReqVO) { // 校验存在 validateCountPlanDetailExists(updateReqVO.getId()); // 更新 CountPlanDetailDO updateObj = CountPlanDetailConvert.INSTANCE.convert(updateReqVO); - countPlanDetailMapper.updateById(updateObj); + return countPlanDetailMapper.updateById(updateObj); } @Override - public void deleteCountPlanDetail(Long id) { + public int deleteCountPlanDetail(Long id) { // 校验存在 validateCountPlanDetailExists(id); // 删除 - countPlanDetailMapper.deleteById(id); + return countPlanDetailMapper.deleteById(id); } private void validateCountPlanDetailExists(Long id) { 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 405ebd0f..f2e06b52 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 @@ -10,7 +10,6 @@ import com.win.module.wms.dal.dataobject.countPlan.CountPlanDetailDO; import com.win.module.wms.dal.dataobject.countPlan.CountPlanMainDO; import javax.validation.Valid; -import java.util.Collection; import java.util.List; /** @@ -50,14 +49,6 @@ public interface CountPlanMainService { */ CountPlanMainDO getCountPlanMain(Long id); - /** - * 获得盘点计划主列表 - * - * @param ids 编号 - * @return 盘点计划主列表 - */ - List getCountPlanMainList(Collection ids); - /** * 获得盘点计划主分页 * 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 50f40ebd..a957f8db 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 @@ -26,7 +26,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; -import java.util.Collection; import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; @@ -100,10 +99,6 @@ public class CountPlanMainServiceImpl implements CountPlanMainService { return countPlanMainMapper.selectById(id); } - @Override - public List getCountPlanMainList(Collection ids) { - return countPlanMainMapper.selectBatchIds(ids); - } @Override public PageResult getCountPlanMainSenior(CustomConditions conditions) { return countPlanMainMapper.selectSenior(conditions); From 18f644e231f8310f715ec4f3ab090459c7d7d2cc Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Fri, 1 Dec 2023 13:47:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89details=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countPlan/vo/CountPlanDetailBaseVO.java | 24 ++----------- .../countPlan/vo/CountPlanDetailExcelVO.java | 14 -------- .../vo/CountPlanDetailExportReqVO.java | 25 +++---------- .../vo/CountPlanDetailPageReqVO.java | 16 --------- .../countPlan/vo/CountPlanMainBaseVO.java | 13 ++----- .../countPlan/vo/CountPlanMainExcelVO.java | 3 -- .../vo/CountPlanMainExportReqVO.java | 3 -- .../countPlan/vo/CountPlanMainPageReqVO.java | 3 -- .../countPlan/CountPlanMainConvert.java | 1 - .../dataobject/countJob/CountJobMainDO.java | 4 --- .../countPlan/CountPlanDetailDO.java | 36 +++---------------- .../dataobject/countPlan/CountPlanMainDO.java | 15 +++----- .../countRecord/CountRecordMainDO.java | 4 --- .../countRequest/CountRequestMainDO.java | 4 --- .../inspectJob/InspectJobMainDO.java | 4 --- .../inspectRecord/InspectRecordMainDO.java | 4 --- .../inspectRequest/InspectRequestMainDO.java | 4 --- .../PurchasereceiptJobMainDO.java | 4 --- .../PurchasereceiptRecordMainDO.java | 4 --- .../PurchasereceiptRequestMainDO.java | 15 +++----- .../PurchasereturnJobMainDO.java | 4 --- .../PurchasereturnRecordMainDO.java | 4 --- .../PurchasereturnRequestMainDO.java | 10 +++--- .../putawayJob/PutawayJobMainDO.java | 4 --- .../putawayRecord/PutawayRecordMainDO.java | 4 --- .../putawayRequest/PutawayRequestMainDO.java | 4 --- .../countPlan/CountPlanDetailMapper.java | 13 ++----- .../mysql/countPlan/CountPlanMainMapper.java | 2 -- 28 files changed, 32 insertions(+), 213 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailBaseVO.java index 30114fbb..852affe0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailBaseVO.java @@ -1,14 +1,11 @@ package com.win.module.wms.controller.countPlan.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.math.BigDecimal; -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; /** @@ -30,12 +27,6 @@ public class CountPlanDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") - private String itemCode; - - @Schema(description = "备注") - private String remark; - @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime createTime; @@ -43,12 +34,6 @@ public class CountPlanDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "计划数量") - private BigDecimal planQty; - - @Schema(description = "计量单位") - private String uom; - @Schema(description = "最后更新时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime updateTime; @@ -56,7 +41,4 @@ public class CountPlanDetailBaseVO { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "是否可用") - private String available; - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailExcelVO.java index 28b5f7c1..af668299 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailExcelVO.java @@ -6,7 +6,6 @@ import com.win.framework.excel.core.convert.DictConvert; import com.win.module.wms.enums.DictTypeConstants; import lombok.Data; -import java.math.BigDecimal; import java.time.LocalDateTime; @@ -28,16 +27,6 @@ public class CountPlanDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") - private String itemCode; - - @ExcelProperty("计划数量") - private BigDecimal planQty; - - @ExcelProperty(value = "计量单位", converter = DictConvert.class) - @DictFormat(DictTypeConstants.UOM) - private String uom; - @ExcelProperty("最后更新时间") private LocalDateTime updateTime; @@ -47,9 +36,6 @@ public class CountPlanDetailExcelVO { @ExcelProperty("是否可用") private String available; - @ExcelProperty("备注") - private String remark; - @ExcelProperty("创建时间") private LocalDateTime createTime; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailExportReqVO.java index 5e3f8b91..9e65ce8c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailExportReqVO.java @@ -1,14 +1,11 @@ package com.win.module.wms.controller.countPlan.vo; -import lombok.*; - -import java.math.BigDecimal; -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，参数和 CountPlanDetailPageReqVO 是一致的") @@ -24,12 +21,6 @@ public class CountPlanDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") - private String itemCode; - - @Schema(description = "备注") - private String remark; - @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; @@ -37,12 +28,6 @@ public class CountPlanDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "计划数量") - private BigDecimal planQty; - - @Schema(description = "计量单位") - private String uom; - @Schema(description = "最后更新时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] updateTime; @@ -50,7 +35,7 @@ public class CountPlanDetailExportReqVO { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "是否可用") - private String available; + @Schema(description = "主表ID") + private Long masterId; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailPageReqVO.java index a54991c8..03b71206 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailPageReqVO.java @@ -7,7 +7,6 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; -import java.math.BigDecimal; import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -27,12 +26,6 @@ public class CountPlanDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") - private String itemCode; - - @Schema(description = "备注") - private String remark; - @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; @@ -40,12 +33,6 @@ public class CountPlanDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "计划数量") - private BigDecimal planQty; - - @Schema(description = "计量单位") - private String uom; - @Schema(description = "最后更新时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] updateTime; @@ -53,9 +40,6 @@ public class CountPlanDetailPageReqVO extends PageParam { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "是否可用") - private String available; - @Schema(description = "主表ID") private Long masterId; 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 5c44c8bd..8815d67e 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 @@ -1,15 +1,11 @@ package com.win.module.wms.controller.countPlan.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + import java.math.BigDecimal; import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import javax.validation.constraints.*; -import org.springframework.format.annotation.DateTimeFormat; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -41,9 +37,6 @@ public class CountPlanMainBaseVO { @Schema(description = "库位忽略名单") private String ignoreListOfLocation; - @Schema(description = "盘点范围列表") - private String scopeList; - @Schema(description = "单据号") private String number; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExcelVO.java index bd9fba4f..fbb73cf9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExcelVO.java @@ -39,9 +39,6 @@ public class CountPlanMainExcelVO { @ExcelProperty("库位忽略名单") private String ignoreListOfLocation; - @ExcelProperty("盘点范围列表") - private String scopeList; - @ExcelProperty("单据号") private String number; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExportReqVO.java index ae3c7769..3dba4656 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExportReqVO.java @@ -33,9 +33,6 @@ public class CountPlanMainExportReqVO { @Schema(description = "库位忽略名单") private String ignoreListOfLocation; - @Schema(description = "盘点范围列表") - private String scopeList; - @Schema(description = "单据号") private String number; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainPageReqVO.java index e3d20db3..65ffa48a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainPageReqVO.java @@ -35,9 +35,6 @@ public class CountPlanMainPageReqVO extends PageParam { @Schema(description = "库位忽略名单") private String ignoreListOfLocation; - @Schema(description = "盘点范围列表") - private String scopeList; - @Schema(description = "单据号") private String number; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countPlan/CountPlanMainConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countPlan/CountPlanMainConvert.java index 62b7aabf..b1a50a95 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countPlan/CountPlanMainConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/countPlan/CountPlanMainConvert.java @@ -41,7 +41,6 @@ public interface CountPlanMainConvert { @Mapping(source = "mainDO.number", target = "number"), @Mapping(source = "mainDO.remark", target = "remark"), @Mapping(source = "mainDO.available", target = "available"), - @Mapping(source = "detailDO.remark", target = "remarkDetail"), @Mapping(source = "mainDO.createTime", target = "createTime"), @Mapping(source = "mainDO.creator", target = "creator"), @Mapping(source = "mainDO.updateTime", target = "updateTime"), 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 46e497da..42b82486 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 @@ -49,10 +49,6 @@ public class CountJobMainDO extends BaseDO { * 库位代码 */ private String locationCode; - /** - * 明细 - */ - private String details; /** * 申请时间 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanDetailDO.java index 6f63eaef..baa746f1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanDetailDO.java @@ -1,12 +1,10 @@ package com.win.module.wms.dal.dataobject.countPlan; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; +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.*; /** * 盘点计划子 DO @@ -45,35 +43,9 @@ public class CountPlanDetailDO extends BaseDO { * 单据号 */ private String number; - /** - * 物品代码 - */ - private String itemCode; - /** - * 备注 - */ - private String remark; - /** - * 地点ID - */ - private String siteId; - /** - * 计划数量 - */ - private BigDecimal planQty; - /** - * 计量单位 - * - * 枚举 {@link TODO uom 对应的类} - */ - private String uom; /** * 并发乐观锁 */ private String concurrencyStamp; - /** - * 是否可用 - */ - private String available; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanMainDO.java index 6db11f57..64e688fe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanMainDO.java @@ -1,14 +1,13 @@ package com.win.module.wms.dal.dataobject.countPlan; +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.math.BigDecimal; 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 @@ -57,10 +56,6 @@ public class CountPlanMainDO extends BaseDO { * 库位忽略名单 */ private String ignoreListOfLocation; - /** - * 盘点范围列表 - */ - private String scopeList; /** * 单据号 */ 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 f5fc3bb5..d5d63d2b 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 @@ -51,10 +51,6 @@ public class CountRecordMainDO extends BaseDO { * 仓库代码 */ private String warehouseCode; - /** - * 明细 - */ - private String details; /** * 出库事务类型 */ 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 3cd0ea23..e8c9e48b 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 @@ -46,10 +46,6 @@ public class CountRequestMainDO extends BaseDO { * 仓库代码 */ private String warehouseCode; - /** - * details - */ - private String details; /** * 单据号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectJob/InspectJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectJob/InspectJobMainDO.java index f9e127f5..0856d180 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectJob/InspectJobMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectJob/InspectJobMainDO.java @@ -128,10 +128,6 @@ public class InspectJobMainDO extends BaseDO { * 到库位类型范围 */ private String toLocationTypes; - /** - * 明细 - */ - private String details; /** * 单据号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordMainDO.java index 5b734937..335b29be 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordMainDO.java @@ -93,10 +93,6 @@ public class InspectRecordMainDO extends BaseDO { * 枚举 {@link TODO interface_type 对应的类} */ private String interfaceType; - /** - * 明细 - */ - private String details; /** * 单据号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestMainDO.java index e8aebf06..2cf16b93 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestMainDO.java @@ -36,10 +36,6 @@ public class InspectRequestMainDO extends BaseDO { * 供应商代码 */ private String supplierCode; - /** - * details - */ - private String details; /** * 单据号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobMainDO.java index f9d8293c..a3ed21bb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobMainDO.java @@ -73,10 +73,6 @@ public class PurchasereceiptJobMainDO extends BaseDO { * 到仓库代码 */ private String toWarehouseCode; - /** - * 明细 - */ - private String details; /** * 申请时间 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchasereceiptRecordMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchasereceiptRecordMainDO.java index c61d8153..4fc83356 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchasereceiptRecordMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchasereceiptRecordMainDO.java @@ -76,10 +76,6 @@ public class PurchasereceiptRecordMainDO extends BaseDO { * 到仓库代码 */ private String toWarehouseCode; - /** - * 明细 - */ - private String details; /** * 出库事务类型 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRequest/PurchasereceiptRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRequest/PurchasereceiptRequestMainDO.java index a46f015f..f00e8664 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRequest/PurchasereceiptRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRequest/PurchasereceiptRequestMainDO.java @@ -1,13 +1,12 @@ package com.win.module.wms.dal.dataobject.purchasereceiptRequest; +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 com.baomidou.mybatisplus.annotation.*; -import com.win.framework.mybatis.core.dataobject.BaseDO; /** * 采购收货申请主 DO @@ -82,10 +81,6 @@ public class PurchasereceiptRequestMainDO extends BaseDO { * 到月台代码 */ private String toDockCode; - /** - * details - */ - private String details; /** * 单据号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnJob/PurchasereturnJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnJob/PurchasereturnJobMainDO.java index a33ce13f..f4d022f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnJob/PurchasereturnJobMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnJob/PurchasereturnJobMainDO.java @@ -76,10 +76,6 @@ public class PurchasereturnJobMainDO extends BaseDO { * 到仓库代码 */ private String toWarehouseCode; - /** - * 明细 - */ - private String details; /** * 申请时间 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRecord/PurchasereturnRecordMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRecord/PurchasereturnRecordMainDO.java index 8d792db8..acfbe663 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRecord/PurchasereturnRecordMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRecord/PurchasereturnRecordMainDO.java @@ -81,10 +81,6 @@ public class PurchasereturnRecordMainDO extends BaseDO { * 到仓库代码 */ private String toWarehouseCode; - /** - * 明细 - */ - private String details; /** * 出库事务类型 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRequest/PurchasereturnRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRequest/PurchasereturnRequestMainDO.java index fad48feb..b62fcfb0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRequest/PurchasereturnRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRequest/PurchasereturnRequestMainDO.java @@ -1,10 +1,12 @@ package com.win.module.wms.dal.dataobject.purchasereturnRequest; +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.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import com.win.framework.mybatis.core.dataobject.BaseDO; /** * 采购退货申请主 DO @@ -65,10 +67,6 @@ public class PurchasereturnRequestMainDO extends BaseDO { * 到仓库代码 */ private String toWarehouseCode; - /** - * details - */ - private String details; /** * 单据号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayJob/PutawayJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayJob/PutawayJobMainDO.java index 0f3a5d6c..fc2ed9d4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayJob/PutawayJobMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayJob/PutawayJobMainDO.java @@ -39,10 +39,6 @@ public class PutawayJobMainDO extends BaseDO { * 从仓库代码 */ private String fromWarehouseCode; - /** - * 明细 - */ - private String details; /** * 申请时间 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRecord/PutawayRecordMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRecord/PutawayRecordMainDO.java index 869e8a71..b00f73f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRecord/PutawayRecordMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRecord/PutawayRecordMainDO.java @@ -41,10 +41,6 @@ public class PutawayRecordMainDO extends BaseDO { * 供应商代码 */ private String supplierCode; - /** - * 明细 - */ - private String details; /** * 出库事务类型 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRequest/PutawayRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRequest/PutawayRequestMainDO.java index b047bee7..7a69715d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRequest/PutawayRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRequest/PutawayRequestMainDO.java @@ -46,10 +46,6 @@ public class PutawayRequestMainDO extends BaseDO { * 从库区代码范围 */ private String fromAreaCodes; - /** - * details - */ - private String details; /** * 单据号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countPlan/CountPlanDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countPlan/CountPlanDetailMapper.java index 4f75436d..c743ada8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countPlan/CountPlanDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countPlan/CountPlanDetailMapper.java @@ -26,34 +26,27 @@ public interface CountPlanDetailMapper extends BaseMapperX { .eqIfPresent(CountPlanDetailDO::getType, reqVO.getType()) .eqIfPresent(CountPlanDetailDO::getValue, reqVO.getValue()) .eqIfPresent(CountPlanDetailDO::getNumber, reqVO.getNumber()) - .eqIfPresent(CountPlanDetailDO::getItemCode, reqVO.getItemCode()) - .eqIfPresent(CountPlanDetailDO::getRemark, reqVO.getRemark()) .betweenIfPresent(CountPlanDetailDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(CountPlanDetailDO::getCreator, reqVO.getCreator()) - .eqIfPresent(CountPlanDetailDO::getPlanQty, reqVO.getPlanQty()) - .eqIfPresent(CountPlanDetailDO::getUom, reqVO.getUom()) .betweenIfPresent(CountPlanDetailDO::getUpdateTime, reqVO.getUpdateTime()) .eqIfPresent(CountPlanDetailDO::getUpdater, reqVO.getUpdater()) - .eqIfPresent(CountPlanDetailDO::getAvailable, reqVO.getAvailable()) .orderByDesc(CountPlanDetailDO::getId)); } + default PageResult selectSenior(CustomConditions conditions) { return selectPage(conditions, QueryWrapperUtils.structure(conditions)); } + default List selectList(CountPlanDetailExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() + .eqIfPresent(CountPlanDetailDO::getMasterId, reqVO.getMasterId()) .eqIfPresent(CountPlanDetailDO::getType, reqVO.getType()) .eqIfPresent(CountPlanDetailDO::getValue, reqVO.getValue()) .eqIfPresent(CountPlanDetailDO::getNumber, reqVO.getNumber()) - .eqIfPresent(CountPlanDetailDO::getItemCode, reqVO.getItemCode()) - .eqIfPresent(CountPlanDetailDO::getRemark, reqVO.getRemark()) .betweenIfPresent(CountPlanDetailDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(CountPlanDetailDO::getCreator, reqVO.getCreator()) - .eqIfPresent(CountPlanDetailDO::getPlanQty, reqVO.getPlanQty()) - .eqIfPresent(CountPlanDetailDO::getUom, reqVO.getUom()) .betweenIfPresent(CountPlanDetailDO::getUpdateTime, reqVO.getUpdateTime()) .eqIfPresent(CountPlanDetailDO::getUpdater, reqVO.getUpdater()) - .eqIfPresent(CountPlanDetailDO::getAvailable, reqVO.getAvailable()) .orderByDesc(CountPlanDetailDO::getId)); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countPlan/CountPlanMainMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countPlan/CountPlanMainMapper.java index 5f1e11f9..c4869e3e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countPlan/CountPlanMainMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countPlan/CountPlanMainMapper.java @@ -28,7 +28,6 @@ public interface CountPlanMainMapper extends BaseMapperX { .eqIfPresent(CountPlanMainDO::getLimitedValue, reqVO.getLimitedValue()) .eqIfPresent(CountPlanMainDO::getIgnoreListOfItem, reqVO.getIgnoreListOfItem()) .eqIfPresent(CountPlanMainDO::getIgnoreListOfLocation, reqVO.getIgnoreListOfLocation()) - .eqIfPresent(CountPlanMainDO::getScopeList, reqVO.getScopeList()) .eqIfPresent(CountPlanMainDO::getNumber, reqVO.getNumber()) .eqIfPresent(CountPlanMainDO::getBusinessType, reqVO.getBusinessType()) .eqIfPresent(CountPlanMainDO::getRemark, reqVO.getRemark()) @@ -59,7 +58,6 @@ public interface CountPlanMainMapper extends BaseMapperX { .eqIfPresent(CountPlanMainDO::getLimitedValue, reqVO.getLimitedValue()) .eqIfPresent(CountPlanMainDO::getIgnoreListOfItem, reqVO.getIgnoreListOfItem()) .eqIfPresent(CountPlanMainDO::getIgnoreListOfLocation, reqVO.getIgnoreListOfLocation()) - .eqIfPresent(CountPlanMainDO::getScopeList, reqVO.getScopeList()) .eqIfPresent(CountPlanMainDO::getNumber, reqVO.getNumber()) .eqIfPresent(CountPlanMainDO::getBusinessType, reqVO.getBusinessType()) .eqIfPresent(CountPlanMainDO::getRemark, reqVO.getRemark()) From 18042aa1753c30fb13ffc92bc9434135bc76d8d2 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 1 Dec 2023 14:21:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=92=8C=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasereceiptJobDetailController.java | 11 +++++++++-- .../PurchasereceiptJobMainController.java | 6 ++++-- .../vo/PurchasereceiptJobMainBaseVO.java | 8 ++++++++ .../vo/PurchasereceiptJobMainExcelVO.java | 11 +++++++---- .../PurchasereceiptRequestDetailController.java | 15 +++++++++++++-- .../PurchasereceiptRequestMainController.java | 17 +++++++++++++++-- .../vo/PurchasereceiptRequestMainExcelVO.java | 3 +++ 7 files changed, 59 insertions(+), 12 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java index 7bcbd436..0f9e66b2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobDetailController.java @@ -7,8 +7,11 @@ import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailPageReqVO; import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobDetailRespVO; +import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailRespVO; import com.win.module.wms.convert.purchasereceiptJob.PurchasereceiptJobDetailConvert; +import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestDetailConvert; import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO; +import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO; import com.win.module.wms.service.purchasereceiptJob.PurchasereceiptJobDetailService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -41,7 +44,6 @@ public class PurchasereceiptJobDetailController { PageResult result = PurchasereceiptJobDetailConvert.INSTANCE.convertPage(pageResult); for(PurchasereceiptJobDetailRespVO vo : result.getList()) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); } return success(result); @@ -52,7 +54,12 @@ public class PurchasereceiptJobDetailController { @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-job-detail:query')") public CommonResult> getPurchasereceiptJobDetailPage(@Valid PurchasereceiptJobDetailPageReqVO pageVO) { PageResult pageResult = purchasereceiptJobDetailService.getPurchasereceiptJobDetailPage(pageVO); - return success(PurchasereceiptJobDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = PurchasereceiptJobDetailConvert.INSTANCE.convertPage(pageResult); + for(PurchasereceiptJobDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + vo.setCreator(user.getNickname()); + } + return success(result); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java index 1dfcb947..ce900eb1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/PurchasereceiptJobMainController.java @@ -60,8 +60,9 @@ public class PurchasereceiptJobMainController { PageResult pageResult1 = PurchasereceiptJobMainConvert.INSTANCE.convertPage(pageResult); for (PurchasereceiptJobMainRespVO vo : pageResult1.getList()) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); + AdminUserRespDTO userUpdater = userApi.getUser(Long.valueOf(vo.getUpdater())); + vo.setUpdater(userUpdater.getNickname()); } return success(pageResult1); } @@ -74,8 +75,9 @@ public class PurchasereceiptJobMainController { PageResult result = PurchasereceiptJobMainConvert.INSTANCE.convertPage(pageResult); for (PurchasereceiptJobMainRespVO vo : result.getList()) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); + AdminUserRespDTO userUpdater = userApi.getUser(Long.valueOf(vo.getUpdater())); + vo.setUpdater(userUpdater.getNickname()); } return success(result); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainBaseVO.java index 49c5d1d8..d9c08378 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainBaseVO.java @@ -1,5 +1,7 @@ package com.win.module.wms.controller.purchasereceiptJob.vo; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -88,6 +90,9 @@ public class PurchasereceiptJobMainBaseVO { @Schema(description = "承接人用户ID") private String acceptUserId; + @Schema(description = "承接人用户名") + private String acceptUserName; + @Schema(description = "承接时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime acceptTime; @@ -95,6 +100,9 @@ public class PurchasereceiptJobMainBaseVO { @Schema(description = "完成人用户ID") private String completeUserId; + @Schema(description = "完成人用户名") + private String completeUserName; + @Schema(description = "完成时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime completeTime; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainExcelVO.java index 6151ceda..5b966c4e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainExcelVO.java @@ -1,6 +1,8 @@ package com.win.module.wms.controller.purchasereceiptJob.vo; import com.alibaba.excel.annotation.ExcelProperty; +import com.baomidou.mybatisplus.annotation.FieldStrategy; +import com.baomidou.mybatisplus.annotation.TableField; import com.win.framework.excel.core.annotations.DictFormat; import com.win.framework.excel.core.convert.DictConvert; import com.win.module.wms.enums.DictTypeConstants; @@ -74,14 +76,15 @@ public class PurchasereceiptJobMainExcelVO { @ExcelProperty("岗位") private String userPositionCode; - @ExcelProperty("承接人用户ID") - private String acceptUserId; + @ExcelProperty("承接人用户名") + private String acceptUserName; @ExcelProperty("承接时间") private LocalDateTime acceptTime; - @ExcelProperty("完成人用户ID") - private String completeUserId; + + @ExcelProperty("完成人用户名") + private String completeUserName; @ExcelProperty("完成时间") private LocalDateTime completeTime; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java index d66fced2..7ec46a74 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java @@ -5,6 +5,7 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.purchasereceiptJob.vo.PurchasereceiptJobMainRespVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailCreateReqVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailPageReqVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.PurchasereceiptRequestDetailRespVO; @@ -74,7 +75,15 @@ public class PurchasereceiptRequestDetailController { @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-detail:query')") public CommonResult> getPurchasereceiptRequestDetailPage(@Valid PurchasereceiptRequestDetailPageReqVO pageVO) { PageResult pageResult = purchasereceiptRequestDetailService.getPurchasereceiptRequestDetailPage(pageVO); - return success(PurchasereceiptRequestDetailConvert.INSTANCE.convertPage(pageResult)); + PageResult result = PurchasereceiptRequestDetailConvert.INSTANCE.convertPage(pageResult); + for (PurchasereceiptRequestDetailRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + //后端创建个字段作为前端展示的虚拟字段 + vo.setCreator(user.getNickname()); + AdminUserRespDTO userUpdater = userApi.getUser(Long.valueOf(vo.getUpdater())); + vo.setUpdater(userUpdater.getNickname()); + } + return success(result); } @PostMapping("/senior") @@ -83,10 +92,12 @@ public class PurchasereceiptRequestDetailController { public CommonResult> getPurchasereceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = purchasereceiptRequestDetailService.getPurchasereceiptRequestDetailSenior(conditions); PageResult result = PurchasereceiptRequestDetailConvert.INSTANCE.convertPage(pageResult); - for(PurchasereceiptRequestDetailRespVO vo : result.getList()) { + for (PurchasereceiptRequestDetailRespVO vo : result.getList()) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); + AdminUserRespDTO userUpdater = userApi.getUser(Long.valueOf(vo.getUpdater())); + vo.setUpdater(userUpdater.getNickname()); } return success(result); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java index adf57a06..aa6606ec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java @@ -9,7 +9,10 @@ import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; +import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO; +import com.win.module.wms.controller.itembasic.vo.ItembasicRespVO; import com.win.module.wms.controller.purchasereceiptRequest.vo.*; +import com.win.module.wms.convert.itembasic.ItembasicConvert; import com.win.module.wms.convert.purchasereceiptRequest.PurchasereceiptRequestMainConvert; import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestDetailDO; import com.win.module.wms.dal.dataobject.purchasereceiptRequest.PurchasereceiptRequestMainDO; @@ -74,8 +77,9 @@ public class PurchasereceiptRequestMainController { PageResult result = PurchasereceiptRequestMainConvert.INSTANCE.convertPage(pageResult); for(PurchasereceiptRequestMainRespVO vo : result.getList()) { AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); - //后端创建个字段作为前端展示的虚拟字段 vo.setCreator(user.getNickname()); + AdminUserRespDTO userUpdater = userApi.getUser(Long.valueOf(vo.getUpdater())); + vo.setUpdater(userUpdater.getNickname()); } return success(result); } @@ -103,7 +107,14 @@ public class PurchasereceiptRequestMainController { @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-main:query')") public CommonResult> getPurchasereceiptRequestMainPage(@Valid PurchasereceiptRequestMainPageReqVO pageVO) { PageResult pageResult = purchasereceiptRequestMainService.getPurchasereceiptRequestMainPage(pageVO); - return success(PurchasereceiptRequestMainConvert.INSTANCE.convertPage(pageResult)); + PageResult result = PurchasereceiptRequestMainConvert.INSTANCE.convertPage(pageResult); + for(PurchasereceiptRequestMainRespVO vo : result.getList()) { + AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); + vo.setCreator(user.getNickname()); + AdminUserRespDTO userUpdate = userApi.getUser(Long.valueOf(vo.getUpdater())); + vo.setUpdater(userUpdate.getNickname()); + } + return success(result); } @GetMapping("/export-excel") @@ -154,7 +165,9 @@ public class PurchasereceiptRequestMainController { for(PurchasereceiptRequestDetailDO detailDO : subList) { PurchasereceiptRequestMainExcelVO vo = PurchasereceiptRequestMainConvert.INSTANCE.convert(mainDO, detailDO); AdminUserRespDTO user = userApi.getUser(Long.valueOf(mainDO.getCreator())); + AdminUserRespDTO userUpdate = userApi.getUser(Long.valueOf(mainDO.getUpdater())); vo.setCreator(user.getNickname()); + vo.setUpdater(userUpdate.getNickname()); resultList.add(vo); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java index 99943a49..bc3ac156 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.purchasereceiptRequest.vo; import com.alibaba.excel.annotation.ExcelProperty; +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; @@ -177,12 +178,14 @@ public class PurchasereceiptRequestMainExcelVO { private String toOwnerCode; @ExcelProperty("最后更新时间") + @ColumnWidth(value = 20) private LocalDateTime updateTime; @ExcelProperty("最后更新者用户名") private String updater; @ExcelProperty("创建时间") + @ColumnWidth(value = 20) private LocalDateTime createTime; @ExcelProperty("创建者用户名")