对接MES系统

warewms-admin/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 # 指定环境的默认配置
 spring:
   profiles:
-    active: dev
+    active: test
 socket:
   InkjetPrinters:
 
@@ -13,19 +13,19 @@ plc:
     slot: 1
     rack: 0
     name: ChengZhongPlc
-    siemensPLCS: S1200
+    ePlcType: S1200
     heartbeat: DB11.0.0
   plcList[1]:
     ip: 172.20.27.2
     enable: false
     name: DaoJiaoJiPlc
-    siemensPLCS: S200Smart
+    ePlcType: S200_SMART
     heartbeat:
   plcList[2]:
     ip: 172.20.52.24
     enable: false
     name: ZaZhiPlc
-    siemensPLCS: S1500
+    ePlcType: S1500
     heartbeat:
 
 MES:

warewms-system/src/main/java/com/warewms/hailiang/MES/MesService.java

@@ -1,6 +1,7 @@
 package com.warewms.hailiang.MES;
 
 import cn.hutool.json.JSONObject;
+import org.springframework.stereotype.Service;
 
 /**
  * Created with IntelliJ IDEA.

warewms-system/src/main/java/com/warewms/hailiang/MES/impl/MesServiceImpl.java

@@ -8,6 +8,7 @@ import cn.hutool.json.JSONUtil;
 import com.warewms.hailiang.MES.MesService;
 import io.swagger.util.Json;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
 
 /**
  * Created with IntelliJ IDEA.
@@ -18,6 +19,7 @@ import org.springframework.beans.factory.annotation.Value;
  * To change this template use File | Settings | File Templates.
  * Description: MES对接实现类
  **/
+@Service
 public class MesServiceImpl implements MesService {
     @Value("${MES.address}")
     private String MESAddress;
@@ -25,7 +27,7 @@ public class MesServiceImpl implements MesService {
     @Value("${MES.getBatchNoUrl}")
     private String getBatchNoUrl;
 
-    @Value("${MES.getBatchNoResultURl}")
+    @Value("${MES.getBatchNoResultUrl}")
     private String getBatchNoResultURl;