From 757f103f37d83dfb55bb49b3df0b805cb520d4f7 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 11 十月 2025 15:28:26 +0800
Subject: [PATCH] 第三版

---
 src/main/java/com/zy/asrs/controller/MobileController.java |  241 +++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 216 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 7508ecd..c13b547 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -4,6 +4,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.annotations.AppAuth;
 import com.core.annotations.ManagerAuth;
 import com.core.common.BaseRes;
 import com.core.common.Cools;
@@ -13,8 +14,12 @@
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.CombParam;
 import com.zy.asrs.entity.param.MobileAdjustParam;
+import com.zy.asrs.entity.param.RCSParam;
+import com.zy.asrs.entity.param.Review;
 import com.zy.asrs.entity.result.MobileAdjustResult;
 import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.MobileServiceImpl;
+import com.zy.asrs.task.WorkMastScheduler;
 import com.zy.asrs.task.handler.WorkLogHandler;
 import com.zy.common.constant.MesConstant;
 import com.zy.common.model.LocDto;
@@ -22,11 +27,19 @@
 import com.zy.common.model.WrkDto;
 import com.zy.common.utils.HttpHandler;
 import com.zy.common.web.BaseController;
+import com.zy.common.web.param.SearchLocParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**
@@ -36,7 +49,7 @@
 @RestController
 @RequestMapping("mobile")
 public class MobileController extends BaseController  {
-
+    private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class);
     @Autowired
     private MobileService mobileService;
     @Autowired
@@ -57,6 +70,12 @@
     private BasDevpService basDevpService;
     @Autowired
     private PackService packService;
+    @Autowired
+    private ApiLogService apiLogService;
+    @Value("${rcs.address.url}")
+    private String url;
+    @Value("${rcs.address.attrcs}")
+    private String attrcs;
 
 
     // 鍟嗗搧涓婃灦
@@ -149,22 +168,25 @@
 
     /**
      * 鍑哄簱纭 - 鎵墭鐩樼爜
-     * 1.鍏ㄦ澘 杩斿洖 101
-     * 2.鎷f枡 杩斿洖 103
+     * 31.鍏ㄦ澘鍑哄簱绛夊緟涓嬫灦 -->32.绛夊緟AGV鎼繍绌烘澘鍥炲簱
      */
     @RequestMapping("/pakout/confirm/barcode/auth")
     @ManagerAuth
-    public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode){
-        if (Cools.isEmpty(barcode)) {
-            return R.ok();
+    public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode,
+                                  @RequestParam(required = false) String staNo){
+        if (Cools.isEmpty(barcode)||Cools.isEmpty(staNo)) {
+            return R.error("鎵樼洏鐮佹垨鑰匒GV绔欑偣涓嶈兘涓虹┖");
         }
-        WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
-        if (wrkMast != null) {
-            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
-            // 鍘婚櫎宸插嚭搴撶‘璁ょ殑鏄庣粏
-            wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() != null && wrkDetl.getInspect() != 0);
-            return R.ok().add(Cools.add("wrkNo", wrkMast.getWrkNo()).add("ioType", wrkMast.getIoType()).add("list", wrkDetls));
+        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode).eq("io_type", 101));
+        if (Cools.isEmpty(wrkMast)) {
+            return R.error("娌℃湁鎵惧埌璇ユ墭鐩�="+barcode+"瀵瑰簲鐨勫嚭搴撲换鍔�");
         }
+        wrkMast.setWrkSts(32L);//32.绛夊緟AGV鎼繍绌烘澘鍥炲簱
+        wrkMast.setMemo(staNo);//AGV鍙栫┖鎵樼洏绔欑偣
+        wrkMast.setOveMk("Y");
+        wrkMast.setModiTime(new Date());
+        wrkMastService.updateById(wrkMast);
+
         return R.ok();
     }
 
@@ -326,24 +348,193 @@
 
 
     /*...........................璧e窞鏂板..............浠ヤ笅.............璧e窞鏂板...........................*/
-    @PostMapping("/test/startUp/auth")
+//    @PostMapping("/test/startUp/auth")
 //    @ManagerAuth(memo = "鐢宠PACK娴嬭瘯")
