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

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

@@ -4831,7 +4831,27 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 	@Override
 	public R findAdvanceDetailListByWaybillId(AdvanceDTO advanceDTO) {
 
-		List<AdvanceDetailVO> advanceDetailVOList = advanceDetailService.findAdvanceDetailListByWaybillId(advanceDTO);
+		List<AdvanceDetailVO> advanceDetailVOList = new ArrayList<>();
+
+		Long clientId = advanceDTO.getClientId();
+		if(!Objects.isNull(clientId)){
+			Long waybillId = advanceDTO.getWaybillId();
+
+			List<TrunklineAdvanceEntity> trunklineAdvanceEntityList = trunklineWaybillOrderService.findListByWaybillId(waybillId);
+			//取出trunklineAdvanceEntityList中的所有id放入一个List
+			List<Long> advanceIds = trunklineAdvanceEntityList.stream().map(TrunklineAdvanceEntity::getId).collect(Collectors.toList());
+
+			BasicdataClientEntity basicdataClientEntity = basicdataClientClient.findEntityById(clientId);
+			if(!Objects.isNull(basicdataClientEntity)){
+				advanceDTO.setMainId(basicdataClientEntity.getMainId());
+				advanceDTO.setAdvanceIds(advanceIds);
+				advanceDetailVOList = advanceDetailService.findAdvanceDetailListByAdvanceIds(advanceDTO);
+			}else{
+				advanceDetailVOList = advanceDetailService.findAdvanceDetailListByWaybillId(advanceDTO);
+			}
+		}else{
+			advanceDetailVOList = advanceDetailService.findAdvanceDetailListByWaybillId(advanceDTO);
+		}
 
 		return R.data(advanceDetailVOList);
 	}

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

@@ -11533,13 +11533,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		//判断包件是否已入库
 		DistributionParcelListEntity distributionParcelListEntity = distributionParcelListClient.findByPacketBarCodeAndWarehouseId(orderPackageCode, warehouseId);
 		if (!Objects.isNull(distributionParcelListEntity)) {
-//			String orderPackageStatus = distributionParcelListEntity.getOrderPackageStatus();
-//			if ("20".equals(orderPackageStatus) || "30".equals(orderPackageStatus)) {
-//				log.warn("##############unloadPackage: 包件已入库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
-//				return Resp.scanFail(200,"包件已入库", "包件已入库");
-//			}
-			log.warn("##############unloadPackage: 包件已入库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
-			return Resp.scanFail(200,"包件已入库", "包件已入库");
+			String orderPackageStatus = distributionParcelListEntity.getOrderPackageStatus();
+			if ("20".equals(orderPackageStatus) || "30".equals(orderPackageStatus)) {
+				log.warn("##############unloadPackage: 包件已入库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
+				return Resp.scanFail(200,"包件已入库", "包件已入库");
+			}
+//			log.warn("##############unloadPackage: 包件已入库 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
+//			return Resp.scanFail(200,"包件已入库", "包件已入库");
 		}