查询库存修改

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

@@ -47,7 +47,8 @@ public interface IStockGoodsClient {
 								@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);
+								@RequestParam(value = "contractNumber",required = false)String contractNumber,
+								@RequestParam(value = "tradeType",required = false)String tradeType);
 
 	/**
 	 * 新增库存总账

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

@@ -274,7 +274,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 			storageId = null;
 			corpId = null;
 		}
-		R<StockGoodsVO> goodsVOR = stockGoodsClient.selectStock(corpId, storageId, deliveryItems.getItemId(), itemType, lotNo, cntrNo, billNo, contractNumber);
+		R<StockGoodsVO> goodsVOR = stockGoodsClient.selectStock(corpId, storageId, deliveryItems.getItemId(), itemType, lotNo, cntrNo, billNo, contractNumber,tradeType);
 		if (goodsVOR.isSuccess()){
 			return goodsVOR.getData();
 		}

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

@@ -54,8 +54,8 @@ public class StockGoodsClient implements IStockGoodsClient{
 	 */
 	@Override
 	@GetMapping(SELECT_STOKE)
-	public R<StockGoodsVO> selectStock(Long corpId, Long storageId, Long goodId, String itemType, String lotNo,String cntrNo,String billNo,String contractNumber) {
-		return R.data(stockGoodsService.selectStock(corpId,storageId,goodId,itemType,lotNo,cntrNo,billNo,contractNumber));
+	public R<StockGoodsVO> selectStock(Long corpId, Long storageId, Long goodId, String itemType, String lotNo,String cntrNo,String billNo,String contractNumber,String tradeType) {
+		return R.data(stockGoodsService.selectStock(corpId,storageId,goodId,itemType,lotNo,cntrNo,billNo,contractNumber,tradeType));
 	}
 
 	/**

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

@@ -55,7 +55,7 @@ public interface IStockGoodsService extends IService<StockGoods> {
 	 * @param contractNumber 合同号
 	 * @return
 	 */
-	StockGoodsVO selectStock(Long corpId,Long storageId,Long goodId,String itemType,String lotNo,String cntrNo,String billNo,String contractNumber);
+	StockGoodsVO selectStock(Long corpId,Long storageId,Long goodId,String itemType,String lotNo,String cntrNo,String billNo,String contractNumber,String tradeType);
 	/**
 	 * 新增库存总账
 	 */

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

@@ -80,7 +80,7 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 	 * @return
 	 */
 	@Override
-	public StockGoodsVO selectStock(Long corpId,Long storageId,Long goodId,String itemType,String lotNo,String cntrNo,String billNo,String contractNumber) {
+	public StockGoodsVO selectStock(Long corpId,Long storageId,Long goodId,String itemType,String lotNo,String cntrNo,String billNo,String contractNumber,String tradeType) {
 		LambdaQueryWrapper<StockGoods> lambdaQueryWrapper = new LambdaQueryWrapper();
 		lambdaQueryWrapper.eq(Func.isNotEmpty(corpId),StockGoods::getCorpId,corpId);//客户id
 		lambdaQueryWrapper.eq(Func.isNotEmpty(storageId),StockGoods::getStorageId,storageId);//仓库id
@@ -91,7 +91,7 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 		lambdaQueryWrapper.eq(Func.isNotEmpty(lotNo),StockGoods::getLotNo,lotNo);//批次号
 		lambdaQueryWrapper.isNull(Func.isEmpty(lotNo),StockGoods::getLotNo);//批次号
 		lambdaQueryWrapper.eq(StockGoods::getTenantId,SecureUtil.getTenantId());//租户
-
+		lambdaQueryWrapper.eq(Func.isNotEmpty(tradeType),StockGoods::getTradeType,tradeType);
 		lambdaQueryWrapper.eq(Func.isNotEmpty(cntrNo),StockGoods::getCntrNo,cntrNo);//收货单 箱号
 		lambdaQueryWrapper.eq(Func.isNotEmpty(billNo),StockGoods::getBillNo,billNo);//收货单 提单号
 		lambdaQueryWrapper.eq(Func.isNotEmpty(contractNumber),StockGoods::getContractNumber,contractNumber);//收货单 合同号
@@ -128,6 +128,7 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 			if (stockGoods.getInQuantity() == null){
 				stockGoods.setInQuantity(datum.getBalanceQuantity());
 			}
+			stockGoods.setTradeType("CN");
 			stockGoods.setTenantId(SecureUtil.getTenantId());
 			//获取商品id
 			R<GoodsDesc> goodsDesc = goodsDescClient.GoodsByCode(datum.getCode());