From c12d108ee5d786d460718fd258a87bda64a6aa39 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 25 三月 2025 14:36:09 +0800
Subject: [PATCH] #输送线循环优化
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 293 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 230 insertions(+), 63 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..f2d45cb 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,19 @@
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.TaskWrk;
-import com.zy.asrs.entity.ToWmsDTO;
+import com.zy.asrs.domain.enums.WorkNoType;
+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.service.OpenService;
-import com.zy.asrs.service.TaskWrkService;
+import com.zy.asrs.entity.param.TaskCreateParam;
+import com.zy.asrs.service.*;
+import com.zy.asrs.utils.Utils;
+import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
@@ -36,59 +38,112 @@
private TaskWrkService taskWrkService;
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private ApiLogService apiLogService;
+
+ @Autowired
+ private StaDescService staDescService;
+ @Autowired
+ private CommonService commonService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private BasDevpService basDevpService;
+
@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");
+ 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("H-1101");
+ add("G-1101");
}};
+
@Override
- public void taskCreate(taskCreateParam param) {
+ public HashMap<String, Object> taskCreate(TaskCreateParam param) {
+ HashMap<String,Object> map=new HashMap<>();
TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
if (taskWrk != null) {
- throw new CoolException(param.getTaskNo() + "浠诲姟宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
- }
- if (param.getIoType().equals(0)){
- throw new CoolException("鐢熸垚浠诲姟澶辫触锛屼换鍔＄被鍨嬩笉瀛樺湪锛�");
+ map.put("Code","0");
+ map.put("Msg",param.getTaskNo()+"浠诲姟宸茬粡鐢熸垚锛�");
+ return map;
}
Date now = new Date();
taskWrk = new TaskWrk();
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getStartPoint()));
+ int workNo1 = commonService.getWorkNo(WorkNoType.PAKOUT.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
taskWrk.setTaskNo(param.getTaskNo());//浠诲姟鍙�
+ taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
taskWrk.setCreateTime(now);
+ try {
+ if (param.getIoType() > 1) {
+ if (Utils.locNoRowBoolean(locMast.getRow1())) {
+ param.setTaskPriority(11);
+ }
+ }
+ } catch (Exception e) {
+ }
taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
taskWrk.setBarcode(param.getBarcode());//鏉＄爜
- taskWrk.setCrnNo(param.getCrn());
- if(param.getIoType() == 1){
+ taskWrk.setCrnNo(locMast.getCrnNo());
+ 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(param.getStartPoint());//璧风偣
+ taskWrk.setTargetPoint(param.getTargetPoint());
+ }
+ taskWrk.setTargetPoint(param.getTargetPoint());
+ } else if (param.getIoType() == 3) {
+ taskWrk.setWrkSts(11);
+ if (!Cools.isEmpty(param.getStartPoint())) {
+ taskWrk.setStartPoint(param.getStartPoint());//璧风偣
+ taskWrk.setTargetPoint(param.getTargetPoint());
+ }
}
- 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("鐢熸垚浠诲姟澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ map.put("Code","0");
+ map.put("Msg",param.getTaskNo()+"鍒涘缓浠诲姟澶辫触锛�");
+ return map;
}
+ map.put("Code","1");
+ map.put("Msg","ok");
+ return map;
}
@Override
public R AgvToWCSToWms(WMSAndAGVInterfaceParam param) throws IOException {
ToWmsDTO toWmsDTO = new ToWmsDTO();
Map<String, Object> map = new HashMap<>();
- map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
- List<Integer> list = getInEnableRoadway();
+ map.put("x-api-key", "7a15b5db-29b6-552c-8cff-0cfec3756da2");
+ List<Integer> list = new ArrayList<>();
+ if (param.getWharfSource().contains("J")) {
+ list = getInEnableRoadway();
+ } else {
+ list = getInEnableRoadway2();
+ }
+
//TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
toWmsDTO.setWarehouseId("1688469798893297665");
@@ -105,86 +160,160 @@
.setJson(JSON.toJSONString(toWmsDTO))
.build()
.doPost();
- }catch (Exception e){
- return R.error("wms杩炴帴澶辫触"+e.getMessage());
+ } catch (Exception e) {
+ return R.error("wms杩炴帴澶辫触" + e.getMessage());
}
JSONObject jsonObject = JSON.parseObject(response);
+
+ apiLogService.save("wms璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
+ , wmsUrl + "wcsManager/wcsInterface/inboundTaskApply"
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(toWmsDTO)
+ , 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("stn_no", 200));
+ } else if (param.getWharfSource().contains("H")) {
+ staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", data.getTaskTunnel())
+ .eq("type_no", 1)
+ .lt("stn_no", 400)
+ .gt("stn_no", 200));
+ } else {
+ staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
+ .eq("crn_no", data.getTaskTunnel())
+ .eq("type_no", 1)
+ .lt("stn_no", 500)
+ .ge("stn_no", 400));
+ }
+ 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 {
- if (staProtocol.isLoading() && !staProtocol.isCar() && workNo == 0){
+ } 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杩斿洖瀹屾垚鍚庯紝鍛戒护涓嬪彂澶辫触");
}
}
+
}
}
}
-
-
-
}
}
- public List<Integer> getInEnableRoadway(){
+ @Override
+ public R getAgvPickAndPlaceV1(TaskOverParam param) {
+ BasDevp basDevp = basDevpService.selectById(param.getStaNo());
+ if (Cools.isEmpty(basDevp)) {
+ return R.error("绔欑偣鍙锋湁璇�" + param.getStaNo());
+ }
+ if (param.getType() == 0 && basDevp.getAgvStartPick() == 1) {
+ return R.ok();
+ } else if (param.getType() == 1 && basDevp.getAgvStartPlace() == 1) {
+ return R.ok();
+ } else {
+ return R.error("涓嶅厑璁�");
+ }
+ }
+
+ @Override
+ public R getAgvPickAndPlaceV2(TaskOverParam param) {
+ BasDevp basDevp = basDevpService.selectById(param.getStaNo());
+ if (Cools.isEmpty(basDevp)) {
+ return R.error("绔欑偣鍙锋湁璇�" + param.getStaNo());
+ }
+ if (param.getType() == 0) {
+ basDevp.setAgvTargetPick(1);
+ basDevpService.updateById(basDevp);
+ return R.ok();
+ } else if (param.getType() == 1) {
+ basDevp.setAgvTargetPlace(1);
+ basDevpService.updateById(basDevp);
+ return R.ok();
+ } else {
+ return R.error("璇锋眰绫诲瀷寮傚父" + param.getType());
+ }
+ }
+
+ public List<Integer> getInEnableRoadway() {
int[] roadway = null;
List<Integer> list = new ArrayList<>();
- Map<Integer,Integer> map = new HashMap<>();
- map.put(103,1);
- map.put(107,2);
- map.put(111,3);
- map.put(115,4);
- map.put(119,5);
- map.put(123,6);
- //map.put(301,7);
+ Map<Integer, Integer> map = new HashMap<>();
+ map.put(103, 1);
+ map.put(107, 2);
+ map.put(111, 3);
+ map.put(115, 4);
+ map.put(119, 5);
+ map.put(123, 6);
+ //put(301,7);
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鍏ュ簱鍙�
@@ -198,8 +327,8 @@
staProtocol = staProtocol.clone();
}
Short workNo = staProtocol.getWorkNo();
- if (workNo == 0 && !staProtocol.isLoading()){
- if (Cools.isEmpty(map.get(inSta.getStaNo()))){
+ if (workNo == 0 && !staProtocol.isLoading()) {
+ if (Cools.isEmpty(map.get(inSta.getStaNo()))) {
continue;
}
list.add(map.get(inSta.getStaNo()));
@@ -209,4 +338,42 @@
//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