From 34233e96b183e28157460912481d0d478bc0afdf Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 26 Jul 2023 17:32:25 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E7=A7=BB=E5=8A=A8=E7=B1=BB=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-system/doc/wms.xls | Bin 320000 -> 322048 bytes .../java/org/nl/common/utils/StringUtils.java | 7 ++- .../wms/ext/acs/service/AcsToWmsService.java | 4 +- .../ext/acs/service/dto/PutActionRequest.java | 22 ---------- .../wms/ext/acs/service/{vo => dto}/Resp.java | 2 +- .../acs/service/dto/{ => to}/BaseRequest.java | 2 +- .../service/{vo => dto/to}/BaseResponse.java | 2 +- .../{vo => dto/to/acs}/ApplyTaskResponse.java | 3 +- .../dto/{ => to/acs}/CancelTaskRequest.java | 3 +- .../dto/{ => to/acs}/CreateTaskRequest.java | 4 +- .../to/acs/FeedBackTaskStatusResponse.java | 6 +++ .../to/acs}/GetPalletizeResponse.java | 3 +- .../acs/service/dto/to/acs/GrabResponse.java | 7 +++ .../service/dto/to/acs/PutActionRequest.java | 27 ++++++++++++ .../dto/{ => to/wms}/ApplyTaskRequest.java | 4 +- .../to/wms}/CancelTaskResponse.java | 3 +- .../to/wms}/CreateTaskResponse.java | 3 +- .../wms}/FeedBackTaskStatusRequest.java | 3 +- .../dto/{ => to/wms}/GetPalletizeRequest.java | 3 +- .../service/dto/{ => to/wms}/GrabRequest.java | 3 +- .../{vo => dto/to/wms}/PutActionResponse.java | 4 +- .../acs/service/impl/AcsToWmsServiceImpl.java | 40 ++++++++++++------ .../vo/FeedBackTaskStatusResponse.java | 4 -- .../wms/ext/acs/service/vo/GrabResponse.java | 5 --- .../wms/ext/acs/service/vo/StandResponse.java | 21 --------- .../service/ISysInteractRecordService.java | 2 +- .../impl/SysInteractRecordServiceImpl.java | 4 +- .../sch/task/service/ISchBaseTaskService.java | 2 +- .../nl/wms/sch/task_manage/AbstractTask.java | 9 +++- .../nl/wms/sch/task_manage/AcsTaskDto.java | 2 +- .../task/tasks/dtk/mapper/DTKMapper.xml | 2 +- 31 files changed, 108 insertions(+), 98 deletions(-) delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/PutActionRequest.java rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/{vo => dto}/Resp.java (92%) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/{ => to}/BaseRequest.java (94%) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/{vo => dto/to}/BaseResponse.java (98%) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/{vo => dto/to/acs}/ApplyTaskResponse.java (86%) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/{ => to/acs}/CancelTaskRequest.java (81%) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/{ => to/acs}/CreateTaskRequest.java (94%) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/FeedBackTaskStatusResponse.java rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/{vo => dto/to/acs}/GetPalletizeResponse.java (90%) create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/GrabResponse.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/PutActionRequest.java rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/{ => to/wms}/ApplyTaskRequest.java (86%) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/{vo => dto/to/wms}/CancelTaskResponse.java (61%) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/{vo => dto/to/wms}/CreateTaskResponse.java (63%) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/{ => to/wms}/FeedBackTaskStatusRequest.java (86%) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/{ => to/wms}/GetPalletizeRequest.java (59%) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/{ => to/wms}/GrabRequest.java (90%) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/{vo => dto/to/wms}/PutActionResponse.java (53%) delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/FeedBackTaskStatusResponse.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/GrabResponse.java delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/StandResponse.java diff --git a/lms/nladmin-system/doc/wms.xls b/lms/nladmin-system/doc/wms.xls index 03b9b3c8bfe1b9adecd8c73601fa02b207bc9c46..160c0df283dea691593db3ceea4c6bde9ca66d1a 100644 GIT binary patch delta 9134 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 delta 7574 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 E2X%VK&;S4c diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/StringUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/StringUtils.java index f3f5e42..86fff98 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/StringUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/StringUtils.java @@ -146,10 +146,9 @@ public class StringUtils { * 获取ip地址 */ public static String getIp(HttpServletRequest request) { - // TODO 不解析IP地址 - if(true){ - return "127.0.0.1"; - } +// if(true){ +// return "127.0.0.1"; +// } String ip = request.getHeader("x-forwarded-for"); if (ip == null || ip.length() == 0 || UNKNOWN.equalsIgnoreCase(ip)) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java index e6e7f0c..da49b56 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java @@ -1,9 +1,7 @@ package org.nl.wms.ext.acs.service; import com.alibaba.fastjson.JSONObject; -import org.nl.wms.ext.acs.service.vo.BaseResponse; -import org.nl.wms.ext.acs.service.vo.FeedBackTaskStatusResponse; -import org.nl.wms.ext.acs.service.vo.GetPalletizeResponse; +import org.nl.wms.ext.acs.service.dto.to.BaseResponse; /** * @Author: lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/PutActionRequest.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/PutActionRequest.java deleted file mode 100644 index f356f38..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/PutActionRequest.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.nl.wms.ext.acs.service.dto; - -import lombok.Data; - -import java.util.List; - -/** - * @Author: lyd - * @Description: 提供设备信号 - * @Date: 2023/7/26 - */ -@Data -public class PutActionRequest extends BaseRequest { - - /** - * 设备号 - */ - private String device_code; - - private List list ; - -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/Resp.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/Resp.java similarity index 92% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/Resp.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/Resp.java index 9523d21..647cd6d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/Resp.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/Resp.java @@ -1,4 +1,4 @@ -package org.nl.wms.ext.acs.service.vo; +package org.nl.wms.ext.acs.service.dto; import lombok.Data; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/BaseRequest.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseRequest.java similarity index 94% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/BaseRequest.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseRequest.java index 89828df..7d96008 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/BaseRequest.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseRequest.java @@ -1,4 +1,4 @@ -package org.nl.wms.ext.acs.service.dto; +package org.nl.wms.ext.acs.service.dto.to; import lombok.Data; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/BaseResponse.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseResponse.java similarity index 98% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/BaseResponse.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseResponse.java index 7db5897..ff85990 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/BaseResponse.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseResponse.java @@ -1,4 +1,4 @@ -package org.nl.wms.ext.acs.service.vo; +package org.nl.wms.ext.acs.service.dto.to; import cn.hutool.core.date.DateUtil; import cn.hutool.http.HttpStatus; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/ApplyTaskResponse.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/ApplyTaskResponse.java similarity index 86% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/ApplyTaskResponse.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/ApplyTaskResponse.java index 3b42721..2ae8554 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/ApplyTaskResponse.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/ApplyTaskResponse.java @@ -1,8 +1,9 @@ -package org.nl.wms.ext.acs.service.vo; +package org.nl.wms.ext.acs.service.dto.to.acs; import cn.hutool.core.date.DateUtil; import cn.hutool.http.HttpStatus; import lombok.Data; +import org.nl.wms.ext.acs.service.dto.to.BaseResponse; @Data public class ApplyTaskResponse extends BaseResponse { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/CancelTaskRequest.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/CancelTaskRequest.java similarity index 81% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/CancelTaskRequest.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/CancelTaskRequest.java index 020d2b4..749bef8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/CancelTaskRequest.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/CancelTaskRequest.java @@ -1,6 +1,7 @@ -package org.nl.wms.ext.acs.service.dto; +package org.nl.wms.ext.acs.service.dto.to.acs; import lombok.Data; +import org.nl.wms.ext.acs.service.dto.to.BaseRequest; import java.util.Map; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/CreateTaskRequest.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/CreateTaskRequest.java similarity index 94% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/CreateTaskRequest.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/CreateTaskRequest.java index 2f51739..00b2c43 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/CreateTaskRequest.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/CreateTaskRequest.java @@ -1,6 +1,7 @@ -package org.nl.wms.ext.acs.service.dto; +package org.nl.wms.ext.acs.service.dto.to.acs; import lombok.Data; +import org.nl.wms.ext.acs.service.dto.to.BaseRequest; import java.util.Map; @@ -22,7 +23,6 @@ public class CreateTaskRequest extends BaseRequest { */ private String task_code; - /** * 取货点1 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/FeedBackTaskStatusResponse.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/FeedBackTaskStatusResponse.java new file mode 100644 index 0000000..ba4b1f7 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/FeedBackTaskStatusResponse.java @@ -0,0 +1,6 @@ +package org.nl.wms.ext.acs.service.dto.to.acs; + +import org.nl.wms.ext.acs.service.dto.to.BaseResponse; + +public class FeedBackTaskStatusResponse extends BaseResponse { +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/GetPalletizeResponse.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/GetPalletizeResponse.java similarity index 90% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/GetPalletizeResponse.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/GetPalletizeResponse.java index 15e24ea..25da3ff 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/GetPalletizeResponse.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/GetPalletizeResponse.java @@ -1,8 +1,9 @@ -package org.nl.wms.ext.acs.service.vo; +package org.nl.wms.ext.acs.service.dto.to.acs; import cn.hutool.core.date.DateUtil; import cn.hutool.http.HttpStatus; import lombok.Data; +import org.nl.wms.ext.acs.service.dto.to.BaseResponse; import org.nl.wms.ext.acs.service.dto.PalletizeDto; @Data diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/GrabResponse.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/GrabResponse.java new file mode 100644 index 0000000..efaa8d5 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/GrabResponse.java @@ -0,0 +1,7 @@ +package org.nl.wms.ext.acs.service.dto.to.acs; + +import org.nl.wms.ext.acs.service.dto.to.BaseResponse; + +public class GrabResponse extends BaseResponse { +} + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/PutActionRequest.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/PutActionRequest.java new file mode 100644 index 0000000..c5cc3ce --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/PutActionRequest.java @@ -0,0 +1,27 @@ +package org.nl.wms.ext.acs.service.dto.to.acs; + +import lombok.Data; +import org.nl.wms.ext.acs.service.dto.to.BaseRequest; +import org.nl.wms.ext.acs.service.dto.SignalData; + +import java.util.List; + +/** + * @Author: lyd + * @Description: 提供设备信号 lms->acs + * @Date: 2023/7/26 + */ +@Data +public class PutActionRequest extends BaseRequest { + + /** + * 设备号 + */ + private String device_code; + + /** + * 信号数据 + */ + private List list; + +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/ApplyTaskRequest.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/ApplyTaskRequest.java similarity index 86% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/ApplyTaskRequest.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/ApplyTaskRequest.java index 75155d7..93a7ee2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/ApplyTaskRequest.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/ApplyTaskRequest.java @@ -1,7 +1,7 @@ -package org.nl.wms.ext.acs.service.dto; +package org.nl.wms.ext.acs.service.dto.to.wms; import lombok.Data; -import org.nl.wms.ext.acs.service.dto.BaseRequest; +import org.nl.wms.ext.acs.service.dto.to.BaseRequest; import org.nl.wms.ext.acs.service.dto.PalletizeDto; /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/CancelTaskResponse.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/CancelTaskResponse.java similarity index 61% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/CancelTaskResponse.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/CancelTaskResponse.java index a9c5bcc..e4f94e0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/CancelTaskResponse.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/CancelTaskResponse.java @@ -1,6 +1,7 @@ -package org.nl.wms.ext.acs.service.vo; +package org.nl.wms.ext.acs.service.dto.to.wms; import lombok.Data; +import org.nl.wms.ext.acs.service.dto.to.BaseResponse; /** * @Author: lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/CreateTaskResponse.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/CreateTaskResponse.java similarity index 63% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/CreateTaskResponse.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/CreateTaskResponse.java index 60b88dc..a2f917f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/CreateTaskResponse.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/CreateTaskResponse.java @@ -1,6 +1,7 @@ -package org.nl.wms.ext.acs.service.vo; +package org.nl.wms.ext.acs.service.dto.to.wms; import lombok.Data; +import org.nl.wms.ext.acs.service.dto.to.BaseResponse; /** * @Author: lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/FeedBackTaskStatusRequest.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/FeedBackTaskStatusRequest.java similarity index 86% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/FeedBackTaskStatusRequest.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/FeedBackTaskStatusRequest.java index 55cc824..bf737e5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/FeedBackTaskStatusRequest.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/FeedBackTaskStatusRequest.java @@ -1,6 +1,7 @@ -package org.nl.wms.ext.acs.service.dto; +package org.nl.wms.ext.acs.service.dto.to.wms; import lombok.Data; +import org.nl.wms.ext.acs.service.dto.to.BaseRequest; /** * ACS任务反馈请求实体 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/GetPalletizeRequest.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/GetPalletizeRequest.java similarity index 59% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/GetPalletizeRequest.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/GetPalletizeRequest.java index 0f8f6e7..4314472 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/GetPalletizeRequest.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/GetPalletizeRequest.java @@ -1,6 +1,7 @@ -package org.nl.wms.ext.acs.service.dto; +package org.nl.wms.ext.acs.service.dto.to.wms; import lombok.Data; +import org.nl.wms.ext.acs.service.dto.to.BaseRequest; @Data public class GetPalletizeRequest extends BaseRequest { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/GrabRequest.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/GrabRequest.java similarity index 90% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/GrabRequest.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/GrabRequest.java index 80ad737..22a62e9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/GrabRequest.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/GrabRequest.java @@ -1,6 +1,7 @@ -package org.nl.wms.ext.acs.service.dto; +package org.nl.wms.ext.acs.service.dto.to.wms; import lombok.Data; +import org.nl.wms.ext.acs.service.dto.to.BaseRequest; /** * ACS抓取砖块记录信息实体 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/PutActionResponse.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/PutActionResponse.java similarity index 53% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/PutActionResponse.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/PutActionResponse.java index 8d11756..a75bdc6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/PutActionResponse.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/PutActionResponse.java @@ -1,4 +1,6 @@ -package org.nl.wms.ext.acs.service.vo; +package org.nl.wms.ext.acs.service.dto.to.wms; + +import org.nl.wms.ext.acs.service.dto.to.BaseResponse; /** * @Author: lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 73073cf..19cc3ba 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -15,11 +15,14 @@ import org.nl.wms.database.brick.service.IMdBaseBrickInfoService; import org.nl.wms.database.material.service.IMdBaseMaterialService; import org.nl.wms.database.material.service.dao.MdBaseMaterial; import org.nl.wms.ext.acs.service.dto.*; -import org.nl.wms.ext.acs.service.dto.ApplyTaskRequest; -import org.nl.wms.ext.acs.service.vo.BaseResponse; +import org.nl.wms.ext.acs.service.dto.to.acs.PutActionRequest; +import org.nl.wms.ext.acs.service.dto.to.wms.ApplyTaskRequest; +import org.nl.wms.ext.acs.service.dto.to.wms.FeedBackTaskStatusRequest; +import org.nl.wms.ext.acs.service.dto.to.wms.GetPalletizeRequest; +import org.nl.wms.ext.acs.service.dto.to.BaseResponse; import org.nl.wms.ext.acs.service.AcsToWmsService; -import org.nl.wms.ext.acs.service.vo.ApplyTaskResponse; -import org.nl.wms.ext.acs.service.vo.GetPalletizeResponse; +import org.nl.wms.ext.acs.service.dto.to.acs.ApplyTaskResponse; +import org.nl.wms.ext.acs.service.dto.to.acs.GetPalletizeResponse; import org.nl.wms.ext.record.service.ISysInteractRecordService; import org.nl.wms.pdm.record.service.IPdmBdRequestMaterialRecordService; import org.nl.wms.pdm.record.service.dao.PdmBdRequestMaterialRecord; @@ -50,6 +53,7 @@ import org.springframework.transaction.annotation.Transactional; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.List; /** * @Author: lyd @@ -72,7 +76,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { private ISchBaseVehiclematerialgroupService vehiclematerialgroupService; @Autowired private TaskFactory taskFactory; - + @Autowired private ISysNoticeService noticeService; @Autowired @@ -410,7 +414,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { return BaseResponse.responseOk(requestNo); } - public BaseResponse receiveTaskStatusAcs(JSONObject param) { + public BaseResponse feedbackTaskStatus(JSONObject param) { // todo: action暂未维护 String requestNo = param.getString("requestNo"); FeedBackTaskStatusRequest taskStatusRequest = param.toJavaObject(FeedBackTaskStatusRequest.class); @@ -475,14 +479,22 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { /** 实时修改点位状态 */ public BaseResponse realTimeSetPoint(JSONObject param) { - String requestNo = param.getString("requestNo"); - String deviceCode = param.getString("device_code"); - String vehicleType = param.getString("vehicle_type"); + // todo: 实体错误 + PutActionRequest actionRequest = param.toJavaObject(PutActionRequest.class); + String requestNo = actionRequest.getRequestNo(); + String deviceCode = actionRequest.getDevice_code(); + List list = actionRequest.getList(); +// String vehicleType = actionRequest.getVehicle_type(); if (deviceCode == null) { return BaseResponse.responseError(requestNo, "设备编码不能为空"); } - // move - String move = (param.getInteger("move") + 1) + ""; + String move = ""; + // move 根据链表数据来 + for (SignalData signalData : list) { + if (signalData.getCode().equals("move")) { + move = (Integer.parseInt(signalData.getValue()) + 1) + ""; + } + } // 找到点位 SchBasePoint schBasePoint = pointService.getById(deviceCode); if (ObjectUtil.isEmpty(schBasePoint)) { @@ -495,9 +507,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { && move.equals(PointStatusEnum.EMPTY_VEHICLE.getCode())) || (pointStatus.equals(move))) { // 不做操作 return BaseResponse.responseOk(requestNo); } - if (vehicleType != null) { - schBasePoint.setVehicle_type(vehicleType); - } +// if (vehicleType != null) { +// schBasePoint.setVehicle_type(vehicleType); +// } schBasePoint.setPoint_status(move); PointUtils.setUpdateByAcs(schBasePoint); pointService.updateById(schBasePoint); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/FeedBackTaskStatusResponse.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/FeedBackTaskStatusResponse.java deleted file mode 100644 index cde7a98..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/FeedBackTaskStatusResponse.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.nl.wms.ext.acs.service.vo; - -public class FeedBackTaskStatusResponse extends BaseResponse { -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/GrabResponse.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/GrabResponse.java deleted file mode 100644 index b853921..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/GrabResponse.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.nl.wms.ext.acs.service.vo; - -public class GrabResponse extends BaseResponse { -} - diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/StandResponse.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/StandResponse.java deleted file mode 100644 index 1bd177b..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/vo/StandResponse.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.nl.wms.ext.acs.service.vo; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.http.HttpStatus; -import lombok.Data; - -/** - * @Author: lyd - * @Description: 是否静置完成 - * @Date: 2023/7/14 - */ -@Data -public class StandResponse extends BaseResponse { - private boolean is_success; - - public StandResponse() { - this.setCode(HttpStatus.HTTP_OK); - this.setResponseDate(DateUtil.now()); - this.setMessage("操作成功"); - } -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java index fcebdf9..c795baa 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.ext.acs.service.vo.BaseResponse; +import org.nl.wms.ext.acs.service.dto.to.BaseResponse; import org.nl.wms.ext.record.service.dao.SysInteractRecord; import java.util.Map; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java index 4ee8240..dab2e91 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java @@ -8,12 +8,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; -import org.nl.common.utils.SecurityUtils; -import org.nl.wms.ext.acs.service.vo.BaseResponse; +import org.nl.wms.ext.acs.service.dto.to.BaseResponse; import org.nl.wms.ext.record.service.ISysInteractRecordService; import org.nl.wms.ext.record.service.dao.mapper.SysInteractRecordMapper; import org.nl.wms.ext.record.service.dao.SysInteractRecord; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java index 50ee40e..74daf38 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.ext.acs.service.dto.BaseRequest; +import org.nl.wms.ext.acs.service.dto.to.BaseRequest; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task_manage.task.core.TaskStatus; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java index 0557ae5..b275391 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java @@ -42,7 +42,7 @@ public abstract class AbstractTask { private ISchBasePointService pointService; @Autowired private IPdmBdWorkorderService workorderService; - + /** * 任务创建 @@ -77,6 +77,11 @@ public abstract class AbstractTask { List list = new ArrayList<>(); for (SchBaseTask task : taskList) { AcsTaskDto taskDto = new AcsTaskDto(); + String responseParam = task.getResponse_param(); + if (ObjectUtil.isNotEmpty(responseParam)) { + JSONObject jsonObject = JSONObject.parseObject(responseParam); + taskDto.setDirection(jsonObject.getString("direction")); + } taskDto.setRequestNo(IdUtil.simpleUUID());// todo taskDto.setRequestDate(DateUtil.now()); taskDto.setExt_task_id(task.getTask_id()); @@ -125,7 +130,7 @@ public abstract class AbstractTask { } - // todo: 以下改为public会出现自动注入类出现问题 + // 以下改为public会出现自动注入类出现问题 protected abstract void updateStatus(String task_code, TaskStatus status); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java index 6f7be06..b99039b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AcsTaskDto.java @@ -1,7 +1,7 @@ package org.nl.wms.sch.task_manage; import lombok.Data; -import org.nl.wms.ext.acs.service.dto.CreateTaskRequest; +import org.nl.wms.ext.acs.service.dto.to.acs.CreateTaskRequest; @Data public class AcsTaskDto extends CreateTaskRequest { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/mapper/DTKMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/mapper/DTKMapper.xml index d4bdd92..81e7c40 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/mapper/DTKMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/mapper/DTKMapper.xml @@ -6,7 +6,7 @@ p.* FROM `sch_base_point` p - WHERE (p.point_type = '1' OR p.point_type IS NULL OR p.point_type = '') + WHERE p.point_type = '1' AND (p.ing_task_code = '' OR p.ing_task_code IS NULL) AND p.point_status = '1' AND p.region_code IN