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

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

@@ -339,4 +339,24 @@ public class OrderItems extends OrderBase {
 	@ApiModelProperty(value = "配件信息")
 	@TableField(exist = false)
 	private List<OrderParts> partsList;
+	/**
+	 * FOB系数
+	 */
+	@ApiModelProperty(value = "FOB系数")
+	private BigDecimal coefficient;
+	/**
+	 * 汇率
+	 */
+	@ApiModelProperty(value = "汇率")
+	private BigDecimal exchangeRate;
+	/**
+	 * 美元价格
+	 */
+	@ApiModelProperty(value = "美元价格")
+	private BigDecimal greenback;
+	/**
+	 * 币别
+	 */
+	@ApiModelProperty(value = "币别")
+	private String currency;
 }

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

@@ -34,6 +34,9 @@ import org.springblade.deliver.goods.vo.DeliveryItemsVO;
 import org.springblade.deliver.goods.mapper.DeliveryItemsMapper;
 import org.springblade.deliver.goods.service.IDeliveryItemsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.purchase.sales.entity.Order;
+import org.springblade.purchase.sales.entity.OrderItems;
+import org.springblade.purchase.sales.feign.IOrderDescClient;
 import org.springblade.purchase.sales.feign.IOrderItemsClient;
 import org.springblade.stock.entity.StockGoods;
 import org.springblade.stock.feign.IStockGoodsClient;
@@ -58,6 +61,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 	private IGoodsDescClient goodsDescClient;//获取商品信息
 	private IStockGoodsClient stockGoodsClient;//查询库存账对外访问接口
 	private IOrderItemsClient orderItemsClient;//订单对外访问接口
+	private IOrderDescClient orderDescClient;//订单
 	@Override
 	public IPage<DeliveryItemsVO> selectDeliveryItemsPage(IPage<DeliveryItemsVO> page, DeliveryItemsVO deliveryItems) {
 		return page.setRecords(baseMapper.selectDeliveryItemsPage(page, deliveryItems));
@@ -121,6 +125,13 @@ 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不能为空");

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

@@ -131,6 +131,7 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 				}
 				if (StringUtils.isNotBlank(goodsDesc.getData().getTypeno())){
 					stockGoods.setTypeno(goodsDesc.getData().getTypeno());
+					stockGoods.setItemType(goodsDesc.getData().getTypeno());
 				}
 				if (StringUtils.isNotBlank(goodsDesc.getData().getSpecsOne())){
 					stockGoods.setTypenoOne(goodsDesc.getData().getSpecsOne());

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderItemsMapper.xml

@@ -51,6 +51,10 @@
         <result column="insurance" property="insurance"/>
         <result column="freight" property="freight"/>
         <result column="discount" property="discount"/>
+        <result column="currency" property="currency"/>
+        <result column="greenback" property="greenback"/>
+        <result column="exchange_rate" property="exchangeRate"/>
+        <result column="coefficient" property="coefficient"/>
     </resultMap>