2025年2月24日11:55:30

blade-service-api/blade-los-api/src/main/java/org/springblade/los/check/entity/LosAuditProecess.java

@@ -324,5 +324,17 @@ public class LosAuditProecess implements Serializable {
 	@ApiModelProperty(value = "参考号")
 	private String referenceNumber;
 
+	/**
+	 * 订舱代理 id
+	 */
+	@ApiModelProperty(value = "订舱代理 id")
+	private Long bookingAgentId;
+
+	/**
+	 * 订舱代理中文名称
+	 */
+	@ApiModelProperty(value = "订舱代理中文名称")
+	private String bookingAgentCnName;
+
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/basic/commodity/controller/BCommodityController.java

@@ -87,6 +87,7 @@ public class BCommodityController extends BladeController {
 			.and(ObjectUtils.isNotNull(bCommodity.getHsCode()), i -> i.like(BCommodity::getCnName, bCommodity.getHsCode()).or()
 				.like(BCommodity::getEnName, bCommodity.getHsCode()).or().like(BCommodity::getHsCode, bCommodity.getHsCode()))
 			.like(ObjectUtils.isNotNull(bCommodity.getNcmCode()), BCommodity::getNcmCode, bCommodity.getNcmCode())
+			.like(ObjectUtils.isNotNull(bCommodity.getCnName()), BCommodity::getCnName, bCommodity.getCnName())
 			.like(ObjectUtils.isNotNull(bCommodity.getStatus()), BCommodity::getStatus, bCommodity.getStatus());
 		String status = sysClient.getParamServiceNew("basic.data.sort");
 		if ("name".equals(status)) {

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

@@ -1377,6 +1377,9 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			auditProecessDTO.setCorpId(declare.getCorpId());
 			auditProecessDTO.setCorpsName(declare.getCorpCnName());
 			auditProecessDTO.setReferenceNumber(declare.getMblno());
+			auditProecessDTO.setMorderNo(declare.getMblno());
+			auditProecessDTO.setBookingAgentId(declare.getBookingAgentId());
+			auditProecessDTO.setBookingAgentCnName(declare.getBookingAgentCnName());
 			Dept dept = deptUtils.getDept(declare.getCreateDept());
 			if (dept != null) {
 				auditProecessDTO.setSalesCompanyId(dept.getId());