From 4fecb249cefe8497394c89f3132bc2b5e32793d3 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 23 Jun 2022 10:42:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E9=AA=8C=E6=94=B6=EF=BC=8C?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/OrderController.java | 50 +++++++++++------- .../inout/StockOrderController.java | 52 +++++++++---------- .../req/inventory/FilterInvUserRequest.java | 2 - .../admin/thread/IoTransInoutService.java | 1 + 4 files changed, 58 insertions(+), 47 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index 6aa2320..83ee56a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -22,6 +22,7 @@ import com.glxp.sale.admin.entity.udid.UdiEntity; import com.glxp.sale.admin.req.basic.BasicEntrustRecRequest; import com.glxp.sale.admin.req.inout.*; import com.glxp.sale.admin.req.inventory.FilterInvUserRequest; +import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.inout.OrderEditRequest; import com.glxp.sale.admin.service.auth.AuthAdminService; @@ -202,19 +203,19 @@ public class OrderController { Integer userId = customerService.getUserId(); orderFilterRequest.setFromCorpId(null); orderFilterRequest.setUserId(userId); - if (StrUtil.isNotEmpty(orderFilterRequest.getLocStorageCode())) { - InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(orderFilterRequest.getLocStorageCode()); - FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); - filterInvUserRequest.setCode(invWarehouseEntity.getCode()); - filterInvUserRequest.setUserid(userId.longValue()); - filterInvUserRequest.setIsDirector(true); - List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); - if (CollUtil.isEmpty(warehouseUserEntities)) { - orderFilterRequest.setUnionUser(userId); - } - } else { - return ResultVOUtils.error(500, "请先选择当前仓库"); - } +// if (StrUtil.isNotEmpty(orderFilterRequest.getLocStorageCode())) { +// InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(orderFilterRequest.getLocStorageCode()); +// FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); +// filterInvUserRequest.setCode(invWarehouseEntity.getCode()); +// filterInvUserRequest.setUserid(userId.longValue()); +// filterInvUserRequest.setIsDirector(true); +// List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); +// if (CollUtil.isEmpty(warehouseUserEntities)) { +// orderFilterRequest.setUnionUser(userId); +// } +// } else { +// return ResultVOUtils.error(500, "请先选择当前仓库"); +// } } else { orderFilterRequest.setCustomerId(null); @@ -266,11 +267,20 @@ public class OrderController { return ResultVOUtils.error(500, "非" + bussinessTypeEntity.getName() + "类型单据！"); } else if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_CHECKED)) { if (StrUtil.isNotEmpty(stockOrderEntity.getLocStorageCode())) { - InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderEntity.getLocStorageCode()); - FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); - filterInvUserRequest.setCode(invWarehouseEntity.getCode()); - filterInvUserRequest.setUserid(userId.longValue()); - List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); + List warehouseUserEntities = new ArrayList<>(); + List invWarehouseEntities = new ArrayList<>(); + if (StrUtil.isNotEmpty(stockOrderEntity.getInvWarehouseCode())) { + FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); + filterInvUserRequest.setCode(stockOrderEntity.getInvWarehouseCode()); + filterInvUserRequest.setUserid(userId.longValue()); + warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); + } else { + FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); + filterInvWarehouseRequest.setCode(stockOrderEntity.getLocStorageCode()); + filterInvWarehouseRequest.setUserId(userId + ""); + invWarehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest); + } + List entrustReceEntities = null; if (!stockOrderEntity.isEntrustEnd()) { BasicEntrustRecRequest basicEntrustRecRequest = new BasicEntrustRecRequest(); @@ -281,7 +291,7 @@ public class OrderController { } else { return ResultVOUtils.error(500, "单据已委托验收完成！"); } - if (CollUtil.isEmpty(warehouseUserEntities) && CollUtil.isEmpty(entrustReceEntities)) { + if (CollUtil.isEmpty(warehouseUserEntities) && CollUtil.isEmpty(entrustReceEntities) && CollUtil.isEmpty(invWarehouseEntities)) { return ResultVOUtils.error(500, "权限不足，无法验收！"); } } @@ -384,6 +394,7 @@ public class OrderController { //修改往来单位及当前库存号 supplementOrder.setFromCorpId(orderEntity.getLocStorageCode()); supplementOrder.setLocStorageCode(entrustReceEntity.getEntrustInv()); + supplementOrder.setInvWarehouseCode(entrustReceEntity.getInvWarehouseCode()); String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId()); supplementOrder.setFromCorp(name); supplementOrder.setFromType(ConstantStatus.FROM_PEACE_CHANGE); @@ -400,6 +411,7 @@ public class OrderController { supplementCode.setFromCorpId(supplementOrder.getFromCorpId()); supplementCode.setFromCorp(supplementOrder.getFromCorp()); supplementCode.setLocStorageCode(supplementOrder.getLocStorageCode()); + supplementCode.setInvWarehouseCode(supplementOrder.getInvWarehouseCode()); supplementCode.setOrderId(supplementOrderNo); //查询补单设置 supplementCode.setAction(bussinessTypeEntity.getSupplementOrderType()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java index 98da3dd..b5cf0aa 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java @@ -268,19 +268,19 @@ public class StockOrderController { Integer userId = customerService.getUserId(); stockOrderFilterRequest.setUnitIdFk(null); stockOrderFilterRequest.setUserId(customerService.getUserId()); - if (StrUtil.isNotEmpty(stockOrderFilterRequest.getLocStorageCode())) { - InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderFilterRequest.getLocStorageCode()); - FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); - filterInvUserRequest.setCode(invWarehouseEntity.getCode()); - filterInvUserRequest.setUserid(userId.longValue()); - filterInvUserRequest.setIsDirector(true); - List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); - if (CollUtil.isEmpty(warehouseUserEntities)) { - stockOrderFilterRequest.setUnionUser(userId); - } - } else { - return ResultVOUtils.error(500, "请先选择当前仓库"); - } +// if (StrUtil.isNotEmpty(stockOrderFilterRequest.getLocStorageCode())) { +// InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderFilterRequest.getLocStorageCode()); +// FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); +// filterInvUserRequest.setCode(invWarehouseEntity.getCode()); +// filterInvUserRequest.setUserid(userId.longValue()); +// filterInvUserRequest.setIsDirector(true); +// List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); +// if (CollUtil.isEmpty(warehouseUserEntities)) { +// stockOrderFilterRequest.setUnionUser(userId); +// } +// } else { +// return ResultVOUtils.error(500, "请先选择当前仓库"); +// } } else stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk()); stockOrderFilterRequest.setCorpId(null); @@ -316,19 +316,19 @@ public class StockOrderController { Integer userId = customerService.getUserId(); stockOrderFilterRequest.setUnitIdFk(null); stockOrderFilterRequest.setUserId(userId); - if (StrUtil.isNotEmpty(stockOrderFilterRequest.getLocStorageCode())) { - InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderFilterRequest.getLocStorageCode()); - FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); - filterInvUserRequest.setCode(invWarehouseEntity.getCode()); - filterInvUserRequest.setUserid(userId.longValue()); - filterInvUserRequest.setIsDirector(true); - List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); - if (CollUtil.isEmpty(warehouseUserEntities)) { - stockOrderFilterRequest.setUnionUser(userId); - } - } else { - return ResultVOUtils.error(500, "请先选择当前仓库"); - } +// if (StrUtil.isNotEmpty(stockOrderFilterRequest.getLocStorageCode())) { +// InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderFilterRequest.getLocStorageCode()); +// FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); +// filterInvUserRequest.setCode(invWarehouseEntity.getCode()); +// filterInvUserRequest.setUserid(userId.longValue()); +// filterInvUserRequest.setIsDirector(true); +// List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); +// if (CollUtil.isEmpty(warehouseUserEntities)) { +// stockOrderFilterRequest.setUnionUser(userId); +// } +// } else { +// return ResultVOUtils.error(500, "请先选择当前仓库"); +// } } else { CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(customerId)); stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvUserRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvUserRequest.java index dbf73fb..bb338ce 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvUserRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvUserRequest.java @@ -9,9 +9,7 @@ public class FilterInvUserRequest extends ListPageRequest { private Integer id; private String code; - private Long userid; - private String username; private Boolean isDirector; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java index 5fe48cc..388166a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java @@ -192,6 +192,7 @@ public class IoTransInoutService { orderSaveRequest.setCreateUser(postOrderRequest.getUserId()); } orderSaveRequest.setLocStorageCode(warehouseEntity.getLocStorageCode()); + orderSaveRequest.setInvWarehouseCode(warehouseEntity.getInvWarehouseCode()); orderSaveRequest.setMainAction(warehouseEntity.getMainAction()); orderSaveRequest.setReceiveStatus(0); orderSaveRequest.setPreCheck(postOrder.isPreCheck());