中心仓出入库列表接口

blade-service-api/tire-center-warehouse-api/src/main/java/com/ecp/tire/center/warehouse/api/plan/entity/CenterOrderPlan.java

@@ -1,5 +1,6 @@
 package com.ecp.tire.center.warehouse.api.plan.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -284,4 +285,16 @@ public class CenterOrderPlan implements Serializable {
 	private String shortcutJoin;
 
 
+	/**
+	 *  品牌
+	 */
+	@TableField(exist = false)
+	private String b1name;
+
+	/**
+	 * 规格型号
+	 */
+	@TableField(exist = false)
+	private String p1name;
+
 }

blade-service/blade-sales-part/pom.xml

@@ -113,12 +113,18 @@
             <groupId>org.springblade</groupId>
             <artifactId>tire-center-warehouse</artifactId>
             <version>2.8.2.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.pagehelper</groupId>
+                    <artifactId>pagehelper</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>com.echepei</groupId>
             <artifactId>shop-sdk</artifactId>
-            <version>1.0.3</version>
+            <version>1.0.6</version>
         </dependency>
     </dependencies>
 

blade-service/tire-center-warehouse/pom.xml

@@ -84,6 +84,22 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-swagger</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper</artifactId>
+            <version>5.3.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.jsqlparser</groupId>
+                    <artifactId>jsqlparser</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
 

blade-service/tire-center-warehouse/src/main/java/com/ecp/tire/center/warehouse/pagehelper/CenterPageHelperConfig.java

@@ -0,0 +1,32 @@
+package com.ecp.tire.center.warehouse.pagehelper;
+
+
+import com.github.pagehelper.PageInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Properties;
+
+/**
+ * 手动分页插件
+ *
+ * @author Rain
+ */
+@Configuration
+public class CenterPageHelperConfig {
+
+
+	/**
+	 * PageHelper分页插件
+	 */
+	@Bean
+	PageInterceptor pageInterceptor() {
+		PageInterceptor pageInterceptor = new PageInterceptor();
+		Properties properties = new Properties();
+		properties.setProperty("helperDialect", "mysql");
+		pageInterceptor.setProperties(properties);
+		return pageInterceptor;
+	}
+
+
+}

blade-service/tire-center-warehouse/src/main/java/com/ecp/tire/center/warehouse/pagehelper/PageHelperUtil.java

@@ -0,0 +1,29 @@
+package com.ecp.tire.center.warehouse.pagehelper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageInfo;
+
+import java.util.List;
+
+/**
+ * @author Rain
+ */
+public class PageHelperUtil {
+
+
+	/**
+	 * 注意，传输的list必须是经过 pagehelper 处理过的list
+	 */
+	public static <T> IPage<T> getPageInfo(List<T> list) {
+		PageInfo<T> pageInfo = new PageInfo<>(list);
+		IPage<T> page = new Page<>();
+		page.setRecords(pageInfo.getList());
+		page.setTotal(pageInfo.getTotal());
+		page.setCurrent(pageInfo.getPageNum());
+		page.setSize(pageInfo.getPageSize());
+		return page;
+	}
+
+
+}

blade-service/tire-center-warehouse/src/main/java/com/ecp/tire/center/warehouse/plan/impl/CenterOrderPlanServiceImpl.java

@@ -11,29 +11,27 @@ import com.ecp.tire.center.warehouse.api.ship.entity.CenterShipCost;
 import com.ecp.tire.center.warehouse.api.stock.entity.CenterStockDesc;
 import com.ecp.tire.center.warehouse.api.stock.vo.CenterExportPlanInVo;
 import com.ecp.tire.center.warehouse.api.storage.vo.PlanAuditVo;
+import com.ecp.tire.center.warehouse.pagehelper.PageHelperUtil;
 import com.ecp.tire.center.warehouse.plan.mapper.CenterOrderPlanItemMapper;
 import com.ecp.tire.center.warehouse.plan.mapper.CenterOrderPlanMapper;
 import com.ecp.tire.center.warehouse.plan.service.ICenterOrderPlanItemService;
 import com.ecp.tire.center.warehouse.plan.service.ICenterOrderPlanService;
 import com.ecp.tire.center.warehouse.ship.service.ICenterShipCostService;
