1.中外运edi增加判断

2.费用生成账单-账单日期与业务日期同步
3.OW箱明细导出
4.OW拿明细批量修改POD场站问题修改
5.报表打印名称全部取值全称，不要简称
6.放箱号明细创建人修改人为空问题修改

blade-service-api/blade-los-api/src/main/java/org/springblade/los/box/dto/ExportTradingBoxItemOutEn.java

@@ -47,12 +47,6 @@ public class ExportTradingBoxItemOutEn implements Serializable {
 	 */
 	@ExcelProperty(value = "Release Date")
 	private String effectiveDate;
-
-	/**
-	 * 箱东
-	 */
-	@ExcelProperty(value = "Owner")
-	private String boxEastName;
 	/**
 	 * 放箱号
 	 */

blade-service-api/blade-los-api/src/main/java/org/springblade/los/box/excel/EmptyContainerAppearance.java

@@ -75,7 +75,7 @@ public class EmptyContainerAppearance {
 	/**
 	 * 箱好坏
 	 */
-	@ExcelProperty(value = "箱好坏")
+	@ExcelProperty(value = "箱好坏（好/坏）")
 	private String status;
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -1009,7 +1009,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							}
 							List<FeeCenter> feeCenterListMh = feeCenterService.list(lambdaQueryWrapper);
 							if (!feeCenterListMh.isEmpty()) {
-								for (FeeCenter item : feeCenterListMh) {
+								/*for (FeeCenter item : feeCenterListMh) {
 									if (ObjectUtils.isNotNull(item.getShortName())) {
 										item.setCorpCnName(item.getShortName());
 									} else {
@@ -1020,7 +1020,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 									} else {
 										item.setBillCorpCnName("无");
 									}
-								}
+								}*/
 								for (Bills item : billsList) {
 									this.dictionaryConversion(item);
 									item.setPrintPeople(AuthUtil.getUserName());
@@ -1119,7 +1119,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						bills.setFeeCenterListD(feeD);
 						List<FeeCenter> feeC = feeCenterList.stream().filter(e -> MagicValues.C.equals(e.getDc())).collect(Collectors.toList());
 						bills.setFeeCenterListC(feeC);
-						for (FeeCenter item : feeCenterList) {
+						/*for (FeeCenter item : feeCenterList) {
 							if (ObjectUtils.isNotNull(item.getShortName())) {
 								item.setCorpCnName(item.getShortName());
 							} else {
@@ -1130,7 +1130,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							} else {
 								item.setBillCorpCnName("无");
 							}
-						}
+						}*/
 						// 提取汇率
 						bills.setRate(feeCenterList.get(0).getExrate());
 						List<FeeCenter> feeCenters = feeCenterList.stream()
@@ -1223,7 +1223,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						bills.setFeeCenterListC(feeC);
 					}
 					if (!feeCenterList.isEmpty()) {
-						for (FeeCenter item : feeCenterList) {
+						/*for (FeeCenter item : feeCenterList) {
 							if (ObjectUtils.isNotNull(item.getShortName())) {
 								item.setCorpCnName(item.getShortName());
 							} else {
@@ -1234,7 +1234,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							} else {
 								item.setBillCorpCnName("无");
 							}
-						}
+						}*/
 						List<FeeCenter> feeCenters = feeCenterList.stream()
 							.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
 								Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode() + f.getDc()))), ArrayList::new));
@@ -1932,7 +1932,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								}).collect(Collectors.toList());
 							}
 
