From 3e3287907c53ce66585406ffe917d46277a6b9f7 Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Mon, 27 Mar 2023 14:24:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9C=8D=E5=8A=A1=E5=BE=AA?= =?UTF-8?q?=E7=8E=AF=E4=BE=9D=E8=B5=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/acs/service/impl/AcsToWmsServiceImpl.java | 13 +++++++++---- .../ext/acs/service/impl/WmsToAcsServiceImpl.java | 5 +++-- .../nl/wms/pda/rest/CacheLineHandController.java | 12 ++++++------ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index befd05ed..111f532a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -16,6 +16,7 @@ import org.nl.common.enums.AcsTaskEnum; import org.nl.common.utils.MapOf; import org.nl.common.utils.SecurityUtils; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.ext.acs.service.AcsToWmsService; import org.nl.wms.pda.service.CacheLineHandService; import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.service.TaskService; @@ -35,10 +36,14 @@ import java.util.Map; @Service @RequiredArgsConstructor @Slf4j -public class AcsToWmsServiceImpl implements AcsToWmsService { - private final TaskService taskService; - private final AgvInstService agvInstService; - private final CacheLineHandService cacheLineHandService; +public class AcsToWmsServiceImpl implements AcsToWmsService{ + + + @Autowired + private TaskService taskService; + @Autowired + private CacheLineHandService cacheLineHandService; + private final AgvInstService agvInstService; @Override public Map apply(JSONObject jsonObject) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java index 9e44225d..adeb8b2a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java @@ -3,19 +3,20 @@ package org.nl.wms.ext.acs.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; import org.nl.common.utils.AcsUtil; import org.nl.common.utils.MapOf; import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.Map; + @Service @RequiredArgsConstructor @Slf4j -public class WmsToAcsServiceImpl implements WmsToAcsService { +public class WmsToAcsServiceImpl implements WmsToAcsService{ @Override public Map issueTaskToAcs(JSONArray arr) { JSONArray form = new JSONArray(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/CacheLineHandController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/CacheLineHandController.java index fb99fdf6..1b67e121 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/CacheLineHandController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/CacheLineHandController.java @@ -61,15 +61,15 @@ public class CacheLineHandController{ @ApiOperation("规格下拉框查询") public CommonResult semiMaterialSpecQuery(@RequestBody JSONObject form) { log.info("海亮缓存线手持服务 [规格下拉框查询] 接口被请求, 请求参数-{}", form); - return RestBusinessTemplate.execute(() -> cacheLineHandService.semiMaterialSpecQuery(form.getString("form"))); + return RestBusinessTemplate.execute(() -> cacheLineHandService.semiMaterialSpecQuery(form.getString("search_bar"))); } - @PostMapping("/workProcedureQuery") + @PostMapping("/workprocedureQuery") @Log("工序下拉框查询") @ApiOperation("工序下拉框查询") public CommonResult workProcedureQuery(@RequestBody JSONObject form) { log.info("海亮缓存线手持服务 [工序下拉框查询] 接口被请求, 请求参数-{}", form); - return RestBusinessTemplate.execute(() -> cacheLineHandService.workProcedureQuery(form.getString("form"))); + return RestBusinessTemplate.execute(() -> cacheLineHandService.workProcedureQuery(form.getString("search_bar"))); } @PostMapping("/deviceQuery") @@ -77,7 +77,7 @@ public class CacheLineHandController{ @ApiOperation("缓存线设备下拉框查询") public CommonResult deviceQuery(@RequestBody JSONObject form) { log.info("海亮缓存线手持服务 [缓存线设备下拉框查询] 接口被请求, 请求参数-{}", form); - return RestBusinessTemplate.execute(() -> cacheLineHandService.deviceQuery(form.getString("form"))); + return RestBusinessTemplate.execute(() -> cacheLineHandService.deviceQuery(form.getString("search_bar"))); } @PostMapping("/instStatusQuery") @@ -85,13 +85,13 @@ public class CacheLineHandController{ @ApiOperation("指令状态下拉框查询") public CommonResult instStatusQuery(@RequestBody JSONObject form) { log.info("海亮缓存线手持服务 [指令状态下拉框查询] 接口被请求, 请求参数-{}", form); - return RestBusinessTemplate.execute(() -> cacheLineHandService.instStatusQuery(form.getString("form"))); + return RestBusinessTemplate.execute(() -> cacheLineHandService.instStatusQuery(form.getString("search_bar"))); } @PostMapping("/instPageQuery") @Log("任务分页查询") @ApiOperation("任务分页数据") - public CommonResult instPageQuery(@RequestBody Map param, Pageable page) { + public CommonResult> instPageQuery(@RequestBody Map param, Pageable page) { log.info("海亮缓存线手持服务 [任务分页查询] 接口被请求, 请求参数-{}", param); return RestBusinessTemplate.execute(() -> { if(null == param) {