From 566a8d0aec6aa7f856cf8727cd52238578d8ff49 Mon Sep 17 00:00:00 2001 From: x_z Date: Fri, 5 Aug 2022 14:44:24 +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 | 13 +++++++------ .../sale/admin/dao/basic/BussinessTypeDao.java | 8 ++++++++ .../sale/admin/dao/inout/WarehouseUserDao.java | 8 ++++++++ .../service/inout/WarehouseUserService.java | 8 ++++++++ .../service/inout/impl/OrderServiceImpl.java | 17 ++++++++++++++++- .../inout/impl/WarehouseUserServiceImpl.java | 5 +++++ .../glxp/sale/admin/thread/AsyncDiDlHelper.java | 2 -- .../mybatis/mapper/basic/BussinessTypeDao.xml | 10 ++++++++++ .../mybatis/mapper/inout/WarehouseUserDao.xml | 5 +++++ 9 files changed, 67 insertions(+), 9 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java index 8abede8..3ca0cf1 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java @@ -17,6 +17,7 @@ import com.glxp.sale.admin.res.inventory.InvSubWarehouseResponse; import com.glxp.sale.admin.res.inventory.InvWarehouseThirdSysResponse; import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.inout.WarehouseBussinessTypeService; +import com.glxp.sale.admin.service.inout.WarehouseUserService; import com.glxp.sale.admin.service.inventory.InvProductService; import com.glxp.sale.admin.service.inventory.InvSubWarehouseService; import com.glxp.sale.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") @@ -145,16 +148,14 @@ 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()); if (!warehouseBussinessTypeEntities.isEmpty()) { - return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！"); + return ResultVOUtils.error(500, "请先移除该仓库关联单据类型！"); } //判断此分库中是否还有库存 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessTypeDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessTypeDao.java index 45fe9d4..8798e73 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessTypeDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BussinessTypeDao.java @@ -53,4 +53,12 @@ public interface BussinessTypeDao { * @param action */ void updateSupplementOrderType(@Param("supplementOrderType") String supplementOrderType, @Param("action") String action); + + /** + * 根据业务单据号查询补单类型 + * + * @param stockOrderBillNo + * @return + */ + String selectSupplementTypeByBillNo(@Param("stockOrderBillNo") String stockOrderBillNo); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseUserDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseUserDao.java index 1d25803..f471ac5 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inout/WarehouseUserDao.java +++ b/api-admin/src/main/java/com/glxp/sale/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/sale/admin/service/inout/WarehouseUserService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseUserService.java index 1189226..46a020f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseUserService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/WarehouseUserService.java @@ -47,4 +47,12 @@ public interface WarehouseUserService { * @param id */ void deleteWarehouseUser(Integer id); + + /** + * 根据分仓编码，统计用户数量 + * + * @param subInvCode + * @return + */ + Integer countUserBySubInvCode(String subInvCode); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java index 7f66824..af3381d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java @@ -330,7 +330,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); @@ -338,6 +338,21 @@ 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 filterOrderForDelete(String billNo) { OrderEntity orderEntity = orderDao.selectByBillNo(billNo); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseUserServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseUserServiceImpl.java index 28dd992..dedeebf 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseUserServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/WarehouseUserServiceImpl.java @@ -107,4 +107,9 @@ public class WarehouseUserServiceImpl implements WarehouseUserService { warehouseUserDao.deleteByPrimaryKey(id); } } + + @Override + public Integer countUserBySubInvCode(String subInvCode) { + return warehouseUserDao.countByCode(subInvCode); + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlHelper.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlHelper.java index 284e35e..9772bf4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlHelper.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/AsyncDiDlHelper.java @@ -3,9 +3,7 @@ package com.glxp.sale.admin.thread; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.sale.admin.entity.basic.UdiCompanyEntity; -import com.glxp.sale.admin.entity.basic.UdiInfoEntity; import com.glxp.sale.admin.entity.receipt.ProductInfoEntity; -import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.util.HttpClient; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; 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 bef3f11..1da2028 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -370,4 +370,14 @@ or supplementOrderType = '') and corpType = 1 + + 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 6d9120c..58fbf8d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml @@ -277,6 +277,11 @@ from inv_warehouse_user where userId = #{userId} + + + delete from inv_warehouse_user