Merge branch 'dev' of http://git.echepei.com/lazhaoqian/bladex into dev

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/CorpsDesc.java

@@ -276,6 +276,11 @@ public class CorpsDesc implements Serializable {
 	 */
 	@ApiModelProperty(value = "付款方式")
 	private String paymentType;
+	/**
+	 * 客户类型
+	 */
+	@ApiModelProperty(value = "客户类型")
+	private String corpType;
 
 
 }

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/CorpsType.java

@@ -126,6 +126,11 @@ public class CorpsType implements Serializable {
 	@ApiModelProperty(value = "父级名称")
 	@TableField(exist = false)
 	private String parentName;
+	/**
+	 * 客户类型
+	 */
+	@ApiModelProperty(value = "客户类型")
+	private String corpType;
 
 
 }

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

@@ -23,6 +23,7 @@ public interface IStorageClient {
 	String API_PREFIX = "/client";
 	String FIND_BY_ID = API_PREFIX + "/findById";
 	String STORAGE_MESSAGE = API_PREFIX + "/storageMessage";
+	String STORAGE_NAME = API_PREFIX + "/storageName";
 
     @GetMapping(FIND_BY_ID)
 	StorageDesc findById(@RequestParam(value = "id",required = true) Long id);
@@ -34,5 +35,9 @@ public interface IStorageClient {
 	 */
 	@GetMapping(STORAGE_MESSAGE)
 	List<Map<String,Object>> getStorageMessage(@RequestParam(value = "id",required = true) Long id);
-
+	/***
+	 * 根据仓库名获取仓库
+	 */
+	@GetMapping(STORAGE_NAME)
+	StorageDesc getName(@RequestParam(value = "name",required = true) String name);
 }

blade-service-api/blade-mocha-item-api/src/main/java/org/springblade/mocha/entity/PriceBank.java

@@ -249,6 +249,12 @@ public class PriceBank implements Serializable {
 	 */
 		@ApiModelProperty(value = "推荐理由")
 		private String referrerReason;
+	/**
+	 * 英文描述
+	 */
+		@ApiModelProperty(value = "英文描述")
+		@TableField(exist = false)
+		private String cnameDescription;
 
 
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/feign/IOrderItemsClient.java

@@ -15,6 +15,7 @@ public interface IOrderItemsClient {
 	String API_PREFIX = "/client";
 	String ACTUAL_QUANTITY = API_PREFIX + "actualQuantity";
 	String ACTUAL_WEIGHT = API_PREFIX + "actualWeight";
+	String RECEIVED = API_PREFIX + "/received";
 
 
 	/**
@@ -33,4 +34,5 @@ public interface IOrderItemsClient {
 	R updateActualWeight(@RequestParam("orderItemsId") Long orderItemsId,
 						   @RequestParam("actualWeight")BigDecimal actualWeight,
 						   @RequestParam("deliveryType")int deliveryType);
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsTypeController.java

@@ -154,8 +154,8 @@ public class CorpsTypeController extends BladeController {
 	@GetMapping("/tree")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "树形结构", notes = "树形结构")
-	public R<List<CorpsTypeVO>> tree(String tenantId, BladeUser bladeUser) {
-		List<CorpsTypeVO> tree = corpsTypeService.tree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()));
+	public R<List<CorpsTypeVO>> tree(String tenantId, BladeUser bladeUser,String corpType) {
+		List<CorpsTypeVO> tree = corpsTypeService.tree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()),corpType);
 		return R.data(tree);
 	}
 	/**
@@ -164,8 +164,8 @@ public class CorpsTypeController extends BladeController {
 	@GetMapping("/lazy-tree")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "懒加载树形结构", notes = "树形结构")
-	public R<List<CorpsTypeVO>> lazyTree(String tenantId, Long parentId, BladeUser bladeUser) {
-		List<CorpsTypeVO> tree = corpsTypeService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
+	public R<List<CorpsTypeVO>> lazyTree(String tenantId, Long parentId, BladeUser bladeUser,String corpType) {
+		List<CorpsTypeVO> tree = corpsTypeService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId,corpType);
 		return R.data(tree);
 	}
 

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsDescMapper.xml

@@ -45,6 +45,7 @@
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="payment_type" property="paymentType"/>
+        <result column="corp_type" property="corpType"/>
     </resultMap>
 
 
@@ -61,6 +62,9 @@
         <if test="CorpsDesc.code!=null and CorpsDesc.code != ''">
             and code like CONCAT(CONCAT('%', #{CorpsDesc.code}), '%')
         </if>
+        <if test="CorpsDesc.corpType!=null and CorpsDesc.corpType != ''">
+            and corp_type = #{CorpsDesc.corpType}
+        </if>
         <if test="CorpsDesc.cname!=null and CorpsDesc.cname != ''">
             and cname like CONCAT(CONCAT('%', #{CorpsDesc.cname}), '%')
         </if>

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsTypeMapper.java

@@ -46,7 +46,7 @@ public interface CorpsTypeMapper extends BaseMapper<CorpsType> {
 	 * @param tenantId
 	 * @return
 	 */
-	List<CorpsTypeVO> tree(String tenantId);
+	List<CorpsTypeVO> tree(String tenantId,String corpType);
 
 	/**
 	 * 懒加载
@@ -54,7 +54,7 @@ public interface CorpsTypeMapper extends BaseMapper<CorpsType> {
 	 * @param parentId
 	 * @return
 	 */
-	List<CorpsTypeVO> lazyTree(String tenantId, Long parentId);
+	List<CorpsTypeVO> lazyTree(String tenantId, Long parentId,String corpType);
 
 	/**
 	 * 获取客户类别的名称

blade-service/blade-client/src/main/java/org/springblade/client/corps/mapper/CorpsTypeMapper.xml

@@ -19,6 +19,7 @@
         <result column="update_time" property="updateTime"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="corp_type" property="corpType"/>
     </resultMap>
     <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
         <id column="id" property="id"/>
@@ -65,6 +66,9 @@
             <if test="corpsType.id!=null">
                 and dept.id = #{corpsType.id}
             </if>
+            <if test="corpsType.corpType!=null and corpsType.corpType != ''">
+                and corp_type = #{corpsType.corpType}
+            </if>
             <if test="corpsType.cname!=null and corpsType.cname != ''">
                 and dept.cname like concat(concat('%',  #{corpsType.cname}),'%')
             </if>
@@ -119,6 +123,7 @@
         WHERE
         is_deleted = 0
         and status = 0
+        and corp_type = #{corpType}
         <if test="tenantId!=null and tenantId!=''">
             and tenant_id = #{tenantId}
         </if>
@@ -144,6 +149,7 @@
         WHERE
         dept.parent_id = #{param2} AND dept.is_deleted = 0
         and dept.status = 0
+        and dept.corp_type = #{param3}
         <if test="param1!=null and param1!=''">
             and dept.tenant_id = #{param1}
         </if>

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/ICorpsTypeService.java

@@ -47,7 +47,7 @@ public interface ICorpsTypeService extends IService<CorpsType> {
 	 * @param tenantId
 	 * @return
 	 */
-	List<CorpsTypeVO> tree(String tenantId);
+	List<CorpsTypeVO> tree(String tenantId,String corpType);
 
 	/**
 	 * 获取类别详情
@@ -62,7 +62,7 @@ public interface ICorpsTypeService extends IService<CorpsType> {
 	 * @param parentId
 	 * @return
 	 */
-	List<CorpsTypeVO> lazyTree(String tenantId, Long parentId);
+	List<CorpsTypeVO> lazyTree(String tenantId, Long parentId,String corpType);
 
 	/**
 	 * 验证类别名称唯一新

blade-service/blade-client/src/main/java/org/springblade/client/corps/service/impl/CorpsTypeServiceImpl.java

@@ -115,11 +115,11 @@ public class CorpsTypeServiceImpl extends ServiceImpl<CorpsTypeMapper, CorpsType
 	}
 
 	@Override
-	public List<CorpsTypeVO> tree(String tenantId) {
+	public List<CorpsTypeVO> tree(String tenantId,String corpType) {
 		if (StringUtils.isBlank(tenantId)){
 			tenantId = SecureUtil.getTenantId();
 		}
-		return ForestNodeMerger.merge(baseMapper.tree(tenantId));
+		return ForestNodeMerger.merge(baseMapper.tree(tenantId,corpType));
 	}
 
 	@Override
@@ -133,11 +133,11 @@ public class CorpsTypeServiceImpl extends ServiceImpl<CorpsTypeMapper, CorpsType
 	}
 
 	@Override
-	public List<CorpsTypeVO> lazyTree(String tenantId, Long parentId) {
+	public List<CorpsTypeVO> lazyTree(String tenantId, Long parentId,String corpType) {
 		if (StringUtils.isBlank(tenantId)){
 			tenantId = SecureUtil.getTenantId();
 		}
-		return baseMapper.lazyTree(tenantId,parentId);
+		return baseMapper.lazyTree(tenantId,parentId,corpType);
 	}
 
 	@Override

blade-service/blade-client/src/main/java/org/springblade/client/storage/feign/StorageClient.java

@@ -1,6 +1,7 @@
 package org.springblade.client.storage.feign;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
@@ -16,6 +17,7 @@ import org.springblade.core.mp.support.BladePage;
 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.secure.utils.SecureUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -46,5 +48,10 @@ public class StorageClient implements IStorageClient {
 		return storageDescService.getStorageMessage(id);
 	}
 
+	@Override
+	public StorageDesc getName(String name) {
+		return storageDescService.getOne(new QueryWrapper<StorageDesc>().eq("cname",name).eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted",0));
+	}
+
 
 }

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

@@ -125,13 +125,8 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 	 * @return
 	 */
 	public List<DeliveryItems> affirmDeliveryItemsList(Long pId,Delivery delivery,List<DeliveryItems> deliveryItemsList){
-		if (delivery.getSrcId() == null){
-			Order order = orderDescClient.getById(delivery.getSrcId());
-			BigDecimal reduce = deliveryItemsList.stream().filter(e -> e.getContractAmount() != null).map(DeliveryItems::getContractAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-			if (reduce.compareTo(order.getSettlmentAmount()) >0){
-				throw  new RuntimeException("发货金额不可以超过已收金额");
-			}
-		}
+		//判断要发货物的金额和已收金额的大小
+
 		for (DeliveryItems deliveryItems : deliveryItemsList) {
 			if (deliveryItems.getItemId() == null){
 				throw new RuntimeException("发货明细中商品id不能为空");
@@ -165,6 +160,13 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 			if (!actualQuantity.isSuccess()){
 				throw new RuntimeException("更新订单发货数量出错," + actualQuantity.getMsg());
 			}
+			// todo 出口贸易确认发货修改发票重量
+			if (delivery.getTradeType().equals(OrderTypeEnum.IMPORT.getType())){
+				R actualWeight = orderItemsClient.updateActualWeight(deliveryItems.getSrcId(), deliveryItems.getInvoiceWeight(), delivery.getDeliveryType());
+				if (!actualWeight.isSuccess()){
+					throw new RuntimeException("更新订单发票重量出错," + actualQuantity.getMsg());
+				}
+			}
 			//更新发货明细库存字段
 			deliveryItems.setInventoryNumber(stockGoods.getSurplusRouteQuantity());
 			baseMapper.updateById(deliveryItems);
@@ -192,8 +194,8 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 			billNo = deliveryItems.getBillNo();//提单号
 			contractNumber = deliveryItems.getContractNumber();//合同号
 		}else if (tradeType.equals(OrderTypeEnum.DOMESTIC.getType())){//国内
-			corpId = null;
-			storageId = null;
+			//corpId = null;
+			//storageId = null;
 		}else if (tradeType.equals(OrderTypeEnum.EXPORT.getType())){//出口
 			storageId = null;
 			corpId = null;

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/PriceBankController.java

@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
 import org.springblade.client.feign.IGoodsDescClient;
+import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -94,12 +95,14 @@ public class PriceBankController extends BladeController {
 		lambdaQueryWrapper.ge(Func.isNotEmpty(priceBank.getDateValidityEnd()),PriceBank::getEndTime,priceBank.getDateValidityEnd());
 		lambdaQueryWrapper.orderByDesc(PriceBank::getId);
 		IPage<PriceBank> pages = priceBankService.page(Condition.getPage(query), lambdaQueryWrapper);
-	/*	if (CollectionUtils.isNotEmpty(pages.getRecords())){
+		if (CollectionUtils.isNotEmpty(pages.getRecords())){
 			pages.getRecords().stream().forEach(item ->{
-				GoodsType goodsType = goodsDescClient.goodTypeId(item.getItemId());
-				item.setGoodsTypeName(goodsType.getCname());
+				R<GoodsDescVO> goodsDesc = goodsDescClient.selectGoodsMessage(item.getItemId());
+				if (goodsDesc != null && goodsDesc.getData() != null){
+					item.setCnameDescription(goodsDesc.getData().getCnameDescription());
+				}
 			});
-		}*/
+		}
 		return R.data(pages);
 	}
 
@@ -126,6 +129,14 @@ public class PriceBankController extends BladeController {
 		lambdaQueryWrapper.eq(Func.isNotEmpty(priceBank.getBillType()),PriceBank::getBillType,priceBank.getBillType());
 		lambdaQueryWrapper.orderByDesc(PriceBank::getId);
 		IPage<PriceBank> pages = priceBankService.page(Condition.getPage(query), lambdaQueryWrapper);
+		if (CollectionUtils.isNotEmpty(pages.getRecords())){
+			pages.getRecords().stream().forEach(item ->{
+				R<GoodsDescVO> goodsDesc = goodsDescClient.selectGoodsMessage(item.getItemId());
+				if (goodsDesc != null && goodsDesc.getData() != null){
+					item.setCnameDescription(goodsDesc.getData().getCnameDescription());
+				}
+			});
+		}
 		return R.data(pages);
 	}
 

blade-service/blade-stock/src/main/java/org/springblade/stock/excel/StockGoodsExcel.java

@@ -46,4 +46,9 @@ public class StockGoodsExcel implements Serializable {
 	 */
 	@ExcelProperty("客户名称")
 	private String corpName;
+	/**
+	 * 仓库名称
+	 */
+	@ExcelProperty("仓库名称")
+	private String storageName;
 }

blade-service/blade-stock/src/main/java/org/springblade/stock/service/impl/StockGoodsServiceImpl.java

@@ -24,8 +24,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.GoodsDesc;
+import org.springblade.client.entity.StorageDesc;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IGoodsDescClient;
+import org.springblade.client.feign.IStorageClient;
 import org.springblade.client.vo.GoodsDescVO;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
@@ -58,6 +60,7 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 	private ICorpsDescClient corpsDescClient;//获取客户信息
 	private IGoodsDescClient goodsDescClient;//商品信息
 	private IUserClient userClient;//用户信息
+	private IStorageClient storageClient;
 	@Override
 	public IPage<StockGoodsVO> selectStockGoodsPage(IPage<StockGoodsVO> page, StockGoodsVO stockGoods) {
 		return page.setRecords(baseMapper.selectStockGoodsPage(page, stockGoods));
@@ -152,9 +155,17 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 			}else {
 				continue;
 			}
+			//获取仓库id
+			StorageDesc storageDesc = storageClient.getName(datum.getStorageName());
+			if (storageDesc != null){
+				stockGoods.setStorageId(storageDesc.getId());
+			}else {
+				continue;
+			}
 			//查询库存账
 			StockGoods goods = baseMapper.selectOne(new QueryWrapper<StockGoods>().eq("goods_id", stockGoods.getGoodsId())
-				.eq("corp_id", stockGoods.getCorpId()).eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0));
+				.eq("corp_id", stockGoods.getCorpId()).eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0)
+			.eq("item_type",stockGoods.getItemType()).eq("storage_id",stockGoods.getStorageId()));
 			if (goods == null){
 				stockGoods.setCreateTime(new Date());
 				stockGoods.setCreateUser(SecureUtil.getUserId());

blade-service/trade-purchase/pom.xml

@@ -87,6 +87,12 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-mocha-item-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -2,6 +2,7 @@ package com.trade.purchase.order.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -35,6 +36,7 @@ import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.mocha.feign.IPriceBankClient;
 import org.springblade.stock.entity.StockGoods;
 import org.springblade.stock.feign.IStockGoodsClient;
 import org.springblade.system.user.entity.User;
@@ -70,6 +72,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	private IStockGoodsClient stockGoodsClient;
 	private OrderItemsMapper orderItemsMapper;
 	private IOrderFreightService orderFreightService;
+	private IPriceBankClient priceBankClient;
 
 
 
@@ -344,6 +347,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		submitDto.setUpdateTime(new Date());
 		submitDto.setUpdateUser(SecureUtil.getUserId());
 		baseMapper.updateById(submitDto);
+		Order order = baseMapper.selectById(submitDto.getId());//获取元报价单信息
+		BeanUtil.copy(order,submitDto);
 		//获取订单明细信息
 		List<OrderItems> orderItemsList = this.getOrderItems(submitDto.getId(),SecureUtil.getUserId());
 		if (CollectionUtils.isNotEmpty(orderItemsList)) {
@@ -487,10 +492,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0).orderByAsc("sort"));
 		if (CollectionUtils.isNotEmpty(list)){
 			list.stream().forEach(item ->{
-				OrderItems orderItems = new OrderItems();
-				orderItems.setId(item.getSrcId());
-				orderItems.setPurchaseAmount(item.getPurchaseAmount());
-				orderItemsService.updateById(orderItems);
+				priceBankClient.updatePrice(item.getItemId(),item.getPrice(),SecureUtil.getTenantId(),item.getCorpId(),item.getItemType(),OrderTypeEnum.PURCHASE.getType(),order.getTradeType());
 			});
 		}
 		vo.setItemsVOList(list.stream().map(orderItemMapstructMapper::toVo).collect(Collectors.toList()));
@@ -546,12 +548,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			BigDecimal reduce = list.stream().map(OrderFreight::getOceanFreight).reduce(BigDecimal.ZERO, BigDecimal::add);
 			submitDto.setReferenceOceanFreight(reduce);
 		}
-		baseMapper.updateById(submitDto);//更新原询价单信息
+		baseMapper.updateById(submitDto);//更新原报价单信息
+		Order order = baseMapper.selectById(submitDto.getId());//获取元报价单信息
+		BeanUtil.copy(order,submitDto);
 		//获取订单明细信息
 		List<OrderItems> orderItemsList = this.getOrderItems(submitDto.getId(),SecureUtil.getUserId());
 		if (CollectionUtils.isNotEmpty(orderItemsList)) {
-			submitDto.setItemsVOList(orderItemsList.stream().map(orderItemMapstructMapper::toVo).collect(Collectors.toList()));
+			submitDto.setOrderItemsList(orderItemsList.stream().map(orderItemMapstructMapper::toVo).collect(Collectors.toList()));
 		}
+
+
 		return R.data(submitDto);
 	}