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-23 11:05:05 +08:00
parent 597bb18b97
commit 302cddef41
9 changed files with 87 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,18 @@ public class ToWmsApiController {
return ajaxResult;
}
/**
* 接收开始信号
*/
@PostMapping("/startSignal")
public AjaxResult startSignal(@RequestBody MydoJob mydoJob) {
AjaxResult ajaxResult = toWmsService.startSignal(mydoJob);
RequestLog requestLog = requestLogService.getRequestLog(JSONUtil.toJsonStr(mydoJob), "startSignal");
requestLog.setResponseBody(Convert.toStr(ajaxResult.get("msg")));
requestLogService.insertRequestLog(requestLog);
return ajaxResult;
}
/**
* 入库、出库 任务完成回传
* Map<String, String>

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

@@ -20,4 +20,6 @@ public interface IToWmsService {
AjaxResult reMaterial(MydoJob mydoJob);
AjaxResult getJob(MydoJob mydoJob);
AjaxResult startSignal(MydoJob mydoJob);
}

4
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
View File

@@ -56,8 +56,8 @@ public class ToWcsServiceImpl implements IToWcsService {
for (MydoJob outMydoJob : outMydoJobs) {
RequestLog requestLog = requestLogService.getRequestLog(PUSH_OUT_MYDO_JOB, JSONUtil.toJsonStr(outMydoJob), "推送出库任务");
if ("1".equals(requestLog.getIsSuccessful())){
outMydoJob.setStatus("3");
outMydoJob.setStartTime(DateUtil.formatDateTime(DateUtil.date()));
outMydoJob.setStatus("2");
//outMydoJob.setStartTime(DateUtil.formatDateTime(DateUtil.date()));
mydoJobService.updateMydoJob(outMydoJob);
}
}

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

@@ -84,8 +84,7 @@ public class ToWmsServiceImpl implements IToWmsService {
if ("1".equals(mydoJob.getExecutionPhase())){
mydoJob.setExecutionPhase("2");
mydoJob.setEntranceId(param.getEntranceId());
mydoJob.setStatus("3");
mydoJob.setStartTime(DateUtil.formatDateTime(DateUtil.date()));
mydoJob.setStatus("2");
mydoJobService.updateMydoJob(mydoJob);
}
return AjaxResult.success(mydoJob);
@@ -222,4 +221,21 @@ public class ToWmsServiceImpl implements IToWmsService {
return AjaxResult.success(mydoJobs);
}
}
@Override
public AjaxResult startSignal(MydoJob mydoJob) {
MydoJob mydoJobParam = new MydoJob();
mydoJobParam.setTaskNo(mydoJob.getTaskNo());
List<MydoJob> mydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
if (mydoJobs.isEmpty()){
return AjaxResult.error("没有该作业");
}else {
for (MydoJob mydoJob1 : mydoJobs) {
mydoJob1.setStatus("3");
mydoJob1.setStartTime(DateUtil.formatDateTime(DateUtil.date()));
mydoJobService.updateMydoJob(mydoJob1);
}
return AjaxResult.success("开始作业成功");
}
}
}

16
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/IMydoJobDetailService.java
View File

@@ -5,15 +5,15 @@ import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
/**
* 子任务Service接口
*
*
* @author ruoyi
* @date 2025-05-22
*/
public interface IMydoJobDetailService
public interface IMydoJobDetailService
{
/**
* 查询子任务
*
*
* @param jobDetailId 子任务主键
* @return 子任务
*/
@@ -21,7 +21,7 @@ public interface IMydoJobDetailService
/**
* 查询子任务列表
*
*
* @param mydoJobDetail 子任务
* @return 子任务集合
*/
@@ -29,7 +29,7 @@ public interface IMydoJobDetailService
/**
* 新增子任务
*
*
* @param mydoJobDetail 子任务
* @return 结果
*/
@@ -37,7 +37,7 @@ public interface IMydoJobDetailService
/**
* 修改子任务
*
*
* @param mydoJobDetail 子任务
* @return 结果
*/
@@ -45,7 +45,7 @@ public interface IMydoJobDetailService
/**
* 批量删除子任务
*
*
* @param jobDetailIds 需要删除的子任务主键集合
* @return 结果
*/
@@ -53,7 +53,7 @@ public interface IMydoJobDetailService
/**
* 删除子任务信息
*
*
* @param jobDetailId 子任务主键
* @return 结果
*/