1.干线bug修复

blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCheckListener.java

@@ -575,6 +575,12 @@ public class WaybillCheckListener {
 						Integer systemChargeType = warehouseWayBillDetail.getSystemChargeType();//系统运费计算方式
 						Integer systemPickupChargeType = warehouseWayBillDetail.getSystemPickupChargeType();//系统提货计算方式 默认案件数分摊
 
+						if(Objects.isNull(systemChargeType)){
+							systemChargeType = chargeType;
+						}
+
+
+
 						BigDecimal productTotalWeight = warehouseWayBillDetail.getWeight();//运单品类的总重量
 						Integer num = warehouseWayBillDetail.getNum();//运单品类的总数量
 						BigDecimal productTotalVolume = warehouseWayBillDetail.getVolume();//运单品类总体积

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

@@ -197,4 +197,6 @@ public interface TrunklineCarsLoadScanMapper extends BaseMapper<TrunklineCarsLoa
 	List<TrunklineCarsLoadScanEntity> findUnloadNoDataList(@Param("loadId") Long loadId, @Param("warehouseId") Long warehouseId);
 
 	void updateReserve1ByOrderPackageCode(@Param("orderPackageCode") String orderPackageCode, @Param("reseve1") String reseve1);
+
+    List<TrunklineCarsLoadScanEntity> findListByIdsAndType(@Param("carsLoadScanIdList") List<Long> carsLoadScanIdList, @Param("type") int type);
 }

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

@@ -1180,4 +1180,14 @@
         where scan_code = #{orderPackageCode}
     </update>
 
+    <select id="findListByIdsAndType" resultType="com.logpm.trunkline.entity.TrunklineCarsLoadScanEntity">
+        select *
+        from logpm_trunkline_cars_load_scan
+        where id in
+        <foreach collection="carsLoadScanIdList" item="id" separator="," open="(" close=")">
+            #{id}
+        </foreach>
+        and type = #{type}
+    </select>
+
 </mapper>

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

@@ -199,4 +199,6 @@ public interface ITrunklineCarsLoadScanService extends BaseService<TrunklineCars
 	List<TrunklineCarsLoadScanEntity> findUnloadNoDataList(Long loadId, Long warehouseId);
 
 	void updateReserve1ByOrderPackageCode(String orderPackageCode, String reseve1);
+
+	List<TrunklineCarsLoadScanEntity> findListByIdsAndType(List<Long> carsLoadScanIdList, int type);
 }

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

@@ -494,4 +494,9 @@ public class TrunklineCarsLoadScanServiceImpl extends BaseServiceImpl<TrunklineC
 		baseMapper.updateReserve1ByOrderPackageCode(orderPackageCode,reseve1);
 	}
 
+	@Override
+	public List<TrunklineCarsLoadScanEntity> findListByIdsAndType(List<Long> carsLoadScanIdList, int type) {
+		return baseMapper.findListByIdsAndType(carsLoadScanIdList,type);
+	}
+
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml

@@ -1177,25 +1177,6 @@
             </foreach>
         </if>
         group by lww.id
-        <if test="param.warehouseIds != null and param.warehouseIds.size() > 0">
-            HAVING
-            <foreach collection="param.warehouseIds" item="item" index="index" open="(" close=")">
-                <if test="index == 0">
-                    GROUP_CONCAT(DISTINCT ltwt.warehouse_id) like CONCAT('%',#{item},'%')
-                </if>
-                <if test="index != 0">
-                    or GROUP_CONCAT(DISTINCT ltwt.warehouse_id) like CONCAT('%',#{item},'%')
-                </if>
-            </foreach>
-            or group_concat(lww.departure_warehouse_id) in
-            <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-            or group_concat(lww.destination_warehouse_id) in
-            <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
         order by lww.create_time desc
     </select>