优化系统逻辑

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java

@@ -11,7 +11,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  *
  * @author ruoyi
  */
-@MapperScan("com.**.mapper")
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 @EnableScheduling
 public class RuoYiApplication

ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java

@@ -1,5 +1,6 @@
 package com.ruoyi.bas.cargoSpace.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
@@ -21,6 +22,7 @@ public class BasCargoSpace extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /** 货位id     主键  */
+    @TableId
     private String cargoSpaceId;
 
     /** 仓库id（不允许为空） */

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java

@@ -36,8 +36,7 @@ public class OutMydoJobController extends BaseController {
     public TableDataInfo list(MydoJob mydoJob)
     {
         startPage();
-        //mydoJob.setInOut("2");
-        List<MydoJob> list = new ArrayList<>();
+        List<MydoJob> list;
         if(Integer.parseInt(mydoJob.getStatus())<4) {
             list = mydoJobService.selectMydoJobList(mydoJob);
         }else{

ruoyi-ui/src/views/check/job/out/index.vue

@@ -103,7 +103,7 @@
 
 
   <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="danger"
           plain
@@ -111,7 +111,7 @@
           size="mini"
           @click="handleCompletedManually({type: 'invalid'})"
           v-hasPermi="['job:checkMydoJob:OuthandFinish']"
-        >{{$t('checkJobOut.manualInvalid')}}</el-button> <!-- 手动作废 -->
+        >{{$t('checkJobOut.manualInvalid')}}</el-button> &lt;!&ndash; 手动作废 &ndash;&gt;
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -121,8 +121,8 @@
           size="mini"
           @click="handleCompletedManually({type: 'completed'})"
           v-hasPermi="['job:checkMydoJob:OuthandInvalidation']"
-        >{{$t('checkJobOut.manualFinish')}}</el-button> <!-- 手动完成 -->
-      </el-col>
+        >{{$t('checkJobOut.manualFinish')}}</el-button> &lt;!&ndash; 手动完成 &ndash;&gt;
+      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>