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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
猫猫guowen
2025-09-30 15:33:47 +08:00
parent 0f2721f479 a1d339c1f0
commit fe1f81424b
6 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/api/domain/wcs2wms/ReceiveJob.java
View File

@@ -15,5 +15,6 @@ public class ReceiveJob {
private String entranceId;
private String inOrOut;
private String jobId;
private String roadwayId;
}

2
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
View File

@@ -355,7 +355,9 @@ public class ApiServiceImpl implements IApiService {
mydoJob.setInOrOut(receiveOutJob.getInOrOut());
mydoJob.setStatus("1");
mydoJob.setTrayCode(receiveOutJob.getTrayCode());
mydoJob.setRoadwayId(receiveOutJob.getRoadwayId());
mydoJob.setCreateTime(DateUtils.getNowDate());
mydoJob.setExecutionPhase("0");
int i = mydoJobService.insertMydoJob(mydoJob);
if (i > 0) {
return AjaxResult.success();

2
ruoyi-admin/src/main/java/com/ruoyi/schedule/ScheduleThread.java
View File

@@ -143,7 +143,7 @@ public class ScheduleThread {
monitoringCustomThread.thread.start();
//floor1BothWayInSsjCustomThread.thread.start();
//floor1BothWayOutSsjCustomThread.thread.start();
//floor1SingleSsjCustomThread.thread.start();
floor1SingleSsjCustomThread.thread.start();
floor2InSsjCustomThread.thread.start();
lineSsjCustomThread.thread.start();
floor2OutSsjCustomThread.thread.start();

4
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/floor2/LineSsjThread.java
View File

@@ -198,9 +198,9 @@ public class LineSsjThread implements Runnable {
String deviceCode = "";
if (mydoJob != null) {
if ("1".equals(mydoJob.getRoadwayId())) {
deviceCode = "L1012";
} else {
deviceCode = "L1011";
} else {
deviceCode = "L1012";
}
int kx = deviceSsjMap.get(deviceCode).getKx();
MydoJob mydoJob1 = new MydoJob();

2
ruoyi-admin/src/main/resources/mapper/job/IDynamicMonitoringService.xml
View File

@@ -130,7 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</insert>
<insert id="insertHistory">
insert into mydo_job_wcs_history
insert into mydo_job_wcs_finish
select * from mydo_job_wcs where job_id = #{jobId}
</insert>