优化系统逻辑
This commit is contained in:
@@ -11,7 +11,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
|
||||
*
|
||||
* @author ruoyi
|
||||
*/
|
||||
@MapperScan("com.**.mapper")
|
||||
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
|
||||
@EnableScheduling
|
||||
public class RuoYiApplication
|
||||
|
||||
@@ -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(不允许为空) */
|
||||
|
||||
@@ -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{
|
||||
|
||||
Reference in New Issue
Block a user