1.干线修复

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalRecordServiceImpl.java

@@ -116,12 +116,13 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 		List<Long> abnormalRecordIds = abnormalRecordDTO.getAbnormalRecordIds();
 		List<AftersalesAbnormalRecordEntity> abnormalRecordEntityList = baseMapper.selectBatchIds(abnormalRecordIds);
 		if(CollUtil.isNotEmpty(abnormalRecordIds)){
-			abnormalRecordEntityList.forEach(abnormalRecordEntity -> {
+
+			for (AftersalesAbnormalRecordEntity abnormalRecordEntity : abnormalRecordEntityList) {
 				Long abnormalRecordId = abnormalRecordEntity.getId();
 				Integer abnormalStatus = abnormalRecordEntity.getAbnormalStatus();
 				if(abnormalStatus.equals(1)){
 					log.warn("################dealAbnormal: 异常已完结");
-					throw new CustomerException(405,"异常已完结");
+					continue;
 				}
 				String abnormalType = abnormalRecordEntity.getAbnormalType();
 				String upWarehouseName = abnormalRecordEntity.getWarehouseName();
@@ -141,7 +142,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 						R r = trunklineCarsLoadScanClient.incomingPackage(carsLoadScanId);
 						int code = r.getCode();
 						if(code != 200){
-							throw new CustomerException(405,"入库失败");
+							continue;
 						}
 
 						//发送异常列表包件入库
@@ -163,7 +164,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 						R r = trunklineCarsLoadScanClient.adnormalHasStock(carsLoadScanId,warehouseId);
 						int code = r.getCode();
 						if(code != 200){
-							throw new CustomerException(405,"入库失败");
+							continue;
 						}
 
 						//已入库
@@ -488,7 +489,7 @@ public class AftersalesAbnormalRecordServiceImpl extends BaseServiceImpl<Aftersa
 				abnormalRecordEntity.setDealUserId(AuthUtil.getUserId());
 				abnormalRecordEntity.setDealUserName(AuthUtil.getNickName());
 				updateById(abnormalRecordEntity);
-			});
+			}
 		}
 		return R.success("处理成功");
 	}

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

@@ -758,8 +758,6 @@
         ldsa.is_zero, ldsa.accept_warehouse_id, ldsa.accept_warehouse_name, ldsa.order_delivery_status
         from logpm_distribution_stock_article ldsa
         LEFT JOIN logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id
-        LEFT JOIN logpm_trunkline_waybill_order AS ltwo ON ldsa.waybill_number = ltwo.waybill_no
-        LEFT JOIN logpm_warehouse_waybill AS lww ON lww.id = ltwo.waybill_id
         <where>
             ldsa.order_status in ('10','20','30','70')
             and ldsa.reservation_status in ('10','20')
@@ -860,7 +858,6 @@
             <if test="par.customerAddress !=null  and par.customerAddress !=''">
                 and ldsa.customer_address like concat('%',#{par.customerAddress},'%')
             </if>
-            AND lww.check_status = 1
         </where>
         ORDER BY
         ldsa.warehouse_entry_time DESC