From d0ad6f402abde8943329a6e863ce1de4fadc0f21 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 30 十月 2023 15:16:55 +0800
Subject: [PATCH] 平库拣货流程修改
---
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index 4aa441f..a02a99c 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -26,6 +26,7 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.EnumSet;
+import java.util.Map;
/**
* 涓婃姤浜嬩欢绫诲瀷锛坋ventType锛夛細
@@ -71,15 +72,14 @@
//save api log (appkey 鍚庣画娣诲姞)
AppAuthUtil.auth("",param, request);
-
- AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", param.getTaskCode()));
+ int wrkNo = Integer.parseInt(param.getTaskCode());
+ if(wrkNo < 0){
+ wrkNo = -wrkNo;
+ }
+ AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", wrkNo));
if(Cools.isEmpty(agvWrkMast)){
return R.error("浠诲姟缂栧彿閿欒");
}
-
-// if(!checkParam(param,agvWrkMast)){
-// return R.error("浠诲姟鍙傛暟涓庡伐浣滄。鍙傛暟涓嶇鍚�");
-// }
AgvTask agvTask = AgvTask.valueOf(param.getEventType());
Class<AgvTask> clz = AgvTask.class;
@@ -98,16 +98,12 @@
return R.ok();
}
- private boolean checkParam(AgvTaskCallBackParam param, AgvWrkMast agvWrkMast){
- if(!agvWrkMast.getLocNo().equals(param.getLocationCode())){
- return false;
- }
- if(!agvWrkMast.getSourceLocNo().equals(param.getStationCode())){
- return false;
- }
- return true;
- }
+ @PostMapping("/conveyor/loadContainerFinish ")
+ @AppAuth(memo = "鍙栧鍣ㄥ畬鎴愰�氱煡")
+ public R loadContainerFinish(@RequestBody Map<String,Object> params){
+ return R.ok();
+ }
}
enum AgvTask{
@@ -128,7 +124,7 @@
}
//鍑哄簱浠诲姟 110.绌烘澘鍑哄簱
if(agvWrkMast.getIoType() == 110){
- agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode());
+ agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode());
}
}
--
Gitblit v1.9.1