1.放箱号明细导出增加选中行导出

2.放箱号明细，OW拿明细增加pod场站联系人电话等字段
3.OW箱明细导出增加选中行导出
4.OW拿明细批量修改POD场站同步明细和放箱号明细联系人电话信息

blade-service-api/blade-los-api/src/main/java/org/springblade/los/box/entity/PutBoxItems.java

@@ -322,6 +322,35 @@ public class PutBoxItems implements Serializable {
 	private String status;
 
 	/**
+	 * 目的港场站地址
+	 */
+	@ApiModelProperty(value = "目的港场站地址")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String podCyAddress;
+
+	/**
+	 * 目的港场站联系人
+	 */
+	@ApiModelProperty(value = "目的港场站联系人")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String podCyContact;
+
+	/**
+	 * 目的港场站邮箱
+	 */
+	@ApiModelProperty(value = "目的港场站邮箱")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String podCyEmail;
+
+	/**
+	 * 目的港场站电话
+	 */
+	@ApiModelProperty(value = "目的港场站电话")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String podCyTel;
+
+
+	/**
 	 * 临时字段  是否接入业务逻辑
 	 */
 	@TableField(exist = false)

blade-service-api/blade-los-api/src/main/java/org/springblade/los/box/entity/TradingBox.java

@@ -909,4 +909,10 @@ public class TradingBox implements Serializable {
 	@TableField(exist = false)
 	private String whetherDisplay;
 
+	/**
+	 * 明细ids
+	 */
+	@TableField(exist = false)
+	private String itemIds;
+
 }

blade-service-api/blade-los-api/src/main/java/org/springblade/los/box/entity/TradingBoxItem.java

@@ -611,6 +611,34 @@ public class TradingBoxItem implements Serializable {
 	private String buxStaus;
 
 	/**
+	 * 目的港场站地址
+	 */
+	@ApiModelProperty(value = "目的港场站地址")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String podCyAddress;
+
+	/**
+	 * 目的港场站联系人
+	 */
+	@ApiModelProperty(value = "目的港场站联系人")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String podCyContact;
+
+	/**
+	 * 目的港场站邮箱
+	 */
+	@ApiModelProperty(value = "目的港场站邮箱")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String podCyEmail;
+
+	/**
+	 * 目的港场站电话
+	 */
+	@ApiModelProperty(value = "目的港场站电话")
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String podCyTel;
+
+	/**
 	 * 起租日期
 	 */
 	@TableField(exist = false)

blade-service/blade-los/src/main/java/org/springblade/los/box/controller/PutBoxItemsController.java

@@ -158,7 +158,7 @@ public class PutBoxItemsController extends BladeController {
 	 * 导出放箱号箱明细数据
 	 */
 	@GetMapping("/exportBoxItem")
-	public void exportBoxItem(HttpServletResponse response, Long pid) {
+	public void exportBoxItem(HttpServletResponse response, Long pid,@RequestParam(value = "itemIds",required = false) String itemIds) {
 		PutBox putBox = putBoxMapper.selectById(pid);
 		if (putBox == null) {
 			throw new RuntimeException("未查到单据信息");
@@ -166,6 +166,7 @@ public class PutBoxItemsController extends BladeController {
 		List<PutBoxItems> list = putBoxItemsService.list(new LambdaQueryWrapper<PutBoxItems>()
 			.eq(PutBoxItems::getTenantId, AuthUtil.getTenantId())
 			.eq(PutBoxItems::getIsDeleted, 0)
+			.apply(ObjectUtils.isNotNull(itemIds), "find_in_set(id,'" + itemIds + "')")
 			.eq(PutBoxItems::getPid, pid));
 		for (PutBoxItems items : list) {
 			items.setContainerNumber(putBox.getContainerNumber());

blade-service/blade-los/src/main/java/org/springblade/los/box/controller/TradingBoxController.java

@@ -40,7 +40,6 @@ import org.springblade.los.box.entity.TradingBox;
 import org.springblade.los.box.entity.TradingBoxItem;
 import org.springblade.los.box.service.ITradingBoxItemService;
 import org.springblade.los.box.service.ITradingBoxService;
-import org.springblade.los.statisticAnalysis.FeeSummaryDetailRD;
 import org.springblade.system.feign.ISysClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -267,6 +266,7 @@ public class TradingBoxController extends BladeController {
 		List<TradingBoxItem> tradingBoxItemList = tradingBoxItemService.list(new LambdaQueryWrapper<TradingBoxItem>()
 			.eq(TradingBoxItem::getTenantId, AuthUtil.getTenantId())
 			.eq(TradingBoxItem::getIsDeleted, 0)
+			.apply(ObjectUtils.isNotNull(tradingBox.getItemIds()), "find_in_set(id,'" + tradingBox.getItemIds() + "')")
 			.eq(TradingBoxItem::getPid, tradingBox.getId())
 		);
 		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
@@ -275,28 +275,28 @@ public class TradingBoxController extends BladeController {
 		for (TradingBoxItem item : tradingBoxItemList) {
 			if ("OW-N,OW-F".contains(detail.getType())) {
 				ExportTradingBoxItemOutEn export = new ExportTradingBoxItemOutEn();
-				if (ObjectUtils.isNotNull(detail.getEffectiveDate())){
+				if (ObjectUtils.isNotNull(detail.getEffectiveDate())) {
 					export.setEffectiveDate(formatter.format(detail.getEffectiveDate()));
 				}
 				export.setContainerNumber(item.getContainerNumber());
 				export.setCode(item.getCode());
 				export.setBoxType(item.getBoxType());
-				if (ObjectUtils.isNotNull(item.getPolPickUpDate())){
+				if (ObjectUtils.isNotNull(item.getPolPickUpDate())) {
 					export.setPolPickUpDate(formatter.format(item.getPolPickUpDate()));
 				}
 				export.setPolCname(detail.getPolCname());
 				export.setPodCname(detail.getPodCname());
-				if (ObjectUtils.isNotNull(item.getEtd())){
+				if (ObjectUtils.isNotNull(item.getEtd())) {
 					export.setEtd(formatter.format(item.getEtd()));
 				}
-				if (ObjectUtils.isNotNull(item.getEta())){
+				if (ObjectUtils.isNotNull(item.getEta())) {
 					export.setEta(formatter.format(item.getEta()));
 				}
 				export.setOffhireReference(detail.getOffhireReference());
-				if (ObjectUtils.isNotNull(detail.getExpiryDate())){
+				if (ObjectUtils.isNotNull(detail.getExpiryDate())) {
 					export.setExpiryDate(formatter.format(detail.getExpiryDate()));
 				}
-				if (ObjectUtils.isNotNull(item.getPodEmptyContainerReturnDate())){
+				if (ObjectUtils.isNotNull(item.getPodEmptyContainerReturnDate())) {
 					export.setPodEmptyContainerReturnDate(formatter.format(item.getPodEmptyContainerReturnDate()));
 				}
 				export.setRepairCost("");
@@ -316,7 +316,7 @@ public class TradingBoxController extends BladeController {
 				outList.add(data);
 			}
 		}
-		if ("OW-N,OW-F".equals(detail.getType())) {
+		if ("OW-N,OW-F".contains(detail.getType())) {
 			ExcelUtil.export(response, "箱明细", "箱明细", outListEn, ExportTradingBoxItemOutEn.class);
 		} else {
 			ExcelUtil.export(response, "箱明细", "箱明细", outList, ExportTradingBoxItemOut.class);

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

@@ -2668,11 +2668,6 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 		if (putBox == null) {
 			throw new RuntimeException("未查到放箱号");
 		}
-		putBox.setPodCyAddress(tradingBox.getPodCyAddress());
-		putBox.setPodCyContact(tradingBox.getPodCyContact());
-		putBox.setPodCyEmail(tradingBox.getPodCyEmail());
-		putBox.setPodCyTel(tradingBox.getPodCyTel());
-		putBoxService.updateById(putBox);
 		List<PutBoxItems> putBoxItemsList = putBoxItemsService.list(new LambdaQueryWrapper<PutBoxItems>()
 			.eq(PutBoxItems::getTenantId, AuthUtil.getTenantId())
 			.eq(PutBoxItems::getIsDeleted, 0)
@@ -2688,6 +2683,10 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			item.setPodStationCname(tradingBox.getPodStationCname());
 			item.setPodStationCode(tradingBox.getPodStationCode());
 			item.setPodStationEname(tradingBox.getPodStationEname());
+			item.setPodCyAddress(tradingBox.getPodCyAddress());
+			item.setPodCyContact(tradingBox.getPodCyContact());
+			item.setPodCyEmail(tradingBox.getPodCyEmail());
+			item.setPodCyTel(tradingBox.getPodCyTel());
 			item.setUpdateUser(AuthUtil.getUserId());
 			item.setUpdateUserName(AuthUtil.getUserName());
 			item.setUpdateTime(new Date());
@@ -2700,6 +2699,10 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			boxItems.setPodStationCname(tradingBox.getPodStationCname());
 			boxItems.setPodStationCode(tradingBox.getPodStationCode());
 			boxItems.setPodStationEname(tradingBox.getPodStationEname());
+			boxItems.setPodCyAddress(tradingBox.getPodCyAddress());
+			boxItems.setPodCyContact(tradingBox.getPodCyContact());
+			boxItems.setPodCyEmail(tradingBox.getPodCyEmail());
+			boxItems.setPodCyTel(tradingBox.getPodCyTel());
 			boxItems.setUpdateUser(AuthUtil.getUserId());
 			boxItems.setUpdateUserName(AuthUtil.getUserName());
 			boxItems.setUpdateTime(new Date());
@@ -2718,11 +2721,6 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				.eq(Bills::getIsDeleted, 0)
 				.in(Bills::getMblno, mblno));
 			if (!billsList.isEmpty()) {
-/*				for (Bills item : billsList) {
-					if (new Date().compareTo(item.getEtd()) > 0) {
-						throw new RuntimeException("提单号：" + item.getMblno() + "已开船，修改失败");
-					}
-				}*/
 				List<Containers> containersList = containersService.list(new LambdaQueryWrapper<Containers>()
 					.eq(Containers::getTenantId, AuthUtil.getTenantId())
 					.eq(Containers::getIsDeleted, 0)