订单查看部门权限，审核未通过订单不允许出库

sd-business/src/main/java/com/sd/business/service/department/impl/DepartmentServiceImpl.java

@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -57,6 +58,11 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         wrapper.apply(ObjectUtil.isNotEmpty(dto.getPriceBillingStandardId()),
                 "find_in_set({0}, d.price_billing_standard_id)", dto.getPriceBillingStandardId());
 
+        List<Long> detpIdList = sysUserService.getDetpIdListByUserId(SecurityUtils.getUserId());
+        if (detpIdList.size() > 0) {
+            wrapper.in("d", Department::getId, detpIdList);
+        }
+
         Page<DepartmentVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }

sd-business/src/main/java/com/sd/business/service/in/impl/InOutStorageServiceImpl.java

@@ -134,4 +134,5 @@ public class InOutStorageServiceImpl extends ServiceImpl<InOutStorageMapper, InO
         wrapper.ge("iosb", InOutStorageBom::getCreateTime, offsetDay);
         return this.baseMapper.getOutStorageQuantity(wrapper);
     }
+
 }

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -16,6 +16,7 @@ import com.ruoyi.common.core.domain.BaseSelectDto;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.system.service.ISysUserService;
 import com.sd.business.entity.bom.bo.BomSpecBo;
 import com.sd.business.entity.bom.po.Bom;
 import com.sd.business.entity.bom.po.BomSpec;
@@ -98,6 +99,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
     @Autowired
     private InOutStorageService inOutStorageService;
 
+    @Autowired
+    private ISysUserService sysUserService;
+
     @Override
     public Page<OrderInfoVo> getPage(OrderSelectDto dto) {
         IWrapper<OrderInfo> wrapper = getWrapper();
@@ -117,6 +121,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
                 .or(r -> r.eq("o", OrderInfo::getSource, 1))
         );
 
+        List<Long> detpIdList = sysUserService.getDetpIdListByUserId(SecurityUtils.getUserId());
+        if (detpIdList.size() > 0) {
+            wrapper.in("o", OrderInfo::getDepartmentId, detpIdList);
+            wrapper.eq("o", OrderInfo::getCreateUser, SecurityUtils.getUserId());
+        }
+
         if (Objects.equals(dto.getLinkedStatementOfAccount(), 0)) {
             wrapper.isNull("o.statement_of_account_id");
             wrapper.in("o", OrderInfo::getStatus,

sd-business/src/main/java/com/sd/business/service/production/impl/StockPreparationServiceImpl.java

@@ -3,6 +3,7 @@ package com.sd.business.service.production.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.flow.enums.FlowStatusEnum;
 import com.ruoyi.common.constant.StatusConstant;
 import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -388,6 +389,11 @@ public class StockPreparationServiceImpl implements StockPreparationService {
                 .or(r -> r.ne("oi", OrderInfo::getWlnStorageCode, "T007").ge("oi", OrderInfo::getWlnStatus, 1))
                 .or(r -> r.eq("oi", OrderInfo::getSource, 1))
         );
+
+        wrapper.and(q -> q
+                .and(r -> r.isNull("oi.flow_id").isNull("oi.flow_status"))
+                .or(r -> r.eq("oi", OrderInfo::getFlowStatus, FlowStatusEnum.PASS.getKey())));
+
         return wrapper;
     }