diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 7fc973b..5803460 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/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 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java index 73a1638..d327bf0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/cargoSpace/domain/BasCargoSpace.java +++ b/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(不允许为空) */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java index 213956f..08b2ea8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java +++ b/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 list = new ArrayList<>(); + List list; if(Integer.parseInt(mydoJob.getStatus())<4) { list = mydoJobService.selectMydoJobList(mydoJob); }else{ diff --git a/ruoyi-ui/src/views/check/job/out/index.vue b/ruoyi-ui/src/views/check/job/out/index.vue index 6cc1e4e..d2936a7 100644 --- a/ruoyi-ui/src/views/check/job/out/index.vue +++ b/ruoyi-ui/src/views/check/job/out/index.vue @@ -103,7 +103,7 @@ - + + >{{$t('checkJobOut.manualInvalid')}} <!– 手动作废 –> {{$t('checkJobOut.manualFinish')}} - + >{{$t('checkJobOut.manualFinish')}} <!– 手动完成 –> + -->