From 644103477543ade77b8a824fcdc9fecede8b0693 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 5 Aug 2022 14:43:59 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=98=AF=E5=90=A6=E5=8F=AF=E4=BB=A5=E8=A1=A5?= =?UTF-8?q?=E5=8D=95=E5=88=A4=E6=96=AD=E5=A2=9E=E5=8A=A0=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=B9=B3=E8=A1=A1=E8=A1=A5=E5=8D=95=E6=9C=89?= =?UTF-8?q?=E6=97=A0=E5=80=BC=E5=88=A4=E6=96=AD=202.=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=86=E5=BA=93=E6=9C=89=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=88=A4=E6=96=AD=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/InvSubWarehouseController.java | 11 ++++++----- .../api/admin/dao/basic/BussinessTypeDao.java | 8 ++++++++ .../api/admin/dao/inout/WarehouseUserDao.java | 8 ++++++++ .../service/inout/WarehouseUserService.java | 7 +++++++ .../service/inout/impl/OrderServiceImpl.java | 16 +++++++++++++++- .../inout/impl/WarehouseUserServiceImpl.java | 5 +++++ .../mybatis/mapper/basic/BussinessTypeDao.xml | 10 ++++++++++ .../mybatis/mapper/inout/WarehouseUserDao.xml | 5 +++++ 8 files changed, 64 insertions(+), 6 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java index 01d9f9b0..3f8df0e7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java @@ -17,6 +17,7 @@ import com.glxp.api.admin.res.inventory.InvSubWarehouseResponse; import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse; import com.glxp.api.admin.service.auth.CustomerService; import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService; +import com.glxp.api.admin.service.inout.WarehouseUserService; import com.glxp.api.admin.service.inventory.InvProductService; import com.glxp.api.admin.service.inventory.InvSubWarehouseService; import com.glxp.api.admin.service.inventory.InvWarehouseService; @@ -47,6 +48,8 @@ public class InvSubWarehouseController { WarehouseBussinessTypeService warehouseBussinessTypeService; @Resource private InvProductService invProductService; + @Resource + private WarehouseUserService warehouseUserService; @AuthRuleAnnotation("") @GetMapping("spms/sub/inv/warehouse/filter") @@ -143,11 +146,9 @@ public class InvSubWarehouseController { InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.findById(deleteRequest.getId()); - FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); - filterInvWarehouseRequest.setCode(invSubWarehouseEntity.getParentId()); - List warehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest); - if (!warehouseEntities.isEmpty()) { - return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！"); + Integer userCount = warehouseUserService.countUserBySubInvCode(invSubWarehouseEntity.getCode()); + if (userCount > 0) { + return ResultVOUtils.error(500, "请先移除该仓库关联用户！"); } List warehouseBussinessTypeEntities = warehouseBussinessTypeService.getListByCode(invSubWarehouseEntity.getCode()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java index 69ec30f8..15d346f9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java @@ -61,4 +61,12 @@ public interface BussinessTypeDao { * @return */ String selectInoutTypebByLocalAction(@Param("localAction") String localAction); + + /** + * 根据业务单据号查询补单类型 + * + * @param stockOrderBillNo + * @return + */ + String selectSupplementTypeByBillNo(@Param("stockOrderBillNo") String stockOrderBillNo); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java index 5d3f395a..7720be50 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java @@ -52,4 +52,12 @@ public interface WarehouseUserDao { * @param isDirector */ void updateDirectorById(@Param("id") Integer id, @Param("isDirector") int isDirector); + + /** + * 根据分仓编码统计绑定的用户数 + * + * @param code + * @return + */ + Integer countByCode(@Param("code") String code); } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java index 3c1d6035..42242e83 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java @@ -57,4 +57,11 @@ public interface WarehouseUserService { */ List getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest); + /** + * 根据分仓编码，统计用户数量 + * + * @param subInvCode + * @return + */ + Integer countUserBySubInvCode(String subInvCode); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java index b4ffdb15..5c05ae22 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java @@ -338,7 +338,7 @@ public class OrderServiceImpl implements OrderService { stockOrderEntityList.forEach(stockOrderEntity -> { StockOrderResponse response = new StockOrderResponse(); BeanUtil.copyProperties(stockOrderEntity, response); - if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_DELIVER)) { + if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_DELIVER) && checkBusTypeSupplementOrder(stockOrderEntity.getBillNo())) { response.setEnableSupplementOrder(true); } result.add(response); @@ -346,6 +346,20 @@ public class OrderServiceImpl implements OrderService { return result; } + /** + * 校验扫码单据类型是否绑定了补单类型 + * + * @param stockOrderBillNo 业务单据号 + * @return + */ + boolean checkBusTypeSupplementOrder(String stockOrderBillNo) { + String supplementOrderType = bussinessTypeDao.selectSupplementTypeByBillNo(stockOrderBillNo); + if (StrUtil.isNotBlank(supplementOrderType)) { + return true; + } + return false; + } + @Override public List checkSubmitOrder(List orderResponseList) { if (CollUtil.isEmpty(orderResponseList)) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java index 3b89d00c..8897bfc7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java @@ -116,4 +116,9 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { } return warehouseUserDao.selectListByCode(filterInvLinkDataRequest.getCode()); } + + @Override + public Integer countUserBySubInvCode(String subInvCode) { + return warehouseUserDao.countByCode(subInvCode); + } } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index 613069e5..37736d88 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -400,4 +400,14 @@ where localAction = #{localAction} + + diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml index 05bd9503..90b22a52 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml @@ -273,6 +273,11 @@ from inv_warehouse_user where userId = #{userId} + + + delete from inv_warehouse_user