From 9c86cce3943842ed28f3acd48c33c76cb93b57e5 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 06 三月 2024 18:04:19 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OpenController.java |  287 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 202 insertions(+), 85 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 1ad9267..283d0c7 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -2,26 +2,27 @@
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.annotations.AppAuth;
 import com.core.common.BaseRes;
 import com.core.common.Cools;
 import com.core.common.R;
 import com.core.exception.CoolException;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.CommandInfo;
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.CarryParam;
+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.entity.param.TaskCreateParam;
 import com.zy.asrs.service.*;
 import com.zy.common.web.BaseController;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
+import java.io.IOException;
+import java.util.*;
 
 @Slf4j
 @RestController
@@ -38,19 +39,51 @@
     private TaskWrkController taskWrkController;
     @Autowired
     private BasDevpService basDevpService;
+    @Autowired
+    private ApiLogService apiLogService;
+    @Autowired
+    private BasCrnpService basCrnpService;
+    @Autowired
+    private StaDescService staDescService;
+    @Autowired
+    private LocMastService locMastService;
+
+    @Value("${wms.url}")
+    private String wmsUrl;
 
     private static final boolean auth = true;
 
     public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
         add("ea1f0459efc02a79f046f982767939ae");
     }};
+    //agv浠诲姟瀹屾垚
+    @PostMapping("/toAgvTaskOver")
+    @AppAuth(memo = "agv浠诲姟瀹屾垚鎺ュ彛")
+    public R getAgvTaskOver(@RequestHeader String appkey,
+                           @RequestBody TaskOverParam param,
+                           HttpServletRequest request){
+        auth(appkey, param, request);
+        if (Cools.isEmpty(param)) {
+            return R.parse(BaseRes.PARAM);
+        }
+        if (Cools.isEmpty(param.getWharfCode())){
+            return R.error("鐮佸ご[wharfCode]涓嶈兘涓虹┖");
+        }
+        if (Cools.isEmpty(param.getStatus())){
+            return R.error("瀹屾垚鏍囪[status]涓嶈兘涓虹┖");
+        }
+        openService.getAgvTaskOver(param);
+        return R.ok();
+    }
 
     //鍒涘缓浠诲姟
     @PostMapping("/taskCreate")
     public R taskCreate(@RequestHeader String appkey,
-                          @RequestBody taskCreateParam param,
+                          @RequestBody List<TaskCreateParam> param1,
                           HttpServletRequest request) {
-        auth(appkey, param, request);
+        auth(appkey, param1, request);
+        for (TaskCreateParam param : param1
+             ) {
         if (Cools.isEmpty(param)) {
             return R.parse(BaseRes.PARAM);
         }
@@ -63,7 +96,21 @@
         if (Cools.isEmpty(param.getBarcode())) {
             return R.error("鏉$爜[barcode]涓嶈兘涓虹┖");
         }
+        String locNo=null;
+        if(param.getIoType()==1){
+            locNo=param.getTargetPoint();
+        }else{
+            locNo=param.getStartPoint();
+        }
+        LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
+                .eq("loc_sts","F")
+                .eq("loc_no",locNo)
+                .eq("barcode",param.getBarcode()));
+        if(Cools.isEmpty(locMast)){
+            return R.error("璇ュ簱浣嶄笉婊′綇鍑哄簱鏉′欢"+param.getTargetPoint());
+        }
         openService.taskCreate(param);
+        }
         return R.ok();
     }
 
@@ -108,9 +155,12 @@
 
     //AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛
     @PostMapping("/targetWharfApply")
