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

blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml

@@ -869,7 +869,8 @@
         IFNULL(SUM(IF(type_service='3',hand_quantity,0)),0) billNum,
         IFNULL(SUM(IF(type_service='4',hand_quantity,0)),0) thirdTransferNum
         from logpm_distribution_stock_article
-        WHERE 1=1
+        WHERE
+        is_deleted = 0
         and warehouse_id in
         <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
             #{item}
@@ -942,7 +943,7 @@
     </select>
     <select id="findTripartiteDeliveryTotal" resultType="com.logpm.report.vo.indexCount.IndexDeliveryDataVO">
         SELECT
-        warehouse_name,
+        warehouse_name AS warehouseName,
         warehouse_id,
         type AS type,
         count( 1 ) AS totalNum

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java

@@ -448,6 +448,8 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 			Integer upshelfNum = Objects.isNull(warehouseNumberVO4) ? 0 : warehouseNumberVO4.getCountNumber();
 
 			indexAllocationDataVO.setTotalNum(totalAllocationNum);
+			indexAllocationDataVO.setWarehouseId(handOrderDataByWarehouseIdVO.getWarehouseId());
+			indexAllocationDataVO.setWarehouseName(handOrderDataByWarehouseIdVO.getWarehouseName());
 			indexAllocationDataVO.setUseNum(useAllocationNum);
 			indexAllocationDataVO.setNullNum(totalAllocationNum - useAllocationNum);
 			indexAllocationDataVO.setUpshelfNum(upshelfNum);
@@ -873,7 +875,7 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 		indexSignforDayDataVO.setClerkSignNum(dayClerkSignforNum);
 		//查询计划数量
 		Integer dayPlanByday = warehouseIndexMapper.findPlanNumByDay(warehouseId);
-		indexSignforDayDataVO.setPlanNum(dayClerkSignforNum);
+		indexSignforDayDataVO.setPlanNum(dayPlanByday);
 		//计算文员签收率
 		indexSignforDayDataVO.setClerkSignforScale("0.0000");
 		if (dayClerkSignforNum > 0 && dayPlanByday > 0) {