Merge remote-tracking branch 'origin/dev' into pre-production

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

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.logpm.aftersales.entity.AftersalesAbnormalRecordEntity;
 import com.logpm.aftersales.feign.IAftersalesAbnormalRecordClient;
+import com.logpm.aftersales.feign.IAftersalesWorkOrderClient;
 import com.logpm.basicdata.entity.BasicdataDriverArteryEntity;
 import com.logpm.basicdata.entity.BasicdataTrayEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
@@ -118,6 +119,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	private final ITrunklineLoadSignPhotoService loadSignPhotoService;
 	private final ITrunklineWaybillPackageService waybillPackageService;
 	private final ITrunklinePackageTrackLogClient packageTrackLogClient;
+	private final IAftersalesWorkOrderClient aftersalesWorkOrderClient;
 
 	@Override
 	public IPage<TrunklineCarsLoadVO> loadCarsPageList(LoadCarsDTO loadCarsDTO) {
@@ -4368,7 +4370,29 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			});
 
 			newParcelListEntities.forEach(e -> {
-				carsLoadAsyncService.dealwithAfterAbnormalPackage(e.getOrderPackageCode(), warehouseId, warehouseName, carsLoadEntity.getCarsNo(), userId, deptId, nickName);
+
+				String orderPackageCode = e.getOrderPackageCode();
+
+				List<AftersalesAbnormalRecordEntity> abnormalRecordEntities = abnormalRecordClient.findOrderPackageAndAbnormalStatus(orderPackageCode,"0");
+				//循环abnormalRecordEntities把abnormalStatus改为1
+				//如果send_order_status = 1 则修改工单记录
+				for (AftersalesAbnormalRecordEntity abnormalRecordEntity : abnormalRecordEntities) {
+					Integer sendOrderStatus = abnormalRecordEntity.getSendOrderStatus();
+					if(Objects.isNull(sendOrderStatus)){
+						continue;
+					}
+
+					if(sendOrderStatus == 1){
+						//修改对应工单记录
+						aftersalesWorkOrderClient.updateWorkOrderStatus(warehouseId,orderPackageCode,1);
+					}
+					abnormalRecordEntity.setAbnormalStatus(1);
+					abnormalRecordEntity.setDealUserId(userId);
+					abnormalRecordEntity.setDealUserName(nickName);
+					abnormalRecordEntity.setRemark("包件已在 "+warehouseName+" 车次号："+carsNo+" 中被卸车");
+				}
+				abnormalRecordClient.updateList(abnormalRecordEntities);
+//				carsLoadAsyncService.dealwithAfterAbnormalPackage(e.getOrderPackageCode(), warehouseId, warehouseName, carsLoadEntity.getCarsNo(), userId, deptId, nickName);
 			});
 
 			String content = "包件在 " + warehouseName + "卸车，卸车方式：" + IncomingTypeEnum.getValue(incomingType);