From 2e586ec3808b5a6d170aba9ddcbf5ef7b69f9eef Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期六, 13 八月 2022 10:56:22 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   89 ++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 89 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 5d8970a..76ede1d 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,6 +1,8 @@
 package com.zy.asrs.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.common.BaseRes;
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.SnowflakeIdWorker;
@@ -19,6 +21,9 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.tools.JavaCompiler;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -48,6 +53,14 @@
     private TagService tagService;
     @Autowired
     private TagMapper tagMapper;
+    @Autowired
+    private WaitPakinService waitPakinService;
+    @Autowired
+    private WrkDetlService wrkDetlService;
+    @Autowired
+    private TestMastService testMastService;
+    @Autowired
+    private LocMastService locMastService;
 
     @Override
     @Transactional
@@ -544,4 +557,80 @@
 
     }
 
+    /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
+    @Override
+    @Transactional
+    public void combPACK(CombParam param) {
+        if (Cools.isEmpty(param.getPackNo())) {
+            throw new CoolException(BaseRes.PARAM);
+        }
+        // 鍒ゆ柇鏄惁鏈夌浉鍚孭ack鐮佺殑鏁版嵁
+        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+                eq("zpallet", param.getPackNo()).eq("io_status", "N")) > 0) {
+            throw new CoolException(param.getPackNo() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+        }
+
+        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getPackNo()));
+        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getPackNo()));
+        if (countLoc > 0 || countWrk > 0) {
+            throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getPackNo());
+        }
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        java.util.Date date1=null;
+        try {
+            date1= sdf.parse(param.getRequestTime());
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        java.sql.Date requestTime = new java.sql.Date(date1.getTime());
+
+        // 鐢熸垚鍏ュ簱閫氱煡妗�
+        Mat mat = matService.selectByMatnr(param.getPackName());
+        if (Cools.isEmpty(mat)) {
+            throw new CoolException(param.getPackName() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+        }
+        WaitPakin waitPakin = new WaitPakin();
+        waitPakin.sync(mat);
+        waitPakin.setZpallet(param.getPackNo());   // Pack鐮�
+        waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��
+        waitPakin.setAnfme(1.0);  // 鏁伴噺
+        waitPakin.setStatus("Y");    // 鐘舵��
+        waitPakin.setAppeUser(null);
+        waitPakin.setAppeTime(requestTime);
+        waitPakin.setModiUser(null);
+        waitPakin.setModiTime(requestTime);
+        if (!waitPakinService.insert(waitPakin)) {
+            throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+        }
+    }
+
+    @Override
+    @Transactional
+    public void infoReview(Review review) {
+        Wrapper wrapper = new EntityWrapper<TestMast>()
+                .eq("loc_no", review.getLocNo());
+        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
+        if (locMast.getPackStatus()!=1){
+            throw new CoolException("浜у搧鐘舵�佷笉鏄� 1:寰呮祴璇�");
+        }
+        TestMast testMast = testMastService.selectOne(wrapper);
+        if(null != testMast){
+            if (testMast.getStatus()==1){
+                testMast.setStatus(2);
+                testMast.setModiTime(new Date());
+                if (!testMastService.update(testMast,wrapper)){
+
+                }
+            }else if (Cools.isEmpty(testMast.getStatus())){
+                throw new CoolException("鐘舵�佸紓甯�");
+            }else {
+                throw new CoolException("鐘舵�佷笉鏄� 1:鐢宠涓�");
+            }
+        } else {
+            throw new CoolException("娴嬭瘯鐢宠澶辫触");
+        }
+    }
+    /*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
+
 }

--
Gitblit v1.9.1