From 0d04bc5d8080b82338302fba0a59fccff2eaedfc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 06 七月 2025 11:28:29 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/OpenServiceImpl.java | 126 ++++++++++++++++++++++++++++-------------
1 files changed, 85 insertions(+), 41 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/OpenServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/OpenServiceImpl.java
index 1c1ced4..9a55d74 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/OpenServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/OpenServiceImpl.java
@@ -148,32 +148,6 @@
priority = param.getPriority();
}
- Task task = new Task();
- task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
- task.setTaskNo(String.valueOf(Utils.getTaskNo("IN")));
- task.setWmsTaskNo(param.getTaskNo());
- task.setTaskSts(TaskStsType.NEW_INBOUND.sts);
- task.setTaskCtg(taskCtg.getId());
- task.setPriority(priority);
- task.setOriginSite(param.getOriginSite());
- task.setOriginLoc(null);
- task.setDestSite(destSite);
- task.setDestLoc(param.getDestLoc());
- task.setZpallet(param.getBarcode());
- task.setIoTime(new Date());
- task.setStartTime(new Date());
- task.setStatus(1);
- task.setMemo("");
- task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
- task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
- task.setHostId(hostId);//涓存椂鎺у埗鍙厑璁竓ost涓�1
- task.setMemo(param.getEndSite());
-
- boolean result = taskService.save(task);
- if (!result) {
- throw new CoolException("鐢熸垚鍏ュ簱浠诲姟澶辫触锛�");
- }
-
if (createWcsTaskParam != null) {
//杞彂agv
if (!createWcsTaskParam.getFrmPos().equals("06YZ0001")){
@@ -184,9 +158,87 @@
if (!httpRequest.equals("SUCCESS")){
throw new CoolException("杞彂AGV浠诲姟澶辫触" + httpRequest);
}
+
+ Task task = new Task();
+ task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
+ task.setTaskNo(String.valueOf(Utils.getTaskNo("IN")));
+ task.setWmsTaskNo(param.getTaskNo());
+ task.setTaskSts(TaskStsType.NEW_INBOUND.sts);
+ task.setTaskCtg(taskCtg.getId());
+ task.setPriority(priority);
+ task.setOriginSite(param.getOriginSite());
+ task.setOriginLoc(null);
+ task.setDestSite(destSite);
+ task.setDestLoc(param.getDestLoc());
+ task.setZpallet(param.getBarcode());
+ task.setIoTime(new Date());
+ task.setStartTime(new Date());
+ task.setStatus(1);
+ task.setMemo("");
+ task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
+ task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
+ task.setHostId(hostId);//涓存椂鎺у埗鍙厑璁竓ost涓�1
+ task.setMemo(param.getEndSite());
+
+ boolean result = taskService.save(task);
+ if (!result) {
+ throw new CoolException("鐢熸垚鍏ュ簱浠诲姟澶辫触锛�");
+ }
}catch (Exception e){
throw new CoolException("杞彂AGV浠诲姟鍑洪敊" + e.getMessage());
}
+ }else {
+ Task task = new Task();
+ task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
+ task.setTaskNo(String.valueOf(Utils.getTaskNo("IN")));
+ task.setWmsTaskNo(param.getTaskNo());
+ task.setTaskSts(TaskStsType.NEW_INBOUND.sts);
+ task.setTaskCtg(taskCtg.getId());
+ task.setPriority(priority);
+ task.setOriginSite(param.getOriginSite());
+ task.setOriginLoc(null);
+ task.setDestSite(destSite);
+ task.setDestLoc(param.getDestLoc());
+ task.setZpallet(param.getBarcode());
+ task.setIoTime(new Date());
+ task.setStartTime(new Date());
+ task.setStatus(1);
+ task.setMemo("");
+ task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
+ task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
+ task.setHostId(hostId);//涓存椂鎺у埗鍙厑璁竓ost涓�1
+ task.setMemo(param.getEndSite());
+
+ boolean result = taskService.save(task);
+ if (!result) {
+ throw new CoolException("鐢熸垚鍏ュ簱浠诲姟澶辫触锛�");
+ }
+ }
+ }else {
+ Task task = new Task();
+ task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
+ task.setTaskNo(String.valueOf(Utils.getTaskNo("IN")));
+ task.setWmsTaskNo(param.getTaskNo());
+ task.setTaskSts(TaskStsType.NEW_INBOUND.sts);
+ task.setTaskCtg(taskCtg.getId());
+ task.setPriority(priority);
+ task.setOriginSite(param.getOriginSite());
+ task.setOriginLoc(null);
+ task.setDestSite(destSite);
+ task.setDestLoc(param.getDestLoc());
+ task.setZpallet(param.getBarcode());
+ task.setIoTime(new Date());
+ task.setStartTime(new Date());
+ task.setStatus(1);
+ task.setMemo("");
+ task.setShuttleNo(null);//绛夊緟涓荤嚎绋嬪垎閰嶅皬杞�
+ task.setRecordLoc("Y");//璁板綍搴撳瓨淇℃伅
+ task.setHostId(hostId);//涓存椂鎺у埗鍙厑璁竓ost涓�1
+ task.setMemo(param.getEndSite());
+
+ boolean result = taskService.save(task);
+ if (!result) {
+ throw new CoolException("鐢熸垚鍏ュ簱浠诲姟澶辫触锛�");
}
}
@@ -325,21 +377,6 @@
boolean result = taskService.save(task);
if (!result) {
throw new CoolException("鐢熸垚鍑哄簱浠诲姟澶辫触锛�");
- }
-
- if (createWcsTaskParam != null) {
- if (!createWcsTaskParam.getFrmPos().equals("06YZ0001")){
- try {
- AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
- getInRequestParam(agvTaskCreateParam, createWcsTaskParam);
- String httpRequest = doHttpRequest(agvTaskCreateParam, "172.18.16.248:443", "/rcs/rtas/api/robot/controller/task/submit");
- if (!httpRequest.equals("SUCCESS")){
- throw new CoolException("杞彂AGV浠诲姟澶辫触" + httpRequest);
- }
- }catch (Exception e){
- throw new CoolException("杞彂AGV浠诲姟鍑洪敊" + e.getMessage());
- }
- }
}
return R.ok();
@@ -505,6 +542,13 @@
map.put("requestPK", param.getRequestPK());
log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
+ }else {
+ map.put("success", "1");
+ map.put("message", "success");
+ map.put("result", "");
+ map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
+ return map;
}
}catch (Exception e){
map.put("success", "0");
--
Gitblit v1.9.1