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

blade-service-api/blade-purchase-sales-api/pom.xml

@@ -12,6 +12,12 @@
     <artifactId>blade-purchase-sales-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-purchase-sales-api/src/main/java/org/springblade/purchase/sales/feign/IOrderItemsClient.java

@@ -0,0 +1,28 @@
+package org.springblade.purchase.sales.feign;
+
+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.RequestParam;
+
+import java.math.BigDecimal;
+
+@FeignClient(
+	value = LauncherConstant.APPLICATION_PURCHASE_SALES_NAME
+)
+public interface IOrderItemsClient {
+	String API_PREFIX = "/client";
+	String ACTUAL_QUANTITY = API_PREFIX + "actualQuantity";
+
+
+	/**
+	 * 修改订单明细发货数量
+	 * @param orderItemsId 订单明细id
+	 * @param actualQuantity 发货数量
+	 * @return
+	 */
+	@GetMapping(ACTUAL_QUANTITY)
+	R updateActualQuantity(@RequestParam("orderItemsId") Long orderItemsId,
+						   @RequestParam("actualQuantity")BigDecimal actualQuantity);
+}

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

@@ -40,11 +40,11 @@ public interface IStockGoodsClient {
 	R<StockGoodsVO> selectStock(@RequestParam("corpId")Long corpId,
 								@RequestParam("storageId")Long storageId,
 								@RequestParam("goodId")Long goodId,
-								@RequestParam("itemType")String itemType,
-								@RequestParam("lotNo")String lotNo,
-								@RequestParam("cntrNo")String cntrNo,
-								@RequestParam("billNo")String billNo,
-								@RequestParam("contractNumber")String contractNumber);
+								@RequestParam(value = "itemType",required = false)String itemType,
+								@RequestParam(value = "lotNo",required = false)String lotNo,
+								@RequestParam(value = "cntrNo",required = false)String cntrNo,
+								@RequestParam(value = "billNo",required = false)String billNo,
+								@RequestParam(value = "contractNumber",required = false)String contractNumber);
 
 	/**
 	 * 新增库存总账

blade-service/blade-deliver-goods/pom.xml

@@ -54,6 +54,12 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-purchase-sales-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

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

@@ -33,6 +33,7 @@ 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.feign.IOrderItemsClient;
 import org.springblade.stock.entity.StockGoods;
 import org.springblade.stock.feign.IStockGoodsClient;
 import org.springblade.stock.vo.StockGoodsVO;
@@ -55,6 +56,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 
 	private IGoodsDescClient goodsDescClient;//获取商品信息
 	private IStockGoodsClient stockGoodsClient;//查询库存账对外访问接口
+	private IOrderItemsClient orderItemsClient;//订单对外访问接口
 	@Override
 	public IPage<DeliveryItemsVO> selectDeliveryItemsPage(IPage<DeliveryItemsVO> page, DeliveryItemsVO deliveryItems) {
 		return page.setRecords(baseMapper.selectDeliveryItemsPage(page, deliveryItems));
@@ -133,7 +135,12 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 				this.deliverGoods(delivery.getTradeType(),stock.getId(),deliveryItems);
 			}else {
 				//新增库存账
-				this.saveStock(delivery.getTradeType(),delivery.getCorpId(),delivery.getStorageId(),deliveryItems);
+				throw  new RuntimeException("库存为空");
+			}
+			// todo 更新订单明细中发货数量  采购和销售可能需要调不同接口
+			R actualQuantity = orderItemsClient.updateActualQuantity(deliveryItems.getSrcId(), deliveryItems.getActualQuantity());
+			if (!actualQuantity.isSuccess()){
+				throw new RuntimeException("更新订单发货数量出错," + actualQuantity.getMsg());
 			}
 		}
 		return deliveryItemsList;

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

@@ -0,0 +1,39 @@
+package org.springblade.purchase.sales.feign;
+
+import lombok.AllArgsConstructor;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tool.api.R;
+import org.springblade.purchase.sales.entity.OrderItems;
+import org.springblade.purchase.sales.service.IOrderItemsService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.math.BigDecimal;
+
+@NonDS
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class OrderItemsClient implements IOrderItemsClient{
+	private IOrderItemsService orderItemsService;//订单明细
+
+	/**
+	 * 修改订单明细发货数量
+	 * @param orderItemsId 订单明细id
+	 * @param actualQuantity 发货数量
+	 * @return
+	 */
+	@Override
+	@GetMapping(ACTUAL_QUANTITY)
+	public R updateActualQuantity(Long orderItemsId, BigDecimal actualQuantity) {
+		OrderItems orderItems = orderItemsService.getById(orderItemsId);
+		if (orderItems == null){
+			throw new RuntimeException("找不到订单明细");
+		}
+		OrderItems items = new OrderItems();
+		items.setId(orderItemsId);
+		items.setActualQuantity(orderItems.getActualQuantity().add(actualQuantity));
+		return R.data(orderItemsService.updateById(items));
+	}
+}

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

@@ -77,7 +77,7 @@ public class StockGoodsClient implements IStockGoodsClient{
 	@Override
 	@PostMapping(UPDATE_STOCK)
 	public R updateStock(StockGoods stockGoods) {
-		return R.data(stockGoodsService.updateMessage(stockGoods));
+		return R.data(stockGoodsService.updateById(stockGoods));
 	}
 
 	/**

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

@@ -82,9 +82,9 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 		lambdaQueryWrapper.eq(Func.isNotEmpty(storageId),StockGoods::getStorageId,storageId);//仓库id
 		lambdaQueryWrapper.eq(Func.isNotEmpty(goodId),StockGoods::getGoodsId,goodId);//商品id
 		lambdaQueryWrapper.eq(Func.isNotEmpty(itemType),StockGoods::getItemType,itemType);//产品型号
-		lambdaQueryWrapper.eq(Func.isEmpty(itemType),StockGoods::getItemType,null);//产品型号
+		lambdaQueryWrapper.isNull(Func.isEmpty(itemType),StockGoods::getItemType);//产品型号
 		lambdaQueryWrapper.eq(Func.isNotEmpty(lotNo),StockGoods::getLotNo,lotNo);//批次号
-		lambdaQueryWrapper.eq(Func.isEmpty(lotNo),StockGoods::getLotNo,null);//批次号
+		lambdaQueryWrapper.isNull(Func.isEmpty(lotNo),StockGoods::getLotNo);//批次号
 		lambdaQueryWrapper.eq(StockGoods::getTenantId,SecureUtil.getTenantId());//租户
 
 		lambdaQueryWrapper.eq(Func.isNotEmpty(cntrNo),StockGoods::getCntrNo,cntrNo);//收货单 箱号