2024年9月20日15:17:57

blade-service/blade-los/src/main/java/org/springblade/los/business/aea/service/impl/AeaBillsServiceImpl.java

@@ -120,7 +120,6 @@ public class AeaBillsServiceImpl extends ServiceImpl<AeaBillsMapper, AeaBills> i
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R submit(AeaBills aeaBillss)throws Exception {
 		Object object = StringTools.handle(aeaBillss,"AeaBills");
 		AeaBills aeaBills = JSONObject.parseObject(JSONObject.toJSONString(object), AeaBills.class);

blade-service/blade-los/src/main/java/org/springblade/los/business/amends/service/impl/AmendsServiceImpl.java

@@ -113,7 +113,6 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R submit(Amends amends) {
 		String deptId = "";
 		String deptName = "";

blade-service/blade-los/src/main/java/org/springblade/los/business/customsDeclaration/service/impl/CustomsDeclarationServiceImpl.java

@@ -140,7 +140,6 @@ public class CustomsDeclarationServiceImpl extends ServiceImpl<CustomsDeclaratio
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R submit(CustomsDeclaration customsDeclarations) throws Exception{
 		Object object = StringTools.handle(customsDeclarations,"CustomsDeclaration");
 		CustomsDeclaration customsDeclaration = JSONObject.parseObject(JSONObject.toJSONString(object), CustomsDeclaration.class);

blade-service/blade-los/src/main/java/org/springblade/los/business/release/service/impl/SeaReleaseBillServiceImpl.java

@@ -105,7 +105,6 @@ public class SeaReleaseBillServiceImpl extends ServiceImpl<SeaReleaseBillMapper,
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R submit(SeaReleaseBill seaReleaseBill) throws Exception {
 		Object object = StringTools.handle(seaReleaseBill, "SeaReleaseBill");
 		SeaReleaseBill releaseBill = JSONObject.parseObject(JSONObject.toJSONString(object), SeaReleaseBill.class);

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

@@ -1079,7 +1079,6 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R getBillNo(Bills bills) {
 		BusinessType businessType = bBusinessTypeService.getOne(new LambdaQueryWrapper<BusinessType>()
 			.eq(BusinessType::getTenantId, AuthUtil.getTenantId())
@@ -1643,6 +1642,14 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		copyBills.setCfsGrossWeight(new BigDecimal("0.00"));
 		copyBills.setCfsMeasurement(new BigDecimal("0.00"));
 		copyBills.setFilesList(filesList);
+		copyBills.setDispatchVehiclesList(new ArrayList<>());
+		copyBills.setContainersList(new ArrayList<>());
+		copyBills.setContainersReportsList(new ArrayList<>());
+		copyBills.setWaitingBoxList(new ArrayList<>());
+		copyBills.setFeeCenterList(new ArrayList<>());
+		copyBills.setFeeCenterAmendList(new ArrayList<>());
+		copyBills.setInStorageList(new ArrayList<>());
+		copyBills.setOutStorageList(new ArrayList<>());
 		return copyBills;
 	}
 
@@ -2239,7 +2246,6 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R submitTrade(Bills bills) {
 		String deptId = "";
 		String deptName = "";
@@ -2369,7 +2375,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					amountCrUsd = amountCrUsd.add(usd);
 				}
 			}
-			feeCenterService.submitList(bills.getFeeCenterListC());
+			feeCenterService.submitListTrade(bills.getFeeCenterListC());
 		}
 		//应收
 		int statusD = 0;
@@ -2421,7 +2427,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					amountDrUsd = amountDrUsd.add(usd);
 				}
 			}
-			feeCenterService.submitList(bills.getFeeCenterListD());
+			feeCenterService.submitListTrade(bills.getFeeCenterListD());
 		}
 		if (0 == statusD && 0 == statusC) {
 			bills.setAccountStatus(0);
@@ -2488,6 +2494,21 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			bills.setNetWeight(bills.getPreContainersList().stream().map(PreContainers::getNetWeight).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 			bills.setMeasurement(bills.getPreContainersList().stream().map(PreContainers::getMeasurement).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 			for (PreContainers item : bills.getPreContainersList()) {
+				if (item.getId() == null) {
+					item.setPid(bills.getId());
+					item.setCreateTime(new Date());
+					item.setCreateUser(AuthUtil.getUserId());
+					item.setCreateUserName(AuthUtil.getUserName());
+					if (ObjectUtils.isNotNull(branchId)) {
+						item.setBranchId(branchId);
+						item.setCreateDept(deptId);
+						item.setCreateDeptName(deptName);
+					}
+				} else {
+					item.setUpdateUser(AuthUtil.getUserId());
+					item.setUpdateTime(new Date());
+					item.setUpdateUserName(AuthUtil.getUserName());
+				}
 				if (!agentItemsList.isEmpty() && ObjectUtils.isNotNull(item.getInspectionDate())) {
 					for (AgentItems items : agentItemsList) {
 						if (item.getBoxNo().equals(items.getBoxNo())) {
@@ -2519,10 +2540,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					teu = teu.add(new BigDecimal(item.getQuantity()).multiply(item.getTeu()));
 				}
 			}
-			R res = preContainersService.submitList(bills.getPreContainersList());
-			if (!res.isSuccess()) {
-				throw new RuntimeException("保存失败");
-			}
+			preContainersService.saveOrUpdateBatch(bills.getPreContainersList());
 			if (boxTypeSum.length() > 0) {
 				boxTypeSum = new StringBuilder(boxTypeSum.substring(0, boxTypeSum.length() - 1));
 				bills.setQuantityCntrDescr(boxTypeSum.toString());

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

@@ -405,6 +405,9 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 		dispatchVehicles.setBoxNo(preContainers.getBoxNo());
 		dispatchVehicles.setPrice(preContainers.getPrice());
 		dispatchVehicles.setNumber(preContainers.getNumber());
+		if (new BigDecimal("0.00").compareTo(preContainers.getGrossWeight()) == 0){
+			preContainers.setGrossWeight(preContainers.getNetWeight());
+		}
 		dispatchVehicles.setGrossWeight(preContainers.getGrossWeight());
 		dispatchVehicles.setNetWeight(preContainers.getNetWeight());
 		dispatchVehicles.setHsCode(preContainers.getHsCode());

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FeeCenterServiceImpl.java

@@ -1186,8 +1186,6 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					if (bills != null) {
 						feeCenter.setBillNo(bills.getBillNo());
 						feeCenter.setBillDate(bills.getBillDate());
-						feeCenter.setCorpId(bills.getCorpId());
-						feeCenter.setCorpCnName(bills.getCorpCnName());
 						feeCenter.setBillCorpId(bills.getCorpId());
 						feeCenter.setBillCorpCnName(bills.getCorpCnName());
 						feeCenter.setPolId(bills.getPolId());
@@ -1206,8 +1204,6 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 					if (agent != null) {
 						feeCenter.setBillNo(agent.getContractNo());
 						feeCenter.setBillDate(agent.getBusinessDate());
-						/*feeCenter.setCorpId(agent.getDomesticConsigneeId());
-						feeCenter.setCorpCnName(agent.getDomesticConsigneeCname());*/
 						feeCenter.setBillCorpId(agent.getCorpId());
 						feeCenter.setBillCorpCnName(agent.getCorpName());
 						feeCenter.setPolId(agent.getPolId());

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FinAccBillsServiceImpl.java

@@ -98,7 +98,6 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R submit(FinAccBills finAccBills) {
 		if (finAccBills.getId() == null) {
 			finAccBills.setCreateTime(new Date());

blade-service/blade-los/src/main/java/org/springblade/los/finance/invoices/service/impl/FinInvoicesServiceImpl.java

@@ -104,7 +104,6 @@ public class FinInvoicesServiceImpl extends ServiceImpl<FinInvoicesMapper, FinIn
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R submit(FinInvoices finInvoices) {
 		String deptId = "";
 		String deptName = "";

blade-service/blade-los/src/main/java/org/springblade/los/finance/stl/service/impl/FinStlBillsServiceImpl.java

@@ -180,7 +180,6 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R submit(FinStlBills finStlBills) {
 		String deptId = "";
 		String deptName = "";

blade-service/blade-los/src/main/java/org/springblade/los/finance/vouchers/service/impl/FinVouchersServiceImpl.java

@@ -118,7 +118,6 @@ public class FinVouchersServiceImpl extends ServiceImpl<FinVouchersMapper, FinVo
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R submit(FinVouchers finVouchers) {
 		String deptId = "";
 		String deptName = "";
@@ -2049,7 +2048,6 @@ public class FinVouchersServiceImpl extends ServiceImpl<FinVouchersMapper, FinVo
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R submitPeriod(FinVouchers finVouchers) {
 		BusinessType businessType = bBusinessTypeService.getOne(new LambdaQueryWrapper<BusinessType>()
 			.eq(BusinessType::getTenantId, AuthUtil.getTenantId())

blade-service/blade-los/src/main/java/org/springblade/los/trade/service/impl/AgentServiceImpl.java

@@ -344,7 +344,6 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R submit(Agent agent) {
 		Long deptId = 0L;
 		String deptName = "";
@@ -2436,7 +2435,6 @@ public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public Agent generateBill(Agent agent) {
 		if (agent.getId() == null) {
 			throw new RuntimeException("缺少必要参数");