盘点任务回复

src/main/java/com/mushiny/heli/xnr/controller/HeliWMSController.java

@@ -4,6 +4,7 @@ import com.mushiny.heli.xnr.comm.JsonUtils;
 import com.mushiny.heli.xnr.dto.ItemDTO;
 import com.mushiny.heli.xnr.dto.MessageDTO;
 import com.mushiny.heli.xnr.mq.MqSender;
+import com.mushiny.heli.xnr.wcs.WmsToWcsService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,10 +20,13 @@ import org.springframework.web.bind.annotation.RestController;
  */
 
 @RestController
-@RequestMapping("/heli")
+@RequestMapping("/xnr/heli")
 public class HeliWMSController {
 
     @Autowired
+    private WmsToWcsService wmsToWcsService;
+
+    @Autowired
     private MqSender mqSender;
 
     private final static Logger logger = LoggerFactory.getLogger(HeliWMSController.class);
@@ -53,4 +57,12 @@ public class HeliWMSController {
         return ResponseEntity.ok(dto);
     }
 
+    @PostMapping(value = "/testRelease", produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<String> testRelease(
+            @RequestBody String json){
+        logger.debug("json: " + json);
+        String ret = this.wmsToWcsService.releasePod("lisi");
+        return ResponseEntity.ok(ret);
+    }
+
 }

src/main/java/com/mushiny/heli/xnr/controller/ICQAController.java

@@ -23,7 +23,7 @@ import java.util.Map;
  * Created by Lisi on 2019-11-30.
  */
 @RestController
-@RequestMapping("/icqa")
+@RequestMapping("/xnr/icqa")
 public class ICQAController {
 
     private final static Logger logger = LoggerFactory.getLogger(ICQAController.class);

src/main/java/com/mushiny/heli/xnr/controller/InboundController.java

@@ -22,7 +22,7 @@ import java.util.Map;
  * Created by Lisi on 2019-11-27.
  */
 @RestController
-@RequestMapping("/inbound")
+@RequestMapping("/xnr/inbound")
 public class InboundController {
     private final static Logger logger = LoggerFactory.getLogger(InboundController.class);
 

src/main/java/com/mushiny/heli/xnr/controller/OutboundController.java

@@ -16,7 +16,7 @@ import java.util.Map;
  * Created by Lisi on 2019-11-30.
  */
 @RestController
-@RequestMapping("/outbound")
+@RequestMapping("/xnr/outbound")
 public class OutboundController {
 
     /**

src/main/java/com/mushiny/heli/xnr/controller/WMSController.java

@@ -20,7 +20,7 @@ import java.util.Map;
  * 电梯配置
  */
 @RestController
-@RequestMapping("/mushiny")
+@RequestMapping("/xnr/mushiny")
 public class WMSController {
 
     private final static Logger logger = LoggerFactory.getLogger(WMSController.class);

src/main/java/com/mushiny/heli/xnr/service/WMSRespService.java

@@ -42,7 +42,7 @@ public class WMSRespService {
 
     public static final String TABLE_OBORDER = "WMS_OUTBOUND_ORDER";
     public static final String TABLE_IBORDER = "WMS_INBOUND_ORDER";
-    public static final String TABLE_ICQAORDER = "WMS_INBOUND_ORDER";
+    public static final String TABLE_ICQAORDER = "WMS_ICQA_ORDER";
     public static final String SQL_QUERYALL_ICQAORDER =
             "SELECT * FROM WMS_ICQA_ORDER,WMS_ICQA_ORDERPOSITION " +
             "WHERE WMS_ICQA_ORDER.TASKID = WMS_ICQA_ORDERPOSITION.TASKID " +

src/main/java/com/mushiny/heli/xnr/wcs/ExecutorHandler.java

@@ -43,7 +43,7 @@ public class ExecutorHandler {
         MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
         headers.setContentType(type);
         headers.add("Accept", MediaType.APPLICATION_JSON.toString());
-        headers.add("Authorization",token);
+        headers.add("authorization",token);
         HttpEntity<String> formEntity = new HttpEntity<String>(headers);
 
         ResponseEntity<String> result = restTemplate.exchange(url, HttpMethod.GET,formEntity,String.class,params);
@@ -53,6 +53,20 @@ public class ExecutorHandler {
         return body;
     }
 
+    public String getMethod(String url,Map params,String token){
+        HttpHeaders headers = new HttpHeaders();
+        MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
+        headers.setContentType(type);
+        headers.add("Accept", MediaType.APPLICATION_JSON.toString());
+        headers.add("authorization", token);
+        ResponseEntity<String> response = restTemplate.exchange(
+                url+"?taskId={taskId}",
+                HttpMethod.GET,
+                new HttpEntity<String>(headers),
+                Map.class, params);
+        return response.getBody();
+    }
+
     public String postForObject(String url,String params,String token){
         HttpHeaders headers = new HttpHeaders();
         MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");

src/main/java/com/mushiny/heli/xnr/wcs/WmsToWcsBusiness.java

@@ -39,7 +39,8 @@ public class WmsToWcsBusiness {
     private String username;
     @Value("${wcs.password}")
     private String password;
-    @Value("{wcs.type}")
+
+    @Value("${wcs.type}")
     private String type;
 
 

src/main/java/com/mushiny/heli/xnr/wcs/WmsToWcsService.java

@@ -127,6 +127,18 @@ public class WmsToWcsService{
        return taskId;
     }
 
+    @Transactional
+    public String releasePod(String taskId) {
+        String token = wmsToWcsBusiness.getTokenFromWcs();
+        if("".equals(token)){
+            logger.info("获取wcs token失败");
+            return "no token";
+        }
+        token = "Bearer " + token;
+        Map<String, Object> taskMap = new HashMap<>();
+        taskMap.put("taskId", taskId);
+        return this.executorHandler.getMethod(this.releasePod, taskMap, token);
+    }
 
 
     @Transactional