java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

1.修改开单的队列名称

master
pref_mail@163.com 6 months ago
parent
1e4473d888
commit
f26f5c8d79
4 changed files with 8 additions and 152 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java
  2. 151
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
  3. 4
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/OpenWaybillToBusinessListener.java
  4. 3
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java

2
blade-biz-common/src/main/java/org/springblade/common/constant/broadcast/FanoutConstants.java
Unescape View File

@ -22,7 +22,6 @@ public abstract class FanoutConstants {
// 开单检测数据 --商家端
String SEND_BUSINESS_DATA_BY_OPENWAYBILL_DATA = "fanout.trunkline.openWaybill.send_business_data.open" + ModuleNameConstant.DEVAUTH;
// 改单数据 --商家端
String SEND_BUSINESS_DATA_BY_UPDATEWAYBILL_DATA = "fanout.trunkline.openWaybill.send_business_data.update" + ModuleNameConstant.DEVAUTH;
}
}
@ -36,6 +35,7 @@ public abstract class FanoutConstants {
interface QUEUE {
String STATISTICSDATA_UPDATEPACKAGEINFO = "fanout.trunkline.updatewaybill.statisticsdata.updatePackageinfo" + ModuleNameConstant.DEVAUTH;
String SEND_BUSINESS_DATA_BY_UPDATEWAYBILL_DATA = "fanout.trunkline.openWaybill.send_business_data.update" + ModuleNameConstant.DEVAUTH;
}

151
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionLoadscanMapper.xml
Unescape View File

@ -2,154 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.logpm.distribution.mapper.DistributionLoadscanMapper">
<!-- 通用查询映射结果 -->
<resultMap id="distributionLoadscanResultMap" type="com.logpm.distribution.entity.DistributionLoadscanEntity">
<result column="id" property="id"/>
<result column="tenant_id" property="tenantId"/>
<result column="create_user" property="createUser"/>
<result column="create_time" property="createTime"/>
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
<result column="is_deleted" property="isDeleted"/>
<result column="create_dept" property="createDept"/>
<result column="reserve1" property="reserve1"/>
<result column="id" property="id"/>
<result column="reserve2" property="reserve2"/>
<result column="tenant_id" property="tenantId"/>
<result column="reserve3" property="reserve3"/>
<result column="create_user" property="createUser"/>
<result column="reserve4" property="reserve4"/>
<result column="create_time" property="createTime"/>
<result column="reserve5" property="reserve5"/>
<result column="update_user" property="updateUser"/>
<result column="scan_type" property="scanType"/>
<result column="update_time" property="updateTime"/>
<result column="tray_id" property="trayId"/>
<result column="status" property="status"/>
<result column="brand_id" property="brandId"/>
<result column="is_deleted" property="isDeleted"/>
<result column="brand_name" property="brandName"/>
<result column="create_dept" property="createDept"/>
<result column="tray_no" property="trayNo"/>
<result column="reserve1" property="reserve1"/>
<result column="train_number" property="trainNumber"/>
<result column="vehicle_id" property="vehicleId"/>
<result column="reserve3" property="reserve3"/>
<result column="driver_id" property="driverId"/>
<result column="reserve4" property="reserve4"/>
<result column="vehicle_name" property="vehicleName"/>
<result column="reserve5" property="reserve5"/>
<result column="driver_name" property="driverName"/>
<result column="scan_type" property="scanType"/>
<result column="warehouse_id" property="warehouseId"/>
<result column="tray_id" property="trayId"/>
<result column="warehouse_name" property="warehouseName"/>
<result column="brand_id" property="brandId"/>
<result column="package_id" property="packageId"/>
<result column="brand_name" property="brandName"/>
<result column="packet_bar_code" property="packetBarCode"/>
<result column="tray_no" property="trayNo"/>
<result column="scan_status" property="scanStatus"/>
<result column="train_number" property="trainNumber"/>
<result column="confirm_time" property="confirmTime"/>
<result column="id" property="id"/>
<result column="vehicle_id" property="vehicleId"/>
<result column="scan_time" property="scanTime"/>
<result column="tenant_id" property="tenantId"/>
<result column="driver_id" property="driverId"/>
<result column="kitting" property="kitting"/>
<result column="create_user" property="createUser"/>
<result column="vehicle_name" property="vehicleName"/>
<result column="type" property="type"/>
<result column="create_time" property="createTime"/>
<result column="driver_name" property="driverName"/>
<result column="detention_person" property="detentionPerson"/>
<result column="update_user" property="updateUser"/>
<result column="warehouse_id" property="warehouseId"/>
<result column="un_warehouse_id" property="unWarehouseId"/>
<result column="update_time" property="updateTime"/>
<result column="warehouse_name" property="warehouseName"/>
<result column="un_warehouse_name" property="unWarehouseName"/>
<result column="status" property="status"/>
<result column="package_id" property="packageId"/>
<result column="un_administrators_id" property="unAdministratorsId"/>
<result column="is_deleted" property="isDeleted"/>
<result column="packet_bar_code" property="packetBarCode"/>
<result column="un_administrators_name" property="unAdministratorsName"/>
<result column="create_dept" property="createDept"/>
<result column="scan_status" property="scanStatus"/>
<result column="is_insert" property="isInsert"/>
<result column="reserve1" property="reserve1"/>
<result column="confirm_time" property="confirmTime"/>
<result column="scan_state" property="scanState"/>
<result column="scan_time" property="scanTime"/>
<result column="scan_synchronous" property="scanSynchronous"/>
<result column="reserve3" property="reserve3"/>
<result column="kitting" property="kitting"/>
<result column="plan_destination_id" property="planDestinationId"/>
<result column="reserve4" property="reserve4"/>
<result column="type" property="type"/>
<result column="msg" property="msg"/>
<result column="reserve5" property="reserve5"/>
<result column="detention_person" property="detentionPerson"/>
<result column="unload_time" property="unloadTime"/>
<result column="scan_type" property="scanType"/>
<result column="un_warehouse_id" property="unWarehouseId"/>
<result column="order_id" property="orderId"/>
<result column="tray_id" property="trayId"/>
<result column="un_warehouse_name" property="unWarehouseName"/>
<result column="reservation_id" property="reservationId"/>
<result column="brand_id" property="brandId"/>
<result column="un_administrators_id" property="unAdministratorsId"/>
<result column="delivery_id" property="deliveryId"/>
<result column="brand_name" property="brandName"/>
<result column="un_administrators_name" property="unAdministratorsName"/>
<result column="loaded_nub" property="loadedNub"/>
<result column="tray_no" property="trayNo"/>
<result column="is_insert" property="isInsert"/>
<result column="package_nub" property="packageNub"/>
<result column="train_number" property="trainNumber"/>
<result column="scan_state" property="scanState"/>
<result column="vehicle_id" property="vehicleId"/>
<result column="scan_synchronous" property="scanSynchronous"/>
<result column="driver_id" property="driverId"/>
<result column="plan_destination_id" property="planDestinationId"/>
<result column="vehicle_name" property="vehicleName"/>
<result column="msg" property="msg"/>
<result column="driver_name" property="driverName"/>
<result column="unload_time" property="unloadTime"/>
<result column="warehouse_id" property="warehouseId"/>
<result column="order_id" property="orderId"/>
<result column="warehouse_name" property="warehouseName"/>
<result column="reservation_id" property="reservationId"/>
<result column="package_id" property="packageId"/>
<result column="delivery_id" property="deliveryId"/>
<result column="packet_bar_code" property="packetBarCode"/>
<result column="loaded_nub" property="loadedNub"/>
<result column="scan_status" property="scanStatus"/>
<result column="package_nub" property="packageNub"/>
<result column="confirm_time" property="confirmTime"/>
<result column="scan_time" property="scanTime"/>
<result column="kitting" property="kitting"/>
<result column="type" property="type"/>
<result column="detention_person" property="detentionPerson"/>
<result column="un_warehouse_id" property="unWarehouseId"/>
<result column="un_warehouse_name" property="unWarehouseName"/>
<result column="un_administrators_id" property="unAdministratorsId"/>
<result column="un_administrators_name" property="unAdministratorsName"/>
<result column="is_insert" property="isInsert"/>
<result column="scan_state" property="scanState"/>
<result column="scan_synchronous" property="scanSynchronous"/>
<result column="plan_destination_id" property="planDestinationId"/>
<result column="msg" property="msg"/>
<result column="unload_time" property="unloadTime"/>
<result column="order_id" property="orderId"/>
<result column="reservation_id" property="reservationId"/>
<result column="delivery_id" property="deliveryId"/>
<result column="loaded_nub" property="loadedNub"/>
<result column="package_nub" property="packageNub"/>
</resultMap>
<update id="updatecutSumById">
@ -203,7 +56,7 @@
</update>
<select id="selectDistributionLoadscanPage" resultMap="distributionLoadscanResultMap">
<select id="selectDistributionLoadscanPage" resultType="com.logpm.distribution.vo.DistributionLoadscanVO">
select * from logpm_distribution_loadscan where is_deleted = 0
</select>

4
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mq/OpenWaybillToBusinessListener.java
Unescape View File

@ -113,8 +113,8 @@ public class OpenWaybillToBusinessListener {
@RabbitListener(bindings = @QueueBinding(
value = @Queue(name = FanoutConstants.trunkline.OPENWAYBILL.QUEUE.SEND_BUSINESS_DATA_BY_UPDATEWAYBILL_DATA),
exchange = @Exchange(name = FanoutConstants.trunkline.OPENWAYBILL.EXCHANGE, type = ExchangeTypes.FANOUT)
value = @Queue(name = FanoutConstants.trunkline.UPDATEWAYBILL.QUEUE.SEND_BUSINESS_DATA_BY_UPDATEWAYBILL_DATA),
exchange = @Exchange(name = FanoutConstants.trunkline.UPDATEWAYBILL.EXCHANGE, type = ExchangeTypes.FANOUT)
))
@Transactional(rollbackFor = Exception.class)
public void updateWaybillToBusinessDataHandler(String message) {

3
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderAsyncServiceImpl.java
Unescape View File

@ -845,6 +845,9 @@ public class OpenOrderAsyncServiceImpl implements IOpenOrderAsyncService {
Map<Long, BillladingPackageVO> billladingPackageMap = billladingPackageList.stream().collect(Collectors.toMap(BillladingPackageVO::getBillladingId, Function.identity()));
List<Long> billladingIds = new ArrayList<>(billladingPackageMap.keySet());
if(billladingIds.isEmpty()){
return;
}
QueryWrapper<TrunklineBillladingEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.in("id", billladingIds)

Write Preview
Loading…
Cancel
Save