1.海、空运舱单，快递业务，海运派车模块增加amend获取单据接口

2.调试及修改海、空运舱单接口

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/generalBill/entity/GeneralBill.java

@@ -406,6 +406,12 @@ public class GeneralBill implements Serializable {
 	private BigDecimal amountProfitLoc;
 
 	/**
+	 * 运输类型
+	 */
+	@ApiModelProperty(value = "运输类型")
+	private String transportType;
+
+	/**
 	 * 编码生成code
 	 */
 	@TableField(exist = false)

blade-service/blade-los/src/main/java/org/springblade/los/business/generalBill/controller/GeneralBillController.java

@@ -34,9 +34,11 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.los.business.generalBill.entity.GeneralBill;
 import org.springblade.los.business.generalBill.service.IGeneralBillService;
 import org.springblade.los.business.generalBill.vo.GeneralBillVO;
+import org.springblade.los.business.sea.entity.Bills;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * 业务-海、空运舱单，快递业务，海运派车 控制器
@@ -173,5 +175,14 @@ public class GeneralBillController extends BladeController {
 		return R.data(declare);
 	}
 
+	/**
+	 * amend获取单据数据
+	 */
+	@GetMapping("/getDetail")
+	public R<List<GeneralBill>> getDetail(GeneralBill bills) {
+		List<GeneralBill> detail = generalBillService.getDetail(bills);
+		return R.data(detail);
+	}
+
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/business/generalBill/service/IGeneralBillService.java

@@ -22,6 +22,8 @@ import org.springblade.los.business.generalBill.vo.GeneralBillVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.List;
+
 /**
  * 业务-海、空运舱单，快递业务，海运派车 服务类
  *
@@ -46,4 +48,6 @@ public interface IGeneralBillService extends IService<GeneralBill> {
 	GeneralBill checkBills(GeneralBill generalBill);
 
 	GeneralBill revokeCheckOrder(GeneralBill generalBill);
+
+	List<GeneralBill> getDetail(GeneralBill bills);
 }

blade-service/blade-los/src/main/java/org/springblade/los/business/generalBill/service/impl/GeneralBillServiceImpl.java

@@ -442,4 +442,54 @@ public class GeneralBillServiceImpl extends ServiceImpl<GeneralBillMapper, Gener
 		return declare;
 	}
 
+	@Override
+	public List<GeneralBill> getDetail(GeneralBill bills) {
+		if (ObjectUtils.isNull(bills.getMblno()) &&
+			ObjectUtils.isNull(bills.getHblno()) &&
+			ObjectUtils.isNull(bills.getRefno())
+		) {
+			throw new RuntimeException("缺少必要参数");
+		}
+		LambdaQueryWrapper<GeneralBill> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(bills.getBusinessType()), GeneralBill::getBusinessType, bills.getBusinessType())
+			.like(ObjectUtils.isNotNull(bills.getMblno()), GeneralBill::getMblno, bills.getMblno())
+			.like(ObjectUtils.isNotNull(bills.getHblno()), GeneralBill::getHblno, bills.getHblno())
+			.like(ObjectUtils.isNotNull(bills.getRefno()), GeneralBill::getRefno, bills.getRefno())
+			.eq(GeneralBill::getIsDeleted, 0)
+			.eq(GeneralBill::getTenantId, AuthUtil.getTenantId())
+			.eq(GeneralBill::getStatus, 3);
+		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("财务")) {
+			lambdaQueryWrapper.apply("find_in_set(team_id,'" + AuthUtil.getPostId() + "')");
+		}
+		if (!AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(GeneralBill::getBranchId, deptUtils.getDeptPid());
+		}
+		List<GeneralBill> billsList = baseMapper.selectList(lambdaQueryWrapper);
+		if (billsList.isEmpty()) {
+			throw new RuntimeException("未查到单据信息");
+		}
+		for (GeneralBill detail : billsList) {
+			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::getAccStatus, 1)
+				.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::getAccStatus, 1)
+				.eq(FeeCenter::getBillNo, detail.getBillNo())
+			));
+		}
+
+		return billsList;
+	}
+
 }