From 846426425d83998dc223aabbd2e8be7ca393c952 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 17 一月 2022 10:03:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/web/param/SearchLocParam.java   |   30 +++++++++++++++
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   28 ++++++++++++--
 src/main/resources/application.yml                          |    3 +
 3 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index aa13b7e..3603a5e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1,6 +1,7 @@
 package com.zy.asrs.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.core.common.Cools;
@@ -19,6 +20,8 @@
 import com.zy.common.model.StartupDto;
 import com.zy.common.service.CommonService;
 import com.zy.common.utils.CollectionUtils;
+import com.zy.common.utils.HttpHandler;
+import com.zy.common.web.param.SearchLocParam;
 import com.zy.core.CrnThread;
 import com.zy.core.DevpThread;
 import com.zy.core.cache.MessageQueue;
@@ -37,7 +40,7 @@
 import com.zy.core.thread.LedThread;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -57,7 +60,6 @@
 @Service("mainService")
 @Transactional
 public class MainServiceImpl {
-
 
     public static final long COMMAND_TIMEOUT = 5 * 1000;
 
@@ -85,8 +87,8 @@
     private BasErrLogService basErrLogService;
     @Autowired
     private BasCrnErrorMapper basCrnErrorMapper;
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
+    @Value("${wms.url}")
+    private String wmsUrl;
 
     /**
      * 缁勬墭
@@ -139,6 +141,24 @@
                     }
 
                     try {
+
+                        SearchLocParam param = new SearchLocParam();
+                        String response = new HttpHandler.Builder()
+                                .setUri(wmsUrl)
+                                .setPath("/rpc/pakin/loc/v1")
+                                .setJson(JSON.toJSONString(param))
+                                .build()
+                                .doPost();
+                        JSONObject jsonObject = JSON.parseObject(response);
+                        if (jsonObject.getInteger("code").equals(200)) {
+                            StartupDto dto = jsonObject.getObject("data", StartupDto.class);
+                            // todo
+
+                        } else {
+                            log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl+"/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
+                        }
+
+
                         // 妫�绱㈠簱浣�
                         LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
                         List<String> matNos = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
diff --git a/src/main/java/com/zy/common/web/param/SearchLocParam.java b/src/main/java/com/zy/common/web/param/SearchLocParam.java
new file mode 100644
index 0000000..94b500c
--- /dev/null
+++ b/src/main/java/com/zy/common/web/param/SearchLocParam.java
@@ -0,0 +1,30 @@
+package com.zy.common.web.param;
+
+import com.alibaba.fastjson.JSON;
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020/10/30
+ */
+@Data
+public class SearchLocParam {
+
+    private Integer ioType;
+
+    private Integer sourceStaNo;
+
+    private String barcode;
+
+    // 搴撲綅瑙勬牸锛� 0:鏈煡, 1:浣庡簱浣�, 2:涓簱浣�, 3:楂樺簱浣� 锛�
+    private Short locType1;
+
+    public static void main(String[] args) {
+        SearchLocParam searchLocParam = new SearchLocParam();
+        searchLocParam.setIoType(1);
+        searchLocParam.setSourceStaNo(101);
+        searchLocParam.setBarcode("10001111");
+        searchLocParam.setLocType1((short) 1);
+        System.out.println(JSON.toJSONString(searchLocParam));
+    }
+
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5faeab7..8c59dcd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -33,6 +33,9 @@
 swagger:
   enable: false
 
+wms:
+  url: localhost:8080/xgmwms
+
 # 涓嬩綅鏈洪厤缃�
 wcs-slave:
   # 鍙屾繁

--
Gitblit v1.9.1