1.代码位置移动

blade-service/blade-los/src/main/java/org/springblade/los/Util/BillUtils.java

@@ -9,6 +9,7 @@ import org.springblade.client.entity.Message;
 import org.springblade.client.feign.IMessageClient;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.los.basic.corps.entity.BCorps;
 import org.springblade.los.basic.corps.service.IBCorpsService;
 import org.springblade.los.basic.cur.entity.BCurExrate;
@@ -27,6 +28,7 @@ import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -611,4 +613,68 @@ public class BillUtils implements IBillUtils {
 		}
 
 	}
+
+	@Override
+	public R verifyData(Long vesselId, String voyageNo, Long polId) {
+		Bills bills = billsMapper.selectOne(new LambdaQueryWrapper<Bills>()
+			.eq(Bills::getTenantId, AuthUtil.getTenantId())
+			.eq(Bills::getIsDeleted, 0)
+			.eq(Bills::getVesselId, vesselId)
+			.eq(Bills::getVoyageNo, voyageNo)
+			.eq(Bills::getPolId, polId)
+			.last("LIMIT 1"));
+		return R.data(bills);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public R updateVerifyData(Long vesselId, String voyageNo, Long polId, Date etd) {
+		List<Bills> billsList = billsMapper.selectList(new LambdaQueryWrapper<Bills>()
+			.eq(Bills::getTenantId, AuthUtil.getTenantId())
+			.eq(Bills::getIsDeleted, 0)
+			.ne(Bills::getBillStatus, 3)
+			.eq(Bills::getVesselId, vesselId)
+			.eq(Bills::getVoyageNo, voyageNo)
+			.eq(Bills::getPolId, polId));
+		if (!billsList.isEmpty()) {
+			for (Bills item : billsList) {
+				item.setEtd(etd);
+				item.setUpdateUser(AuthUtil.getUserId());
+				item.setUpdateUserName(AuthUtil.getUserName());
+				item.setUpdateTime(new Date());
+				billsMapper.updateById(item);
+			}
+			List<FeeCenter> feeCenterList = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
+				.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+				.eq(FeeCenter::getIsDeleted, 0)
+				.in(FeeCenter::getPid, billsList.stream().map(Bills::getId).distinct().collect(Collectors.toList())));
+			if (!feeCenterList.isEmpty()){
+				for (FeeCenter item : feeCenterList) {
+					item.setEtd(etd);
+					int version = StringUtil.isBlank(item.getVersion()) ? 1 : Integer.parseInt(item.getVersion());
+					item.setVersion(String.valueOf(version + 1));
+					item.setUpdateUser(AuthUtil.getUserId());
+					item.setUpdateUserName(AuthUtil.getUserName());
+					item.setUpdateTime(new Date());
+				}
+				feeCenterService.updateBatchById(feeCenterList);
+			}
+			List<FinAccBills> finAccBillsList = finAccBillsService.list(new LambdaQueryWrapper<FinAccBills>()
+				.eq(FinAccBills::getTenantId, AuthUtil.getTenantId())
+				.eq(FinAccBills::getIsDeleted, 0)
+				.in(FinAccBills::getBusinessBillId, billsList.stream().map(Bills::getId).distinct().collect(Collectors.toList())));
+			if (!finAccBillsList.isEmpty()){
+				for (FinAccBills item : finAccBillsList) {
+					item.setEtd(etd);
+					int version = StringUtil.isBlank(item.getVersion()) ? 1 : Integer.parseInt(item.getVersion());
+					item.setVersion(String.valueOf(version + 1));
+					item.setUpdateUser(AuthUtil.getUserId());
+					item.setUpdateUserName(AuthUtil.getUserName());
+					item.setUpdateTime(new Date());
+				}
+				finAccBillsService.updateBatchById(finAccBillsList);
+			}
+		}
+		return R.data(billsList);
+	}
 }

blade-service/blade-los/src/main/java/org/springblade/los/Util/IBillUtils.java

