From fb9432524649ab3b6f2314b1e0978cc6c26020eb Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期四, 27 六月 2024 15:36:47 +0800
Subject: [PATCH] some NotNull error
---
pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/workStation/WorkStationSv.java | 2 +-
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 2 +-
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepSv.java | 7 ++++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/workStation/WorkStationSv.java b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/workStation/WorkStationSv.java
index 40e67b6..795a82c 100644
--- a/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/workStation/WorkStationSv.java
+++ b/pms-parent/pms-web-product/src/main/java/com/dy/pmsProduct/workStation/WorkStationSv.java
@@ -56,7 +56,7 @@
// 淇濆瓨history
StaAssemblyWorkHistory history = new StaAssemblyWorkHistory();
BeanUtils.copyProperties(workLast,history);
- history.setId(null);
+ //history.setId(null);
int count = assemblyWorkHistoryDao.insertSelective(history);
//鍒犻櫎last
assemblyWorkLastDao.deleteByPrimaryKey(id);
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 3fa99a4..9566bf2 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
@@ -69,8 +69,9 @@
long workId = Long.parseLong(params.workId);
StaAssemblyWorkLast workLast = assemblyWorkLastDao.selectByPrimaryKey(workId);
if (workLast == null) {
- throw new RuntimeException("宸ュ崟涓嶅瓨鍦�");
+ throw new RuntimeException("绯荤粺涓病鏈夎鏉＄櫥褰曚俊鎭�");//宸ュ崟涓嶅瓨鍦�
}
+ //fancy 2024/6/27 鏄笉鏄彲浠ヤ笉鐢ㄦ鏌ヤ换鍔′笌璁惧鐮�...
PrAssemblyPlan plan = assemblyPlanDao.selectByPrimaryKey(workLast.getPlanId());
// 楠岃瘉骞跺鐞嗚澶囧彿鍜岀墿鏂欏彿
Set<String> deviceSet = new HashSet<>(Arrays.asList(params.deviceNo.split(",")));
@@ -87,10 +88,10 @@
});
if (deviceList.isEmpty()) {
- throw new RuntimeException("璁惧鍙蜂笉灞炰簬褰撳墠浠诲姟璁″垝");
+ throw new RuntimeException("璁惧鍙�("+ params.deviceNo +")鍧囦笉灞炰簬褰撳墠浠诲姟璁″垝");
}
if (deviceList.size() > 1) {
- throw new RuntimeException("璁惧鍙锋湁涓斿彧鑳芥湁涓�涓�");
+ throw new RuntimeException("璁惧鍙锋湁涓斿彧鑳芥湁涓�涓睘浜庡綋鍓嶄换鍔¤鍒�");
}
StaDeviceLast deviceLast = buildDeviceLast(params, workLast, deviceList.get(0));
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 e0fc39b..7686640 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
@@ -238,7 +238,7 @@
// 淇濆瓨history
StaAssemblyWorkHistory history = new StaAssemblyWorkHistory();
BeanUtils.copyProperties(workLast,history);
- history.setId(null);
+ //history.setId(null);
int count = assemblyWorkHistoryDao.insertSelective(history);
//鍒犻櫎last
assemblyWorkLastDao.deleteByPrimaryKey(Long.parseLong(id));
--
Gitblit v1.8.0