From 5b4989a3e8dc144da636f1a8b84206e0f4ba76f3 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期四, 06 十月 2022 20:38:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/TestMast.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 15 ++++++++-------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TestMast.java b/src/main/java/com/zy/asrs/entity/TestMast.java
index 5307bd0..b96e263 100644
--- a/src/main/java/com/zy/asrs/entity/TestMast.java
+++ b/src/main/java/com/zy/asrs/entity/TestMast.java
@@ -53,7 +53,7 @@
/**
* 鐘舵�� 0: 寰呯敵璇� 1: 鐢宠涓� 2: 宸插鏍�;3 4: 瀹屾垚
*/
- @ApiModelProperty(value= "鐘舵�� 0: 寰呯敵璇� 1: 鐢宠涓� 2: 宸插鏍� 3: 娴嬭瘯涓� 4: 瀹屾垚 ")
+ @ApiModelProperty(value= "鐘舵�� 0: 鏆傚仠 1: 鐢宠涓� 2: 澶嶆牳涓� 3: 娴嬭瘯涓� 4: 瀹屾垚 ")
private Integer status;
/**
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 d7642fc..9d3cea4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -623,24 +623,25 @@
@Transactional
public void startUpTestPACK(TestMast testMast) {
-// 鍚姩娴嬭瘯璇锋眰
- ReturnT<String> result=startUpTestPACK1(testMast);
- if (!result.isSuccess()) {
- log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
- throw new CoolException("娴嬭瘯鐢宠澶辫触");
- }
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_no", testMast.getLocNo())
);
if (Cools.isEmpty(locMast)) {
throw new CoolException(BaseRes.PARAM);
}
-
Date now = new Date();
testMast.setStatus(1);
testMast.setChannel(locMast.getChannel());
testMast.setModiTime(now);
testMast.setAppeTime(now);
+
+// 鍚姩娴嬭瘯璇锋眰
+ ReturnT<String> result=startUpTestPACK1(testMast);
+ if (!result.isSuccess()) {
+ log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
+ throw new CoolException("娴嬭瘯鐢宠澶辫触");
+ }
+
if (!testMastService.insert(testMast)){
throw new CoolException("娣诲姞testMast澶辫触");
}
--
Gitblit v1.9.1