From 53f095a34dba25e2fe3b33ae16475bd3a4c682fc Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 22 一月 2024 12:55:30 +0800
Subject: [PATCH] 火警日志添加

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |  141 +++++++++++++++++++---------------------------
 1 files changed, 59 insertions(+), 82 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 367f64b..aecb3c1 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -20,6 +20,8 @@
 import com.zy.common.model.enums.WorkNoType;
 import com.zy.common.service.CommonService;
 import com.zy.common.utils.NodeUtils;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -64,6 +66,8 @@
     private CommonService commonService;
     @Autowired
     private WrkMastService wrkMastService;
+    @Autowired
+    private ConfigService configService;
 
     @Value("${mes.inPath}")
     private String inpath;
@@ -573,64 +577,74 @@
             throw new CoolException("缂哄皯鍙傛暟锛歱ackNo");
         }else if (Cools.isEmpty(param.getPackName())){
             throw new CoolException("缂哄皯鍙傛暟锛歱ackName");
-        }else if (Cools.isEmpty(param.getSettingTimes())){
-            throw new CoolException("缂哄皯鍙傛暟锛歴ettingTimes");
         }else if (Cools.isEmpty(param.getRequestTime())){
-            throw new CoolException("缂哄皯鍙傛暟锛歳equestTime");
+            throw new CoolException("缂哄皯鍙傛暟锛歳equestTime");//姝ゅ弬鏁板~鍏ョ敓浜ф棩鏈熶竴鏍�  涓嶇敤鍙叧闂�
         }
         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() + "鏁版嵁姝e湪杩涜鍏ュ簱");
-        }
+//        // 鍒ゆ柇鏄惁鏈夌浉鍚孭ack鐮佺殑鏁版嵁
+//        if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+//                eq("zpallet", param.getPackNo()).eq("io_status", "N")) > 0) {
+//            throw new CoolException(param.getPackNo() + "鏁版嵁姝e湪杩涜鍏ュ簱");
+//        }
 
-        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getPackNo()));
-        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getPackNo()));
-        int countPakin = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getPackNo()));
-        if (countLoc > 0 || countWrk > 0) {
-            throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉$爜鏁版嵁宸插瓨鍦�===>>" + param.getPackNo());
-        }else if (countPakin>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()));
+//        int countPakin = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getPackNo()));
+//        if (countLoc > 0 || countWrk > 0) {
+//            throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉$爜鏁版嵁宸插瓨鍦�===>>" + param.getPackNo());
+//        }else if (countPakin>0){
+//            throw new CoolException("閲嶅鐢宠" + param.getPackNo());
+//        }
 
 //         鐢熸垚鍏ュ簱閫氱煡妗�
-        Mat mat = matService.selectByMatnr(param.getPackName());
+        Mat mat = matService.selectByMatnr(param.getPackNo());
+        Date now = new Date();
         if (Cools.isEmpty(mat)) {
             Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
             Mat matNew = new Mat();
             matNew.setTagId(tag.getId());
-            matNew.setMatnr(param.getPackName());
+            matNew.setMatnr(param.getPackNo());
             matNew.setMaktx(param.getPackName());
-            matNew.setDeadWarn(480);//8灏忔椂  480鍒嗛挓
+            matNew.setManuDate(param.getRequestTime());
+            matNew.setDeadWarn(1440);//6灏忔椂  360鍒嗛挓  24灏忔椂  1440鍒嗛挓
+            Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "JingZhiTime"));
+            if (!Cools.isEmpty(config)){
+                try{
+                    int time = Integer.parseInt(config.getValue());
+                    matNew.setDeadWarn(time);//6灏忔椂  360鍒嗛挓  24灏忔椂  1440鍒嗛挓
+                }catch (Exception e){
+
+                }
+            }
             matNew.setCreateBy(9999L);//9999琛ㄧずerp涓嬪彂
-            matNew.setCreateTime(new Date());
+            matNew.setCreateTime(now);
             matNew.setUpdateBy(9999L);//9999琛ㄧずerp涓嬪彂
-            matNew.setUpdateTime(new Date());
+            matNew.setUpdateTime(now);
             if (!matService.insert(matNew)){
                 throw new CoolException(param.getPackName() + "鍟嗗搧妗f鑷姩鐢熸垚澶辫触");
             }
+//            mat=matNew;
 //            throw new CoolException(param.getPackName() + "鍟嗗搧妗f涓嶅瓨鍦�");
         }