-							for (FeeCenter item : feeCenterListMh) {
+							/*for (FeeCenter item : feeCenterListMh) {
 								if (ObjectUtils.isNotNull(item.getShortName())) {
 									item.setCorpCnName(item.getShortName());
 								} else {
@@ -1943,7 +1943,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								} else {
 									item.setBillCorpCnName("无");
 								}
-							}
+							}*/
 							for (Bills item : billsList) {
 								item.setPrintPeople(AuthUtil.getUserName());
 								List<FeeCenter> feeD = feeCenterListMh.stream().filter(e -> MagicValues.D.equals(e.getDc())
@@ -2049,7 +2049,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					List<FeeCenter> feeC = feeCenterList.stream().filter(e -> MagicValues.C.equals(e.getDc())).collect(Collectors.toList());
 					bills.setFeeCenterListC(feeC);
 
-					for (FeeCenter item : feeCenterList) {
+					/*for (FeeCenter item : feeCenterList) {
 						if (ObjectUtils.isNotNull(item.getShortName())) {
 							item.setCorpCnName(item.getShortName());
 						} else {
@@ -2060,7 +2060,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						} else {
 							item.setBillCorpCnName("无");
 						}
-					}
+					}*/
 					if (!feeCenterList.isEmpty()) {
 						bills.setRate(feeCenterList.get(0).getExrate());
 						List<FeeCenter> feeCenters = feeCenterList.stream()
@@ -2161,7 +2161,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					List<FeeCenter> feeC = feeCenterList.stream().filter(e -> MagicValues.C.equals(e.getDc())).collect(Collectors.toList());
 					bills.setFeeCenterListC(feeC);
 					if (!feeCenterList.isEmpty()) {
-						for (FeeCenter item : feeCenterList) {
+						/*for (FeeCenter item : feeCenterList) {
 							if (ObjectUtils.isNotNull(item.getShortName())) {
 								item.setCorpCnName(item.getShortName());
 							} else {
@@ -2172,7 +2172,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							} else {
 								item.setBillCorpCnName("无");
 							}
-						}
+						}*/
 						List<FeeCenter> feeCenters = feeCenterList.stream()
 							.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
 								Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode() + f.getDc()))), ArrayList::new));
@@ -2747,10 +2747,10 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			Amends amends = amendsService.getById(billId);
 			if (amends != null) {
 				String exrateType = currencyUtils.standardCurrency(amends.getBranchId());
-				List<BCorps> bCorpsList = bCorpsService.list(new LambdaQueryWrapper<BCorps>()
+			/*	List<BCorps> bCorpsList = bCorpsService.list(new LambdaQueryWrapper<BCorps>()
 					.eq(BCorps::getTenantId, AuthUtil.getTenantId())
 					.eq(BCorps::getIsDeleted, 0)
-					.eq(BCorps::getStatus, 0));
+					.eq(BCorps::getStatus, 0));*/
 				List<Amends> amendsList = amendsService.list(new LambdaQueryWrapper<Amends>()
 					.eq(Amends::getOrigId, amends.getOrigId())
 					.eq(Amends::getStatus, 3)
@@ -2783,12 +2783,12 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 					if (biz.isSuccess()) {
 						bills.setSrcType(biz.getData());
 					}
-					BCorps carrierCorps = bCorpsList.stream().filter(e -> e.getId().equals(bills.getCarrierId())).findFirst().orElse(null);
+					/*BCorps carrierCorps = bCorpsList.stream().filter(e -> e.getId().equals(bills.getCarrierId())).findFirst().orElse(null);
 					if (carrierCorps != null && ObjectUtils.isNotNull(carrierCorps.getShortName())) {
 						bills.setCarrierCnName(carrierCorps.getShortName());
 					} else {
 						bills.setCarrierCnName(bills.getCarrierCnName());
-					}
+					}*/
 					bills.setPrintPeople(AuthUtil.getUserName());
 					String analysis = "";
 					if ("OWN".equals(bills.getSrcType())) {
@@ -2799,12 +2799,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						analysis = "业务员";
 					}
 					analysis = analysis + "/" + bills.getSrcCnName() + "/";
-					BCorps corps = bCorpsList.stream().filter(e -> e.getId().equals(bills.getCorpId())).findFirst().orElse(null);
+					/*BCorps corps = bCorpsList.stream().filter(e -> e.getId().equals(bills.getCorpId())).findFirst().orElse(null);
 					if (corps != null && ObjectUtils.isNotNull(corps.getShortName())) {
 						analysis += corps.getShortName();
 					} else {
 						analysis += bills.getCorpCnName();
-					}
+					}*/
+					analysis += bills.getCorpCnName();
 					bills.setAnalysis(analysis);
 					if (MagicValues.MM.equals(bills.getBillType()) || MagicValues.DD.equals(bills.getBillType())) {
 						List<Bills> billsList = billsService.list(new LambdaQueryWrapper<Bills>()
@@ -2839,7 +2840,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 										}
 									}
 									feeCenterListMh.addAll(amendFeeCenterList);
-									for (FeeCenter items : feeCenterListMh) {
+									/*for (FeeCenter items : feeCenterListMh) {
 										if (ObjectUtils.isNotNull(items.getShortName())) {
 											items.setCorpCnName(items.getShortName());
 										} else {
@@ -2850,7 +2851,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 										} else {
 											items.setBillCorpCnName("无");
 										}
-									}
+									}*/
 									List<FeeCenter> feeCenterList = feeCenterListMh.stream()
 										.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
 											Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode() + f.getReportType()))), ArrayList::new));
@@ -2931,12 +2932,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 										}
 
 										if (!feeCenterListD.isEmpty()) {
-											BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+											/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 											if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 												feeCenterReports.setBillCorpCnName(bCorps.getShortName());
 											} else {
 												feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
-											}
+											}*/
+											feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
 											feeCenterReports.setAmountD(feeCenterListD.stream().map(FeeCenter::getAmount)
 												.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 											feeCenterReports.setAmountLocD(feeCenterListD.stream().map(FeeCenter::getAmountLoc)
@@ -2944,12 +2946,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 										}
 
 										if (!feeCenterListUsdD.isEmpty()) {
-											BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+											/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 											if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 												feeCenterReports.setBillCorpCnName(bCorps.getShortName());
 											} else {
 												feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
-											}
+											}*/
+											feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
 											feeCenterReports.setAmountUsdD(feeCenterListUsdD.stream().map(FeeCenter::getAmount)
 												.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 											feeCenterReports.setAmountLocD(feeCenterListUsdD.stream().map(FeeCenter::getAmountLoc)
@@ -2957,12 +2960,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 										}
 
 										if (!feeCenterListC.isEmpty()) {
-											BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+											/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 											if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 												feeCenterReports.setCorpCnName(bCorps.getShortName());
 											} else {
 												feeCenterReports.setCorpCnName(fee.getCorpCnName());
-											}
+											}*/
+											feeCenterReports.setCorpCnName(fee.getCorpCnName());
 											feeCenterReports.setAmountC(feeCenterListC.stream().map(FeeCenter::getAmount)
 												.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 											feeCenterReports.setAmountLocC(feeCenterListC.stream().map(FeeCenter::getAmountLoc)
@@ -2970,12 +2974,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 										}
 
 										if (!feeCenterListUsdC.isEmpty()) {
-											BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+											/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 											if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 												feeCenterReports.setCorpCnName(bCorps.getShortName());
 											} else {
 												feeCenterReports.setCorpCnName(fee.getCorpCnName());
-											}
+											}*/
+											feeCenterReports.setCorpCnName(fee.getCorpCnName());
 											feeCenterReports.setAmountUsdC(feeCenterListUsdC.stream().map(FeeCenter::getAmount)
 												.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 											feeCenterReports.setAmountLocC(feeCenterListUsdC.stream().map(FeeCenter::getAmountLoc)
@@ -3014,7 +3019,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 											List<FeeCenter> amendsFeeCenterListMhs = amendsFeeCenterListMh.stream().filter(e -> amendIdList.contains(e.getPid()))
 												.collect(Collectors.toList());
 											if (!amendsFeeCenterListMhs.isEmpty()) {
-												for (FeeCenter items : amendsFeeCenterListMhs) {
+												/*for (FeeCenter items : amendsFeeCenterListMhs) {
 													if (ObjectUtils.isNotNull(items.getShortName())) {
 														items.setCorpCnName(items.getShortName());
 													} else {
@@ -3025,7 +3030,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 													} else {
 														items.setBillCorpCnName("无");
 													}
-												}
+												}*/
 												List<FeeCenter> feeCenterList = amendsFeeCenterListMhs.stream()
 													.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(
 														Comparator.comparing(f -> f.getFeeId() + f.getCorpId() + f.getCurCode() + f.getReportType()))), ArrayList::new));
@@ -3106,12 +3111,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 													}
 
 													if (!feeCenterListD.isEmpty()) {
-														BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+														/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 														if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 															feeCenterReports.setBillCorpCnName(bCorps.getShortName());
 														} else {
 															feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
-														}
+														}*/
+														feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
 														feeCenterReports.setAmountD(feeCenterListD.stream().map(FeeCenter::getAmount)
 															.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 														feeCenterReports.setAmountLocD(feeCenterListD.stream().map(FeeCenter::getAmountLoc)
@@ -3119,12 +3125,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 													}
 
 													if (!feeCenterListUsdD.isEmpty()) {
-														BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+														/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 														if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 															feeCenterReports.setBillCorpCnName(bCorps.getShortName());
 														} else {
 															feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
-														}
+														}*/
+														feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
 														feeCenterReports.setAmountUsdD(feeCenterListUsdD.stream().map(FeeCenter::getAmount)
 															.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 														feeCenterReports.setAmountLocD(feeCenterListUsdD.stream().map(FeeCenter::getAmountLoc)
@@ -3132,12 +3139,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 													}
 
 													if (!feeCenterListC.isEmpty()) {
-														BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+														/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 														if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 															feeCenterReports.setCorpCnName(bCorps.getShortName());
 														} else {
 															feeCenterReports.setCorpCnName(fee.getCorpCnName());
-														}
+														}*/
+														feeCenterReports.setCorpCnName(fee.getCorpCnName());
 														feeCenterReports.setAmountC(feeCenterListC.stream().map(FeeCenter::getAmount)
 															.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 														feeCenterReports.setAmountLocC(feeCenterListC.stream().map(FeeCenter::getAmountLoc)
@@ -3145,12 +3153,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 													}
 
 													if (!feeCenterListUsdC.isEmpty()) {
-														BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+														/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 														if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 															feeCenterReports.setCorpCnName(bCorps.getShortName());
 														} else {
 															feeCenterReports.setCorpCnName(fee.getCorpCnName());
-														}
+														}*/
+														feeCenterReports.setCorpCnName(fee.getCorpCnName());
 														feeCenterReports.setAmountUsdC(feeCenterListUsdC.stream().map(FeeCenter::getAmount)
 															.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 														feeCenterReports.setAmountLocC(feeCenterListUsdC.stream().map(FeeCenter::getAmountLoc)
@@ -3190,7 +3199,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 						feeCenterList.addAll(amendFeeCenterList);
 						if (!feeCenterList.isEmpty()) {
 							bills.setRate(feeCenterList.get(0).getExrate());
-							for (FeeCenter item : feeCenterList) {
+							/*for (FeeCenter item : feeCenterList) {
 								if (ObjectUtils.isNotNull(item.getShortName())) {
 									item.setCorpCnName(item.getShortName());
 								} else {
@@ -3201,7 +3210,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								} else {
 									item.setBillCorpCnName("无");
 								}
-							}
+							}*/
 							feeCenterList.stream().filter(e -> ObjectUtils.isNull(e.getReportType())).forEach(e -> e.setReportType("0"));
 							List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 							for (FeeCenter fee : feeCenterList) {
@@ -3281,48 +3290,52 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								feeCenterReports.setDc(fee.getDc());
 
 								if (!feeCenterListD.isEmpty()) {
-									BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+									/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 									if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 										feeCenterReports.setBillCorpCnName(bCorps.getShortName());
 									} else {
 										feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
-									}
+									}*/
+									feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
 									feeCenterReports.setAmountD(feeCenterListD.stream().map(FeeCenter::getAmount)
 										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 									feeCenterReports.setAmountLocD(feeCenterListD.stream().map(FeeCenter::getAmountLoc)
 										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 								}
 								if (!feeCenterListUsdD.isEmpty()) {
-									BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+									/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 									if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 										feeCenterReports.setBillCorpCnName(bCorps.getShortName());
 									} else {
 										feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
-									}
+									}*/
+									feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
 									feeCenterReports.setAmountUsdD(feeCenterListUsdD.stream().map(FeeCenter::getAmount)
 										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 									feeCenterReports.setAmountLocD(feeCenterListUsdD.stream().map(FeeCenter::getAmountLoc)
 										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 								}
 								if (!feeCenterListC.isEmpty()) {
-									BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+									/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 									if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 										feeCenterReports.setCorpCnName(bCorps.getShortName());
 									} else {
 										feeCenterReports.setCorpCnName(fee.getCorpCnName());
-									}
+									}*/
+									feeCenterReports.setCorpCnName(fee.getCorpCnName());
 									feeCenterReports.setAmountC(feeCenterListC.stream().map(FeeCenter::getAmount)
 										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 									feeCenterReports.setAmountLocC(feeCenterListC.stream().map(FeeCenter::getAmountLoc)
 										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 								}
 								if (!feeCenterListUsdC.isEmpty()) {
-									BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+									/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 									if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 										feeCenterReports.setCorpCnName(bCorps.getShortName());
 									} else {
 										feeCenterReports.setCorpCnName(fee.getCorpCnName());
-									}
+									}*/
+									feeCenterReports.setCorpCnName(fee.getCorpCnName());
 									feeCenterReports.setAmountUsdC(feeCenterListUsdC.stream().map(FeeCenter::getAmount)
 										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 									feeCenterReports.setAmountLocC(feeCenterListUsdC.stream().map(FeeCenter::getAmountLoc)
@@ -3362,7 +3375,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 							}
 							feeCenterList.addAll(amendFeeCenterList);
 							if (!feeCenterList.isEmpty()) {
-								for (FeeCenter item : feeCenterList) {
+								/*for (FeeCenter item : feeCenterList) {
 									if (ObjectUtils.isNotNull(item.getShortName())) {
 										item.setCorpCnName(item.getShortName());
 									} else {
@@ -3373,7 +3386,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 									} else {
 										item.setBillCorpCnName("无");
 									}
-								}
+								}*/
 								feeCenterList.stream().filter(e -> ObjectUtils.isNull(e.getReportType())).forEach(e -> e.setReportType("0"));
 								List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 								for (FeeCenter fee : feeCenterList) {
@@ -3453,12 +3466,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 									}
 
 									if (!feeCenterListD.isEmpty()) {
-										BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+										/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 										if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 											feeCenterReports.setBillCorpCnName(bCorps.getShortName());
 										} else {
 											feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
-										}
+										}*/
+										feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
 										feeCenterReports.setAmountD(feeCenterListD.stream().map(FeeCenter::getAmount)
 											.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 										feeCenterReports.setAmountLocD(feeCenterListD.stream().map(FeeCenter::getAmountLoc)
@@ -3466,12 +3480,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 									}
 
 									if (!feeCenterListUsdD.isEmpty()) {
-										BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+										/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 										if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 											feeCenterReports.setBillCorpCnName(bCorps.getShortName());
 										} else {
 											feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
-										}
+										}*/
+										feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
 										feeCenterReports.setAmountUsdD(feeCenterListUsdD.stream().map(FeeCenter::getAmount)
 											.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 										feeCenterReports.setAmountLocD(feeCenterListUsdD.stream().map(FeeCenter::getAmountLoc)
@@ -3479,12 +3494,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 									}
 
 									if (!feeCenterListC.isEmpty()) {
-										BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+										/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 										if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 											feeCenterReports.setCorpCnName(bCorps.getShortName());
 										} else {
 											feeCenterReports.setCorpCnName(fee.getCorpCnName());
-										}
+										}*/
+										feeCenterReports.setCorpCnName(fee.getCorpCnName());
 										feeCenterReports.setAmountC(feeCenterListC.stream().map(FeeCenter::getAmount)
 											.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 										feeCenterReports.setAmountLocC(feeCenterListC.stream().map(FeeCenter::getAmountLoc)
@@ -3492,12 +3508,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 									}
 
 									if (!feeCenterListUsdC.isEmpty()) {
-										BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+										/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 										if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 											feeCenterReports.setCorpCnName(bCorps.getShortName());
 										} else {
 											feeCenterReports.setCorpCnName(fee.getCorpCnName());
-										}
+										}*/
+										feeCenterReports.setCorpCnName(fee.getCorpCnName());
 										feeCenterReports.setAmountUsdC(feeCenterListUsdC.stream().map(FeeCenter::getAmount)
 											.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 										feeCenterReports.setAmountLocC(feeCenterListUsdC.stream().map(FeeCenter::getAmountLoc)
@@ -3531,7 +3548,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								}
 							}
 							feeCenterListMh.addAll(amendFeeCenterList);*/
-							for (FeeCenter item : feeCenterListMh) {
+							/*for (FeeCenter item : feeCenterListMh) {
 								if (ObjectUtils.isNotNull(item.getShortName())) {
 									item.setCorpCnName(item.getShortName());
 								} else {
@@ -3542,7 +3559,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								} else {
 									item.setBillCorpCnName("无");
 								}
-							}
+							}*/
 							List<FeeCenterReports> feeCenterReportList = new ArrayList<>();
 							for (FeeCenter fee : feeCenterListMh) {
 								FeeCenterReports feeCenterReports = new FeeCenterReports();
@@ -3621,12 +3638,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								}
 
 								if (!feeCenterListD.isEmpty()) {
-									BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+									/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 									if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 										feeCenterReports.setBillCorpCnName(bCorps.getShortName());
 									} else {
 										feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
-									}
+									}*/
+									feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
 									feeCenterReports.setAmountD(feeCenterListD.stream().map(FeeCenter::getAmount)
 										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 									feeCenterReports.setAmountLocD(feeCenterListD.stream().map(FeeCenter::getAmountLoc)
@@ -3634,12 +3652,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								}
 
 								if (!feeCenterListUsdD.isEmpty()) {
-									BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+								/*	BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 									if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 										feeCenterReports.setBillCorpCnName(bCorps.getShortName());
 									} else {
 										feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
-									}
+									}*/
+									feeCenterReports.setBillCorpCnName(fee.getCorpCnName());
 									feeCenterReports.setAmountUsdD(feeCenterListUsdD.stream().map(FeeCenter::getAmount)
 										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 									feeCenterReports.setAmountLocD(feeCenterListUsdD.stream().map(FeeCenter::getAmountLoc)
@@ -3647,12 +3666,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								}
 
 								if (!feeCenterListC.isEmpty()) {
-									BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+									/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 									if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 										feeCenterReports.setCorpCnName(bCorps.getShortName());
 									} else {
 										feeCenterReports.setCorpCnName(fee.getCorpCnName());
-									}
+									}*/
+									feeCenterReports.setCorpCnName(fee.getCorpCnName());
 									feeCenterReports.setAmountC(feeCenterListC.stream().map(FeeCenter::getAmount)
 										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 									feeCenterReports.setAmountLocC(feeCenterListC.stream().map(FeeCenter::getAmountLoc)
@@ -3660,12 +3680,13 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 								}
 
 								if (!feeCenterListUsdC.isEmpty()) {
-									BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
+									/*BCorps bCorps = bCorpsList.stream().filter(e -> e.getId().equals(fee.getCorpId())).findFirst().orElse(null);
 									if (bCorps != null && ObjectUtils.isNotNull(bCorps.getShortName())) {
 										feeCenterReports.setCorpCnName(bCorps.getShortName());
 									} else {
 										feeCenterReports.setCorpCnName(fee.getCorpCnName());
-									}
+									}*/
+									feeCenterReports.setCorpCnName(fee.getCorpCnName());
 									feeCenterReports.setAmountUsdC(feeCenterListUsdC.stream().map(FeeCenter::getAmount)
 										.filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 									feeCenterReports.setAmountLocC(feeCenterListUsdC.stream().map(FeeCenter::getAmountLoc)

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

@@ -273,12 +273,11 @@ public class TradingBoxController extends BladeController {
 		List<ExportTradingBoxItemOut> outList = new ArrayList<>();
 		List<ExportTradingBoxItemOutEn> outListEn = new ArrayList<>();
 		for (TradingBoxItem item : tradingBoxItemList) {
-			if ("OW-N,OW-F".equals(detail.getType())) {
+			if ("OW-N,OW-F".contains(detail.getType())) {
 				ExportTradingBoxItemOutEn export = new ExportTradingBoxItemOutEn();
 				if (ObjectUtils.isNotNull(detail.getEffectiveDate())){
 					export.setEffectiveDate(formatter.format(detail.getEffectiveDate()));
 				}
-				export.setBoxEastName(item.getBoxEastName());
 				export.setContainerNumber(item.getContainerNumber());
 				export.setCode(item.getCode());
 				export.setBoxType(item.getBoxType());

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

@@ -2732,6 +2732,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 						putBoxItem.setPodStationEname(recordItems.getStationCode());
 						putBoxItem.setBoxStatus(recordItems.getBoxStatus());
 						putBoxItem.setBoxDynamics("退租箱进场");
+						putBoxItem.setUpdateUser(AuthUtil.getUserId());
+						putBoxItem.setUpdateUserName(AuthUtil.getUserName());
+						putBoxItem.setUpdateTime(new Date());
 						putBoxItemsOldList.add(putBoxItem);
 					}
 				}
@@ -2759,6 +2762,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 								tradingBoxItem.setStationCode(recordItems.getStationCname());
 								tradingBoxItem.setStationCname(recordItems.getStationEname());
 								tradingBoxItem.setStationEname(recordItems.getStationCode());
+								tradingBoxItem.setUpdateUser(AuthUtil.getUserId());
+								tradingBoxItem.setUpdateUserName(AuthUtil.getUserName());
+								tradingBoxItem.setUpdateTime(new Date());
 								tradingBoxItemOldList.add(tradingBoxItem);
 							}
 						}
@@ -3210,6 +3216,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 							putBoxItem.setPolPickUpDate(item.getApproachExitDate());
 							putBoxItem.setPolPreAppearanceDate(item.getApproachExitDate());
 							putBoxItem.setBoxStatus(item.getBoxStatus());
+							putBoxItem.setUpdateUser(AuthUtil.getUserId());
+							putBoxItem.setUpdateUserName(AuthUtil.getUserName());
+							putBoxItem.setUpdateTime(new Date());
 						} else {
 							putBoxItem = new PutBoxItems();
 							putBoxItem.setBoxClass(putBox.getBoxClass());
@@ -3231,6 +3240,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 							putBoxItem.setPolPickUpDate(item.getApproachExitDate());
 							putBoxItem.setPolPreAppearanceDate(item.getApproachExitDate());
 							putBoxItem.setTenantId(tenantId);
+							putBoxItem.setCreateUser(AuthUtil.getUserId());
+							putBoxItem.setCreateUserName(AuthUtil.getUserName());
+							putBoxItem.setCreateTime(new Date());
 						}
 					} else {
 						putBoxItem = new PutBoxItems();
@@ -3253,6 +3265,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 						putBoxItem.setPolPickUpDate(item.getApproachExitDate());
 						putBoxItem.setPolPreAppearanceDate(item.getApproachExitDate());
 						putBoxItem.setTenantId(tenantId);
+						putBoxItem.setCreateUser(AuthUtil.getUserId());
+						putBoxItem.setCreateUserName(AuthUtil.getUserName());
+						putBoxItem.setCreateTime(new Date());
 					}
 					if (ObjectUtils.isNotNull(putBox.getBoxEastId()) && !"null".equals(putBox.getBoxEastId())) {
 						putBoxItem.setBoxEastId(Long.parseLong(putBox.getBoxEastId()));
@@ -3302,6 +3317,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 											tradingBoxItem.setPolPreAppearanceDate(new Date());
 										}
 										tradingBoxItem.setStatus("待使用");
+										tradingBoxItem.setUpdateUser(AuthUtil.getUserId());
+										tradingBoxItem.setUpdateUserName(AuthUtil.getUserName());
+										tradingBoxItem.setUpdateTime(new Date());
 									} else {
 										tradingBoxItem = new TradingBoxItem();
 										tradingBoxItem.setBoxBelongsTo("SOC");
@@ -3347,6 +3365,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 										}
 										tradingBoxItem.setStatus("待使用");
 										tradingBoxItem.setTenantId(tenantId);
+										tradingBoxItem.setCreateUser(AuthUtil.getUserId());
+										tradingBoxItem.setCreateUserName(AuthUtil.getUserName());
+										tradingBoxItem.setCreateTime(new Date());
 									}
 								} else {
 									tradingBoxItem = new TradingBoxItem();
@@ -3399,6 +3420,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 									tradingBoxItem.setLeaseCommencementDate(item.getApproachExitDate());
 									tradingBoxItem.setBuxStaus("已启租");
 								}
+								tradingBoxItem.setCreateUser(AuthUtil.getUserId());
+								tradingBoxItem.setCreateUserName(AuthUtil.getUserName());
+								tradingBoxItem.setCreateTime(new Date());
 								tradingBoxItems.add(tradingBoxItem);
 							} else {
 //								throw new RuntimeException("放箱号：" + item.getContainerNumber() + "未查到来源单据");
@@ -3479,6 +3503,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 							tradingBoxMapper.updateById(tradingBox);
 						}
 					}
+					item.setVersion(ObjectUtils.isNull(item.getVersion())?1:item.getVersion()+1);
 				}
 				putBoxService.saveOrUpdateBatch(putBoxes);
 			}
@@ -3773,6 +3798,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 											putBoxItem.setStatus("已完成");
 											putBoxItem.setBoxDynamics("已返场");
 											putBoxItem.setBoxStatus(recordItems.getBoxStatus());
+											putBoxItem.setUpdateUser(AuthUtil.getUserId());
+											putBoxItem.setUpdateUserName(AuthUtil.getUserName());
+											putBoxItem.setUpdateTime(new Date());
 											putBoxItemsOldList.add(putBoxItem);
 										} else {
 //											throw new RuntimeException("未查到原放箱号：" + archives.getContainerNumber() + "中箱号为：" + item.getCntrNo() + "数据");
@@ -3813,6 +3841,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 														tradingBoxItem.setStationCode(recordItems.getStationCode());
 														tradingBoxItem.setPodFreeBoxUseDays(billsHYJK.getPodFreeBoxUseDays());
 														tradingBoxItem.setEta(billsHYJK.getEta());
+														tradingBoxItem.setUpdateUser(AuthUtil.getUserId());
+														tradingBoxItem.setUpdateUserName(AuthUtil.getUserName());
+														tradingBoxItem.setUpdateTime(new Date());
 														tradingBoxItemOldList.add(tradingBoxItem);
 													} else {
 //														throw new RuntimeException("未查到原OW单据-放箱号：" + archives.getContainerNumber() + "中箱号是：" + item.getCntrNo() + "数据");
@@ -3886,6 +3917,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 												putBox2.setPolStationEname(recordItems.getStationCode());
 												putBox2.setBoxType(archives.getTypeName());
 												putBox2.setBoxClass(archives.getBoxType());
+												putBox.setCreateUser(AuthUtil.getUserId());
+												putBox.setCreateUserName(AuthUtil.getUserName());
+												putBox.setCreateTime(new Date());
 //											putBox2.setTotalNum(1);
 //											putBox2.setOccupyNum(0);
 //											putBox2.setRemainingNum(1);
@@ -3896,6 +3930,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 //											putBox2.setOccupyNum(0);
 //											putBox2.setRemainingNum(putBox1.getRemainingNum() + 1);
 //											putBox2.setStorageNum(putBox1.getStorageNum() + 1);
+												putBox.setUpdateUser(AuthUtil.getUserId());
+												putBox.setUpdateUserName(AuthUtil.getUserName());
+												putBox.setUpdateTime(new Date());
 												putBoxNewList.add(putBox2);
 											}
 										} else {
@@ -3942,6 +3979,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 											putBox.setPolStationEname(recordItems.getStationCode());
 											putBox.setBoxType(archives.getTypeName());
 											putBox.setBoxClass(archives.getBoxType());
+											putBox.setCreateUser(AuthUtil.getUserId());
+											putBox.setCreateUserName(AuthUtil.getUserName());
+											putBox.setCreateTime(new Date());
 //										putBox.setTotalNum(1);
 //										putBox.setOccupyNum(0);
 //										putBox.setRemainingNum(1);
@@ -3972,6 +4012,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 											putBoxItem.setEta(billsHYJK.getEta());
 											putBoxItem.setStatus("已完成");
 											putBoxItem.setBoxDynamics("已返场");
+											putBoxItem.setUpdateUser(AuthUtil.getUserId());
+											putBoxItem.setUpdateUserName(AuthUtil.getUserName());
+											putBoxItem.setUpdateTime(new Date());
 											putBoxItemsOldList.add(putBoxItem);
 										} else {
 //											throw new RuntimeException("未查到原放箱号：" + archives.getContainerNumber() + "中箱号为：" + item.getCntrNo() + "数据");
@@ -4011,6 +4054,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 													tradingBoxItem.setStationEname(recordItems.getStationCode());
 													tradingBoxItem.setPodFreeBoxUseDays(billsHYJK.getPodFreeBoxUseDays());
 													tradingBoxItem.setEta(billsHYJK.getEta());
+													tradingBoxItem.setUpdateUser(AuthUtil.getUserId());
+													tradingBoxItem.setUpdateUserName(AuthUtil.getUserName());
+													tradingBoxItem.setUpdateTime(new Date());
 													tradingBoxItemOldList.add(tradingBoxItem);
 												} else {
 //													throw new RuntimeException("未查到原OW单据-放箱号：" + archives.getContainerNumber() + "中箱号是：" + item.getCntrNo() + "数据");
@@ -4063,6 +4109,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 							archivesService.updateBatchById(archivesArrayList);
 						}
 						if (!putBoxNewList.isEmpty()) {
+							for (PutBox item : putBoxNewList){
+								item.setVersion(ObjectUtils.isNull(item.getVersion())?1:item.getVersion()+1);
+							}
 							putBoxService.saveOrUpdateBatch(putBoxNewList);
 						}
 						for (Containers item : containersList) {
@@ -4112,6 +4161,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 												putBoxItem.setPodStationEname(null);
 												putBoxItem.setPodFreeBoxUseDays(null);
 												putBoxItem.setPodBoxUseDays(null);
+												putBoxItem.setUpdateUser(AuthUtil.getUserId());
+												putBoxItem.setUpdateUserName(AuthUtil.getUserName());
+												putBoxItem.setUpdateTime(new Date());
 											} else {
 												putBoxItem = new PutBoxItems();
 												putBoxItem.setBoxClass(putBox.getBoxClass());
@@ -4129,6 +4181,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 												putBoxItem.setPolCyCode(billsHYJK.getPodCode());
 												putBoxItem.setPolCyCname(billsHYJK.getPodCnName());
 												putBoxItem.setPolCyEname(billsHYJK.getPodEnName());
+												putBoxItem.setCreateUser(AuthUtil.getUserId());
+												putBoxItem.setCreateUserName(AuthUtil.getUserName());
+												putBoxItem.setCreateTime(new Date());
 											}
 										} else {
 											putBoxItem = new PutBoxItems();
@@ -4147,6 +4202,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 											putBoxItem.setPolCyCode(billsHYJK.getPodCode());
 											putBoxItem.setPolCyCname(billsHYJK.getPodCnName());
 											putBoxItem.setPolCyEname(billsHYJK.getPodEnName());
+											putBoxItem.setCreateUser(AuthUtil.getUserId());
+											putBoxItem.setCreateUserName(AuthUtil.getUserName());
+											putBoxItem.setCreateTime(new Date());
 										}
 										putBoxItemsNewList.add(putBoxItem);
 									} else {
@@ -4220,6 +4278,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 									+ Integer.parseInt(count + ""));
 								item.setRemainingNum((ObjectUtils.isNull(item.getRemainingNum()) ? 0 : item.getRemainingNum()) + Integer.parseInt(count + ""));
 								item.setStorageNum((ObjectUtils.isNull(item.getStorageNum()) ? 0 : item.getStorageNum()) + Integer.parseInt(count + ""));
