diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceLayerController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceLayerController.java index 28732f63b..1780378bf 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceLayerController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceLayerController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.auth; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -64,6 +65,10 @@ public class SysWorkplaceLayerController extends BaseController { @PostMapping("/udiwms/WorkplaceLayer/deleteLayer") public BaseResponse deleteLayer(@RequestBody SysWorkplaceLayerRequest request){ + SysWorkplaceLayer one = sysWorkplaceLayerService.getOne(new LambdaQueryWrapper().eq(SysWorkplaceLayer::getCode, request.getCode())); + if (one == null){ + return ResultVOUtils.error(501,"摆货层不存在"); + } Boolean save = sysWorkplaceLayerService.deleteLayer(request); return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java index 5e7273ef3..51da6a479 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectCodeBackupController.java @@ -212,11 +212,6 @@ public class IoCollectCodeBackupController extends BaseController { @PostMapping("/udiwms/basic/collect/IoCollectCodeBackup/deleteCodes") public BaseResponse deleteCodes(@RequestBody IoCollectCodeRequest request) { IoCollectOrderBackup order = ioCollectOrderBackupService.getByBillNo(request.getBillNo()); - if(request.getSelectType() == null){ - //如果是null 正常查询 - request.setSelectType(1); - } - if (order.getCheckCodeStatus() != 1 && request.getSelectType() == 2) { List list = ioCollectOrderCheckCodeService.list(new LambdaQueryWrapper().eq(IoCollectOrderCheckCode::getBillNo, request.getBillNo())); if (list.size() > 0) { ioCollectOrderCheckCodeService.removeBatchByIds(list); @@ -238,7 +233,6 @@ public class IoCollectCodeBackupController extends BaseController { } order.setCheckCodeConfirm(0); ioCollectOrderBackupService.updateByBillNo(order); - } return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java index 56b0016d7..d40eb46d1 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java @@ -40,7 +40,7 @@ public class SysWorkplaceLayerService extends ServiceImpl