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

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/entity/RepairFees.java

@@ -169,5 +169,11 @@ public class RepairFees implements Serializable {
 	@ApiModelProperty(value = "租户号")
 	private String tenantId;
 
+	/**
+	 * 汇率
+	 */
+	@ApiModelProperty(value = "汇率")
+	private BigDecimal exchangeRate;
+
 
 }

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/entity/TradingBoxFees.java

@@ -197,5 +197,11 @@ public class TradingBoxFees implements Serializable {
 	@ApiModelProperty(value = "计价单位")
 	private String unit;
 
+	/**
+	 * 汇率
+	 */
+	@ApiModelProperty(value = "汇率")
+	private BigDecimal exchangeRate;
+
 
 }

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/entity/TransportItemFees.java

@@ -182,5 +182,11 @@ public class TransportItemFees implements Serializable {
 	@ApiModelProperty(value = "计价单位")
 	private String unit;
 
+	/**
+	 * 汇率
+	 */
+	@ApiModelProperty(value = "汇率")
+	private BigDecimal exchangeRate;
+
 
 }

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/IPortClient.java

@@ -5,6 +5,7 @@ import org.springblade.common.constant.LauncherConstant;
 import org.springblade.core.tool.api.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -17,16 +18,16 @@ public interface IPortClient {
 
 	String API_PREFIX = "/client";
 	String GET_PORT = API_PREFIX + "/getPort";
-	String GET_PORT_DETAIL = API_PREFIX + "/getPortDetail";
+	String GET_PORT_DATA = API_PREFIX + "/getPortData";
 	String GET_PORT_LIST = API_PREFIX + "/getPortList";
 
 	@GetMapping(GET_PORT)
 	BasicPortDesc getPort(@RequestParam("id") Long id);
 
-	@GetMapping(GET_PORT_DETAIL)
-	BasicPortDesc getPortDetail(@RequestBody BasicPortDesc basicPortDesc);
+	@PostMapping(GET_PORT_DATA)
+	BasicPortDesc getPortData(@RequestBody BasicPortDesc basicPortDesc);
 
-	@GetMapping(GET_PORT_LIST)
+	@PostMapping(GET_PORT_LIST)
 	R<List<BasicPortDesc>> getPortList(@RequestBody BasicPortDesc basicPortDesc);
 
 }

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/RepairController.java

@@ -26,6 +26,7 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import org.springblade.box.tube.entity.TradingBox;
+import org.springblade.box.tube.entity.Transport;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -132,6 +133,10 @@ public class RepairController extends BladeController {
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		Repair repair = repairService.getById(ids);
+		if (ObjectUtils.isNotNull(repair) && 3 == repair.getStatus()) {
+			throw new RuntimeException("审核通过不允许删除");
+		}
 		return R.status(repairService.removeByIds(Func.toLongList(ids)));
 	}
 

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TradingBoxController.java

@@ -17,26 +17,25 @@
 package org.springblade.box.tube.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.box.tube.entity.Archives;
