From 88fab7bde2a5c4e5831164fa7db54ab59caa6fb0 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 10 七月 2025 15:20:24 +0800
Subject: [PATCH] node返回增加字段
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java | 4 ++--
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionViewVO.java | 4 ++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/mapper/ProduceDivisionMapper.xml | 2 +-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java | 10 ++++++----
4 files changed, 13 insertions(+), 7 deletions(-)
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 6bc337c..becc1cd 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
@@ -14,7 +14,7 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>-->
<select id="pageQuery" resultType="org.springblade.mdm.basesetting.producedivision.vo.ProduceDivisionViewVO">
- select p.id,p.team_leader_id,p.programmer_id,p.checker_id,p.senior_id,l.name team_leader_name,pro.name programmer_name,c.name checker_name,s.name seniorName
+ select p.id,p.drawing_no,p.team_leader_id,p.programmer_id,p.checker_id,p.senior_id,l.name team_leader_name,pro.name programmer_name,c.name checker_name,s.name seniorName
from mdm_produce_division p join blade_user l on p.team_leader_id=l.id and l.is_deleted=0
join blade_user pro on p.programmer_id=pro.id and pro.is_deleted=0
join blade_user c on p.checker_id=c.id and c.is_deleted=0
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionViewVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionViewVO.java
index 64eb4ef..9bb771d 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionViewVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/vo/ProduceDivisionViewVO.java
@@ -12,8 +12,12 @@
@Getter
public class ProduceDivisionViewVO extends BaseVO {
+ @Schema(description = "闆剁粍浠跺彿/鍥惧彿")
+ private String drawingNo;
+
@Schema(description = "涓撲笟缁勯暱id")
private Long teamLeaderId;
+ @Schema(description = "涓撲笟缁勯暱濮撳悕")
private String teamLeaderName;
@Schema(description = "缂栧埗宸ヨ壓鍛榠d")
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
index 5c65bf6..9bf2c07 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcProgramController.java
@@ -96,8 +96,8 @@
@PostMapping("/upgrade-process-edition")
@Operation(summary = "鍗囩増", description = "鍗囩骇宸ュ簭鐗堟")
- public R<Boolean> upgradeProcessEdition(Long id,String newProcessEdition ) {
- ncProgramService.upgradeProcessEdition(id,newProcessEdition);
+ public R<Boolean> upgradeProcessEdition(Long bindNcNodeId,String newProcessEdition ) {
+ ncProgramService.upgradeProcessEdition(bindNcNodeId,newProcessEdition);
return R.<Boolean>status(true);
}
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 7b60fa7..66fbc5b 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
@@ -244,13 +244,15 @@
/**
* 鍗囩増(鍗囩骇宸ュ簭鐗堟),鍗囩骇宸ュ簭鐗堟湰锛堝寘鎷▼搴忓拰鍏朵粬闄勪欢锛�
- * @param id 绋嬪簭鏂囦欢id
+ * @param bindNodeid 绋嬪簭鏂囦欢缁戝畾鐨勮妭鐐筰d
* @param newProcessEdition 鏂扮増娆�
*/
- public void upgradeProcessEdition(long id,String newProcessEdition) {
- NcProgram prog = this.getById(id);
+ public void upgradeProcessEdition(long bindNcNodeid,String newProcessEdition) {
+ //NcProgram prog = this.getById(id);
+ NcProgram prog = getByBindNodeId(bindNcNodeid);
+
//灏嗙幇鏈夌▼搴忔洿鏂颁负闈炴渶鏂扮増鏈�
- this.update(Wrappers.lambdaUpdate(NcProgram.class).eq(NcProgram::getId,id).set(NcProgram::getIsLastEdition,0));
+ this.update(Wrappers.lambdaUpdate(NcProgram.class).eq(NcProgram::getBindNcNodeId,bindNcNodeid).set(NcProgram::getIsLastEdition,0));
NcProgram newVerProg = new NcProgram();
BeanUtils.copyProperties(prog, newVerProg);
--
Gitblit v1.9.3