fix:修复商家预入库数量的展示问题

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataDriverArteryClient.java

@@ -62,7 +62,7 @@ public interface IBasicdataDriverArteryClient {
     List<JSONObject> findDriverListByName(@RequestParam String driverName,@RequestParam String jobType);
 
 	@GetMapping(API_PREFIX+"/getDriverArteryById")
-	BasicdataDriverArteryEntity getDriverArteryById(Long id);
+	BasicdataDriverArteryEntity getDriverArteryById(@RequestParam Long id);
 
 	@GetMapping(API_PREFIX+"/findDriverListByNameAndWarehouseId")
 	List<JSONObject> findDriverListByNameAndWarehouseId(@RequestParam String driverName, @RequestParam String jobType, @RequestParam Long warehouseId);

blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml

@@ -190,9 +190,9 @@
         driver_name,
         task_time,
         COUNT(DISTINCT order_code) as orderCount,
-        COUNT(DISTINCT order_package_code) as orderPackageCodeCount,
+        sum( quantity ) as orderPackageCodeCount,
-        sum(case  when order_package_loading_status =20 then 1 else 0 end ) as loadCarCount,
+        sum( load_num ) as loadCarCount,
-        sum(case  when in_warehouse =1 then 1 else 0 end ) as inWarehouseCount
+        sum( unload_num ) as inWarehouseCount
 
         from logpm_business_pre_order
         <where>
@@ -218,9 +218,9 @@
         driver_name,
         task_time,
         COUNT(DISTINCT order_code) as orderCount,
-        COUNT(DISTINCT order_package_code) as orderPackageCodeCount,
+        sum(quantity) as orderPackageCodeCount,
-        sum(case  when order_package_loading_status =20 then 1 else 0 end ) as loadCarCount,
+        sum(load_num ) as loadCarCount,
-        sum(case  when in_warehouse =1 then 1 else 0 end ) as inWarehouseCount
+        sum(unload_num ) as inWarehouseCount
         from logpm_business_pre_order
         <where>
             is_deleted=0

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

@@ -154,6 +154,6 @@
         FROM
             logpm_distribution_loadscan
         WHERE
-            reservation_id = #{reservationId} AND parcel_list_id = #{parcelListId}
+            reservation_id = #{reservationId} AND package_id = #{parcelListId}
     </select>
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/BusinessPreOrderDataQueueHandler.java

@@ -146,7 +146,7 @@ public class BusinessPreOrderDataQueueHandler {
 							//设置装车数量
 							data.setLoadNum(distributionLoadscanEntity.getLoadedNub());
 						}
-
+						data.setConditions(3);
 						data.setDriverName(distributionDeliveryListEntity.getDriverName());
 						data.setVehicleName(distributionDeliveryListEntity.getVehicleName());
 						data.setDistrCarNumber(distributionDeliveryListEntity.getTrainNumber());

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

@@ -11,7 +11,6 @@ public interface IInComingService {
 
 	R incomingPackages(InComingDTO inComingDTO);
 
-	@Transactional(rollbackFor = Exception.class)
 	R incomingPackageByTaryCode(InComingDTO inComingDTO);
 
 	R findIncomingOrderList(InComingDTO inComingDTO);