+    @AppAuth(memo = "AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛")
     public R targetWharfApply(@RequestHeader String appkey,
                               @RequestBody WMSAndAGVInterfaceParam param,
-                              HttpServletRequest request) {
+                              HttpServletRequest request) throws IOException {
+        auth(appkey,param,request);
+
         if (Cools.isEmpty(param)){
             return R.error("鍙傛暟涓虹┖锛�");
         } else if (Cools.isEmpty(param.getTaskNo())){
@@ -122,19 +172,25 @@
         } else if (Cools.isEmpty(param.getFreeWharfs()) || param.getFreeWharfs().size()==0){
             return R.error("绌洪棽鐨勫叆搴撶爜澶达紙AGV锛変负绌猴紒");
         }
-        TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
-
-        if (Cools.isEmpty(taskWrk)){
-            return R.error("鏈煡璇㈠埌浠诲姟锛屼换鍔″彿锛�"+param.getTaskNo());
-        }
-        return R.ok(taskWrk.getStartPoint());
+        R r = openService.AgvToWCSToWms(param);
+        apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+                ,request.getRemoteAddr()+request.getRequestURI()
+                ,appkey
+                ,request.getRemoteAddr()
+                ,JSON.toJSONString(param)
+                ,r.toString()
+                ,true
+        );
+        return r;
     }
 
     //AGV璇锋眰鍔ㄤ綔鎺ュ彛
     @PostMapping("/agvTaskRequest")
+    @AppAuth(memo = "AGV璇锋眰鍔ㄤ綔鎺ュ彛")
     public R agvTaskRequest(@RequestHeader String appkey,
                               @RequestBody WMSAndAGVInterfaceParam param,
                               HttpServletRequest request) {
+        auth(appkey, param, request);
         if (Cools.isEmpty(param)){
             return R.error("鍙傛暟涓虹┖锛�");
         } else if (Cools.isEmpty(param.getRequestType())){
@@ -143,17 +199,51 @@
             return R.error("鐮佸ご缂栧彿涓虹┖锛�");
         }
 
-        try{
-            BasDevp basDevp = basDevpService.selectById(param.getWharfCode());
-            if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
-                return R.ok();
-            }else {
-                return R.error();
-            }
-        }catch (Exception e){
-            log.error("AGV璇锋眰鍔ㄤ綔鎺ュ彛鎶ラ敊:"+e);
-            return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
+        Map<String,Integer> map = new HashMap<>();
+        map.put("J-1102",102);map.put("J-1101",101);
+        map.put("J-1103",105);map.put("J-1104",106);
+        map.put("J-1105",109);map.put("J-1106",110);
+        map.put("J-1107",113);map.put("J-1108",114);
+        map.put("J-1109",117);map.put("J-1110",118);
+        map.put("J-1111",121);map.put("J-1112",122);
+        map.put("H-1102",300);map.put("H-1101",305);
+        map.put("G-1102",400);map.put("G-1101",405);
+//        StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+//                .eq("stn_desc", param.getWharfCode()));
+//
+//        if (Cools.isEmpty(staDesc)){
+//            return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
+//        }
+        if (Cools.isEmpty(map.get(param.getWharfCode()))){
+            return R.error("鏈煡璇㈠埌绔欑偣");
         }
+        BasDevp basDevp = basDevpService.selectById(map.get(param.getWharfCode()));
+//        BasDevp basDevp = basDevpService.selectById(staDesc.getStnNo());
+        if (basDevp.getAutoing().equals("Y") && (basDevp.getInEnable().equals("Y") || basDevp.getOutEnable().equals("Y"))){
+            apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+                    ,request.getRemoteAddr()+request.getRequestURI()
+                    ,appkey
+                    ,request.getRemoteAddr()
+                    ,JSON.toJSONString(param)
+                    ,R.ok().toString()
+                    ,true
+            );
+            return R.ok("鍙叆");
+        }else {
+            apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+                    ,request.getRemoteAddr()+request.getRequestURI()
+                    ,appkey
+                    ,request.getRemoteAddr()
+                    ,JSON.toJSONString(param)
+                    ,R.error("绔欑偣鐘舵�佷笉鍙叆").toString()
+                    ,true
+            );
+            return R.error("绔欑偣鐘舵�佷笉鍙叆");
+        }
+
+
+
+
 
     }
 
