From dc0d1431615cb1389237a49960ebfc9d18f6e725 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期一, 15 七月 2024 16:44:06 +0800
Subject: [PATCH] change table
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 58 +++++++++++++++++++++++-----------------------------------
1 files changed, 23 insertions(+), 35 deletions(-)
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 30ce98d..0b0a0cb 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
@@ -155,11 +155,16 @@
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() + ".璇峰厛璁╁叾瑙ｇ粦");
+ //鍒犻櫎宸ョ珯鐧诲綍淇℃伅
+ for (int i = 0; i < workLasts.size(); i++) {
+ logout(workLasts.get(i).getId().toString());
+ }
+ //throw new RuntimeException("鍛樺伐(" +userInfo.getName() + ")缂栫爜:" + workLasts.get(0).getUserId() + "宸茬粡缁戝畾璇ュ伐绔�(" + stationInfo.getName() + ")缂栫爜:" + workLasts.get(0).getStationId() + ".璇峰厛璁╁叾瑙ｇ粦");
} else {
BeanUtils.copyProperties(userStationList.get(0), result);
}
- } else {
+ }
+ if (result.getId() == null) {
result.setUserId(userInfo.getId());
result.setUserName(userInfo.getName());
result.setStationId(stationInfo.getId());
@@ -170,9 +175,13 @@
}
public StaAssemblyWorkLast getWorkLast(String workId) {
+ if (StringUtils.isBlank(workId)) {
+ throw new RuntimeException("鐧诲綍ID涓虹┖,璇疯仈绯荤鐞嗗憳鏌ョ湅骞惰В鍐抽棶棰�.");
+ }
StaAssemblyWorkLast result = assemblyWorkLastDao.selectByPrimaryKey(Long.parseLong(workId));
if (result == null) {
- return null;
+ throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");
+ //return null;
}
BaUser userInfo = getUserInfo(result.getUserId().toString());
PltStation stationInfo = getStationInfo(result.getStationId().toString());
@@ -184,30 +193,32 @@
//鐩存帴鍒犻櫎璁板綍
logout(result.getId().toString());
result.setId(null);
- if(userInfo == null){
+ result.setStatus(STATUS_WORK_LAST_LOGOUT);
+ if (userInfo == null) {
result.setUserId(null);
result.setUserName("");
}
- if(stationInfo == null){
+ if (stationInfo == null) {
result.setStationId(null);
result.setStationName("");
}
- if(assyPlan == null){
+ if (assyPlan == null) {
result.setPlanId(null);
result.setPlanName("");
}
- if(!hasNodeId){
+ if (!hasNodeId) {
result.setNodeId(null);
result.setNodeName("");
}
return result;
- }else {
+ } else {
result.setPlanName(assyPlan.getName());
result.setProcessName(assyPlan.getProcessName());
result.setNodeName(assyPlan.getProcess().getNodes().get(0).getContent());
//鎵惧埌瀵瑰簲鐨勪骇鍝佷俊鎭�
- PltProduct product = productDao.selectByPrimaryKey(assyPlan.getProId());
+ PltProduct product = productDao.selectByPrimaryKey(assyPlan.getProId());
if (product != null) {
+ result.setProId(product.getId());
result.setProName(product.getName());
String devicePrefix = "110" + product.getCode() + assyPlan.getBatchNo();
result.setDevicePrefix(devicePrefix);
@@ -233,7 +244,7 @@
param.setStatus(STATUS_NORMAL);
List<StaAssemblyWorkLast> workLasts = assemblyWorkLastDao.selectList(param);
if (workLasts.size() > 0) {
- result = getWorkLast(workLasts.get(0).getId().toString());
+ result = getWorkLast(workLasts.get(0).getId().toString());
}
result.setStationId(stationInfo.getId());
result.setStationName(stationInfo.getName());
@@ -291,10 +302,11 @@
result.setProcessName(assyPlan.getProcessName());
result.setNodeName(assyPlan.getProcess().getNodes().get(0).getContent());
//鎵惧埌瀵瑰簲鐨勪骇鍝佷俊鎭�
- PltProduct product = productDao.selectByPrimaryKey(assyPlan.getProId());
+ PltProduct product = productDao.selectByPrimaryKey(assyPlan.getProId());
if (product == null) {
throw new RuntimeException("浜у搧淇℃伅鏈夎鎴栬鍏朵粬浜哄憳淇敼,璇风櫥褰曠鐞嗙郴缁熸煡鐪嬩换鍔″叧鑱斾骇鍝両D涓�:" + assyPlan.getProId());
}
+ result.setProId(product.getId());
result.setProName(product.getName());
String devicePrefix = "110" + product.getCode() + assyPlan.getBatchNo();
result.setDevicePrefix(devicePrefix);
@@ -331,28 +343,6 @@
});
});*/
return planList;
- }
-
- //workId assistants 浼犵殑鏄崟涓殑userId 蹇呬紶鍙傛暟
- public List<BaUser> updateAssistant(QueryVo vo) {
- //鎵惧埌workId
- StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(vo.getWorkId());
- 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)) {
- sb.append(item.substring(3)).append(",");
- } else {
- sb.append(item).append(",");
- }
- }
- String assistantStr = assistantArr.length > 0 ? sb.deleteCharAt(sb.length() - 1).toString() : "";
- List<BaUser> userInfo = baUserDao.selectByAssistants(vo.getAssistants());
- return userInfo;
}
public int addAssistant(String workId, String assistant) {
@@ -417,6 +407,4 @@
List<BaUser> assistantList = baUserDao.selectByAssistants(workLast.getAssistants());
return assistantList;
}
-
-
}
\ No newline at end of file
--
Gitblit v1.8.0