From f379dade90ec59e08c037cba4917308e3dfdb928 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 08 七月 2025 17:02:06 +0800
Subject: [PATCH] 调整审批记录的保存方式
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramExportDncPageVO.java | 4
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml | 15 +--
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java | 78 +++++++++++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmParamController.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 10 -
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/AutoAssignUsersService.java | 31 ++++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java | 14 +-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java | 5
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java | 4
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeProgramVO.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 29 +----
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskAssignVO.java | 4
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml | 6
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 8
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramVO.java | 4
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/ProduceDivision.java | 4
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionVO.java | 28 ++---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/MdmProgramImportVO.java | 5
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java | 8 -
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExchangeService.java | 11 -
22 files changed, 165 insertions(+), 111 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/ProduceDivision.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/ProduceDivision.java
index e98c260..61c7e2a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/ProduceDivision.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/ProduceDivision.java
@@ -13,6 +13,10 @@
@TableName("mdm_produce_division")
public class ProduceDivision extends BizEntity {
/**
+ * 闆剁粍浠剁紪鍙�
+ */
+ private String drawingNo;
+ /**
* 涓撲笟缁勯暱id
*/
private Long teamLeaderId;
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionVO.java
index e5028df..9ecf5ba 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionVO.java
@@ -1,29 +1,27 @@
package org.springblade.mdm.basesetting.producedivision.vo;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springblade.mdm.commons.vo.BaseVO;
-/**
- * 涓诲埗璁″垝琛�
- */
+
+@Schema(description = "涓诲埗鍒嗗伐琛�")
@Setter
@Getter
public class ProduceDivisionVO extends BaseVO {
- /**
- * 涓撲笟缁勯暱id
- */
+ @Schema(description = "闆剁粍浠跺彿/鍥惧彿")
+ private String drawingNo;
+
+ @Schema(description = "涓撲笟缁勯暱id")
private Long teamLeaderId;
- /**
- * 缂栧埗宸ヨ壓鍛榠d
- */
+
+ @Schema(description = "缂栧埗宸ヨ壓鍛榠d")
private Long programmerId;
- /**
- * 鏍″宸ヨ壓鍛榠d
- */
+
+ @Schema(description = "鏍″宸ヨ壓鍛榠d")
private Long checkerId;
- /**
- * 楂樺笀id
- */
+
+ @Schema(description = "瀹℃壒楂樺笀id")
private Long seniorId;
}
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 911f2cc..ab823cd 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
@@ -1,5 +1,6 @@
package org.springblade.mdm.flow.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -17,6 +18,7 @@
import org.springblade.mdm.flow.excution.StartDispatcher;
import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
+import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -77,7 +79,7 @@
if(variables.containsKey("assignee")){
- addApproveRecord(taskId,processInstanceId,comment,programIds,variables);
+ addApproveRecord(taskId,processInstanceId,comment,variables);
//鎸囧畾浜嗕笅涓�姝ユ墽琛屼汉
taskService.complete(taskId, variables);
@@ -89,29 +91,16 @@
}
- void addApproveRecord(String taskId, String processInstanceId, String comment,String programIds,Map<String, Object> variables){
- List<Long> programIdList = new ArrayList<>();
- if(programIds != null){
- programIdList = Func.toLongList(programIds);
- }else{
- programIdList.add(null);
- }
+ void addApproveRecord(String taskId, String processInstanceId, String comment,Map<String, Object> variables){
+ String operateResult = variables.get("approve")+"";
+
Task task = taskService.createTaskQuery()
.taskId(taskId)
.singleResult();
- for(Long programId : programIdList){
- ApproveRecord rec = new ApproveRecord();
- rec.setTaskName(task.getName());
- rec.setComment(comment);
- rec.setNcProgramId(programId);
- rec.setOperateResult(variables.get("approve")+"");//瀹℃壒缁撴灉
- rec.setOperateTime(DateUtil.now());
- rec.setProcessInstanceId(processInstanceId);
- rec.setUserId(AuthUtil.getUserId());
- rec.setUserNickname(AuthUtil.getNickName());
+ approveRecordService.saveApproveRecords(task,processInstanceId,operateResult,comment);
+ List<Long> programIdList = new ArrayList<>();
- approveRecordService.save(rec);
- }
+
}
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/AutoAssignUsersService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/AutoAssignUsersService.java
index 65264c3..1a66a46 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/AutoAssignUsersService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/AutoAssignUsersService.java
@@ -1,28 +1,43 @@
package org.springblade.mdm.flow.excution;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.AllArgsConstructor;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
import org.springblade.mdm.basesetting.producedivision.mapper.ProduceDivisionMapper;
+import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
+import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.Map;
+import java.util.Optional;
/**
* 鑾峰彇鑷姩鍖归厤鐨勪笓涓氱粍闀匡紝缂栧埗浜哄憳锛屾暀鐮斿憳锛屽拰楂樺笀
*/
+@AllArgsConstructor
@Service
public class AutoAssignUsersService {
- @Autowired
- private ProduceDivisionMapper divMapper;
- public Map<String,Object> autoAssignUsers(long producePlanId){
- ProduceDivision pplan = divMapper.selectById(producePlanId);
+ //private final ProduceDivisionMapper divMapper;
+ private final ProduceDivisionService divService;
+
+ public Map<String,Object> autoAssignUsers(TaskAssignVO startVO){
+ LambdaQueryWrapper<ProduceDivision> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ProduceDivision::getDrawingNo,startVO.getDrawingNo());
+ Optional<ProduceDivision> optDiv = divService.getOneOpt(queryWrapper);
+
+ if(!optDiv.isPresent()){
+ throw new RuntimeException("鏈壘鍒颁富鍒跺垎宸ヨ〃鏁版嵁");
+ }
+
+ ProduceDivision division = optDiv.get();
Map<String,Object> result = new HashMap<String,Object>();
- result.put("teamLeader",pplan.getTeamLeaderId());
- result.put("programmer",pplan.getProgrammerId());
- result.put("checker",pplan.getCheckerId());
- result.put("senior",pplan.getSeniorId());
+ result.put("teamLeader",division.getTeamLeaderId());
+ result.put("programmer",division.getProgrammerId());
+ result.put("checker",division.getCheckerId());
+ result.put("senior",division.getSeniorId());
return result;
}
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 49b4588..0570445 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
@@ -41,7 +41,7 @@
*/
public void start(TaskAssignVO startVO){
- Map<String,Object> preAssignee = autoAssignUsersService.autoAssignUsers(startVO.getProducePlanId());
+ Map<String,Object> preAssignee = autoAssignUsersService.autoAssignUsers(startVO);
Map<String, Object> vars = new HashMap<>(preAssignee);
vars.put("machineCode",startVO.getMachineCode());
@@ -53,13 +53,13 @@
vars.put("craftEdition",startVO.getCraftEdition());
vars.put("planStartTime",startVO.getPlanStartTime());
- vars.put("partNo",startVO.getPartNo());
- vars.put("partNoEdition",startVO.getPartNoEdition());
+ vars.put("drawingNo",startVO.getDrawingNo());
+ vars.put("drawingNoEdition",startVO.getDrawingNoEdition());
vars.put("planLockDays",startVO.getPlanLockDays());
vars.put("productModel",startVO.getProductModel());
- List<NcProgram> curedNcPrograms = ncProgramService.getCuredNcProgram(startVO.getPartNo(),startVO.getMachineCode());
+ List<NcProgram> curedNcPrograms = ncProgramService.getCuredNcProgram(startVO.getDrawingNo(),startVO.getMachineCode());
//璁剧疆鏄惁鏈夊浐鍖栫▼搴忔爣璁�
vars.put("hasCuredProgram",!curedNcPrograms.isEmpty() ? "Y":"N");
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java
index ae3d979..5160903 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveRecordService.java
@@ -1,12 +1,19 @@
package org.springblade.mdm.flow.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.flowable.task.api.Task;
import org.springblade.core.mp.base.BizServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.mapper.ApproveRecordMapper;
import org.springblade.mdm.flow.vo.ApproveRecordVO;
+import org.springblade.mdm.program.entity.ProcessProgRef;
+import org.springblade.mdm.program.service.ProcessProgRefService;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -20,8 +27,77 @@
@Service
@AllArgsConstructor
public class ApproveRecordService extends BizServiceImpl<ApproveRecordMapper, ApproveRecord> {
-
+ private final ProcessProgRefService processProgRefService;
public List<ApproveRecordVO> listByNcProgramId(Long ncProgramId) {
return this.getBaseMapper().listByNcProgramId(ncProgramId);
}
+
+ public void saveApproveRecords(Task task, String processInstanceId, String operateResult, String comment) {
+ LambdaQueryWrapper<ProcessProgRef> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ProcessProgRef::getProcessInstanceId, processInstanceId);
+ List<ProcessProgRef> refList = processProgRefService.list(queryWrapper);
+ if(!refList.isEmpty()) {
+ for (ProcessProgRef refObj : refList) {
+ ApproveRecord rec = new ApproveRecord();
+ rec.setTaskName(task.getName());
+ rec.setComment(comment);
+ rec.setNcProgramId(refObj.getNcProgramId());
+ rec.setOperateResult(operateResult);//瀹℃壒缁撴灉
+ rec.setOperateTime(DateUtil.now());
+ rec.setProcessInstanceId(processInstanceId);
+ rec.setUserId(AuthUtil.getUserId());
+ rec.setUserNickname(AuthUtil.getNickName());
+
+ save(rec);
+ }
+
+ //妫�鏌cprogram涓簄ull鐨勬暟鎹�
+ updateApproveRecords(processInstanceId);
+ }else{
+ //濡傛灉杩樻病鏈夊叧鑱旂殑绋嬪簭鏁版嵁锛屽垯鎻掑叆涓�涓猵rogramId涓簄ull鐨�
+ ApproveRecord rec = new ApproveRecord();
+ rec.setTaskName(task.getName());
+ rec.setProcessInstanceId(processInstanceId);
+ rec.setOperateResult(operateResult);
+ rec.setOperateTime(DateUtil.now());
+ rec.setNcProgramId(null);//绌虹殑绋嬪簭id
+ rec.setUserId(AuthUtil.getUserId());
+ rec.setUserNickname(AuthUtil.getNickName());
+
+ save(rec);
+ }
+ }
+
+ void updateApproveRecords(String processInstanceId) {
+ LambdaQueryWrapper<ProcessProgRef> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(ProcessProgRef::getProcessInstanceId, processInstanceId).isNull(ProcessProgRef::getNcProgramId);
+ List<ProcessProgRef> refList = processProgRefService.list(queryWrapper);
+ if(refList.isEmpty()) {
+ return;
+ }
+ List<ApproveRecord> records = this.lambdaQuery().isNull(ApproveRecord::getNcProgramId).eq(ApproveRecord::getProcessInstanceId, processInstanceId).list();
+ if(records.isEmpty()) {
+ return;
+ }
+
+ for(ApproveRecord record:records) {
+
+ for(int j=0;j< refList.size();j++) {
+ ProcessProgRef refObj = refList.get(j);
+
+ ApproveRecord record2 = new ApproveRecord();
+ BeanUtils.copyProperties(record, record2);
+ record2.setNcProgramId(refObj.getNcProgramId());
+
+ if(j>0){
+ record2.setId(null);
+ save(record2);
+ }else{
+ updateById(record2);
+ }
+ }
+
+ }
+
+ }
}
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 e952ba9..1489e36 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
@@ -10,9 +10,9 @@
@Schema(description = "浠诲姟璁″垝")
public class TaskAssignVO {
@Schema(description = "闆剁粍浠�/鍥惧彿")
- private String partNo;
+ private String drawingNo;
@Schema(description = "鍥惧彿鐗堟/璁捐鐗堟")
- private String partNoEdition;
+ private String drawingNoEdition;
@Schema(description = "宸ュ簭鍙�")
private String processNo;
@Schema(description = "宸ュ簭鍚嶇О")
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmParamController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmParamController.java
index 7f028d8..89da234 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmParamController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/MdmParamController.java
@@ -35,7 +35,7 @@
@GetMapping("/getValue")
@ApiOperationSupport(order = 2)
@Operation(summary = "鑾峰彇鍙傛暟鍊�")
- public R<String> detail(@Parameter(description = "鍙傛暟Key") @RequestParam String paramKey) {
+ public R<String> getValue(@Parameter(description = "鍙傛暟Key") @RequestParam String paramKey) {
try {
return sysClient.getParamValue(paramKey);
}catch (Exception e){
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java
index 7e2fbfe..fbc670b 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java
@@ -5,9 +5,6 @@
import lombok.Setter;
import org.springblade.core.mp.base.BizEntity;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
@Setter
@Getter
@TableName("mdm_nc_node")
@@ -43,7 +40,7 @@
/**
* 闆剁粍浠跺彿/鍥惧彿
*/
- private String partNo;
+ private String drawingNo;
/**
* 鍥惧彿鐗堟
*/
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java
index fda3af2..2739a5b 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java
@@ -58,7 +58,7 @@
/**
* 闆剁粍浠跺彿/鍥惧彿
*/
- private String partNo;
+ private String drawingNo;
/**
* 鎻忚堪
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
index 19b09ce..62a8d14 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcNodeMapper.xml
@@ -24,11 +24,11 @@
<!-- <select id="parentTree" resultMap="treeNodeResultMap">-->
<!-- select id, parent_id, dict_value as title, id as "value", id as "key" from blade_dict where is_deleted = 0 and parent_id = 0-->
<!-- </select>-->
- <sql id="prog_all_columns">id,tenant_id,nc_node_id,code,name,machine_code,part_no,is_cured,
+ <sql id="prog_all_columns">id,tenant_id,nc_node_id,code,name,machine_code,draw_no,is_cured,
expire_date,process_edition,is_last_edition,is_locked,task_assign_time,status,create_dept,is_deleted,create_time,create_user,update_time,update_user</sql>
<select id="getCuredNcProgram" resultMap="BaseResultMap">
select <include refid="prog_all_columns"/> from mdm_nc_program
- where is_deleted=0 and is_cured=1 and part_no=#{partNo} and is_last_edition=1
+ where is_deleted=0 and is_cured=1 and drawing_no=#{drawingNo} and is_last_edition=1
and machine_code in (select code from mdm_machine where machine_group_code=#{machineGroupCode})
order by create_time desc
limit 1
@@ -43,7 +43,7 @@
FROM
mdm_nc_node
WHERE
- parent_id = id and is_deleted = 0
+ parent_id = n.id and is_deleted = 0
) AS "has_children" from mdm_nc_node n left join blade_user u on n.create_user=u.id where n.is_deleted=0 and n.parent_id=#{parentId}
</select>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java
index 0233b9f..8f1d071 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.java
@@ -18,11 +18,11 @@
/**
* 鑾峰彇鏈�鏂板浐鍖栫▼搴�
- * @param partNo 闆剁粍浠跺彿
+ * @param drawingNo 闆剁粍浠跺彿
* @param machineGroupCode 鏈哄簥缁勪唬鐮�
* @return
*/
- List<NcProgram> getCuredNcProgram( @Param("partNo")String partNo,@Param("machineGroupCode")String machineGroupCode);
+ List<NcProgram> getCuredNcProgram( @Param("drawingNo")String drawingNo,@Param("machineGroupCode")String machineGroupCode);
IPage<NcProgramVO> pageQuery(@Param("page")IPage<NcNodeProgramVO> page, @Param("query") NcNodeProgramQueryVO query);
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml
index c99c185..b77475a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml
@@ -8,7 +8,7 @@
<result column="package_name" property="packageName"/>
<result column="machine_code" property="machineCode"/>
- <result column="part_no" property="partNo"/>
+ <result column="drawing_no" property="drawingNo"/>
<result column="is_cured" property="isCured"/>
<result column="expire_date" property="expireDate"/>
<result column="process_edition" property="processEdition"/>
@@ -34,17 +34,17 @@
<!-- <select id="parentTree" resultMap="treeNodeResultMap">-->
<!-- select id, parent_id, dict_value as title, id as "value", id as "key" from blade_dict where is_deleted = 0 and parent_id = 0-->
<!-- </select>-->
- <sql id="all_columns">id,tenant_id,nc_node_id,code,name,machine_code,part_no,is_cured,
+ <sql id="all_columns">id,tenant_id,nc_node_id,code,name,machine_code,drawing_no,is_cured,
expire_date,process_edition,is_last_edition,is_locked,task_assign_time,status,create_dept,is_deleted,create_time,create_user,update_time,update_user</sql>
<select id="getCuredNcProgram" resultMap="BaseResultMap">
select <include refid="all_columns"/> from mdm_nc_program
- where is_deleted=0 and is_cured=1 and part_no=#{partNo} and is_last_edition=1
+ where is_deleted=0 and is_cured=1 and drawing_no=#{drawingNo} and is_last_edition=1
and machine_code in (select code from mdm_machine where machine_group_code=#{machineGroupCode})
order by create_time desc
</select>
<select id="pageQuery" resultType="org.springblade.mdm.program.vo.NcProgramVO">
- select id,nc_node_id,name,machine_code,part_no,part_no_edition,process_name,craft_edition from mdm_nc_program p
+ select id,nc_node_id,name,machine_code,drawing_no,drawing_no_edition,process_name,craft_edition from mdm_nc_program p
where is_deleted=0 and is_last_edition=1 and (category='program' or category='subprogram')
<where>
@@ -53,10 +53,5 @@
</if>
</where>
</select>
- <!--
- <select id="getLastNcProgram" resultType="org.springblade.mdm.program.entity.NcProgram">
- select <include refid="all_columns"/> from mdm_nc_program
- where is_deleted=0 and is_last_edition=1 order by create_time desc limit 1
- </select>
- -->
+
</mapper>
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
index 1f285df..417d28b 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
@@ -25,7 +25,6 @@
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.entity.NcProgramExchange;
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
-import org.springblade.mdm.program.vo.DncSendBackData;
import org.springblade.mdm.program.vo.MdmProgramImportVO;
import org.springblade.mdm.utils.CustomBinaryReader;
import org.springframework.stereotype.Service;
@@ -36,7 +35,6 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.Duration;
-import java.time.LocalDateTime;
import java.util.*;
/**
@@ -146,7 +144,7 @@
d.setIsTest(jsonObject.getInteger("isTest"));
d.setMachineCode(jsonObject.getString("machineCode"));
d.setNcNodeId(jsonObject.getLong("ncNodeId"));
- d.setPartNo(jsonObject.getString("partNo"));
+ d.setDrawingNo(jsonObject.getString("drawingNo"));
d.setProcessEdition(jsonObject.getString("processEdition"));
fileDataMap.put(d.getName(),d);
@@ -252,7 +250,7 @@
d.setIsTest(jsonObject.getInteger("isTest"));
d.setMachineCode(jsonObject.getString("machineCode"));
d.setNcNodeId(jsonObject.getLong("ncNodeId"));
- d.setPartNo(jsonObject.getString("partNo"));
+ d.setDrawingNo(jsonObject.getString("drawingNo"));
d.setProcessEdition(jsonObject.getString("processEdition"));
setBaseProperties(d,jsonObject);
@@ -273,7 +271,7 @@
node.setDescription(jsonObject.getString("description"));
node.setNodeType(jsonObject.getString("nodeType"));
node.setProcessName(jsonObject.getString("processName"));
- node.setPartNo(jsonObject.getString("partNo"));
+ node.setDrawingNo(jsonObject.getString("drawingNo"));
node.setMachineCode(jsonObject.getString("machineCode"));
node.setParentId(jsonObject.getLong("parentId"));
node.setParentIds(jsonObject.getString("parentIds"));
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExchangeService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExchangeService.java
index e2e2241..a685a4b 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExchangeService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExchangeService.java
@@ -3,19 +3,14 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
-import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.compress.archivers.zip.ZipFile;
import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
-import org.apache.commons.io.IOUtils;
import org.springblade.core.mp.base.BizEntity;
import org.springblade.core.mp.base.BizServiceImpl;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
import org.springblade.core.oss.OssTemplate;
import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.redis.cache.BladeRedis;
@@ -23,7 +18,6 @@
import org.springblade.core.tool.utils.FileUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.IoUtil;
-import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.service.CureFlowService;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgram;
@@ -31,7 +25,6 @@
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springblade.mdm.utils.CustomBinaryReader;
-import org.springblade.mdm.utils.FileExchangeUtil;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -240,7 +233,7 @@
program.setIsTest(jsonObject.getInteger("isTest"));
program.setMachineCode(jsonObject.getString("machineCode"));
program.setNcNodeId(jsonObject.getLong("ncNodeId"));
- program.setPartNo(jsonObject.getString("partNo"));
+ program.setDrawingNo(jsonObject.getString("drawingNo"));
program.setProcessEdition(jsonObject.getString("processEdition"));
setBaseProperties(program,jsonObject);
@@ -261,7 +254,7 @@
node.setDescription(jsonObject.getString("description"));
node.setNodeType(jsonObject.getString("nodeType"));
node.setProcessName(jsonObject.getString("processName"));
- node.setPartNo(jsonObject.getString("partNo"));
+ node.setDrawingNo(jsonObject.getString("drawingNo"));
node.setMachineCode(jsonObject.getString("machineCode"));
node.setParentId(jsonObject.getLong("parentId"));
node.setParentIds(jsonObject.getString("parentIds"));
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
index 378e5cd..17e2b18 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
@@ -7,16 +7,12 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
-import org.apache.commons.compress.archivers.zip.ZipFile;
-import org.apache.commons.compress.utils.SeekableInMemoryByteChannel;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BizEntity;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.oss.OssTemplate;
-import org.springblade.core.tool.utils.FileUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.service.ApproveRecordService;
@@ -27,12 +23,10 @@
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
import java.io.*;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
-import java.util.Enumeration;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -139,7 +133,7 @@
recObj.put("category",program.getCategory());
recObj.put("description",program.getDescription());
recObj.put("name",program.getName());
- recObj.put("partNo",program.getPartNo());
+ recObj.put("drawingNo",program.getDrawingNo());
recObj.put("ncNodeId",program.getNcNodeId());
recObj.put("bindNcNodeId",program.getBindNcNodeId());
recObj.put("url",program.getUrl());
@@ -233,7 +227,7 @@
recObj.put("description",node.getDescription());
recObj.put("name",node.getName());
recObj.put("remark",node.getRemark());
- recObj.put("partNo",node.getPartNo());
+ recObj.put("drawingNo",node.getDrawingNo());
recObj.put("parentIds",node.getParentIds());
recObj.put("processName",node.getProcessName());
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
index 3ec932c..dfe7c10 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
@@ -71,20 +71,18 @@
public class NcProgramService extends BizServiceImpl<NcProgramMapper, NcProgram> {
private final MachineService machineService;
-
private final OssTemplate ossTemplate;
private final NcNodeService nodeService;
-
private final ProgramSeqMapper seqMapper;
/**
* 鏌ヨ鐜版湁鍥哄寲鐨勭▼搴忥紝鏆傚畾鏉′欢锛氶浂缁勪欢鍙风浉鍚岋紝涓旀槸鍚屼竴鏈哄簥缁�
- * @param partNo
+ * @param drwaingNo
* @param machineCode
* @return
*/
- public List<NcProgram> getCuredNcProgram(String partNo,String machineCode) {
+ public List<NcProgram> getCuredNcProgram(String drwaingNo,String machineCode) {
Machine machine = machineService.getByCode(machineCode);
- return this.getBaseMapper().getCuredNcProgram(partNo,machine.getMachineGroupCode());
+ return this.getBaseMapper().getCuredNcProgram(drwaingNo,machine.getMachineGroupCode());
}
@@ -103,7 +101,7 @@
prog.setName(file.getOriginalFilename());
prog.setNcNodeId(uploadVO.getNodeId());
prog.setOssName(bfile.getName());
- prog.setPartNo(uploadVO.getPartNo());
+ prog.setDrawingNo(uploadVO.getDrawingNo());
prog.setProcessEdition(uploadVO.getProcessEdition());
prog.setIsLastEdition(1);
boolean isTextFile = false;
@@ -134,7 +132,7 @@
prog.setName(file.getOriginalFilename());
prog.setNcNodeId(uploadVO.getNodeId());
prog.setOssName(bfile.getName());
- prog.setPartNo(uploadVO.getPartNo());
+ prog.setDrawingNo(uploadVO.getDrawingNo());
prog.setProcessEdition(uploadVO.getProcessEdition());
prog.setIsLastEdition(1);
prog.setMachineCode(uploadVO.getMachineCode());
@@ -153,7 +151,7 @@
node.setName(prog.getName());
node.setMachineCode(uploadVO.getMachineCode());
node.setParentId(uploadVO.getNodeId());
- node.setPartNo(uploadVO.getPartNo());
+ node.setDrawingNo(uploadVO.getDrawingNo());
node.setProcessName(uploadVO.getProcessName());
nodeService.save(node);
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/MdmProgramImportVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/MdmProgramImportVO.java
index 74ede51..81975b5 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/MdmProgramImportVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/MdmProgramImportVO.java
@@ -4,9 +4,6 @@
import lombok.Getter;
import lombok.Setter;
-import java.time.LocalDateTime;
-import java.util.List;
-
/**
* 鍦ㄥ伐鎺х綉瀵煎叆MDM绋嬪簭
*/
@@ -48,7 +45,7 @@
private String machineCode;
@Schema(description = "鍥惧彿")
- private String partNo;
+ private String drawingNo;
/**
* 鎻忚堪
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeProgramVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeProgramVO.java
index e416857..2e0cab0 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeProgramVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeProgramVO.java
@@ -34,5 +34,5 @@
private String craftEdition;
@Schema(description = "闆剁粍浠跺彿/鍥惧彿")
- private String partNo;
+ private String drawingNo;
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramExportDncPageVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramExportDncPageVO.java
index 19e1c26..e8e4daf 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramExportDncPageVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramExportDncPageVO.java
@@ -14,9 +14,9 @@
@Schema(description = "绋嬪簭鍚嶇О")
private String name;
@Schema(description = "鍥惧彿")
- private String partNo;
+ private String drawingNo;
@Schema(description = "鍥惧彿鐗堟")
- private String partNoEdition;
+ private String drawingNoEdition;
@Schema(description = "宸ュ簭鍚嶇О")
private String processName;
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java
index dacd3a7..9392022 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java
@@ -21,7 +21,7 @@
private MultipartFile file;
@Schema(description = "闆剁粍浠跺彿/鍥惧彿")
- private String partNo;
+ private String drawingNo;
@Schema(description = "宸ュ簭锛屽鈥滅簿閾ｂ��")
private String processName;
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramVO.java
index ce34105..b855e81 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramVO.java
@@ -28,9 +28,9 @@
private String craftEdition;
@Schema(description = "闆剁粍浠跺彿/鍥惧彿")
- private String partNo;
+ private String drawingNo;
@Schema(description = "闆剁粍浠跺彿/鍥惧彿鐗堟")
- private String partNoEdition;
+ private String drawingNoEdition;
@Schema(description = "鏄惁娴嬭瘯绋嬪簭.1鏄�;0鍚�")
private Integer isTest;
--
Gitblit v1.9.3