2024年1月12日14:03:27

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -2833,14 +2833,16 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			List<DeliveryFees> deliveryFeesList = delivery.getDeliveryFeesList();
 			BigDecimal amount = new BigDecimal("0.00");
 			//逐条计算费用税
-			for (DeliveryFees item : deliveryFeesList) {
-				if (ObjectUtils.isNotNull(item.getAmount()) && !new BigDecimal("0.00").equals(item.getAmount())) {
-					costAmount = costAmount.add(item.getAmount().divide(new BigDecimal("1.13"), MathContext.DECIMAL32)
-						.multiply(new BigDecimal("0.13")).setScale(2, BigDecimal.ROUND_HALF_UP));
-					amount = amount.add(item.getAmount());
-				} else {
-					costAmount = costAmount.add(new BigDecimal("0.00"));
-					amount = amount.add(new BigDecimal("0.00"));
+			if(ObjectUtils.isNotNull(deliveryFeesList) && deliveryFeesList.size()>0){
+				for (DeliveryFees item : deliveryFeesList) {
+					if (ObjectUtils.isNotNull(item.getAmount()) && !new BigDecimal("0.00").equals(item.getAmount())) {
+						costAmount = costAmount.add(item.getAmount().divide(new BigDecimal("1.13"), MathContext.DECIMAL32)
+							.multiply(new BigDecimal("0.13")).setScale(2, BigDecimal.ROUND_HALF_UP));
+						amount = amount.add(item.getAmount());
+					} else {
+						costAmount = costAmount.add(new BigDecimal("0.00"));
+						amount = amount.add(new BigDecimal("0.00"));
+					}
 				}
 			}
 			purchaseTotalAmount = purchaseTotalAmount.add(amount);

blade-service/blade-los/src/main/java/org/springblade/los/basic/cntr/service/impl/BCntrTypesServiceImpl.java

@@ -67,6 +67,12 @@ public class BCntrTypesServiceImpl extends ServiceImpl<CntrTypesMapper, BCntrTyp
 				.eq(BCntrTypes::getCnName, bCntrTypes.getCnName())) > 0) {
 				throw new RuntimeException("名称已存在");
 			}
+			if (baseMapper.selectCount(new LambdaQueryWrapper<BCntrTypes>()
+				.eq(BCntrTypes::getTenantId, AuthUtil.getTenantId())
+				.eq(BCntrTypes::getIsDeleted, 0)
+				.eq(BCntrTypes::getCnName, bCntrTypes.getCustomsCode())) > 0) {
+				throw new RuntimeException("海关编码已存在");
+			}
 			//获取部门ids对应中文名
 			if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 				bCntrTypes.setCreateDept(AuthUtil.getDeptId());

blade-service/blade-los/src/main/java/org/springblade/los/basic/fees/controller/BFeesController.java

@@ -86,6 +86,7 @@ public class BFeesController extends BladeController {
 			.like(ObjectUtils.isNotNull(bFees.getCnName()), BFees::getCnName, bFees.getCnName())
 			.like(ObjectUtils.isNotNull(bFees.getEnName()), BFees::getEnName, bFees.getEnName())
 			.like(ObjectUtils.isNotNull(bFees.getStatus()), BFees::getStatus, bFees.getStatus())
+			.like(ObjectUtils.isNotNull(bFees.getFeesTypeId()), BFees::getFeesTypeId, bFees.getFeesTypeId())
 			.orderByDesc(BFees::getCreateTime);
 		IPage<BFees> pages = bFeesService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);

blade-service/blade-los/src/main/java/org/springblade/los/basic/fees/controller/LosBFeesTemplateController.java

@@ -84,6 +84,7 @@ public class LosBFeesTemplateController extends BladeController {
 			.like(ObjectUtils.isNotNull(losBFeesTemplate.getCnName()), LosBFeesTemplate::getCnName, losBFeesTemplate.getCnName())
 			.like(ObjectUtils.isNotNull(losBFeesTemplate.getEnName()), LosBFeesTemplate::getEnName, losBFeesTemplate.getEnName())
 			.like(ObjectUtils.isNotNull(losBFeesTemplate.getStatus()), LosBFeesTemplate::getStatus, losBFeesTemplate.getStatus())
+			.like(ObjectUtils.isNotNull(losBFeesTemplate.getBusinessTypeId()), LosBFeesTemplate::getBusinessTypeId, losBFeesTemplate.getBusinessTypeId())
 			.orderByDesc(LosBFeesTemplate::getCreateTime);
 		IPage<LosBFeesTemplate> pages = losBFeesTemplateService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);

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

