2024年1月15日17:45:15

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/amends/entity/Amends.java

@@ -436,6 +436,12 @@ public class Amends implements Serializable {
 	private String tenantId;
 
 	/**
+	 * 物流-费用中心
+	 */
+	@TableField(exist = false)
+	private List<FeeCenter> feeCenterList;
+
+	/**
 	 * 物流-费用中心(付)
 	 */
 	@TableField(exist = false)

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

@@ -23,27 +23,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.los.Util.IDeptUtils;
-import org.springblade.los.basic.cur.service.IBCurrencyService;
 import org.springblade.los.business.amends.entity.Amends;
 import org.springblade.los.business.amends.mapper.AmendsMapper;
 import org.springblade.los.business.amends.service.IAmendsService;
 import org.springblade.los.business.amends.vo.AmendsVO;
-import org.springblade.los.business.files.entity.FilesCenter;
-import org.springblade.los.business.sea.dto.WaitingBox;
-import org.springblade.los.business.sea.entity.*;
 import org.springblade.los.finance.fee.entity.FeeCenter;
 import org.springblade.los.finance.fee.service.IFeeCenterService;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.ISysClient;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 业务-业务费用 AmendDate 服务实现类
@@ -115,19 +107,24 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 			throw new RuntimeException("缺少必要参数");
 		}
 		Amends detail = baseMapper.selectById(amends.getId());
+		detail.setFeeCenterList(feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
+			.eq(FeeCenter::getIsDeleted, 0)
+			.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+			.eq(FeeCenter::getPid, detail.getId())
+		));
 		detail.setFeeCenterListC(feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
 			.eq(FeeCenter::getIsDeleted, 0)
 			.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 			.eq(FeeCenter::getPid, detail.getId())
 			.eq(FeeCenter::getDc, "C")
-			.eq(FeeCenter::getBillNo, detail.getBillNo())
+			.eq(FeeCenter::getBillNo, detail.getOrigId())
 		));
 		detail.setFeeCenterListD(feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
 			.eq(FeeCenter::getIsDeleted, 0)
 			.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
 			.eq(FeeCenter::getPid, detail.getId())
 			.eq(FeeCenter::getDc, "D")
-			.eq(FeeCenter::getBillNo, detail.getBillNo())
+			.eq(FeeCenter::getBillNo, detail.getOrigId())
 		));
 		return detail;
 	}

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

@@ -370,4 +370,15 @@ public class BillsController extends BladeController {
 		return R.data(declare);
 	}
 
+	/**
+	 * 详情
+	 */
+	@GetMapping("/getDetail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入bills")
+	public R<Bills> getDetail(Bills bills) {
+		Bills detail = billsService.getDetail(bills);
+		return R.data(detail);
+	}
+
 }

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

@@ -140,4 +140,6 @@ public interface IBillsService extends IService<Bills> {
 	 * @return
 	 */
 	R revokeDisembarking(String ids);
+
+	Bills getDetail(Bills bills);
 }

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

@@ -28,16 +28,9 @@ 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.IDeptUtils;
-import org.springblade.los.Util.RegularUtils;
 import org.springblade.los.basic.business.entity.BusinessType;
 import org.springblade.los.basic.business.service.IBusinessTypeService;
-import org.springblade.los.basic.corps.entity.BCorps;
-import org.springblade.los.basic.corps.service.IBCorpsService;
 import org.springblade.los.basic.cur.service.IBCurrencyService;
-import org.springblade.los.basic.ports.entity.BPorts;
-import org.springblade.los.basic.ports.service.IBPortsService;
-import org.springblade.los.basic.vessels.entity.BVessels;
-import org.springblade.los.basic.vessels.service.IBVesselsService;
 import org.springblade.los.billno.entity.BusinessBillNo;
 import org.springblade.los.billno.service.IBusinessBillNoService;
 import org.springblade.los.business.files.entity.FilesCenter;
@@ -53,8 +46,6 @@ import org.springblade.los.check.entity.LosAuditPathsLevels;
 import org.springblade.los.check.service.IAuditPathsActsService;
 import org.springblade.los.check.service.IAuditPathsLevelsService;
 import org.springblade.los.check.service.IAuditProecessService;
-import org.springblade.los.edi.api.EDISender;
-import org.springblade.los.edi.dto.InttraSoDto;
 import org.springblade.los.finance.fee.entity.FeeCenter;
 import org.springblade.los.finance.fee.entity.FinAccBills;
 import org.springblade.los.finance.fee.service.IFeeCenterService;
@@ -66,7 +57,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -113,12 +103,6 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 
 	private final IAuditProecessService auditProecessService;
 
