Merge remote-tracking branch 'origin/fencang' into fencang

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();
+        Integer userCount = warehouseUserService.countUserBySubInvCode(invSubWarehouseEntity.getCode());
-        filterInvWarehouseRequest.setCode(invSubWarehouseEntity.getParentId());
+        if (userCount > 0) {
-        List<InvWarehouseEntity> warehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest);
+            return ResultVOUtils.error(500, "请先移除该仓库关联用户！");
-        if (!warehouseEntities.isEmpty()) {
-            return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！");
         }
 
         List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.getListByCode(invSubWarehouseEntity.getCode());
         if (!warehouseBussinessTypeEntities.isEmpty()) {
-            return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！");
+            return ResultVOUtils.error(500, "请先移除该仓库关联单据类型！");
         }
 
         //判断此分库中是否还有库存

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);
 }

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);
 }

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);
 }

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<OrderEntity> filterOrderForDelete(String billNo) {
         OrderEntity orderEntity = orderDao.selectByBillNo(billNo);

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);
+    }
 }

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;

api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml

@@ -370,4 +370,14 @@
            or supplementOrderType = '')
           and corpType = 1
     </select>
+
+    <select id="selectSupplementTypeByBillNo" resultType="java.lang.String">
+        select supplementOrderType
+        from basic_bussiness_type
+        where action = (select action
+                        from io_order
+                        where id = (select orderIdFk
+                                    from stock_order
+                                    where billNo = #{stockOrderBillNo}))
+    </select>
 </mapper>

api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml

@@ -277,6 +277,11 @@
         from inv_warehouse_user
         where userId = #{userId}
     </select>
+
+    <select id="countByCode" resultType="java.lang.Integer">
+        select count(*) from inv_warehouse_user where code = #{code}
+    </select>
+
     <delete id="deleteByCode">
         delete
         from inv_warehouse_user