场站api接口同步功能自动bug修改

blade-service/blade-los/src/main/java/org/springblade/los/box/dynamics/service/impl/BoxDynamicsRecordServiceImpl.java

@@ -779,6 +779,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 				}
 			}*/
 			if (!itemsListJC.isEmpty()){
+				for (BoxDynamicsRecordItems item : itemsListJC){
+					item.setTenantId(AuthUtil.getTenantId());
+				}
 				this.synchronization(itemsListJC);
 			}
 			List<BoxDynamicsRecordItems> itemsListFC = itemsList.stream().filter(e -> "C".equals(e.getObjective())).collect(Collectors.toList());
@@ -1505,7 +1508,6 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 								putBoxItem.setPolCyEname(item.getPortEname());
 								putBoxItem.setPolPickUpDate(item.getApproachExitDate());
 								putBoxItem.setPolPreAppearanceDate(item.getApproachExitDate());
-								putBoxItem.setMblno(putBox.getSrcNo());
 								putBoxItem.setBoxStatus(item.getBoxStatus());
 							} else {
 								putBoxItem = new PutBoxItems();
@@ -1526,7 +1528,6 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 								putBoxItem.setPolCyEname(item.getPortEname());
 								putBoxItem.setPolPickUpDate(item.getApproachExitDate());
 								putBoxItem.setPolPreAppearanceDate(item.getApproachExitDate());
-								putBoxItem.setMblno(putBox.getSrcNo());
 							}
 						} else {
 							putBoxItem = new PutBoxItems();
@@ -1540,7 +1541,6 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 							putBoxItem.setContainerNumber(item.getContainerNumber());
 							putBoxItem.setBoxCode(item.getBoxCode());
 							putBoxItem.setBoxType(item.getBoxType());
-							putBoxItem.setMblno(putBox.getSrcNo());
 							putBoxItem.setBoxDynamics("调箱进场");
 							putBoxItem.setPolCyId(item.getStationId());
 							putBoxItem.setPolCyCode(item.getStationCode());
@@ -1572,7 +1572,6 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 											.findFirst().orElse(null);
 										if (tradingBoxItem != null) {
 											tradingBoxItem.setPid(tradingBox.getId());
-											tradingBoxItem.setMblno(putBox.getSrcNo());
 											tradingBoxItem.setBoxDynamics("调箱进场");
 											tradingBoxItem.setPortId(item.getPortId());
 											tradingBoxItem.setPortCode(item.getPortCode());
@@ -1610,7 +1609,6 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 											tradingBoxItem.setPid(tradingBox.getId());
 											tradingBoxItem.setContainerNumber(item.getContainerNumber());
 											tradingBoxItem.setCode(item.getBoxCode());
-											tradingBoxItem.setMblno(putBox.getSrcNo());
 											tradingBoxItem.setBoxDynamics("调箱进场");
 											tradingBoxItem.setBoxType(item.getBoxType());
 											tradingBoxItem.setPortId(item.getPortId());
@@ -1650,7 +1648,6 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 										tradingBoxItem.setPid(tradingBox.getId());
 										tradingBoxItem.setContainerNumber(item.getContainerNumber());
 										tradingBoxItem.setCode(item.getBoxCode());
-										tradingBoxItem.setMblno(putBox.getSrcNo());
 										tradingBoxItem.setBoxDynamics("调箱进场");
 										tradingBoxItem.setBoxType(item.getBoxType());
 										tradingBoxItem.setPortId(item.getPortId());
@@ -2064,7 +2061,6 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 											} else if ("OW-F".equals(tradingBox.getType())) {
 												tradingBoxItem.setBoxCategory("OW(放)");
 											}
-											putBoxItem.setBoxClass(putBox.getBusType());
 											tradingBoxItem.setBoxCondition("新");
 											tradingBoxItem.setBoxStatus(item.getBoxStatus());
 											tradingBoxItem.setPid(tradingBox.getId());
@@ -3092,6 +3088,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 		} else {
 			for (BoxDynamicsRecordItems item : itemsList) {
 				item.setPid(boxDynamicsRecord.getId());
+				item.setTenantId(AuthUtil.getTenantId());
 				boxDynamicsRecordItemsService.save(item);
 			}
 			// 创建线程池
@@ -3127,17 +3124,18 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 			throw new RemoteException("进出场目的不能为空");
 		}
 		if (!itemsListJC.isEmpty()) {
+			String tenantId = itemsListJC.get(0).getTenantId();
 			List<String> boxCodeList = itemsListJC.stream().map(BoxDynamicsRecordItems::getBoxCode).filter(Objects::nonNull)
 				.distinct().collect(Collectors.toList());
 			//箱档案数据
 			List<Archives> archivesList = archivesService.list(new LambdaQueryWrapper<Archives>()
-				.eq(Archives::getTenantId, AuthUtil.getTenantId())
+				.eq(Archives::getTenantId, tenantId)
 				.eq(Archives::getIsDeleted, 0)
 				.in(Archives::getCode, boxCodeList));
 			List<String> containerNumberList = itemsListJC.stream().map(BoxDynamicsRecordItems::getContainerNumber)
 				.distinct().collect(Collectors.toList());
 			List<PutBox> putBoxList = putBoxService.list(new LambdaQueryWrapper<PutBox>()
-				.eq(PutBox::getTenantId, AuthUtil.getTenantId())
+				.eq(PutBox::getTenantId, tenantId)
 				.eq(PutBox::getIsDeleted, 0)
 				.in(PutBox::getContainerNumber, containerNumberList));
 			if (putBoxList.isEmpty()) {
@@ -3146,9 +3144,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 			List<Long> putBoxIdList = putBoxList.stream().map(PutBox::getId).collect(Collectors.toList());
 			List<PutBoxItems> putBoxItemsList = putBoxItemsService.list(new LambdaQueryWrapper<PutBoxItems>()
 				.eq(PutBoxItems::getIsDeleted, 0)
-				.eq(PutBoxItems::getTenantId, AuthUtil.getTenantId())
+				.eq(PutBoxItems::getTenantId, tenantId)
 				.in(PutBoxItems::getPid, putBoxIdList));
-			String blacklist = sysClient.getParamService("box.blacklist");
+			String blacklist = sysClient.getParamServiceDWT("box.blacklist",tenantId);
 			if (ObjectUtils.isNotNull(blacklist)) {
 				StringBuilder text = new StringBuilder();
 				for (String item : boxCodeList) {
@@ -3167,7 +3165,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 			List<TradingBox> tradingBoxList = new ArrayList<>();
 			if (!srcIdList.isEmpty()) {
 				tradingBoxList = tradingBoxMapper.selectList(new LambdaQueryWrapper<TradingBox>()
-					.eq(TradingBox::getTenantId, AuthUtil.getTenantId())
+					.eq(TradingBox::getTenantId, tenantId)
 					.eq(TradingBox::getIsDeleted, 0)
 					.in(TradingBox::getId, srcIdList));
 			}
@@ -3176,7 +3174,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 				List<Long> tradingBoxIdList = tradingBoxList.stream().map(TradingBox::getId).collect(Collectors.toList());
 				tradingBoxItemList = tradingBoxItemService.list(new LambdaQueryWrapper<TradingBoxItem>()
 					.eq(TradingBoxItem::getIsDeleted, 0)
-					.eq(TradingBoxItem::getTenantId, AuthUtil.getTenantId())
+					.eq(TradingBoxItem::getTenantId, tenantId)
 					.in(TradingBoxItem::getPid, tradingBoxIdList));
 			}
 			List<PutBoxItems> putBoxItems = new ArrayList<>();
@@ -3250,6 +3248,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 						archives.setStationCode(item.getStationCode());
 						archives.setStationCname(item.getStationCname());
 						archives.setStationEname(item.getStationEname());
+						archives.setTenantId(tenantId);
 					}
 					archivesArrayList.add(archives);
 					if (ObjectUtils.isNotNull(putBox.getBoxType()) && !putBox.getBoxType().equals(item.getBoxType())) {
@@ -3292,6 +3291,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 							putBoxItem.setPolCyEname(item.getPortEname());
 							putBoxItem.setPolPickUpDate(item.getApproachExitDate());
 							putBoxItem.setPolPreAppearanceDate(item.getApproachExitDate());
+							putBoxItem.setTenantId(tenantId);
 						}
 					} else {
 						putBoxItem = new PutBoxItems();
@@ -3313,6 +3313,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 						putBoxItem.setPolCyEname(item.getPortEname());
 						putBoxItem.setPolPickUpDate(item.getApproachExitDate());
 						putBoxItem.setPolPreAppearanceDate(item.getApproachExitDate());
+						putBoxItem.setTenantId(tenantId);
 					}
 					if (ObjectUtils.isNotNull(putBox.getBoxEastId()) && !"null".equals(putBox.getBoxEastId())) {
 						putBoxItem.setBoxEastId(Long.parseLong(putBox.getBoxEastId()));
@@ -3402,6 +3403,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 											tradingBoxItem.setPolPreAppearanceDate(new Date());
 										}
 										tradingBoxItem.setStatus("待使用");
+										tradingBoxItem.setTenantId(tenantId);
 									}
 								} else {
 									tradingBoxItem = new TradingBoxItem();
@@ -3442,6 +3444,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 										tradingBoxItem.setPolPreAppearanceDate(new Date());
 									}
 									tradingBoxItem.setStatus("待使用");
