From 701542ac0a90cf0e3a0a81ec2bb8066b5de68e75 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期六, 28 三月 2026 11:21:17 +0800
Subject: [PATCH] 更新为正式部署许可证

---
 src/main/java/com/zy/asrs/controller/MesController.java |   71 ++++++++++++++++++++++++++++++++---
 1 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MesController.java b/src/main/java/com/zy/asrs/controller/MesController.java
index 92c13b4..52306dc 100644
--- a/src/main/java/com/zy/asrs/controller/MesController.java
+++ b/src/main/java/com/zy/asrs/controller/MesController.java
@@ -1,23 +1,39 @@
 package com.zy.asrs.controller;
 
+import com.alibaba.excel.util.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.core.annotations.AppAuth;
+import com.core.annotations.ManagerAuth;
 import com.core.common.Cools;
+import com.core.common.R;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.mes.*;
+import com.zy.asrs.entity.param.CombParam;
 import com.zy.asrs.service.MesService;
+import com.zy.asrs.service.MobileService;
+import com.zy.asrs.service.impl.RcsServiceImpl;
 import com.zy.common.web.BaseController;
 import lombok.extern.slf4j.Slf4j;
+import org.hibernate.validator.constraints.NotEmpty;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.List;
 
 @RestController
 @Slf4j
 public class MesController extends BaseController {
 
+    // 娴峰悍RCS鍦板潃
+    @Value("${hik.url}")
+    private String HIK_URL;
+    @Autowired
+    private MobileService mobileService;
     @Resource
     private MesService mesService;
 
@@ -29,11 +45,15 @@
     // 鐗╂枡淇℃伅鍚屾
     @PostMapping("/api/mes/synMatInfo")
     @AppAuth(memo = "鐗╂枡淇℃伅鍚屾")
-    public MesReturn synMatInfo(@RequestHeader(required = false) String appkey,@RequestBody MesMatRecvForm param, HttpServletRequest request){
-        auth(appkey, param, request);
+    //public MesReturn synMatInfo(@RequestHeader(required = false) String appkey, @RequestBody List<MesMatRecvForm> params, HttpServletRequest request){
+    public MesReturn synMatInfo(@RequestHeader(required = false) String appkey, @RequestBody MesMatRecvForm params, HttpServletRequest request){
+        auth(appkey, params, request);
         MesReturn mesReturn = new MesReturn();
         try {
-            mesReturn = mesService.matInfoAndInBound(param);
+//            for (MesMatRecvForm param : params){
+//                mesReturn = mesService.matInfoAndInBound(param);
+//            }
+            mesReturn = mesService.matInfoAndInBound(params);
         } catch (Exception e) {
             mesReturn.setSuccess("2");
             mesReturn.setMessage("鐗╂枡淇℃伅鍚屾澶辫触");
@@ -50,7 +70,7 @@
         return mesReturn;
     }
 
-    // 鍑哄簱鐢宠锛堝彨鏂欙級锛岃閰嶅簱銆佹粦鍧楀簱
+//    // 鍑哄簱鍏ュ簱璁㈠崟鐢宠
     @PostMapping("/api/mes/callOutBoundOrder")
     public MesReturn callOutBoundOrder(@RequestBody MesCallOutApply param){
 
@@ -71,14 +91,12 @@
     // 鍏ョ珯鍏佽
     @PostMapping("/api/mes/allowInStation")
     public MesReturn allowInStation(@RequestBody TransInOutStationAllow param){
-
         return mesService.allowInStation(param);
     }
 
     // 绂荤珯鍏佽锛岃閰嶅簱銆佹粦鍧楀簱
     @PostMapping("/api/mes/allowOutStation")
     public MesReturn allowOutStation(@RequestBody TransInOutStationAllow param){
-
         return mesService.allowOutStation(param);
     }
 
@@ -120,4 +138,45 @@
         return mesService.queryInventory(itemno,orderNo);
     }
 
+
+    /**
+     * MES璋冪敤PDA鐨凙GV璁㈠崟鍏ュ簱鎺ュ彛
+     * @param combParam
+     * @return
+     */
+    @RequestMapping("/comb/auth")
+    @ManagerAuth(memo = "缁勬墭")
+    public R comb(@RequestBody CombParam combParam){
+        log.info("=============== MES涓嬪彂缁勬墭璁㈠崟 ===============");
+        log.info("{}", combParam);
+        log.info("=============== MES涓嬪彂缁勬墭璁㈠崟 ===============");
+        if (combParam.getUserId() != null && !combParam.getUserId().equals(null)){
+            mobileService.comb(combParam, combParam.getUserId());
+        }else {
+            mobileService.comb(combParam, getUserId());
+        }
+        return R.ok("缁勬墭鎴愬姛");
+    }
+
+    @PostMapping("/api/mes/pauseAGV")
+    public MesReturn AGVPause(@RequestBody JSONObject param){
+        MesReturn mesReturn = new MesReturn();
+        int AGVType;
+        if (param.containsKey("zoneCode")){
+            param.put("mapCode", "BB");
+            param.put("invoke", "BLOCKADE");
+            AGVType = 1;
+        }else {
+            AGVType = 2;
+        }
+        if (mesService.AGVPause(param, AGVType) == 1){
+            mesReturn.setSuccess("1");
+            mesReturn.setMessage("鎴愬姛");
+            return mesReturn;
+        }else {
+            mesReturn.setSuccess("2");
+            mesReturn.setMessage("澶辫触");
+            return mesReturn;
+        }
+    }
 }

--
Gitblit v1.9.1