From f548bd5e0c9e73f56fffa528ef14d92599a71cce Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期四, 06 十月 2022 20:33:08 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 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 3896c18..d7642fc 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -631,7 +631,6 @@
         }
         LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                 .eq("loc_no", testMast.getLocNo())
-                .eq("channel",testMast.getChannel())
         );
         if (Cools.isEmpty(locMast)) {
             throw new CoolException(BaseRes.PARAM);
@@ -639,6 +638,7 @@
 
         Date now = new Date();
         testMast.setStatus(1);
+        testMast.setChannel(locMast.getChannel());
         testMast.setModiTime(now);
         testMast.setAppeTime(now);
         if (!testMastService.insert(testMast)){
@@ -669,12 +669,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