From af1b0101f2f19fb562ba81eb2bbe3a7976e3d716 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 24 十一月 2023 15:50:50 +0800
Subject: [PATCH] #堆垛机出入库
---
src/main/java/com/zy/asrs/controller/OpenController.java | 93 +++++++++++++++++++++++++++-------------------
1 files changed, 55 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 18c87c4..6806b2b 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -16,6 +16,7 @@
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -121,6 +122,9 @@
}
TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
+ if (Cools.isEmpty(taskWrk)){
+ return R.error("鏈煡璇㈠埌浠诲姟锛屼换鍔″彿锛�"+param.getTaskNo());
+ }
return R.ok(taskWrk.getStartPoint());
}
@@ -136,38 +140,48 @@
} else if (Cools.isEmpty(param.getWharfCode())){
return R.error("鐮佸ご缂栧彿涓虹┖锛�");
}
- BasDevp basDevp = basDevpService.selectById(param.getWharfCode());
- if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
- return R.ok();
- }else {
- return R.error();
+
+ try{
+ BasDevp basDevp = basDevpService.selectById(param.getWharfCode());
+ if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
+ return R.ok();
+ }else {
+ return R.error();
+ }
+ }catch (Exception e){
+ log.error("AGV璇锋眰鍔ㄤ綔鎺ュ彛鎶ラ敊:"+e);
+ return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
}
+
}
//浠诲姟涓嬪彂鎺ュ彛
@PostMapping("/outboundTaskSend")
+ @Transactional
public R outboundTaskSend(@RequestHeader String appkey,
- @RequestBody WMSAndAGVInterfaceParam param,
+ @RequestBody List<WMSAndAGVInterfaceParam> params,
HttpServletRequest request) {
- try {
- if (Cools.isEmpty(param)){
- return R.error("鍙傛暟涓虹┖锛�");
- } else if (Cools.isEmpty(param.getTaskNo())){
- return R.error("浠诲姟鍙蜂负绌猴紒");
- } else if (Cools.isEmpty(param.getTaskType())){
- return R.error("浠诲姟绫诲瀷涓虹┖锛�");
- } else if (Cools.isEmpty(param.getWarehouseId())){
- return R.error("浠撳簱鏍囪瘑涓虹┖锛�");
- }
- if (Cools.isEmpty(param.getTaskPriority())){
- param.setTaskPriority(1);
- }
- if (Cools.isEmpty(param.getContainerCode())){
- return R.error("瀹瑰櫒缂栫爜(鎵樼洏鐮�)涓虹┖锛�");
- }
- if (Cools.isEmpty(param.getEmptyContainer())){
- return R.error("鏄惁绌烘墭鐩樹俊鍙蜂负绌猴紒");
- }
+ List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
+ for (WMSAndAGVInterfaceParam param:params){
+ try {
+ if (Cools.isEmpty(param)){
+ return R.error("鍙傛暟涓虹┖锛�");
+ } else if (Cools.isEmpty(param.getTaskNo())){
+ return R.error("浠诲姟鍙蜂负绌猴紒");
+ } else if (Cools.isEmpty(param.getTaskType())){
+ return R.error("浠诲姟绫诲瀷涓虹┖锛�");
+ } else if (Cools.isEmpty(param.getWarehouseId())){
+ return R.error("浠撳簱鏍囪瘑涓虹┖锛�");
+ }
+ if (Cools.isEmpty(param.getTaskPriority())){
+ param.setTaskPriority(1);
+ }
+ if (Cools.isEmpty(param.getContainerCode())){
+ return R.error("瀹瑰櫒缂栫爜(鎵樼洏鐮�)涓虹┖锛�");
+ }
+ if (Cools.isEmpty(param.getEmptyContainer())){
+ return R.error("鏄惁绌烘墭鐩樹俊鍙蜂负绌猴紒");
+ }
// if (Cools.isEmpty(param.getTaskTunnel())){
// return R.error("浠诲姟宸烽亾涓虹┖锛�");
// }
@@ -177,17 +191,20 @@
// if (Cools.isEmpty(param.getTaskSerialNo())){
// return R.error("浠诲姟鎵ц椤哄簭涓虹┖锛�");
// }
- if (Cools.isEmpty(param.getTargetWharf())){
- return R.error("鐩爣鐮佸ご鍖哄煙涓虹┖锛�");//G寮�澶�=7杞﹂棿锛孒寮�澶�=8灞傦紝J寮�澶�=9杞﹂棿
+ if (Cools.isEmpty(param.getTargetWharf())){
+ return R.error("鐩爣鐮佸ご鍖哄煙涓虹┖锛�");//G寮�澶�=7杞﹂棿锛孒寮�澶�=8灞傦紝J寮�澶�=9杞﹂棿
+ }
+
+ openService.taskCreate(new taskCreateParam(param));
+
+ params1.add(param);
+// return R.ok(param);
+ }catch (Exception e){
+ String errorMsg = Cools.isEmpty(e.getLocalizedMessage()) ? "" : e.getLocalizedMessage();
+ return R.error("鐢熸垚浠诲姟澶辫触锛岃鑱旂郴绠＄悊鍛�!"+ errorMsg);
}
-
- openService.taskCreate(new taskCreateParam(param));
-
- return R.ok(param);
- }catch (Exception e){
- String errorMsg = Cools.isEmpty(e.getLocalizedMessage()) ? "" : e.getLocalizedMessage();
- return R.ok("鐢熸垚浠诲姟澶辫触锛岃鑱旂郴绠＄悊鍛�!"+ errorMsg);
}
+ return R.ok(params1);
}
//浠诲姟鍙栨秷鎺ュ彛
@@ -212,20 +229,20 @@
}
boolean sign =false;
switch (param.getTaskStatus()){
- case "1"://姝ｅ父鍙栨秷
+ case 1://姝ｅ父鍙栨秷
if (taskWrk.getWrkSts()>1){
return R.error("浠诲姟宸插紑濮嬫墽琛�");
}
- case "2"://寮哄埗鍙栨秷
+ case 2://寮哄埗鍙栨秷
if (taskWrk.getWrkSts()>3){
return R.error("浠诲姟宸叉墽琛屽畬鎴�");
}
break;
- case "3"://姝ｅ父瀹屾垚
+ case 3://姝ｅ父瀹屾垚
if (taskWrk.getWrkSts()>11){
return R.error("浠诲姟宸插紑濮嬫墽琛�");
}
- case "4"://寮哄埗瀹屾垚
+ case 4://寮哄埗瀹屾垚
if (taskWrk.getWrkSts()>14){
return R.error("浠诲姟宸叉墽琛屽畬鎴�");
}
--
Gitblit v1.9.1