From 23e276a6e6789b38ea342ecc309b74f87344e131 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 20 十一月 2025 09:56:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 249 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 232 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index adbbe73..654db88 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.annotations.AppAuth;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -22,6 +23,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -34,6 +36,21 @@
@RequestMapping("mobile")
@Slf4j
public class MobileController extends BaseController {
+
+ private static final boolean auth = true;
+ public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
+ add("ea1f0459efc02a79f046f982767939ae");
+ }};
+
+ public static final ArrayList<String> agvSta1 = new ArrayList<String>() {{
+ add("5400101");add("5400102");add("5400103");add("5400104");add("5400105");add("5400106");add("5400107");
+ }};
+ public static final ArrayList<String> agvSta2 = new ArrayList<String>() {{
+ add("5400201");add("5400202");add("5400203");add("5400204");add("5400205");add("5400206");add("5400207");
+ }};
+ public static final ArrayList<String> agvSta3 = new ArrayList<String>() {{
+ add("5400301");add("5400302");add("5400303");add("5400304");add("5400305");add("5400306");add("5400307");
+ }};
@Autowired
private MobileService mobileService;
@@ -62,6 +79,54 @@
@Autowired
private CommonService commonService;
+
+// @PostMapping("/agv/start")
+// @ManagerAuth
+// public R pdaStockCheck(@RequestBody StockCheckParam param){
+//
+//
+//
+// }
+@RequestMapping("/agv/staBind")
+@ManagerAuth(memo = "AGV绔欑偣缁戝畾鐗╂枡")
+public R pdaAgvStaBind(@RequestBody CombParam combParam){
+ if (Cools.isEmpty(combParam.getBarcode(), combParam.getCombMats())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+
+ mobileService.AgvStaBind(combParam,getUserId());
+
+ return R.ok();
+
+}
+ @PostMapping("/agv/AGVDismantle")
+ @ManagerAuth
+ public R pdaAGVDismantle(@RequestBody Map<String,Object> map){
+ return mobileService.AgvDismantle(map);
+ }
+ @PostMapping("/agv/finishedCall")
+ @ManagerAuth
+ public R pdaAgvFinishedCall(@RequestBody Map<String,Object> map){
+ return mobileService.FinishedCall(map);
+ }
+ @PostMapping("/agv/agv2fPack")
+ @ManagerAuth
+ public R pdaAgv2fPack(@RequestBody Map<String,Object> map){
+ return mobileService.agv2fPack(map);
+ }
+ @PostMapping("/agv/lineCall")
+ @ManagerAuth
+ public R pdaAgvLineCall(@RequestBody Map<String,Object> map){
+ return mobileService.lineCall(map);
+ }
+
+ @GetMapping("/agv/site/list")
+ @ManagerAuth
+ public R pdaAgvSiteList(){
+ return mobileService.siteList();
+ }
+
+
@PostMapping("/agv/start")
@ManagerAuth
public R pdaAgvStart(@RequestBody Map<String,Object> map){
@@ -82,10 +147,73 @@
// return R.ok();
// }
String sta = (String) map.get("sta"); // 鏆傚瓨浣�
- String inSta = (String) map.get("inSta"); // 鍏ュ簱绔欑偣
+ String inSta = String.valueOf(map.get("inSta")); // 鍏ュ簱绔欑偣
return mobileService.inLocCallAgv(sta, inSta);
+ }
+
+ @PostMapping("/agv/unbind")
+ @ManagerAuth
+ public R pdaAgvUnbind(@RequestBody Map<String,Object> map){
+
+ String site = (String) map.get("site"); // 鏆傚瓨浣�
+
+ if (Cools.isEmpty(site)) {
+ return R.parse("鏆傚瓨浣嶄笉鑳戒负绌�");
+ }
+
+ return mobileService.unbind(site);
+ }
+
+ @PostMapping("/agv/unbind2")
+ @ManagerAuth
+ public R pdaAgvUnbind2(@RequestBody Map<String,Object> map){
+
+ String site = (String) map.get("site"); // 鏆傚瓨浣�
+
+ if (Cools.isEmpty(site)) {
+ return R.parse("鏆傚瓨浣嶄笉鑳戒负绌�");
+ }
+
+ return mobileService.unbind2(site);
+ }
+
+ @PostMapping("/agv/bind")
+ @ManagerAuth
+ public R pdaAgvBind(@RequestBody Map<String,Object> map){
+
+ String site = (String) map.get("site"); // 鏆傚瓨浣�
+
+ if (Cools.isEmpty(site)) {
+ return R.parse("鏆傚瓨浣嶄笉鑳戒负绌�");
+ }
+
+ // 鍒ゆ柇site鍦ㄥ摢涓垪琛ㄤ腑锛屽苟鑾峰彇瀵瑰簲鐨勫垪琛�
+ ArrayList<String> targetList = null;
+ if (agvSta1.contains(site)) {
+ targetList = agvSta1;
+ } else if (agvSta2.contains(site)) {
+ targetList = agvSta2;
+ } else if (agvSta3.contains(site)) {
+ targetList = agvSta3;
+ }
+
+ // 濡傛灉site鍦╝gvSta1銆乤gvSta2鎴朼gvSta3涓紝寰幆璋冪敤bindPodAndBerth
+ if (targetList != null) {
+ // 寰幆璋冪敤bindPodAndBerth澶勭悊鍒楄〃涓殑鎵�鏈夋暟鎹�
+ for (String siteItem : targetList) {
+ boolean b = mobileService.bindPodAndBerth(siteItem);
+ }
+ return R.ok();
+ } else {
+ // 鍘熸湁閫昏緫锛氫笉鍦ㄦ寚瀹氱珯鐐逛腑锛屽彧澶勭悊鍗曚釜site
+ boolean b = mobileService.bindPodAndBerth(site);
+ if (b){
+ return R.ok();
+ }
+ return R.error();
+ }
}
private void getAgvTaskParam(ForwardAGVTaskParam agvTaskCreateParam,String agv,String sta){
@@ -256,8 +384,75 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
- mobileService.comb(combParam, getUserId());
- return R.ok("缁勬墭鎴愬姛");
+ if (Cools.isEmpty(combParam.getBarcode(), combParam.getCombMats())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+ .eq("barcode", combParam.getBarcode())
+ .eq("io_type", 104)
+ .in("wrk_sts", 14,105));
+ if (Cools.isEmpty(wrkMast)) {
+ mobileService.comb(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }else {
+ mobileService.mergeComb(combParam, getUserId());
+ return R.ok("骞舵澘鎴愬姛");
+ }
+
+
+ }
+
+ @RequestMapping("/pingKu/Shelves/auth")
+ @ManagerAuth(memo = "骞冲簱涓婃灦")
+ public R pingKuShelves(@RequestBody CombParam combParam){
+ if (Cools.isEmpty(combParam.getLocno(), combParam.getCombMats())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ mobileService.pingKuShelves(combParam, getUserId());
+
+ return R.ok();
+ }
+
+ @RequestMapping("/pingKu/unShelves/auth")
+ @ManagerAuth(memo = "骞冲簱涓嬫灦")
+ public R pingKuUnShelves(@RequestBody CombParam combParam){
+ if (Cools.isEmpty(combParam.getLocno(), combParam.getCombMats())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ mobileService.pingKuUnShelves(combParam, getUserId());
+
+ return R.ok();
+ }
+
+ @RequestMapping("/pingKu/getList/auth")
+ @ManagerAuth(memo = "骞冲簱鑾峰彇搴撳瓨鍒楄〃")
+ @AppAuth(memo = "骞冲簱鑾峰彇搴撳瓨鍒楄〃")
+ public R pingKuGetList(@RequestBody PKInventoryAdjustment combParam){
+ auth("", combParam, request);
+ if (Cools.isEmpty(combParam.getLocno())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ List<ManLocDetl> manLocDetls = mobileService.pingKuGetList(combParam);
+
+ return R.ok(manLocDetls);
+ }
+
+ @RequestMapping("/pingKu/inventoryAdjustment/auth")
+ @ManagerAuth(memo = "搴撳瓨璋冩暣")
+ @AppAuth(memo = "搴撳瓨璋冩暣")
+ public R pingKuInventoryAdjustment(@RequestBody PKInventoryAdjustment combParam, HttpServletRequest request){
+ auth("", combParam, request);
+ if (Cools.isEmpty(combParam.getLocno())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+ mobileService.pingKuInventoryAdjustment(combParam);
+
+ return R.ok();
+ }
+
+ private void auth(String appkey, Object obj, HttpServletRequest request) {
+// log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
}
@RequestMapping("/pack/get/auth")
@@ -507,6 +702,13 @@
return R.ok("鐩樼偣鎴愬姛");
}
+ @RequestMapping("/pda/adjust/auth")
+ @ManagerAuth(memo = "pda鐩樼偣")
+ public R pdaAdjust(@RequestBody pdaAdjustParam param){
+ mobileService.pdaAdjust(param,getUserId());
+ return R.ok("鐩樼偣鎴愬姛");
+ }
+
@PostMapping("/order/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
@@ -517,12 +719,20 @@
return R.ok("鍑哄簱鎴愬姛");
}
+ @GetMapping("/checkOut/submit/auth")
+ @ManagerAuth(memo = "鐩樼偣涓婁紶")
+ public R CheckOutUploadERP(@RequestParam String orderId){
+ mobileService.inventoryUpload(orderId);
+ return R.ok("鐩樼偣鎴愬姛");
+ }
+
+
@RequestMapping("/ddd/ddd")
@ManagerAuth()
public R ddd() {
- int w = 64;
+ int w = 99999;
for (int i = 17; i <= 37; i++) {
- for (int j = 1;j<=14;j++){
+ for (int j = 8;j<=14;j++){
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 1));
LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 2));
LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 3));
@@ -531,8 +741,9 @@
continue;
}
// locMast.setGro1(w);
- locMast2.setGro1(locMast.getGro1()+100);
- locMast3.setGro1(locMast.getGro1()+200);
+// locMast.setGro1(locMast.getGro1()+1000);
+ locMast2.setGro1(locMast.getGro1()+1000);
+ locMast3.setGro1(locMast.getGro1()+2000);
// locMast4.setGro1(w);
// locMastService.updateById(locMast);
locMastService.updateById(locMast2);
@@ -542,19 +753,23 @@
}
}
// for (int i = 17; i <=37; i++) {
-// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 14).eq("lev1", 1));
-//// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 10).eq("lev1", 1));
-//// LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 11).eq("lev1", 1));
+// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 3).eq("lev1", 1));
+// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 8).eq("lev1", 1));
+// LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 13).eq("lev1", 1));
//// LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 12).eq("lev1", 1));
-// locMast.setGro1(w);
-//// locMast2.setGro1(w);
-//// locMast3.setGro1(w);
+// if (!Cools.isEmpty(locMast)) {
+// locMast.setGro1(w);
+// locMastService.updateById(locMast);
+// }
+//
+// locMast2.setGro1(w);
+// locMast3.setGro1(w);
//// locMast4.setGro1(w);
-// locMastService.updateById(locMast);
-//// locMastService.updateById(locMast2);
-//// locMastService.updateById(locMast3);
+//
+// locMastService.updateById(locMast2);
+// locMastService.updateById(locMast3);
//// locMastService.updateById(locMast4);
-// w++;
+//// w++;
// }
return R.ok();
--
Gitblit v1.9.1