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

2026.3.19 晚

Browse Source 
新增出库到位自动过账
This commit is contained in:
1009473166@qq.com
2026-03-19 18:44:54 +08:00
parent af308d7dc9
commit d98fe2a30c
5 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,4 +143,6 @@ public interface IApiService
DeviceSsj getDeviceMsg(String taskNo);
DeviceSsj getDeviceMsgSsj(String entranceId);
AjaxResult OutMakeSure(HashMap<String, Object> map);
}

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

@@ -490,4 +490,15 @@ public class ApiServiceImpl implements IApiService {
List<DeviceSsj> deviceSsjs = deviceSsjService.selectDeviceSsjList(ssj);
return deviceSsjs.get(0);
}
@Override
public AjaxResult OutMakeSure(HashMap<String, Object> param) {
RequestLog requestLog = requestLogService.getRequestLog(OUT_MAKE_SURE, "线边直出请求过账", JSONUtil.toJsonStr(param));
if ("1".equals(requestLog.getIsSuccessful())) {
InterfaceReceive bean = JSONUtil.toBean(requestLog.getResponseBody(), InterfaceReceive.class);
return AjaxResult.success(bean.getData());
} else {
return AjaxResult.error();
}
}
}

5
ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java
View File

@@ -1,12 +1,14 @@
package com.ruoyi.common;
import org.springframework.security.access.method.P;
public class Constant {
public static final String WMS_BASE_URL = "http://localhost:8080/api2wms/";
public static final String RCS_BASE_URL = "http://127.0.0.1:8081/rcms-dps/rest/";
public static final String AGV_BASE_URL = "http://127.0.0.1:9501/api/app/agvs-task";
public static final String WMS_BASE_PDA_URL = "http://localhost:8080/pda/";
public static final String JOB_FINISH_URL = WMS_BASE_URL+"jobFinish";
public static final String CONTINUE_TASK_URL = RCS_BASE_URL+"continueTask";
@@ -19,6 +21,7 @@ public class Constant {
public static final String RE_MATERIAL_URL = WMS_BASE_URL+"reMaterial";
public static final String REQUEST_ENTER_URL = WMS_BASE_URL+"requestEnterByTrayCodeAndEntranceId";
public static final String CREATE_AGV_TASK_URL = AGV_BASE_URL+"agvs-task";
public static final String OUT_MAKE_SURE=WMS_BASE_PDA_URL+"outMakeSure";
public static final String WAREHOUSE_01 = "01";

9
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/srgv/BaseSRgvThread.java
View File

@@ -322,8 +322,6 @@ public class BaseSRgvThread implements Runnable, SRgvThreadInterface {
// 最终选中的小车赋值给deviceSrgv（保持原有变量名兼容）
deviceSrgv = bestSrgv;
if (deviceSrgv == null) {
//如果未选择到小车，再找其他楼层的小车
for (DeviceSrgv deviceSrgv1 : deviceSrgvList) {
@@ -1475,8 +1473,11 @@ public class BaseSRgvThread implements Runnable, SRgvThreadInterface {
jobCallBack.setTaskNo(Convert.toLong(mydoJobOut.getTaskNo()));
jobCallBack.setCreateTime(new Date());
jobCallBackService.insertJobCallBack(jobCallBack);
mydoJobService.insertHistory(mydoJobOut.getJobId());
mydoJobService.deleteMydoJobByJobId(mydoJobOut.getJobId());
// 不是线边整托线边直出的删除作业
if (!mydoJobOut.getInOrOut().equals("22")) {
mydoJobService.insertHistory(mydoJobOut.getJobId());
mydoJobService.deleteMydoJobByJobId(mydoJobOut.getJobId());
}
}
case "7"://移库，变动库存
MydoJob mydoJobyk = mydoJobService.selectMydoJobByTaskNo(Long.valueOf(wcsSrgvQueue.getTaskNo()));

22
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/SsjThread.java
View File

@@ -106,19 +106,17 @@ public class SsjThread implements Runnable {
void inDispatch(DeviceSsj deviceSsj) {
//出库到位
if (deviceSsj.getDw() == 1 && deviceSsj.getTaskNo() > 0) {
MydoJob mydoJob = mydoJobService.selectMydoJobByTaskNo(Convert.toLong(deviceSsj.getTaskNo()));
if (mydoJob != null) {
log.info("设备：{} 位置：{} 任务号：{} 出库到位", "输送线", deviceSsj.getDeviceCode(), mydoJob.getTaskNo());
mydoJobService.insertHistory(mydoJob.getJobId());
mydoJobService.deleteMydoJobByJobId(mydoJob.getJobId());
JobCallBack jobCallBack = new JobCallBack();
jobCallBack.setType("2");
jobCallBack.setMydojobId(mydoJob.getJobId());
jobCallBack.setStatus("0");
jobCallBack.setTaskNo(Convert.toLong(mydoJob.getTaskNo()));
jobCallBack.setCreateTime(new Date());
jobCallBackService.insertJobCallBack(jobCallBack);
if (mydoJob != null && mydoJob.getInOrOut().equals("22")) {
// 新增agv执行队列，以及调用wms后台任务过账
HashMap<String, Object> map = new HashMap<>();
map.put("trayCode", mydoJob.getTrayCode());
//拉取
AjaxResult ajaxResult = apiService.OutMakeSure(map);
if (ajaxResult.get("code").equals("200")) {
mydoJobService.insertHistory(mydoJob.getJobId());
mydoJobService.deleteMydoJobByJobId(mydoJob.getJobId());
}
}
}
}