diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java index cbd1c77..5ffe8ca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java @@ -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 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWmsService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWmsService.java index a4fc71b..c62e6a6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWmsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWmsService.java @@ -20,4 +20,6 @@ public interface IToWmsService { AjaxResult reMaterial(MydoJob mydoJob); AjaxResult getJob(MydoJob mydoJob); + + AjaxResult startSignal(MydoJob mydoJob); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java index 7c336c5..f5b0b2e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java @@ -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); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java index b538eb6..5e9c7dc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java @@ -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 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("开始作业成功"); + } + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/IMydoJobDetailService.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/IMydoJobDetailService.java index e3769fc..43c0bac 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/IMydoJobDetailService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/service/IMydoJobDetailService.java @@ -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 结果 */ diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml index a5a1628..bfb1218 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml @@ -29,34 +29,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select stock_guid, stock_check_id, check_type, create_date, create_man_id, status, cs.warehouse_id, finish_date, erp_bill, stock_source, department_no, customer_no, class_no, supplier_no, spare1, spare2, spare3, spare4, spare5 , - bw.warehouse_name, sd.dept_name as department_name + select cs.stock_guid, + cs.stock_check_id, + cs.check_type, + cs.create_date, + cs.create_man_id, + cs.status, + cs.warehouse_id, + cs.finish_date, + cs.erp_bill, + cs.stock_source, + cs.department_no, + cs.customer_no, + cs.class_no, + cs.supplier_no, + cs.spare1, + cs.spare2, + cs.spare3, + cs.spare4, + cs.spare5, + bw.warehouse_name, + sd.dept_name as department_name from check_stockin cs - left join bas_warehouse bw on cs.warehouse_id = bw.warehouse_id - left join sys_dept sd on cs.department_no = sd.dept_id + left join bas_warehouse bw on cs.warehouse_id = bw.warehouse_id + left join sys_dept sd on cs.department_no = sd.dept_id diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index 8fbde2b..c9152bb 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -450,7 +450,8 @@ export default { onlyReviewedCanConfirm: 'Only reviewed documents can be confirmed', autoAllocation:'autoAllocation', autoAllocationSuccess:"autoAllocationSuccess", - checkPort:'checkPort' + checkPort:'checkPort', + departmentName: 'departmentName', }, // ***************盘点入库作业************* checkJobIn: { diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 620a8dc..8280913 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -430,7 +430,8 @@ export default { cargoSpaceName: '货位名称', autoAllocation:'自动分配', autoAllocationSuccess:"自动分配成功", - checkPort:'盘点出口' + checkPort:'盘点出口', + departmentName: '部门名称', }, // ***************盘点入库作业************* checkJobIn: { diff --git a/ruoyi-ui/src/views/check/stockCheck/index.vue b/ruoyi-ui/src/views/check/stockCheck/index.vue index 70574a2..a9c50d9 100644 --- a/ruoyi-ui/src/views/check/stockCheck/index.vue +++ b/ruoyi-ui/src/views/check/stockCheck/index.vue @@ -215,7 +215,7 @@ - + @@ -234,7 +234,6 @@ -