From c904f735e0b8a488ef56744c08f8e10258639bce Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 05 六月 2025 15:54:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |  123 +++++++++++++++++++++++++++++++----------
 1 files changed, 93 insertions(+), 30 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 529e10a..7289f95 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -7,16 +7,11 @@
 import com.core.common.R;
 import com.core.exception.CoolException;
 import com.zy.asrs.domain.enums.TaskStatusType;
-import com.zy.asrs.entity.StaDesc;
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.entity.ToWmsDTO;
+import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.TaskOverParam;
 import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
 import com.zy.asrs.entity.param.taskCreateParam;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.OpenService;
-import com.zy.asrs.service.StaDescService;
-import com.zy.asrs.service.TaskWrkService;
+import com.zy.asrs.service.*;
 import com.zy.asrs.utils.Utils;
 import com.zy.common.utils.HttpHandler;
 import com.zy.core.DevpThread;
@@ -48,18 +43,40 @@
     @Autowired
     private StaDescService staDescService;
 
+    @Autowired
+    private BasCrnpService basCrnpService;
+    @Autowired
+    private LocMastService locMastService;
+
 
 
     @Value("${wms.url}")
     private String wmsUrl;
     public ArrayList<String> wharfCode1 = new ArrayList<String>(){{
-        add("J-1101"); add("J-1103"); add("J-1105"); add("J-1107"); add("J-1109"); add("J-1111");
+        add("J-1101"); add("J-1103"); add("J-1105"); add("J-1107"); add("J-1109"); add("J-1111");add("H-1101");
+        add("G-1101");
     }};
 
 
 
     @Override
     public R taskCreate(taskCreateParam param) {
+        //绂佺敤鍫嗗灈鏈哄悗涓嶅彲涓嬪彂浠诲姟
+//        BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", param.getCrn()));
+//        if ((param.getIoType() == 3 || param.getIoType() == 1 ) && basCrnp.getInEnable().equals("N")){
+//            throw new CoolException("鐢熸垚浠诲姟澶辫触锛屽爢鍨涙満涓嶅彲鐢�");
+//        } else if (param.getIoType() == 2 && basCrnp.getOutEnable().equals("N")) {
+//            throw new CoolException("鐢熸垚浠诲姟澶辫触锛屽爢鍨涙満涓嶅彲鐢�");
+//        }
+        //绂佺敤搴撲綅鍚庝笉鍙笅鍙戝嚭搴撲换鍔�
+        if (param.getIoType() == 2){
+            String wcsLocNo = Utils.getWcsLocNo(param.getStartPoint());
+            LocMast locMast = locMastService.selectByLocNo(wcsLocNo);
+            if (locMast.getLocSts().equals("J")){
+                throw new CoolException("鐢熸垚鍑哄簱浠诲姟澶辫触锛屽簱浣嶈绂佺敤");
+            }
+        }
+
         TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
         if (taskWrk != null) {
             throw new CoolException(param.getTaskNo() + "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
@@ -91,6 +108,12 @@
                 taskWrk.setOriginStartPoint(param.getStartPoint());
             }
             taskWrk.setTargetPoint(param.getTargetPoint());
+        }else if (param.getIoType() == 3){
+            taskWrk.setWrkSts(11);
+            if (!Cools.isEmpty(param.getStartPoint())) {
+                taskWrk.setStartPoint(Utils.getWcsLocNo(param.getStartPoint()));//璧风偣
+                taskWrk.setOriginStartPoint(param.getStartPoint());
+            }
         }
 
 
@@ -139,11 +162,11 @@
 
         JSONObject jsonObject = JSON.parseObject(response);
 
-        apiLogService.save("wms璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+        apiLogService.save("璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
                 ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
                 ,null
                 ,"127.0.0.1"
-                ,JSON.toJSONString(param)
+                ,JSON.toJSONString(toWmsDTO)
                 ,response
                 ,true
         );
@@ -168,28 +191,35 @@
                 staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                         .eq("crn_no",data.getTaskTunnel())
                         .eq("type_no",1)
-                        .lt("crn_stn",200));
+                        .lt("stn_no",200));
+            }else if (param.getWharfSource().contains("H")){
+                staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+                        .eq("crn_no",data.getTaskTunnel())
+                        .eq("type_no",1)
+                        .lt("stn_no",400)
+                        .gt("stn_no",200));
             }else {
                 staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                         .eq("crn_no",data.getTaskTunnel())
                         .eq("type_no",1)
-                        .ge("crn_stn",200));
+                        .lt("stn_no",500)
+                        .ge("stn_no",400));
             }
-            //map1.put("taskTunnel", staDesc.getStnDesc());
-            map1.put("taskTunnel", "J-1104");
+            map1.put("taskTunnel", staDesc.getStnDesc());
+            //map1.put("taskTunnel", "J-1104");
             return R.ok(map1);
         }
         return R.error((String) jsonObject.get("msg"));
     }
 
     @Override
