Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/api/DistributionDeliveryAppController.java

@@ -79,8 +79,8 @@ public class DistributionDeliveryAppController {
 	@GetMapping("/trays")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "详情", notes = "传入DistributionDeliveryListDTO")
-	public R<IPage<DistributionAppReservationVO>> traysDetail(DistributionAppDeliveryListDTO distributionDeliveryList, Query query) {
+	public R traysDetail(DistributionAppDeliveryListDTO distributionDeliveryList) {
-		IPage<DistributionAppReservationVO> pages = distributionDeliveryListService.getAppDeliveryreservationTraysPage(Condition.getPage(query),distributionDeliveryList);
+		List<DistributionAppReservationVO> pages = distributionDeliveryListService.getAppDeliveryreservationTraysPage(distributionDeliveryList);
 		return R.data(pages);
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.java

@@ -181,5 +181,5 @@ public interface DistributionDeliveryInfoMapper extends BaseMapper<DistributionD
 	 * @param id
 	 * @return
 	 */
-	List<DistributionAppReservationVO> selectAppTarysListPage(IPage<DistributionAppReservationVO> page,@Param("reservationId") Long id);
+	List<DistributionAppReservationVO> selectAppTarysListPage(@Param("reservationId") Long id);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java

@@ -261,7 +261,7 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 * @param distributionDeliveryList
 	 * @return
 	 */
-	IPage<DistributionAppReservationVO> getAppDeliveryreservationTraysPage(IPage<DistributionAppReservationVO> page, DistributionAppDeliveryListDTO distributionDeliveryList);
+	List<DistributionAppReservationVO> getAppDeliveryreservationTraysPage(DistributionAppDeliveryListDTO distributionDeliveryList);
 
 	/**
 	 * 异常装车

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -5258,13 +5258,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	}
 
 	@Override
-	public IPage<DistributionAppReservationVO> getAppDeliveryreservationTraysPage(IPage<DistributionAppReservationVO> page, DistributionAppDeliveryListDTO distributionDeliveryList) {
+	public List<DistributionAppReservationVO> getAppDeliveryreservationTraysPage( DistributionAppDeliveryListDTO distributionDeliveryList) {
 //		---------------------------------2023-09-25   新增托盘详情---------------------------------------------------------------------------------------
-		List<DistributionAppReservationVO> customList = distributionDeliveryInfoMapper.selectAppTarysListPage(page, Long.parseLong(distributionDeliveryList.getReservationId()));
+		List<DistributionAppReservationVO> customList = distributionDeliveryInfoMapper.selectAppTarysListPage( Long.parseLong(distributionDeliveryList.getReservationId()));
 		List<DistributionAppReservationVO> a = new ArrayList<>();
 		customList.forEach(c -> {
 			String trayCode = c.getTrayCode();
-			List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda().eq(DistributionLoadscanEntity::getReservationId, distributionDeliveryList.getReservationId()).eq(DistributionLoadscanEntity::getTrayNo, trayCode).ne(DistributionLoadscanEntity::getScanStatus, "1"));
+			List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
+				.eq(DistributionLoadscanEntity::getReservationId, distributionDeliveryList.getReservationId())
+				.eq(DistributionLoadscanEntity::getTrayNo, trayCode)
+				.ne(DistributionLoadscanEntity::getScanStatus, "1"));
 			c.setIsScan(1);
 			if (Func.isNotEmpty(loadscanEntityList) && loadscanEntityList.size() > 0) {
 				c.setIsScan(2);
@@ -5289,7 +5292,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			}
 
 		});
-		return page.setRecords(a);
+		return a;
 	}
 
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/MengTianPushDataJob.java

@@ -102,7 +102,7 @@ public class MengTianPushDataJob {
 		map.put("messageData", entries);
 		log.info("梦天手动回推签收扫描数据：{}", JSONUtil.toJsonStr(map));
 		rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_EXCHANGE, RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_ROUTING, map);
-		mtPushDataMapper.customPushNodeDataSended(js.getStr("sendTaskId"), 1);
+		mtPushDataMapper.customPushNodeDataSendedScan(js.getStr("unitNo"), 1);
 		return ReturnT.SUCCESS;
 	}
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.java

@@ -16,4 +16,6 @@ public interface MtPushDataMapper  extends BaseMapper<MtPushData> {
 	List<MtReceiveImagesDTO> customPushNodeDataImage(String sendTaskId);
 
 	void customPushNodeDataSended(@Param("sendTaskId") String sendTaskId, @Param("pushType") int pushType);
+
+	void customPushNodeDataSendedScan(@Param("unitNo") String unitNo, @Param("pushType") int pushType);
 }

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/mapper/MtPushDataMapper.xml

@@ -43,4 +43,10 @@
            set sendStatus = 1
          where sendTaskId = #{sendTaskId} and push_type = #{pushType}
     </update>
+
+    <update id="customPushNodeDataSendedScan">
+        update mt_custom_push_data_package
+           set sendStatus = 1
+         where unitNo = #{unitNo} and push_type = #{pushType}
+    </update>
 </mapper>

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

@@ -186,4 +186,25 @@ public interface WarehouseIndexMapper {
 	 * @return
 	 */
 	Integer findPlanNumByDay(@Param("param")IndexDTO indexDTO);
+
+	/**
+	 * 查询当月文员计划数
+	 * @param indexDTO
+	 * @return
+	 */
+	Integer findPlanNumByMonth(@Param("param")IndexDTO indexDTO);
+
+	/**
+	 * 查询当天文员复核超时数
+	 * @param indexDTO
+	 * @return
+	 */
+	Integer findClerkOverTimeNumByDay(@Param("param")IndexDTO indexDTO);
+
+	/**
+	 * 查询当月文员复核超时数
+	 * @param indexDTO
+	 * @return
+	 */
+	Integer findClerkOverTimeNumByMonth(@Param("param")IndexDTO indexDTO);
 }

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

@@ -655,6 +655,7 @@
         <where>
             reservation_status != 40
             AND is_deleted = 0
+            AND DATE_FORMAT(created_time, "%y%m%d" ) = DATE_FORMAT( #{param.dayStr}, "%y%m%d" )
             <if test="param.warehouseIds != null">
                 AND warehouse_id IN
                 <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
@@ -663,5 +664,64 @@
             </if>
         </where>
     </select>
+    <select id="findPlanNumByMonth" resultType="java.lang.Integer">
+        SELECT
+        count( 1 )
+        FROM
+        logpm_distribution_reservation
+        <where>
+            reservation_status != 40
+            AND is_deleted = 0
+            AND DATE_FORMAT(created_time, "%y%m" ) = DATE_FORMAT( #{param.dayStr}, "%y%m" )
+            <if test="param.warehouseIds != null">
+                AND warehouse_id IN
+                <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="findClerkOverTimeNumByDay" resultType="java.lang.Integer">
+        SELECT
+        count(1) AS num
+        FROM
+        logpm_distribution_reservation AS ldr
+        INNeR JOIN logpm_distribution_signfor AS lds ON ldr.id = lds.reservation_id
+        <where>
+            lds.signing_status = 2
+            AND ldr.is_deleted = 0
+            AND ldr.reservation_status != 40
+            AND lds.is_deleted = 0
+            AND DATE_FORMAT(ldr.create_time, "%y%m%d" ) = DATE_FORMAT( #{param.dayStr}, "%y%m%d" )
+            AND DATEDIFF (DATE_FORMAT(lds.signing_time,"%y%m%d"),DATE_FORMAT(ldr.create_time,"%y%m%d")) > 3
+            <if test="param.warehouseIds != null">
+                AND ldr.warehouse_id IN
+                <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <select id="findClerkOverTimeNumByMonth" resultType="java.lang.Integer">
+        SELECT
+        count(1) AS num
+        FROM
+        logpm_distribution_reservation AS ldr
+        INNeR JOIN logpm_distribution_signfor AS lds ON ldr.id = lds.reservation_id
+        <where>
+            lds.signing_status = 2
+            AND ldr.is_deleted = 0
+            AND ldr.reservation_status != 40
+            AND lds.is_deleted = 0
+            AND DATE_FORMAT(ldr.create_time, "%y%m" ) = DATE_FORMAT( #{param.dayStr}, "%y%m" )
+            AND DATEDIFF (DATE_FORMAT(lds.signing_time,"%y%m%d"),DATE_FORMAT(ldr.create_time,"%y%m%d")) > 3
+            <if test="param.warehouseIds != null">
+                AND ldr.warehouse_id IN
+                <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 
 </mapper>

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

@@ -314,9 +314,15 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 		indexSignforDayDataVO.setSignScale(daySignforScale);
 		//查询当天文员复核数
 		Integer dayClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByDay(indexDTO);
+		indexSignforDayDataVO.setClerkSignNum(dayClerkSignforNum);
 		//查询当天计划数
-		Integer planByday = warehouseIndexMapper.findPlanNumByDay(indexDTO);
+		Integer dayPlanByday = warehouseIndexMapper.findPlanNumByDay(indexDTO);
 		//计算文员签收率
+		Double dayClerkSignforScale = (double) (dayClerkSignforNum / (dayPlanByday + dayClerkSignforNum));
+		indexSignforDayDataVO.setClerkSignforScale(dayClerkSignforScale);
+		//文员超时复核数
+		Integer dayClerkOverTimeSignfoNum = warehouseIndexMapper.findClerkOverTimeNumByDay(indexDTO);
+//		indexSignforDayDataVO.setClerkOverTimeSignfoNum(dayClerkOverTimeSignfoNum);
 
 
 		indexSignforDayDataVO.setClerkSignNum(dayClerkSignforNum);
@@ -335,6 +341,15 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService {
 		//查询当月文员复核数
 		Integer monthClerkSignforNum = warehouseIndexMapper.findClerkSignforNumByMonth(indexDTO);
 		indexSignforMonthDataVO.setClerkSignNum(monthClerkSignforNum);
+		Integer monthPlanByday = warehouseIndexMapper.findPlanNumByMonth(indexDTO);
+		Double monthClerkSignforScale = (double) (monthClerkSignforNum / (monthPlanByday + monthClerkSignforNum));
+		indexSignforMonthDataVO.setClerkSignforScale(monthClerkSignforScale);
+		//查询当月文员复核
+		Integer monthClerkOverTimeSignfoNum = warehouseIndexMapper.findClerkOverTimeNumByMonth(indexDTO);
+		indexSignforMonthDataVO.setClerkOverTimeSignfoNum(monthClerkOverTimeSignfoNum);
+		Double monthClerkOverTimeScale = (double) (monthClerkOverTimeSignfoNum / monthPlanByday);
+		indexSignforMonthDataVO.setClerkOverTimeScale(monthClerkOverTimeScale);
+		list.add(indexSignforMonthDataVO);
 		return list;
 	}
 }

blade-service/logpm-report/src/main/java/com/logpm/report/vo/indexCount/IndexSignforDataVO.java

@@ -8,16 +8,23 @@ import java.math.BigDecimal;
 @Data
 public class IndexSignforDataVO implements Serializable {
 
-
+	//类型
 	private Integer type;
-
+	//签收数
 	private Integer signNum;
-
+	//未签收数
 	private Integer UnSignNum;
+	//文员超时为复核数
+	private Integer clerkOverTimeSignfoNum;
 
+	//文员超时为复核数
+	private Double clerkOverTimeScale;
 
+	//签收率
 	private Double signScale;
-
+	//复核率
+	private Double ClerkSignforScale;
+	//复核数
 	private Integer clerkSignNum;