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

 Conflicts:

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

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

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -267,7 +268,7 @@ public class Delivery implements Serializable {
 	 */
 		@ApiModelProperty(value = "客户中文名")
 		@TableField(exist = false)
-		private String corpName;
+		private String corpsName;
 	/**
 	 * 销售公司中文名
 	 */
@@ -284,6 +285,22 @@ public class Delivery implements Serializable {
 	 */
 		@ApiModelProperty(value = "采购方式")
 		private String purchaseMode;
+	/**
+	 * 收货人电话
+	 */
+		@ApiModelProperty(value = "收货人电话")
+		private String arrivalTel;
+	/**
+	 * 单据状态字典表
+	 */
+		@ApiModelProperty(value = "单据状态字典表")
+		private String deliveryStatus;
+	/**
+	 * 详情回显客户中文名
+	 */
+		@ApiModelProperty(value = "详情回显客户中文名")
+		@TableField(exist = false)
+		private List<Map<String,Object>> corpName;
 
 
 }

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

@@ -568,6 +568,12 @@ public class Order implements Serializable {
 	 */
 	@ApiModelProperty(value = "销售核价备注")
 	private String sellPricingRemarks;
+	/**
+	 * 所属公司回显中文名
+	 */
+	@ApiModelProperty(value = "所属公司中文名")
+	@TableField(exist = false)
+	private List<Map<String,Object>> belongToCorpList;
 
 
 }

blade-service-api/blade-stock-api/pom.xml

@@ -12,5 +12,11 @@
     <artifactId>blade-stock-api</artifactId>
     <name>${project.artifactId}</name>
     <version>2.8.2.RELEASE</version>
+    <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-common</artifactId>
+        </dependency>
+    </dependencies>
 
 </project>

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

@@ -0,0 +1,46 @@
+package org.springblade.stock.feign;
+
+import org.springblade.common.constant.LauncherConstant;
+import org.springblade.core.tool.api.R;
+import org.springblade.stock.entity.StockGoods;
+import org.springblade.stock.vo.StockGoodsVO;
+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;
+
+import javax.validation.Valid;
+
+@FeignClient(
+	value = LauncherConstant.APPLICATION_STOCK_NAME
+)
+public interface IStockGoodsClient {
+	String API_PREFIX = "/client";
+	String SELECT_STOKE = API_PREFIX + "select-stock";
+	String SAVE_STOCK = API_PREFIX + "save-stock" ;
+
+	/**
+	 * 查询库存总账 是否存在
+	 * @param corpId 客户id
+	 * @param storageId 仓库id
+	 * @param goodId 商品id
+	 * @param itemType 产品规格型号
+	 * @param lotNo 批次号
+	 * @return
+	 */
+	@GetMapping(SELECT_STOKE)
+	R<StockGoodsVO> selectStock(@RequestParam("corpId")Long corpId,
+								@RequestParam("storageId")Long storageId,
+								@RequestParam("goodId")Long goodId,
+								@RequestParam("itemType")String itemType,
+								@RequestParam("lotNo")String lotNo);
+
+	/**
+	 * 新增库存总账
+	 * @param stockGoods
+	 * @return
+	 */
+	@PostMapping(SAVE_STOCK)
+	R saveStock(@Valid @RequestBody StockGoods stockGoods);
+}

blade-service/blade-client/src/main/java/org/springblade/client/goods/mapper/GoodsDescMapper.xml

@@ -201,19 +201,10 @@
             and bg.status = #{GoodsDesc.status}
         </if>
         <if test='GoodsDesc.goodsTypeId!=null and GoodsDesc.goodsTypeId != ""'>
-            and bg.id in (
-            SELECT
-            DISTINCT
-            goods_id
-            FROM
-            basic_goods_type_desc
-            WHERE
-            status = 0
-            AND goods_type_id  = #{GoodsDesc.goodsTypeId}
-            )
+            AND bg.goods_type_id  = #{GoodsDesc.goodsTypeId}
         </if>
     </select>
-    <select id="selectGoodsMessage" resultMap="goodsDescResultMap">
+    <select id="selectGoodsMessage" resultType="org.springblade.client.vo.GoodsDescVO">
         select
         id,
         code,

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryItemsMapper.xml

@@ -41,6 +41,7 @@
         <result column="tax_rate" property="taxRate"/>
         <result column="purchase_amount" property="purchaseAmount"/>
         <result column="purchase_quantity" property="purchaseQuantity"/>
+        <result column="unit" property="unit"/>
     </resultMap>
 
 

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryMapper.xml

@@ -43,6 +43,8 @@
         <result column="trade_type" property="tradeType"/>
         <result column="purchase_amount" property="purchaseAmount"/>
         <result column="purchase_mode" property="purchaseMode"/>
+        <result column="arrival_tel" property="arrivalTel"/>
+        <result column="delivery_status" property="deliveryStatus"/>
     </resultMap>
 
 

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

@@ -85,18 +85,18 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 		List<DeliveryItems> deliveryItemsList = baseMapper.selectList(new QueryWrapper<DeliveryItems>().eq("pid", delivery.getId())
 			.eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0));
 		if (CollectionUtils.isNotEmpty(deliveryItemsList)){
-			deliveryItemsList.stream().forEach(item ->{
-				if (item.getItemId() != null){
+			for (DeliveryItems deliveryItems : deliveryItemsList) {
+				if (deliveryItems.getItemId() != null){
 					//获取商品编码,名称,规格编码,规格型号
-					R<GoodsDescVO> goodsMessage = goodsDescClient.selectGoodsMessage(item.getItemId());
+					R<GoodsDescVO> goodsMessage = goodsDescClient.selectGoodsMessage(deliveryItems.getItemId());
 					if (goodsMessage.isSuccess() && goodsMessage.getData() != null){
-						item.setCode(goodsMessage.getData().getCode());
-						item.setCname(goodsMessage.getData().getCname());
-						item.setTypeno(goodsMessage.getData().getTypeno());
-						item.setSpecificationAndModel(goodsMessage.getData().getSpecificationAndModel());
+						deliveryItems.setCode(goodsMessage.getData().getCode());
+						deliveryItems.setCname(goodsMessage.getData().getCname());
+						deliveryItems.setTypeno(goodsMessage.getData().getTypeno());
+						deliveryItems.setSpecificationAndModel(goodsMessage.getData().getSpecificationAndModel());
 					}
 				}
-			});
+			}
 		}
 		return deliveryItemsList;
 	}

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

