1.应收总账检索条件问题修改

2.销售选商品增加仓库条件

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/controller/GoodsDescController.java

@@ -472,12 +472,12 @@ public class GoodsDescController extends BladeController {
 	@ApiOperation(value = "商品下拉", notes = "传入goods")
 	public R<IPage<PjGoodsDesc>> goodsPageXs(PjGoodsDesc goods, Query query) {
 		List<Long> goodIdList = new ArrayList<>();
-		if (ObjectUtils.isNotNull(ParameterUtils.getStorageId()) && ParameterUtils.whetherDatabaseSharding()) {
+		if ( ParameterUtils.whetherDatabaseSharding()) {
 			LambdaQueryWrapper<PjStockDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 			lambdaQueryWrapper.eq(PjStockDesc::getTenantId, AuthUtil.getTenantId())
 				.eq(PjStockDesc::getIsDeleted, 0)
-				.eq(PjStockDesc::getSalesCompanyId, AuthUtil.getDeptId())//公司
-				.apply("find_in_set(storage_id,'" + ParameterUtils.getStorageId() + "')")
+				.eq(PjStockDesc::getSalesCompanyId, AuthUtil.getDeptId())
+				.eq(PjStockDesc::getStorageId, goods.getStock())
 				.orderByDesc(PjStockDesc::getBalanceQuantity);
 			List<PjStockDesc> stockDescList = stockDescService.list(lambdaQueryWrapper);
 			if (!stockDescList.isEmpty()) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderMapper.xml

@@ -412,11 +412,11 @@
         <if test="order.customerId!=null">
             and o.customer_id = #{order.customerId}
         </if>
-        <if test="order.storageIds!=null">
+        <if test="order.storageIds!=null and order.storageIds != ''">
             and FIND_IN_SET(o.storage_id , #{order.storageIds})
         </if>
         <if test="order.storageId!=null">
-            and o.storage_id = #{order.storageIds}
+            and o.storage_id = #{order.storageId}
         </if>
         <if test="order.whetherSettlement !=null and order.whetherSettlement == 0">
             and o.total_money != o.payment_amount_tl
@@ -478,11 +478,11 @@
         <if test="order.customerId!=null">
             and o.customer_id = #{order.customerId}
         </if>
-        <if test="order.storageIds!=null">
+        <if test="order.storageIds!=null  and order.storageIds != ''">
             and FIND_IN_SET(o.storage_id , #{order.storageIds})
         </if>
         <if test="order.storageId!=null">
-            and o.storage_id = #{order.storageIds}
+            and o.storage_id = #{order.storageId}
         </if>
         <if test="order.whetherSettlement !=null and order.whetherSettlement == 0">
             and o.total_money != o.payment_amount_tl

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -378,7 +378,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 
 	@Override
 	public IPage<PjOrderStatisticsWeb> statisticsPage(IPage<PjOrderStatisticsWeb> page, PjOrderStatisticsWeb order) {
-		if (ParameterUtils.whetherDatabaseSharding()) {
+		if (ObjectUtils.isNotNull(ParameterUtils.getStorageId()) && ParameterUtils.whetherDatabaseSharding()) {
 			order.setStorageIds(ParameterUtils.getStorageId());
 		}
 		List<PjOrderStatisticsWeb> list = baseMapper.statisticsPage(page, order);
@@ -554,7 +554,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 
 	@Override
 	public List<PjOrderStatisticsExcel> statisticsExport(PjOrderStatisticsWeb order) {
-		if (ParameterUtils.whetherDatabaseSharding()) {
+		if (ObjectUtils.isNotNull(ParameterUtils.getStorageId()) && ParameterUtils.whetherDatabaseSharding()) {
 			order.setStorageIds(ParameterUtils.getStorageId());
 		}
 		List<PjOrderStatisticsExcel> list = baseMapper.statisticsExport(order);
@@ -2498,7 +2498,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 
 	@Override
 	public R statisticsSum(PjOrderStatisticsWeb order) {
-		if (ParameterUtils.whetherDatabaseSharding()) {
+		if (ObjectUtils.isNotNull(ParameterUtils.getStorageId()) && ParameterUtils.whetherDatabaseSharding()) {
 			order.setStorageIds(ParameterUtils.getStorageId());
 		}