From bc48a855d98e360042a7e2fff5594a91a82578c6 Mon Sep 17 00:00:00 2001
From: taisheng <taisheng@qq.com>
Date: 星期四, 24 七月 2025 16:16:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 161 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 100 insertions(+), 61 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 1819c4a..b382e51 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,23 +1,19 @@
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.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.asrs.domain.enums.WorkNoType;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.GenerateAgvTaskParam;
+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
@@ -25,84 +21,127 @@
@Autowired
private TaskWrkService taskWrkService;
-
- @Value("${wms.url}")
- private String wmsUrl;
+ @Autowired
+ 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(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 = new ArrayList<>();
- list.add(1);
- list.add(4);
- //TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
- toWmsDTO.setWarehouseId("1688469798893297665");
- toWmsDTO.setContainerCode(param.getContainerCode());
- toWmsDTO.setApplyType("TUNNEL");
- toWmsDTO.setWharfSource(null);
- toWmsDTO.setCanInboundTunnels(list);
- String response = new HttpHandler.Builder()
- .setHeaders(map)
- .setUri(wmsUrl)
- .setPath("wcsManager/wcsInterface/inboundTaskApply")
- .setJson(JSON.toJSONString(toWmsDTO))
- .build()
- .doPost();
-
- 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"));
+ public boolean generateAgvTask(GenerateAgvTaskParam param) {
+ Date now = new Date();
+ String originPoint = param.getOriginPoint();
+ String targetPoint = param.getTargetPoint();
+ LocMast startLocMast = locMastService.selectByLocNo(originPoint);
+ if(startLocMast == null){
+ throw new CoolException("鍙栬揣鐐瑰簱浣嶄笉瀛樺湪");
}
+ if (!startLocMast.getLocSts().equals("F")) {
+ throw new CoolException("鍙栬揣鐐逛笉澶勪簬鍦ㄥ簱");
+ }
+
+ LocMast targetLocMast = locMastService.selectByLocNo(targetPoint);
+ if(targetLocMast == null){
+ throw new CoolException("鏀捐揣鐐瑰簱浣嶄笉瀛樺湪");
+ }
+
+ if (!targetLocMast.getLocSts().equals("O")) {
+ throw new CoolException("鏀捐揣鐐逛笉澶勪簬绌哄簱");
+ }
+
+ TaskWrk taskWrk = new TaskWrk();
+ int workNo1 = commonService.getWorkNo(WorkNoType.AGV.type);//鑾峰彇AGV宸ヤ綔鍙�
+
+ taskWrk.setTaskNo(String.valueOf(workNo1));//浠诲姟鍙�
+ taskWrk.setWrkNo(workNo1);
+ taskWrk.setStatus(TaskStatusType.RECEIVE.id);//浠诲姟鐘舵�侊細鎺ユ敹
+ taskWrk.setCreateTime(now);
+ taskWrk.setWrkSts(11);
+ taskWrk.setIoType(4);//AGV鎼繍
+ taskWrk.setStartPoint(param.getOriginPoint());//鍙栬揣鐐�
+ taskWrk.setTargetPoint(param.getTargetPoint());//鏀捐揣鐐�
+ taskWrk.setBarcode(startLocMast.getBarcode());
+
+ boolean insert = taskWrkService.insert(taskWrk);
+ if (!insert) {
+ throw new CoolException("浠诲姟鐢熸垚澶辫触");
+ }
+
+ startLocMast.setLocSts("R");
+ startLocMast.setModiTime(now);
+ locMastService.updateById(startLocMast);
+
+ targetLocMast.setLocSts("S");
+ targetLocMast.setModiTime(now);
+ locMastService.updateById(targetLocMast);
+
+ return true;
}
}
--
Gitblit v1.9.1