1.海运出口提单确认增加提示客户是否提交修改

2.海运进出口配箱信息导出增加唛头

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

@@ -4588,6 +4588,12 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			throw new RuntimeException("缺少必要参数");
 		}
 		Bills detail = baseMapper.selectById(bills.getId());
+		if (detail == null) {
+			throw new RuntimeException("未查到客户订舱信息");
+		}
+		if (ObjectUtils.isNotNull(detail.getConfirmStatus())) {
+			throw new RuntimeException("客户未修改SI信息");
+		}
 		if (ObjectUtils.isNotNull(bills.getConfirmStatus()) && "1".equals(bills.getConfirmStatus())) {
 			if (!detail.getConfirmStatus().equals(bills.getConfirmStatus())) {
 				throw new RuntimeException("提单未确认");

blade-service/blade-los/src/main/java/org/springblade/los/excel/BoxAndLeadSealNoExcel.java

@@ -20,6 +20,9 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -96,5 +99,11 @@ public class BoxAndLeadSealNoExcel implements Serializable {
 	@ExcelProperty(value = "包装单位")
 	private String packingUnit;
 
+	/**
+	 * 唛头
+	 */
+	@ExcelProperty(value = "唛头")
+	private String marks;
+
 
 }