From 4efdfa79008cb12e1fbb7120cd68198cd0d0677c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 13 十二月 2023 16:47:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 184 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 145 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 4c3b4fe..4347bc1 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -2,17 +2,22 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
+import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.entity.ToWmsDTO;
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.service.ApiLogService;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.TaskWrkService;
+import com.zy.asrs.utils.Utils;
import com.zy.common.utils.HttpHandler;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
@@ -26,6 +31,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.*;
@@ -36,15 +42,25 @@
private TaskWrkService taskWrkService;
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private ApiLogService apiLogService;
+
+ @Autowired
+ private StaDescService staDescService;
+
+
@Value("${wms.url}")
private String wmsUrl;
public ArrayList<String> wharfCode1 = new ArrayList<String>(){{
- add("J-1101"); add("J-1103"); add("J-1105"); add("J-1107"); add("J-1109"); add("J-1111");
+ add("J-1101"); add("J-1103"); add("J-1105"); add("J-1107"); add("J-1109"); add("J-1111");add("H-1101");
+ add("G-1101");
}};
+
+
@Override
- public void taskCreate(taskCreateParam param) {
+ public R taskCreate(taskCreateParam param) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
if (taskWrk != null) {
throw new CoolException(param.getTaskNo() + "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
@@ -64,23 +80,36 @@
taskWrk.setCrnNo(param.getCrn());
if(param.getIoType() == 1){
taskWrk.setWrkSts(1);
+ if (!Cools.isEmpty(param.getTargetPoint())) {
+ taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//缁堢偣
+ taskWrk.setOriginTargetPoint(param.getTargetPoint());
+ }
+
} else if (param.getIoType() == 2) {
taskWrk.setWrkSts(11);
+ if (!Cools.isEmpty(param.getStartPoint())) {
+ taskWrk.setStartPoint(Utils.getWcsLocNo(param.getStartPoint()));//璧风偣
+ taskWrk.setOriginStartPoint(param.getStartPoint());
+ }
+ taskWrk.setTargetPoint(param.getTargetPoint());
+ }else if (param.getIoType() == 3){
+ taskWrk.setWrkSts(11);
+ if (!Cools.isEmpty(param.getStartPoint())) {
+ taskWrk.setStartPoint(Utils.getWcsLocNo(param.getStartPoint()));//璧风偣
+ taskWrk.setOriginStartPoint(param.getStartPoint());
+ }
}
- if (!Cools.isEmpty(param.getStartPoint())) {
- taskWrk.setStartPoint(param.getStartPoint());//璧风偣
- }
- if (!Cools.isEmpty(param.getTargetPoint())) {
- taskWrk.setTargetPoint(param.getTargetPoint());//缁堢偣
- }
+
+
if (!Cools.isEmpty(param.getMemo())) {
taskWrk.setMemo(param.getMemo());//澶囨敞
}
if (!taskWrkService.insert(taskWrk)) {
- throw new CoolException("鐢熸垚浠诲姟澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ return R.error("鍒涘缓浠诲姟澶辫触");
}
+ return R.ok();
}
@Override
@@ -88,7 +117,13 @@
ToWmsDTO toWmsDTO = new ToWmsDTO();
Map<String, Object> map = new HashMap<>();
map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
- List<Integer> list = getInEnableRoadway();
+ List<Integer> list = new ArrayList<>();
+ if (param.getWharfSource().contains("J")){
+ list = getInEnableRoadway();
+ }else {
+ list = getInEnableRoadway2();
+ }
+
//TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
toWmsDTO.setWarehouseId("1688469798893297665");
@@ -110,66 +145,99 @@
}
JSONObject jsonObject = JSON.parseObject(response);
+
+ apiLogService.save("wms璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+ ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
+ ,null
+ ,"127.0.0.1"
+ ,JSON.toJSONString(param)
+ ,response
+ ,true
+ );
+
if (jsonObject.getInteger("code").equals(200)) {
//瑙ｆ瀽
List<WMSAndAGVInterfaceParam> params = new ArrayList<>();
params.add(param);
WMSAndAGVInterfaceParam data = JSONObject.parseObject(jsonObject.get("data").toString(), WMSAndAGVInterfaceParam.class);
-
- taskCreate(new taskCreateParam(data));
- return R.ok(jsonObject.get("data"));
- }else {
- return R.error((String) jsonObject.get("msg"));
+ String msg = null;
+ try {
+ taskCreate(new taskCreateParam(data));
+ }catch (Exception e){
+ msg = e.getMessage();
+ }
+ if (msg != null){
+ return R.error(msg);
+ }
+ Map<String,String> map1 = new HashMap<>();
+ StaDesc staDesc = new StaDesc();
+ if (param.getWharfSource().contains("J")){
+ staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no",data.getTaskTunnel())
+ .eq("type_no",1)
+ .lt("crn_stn",200));
+ }else {
+ staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no",data.getTaskTunnel())
+ .eq("type_no",1)
+ .ge("crn_stn",200));
+ }
+ map1.put("taskTunnel", staDesc.getStnDesc());
+ //map1.put("taskTunnel", "J-1104");
+ return R.ok(map1);
}
-
+ return R.error((String) jsonObject.get("msg"));
}
@Override
public void getAgvTaskOver(TaskOverParam param) {
- 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("H-1101",305);map.put("H-1102",300);
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
+ StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("stn_desc", param.getWharfCode()));
+ if (Cools.isEmpty(staDesc)){
+ throw new RuntimeException("鏈煡璇㈠埌绔欑偣淇℃伅");
+ }
// 鑾峰彇鍏ュ簱绔欎俊鎭�
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- StaProtocol staProtocol = devpThread.getStation().get(map.get(param.getWharfCode()));
+ StaProtocol staProtocol = devpThread.getStation().get(staDesc.getStnNo());
if (staProtocol == null) {
continue;
} else {
staProtocol = staProtocol.clone();
}
Short workNo = staProtocol.getWorkNo();
- for (DevpSlave.Sta inSta : devp.getInSta()) {
- if (inSta.getBackSta().equals(map.get(param.getWharfCode()))){
- if (wharfCode1.contains(param.getWharfCode())){
- if (!staProtocol.isLoading() && !staProtocol.isCar()){
- //AGV鍑哄簱瀹屾垚浠ュ悗
- }
+ if (wharfCode1.contains(param.getWharfCode())){
+ if (!staProtocol.isLoading() && !staProtocol.isCar() && staProtocol.getWorkNo() >0){
+ //AGV鍑哄簱瀹屾垚浠ュ悗
+ staProtocol.setWorkNo((short) 0);
+ staProtocol.setStaNo((short)0);
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
+ if (result) {
- }else {
+ } else {
+ throw new RuntimeException("agv杩斿洖瀹屾垚鍚庯紝鍛戒护涓嬪彂澶辫触");
+ }
+ }
+ }else {
+ for (DevpSlave.Sta inSta : devp.getInSta()) {
+ if (inSta.getBackSta().equals(staDesc.getStnNo())){
+
if (staProtocol.isLoading() && !staProtocol.isCar() && workNo == 0){
//AGV鍏ュ簱瀹屾垚浠ュ悗
staProtocol.setWorkNo((short) 9999);
staProtocol.setStaNo(inSta.getStaNo().shortValue());
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
if (result) {
} else {
throw new RuntimeException("agv杩斿洖瀹屾垚鍚庯紝鍛戒护涓嬪彂澶辫触");
}
}
+
}
}
}
-
-
-
}
}
@@ -184,7 +252,7 @@
map.put(115,4);
map.put(119,5);
map.put(123,6);
- //map.put(301,7);
+ //put(301,7);
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鍏ュ簱鍙�
@@ -199,14 +267,52 @@
}
Short workNo = staProtocol.getWorkNo();
if (workNo == 0 && !staProtocol.isLoading()){
- if (Cools.isEmpty(map.get(inSta.getStaNo()))){
+ if (Cools.isEmpty( map.get(inSta.getStaNo()))){
continue;
}
- list.add(map.get(inSta.getStaNo()));
+ list.add( map.get(inSta.getStaNo()));
}
}
}
//roadway = list.stream().mapToInt(Integer::intValue).toArray();
return list;
}
+
+ public List<Integer> getInEnableRoadway2(){
+ int[] roadway = null;
+ List<Integer> list = new ArrayList<>();
+ Map<Integer,Integer> map = new HashMap<>();
+ map.put(205,1);
+ map.put(211,2);
+ map.put(217,3);
+ map.put(223,4);
+ map.put(229,5);
+ map.put(235,6);
+ //put(301,7);
+ // 鏍规嵁杈撻�佺嚎plc閬嶅巻
+ for (DevpSlave devp : slaveProperties.getDevp()) {
+ // 閬嶅巻鍏ュ簱鍙�
+ for (DevpSlave.Sta inSta : devp.getInSta()) {
+ // 鑾峰彇鍏ュ簱绔欎俊鎭�
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ StaProtocol staProtocol = devpThread.getStation().get(inSta.getBackSta());
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ Short workNo = staProtocol.getWorkNo();
+ if (workNo == 0 && !staProtocol.isLoading()){
+ if (Cools.isEmpty( map.get(inSta.getStaNo()))){
+ continue;
+ }
+ list.add( map.get(inSta.getStaNo()));
+ }
+ }
+ }
+ //roadway = list.stream().mapToInt(Integer::intValue).toArray();
+ return list;
+ }
+
+
}
--
Gitblit v1.9.1