@@ -1,5 +1,6 @@
 package org.springblade.los.Util;
 
+import org.springblade.core.tool.api.R;
 import org.springblade.los.basic.cur.entity.BCurExrate;
 import org.springblade.los.basic.fees.entity.BFees;
 import org.springblade.los.business.release.entity.SeaReleaseBillItems;
@@ -7,6 +8,7 @@ import org.springblade.los.business.sea.entity.Bills;
 import org.springblade.los.business.sea.entity.PreContainers;
 import org.springblade.los.finance.fee.entity.FeeCenter;
 
+import java.util.Date;
 import java.util.List;
 
 /**

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

@@ -2657,9 +2657,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 		if (ObjectUtils.isNull(tradingBox.getTradingBoxItemsList()) || tradingBox.getTradingBoxItemsList().isEmpty()) {
 			throw new RuntimeException("请选择明细");
 		}
-		if (ObjectUtils.isNull(tradingBox.getPodStationId())) {
-			throw new RuntimeException("请选择更改还箱场站");
-		}
+
 		PutBox putBox = putBoxService.getOne(new LambdaQueryWrapper<PutBox>()
 			.eq(PutBox::getTenantId, AuthUtil.getTenantId())
 			.eq(PutBox::getIsDeleted, 0)

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -33,6 +33,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.los.Util.IBillUtils;
 import org.springblade.los.business.release.entity.SeaReleaseBillItems;
 import org.springblade.los.business.sea.entity.Bills;
 import org.springblade.los.business.sea.entity.SeaBillsDetail;
@@ -74,6 +75,8 @@ public class BillsController extends BladeController {
 
 	private final IFeeCenterService feeCenterService;
 
+	private final IBillUtils billUtils;
+
 	/**
 	 * 详情
 	 */
