2022年11月25日20:00:15

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/dto/ArchivesExcelOut.java

@@ -76,7 +76,7 @@ public class ArchivesExcelOut implements Serializable {
 	 * 状态（使用 退租 卖出）
 	 */
 	@ExcelProperty(value = "状态（使用 退租 卖出）")
-	private Integer status;
+	private String status;
 	/**
 	 * 最新地点
 	 */

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

@@ -200,6 +200,9 @@ public class DeliveryItems implements Serializable {
 	*/
 		@ApiModelProperty(value = "合同号")
 		private String contractNumber;
+
+	@ApiModelProperty(value = "合同类型")
+	private String orderType;
 	/**
 	* 发票重量
 	*/
@@ -325,4 +328,5 @@ public class DeliveryItems implements Serializable {
 	@TableField(exist = false)
 	private String createUserName;
 
+
 }

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/vo/OrderDTO.java

@@ -55,4 +55,6 @@ public class OrderDTO extends OrderItems {
 
 	private BigDecimal grossWeight;
 
+	private String orderType;
+
 }

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/ArchivesController.java

@@ -91,7 +91,10 @@ public class ArchivesController extends BladeController {
 			.eq(ObjectUtils.isNotNull(archives.getTypeId()), Archives::getTypeId, archives.getTypeId())//箱型id
 			.eq(ObjectUtils.isNotNull(archives.getAddressId()), Archives::getAddressId, archives.getAddressId())//最新地点id
 			.eq(ObjectUtils.isNotNull(archives.getLeasingCompanyId()), Archives::getLeasingCompanyId, archives.getLeasingCompanyId())//租赁公司
-			.eq(ObjectUtils.isNotNull(archives.getBoxSource()), Archives::getBoxSource, archives.getBoxSource());//箱来源
+			.eq(ObjectUtils.isNotNull(archives.getBoxSource()), Archives::getBoxSource, archives.getBoxSource())//箱来源
+			.eq(ObjectUtils.isNotNull(archives.getStatus()), Archives::getStatus, archives.getStatus())//状态
+			.eq(ObjectUtils.isNotNull(archives.getBoxMakingCompany()), Archives::getBoxMakingCompany, archives.getBoxMakingCompany())//造箱公司
+			.eq(ObjectUtils.isNotNull(archives.getBoxStatus()), Archives::getBoxStatus, archives.getBoxStatus());//箱状态
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(archives.getBoxMakingCompanyId()), Archives::getBoxMakingCompanyId, archives.getBoxMakingCompanyId());//造箱公司
 		if (archives.getNewDateList() != null && archives.getNewDateList().size() > 1) {//最新日期
 			lambdaQueryWrapper.ge(Archives::getNewDate, archives.getNewDateList().get(0));
@@ -191,7 +194,7 @@ public class ArchivesController extends BladeController {
 			.eq(ObjectUtils.isNotNull(archives.getBoxSource()), Archives::getBoxSource, archives.getBoxSource());
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(archives.getBoxMakingCompanyId()), Archives::getBoxMakingCompanyId, archives.getBoxMakingCompanyId());
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(archives.getBoxStatus()), Archives::getBoxStatus, archives.getBoxStatus());
-		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(archives.getStatus()), Archives::getStatus, archives.getStatus());
+		lambdaQueryWrapper.eq( Archives::getStatus, "使用");
 		List<Archives> list = new ArrayList<>();
 		IPage<Archives> pages = archivesService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (pages.getRecords().size() > 0) {

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/BoxDataAnalysisController.java

@@ -17,6 +17,7 @@
 package org.springblade.box.tube.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
@@ -25,6 +26,8 @@ import lombok.AllArgsConstructor;
 import org.springblade.box.tube.entity.Archives;
 import org.springblade.box.tube.service.IArchivesService;
 import org.springblade.core.boot.ctrl.BladeController;
+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.tool.api.R;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -68,12 +71,12 @@ public class BoxDataAnalysisController extends BladeController {
 	@GetMapping("/details")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "箱分布", notes = "传入archives")
-	public R details(@RequestParam("address") String address) {
+	public R details(@RequestParam("address") String address, Query query) {
 		LambdaQueryWrapper<Archives> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(Archives::getTenantId, AuthUtil.getTenantId())
 			.eq(Archives::getIsDeleted, 0)
 			.eq(Archives::getAddress, address);
-		List<Archives> archivesList = archivesService.list(lambdaQueryWrapper);
+		IPage<Archives> archivesList = archivesService.page(Condition.getPage(query),lambdaQueryWrapper);
 		return R.data(archivesList);
 	}
 

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/mapper/ArchivesMapper.xml

@@ -43,6 +43,7 @@
         update container_archives
         <trim prefix="SET" suffixOverrides=",">
             <if test="address != null and address !=''">address = #{address},</if>
+            <if test="boxAccessStatus != null and boxAccessStatus !=''">box_access_status = #{boxAccessStatus},</if>
             <if test="addressId != null">address_id = #{addressId},</if>
             <if test="newDate != null">new_date = #{newDate},</if>
         </trim>

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/ArchivesServiceImpl.java

@@ -135,6 +135,12 @@ public class ArchivesServiceImpl extends ServiceImpl<ArchivesMapper, Archives> i
 			if (ObjectUtils.isNull(archives.getCode())) {
 				throw new RuntimeException("箱号不能为空");
 			}
+			if (ObjectUtils.isNull(archives.getAddress())) {
+				throw new RuntimeException("最新地点不能为空");
+			}
+			if (ObjectUtils.isNull(archives.getNewDate())) {
+				throw new RuntimeException("最新时间不能为空");
+			}
 			//箱类型
 			if (ObjectUtils.isNotNull(archives.getName())) {
 				R<BasicContainerDesc> detail = containerDescClient.getContainer(archives.getName());

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

@@ -527,6 +527,7 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 			}
 			stockGoods.setLockingQuantity(stockGoods.getLockingQuantity().subtract(deliveryItems.getActualQuantity()));
 		}
+		stockGoods.setOrderType(deliveryItems.getOrderType());
 		stockGoods.setCntrNo(deliveryItems.getCntrNo());
 		stockGoods.setUpdateTime(new Date());
 		stockGoods.setUpdateUser(SecureUtil.getUserId());
@@ -576,7 +577,11 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 			stockGoods.setBalanceVolumn(deliveryItems.getBillWeight());//结余码单重量
 
 			stockGoods.setTradeType("JK");
-			stockGoods.setOrderType(orderType);
+			if (ObjectUtil.isNotEmpty(orderType)){
+				stockGoods.setOrderType(orderType);
+			}else{
+				stockGoods.setOrderType(deliveryItems.getOrderType());
+			}
 		}
 		//国内
 		else if(tradeType.equals(OrderTypeEnum.DOMESTIC.getType()))

blade-service/trade-purchase/src/main/java/com/trade/purchase/excel/RubberStockDto.java

@@ -142,6 +142,11 @@ public class RubberStockDto {
 	private Integer size;
 
 	/**
+	 * 采购合同日期
+	 */
+	private Date businesDate;
+
+	/**
 	 * 采购合同日期（开始）
 	 */
 	private Date businesDateStartC;
@@ -151,4 +156,9 @@ public class RubberStockDto {
 	 */
 	private Date businesDateEndC;
 
+	/**
+	 * 橡胶库存匹配状态
+	 */
+	private String  rubberDistinguish;
+
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/PurchaseOrderController.java

@@ -896,53 +896,103 @@ public class PurchaseOrderController extends BladeController {
 		int size = rubberStockDto.getSize() == null ? 1 : rubberStockDto.getSize();
 		iPage.setCurrent(current);
 		iPage.setSize(size);
-		IPage<RubberStockDto> pages = orderService.rubberStock(iPage, rubberStockDto);
-		//客户
-		List<CorpsDesc> corpsDescList = castToList(redisTemplate.opsForValue().get("corps"), CorpsDesc.class);
-		if (ObjectUtils.isNull(corpsDescList)) {
-			CorpsDesc corpsDesc = new CorpsDesc();
-			corpsDesc.setTenantId(AuthUtil.getTenantId());
-			corpsDescList = corpsDescClient.getCorp(corpsDesc);
-			redisClient.basicData("all");
-		}
-		//商品
-		List<GoodsDesc> goodsList = castToList(redisTemplate.opsForValue().get("goods"), GoodsDesc.class);
-		for (RubberStockDto rubberStock : pages.getRecords()) {
-			//获取供应商中文名
-			CorpsDesc corpMessage = corpsDescList.stream().filter(corp -> corp.getId().equals(rubberStock.getCorpIdC())).findFirst().orElse(null);
-			if (ObjectUtils.isNotNull(corpMessage)) {
-				rubberStock.setCorpNameC(corpMessage.getCname());
-			}
-			//采购公司
-			CorpsDesc corpMessage1 = corpsDescList.stream().filter(corp -> corp.getId().equals(rubberStock.getBelongToCorpIdC())).findFirst().orElse(null);
-			if (ObjectUtils.isNotNull(corpMessage1)) {
-				rubberStock.setBelongToCorpNameC(corpMessage1.getCname());
-			}
+		if ("1".equals(rubberStockDto.getRubberDistinguish())){
+			IPage<RubberStockDto> pages = orderService.rubberStock(iPage, rubberStockDto);
 			//客户
-			CorpsDesc corpMessage2 = corpsDescList.stream().filter(corp -> corp.getId().equals(rubberStock.getCorpIdX())).findFirst().orElse(null);
-			if (ObjectUtils.isNotNull(corpMessage2)) {
-				rubberStock.setCorpNameX(corpMessage2.getCname());
+			List<CorpsDesc> corpsDescList = castToList(redisTemplate.opsForValue().get("corps"), CorpsDesc.class);
+			if (ObjectUtils.isNull(corpsDescList)) {
+				CorpsDesc corpsDesc = new CorpsDesc();
+				corpsDesc.setTenantId(AuthUtil.getTenantId());
+				corpsDescList = corpsDescClient.getCorp(corpsDesc);
+				redisClient.basicData("all");
 			}
-			//销售公司
-			CorpsDesc corpMessage3 = corpsDescList.stream().filter(corp -> corp.getId().equals(rubberStock.getBelongToCorpIdX())).findFirst().orElse(null);
-			if (ObjectUtils.isNotNull(corpMessage3)) {
-				rubberStock.setBelongToCorpNameX(corpMessage3.getCname());
-			}
-			//品名
-			GoodsDesc goodsDesc = goodsList.stream().filter(goods -> goods.getId().equals(rubberStock.getItemIdC())).findFirst().orElse(null);
-			if (ObjectUtils.isNotNull(goodsDesc)) {
-				rubberStock.setItemNameC(goodsDesc.getCname());
+			//商品
+			List<GoodsDesc> goodsList = castToList(redisTemplate.opsForValue().get("goods"), GoodsDesc.class);
+			for (RubberStockDto rubberStock : pages.getRecords()) {
+				//获取供应商中文名
+				CorpsDesc corpMessage = corpsDescList.stream().filter(corp -> corp.getId().equals(rubberStock.getCorpIdC())).findFirst().orElse(null);
+				if (ObjectUtils.isNotNull(corpMessage)) {
+					rubberStock.setCorpNameC(corpMessage.getCname());
+				}
+				//采购公司
+				CorpsDesc corpMessage1 = corpsDescList.stream().filter(corp -> corp.getId().equals(rubberStock.getBelongToCorpIdC())).findFirst().orElse(null);
+				if (ObjectUtils.isNotNull(corpMessage1)) {
+					rubberStock.setBelongToCorpNameC(corpMessage1.getCname());
+				}
+				//客户
+				CorpsDesc corpMessage2 = corpsDescList.stream().filter(corp -> corp.getId().equals(rubberStock.getCorpIdX())).findFirst().orElse(null);
+				if (ObjectUtils.isNotNull(corpMessage2)) {
+					rubberStock.setCorpNameX(corpMessage2.getCname());
+				}
+				//销售公司
+				CorpsDesc corpMessage3 = corpsDescList.stream().filter(corp -> corp.getId().equals(rubberStock.getBelongToCorpIdX())).findFirst().orElse(null);
+				if (ObjectUtils.isNotNull(corpMessage3)) {
+					rubberStock.setBelongToCorpNameX(corpMessage3.getCname());
+				}
+				//品名
+				GoodsDesc goodsDesc = goodsList.stream().filter(goods -> goods.getId().equals(rubberStock.getItemIdC())).findFirst().orElse(null);
+				if (ObjectUtils.isNotNull(goodsDesc)) {
+					rubberStock.setItemNameC(goodsDesc.getCname());
+				}
+				if(ObjectUtils.isNotNull(rubberStock.getAmountX()) && ObjectUtils.isNotNull(rubberStock.getAmountC())){
+					rubberStock.setProfit(rubberStock.getAmountX().subtract(rubberStock.getAmountC()));
+					rubberStock.setNoProfit(rubberStock.getAmountX().subtract(rubberStock.getAmountC()));
+				}else{
+					rubberStock.setProfit(new BigDecimal(0.00));
+					rubberStock.setNoProfit(new BigDecimal(0.00));
+				}
+
 			}
-			if(ObjectUtils.isNotNull(rubberStock.getAmountX()) && ObjectUtils.isNotNull(rubberStock.getAmountC())){
-				rubberStock.setProfit(rubberStock.getAmountX().subtract(rubberStock.getAmountC()));
-				rubberStock.setNoProfit(rubberStock.getAmountX().subtract(rubberStock.getAmountC()));
-			}else{
-				rubberStock.setProfit(new BigDecimal(0.00));
-				rubberStock.setNoProfit(new BigDecimal(0.00));
+			return R.data(pages);
+		}else{
+			IPage<RubberStockDto> pages = orderService.rubberStockXS(iPage, rubberStockDto);
+			//客户
+			List<CorpsDesc> corpsDescList = castToList(redisTemplate.opsForValue().get("corps"), CorpsDesc.class);
+			if (ObjectUtils.isNull(corpsDescList)) {
+				CorpsDesc corpsDesc = new CorpsDesc();
+				corpsDesc.setTenantId(AuthUtil.getTenantId());
+				corpsDescList = corpsDescClient.getCorp(corpsDesc);
+				redisClient.basicData("all");
 			}
+			//商品
+			List<GoodsDesc> goodsList = castToList(redisTemplate.opsForValue().get("goods"), GoodsDesc.class);
+			for (RubberStockDto rubberStock : pages.getRecords()) {
+				//获取供应商中文名
+				CorpsDesc corpMessage = corpsDescList.stream().filter(corp -> corp.getId().equals(rubberStock.getCorpIdC())).findFirst().orElse(null);
+				if (ObjectUtils.isNotNull(corpMessage)) {
+					rubberStock.setCorpNameC(corpMessage.getCname());
+				}
+				//采购公司
+				CorpsDesc corpMessage1 = corpsDescList.stream().filter(corp -> corp.getId().equals(rubberStock.getBelongToCorpIdC())).findFirst().orElse(null);
+				if (ObjectUtils.isNotNull(corpMessage1)) {
+					rubberStock.setBelongToCorpNameC(corpMessage1.getCname());
+				}
+				//客户
+				CorpsDesc corpMessage2 = corpsDescList.stream().filter(corp -> corp.getId().equals(rubberStock.getCorpIdX())).findFirst().orElse(null);
+				if (ObjectUtils.isNotNull(corpMessage2)) {
+					rubberStock.setCorpNameX(corpMessage2.getCname());
+				}
+				//销售公司
+				CorpsDesc corpMessage3 = corpsDescList.stream().filter(corp -> corp.getId().equals(rubberStock.getBelongToCorpIdX())).findFirst().orElse(null);
+				if (ObjectUtils.isNotNull(corpMessage3)) {
+					rubberStock.setBelongToCorpNameX(corpMessage3.getCname());
+				}
+				//品名
+				GoodsDesc goodsDesc = goodsList.stream().filter(goods -> goods.getId().equals(rubberStock.getItemIdC())).findFirst().orElse(null);
+				if (ObjectUtils.isNotNull(goodsDesc)) {
+					rubberStock.setItemNameC(goodsDesc.getCname());
+				}
+				if(ObjectUtils.isNotNull(rubberStock.getAmountX()) && ObjectUtils.isNotNull(rubberStock.getAmountC())){
+					rubberStock.setProfit(rubberStock.getAmountX().subtract(rubberStock.getAmountC()));
+					rubberStock.setNoProfit(rubberStock.getAmountX().subtract(rubberStock.getAmountC()));
+				}else{
+					rubberStock.setProfit(new BigDecimal(0.00));
+					rubberStock.setNoProfit(new BigDecimal(0.00));
+				}
 
+			}
+			return R.data(pages);
 		}
-		return R.data(pages);
 	}
 
 	/**

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderItemsMapper.xml

@@ -98,7 +98,8 @@
         b.amount as amount,
         b.item_id as itemId,
         b.id as id,
-        b.gross_weight as grossWeight
+        b.gross_weight as grossWeight,
+        a.order_type AS orderType
         FROM
         business_order a,
         business_order_items b

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderMapper.java

@@ -71,4 +71,6 @@ public interface OrderMapper extends BaseMapper<Order> {
 	 * @return
 	 */
 	List<RubberStockDto> rubberStock(IPage<RubberStockDto> page, @Param("rubberStockDto") RubberStockDto rubberStockDto);
+
+    List<RubberStockDto> rubberStockXS(IPage<RubberStockDto> iPage, @Param("rubberStockDto") RubberStockDto rubberStockDto);
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderMapper.xml

@@ -692,6 +692,7 @@
     <select id="rubberStock" resultType="com.trade.purchase.excel.RubberStockDto">
         SELECT DISTINCT
             boC.corp_id AS corpIdC,
+            boC.busines_date AS businesDate,
             boCi.item_id AS itemIdC,
             boC.belong_to_corp_id AS belongToCorpIdC,
             boC.required_arrival_date AS requiredArrivalDateC,
@@ -792,4 +793,71 @@
             and boC.busines_date &lt;= #{rubberStockDto.businesDateEndC}
         </if>
     </select>
+    <select id="rubberStockXS" resultType="com.trade.purchase.excel.RubberStockDto">
+        SELECT DISTINCT
+            boX.order_no AS orderNoX,
+            boX.belong_to_corp_id AS belongToCorpIdX,
+            boX.corp_id AS corpIdX,
+            boXi.price AS priceX,
+            boXi.order_quantity AS orderQuantityX,
+            boXi.amount AS amountX,
+            boX.planned_delivery_date AS plannedDeliveryDateX,
+            boX.bill_no AS billNoX,
+            boX.sales_name AS salesName,
+            boXi.if_tax AS ifTax,
+            boX.balance_amount AS balanceAmountX
+        FROM
+            business_order boX
+                LEFT JOIN business_order_items boXi ON boX.id = boXi.pid
+        WHERE
+            boX.is_deleted = 0
+          AND boX.bill_type = 'XS'
+          AND boX.order_type = '橡胶'
+          AND ISNULL( boX.morder_no )
+        <if test="rubberStockDto.tenantId != null and rubberStockDto.tenantId != ''">
+            and boX.tenant_id = #{rubberStockDto.tenantId}
+        </if>
+        <if test="rubberStockDto.corpIdC !=null">
+            and boX.corp_id = #{rubberStockDto.corpIdC}
+        </if>
+        <if test="rubberStockDto.itemIdC !=null">
+            and boXi.item_id = #{rubberStockDto.itemIdC}
+        </if>
+        <if test="rubberStockDto.belongToCorpIdC !=null">
+            and boX.belong_to_corp_id = #{rubberStockDto.belongToCorpIdC}
+        </if>
+        <if test="rubberStockDto.requiredArrivalDateStartC !=null ">
+            and boX.required_arrival_date &gt;= #{rubberStockDto.requiredArrivalDateStartC}
+        </if>
+        <if test="rubberStockDto.requiredArrivalDateEndC !=null">
+            and boX.required_arrival_date &lt;= #{rubberStockDto.requiredArrivalDateEndC}
+        </if>
+        <if test="rubberStockDto.businesDateStartC !=null">
+            and boX.busines_date &lt;= #{rubberStockDto.businesDateStartC}
+        </if>
+        <if test="rubberStockDto.businesDateEndC !=null">
+            and boX.busines_date &lt;= #{rubberStockDto.businesDateEndC}
+        </if>
+        <if test="rubberStockDto.orderNoX !=null and rubberStockDto.orderNoX != ''">
+            and boX.bill_no like CONCAT(CONCAT('%', #{rubberStockDto.orderNoX}), '%')
+        </if>
+        <if test="rubberStockDto.corpIdX !=null">
+            and boX.corp_id = #{rubberStockDto.corpIdX}
+        </if>
+        <if test="rubberStockDto.belongToCorpIdX !=null">
+            and boX.belong_to_corp_id = #{rubberStockDto.belongToCorpIdX}
+        </if>
+        <if test="rubberStockDto.plannedDeliveryDateStartX !=null ">
+            and boX.planned_delivery_date &gt;= #{rubberStockDto.plannedDeliveryDateStartX}
+        </if>
+        <if test="rubberStockDto.plannedDeliveryDateEndX !=null">
+            and boX.planned_delivery_date &lt;= #{rubberStockDto.plannedDeliveryDateEndX}
+        </if>
+        <if test="rubberStockDto.orderNoX !=null and rubberStockDto.orderNoX != ''">
+            and boX.bill_no like CONCAT(CONCAT('%', #{rubberStockDto.orderNoX}), '%')
+        </if>
+        <if test="rubberStockDto.billNoX !=null and rubberStockDto.billNoX != ''">
+            and boXi.bill_no like CONCAT(CONCAT('%', #{rubberStockDto.billNoX}), '%')
+        </if>
+    </select>
 </mapper>

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/IOrderService.java

@@ -299,4 +299,6 @@ public interface IOrderService extends IService<Order> {
 	 * @return
 	 */
 	IPage<RubberStockDto> rubberStock(IPage<RubberStockDto> page, RubberStockDto rubberStockDto);
+
+    IPage<RubberStockDto> rubberStockXS(IPage<RubberStockDto> iPage, RubberStockDto rubberStockDto);
 }

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -2420,6 +2420,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		return page.setRecords(baseMapper.rubberStock(page, rubberStockDto));
 	}
 
+	@Override
+	public IPage<RubberStockDto> rubberStockXS(IPage<RubberStockDto> iPage, RubberStockDto rubberStockDto) {
+		return iPage.setRecords(baseMapper.rubberStockXS(iPage, rubberStockDto));
+	}
+
 	/**
 	 * 订单生成账单 并且推送财务消息
 	 *