From ca8f5a8f133e7f5b00b9d35ff6d15720804569af Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 31 一月 2024 10:15:32 +0800
Subject: [PATCH] Merge branch 'ryzhwcs' of http://47.97.1.152:5880/r/zy-wcs into ryzhwcs
---
src/main/java/com/zy/asrs/controller/OpenController.java | 197 +++++++++++++++++++++++++++++++++---------------
1 files changed, 134 insertions(+), 63 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index ada0552..6e3ff59 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,7 +1,6 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.BaseRes;
@@ -11,9 +10,8 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.TaskOverParam;
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
-import com.zy.asrs.entity.param.taskCreateParam;
+import com.zy.asrs.entity.param.TaskCreateParam;
import com.zy.asrs.service.*;
-import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,10 +21,7 @@
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@Slf4j
@RestController
@@ -45,9 +40,12 @@
private BasDevpService basDevpService;
@Autowired
private ApiLogService apiLogService;
-
+ @Autowired
+ private BasCrnpService basCrnpService;
@Autowired
private StaDescService staDescService;
+ @Autowired
+ private LocMastService locMastService;
@Value("${wms.url}")
private String wmsUrl;
@@ -80,7 +78,7 @@
//鍒涘缓浠诲姟
@PostMapping("/taskCreate")
public R taskCreate(@RequestHeader String appkey,
- @RequestBody taskCreateParam param,
+ @RequestBody TaskCreateParam param,
HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
@@ -185,22 +183,26 @@
}
Map<String,Integer> map = new HashMap<>();
- map.put("J-1101",102);map.put("J-1102",101);
- map.put("J-1103",106);map.put("J-1104",105);
- map.put("J-1105",110);map.put("J-1106",109);
- map.put("J-1107",114);map.put("J-1108",113);
- map.put("J-1109",118);map.put("J-1110",117);
- map.put("J-1111",122);map.put("J-1112",121);
+ map.put("J-1102",102);map.put("J-1101",101);
+ map.put("J-1103",105);map.put("J-1104",106);
+ map.put("J-1105",109);map.put("J-1106",110);
+ map.put("J-1107",113);map.put("J-1108",114);
+ map.put("J-1109",117);map.put("J-1110",118);
+ map.put("J-1111",121);map.put("J-1112",122);
map.put("H-1102",300);map.put("H-1101",305);
- StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("stn_desc", param.getWharfCode()));
-
- if (Cools.isEmpty(staDesc)){
- return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
+ map.put("G-1102",400);map.put("G-1101",405);
+// StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+// .eq("stn_desc", param.getWharfCode()));
+//
+// if (Cools.isEmpty(staDesc)){
+// return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
+// }
+ if (Cools.isEmpty(map.get(param.getWharfCode()))){
+ return R.error("鏈煡璇㈠埌绔欑偣");
}
- //BasDevp basDevp = basDevpService.selectById(map.get(param.getWharfCode()));
- BasDevp basDevp = basDevpService.selectById(staDesc.getStnNo());
- if (basDevp.getAutoing().equals("Y")){
+ BasDevp basDevp = basDevpService.selectById(map.get(param.getWharfCode()));
+// BasDevp basDevp = basDevpService.selectById(staDesc.getStnNo());
+ if (basDevp.getAutoing().equals("Y") && (basDevp.getInEnable().equals("Y") || basDevp.getOutEnable().equals("Y"))){
apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
,request.getRemoteAddr()+request.getRequestURI()
,appkey
@@ -209,7 +211,7 @@
,R.ok().toString()
,true
);
- return R.ok();
+ return R.ok("鍙叆");
}else {
apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
,request.getRemoteAddr()+request.getRequestURI()
@@ -238,53 +240,90 @@
List<WMSAndAGVInterfaceParam> params1 =new ArrayList<>();
for (WMSAndAGVInterfaceParam param:params){
- 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.getTargetWharf())){
- return R.error("鐩爣鐮佸ご鍖哄煙涓虹┖锛�");//G寮�澶�=7杞﹂棿锛孒寮�澶�=8灞傦紝J寮�澶�=9杞﹂棿
- }
- StaDesc staDesc = new StaDesc();
- 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("crn_stn", 200));
- }else {
- staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("crn_no", param.getTaskTunnel()).eq("type_no",2).ge("crn_stn", 200));
+ 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.getSourceLocationCode()) || Cools.isEmpty(param.getTargetLocationCode())){
+ return R.error("鍒濆鐩爣鎴栬�呯洰鏍囦綅涓虹┖");
+ }
+// if (Cools.isEmpty(param.getContainerCode())){
+// return R.error("瀹瑰櫒缂栫爜(鎵樼洏鐮�)涓虹┖锛�");
+// }
+// if (Cools.isEmpty(param.getEmptyContainer())){
+// return R.error("鏄惁绌烘墭鐩樹俊鍙蜂负绌猴紒");
+// }
+// if (!param.getTaskType().equals("YK")){
+// if (Cools.isEmpty(param.getTargetWharf())){
+// return R.error("鐩爣鐮佸ご鍖哄煙涓虹┖锛�");//G寮�澶�=7杞﹂棿锛孒寮�澶�=8灞傦紝J寮�澶�=9杞﹂棿
+// }
+// }
+
+ LocMast locMast = locMastService.selectByLocNo(param.getSourceLocationCode());
+ if(Cools.isEmpty(locMast)){
+ return R.error("鍒濆搴撲綅鏃犳硶鎵惧埌");
+ }
+
+ Integer ioType = TaskCreateParam.convertParamIoType(param.getTaskType());
+ if(ioType == 2){
+ //鍑哄簱浠诲姟鍒涘缓
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("type_no",2)
+ .eq("crn_no",locMast.getCrnNo())
+ .eq("stn_no",param.getTargetLocationCode()));
+ if(Cools.isEmpty(staDesc)){
+ return R.error("鍑哄簱璺姴涓嶅瓨鍦�");
}
param.setTargetLocationCode(staDesc.getStnNo().toString());
+ R r = openService.taskCreate(new TaskCreateParam(param));
+ }else if (ioType == 3){
+ //绉诲簱浠诲姟鍒涘缓
+
+ }
+
+// 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));
+ R r = openService.taskCreate(new TaskCreateParam(param));
- apiLogService.save("Wms浠诲姟涓嬪彂鎺ュ彛"
- ,request.getRemoteAddr()+request.getRequestURI()
- ,appkey
- ,request.getRemoteAddr()
- ,JSON.toJSONString(param)
- ,r.toString()
- ,true
- );
- return r;
+ apiLogService.save("Wms浠诲姟涓嬪彂鎺ュ彛"
+ ,request.getRemoteAddr()+request.getRequestURI()
+ ,appkey
+ ,request.getRemoteAddr()
+ ,JSON.toJSONString(param)
+ ,r.toString()
+ ,true
+ );
}
- return null;
+ return R.ok();
}
//浠诲姟鍙栨秷鎺ュ彛
@@ -292,6 +331,7 @@
public R taskCancel(@RequestHeader String appkey,
@RequestBody WMSAndAGVInterfaceParam param,
HttpServletRequest request) {
+ auth(appkey, param, request);
if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖锛�");
} else if (Cools.isEmpty(param.getTaskNo())){
@@ -347,6 +387,37 @@
}
}
+ //璁惧鐘舵�佹煡璇㈡帴鍙�
+ @PostMapping("/deviceStatus")
+ @Transactional
+ public R deviceStatus(@RequestHeader String appkey,
+ HttpServletRequest request) {
+ auth(appkey, "璁惧鐘舵�佹煡璇㈡帴鍙�", request);
+ List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
+ List<Map<String, 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<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);
+ }
+ return R.ok(list);
+ }
}
--
Gitblit v1.9.1