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

编辑设备类型和出入库调度

Browse Source
This commit is contained in:
lsymicc
2026-03-30 14:00:32 +08:00
parent f6696e0b60
commit 14d3321b68
18 changed files with 347 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,6 +143,11 @@ public interface IApiService
*/
public AjaxResult createInMydoJob(Map<String, Object> param);
/**
* 入库请求作业异常反馈（扫码失败、外形、称重等异常）
*/
public AjaxResult createInMydoJobException(Map<String, Object> param);
public AjaxResult selectMydoJobByNoTrayCode(Map<String, Object> param);
AjaxResult receiveOutMydoJob(ReceiveJob receiveOutJob);

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

@@ -431,6 +431,22 @@ public class ApiServiceImpl implements IApiService {
}
}
/**
* 入库请求作业异常反馈（扫码失败、外形、称重等异常）
* @param param
* @return
*/
@Override
public AjaxResult createInMydoJobException(Map<String, Object> param) {
RequestLog requestLog = requestLogService.getRequestLog(WMS_STOCKIN_MYDOJOB, "入库异常反馈", 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();
}
}
@Override
public AjaxResult receiveOutMydoJob(ReceiveJob receiveOutJob) {
@@ -440,9 +456,10 @@ public class ApiServiceImpl implements IApiService {
job.setTaskNo(receiveOutJob.getTaskNo());
List<MydoJob> tasks = mydoJobService.selectMydoJobList(job);
//校验：任务已存在
if (tasks.size() != 0) {
log.info("【请求异常】wms下发出库任务失败，该任务已存在，任务号:{}", receiveOutJob.getTaskNo());
return AjaxResult.error("【请求异常】wms下发出库任务失败，该任务已存在，任务号:" + receiveOutJob.getTaskNo());
log.info("【请求异常】wms下发出库任务失败，该任务已存在，单号:{}，任务号:{}", receiveOutJob.getJobId(), receiveOutJob.getTaskNo());
return AjaxResult.error("【请求异常】wms下发出库任务失败，该任务已存在，单号:" + receiveOutJob.getJobId() + "，任务号:" + receiveOutJob.getTaskNo());
}
//生成出库作业

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

@@ -157,7 +157,7 @@ public class RequestLogServiceImpl implements IRequestLogService
}
@Override
public RequestLog getRequestLog2(String url, String endPoint,String param) {
public RequestLog getRequestLog2(String url, String endPoint, String param) {
RequestLog requestLog = new RequestLog();
Date requestTime = new Date();
requestLog.setRequestTime(DateUtil.format(requestTime, "yyyy-MM-dd HH:mm:ss"));