待出入库添加权限

hx-mes/src/main/java/com/fjhx/mes/service/border/impl/BorderOfLineServiceImpl.java

@@ -20,6 +20,7 @@ import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.fjhx.wms.service.stock.StockWaitDetailsService;
 import com.fjhx.wms.service.stock.StockWaitService;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -126,6 +127,7 @@ public class BorderOfLineServiceImpl extends ServiceImpl<BorderOfLineMapper, Bor
         if (borderOfLineDto.getType() == 2) {
             StockWait stockWait = new StockWait();
             stockWait.setType(1);
+            stockWait.setCompanyId(SecurityUtils.getCompanyId());
 //            stockWait.setBusinessType(StockWaitType.BORDER_OF_LINE_IN.getDetailType());
             stockWait.setBusinessId(borderOfLineJournal.getId());
             stockWait.setStatus(0);

hx-mes/src/main/java/com/fjhx/mes/service/completion/impl/CompletionInfoServiceImpl.java

@@ -24,6 +24,7 @@ import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.fjhx.wms.service.stock.StockWaitDetailsService;
 import com.fjhx.wms.service.stock.StockWaitService;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -117,6 +118,7 @@ public class CompletionInfoServiceImpl extends ServiceImpl<CompletionInfoMapper,
         stockWait.setBusinessType(JournalType.COMPLETION_IN.getDetailType());
         stockWait.setBusinessId(completionInfoDto.getId());
         stockWait.setStatus(0);
+        stockWait.setCompanyId(SecurityUtils.getCompanyId());
         stockWaitService.save(stockWait);
         StockWaitDetails stockWaitDetails =new StockWaitDetails();
         stockWaitDetails.setStockWaitId(stockWait.getId());

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskDetailServiceImpl.java

@@ -182,6 +182,7 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
         this.updateById(productionTaskDetail);
 
         StockWait stockWait = new StockWait();
+        stockWait.setCompanyId(SecurityUtils.getCompanyId());
         stockWait.setType(1);//入库
         stockWait.setStatus(0);//待入库
         stockWait.setBusinessType(JournalType.COMPLETION_IN.getDetailType());//

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskServiceImpl.java

@@ -37,6 +37,7 @@ import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.fjhx.wms.service.stock.StockWaitDetailsService;
 import com.fjhx.wms.service.stock.StockWaitService;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -171,6 +172,7 @@ public class ProductionTaskServiceImpl extends ServiceImpl<ProductionTaskMapper,
         }
         //创建待出库信息
         StockWait stockWait = new StockWait();
+        stockWait.setCompanyId(SecurityUtils.getCompanyId());
         stockWait.setBusinessId(productionTaskDto.getId());
         stockWait.setType(2);//出库
         stockWait.setStatus(0);//待出库

hx-mes/src/main/java/com/fjhx/mes/service/report/impl/ReportLossesDetailsServiceImpl.java

@@ -146,6 +146,7 @@ public class ReportLossesDetailsServiceImpl extends ServiceImpl<ReportLossesDeta
 
         //生成待出库数据
         StockWait stockWait = new StockWait();
+        stockWait.setCompanyId(SecurityUtils.getCompanyId());
         stockWait.setType(2);
         stockWait.setBusinessType(journalType.getDetailType());
         stockWait.setBusinessId(dto.getId());

hx-sale/src/main/java/com/fjhx/sale/flow/PurchaseBackFlow.java

