lsy/FT577-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改页面显示

Browse Source
This commit is contained in:
liuhanqing
2025-09-28 16:40:00 +08:00
parent 4d6e3e8107
commit 109e65730a
11 changed files with 156 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi-admin/src/main/java/com/ruoyi/job/controller/MydoJobController.java
View File

@@ -46,6 +46,18 @@ public class MydoJobController extends BaseController
return getDataTable(list);
}
/**
* 查询作业信息列表
*/
@PreAuthorize("@ss.hasPermi('job:mydoJob:list')")
@GetMapping("/listFinish")
public TableDataInfo listFinish(MydoJob mydoJob)
{
startPage();
List<MydoJob> list = mydoJobService.selectMydoJobFinishList(mydoJob);
return getDataTable(list);
}
/**
* 导出作业信息列表
*/

2
ruoyi-admin/src/main/java/com/ruoyi/job/mapper/MydoJobMapper.java
View File

@@ -77,4 +77,6 @@ public interface MydoJobMapper
List<MydoJob> selectInOrOutMydoJobList(MydoJob mydoJob);
MydoJob selectMydoJobByEntranceList(@Param("entranceList") List<String> entranceList);
List<MydoJob> selectMydoJobFinishList(MydoJob mydoJob);
}

2
ruoyi-admin/src/main/java/com/ruoyi/job/service/IMydoJobService.java
View File

@@ -72,4 +72,6 @@ public interface IMydoJobService
List<MydoJob> selectInOrOutMydoJobList(MydoJob mydoJob);
MydoJob selectMydoJobByEntranceList(List<String> entranceList);
List<MydoJob> selectMydoJobFinishList(MydoJob mydoJob);
}

5
ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java
View File

@@ -147,4 +147,9 @@ public class MydoJobServiceImpl implements IMydoJobService
public MydoJob selectMydoJobByEntranceList(List<String> entranceList) {
return mydoJobMapper.selectMydoJobByEntranceList(entranceList);
}
@Override
public List<MydoJob> selectMydoJobFinishList(MydoJob mydoJob) {
return mydoJobMapper.selectMydoJobFinishList(mydoJob);
}
}

3
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor1/Floor1BothWayInSsjThread.java
View File

@@ -15,7 +15,6 @@ import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.device.ssj.domain.DeviceSsj;
import com.ruoyi.job.domain.MydoJob;
import com.ruoyi.job.service.IMydoJobService;
import com.ruoyi.queue.agv.service.IAgvQueueService;
import com.ruoyi.queue.ddj.domain.DdjDeviceExecutionQueue;
import com.ruoyi.queue.ddj.service.IDdjDeviceExecutionQueueService;
import com.ruoyi.schedule.plcRead.ssj.PlcSsjRead;
@@ -37,7 +36,6 @@ public class Floor1BothWayInSsjThread implements Runnable {
public HashMap<String, DeviceSsj> ssjCodeList;
private IApiService apiService;
private IAgvQueueService agvQueueService;
private IMydoJobService mydoJobService;
private IBasCargoSpaceService basCargoSpaceService;
private IDdjDeviceExecutionQueueService ddjDeviceExecutionQueueService;
@@ -57,7 +55,6 @@ public class Floor1BothWayInSsjThread implements Runnable {
apiService = SpringUtils.getBean(IApiService.class);
agvQueueService = SpringUtils.getBean(IAgvQueueService.class);
mydoJobService = SpringUtils.getBean(IMydoJobService.class);
basCargoSpaceService = SpringUtils.getBean(IBasCargoSpaceService.class);
ddjDeviceExecutionQueueService = SpringUtils.getBean(IDdjDeviceExecutionQueueService.class);