Merge remote-tracking branch 'origin/dev' into dev

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

@@ -33,7 +33,6 @@ import org.springblade.los.basic.business.service.IBusinessTypeService;
 import org.springblade.los.basic.cur.service.IBCurrencyService;
 import org.springblade.los.billno.entity.BusinessBillNo;
 import org.springblade.los.billno.service.IBusinessBillNoService;
-import org.springblade.los.business.aea.entity.AeaBills;
 import org.springblade.los.business.files.entity.FilesCenter;
 import org.springblade.los.business.files.service.IFilesCenterService;
 import org.springblade.los.business.sea.dto.WaitingBox;
@@ -141,9 +140,9 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			bills.setBillDate(bills.getEta());
 		}
 		if (bills.getId() == null) {
-			if ("MH".equals(bills.getBillType())) {
+			if (!"MH".equals(bills.getBillType())) {
 				if (count.size() > 0) {
-					throw new RuntimeException("提单号不允许重复");
+					throw new RuntimeException("提单号不允许重复:"+bills.getMblno());
 				}
 			}
 			BusinessType businessType = bBusinessTypeService.getOne(new LambdaQueryWrapper<BusinessType>()
@@ -173,9 +172,9 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			}
 		} else {
 			List<Long> ids = count.stream().map(Bills::getId).distinct().collect(Collectors.toList());
-			if ("MH".equals(bills.getBillType())) {
+			if (!"MH".equals(bills.getBillType())) {
 				if (count.size() > 0 && !ids.contains(bills.getId())) {
-					throw new RuntimeException("提单号不允许重复");
+					throw new RuntimeException("提单号不允许重复:"+bills.getMblno());
 				}
 			}
 			bills.setUpdateUser(AuthUtil.getUserId());