From 4c88c0606bb333ac1ad4c1ad536a848f7d27fdb7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 23 四月 2025 12:43:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 243 ++++++++++++++++--------------------------------
1 files changed, 83 insertions(+), 160 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 6da4410..cd5f403 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,32 +1,17 @@
package com.zy.asrs.service.impl;
-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.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.common.utils.HttpHandler;
-import com.zy.core.DevpThread;
-import com.zy.core.cache.MessageQueue;
-import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.SlaveType;
-import com.zy.core.model.DevpSlave;
-import com.zy.core.model.Task;
-import com.zy.core.model.protocol.StaProtocol;
-import com.zy.core.properties.SlaveProperties;
+import com.zy.asrs.domain.enums.WorkNoType;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.TaskCreateInParam;
+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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-
-import java.io.IOException;
import java.util.*;
@Service
@@ -35,175 +20,113 @@
@Autowired
private TaskWrkService taskWrkService;
@Autowired
- private SlaveProperties slaveProperties;
-
- @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");
- }};
+ private CommonService commonService;
+ @Autowired
+ private LocMastService locMastService;
@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(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();
-
- //TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
- toWmsDTO.setWarehouseId("1688469798893297665");
- toWmsDTO.setContainerCode(param.getContainerCode());
- toWmsDTO.setApplyType("TUNNEL");
- toWmsDTO.setWharfSource(null);
- toWmsDTO.setCanInboundTunnels(list);
- String response = null;
- try {
- response = new HttpHandler.Builder()
- .setHeaders(map)
- .setUri(wmsUrl)
- .setPath("wcsManager/wcsInterface/inboundTaskApply")
- .setJson(JSON.toJSONString(toWmsDTO))
- .build()
- .doPost();
- }catch (Exception e){
- return R.error("wms杩炴帴澶辫触"+e.getMessage());
+ public HashMap<String, Object> taskCreateIn(TaskCreateInParam param) {
+ HashMap<String, Object> map = new HashMap<>();
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
+ if (taskWrk != null) {
+ map.put("Code","0");
+ map.put("Msg", param.getTaskNo() + "浠诲姟宸茬粡鐢熸垚锛�");
+ return map;
}
- JSONObject jsonObject = JSON.parseObject(response);
- 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"));
+ Date now = new Date();
+ taskWrk = new TaskWrk();
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getTargetPoint()));
+ int workNo1 = commonService.getWorkNo(WorkNoType.PAKIN.type);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ taskWrk.setTaskNo(param.getTaskNo());//浠诲姟鍙�
+ taskWrk.setWrkNo(workNo1);
+ taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
+ taskWrk.setCreateTime(now);
+ taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
+ taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
+ taskWrk.setBarcode(param.getBarcode());//鏉＄爜
+ taskWrk.setCrnNo(locMast.getCrnNo());
+ taskWrk.setWrkSts(1);
+ taskWrk.setTargetPoint(param.getTargetPoint());//缁堢偣
+ taskWrk.setOriginTargetPoint(param.getTargetPoint());
+ if (!Cools.isEmpty(param.getMemo())) {
+ taskWrk.setMemo(param.getMemo());//澶囨敞
}
- }
-
- @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);
-
- // 鏍规嵁杈撻�佺嚎plc閬嶅巻
- for (DevpSlave devp : slaveProperties.getDevp()) {
- // 鑾峰彇鍏ュ簱绔欎俊鎭�
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- StaProtocol staProtocol = devpThread.getStation().get(map.get(param.getWharfCode()));
- 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鍑哄簱瀹屾垚浠ュ悗
- }
-
- }else {
- if (staProtocol.isLoading() && !staProtocol.isCar() && workNo == 0){
- //AGV鍏ュ簱瀹屾垚浠ュ悗
- staProtocol.setWorkNo((short) 9998);
- staProtocol.setStaNo(inSta.getStaNo().shortValue());
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- if (result) {
-
- } else {
- throw new RuntimeException("agv杩斿洖瀹屾垚鍚庯紝鍛戒护涓嬪彂澶辫触");
- }
- }
- }
- }
- }
-
-
-
+ if (!taskWrkService.insert(taskWrk)) {
+ map.put("Code", "0");
+ map.put("Msg", param.getTaskNo() + "鍒涘缓浠诲姟澶辫触锛�");
+ return map;
}
-
- }
-
- 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(300,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()){
- list.add(map.get(inSta.getStaNo()));
- }
- }
- }
- //roadway = list.stream().mapToInt(Integer::intValue).toArray();
- return list;
+ map.put("Code","1");
+ map.put("Msg","ok");
+ return map;
}
}
--
Gitblit v1.9.1