From 6c79b10d6271fd218dbcdc2b9648a5b80361471d Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期六, 08 十月 2022 14:06:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 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 0dcd93f..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,21 +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()));
+ 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澶辫触");
}
@@ -666,12 +670,12 @@
@Transactional
public ReturnT<String> startUpTestPACK1(TestMast testMast){
try {
- CombParam combParam = new CombParam();
- combParam.setPackNo(testMast.getLocNo());
- combParam.setPackName(testMast.getUserId());
- combParam.setLocNo(testMast.getBarcode());
- combParam.setRequestTime(DateUtils.convert(new Date()));
- return postMesData(renUrl,startUpTestPACK,combParam);
+ Review review=new Review();
+ review.setLocNo(testMast.getLocNo());
+ review.setUserId(testMast.getUserId());
+ review.setBarcode(testMast.getBarcode());
+ review.setRequestTime(DateUtils.convert(new Date()));
+ return postMesData(renUrl,startUpTestPACK,review);
}catch (Exception e) {
log.error("fail", e);
e.printStackTrace();
--
Gitblit v1.9.1