1.海运进出口请核 场站必填校验修改

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

@@ -2119,11 +2119,15 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			if (ObjectUtils.isNull(declare.getCarrierId())) {
 				texts = texts + "船公司、";
 			}
-			if (ObjectUtils.isNull(declare.getCyId())) {
-				texts = texts + "POL场站、";
+			if ("SE".equals(declare.getBusinessType())) {
+				if (ObjectUtils.isNull(declare.getCyId())) {
+					texts = texts + "POL场站、";
+				}
 			}
-			if (ObjectUtils.isNull(declare.getPodCyId())) {
-				texts = texts + "POD场站、";
+			if ("SI".equals(declare.getBusinessType())) {
+				if (ObjectUtils.isNull(declare.getPodCyId())) {
+					texts = texts + "POD场站、";
+				}
 			}
 			if (ObjectUtils.isNotNull(texts)) {
 				throw new RuntimeException("单号：" + declare.getBillNo() + "," + texts + "不能为空");
@@ -2253,11 +2257,15 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 						if (ObjectUtils.isNull(item.getCarrierId())) {
 							texts = texts + "船公司、";
 						}
-						if (ObjectUtils.isNull(item.getCyId())) {
-							texts = texts + "POL场站、";
+						if ("SE".equals(item.getBusinessType())) {
+							if (ObjectUtils.isNull(item.getCyId())) {
+								texts = texts + "POL场站、";
+							}
 						}
-						if (ObjectUtils.isNull(item.getPodCyId())) {
-							texts = texts + "POD场站、";
+						if ("SI".equals(item.getBusinessType())) {
+							if (ObjectUtils.isNull(item.getPodCyId())) {
+								texts = texts + "POD场站、";
+							}
 						}
 						if (ObjectUtils.isNotNull(texts)) {
 							throw new RuntimeException("单号：" + item.getBillNo() + "," + texts + "不能为空");
@@ -4232,11 +4240,15 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 						if (ObjectUtils.isNull(item.getCarrierId())) {
 							texts = texts + "船公司、";
 						}
-						if (ObjectUtils.isNull(item.getCyId())) {
-							texts = texts + "POL场站、";
+						if ("SE".equals(item.getBusinessType())) {
+							if (ObjectUtils.isNull(item.getCyId())) {
+								texts = texts + "POL场站、";
+							}
 						}
-						if (ObjectUtils.isNull(item.getPodCyId())) {
-							texts = texts + "POD场站、";
+						if ("SI".equals(item.getBusinessType())) {
+							if (ObjectUtils.isNull(item.getPodCyId())) {
+								texts = texts + "POD场站、";
+							}
 						}
 					}
 					if (ObjectUtils.isNotNull(texts)) {
@@ -4315,11 +4327,15 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				if (ObjectUtils.isNull(declare.getCarrierId())) {
 					texts = texts + "船公司、";
 				}
-				if (ObjectUtils.isNull(declare.getCyId())) {
-					texts = texts + "POL场站、";
+				if ("SE".equals(declare.getBusinessType())) {
+					if (ObjectUtils.isNull(declare.getCyId())) {
+						texts = texts + "POL场站、";
+					}
 				}
-				if (ObjectUtils.isNull(declare.getPodCyId())) {
-					texts = texts + "POD场站、";
+				if ("SI".equals(declare.getBusinessType())) {
+					if (ObjectUtils.isNull(declare.getPodCyId())) {
+						texts = texts + "POD场站、";
+					}
 				}
 			}
 			if (ObjectUtils.isNotNull(texts)) {