修改完善-进口贸易的库存、采购、销售、财务

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/Delivery.java

@@ -345,4 +345,10 @@ public class Delivery implements Serializable {
 	 */
 	@ApiModelProperty(value = "提单号")
 	private String billNo;
+
+	/**
+	 * 提单号
+	 */
+	@ApiModelProperty(value = "码单重量")
+	private BigDecimal billWeight;
 }

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/entity/DeliveryItems.java

@@ -278,5 +278,8 @@ public class DeliveryItems implements Serializable {
 		@ApiModelProperty(value = "产品属性")
 		private String itemProp;
 
+    	@ApiModelProperty(value = "库存重量")
+		private BigDecimal inWeight;
+
 
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -672,4 +672,7 @@ public class Order implements Serializable {
 	private String accountBank;
 	@ApiModelProperty(value = "预付保证金币别")
 	private String prepayCurrency;
+
+	@ApiModelProperty(value = "发票金额")
+	private BigDecimal invoiceAmount;
 }

blade-service-api/blade-stock-api/src/main/java/org/springblade/stock/feign/IStockGoodsClient.java

@@ -24,6 +24,7 @@ public interface IStockGoodsClient {
 	String UPDATE_STOCK = API_PREFIX + "/updateStock";
 	String GET_STOCK_BY_ID = API_PREFIX + "/getStockByID";
 	String GET_ONE = API_PREFIX + "/getOne";
+	String GET_STOCK_BY_CONDITIONS = API_PREFIX + "/getStockByCondition";
 
 	/**
 	 * 查询库存总账 是否存在
@@ -62,6 +63,9 @@ public interface IStockGoodsClient {
 	@GetMapping(GET_STOCK)
 	R<? extends Object> getStock(StockGoods stockGoods);
 
+	@GetMapping(GET_STOCK_BY_CONDITIONS)
+	R<StockGoods> getStockByCondition(StockGoods stockGoods);
+
 	/**
 	 * 修改库存总账
 	 * @param stockGoods

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/Order.java

@@ -588,5 +588,7 @@ public class Order extends OrderBase {
 	@ApiModelProperty(value = "预付保证金币别")
 	private String prepayCurrency;
 
+	@ApiModelProperty(value = "发票金额")
+	private BigDecimal invoiceAmount;
 
 }

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

@@ -19,6 +19,7 @@ package org.springblade.check.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import org.springblade.check.entity.AuditPaths;
 import org.springblade.check.entity.AuditPathsLevels;
 import org.springblade.check.service.IAuditPathsLevelsService;
 import io.swagger.annotations.Api;
@@ -28,6 +29,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 
 import org.springblade.check.entity.AuditPathsActs;
+import org.springblade.check.service.IAuditPathsService;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -55,6 +57,8 @@ public class AuditPathsActsController extends BladeController {
 
 	private final IAuditPathsLevelsService auditPathsLevelsService;
 
+	private final IAuditPathsService pathsService;
+
 
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
@@ -65,6 +69,15 @@ public class AuditPathsActsController extends BladeController {
 		lambdaQueryWrapper.eq(AuditPathsActs::getTenantId, AuthUtil.getTenantId());
 		lambdaQueryWrapper.like(StringUtils.isNotBlank(auditPathsActs.getActName()),AuditPathsActs::getActName,auditPathsActs.getActName());
 		IPage<AuditPathsActs> pages = auditPathsActsService.page(Condition.getPage(query), lambdaQueryWrapper);
+		List<AuditPathsActs> records = pages.getRecords();
+		if(CollectionUtils.isNotEmpty(records))
+		{
+			records.forEach(e->{
+				Long pathId = e.getPathId();
+				AuditPaths auditPaths = pathsService.getById(pathId);
+                e.setPathName(auditPaths.getPathName());
+			});
+		}
 		return R.data(pages);
 	}
 

blade-service/blade-check/src/main/java/org/springblade/check/entity/AuditPathsActs.java

@@ -17,6 +17,7 @@
 package org.springblade.check.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import lombok.Data;
@@ -70,5 +71,9 @@ public class AuditPathsActs implements Serializable {
 		@ApiModelProperty(value = "租户id")
 		private String tenantId;
 
+	@ApiModelProperty(value = "审批路径名称")
+	@TableField(exist = false)
+		private String pathName;
+
 
 }

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

@@ -275,6 +275,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 					StockGoods stockGoods = iDeliveryItemsService.saveStock(delivery.getTradeType(), delivery.getCorpId(), delivery.getStorageId(), e);
 					//更新收货单明细库存
 					e.setInventoryNumber(stockGoods.getSurplusRouteQuantity());
+					e.setInWeight(stockGoods.getInWeight());
 				}
 				//修改库存单
 				else if(stock!=null)
@@ -282,6 +283,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 					StockGoods receiving = iDeliveryItemsService.receiving(delivery.getTradeType(), stock.getId(), e);
 					//更新收货单明细库存
 					e.setInventoryNumber(receiving.getSurplusRouteQuantity());
+					e.setInWeight(receiving.getInWeight());
 				}
                 //更新item已发数量
 				R r = iOrderItemsClient.updateActualQuantity(e.getSrcId(), inventoryNumber, 1);
@@ -349,6 +351,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			 //更新stock库存数量
 			 StockGoods stockGoods = iDeliveryItemsService.cancelStock(delivery.getTradeType(), stock.getId(), e);
 			 e.setInventoryNumber(stockGoods.getSurplusRouteQuantity());
+			 e.setInWeight(stockGoods.getInWeight());
 			 //更新库存内容
 			 iDeliveryItemsService.updateById(e);
 		 });

blade-service/blade-stock/src/main/java/org/springblade/stock/feign/StockGoodsClient.java

@@ -1,5 +1,6 @@
 package org.springblade.stock.feign;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import lombok.AllArgsConstructor;
@@ -85,6 +86,16 @@ public class StockGoodsClient implements IStockGoodsClient{
 		return R.data(reduce);
 	}
 
+	@Override
+	@GetMapping(GET_STOCK_BY_CONDITIONS)
+	public R<StockGoods> getStockByCondition(StockGoods stockGoods)
+	{
+		QueryWrapper<StockGoods> queryWrapper = Condition.getQueryWrapper(stockGoods);
+		queryWrapper.eq("tenant_id",AuthUtil.getTenantId());
+		queryWrapper.eq("is_deleted",0);
+	    return 	R.data(stockGoodsService.getOne(queryWrapper));
+	}
+
 	/**
 	 * 修改库存总账
 	 * @param stockGoods