From 451e51877e1399f5f903a37e2bf02a7f2f5a8b99 Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Thu, 18 Aug 2022 15:06:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/nl/acs/ext/T.java | 4 -- .../acs/ext/erp/service/AcsToErpService.java | 17 ------ .../erp/service/impl/AcsToErpServiceImpl.java | 57 ------------------- 3 files changed, 78 deletions(-) delete mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/T.java delete mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/erp/service/AcsToErpService.java delete mode 100644 acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/erp/service/impl/AcsToErpServiceImpl.java diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/T.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/T.java deleted file mode 100644 index 229ffa9..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/T.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.nl.acs.ext; - -public class T { -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/erp/service/AcsToErpService.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/erp/service/AcsToErpService.java deleted file mode 100644 index 4268631..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/erp/service/AcsToErpService.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.nl.acs.ext.erp.service; - - -import com.alibaba.fastjson.JSONObject; - -/** - * Created by ZZ on 2021/9/23. - */ -public interface AcsToErpService { - /** - * ACS向WMS申请任务 - * - * @param device_code 条件 - * @return JSONObject - */ - JSONObject sendDeviceToWms(String device_code); -} diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/erp/service/impl/AcsToErpServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/erp/service/impl/AcsToErpServiceImpl.java deleted file mode 100644 index 269dac1..0000000 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/erp/service/impl/AcsToErpServiceImpl.java +++ /dev/null @@ -1,57 +0,0 @@ -package org.nl.acs.ext.erp.service.impl; - -import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.config.AcsConfig; -import org.nl.acs.config.server.AcsConfigService; -import org.nl.acs.ext.erp.service.AcsToErpService; -import org.nl.exception.BadRequestException; -import org.nl.wql.core.bean.WQLObject; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Service; - - -/** - * Created by ZZ on 2021/9/23. - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class AcsToErpServiceImpl implements AcsToErpService { - @Autowired - AcsConfigService acsConfigService; - - @Override - public JSONObject sendDeviceToWms(String device_code) { - log.info("sendDeviceToWms----输入参数是:{}", device_code); - JSONObject resultJson = new JSONObject(); - JSONObject erp_map = WQLObject.getWQLObject("acs_device_erpmapping").query("device_code = '" + device_code + "'").uniqueResult(0); - if (erp_map == null) { - throw new BadRequestException("该设备:" + device_code + "未找到对应的ERP设备!"); - } - String erp_code = erp_map.getString("erp_code"); - JSONObject jo = new JSONObject(); - jo.put("device_code", erp_code); - log.info("sendDeviceToWms----erp_code是:{}", erp_code); - String result2 = ""; - try { - String url = acsConfigService.findConfigFromCache().get(AcsConfig.ERPURL).toString(); - result2 = HttpRequest.post(url) - .body(jo.toString()) - .execute().body(); - System.out.println(result2); - resultJson.put("code", HttpStatus.OK); - resultJson.put("message", "发送成功"); - } catch (Exception e) { - String msg = e.getMessage(); - //网络不通 - System.out.println(msg); - resultJson.put("code", HttpStatus.BAD_REQUEST); - resultJson.put("message", msg); - } - return resultJson; - } -}