修改字段错误

yangys

2025-06-30 cf7234b1fc2c5827fdb126ba2f7db2456f2c1da6

修改字段错误

 blade-service/blade-mdm/pom.xml

@@ -75,6 +75,11 @@
            <artifactId>tika-core</artifactId>
            <version>3.2.0</version>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-devtools</artifactId>
            <optional>true</optional>
        </dependency>
        <!--<dependency>
            <groupId>org.springblade</groupId>
            <artifactId>blade-starter-transaction</artifactId>

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java

@@ -76,15 +76,15 @@
    /**
     * æ˜¯å¦æœ€æ–°ç‰ˆæ¬¡ï¼Œ1：最新版次；0:历史版次
     */
    private Integer isLastEdition;
    private Integer isLastEdition = 1;
    /**
     * æ˜¯å¦é”å®š
     */
    private Integer isLocked;
    private Integer isLocked = 0;
    /**
     * æ˜¯å¦æµ‹è¯•ç¨‹åº
     */
    private Integer isTest;
    private Integer isTest = 0;
    /**
     * ä»»åŠ¡åˆ†æ´¾æ—¶é—´
     */

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/ProgramSeq.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package org.springblade.mdm.program.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Getter;
import lombok.Setter;
import org.springblade.core.mp.base.BizEntity;

import java.time.LocalDate;
import java.util.Date;

@Setter
@Getter
@TableName("mdm_program_seq")
public class ProgramSeq {
    private long id;
    private Date createTime;
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProgramSeqMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
package org.springblade.mdm.program.mapper;

import org.springblade.mdm.program.entity.ProgramSeq;

import java.util.List;

public interface ProgramSeqMapper{
    void insert(ProgramSeq entity);
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/ProgramSeqMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.springblade.mdm.program.mapper.ProgramSeqMapper">

    <insert id="insert" useGeneratedKeys="true" keyProperty="id">
        INSERT INTO mdm_program_seq(create_time)
        VALUES(current_time)
    </insert>
</mapper>

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java

@@ -37,8 +37,10 @@
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.ProgramSeq;
import org.springblade.mdm.program.mapper.NcProgramMapper;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.mapper.ProgramSeqMapper;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springblade.mdm.program.vo.NcProgramUploadVO;
import org.springblade.mdm.program.vo.NcProgramVO;
@@ -50,6 +52,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;

@@ -67,6 +70,8 @@

    private final OssTemplate ossTemplate;
    private final NcNodeService nodeService;

    private final ProgramSeqMapper seqMapper;
    /**
     * æŸ¥è¯¢çŽ°æœ‰å›ºåŒ–的程序，暂定条件：零组件号相同，且是同一机床组
     * @param partNo
@@ -84,16 +89,20 @@
     * @param uploadVO ä¸Šä¼ æ–‡ä»¶è¡¨å•æ•°æ®
     */
    public void uploadProgramFile(NcProgramUploadVO uploadVO) {


        MultipartFile file = uploadVO.getFile();
        BladeFile bfile = ossTemplate.putFile(uploadVO.getFile());
        String link = bfile.getLink();
        //保存profame
        NcProgram prog = new NcProgram();
        prog.setCode(generageCode());
        prog.setName(file.getOriginalFilename());
        prog.setNcNodeId(uploadVO.getNodeId());
        prog.setOssName(bfile.getName());
        prog.setPartNo(uploadVO.getPartNo());
        prog.setProcessEdition(uploadVO.getProcessEdition());
        prog.setIsLastEdition(1);
        boolean isTextFile = false;
        try {
            isTextFile = FileContentUtil.isTextFile(file.getInputStream());
@@ -107,6 +116,13 @@
        this.save(prog);
    }

    String generageCode(){
        ProgramSeq program = new ProgramSeq();
        seqMapper.insert(program);

        DecimalFormat df = new DecimalFormat("0000000000");
        return df.format(program.getId());
    }
    /**
     * åˆ é™¤ä¸€ä¸ªç¨‹åº
     * @param id

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcProgramUploadVO.java

@@ -11,7 +11,7 @@
 */
@Setter
@Getter
public class NcProgramUploadVO extends BaseVO {
public class NcProgramUploadVO {
    @Schema(description = "所属节点id")
    private Long nodeId;