移库

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

@@ -91,12 +91,12 @@ public class InOutWarehouseTaskController {
 
     /**
      * 移库任务列表
-     * @param sendWarehouse,receiveWarehouse,moveTaskNo
+     * @param inOutWarehouseTask
      * @return
      */
     @GetMapping("/selectInOutWarehouseTaskRelocation")
-    public List<InOutWarehouseTask> selectInOutWarehouseTaskRelocation(String sendWarehouse,String receiveWarehouse,String moveTaskNo) {
-        return inOutWarehouseTaskService.selectInOutWarehouseTaskRelocation(sendWarehouse,receiveWarehouse,moveTaskNo);
+    public Page<InOutWarehouseTask> selectInOutWarehouseTaskRelocation(InOutWarehouseTask inOutWarehouseTask) {
+        return inOutWarehouseTaskService.selectInOutWarehouseTaskRelocation(inOutWarehouseTask);
     }
 
     /**

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

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
 
 import java.util.Date;
 import java.io.Serializable;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -226,6 +227,23 @@ public class InOutWarehouseTask extends BaseModel<InOutWarehouseTask> {
     @TableField(exist = false)
     private String searchType;
 
+    /**
+     *移库入库仓库名
+     */
+    @TableField(exist = false)
+    private String warehouseNameIn;
+
+    /**
+     * 重量（吨）
+     */
+    @TableField(exist = false)
+    private Float weightIn;
+
+    /**
+     * 重量（吨）
+     */
+    @TableField(exist = false)
+    private List<InOutWarehouseTask> inOutWarehouseTaskList;
 
 
     @Override

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

@@ -31,4 +31,21 @@ public interface InOutWarehouseTaskMapper extends BaseMapper<InOutWarehouseTask>
      * @return
      */
     List<InOutWarehouseTask> getListByCondition(Map<String, Object> pageView);
+
+
+    /**
+     * 根据条件查询出入库任务总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getMoveCountByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询出入库任务列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<InOutWarehouseTask> getMoveListByCondition(Map<String, Object> pageView);
 }

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

@@ -61,10 +61,10 @@ public interface IInOutWarehouseTaskService extends IService<InOutWarehouseTask>
 
     /**
      * 移库任务列表
-     * @param sendWarehouse,receiveWarehouse,moveTaskNo
+     * @param inOutWarehouseTask
      * @return
      */
-    List<InOutWarehouseTask> selectInOutWarehouseTaskRelocation(String sendWarehouse,String receiveWarehouse,String moveTaskNo);
+    Page<InOutWarehouseTask> selectInOutWarehouseTaskRelocation(InOutWarehouseTask inOutWarehouseTask);
 
     /**
      * 查看移库任务详情

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

@@ -10,10 +10,7 @@ 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.entity.WarehouseBaseInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutDetail;
-import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseNumView;
 import com.yh.saas.plugin.yiliangyiyun.mapper.InOutWarehouseTaskMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IInOutWarehouseTaskService;
@@ -187,30 +184,27 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
     /**
      * 移库任务列表
      *
-     * @param sendWarehouse,receiveWarehouse,moveTaskNo
+     * @param inOutWarehouseTask
      * @return
      */
     @Override
-    public List<InOutWarehouseTask> selectInOutWarehouseTaskRelocation(String sendWarehouse,String receiveWarehouse,String moveTaskNo) {
-        //查询页面信息
-        Wrapper<InOutWarehouseTask> inOutWarehouseTaskWrapper = new EntityWrapper<>();
-        inOutWarehouseTaskWrapper.eq(InOutWarehouseTask.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
-                .eq(InOutWarehouseTask.QueryFiles.TASK_TYPE_KEY, NumberConstant.CONSTANT3)
-                .eq(InOutWarehouseTask.QueryFiles.APPROVE_STATUS,NumberConstant.CONSTANT0)
-                .orderBy("establish_date", false);
-        if (!StringUtils.isEmpty(sendWarehouse)) {
-            inOutWarehouseTaskWrapper.like(InOutWarehouseTask.QueryFiles.SEND_WAREHOUSE, "%" + sendWarehouse + "%");
-        }
-        if (!StringUtils.isEmpty(receiveWarehouse)) {
-            inOutWarehouseTaskWrapper.like(InOutWarehouseTask.QueryFiles.RECEIVE_WAREHOUSE,"%" + receiveWarehouse + "%");
-        }
-        if (!StringUtils.isEmpty(moveTaskNo)) {
-            inOutWarehouseTaskWrapper.like(InOutWarehouseTask.QueryFiles.MOVE_TASK_NO, "%" + moveTaskNo + "%");
-        }
-        //查询所有移库任务
-        List<InOutWarehouseTask> inOutWarehouseTaskAllList = this.selectList(inOutWarehouseTaskWrapper);
-        if(!CollectionUtils.isEmpty(inOutWarehouseTaskAllList)){
-            for(InOutWarehouseTask inOutWarehouseTask : inOutWarehouseTaskAllList){
+    public Page<InOutWarehouseTask> selectInOutWarehouseTaskRelocation(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("pageSize", inOutWarehouseTask.getPageSize());
+        pageView.put("currentPage", inOutWarehouseTask.getCurrentPage());
+
+        List<InOutWarehouseTask> dataList = this.baseMapper.getMoveListByCondition(pageView);
+
+        Integer dataCount = this.baseMapper.getMoveCountByCondition(pageView);
+
+
+        if(!CollectionUtils.isEmpty(dataList)){
+            for(InOutWarehouseTask inOutWarehouseTaska : dataList){
 
                 //定义累计退库量
                 String stockReturnCount = "";
@@ -218,32 +212,26 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                 //查询退库量
                 List<InOutWarehouseTask> inOutWarehouseTaskList = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
                         .eq("task_type_key","4")
-                        .eq("contract_no",inOutWarehouseTask.getContractNo().equals(inOutWarehouseTask.getMoveTaskNo()))
+                        .eq("contract_no",inOutWarehouseTaska.getMoveTaskNo())
                         .eq("in_out_flag","2").orderBy("send_warehouse_name").groupBy("send_warehouse_name"));
                 if(!CollectionUtils.isEmpty(inOutWarehouseTaskList)){
                     Float stockReturn = 0f;
                     for(InOutWarehouseTask inoutwarehouse :inOutWarehouseTaskList){
                         stockReturn = stockReturn + inoutwarehouse.getStockReturn();
                     }
-                    inOutWarehouseTask.setSendWarehouse(inOutWarehouseTaskList.get(0).getSendWarehouse());
                     inOutWarehouseTask.setStockReturnCount(String.valueOf(stockReturn));
-                    if(StringUtils.isEmpty(stockReturnCount)){
-                        stockReturnCount = "0";
-                    }
-                    stockReturnCount = String.valueOf(Float.valueOf(stockReturnCount)+stockReturn);
-                }
-
-                for (InOutWarehouseTask inOutWarehouseTask1 : inOutWarehouseTaskAllList) {
-                    if (inOutWarehouseTask1.getSendWarehouse().equals(inOutWarehouseTask.getSendWarehouse())) {
-                        inOutWarehouseTask1.setStockReturnCount(stockReturnCount);
-                    }
-
+                    inOutWarehouseTask.setInOutWarehouseTaskList(inOutWarehouseTaskList);
                 }
 
             }
         }
 
-        return inOutWarehouseTaskAllList;
+        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;
     }
 
     /**

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

@@ -73,4 +73,67 @@
             LIMIT ${startRecord}, ${pageSize}
         </if>
     </select>
+
+
+
+    <!-- 获得移库任务列表 -->
+    <select id="getMoveListByCondition" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.InOutWarehouseTask">
+        SELECT
+        a.id as id,
+        a.contract_no as contractNo,
+        a.in_out_task_no as inOutTaskNo,
+        a.warehouse_name as warehouseName,
+        b.warehouse_name as warehouseNameIn,
+        a.in_out_type as inOutType,
+        a.goods_name as goodsName,
+        a.weight as weight,
+        b.weight as weightIn,
+        a.predict_date as predictDate,
+        a.publisher as publisher,
+        a.task_status as taskStatus,
+        a.establish_date as establishDate,
+        a.relevance_id as relevanceId,
+        a.task_type_key as taskTypeKey,
+        a.in_out_flag as inOutFlag
+        FROM in_out_warehouse_task a
+        left join
+        in_out_warehouse_task b
+        on
+        a.relevance_id = b.relevance_id
+        WHERE
+        a.comp_id = #{compId}
+        and
+        a.task_type_key = '3'
+        and a.delete_flag = '0'
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(a.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(a.in_out_task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+        </if>
+        ORDER BY a.task_status DESC , a.establish_date DESC
+        <if test="currentPage != null and currentPage != ''">
+            LIMIT ${startRecord}, ${pageSize}
+        </if>
+    </select>
+
+
+    <!-- 获得移库任务总数 -->
+    <select id="getMoveCountByCondition" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+        COUNT(id)
+        FROM in_out_warehouse_task a
+        left join
+        in_out_warehouse_task b
+        on
+        a.relevance_id = b.relevance_id
+        WHERE
+        a.comp_id = #{compId}
+        and
+        a.task_type_key = '3'
+        and a.delete_flag = '0'
+        <if test="searchKeyWord != null and searchKeyWord != ''">
+            AND (lower(a.contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(a.in_out_task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
+        </if>
+    </select>
 </mapper>