From 3adff2c549121bc166f49aa8de681265cd87b2d9 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 19 六月 2025 09:49:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 201 +++++++++++++++++++++++++++++++-------------------
1 files changed, 125 insertions(+), 76 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 56b2679..3cf81fc 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -8,10 +8,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.domain.enums.WorkNoType;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.StaDesc;
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.entity.ToWmsDTO;
+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;
@@ -50,41 +47,56 @@
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");add("H-1101");
+ 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("ReturnStatus",1);
+ map.put("ErrorMessage",param.getTaskNo()+"浠诲姟宸茬粡鐢熸垚锛�");
+ return map;
}
Date now = new Date();
taskWrk = new TaskWrk();
- LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",param.getStartPoint()));
+ 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(locMast.getCrnNo());
- if(param.getIoType() == 1){
+ if (param.getIoType() == 1) {
taskWrk.setWrkSts(1);
if (!Cools.isEmpty(param.getTargetPoint())) {
taskWrk.setTargetPoint(Utils.getWcsLocNo(param.getTargetPoint()));//缁堢偣
@@ -98,7 +110,7 @@
taskWrk.setTargetPoint(param.getTargetPoint());
}
taskWrk.setTargetPoint(param.getTargetPoint());
- }else if (param.getIoType() == 3){
+ } else if (param.getIoType() == 3) {
taskWrk.setWrkSts(11);
if (!Cools.isEmpty(param.getStartPoint())) {
taskWrk.setStartPoint(param.getStartPoint());//璧风偣
@@ -107,26 +119,29 @@
}
-
if (!Cools.isEmpty(param.getMemo())) {
taskWrk.setMemo(param.getMemo());//澶囨敞
}
if (!taskWrkService.insert(taskWrk)) {
- return R.error("鍒涘缓浠诲姟澶辫触");
+ map.put("ReturnStatus",1);
+ map.put("ErrorMessage",param.getTaskNo()+"鍒涘缓浠诲姟澶辫触锛�");
+ return map;
}
- return R.ok();
+ map.put("ReturnStatus",0);
+ map.put("ErrorMessage","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");
+ map.put("x-api-key", "7a15b5db-29b6-552c-8cff-0cfec3756da2");
List<Integer> list = new ArrayList<>();
- if (param.getWharfSource().contains("J")){
+ if (param.getWharfSource().contains("J")) {
list = getInEnableRoadway();
- }else {
+ } else {
list = getInEnableRoadway2();
}
@@ -146,19 +161,19 @@
.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
+ , wmsUrl + "wcsManager/wcsInterface/inboundTaskApply"
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(toWmsDTO)
+ , response
+ , true
);
if (jsonObject.getInteger("code").equals(200)) {
@@ -169,31 +184,31 @@
String msg = null;
try {
taskCreate(new TaskCreateParam(data));
- }catch (Exception e){
+ } catch (Exception e) {
msg = e.getMessage();
}
- if (msg != null){
+ if (msg != null) {
return R.error(msg);
}
- Map<String,String> map1 = new HashMap<>();
+ Map<String, String> map1 = new HashMap<>();
StaDesc staDesc = new StaDesc();
- if (param.getWharfSource().contains("J")){
+ 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")){
+ .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 {
+ .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));
+ .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");
@@ -208,7 +223,7 @@
for (DevpSlave devp : slaveProperties.getDevp()) {
StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
.eq("stn_desc", param.getWharfCode()));
- if (Cools.isEmpty(staDesc)){
+ if (Cools.isEmpty(staDesc)) {
throw new RuntimeException("鏈煡璇㈠埌绔欑偣淇℃伅");
}
// 鑾峰彇鍏ュ簱绔欎俊鎭�
@@ -220,11 +235,11 @@
staProtocol = staProtocol.clone();
}
Short workNo = staProtocol.getWorkNo();
- if (wharfCode1.contains(param.getWharfCode())){
- if (!staProtocol.isLoading() && !staProtocol.isCar() && staProtocol.getWorkNo() >0){
+ if (wharfCode1.contains(param.getWharfCode())) {
+ if (!staProtocol.isLoading() && !staProtocol.isCar() && staProtocol.getWorkNo() > 0) {
//AGV鍑哄簱瀹屾垚浠ュ悗
staProtocol.setWorkNo((short) 0);
- staProtocol.setStaNo((short)0);
+ staProtocol.setStaNo((short) 0);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
if (result) {
@@ -232,11 +247,11 @@
throw new RuntimeException("agv杩斿洖瀹屾垚鍚庯紝鍛戒护涓嬪彂澶辫触");
}
}
- }else {
+ } else {
for (DevpSlave.Sta inSta : devp.getInSta()) {
- if (inSta.getBackSta().equals(staDesc.getStnNo())){
+ if (inSta.getBackSta().equals(staDesc.getStnNo())) {
- if (staProtocol.isLoading() && !staProtocol.isCar() && workNo == 0){
+ if (staProtocol.isLoading() && !staProtocol.isCar() && workNo == 0) {
//AGV鍏ュ簱瀹屾垚浠ュ悗
staProtocol.setWorkNo((short) 9999);
staProtocol.setStaNo(inSta.getStaNo().shortValue());
@@ -255,16 +270,50 @@
}
- 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<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()) {
@@ -279,11 +328,11 @@
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()));
+ list.add(map.get(inSta.getStaNo()));
}
}
}
@@ -291,16 +340,16 @@
return list;
}
- public List<Integer> getInEnableRoadway2(){
+ 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);
+ 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()) {
@@ -315,11 +364,11 @@
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()));
+ list.add(map.get(inSta.getStaNo()));
}
}
}
--
Gitblit v1.9.1