From bcb5e464f879458c421069e7d8c72d8c16b4ac7b Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期六, 13 八月 2022 10:32:46 +0800
Subject: [PATCH] Merge branch 'gzynasrs' of http://47.97.1.152:5880/r/zy-asrs into gzynasrs

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 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 f45907c..3595f89 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -4,6 +4,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.annotations.ManagerAuth;
 import com.core.common.*;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
@@ -11,7 +12,10 @@
 import com.zy.asrs.entity.param.MobileAdjustParam;
 import com.zy.asrs.entity.param.OpenOrderPakinParam;
 import com.zy.asrs.service.*;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.task.handler.WorkLogHandler;
 import com.zy.asrs.utils.MatUtils;
+import com.zy.common.CodeRes;
 import com.zy.common.constant.MesConstant;
 import com.zy.common.entity.Parameter;
 import com.zy.common.model.DetlDto;
@@ -22,6 +26,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -72,6 +78,10 @@
     private NodeService nodeService;
     @Autowired
     private ManLocDetlService manLocDetlService;
+    @Autowired
+    private TestMastService testMastService;
+    @Autowired
+    private WorkLogHandler workLogHandler;
 
 
     @Override
@@ -85,6 +95,13 @@
                 eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
             throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
         }
+
+        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+        if (countLoc > 0 || countWrk > 0) {
+            throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+        }
+
         Date now = new Date();
 
         // 鏃犲崟缁勬墭
@@ -584,4 +601,47 @@
             throw new CoolException(locDetl.getLocNo() + "搴撲綅涓嶆槸鍦ㄥ簱鐘舵��");
         }
     }
+
+    /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
+    @Override
+    @Transactional
+    public void startUpTestPACK(TestMast testMast) {
+
+        //鍚姩娴嬭瘯璇锋眰
+        ReturnT<String> result=workLogHandler.startUpTestPACK(testMast);
+        if (!result.isSuccess()) {
+            log.error("娴嬭瘯鐢宠澶辫触", testMast.getBarcode());
+        }
+        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()));
+        if (Cools.isEmpty(locMast)) {
+            throw new CoolException(BaseRes.PARAM);
+        }
+        Date date1;
+        try {
+            date1 = new Date();
+        }catch (Exception e){
+            throw new CoolException("鑾峰彇鏃堕棿澶辫触");
+        }
+        testMast.setChannel(1);
+        testMast.setStatus(1);
+        testMast.setModiTime(date1);
+        testMast.setAppeTime(date1);
+        if (!testMastService.insert(testMast)){
+            throw new CoolException("娣诲姞testMast澶辫触");
+        }
+        locMast.setPackStatus(2);
+        locMast.setModiTime(date1);
+        if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
+            throw new CoolException("鐢宠娴嬭瘯澶辫触");
+        }
+    }
+    @Override
+    @Transactional
+    public void suspendTestPACK() {
+        ReturnT<String> result=workLogHandler.suspendTestPACK();
+        if (!result.isSuccess()) {
+            log.error("娴嬭瘯鐢宠澶辫触");
+        }
+    }
+    /*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
 }

--
Gitblit v1.9.1