Merge remote-tracking branch 'origin/master'

pom.xml

@@ -16,7 +16,7 @@
 	<description>SMF project for Spring Boot</description>
 	<properties>
 		<maven.build.timestamp.format>M.ddHHmm</maven.build.timestamp.format>
-		<main.version>3.${maven.build.timestamp}</main.version>
+		<main.version>4.${maven.build.timestamp}</main.version>
 		<app.version>${main.version}</app.version>
 		<java.version>1.8</java.version>
 		<jjwt.version>0.11.1</jjwt.version>

src/main/java/com/neotel/smfcore/common/init/DataInitManager.java

@@ -89,7 +89,7 @@ public class DataInitManager {
                 operator = roleManager.save(operator);
                 log.info("创建默认角色：" + operator.toString());
 
-                admin = new User(userName, "admin@qq.com", "zh-CN", role.getId(), "$2a$10$Egp1/gvFlt7zhlXVfEFw4OfWQCGPw0ClmMcc6FjTnvXNRVf9zdMRa", true, true, new Date(), groupIds, "");
+                admin = new User(userName, "admin@neotel.tech", "zh-CN", role.getId(), "$2a$10$Egp1/gvFlt7zhlXVfEFw4OfWQCGPw0ClmMcc6FjTnvXNRVf9zdMRa", true, true, new Date(), groupIds, "");
                 admin = userManager.save(admin);
                 log.info("创建默认用户：" + admin.toString());
 

src/main/java/com/neotel/smfcore/core/device/bean/StatusBean.java

@@ -262,10 +262,18 @@ public class StatusBean {
         data.put("temp",String.valueOf(temperature));
     }
 
+    public void setMinTemperature(float minTemperature) {
+        data.put("minTemp",String.valueOf(minTemperature));
+    }
+
     public void setHumidity(float humidity) {
         data.put("humi", String.valueOf(humidity));
     }
 
+    public void setMinHumidity(float minHumidity) {
+        data.put("minHumi", String.valueOf(minHumidity));
+    }
+
     public List<AlarmInfo> getAlarmList() {
         return alarmList;
     }
@@ -306,7 +314,7 @@ public class StatusBean {
         addPosInfo(barcode,posId,plateW,plateH,isSingleOut,false,0);
     }
     public void addPosInfo(String barcode, String posId, int plateW, int plateH, boolean isSingleOut,boolean isNgReel,int usedCount) {
-        addPosInfo(barcode, posId, plateW, plateH, isSingleOut, isNgReel, "", usedCount);
+        addPosInfo(barcode, posId, plateW, plateH, isSingleOut, isNgReel, "", usedCount,"");
     }
     /**
      * 获取客户端发送上来的条码信息
@@ -317,7 +325,7 @@ public class StatusBean {
     /**
      * 入库时添加仓位及料盘大小信息(posId库位编号，plateW:料盘宽度,plateH:料盘高度,singleOut:是否出库到料仓门口)
      */
-    public void addPosInfo(String barcode, String posId, int plateW, int plateH, boolean isSingleOut,boolean isNgReel,String ngMsg,int usedCount) {
+    public void addPosInfo(String barcode, String posId, int plateW, int plateH, boolean isSingleOut,boolean isNgReel,String ngMsg,int usedCount,String hSerial) {
         String originalPosId = data.get("posId");
         String originalPlateW = data.get("plateW");
         String originalPlateH = data.get("plateH");
@@ -354,6 +362,7 @@ public class StatusBean {
             data.put("ngMsg", "Repeat Inbound");
         }
         data.put("usedCount", usedCount + "");
+        data.put("hSerial",hSerial);
     }
 
     /**

src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java

@@ -128,6 +128,13 @@ public class BaseDeviceHandler implements IDeviceHandler {
             log.info("获取温湿度报警值 maxTemperature["+maxTemperature+"]maxHumidity["+maxHumidity+"]");
             statusBean.setTemperature(maxTemperature);
             statusBean.setHumidity(maxHumidity);
+
+            float minTemperature = msdSettiings.getMinTemperature();
+            float minHumidity = msdSettiings.getMinHumidity();
+            log.info("获取温湿度报警值 minTemperature["+minTemperature+"]minHumidity["+minHumidity+"]");
+            statusBean.setMinTemperature(minTemperature);
+            statusBean.setMinHumidity(minHumidity);
+
             return statusBean;
         } else if (dataCache.needUpdateHumidiy(statusBean.getCid())) {
             MSDSettiings msdSettiings = dataCache.getCache(Constants.CACHE_msdSetting);

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -23,6 +23,7 @@ import com.neotel.smfcore.core.barcode.service.po.Component;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.device.bean.PosInfo;
 import com.neotel.smfcore.core.device.enums.OP_STATUS;
+import com.neotel.smfcore.core.language.util.MessageUtils;
 import com.neotel.smfcore.core.message.util.DeviceMessageUtil;
 import com.neotel.smfcore.core.order.service.po.LiteOrder;
 import com.neotel.smfcore.core.storage.service.manager.IStorageManager;
@@ -345,7 +346,7 @@ public class DeviceController {
                     errorMsg = ve.getMessage();
                     log.info("查找空库位失败:" + errorMsg);
                     resultMap.put("result", "105");
-                    resultMap.put("msg", errorMsg);
+                    resultMap.put("msg", MessageUtils.getText(ve.getMsgKey(),ve.getMsgParam(),request.getLocale(),ve.getDefaultMsg()));
                 } catch (Exception e) {
                     errorMsg = e.getMessage();
                     log.info("查找空库位失败,", e);

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -550,13 +550,12 @@ public class TaskService {
                         plateW = pos.getW();
                         plateH = pos.getH();
                     }
-                    statusBean.addData("hSerial",task.getSourceName());
                     String NgMsg=task.getAppendData("ngMsg");
                     boolean isNg=false;
                     if(ObjectUtil.isNotEmpty(NgMsg)){
                         isNg=true;
                     }
-                    statusBean.addPosInfo(task.getBarcode(), posName, plateW, plateH, isSingleOut,isNg,NgMsg,0);
+                    statusBean.addPosInfo(task.getBarcode(), posName, plateW, plateH, isSingleOut,isNg,NgMsg,0,task.getSourceName());
                     log.info("出库" + storage.getName() + "[" + posName + "]物料[" + task.getBarcode() + "]" + isSingleOut + "["+NgMsg+"]发送到客户端" + cid);
                 }
             }