From bfc5f67af0bd2d28e2db352987a7b4c535058d8d Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期一, 01 七月 2024 14:00:03 +0800
Subject: [PATCH] some AIP change
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java | 9 -
pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml | 22 ++++
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrAssemblyPlanMapper.java | 2
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 192 +++++++++++++++++++++-----------------
pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml | 62 ++++++++++++
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 2
6 files changed, 196 insertions(+), 93 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrAssemblyPlanMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrAssemblyPlanMapper.java
index 21827e7..1399572 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrAssemblyPlanMapper.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrAssemblyPlanMapper.java
@@ -36,4 +36,6 @@
boolean exists(String name, Long id);
List<PrAssemblyPlan> selectAssyPlanList(PrAssemblyPlan params);
+
+ List<PrAssemblyPlan> selectAssyPlanSimplify(PrAssemblyPlan params);
}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
index 95678f7..99f0628 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
@@ -6,13 +6,9 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import com.dy.pmsGlobal.pojoBa.BaUser;
-import com.dy.pmsGlobal.pojoPr.PrProductionNode;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotEmpty;
+import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
import jakarta.validation.constraints.NotNull;
import lombok.*;
-
-
import java.util.Date;
import java.util.List;
@@ -90,6 +86,9 @@
@TableField(exist = false)
public String nodeName;
+
+ @TableField(exist = false)
+ public PrAssemblyPlan plan;
/**
* 浠诲姟璁ら鏃堕棿
*/
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
index 8a0e8c7..ddbf664 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
@@ -30,6 +30,24 @@
select="com.dy.pmsGlobal.daoPr.PrProductionProcessMapper.selectByPrimaryKey" fetchType="eager" column="process_id" />
</resultMap>
+ <resultMap id="PlanResultMap" type="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="proId" column="pro_id" jdbcType="BIGINT"/>
+ <result property="batchId" column="batch_id" jdbcType="BIGINT"/>
+ <result property="processId" column="process_id" jdbcType="BIGINT"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="number" column="number" jdbcType="INTEGER"/>
+ <result property="status" column="status" jdbcType="TINYINT"/>
+ <result property="creator" column="creator" jdbcType="VARCHAR"/>
+ <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
+ <result property="startDate" column="start_date" jdbcType="VARCHAR"/>
+ <result property="endDate" column="end_date" jdbcType="VARCHAR"/>
+ <result property="deleted" column="deleted" jdbcType="TINYINT"/>
+ <result property="content" column="content" jdbcType="VARCHAR"/>
+ <collection property="process" ofType="com.dy.pmsGlobal.pojoPr.PrProductionProcess"
+ select="com.dy.pmsGlobal.daoPr.PrProductionProcessMapper.selectByProcessId" fetchType="eager" column="process_id" />
+ </resultMap>
+
<sql id="Base_Column_List">
id,pro_id,batch_id,
process_id,name,number,
@@ -65,6 +83,50 @@
from pr_production_node
where process_id = #{processId,jdbcType=BIGINT}
</select>
+ <select id="selectAssyPlanSimplify" resultMap="PlanResultMap" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
+ select
+ <include refid="Base_Column_List" />
+ from pr_assembly_plan
+ <trim prefix="where" suffixOverrides="and">
+ <if test="proId != null">
+ pro_id = #{proId,jdbcType=BIGINT} and
+ </if>
+ <if test="batchId != null">
+ batch_id = #{batchId,jdbcType=BIGINT} and
+ </if>
+ <if test="processId != null">
+ process_id = #{processId,jdbcType=BIGINT} and
+ </if>
+ <if test="name != null">
+ name = #{name,jdbcType=VARCHAR} and
+ </if>
+ <if test="number != null">
+ number = #{number,jdbcType=INTEGER} and
+ </if>
+ <if test="status != null">
+ status = #{status,jdbcType=TINYINT} and
+ </if>
+ <if test="creator != null">
+ creator = #{creator,jdbcType=VARCHAR} and
+ </if>
+ <if test="dt != null">
+ dt = #{dt,jdbcType=TIMESTAMP} and
+ </if>
+ <if test="startDate != null">
+ start_date = #{startDate,jdbcType=VARCHAR} and
+ </if>
+ <if test="endDate != null">
+ end_date = #{endDate,jdbcType=VARCHAR} and
+ </if>
+ <if test="deleted != null">
+ deleted = #{deleted,jdbcType=TINYINT} and
+ </if>
+ <if test="content != null">
+ content = #{content,jdbcType=VARCHAR} and
+ </if>
+ </trim>
+ order by id desc
+ </select>
<select id="selectAssyPlanList" resultMap="BaseResultMap" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
select
<include refid="Base_Column_List" />
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
index f6088af..0386a6a 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
@@ -25,6 +25,19 @@
select="selectByProcess" fetchType="eager" column="id" />
</resultMap>
+ <resultMap id="ProcessResultMap" type="com.dy.pmsGlobal.pojoPr.PrProductionProcess">
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="proId" column="pro_id" jdbcType="BIGINT"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="creator" column="creator" jdbcType="VARCHAR"/>
+ <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
+ <result property="disabled" column="disabled" jdbcType="TINYINT"/>
+ <result property="deleted" column="deleted" jdbcType="TINYINT"/>
+ <result property="remark" column="remark" jdbcType="VARCHAR"/>
+ <collection property="nodes" ofType="com.dy.pmsGlobal.pojoPr.PrProductionNode"
+ select="selectByProcess" fetchType="eager" column="id" />
+ </resultMap>
+
<sql id="Base_Column_List">
id,pro_id,name,
creator,dt,disabled,
@@ -41,13 +54,20 @@
from pr_production_node
where process_id = #{processId,jdbcType=BIGINT}
</select>
- <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <select id="selectByProcessId" parameterType="java.lang.Long" resultMap="ProcessResultMap">
select
<include refid="Base_Column_List" />
from pr_production_process
where id = #{id,jdbcType=BIGINT}
</select>
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List" />
+ from pr_production_process
+ where id = #{id,jdbcType=BIGINT}
+ </select>
+
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from pr_production_process
where id = #{id,jdbcType=BIGINT}
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
index 3d40dbf..4db7548 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java
@@ -184,7 +184,7 @@
long workId = Long.parseLong(vo.workId);
StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
if (workLast == null) {
- throw new RuntimeException("宸ュ崟涓嶅瓨鍦�");
+ throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
}
StaDeviceLast preDeviceRecord = deviceLastDao.selectByDeviceNo(vo.deviceNo);
StaRepairInfo repairInfo = new StaRepairInfo();
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
index dee4203..e75269d 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
@@ -1,7 +1,6 @@
package com.dy.pmsStation.workOrder;
import com.alibaba.excel.util.StringUtils;
-import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.pmsGlobal.daoBa.BaUserMapper;
import com.dy.pmsGlobal.daoOth.OthFileMapper;
import com.dy.pmsGlobal.daoPlt.PltStationMapper;
@@ -27,7 +26,6 @@
import java.util.Date;
import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
@Slf4j
@@ -49,79 +47,88 @@
private FileOperate fileOperate;
private OthFileMapper othFileMapper;
@Value("${dy.webFile.fmUrl}")
- private String fmUrl ;
+ private String fmUrl;
+
@Autowired
public void setAssemblyDao(PrAssemblyPlanMapper assemblyDao) {
this.assemblyDao = assemblyDao;
}
+
@Autowired
- private void setBaUserDao(BaUserMapper baUserDao){
+ private void setBaUserDao(BaUserMapper baUserDao) {
this.baUserDao = baUserDao;
}
+
@Autowired
- private void setPltStationDao(PltStationMapper pltStationDao){
+ private void setPltStationDao(PltStationMapper pltStationDao) {
this.pltStationDao = pltStationDao;
}
+
@Autowired
- private void setStaAssemblyWorkHistoryDao(StaAssemblyWorkHistoryMapper assemblyWorkHistoryDao){
+ private void setStaAssemblyWorkHistoryDao(StaAssemblyWorkHistoryMapper assemblyWorkHistoryDao) {
this.assemblyWorkHistoryDao = assemblyWorkHistoryDao;
}
+
@Autowired
- private void setStaAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao){
+ private void setStaAssemblyWorkLastDao(StaAssemblyWorkLastMapper assemblyWorkLastDao) {
this.assemblyWorkLastDao = assemblyWorkLastDao;
}
+
@Autowired
- public void setFileOperate(FileOperate fileOperate){
+ public void setFileOperate(FileOperate fileOperate) {
this.fileOperate = fileOperate;
}
+
@Autowired
- public void setOthFileMapper(OthFileMapper othFileMapper){
+ public void setOthFileMapper(OthFileMapper othFileMapper) {
this.othFileMapper = othFileMapper;
}
- public BaUser getUserInfo(String id){
+ public BaUser getUserInfo(String id) {
Long userId = null;
- if(StringUtils.isBlank(id)){
+ if (StringUtils.isBlank(id)) {
throw new RuntimeException("鍛樺伐缂栫爜涓嶈兘涓虹┖");
}
//鐢ㄦ埛101
- if(id.startsWith(USER_PREFIX)){
+ if (id.startsWith(USER_PREFIX)) {
userId = Long.parseLong(id.toString().substring(3));
- }else{
+ } else {
userId = Long.parseLong(id.toString());
}
BaUser userInfo = baUserDao.selectByPrimaryKey(userId);
- if(userInfo == null){
- throw new RuntimeException("鍛樺伐缂栫爜:"+ userId +"涓嶅湪绯荤粺涓�,璇峰厛缁存姢鍛樺伐淇℃伅");
- }else if(userInfo.getDisabled()){
- throw new RuntimeException("鍛樺伐("+userInfo.getName()+")缂栫爜:"+ userId +"鍦ㄧ郴缁熷凡绂佺敤,璇峰厛鍚敤鍛樺伐");
+ if (userInfo == null) {
+ throw new RuntimeException("鍛樺伐缂栫爜:" + userId + "涓嶅湪绯荤粺涓�,璇峰厛缁存姢鍛樺伐淇℃伅");
+ } else if (userInfo.getDisabled()) {
+ throw new RuntimeException("鍛樺伐(" + userInfo.getName() + ")缂栫爜:" + userId + "鍦ㄧ郴缁熷凡绂佺敤,璇峰厛鍚敤鍛樺伐");
}
return userInfo;
}
- public PltStation getStationInfo(String id){
+
+ public PltStation getStationInfo(String id) {
//浠呮鏌ュ伐绔欎俊鎭互鍙婂伐绔欏崰鐢ㄦ儏鍐�
Long stationId = null;
- if(StringUtils.isBlank(id)){
+ if (StringUtils.isBlank(id)) {
throw new RuntimeException("宸ョ珯缂栫爜涓嶈兘涓虹┖");
}
//宸ョ珯103
- if(id.startsWith(STATION_PREFIX)){
+ if (id.startsWith(STATION_PREFIX)) {
stationId = Long.parseLong(id.toString().substring(3));
- }else{
+ } else {
stationId = Long.parseLong(id.toString());
}
PltStation stationInfo = pltStationDao.selectByPrimaryKey(stationId);
- if(stationInfo == null){
- throw new RuntimeException("宸ョ珯缂栫爜:"+ stationId +"涓嶅湪绯荤粺涓�,璇峰厛缁存姢宸ョ珯淇℃伅");
- }else if(stationInfo.getDisabled()){
- throw new RuntimeException("宸ョ珯("+stationInfo.getName()+")缂栫爜:"+ stationId +"鍦ㄧ郴缁熷凡绂佺敤,璇峰厛鍚敤宸ョ珯");
+ if (stationInfo == null) {
+ throw new RuntimeException("宸ョ珯缂栫爜:" + stationId + "涓嶅湪绯荤粺涓�,璇峰厛缁存姢宸ョ珯淇℃伅");
+ } else if (stationInfo.getDisabled()) {
+ throw new RuntimeException("宸ョ珯(" + stationInfo.getName() + ")缂栫爜:" + stationId + "鍦ㄧ郴缁熷凡绂佺敤,璇峰厛鍚敤宸ョ珯");
}
return stationInfo;
}
- public StaAssemblyWorkLast checkStationUsed(String id){
+
+ public StaAssemblyWorkLast checkStationUsed(String id) {
StaAssemblyWorkLast result = new StaAssemblyWorkLast();
PltStation stationInfo = null;
- if(StringUtils.isBlank(id)){
+ if (StringUtils.isBlank(id)) {
throw new RuntimeException("宸ョ珯缂栫爜涓嶈兘涓虹┖,璇锋鏌�");
}
stationInfo = getStationInfo(id);
@@ -130,9 +137,9 @@
param.setStationId(stationInfo.getId());
param.setStatus(STATUS_NORMAL);
List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectList(param);
- if(workLasts.size() > 0){
- BeanUtils.copyProperties(workLasts.get(0),result);
- }else{
+ if (workLasts.size() > 0) {
+ BeanUtils.copyProperties(workLasts.get(0), result);
+ } else {
result.setStationId(stationInfo.getId());
result.setStationName(stationInfo.getName());
result.setLineId(stationInfo.getLineId());
@@ -141,29 +148,29 @@
return result;
}
- public StaAssemblyWorkLast checkUserAndStationUsed(QueryVo vo){
+ public StaAssemblyWorkLast checkUserAndStationUsed(QueryVo vo) {
StaAssemblyWorkLast result = new StaAssemblyWorkLast();
PltStation stationInfo = null;
BaUser userInfo = null;
- if(StringUtils.isBlank(vo.getStationId()) || StringUtils.isBlank(vo.getUserId())){
+ if (StringUtils.isBlank(vo.getStationId()) || StringUtils.isBlank(vo.getUserId())) {
throw new RuntimeException("宸ョ珯缂栫爜鎴栧憳宸ョ紪鐮佸潎涓嶈兘涓虹┖,璇锋鏌�");
}
//宸ョ珯103
- if(vo.getStationId().startsWith(USER_PREFIX)){
+ if (vo.getStationId().startsWith(USER_PREFIX)) {
userInfo = getUserInfo(vo.getStationId());
- }else{
+ } else {
stationInfo = getStationInfo(vo.getStationId());
}
- if(vo.getUserId().startsWith(STATION_PREFIX)){
+ if (vo.getUserId().startsWith(STATION_PREFIX)) {
stationInfo = getStationInfo(vo.getUserId());
- }else{
+ } else {
userInfo = getUserInfo(vo.getUserId());
}
- if(userInfo == null && stationInfo == null){
- throw new RuntimeException("鍛樺伐缂栫爜:"+ vo.getUserId() + "鍜屽伐绔欑紪鐮�:" + vo.getStationId() + "涓嶆纭�,璇锋鏌�");
- }else if(userInfo == null){
- throw new RuntimeException("鍛樺伐缂栫爜:"+ vo.getUserId() + "涓嶆纭�,璇锋鏌�");
- }else if(stationInfo == null){
+ if (userInfo == null && stationInfo == null) {
+ throw new RuntimeException("鍛樺伐缂栫爜:" + vo.getUserId() + "鍜屽伐绔欑紪鐮�:" + vo.getStationId() + "涓嶆纭�,璇锋鏌�");
+ } else if (userInfo == null) {
+ throw new RuntimeException("鍛樺伐缂栫爜:" + vo.getUserId() + "涓嶆纭�,璇锋鏌�");
+ } else if (stationInfo == null) {
throw new RuntimeException("宸ョ珯缂栫爜:" + vo.getStationId() + "涓嶆纭�,璇锋鏌�");
}
//妫�鏌ヨ〃涓璼tationId鏄惁宸茬粡瀛樺湪
@@ -172,14 +179,14 @@
param.setStatus(STATUS_NORMAL);
List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectList(param);
long userId = userInfo.getId();
- if(workLasts.size() > 0){
- List<StaAssemblyWorkLast> userStationList = workLasts.stream().filter(item->userId == item.getUserId()).collect(Collectors.toList());
- if(userStationList.size() == 0){
- throw new RuntimeException("鍛樺伐("+workLasts.get(0).getUserName()+")缂栫爜:"+ workLasts.get(0).getUserId() + "宸茬粡缁戝畾璇ュ伐绔�("+workLasts.get(0).getStationName()+")缂栫爜:" + workLasts.get(0).getStationId() + ".璇峰厛璁╁叾瑙ｇ粦");
- }else{
- BeanUtils.copyProperties(userStationList.get(0),result);
+ if (workLasts.size() > 0) {
+ List<StaAssemblyWorkLast> userStationList = workLasts.stream().filter(item -> userId == item.getUserId()).collect(Collectors.toList());
+ if (userStationList.size() == 0) {
+ throw new RuntimeException("鍛樺伐(" + workLasts.get(0).getUserName() + ")缂栫爜:" + workLasts.get(0).getUserId() + "宸茬粡缁戝畾璇ュ伐绔�(" + workLasts.get(0).getStationName() + ")缂栫爜:" + workLasts.get(0).getStationId() + ".璇峰厛璁╁叾瑙ｇ粦");
+ } else {
+ BeanUtils.copyProperties(userStationList.get(0), result);
}
- }else{
+ } else {
result.setUserId(userInfo.getId());
result.setUserName(userInfo.getName());
result.setStationId(stationInfo.getId());
@@ -188,38 +195,38 @@
}
return result;
}
+
@Transactional
public StaAssemblyWorkLast save(QueryVo vo) {
//鍏坈heck
StaAssemblyWorkLast checkResult = checkUserAndStationUsed(vo);
//鏍￠獙planId processId nodeId
- PrAssemblyPlan params = new PrAssemblyPlan();
- params.setStatus(STATUS_NORMAL);
- params.setId(vo.getPlanId());
- params.setProcessId(vo.getProcessId());
- List<PrAssemblyPlan> planList = selectAssyPlanList(params);
- boolean hasNodeId= planList.stream()
- .flatMap(process -> process.getProcess().getNodes().stream())
+ PrAssemblyPlan assyPlan = assemblyDao.selectByPrimaryKey(vo.getPlanId());
+ if(assyPlan == null){
+ throw new RuntimeException("缁勮浠诲姟宸茬粡鍦ㄧ郴缁熶腑鍒犻櫎璇锋鏌�,鍒锋柊骞堕噸鏂伴�夋嫨浠诲姟");
+ }
+ boolean hasNodeId = assyPlan.getProcess().getNodes().stream()
.anyMatch(node -> node.id.equals(vo.getNodeId()));
- if(!hasNodeId){
+ if (!hasNodeId) {
throw new RuntimeException("鑺傜偣淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇烽噸鏂伴�夋嫨鑺傜偣淇℃伅");
}
+ //鎬庝箞灏嗗彧鍖呭惈杩欎釜鑺傜偣鐨勪俊鎭叏閮ㄥ洖浼犲憿
vo.setLineId(checkResult.getLineId());
StaAssemblyWorkLast staLast = new StaAssemblyWorkLast();
- BeanUtils.copyProperties(vo,staLast);
+ BeanUtils.copyProperties(vo, staLast);
staLast.setUserId(checkResult.getUserId());
staLast.setStationId(checkResult.getStationId());
int count = 0;
- if(checkResult.getId() == null){
- BeanUtils.copyProperties(vo,staLast);
+ if (checkResult.getId() == null) {
+ BeanUtils.copyProperties(vo, staLast);
staLast.setUserId(checkResult.getUserId());
staLast.setStationId(checkResult.getStationId());
staLast.setStatus(STATUS_NORMAL);
staLast.setStartTime(new Date());
count = assemblyWorkLastDao.insertSelective(staLast);
- }else{
+ } else {
//淇濆瓨涓�鏉istory?
- BeanUtils.copyProperties(checkResult,staLast);
+ BeanUtils.copyProperties(checkResult, staLast);
staLast.setPlanId(vo.getPlanId());
staLast.setProcessId(vo.getProcessId());
staLast.setNodeId(vo.getNodeId());
@@ -231,13 +238,18 @@
throw new RuntimeException("鏁版嵁搴撳瓨鍌ㄥけ璐�");
}
StaAssemblyWorkLast result = assemblyWorkLastDao.selectByPrimaryKey(staLast.getId());
+ List<PrProductionNode> nodeInfo =assyPlan.getProcess().getNodes().stream()
+ .filter(node -> node.id.equals(vo.getNodeId())).collect(Collectors.toList());
+ assyPlan.getProcess().setNodes(nodeInfo);
+ result.setPlan(assyPlan);
return result;
}
+
@Transactional
public int logout(String id) {
//鎵惧埌鐧诲綍璁板綍
StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(id));
- if(workLast == null){
+ if (workLast == null) {
throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
}
//鏇存柊鐧诲綍璁板綍
@@ -245,25 +257,27 @@
workLast.setEndTime(new Date());
// 淇濆瓨history
StaAssemblyWorkHistory history = new StaAssemblyWorkHistory();
- BeanUtils.copyProperties(workLast,history);
+ BeanUtils.copyProperties(workLast, history);
//history.setId(null);
int count = assemblyWorkHistoryDao.insertSelective(history);
//鍒犻櫎last
assemblyWorkLastDao.deleteByPrimaryKey(Long.parseLong(id));
return count;
}
- public List<PrAssemblyPlan> selectAssyPlanList(PrAssemblyPlan params){
- List<PrAssemblyPlan> planList = assemblyDao.selectAssyPlanList(params);
- planList.stream().forEach(process -> {
+
+ public List<PrAssemblyPlan> selectAssyPlanList(PrAssemblyPlan params) {
+ List<PrAssemblyPlan> planList = assemblyDao.selectAssyPlanSimplify(params);
+ /* planList.stream().forEach(process -> {
process.getProcess().getNodes().forEach(node -> {
if(node.instruction != null){
addUrl(node.instruction);
}
});
- });
+ });*/
return planList;
}
- private void addUrl(PrWorkingInstruction ins){
+
+ private void addUrl(PrWorkingInstruction ins) {
if (ins == null || ins.fileId == null) {
return;
}
@@ -276,20 +290,21 @@
ins.orgName = file.orgName;
ins.extName = file.extName;
}
+
//workId assistants 浼犵殑鏄崟涓殑userId 蹇呬紶鍙傛暟
public List<BaUser> updateAssistant(QueryVo vo) {
//鎵惧埌workId
StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(vo.getWorkId());
- if(workLast == null){
+ if (workLast == null) {
throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�,璇锋鏌ユ垨閲嶆柊鐧诲綍");
}
//濡傛灉assistants 鏈�101 鍒欏垹鎺�
StringBuilder sb = new StringBuilder();
String[] assistantArr = vo.getAssistants().split(",");
for (String item : assistantArr) {
- if(item.startsWith(USER_PREFIX)){
+ if (item.startsWith(USER_PREFIX)) {
sb.append(item.substring(3)).append(",");
- }else{
+ } else {
sb.append(item).append(",");
}
}
@@ -298,48 +313,49 @@
return userInfo;
}
- public int addAssistant(String workId ,String assistant) {
+ public int addAssistant(String workId, String assistant) {
//鎵惧埌workId
StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
- if(workLast == null){
+ if (workLast == null) {
throw new RuntimeException("绯荤粺涓病鏈夊綋鍓嶇櫥褰曚俊鎭�,璇锋鏌ユ垨閲嶆柊鐧诲綍");
}
BaUser userInfo = getUserInfo(assistant);
//褰撳墠鐧诲綍浜轰笉鑳芥槸杈呭姪浜哄憳
- if(workLast.getUserId() == userInfo.getId()){
- throw new RuntimeException(userInfo.getName() +"鏄綋鍓嶇櫥褰曚汉鍛�,涓嶅繀娣诲姞涓鸿緟鍔╀汉鍛�.");
+ if (workLast.getUserId() == userInfo.getId()) {
+ throw new RuntimeException(userInfo.getName() + "鏄綋鍓嶇櫥褰曚汉鍛�,涓嶅繀娣诲姞涓鸿緟鍔╀汉鍛�.");
}
String userId = userInfo.getId().toString();
- if(StringUtils.isBlank(workLast.getAssistants())){
+ if (StringUtils.isBlank(workLast.getAssistants())) {
workLast.setAssistants(userId);
- }else{
+ } else {
//宸茬粡娣诲姞鐨勮緟鍔╀汉鍛� 涓嶅繀閲嶅娣诲姞
String assistants = workLast.getAssistants();
String[] assistantArr = assistants.split(",");
for (String item : assistantArr) {
- if(userId.equals(item)){
- throw new RuntimeException(userInfo.getName() +"宸茬粡娣诲姞涓鸿緟鍔╀汉鍛�,涓嶅繀閲嶅娣诲姞.");
+ if (userId.equals(item)) {
+ throw new RuntimeException(userInfo.getName() + "宸茬粡娣诲姞涓鸿緟鍔╀汉鍛�,涓嶅繀閲嶅娣诲姞.");
}
}
- workLast.setAssistants(assistants +","+ userId);
+ workLast.setAssistants(assistants + "," + userId);
}
int count = assemblyWorkLastDao.updateByPrimaryKey(workLast);
return count;
}
- public int removeAssistant(String workId ,String assistant) {
+
+ public int removeAssistant(String workId, String assistant) {
//鎵惧埌workId
StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
- if(workLast == null){
+ if (workLast == null) {
throw new RuntimeException("绯荤粺涓病鏈夊綋鍓嶇櫥褰曚俊鎭�,璇锋鏌ユ垨閲嶆柊鐧诲綍");
}
- if((!StringUtils.isBlank(assistant)) && assistant.startsWith(USER_PREFIX)){
+ if ((!StringUtils.isBlank(assistant)) && assistant.startsWith(USER_PREFIX)) {
assistant = assistant.substring(3);
}
- if(!StringUtils.isBlank(workLast.getAssistants())){
+ if (!StringUtils.isBlank(workLast.getAssistants())) {
StringBuilder sb = new StringBuilder();
String[] assistantArr = workLast.getAssistants().split(",");
for (String item : assistantArr) {
- if((!StringUtils.isBlank(assistant)) && (!assistant.equals(item))){
+ if ((!StringUtils.isBlank(assistant)) && (!assistant.equals(item))) {
sb.append(item).append(",");
}
}
@@ -349,13 +365,17 @@
int count = assemblyWorkLastDao.updateByPrimaryKey(workLast);
return count;
}
+
public List<BaUser> getAssistantList(String workId) {
//鎵惧埌workId
StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
- if(workLast == null){
+ if (workLast == null) {
throw new RuntimeException("绯荤粺涓病鏈夊綋鍓嶇櫥褰曚俊鎭�,璇锋鏌ユ垨閲嶆柊鐧诲綍");
}
List<BaUser> assistantList = baUserDao.selectByAssistants(workLast.getAssistants());
return assistantList;
}
+ //鏍规嵁鑺傜偣鐨勬煡鍑鸿妭鐐逛綔涓氭寚瀵间功
+
+ // 鏍规嵁浜у搧鏌ュ嚭浜у搧鏂囦欢 涓昏鎶�鏈弬鏁�
}
\ No newline at end of file
--
Gitblit v1.8.0