+import org.springblade.box.tube.entity.TradingBox;
+import org.springblade.box.tube.service.ITradingBoxService;
+import org.springblade.box.tube.vo.TradingBoxVO;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.box.tube.entity.TradingBox;
-import org.springblade.box.tube.vo.TradingBoxVO;
-import org.springblade.box.tube.service.ITradingBoxService;
-import org.springblade.core.boot.ctrl.BladeController;
+
+import javax.validation.Valid;
 
 /**
  * 买（卖）箱表 控制器
@@ -136,6 +135,10 @@ public class TradingBoxController extends BladeController {
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		TradingBox tradingBox = tradingBoxService.getById(ids);
+		if (ObjectUtils.isNotNull(tradingBox) && 3 == tradingBox.getStatus()) {
+			throw new RuntimeException("审核通过不允许删除");
+		}
 		return R.status(tradingBoxService.removeByIds(Func.toLongList(ids)));
 	}
 

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TransportController.java

@@ -145,6 +145,10 @@ public class TransportController extends BladeController {
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		Transport transport = transportService.getById(ids);
+		if (ObjectUtils.isNotNull(transport) && 3 == transport.getStatus()) {
+			throw new RuntimeException("审核通过不允许删除");
+		}
 		return R.status(transportService.removeByIds(Func.toLongList(ids)));
 	}
 

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/ArchivesServiceImpl.java

@@ -151,7 +151,7 @@ public class ArchivesServiceImpl extends ServiceImpl<ArchivesMapper, Archives> i
 			if (ObjectUtils.isNotNull(archives.getAddress())) {
 				BasicPortDesc basicPortDesc = new BasicPortDesc();
 				basicPortDesc.setName(archives.getAddress());
-				BasicPortDesc detail = portClient.getPortDetail(basicPortDesc);
+				BasicPortDesc detail = portClient.getPortData(basicPortDesc);
 				if (ObjectUtils.isNotNull(detail)) {
 					archives.setAddress(detail.getName());
 					archives.setAddressId(detail.getId());
@@ -179,6 +179,7 @@ public class ArchivesServiceImpl extends ServiceImpl<ArchivesMapper, Archives> i
 				archives.setUpdateTime(new Date());
 				archives.setUpdateUser(AuthUtil.getUserId());
 				archives.setUpdateUserName(AuthUtil.getUserName());
+				archives.setId(selectArchives.getId());
 				baseMapper.updateById(archives);
 			}else{
 				archives.setCreateTime(new Date());
@@ -206,7 +207,7 @@ public class ArchivesServiceImpl extends ServiceImpl<ArchivesMapper, Archives> i
 				lambdaQueryWrapper.eq(Archives::getTenantId, AuthUtil.getTenantId())
 					.eq(Archives::getIsDeleted, 0)
 					.eq(ObjectUtils.isNotNull(portDesc.getId()), Archives::getAddressId, portDesc.getId())//最新地点id
-					.eq(Archives::getBoxStatus, "使用");//状态
+					.eq(Archives::getStatus, "使用");//状态
 				int count = baseMapper.selectCount(lambdaQueryWrapper);
 				address.add(portDesc.getName());
 				sum.add(count);

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/RepairServiceImpl.java

@@ -477,7 +477,7 @@ public class RepairServiceImpl extends ServiceImpl<RepairMapper, Repair> impleme
 				if (!acc_.getSettlementAmount().equals(new BigDecimal("0.00"))) {
 					throw new SecurityException("订单已结算,不允许撤销");
 				} else {
-					financeClient.remove(acc.getId() + "");
+					financeClient.remove(acc_.getId() + "");
 				}
 			}
 		}

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TradingBoxServiceImpl.java

@@ -56,6 +56,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
+import java.math.MathContext;
 import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Date;
@@ -269,6 +270,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 						archives.setUpdateUserName(AuthUtil.getUserName());
 						archives.setUpdateUser(AuthUtil.getUserId());
 						archivesMapper.updateById(archives);
+
 					} else {
 						archives.setCreateUser(AuthUtil.getUserId());
 						archives.setCreateTime(new Date());
@@ -413,9 +415,9 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			// 绑定审核类型
 			auditProecessDTO.setCheckType(selectTradingBox.getType());
 			// 追加跳转路由url
-			auditProecessDTO.setUrl(selectTradingBox.getUrl());
-			auditProecessDTO.setPageStatus(selectTradingBox.getPageStatus());
-			auditProecessDTO.setPageLabel(selectTradingBox.getPageLabel());
+			auditProecessDTO.setUrl(tradingBox.getUrl());
+			auditProecessDTO.setPageStatus(tradingBox.getPageStatus());
+			auditProecessDTO.setPageLabel(tradingBox.getPageLabel());
 			//增加审批类型
 
 			//获取明细信息
@@ -445,11 +447,13 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			receivableLambdaQueryWrapper.eq(TradingBoxFees::getPid, selectTradingBox.getId());
 			receivableLambdaQueryWrapper.eq(TradingBoxFees::getFeesType, 2);
 			List<TradingBoxFees> receivableOrderFeesList = tradingBoxFeesMapper.selectList(receivableLambdaQueryWrapper);
+			BigDecimal payAmount = new BigDecimal("0.00");
 			if (ObjectUtils.isNotNull(receivableOrderFeesList)) {
-				auditProecessDTO.setPayAmount(receivableOrderFeesList.stream().map(TradingBoxFees::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
-			} else {
-				auditProecessDTO.setPayAmount(new BigDecimal(0));
+				for (TradingBoxFees tradingBoxFees : receivableOrderFeesList) {
+					payAmount = payAmount.add(tradingBoxFees.getPrice().multiply(tradingBoxFees.getExchangeRate(), MathContext.DECIMAL32));
+				}
 			}
+			auditProecessDTO.setPayAmount(payAmount);
 			//应收
 			LambdaQueryWrapper<TradingBoxFees> payLambdaQueryWrapper = new LambdaQueryWrapper<>();
 			payLambdaQueryWrapper.eq(TradingBoxFees::getIsDeleted, 0);
@@ -457,11 +461,13 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			payLambdaQueryWrapper.eq(TradingBoxFees::getPid, selectTradingBox.getId());
 			payLambdaQueryWrapper.eq(TradingBoxFees::getFeesType, 1);
 			List<TradingBoxFees> payOrderFeesList = tradingBoxFeesMapper.selectList(payLambdaQueryWrapper);
-			if (ObjectUtils.isNotNull(receivableOrderFeesList)) {
-				auditProecessDTO.setReceivableAmount(payOrderFeesList.stream().map(TradingBoxFees::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
-			} else {
-				auditProecessDTO.setReceivableAmount(new BigDecimal(0));
+			BigDecimal receivableAmount = new BigDecimal("0.00");
+			if (ObjectUtils.isNotNull(payOrderFeesList)) {
+				for (TradingBoxFees tradingBoxFees : payOrderFeesList) {
+					receivableAmount = receivableAmount.add(tradingBoxFees.getPrice().multiply(tradingBoxFees.getExchangeRate(), MathContext.DECIMAL32));
+				}
 			}
+			auditProecessDTO.setReceivableAmount(receivableAmount);
 			//审批数据
 			auditProecessDTO.setCaseNo(code);
 			auditProecessDTO.setMorderNo(selectTradingBox.getContractNo());
@@ -541,9 +547,9 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 		//获取账单信息
 		Acc acc = new Acc();
 		acc.setSrcParentId(selectTradingBox.getId());
-		if("BUY".equals(selectTradingBox.getType())){
+		if ("BUY".equals(selectTradingBox.getType())) {
 			acc.setBillType("申请");
-		}else{
+		} else {
 			acc.setBillType("收费");
 		}
 		acc.setTradeType("BOX");
@@ -555,7 +561,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				if (!acc_.getSettlementAmount().equals(new BigDecimal("0.00"))) {
 					throw new SecurityException("订单已结算,不允许撤销");
 				} else {
-					financeClient.remove(acc.getId() + "");
+					financeClient.remove(acc_.getId() + "");
 				}
 			}
 		}
@@ -571,7 +577,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 		tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getTenantId, AuthUtil.getTenantId());
 		tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getSubmitPay, 1);
 		List<TradingBoxFees> tradingBoxFeesList = tradingBoxFeesMapper.selectList(tradingBoxFeesLambdaQueryWrapper);
-		for (TradingBoxFees tradingBoxFees:tradingBoxFeesList) {
+		for (TradingBoxFees tradingBoxFees : tradingBoxFeesList) {
 			tradingBoxFees.setSubmitPay(0);
 			tradingBoxFeesMapper.updateById(tradingBoxFees);
 		}
@@ -592,9 +598,9 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 
 		//账单数据
 		ApplyDTO applyDTO = new ApplyDTO();
-		if("BUY".equals(billType)){
+		if ("BUY".equals(billType)) {
 			applyDTO.setBillType("申请");
-		}else{
+		} else {
 			applyDTO.setBillType("收费");
 		}
 		applyDTO.setTradeType("BOX");

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TransportServiceImpl.java

@@ -140,11 +140,11 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			List<TransportItemFees> transportItemFeesList = transportItemFeesMapper.selectList(transportItemFeesLambdaQueryWrapper);
 			for (TransportItemFees transportItemFees : transportItemFeesList) {
 				R<FeesDesc> r = feesDescClient.detail(transportItemFees.getItemId());
-				if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())){
+				if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
 					transportItemFees.setItemName(r.getData().getCname());
 				}
 				CorpsDesc corpsDesc = corpsDescClient.getCorpId(transportItemFees.getCorpId());
-				if (ObjectUtils.isNotNull(corpsDesc)){
+				if (ObjectUtils.isNotNull(corpsDesc)) {
 					transportItemFees.setCorpName(corpsDesc.getCname());
 				}
 			}
@@ -430,9 +430,9 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			// 绑定审核类型
 			auditProecessDTO.setCheckType(selectTransport.getBillType());
 			// 追加跳转路由url
-			auditProecessDTO.setUrl(selectTransport.getUrl());
-			auditProecessDTO.setPageStatus(selectTransport.getPageStatus());
-			auditProecessDTO.setPageLabel(selectTransport.getPageLabel());
+			auditProecessDTO.setUrl(transport.getUrl());
+			auditProecessDTO.setPageStatus(transport.getPageStatus());
+			auditProecessDTO.setPageLabel(transport.getPageLabel());
 
 			//获取明细信息
 			LambdaQueryWrapper<TransportItem> transportItemLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -462,11 +462,13 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			receivableLambdaQueryWrapper.eq(TransportItemFees::getPid, selectTransport.getId());
 			receivableLambdaQueryWrapper.eq(TransportItemFees::getFeesType, 2);
 			List<TransportItemFees> receivableOrderFeesList = transportItemFeesMapper.selectList(receivableLambdaQueryWrapper);
+			BigDecimal payAmount = new BigDecimal("0.00");
 			if (ObjectUtils.isNotNull(receivableOrderFeesList)) {
-				auditProecessDTO.setPayAmount(receivableOrderFeesList.stream().map(TransportItemFees::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
-			} else {
-				auditProecessDTO.setPayAmount(new BigDecimal(0));
+				for (TransportItemFees transportItemFees : receivableOrderFeesList) {
+					payAmount = payAmount.add(transportItemFees.getPrice().multiply(transportItemFees.getExchangeRate(), MathContext.DECIMAL32));
+				}
 			}
+			auditProecessDTO.setPayAmount(payAmount);
 			//应收
 			LambdaQueryWrapper<TransportItemFees> payLambdaQueryWrapper = new LambdaQueryWrapper<>();
 			payLambdaQueryWrapper.eq(TransportItemFees::getIsDeleted, 0);
@@ -474,11 +476,13 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 			payLambdaQueryWrapper.eq(TransportItemFees::getPid, selectTransport.getId());
 			payLambdaQueryWrapper.eq(TransportItemFees::getFeesType, 1);
 			List<TransportItemFees> payOrderFeesList = transportItemFeesMapper.selectList(payLambdaQueryWrapper);
-			if (ObjectUtils.isNotNull(receivableOrderFeesList)) {
-				auditProecessDTO.setReceivableAmount(payOrderFeesList.stream().map(TransportItemFees::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
-			} else {
-				auditProecessDTO.setReceivableAmount(new BigDecimal(0));
+			BigDecimal receivableAmount = new BigDecimal("0.00");
+			if (ObjectUtils.isNotNull(payOrderFeesList)) {
+				for (TransportItemFees transportItemFees : payOrderFeesList) {
+					receivableAmount = receivableAmount.add(transportItemFees.getPrice().multiply(transportItemFees.getExchangeRate(), MathContext.DECIMAL32));
+				}
 			}
+			auditProecessDTO.setReceivableAmount(receivableAmount);
 
 			//审批数据
 			auditProecessDTO.setCaseNo(code);
@@ -557,21 +561,21 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 		//获取账单信息
 		Acc acc = new Acc();
 		acc.setSrcParentId(selectTransport.getId());
-		if("JKFC".equals(selectTransport.getBillType())){
+		if ("JKFC".equals(selectTransport.getBillType())) {
 			acc.setBillType("申请");
-		}else{
+		} else {
 			acc.setBillType("收费");
 		}
 		acc.setTradeType("BOX");
 		acc.setSrcType(6);
 		R<List<Acc>> r = financeClient.getAccListByCondition(acc);
 		if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
-			for (Acc acc_:r.getData()) {
+			for (Acc acc_ : r.getData()) {
 				//判断账单是否已有结算  true 不允许撤销审核  false 删除账单并撤销审核
 				if (!acc_.getSettlementAmount().equals(new BigDecimal("0.00"))) {
 					throw new SecurityException("订单已结算,不允许撤销");
 				} else {
-					financeClient.remove(acc.getId() + "");
+					financeClient.remove(acc_.getId() + "");
 				}
 			}
 		}
@@ -587,7 +591,7 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 		transportItemFeesLambdaQueryWrapper.eq(TransportItemFees::getTenantId, AuthUtil.getTenantId());
 		transportItemFeesLambdaQueryWrapper.eq(TransportItemFees::getSubmitPay, 1);
 		List<TransportItemFees> transportItemFeesList = transportItemFeesMapper.selectList(transportItemFeesLambdaQueryWrapper);
-		for (TransportItemFees transportItemFees:transportItemFeesList) {
+		for (TransportItemFees transportItemFees : transportItemFeesList) {
 			transportItemFees.setSubmitPay(0);
 			transportItemFeesMapper.updateById(transportItemFees);
 		}
@@ -608,9 +612,9 @@ public class TransportServiceImpl extends ServiceImpl<TransportMapper, Transport
 
 		//账单数据
 		ApplyDTO applyDTO = new ApplyDTO();
-		if("JKFC".equals(billType)){
+		if ("JKFC".equals(billType)) {
 			applyDTO.setBillType("申请");
-		}else{
+		} else {
 			applyDTO.setBillType("收费");
 		}
 		applyDTO.setTradeType("BOX");

blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditProecessController.java

@@ -150,6 +150,7 @@ public class AuditProecessController extends BladeController {
 						auditOrderVO.setOrderNo(tradingBox.getContractNo());
 						auditOrderVO.setCorpsName(tradingBox.getPurchaseCompanyName());
 					}
+					auditOrderVO.setAmountReceivable(e.getReceivableAmount());
 				} else if ("CKZY".equals(e.getCheckType()) || "JKFC".equals(e.getCheckType())) {
 					Transport transport = transportClient.getTransportById(e.getBillId());
 					if (transport != null) {
@@ -157,6 +158,7 @@ public class AuditProecessController extends BladeController {
 						auditOrderVO.setOrderNo(transport.getContractNo());
 						auditOrderVO.setCorpsName(transport.getCorpName());
 					}
+					auditOrderVO.setAmountReceivable(e.getReceivableAmount());
 				} else if ("REPAIR".equals(e.getCheckType()) || "WASH".equals(e.getCheckType())) {
 					Repair repair = repairClient.getRepairById(e.getBillId());
 					if (repair != null) {
@@ -164,6 +166,7 @@ public class AuditProecessController extends BladeController {
 						auditOrderVO.setOrderNo(repair.getSysNo());
 						auditOrderVO.setCorpsName(repair.getCompany());
 					}
+					auditOrderVO.setAmountReceivable(e.getReceivableAmount());
 				} else {
 					if (e.getBillId() != null) {
 						Order order = orderDescClient.getById(e.getBillId());

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -741,9 +741,13 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 			goodsDescMapper.updateById(goodsDesc);
 			// 文件列表
 			if (CollectionUtils.isNotEmpty(filesList)) {
-				filesList.forEach(k -> {
+				int count = 0;
+				for(GoodsFiles k:filesList){
 					// 新增
 					if (k.getId() == null) {
+						if (count == 0) {
+							k.setVersion("0");
+						}
 						k.setTenantId(AuthUtil.getTenantId());
 						k.setPid(goodsDesc.getId());
 						k.setCreateTime(new Date());
@@ -756,7 +760,8 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 						k.setUpdateUser(SecureUtil.getUserId());
 						goodsFilesMapper.updateById(k);
 					}
-				});
+					count++;
+				}
 			}
 			if (!CollectionUtils.isEmpty(stockGoodsList)) {
 				stockGoodsList.forEach(k -> {

blade-service/blade-client/src/main/java/org/springblade/client/port/feign/PortClient.java

@@ -10,6 +10,7 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
@@ -32,8 +33,8 @@ public class PortClient implements IPortClient {
 
 
 	@Override
-	@GetMapping(GET_PORT_DETAIL)
-	public BasicPortDesc getPortDetail(@RequestBody BasicPortDesc basicPortDesc) {
+	@PostMapping(GET_PORT_DATA)
+	public BasicPortDesc getPortData(@RequestBody BasicPortDesc basicPortDesc) {
 		LambdaQueryWrapper<BasicPortDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(BasicPortDesc::getIsDeleted, 0)
 			.eq(ObjectUtils.isNotNull(basicPortDesc.getName()), BasicPortDesc::getName, basicPortDesc.getName())
@@ -44,6 +45,7 @@ public class PortClient implements IPortClient {
 	}
 
 	@Override
+	@PostMapping(GET_PORT_LIST)
 	public R<List<BasicPortDesc>> getPortList(@RequestBody BasicPortDesc basicPortDesc) {
 		LambdaQueryWrapper<BasicPortDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(BasicPortDesc::getIsDeleted, 0)