+									tradingBoxItem.setTenantId(tenantId);
 								}
 								tradingBoxItem.setBoxEastId(tradingBox.getPurchaseCompanyId());
 								tradingBoxItem.setBoxEastName(tradingBox.getPurchaseCompanyName());
@@ -3553,7 +3556,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 						archivesTrajectory.setCreateTime(new Date());
 						archivesTrajectory.setCreateUser(AuthUtil.getUserId());
 						archivesTrajectory.setCreateUserName(AuthUtil.getUserName());
-						archivesTrajectory.setTenantId(AuthUtil.getTenantId());
+						archivesTrajectory.setTenantId(tenantId);
 						archivesTrajectory.setSrcId(tradingBox.getId());
 						archivesTrajectory.setEtd(item.getEtd());
 						archivesTrajectory.setPolCyId(item.getPolCyId());

blade-service/blade-los/src/main/java/org/springblade/los/box/service/impl/PutBoxServiceImpl.java

@@ -3672,11 +3672,11 @@ public class PutBoxServiceImpl extends ServiceImpl<PutBoxMapper, PutBox> impleme
 				if (billsHYJKList.isEmpty()) {
 					throw new RuntimeException("未查到海运出口单据");
 				}
-				for (Bills item : billsHYJKList) {
+				/*for (Bills item : billsHYJKList) {
 					if (ObjectUtils.isNotNull(item.getEtd()) && new Date().compareTo(item.getEtd()) > 0) {
 						throw new RuntimeException("提单号：" + item.getMblno() + "已开船，修改失败");
 					}
-				}
+				}*/
 				List<Long> idHYJKList = billsHYJKList.stream().map(Bills::getMasterId).distinct().collect(Collectors.toList());
 				List<Bills> billsHYJKListFD = billsMapper.selectList(new LambdaQueryWrapper<Bills>()
 					.eq(Bills::getTenantId, AuthUtil.getTenantId())