From 103f52ade0f77e420dec306ea3b51d0a3c0ac3ee Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 19 三月 2025 13:23:12 +0800
Subject: [PATCH] art: 设备管理-系统业务编码生成，工艺参数维护功能修改
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
index 8bb0199..819c3bf 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
@@ -1,26 +1,19 @@
package org.jeecg.modules.dnc.service.impl;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import liquibase.pro.packaged.P;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.dnc.exception.ExceptionCast;
import org.jeecg.modules.dnc.mapper.ProcessStreamMapper;
+import org.jeecg.modules.dnc.request.ProcessStreamRequest;
import org.jeecg.modules.dnc.response.*;
-
import org.jeecg.modules.dnc.service.*;
import org.jeecg.modules.dnc.utils.ValidateUtil;
-
-
-import org.jeecg.modules.dnc.request.ProcessStreamRequest;
-import org.jeecg.modules.dnc.entity.*;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.entity.SysUser;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +48,8 @@
private IDocRelativeService iDocRelativeService;
@Autowired
private IProcessStreamPermissionService processStreamPermissionService;
+ @Autowired
+ private IProductMixService productMixService;
@Autowired
private IProductPermissionService productPermissionService;
@@ -136,6 +131,16 @@
if (!b) {
ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR);
}
+ //娣诲姞缁撴瀯鏍�
+ ProductMix productMix;
+ if (stream.getPsvId() != null) {
+ productMix = new ProductMix(Long.parseLong(stream.getProcessId()),Long.parseLong(stream.getPsvId())
+ ,stream.getProcessName(),stream.getProcessCode(),5);
+ }else {
+ productMix = new ProductMix(Long.parseLong(stream.getProcessId()),Long.parseLong(stream.getComponentId())
+ ,stream.getProcessName(),stream.getProcessCode(),5);
+ }
+ productMixService.save(productMix);
//娣诲姞鏉冮檺楠岃瘉
PermissionStreamNew permissionStream = new PermissionStreamNew();
permissionStream.setUserId(userId);
@@ -161,6 +166,11 @@
stream.setProcessName(stream.getProcessName().toUpperCase());
stream.setProcessCode(null);
boolean b = super.updateById(stream);
+ //鍚屾淇敼缁撴瀯鏍�
+ ProductMix productMix = productMixService.getById(Long.parseLong(id));
+ productMix.setName(stream.getProcessName());
+ productMix.setCode(stream.getProcessCode());
+ productMixService.updateById(productMix);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
ProcessInfo processInfo = new ProcessInfo();
@@ -187,6 +197,9 @@
if (!docRelativeList.isEmpty()){
ExceptionCast.cast(ProcessInfoCode.PROCESS_HAS_DOC);
}
+ boolean b = productMixService.removeById(id);
+ if(!b)
+ ExceptionCast.cast(CommonCode.FAIL);
return super.removeById(id);
}
--
Gitblit v1.9.3