From 5317a45f64ae948e7351cce8ccf06ed88ffe4eeb Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 20 十月 2025 10:30:03 +0800
Subject: [PATCH] 新增AGV拣料回库或者移动
---
src/main/java/com/zy/asrs/controller/MobileController.java | 38 +++++++++++++++++++++++++++++---------
src/main/resources/application.yml | 2 +-
2 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 2955095..d73bd84 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -348,16 +348,36 @@
* @return
*/
@RequestMapping("/AGVSite")
- public R AGVSite(@RequestParam(required = false) String locNo){
+ public R AGVSite(@RequestParam(required = false) String locNo,@RequestParam(required = false) String barcode){
HashMap<Integer,String> map=new HashMap<>();
- map.put(100,"100-鍏ュ簱鍙�");
- map.put(1001,"1000-琛ョ┖鏉垮彛");
- map.put(2001,"2001-鍑哄簱鍙�1");
- map.put(2002,"2002-鍑哄簱鍙�2");
- map.put(3001,"3001-浣滀笟鍙�1");
- map.put(3002,"3002-浣滀笟鍙�2");
- map.put(4001,"4001-涓嶅悎鏍�");
- map.remove(Integer.parseInt(locNo));
+ if(!Cools.isEmpty(barcode)){
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
+ if(!Cools.isEmpty(wrkMast)){
+ if (!Cools.isEmpty(wrkMast.getInvWh())&&wrkMast.getWrkNo().equals("Y")&&(wrkMast.getIoType()==103||wrkMast.getIoType()==107)){
+ map.put(100,"100-鍏ュ簱鍙�");
+ }else {
+ return R.error("璇蜂笅鏋跺悗鍐嶆搷浣渁gv");
+ }
+ }else {
+ map.put(100,"100-鍏ュ簱鍙�");
+ map.put(1001,"1000-琛ョ┖鏉垮彛");
+ map.put(2001,"2001-鍑哄簱鍙�1");
+ map.put(2002,"2002-鍑哄簱鍙�2");
+ map.put(3001,"3001-浣滀笟鍙�1");
+ map.put(3002,"3002-浣滀笟鍙�2");
+ map.put(4001,"4001-涓嶅悎鏍�");
+ map.remove(Integer.parseInt(locNo));
+ }
+ }else {
+ map.put(100,"100-鍏ュ簱鍙�");
+ map.put(1001,"1000-琛ョ┖鏉垮彛");
+ map.put(2001,"2001-鍑哄簱鍙�1");
+ map.put(2002,"2002-鍑哄簱鍙�2");
+ map.put(3001,"3001-浣滀笟鍙�1");
+ map.put(3002,"3002-浣滀笟鍙�2");
+ map.put(4001,"4001-涓嶅悎鏍�");
+ map.remove(Integer.parseInt(locNo));
+ }
return R.ok(map);
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ea05a1c..256b4c3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://178.18.1.201:1433;databasename=jxtlfasrs-yclk
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jxtlfasrs-yclk
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1