-	private final IBPortsService bPortsService;
-
-	private final IBCorpsService bCorpsService;
-
-	private final IBVesselsService bVesselsService;
-
 
 	@Override
 	public IPage<BillsVO> selectBillsPage(IPage<BillsVO> page, BillsVO bills) {
@@ -156,9 +140,9 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			.eq(Bills::getMblno, bills.getMblno())
 			.eq(Bills::getBookingNo, bills.getBookingNo())
 		);
-		if ("SE".equals(bills.getBusinessType())){
+		if ("SE".equals(bills.getBusinessType())) {
 			bills.setBillDate(bills.getEtd());
-		}else{
+		} else {
 			bills.setBillDate(bills.getEta());
 		}
 		if (bills.getId() == null) {
@@ -342,7 +326,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		Integer HC40 = 0;
 		Integer GP45 = 0;
 		Integer GP48 = 0;
-		String boxTypeSum = "";
+		StringBuilder boxTypeSum = new StringBuilder();
 		if (ObjectUtils.isNotNull(bills.getPreContainersList())) {
 			for (PreContainers item : bills.getPreContainersList()) {
 				item.setPid(bills.getId());
@@ -357,29 +341,15 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				} else if ("48GP".equals(item.getCntrTypeCode())) {
 					GP48 += item.getQuantity();
 				}
+				boxTypeSum.append(item.getCntrTypeCode()).append("*").append(item.getQuantity()).append(",");
 			}
 			R res = preContainersService.submitList(bills.getPreContainersList());
 			if (!res.isSuccess()) {
 				throw new RuntimeException("保存失败");
 			}
-			if (GP20 > 0) {
-				boxTypeSum += "20GP * " + GP20 + ",";
-			}
-			if (GP40 > 0) {
-				boxTypeSum += "40GP * " + GP40 + ",";
-			}
-			if (HC40 > 0) {
-				boxTypeSum += "40HC * " + HC40 + ",";
-			}
-			if (GP45 > 0) {
-				boxTypeSum += "45GP * " + GP45 + ",";
-			}
-			if (GP48 > 0) {
-				boxTypeSum += "48GP * " + GP48 + ",";
-			}
 			if (boxTypeSum.length() > 0) {
-				boxTypeSum = boxTypeSum.substring(0, boxTypeSum.length() - 1);
-				bills.setQuantityCntrDescr(boxTypeSum);
+				boxTypeSum = new StringBuilder(boxTypeSum.substring(0, boxTypeSum.length() - 1));
+				bills.setQuantityCntrDescr(boxTypeSum.toString());
 			}
 		}
 		bills.setQuantityV20(GP20);
@@ -1445,5 +1415,42 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		return R.data("操作成功");
 	}
 
+	@Override
+	public Bills getDetail(Bills bills) {
+		if (ObjectUtils.isNull(bills.getMblno()) &&
+			ObjectUtils.isNull(bills.getHblno()) &&
+			ObjectUtils.isNull(bills.getBookingNo()) &&
+			ObjectUtils.isNull(bills.getRefno())
+		) {
+			throw new RuntimeException("缺少必要参数");
+		}
+		Bills detail = baseMapper.selectOne(new LambdaQueryWrapper<Bills>()
+			.eq(ObjectUtils.isNotNull(bills.getMblno()), Bills::getMblno, bills.getMblno())
+			.eq(ObjectUtils.isNotNull(bills.getHblno()), Bills::getHblno, bills.getHblno())
+			.eq(ObjectUtils.isNotNull(bills.getBookingNo()), Bills::getBookingNo, bills.getBookingNo())
+			.eq(ObjectUtils.isNotNull(bills.getRefno()), Bills::getRefno, bills.getRefno())
+		);
+		if (detail == null) {
+			throw new RuntimeException("未查到单据信息");
+		}
+		detail.setFeeCenterListC(feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
+			.eq(FeeCenter::getIsDeleted, 0)
+			.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+			.eq(FeeCenter::getBillType, detail.getBillType())
+			.eq(FeeCenter::getPid, detail.getId())
+			.eq(FeeCenter::getDc, "C")
+			.eq(FeeCenter::getBillNo, detail.getBillNo())
+		));
+		detail.setFeeCenterListD(feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
+			.eq(FeeCenter::getIsDeleted, 0)
+			.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+			.eq(FeeCenter::getBillType, detail.getBillType())
+			.eq(FeeCenter::getPid, detail.getId())
+			.eq(FeeCenter::getDc, "D")
+			.eq(FeeCenter::getBillNo, detail.getBillNo())
+		));
+		return detail;
+	}
+
 
 }