问题处理

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionTaskProgressVo.java

@@ -27,4 +27,9 @@ public class ProductionTaskProgressVo extends ProductionTaskProgress {
      */
     private List<ProductionScheduling> schedulingList;
 
+    /**
+     * 排程总数
+     */
+    private Integer schedulingCount;
+
 }

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

@@ -153,6 +153,11 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
                                     ObjectUtil.equals(item.getProcessesId(), productionTaskProgressVo.getProcessesId())
                     ).collect(Collectors.toList());
             productionTaskProgressVo.setSchedulingList(schedulingList);
+
+            //排程数量求和
+            int schedulingCount = schedulingList.stream().map(ProductionScheduling::getQuantity).mapToInt(Integer::intValue).sum();
+            ;
+            productionTaskProgressVo.setSchedulingCount(schedulingCount);
         }
 
 

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

@@ -56,6 +56,15 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
     @Override
     public Page<StockWaitVo> getPage(StockWaitSelectDto dto) {
         IWrapper<StockWait> wrapper = getWrapper();
+
+        //权限过滤：待出入库-子公司看自己的,总公司看全部
+        Long companyId = SecurityUtils.getCompanyId();
+        if (!Objects.equals(companyId, 100L)) {
+            wrapper.eq("sw", StockWait::getCompanyId, companyId);
+        } else {
+            wrapper.eq("sw", StockWait::getCompanyId, dto.getCompanyId());
+        }
+
         //过滤入库/出库
         wrapper.eq(StockWait::getType, dto.getType());
         wrapper.eq("sw", StockWait::getBusinessType, dto.getBusinessType());
@@ -67,14 +76,6 @@ 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);