From a1e94379b115721b2e604070dc48063b8016f72f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 21 十月 2025 19:32:59 +0800
Subject: [PATCH] 侧面输送线出库码盘信息对接
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 345 ++++++++++++---------------------------------------------
1 files changed, 73 insertions(+), 272 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 8c59836..aa8cb04 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,26 +1,22 @@
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.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.domain.param.ApplyInDevpDto;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.TaskWrk;
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;
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;
@@ -28,8 +24,8 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import java.io.IOException;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
@Service
public class OpenServiceImpl implements OpenService {
@@ -40,7 +36,6 @@
private SlaveProperties slaveProperties;
@Autowired
private ApiLogService apiLogService;
-
@Autowired
private StaDescService staDescService;
@Autowired
@@ -49,41 +44,47 @@
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");add("H-1101");
- add("G-1101");
- }};
-
-
@Override
- public R 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);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", param.getStartPoint()));
+ if (locMast == null) {
+ map.put("Code", "0");
+ map.put("Msg", param.getStartPoint() + "搴撲綅鍙锋湁璇�");
+ return map;
+ }
+ int workNoType = WorkNoType.PAKOUT.type;
+ // 2锛�3鍙峰爢鍨涙満鍑哄簱锛岄渶瑕侀�氳繃鏉＄爜鍖哄垎澶у皬鎵樼洏锛�16寮�澶村皬鎵樼洏锛�18寮�澶村ぇ鎵樼洏锛屼换鍔″彿3001-6000涓哄皬鎵樼洏
+ if (param.getIoType() == 2 && (locMast.getCrnNo() == 3 || locMast.getCrnNo() == 2) && locMast.getBarcode().startsWith("16")) {
+ workNoType = WorkNoType.PICK.type;
+ }
+ int workNo1 = commonService.getWorkNo(workNoType);//鑾峰彇鍏ュ簱宸ヤ綔鍙�
taskWrk.setTaskNo(param.getTaskNo());//浠诲姟鍙�
taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
taskWrk.setCreateTime(now);
+ taskWrk.setAssignTime(now);
taskWrk.setIoType(param.getIoType());//浠诲姟绫诲瀷
taskWrk.setIoPri(param.getTaskPriority());//浼樺厛绾�
taskWrk.setBarcode(param.getBarcode());//鏉＄爜
taskWrk.setCrnNo(locMast.getCrnNo());
- if(param.getIoType() == 1){
+ taskWrk.setType(param.getType());
+ taskWrk.setMp(param.getMp());
+ taskWrk.setLx(param.getLx());
+ taskWrk.setLev(param.getLev());
+ if (param.getIoType() == 1) {
taskWrk.setWrkSts(1);
if (!Cools.isEmpty(param.getTargetPoint())) {
taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//缁堢偣
@@ -92,12 +93,16 @@
} else if (param.getIoType() == 2) {
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 (Integer.parseInt(param.getTargetPoint()) == 211 || Integer.parseInt(param.getTargetPoint()) == 206 || Integer.parseInt(param.getTargetPoint()) == 202) {
+ taskWrk.setTargetPoint(String.valueOf(Integer.parseInt(param.getTargetPoint()) + 1));
+ } else {
+ taskWrk.setTargetPoint(String.valueOf(Integer.parseInt(param.getTargetPoint()) - 1));
}
- taskWrk.setTargetPoint(param.getTargetPoint());
- }else if (param.getIoType() == 3){
+// }
+// taskWrk.setTargetPoint(param.getTargetPoint());
+ } else if (param.getIoType() == 3) {
taskWrk.setWrkSts(11);
if (!Cools.isEmpty(param.getStartPoint())) {
taskWrk.setStartPoint(param.getStartPoint());//璧风偣
@@ -106,259 +111,55 @@
}
-
if (!Cools.isEmpty(param.getMemo())) {
taskWrk.setMemo(param.getMemo());//澶囨敞
}
if (!taskWrkService.insert(taskWrk)) {
- return R.error("鍒涘缓浠诲姟澶辫触");
+ map.put("Code", "0");
+ map.put("Msg", param.getTaskNo() + "鍒涘缓浠诲姟澶辫触锛�");
+ return map;
}
- return R.ok();
+ 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 = new ArrayList<>();
- if (param.getWharfSource().contains("J")){
- list = getInEnableRoadway();
- }else {
- list = getInEnableRoadway2();
+ public R applyInDevp(ApplyInDevpDto param) {
+ Integer sourceSite = param.getSourceSite();
+ BasDevp basDevp = basDevpService.selectById(sourceSite);
+ if (basDevp == null) {
+ return R.error("婧愮珯鐐逛笉瀛樺湪:" + param);
}
-
-
- //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());
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
+ StaProtocol staProtocol = devpThread.getStation().get(sourceSite);
+ if (staProtocol == null) {
+ return R.parse(sourceSite + "绾跨▼涓虹┖!");
+ } else {
+ staProtocol = staProtocol.clone();
}
-
- 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);
- 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);
+ StaProtocol staProtocol1 = devpThread.getStation().get(param.getTargetSite());
+ if (staProtocol1 == null) {
+ return R.parse(param.getTargetSite() + "绾跨▼涓虹┖!");
+ } else {
+ staProtocol1 = staProtocol1.clone();
}
- return R.error((String) jsonObject.get("msg"));
- }
+// if (staProtocol1.isLoading()) {
+// return R.error(staProtocol1.getSiteId() + "绔欑偣鏈夌墿!");
+// }
- @Override
- public void getAgvTaskOver(TaskOverParam param) {
- // 鏍规嵁杈撻�佺嚎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(staDesc.getStnNo());
- if (staProtocol == null) {
- continue;
- } else {
- staProtocol = staProtocol.clone();
- }
- Short workNo = staProtocol.getWorkNo();
- 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 {
- 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(3, staProtocol));
- if (result) {
-
- } else {
- throw new RuntimeException("agv杩斿洖瀹屾垚鍚庯紝鍛戒护涓嬪彂澶辫触");
- }
- }
-
- }
- }
- }
+ if (!staProtocol.isAutoing()) {
+ return R.error(staProtocol.getSiteId() + "绔欑偣fei鑷姩");
}
-
- }
-
- @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("涓嶅厑璁�");
+ staProtocol.setWorkNo((short) commonService.getWorkNo(param.getFlag()));
+ staProtocol.setStaNo(param.getTargetSite().shortValue());
+ basDevpService.updateById(basDevp);
+ boolean result = MessageQueue.offer(SlaveType.Devp, 2, new Task(2, staProtocol));
+ if (result) {
+ return R.ok("鎴愬姛");
+ } else {
+ return R.error("涓嬪彂鍛戒护澶辫触:" + param);
}
}
-
- @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);
- //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;
- }
-
- 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