@@ -161,53 +251,68 @@
     @PostMapping("/outboundTaskSend")
     @Transactional
     public R outboundTaskSend(@RequestHeader String appkey,
-                              @RequestBody List<WMSAndAGVInterfaceParam> params,
+                              @RequestBody List<CarryParam> params,
                               HttpServletRequest request) {
-        auth(appkey, params, request);
+        //auth(appkey, params, request);
         List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
-        for (WMSAndAGVInterfaceParam param:params){
-            try {
-                if (Cools.isEmpty(param)){
-                    return R.error("鍙傛暟涓虹┖锛�");
-                } else if (Cools.isEmpty(param.getTaskNo())){
-                    return R.error("浠诲姟鍙蜂负绌猴紒");
-                } else if (Cools.isEmpty(param.getTaskType())){
-                    return R.error("浠诲姟绫诲瀷涓虹┖锛�");
-                } else if (Cools.isEmpty(param.getWarehouseId())){
-                    return R.error("浠撳簱鏍囪瘑涓虹┖锛�");
-                }
-                if (Cools.isEmpty(param.getTaskPriority())){
-                    param.setTaskPriority(1);
-                }
-                if (Cools.isEmpty(param.getContainerCode())){
-                    return R.error("瀹瑰櫒缂栫爜(鎵樼洏鐮�)涓虹┖锛�");
-                }
-                if (Cools.isEmpty(param.getEmptyContainer())){
-                    return R.error("鏄惁绌烘墭鐩樹俊鍙蜂负绌猴紒");
-                }
-//        if (Cools.isEmpty(param.getTaskTunnel())){
-//            return R.error("浠诲姟宸烽亾涓虹┖锛�");
-//        }
-//        if (Cools.isEmpty(param.getGroupNo())){
-//            return R.error("浠诲姟缁勪负绌猴紒");
-//        }
-//        if (Cools.isEmpty(param.getTaskSerialNo())){
-//            return R.error("浠诲姟鎵ц椤哄簭涓虹┖锛�");
-//        }
-                if (Cools.isEmpty(param.getTargetWharf())){
-                    return R.error("鐩爣鐮佸ご鍖哄煙涓虹┖锛�");//G寮�澶�=7杞﹂棿锛孒寮�澶�=8灞傦紝J寮�澶�=9杞﹂棿
-                }
+        for (CarryParam param:params){
 
-                openService.taskCreate(new taskCreateParam(param));
-
-                params1.add(param);
-//                return R.ok(param);
-            }catch (Exception e){
-                String errorMsg = Cools.isEmpty(e.getLocalizedMessage()) ? "" : e.getLocalizedMessage();
-                return R.error("鐢熸垚浠诲姟澶辫触锛岃鑱旂郴绠$悊鍛�!"+ errorMsg);
+            if (Cools.isEmpty(param)){
+                return R.error("鍙傛暟涓虹┖锛�");
+            } else if (Cools.isEmpty(param.getTaskNo())){
+                return R.error("浠诲姟鍙蜂负绌猴紒");
+            } else if (Cools.isEmpty(param.getIoType())){
+                return R.error("浠诲姟绫诲瀷涓虹┖锛�");
             }
+            if (Cools.isEmpty(param.getStartPoint()) || Cools.isEmpty(param.getTargetPoint())){
+                return R.error("鍒濆鐩爣鎴栬�呯洰鏍囦綅涓虹┖");
+            }
+//            if (Cools.isEmpty(param.getContainerCode())){
+//                return R.error("瀹瑰櫒缂栫爜(鎵樼洏鐮�)涓虹┖锛�");
+//            }
+//            if (Cools.isEmpty(param.getEmptyContainer())){
+//                return R.error("鏄惁绌烘墭鐩樹俊鍙蜂负绌猴紒");
+//            }
+//            if (!param.getTaskType().equals("YK")){
+//                if (Cools.isEmpty(param.getTargetWharf())){
+//                    return R.error("鐩爣鐮佸ご鍖哄煙涓虹┖锛�");//G寮�澶�=7杞﹂棿锛孒寮�澶�=8灞傦紝J寮�澶�=9杞﹂棿
+//                }
+//            }
+
+            LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
+            if(Cools.isEmpty(locMast)){
+                return R.error("鍒濆搴撲綅鏃犳硶鎵惧埌");
+            }
+
+            R r = null;
+
+            if(param.getIoType() == 2){
+                //鍑哄簱浠诲姟鍒涘缓
+                StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+                        .eq("type_no",2)
+                        .eq("crn_no",locMast.getCrnNo())
+                        .eq("stn_no",param.getTargetPoint()));
+                if(Cools.isEmpty(staDesc)){
+                    return R.error("鍑哄簱璺姴涓嶅瓨鍦�");
+                }
+                r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
+            }else if (param.getIoType() == 3){
+                //绉诲簱浠诲姟鍒涘缓
+                r = openService.taskCreate(new TaskCreateParam(param,locMast.getCrnNo()));
+            }
+
+            apiLogService.save("Wms浠诲姟涓嬪彂鎺ュ彛"
+                    ,request.getRemoteAddr()+request.getRequestURI()
+                    ,appkey
+                    ,request.getRemoteAddr()
+                    ,JSON.toJSONString(param)
+                    ,r.toString()
+                    ,true
+            );
+
         }
-        return R.ok(params1);
+
+        return R.ok();
     }
 
     //浠诲姟鍙栨秷鎺ュ彛
@@ -215,39 +320,34 @@
     public R taskCancel(@RequestHeader String appkey,
                                @RequestBody WMSAndAGVInterfaceParam param,
                                HttpServletRequest request) {
+        auth(appkey, param, request);
         if (Cools.isEmpty(param)){
             return R.error("鍙傛暟涓虹┖锛�");
         } else if (Cools.isEmpty(param.getTaskNo())){
             return R.error("宸ヤ綔鍙蜂负绌猴紒");
-        } else if (Cools.isEmpty(param.getTaskStatus())){
+        } else if (Cools.isEmpty(param.getIoType())){
             return R.error("鎿嶄綔绫诲瀷涓虹┖锛�");
+        } else if (Cools.isEmpty(param.getBarcode())){
+            return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒");
         }
-//        else if (Cools.isEmpty(param.getWarehouseId())){
-//            return R.error("浠撳簱鏍囪瘑涓虹┖锛�");
-//        }
 
-        TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("task_no", param.getTaskNo()));
+        TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>()
+                .eq("task_no", param.getTaskNo())
+                .eq("io_type",param.getIoType())
+                .eq("barcode",param.getBarcode()));
         if (Cools.isEmpty(taskWrk)){
-            return R.error("鏈煡鍒板綋鍓嶄换鍔�");
+            return R.error("鏈煡鍒板綋鍓嶄换鍔�---"+param);
         }
         boolean sign =false;
         switch (param.getTaskStatus()){
             case 1://姝e父鍙栨秷
-                if (taskWrk.getWrkSts()>1){
+                if (taskWrk.getStatus()>1){
                     return R.error("浠诲姟宸插紑濮嬫墽琛�");
-                }
-            case 2://寮哄埗鍙栨秷
-                if (taskWrk.getWrkSts()>3){
-                    return R.error("浠诲姟宸叉墽琛屽畬鎴�");
                 }
                 break;
-            case 3://姝e父瀹屾垚
-                if (taskWrk.getWrkSts()>11){
+            case 2://姝e父瀹屾垚
+                if (taskWrk.getStatus()>1){
                     return R.error("浠诲姟宸插紑濮嬫墽琛�");
-                }
-            case 4://寮哄埗瀹屾垚
-                if (taskWrk.getWrkSts()>14){
-                    return R.error("浠诲姟宸叉墽琛屽畬鎴�");
                 }
                 sign=true;
                 break;
@@ -270,6 +370,23 @@
         }
     }
 
+    //璁惧鐘舵�佹煡璇㈡帴鍙�
+    @PostMapping("/deviceStatus")
+    @Transactional
+    public R deviceStatus(@RequestHeader String appkey,
+                              HttpServletRequest request) {
+        auth(appkey, "璁惧鐘舵�佹煡璇㈡帴鍙�", request);
+        List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+        List<Object> list = new ArrayList<>();
+        for (BasDevp basDevp:basDevps){
+            list.add(basDevp);
+        }
+        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+        for (BasCrnp basCrnp:basCrnps){
+            list.add(basCrnp);
+        }
+        return R.ok(list);
+    }
 
 
 }

--
Gitblit v1.9.1