diff --git a/lms/nladmin-system/doc/wms.xls b/lms/nladmin-system/doc/wms.xls index 03b9b3c..160c0df 100644 Binary files a/lms/nladmin-system/doc/wms.xls and b/lms/nladmin-system/doc/wms.xls differ 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