Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -479,11 +479,28 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
      */
     @Override
     public List<InOutWarehouseTask> selectInOutWarehouseNo(String flag) {
-        //执行中的编号
-        List<InOutWarehouseTask> inOutWarehouseTaskList=this.selectList(new EntityWrapper<InOutWarehouseTask>()
-                .eq("comp_id",AuthSecurityUtils.getCurrentUserInfo().getCompId())
-                .eq("task_status_key","5")
-        .orderBy("update_date",false));
+        List<InOutWarehouseTask> inOutWarehouseTaskList=new ArrayList<>();
+        //出库执行中的编号
+        if ("1".equals(flag)) {
+            List<InOutWarehouseTask> inOutWarehouseTaskList1 = this.selectList(new EntityWrapper<InOutWarehouseTask>()
+                    .eq("comp_id", AuthSecurityUtils.getCurrentUserInfo().getCompId())
+                    .eq("task_status_key", "5")
+                    .ne("in_out_type","采购入库")
+                    .ne("in_out_type","退库")
+                    .ne("in_out_type","移库入库")
+                    .orderBy("update_date", false));
+            inOutWarehouseTaskList=inOutWarehouseTaskList1;
+        }
+        //入库
+        else {
+            List<InOutWarehouseTask> inOutWarehouseTaskList1 = this.selectList(new EntityWrapper<InOutWarehouseTask>()
+                    .eq("comp_id", AuthSecurityUtils.getCurrentUserInfo().getCompId())
+                    .eq("task_status_key", "5")
+                    .ne("in_out_type","销售出库")
+                    .ne("in_out_type","移库出库")
+                    .orderBy("update_date", false));
+            inOutWarehouseTaskList=inOutWarehouseTaskList1;
+        }
         return inOutWarehouseTaskList;
     }
 }