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

修改位置请求接口

Browse Source
This commit is contained in:
liuhanqing
2026-02-11 10:43:56 +08:00
parent c53655c1cb
commit 42a215b2d3
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/bs/BsInSsjThread.java
View File

@@ -143,11 +143,12 @@ public class BsInSsjThread implements Runnable {
if (CollUtil.isEmpty(agvQueues)) { if (CollUtil.isEmpty(agvQueues)) {
//根据入口，查询对应的入库作业 //根据入口，查询对应的入库作业
MydoJob mydoJobParam = new MydoJob(); MydoJob mydoJobParam = new MydoJob();
mydoJobParam.setEntranceId(Convert.toStr(inSsjDevice.getTaskNo())); mydoJobParam.setEntranceId(Convert.toStr(inSsjDevice.getDeviceCode()));
List<MydoJob> mydoJobs = apiService.requestEnterByEnterId(mydoJobParam); List<MydoJob> mydoJobs = apiService.requestEnterByEnterId(mydoJobParam);
if (ObjUtil.isNotNull(mydoJobs)) { if (CollUtil.isNotEmpty(mydoJobs)) {
MydoJob mydoJob = mydoJobs.get(0);
//创建ctu入库队列 //创建ctu入库队列
AgvQueue agvQueue = apiService.createAgvQueue(inSsjDevice.getName(), mydoJobs.get(0).getCargoSpaceId(), mydoJobs.get(0).getTrayCode(), mydoJobs.get(0).getTaskNo(), "1"); AgvQueue agvQueue = apiService.createAgvQueue(inSsjDevice.getName(), mydoJob.getCargoSpaceId(), mydoJob.getTrayCode(), mydoJob.getTaskNo(), "1");
if (ObjUtil.isNotNull(agvQueue)) { if (ObjUtil.isNotNull(agvQueue)) {
log.info("创建CTU入库作业 taskNo{}", agvQueue.getWmsTaskNo()); log.info("创建CTU入库作业 taskNo{}", agvQueue.getWmsTaskNo());
} }

7
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/js/JsInSsjThread.java
View File

@@ -91,11 +91,12 @@ public class JsInSsjThread implements Runnable {
if (CollUtil.isEmpty(agvQueues)) { if (CollUtil.isEmpty(agvQueues)) {
//根据入口，查询对应的入库作业 //根据入口，查询对应的入库作业
MydoJob mydoJobParam = new MydoJob(); MydoJob mydoJobParam = new MydoJob();
mydoJobParam.setEntranceId(Convert.toStr(inSsjDevice.getTaskNo())); mydoJobParam.setEntranceId(Convert.toStr(inSsjDevice.getDeviceCode()));
List<MydoJob> mydoJobs = apiService.requestEnterByEnterId(mydoJobParam); List<MydoJob> mydoJobs = apiService.requestEnterByEnterId(mydoJobParam);
if (ObjUtil.isNotNull(mydoJobs)) { if (CollUtil.isNotEmpty(mydoJobs)) {
MydoJob mydoJob = mydoJobs.get(0);
//创建ctu入库队列 //创建ctu入库队列
AgvQueue agvQueue = apiService.createAgvQueue(inSsjDevice.getName(), mydoJobs.get(0).getCargoSpaceId(), mydoJobs.get(0).getTrayCode(), mydoJobs.get(0).getTaskNo(), "1"); AgvQueue agvQueue = apiService.createAgvQueue(inSsjDevice.getName(), mydoJob.getCargoSpaceId(), mydoJob.getTrayCode(), mydoJob.getTaskNo(), "1");
if (ObjUtil.isNotNull(agvQueue)) { if (ObjUtil.isNotNull(agvQueue)) {
log.info("创建CTU入库作业 taskNo{}", agvQueue.getWmsTaskNo()); log.info("创建CTU入库作业 taskNo{}", agvQueue.getWmsTaskNo());
} }

2
ruoyi-admin/src/main/resources/application-druid.yml
View File

@@ -6,7 +6,7 @@ spring:
druid: druid:
#主数据信息 #主数据信息
master: master:
url: jdbc:sqlserver://172.16.2.170:1433;databaseName=FT501_WCS; url: jdbc:sqlserver://ngrok.xiaomiqiu123.top:54327;databaseName=FT501_WCS;
username: sa username: sa
password: Flrd0914. password: Flrd0914.
# 从库数据源 # 从库数据源

2
ruoyi-admin/src/main/resources/application.yml
View File

@@ -68,7 +68,7 @@ spring:
# redis 配置 # redis 配置
redis: redis:
# 地址 # 地址
host: 172.16.2.170 host: 127.0.0.1
# 端口，默认为6379 # 端口，默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引