From aa563edbc3d4680593ebe111b900199c0f8c8576 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 28 八月 2023 11:17:40 +0800
Subject: [PATCH] #补丁
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 665ea8a..ca96989 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -105,7 +105,7 @@
}
Date now = new Date();
- int matType = 0;
+ Integer matType = 0;
// 鏃犲崟缁勬墭
if (Cools.isEmpty(param.getOrderNo())) {
@@ -156,7 +156,7 @@
}else {
if (matType == 0){
matType = mat.getMatType();
- }else if (matType!=mat.getMatType()){
+ }else if (!matType.equals(mat.getMatType())){
throw new CoolException("璇风粍鎵樺悓涓�绫诲瀷鐨勭墿鏂�");
}
}
@@ -211,15 +211,15 @@
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
waitPakin.setMatType(mat.getMatType());//鐗╂枡绫诲瀷
- if (Cools.isEmpty(mat.getMatType())){
- throw new CoolException("鐗╂枡绫诲瀷寮傚父"+mat.getMatnr());
- }else {
- if (matType == 0){
- matType = mat.getMatType();
- }else if (matType!=mat.getMatType()){
- throw new CoolException("璇风粍鎵樺悓涓�绫诲瀷鐨勭墿鏂�");
- }
- }
+// if (Cools.isEmpty(mat.getMatType())){
+// throw new CoolException("鐗╂枡绫诲瀷寮傚父"+mat.getMatnr());
+// }else {
+// if (matType == 0){
+// matType = mat.getMatType();
+// }else if (matType!=mat.getMatType()){
+// throw new CoolException("璇风粍鎵樺悓涓�绫诲瀷鐨勭墿鏂�");
+// }
+// }
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
--
Gitblit v1.9.1