1.修复数据同步问题

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.java

@@ -206,5 +206,5 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
 
 	String findBrandNameByCarLoadCode(@Param("loadCode")  String loadCode);
 
-	int findEntityByOrderPackageCodeAndUnloadTime(@Param("orderPackageCode")  String orderPackageCode, @Param("unloadTime")  Date unloadTime);
+	int findEntityByOrderPackageCodeAndUnloadTime(@Param("orderPackageCode")  String orderPackageCode, @Param("unloadTime")  Date unloadTime, @Param("warehouseId") Long warehouseId);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml

@@ -1233,6 +1233,7 @@
         from logpm_trunkline_cars_load_scan ltcls
         where ltcls.scan_code = #{orderPackageCode}
           and ltcls.unload_time > #{unloadTime}
+          and ltcls.unload_node_id != #{warehouseId}
     </select>
 
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineCarsLoadScanService.java

@@ -213,5 +213,5 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 	 */
 	String findBrandNameByCarLoadCode(String loadCode);
 
-	int findEntityByOrderPackageCodeAndUnloadTime(String orderPackageCode, Date unloadTime);
+	int findEntityByOrderPackageCodeAndUnloadTime(String orderPackageCode, Date unloadTime, Long warehouseId);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadScanServiceImpl.java

@@ -515,7 +515,7 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 	}
 
 	@Override
-	public int findEntityByOrderPackageCodeAndUnloadTime(String orderPackageCode, Date unloadTime) {
-		return baseMapper.findEntityByOrderPackageCodeAndUnloadTime(orderPackageCode,unloadTime);
+	public int findEntityByOrderPackageCodeAndUnloadTime(String orderPackageCode, Date unloadTime, Long warehouseId) {
+		return baseMapper.findEntityByOrderPackageCodeAndUnloadTime(orderPackageCode,unloadTime,warehouseId);
 	}
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -13641,7 +13641,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					orderPackageCodeList.add(orderPackageCode);
 
 					//查询是否有在系统无编码后进行卸车的数据
-					int unloadNum = trunklineCarsLoadScanService.findEntityByOrderPackageCodeAndUnloadTime(orderPackageCode,unloadTime);
+					int unloadNum = trunklineCarsLoadScanService.findEntityByOrderPackageCodeAndUnloadTime(orderPackageCode,unloadTime,warehouseId);
 					if(unloadNum > 0){
 						DistributionParcelListEntity parcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
 						if(!Objects.isNull(parcelListEntity)){