修改

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

@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 
 /**
  * <p>
@@ -49,7 +51,7 @@ public class InOutWarehouseTaskController {
     }
 
     /**
-     * 出入库（移库）任务列表
+     * 出入库任务列表
      * @param inOutWarehouseTask
      * @return
      */
@@ -59,13 +61,13 @@ public class InOutWarehouseTaskController {
     }
 
     /**
-     * 查看出入库（移库）任务
-     * @param id
+     * 查看出入库任务
+     * @param relevanceId
      * @return
      */
     @GetMapping("/getInOutWarehouseTask")
-    public InOutWarehouseTask getInOutWarehouseTask(String id){
-        return inOutWarehouseTaskService.getInOutWarehouseTask(id);
+    public List<InOutWarehouseTask> getInOutWarehouseTask(String relevanceId){
+        return inOutWarehouseTaskService.getInOutWarehouseTask(relevanceId);
     }
 }
 

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

@@ -64,6 +64,10 @@ public class InOutWarehouseTask extends BaseModel<InOutWarehouseTask> {
      * 仓位编号
      */
     private String binNumber;
+    /**
+     * 关联id
+     */
+    private String relevanceId;
     /**
      * 任务类型key（1出库2入库3移库4退库并出库）
      */
@@ -213,6 +217,7 @@ public class InOutWarehouseTask extends BaseModel<InOutWarehouseTask> {
 
         public static final String DELETE_FLAG = "delete_flag";
 
+        public static final String relevanceId = "relevance_id";
 
 
     }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.InOutWarehouseTask;
 import com.baomidou.mybatisplus.service.IService;
 
+import java.util.List;
 
 
 /**
@@ -32,16 +33,16 @@ public interface IInOutWarehouseTaskService extends IService<InOutWarehouseTask>
     boolean selectTaskNo(String moveTaskNo);
 
     /**
-     * 出入库（移库）任务列表
+     * 出入库任务列表
      * @param inOutWarehouseTask
      * @return
      */
     Page<InOutWarehouseTask> selectInOutWarehouseTask(InOutWarehouseTask inOutWarehouseTask);
 
     /**
-     * 查看出入库（移库）任务
-     * @param id
+     * 查看出入库任务
+     * @param relevanceId
      * @return
      */
-    InOutWarehouseTask getInOutWarehouseTask(String id);
+    List<InOutWarehouseTask> getInOutWarehouseTask(String relevanceId);
 }

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

@@ -12,6 +12,7 @@ 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -27,6 +28,8 @@ import java.util.*;
 @Service
 public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTaskMapper, InOutWarehouseTask> implements IInOutWarehouseTaskService {
 
+    @Autowired
+    private IInOutWarehouseTaskService inOutWarehouseTaskService;
     /**
      * 出入库任务新增 编辑
      * @param inOutWarehouseTask
@@ -74,7 +77,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
     }
 
     /**
-     * 出入库(移库)任务列表
+     * 出入库任务列表
      * @param inOutWarehouseTask
      * @return
      */
@@ -100,14 +103,15 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
         return page;
     }
     /**
-     * 查看出入库（移库）任务
-     * @param id
+     * 查看出入库任务
+     * @param relevanceId
      * @return
      */
     @Override
-    public InOutWarehouseTask getInOutWarehouseTask(String id){
-        InOutWarehouseTask inOutWarehouseTask = this.selectById(id);
-        return inOutWarehouseTask;
+    public List<InOutWarehouseTask> getInOutWarehouseTask(String relevanceId){
+        List<InOutWarehouseTask> inOutWarehouseTaskList = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
+            .eq(InOutWarehouseTask.QueryFiles.relevanceId,relevanceId).eq(InOutWarehouseTask.QueryFiles.DELETE_FLAG,NumberConstant.CONSTANT0));
+        return inOutWarehouseTaskList;
     }
 
 }

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

@@ -26,9 +26,6 @@
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(in_out_task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(move_task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(send_warehouse) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(receive_warehouse) like lower(CONCAT('%',#{searchKeyWord},'%'))
         </if>
     </select>
     <!-- 获得出入库任务列表 -->
@@ -38,7 +35,6 @@
         id,
         contract_no as contractNo,
         in_out_task_no as inOutTaskNo,
-        move_task_no as moveTaskNo,
         warehouse_name as warehouseName,
         in_out_type as inOutType,
         goods_name as goodsName,
@@ -47,12 +43,7 @@
         publisher as publisher,
         task_status as taskStatus,
         establish_date as establishDate,
-        send_warehouse as sendWarehouse,
-        receive_warehouse as receiveWarehouse,
-        delivery_volume as deliveryVolume,
-        storage_volume as storageVolume,
-        stock_return as stockReturn,
-        transport_loss as transportLoss
+        relevance_id as relevanceId
         FROM in_out_warehouse_task
         WHERE
         comp_id = #{compId}
@@ -74,9 +65,6 @@
         <if test="searchKeyWord != null and searchKeyWord != ''">
             AND (lower(contract_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(in_out_task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(move_task_no) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(send_warehouse) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(receive_warehouse) like lower(CONCAT('%',#{searchKeyWord},'%'))
         </if>
         ORDER BY task_status DESC , establish_date DESC
         <if test="currentPage != null and currentPage != ''">