-    public synchronized R startUpTestPACK(@RequestBody TestMast testMast) {
-        if (Cools.isEmpty(testMast)) {
-            return R.parse(BaseRes.PARAM);
-        }
-        //鎻愪氦娴嬭瘯绯荤粺
-        mobileService.startUpTestPACK(testMast);
+//    public synchronized R startUpTestPACK(@RequestBody TestMast testMast) {
+//        if (Cools.isEmpty(testMast)) {
+//            return R.parse(BaseRes.PARAM);
+//        }
+//        mobileService.startUpTestPACK(testMast); //鎻愪氦娴嬭瘯绯荤粺
+//        return R.ok();
+//    }
 
-        return R.ok();
-    }
     @PostMapping("/test/suspend/auth")
-    @ManagerAuth(memo = "鏆傚仠娴嬭瘯")
-    public synchronized R suspendTestPACK() {
-        mobileService.suspendTestPACK();
-        return R.ok();
+//    @ManagerAuth(memo = "鏆傚仠娴嬭瘯")
+    @ResponseBody
+    public synchronized R suspendTestPACK(@RequestBody SearchLocParam param) {
+        if (mobileService.suspendTestPACK(param.getBarcode())){  //璇锋眰鏆傚仠娴嬭瘯
+            return R.ok();
+        }else {
+            return R.error("鏆傚仠澶辫触");
+        }
     }
+    /**
+     * 娴嬭瘯搴撳熀鏈俊鎭�
+     */
+    @RequestMapping("/pack/basic/information")
+//    @ManagerAuth(memo = "娴嬭瘯搴撳熀鏈俊鎭�")
+    public R packTestBasicInformation(){
+        return R.ok().add(mobileService.packTestBasicInformation());
+    }
+    /**
+     * 娴嬭瘯搴撲娇鐢ㄦ儏鍐�
+     */
+    @RequestMapping("/pack/usage/rate")
+//    @ManagerAuth(memo = "娴嬭瘯搴撲娇鐢ㄦ儏鍐�")
+    public R packUsageRate(){
+        return R.ok().add(mobileService.packUsageRate());
+    }
+    /**
+     * 娴嬭瘯搴撳悎鏍兼暟
+     */
+    @RequestMapping("/pack/qualified")
+//    @ManagerAuth(memo = "娴嬭瘯搴撳悎鏍兼暟")
+    public R packQualified(){
+        return R.ok().add(mobileService.packQualified());
+    }
+    /**
+     * 鏃�8-鏅�20
+     */
+    @RequestMapping("/pack/morning")
+//    @ManagerAuth(memo = "娴嬭瘯搴撳悎鏍兼暟")
+    public R chartAxisMorning(){
+        return R.ok().add(mobileService.chartAxisMorning());
+    }
+    /**
+     * 鏅�20-绗簩澶╂棭8
+     */
+    @RequestMapping("/pack/evening")
+//    @ManagerAuth(memo = "娴嬭瘯搴撳悎鏍兼暟")
+    public R chartAxisEvening(){
+        return R.ok().add(mobileService.chartAxisEvening());
+    }
+
+    @RequestMapping("/pack/morning/v2")
+//    @ManagerAuth(memo = "娴嬭瘯搴撳悎鏍兼暟")
+    public R chartAxisMorningV2(){
+        Map<String,Object> map=new HashMap<String, Object>();
+        List<AxisBean> list = new ArrayList<AxisBean>();
+
+        List<WorkChartAxis> listChart = mobileService.chartAxisMorning();
+
+        if(listChart!=null) {
+            ArrayList<Integer> data1 = new ArrayList<Integer>();
+            ArrayList<Integer> data2 = new ArrayList<Integer>();
+
+            SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
+            Calendar calendar = Calendar.getInstance();
+            calendar.add(Calendar.DATE, -12);
+            for(int i=0;i<12;i++) {
+                boolean flag = true;
+                calendar.add(Calendar.DATE, 1);
+                String str = sf.format(calendar.getTime());
+                for(WorkChartAxis workChart : listChart) {
+                    if(str.equals(workChart.getYmd())) {
+                        data1.add(workChart.getInqty());
+                        data2.add(workChart.getOutqty());
+                        flag = false;
+                        break;
+                    }
+                }
+                if(flag) {
+                    data1.add(0);
+                    data2.add(0);
+                }
+            }
+            AxisBean inqty = new AxisBean();
+            inqty.setName("鍏ュ簱鏁伴噺");
+            Integer[] array1 = new Integer[data1.size()];
+            inqty.setData(data1.toArray(array1));
+            list.add(inqty);
+            AxisBean outqty = new AxisBean();
+            outqty.setName("鍑哄簱鏁伴噺");
+            Integer[] array2 = new Integer[data2.size()];
+            outqty.setData(data2.toArray(array2));
+            list.add(outqty);
+        }
+        map.put("rows",list);
+        return R.ok(map);
+    }
+
+
     /*...........................璧e窞鏂板..............浠ヤ笂.............璧e窞鏂板...........................*/
 
+    /**
+     * 鎵ц绉诲簱浠诲姟
+     * @param sourceStaNo
+     * @param staNo
+     * @return
+     */
+    @RequestMapping("/AGVMove")
+    public R AGVMove(@RequestParam(required = false) String sourceStaNo
+            ,@RequestParam(required = false) String staNo
+            ,Integer priority){
+        String noww="aa" + new Date().getTime();
+
+        LinkedHashMap<String,Object> rcsParam=new LinkedHashMap<>();
+        rcsParam.put("task_id",noww);
+        rcsParam.put("start_location",sourceStaNo);
+        rcsParam.put("start_command",1);
+        rcsParam.put("target_location",staNo);
+        rcsParam.put("target_command",2);
+        rcsParam.put("priority",1);//浼樺厛绾ц秺灏忓厛鎵ц
+        rcsParam.put("robot_type",1);//杞� 杈� 绫� 鍨� 0:XC 1:XCD 2:XP_T 3:XP_L
+        rcsParam.put("MoverID","XCD");
+        String wait_location = "";
+        if(staNo.equals("5001") || staNo.equals("5002") ){
+            wait_location = "4";
+        }else if(staNo.equals("6001") ){
+            wait_location = "122";
+        }else if(staNo.equals("6002") ){
+            wait_location = "120";
+        }else if(staNo.equals("7001") ){
+            wait_location = "120";
+        }else if(staNo.equals("7002") ){
+            wait_location = "120";
+        }
+        rcsParam.put("wait_location",wait_location);//浠诲姟瀹屾垚浼戞伅绔欑偣鍚嶇О
+
+        LinkedHashMap<String,Object> map=new LinkedHashMap<>();
+        map.put("data",rcsParam);
+        String response ="";
+        Boolean bool =false;
+        String msg = "";
+        try {
+            log.info("wms娲惧彂鎼繍浠诲姟缁橝GV鎼繍={}", rcsParam);
+            response = new HttpHandler.Builder()
+                    // .setHeaders(headParam)
+                    .setUri(url)
+                    .setPath(attrcs)
+                    .setJson(JSON.toJSONString(map))
+                    .build()
+                    .doPost();
+            JSONObject jsonObject = JSON.parseObject(response);
+            JSONObject data = jsonObject.getJSONObject("data");
+            JSONObject errInfo = jsonObject.getJSONObject("err_info");
+            if(data.getInteger("result")==0){
+                bool = true;
+            }else{
+                msg=errInfo.getString("err_msg");
+            }
+        } catch (Exception e) {
+            log.error("wms娲惧彂鎼繍浠诲姟缁橝GV鎼繍澶辫触杩斿洖鍊�={}", response);
+        } finally {
+            apiLogService.save("wms娲惧彂鎼繍浠诲姟缁橝GV鎼繍"
+                    , url + attrcs
+                    , null
+                    , "127.0.0.1"
+                    , JSON.toJSONString(map)
+                    , response
+                    , bool
+            );
+        }
+
+        if(bool){
+            return R.ok(noww);
+        }else {
+            return R.error(msg);
+        }
+
+    }
 
 }

--
Gitblit v1.9.1