分页查询

pom.xml

@@ -230,6 +230,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.4.6</version>
+        </dependency>
 
 
 

src/main/java/com/imcs/admin/business/controller/OrderController.java

@@ -1,6 +1,7 @@
 package com.imcs.admin.business.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.imcs.admin.business.dao.UserDao;
@@ -29,8 +30,8 @@ public class OrderController {
     private OrderService orderService;
 
 
-    @PostMapping("/inList")
-    public Page getInList(@RequestBody WInventoryTransactionOrders order){
+    @GetMapping("/inList")
+    public Page getInList(WInventoryTransactionOrders order){
         return orderService.getInList(order);
     }
 

src/main/java/com/imcs/admin/business/controller/WInventoryTransactionTaskController.java

@@ -1,6 +1,8 @@
 package com.imcs.admin.business.controller;
 
+import com.github.pagehelper.PageInfo;
 import com.imcs.admin.business.service.WInventoryTransactionTaskService;
+import com.imcs.admin.common.Result;
 import com.imcs.admin.entity.WInventoryTransactionTask;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -28,14 +30,16 @@ public class WInventoryTransactionTaskController {
      * 分页查询
      *
      * @param wInventoryTransactionTask 筛选条件
-     * @param pageRequest      分页对象
      * @return 查询结果
      */
     @GetMapping
-    public ResponseEntity<Page<WInventoryTransactionTask>> queryByPage(WInventoryTransactionTask wInventoryTransactionTask, PageRequest pageRequest) {
-        return ResponseEntity.ok(this.wInventoryTransactionTaskService.queryByPage(wInventoryTransactionTask, pageRequest));
+    public PageInfo queryByPage(WInventoryTransactionTask wInventoryTransactionTask){
+
+         return wInventoryTransactionTaskService.queryByPage(wInventoryTransactionTask);
     }
 
+
+
     /**
      * 通过主键查询单条数据
      *
@@ -48,7 +52,7 @@ public class WInventoryTransactionTaskController {
     }
 
     /**
-     * 新增数据
+     * 出库单 任务执行
      *
      * @param wInventoryTransactionTask 实体
      * @return 新增结果

src/main/java/com/imcs/admin/business/dao/WInventoryTransactionTaskDao.java

@@ -26,10 +26,9 @@ public interface WInventoryTransactionTaskDao extends BaseMapper<WInventoryTrans
      * 查询指定行数据
      *
      * @param wInventoryTransactionTask 查询条件
-     * @param pageable         分页对象
      * @return 对象列表
      */
-    List<WInventoryTransactionTask> queryAllByLimit(WInventoryTransactionTask wInventoryTransactionTask, @Param("pageable") Pageable pageable);
+    List<WInventoryTransactionTask> queryAllByLimit(WInventoryTransactionTask wInventoryTransactionTask);
 
     /**
      * 统计总行数

src/main/java/com/imcs/admin/business/service/OrderService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.imcs.admin.entity.WInventoryTransactionOrders;
 
 public interface OrderService {
-    Page getInList( WInventoryTransactionOrders order);
+    Page getInList(WInventoryTransactionOrders order);
 
     void add(WInventoryTransactionOrders orders);
     void addOut(WInventoryTransactionOrders orders);

src/main/java/com/imcs/admin/business/service/WInventoryTransactionTaskService.java

@@ -1,9 +1,12 @@
 package com.imcs.admin.business.service;
 
+import com.github.pagehelper.PageInfo;
 import com.imcs.admin.entity.WInventoryTransactionTask;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 
+import java.util.List;
+
 /**
  * 出入库任务(WInventoryTransactionTask)表服务接口
  *
@@ -24,10 +27,9 @@ public interface WInventoryTransactionTaskService {
      * 分页查询
      *
      * @param wInventoryTransactionTask 筛选条件
-     * @param pageRequest      分页对象
      * @return 查询结果
      */
-    Page<WInventoryTransactionTask> queryByPage(WInventoryTransactionTask wInventoryTransactionTask, PageRequest pageRequest);
+    PageInfo queryByPage(WInventoryTransactionTask wInventoryTransactionTask);
 
     /**
      * 新增数据

src/main/java/com/imcs/admin/business/service/impl/OrderServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.gson.Gson;
@@ -41,8 +42,9 @@ public class OrderServiceImpl extends BaseServiceImpl implements OrderService {
 
     @Override
     public Page getInList(WInventoryTransactionOrders order) {
-        LambdaQueryWrapper<WInventoryTransactionOrders> wrapper = Wrappers.lambdaQuery(WInventoryTransactionOrders.class).eq(WInventoryTransactionOrders::getInOutType,order.getInOutType()).ne(WInventoryTransactionOrders::getStatus,-1);
-        Page<WInventoryTransactionOrders> userPage = ordersDao.selectPage(new Page<>(), wrapper);
+        Page page=new Page<>(order.getPage(),order.getSize());
+        LambdaQueryWrapper<WInventoryTransactionOrders> wrapper = Wrappers.lambdaQuery(WInventoryTransactionOrders.class).eq(WInventoryTransactionOrders::getInOutType,order.getInOutType()).ne(WInventoryTransactionOrders::getStatus,-1).orderByAsc(WInventoryTransactionOrders::getId);;
+        Page<WInventoryTransactionOrders> userPage = ordersDao.selectPage(page, wrapper);
         return userPage;
     }
 

src/main/java/com/imcs/admin/business/service/impl/WInventoryTransactionTaskServiceImpl.java

@@ -1,5 +1,7 @@
 package com.imcs.admin.business.service.impl;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.imcs.admin.business.constants.Status;
 import com.imcs.admin.business.service.WInventoryTransactionTaskService;
 import com.imcs.admin.common.Result;
@@ -9,6 +11,7 @@ import com.imcs.admin.entity.WInventoryTransactionTask;
 import com.imcs.admin.entity.WInventoryTransactionTaskDetail;
 import com.imcs.admin.entity.assemble.PolicyResult;
 import com.imcs.admin.entity.query.PolicyQuery;
+import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -43,15 +46,18 @@ public class WInventoryTransactionTaskServiceImpl extends BaseServiceImpl implem
      * 分页查询
      *
      * @param wInventoryTransactionTask 筛选条件
-     * @param pageRequest      分页对象
      * @return 查询结果
      */
     @Override
-    public Page<WInventoryTransactionTask> queryByPage(WInventoryTransactionTask wInventoryTransactionTask, PageRequest pageRequest) {
-        long total = this.taskDao.count(wInventoryTransactionTask);
-        return new PageImpl<>(this.taskDao.queryAllByLimit(wInventoryTransactionTask, pageRequest), pageRequest, total);
+    public PageInfo queryByPage(WInventoryTransactionTask wInventoryTransactionTask) {
+        PageHelper.startPage(wInventoryTransactionTask.getPage(),wInventoryTransactionTask.getSize());
+        List<WInventoryTransactionTask> wInventoryTransactionTasks = taskDao.queryAllByLimit(wInventoryTransactionTask);
+        PageInfo pageInfo=new PageInfo(wInventoryTransactionTasks);
+        return pageInfo;
     }
 
+
+
     /**
      * 新增数据
      *

src/main/java/com/imcs/admin/business/service/impl/WStorageLocationManagementServiceImpl.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.imcs.admin.business.constants.Status;
 import com.imcs.admin.business.service.WStorageLocationManagementService;
+import com.imcs.admin.common.Result;
 import com.imcs.admin.entity.*;
+import com.imcs.admin.entity.assemble.PolicyResult;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -29,11 +31,18 @@ public class WStorageLocationManagementServiceImpl extends BaseServiceImpl imple
     @Override
     public String getPalletCode(String endPosition) {
         //空托盘出库
-        String storageLocationCode="";
+        String storageLocationCode=null;
         if(StringUtils.isBlank(endPosition)){
             //TODO
             //获取空托盘 库位
             //storageLocationCode
+            /*ImportOrExportPolicyDto importOrExportPolicyDto=new ImportOrExportPolicyDto();
+            Result exportPolicy = importOrExportPolicyService.findExportPolicy(importOrExportPolicyDto);
+            if(exportPolicy.getData() == null){
+                throw new RuntimeException("无可用库位，请联系管理员！");
+            }
+            ImportOrExportPolicyDto importOrExportPolicyDto1 = (ImportOrExportPolicyDto)exportPolicy.getData();
+            storageLocationCode=importOrExportPolicyDto1.getPolicyCode();*/
         }
 
 

src/main/java/com/imcs/admin/entity/PageSize.java

@@ -0,0 +1,12 @@
+package com.imcs.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+@Data
+public class PageSize {
+    @TableField(exist = false)
+    private int page;
+    @TableField(exist = false)
+    private int size;
+}

src/main/java/com/imcs/admin/entity/WInventoryTransactionOrders.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -19,7 +20,7 @@ import java.util.List;
  */
 @Data
 @TableName(value = "w_inventory_transaction_orders")
-public class WInventoryTransactionOrders implements Serializable {
+public class WInventoryTransactionOrders extends PageSize implements Serializable {
     private static final long serialVersionUID = -44817825772005301L;
 /**
      * 主键
@@ -112,5 +113,7 @@ public class WInventoryTransactionOrders implements Serializable {
     private String operation;//操作
 
 
+
+
 }
 

src/main/java/com/imcs/admin/entity/WInventoryTransactionTask.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Builder;
 import lombok.Data;
 /**
@@ -18,7 +19,7 @@ import lombok.Data;
  */
 @Data
 @TableName(value = "w_inventory_transaction_task")
-public class WInventoryTransactionTask implements Serializable {
+public class WInventoryTransactionTask extends PageSize implements Serializable {
     private static final long serialVersionUID = 353494033918654712L;
 /**
      * 主键
@@ -89,5 +90,9 @@ public class WInventoryTransactionTask implements Serializable {
     @TableField(exist = false)
     private List<WInventoryTransactionTaskDetail> detailList;
 
+
+    @TableField(exist = false)
+    private String orderCode;
+
 }
 

src/main/resources/mapper/WInventoryTransactionTaskDao.xml

@@ -19,6 +19,7 @@
         <result property="createdBy" column="created_by" jdbcType="INTEGER"/>
         <result property="updatedAt" column="updated_at" jdbcType="TIMESTAMP"/>
         <result property="updatedBy" column="updated_by" jdbcType="INTEGER"/>
+        <result property="orderCode" column="order_code" jdbcType="INTEGER"/>
     </resultMap>
 
     <!--查询单个-->
@@ -32,59 +33,62 @@
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="WInventoryTransactionTaskMap">
         select
-        *
-        from w_inventory_transaction_task
+        task.*,orders.order_code
+        from w_inventory_transaction_task task
+        left join w_inventory_transaction_orders orders on task.w_inventory_transaction_orders_id=orders.id
         <where>
             <if test="id != null">
-                and id = #{id}
+                and task.id = #{id}
             </if>
             <if test="wInventoryTransactionOrdersId != null">
-                and w_inventory_transaction_orders_id = #{wInventoryTransactionOrdersId}
+                and task.w_inventory_transaction_orders_id = #{wInventoryTransactionOrdersId}
             </if>
             <if test="taskCode != null and taskCode != ''">
-                and task_code = #{taskCode}
+                and task.task_code = #{taskCode}
             </if>
             <if test="startPosition != null and startPosition != ''">
-                and start_position = #{startPosition}
+                and task.start_position = #{startPosition}
             </if>
             <if test="endPosition != null and endPosition != ''">
-                and end_position = #{endPosition}
+                and task.end_position = #{endPosition}
             </if>
             <if test="vectorCode != null and vectorCode != ''">
-                and vector_code = #{vectorCode}
+                and task.vector_code = #{vectorCode}
             </if>
             <if test="errorInfo != null and errorInfo != ''">
-                and error_info = #{errorInfo}
+                and task.error_info = #{errorInfo}
             </if>
             <if test="status != null">
-                and status = #{status}
+                and task.status = #{status}
             </if>
             <if test="taskType != null">
-                and task_type = #{taskType}
+                and task.task_type = #{taskType}
             </if>
             <if test="startTime != null">
-                and start_time = #{startTime}
+                and task.start_time = #{startTime}
             </if>
             <if test="endTime != null">
-                and end_time = #{endTime}
+                and task.end_time = #{endTime}
             </if>
             <if test="remarks != null and remarks != ''">
-                and remarks = #{remarks}
+                and task.remarks = #{remarks}
             </if>
             <if test="createdAt != null">
-                and created_at = #{createdAt}
+                and task.created_at = #{createdAt}
             </if>
             <if test="createdBy != null">
-                and created_by = #{createdBy}
+                and task.created_by = #{createdBy}
             </if>
             <if test="updatedAt != null">
-                and updated_at = #{updatedAt}
+                and task.updated_at = #{updatedAt}
             </if>
             <if test="updatedBy != null">
-                and updated_by = #{updatedBy}
+                and task.updated_by = #{updatedBy}
+            </if>
+            <if test="orderCode != null">
+                and orders.order_code = #{orderCode}
             </if>
         </where>
-        limit #{pageable.offset}, #{pageable.pageSize}
     </select>
 
     <!--统计总行数-->

src/main/resources/static/wms/in/index.html

@@ -124,13 +124,13 @@
             },
             queryClick() {
                 this.loading = true;
-                const param = {
-                    'current': this.currentPage,
-                    'size': this.currentPageSize
-                };
 
-                axios.post('/order/inList', {
-                    'inOutType': 2,
+                axios.get('/order/inList', {
+                    params:{
+                        page: this.currentPage,
+                        size: this.currentPageSize,
+                        inOutType:2,
+                    }
                 })
                     .then(response => {
                         console.log(response)

src/main/resources/static/wms/out/index.html

@@ -181,9 +181,9 @@
                             <div class="table-title">库存明细</div>
                             <el-table ref="singleTable" :data="detailListTask" v-loading="loading" :border=true label="库存明细"
                                       tooltip-effect="dark"
-                                      highlight-current-row max-height="500" style="width: 100%;" @row-click="rowClick"
+                                      highlight-current-row max-height="500" style="width: 100%;"
                                       :default-sort="{prop: 'createDate', order: 'descending'}"
-                                       >
+                                       ><!--@row-click="rowClick"-->
                                 <el-table-column prop="materialCode" label="物料编码" :show-overflow-tooltip="true"></el-table-column>
                                 <el-table-column prop="storageLocationCode" label="库位编码" :show-overflow-tooltip="true"></el-table-column>
                                 <el-table-column label="托盘" :show-overflow-tooltip="true">
@@ -374,13 +374,13 @@
             queryClick() {
                 this.loading = true;
                 this.dis
-                const param = {
-                    'current': this.currentPage,
-                    'size': this.currentPageSize
-                };
 
-                axios.post('/order/inList', {
-                    'inOutType': 1
+                axios.get('/order/inList', {
+                    params:{
+                        page: this.currentPage,
+                        size: this.currentPageSize,
+                        inOutType:1,
+                    }
                 })
                     .then(response => {
                         console.log(response)
@@ -653,6 +653,19 @@
                         }
 
                         if(verify === 0){
+                            const needFlag=this.detailListTask.some(vo=>{
+                                if(vo.materialCode === this.inputCode){
+                                    return true;
+                                }
+                                return false;
+                            })
+                            if(!needFlag){
+                                this.$message.error('需求明细无法识别'+this.inputCode);
+                                this.inputCode='';
+                                return;
+                            }
+
+
                             const flag =this.detailListPallet.some(vo=>{
                                 if(vo.materialCode === this.inputCode){
                                     const flag1=this.detailListOut.some(item =>{