From 6322a3bd0362e1c3e81b9396bf3a6774f6ef39cd Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 2 May 2023 11:41:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E9=AA=8C=E6=94=B6?= =?UTF-8?q?=EF=BC=8C=E5=AF=84=E5=94=AE=E5=85=B6=E4=BB=96=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=AF=E6=9F=A5=E7=9C=8B=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2bug=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=89=E5=8D=95=E6=91=86=E8=B4=A7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/InvWarehouseController.java | 35 ++++++++++++++++++ .../controller/auth/SysUserController.java | 36 +++++++++---------- .../api/dao/inv/InvPreInProductDetailDao.java | 3 ++ .../api/dao/inv/InvPreProductDetailDao.java | 3 ++ .../auth/FilterInvSubWarehouseRequest.java | 1 + .../req/auth/FilterInvWarehouseRequest.java | 1 + .../api/service/auth/InvWarehouseService.java | 1 - .../impl/InvInnerOrderPrintServiceImpl.java | 3 ++ .../service/inv/impl/InvPlaceServiceImpl.java | 12 ++++++- .../mybatis/mapper/auth/InvWarehouseDao.xml | 14 +++++--- .../mapper/inv/InvPreInProductDetailDao.xml | 24 +++++++++++++ .../mapper/inv/InvPreProductDetailDao.xml | 24 +++++++++++++ 12 files changed, 133 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 9578c8358..0e109b79d 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -24,6 +24,8 @@ import com.glxp.api.res.basic.BasicBussinessTypeResponse; import com.glxp.api.service.auth.*; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.system.SystemParamConfigService; +import com.glxp.api.util.BeanCopyUtils; +import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -33,6 +35,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; import java.util.*; +import java.util.stream.Collectors; @RestController public class InvWarehouseController extends BaseController { @@ -118,6 +121,38 @@ public class InvWarehouseController extends BaseController { return ResultVOUtils.success(list); } + + /** + * 前端查询自己关联仓库包含预验收，寄售库 + * + * @return + */ + @GetMapping("spms/inv/warehouse/findAllInvByUser") + public BaseResponse findAllInvByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) { + Long userId = getUserId(); + List list = new ArrayList<>(); + if (null == userId) { + return ResultVOUtils.error(ResultEnum.LOGIN_VERIFY_FALL); + } + if (filterInvWarehouseRequest.getAdvanceType() == 2 || filterInvWarehouseRequest.getAdvanceType() == 3) { + FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); + BeanUtils.copyProperties(filterInvWarehouseRequest, filterInvSubWarehouseRequest); + list = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest); + } else { + FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); + filterInvSubWarehouseRequest.setFilterAdvanceType(1); + List preInList = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest); + filterInvWarehouseRequest.setUserId(userId); + List myList = invWarehouseService.findInvListByUser(filterInvWarehouseRequest); + List resultList = myList.stream().filter(invWarehouseEntity -> + preInList.stream().anyMatch(preIn -> !preIn.getCode().equals(invWarehouseEntity.getCode())) + ).collect(Collectors.toList()); + resultList.addAll(preInList); + return ResultVOUtils.success(list); + } + return ResultVOUtils.success(list); + } + /** * 获取往来仓库(除了自己) * diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java index 642ed02fe..c6a1ef321 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -71,24 +71,24 @@ public class SysUserController extends BaseController { AuthAdminResponse authAdminResponse = new AuthAdminResponse(); BeanUtils.copyProperties(item, authAdminResponse); List roles = sysRoleService.selectRoleListByUserId(authAdminResponse.getId()); - List deptUserResponses=null; - if("key".equals(filterAuthUserRequest.getKey())){ - deptUserResponses = deptUserService.selectByUserIdKey(authAdminResponse.getId()); - }else{ + List deptUserResponses = null; + if ("key".equals(filterAuthUserRequest.getKey())) { + deptUserResponses = deptUserService.selectByUserIdKey(authAdminResponse.getId()); + } else { deptUserResponses = deptUserService.selectByUserId(authAdminResponse.getId()); } if (CollUtil.isNotEmpty(deptUserResponses)) { List depts = new ArrayList<>(); String deptName = ""; for (DeptUserResponse deptUserResponse : deptUserResponses) { - if(deptUserResponse.getDeptId()!=1){ + if (deptUserResponse.getDeptId() != 1) { depts.add(deptUserResponse.getDeptId()); deptName = deptName + "," + deptUserResponse.getDeptName(); } } - if(deptName.length()!=0){ + if (deptName.length() != 0) { authAdminResponse.setDeptName(deptName.substring(1)); - }else{ + } else { authAdminResponse.setDeptName(deptName); } authAdminResponse.setDepts(depts); @@ -190,9 +190,9 @@ public class SysUserController extends BaseController { } //默认插入第一部门 - List deptCodeList=authUserSaveRequest.getDepts(); - if(deptCodeList == null){ - deptCodeList=new ArrayList<>(); + List deptCodeList = authUserSaveRequest.getDepts(); + if (deptCodeList == null) { + deptCodeList = new ArrayList<>(); } deptCodeList.add(1L); authUserSaveRequest.setDepts(deptCodeList); @@ -261,7 +261,7 @@ public class SysUserController extends BaseController { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } // 修改角色 - // userService.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles()); + userService.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles()); userService.updateAuthAdmin(authAdmin); @@ -270,19 +270,19 @@ public class SysUserController extends BaseController { FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust(); filterDeptUserReqeust.setUserId(authUserSaveRequest.getId()); List deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust); - if(deptUserEntities == null){ + if (deptUserEntities == null) { deptCodeList.add(1L); authUserSaveRequest.setDepts(deptCodeList); - }else{ - Boolean checkDeptId=false; + } else { + Boolean checkDeptId = false; for (DeptUserEntity deptUserEntity : deptUserEntities) { - if(deptUserEntity.getDeptId() == 1){ - checkDeptId=true; - }else{ + if (deptUserEntity.getDeptId() == 1) { + checkDeptId = true; + } else { deptCodeList.add(deptUserEntity.getDeptId()); } } - if(checkDeptId==false){ + if (checkDeptId == false) { deptCodeList.add(1L); authUserSaveRequest.setDepts(deptCodeList); } diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java index 81b7c2bcc..042a9fecd 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java @@ -6,6 +6,7 @@ import com.glxp.api.req.inv.FilterInvPlaceRequest; import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; import com.glxp.api.req.inv.FilterInvPreinProductRequest; import com.glxp.api.req.inv.FilterInvProductDetailRequest; +import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.res.inv.InvPreinProductResponse; import org.apache.ibatis.annotations.Mapper; @@ -41,4 +42,6 @@ public interface InvPreInProductDetailDao extends BaseMapperPlus ids, @Param("invSpaceCode") String invSpaceCode); + List getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest); + } diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java index 299cfea89..3821caa7c 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java @@ -6,6 +6,7 @@ import com.glxp.api.req.inv.FilterInvPlaceRequest; import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; import com.glxp.api.req.inv.FilterInvPreinProductRequest; import com.glxp.api.req.inv.FilterInvProductDetailRequest; +import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.res.inv.InvPreinProductResponse; import org.apache.ibatis.annotations.Param; @@ -40,4 +41,6 @@ public interface InvPreProductDetailDao extends BaseMapperPlus ids, @Param("invSpaceCode") String invSpaceCode); + + List getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest); } diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java index 85c6ecc76..19ae792ac 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java @@ -20,4 +20,5 @@ public class FilterInvSubWarehouseRequest extends ListPageRequest { public String thirdId4; private String key; + private Integer filterAdvanceType; } diff --git a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java index e030b08d6..59d24541b 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java +++ b/src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java @@ -14,6 +14,7 @@ public class FilterInvWarehouseRequest extends ListPageRequest { private String code; private String name; private String deptCode; + // 1:入账库，2：预验收库，3：寄售库 private Integer advanceType; private Boolean isDefault; private Date updateTime; diff --git a/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java b/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java index 0d31866af..f56ac300b 100644 --- a/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java +++ b/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java @@ -21,7 +21,6 @@ public interface InvWarehouseService extends IService { InvWarehouseEntity selectByThrCode(String code, String thirdSys); - List filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest); List filterGroupInvSub(FilterInvWarehouseRequest filterInvSubWarehouseRequest); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java index 3152c3cd7..54b53f645 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.api.service.inv.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -92,6 +93,8 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService invInnerOrderPrintDao.delete(ew); List innerOrderDetailEntityList = innerOrderDetailService.selectOrderList(orderIdFk); + if (CollUtil.isEmpty(innerOrderDetailEntityList)) + return false; for (InnerOrderDetailEntity obj : innerOrderDetailEntityList) { InvInnerOrderPrintEntity innerOrderPrintEntity = new InvInnerOrderPrintEntity(); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java index 0c0ee2c49..6fc761a62 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java @@ -176,6 +176,16 @@ public class InvPlaceServiceImpl implements InvPlaceService { if (null != filterInvPlaceRequest.getPage() && null != filterInvPlaceRequest.getLimit()) { PageHelper.offsetPage((filterInvPlaceRequest.getPage() - 1) * filterInvPlaceRequest.getLimit(), filterInvPlaceRequest.getLimit()); } - return invProductDetailDao.getInvPlaceOrderList(filterInvPlaceRequest); + + + InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOne(new QueryWrapper().eq("code", filterInvPlaceRequest.getInvCode())); + if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) { + return invPreInProductDetailDao.getInvPlaceOrderList(filterInvPlaceRequest); + } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) { + return invPreProductDetailDao.getInvPlaceOrderList(filterInvPlaceRequest); + } else + return invProductDetailDao.getInvPlaceOrderList(filterInvPlaceRequest); + + } } diff --git a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml index d02efe8be..9f3b97d53 100644 --- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml @@ -19,6 +19,9 @@ AND a.advanceType = #{advanceType} + + AND (a.advanceType = 2 or advanceType = 3) + AND a.parentId = #{parentId} @@ -147,7 +150,7 @@ replace INTO auth_warehouse ( id, code, `name`, parentId, remark, defaultInv, advanceType, spUse, parentCode - , thirdId, thirdId1, thirdId2, thirdId3, thirdId4) + , thirdId, thirdId1, thirdId2, thirdId3, thirdId4, updateTime) values (#{id}, #{code}, #{name}, @@ -161,7 +164,7 @@ #{thirdId1}, #{thirdId2}, #{thirdId3}, - #{thirdId4}) + #{thirdId4}, #{updateTime}) @@ -220,6 +223,9 @@ spUse=#{spUse}, + + updateTime=#{updateTime}, + WHERE id = #{id} @@ -229,7 +235,7 @@ into auth_warehouse (id, code, `name`, parentId, remark, defaultInv, parentCode, advanceType, thirdId, thirdId1, thirdId2, thirdId3, - thirdId4) + thirdId4, updateTime) values @@ -246,7 +252,7 @@ #{item.thirdId1}, #{item.thirdId2}, #{item.thirdId3}, - #{item.thirdId4}) + #{item.thirdId4}, {item.updateTime}) diff --git a/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml index cccbb87be..0b1a11fe9 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml @@ -197,4 +197,28 @@ #{item} + + + diff --git a/src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml index e3d056d52..8f5b04a9f 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml @@ -197,4 +197,28 @@ #{item} + + +