@@ -92,6 +92,7 @@ public class PurchaseBackFlow extends FlowDelegate {
 
         //创建待出库
         StockWait stockWait = new StockWait();
+        stockWait.setCompanyId(SecurityUtils.getCompanyId());
         stockWait.setType(2);//出库
         stockWait.setStatus(0);//待出库
         stockWait.setBusinessType(JournalType.PURCHASE_RETURN_OUT.getDetailType());

hx-sale/src/main/java/com/fjhx/sale/service/arrival/impl/ArrivalServiceImpl.java

@@ -106,6 +106,7 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
 
         //生成待入库数据
         StockWait stockWait = new StockWait();
+        stockWait.setCompanyId(SecurityUtils.getCompanyId());
         stockWait.setType(1);
         stockWait.setBusinessType(JournalType.PURCHASE_IN.getDetailType());
         stockWait.setBusinessId(purchase.getId());

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -2950,6 +2950,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
 
         //生成待出库数据
         StockWait stockWait = new StockWait();
+        stockWait.setCompanyId(SecurityUtils.getCompanyId());
         stockWait.setType(2);
         stockWait.setBusinessCode(contract.getCode());
         stockWait.setBusinessType(JournalType.SALE_OUT.getDetailType());

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -149,6 +149,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
 
         //创建待出库记录
         StockWait stockWait = new StockWait();
+        stockWait.setCompanyId(SecurityUtils.getCompanyId());
         stockWait.setType(2);//待出库
         stockWait.setBusinessType(StockWaitType.JD_ORDER_OUT.getDetailType());
         stockWait.setBusinessId(jdOrderId);
@@ -238,6 +239,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
 
                 //创建待出库记录
                 StockWait stockWait = new StockWait();
+                stockWait.setCompanyId(SecurityUtils.getCompanyId());
                 stockWait.setType(2);//待出库
                 stockWait.setBusinessType(StockWaitType.JD_ORDER_OUT.getDetailType());
                 stockWait.setBusinessId(item.getId());

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/order/impl/OrderInfoServiceImpl.java

@@ -150,6 +150,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
         //添加待出库记录
         StockWait stockWait = new StockWait();
+        stockWait.setCompanyId(SecurityUtils.getCompanyId());
         stockWait.setType(2);//待出库
         stockWait.setBusinessType(StockWaitType.SALE_ORDER_OUT.getDetailType());
         stockWait.setBusinessId(orderInfoDto.getId());

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/purchase/impl/PurchaseBackServiceImpl.java

@@ -107,6 +107,7 @@ public class PurchaseBackServiceImpl extends ServiceImpl<PurchaseBackMapper, Pur
 
         //创建待出库记录
         StockWait stockWait = new StockWait();
+        stockWait.setCompanyId(SecurityUtils.getCompanyId());
         stockWait.setBusinessId(purchaseBackDto.getId());
         stockWait.setBusinessCode(json.getString("contractCode"));
         stockWait.setType(2);//出库

hx-wms/src/main/java/com/fjhx/wms/entity/stock/dto/StockWaitSelectDto.java

@@ -29,4 +29,9 @@ public class StockWaitSelectDto extends BaseSelectDto {
      */
     private Integer businessType;
 
+    /**
+     * 归属公司id
+     */
+    private Long companyId;
+
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockWait.java

@@ -53,4 +53,9 @@ public class StockWait extends BasePo {
      */
     private Long contractId;
 
+    /**
+     * 归属公司id
+     */
+    private Long companyId;
+
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -18,20 +18,17 @@ import com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo;
 import com.fjhx.wms.entity.stock.vo.StockWaitVo;
 import com.fjhx.wms.entity.warehouse.po.Warehouse;
 import com.fjhx.wms.mapper.stock.StockWaitMapper;
-import com.fjhx.wms.service.MyPurchaseService;
 import com.fjhx.wms.service.stock.*;
 import com.fjhx.wms.service.warehouse.WarehouseService;
 import com.fjhx.wms.utils.CodeEnum;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 
@@ -56,9 +53,6 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
     private StockWaitDetailsService stockWaitDetailsService;
     @Autowired
     private WarehouseService warehouseService;
-    @Autowired
-    private MyPurchaseService myPurchaseService;
-
     @Override
     public Page<StockWaitVo> getPage(StockWaitSelectDto dto) {
         IWrapper<StockWait> wrapper = getWrapper();
@@ -73,6 +67,14 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             return page;
         }
 
+        //权限过滤：待出入库-子公司看自己的,总公司看全部
+        Long companyId = SecurityUtils.getCompanyId();
+        if (!Objects.equals(companyId, 100L)) {
+            wrapper.eq("sw", StockWait::getCompanyId, companyId);
+        } else {
+            wrapper.eq("sw", StockWait::getCompanyId, dto.getCompanyId());
+        }
+
         //赋值明细列表
         setDetailsInfo(records);