From e6963c134992d01a6a931f025bafa5c9e7ca1a3a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 12 四月 2024 15:41:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/AgvMobileController.java |   75 +++++++++++++++++++++++++++++++++----
 1 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index 15ec11f..6a08d79 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -1,21 +1,25 @@
 package com.zy.asrs.controller;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.core.common.Cools;
 import com.core.common.R;
 import com.zy.asrs.entity.AgvBasDevp;
+import com.zy.asrs.entity.AgvLocDetl;
+import com.zy.asrs.entity.param.AgvMobileStartPakin;
 import com.zy.asrs.entity.param.AgvMobileStartParam;
 import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.service.AgvBasDevpService;
-import com.zy.asrs.service.AgvMobileService;
-import com.zy.asrs.service.AgvWorkService;
-import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.*;
 import com.zy.common.web.BaseController;
 import lombok.Synchronized;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -35,7 +39,11 @@
     @Autowired
     private AgvWorkService workService;
     @Autowired
+    private AgvLocMastService agvLocMastService;
+    @Autowired
     private OrderDetlService orderDetlService;
+    @Autowired
+    private AgvLocDetlService agvLocDetlService;
 
 
     /*
@@ -43,8 +51,9 @@
      */
     @PostMapping("/comb/auth")
     public R comb(@RequestBody CombParam combParam){
-        String message = agvMobileService.comb(combParam, 1l);
-        return R.ok(message);
+        agvMobileService.comb(combParam, getUserId());
+
+        return R.ok();
     }
 
     /*
@@ -54,7 +63,7 @@
     public R combBinding(@RequestBody Map<String,Object> map){
         String barcode = map.get("barcode").toString();
         String stationCode = map.get("stationCode").toString();
-        Short containerType = Short.valueOf(map.get("containerType").toString());
+        Short containerType = Short.valueOf(barcode.substring(0,2));
         agvMobileService.combBinding(barcode,stationCode,containerType);
         return R.ok("鎵樼洏缁戝畾绔欑偣鎴愬姛");
     }
@@ -97,6 +106,23 @@
     }
 
     /*
+    鍚姩鍏ュ簱锛岀粍鎵� + 鐢熶骇宸ヤ綔妗�
+    */
+    @PostMapping("/start/pakin/auth")
+    @Synchronized
+    @Transactional
+    public R startPakin(@RequestBody AgvMobileStartPakin params){
+        // 缁勬墭
+        params.getCombParams().forEach(combParam -> {
+            agvMobileService.comb(combParam,getUserId());
+        });
+        params.setContainerType(Short.valueOf(params.getContainerCode().substring(0,2)));
+        workService.emptyPlateIn(params.getDevNo(),params.getContainerCode(),params.getContainerType(), getUserId(),false);
+
+        return R.ok("鐢熸垚宸ヤ綔妗ｆ垚鍔�");
+    }
+
+    /*
     鍏ュ簱
      */
     @PostMapping("/pakin/empty/auth")
@@ -104,7 +130,8 @@
     public R pakinEmpty(@RequestBody AgvMobileStartParam params){
 
         for (AgvMobileStartParam.Pda pda : params.getPad()) {
-            workService.emptyPlateIn(pda.getDevNo(),pda.getContainerCode(),pda.getContainerType(), getUserId());
+            pda.setContainerType(Short.valueOf(pda.getContainerCode().substring(0,2)));
+            workService.emptyPlateIn(pda.getDevNo(),pda.getContainerCode(),pda.getContainerType(), getUserId(),false);
         }
 
         return R.ok();
@@ -124,4 +151,36 @@
         return R.ok();
     }
 
+    /*
+    绌烘澘鍑哄簱瀹瑰櫒鐮侀�夋嫨
+     */
+    @PostMapping("/pakout/empty/container/selector/auth")
+    public R containerType(@RequestBody HashMap<String,String> params){
+
+        String devNo = params.get("devNo");
+        AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
+
+        return R.ok(agvLocMastService.queryContainerTypeByLocType1(agvBasDevp.getLocType1()));
+
+    }
+    
+    /*
+    鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙�
+     */
+    @PostMapping("/query/locDetl/v1")
+    public R queryAgvLocDetl(@RequestBody HashMap<String,String> params){
+
+        String orderNo = params.get("orderNo");
+        String threeCode = params.get("threeCode");
+
+        Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("order_no", orderNo);
+
+        wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);
+
+        List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
+
+        return R.ok(agvLocDetls);
+    }
+
+
 }

--
Gitblit v1.9.1