出入库任务列表

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/InOutWarehouseTaskController.java

@@ -1,11 +1,17 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
+
 import com.yh.saas.plugin.yiliangyiyun.entity.InOutWarehouseTask;
-import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.IInOutWarehouseTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.plugins.Page;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
 
 /**
  * <p>
@@ -42,5 +48,24 @@ public class InOutWarehouseTaskController {
         return inOutWarehouseTaskService.selectTaskNo(moveTaskNo);
     }
 
+    /**
+     * 出入库（移库）任务列表
+     * @param inOutWarehouseTask
+     * @return
+     */
+    @GetMapping("/selectInOutWarehouseTask")
+    public Page<InOutWarehouseTask> selectInOutWarehouseTask(InOutWarehouseTask inOutWarehouseTask) {
+        return inOutWarehouseTaskService.selectInOutWarehouseTask(inOutWarehouseTask);
+    }
+
+    /**
+     * 查看出入库（移库）任务
+     * @param id
+     * @return
+     */
+    @GetMapping("/getInOutWarehouseTask")
+    public InOutWarehouseTask getInOutWarehouseTask(String id){
+        return inOutWarehouseTaskService.getInOutWarehouseTask(id);
+    }
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/InOutWarehouseTask.java

@@ -1,12 +1,11 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
 import java.util.Date;
