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