任务编号对应仓库和经办人

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

@@ -137,12 +137,12 @@ public class InOutWarehouseTaskController {
     }
     /**
      * 出入库任务列表
-     * @param flag
+     * @param inOutWarehouseTask
      * @return
      */
     @GetMapping("/selectInOutWarehouseNo")
-    public List<InOutWarehouseTask> selectInOutWarehouseNo(String flag) {
-        return inOutWarehouseTaskService.selectInOutWarehouseNo(flag);
+    public List<InOutWarehouseTask> selectInOutWarehouseNo(InOutWarehouseTask inOutWarehouseTask) {
+        return inOutWarehouseTaskService.selectInOutWarehouseNo(inOutWarehouseTask);
     }
 
 }

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

@@ -260,6 +260,8 @@ public class InOutWarehouseTask extends BaseModel<InOutWarehouseTask> {
 
     @TableField(exist = false)
     private String taskId;
+    @TableField(exist = false)
+    private String flag;
 
     @Override
     protected Serializable pkVal() {

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

@@ -93,8 +93,8 @@ public interface IInOutWarehouseTaskService extends IService<InOutWarehouseTask>
     Page<InOutWarehouseTask> selectWarehouseTask(InOutWarehouseTask inOutWarehouseTask);
     /**
      * 查出入库任务编号
-     * @param flag
+     * @param inOutWarehouseTask
      * @return
      */
-    List<InOutWarehouseTask> selectInOutWarehouseNo(String flag);
+    List<InOutWarehouseTask> selectInOutWarehouseNo(InOutWarehouseTask inOutWarehouseTask);
 }

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

@@ -474,17 +474,19 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
 
     /**
      * 查出入库任务编号
-     * @param flag
+     * @param inOutWarehouseTask
      * @return
      */
     @Override
-    public List<InOutWarehouseTask> selectInOutWarehouseNo(String flag) {
+    public List<InOutWarehouseTask> selectInOutWarehouseNo(InOutWarehouseTask inOutWarehouseTask) {
         List<InOutWarehouseTask> inOutWarehouseTaskList=new ArrayList<>();
         //出库执行中的编号
-        if ("1".equals(flag)) {
+        if ("1".equals(inOutWarehouseTask.getFlag())) {
             List<InOutWarehouseTask> inOutWarehouseTaskList1 = this.selectList(new EntityWrapper<InOutWarehouseTask>()
                     .eq("comp_id", AuthSecurityUtils.getCurrentUserInfo().getCompId())
                     .eq("task_status_key", "5")
+                    .eq("warehouse_name", inOutWarehouseTask.getWarehouseName())
+                    .eq("agent_key", inOutWarehouseTask.getAgentKey())
                     .ne("in_out_type","采购入库")
                     .ne("in_out_type","退库")
                     .ne("in_out_type","移库入库")
@@ -496,6 +498,8 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
             List<InOutWarehouseTask> inOutWarehouseTaskList1 = this.selectList(new EntityWrapper<InOutWarehouseTask>()
                     .eq("comp_id", AuthSecurityUtils.getCurrentUserInfo().getCompId())
                     .eq("task_status_key", "5")
+                    .eq("warehouse_name", inOutWarehouseTask.getWarehouseName())
+                    .eq("agent_key", inOutWarehouseTask.getAgentKey())
                     .ne("in_out_type","销售出库")
                     .ne("in_out_type","移库出库")
                     .orderBy("update_date", false));