-import com.ecp.tire.center.warehouse.ship.service.ICenterShipItemsService;
 import com.ecp.tire.center.warehouse.ship.service.ICenterShipService;
 import com.ecp.tire.center.warehouse.stock.service.ICenterStockDescService;
 import com.ecp.tire.center.warehouse.util.BillCodeUtil;
+import com.github.pagehelper.PageHelper;
 import org.springblade.common.enums.CenterTypeEnum;
 import org.springblade.common.enums.CommonEnum;
 import org.springblade.common.enums.NumberEnum;
-import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.salesPart.entity.PjCorpsDesc;
 import org.springblade.salesPart.entity.PjGoodsDesc;
 import org.springblade.salesPart.entity.PjOrderItems;
-import org.springblade.salesPart.entity.PjProductLaunch;
 import org.springblade.salesPart.excel.ShipItemImportXSCodeExcel;
 import org.springblade.salesPart.feign.IPJCorpClient;
 import org.springblade.system.entity.Dept;
@@ -48,7 +46,6 @@ import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -96,30 +93,11 @@ public class CenterOrderPlanServiceImpl extends ServiceImpl<CenterOrderPlanMappe
 	@Override
 	public IPage<CenterOrderPlan> getCenterPlanList(Query query, CenterOrderPlanVo centerOrderPlanVo) {
 		BladeUser bladeUser = AuthUtil.getUser();
-		LambdaQueryWrapper<CenterOrderPlan> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(CenterOrderPlan::getTenantId, bladeUser.getTenantId())
-			.eq(CenterOrderPlan::getIsDeleted, 0)
-			.eq(CenterOrderPlan::getBsType, centerOrderPlanVo.getBsType())
-			//仓库
-			.eq(Objects.nonNull(centerOrderPlanVo.getStorageId()), CenterOrderPlan::getStorageId, centerOrderPlanVo.getStorageId())
-			.eq(Objects.nonNull(centerOrderPlanVo.getCreateUser()), CenterOrderPlan::getCreateUser, centerOrderPlanVo.getCreateUser())
-			.eq(StringUtils.hasText(centerOrderPlanVo.getStatus()), CenterOrderPlan::getStatus, centerOrderPlanVo.getStatus())
-			.like(StringUtils.hasText(centerOrderPlanVo.getStorageName()), CenterOrderPlan::getStorageName, centerOrderPlanVo.getStorageName())
-			.like(StringUtils.hasText(centerOrderPlanVo.getCustomerName()), CenterOrderPlan::getCustomerName, centerOrderPlanVo.getCustomerName())
-			.like(StringUtils.hasText(centerOrderPlanVo.getShortcutJoin()), CenterOrderPlan::getShortcutJoin, centerOrderPlanVo.getShortcutJoin())
-			.like(StringUtils.hasText(centerOrderPlanVo.getOrdNo()), CenterOrderPlan::getOrdNo, centerOrderPlanVo.getOrdNo());
-		if (!CollectionUtils.isEmpty(centerOrderPlanVo.getBusinesDateList())) {
-			// 业务日期
-			lambdaQueryWrapper.ge(CenterOrderPlan::getBusinesDate, centerOrderPlanVo.getBusinesDateList().get(0));
-			lambdaQueryWrapper.le(CenterOrderPlan::getBusinesDate, centerOrderPlanVo.getBusinesDateList().get(1));
-		}
-/*		if (!AuthUtil.isAdmin()) {
-			lambdaQueryWrapper.eq(CenterOrderPlan::getCreateUser, bladeUser.getUserId());
-			lambdaQueryWrapper.and(queryWrapper -> queryWrapper.eq(CenterOrderPlan::getCreateDept, bladeUser.getDeptId())
-				.or().eq(CenterOrderPlan::getWarehouseKeeper, bladeUser.getUserId()));
-		}*/
-		query.setDescs("create_time");
-		return baseMapper.selectPage(Condition.getPage(query), lambdaQueryWrapper);
+		centerOrderPlanVo.setTenantId(bladeUser.getTenantId());
+		PageHelper.startPage(query.getCurrent(), query.getSize());
+		List<CenterOrderPlan> centerOrderPlanList = baseMapper.getCenterPlanPageList(centerOrderPlanVo);
+		return PageHelperUtil.getPageInfo(centerOrderPlanList);
+
 	}
 
 	@Override

