From d95fc02c3cef872247693572e1bbb0f0e2ccd25d Mon Sep 17 00:00:00 2001 From: zc <zc> Date: 星期二, 05 十一月 2024 09:56:44 +0800 Subject: [PATCH] 接口对接调试 --- src/main/java/com/zy/asrs/controller/OpenController.java | 46 ++++++++++++++++++++++++++++++++++++---------- 1 files changed, 36 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index ada1af4..6cd9a4f 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -8,8 +8,9 @@ import com.core.exception.CoolException; import com.zy.asrs.entity.param.*; import com.zy.asrs.service.OpenService; -import com.zy.common.model.LocDto; import com.zy.common.web.BaseController; +import com.zy.system.entity.Config; +import com.zy.system.service.ConfigService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -17,6 +18,7 @@ import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * Created by vincent on 2022/4/8 @@ -34,11 +36,15 @@ @Autowired private OpenService openService; + @Autowired + private ConfigService configService; + + @Deprecated @PostMapping("/grouping") @AppAuth(memo = "AGV缁勬墭璋冪敤") public synchronized R grouping(@RequestHeader(required = false) String appkey, - @RequestBody(required = false) AgvGroupingParam param, - HttpServletRequest request){ + @RequestBody(required = false) AgvGroupingParam param, + HttpServletRequest request) { auth(appkey, param, request); if (Cools.isEmpty(param.getOrderNo())) { param.setOrderNo(param.getBillNo()); @@ -53,24 +59,44 @@ return openService.grouping(param); } + @PostMapping("/barcodeVerificatio") + @AppAuth(memo = "AGV璋冪敤鏍¢獙鏉$爜") + public synchronized R barcodeVerificatio(@RequestHeader(required = false) String appkey, + @RequestBody(required = false) Map<String, String> param, + HttpServletRequest request) { + auth(appkey, param, request); + + // 鎵樼洏鏉$爜 + String barcode = param.get("barcode"); + if (Cools.isEmpty(barcode)) { + return R.parse("鏉$爜涓嶈兘涓虹┖"); + } + + return openService.barcodeVerificatio(barcode); + } + @PostMapping("/outbound") - @AppAuth(memo = "AGV鍑哄簱璋冪敤") + @AppAuth(memo = "MES璋冪敤鍑哄簱") public synchronized R outbound(@RequestHeader(required = false) String appkey, - @RequestBody(required = false) List<LocDto> locDtos, - HttpServletRequest request) throws InterruptedException { - auth(appkey, locDtos, request); - if (Cools.isEmpty(locDtos)) { + @RequestBody(required = false) OutBoundParam param, + HttpServletRequest request) { + Config mesAuto = configService.selectConfigByCode("CLOSE_OUTBOUND"); + if (mesAuto != null && mesAuto.getValue().equals("1")) { + return R.parse("鍏抽棴鑷姩鍑哄簱"); + } + auth(appkey, param, request); + if (Cools.isEmpty(param.getEndLocation(), param.getBarcode(), param.getOrderNo())) { return R.parse(BaseRes.PARAM); } - return openService.outbound(locDtos); + return openService.outbound(param); } @PostMapping("/order/matSync/default/v1") @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛") public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey, @RequestBody(required = false) MatSyncParam param, - HttpServletRequest request){ + HttpServletRequest request) { auth(appkey, param, request); if (Cools.isEmpty(param)) { return R.parse(BaseRes.PARAM); -- Gitblit v1.9.1