@@ -43,6 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 发货通知单 服务实现类
@@ -119,9 +120,9 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		//获取客户中文名
 		//获取客户中文名
 		if (selectById.getCorpId() != null){
-			R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(selectById.getCorpId());
+			R<List<Map<String,Object>>> corpMessage = corpsDescClient.getCorpsMessage(selectById.getCorpId().toString());
 			if (corpMessage.isSuccess() && corpMessage.getData() != null){
-				selectById.setCorpName(corpMessage.getData().getCname());
+				selectById.setCorpName(corpMessage.getData());
 			}
 		}
 		//获取销售公司中文名

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -147,9 +147,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		}
 		//获取销售公司中文名
 		if (orderMessage.getBelongToCorpId() != null){
-			R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(orderMessage.getBelongToCorpId());
+			R<List<Map<String,Object>>> corpMessage = corpsDescClient.getCorpsMessage(orderMessage.getBelongToCorpId().toString());
 			if (corpMessage.isSuccess() && corpMessage.getData() != null){
-				orderMessage.setBelongToCorpName(corpMessage.getData().getCname());
+				orderMessage.setBelongToCorpList(corpMessage.getData());
 			}
 		}
 		//获取订单明细信息
@@ -178,6 +178,25 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	public Order deliverGoods(Order order) {
 		//获取销售单主表信息
 		Order orderMessage = baseMapper.selectById(order.getId());
+		//获取创建人中文名
+		R<User> createUser = userClient.userInfoById(orderMessage.getCreateUser());
+		if (createUser.isSuccess() || createUser.getData() != null){
+			orderMessage.setCreateUserName(createUser.getData().getName());
+		}
+		//获取客户中文名
+		if (orderMessage.getCorpId() != null){
+			R<List<Map<String,Object>>> corpMessage = corpsDescClient.getCorpsMessage(orderMessage.getCorpId().toString());
+			if (corpMessage.isSuccess() && corpMessage.getData() != null){
+				orderMessage.setCorpName(corpMessage.getData());
+			}
+		}
+		//获取销售公司中文名
+		if (orderMessage.getBelongToCorpId() != null){
+			R<List<Map<String,Object>>> corpMessage = corpsDescClient.getCorpsMessage(orderMessage.getBelongToCorpId().toString());
+			if (corpMessage.isSuccess() && corpMessage.getData() != null){
+				orderMessage.setBelongToCorpList(corpMessage.getData());
+			}
+		}
 		//获取销售单明细数据
 		List<OrderItems> orderItemsList = orderItemsService.getOrderItems(order);
 		orderMessage.setOrderItemsList(orderItemsList);

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

@@ -0,0 +1,51 @@
+package org.springblade.stock.feign;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tool.api.R;
+import org.springblade.stock.entity.StockGoods;
+import org.springblade.stock.service.IStockGoodsService;
+import org.springblade.stock.vo.StockGoodsVO;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.Valid;
+
+@Slf4j
+@NonDS
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class StockGoodsClient implements IStockGoodsClient{
+
+	private IStockGoodsService stockGoodsService;//库存
+
+	/**
+	 * 查询库存总账 是否存在
+	 * @param corpId 客户id
+	 * @param storageId 仓库id
+	 * @param goodId 商品id
+	 * @param itemType 产品规格型号
+	 * @param lotNo 批次号
+	 * @return
+	 */
+	@Override
+	@GetMapping(SELECT_STOKE)
+	public R<StockGoodsVO> selectStock(Long corpId, Long storageId, Long goodId, String itemType, String lotNo) {
+		return R.data(stockGoodsService.selectStock(corpId,storageId,goodId,itemType,lotNo));
+	}
+
+	/**
+	 * 新增库存总账
+	 * @param stockGoods
+	 * @return
+	 */
+	@Override
+	@PostMapping(SAVE_STOCK)
+	public R saveStock(@Valid StockGoods stockGoods) {
+		return R.status(stockGoodsService.saveStock(stockGoods));
+	}
+}

blade-service/blade-stock/src/main/java/org/springblade/stock/service/IStockGoodsService.java

@@ -40,17 +40,22 @@ public interface IStockGoodsService extends IService<StockGoods> {
 
 	/**
 	 * 查询库存总账 是否存在
-	 * 查询条件：corpId  storageId goodsId  itemType lotNo
+	 * @param corpId 客户id
+	 * @param storageId 仓库id
+	 * @param goodId 商品id
+	 * @param itemType 产品规格型号
+	 * @param lotNo 批次号
+	 * @return
 	 */
-	StockGoods selectStock();
+	StockGoodsVO selectStock(Long corpId,Long storageId,Long goodId,String itemType,String lotNo);
 	/**
 	 * 新增库存总账
 	 */
-	boolean saveStock();
+	boolean saveStock(StockGoods stockGoods);
 	/**
 	 * 修改库存总账
 	 */
-	boolean updateStock();
+	int updateStock();
 
 
 

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

@@ -16,6 +16,12 @@
  */
 package org.springblade.stock.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springblade.core.secure.utils.SecureUtil;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.stock.entity.StockGoods;
 import org.springblade.stock.vo.StockGoodsVO;
 import org.springblade.stock.mapper.StockGoodsMapper;
@@ -24,6 +30,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import java.util.Date;
+
 /**
  * 库存账 服务实现类
  *
@@ -39,21 +47,33 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 	}
 
 	/**
-	 * 查询库存账
+	 * 查询库存总账 是否存在
+	 * @param corpId 客户id
+	 * @param storageId 仓库id
+	 * @param goodId 商品id
+	 * @param itemType 产品规格型号
+	 * @param lotNo 批次号
 	 * @return
 	 */
 	@Override
-	public StockGoods selectStock() {
-		return null;
+	public StockGoodsVO selectStock(Long corpId,Long storageId,Long goodId,String itemType,String lotNo) {
+		StockGoods stockGoods = baseMapper.selectOne(new QueryWrapper<StockGoods>().eq("corp_id", corpId).eq("storage_id", storageId).eq("goods_id", goodId)
+			.eq("item_type", itemType).eq("lot_no", lotNo).eq("tenant_id", SecureUtil.getTenantId()));
+		return BeanUtil.copy(stockGoods, StockGoodsVO.class);
 	}
 
 	/**
-	 * 新增库存账
+	 * 新增库存账接口
+	 * @param stockGoods
 	 * @return
 	 */
 	@Override
-	public boolean saveStock() {
-		return false;
+	public boolean  saveStock(StockGoods stockGoods) {
+		stockGoods.setTenantId(SecureUtil.getTenantId());
+		stockGoods.setCreateUser(SecureUtil.getUserId());
+		stockGoods.setCreateTime(new Date());
+		return this.save(stockGoods);
+
 	}
 
 	/**
@@ -61,8 +81,8 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 	 * @return
 	 */
 	@Override
-	public boolean updateStock() {
-		return false;
+	public int updateStock() {
+		return 0;
 	}
 
 }