-    public void getAgvTaskOver(TaskOverParam param) {
+    public R getAgvTaskOver(TaskOverParam param) {
         // 鏍规嵁杈撻�佺嚎plc閬嶅巻
         for (DevpSlave devp : slaveProperties.getDevp()) {
             StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                     .eq("stn_desc", param.getWharfCode()));
             if (Cools.isEmpty(staDesc)){
-                throw new RuntimeException("鏈煡璇㈠埌绔欑偣淇℃伅");
+                throw new CoolException("鏈煡璇㈠埌绔欑偣淇℃伅");
             }
             // 鑾峰彇鍏ュ簱绔欎俊鎭�
             DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
@@ -200,32 +230,45 @@
                 staProtocol = staProtocol.clone();
             }
             Short workNo = staProtocol.getWorkNo();
-            for (DevpSlave.Sta inSta : devp.getInSta()) {
-                if (inSta.getBackSta().equals(staDesc.getStnNo())){
-                    if (wharfCode1.contains(param.getWharfCode())){
-                        if (!staProtocol.isLoading() && !staProtocol.isCar()){
-                            //AGV鍑哄簱瀹屾垚浠ュ悗
-                        }
+            if (wharfCode1.contains(param.getWharfCode())){
+                if (!staProtocol.isLoading() && !staProtocol.isCar() && staProtocol.getWorkNo() >0){
+                    //AGV鍑哄簱瀹屾垚浠ュ悗
+                    staProtocol.setWorkNo((short) 0);
+                    staProtocol.setStaNo((short)0);
+                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
+                    if (result) {
+                        return R.ok("鍙栬揣瀹屾垚");
+                    } else {
+                        throw new CoolException("agv杩斿洖瀹屾垚鍚庯紝鍛戒护涓嬪彂澶辫触");
+                    }
+                }else {
+                    return R.error("鍙栬揣绔欑偣鐘舵�佹湁璇�,鏈夌墿淇″彿锛�"+staProtocol.isLoading()
+                            +",杞﹁締淇″彿锛�"+staProtocol.isCar()+",宸ヤ綔鍙凤細"+staProtocol.getWorkNo());
+                }
+            }else {
+                for (DevpSlave.Sta inSta : devp.getInSta()) {
+                    if (inSta.getBackSta().equals(staDesc.getStnNo())){
 
-                    }else {
                         if (staProtocol.isLoading() && !staProtocol.isCar() && workNo == 0){
                             //AGV鍏ュ簱瀹屾垚浠ュ悗
                             staProtocol.setWorkNo((short) 9999);
                             staProtocol.setStaNo(inSta.getStaNo().shortValue());
                             boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
                             if (result) {
-
+                                return R.ok("鏀捐揣瀹屾垚");
                             } else {
-                                throw new RuntimeException("agv杩斿洖瀹屾垚鍚庯紝鍛戒护涓嬪彂澶辫触");
+                                throw new CoolException("agv杩斿洖瀹屾垚鍚庯紝鍛戒护涓嬪彂澶辫触");
                             }
+                        }else {
+                            return R.error("鏀捐揣绔欑偣鐘舵�佹湁璇�,鏈夌墿淇″彿锛�"+staProtocol.isLoading()
+                                    +",杞﹁締淇″彿锛�"+staProtocol.isCar()+",宸ヤ綔鍙凤細"+staProtocol.getWorkNo());
                         }
+
                     }
                 }
             }
-
-
-
         }
+        return R.ok();
 
     }
 
@@ -253,8 +296,18 @@
                     staProtocol = staProtocol.clone();
                 }
                 Short workNo = staProtocol.getWorkNo();
-                if (workNo == 0 && !staProtocol.isLoading()){
+                if (workNo == 0 && !staProtocol.isLoading() && staProtocol.isAutoing()){
                     if (Cools.isEmpty( map.get(inSta.getStaNo()))){
+                        continue;
+                    }
+                    BasCrnp crnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", map.get(inSta.getStaNo())));
+                    if (Cools.isEmpty(crnp)){
+                        continue;
+                    }
+                    if (crnp.getInEnable().equals("N")){
+                        continue;
+                    }
+                    if (crnp.getCrnSts()!=3){
                         continue;
                     }
                     list.add( map.get(inSta.getStaNo()));
@@ -289,10 +342,20 @@
                     staProtocol = staProtocol.clone();
                 }
                 Short workNo = staProtocol.getWorkNo();
-                if (workNo == 0 && !staProtocol.isLoading()){
+                if (workNo == 0 && !staProtocol.isLoading() && staProtocol.isAutoing()){
                     if (Cools.isEmpty( map.get(inSta.getStaNo()))){
                         continue;
                     }
+                    BasCrnp crnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", map.get(inSta.getStaNo())));
+                    if (Cools.isEmpty(crnp)){
+                        continue;
+                    }
+                    if (crnp.getInEnable().equals("N")){
+                        continue;
+                    }
+                    if (crnp.getCrnSts()!=3){
+                        continue;
+                    }
                     list.add( map.get(inSta.getStaNo()));
                 }
             }

--
Gitblit v1.9.1