+								item.setVersion(ObjectUtils.isNull(item.getVersion())?1:item.getVersion()+1);
 							}
 							putBoxService.saveOrUpdateBatch(putBoxNewList);
 						}
@@ -4339,6 +4398,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 								putBoxItem.setPolPickUpDate(item.getApproachExitDate());
 								putBoxItem.setPolPreAppearanceDate(item.getApproachExitDate());
 								putBoxItem.setBoxStatus(item.getBoxStatus());
+								putBoxItem.setUpdateUser(AuthUtil.getUserId());
+								putBoxItem.setUpdateUserName(AuthUtil.getUserName());
+								putBoxItem.setUpdateTime(new Date());
 							} else {
 								putBoxItem = new PutBoxItems();
 								putBoxItem.setBoxClass(putBox.getBoxClass());
@@ -4358,6 +4420,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 								putBoxItem.setPolCyEname(item.getPortEname());
 								putBoxItem.setPolPickUpDate(item.getApproachExitDate());
 								putBoxItem.setPolPreAppearanceDate(item.getApproachExitDate());
+								putBoxItem.setCreateUser(AuthUtil.getUserId());
+								putBoxItem.setCreateUserName(AuthUtil.getUserName());
+								putBoxItem.setCreateTime(new Date());
 							}
 						} else {
 							putBoxItem = new PutBoxItems();
@@ -4378,6 +4443,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 							putBoxItem.setPolCyEname(item.getPortEname());
 							putBoxItem.setPolPickUpDate(item.getApproachExitDate());
 							putBoxItem.setPolPreAppearanceDate(item.getApproachExitDate());
+							putBoxItem.setCreateUser(AuthUtil.getUserId());
+							putBoxItem.setCreateUserName(AuthUtil.getUserName());
+							putBoxItem.setCreateTime(new Date());
 						}
 						if (ObjectUtils.isNotNull(putBox.getBoxEastId()) && !"null".equals(putBox.getBoxEastId())) {
 							putBoxItem.setBoxEastId(Long.parseLong(putBox.getBoxEastId()));
@@ -4428,6 +4496,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 											tradingBoxItem.setPolPreAppearanceDate(new Date());
 										}
 										tradingBoxItem.setStatus("待使用");