@@ -1073,7 +1076,7 @@ public class BillsController extends BladeController {
 	 */
 	@GetMapping("/verifyData")
 	public R verifyData(@RequestParam("vesselId") Long vesselId,@RequestParam("voyageNo") String voyageNo,@RequestParam("polId") Long polId) {
-		return billsService.verifyData(vesselId,voyageNo,polId);
+		return billUtils.verifyData(vesselId,voyageNo,polId);
 	}
 
 	/**
@@ -1082,7 +1085,7 @@ public class BillsController extends BladeController {
 	@GetMapping("/updateVerifyData")
 	public R updateVerifyData(@RequestParam("vesselId") Long vesselId,@RequestParam("voyageNo") String voyageNo,
 							  @RequestParam("polId") Long polId,@RequestParam("etd") Date etd) {
-		return billsService.updateVerifyData(vesselId,voyageNo,polId,etd);
+		return billUtils.updateVerifyData(vesselId,voyageNo,polId,etd);
 	}
 
 }

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

@@ -251,8 +251,4 @@ public interface IBillsService extends IService<Bills> {
 	List<DeliveryPaperExcel> sendDeliveryPaperExport(String ids);
 
 	R synchronizeCustoms(Bills bills);
-
-	R verifyData(Long vesselId, String voyageNo, Long polId);
-
-	R updateVerifyData(Long vesselId, String voyageNo, Long polId, Date etd);
 }

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

@@ -1458,8 +1458,6 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				item.setIssueDate(bills.getIssueDate());
 				item.setBranchId(bills.getBranchId());
 				item.setBranchName(bills.getBranchName());
-//				item.setHpaymode(bills.getHpaymode());
-//				item.setMpaymode(bills.getMpaymode());
 				item.setCyRemarks(bills.getCyRemarks());
 				item.setPolId(bills.getPolId());
 				item.setPolCode(bills.getPolCode());
@@ -3152,62 +3150,6 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			.eq(SeaBillsDetail::getTenantId, AuthUtil.getTenantId())
 			.eq(SeaBillsDetail::getPid, billsJk.getSrcBusId()));
 		if (seaBillsDetail != null) {
-			/*//HB/L 发货人
-			Long hshipperId = seaBillsDetail.getHshipperId();
-			String hshipperCode = seaBillsDetail.getHshipperCode();
-			String hshipperCnName = seaBillsDetail.getHshipperCnName();
-			String hshipperEnName = seaBillsDetail.getHshipperEnName();
-			String hshipperDetails = seaBillsDetail.getHshipperDetails();
-
-			//HB/L 收货人
-			Long hconsigneeId = seaBillsDetail.getHconsigneeId();
-			String hconsigneeCode = seaBillsDetail.getHconsigneeCode();
-			String hconsigneeCnName = seaBillsDetail.getHconsigneeCnName();
-			String hconsigneeEnName = seaBillsDetail.getHconsigneeEnName();
-			String hconsigneeDetails = seaBillsDetail.getHconsigneeDetails();
-
-			//HB/L  收货人=>发货人
-			seaBillsDetail.setHshipperId(hconsigneeId);
-			seaBillsDetail.setHshipperCode(hconsigneeCode);
-			seaBillsDetail.setHshipperCnName(hconsigneeCnName);
-			seaBillsDetail.setHshipperEnName(hconsigneeEnName);
-			seaBillsDetail.setHshipperDetails(hconsigneeDetails);
-
-			//HB/L  发货人=>收货人
-			seaBillsDetail.setHconsigneeId(hshipperId);
-			seaBillsDetail.setHconsigneeCode(hshipperCode);
-			seaBillsDetail.setHconsigneeCnName(hshipperCnName);
-			seaBillsDetail.setHconsigneeEnName(hshipperEnName);
-			seaBillsDetail.setHconsigneeDetails(hshipperDetails);
-
-			//MB/L 发货人
-			Long mshipperId = seaBillsDetail.getMshipperId();
-			String mshipperCode = seaBillsDetail.getMshipperCode();
-			String mshipperCnName = seaBillsDetail.getMshipperCnName();
-			String mshipperEnName = seaBillsDetail.getMshipperEnName();
-			String mshipperDetails = seaBillsDetail.getMshipperDetails();
-
-			//MB/L 收货人
-			Long mconsigneeId = seaBillsDetail.getMconsigneeId();
-			String mconsigneeCode = seaBillsDetail.getMconsigneeCode();
-			String mconsigneeCnName = seaBillsDetail.getMconsigneeCnName();
-			String mconsigneeEnName = seaBillsDetail.getMconsigneeEnName();
-			String mconsigneeDetails = seaBillsDetail.getMconsigneeDetails();
-
-			//MB/L  收货人=>发货人
-			seaBillsDetail.setMshipperId(mconsigneeId);
-			seaBillsDetail.setMshipperCode(mconsigneeCode);
-			seaBillsDetail.setMshipperCnName(mconsigneeCnName);
-			seaBillsDetail.setMshipperEnName(mconsigneeEnName);
-			seaBillsDetail.setMshipperDetails(mconsigneeDetails);
-
-			//MB/L   发货人=>收货人
-			seaBillsDetail.setMconsigneeId(mshipperId);
-			seaBillsDetail.setMconsigneeCode(mshipperCode);
-			seaBillsDetail.setMconsigneeCnName(mshipperCnName);
-			seaBillsDetail.setMconsigneeEnName(mshipperEnName);
-			seaBillsDetail.setMconsigneeDetails(mshipperDetails);*/
-
 			seaBillsDetail.setUpdateUser(null);
 			seaBillsDetail.setUpdateUserName(null);
 			seaBillsDetail.setUpdateTime(null);
@@ -3250,11 +3192,6 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		if (!containersList.isEmpty()) {
 			List<Containers> containersListNew = new ArrayList<>();
 			for (Containers item : containersList) {
-				/*if ("SOC".equals(billsJk.getBoxBelongsTo())) {
-					if (ObjectUtils.isNull(item.getPodStationId()) || item.getPodStationId() == 0) {
-						throw new RuntimeException("请先维护配箱POD堆场信息");
-					}
-				}*/
 				item.setSrcId(item.getId());
 				item.setId(null);
 				item.setCreateTime(new Date());
@@ -5642,8 +5579,6 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					item.setIssueDate(bills.getIssueDate());
 					item.setBranchId(bills.getBranchId());
 					item.setBranchName(bills.getBranchName());
-//					item.setHpaymode(bills.getHpaymode());
-//					item.setMpaymode(bills.getMpaymode());
 					item.setCyRemarks(bills.getCyRemarks());
 					item.setPolId(bills.getPolId());
 					item.setPolCode(bills.getPolCode());
@@ -6734,68 +6669,4 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		}
 		return R.data(bills);
 	}
-
-	@Override
-	public R verifyData(Long vesselId, String voyageNo, Long polId) {
-		Bills bills = baseMapper.selectOne(new LambdaQueryWrapper<Bills>()
-			.eq(Bills::getTenantId, AuthUtil.getTenantId())
-			.eq(Bills::getIsDeleted, 0)
-			.eq(Bills::getVesselId, vesselId)
-			.eq(Bills::getVoyageNo, voyageNo)
-			.eq(Bills::getPolId, polId)
-			.last("LIMIT 1"));
-		return R.data(bills);
-	}
-
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public R updateVerifyData(Long vesselId, String voyageNo, Long polId, Date etd) {
-		List<Bills> billsList = baseMapper.selectList(new LambdaQueryWrapper<Bills>()
-			.eq(Bills::getTenantId, AuthUtil.getTenantId())
-			.eq(Bills::getIsDeleted, 0)
-			.ne(Bills::getBillStatus, 3)
-			.eq(Bills::getVesselId, vesselId)
-			.eq(Bills::getVoyageNo, voyageNo)
-			.eq(Bills::getPolId, polId));
-		if (!billsList.isEmpty()) {
-			for (Bills item : billsList) {
-				item.setEtd(etd);
-				item.setUpdateUser(AuthUtil.getUserId());
-				item.setUpdateUserName(AuthUtil.getUserName());
-				item.setUpdateTime(new Date());
-			}
-			this.updateBatchById(billsList);
-			List<FeeCenter> feeCenterList = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
-				.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
-				.eq(FeeCenter::getIsDeleted, 0)
-				.in(FeeCenter::getPid, billsList.stream().map(Bills::getId).distinct().collect(Collectors.toList())));
-			if (!feeCenterList.isEmpty()){
-				for (FeeCenter item : feeCenterList) {
-					item.setEtd(etd);
-					int version = StringUtil.isBlank(item.getVersion()) ? 1 : Integer.parseInt(item.getVersion());
-					item.setVersion(String.valueOf(version + 1));
-					item.setUpdateUser(AuthUtil.getUserId());
-					item.setUpdateUserName(AuthUtil.getUserName());
-					item.setUpdateTime(new Date());
-				}
-				feeCenterService.updateBatchById(feeCenterList);
-			}
-			List<FinAccBills> finAccBillsList = finAccBillsService.list(new LambdaQueryWrapper<FinAccBills>()
-				.eq(FinAccBills::getTenantId, AuthUtil.getTenantId())
-				.eq(FinAccBills::getIsDeleted, 0)
-				.in(FinAccBills::getBusinessBillId, billsList.stream().map(Bills::getId).distinct().collect(Collectors.toList())));
-			if (!finAccBillsList.isEmpty()){
-				for (FinAccBills item : finAccBillsList) {
-					item.setEtd(etd);
-					int version = StringUtil.isBlank(item.getVersion()) ? 1 : Integer.parseInt(item.getVersion());
-					item.setVersion(String.valueOf(version + 1));
-					item.setUpdateUser(AuthUtil.getUserId());
-					item.setUpdateUserName(AuthUtil.getUserName());
-					item.setUpdateTime(new Date());
-				}
-				finAccBillsService.updateBatchById(finAccBillsList);
-			}
-		}
-		return R.data(billsList);
-	}
 }