Merge branch 'dev' into pre-production

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

@@ -167,4 +167,6 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
     int updateOrderPackageInceptionStatus(@Param("packageIds") List<Long> packageIds);
 
     void updateTransferStatus(@Param("orderCode") String orderCode, @Param("warehouseId") Long warehouseId, @Param("isTransfer") Integer isTransfer);
+
+    List<Map<String, Integer>> selectAllErrorReservationOrder();
 }

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

@@ -1074,4 +1074,10 @@
         and warehouse_id = #{warehouseId}
     </update>
 
+    <select id="selectAllErrorReservationOrder">
+        SELECT reservation_id,COUNT(1) as num from (
+        SELECT packet_bar_code,reservation_id from logpm_distribution_reservation_package where packet_bar_status !=2  GROUP BY packet_bar_code HAVING COUNT(1)>1)
+        t GROUP BY reservation_id
+    </select>
+
 </mapper>

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

@@ -446,11 +446,11 @@
         ldsl.sku,
         ldsl.grounding_time,
         ldsl.unpack,
-        lwug.position_code
+        (SELECT GROUP_CONCAT(position_code) from logpm_warehouse_updown_goods lwug where lwug.association_id =ldsl.material_id and market_name=ldsl.market_name) as position_code
+
+        <!--        lwug.position_code-->
             FROM
             logpm_distribution_stock_list ldsl
-            JOIN
-            logpm_warehouse_updown_goods lwug ON ldsl.material_id = lwug.association_id
         <where>
             ldsl.service_type = #{par.serviceType} and ldsl.warehouse_id = #{par.warehouseId} and ldsl.is_deleted = 0
             <if test="par.incomingBatch != null and par.incomingBatch != ''">

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

@@ -175,4 +175,7 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 
 	Set<String> updateEntityByOpenOrder(Long advanceId, Long warehouseId, Long waybillId);
 
+
+
+
 }

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

@@ -919,4 +919,5 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		return distributionStockArticleEntity;
 	}
 
+
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java

@@ -0,0 +1,41 @@
+package com.logpm.patch.jobhandle;
+
+
+import com.logpm.patch.service.ISyncDistributionParcelListService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 配送数据修复
+ */
+@Slf4j
+@AllArgsConstructor
+@Component
+public class DistributionDatarepair {
+
+
+	private final ISyncDistributionParcelListService distributionParcelListService;
+	/**
+	 * 预约状态修复
+	 * @param param
+	 * @return
+	 */
+	@XxlJob("reservationDatarepair")
+	public ReturnT<String> reservationDatarepair(String param) {
+
+
+
+
+		return null;
+
+
+	}
+
+
+
+
+
+}

blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/ISyncDistributionParcelListMapper.java

@@ -0,0 +1,14 @@
+package com.logpm.patch.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface ISyncDistributionParcelListMapper {
+
+
+ List<Map<String,Integer>> selectAllErrorReservationOrder();
+
+}

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/ISyncDistributionParcelListService.java

@@ -0,0 +1,14 @@
+package com.logpm.patch.service;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ISyncDistributionParcelListService {
+
+	/**
+	 * 获取错误的预约信息
+	 * @return
+	 */
+	List<Map<String,Integer>> selectAllErrorReservationOrder();
+
+}

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncDistributionParcelListServiceImpl.java

@@ -0,0 +1,15 @@
+package com.logpm.patch.service.impl;
+
+import com.logpm.patch.service.ISyncDistributionParcelListService;
+
+import java.util.List;
+import java.util.Map;
+
+public class SyncDistributionParcelListServiceImpl implements ISyncDistributionParcelListService {
+	@Override
+	public List<Map<String, Integer>> selectAllErrorReservationOrder() {
+
+
+		return null;
+	}
+}