解锁产品时解锁锁定时的版本号

whyclxw

2025-04-21 0c57f51c98c6635ebd4e4d880cf6bb7adf7f880f

解锁产品时解锁锁定时的版本号

 src/main/java/com/whyc/pojo/BOMFeedback.java

@@ -43,6 +43,9 @@
    private String receiverIds;
    private String receiverNames;
    private Date createTime;

    //锁定时产品的版本号用户解锁时恢复
    private Integer nowVersion;
    /**
     * 状态说明:
     * 0:未确认
@@ -246,4 +249,12 @@
    public void setAttachFiles(List attachFiles) {
        this.attachFiles = attachFiles;
    }

    public Integer getNowVersion() {
        return nowVersion;
    }

    public void setNowVersion(Integer nowVersion) {
        this.nowVersion = nowVersion;
    }
}

 src/main/java/com/whyc/service/BOMFeedbakService.java

@@ -231,14 +231,15 @@
                //解锁产品
                Integer productId = mapper.selectById(id).getProductId();
                Product product = productService.getById(productId);
                //解锁产品时解锁锁定时的版本号
                int nowVersion=feedbackDB.getNowVersion();
                if(product!=null){
                    int version=product.getVersion();
                    if(version!=-1){
                        phisService.setpHistoryEnable(product.getParentCode(),product.getCustomCode(),version,1,"问题反馈后"+ username +"确认不需要修改bom,系统执行产品解锁",DateUtil.YYYY_MM_DD_HH_MM_SS.format(product.getVersionTime()));
                    if(nowVersion!=-1){
                        phisService.setpHistoryEnable(product.getParentCode(),product.getCustomCode(),nowVersion,1,"问题反馈后"+ username +"确认不需要修改bom,系统执行产品解锁",DateUtil.YYYY_MM_DD_HH_MM_SS.format(product.getVersionTime()));
                    }
                   }else{
                    ProductHistory phis = phisService.getById(productId);
                    phisService.setpHistoryEnable(phis.getParentCode(),phis.getCustomCode(),phis.getVersion(),1,"问题反馈后"+ username +"确认不需要修改bom,系统执行产品解锁",DateUtil.YYYY_MM_DD_HH_MM_SS.format(phis.getVersionTime()));
                    phisService.setpHistoryEnable(phis.getParentCode(),phis.getCustomCode(),nowVersion,1,"问题反馈后"+ username +"确认不需要修改bom,系统执行产品解锁",DateUtil.YYYY_MM_DD_HH_MM_SS.format(phis.getVersionTime()));
                }
            }
        }
@@ -289,9 +290,16 @@
        //for (File file : fileList) {
        //    file.delete();
        //}

        //查询产品的信息
        QueryWrapper hisWrapper=new QueryWrapper();
        hisWrapper.eq("id",feedback.getProductId());
        hisWrapper.last("limit 1");
        ProductHistory phis=phisMapper.selectOne(hisWrapper);
        //保存
        feedback.setCreateTime(date);
        feedback.setConfirmStatus(0);
        feedback.setNowVersion(phis.getVersion());
        mapper.insert(feedback);
        //发送邮件
        String receiverIds = feedback.getReceiverIds();
@@ -334,11 +342,6 @@
        mailService.sendMail(mailDTO);
        //mailUtil.sendMailBatch(senderName,receiverMailList,subject,content);
        //反馈时直接根据productid直接锁定
        //查询产品的信息
        QueryWrapper hisWrapper=new QueryWrapper();
        hisWrapper.eq("id",feedback.getProductId());
        hisWrapper.last("limit 1");
        ProductHistory phis=phisMapper.selectOne(hisWrapper);
        phisService.setpHistoryEnable(phis.getParentCode(),phis.getCustomCode(),phis.getVersion(),0,feedback.getContent(),ActionUtil.sdfwithALL.format(phis.getVersionTime()));
        return new Response().set(1,true,"反馈完成");
    }