Merge remote-tracking branch 'origin/fix_bug_20240104' into fix_bug_20240104

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

@@ -757,7 +757,7 @@
         logpm_distribution_delivery_list lddl
         left join logpm_distribution_delivery_self ldds on lddl.id =ldds.delivery_id
         <where>
-            lddl.is_deleted =0 and lddl.warehourse_id =#{warehouseId}
+            lddl.is_deleted =0 and lddl.warehouse_id =#{warehouseId}
             <if test=" param.type != null and param.type != ''">and  lddl.type = #{param.type}</if>
             <if test="array != null and @org.apache.commons.collections4.CollectionUtils@isNotEmpty(array)">
                 and lddl.id in

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

@@ -1855,6 +1855,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 					for (DistributionStockArticleEntity distributionStockArticleEntity : v) {
 						List<DistributionParcelListEntity> distributionParcelListEntities = distributionReservationMapper.selectPackageByReservationAndStockArticle(reservationId, distributionStockArticleEntity.getId(), warehouseId);
 						for (DistributionParcelListEntity distributionParcelListEntity : distributionParcelListEntities) {
+							// 这个时候事物还没提交
 							if (distributionParcelListEntity.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())) {
 								String signingTime = distributionLoadscanMapper.selectPackageSigningTime(distributionParcelListEntity.getId());
 								MtReceiveContentDTO mtReceiveContentDTO = new MtReceiveContentDTO();

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

@@ -2451,7 +2451,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						}
 
 					} else if (distributionLoadscanEntity.getSignforState().equals(LoadScanSigningStatusConstant.weiqianshou.getValue())) {
-						if (distributionLoadscanEntity.getLoadedNub() == parcelNumberEntity.getReservationNum()) {
+						if (distributionLoadscanEntity.getLoadedNub() .equals(parcelNumberEntity.getReservationNum()) ) {
 							//装车数量和计划数量一致，这里进行签收数量的维护
 							//修改这里装车数量已经维护好了，只需要维护签收数量
 							distributionParcelNumberEntity.setSigninQuantity(signinQuantity.add(reservationNum).intValue());

blade-service/logpm-factory/src/main/java/com/logpm/factory/mt/feign/MtOrderMainClinet.java

@@ -56,11 +56,11 @@ public class MtOrderMainClinet implements IMtOrderMainClinet {
 		log.info(">>>>>>>>>>>>>>>>> 司机扫描 {}", DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss.SSS"));
 
 
-		rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_EXCHANGE,RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_ROUTING, map,message -> {
+	/*	rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_EXCHANGE,RabbitConstant.MT_BUSINESS_DATA_2_FACTORY_ROUTING, map,message -> {
 			message.getMessageProperties()
 				.setHeader("x-delay", 5000);
 			return message;
-		});
+		});*/
 		log.info(">>>>>>>>>>>>>>>>> 司机扫描 {}", DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss.SSS"));
 
 
@@ -77,11 +77,11 @@ public class MtOrderMainClinet implements IMtOrderMainClinet {
 		map.put("messageData",mes);
 		log.info(">>>>>>>>>>>>>>>>> 文员复核 {}", DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss.SSS"));
 
-		rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_EXCHANGE,RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_ROUTING, map,message -> {
+	/*	rabbitTemplate.convertAndSend(RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_EXCHANGE,RabbitConstant.MT_BUSINESS_DATA_CLERK_CHECK_2_FACTORY_ROUTING, map,message -> {
 			message.getMessageProperties()
 				.setHeader("x-delay", 5000);
 			return message;
-		});
+		});*/
 
 		return R.success("");