From 56f5157ae8dba22eb30fb6c7cb132f80b7161932 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 07 九月 2025 00:53:08 +0800
Subject: [PATCH] 派工界面增加选择主管工艺
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/constants/FlowContants.java | 4 +
blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/service/UserCommonService.java | 4
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.xml | 13 +++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java | 6
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchTaskController.java | 6 +
blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java | 21 +++--
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java | 9 ++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 9 +-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/FlowStartResult.java | 9 ++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.java | 11 ++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskAssignVO.java | 5 +
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/controller/ProduceDivisionController.java | 41 ++++++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramProperties.java | 3
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java | 7 +
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 36 +++++++-
15 files changed, 156 insertions(+), 28 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/controller/ProduceDivisionController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/controller/ProduceDivisionController.java
index c578bcb..f394260 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/controller/ProduceDivisionController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/controller/ProduceDivisionController.java
@@ -6,11 +6,15 @@
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.support.Query;
import org.springblade.core.oss.OssTemplate;
+import org.springblade.core.tool.api.IResultCode;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
+import org.springblade.mdm.basesetting.producedivision.entity.QinzheFgb;
import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
import org.springblade.mdm.basesetting.producedivision.vo.ImportResult;
import org.springblade.mdm.basesetting.producedivision.vo.ProduceDivisionVO;
@@ -23,6 +27,7 @@
import java.io.IOException;
import java.io.InputStream;
+import java.util.Collections;
import java.util.List;
@Slf4j
@@ -115,5 +120,41 @@
log.error("瀵煎嚭鍒嗗伐琛ㄦā鏉垮紓甯�", e);
}
}
+ @Operation(summary = "浠诲姟璁″垝鏌ヨ鍒嗗伐琛╥d", description = "浠诲姟璁″垝g鏍规嵁闆剁粍浠跺彿鏌ヨ鑱岃矗琛╥d")
+ @GetMapping("/select-by-drawingno")
+ public R<ProduceDivision> selectByDrawingNo(@RequestParam String drawingNo) {
+ try {
+ ProduceDivision div = service.getByDrawingNoWithQinzhe(drawingNo);
+ return R.data(div);
+ } catch (Exception e) {
+ log.error("鏍规嵁闆朵欢鍙疯幏鍙栬亴璐ｈ〃寮傚父",e);
+ return R.fail(new IResultCode() {
+ @Override
+ public String getMessage() {
+ return e.getMessage();
+ }
+ @Override
+ public int getCode() {
+ return 201;
+ }
+ });
+ }
+ }
+
+ @Operation(summary = "浠诲姟璁″垝閫夋嫨涓荤宸ヨ壓", description = "浠诲姟璁″垝閫夋嫨涓荤宸ヨ壓")
+ @GetMapping("/select-programmer")
+ public R<List<ProduceDivisionViewVO>> selectProgrammer(@RequestParam String programmer) {
+ if(StringUtils.isBlank(programmer)){
+ return R.data(Collections.emptyList());
+ }
+ try {
+
+ String p = programmer.trim();
+ return R.data(service.queryProgrammer(programmer));
+ } catch (Exception e) {
+ log.error("鑾峰彇闆朵欢鍙峰紓甯�",e);
+ return R.fail(e.getMessage());
+ }
+ }
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.java
index 7042ce1..a878edf 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.java
@@ -6,8 +6,17 @@
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.vo.ProduceDivisionViewVO;
+import java.util.List;
+
public interface ProduceDivisionMapper extends BladeMapper<ProduceDivision> {
IPage<ProduceDivisionViewVO> pageQuery(@Param("page")IPage<ProduceDivision> page, @Param("name")String name);
- //pageMachine
+
+ /**
+ * 鏍规嵁濮撳悕鏌ヨ涓荤宸ヨ壓鍒楄〃
+ * @param programmer 宸ヨ壓i濮撳悕
+ * @return
+ */
+ List<ProduceDivisionViewVO> queryProgrammer(String programmer);
+ //pageMachine
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.xml
index e77bbd9..b6b53ef 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.xml
@@ -32,5 +32,18 @@
)
</if>
</select>
+ <select id="queryProgrammer"
+ resultType="org.springblade.mdm.basesetting.producedivision.vo.ProduceDivisionViewVO">
+ select p.id,p.programmer_id,p.checker_id,p.senior_id,pro.name programmer_name,c.name checker_name
+ from mdm_produce_division p
+ left join blade_user pro on p.programmer_id=pro.id and pro.is_deleted=0
+ left join blade_user c on p.checker_id=c.id and c.is_deleted=0
+ <where>
+ p.is_deleted=0
+ <bind name="pname" value="programmer+'%'"/>
+ and pro.name like #{pname}
+ </where>
+
+ </select>
</mapper>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java
index 3746a6b..8e402d3 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/service/ProduceDivisionService.java
@@ -185,4 +185,13 @@
return division;
}
+
+ /**
+ * 閫夋嫨涓荤宸ヨ壓鏁版嵁
+ * @param programmer
+ * @return
+ */
+ public List<ProduceDivisionViewVO> queryProgrammer(String programmer) {
+ return baseMapper.queryProgrammer(programmer);
+ }
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/service/UserCommonService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/service/UserCommonService.java
index 47a7cc8..facec07 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/service/UserCommonService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/service/UserCommonService.java
@@ -27,8 +27,8 @@
* 鑾峰彇鐢ㄦ埛濮撳悕
* @return
*/
- public String getUserNameById(Long programmerId){
- R<User> programmerResult = userClient.userInfoById(programmerId);
+ public String getUserNameById(Long userId){
+ R<User> programmerResult = userClient.userInfoById(userId);
if(programmerResult.isSuccess()) {
return programmerResult.getData().getName();
}else{
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/constants/FlowContants.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/constants/FlowContants.java
index 8776a10..689fe2c 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/constants/FlowContants.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/constants/FlowContants.java
@@ -148,4 +148,8 @@
宸插浐鍖栦絾浠ュ凡鎵�甯濆浗鏍囧織 Y/N
*/
public static final String CURED_LOCKED = "curedLocked";
+ /**
+ * 绋嬪簭缂栧彿
+ */
+ public static final String PROGRAM_NO = "programNo";
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
index 8715c3e..1ea08eb 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
@@ -19,6 +19,7 @@
import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.flow.service.execute.*;
import org.springblade.mdm.flow.vo.BatchDispatchVO;
+import org.springblade.mdm.flow.vo.FlowStartResult;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -35,9 +36,7 @@
private final StartDispatcher dispatcher;
- private final TaskService taskService;
private final RuntimeService runtimeService;
- private final FlowProgramFileService flowProgramFileService;
private final TryFlowCompleteService tryFlowCompleteService;
@@ -62,16 +61,16 @@
}
try {
- String instId = dispatcher.start(startVO);
+ FlowStartResult result = dispatcher.start(startVO);
dispatch.setStatus(TaskDispatch.STATUS_STARTED);
- dispatch.setProcessInstanceId(instId);
+ dispatch.setProcessInstanceId(result.getProcessInstanceId());
+ dispatch.setProgramNo(result.getProgramNo());
taskDispatchService.updateById(dispatch);
return R.data(true);
} catch (Exception e) {
dispatch.setStatus(TaskDispatch.STATUS_EXCEPTION);
dispatch.setErrMsg(e.getMessage());
taskDispatchService.updateById(dispatch);
- //return R.fail("浠诲姟鍚姩寮傚父:"+e.getMessage());
return R.fail(new IResultCode() {
@Override
public String getMessage() {
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchTaskController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchTaskController.java
index ab7853c..f868532 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchTaskController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchTaskController.java
@@ -24,6 +24,7 @@
import org.springblade.mdm.flow.service.execute.*;
import org.springblade.mdm.flow.vo.BatchDispatchVO;
import org.springblade.mdm.flow.vo.DispathTaskQueryVO;
+import org.springblade.mdm.flow.vo.FlowStartResult;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
@@ -89,9 +90,10 @@
BeanUtils.copyProperties(dispatch, startVO);
startVO.setTitle(startVO.getDrawingNo()+"-"+startVO.getProcessNo()+"-"+startVO.getProcessEdition()+"鏁版帶绋嬪簭缂栧埗");
try {
- String instId = dispatcher.start(startVO);
+ FlowStartResult result = dispatcher.start(startVO);
dispatch.setStatus(TaskDispatch.STATUS_STARTED);
- dispatch.setProcessInstanceId(instId);
+ dispatch.setProcessInstanceId(result.getProcessInstanceId());
+ dispatch.setProgramNo(result.getProgramNo());
taskDispatchService.updateById(dispatch);
} catch (Exception e) {
log.error("娴佺▼鍚姩寮傚父",e);
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
index a3b8bf8..5855732 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
@@ -7,14 +7,18 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
+import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
+import org.springblade.mdm.commons.service.UserCommonService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
+import org.springblade.mdm.flow.vo.FlowStartResult;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NodeDeptQueryService;
+import org.springblade.mdm.program.service.ProgramSeqService;
import org.springblade.mdm.utils.EntityUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,28 +33,41 @@
@Service("startDispatcher")
public class StartDispatcher {
private final RuntimeService runtimeService;
-
+ private final ProgramSeqService programSeqService;
private final IdentityService identityService;
private final NcNodeService ncNodeService;
private final FlowProgramFileService flowProgramFileService;
private final NodeDeptQueryService nodeDeptQueryService;
private final FlowCommonService flowCommonService;
-
+ private final ProduceDivisionService produceDivisionService;
+ private final UserCommonService userCommonService;
/**
* 鍚姩娲惧伐娴佺▼
* @param startVO 琛ㄥ崟鏁版嵁
* @return 娴佺▼瀹炰緥id
*/
@Transactional
- public String start(TaskAssignVO startVO){
+ public FlowStartResult start(TaskAssignVO startVO){
if(!FlowContants.Y.equals(startVO.getIsTempFlow())){
startVO.setIsTempFlow(FlowContants.N);
}
Map<String, Object> vars = new HashMap<>();
- ProduceDivision div = flowCommonService.putDefaultAssignees(vars,startVO.getDrawingNo(),null);
+ ProduceDivision div;
+ if(startVO.getProducePlanId() != null && startVO.getProducePlanId()!=0){
+ //鐣岄潰涓婇�夋嫨浜嗗垎宸ヨ〃鐨勬儏鍐碉紝鐩存帴鏍规嵁id鑾峰彇
+ div = produceDivisionService.getById(startVO.getProducePlanId());
+ vars.put(FlowContants.TEAM_LEADER,div.getTeamLeaderId());
+ vars.put(FlowContants.PROGRAMMER,div.getProgrammerId());
+ vars.put(FlowContants.CHECKER,div.getCheckerId());
+ vars.put(FlowContants.SENIOR,div.getSeniorId());
+ vars.put(FlowContants.PROGRAMMER_NAME, userCommonService.getUserNameById(div.getProgrammerId()));
+
+ }else {
+ div = flowCommonService.putDefaultAssignees(vars, startVO.getDrawingNo(), null);
+ }
vars.put(FlowContants.TITLE,startVO.getTitle());
//鏈哄簥缂栧彿
@@ -110,7 +127,7 @@
vars.put(FlowContants.MY_PROCESS_NAME, myProcessName);
- String businessKey = "0";//涓氬姟琛╧ey
+ String businessKey = Func.toStr(startVO.getTaskDispatchId());//涓氬姟琛╧ey
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
ProcessInstance inst;
if(startVO.isTemporaryFlow()){
@@ -120,13 +137,20 @@
vars.put(FlowContants.ASSIGNEE,div.getTeamLeaderId());//绗竴涓敤鎴风粍闀�
inst = runtimeService.startProcessInstanceByKey(FlowContants.TRY_PROCESS_KEY,businessKey,vars);
}
+ FlowStartResult result = new FlowStartResult();
+ result.setProcessInstanceId(inst.getProcessInstanceId());
+ //鐢熸垚绋嬪簭缂栧彿
+ String programNo = programSeqService.generageProgramNo();
+ runtimeService.setVariable(inst.getProcessInstanceId(),FlowContants.PROGRAM_NO,programNo);
+ result.setProgramNo(programNo);
+
if(curedProgramPackage != null) {//瀛樺湪宸插浐鍖栫▼搴忥紝澶嶅埗鍘熸潵鐨勭▼搴忔枃浠躲��
copyFlowProgramFiles(curedProgramPackage.getId(),inst.getProcessInstanceId());
curedProgramPackage.setProcessInstanceId(inst.getProcessInstanceId());
ncNodeService.updateById(curedProgramPackage);
}
- return inst.getProcessInstanceId();
+ return result;
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
index e0c2278..0689209 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
@@ -81,6 +81,11 @@
return programProperties;
}
+ /**
+ * 浠巑ap涓祴鍊兼祦绋嬩究鍒╁埌vo
+ * @param programProperties vo
+ * @param vars 鍙橀噺map
+ */
void copyFlowPropertiesFromMap(FlowProgramProperties programProperties,Map<String, Object> vars){
programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
@@ -116,6 +121,8 @@
programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));
+ programProperties.setProgramNo(Func.toStr(vars.get(FlowContants.PROGRAM_NO)));
+
programProperties.setActProgrammerId(Func.toLong(vars.get(FlowVariableContants.ACT_PROGRAMMER)));
}
/**
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramProperties.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramProperties.java
index 9e9b8d5..70f14ca 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramProperties.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramProperties.java
@@ -79,4 +79,7 @@
@Schema(description = "鏄惁涓存椂娴佺▼:Y/N")
private String isTempFlow;
+
+ @Schema(description = "鏁版帶绋嬪簭缂栧彿")
+ private String programNo;
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/FlowStartResult.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/FlowStartResult.java
new file mode 100644
index 0000000..d544840
--- /dev/null
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/FlowStartResult.java
@@ -0,0 +1,9 @@
+package org.springblade.mdm.flow.vo;
+
+import lombok.Data;
+
+@Data
+public class FlowStartResult {
+ private String processInstanceId;
+ private String programNo;
+}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskAssignVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskAssignVO.java
index 8ff7f0c..34459f2 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskAssignVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskAssignVO.java
@@ -46,6 +46,11 @@
@Schema(description = "鏄惁涓存椂娴佺▼锛屽��:Y/N")
private String isTempFlow;
+ @Schema(description = "浠诲姟娲惧伐璁板綍琛╥d")
+ private Long taskDispatchId;
+
+ @Schema(description = "浜哄憳鑱岃矗琛╥d锛岀晫闈笂闆朵欢鍙峰尮閰嶄笉涓婄敤鎴锋寚瀹氱殑")
+ private Long producePlanId;
/**
* 鏄惁 鏈� 绋嬪簭琛ュ厖娴佺▼锛堜复鏃舵祦绋嬶級
* @return 鏄惁
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java
index d80b701..c7a39ec 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java
@@ -31,7 +31,7 @@
private final NcNodeService ncNodeService;
private final FlowCommonService flowCommonService;
private final FlowProgramFileService flowProgramFileService;
- private final ProgramSeqService programSeqService;
+
public static final String TRY_NAME = "璇曞垏";
public static final String CURE_NAME = "鍥哄寲";
public static final String DEVIATION_NAME = "鍋忕";
@@ -235,8 +235,8 @@
ncNode.setDeviation(programProperties.getDeviation());
if(NcNode.TYPE_PROGRAM_PACKAGE.equals(nodeType)) {//绋嬪簭鍖呰妭鐐癸紝鍒嗛厤绋嬪簭缂栧彿
- String programNo = programSeqService.generageProgramNo();
- ncNode.setProgramNo(programNo);
+
+ ncNode.setProgramNo(programProperties.getProgramNo());
}
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java
index 2de1b6c..dfad95f 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java
@@ -9,6 +9,7 @@
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.commons.service.ParamService;
+import org.springblade.mdm.commons.service.UserCommonService;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.service.ApproveInfoQueryService;
@@ -39,7 +40,7 @@
@Service
public class ApproveTableService {
@Autowired
- private NcNodeService ncNodeService;
+ private UserCommonService userCommonService;
@Autowired
private MachineService machineService;
@Autowired
@@ -90,27 +91,28 @@
dispatchDateStr = DateUtil.format(approveInfo.getDispatchDate(), DATE_PATTERN);
}
- dataMap.put("teamLeader",approveInfo.getTeamLeaderName()+"/"+dispatchDateStr);
+ dataMap.put("startTime",dispatchDateStr);//宸ユ璐熻矗浜�/鍗曞厓璐熻矗浜烘淳鍑烘椂闂�
dataMap.put("fuzeren",approveInfo.getProgrammerName());//璐熻矗浜�
int isProgram = 0;
if(StringUtils.equals(props.getHasCuredProgram(),FlowContants.Y)){
//鏍″浠诲姟
dataMap.put("jd", WordReplaceUtil.CHECKED);
- dataMap.put("bc", WordReplaceUtil.UNCHECKED);
+ dataMap.put("bz", WordReplaceUtil.UNCHECKED);
}else{
//缂栫▼浠诲姟
dataMap.put("jd", WordReplaceUtil.UNCHECKED);
- dataMap.put("bc", WordReplaceUtil.CHECKED);
+ dataMap.put("bz", WordReplaceUtil.CHECKED);
}
dataMap.put("programNo",dispatch.getProgramNo());
- dataMap.put("fzy",WordReplaceUtil.CHECKED);
- dataMap.put("fzn",WordReplaceUtil.UNCHECKED);
+
+ dataMap.put("fzy",WordReplaceUtil.CHECKED); //浠跨湡 鏄�
+ dataMap.put("fzn",WordReplaceUtil.UNCHECKED);//浠跨湡 鍚�
Date programDate = approveInfo.getCheckDate();
Date checkDate = approveInfo.getCheckDate();
- String bianzhiDateStr = DateUtil.format(dispatch.getCreateTime(), DATE_PATTERN);
+
String checkDateStr = " ";
if (checkDate != null) {
@@ -121,8 +123,9 @@
if (approveInfo.getApproveDate() != null) {
approveDateStr = DateUtil.format(approveInfo.getApproveDate(), DATE_PATTERN);
}
-
- dataMap.put("programmer",approveInfo.getProgrammerName()+"/"+bianzhiDateStr);
+ String bianzhi = userCommonService.getUserNameById(dispatch.getCreateUser());
+ String bianzhiDateStr = DateUtil.format(dispatch.getCreateTime(), DATE_PATTERN);
+ dataMap.put("bianzhi",bianzhi+"/"+bianzhiDateStr);//缂栧埗锛氳鍒掑憳/鍙戣捣鏃堕棿
dataMap.put("jiaodui",approveInfo.getTeamLeaderName()+"/鏃堕棿涓嶇‘瀹�");
dataMap.put("shenpi",approveInfo.getSeniorName()+"/鏃堕棿涓嶇‘瀹�");
--
Gitblit v1.9.3