From b56f0b0c09f150b8a6747b3076ea07053b07a940 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 09 七月 2024 15:24:10 +0800
Subject: [PATCH] getWorkLast change null to error
---
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 29 ++++-------------------------
1 files changed, 4 insertions(+), 25 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..4f9fdf4 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
@@ -172,7 +172,8 @@
public StaAssemblyWorkLast getWorkLast(String workId) {
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());
@@ -208,6 +209,7 @@
//鎵惧埌瀵瑰簲鐨勪骇鍝佷俊鎭�
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);
@@ -295,6 +297,7 @@
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 +334,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 +398,4 @@
List<BaUser> assistantList = baUserDao.selectByAssistants(workLast.getAssistants());
return assistantList;
}
-
-
}
\ No newline at end of file
--
Gitblit v1.8.0