blade-service/tire-center-warehouse/src/main/java/com/ecp/tire/center/warehouse/plan/mapper/CenterOrderPlanMapper.java

@@ -21,4 +21,11 @@ public interface CenterOrderPlanMapper extends BaseMapper<CenterOrderPlan> {
 	 * @return 入库单数据
 	 */
 	List<CenterExportPlanInVo> exportPlanInData(CenterOrderPlanVo centerOrderPlanVo);
+
+	/**
+	 * 获取入库单分页数据
+	 * @param centerOrderPlanVo 入库单参数
+	 * @return 入库单数据
+	 */
+    List<CenterOrderPlan> getCenterPlanPageList(CenterOrderPlanVo centerOrderPlanVo);
 }

blade-service/tire-center-warehouse/src/main/java/com/ecp/tire/center/warehouse/plan/mapper/CenterOrderPlanMapper.xml

@@ -34,7 +34,6 @@
         <result column="express_no" property="expressNo"/>
         <result column="hander_name" property="handerName"/>
         <result column="number_rows" property="numberRows"/>
-        <result column="goods_total_ship_num" property="goodsTotalShipNum"/>
         <result column="due_date" property="dueDate"/>
         <result column="sales_company_id" property="salesCompanyId"/>
         <result column="sales_company_name" property="salesCompanyName"/>
@@ -47,6 +46,7 @@
         <result column="warehouse_keeper_name" property="warehouseKeeperName"/>
         <result column="shortcut_join" property="shortcutJoin"/>
 
+
     </resultMap>
     <select id="exportPlanInData" resultType="com.ecp.tire.center.warehouse.api.stock.vo.CenterExportPlanInVo"
             parameterType="com.ecp.tire.center.warehouse.api.plan.vo.CenterOrderPlanVo">
@@ -101,6 +101,49 @@
         </if>
         order by cop.id desc
     </select>
+    <select id="getCenterPlanPageList" resultMap="orderPlanMap" parameterType="com.ecp.tire.center.warehouse.api.plan.vo.CenterOrderPlanVo">
+        SELECT
+        cop.*
+        FROM
+        center_order_plan cop
+        INNER JOIN center_order_plan_items copi ON cop.id = copi.pid
+        WHERE cop.tenant_id = #{tenantId}
+        AND cop.is_deleted = 0
+        AND cop.bs_type = #{bsType}
+        <if test="storageId != null">
+            AND cop.storage_id = #{storageId}
+        </if>
+        <if test="createUser != null">
+            AND cop.create_user = #{createUser}
+        </if>
+        <if test="status != null and status != ''">
+            AND cop.status = #{status}
+        </if>
+        <if test="storageName != null and storageName != ''">
+            AND cop.storage_name LIKE CONCAT('%', #{storageName}, '%')
+        </if>
+        <if test="customerName != null and customerName != ''">
+            AND cop.customer_name LIKE CONCAT('%', #{customerName}, '%')
+        </if>
+        <if test="shortcutJoin != null and shortcutJoin != ''">
+            AND cop.shortcut_join LIKE CONCAT('%', #{shortcutJoin}, '%')
+        </if>
+        <if test="ordNo != null and ordNo != ''">
+            AND cop.ord_no LIKE CONCAT('%', #{ordNo}, '%')
+        </if>
+        <if test="b1name != null and b1name != ''">
+            AND copi.brand_name LIKE CONCAT('%', #{b1name}, '%')
+        </if>
+        <if test="p1name != null and p1name != ''">
+            AND copi.property_name LIKE CONCAT('%', #{p1name}, '%')
+        </if>
+        <if test="businesDateList != null and businesDateList.size() > 0">
+            AND cop.busines_date >= #{businesDateList[0]}
+            AND cop.busines_date &lt;= #{businesDateList[1]}
+        </if>
+
+        order by cop.create_time desc
+    </select>
 
 
 </mapper>

blade-service/tire-center-warehouse/src/main/java/com/ecp/tire/center/warehouse/plan/service/ICenterOrderPlanService.java

@@ -1,7 +1,6 @@
 package com.ecp.tire.center.warehouse.plan.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ecp.tire.center.warehouse.api.plan.entity.CenterOrderPlan;
 import com.ecp.tire.center.warehouse.api.plan.vo.CenterOrderPlanVo;