Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-stock/src/main/java/org/springblade/stock/controller/StockGoodsController.java

@@ -37,6 +37,7 @@ 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;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
@@ -103,8 +104,18 @@ public class StockGoodsController extends BladeController {
 			LambdaQueryWrapper<StockGoods> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 			lambdaQueryWrapper.eq(StockGoods::getTenantId, SecureUtil.getTenantId());
 			lambdaQueryWrapper.eq(StockGoods::getIsDeleted,0);
-			lambdaQueryWrapper.like(Func.isNotEmpty(stockGoods.getCode()),StockGoods::getCode,stockGoods.getCode());//编码
-			lambdaQueryWrapper.like(Func.isNotEmpty(stockGoods.getCname()),StockGoods::getCname,stockGoods.getCname());//名称
+			lambdaQueryWrapper.eq(Func.isNotEmpty(stockGoods.getBillNo()),StockGoods::getBillNo,stockGoods.getBillNo());
+			lambdaQueryWrapper.eq(Func.isNotEmpty(stockGoods.getContractNumber()),StockGoods::getContractNumber,stockGoods.getContractNumber());
+
+			if(Func.isNotEmpty(stockGoods.getCname()))
+			{
+				List<Long> goodId = goodsDescClient.getGoodId(null, stockGoods.getCname(), null, null, null, null, null);
+				if(goodId!=null)
+				{
+					lambdaQueryWrapper.in(StockGoods::getGoodsId, goodId);
+				}
+			}
+
 			lambdaQueryWrapper.like(Func.isNotEmpty(stockGoods.getBrandItem()),StockGoods::getBrandItem,stockGoods.getBrandItem());//花纹
 			lambdaQueryWrapper.like(Func.isNotEmpty(stockGoods.getPlaceProduction()),StockGoods::getPlaceProduction,stockGoods.getPlaceProduction());//产地
 			lambdaQueryWrapper.like(Func.isNotEmpty(stockGoods.getBrand()),StockGoods::getBrand,stockGoods.getBrand());//品牌
@@ -167,7 +178,18 @@ public class StockGoodsController extends BladeController {
 		//区分箱号查询
 		else if(stockGoods.getIsCntrON()==1)
 		{
-			IPage<StockGoods> iPage = stockGoodsService.groupByStock(Condition.getPage(query));
+			Long goodId=null;
+			if(Func.isNotEmpty(stockGoods.getCname()))
+			{
+				List<Long> longs = goodsDescClient.getGoodId(null, stockGoods.getCname(), null, null, null, null, null);
+				if(CollectionUtils.isNotEmpty(longs))
+				{
+					goodId=longs.get(0).longValue();
+				}
+
+			}
+
+			IPage<StockGoods> iPage = stockGoodsService.groupByStock(Condition.getPage(query), AuthUtil.getTenantId(),stockGoods.getContractNumber(),stockGoods.getBillNo(),goodId,stockGoods.getCreateStartTime(),stockGoods.getCreateEndTime());
 			List<StockGoods> records = iPage.getRecords();
 			if(CollectionUtils.isNotEmpty(records))
 			{

blade-service/blade-stock/src/main/java/org/springblade/stock/mapper/StockGoodsMapper.java

@@ -40,6 +40,6 @@ public interface StockGoodsMapper extends BaseMapper<StockGoods> {
 	 */
 	List<StockGoodsVO> selectStockGoodsPage(IPage page, StockGoodsVO stockGoods);
 
-	IPage<StockGoods> groupByStock(IPage<StockGoods> iPage,@Param("tenantId") String tenantId);
+	IPage<StockGoods> groupByStock(IPage<StockGoods> iPage,@Param("tenantId") String tenantId,@Param("contractNumber") String contractNumber,@Param("billNo") String billNo,@Param("goodId") Long goodId,@Param("createStartTime") String createStartTime,@Param("createEndTime") String createEndTime);
 
 }

blade-service/blade-stock/src/main/java/org/springblade/stock/mapper/StockGoodsMapper.xml

@@ -71,6 +71,19 @@
     FROM
 	business_stock_goods a
     where a.tenant_id=#{tenantId}
+        <if test='contractNumber != null and contractNumber!= ""'>
+            and a.contract_number=#{contractNumber}
+        </if>
+        <if test='billNo != null and billNo!= ""'>
+            and a.bill_no=#{billNo}
+        </if>
+        <if test='goodId != null and goodId!= ""'>
+            and a.goods_id=#{goodId}
+        </if>
+        <if test='createStartTime != null and createStartTime!= "" and createEndTime != null and createEndTime!= ""  ' >
+            and a.create_time between #{createStartTime} and #{createEndTime}
+        </if>
+
     GROUP BY
 	a.bill_no,
 	a.contract_number,

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

@@ -17,6 +17,7 @@
 package org.springblade.stock.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.tool.api.R;
 import org.springblade.stock.entity.StockGoods;
 import org.springblade.stock.excel.StockGoodsExcel;
@@ -82,7 +83,7 @@ public interface IStockGoodsService extends IService<StockGoods> {
 	R<StockGoods> updateMessage(StockGoods stockGoods);
 
 
-	IPage<StockGoods> groupByStock(IPage<StockGoods> iPage);
+	IPage<StockGoods> groupByStock(IPage<StockGoods> iPage, @Param("tenantId") String tenantId, @Param("contractNumber") String contractNumber, @Param("billNo") String billNo, @Param("goodId") Long goodId, @Param("createStartTime") String createStartTime, @Param("createEndTime") String createEndTime);
 
 
 }

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

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.GoodsDesc;
 import org.springblade.client.entity.StorageDesc;
@@ -271,9 +272,9 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 	}
 
 	@Override
-	public IPage<StockGoods> groupByStock(IPage<StockGoods> iPage)
+	public IPage<StockGoods> groupByStock(IPage<StockGoods> iPage,  String tenantId,  String contractNumber,  String billNo,Long goodId,  String createStartTime,  String createEndTime)
 	{
-		return baseMapper.groupByStock(iPage,AuthUtil.getTenantId());
+		return baseMapper.groupByStock(iPage,AuthUtil.getTenantId(),contractNumber,billNo,goodId,createStartTime,createEndTime);
 	}
 
 }