+										tradingBoxItem.setUpdateUser(AuthUtil.getUserId());
+										tradingBoxItem.setUpdateUserName(AuthUtil.getUserName());
+										tradingBoxItem.setUpdateTime(new Date());
 									} else {
 										tradingBoxItem = new TradingBoxItem();
 										tradingBoxItem.setBoxBelongsTo("SOC");
@@ -4471,6 +4542,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 											tradingBoxItem.setPolPreAppearanceDate(new Date());
 										}
 										tradingBoxItem.setStatus("待使用");
+										tradingBoxItem.setCreateUser(AuthUtil.getUserId());
+										tradingBoxItem.setCreateUserName(AuthUtil.getUserName());
+										tradingBoxItem.setCreateTime(new Date());
 									}
 								} else {
 									tradingBoxItem = new TradingBoxItem();
@@ -4515,6 +4589,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 										tradingBoxItem.setPolPreAppearanceDate(new Date());
 									}
 									tradingBoxItem.setStatus("待使用");
+									tradingBoxItem.setCreateUser(AuthUtil.getUserId());
+									tradingBoxItem.setCreateUserName(AuthUtil.getUserName());
+									tradingBoxItem.setCreateTime(new Date());
 								}
 								tradingBoxItem.setBoxEastId(tradingBox.getPurchaseCompanyId());
 								tradingBoxItem.setBoxEastName(tradingBox.getPurchaseCompanyName());
