From 08036517324026b951bb48ef99f873b0f4d63468 Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Fri, 11 Sep 2026 09:45:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8F=91=E6=96=99=E6=8E=A5=E5=8F=A3=E5=B9=B6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=97=B4=E9=9A=94=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AutoIssueServiceImpl.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/com/gaotao/modules/production/service/impl/AutoIssueServiceImpl.java b/src/main/java/com/gaotao/modules/production/service/impl/AutoIssueServiceImpl.java index 7db05684..2855452a 100644 --- a/src/main/java/com/gaotao/modules/production/service/impl/AutoIssueServiceImpl.java +++ b/src/main/java/com/gaotao/modules/production/service/impl/AutoIssueServiceImpl.java @@ -20,6 +20,8 @@ import java.util.List; @Service public class AutoIssueServiceImpl implements AutoIssueService { + private static final long IFS_CALL_INTERVAL_MS = 20L; + @Autowired private IfsApiIssueAndReturnService ifsApiIssueAndReturnService; @@ -44,6 +46,8 @@ public class AutoIssueServiceImpl implements AutoIssueService { resultDto.getFailures().add(buildFailure(shopOrder, handlingUnit, e.getMessage())); log.error("自动发料失败, shopOrder={}, label={}, error={}", getOrderNo(shopOrder), getLabelCode(handlingUnit), e.getMessage(), e); + } finally { + sleepAfterIfsCall(); } } } @@ -130,4 +134,13 @@ public class AutoIssueServiceImpl implements AutoIssueService { private String defaultIfBlank(String value, String defaultValue) { return StringUtils.isBlank(value) ? defaultValue : value; } + + private void sleepAfterIfsCall() { + try { + Thread.sleep(IFS_CALL_INTERVAL_MS); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new XJException("自动发料等待间隔被中断"); + } + } } From 2ed028aaccd962c5135654912c94bd3075c70648 Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Fri, 11 Sep 2026 10:18:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?hu=E5=AF=B9=E5=A4=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gaotao/config/ShiroConfig.java | 1 + .../controller/HandlingUnitApiController.java | 33 +++++++++++++++++++ .../service/HandlingUnitService.java | 6 ++++ .../service/impl/HandlingUnitServiceImpl.java | 5 +++ 4 files changed, 45 insertions(+) create mode 100644 src/main/java/com/gaotao/modules/api/controller/HandlingUnitApiController.java diff --git a/src/main/java/com/gaotao/config/ShiroConfig.java b/src/main/java/com/gaotao/config/ShiroConfig.java index 8bbb49ff..1f590064 100644 --- a/src/main/java/com/gaotao/config/ShiroConfig.java +++ b/src/main/java/com/gaotao/config/ShiroConfig.java @@ -54,6 +54,7 @@ public class ShiroConfig { filterMap.put("/api/agv/**", "anon");//agv反馈信息 filterMap.put("/api/dashboard/**", "anon");//看板接口 filterMap.put("/ws/dashboard/**", "anon");//看板接口 + filterMap.put("/api/handlingunit/**", "anon");//hu对外接口 filterMap.put("/swagger/**", "anon"); filterMap.put("/v2/api-docs", "anon"); filterMap.put("/swagger-ui.html", "anon"); diff --git a/src/main/java/com/gaotao/modules/api/controller/HandlingUnitApiController.java b/src/main/java/com/gaotao/modules/api/controller/HandlingUnitApiController.java new file mode 100644 index 00000000..6661dae4 --- /dev/null +++ b/src/main/java/com/gaotao/modules/api/controller/HandlingUnitApiController.java @@ -0,0 +1,33 @@ +package com.gaotao.modules.api.controller; + +import com.gaotao.common.utils.R; +import com.gaotao.modules.handlingunit.entity.HandlingUnit; +import com.gaotao.modules.handlingunit.entity.dto.*; +import com.gaotao.modules.handlingunit.service.HandlingUnitService; +import com.gaotao.modules.sys.controller.AbstractController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RequestMapping("/api/handlingunit") +@RestController +public class HandlingUnitApiController extends AbstractController { + + @Autowired + private HandlingUnitService handlingUnitService; + + /** + * 查询处理单元详情 + */ + @PostMapping("getHandlingUnitDetail") + public R getHandlingUnitDetail(@RequestBody HandlingUnitDto dto) { + HandlingUnit detail = handlingUnitService.getHandlingUnit(dto.getSite(), dto.getUnitId()); + return R.ok().put("data", detail); + } + + +} diff --git a/src/main/java/com/gaotao/modules/handlingunit/service/HandlingUnitService.java b/src/main/java/com/gaotao/modules/handlingunit/service/HandlingUnitService.java index 3b7f97f7..08a91202 100644 --- a/src/main/java/com/gaotao/modules/handlingunit/service/HandlingUnitService.java +++ b/src/main/java/com/gaotao/modules/handlingunit/service/HandlingUnitService.java @@ -23,6 +23,12 @@ public interface HandlingUnitService extends IService { * 查询处理单元详情 */ HandlingUnitDto getHandlingUnitDetail(String site, String unitId); + + /** + * 对外接口：扫描处理单元标签 + */ + HandlingUnit getHandlingUnit(String site, String unitId); + HandlingUnitDto scanHandlingUnitLabelForYiKu(String site, String unitId); HandlingUnitDto scanHandlingUnitLabelForOther(String site, String unitId); diff --git a/src/main/java/com/gaotao/modules/handlingunit/service/impl/HandlingUnitServiceImpl.java b/src/main/java/com/gaotao/modules/handlingunit/service/impl/HandlingUnitServiceImpl.java index a4921e56..f172eb7b 100644 --- a/src/main/java/com/gaotao/modules/handlingunit/service/impl/HandlingUnitServiceImpl.java +++ b/src/main/java/com/gaotao/modules/handlingunit/service/impl/HandlingUnitServiceImpl.java @@ -57,6 +57,11 @@ public class HandlingUnitServiceImpl extends ServiceImpl