From 90a0cf3b0a84756bcefceb2058317c541a4bb22c Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 27 六月 2024 16:24:37 +0800
Subject: [PATCH] some status change to const
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 32 ++++++++++++++++++++------------
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 23 +++++++++++++----------
2 files changed, 33 insertions(+), 22 deletions(-)
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 9566bf2..3d40dbf 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
@@ -12,6 +12,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.*;
@@ -65,13 +66,13 @@
this.repairInfoDao = repairInfoDao;
}
+ @Transactional
public int save(QueryVo params) {
long workId = Long.parseLong(params.workId);
StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
if (workLast == null) {
throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");//宸ュ崟涓嶅瓨鍦�
}
- //fancy 2024/6/27 鏄笉鏄彲浠ヤ笉鐢ㄦ鏌ヤ换鍔′笌璁惧鐮�...
PrAssemblyPlan plan = assemblyPlanDao.selectByPrimaryKey(workLast.getPlanId());
// 楠岃瘉骞跺鐞嗚澶囧彿鍜岀墿鏂欏彿
Set<String> deviceSet = new HashSet<>(Arrays.asList(params.deviceNo.split(",")));
@@ -152,15 +153,17 @@
record.status = getStatus(params.status,node.isEnd);
return record;
}
- private int saveSnEx(StaAssemblyWorkLast workLast, List<String> deviceList,List<String> materialList, PrAssemblyPlan plan){
- StaWipSnEx snEx = new StaWipSnEx();
- snEx.deviceNo = deviceList.get(0);
- snEx.productNo = plan.batchNo;
- snEx.deviceNo = materialList.get(0);
- snEx.createTime = workLast.startTime;
- snEx.createBy = workLast.userId;
- snEx.productName = plan.proName;
- return wipSnExDao.insertSelective(snEx);
+ private void saveSnEx(StaAssemblyWorkLast workLast, List<String> deviceList,List<String> materialList, PrAssemblyPlan plan){
+ for (String material:materialList) {
+ StaWipSnEx snEx = new StaWipSnEx();
+ snEx.deviceNo = deviceList.get(0);
+ snEx.productId = plan.process.proId;
+ snEx.productNo = material;
+ snEx.createTime = workLast.startTime;
+ snEx.createBy = workLast.userId;
+ snEx.productName = plan.proName;
+ wipSnExDao.insertSelective(snEx);
+ }
}
/**
* 鐘舵��: 1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾
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 7686640..dee4203 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
@@ -33,6 +33,14 @@
@Slf4j
@Service
public class WorkOrderSv {
+ private static final int STATUS_NORMAL = 1;
+ private static final int STATUS_WORK_LAST_LOGOUT = 2;
+ private static final int STATUS_REPAIR = 3;
+ private static final int STATUS_WASTE = 4;
+
+ private static final String USER_PREFIX = "101";
+ private static final String STATION_PREFIX = "103";
+
private PrAssemblyPlanMapper assemblyDao;
private BaUserMapper baUserDao;
private PltStationMapper pltStationDao;
@@ -77,7 +85,7 @@
throw new RuntimeException("鍛樺伐缂栫爜涓嶈兘涓虹┖");
}
//鐢ㄦ埛101
- if(id.startsWith("101")){
+ if(id.startsWith(USER_PREFIX)){
userId = Long.parseLong(id.toString().substring(3));
}else{
userId = Long.parseLong(id.toString());
@@ -97,7 +105,7 @@
throw new RuntimeException("宸ョ珯缂栫爜涓嶈兘涓虹┖");
}
//宸ョ珯103
- if(id.startsWith("103")){
+ if(id.startsWith(STATION_PREFIX)){
stationId = Long.parseLong(id.toString().substring(3));
}else{
stationId = Long.parseLong(id.toString());
@@ -120,7 +128,7 @@
//妫�鏌ヨ〃涓璼tationId鏄惁宸茬粡瀛樺湪
StaAssemblyWorkLast param = new StaAssemblyWorkLast();
param.setStationId(stationInfo.getId());
- param.setStatus(1);
+ param.setStatus(STATUS_NORMAL);
List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectList(param);
if(workLasts.size() > 0){
BeanUtils.copyProperties(workLasts.get(0),result);
@@ -141,12 +149,12 @@
throw new RuntimeException("宸ョ珯缂栫爜鎴栧憳宸ョ紪鐮佸潎涓嶈兘涓虹┖,璇锋鏌�");
}
//宸ョ珯103
- if(vo.getStationId().startsWith("101")){
+ if(vo.getStationId().startsWith(USER_PREFIX)){
userInfo = getUserInfo(vo.getStationId());
}else{
stationInfo = getStationInfo(vo.getStationId());
}
- if(vo.getUserId().startsWith("103")){
+ if(vo.getUserId().startsWith(STATION_PREFIX)){
stationInfo = getStationInfo(vo.getUserId());
}else{
userInfo = getUserInfo(vo.getUserId());
@@ -161,7 +169,7 @@
//妫�鏌ヨ〃涓璼tationId鏄惁宸茬粡瀛樺湪
StaAssemblyWorkLast param = new StaAssemblyWorkLast();
param.setStationId(stationInfo.getId());
- param.setStatus(1);
+ param.setStatus(STATUS_NORMAL);
List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectList(param);
long userId = userInfo.getId();
if(workLasts.size() > 0){
@@ -186,7 +194,7 @@
StaAssemblyWorkLast checkResult = checkUserAndStationUsed(vo);
//鏍￠獙planId processId nodeId
PrAssemblyPlan params = new PrAssemblyPlan();
- params.setStatus(1);
+ params.setStatus(STATUS_NORMAL);
params.setId(vo.getPlanId());
params.setProcessId(vo.getProcessId());
List<PrAssemblyPlan> planList = selectAssyPlanList(params);
@@ -206,7 +214,7 @@
BeanUtils.copyProperties(vo,staLast);
staLast.setUserId(checkResult.getUserId());
staLast.setStationId(checkResult.getStationId());
- staLast.setStatus(1);
+ staLast.setStatus(STATUS_NORMAL);
staLast.setStartTime(new Date());
count = assemblyWorkLastDao.insertSelective(staLast);
}else{
@@ -215,7 +223,7 @@
staLast.setPlanId(vo.getPlanId());
staLast.setProcessId(vo.getProcessId());
staLast.setNodeId(vo.getNodeId());
- staLast.setStatus(1);
+ staLast.setStatus(STATUS_NORMAL);
staLast.setStartTime(new Date());
count = assemblyWorkLastDao.updateByPrimaryKeySelective(staLast);
}
@@ -233,7 +241,7 @@
throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
}
//鏇存柊鐧诲綍璁板綍
- workLast.setStatus(2);
+ workLast.setStatus(STATUS_WORK_LAST_LOGOUT);
workLast.setEndTime(new Date());
// 淇濆瓨history
StaAssemblyWorkHistory history = new StaAssemblyWorkHistory();
@@ -279,7 +287,7 @@
StringBuilder sb = new StringBuilder();
String[] assistantArr = vo.getAssistants().split(",");
for (String item : assistantArr) {
- if(item.startsWith("101")){
+ if(item.startsWith(USER_PREFIX)){
sb.append(item.substring(3)).append(",");
}else{
sb.append(item).append(",");
@@ -324,7 +332,7 @@
if(workLast == null){
throw new RuntimeException("绯荤粺涓病鏈夊綋鍓嶇櫥褰曚俊鎭�,璇锋鏌ユ垨閲嶆柊鐧诲綍");
}
- if((!StringUtils.isBlank(assistant)) && assistant.startsWith("101")){
+ if((!StringUtils.isBlank(assistant)) && assistant.startsWith(USER_PREFIX)){
assistant = assistant.substring(3);
}
if(!StringUtils.isBlank(workLast.getAssistants())){
--
Gitblit v1.8.0