From 7a47c4f922789cccc4b59ca261563036c3ab058c Mon Sep 17 00:00:00 2001 From: xins Date: Tue, 12 Mar 2024 08:42:52 +0800 Subject: [PATCH] =?UTF-8?q?1.7.5=20QMS:=E8=B4=A8=E6=A3=80=E4=B8=8D?= =?UTF-8?q?=E5=90=88=E6=A0=BC=E5=A4=84=E7=BD=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hw/system/api/RemoteSysCommonService.java | 5 ++++ .../domain/common/vo/WfProcessActivityVo.java | 26 +++++++++++++++++++ .../RemoteSysCommonFallbackFactory.java | 11 +++++--- .../hw/common/core/constant/WfConstants.java | 1 + .../qms/controller/QmsMobileController.java | 4 +++ .../qms/domain/vo/QmsCheckResultDetailVo.java | 10 +++++++ 6 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 hw-api/hw-api-system/src/main/java/com/hw/system/api/domain/common/vo/WfProcessActivityVo.java diff --git a/hw-api/hw-api-system/src/main/java/com/hw/system/api/RemoteSysCommonService.java b/hw-api/hw-api-system/src/main/java/com/hw/system/api/RemoteSysCommonService.java index 40c628bd..b3e328bb 100644 --- a/hw-api/hw-api-system/src/main/java/com/hw/system/api/RemoteSysCommonService.java +++ b/hw-api/hw-api-system/src/main/java/com/hw/system/api/RemoteSysCommonService.java @@ -4,10 +4,12 @@ import com.hw.common.core.constant.SecurityConstants; import com.hw.common.core.constant.ServiceNameConstants; import com.hw.common.core.domain.R; import com.hw.system.api.domain.common.WfProcessActivity; +import com.hw.system.api.domain.common.vo.WfProcessActivityVo; import com.hw.system.api.factory.RemoteSysCommonFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; /** @@ -23,4 +25,7 @@ public interface RemoteSysCommonService { @PostMapping("/wfprocessactivity/selectProcessActivityIdByWfProcessId") Long selectProcessActivityIdByWfProcessId(@RequestHeader(SecurityConstants.FROM_SOURCE) String source, Long wfProcessId); + + @PostMapping("/wfprocessactivity/getWfProcessActivityByUI") + R getWfProcessActivityByUI(@RequestBody WfProcessActivityVo wfProcessActivityVo, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/hw-api/hw-api-system/src/main/java/com/hw/system/api/domain/common/vo/WfProcessActivityVo.java b/hw-api/hw-api-system/src/main/java/com/hw/system/api/domain/common/vo/WfProcessActivityVo.java new file mode 100644 index 00000000..b976f4c4 --- /dev/null +++ b/hw-api/hw-api-system/src/main/java/com/hw/system/api/domain/common/vo/WfProcessActivityVo.java @@ -0,0 +1,26 @@ +package com.hw.system.api.domain.common.vo; + +import com.hw.common.core.web.domain.BaseEntity; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Description: 工单流程节点步骤对象 wf_process_activity vo 对象 + * @ClassName: WfProcessActivityVo + * @Author : xins + * @Date :2024-03-11 11:27 + * @Version :1.0 + */ +@Data +public class WfProcessActivityVo extends BaseEntity +{ + + @NotNull(message="流程ID必须输入") + private Long wfProcessId; + + @NotNull(message="顺序必须输入") + private Long processActivityOrder; + + +} diff --git a/hw-api/hw-api-system/src/main/java/com/hw/system/api/factory/RemoteSysCommonFallbackFactory.java b/hw-api/hw-api-system/src/main/java/com/hw/system/api/factory/RemoteSysCommonFallbackFactory.java index 0a4c9ada..8858bd24 100644 --- a/hw-api/hw-api-system/src/main/java/com/hw/system/api/factory/RemoteSysCommonFallbackFactory.java +++ b/hw-api/hw-api-system/src/main/java/com/hw/system/api/factory/RemoteSysCommonFallbackFactory.java @@ -5,6 +5,7 @@ import com.hw.system.api.RemoteSysCommonService; import com.hw.system.api.RemoteUserService; import com.hw.system.api.domain.SysUser; import com.hw.system.api.domain.common.WfProcessActivity; +import com.hw.system.api.domain.common.vo.WfProcessActivityVo; import com.hw.system.api.model.LoginUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,15 +20,14 @@ import java.rmi.Remote; * @author ruoyi */ @Component -public class RemoteSysCommonFallbackFactory implements FallbackFactory -{ +public class RemoteSysCommonFallbackFactory implements FallbackFactory { private static final Logger log = LoggerFactory.getLogger(RemoteLogFallbackFactory.class); @Override public RemoteSysCommonService create(Throwable throwable) { log.error("用户服务调用失败:{}", throwable.getMessage()); - return new RemoteSysCommonService(){ + return new RemoteSysCommonService() { @Override @@ -40,6 +40,11 @@ public class RemoteSysCommonFallbackFactory implements FallbackFactory getWfProcessActivityByUI(WfProcessActivityVo wfProcessActivityVo, String source) { + return R.fail("获取工单流程步骤失败:" + throwable.getMessage()); + } + }; } diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/WfConstants.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/WfConstants.java index 3186451b..3309013f 100644 --- a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/WfConstants.java +++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/WfConstants.java @@ -12,6 +12,7 @@ public class WfConstants { public static final Long WF_QUALITY_ABNORMAL_PROCESS_ID = 301L; /**质检工单实例状态*/ + public static final String WF_INSTANCE_STATUS_TO_START = "0";//未启动 public static final String WF_INSTANCE_STATUS_START = "1";//已启动 public static final String WF_INSTANCE_STATUS_FINISH = "3";//已结束 diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsMobileController.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsMobileController.java index da58c137..d9469348 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsMobileController.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsMobileController.java @@ -185,7 +185,11 @@ public class QmsMobileController extends BaseController { List qmsCheckInstanceFiles = qmsCheckInstanceFileService.selectQmsCheckInstanceFileList(queryCheckInstanceFile); qmsCheckResultDetailVo.setQmsCheckInstanceFiles(qmsCheckInstanceFiles); + + qmsCheckResultDetailVo.setWfInstsanceStatus(qmsQualityInstance.getWfInstanceStatus()); + } else { + qmsCheckResultDetailVo.setWfInstsanceStatus(WfConstants.WF_INSTANCE_STATUS_TO_START); qmsCheckResultDetailVo.setPicEditedAble(true); } diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/vo/QmsCheckResultDetailVo.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/vo/QmsCheckResultDetailVo.java index 85a7aaa0..8ded6f79 100644 --- a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/vo/QmsCheckResultDetailVo.java +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/vo/QmsCheckResultDetailVo.java @@ -38,6 +38,8 @@ public class QmsCheckResultDetailVo private String materialName; + private String wfInstsanceStatus; + List qmsQualityInstanceActivities; List qmsCheckInstanceFiles; @@ -108,6 +110,14 @@ public class QmsCheckResultDetailVo this.materialName = materialName; } + public String getWfInstsanceStatus() { + return wfInstsanceStatus; + } + + public void setWfInstsanceStatus(String wfInstsanceStatus) { + this.wfInstsanceStatus = wfInstsanceStatus; + } + public List getQmsQualityInstanceActivities() { return qmsQualityInstanceActivities; }