@@ -4664,6 +4741,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 								tradingBoxMapper.updateById(tradingBox);
 							}
 						}
+						item.setVersion(ObjectUtils.isNull(item.getVersion())?1:item.getVersion()+1);
 					}
 					putBoxService.saveOrUpdateBatch(putBoxes);
 				}
@@ -4912,6 +4990,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 								putBoxItem.setPolCyEname(item.getStationEname());
 								putBoxItem.setStatus("使用中");
 								putBoxItem.setPolStationEmptyContainerExitDate(item.getApproachExitDate());
+								putBoxItem.setUpdateUser(AuthUtil.getUserId());
+								putBoxItem.setUpdateUserName(AuthUtil.getUserName());
+								putBoxItem.setUpdateTime(new Date());
 							} else {
 								putBoxItem = new PutBoxItems();
 								putBoxItem.setBoxClass(putBoxData.getBoxClass());
@@ -4929,6 +5010,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 								putBoxItem.setPolCyCname(item.getStationCname());
 								putBoxItem.setPolCyEname(item.getStationEname());
 								putBoxItem.setPolStationEmptyContainerExitDate(item.getApproachExitDate());
+								putBoxItem.setCreateUser(AuthUtil.getUserId());
+								putBoxItem.setCreateUserName(AuthUtil.getUserName());
+								putBoxItem.setCreateTime(new Date());
 							}
 						} else {
 							putBoxItem = new PutBoxItems();
@@ -4947,6 +5031,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 							putBoxItem.setPolCyCname(item.getStationCname());
 							putBoxItem.setPolCyEname(item.getStationEname());
 							putBoxItem.setPolStationEmptyContainerExitDate(item.getApproachExitDate());
+							putBoxItem.setCreateUser(AuthUtil.getUserId());
+							putBoxItem.setCreateUserName(AuthUtil.getUserName());
+							putBoxItem.setCreateTime(new Date());
 						}
 						if (ObjectUtils.isNotNull(putBoxData.getBoxEastId()) && !"null".equals(putBoxData.getBoxEastId())) {
 							putBoxItem.setBoxEastId(Long.parseLong(putBoxData.getBoxEastId()));
@@ -4991,6 +5078,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 											}
 											tradingBoxItem.setStatus("待使用");
 											tradingBoxItem.setBoxStatus(item.getBoxStatus());
+											tradingBoxItem.setUpdateUser(AuthUtil.getUserId());
+											tradingBoxItem.setUpdateUserName(AuthUtil.getUserName());
+											tradingBoxItem.setUpdateTime(new Date());
 										} else {
 											tradingBoxItem = new TradingBoxItem();
 											tradingBoxItem.setBoxBelongsTo("SOC");
@@ -5029,6 +5119,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 												tradingBoxItem.setPolStationEmptyContainerExitDate(new Date());
 											}
 											tradingBoxItem.setStatus("待使用");
+											tradingBoxItem.setCreateUser(AuthUtil.getUserId());
+											tradingBoxItem.setCreateUserName(AuthUtil.getUserName());
+											tradingBoxItem.setCreateTime(new Date());
 										}
 									} else {
 										tradingBoxItem = new TradingBoxItem();
@@ -5071,6 +5164,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 									}
 									tradingBoxItem.setBoxEastId(tradingBox.getPurchaseCompanyId());
 									tradingBoxItem.setBoxEastName(tradingBox.getPurchaseCompanyName());
+									tradingBoxItem.setCreateUser(AuthUtil.getUserId());
+									tradingBoxItem.setCreateUserName(AuthUtil.getUserName());
+									tradingBoxItem.setCreateTime(new Date());
 									tradingBoxItems.add(tradingBoxItem);
 								} else {
 //									throw new RuntimeException("放箱号：" + item.getContainerNumber() + "未查到OW单据");
@@ -5131,6 +5227,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 								return false;
 							}
 						}
+						item.setVersion(ObjectUtils.isNull(item.getVersion()) ? 1 : item.getVersion() + 1);
 						putBoxList1.add(item);
 						if (!tradingBoxes.isEmpty()) {
 							TradingBox tradingBox = tradingBoxes.stream().filter(e -> e.getId().equals(item.getSrcId())).findFirst().orElse(null);
@@ -5462,6 +5559,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 								putBoxItem.setEtd(bills.getEtd());
 								putBoxItem.setStatus("使用中");
 								putBoxItem.setPolStationEmptyContainerExitDate(item.getApproachExitDate());
+								putBoxItem.setUpdateUser(AuthUtil.getUserId());
+								putBoxItem.setUpdateUserName(AuthUtil.getUserName());
+								putBoxItem.setUpdateTime(new Date());
 							} else {
 								putBoxItem = new PutBoxItems();
 								putBoxItem.setBoxClass(putBoxData.getBoxClass());
@@ -5490,6 +5590,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 								putBoxItem.setShipEname(bills.getVesselEnName());
 								putBoxItem.setPolFreeBoxUseDays(bills.getPolFreeBoxUseDays());
 								putBoxItem.setEtd(bills.getEtd());
+								putBoxItem.setCreateUser(AuthUtil.getUserId());
+								putBoxItem.setCreateUserName(AuthUtil.getUserName());
+								putBoxItem.setCreateTime(new Date());
 							}
 						} else {
 							putBoxItem = new PutBoxItems();
@@ -5519,6 +5622,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 							putBoxItem.setShipEname(bills.getVesselEnName());
 							putBoxItem.setPolFreeBoxUseDays(bills.getPolFreeBoxUseDays());
 							putBoxItem.setEtd(bills.getEtd());
+							putBoxItem.setCreateUser(AuthUtil.getUserId());
+							putBoxItem.setCreateUserName(AuthUtil.getUserName());
+							putBoxItem.setCreateTime(new Date());
 						}
 						if (ObjectUtils.isNotNull(putBoxData.getBoxEastId()) && !"null".equals(putBoxData.getBoxEastId())) {
 							putBoxItem.setBoxEastId(Long.parseLong(putBoxData.getBoxEastId()));
@@ -5589,6 +5695,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 											tradingBoxItem.setPolFreeBoxUseDays(bills.getPolFreeBoxUseDays());
 											tradingBoxItem.setEtd(bills.getEtd());
 											tradingBoxItem.setBoxStatus(item.getBoxStatus());
+											tradingBoxItem.setUpdateUser(AuthUtil.getUserId());
+											tradingBoxItem.setUpdateUserName(AuthUtil.getUserName());
+											tradingBoxItem.setUpdateTime(new Date());
 										} else {
 											tradingBoxItem = new TradingBoxItem();
 											tradingBoxItem.setBoxBelongsTo("SOC");
@@ -5639,6 +5748,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 											tradingBoxItem.setShipEname(bills.getVesselEnName());
 											tradingBoxItem.setPolFreeBoxUseDays(bills.getPolFreeBoxUseDays());
 											tradingBoxItem.setEtd(bills.getEtd());
+											tradingBoxItem.setCreateUser(AuthUtil.getUserId());
+											tradingBoxItem.setCreateUserName(AuthUtil.getUserName());
+											tradingBoxItem.setCreateTime(new Date());
 										}
 									} else {
 										tradingBoxItem = new TradingBoxItem();
@@ -5689,6 +5801,9 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 										tradingBoxItem.setShipEname(bills.getVesselEnName());
 										tradingBoxItem.setPolFreeBoxUseDays(bills.getPolFreeBoxUseDays());
 										tradingBoxItem.setEtd(bills.getEtd());
+										tradingBoxItem.setCreateUser(AuthUtil.getUserId());
+										tradingBoxItem.setCreateUserName(AuthUtil.getUserName());
+										tradingBoxItem.setCreateTime(new Date());
 									}
 									tradingBoxItem.setBoxEastId(tradingBox.getPurchaseCompanyId());
 									tradingBoxItem.setBoxEastName(tradingBox.getPurchaseCompanyName());
