Merge branch 'dev' into pre-production

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

@@ -644,7 +644,7 @@
                               and ldrs.stock_list_status in (1, 3)
                         ) inventoryNub
         from logpm_distribution_reservation ldr
-                 LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.reservation_id = ldr.id AND AND ldsi.stock_status != 4
+                 LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.reservation_id = ldr.id AND  ldsi.stock_status != 4
                  LEFT JOIN logpm_distribution_stockup lds on lds.id = ldsi.stockup_id
                  LEFT JOIN logpm_distribution_reservation_stockarticle ldrs
                  on ldrs.reservation_id = ldr.id and ldrs.stock_article_status in (1, 3)

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

@@ -1765,8 +1765,11 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 				builder.append(orderCodes);
 
 				log.info(">>>>>> updatePackageDeliveryStatus,{}, {}", reservationId, packageIds);
+				if(!packageIds.isEmpty() && reservationId!=null){
 					//完成对该客户下此包件任务的取消
 					int row = distributionReservationMapper.updatePackageDeliveryStatus(reservationId, packageIds);
+				}
+
 				//维护预约订单状态
 			}
 			List<DistributionParcelNumberDTO> distributionParcelNumberDTOS = distributionReservationMapper.selectZeroPackageListByReservationId(reservationId);

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceMapper.xml

@@ -21,7 +21,7 @@
             delete_administrators_id = 0
             and orderSelfNum = #{orderSelfNum}
         </where>
-        order by id desc
+        order by waybill_no desc
         limit 1
     </select>
 

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

@@ -322,7 +322,7 @@ public class InComingServiceImpl implements IInComingService {
 										});
 									} catch (Exception customerException) {
 										log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 消息推送失败~ 请联系管理员！ ", customerException);
-										throw new CustomerException(customerException.getMessage());
+//										throw new CustomerException(customerException.getMessage());
 
 									}
 
@@ -335,7 +335,7 @@ public class InComingServiceImpl implements IInComingService {
 						});
 					} catch (Exception e) {
 						log.error(">>>>>>>>>>>>>>>>>>>>>>>>>> 预入库消息推送失败~ 请联系管理员！ ", e);
-						throw new CustomerException("服务器异常");
+//						throw new CustomerException("服务器异常");
 
 					}