-        WaitPakin waitPakin = new WaitPakin();
-//        waitPakin.sync(mat);
-        waitPakin.setMatnr(param.getPackName());
-        waitPakin.setMaktx(param.getPackName());
-        waitPakin.setZpallet(param.getPackNo());   // Pack鐮�
-        waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��
-        waitPakin.setAnfme(1.0);  // 鏁伴噺
-        waitPakin.setStatus("Y");    // 鐘舵��
-        waitPakin.setManuDate(param.getRequestTime());
-        waitPakin.setAppeUser(null);
-        waitPakin.setAppeTime(new Date());
-        waitPakin.setModiUser(null);
-        waitPakin.setModiTime(new Date());
-        waitPakin.setDeadWarn(param.getSettingTimes());
-        if (!waitPakinService.insert(waitPakin)) {
-            throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
-        }
+//        WaitPakin waitPakin = new WaitPakin();
+////        waitPakin.sync(mat);
+//        waitPakin.setMatnr(param.getPackName());
+//        waitPakin.setMaktx(param.getPackName());
+//        waitPakin.setZpallet(param.getPackNo());   // Pack鐮�
+//        waitPakin.setIoStatus("N");     // 鍏ュ嚭鐘舵��
+//        waitPakin.setAnfme(1.0);  // 鏁伴噺
+//        waitPakin.setStatus("Y");    // 鐘舵��
+//        waitPakin.setManuDate(param.getRequestTime());
+//        waitPakin.setAppeUser(null);
+//        waitPakin.setAppeTime(new Date());
+//        waitPakin.setModiUser(null);
+//        waitPakin.setModiTime(new Date());
+//        waitPakin.setDeadWarn(mat.getDeadWarn());
+//        if (!waitPakinService.insert(waitPakin)) {
+//            throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�");
+//        }
     }
     @Override
     @Transactional
@@ -777,46 +791,9 @@
         return testMast;
     }
 
-
     @Override
-    @Transactional
     public Boolean testFinish(Review review) {
-        Boolean success=true;
-        Wrapper wrapper = new EntityWrapper<TestMast>()
-                .eq("loc_no", review.getLocNo())
-                .eq("barcode", review.getBarcode())
-                .eq("user_Id", review.getUserId());
-        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()));
-        if (null == locMast ||locMast.getPackStatus()!=2){
-            throw new CoolException("浜у搧鐘舵�佷笉鏄� 2:娴嬭瘯涓�");
-        }else if (!review.getBarcode().equals(locMast.getBarcode())){
-            throw new CoolException("pack鐮佷笉鍚�");
-        }
-        TestMast testMast = testMastService.selectOne(wrapper);
-        if(null != testMast){
-            if (testMast.getStatus()==3){
-                Date date = new Date();
-                locMast.setPackStatus(3);
-                locMast.setModiTime(date);
-                CombParam combParam = new CombParam();
-                combParam.setPackNo(locMast.getBarcode());
-                combParam.setLocNo(locMast.getLocNo());
-                combParam.setPackSts(3);
-                combParam.setRequestTime(DateUtils.convert(new Date()));
-                new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
-
-                if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
-                    throw new CoolException("鏇存敼浜у搧鐘舵�佸け璐�");
-                }
-            }else if (Cools.isEmpty(testMast.getStatus())){
-                throw new CoolException("鐘舵�佸紓甯�");
-            }else {
-                throw new CoolException("娴嬭瘯鐘舵�佷笉鏄� 3:娴嬭瘯涓�");
-            }
-        } else {
-            throw new CoolException("鐘舵�佸紓甯�");
-        }
-        return success;
+        return null;
     }
 
     @Override
@@ -839,12 +816,12 @@
                 Date date = new Date();
                 locMast.setPackStatus(4);
                 locMast.setModiTime(date);
-                CombParam combParam = new CombParam();
-                combParam.setPackNo(locMast.getBarcode());
-                combParam.setLocNo(locMast.getLocNo());
-                combParam.setPackSts(4);
-                combParam.setRequestTime(DateUtils.convert(new Date()));
-                new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
+//                CombParam combParam = new CombParam();
+//                combParam.setPackNo(locMast.getBarcode());
+//                combParam.setLocNo(locMast.getLocNo());
+//                combParam.setPackSts(4);
+//                combParam.setRequestTime(DateUtils.convert(new Date()));
+//                new PostMesDataUtils().postMesData("MES绯荤粺",mesUrl,inpath,combParam);
 
                 if (!locMastService.update(locMast, new EntityWrapper<LocMast>().eq("loc_no", review.getLocNo()))){
                     throw new CoolException("鏇存敼浜у搧鐘舵�佸け璐�");

--
Gitblit v1.9.1