@@ -751,9 +751,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				.eq(Bills::getIsDeleted, 0)
 				.in(Bills::getId, idArr));
 			for (Bills item : billsList) {
-				if (ObjectUtils.isNull(item.getMblno())) {
-					throw new RuntimeException(item.getBillNo() + "分单提单号不能为空，操作失败");
-				}
+
 				item.setMasterId(bills.getId());
 				item.setMasterBillNo(bills.getBillNo());
 				item.setEtd(bills.getEtd());

blade-service/blade-los/src/main/java/org/springblade/los/edi/service/impl/EDISenderServiceImpl.java

@@ -32,7 +32,7 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			SimpleDateFormat sdf1 = new SimpleDateFormat("yyMMddhhmmss");
 			Date date = new Date();
 			//生成edi文件
-			File file = new File("/home/minio/file/" + AuthUtil.getTenantId() + "-bladex/upload", sdf1.format(date) + "-edi.txt");
+			File file = new File("/home/minio/file/" + AuthUtil.getTenantId() + "-bladex/upload", inttraSoDto.getEdiTypes().getCode()+ ".txt");
 //			File file = new File("D:/home/minio/file/" + AuthUtil.getTenantId() + "-bladex/upload", sdf1.format(date) + "-edi.text");
 			file.createNewFile();
 			// 打开文件输出流进行写入操作
@@ -693,7 +693,7 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			SimpleDateFormat sdf1 = new SimpleDateFormat("yyMMddhhmmss");
 			Date date = new Date();
 			//生成edi文件
-			File file = new File("/home/minio/file/" + AuthUtil.getTenantId() + "-bladex/upload", sdf1.format(date) + "-edi.txt");
+			File file = new File("/home/minio/file/" + AuthUtil.getTenantId() + "-bladex/upload", inttraSiDto.getEdiTypes().getCode() + ".txt");
 //			File file = new File("D:/home/minio/file/" + AuthUtil.getTenantId() + "-bladex/upload", sdf1.format(date) + "-edi.text");
 			file.createNewFile();
 			// 打开文件输出流进行写入操作
@@ -1231,7 +1231,7 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			SimpleDateFormat sdf1 = new SimpleDateFormat("yyMMddhhmmss");
 			Date date = new Date();
 			//生成edi文件
-			File file = new File("/home/minio/file/" + AuthUtil.getTenantId() + "-bladex/upload", sdf1.format(date) + "-edi.txt");
+			File file = new File("/home/minio/file/" + AuthUtil.getTenantId() + "-bladex/upload", inttraSiBillDto.getEdiTypes().getCode() + ".txt");
 			file.createNewFile();
 			// 打开文件输出流进行写入操作
 			BufferedWriter writer = new BufferedWriter(new FileWriter(file));
@@ -2626,7 +2626,7 @@ public class EDISenderServiceImpl implements IEDISenderService {
 			SimpleDateFormat sdf1 = new SimpleDateFormat("yyMMddhhmmss");
 			Date date = new Date();
 			//生成edi文件
-			File file = new File("/home/minio/file/" + AuthUtil.getTenantId() + "-bladex/upload", sdf1.format(date) + "-edi.txt");
+			File file = new File("/home/minio/file/" + AuthUtil.getTenantId() + "-bladex/upload", aplSoDto.getEdiTypes().getCode() + ".txt");
 			file.createNewFile();
 			// 打开文件输出流进行写入操作
 			BufferedWriter writer = new BufferedWriter(new FileWriter(file));

blade-service/blade-los/src/main/java/org/springblade/los/edi/service/impl/EdiTypesServiceImpl.java

@@ -141,7 +141,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 			.eq(Containers::getTenantId, AuthUtil.getTenantId())
 			.eq(Containers::getIsDeleted, 0)
 			.apply("find_in_set(pid,'" + ediTypes.getBillId() + "')"));
-		if ("HYCK".equals(ediTypes.getType()) && "INITRRA-SO".equals(ediTypes.getCode())) {
+		if ("HYCK".equals(ediTypes.getType()) && "INTTRA-SO".equals(ediTypes.getCode())) {
 			Date date = new Date();
 			for (Bills details : billsList) {
 				InttraSoDto inttraSoDto = new InttraSoDto();
@@ -271,24 +271,24 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 
 				details.setHshipperCnName(RegularUtils.regularEn(details.getHshipperCnName()));
 				inttraSoDto.setHsHipperOne(details.getHshipperCnName());
-				inttraSoDto.setHsHipperTwo("发货人 2");
-				inttraSoDto.setHsHipperThree("发货人 3");
-				inttraSoDto.setHsHipperFour("发货人 4");
-				inttraSoDto.setHsHipperFive("发货人 5");
+//				inttraSoDto.setHsHipperTwo("发货人 2");
+//				inttraSoDto.setHsHipperThree("发货人 3");
+//				inttraSoDto.setHsHipperFour("发货人 4");
+//				inttraSoDto.setHsHipperFive("发货人 5");
 
 				details.setHconsigneeCnName(RegularUtils.regularEn(details.getHconsigneeCnName()));
 				inttraSoDto.setHConsigneeOne(details.getHconsigneeCnName());
-				inttraSoDto.setHConsigneeTwo("收货人 2");
-				inttraSoDto.setHConsigneeThree("收货人3");
-				inttraSoDto.setHConsigneeFour("收货人 4");
-				inttraSoDto.setHConsigneeFive("收货人 5");
+//				inttraSoDto.setHConsigneeTwo("收货人 2");
+//				inttraSoDto.setHConsigneeThree("收货人3");
+//				inttraSoDto.setHConsigneeFour("收货人 4");
+//				inttraSoDto.setHConsigneeFive("收货人 5");
 
 				details.setHnotifyCnName(RegularUtils.regularEn(details.getHnotifyCnName()));
 				inttraSoDto.setHNotifyOne(details.getHnotifyCnName());
-				inttraSoDto.setHNotifyTwo("通知人 2");
-				inttraSoDto.setHNotifyThree("通知人 3");
-				inttraSoDto.setHNotifyFour("通知人 4");
-				inttraSoDto.setHNotifyFive("通知人 5");
+//				inttraSoDto.setHNotifyTwo("通知人 2");
+//				inttraSoDto.setHNotifyThree("通知人 3");
+//				inttraSoDto.setHNotifyFour("通知人 4");
+//				inttraSoDto.setHNotifyFive("通知人 5");
 
 				details.setCarrierCnName(RegularUtils.regularEn(details.getCarrierCnName()));
 				inttraSoDto.setCarrierName(details.getCarrierCnName());
@@ -309,9 +309,9 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				inttraSoDto.setInttraToDoorName(details.getInttraToDoorCorpName());
 				details.setInttraToDoorCorpAddr(RegularUtils.regularEn(details.getInttraToDoorCorpAddr()));
 				inttraSoDto.setInttraToDoorAddrOne(details.getInttraToDoorCorpAddr());
-				inttraSoDto.setInttraToDoorAddrTwo("地址 2");
-				inttraSoDto.setInttraToDoorAddrThree("地址 3");
-				inttraSoDto.setInttraToDoorAddrFour("地址 4");
+//				inttraSoDto.setInttraToDoorAddrTwo("地址 2");
+//				inttraSoDto.setInttraToDoorAddrThree("地址 3");
+//				inttraSoDto.setInttraToDoorAddrFour("地址 4");
 				details.setInttraToDoorCorpContacts(RegularUtils.regularEn(details.getInttraToDoorCorpContacts()));
 				inttraSoDto.setInttraToDoorContacts(details.getInttraToDoorCorpContacts());
 				details.setInttraToDoorCorpTel(RegularUtils.regularEn(details.getInttraToDoorCorpTel()));
@@ -320,9 +320,9 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				inttraSoDto.setInttraDoorToName(details.getInttraDoorToCorpName());
 				details.setInttraDoorToCorpAddr(RegularUtils.regularEn(details.getInttraDoorToCorpAddr()));
 				inttraSoDto.setInttraDoorToAddrOne(details.getInttraDoorToCorpAddr());
-				inttraSoDto.setInttraDoorToAddrTwo("地址 2");
-				inttraSoDto.setInttraDoorToAddrThree("地址 3");
-				inttraSoDto.setInttraDoorToAddrFour("地址 4");
+//				inttraSoDto.setInttraDoorToAddrTwo("地址 2");
+//				inttraSoDto.setInttraDoorToAddrThree("地址 3");
+//				inttraSoDto.setInttraDoorToAddrFour("地址 4");
 				details.setInttraDoorToCorpContacts(RegularUtils.regularEn(details.getInttraDoorToCorpContacts()));
 				inttraSoDto.setInttraDoorToContacts(details.getInttraDoorToCorpContacts());
 				details.setInttraDoorToCorpTel(RegularUtils.regularEn(details.getInttraDoorToCorpTel()));
@@ -334,7 +334,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				inttraSoDto.setSenderContacts("发送方联系人");
 				inttraSoDto.setSenderTel("发送方联系电话");
 				inttraSoDto.setSenderEmail("发送方联系邮件");
-				inttraSoDto.setBillLadingType("提单类型");
+				inttraSoDto.setBillLadingType(details.getBillType());
 				if (details.getStlCrStatus() >= 3 || details.getStlDrStatus() >= 3) {
 					inttraSoDto.setPaymentStatus("已付款");
 				} else {
@@ -373,7 +373,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				inttraSoDto.setRecordRows(new BigDecimal("10"));
 				inttraSoDto.setInformationNoEnd(inttraSoDto.getInformationNo());
 				inttraSoDto.setFileExchangeNumberEnd(inttraSoDto.getFileExchangeNumber());
-
+				inttraSoDto.setEdiTypes(ediTypes);
 				FilesCenter filesCenter = iediSenderService.sendingInttraSo(inttraSoDto);
 
 				//发送edi记录
@@ -418,7 +418,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 			}
 			billsService.updateBatchById(billsList);
 		}
-		else if ("HYCK".equals(ediTypes.getType()) && "INITRRA-SI".equals(ediTypes.getCode())) {
+		else if ("HYCK".equals(ediTypes.getType()) && "INTTRA-SI".equals(ediTypes.getCode())) {
 			Date date = new Date();
 			for (Bills details : billsList) {
 				InttraSiDto inttraSoDto = new InttraSiDto();
@@ -544,24 +544,24 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 
 				details.setHshipperCnName(RegularUtils.regularEn(details.getHshipperCnName()));
 				inttraSoDto.setHsHipperOne(details.getHshipperCnName());
-				inttraSoDto.setHsHipperTwo("发货人 2");
-				inttraSoDto.setHsHipperThree("发货人 3");
-				inttraSoDto.setHsHipperFour("发货人 4");
-				inttraSoDto.setHsHipperFive("发货人 5");
+//				inttraSoDto.setHsHipperTwo("发货人 2");
+//				inttraSoDto.setHsHipperThree("发货人 3");
+//				inttraSoDto.setHsHipperFour("发货人 4");
+//				inttraSoDto.setHsHipperFive("发货人 5");
 
 				details.setHconsigneeCnName(RegularUtils.regularEn(details.getHconsigneeCnName()));
 				inttraSoDto.setHConsigneeOne(details.getHconsigneeCnName());
-				inttraSoDto.setHConsigneeTwo("收货人 2");
-				inttraSoDto.setHConsigneeThree("收货人3");
-				inttraSoDto.setHConsigneeFour("收货人 4");
-				inttraSoDto.setHConsigneeFive("收货人 5");
+//				inttraSoDto.setHConsigneeTwo("收货人 2");
+//				inttraSoDto.setHConsigneeThree("收货人3");
+//				inttraSoDto.setHConsigneeFour("收货人 4");
+//				inttraSoDto.setHConsigneeFive("收货人 5");
 
 				details.setHnotifyCnName(RegularUtils.regularEn(details.getHnotifyCnName()));
 				inttraSoDto.setHNotifyOne(details.getHnotifyCnName());
-				inttraSoDto.setHNotifyTwo("通知人 2");
-				inttraSoDto.setHNotifyThree("通知人 3");
-				inttraSoDto.setHNotifyFour("通知人 4");
-				inttraSoDto.setHNotifyFive("通知人 5");
+//				inttraSoDto.setHNotifyTwo("通知人 2");
+//				inttraSoDto.setHNotifyThree("通知人 3");
+//				inttraSoDto.setHNotifyFour("通知人 4");
+//				inttraSoDto.setHNotifyFive("通知人 5");
 
 				details.setCarrierCnName(RegularUtils.regularEn(details.getCarrierCnName()));
 				inttraSoDto.setCarrierName(details.getCarrierCnName());
@@ -628,6 +628,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				inttraSoDto.setRecordRows(new BigDecimal("10"));
 				inttraSoDto.setInformationNoEnd(inttraSoDto.getInformationNo());
 				inttraSoDto.setFileExchangeNumberEnd(inttraSoDto.getFileExchangeNumber());
+				inttraSoDto.setEdiTypes(ediTypes);
 
 				FilesCenter filesCenter = iediSenderService.sendingInttraSI(inttraSoDto);
 
@@ -673,7 +674,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 			}
 			billsService.updateBatchById(billsList);
 		}
-		else if ("HYCK".equals(ediTypes.getType()) && "SI-bill".equals(ediTypes.getCode())) {
+		else if ("HYCK".equals(ediTypes.getType()) && "INTTRA-SI-bill".equals(ediTypes.getCode())) {
 			Date date = new Date();
 			for (Bills details : billsList) {
 				InttraSiBillDto inttraSoDto = new InttraSiBillDto();
@@ -773,7 +774,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				inttraSoDto.setRecordRows(new BigDecimal("10"));
 				inttraSoDto.setInformationNoEnd(inttraSoDto.getInformationNo());
 				inttraSoDto.setFileExchangeNumberEnd(inttraSoDto.getFileExchangeNumber());
-
+				inttraSoDto.setEdiTypes(ediTypes);
 				FilesCenter filesCenter = iediSenderService.sendingInttraSiBill(inttraSoDto);
 
 				//发送edi记录
@@ -822,7 +823,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 			Date date = new Date();
 			for (Bills details : billsList) {
 				APLSoDto aplSoDto = new APLSoDto();
-
+				aplSoDto.setEdiTypes(ediTypes);
 				FilesCenter filesCenter = iediSenderService.sendingAplSo(aplSoDto);
 
 				//发送edi记录
@@ -967,7 +968,7 @@ public class EdiTypesServiceImpl extends ServiceImpl<EdiTypesMapper, EdiTypes> i
 				inttraSoDto.setRecordRows(new BigDecimal("10"));
 				inttraSoDto.setInformationNoEnd(inttraSoDto.getInformationNo());
 				inttraSoDto.setFileExchangeNumberEnd(inttraSoDto.getFileExchangeNumber());
-
+				inttraSoDto.setEdiTypes(ediTypes);
 				FilesCenter filesCenter = iediSenderService.sendingInttraSiBill(inttraSoDto);
 
 				//发送edi记录

blade-service/blade-pay/src/main/java/org/springblade/pay/tonglianPayment/controller/WechatMarkController.java

@@ -76,7 +76,7 @@ public class WechatMarkController extends BladeController {
 		lambdaQueryWrapper.eq(WechatMark::getIsDeleted, 0)
 			.eq(WechatMark::getTenantId, AuthUtil.getTenantId())
 			.eq(ObjectUtils.isNotNull(wechatMark.getType()), WechatMark::getType, wechatMark.getType())
-			.eq(ObjectUtils.isNotNull(wechatMark.getSalesCompanyId()), WechatMark::getSalesCompanyId, wechatMark.getSalesCompanyId())
+			.eq( WechatMark::getSalesCompanyId, AuthUtil.getDeptId())
 			.like(ObjectUtils.isNotNull(wechatMark.getSerialNumber()), WechatMark::getSerialNumber, wechatMark.getSerialNumber())
 			.eq(ObjectUtils.isNotNull(wechatMark.getStatus()), WechatMark::getStatus, wechatMark.getStatus());
 		String status = sysClient.getParamService("mall.data");