-import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import com.yh.saas.common.support.entity.BaseModel;
@@ -181,6 +180,19 @@ public class InOutWarehouseTask extends BaseModel<InOutWarehouseTask> {
      * 审核状态
      */
     private String approveStatus;
+    /**
+     * 模糊查询
+     */
+    @TableField(exist = false)
+    private String searchKeyWord;
+
+    /**
+     *查询类型
+     */
+    @TableField(exist = false)
+    private String searchType;
+
+
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/InOutWarehouseTaskMapper.java

@@ -3,6 +3,9 @@ package com.yh.saas.plugin.yiliangyiyun.mapper;
 import com.yh.saas.plugin.yiliangyiyun.entity.InOutWarehouseTask;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 出入库任务 Mapper 接口
@@ -13,4 +16,19 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  */
 public interface InOutWarehouseTaskMapper extends BaseMapper<InOutWarehouseTask> {
 
+    /**
+     * 根据条件查询出入库任务总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询出入库任务列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<InOutWarehouseTask> getListByCondition(Map<String, Object> pageView);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IInOutWarehouseTaskService.java

@@ -1,8 +1,10 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.InOutWarehouseTask;
 import com.baomidou.mybatisplus.service.IService;
-import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
+
+
 
 /**
  * <p>
@@ -29,4 +31,17 @@ public interface IInOutWarehouseTaskService extends IService<InOutWarehouseTask>
      */
     boolean selectTaskNo(String moveTaskNo);
 
+    /**
+     * 出入库（移库）任务列表
+     * @param inOutWarehouseTask
+     * @return
+     */
+    Page<InOutWarehouseTask> selectInOutWarehouseTask(InOutWarehouseTask inOutWarehouseTask);
+
+    /**
+     * 查看出入库（移库）任务
+     * @param id
+     * @return
+     */
+    InOutWarehouseTask getInOutWarehouseTask(String id);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/InOutWarehouseTaskServiceImpl.java

@@ -1,18 +1,23 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.google.common.collect.Lists;
 import com.yh.saas.plugin.yiliangyiyun.entity.InOutWarehouseTask;
 import com.yh.saas.plugin.yiliangyiyun.mapper.InOutWarehouseTaskMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IInOutWarehouseTaskService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseInOutDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 出入库任务 服务实现类
@@ -23,18 +28,18 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTaskMapper, InOutWarehouseTask> implements IInOutWarehouseTaskService {
+
     /**
      * 出入库任务新增 编辑
-     *
      * @param inOutWarehouseTask
      * @return
      */
     @Override
+
     public String insertOrUpdateInOutTask(InOutWarehouseTask inOutWarehouseTask) {
         // 根据传参id判断是否是新增
         //  空是新增
         if (StringUtils.isEmpty(inOutWarehouseTask.getId())) {
-
             // 主键id
             inOutWarehouseTask.setId(IdGenerator.generateUUID());
             inOutWarehouseTask.setTaskStatusKey(StatusEnum.TASK_REVIEWED.getFlag());
@@ -69,4 +74,40 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
         }
     }
 
+    /**
+     * 出入库(移库)任务列表
+     * @param inOutWarehouseTask
+     * @return
+     */
+    public Page<InOutWarehouseTask> selectInOutWarehouseTask(InOutWarehouseTask inOutWarehouseTask){
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (inOutWarehouseTask.getCurrentPage() - 1)
+                * inOutWarehouseTask.getPageSize());
+        //公司id
+        pageView.put("compId",inOutWarehouseTask.getCompId());
+        pageView.put("searchKeyWord",inOutWarehouseTask.getSearchKeyWord());
+        pageView.put("searchType", inOutWarehouseTask.getSearchType());
+        pageView.put("pageSize",inOutWarehouseTask.getPageSize());
+        pageView.put("currentPage",inOutWarehouseTask.getCurrentPage());
+        // 查询出入库任务总数
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
+        List<InOutWarehouseTask> dataList = baseMapper.getListByCondition(pageView);
+        Page<InOutWarehouseTask> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(inOutWarehouseTask.getCurrentPage());
+        page.setSize(inOutWarehouseTask.getPageSize());
+        return page;
+    }
+    /**
+     * 查看出入库（移库）任务
+     * @param id
+     * @return
+     */
+    @Override
+    public InOutWarehouseTask getInOutWarehouseTask(String id){
+        InOutWarehouseTask inOutWarehouseTask = this.selectById(id);
+        return inOutWarehouseTask;
+    }
+
 }

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/InOutWarehouseTaskMapper.xml

@@ -1,5 +1,86 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.InOutWarehouseTaskMapper">
-
+    <!-- 获得出入库任务总数 -->
+    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+        COUNT(i.id)
+        FROM in_out_warehouse_task i
+        WHERE
+        i.comp_id = #{compId}
+        and i.delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND i.task_status_key = '1'
+            </if>
+            <if test="searchType == 2">
+                AND i.task_status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND i.task_status_key = '5'
+            </if>
+            <if test="searchType == 4">
+                AND i.task_status_key = '7'
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(i.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(i.in_out_task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(i.move_task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(i.send_warehouse) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(i.receive_warehouse) like lower(CONCAT('%',#{searchKeyWord},'%'))
+        </if>
+    </select>
+    <!-- 获得出入库任务列表 -->
+    <select id="getListByCondition" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.InOutWarehouseTask">
+        SELECT
+        i.id,
+        i.contract_no as contractNo,
+        i.in_out_task_no as inOutTaskNo,
+        i.move_task_no as moveTaskNo,
+        i.warehouse_name as warehouseName,
+        i.in_out_type as inOutType,
+        i.goods_name as goodsName,
+        i.weight as weight,
+        i.predict_date as predictDate,
+        i.publisher as publisher,
+        i.task_status as taskStatus,
+        i.establish_date as establishDate,
+        i.send_warehouse as sendWarehouse,
+        i.receive_warehouse as receiveWarehouse,
+        i.delivery_volume as deliveryVolume,
+        i.storage_volume as storageVolume,
+        i.stock_return as stockReturn,
+        i.transport_loss as transportLoss,
+        FROM in_out_warehouse_task i
+        WHERE
+        i.comp_id = #{compId}
+        and i.delete_flag = '0'
+        <if test="searchType != null and searchType != ''">
+            <if test="searchType == 1">
+                AND i.task_status_key = '1'
+            </if>
+            <if test="searchType == 2">
+                AND i.task_status_key = '3'
+            </if>
+            <if test="searchType == 3">
+                AND i.task_status_key = '5'
+            </if>
+            <if test="searchType == 4">
+                AND i.task_status_key = '7'
+            </if>
+        </if>
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(i.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(i.in_out_task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(i.move_task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(i.send_warehouse) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(i.receive_warehouse) like lower(CONCAT('%',#{searchKeyWord},'%'))
+        </if>
+        ORDER BY i.task_status DESC , i.establish_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
 </mapper>