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

测试修改

Browse Source
This commit is contained in:
liuhanqing
2025-07-17 14:21:11 +08:00
parent f7a79cdc7e
commit 1cbb1a12a8
21 changed files with 348 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java
View File

@@ -27,9 +27,9 @@ public class ToWmsApiController {
/**
* 入库任务请求
*/
@PostMapping("/inJob")
public AjaxResult inJob(@RequestBody MydoJob mydoJob) {
AjaxResult ajaxResult = toWmsService.inJob(mydoJob);
@PostMapping("/requestEnter")
public AjaxResult requestEnter(@RequestBody MydoJob mydoJob) {
AjaxResult ajaxResult = toWmsService.requestEnter(mydoJob);
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(mydoJob), "InJob");
requestLog.setResponseBody(Convert.toStr(ajaxResult.get("msg")));
requestLogService.insertRequestLog(requestLog);

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

@@ -11,7 +11,7 @@ import java.util.Map;
*/
public interface IToWmsService {
AjaxResult inJob(MydoJob mydoJob);
AjaxResult requestEnter(MydoJob mydoJob);
AjaxResult jobFinish(WmsJobRequest wmsJobRequest);

19
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
View File

@@ -71,12 +71,21 @@ public class ToWmsServiceImpl implements IToWmsService {
@Override
public AjaxResult inJob(MydoJob mydoJob) {
List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(mydoJob);
public AjaxResult requestEnter(MydoJob param) {
MydoJob mydoJobParam = new MydoJob();
mydoJobParam.setTrayCode(param.getTrayCode());
List<MydoJob> mydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
if(mydoJobs.isEmpty()){
return AjaxResult.error("此托盘没有作业");
}
return AjaxResult.success(mydoJobs.get(0));
MydoJob mydoJob = mydoJobs.get(0);
if ("1".equals(mydoJob.getExecutionPhase())){
mydoJob.setExecutionPhase("2");
mydoJob.setEntranceId(param.getEntranceId());
mydoJob.setStatus("3");
mydoJobService.updateMydoJob(mydoJob);
}
return AjaxResult.success(mydoJob);
}
@Override
@@ -93,7 +102,7 @@ public class ToWmsServiceImpl implements IToWmsService {
//入库
mydoJobParam.setTaskNo(wmsJobRequest.getTaskNo());
mydoJobParam.setTrayCode(wmsJobRequest.getTrayCode());
List<MydoJob> inMydoJobs = mydoJobService.selectMydoJobList(mydoJobParam);
List<MydoJob> inMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
if (inMydoJobs.isEmpty()){
return AjaxResult.error("没有该作业 taskNo: {}", wmsJobRequest.getTaskNo());
}
@@ -113,7 +122,7 @@ public class ToWmsServiceImpl implements IToWmsService {
//出库
mydoJobParam.setTaskNo(wmsJobRequest.getTaskNo());
mydoJobParam.setTrayCode(wmsJobRequest.getTrayCode());
List<MydoJob> outMydoJobs = mydoJobService.selectMydoJobList(mydoJobParam);
List<MydoJob> outMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
if (outMydoJobs.isEmpty()){
return AjaxResult.error("没有该作业 taskNo: {}", wmsJobRequest.getTaskNo());
}