From d5153119f10302ce5b8b7d8453ce4d0d53a24fcc Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 14 Apr 2023 15:06:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E7=A9=BA=E5=8D=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/auth/DeptController.java | 32 +++++++++---------- .../inout/IoCodeTempController.java | 8 +++++ .../inout/IoOrderDetailBizController.java | 17 ++++++++-- 3 files changed, 39 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java index bc3185f1..7adbd3a8 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java @@ -250,12 +250,12 @@ public class DeptController extends BaseController { } //判断状态 - String msg=isCheckStatus(deptEntity.getStatus(),deptEntity); - if(msg!=""){ - return ResultVOUtils.error(999,msg); + String msg = isCheckStatus(deptEntity.getStatus(), deptEntity); + if (msg != "") { + return ResultVOUtils.error(999, msg); } //判断供应商状态 - if(deptEntity.isSpUse()==false){ + if (deptEntity.isSpUse() == false) { FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust(); filterDeptUserReqeust.setDeptId(deptEntity.getId().longValue()); List deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust); @@ -295,8 +295,8 @@ public class DeptController extends BaseController { } DeptEntity deptEntity = deptService.selectById(deleteRequest.getId()); - if(deptEntity.getLevel()!=null && deptEntity.getLevel() == 1){ - return ResultVOUtils.error(500,"删除失败，一级部门不允许删除！"); + if (deptEntity.getLevel() != null && deptEntity.getLevel() == 1) { + return ResultVOUtils.error(500, "删除失败，一级部门不允许删除！"); } List invSubWarehouseEntities = invWarehouseService.findByParentId(deptEntity.getCode()); @@ -310,7 +310,7 @@ public class DeptController extends BaseController { return ResultVOUtils.error(500, "删除失败，请先移除该部门关联用户信息！"); } List deptEntities = deptService.selectByPcode(deptEntity.getCode()); - if(deptEntities.size()>0){ + if (deptEntities.size() > 0) { return ResultVOUtils.error(500, "删除失败，请先移除该部门下的子部门！"); } @@ -366,20 +366,20 @@ public class DeptController extends BaseController { return ResultVOUtils.success(list); } - public String isCheckStatus(Integer status,DeptEntity deptEntity){ + public String isCheckStatus(Integer status, DeptEntity deptEntity) { //启用的时候需要判断上级是不是被禁用 - if(status==1){ + if (status == 1) { //查询所有的上级 - List deptEntityList= deptService.selectupDeptAll(deptEntity.getPcode()); - for(DeptEntity obj:deptEntityList){ - if(obj.getStatus()==0){ + List deptEntityList = deptService.selectupDeptAll(deptEntity.getPcode()); + for (DeptEntity obj : deptEntityList) { + if (obj.getStatus() == 0) { return "上级存在禁用的部门修改失败！"; } } - }else{ - List deptEntityList= deptService.selectLowDeptAll(deptEntity.getCode()); - for(DeptEntity obj:deptEntityList){ - if(obj.getStatus()==1){ + } else { + List deptEntityList = deptService.selectLowDeptAll(deptEntity.getCode()); + for (DeptEntity obj : deptEntityList) { + if (obj.getStatus() == 1) { return "下级存在启用的部门修改失败！"; } } diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 89e6c82a..25a23b89 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -647,6 +647,7 @@ public class IoCodeTempController extends BaseController { boolean isBillExit = orderDetailBizService.isExit(orderEntity.getBillNo()); if (!isBillExit) { + orderService.deleteByBillNo(orderEntity.getBillNo()); return ResultVOUtils.error(500, "请先录入业务详情"); } } @@ -960,6 +961,13 @@ public class IoCodeTempController extends BaseController { } } + + boolean r1 = orderDetailBizService.isExit(orderDetailCodeEntity.getOrderIdFk()); + boolean r2 = ioOrderDetailCodeService.isExit(orderDetailCodeEntity.getOrderIdFk()); + if (!r1 && !r2) { + orderService.deleteByBillNo(orderDetailCodeEntity.getOrderIdFk()); + } + orderEntity.setUpdateUser(getUserId() + ""); orderEntity.setUpdateTime(new Date()); orderService.update(orderEntity); diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 54f84451..6fc1b21c 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -121,7 +121,8 @@ public class IoOrderDetailBizController extends BaseController { if (addBizProductReqeust.getOrderEntity() == null) return ResultVOUtils.error(500, "未指定订单"); IoOrderEntity orderEntity = addBizProductReqeust.getOrderEntity(); - if (StrUtil.isEmpty(orderEntity.getBillNo())) { + IoOrderEntity isExit = orderService.findByBillNo(orderEntity.getBillNo()); + if (StrUtil.isEmpty(orderEntity.getBillNo()) || isExit == null) { BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(orderEntity.getInvCode()); String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); @@ -472,7 +473,19 @@ public class IoOrderDetailBizController extends BaseController { @PostMapping("/udiwms/inout/order/delBizProduct") @Log(title = "单据管理", businessType = BusinessType.DELETE) public BaseResponse delBizProduct(@RequestBody DeleteRequest deleteRequest) { - return orderDetailBizService.deleteById(Integer.parseInt(deleteRequest.getId())) > 0 ? ResultVOUtils.success("删除成功！") : ResultVOUtils.error(500, "删除失败"); + IoOrderDetailBizEntity orderDetailBizEntity = orderDetailBizService.selectById(Integer.parseInt(deleteRequest.getId())); + int result = orderDetailBizService.deleteById(Integer.parseInt(deleteRequest.getId())); + if (result > 0) { + boolean r1 = orderDetailBizService.isExit(orderDetailBizEntity.getOrderIdFk()); + boolean r2 = orderDetailCodeService.isExit(orderDetailBizEntity.getOrderIdFk()); + if (!r1 && !r2) { + orderService.deleteByBillNo(orderDetailBizEntity.getOrderIdFk()); + } + return ResultVOUtils.success("删除成功！"); + } + return ResultVOUtils.error(500, "删除失败"); + + }