From 43c47d17ab873af88a224e2e92607572da8ee849 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 01 二月 2024 18:55:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 80 +++++++++++-----------------------------
1 files changed, 22 insertions(+), 58 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index f25afd6..f3b74fa 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -8,6 +8,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.CarryParam;
import com.zy.asrs.entity.param.TaskOverParam;
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.entity.param.TaskCreateParam;
@@ -78,9 +79,11 @@
//鍒涘缓浠诲姟
@PostMapping("/taskCreate")
public R taskCreate(@RequestHeader String appkey,
- @RequestBody TaskCreateParam param,
+ @RequestBody List<TaskCreateParam> param1,
HttpServletRequest request) {
- auth(appkey, param, request);
+ auth(appkey, param1, request);
+ for (TaskCreateParam param : param1
+ ) {
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
@@ -94,6 +97,7 @@
return R.error("鏉＄爜[barcode]涓嶈兘涓虹┖");
}
openService.taskCreate(param);
+ }
return R.ok();
}
@@ -234,23 +238,20 @@
@PostMapping("/outboundTaskSend")
@Transactional
public R outboundTaskSend(@RequestHeader String appkey,
- @RequestBody List<WMSAndAGVInterfaceParam> params,
+ @RequestBody List<CarryParam> params,
HttpServletRequest request) {
- auth(appkey, params, request);
+ //auth(appkey, params, request);
List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
- for (WMSAndAGVInterfaceParam param:params){
+ for (CarryParam param:params){
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
} else if (Cools.isEmpty(param.getTaskNo())){
return R.error("浠诲姟鍙蜂负绌猴紒");
- } else if (Cools.isEmpty(param.getTaskType())){
+ } else if (Cools.isEmpty(param.getIoType())){
return R.error("浠诲姟绫诲瀷涓虹┖锛�");
}
- if (Cools.isEmpty(param.getTaskPriority())){
- param.setTaskPriority(1);
- }
- if (Cools.isEmpty(param.getSourceLocationCode()) || Cools.isEmpty(param.getTargetLocationCode())){
+ if (Cools.isEmpty(param.getStartPoint()) || Cools.isEmpty(param.getTargetPoint())){
return R.error("鍒濆鐩爣鎴栬�呯洰鏍囦綅涓虹┖");
}
// if (Cools.isEmpty(param.getContainerCode())){
@@ -265,50 +266,27 @@
// }
// }
- LocMast locMast = locMastService.selectByLocNo(param.getSourceLocationCode());
+ LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
if(Cools.isEmpty(locMast)){
return R.error("鍒濆搴撲綅鏃犳硶鎵惧埌");
}
- Integer ioType = TaskCreateParam.convertParamIoType(param.getTaskType());
- if(ioType == 2){
+ R r = null;
+
+ if(param.getIoType() == 2){
//鍑哄簱浠诲姟鍒涘缓
StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
.eq("type_no",2)
.eq("crn_no",locMast.getCrnNo())
- .eq("stn_no",param.getTargetLocationCode()));
+ .eq("stn_no",param.getTargetPoint()));
if(Cools.isEmpty(staDesc)){
return R.error("鍑哄簱璺姴涓嶅瓨鍦�");
}
- param.setTargetLocationCode(staDesc.getStnNo().toString());
- R r = openService.taskCreate(new TaskCreateParam(param));
- }else if (ioType == 3){
+ r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
+ }else if (param.getIoType() == 3){
//绉诲簱浠诲姟鍒涘缓
-
+ r = openService.taskCreate(new TaskCreateParam(param,locMast.getCrnNo()));
}
-
-// if (param.getTaskType().equals("CK") && param.getTargetWharf().contains("J")){
-// staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
-// .eq("crn_no",param.getTaskTunnel())
-// .eq("type_no",2)
-// .lt("stn_no",200));
-// }else if (param.getTaskType().equals("CK") && param.getTargetWharf().contains("H")){
-// staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
-// .eq("crn_no",param.getTaskTunnel())
-// .eq("type_no",2)
-// .lt("stn_no",400)
-// .gt("stn_no",200));
-// }else {
-// staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
-// .eq("crn_no",param.getTaskTunnel())
-// .eq("type_no",2)
-// .lt("stn_no",500)
-// .ge("stn_no",400));
-// }
- //param.setTargetLocationCode(staDesc.getStnNo().toString());
-
-
- R r = openService.taskCreate(new TaskCreateParam(param));
apiLogService.save("Wms浠诲姟涓嬪彂鎺ュ彛"
,request.getRemoteAddr()+request.getRequestURI()
@@ -392,27 +370,13 @@
HttpServletRequest request) {
auth(appkey, "璁惧鐘舵�佹煡璇㈡帴鍙�", request);
List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
- List<Map<String, Object>> list = new ArrayList<>();
+ List<Object> list = new ArrayList<>();
for (BasDevp basDevp:basDevps){
- Map<String, Object> map = new HashMap<>();
- map.put("devNo", basDevp.getDevNo());
- map.put("devType", "杈撻�佺嚎");
- map.put("devStatus", basDevp.getAutoing().equals("Y")? 1:0);
- map.put("errorCode", 0);
- map.put("errorMsg", "");
- map.put("newDate",new Date());
- list.add(map);
+ list.add(basDevp);
}
List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
for (BasCrnp basCrnp:basCrnps){
- Map<String, Object> map = new HashMap<>();
- map.put("devNo", basCrnp.getCrnNo());
- map.put("devType", "鍫嗗灈鏈�");
- map.put("devStatus", basCrnp.getCrnSts());
- map.put("errorCode", 0);
- map.put("errorMsg", "");
- map.put("newDate",new Date());
- list.add(map);
+ list.add(basCrnp);
}
return R.ok(list);
}
--
Gitblit v1.9.1