@@ -5832,6 +5947,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 									}
 								}
 							}
+							item.setVersion(ObjectUtils.isNull(item.getVersion()) ? 1 : item.getVersion() + 1);
 							putBoxList1.add(item);
 							if (!tradingBoxes.isEmpty()) {
 								TradingBox tradingBox = tradingBoxes.stream().filter(e -> e.getId().equals(item.getSrcId())).findFirst().orElse(null);
@@ -5887,6 +6003,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 										failureHandling(type, boxDynamicsRecord, "放箱号：" + item.getContainerNumber() + "剩余场地盘存小于本次导入箱数");
 										return false;
 									}
+									putBox.setVersion(ObjectUtils.isNull(putBox.getVersion()) ? 1 : putBox.getVersion() + 1);
 									putBoxListNew.add(putBox);
 								}
 							}
@@ -6087,7 +6204,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 					failureHandling(type, boxDynamicsRecord, "未查到放箱号数据");
 					return false;
 				}
-				Containers containers = containersListNew.stream().filter(e ->  item.getBoxCode().equals(e.getCntrNo())).findFirst().orElse(null);
+				Containers containers = containersListNew.stream().filter(e -> item.getBoxCode().equals(e.getCntrNo())).findFirst().orElse(null);
 				if (containers == null) {
 //					throw new RuntimeException("箱号未在配箱信息中查到");
 					failureHandling(type, boxDynamicsRecord, "箱号未在配箱信息中查到");
@@ -6149,18 +6266,18 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 							feeCenterC.setAmount(feeCenterC.getQuantity().multiply(feeCenterC.getPrice()));
 							feeCenterC.setAmountLoc(feeCenterC.getAmount().multiply(feeCenter.getExrate()));
 							feeCenterC.setUnsettledAmount(feeCenterC.getAmount());
-							if (feeCenterListD.isEmpty()){
+							if (feeCenterListD.isEmpty()) {
 								feeCenterListD.add(feeCenter);
 								feeCenterListC.add(feeCenterC);
-							}else{
-								FeeCenter feeCenterD = feeCenterListD.stream().filter(e-> e.getPid().equals(feeCenter.getPid()) &&
+							} else {
+								FeeCenter feeCenterD = feeCenterListD.stream().filter(e -> e.getPid().equals(feeCenter.getPid()) &&
 									e.getUnitNo().equals(feeCenter.getUnitNo())).findFirst().orElse(null);
-								if (feeCenterD != null){
+								if (feeCenterD != null) {
 									feeCenterD.setQuantity(feeCenterD.getQuantity().add(new BigDecimal("1")));
 									feeCenterD.setAmount(feeCenterD.getQuantity().multiply(feeCenterD.getPrice()));
 									feeCenterD.setAmountLoc(feeCenterD.getAmount().multiply(feeCenterD.getExrate()));
 									feeCenterD.setUnsettledAmount(feeCenterD.getAmount());
-									FeeCenter feeCentersC = feeCenterListC.stream().filter(e-> e.getPid().equals(feeCenterC.getPid()) &&
+									FeeCenter feeCentersC = feeCenterListC.stream().filter(e -> e.getPid().equals(feeCenterC.getPid()) &&
 										e.getUnitNo().equals(feeCenterC.getUnitNo())).findFirst().orElse(null);
 									if (feeCentersC != null) {
 										feeCentersC.setQuantity(feeCentersC.getQuantity().add(new BigDecimal("1")));
@@ -6168,7 +6285,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 										feeCentersC.setAmountLoc(feeCentersC.getAmount().multiply(feeCentersC.getExrate()));
 										feeCentersC.setUnsettledAmount(feeCentersC.getAmount());
 									}
-								}else{
+								} else {
 									feeCenterListD.add(feeCenter);
 									feeCenterListC.add(feeCenterC);
 								}
@@ -6458,18 +6575,18 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 						feeCenterC.setAmountLoc(feeCenterC.getAmount().multiply(feeCenter.getExrate()));
 						feeCenterC.setUnsettledAmount(feeCenterC.getAmount());
 
-						if (feeCenterListD.isEmpty()){
+						if (feeCenterListD.isEmpty()) {
 							feeCenterListD.add(feeCenter);
 							feeCenterListC.add(feeCenterC);
-						}else{
-							FeeCenter feeCenterD = feeCenterListD.stream().filter(e-> e.getPid().equals(feeCenter.getPid()) &&
+						} else {
+							FeeCenter feeCenterD = feeCenterListD.stream().filter(e -> e.getPid().equals(feeCenter.getPid()) &&
 								e.getUnitNo().equals(feeCenter.getUnitNo())).findFirst().orElse(null);
-							if (feeCenterD != null){
+							if (feeCenterD != null) {
 								feeCenterD.setQuantity(feeCenterD.getQuantity().add(new BigDecimal("1")));
 								feeCenterD.setAmount(feeCenterD.getQuantity().multiply(feeCenterD.getPrice()));
 								feeCenterD.setAmountLoc(feeCenterD.getAmount().multiply(feeCenterD.getExrate()));
 								feeCenterD.setUnsettledAmount(feeCenterD.getAmount());
-								FeeCenter feeCentersC = feeCenterListC.stream().filter(e-> e.getPid().equals(feeCenterC.getPid()) &&
+								FeeCenter feeCentersC = feeCenterListC.stream().filter(e -> e.getPid().equals(feeCenterC.getPid()) &&
 									e.getUnitNo().equals(feeCenterC.getUnitNo())).findFirst().orElse(null);
 								if (feeCentersC != null) {
 									feeCentersC.setQuantity(feeCentersC.getQuantity().add(new BigDecimal("1")));
@@ -6477,7 +6594,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 									feeCentersC.setAmountLoc(feeCentersC.getAmount().multiply(feeCentersC.getExrate()));
 									feeCentersC.setUnsettledAmount(feeCentersC.getAmount());
 								}
-							}else{
+							} else {
 								feeCenterListD.add(feeCenter);
 								feeCenterListC.add(feeCenterC);
 							}

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

@@ -129,7 +129,7 @@ public class ExpenseApplicationServiceImpl extends ServiceImpl<ExpenseApplicatio
 				.select(ExpenseApplication::getId,  ExpenseApplication::getVersion)
 				.eq(ExpenseApplication::getId, expenseApplication.getId()));
 			if (!Objects.equals(dataSourceBill.getVersion(), expenseApplication.getVersion())) {
-				return R.fail(601, "数据已被其他用户更新，请等待刷新后重试");
+				return R.fail(601, "数据已被其他用户更新，请刷新后重试");
 			}
 			// 每更新一次往上累加一次版本
 			// 旧数据处理
@@ -434,7 +434,7 @@ public class ExpenseApplicationServiceImpl extends ServiceImpl<ExpenseApplicatio
 				data.setWarehousingDate(item.getStorageDate());
 				data.setOutboundDate(item.getOutboundDate());
 				data.setBillNo((String) clientBillNo.getData());
-				data.setBillDate(new Date());
+				data.setBillDate(item.getBillDate());
 				data.setAccountDc(item.getDc());
 				data.setAccountDate(item.getBillDate());
 				data.setBusinessType(item.getBusinessType());
@@ -813,7 +813,7 @@ public class ExpenseApplicationServiceImpl extends ServiceImpl<ExpenseApplicatio
 				data.setWarehousingDate(item.getStorageDate());
 				data.setOutboundDate(item.getOutboundDate());
 				data.setBillNo((String) clientBillNo.getData());
-				data.setBillDate(new Date());
+				data.setBillDate(item.getBillDate());
 				data.setAccountDc(item.getDc());
 				data.setAccountDate(item.getBillDate());
 				data.setBusinessType(item.getBusinessType());
@@ -980,7 +980,7 @@ public class ExpenseApplicationServiceImpl extends ServiceImpl<ExpenseApplicatio
 					FeeCenter feeCenter1 = feeCenterListOld.stream().filter(e -> e.getId().equals(item.getId())).findFirst().orElse(null);
 					if (feeCenter1 != null) {
 						if (!Objects.equals(feeCenter1.getVersion(), item.getVersion())) {
-							throw new RuntimeException("数据已被其他用户更新，请等待刷新后重试");
+							throw new RuntimeException("数据已被其他用户更新，请刷新后重试");
 						}
 					}
 				}

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

@@ -246,7 +246,7 @@ public class PutBoxServiceImpl extends ServiceImpl<PutBoxMapper, PutBox> impleme
 			PutBox dataSourceBill = baseMapper.selectOne(new LambdaQueryWrapper<PutBox>().select(PutBox::getId, PutBox::getVersion)
 				.eq(PutBox::getId, putBox.getId()));
 			if (!Objects.equals(dataSourceBill.getVersion(), putBox.getVersion())) {
-				return R.fail(601, "数据已被其他用户更新，请等待刷新后重试");
+				return R.fail(601, "数据已被其他用户更新，请刷新后重试");
 			}
 			// 每更新一次往上累加一次版本
 			// 旧数据处理

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

@@ -155,7 +155,7 @@ public class RouteCostServiceImpl extends ServiceImpl<RouteCostMapper, RouteCost
 			RouteCost dataRouteCost = baseMapper.selectOne(new LambdaQueryWrapper<RouteCost>()
 				.select(RouteCost::getId, RouteCost::getVersion).eq(RouteCost::getId, routeCost.getId()));
 			if (!Objects.equals(dataRouteCost.getVersion(), routeCost.getVersion())) {
-				throw new RuntimeException("数据已被其他用户更新，请等待刷新后重试");
+				throw new RuntimeException("数据已被其他用户更新，请刷新后重试");
 			}
 			int version = StringUtil.isBlank(dataRouteCost.getVersion()) ? 1 : Integer.parseInt(dataRouteCost.getVersion());
 			routeCost.setVersion(String.valueOf(version + 1));

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

@@ -239,6 +239,9 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 		} else if ("XGDX".equals(tradingBox.getType())) {
 			billNoFormat = "XGDX";
 			businessTypeCode = "XGDX";
+			if (tradingBox.getPolId().equals(tradingBox.getPodId())) {
+				throw new RuntimeException("调箱目的港与起运港相同，请修改目的港");
+			}
 		} else if ("CCSQ".equals(tradingBox.getType())) {
 			billNoFormat = "CCSQ";
 			businessTypeCode = "CCSQ";
@@ -288,7 +291,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 		String text;
 		if ("OW-N,OW-F".contains(tradingBox.getType())) {
 			text = "放箱号已存在，请勿重复添加";
-			if (ObjectUtils.isNull(tradingBox.getSuitcaseNum())){
+			if (ObjectUtils.isNull(tradingBox.getSuitcaseNum())) {
 				tradingBox.setSuitcaseNum(0);
 			}
 			tradingBox.setNotSuitcaseNum(tradingBox.getBoxNumber() - tradingBox.getSuitcaseNum());
@@ -320,7 +323,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			TradingBox dataTradingBox = baseMapper.selectOne(new LambdaQueryWrapper<TradingBox>()
 				.select(TradingBox::getId, TradingBox::getVersion).eq(TradingBox::getId, tradingBox.getId()));
 			if (!Objects.equals(dataTradingBox.getVersion(), tradingBox.getVersion())) {
-				throw new RuntimeException("数据已被其他用户更新，请等待刷新后重试");
+				throw new RuntimeException("数据已被其他用户更新，请刷新后重试");
 			}
 			int version = StringUtil.isBlank(dataTradingBox.getVersion()) ? 1 : Integer.parseInt(dataTradingBox.getVersion());
 			tradingBox.setVersion(String.valueOf(version + 1));
@@ -461,7 +464,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					FeeCenter feeCenter1 = feeCenterList1.stream().filter(e -> e.getId().equals(item.getId()))
 						.findFirst().orElse(null);
 					if (feeCenter1 != null && !item.getVersion().equals(feeCenter1.getVersion())) {
-						throw new RuntimeException("数据已被其他用户更新，请等待刷新后重试");
+						throw new RuntimeException("数据已被其他用户更新，请刷新后重试");
 					}
 				}
 				item.setAmountLoc(item.getAmount().multiply(item.getExrate()));
@@ -1602,6 +1605,10 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			String boxType = "";
 			if (!boxTypeList.isEmpty() && boxTypeList.size() > 0) {
 				boxType = boxTypeList.get(0).getBoxType();
+			} else {
+				if ("DL,ZR".contains(tradingBox.getType())) {
+					throw new RuntimeException("请先维护箱型箱量明细");
+				}
 			}
 			PutBox putBox = putBoxService.getOne(new LambdaQueryWrapper<PutBox>()
 				.eq(PutBox::getTenantId, AuthUtil.getTenantId())
@@ -2737,7 +2744,6 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				}
 			}
 		}
-		baseMapper.updateById(tradingBox);
 		return R.data(tradingBox);
 	}
 
@@ -2775,14 +2781,6 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 		putBox.setBoxEastId(tradingBox.getPurchaseCompanyId() + "");
 		putBox.setBoxEastName(tradingBox.getPurchaseCompanyName());
 		putBox.setBoxCondition(tradingBox.getBoxCondition());
-
-		if (tradingBox.getBoxNumber() < putBox.getOccupyNum()) {
-			throw new RuntimeException("箱量不能小于已占用数量");
-		}
-		putBox.setTotalNum(tradingBox.getBoxNumber());
-		putBox.setRemainingNum(putBox.getTotalNum() - putBox.getOccupyNum());
-		putBox.setNotSuitcaseNum(putBox.getTotalNum());
-
 		putBox.setEffectiveEndDate(tradingBox.getExpiryDate());
 		putBox.setEffectiveStartDate(tradingBox.getEffectiveDate());
 		putBox.setPolStationId(tradingBox.getPolStationId());
@@ -2795,19 +2793,29 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 		putBox.setPodStationEname(tradingBox.getPodStationEname());
 		putBox.setLoloPod(tradingBox.getLoloPod());
 		putBox.setLoloPol(tradingBox.getLoloPol());
-		putBoxService.updateById(putBox);
 		List<PutBoxItems> putBoxItemsList = putBoxItemsService.list(new LambdaQueryWrapper<PutBoxItems>()
 			.eq(PutBoxItems::getTenantId, AuthUtil.getTenantId())
 			.eq(PutBoxItems::getIsDeleted, 0)
 			.eq(PutBoxItems::getPid, putBox.getId()));
+		Integer alreadyAppeared = 0;
 		if (!putBoxItemsList.isEmpty()) {
 			for (PutBoxItems item : putBoxItemsList) {
 				item.setBoxEastId(tradingBox.getPurchaseCompanyId());
 				item.setBoxEastName(tradingBox.getPurchaseCompanyName());
 				item.setBoxCondition(tradingBox.getBoxCondition());
+				if ("空箱出场".equals(item.getBoxDynamics())) {
+					alreadyAppeared = alreadyAppeared + 1;
+				}
 			}
 			putBoxItemsService.updateBatchById(putBoxItemsList);
 		}
+		if (tradingBox.getBoxNumber() < putBox.getOccupyNum()) {
+			throw new RuntimeException("箱量不能小于已占用数量");
+		}
+		putBox.setTotalNum(tradingBox.getBoxNumber());
+		putBox.setRemainingNum(putBox.getTotalNum() - putBox.getOccupyNum() - alreadyAppeared);
+		putBox.setNotSuitcaseNum(putBox.getTotalNum());
+		putBoxService.updateById(putBox);
 		return R.data(tradingBox);
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/business/amends/service/impl/AmendsServiceImpl.java

@@ -168,7 +168,7 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 			Amends dataSourceBill = baseMapper.selectOne(new LambdaQueryWrapper<Amends>().select(Amends::getId, Amends::getVersion)
 				.eq(Amends::getId, amends.getId()));
 			if (!Objects.equals(dataSourceBill.getVersion(), amends.getVersion())) {
-				return R.fail(601, "数据已被其他用户更新，请等待刷新后重试");
+				return R.fail(601, "数据已被其他用户更新，请刷新后重试");
 			}
 			// 每更新一次往上累加一次版本
 			// 旧数据处理

blade-service/blade-los/src/main/java/org/springblade/los/business/mktSlot/service/impl/MktSlotServiceImpl.java

@@ -169,7 +169,7 @@ public class MktSlotServiceImpl extends ServiceImpl<MktSlotMapper, MktSlot> impl
 		} else {
 			MktSlot dataSourceBill = baseMapper.selectOne(new LambdaQueryWrapper<MktSlot>().select(MktSlot::getId, MktSlot::getVersion).eq(MktSlot::getId, mktSlot.getId()));
 			if (!Objects.equals(dataSourceBill.getVersion(), mktSlot.getVersion())) {
-				return R.fail(601, "数据已被其他用户更新，请等待刷新后重试");
+				return R.fail(601, "数据已被其他用户更新，请刷新后重试");
 			}
 			// 每更新一次往上累加一次版本
 			// 旧数据处理

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -297,7 +297,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		} else {
 			Bills dataSourceBill = baseMapper.selectOne(new LambdaQueryWrapper<Bills>().select(Bills::getId, Bills::getCorpId, Bills::getActualEta, Bills::getVersion).eq(Bills::getId, bills.getId()));
 			if (!Objects.equals(dataSourceBill.getVersion(), bills.getVersion())) {
-				return R.fail(601, "数据已被其他用户更新，请等待刷新后重试");
+				return R.fail(601, "数据已被其他用户更新，请刷新后重试");
 			}
 			// 每更新一次往上累加一次版本
 			// 旧数据处理
@@ -4770,7 +4770,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			Bills dataSourceBill = baseMapper.selectOne(new LambdaQueryWrapper<Bills>().select(Bills::getId, Bills::getVersion,
 				Bills::getIssueStatus, Bills::getStatus).eq(Bills::getId, bills.getId()));
 			if (!Objects.equals(dataSourceBill.getVersion(), bills.getVersion())) {
-				return R.fail(601, "数据已被其他用户更新，请等待刷新后重试");
+				return R.fail(601, "数据已被其他用户更新，请刷新后重试");
 			}
 			// 每更新一次往上累加一次版本
 			// 旧数据处理

blade-service/blade-los/src/main/java/org/springblade/los/edi/service/impl/EDISenderServiceImpl.java

@@ -15,7 +15,6 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.los.Util.RegularUtils;
 import org.springblade.los.Util.Regular_ONE;
 import org.springblade.los.Util.Regular_PIL;
-import org.springblade.los.basic.lines.entity.BLines;
 import org.springblade.los.basic.lines.service.IBLinesService;
 import org.springblade.los.basic.packages.entity.BPackages;
 import org.springblade.los.basic.packages.service.IBPackagesService;
@@ -2976,36 +2975,36 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			for (InttraSoDto bill : billsList) {
 				//记录类型标识 10  船舶有关的基本信息
 				writer.write("10::");
-				writer.write(bill.getVesselName()+"::"+bill.getVoyageNo()+"::::"+bill.getEta()+":"+bill.getPodCode()+":"+bill.getPodName()+"::::1'");
+				writer.write(bill.getVesselName() + "::" + bill.getVoyageNo() + "::::" + bill.getEta() + ":" + bill.getPodCode() + ":" + bill.getPodName() + "::::1'");
 				writer.newLine();
 				count++;
 				//记录类型标识 11   船舶有关的补充信息
-				writer.write("11::::WFL:" + bill.getEta()+":CNTAO:"+ bill.getEta()+"'");
+				writer.write("11::::WFL:" + bill.getEta() + ":CNTAO:" + bill.getEta() + "'");
 				writer.newLine();
 				count++;
 				//记录类型标识 12    提单的第一个记录
 				writer.write("12:" + bill.getMblNo());
-				writer.write("::::::"+bill.getPolCode()+":"+bill.getPolName()+"::P:"+bill.getEtd()+":::::::::::::::'");
+				writer.write("::::::" + bill.getPolCode() + ":" + bill.getPolName() + "::P:" + bill.getEtd() + ":::::::::::::::'");
 				writer.newLine();
 				count++;
 				//记录类型标识 13   提单的地点信息
-				writer.write("13:"+bill.getPodCode()+":"+bill.getPodName()+":::::::21:::'");
+				writer.write("13:" + bill.getPodCode() + ":" + bill.getPodName() + ":::::::21:::'");
 				writer.newLine();
 				count++;
 				//记录类型标识 16    发货人信息
-				writer.write("16::"+bill.getHShipper()+":"+bill.getHShipperDetail()+"::::::::'");
+				writer.write("16::" + bill.getHShipper() + ":" + bill.getHShipperDetail() + "::::::::'");
 				writer.newLine();
 				count++;
 				//记录类型标识 17    收货人信息
-				writer.write("17::"+bill.getHConsignee()+":"+bill.getHConsigneeDetail()+"::::::::'");
+				writer.write("17::" + bill.getHConsignee() + ":" + bill.getHConsigneeDetail() + "::::::::'");
 				writer.newLine();
 				count++;
 				//记录类型标识 18    通知人信息
-				writer.write("18::"+bill.getHNotify()+":::::::::'");
+				writer.write("18::" + bill.getHNotify() + ":::::::::'");
 				writer.newLine();
 				count++;
 				//记录类型标识 41    货物信息
-				writer.write("41:1::"+bill.getPackagesNumber()+"::"+bill.getPackagesDescribe()+":"+bill.getGrossWeight()+"::"+bill.getMeasurement()+":::'");
+				writer.write("41:1::" + bill.getPackagesNumber() + "::" + bill.getPackagesDescribe() + ":" + bill.getGrossWeight() + "::" + bill.getMeasurement() + ":::'");
 				writer.newLine();
 				count++;
 				// 44	MARKS & NOS. 唛头 1-10 行
@@ -3060,7 +3059,9 @@ public class EDISenderServiceImpl implements IEDISenderService {
 						// 记录类型标识 + 箱号 + 封号+箱型
 						writer.write("51:1:" + map1.get("cntrNo") + ":" + map1.get("sealNo") + ":" + map1.get("cntrTypeName"));
 						// 件数+毛重+尺码
-						writer.write(":F:" + map1.get("quantity") + ":" + map1.get("grossWeight") + ":0:" + map1.get("volume") +":::::::1");
+						boolean status = new BigDecimal(map1.get("volume").toString()).compareTo(new BigDecimal("0")) > 0;
+						String CTNSTATUS = status ? "F" : "E";
+						writer.write(":" + CTNSTATUS + ":" + map1.get("quantity") + ":" + map1.get("grossWeight") + ":0:" + map1.get("volume") + ":::::::1");
 						writer.newLine();
 						count += 1;
 					}

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FeeCenterServiceImpl.java

@@ -837,7 +837,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						FeeCenter feeCenter1 = feeCenters.stream().filter(e -> e.getId().equals(feeCenter.getId())).findFirst().orElse(null);
 						if (feeCenter1 != null) {
 							if (!Objects.equals(feeCenter1.getVersion(), feeCenter.getVersion())) {
-								throw new RuntimeException("数据已被其他用户更新，请等待刷新后重试");
+								throw new RuntimeException("数据已被其他用户更新，请刷新后重试");
 							}
 						}
 					}
@@ -979,7 +979,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						FeeCenter feeCenter1 = feeCenters.stream().filter(e -> e.getId().equals(feeCenter.getId())).findFirst().orElse(null);
 						if (feeCenter1 != null) {
 							if (!Objects.equals(feeCenter1.getVersion(), feeCenter.getVersion())) {
-								throw new RuntimeException("数据已被其他用户更新，请等待刷新后重试");
+								throw new RuntimeException("数据已被其他用户更新，请刷新后重试");
 							}
 						}
 					}
@@ -1214,7 +1214,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					FeeCenter feeCenter1 = feeCenterList1.stream().filter(e -> e.getId().equals(feeCenter.getId()))
 						.findFirst().orElse(null);
 					if (feeCenter1 != null && ObjectUtils.isNotNull(feeCenter.getVersion()) && !feeCenter.getVersion().equals(feeCenter1.getVersion())) {
-						throw new RuntimeException("数据已被其他用户更新，请等待刷新后重试");
+						throw new RuntimeException("数据已被其他用户更新，请刷新后重试");
 					}
 				}
 				feeCenter.setAmountLoc(feeCenter.getAmount().multiply(feeCenter.getExrate()));

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FinAccBillsServiceImpl.java

@@ -207,7 +207,7 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 			data.setWarehousingDate(finAccBills.getWarehousingDate());
 			data.setOutboundDate(finAccBills.getOutboundDate());
 			data.setBillNo((String) clientBillNo.getData());
-			data.setBillDate(new Date());
+			data.setBillDate(item.getBillDate());
 			data.setAccountType(finAccBills.getAccountType());
 			data.setAccountDc(item.getDc());
 			data.setAccountDate(item.getBillDate());

blade-service/blade-los/src/main/java/org/springblade/los/finance/invoices/service/impl/FinInvoicesServiceImpl.java

@@ -165,7 +165,7 @@ public class FinInvoicesServiceImpl extends ServiceImpl<FinInvoicesMapper, FinIn
 				.select(FinInvoices::getId, FinInvoices::getVersion)
 				.eq(FinInvoices::getId, finInvoices.getId()));
 			if (!Objects.equals(dataSourceBill.getVersion(), finInvoices.getVersion())) {
-				throw new RuntimeException("数据已被其他用户更新，请等待刷新后重试");
+				throw new RuntimeException("数据已被其他用户更新，请刷新后重试");
 			}
 			// 每更新一次往上累加一次版本
 			// 旧数据处理
@@ -2874,7 +2874,7 @@ public class FinInvoicesServiceImpl extends ServiceImpl<FinInvoicesMapper, FinIn
 				.select(FinInvoices::getId, FinInvoices::getVersion)
 				.eq(FinInvoices::getId, finInvoices.getId()));
 			if (!Objects.equals(dataSourceBill.getVersion(), finInvoices.getVersion())) {
-				throw new RuntimeException("数据已被其他用户更新，请等待刷新后重试");
+				throw new RuntimeException("数据已被其他用户更新，请刷新后重试");
 			}
 			// 每更新一次往上累加一次版本
 			// 旧数据处理

blade-service/blade-los/src/main/java/org/springblade/los/finance/operatingExpenses/service/impl/OperatingExpensesServiceImpl.java

@@ -152,7 +152,7 @@ public class OperatingExpensesServiceImpl extends ServiceImpl<OperatingExpensesM
 				.select(OperatingExpenses::getId,  OperatingExpenses::getVersion)
 				.eq(OperatingExpenses::getId, operatingExpenses.getId()));
 			if (!Objects.equals(dataSourceBill.getVersion(), operatingExpenses.getVersion())) {
-				return R.fail(601, "数据已被其他用户更新，请等待刷新后重试");
+				return R.fail(601, "数据已被其他用户更新，请刷新后重试");
 			}
 			// 每更新一次往上累加一次版本
 			// 旧数据处理

blade-service/blade-los/src/main/java/org/springblade/los/finance/stl/service/impl/FinStlBillsServiceImpl.java

@@ -243,7 +243,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 				.select(FinStlBills::getId, FinStlBills::getVersion)
 				.eq(FinStlBills::getId, finStlBills.getId()));
 			if (!Objects.equals(dataSourceBill.getVersion(), finStlBills.getVersion())) {
-				throw new RuntimeException("数据已被其他用户更新，请等待刷新后重试");
+				throw new RuntimeException("数据已被其他用户更新，请刷新后重试");
 			}
 			// 每更新一次往上累加一次版本
 			// 旧数据处理
@@ -4203,7 +4203,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 				.select(FinStlBills::getId, FinStlBills::getVersion)
 				.eq(FinStlBills::getId, finStlBills.getId()));
 			if (!Objects.equals(dataSourceBill.getVersion(), finStlBills.getVersion())) {
-				throw new RuntimeException("数据已被其他用户更新，请等待刷新后重试");
+				throw new RuntimeException("数据已被其他用户更新，请刷新后重试");
 			}
 			// 每更新一次往上累加一次版本
 			// 旧数据处理