更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/BiInfoController.java

@@ -56,7 +56,11 @@ public class BiInfoController {
     @Autowired
     private ICostManagementInfoService costManagementInfoService;
     @Autowired
+    private IWarehousePositionStorageInfoService warehousePositionStorageInfoService;
+    @Autowired
     private IWarehouseBaseInfoService warehouseBaseInfoService;
+    @Autowired
+    private IWeighingManagementService weighingManagementService;
     private String companyId;
 
     /**
@@ -169,28 +173,35 @@ public class BiInfoController {
 //
 //            }
 //        }
-        List<CostManagementInfo> costManagementInfos = costManagementInfoService.selectList(costManagementInfoEntityWrapper);
-        Double sumTotal = 0d;
-        Double sumCost = 0d;
-        if (CollectionUtils.isNotEmpty(costManagementInfos)) {
-            for (int i = 0; i < costManagementInfos.size(); i++) {
-                CostManagementInfo costManagementInfo = costManagementInfos.get(i);
-                sumTotal = sumTotal + costManagementInfo.getStorage();
-                sumCost = sumCost + (costManagementInfo.getStorage() * costManagementInfo.getCost());
-            }
-        }
+//        List<CostManagementInfo> costManagementInfos = costManagementInfoService.selectList(costManagementInfoEntityWrapper);
+        Double sumAct = warehousePositionStorageInfoService.selectSumStoreage(companyId);
+        Double sumBuy = contractManagementInfoService.selectSumBuy(companyId);
+        Double sumSale = contractManagementInfoService.selectSumSale(companyId);
+//        if (CollectionUtils.isNotEmpty(costManagementInfos)) {
+//            for (int i = 0; i < costManagementInfos.size(); i++) {
+//                CostManagementInfo costManagementInfo = costManagementInfos.get(i);
+//                sumTotal = sumTotal + costManagementInfo.getStorage();
+//                sumCost = sumCost + (costManagementInfo.getStorage() * costManagementInfo.getCost());
+//            }
+//        }
         List<BiViewInfo> biViewInfoList = new ArrayList<>();
         BiViewInfo biViewInfo = new BiViewInfo();
         BiViewInfo biViewInfo1 = new BiViewInfo();
         BiViewInfo biViewInfo2 = new BiViewInfo();
+        BiViewInfo biViewInfo0 = new BiViewInfo();
         biViewInfo.setBiType("8-库存成本");
-        biViewInfo1.setName("总库存量");
-        biViewInfo1.setCount(String.valueOf(sumTotal));
-        biViewInfo2.setName("库存价值");
-        BigDecimal bg = new BigDecimal(sumCost);
+        biViewInfo1.setName("实际库存");
+        BigDecimal bg = new BigDecimal(sumAct);
+        biViewInfo1.setCount(String.valueOf(bg));
+        biViewInfo2.setName("采购待执行");
+        bg = new BigDecimal(sumBuy);
         biViewInfo2.setCount(String.valueOf(bg));
+        biViewInfo0.setName("销售待执行");
+        bg = new BigDecimal(sumSale);
+        biViewInfo0.setCount(String.valueOf(bg));
         biViewInfoList.add(biViewInfo1);
         biViewInfoList.add(biViewInfo2);
+        biViewInfoList.add(biViewInfo0);
         biViewInfo.setBiViewInfoList(biViewInfoList);
         biViewInfos.add(biViewInfo);
 
@@ -251,29 +262,30 @@ public class BiInfoController {
         // 今日装车
         int inCount = tranCarInfoService.selectCount(new EntityWrapper<TranCarInfo>()
                 .eq("status_flag", "3")
-                .eq("comp_id", companyId)
-                .ge("update_date", DateUtil.formatDate(new Date(), DateUtils.DATE_FMT_YYYY_MM_DD)));
+                .eq("comp_id", companyId));
         //今日在途
-        int inAfterCount = tranCarInfoService.selectCount(new EntityWrapper<TranCarInfo>()
-                .eq("status_flag", "3")
-                .eq("comp_id", companyId)
-                .lt("update_date", DateUtil.formatDate(new Date(), DateUtils.DATE_FMT_YYYY_MM_DD)));
+//        int inAfterCount = tranCarInfoService.selectCount(new EntityWrapper<TranCarInfo>()
+//                .eq("status_flag", "3")
+//                .eq("comp_id", companyId)
+//                .lt("update_date", DateUtil.formatDate(new Date(), DateUtils.DATE_FMT_YYYY_MM_DD)));
+        int inAfterCount = warehouseInOutInfoService.selectCountCompany(companyId,"出库");
         //今日卸车
-        int outCount = tranCarInfoService.selectCount(new EntityWrapper<TranCarInfo>()
-                .eq("status_flag", "5")
-                .eq("comp_id", companyId)
-                .ge("update_date", DateUtil.formatDate(new Date(), DateUtils.DATE_FMT_YYYY_MM_DD)));
+        int outCount = warehouseInOutInfoService.selectCountCompany(companyId,"入库");
+        int outCount1 = weighingManagementService.selectCount(new EntityWrapper<WeighingManagement>()
+                .le("status_flag", "3")
+                .eq("delete_flag", "0")
+                .eq("comp_id", companyId));
         BiViewInfo biViewInfo = new BiViewInfo();
         BiViewInfo biViewInfo1 = new BiViewInfo();
         BiViewInfo biViewInfo2 = new BiViewInfo();
         BiViewInfo biViewInfo3 = new BiViewInfo();
         biViewInfo.setBiType("7-车辆信息");
         biViewInfo1.setName("在途车辆");
-        biViewInfo1.setCount(String.valueOf(inCount + inAfterCount));
+        biViewInfo1.setCount(String.valueOf(inCount));
         biViewInfo2.setName("装货车辆");
-        biViewInfo2.setCount(String.valueOf(inCount));
+        biViewInfo2.setCount(String.valueOf(inAfterCount));
         biViewInfo3.setName("卸货车辆");
-        biViewInfo3.setCount(String.valueOf(outCount));
+        biViewInfo3.setCount(String.valueOf(outCount+outCount1));
         biViewInfoList.add(biViewInfo1);
         biViewInfoList.add(biViewInfo2);
         biViewInfoList.add(biViewInfo3);

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/ContractManagementInfoMapper.java

@@ -32,5 +32,6 @@ public interface ContractManagementInfoMapper extends BaseMapper<ContractManagem
      * @return
      */
     List<ContractManagementInfo> getListByCondition(Map<String, Object> pageView);
-
+    Double selectSumSale(String compId);
+    Double selectSumBuy(String compId);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/WarehouseInOutInfoMapper.java

@@ -23,6 +23,7 @@ public interface WarehouseInOutInfoMapper extends BaseMapper<WarehouseInOutInfo>
      * @return
      */
     Integer getCountByCondition(Map<String, Object> pageView);
+    Integer selectCountCompany(Map<String, Object> pageView);
 
     /**
      * 根据条件查询流转记录列表

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/WarehousePositionStorageInfoMapper.java

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  */
 public interface WarehousePositionStorageInfoMapper extends BaseMapper<WarehousePositionStorageInfo> {
 
+    Double selectSumStoreage(String compId);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IContractManagementInfoService.java

@@ -87,5 +87,6 @@ public interface IContractManagementInfoService extends IService<ContractManagem
      * @throws Exception
      */
     void exportStorageFee(ContractManagementInfo example, HttpServletResponse response) throws Exception;
-
+    Double selectSumSale(String compId);
+    Double selectSumBuy(String compId);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IWarehouseInOutInfoService.java

@@ -114,4 +114,5 @@ public interface IWarehouseInOutInfoService extends IService<WarehouseInOutInfo>
     String selectCompId(String contractNo);
 
     void tesk(WarehouseInOutInfo warehouseInOutInfo,String flag);
+    Integer selectCountCompany(String compId,String type);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IWarehousePositionStorageInfoService.java

@@ -22,4 +22,5 @@ public interface IWarehousePositionStorageInfoService extends IService<Warehouse
      ** @return
      */
     List<WarehousePositionStorageInfo> selectGoodsName(String positionId);
+    Double selectSumStoreage(String compId);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractManagementInfoServiceImpl.java

@@ -1619,6 +1619,14 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
         download(path, response, wb);
     }
 
+    @Override
+    public Double selectSumSale(String compId) {
+        return baseMapper.selectSumSale(compId);
+    }
+    @Override
+    public Double selectSumBuy(String compId) {
+        return baseMapper.selectSumBuy(compId);
+    }
     /**
      * 删除
      *

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -2033,4 +2033,13 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
 
     }
 
+    @Override
+    public Integer selectCountCompany(String compId,String type) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("compId", compId);
+        //  仓库ID
+        pageView.put("type", type);
+        return  baseMapper.selectCountCompany(pageView);
+    }
+
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousePositionStorageInfoServiceImpl.java

@@ -6,6 +6,7 @@ import com.yh.saas.plugin.yiliangyiyun.entity.WarehousePositionStorageInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.WarehousePositionStorageInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IWarehousePositionStorageInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 
@@ -22,7 +23,6 @@ import java.util.List;
 @Service
 public class WarehousePositionStorageInfoServiceImpl extends ServiceImpl<WarehousePositionStorageInfoMapper, WarehousePositionStorageInfo> implements IWarehousePositionStorageInfoService {
 
-
     /**
      * 盘损货名下拉列表
      * @param positionId
@@ -34,4 +34,9 @@ public class WarehousePositionStorageInfoServiceImpl extends ServiceImpl<Warehou
                 .eq("position_id",positionId).eq("delete_flag", "0"));
         return warehousePositionStorageInfoList;
     }
+
+    @Override
+    public Double selectSumStoreage(String compId) {
+       return baseMapper.selectSumStoreage(compId);
+    }
 }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ContractManagementInfoMapper.xml

@@ -183,4 +183,62 @@
             LIMIT ${startRecord}, ${pageSize}
         </if>
     </select>
+    <select id="selectSumSale" parameterType="Map" resultType="java.lang.Double">
+        SELECT
+        sum( b.sumSale )
+        FROM
+        (
+        SELECT
+        CASE
+
+        WHEN
+        (
+        a.weight - ifnull( sum( ssrr.net_weight ), 0 )) &lt; 0 THEN
+        0 ELSE (
+        a.weight - ifnull( sum( ssrr.net_weight ), 0 ))
+        END AS sumSale
+        FROM
+        contract_management_info a
+        LEFT JOIN stock_sale_receipt_report ssrr ON ssrr.contract_no = a.contract_no
+        AND ssrr.delete_flag = 0
+        WHERE
+        a.delete_flag = 0
+        AND a.status_flag = '1'
+        AND a.goods_type = '1'
+        AND a.contract_type = '1'
+        AND a.comp_id = #{compId}
+        AND a.signing_date >= '2022-01-01'
+        GROUP BY
+        a.contract_no
+        ) b
+    </select>
+    <select id="selectSumBuy" parameterType="Map" resultType="java.lang.Double">
+        SELECT
+        sum( b.sumBuy )
+        FROM
+        (
+        SELECT
+        CASE
+
+        WHEN
+        (
+        a.weight - ifnull( sum( ssrr.net_weight ), 0 )) &lt; 0 THEN
+        0 ELSE (
+        a.weight - ifnull( sum( ssrr.net_weight ), 0 ))
+        END AS sumBuy
+        FROM
+        contract_management_info a
+        LEFT JOIN stock_purchase_receipt_report ssrr ON ssrr.contract_no = a.contract_no
+        AND ssrr.delete_flag = 0
+        WHERE
+        a.delete_flag = 0
+        AND a.status_flag = '1'
+        AND a.goods_type = '1'
+        AND a.contract_type = '2'
+        AND a.comp_id = #{compId}
+        AND a.signing_date >= '2022-01-01'
+        GROUP BY
+        a.contract_no
+        ) b
+    </select>
 </mapper>

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseInOutInfoMapper.xml

@@ -299,4 +299,13 @@
         and ( w.contract_no like "%${keyWord}%" or w.tran_car_no like "%${keyWord}%" or car_no like "%${keyWord}%")
         ORDER BY w.update_date DESC
     </select>
+    <select id="selectCountCompany" parameterType="Map" resultType="java.lang.Integer">
+        select count(1)
+        from warehouse_in_out_info w
+        left join warehouse_base_info wbi on wbi.id = w.base_id
+        where wbi.comp_id = #{compId}
+        and w.delete_flag = '0'
+        and w.status_flag = '1'
+        and w.in_out_type like "%${type}%"
+    </select>
 </mapper>

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehousePositionStorageInfoMapper.xml

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.WarehousePositionStorageInfoMapper">
 
+    <select id="selectSumStoreage" parameterType="Map"  resultType="java.lang.Double">
+        SELECT
+            sum(a.`storage`)
+        FROM
+            warehouse_position_storage_info a
+            left join warehouse_position_info wpi on wpi.id = a.position_id and wpi.delete_flag = 0
+            left join warehouse_base_info wbi on wbi.id = wpi.base_id and wbi.delete_flag = 0
+        WHERE
+            a.delete_flag = 0
+            and wbi.comp_id = #{compId}
+    </select>
 </mapper>