From 804ef3a78675647b49208ddc65fea3a2038bc069 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Thu, 20 Jun 2024 09:00:05 +0800 Subject: [PATCH] =?UTF-8?q?add=EF=BC=9Awms=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/acs/ext/wms/rest/WmsToAcsController.java | 15 +++++++++++++++ .../nl/acs/ext/wms/service/AcsToWmsService.java | 2 ++ .../nl/acs/ext/wms/service/WmsToAcsService.java | 7 +++---- .../ext/wms/service/impl/AcsToWmsServiceImpl.java | 6 ++++++ 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java index cb4c1c6..d77ab50 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java @@ -5,6 +5,7 @@ package org.nl.acs.ext.wms.rest; import cn.dev33.satoken.annotation.SaIgnore; +import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.ext.wms.data.one.CancelTaskRequest; @@ -45,6 +46,20 @@ public class WmsToAcsController { return new ResponseEntity<>(wmstoacsService.cancelFromWms(reqs), HttpStatus.OK); } + @PostMapping("/switchInOut") + @Log(value = "切换出入库模式") + @SaIgnore + public ResponseEntity switchInOut(@RequestBody JSONObject reqs) throws Exception { + return new ResponseEntity<>(wmstoacsService.switchInOut(reqs), HttpStatus.OK); + } + + @PostMapping("/pinckStartStop") + @Log(value = "拣选工位启停") + @SaIgnore + public ResponseEntity pinckStartStop(@RequestBody JSONObject reqs) throws Exception { + return new ResponseEntity<>(wmstoacsService.pinkStartStop(reqs), HttpStatus.OK); + } + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java index edc2973..c65f68d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java @@ -17,6 +17,8 @@ public interface AcsToWmsService { public UnifiedResponse feedbackTaskStatusToWms(JSONArray arr); + public UnifiedResponse feedPinkStartStop(JSONObject req); + } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java index 3cc5a7b..9bcba4e 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java @@ -1,6 +1,7 @@ package org.nl.acs.ext.wms.service; +import com.alibaba.fastjson.JSONObject; import org.nl.acs.ext.wms.data.one.*; import java.util.List; @@ -31,9 +32,7 @@ public interface WmsToAcsService { CancelTaskResponse cancelFromWms(List reqs) throws Exception; + JSONObject switchInOut(JSONObject reqs); - - - - + JSONObject pinkStartStop(JSONObject reqs); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index 49546e6..9f1a634 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -37,5 +37,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { return LmsHttpUtil.sendPostRequest(addressDto.getMethods_url(), arr, null); } + @Override + public UnifiedResponse feedPinkStartStop(JSONObject req) { + AddressDto addressDto = addressService.findByCode("feedPinkStartStop"); + return LmsHttpUtil.sendPostRequest(addressDto.getMethods_url(), req, null); + } + }