工单颜色

pom.xml

@@ -15,9 +15,9 @@
 	<name>smf-core</name>
 	<description>SMF project for Spring Boot</description>
 	<properties>
-		<maven.build.timestamp.format>MMd</maven.build.timestamp.format>
+		<maven.build.timestamp.format>M.dd</maven.build.timestamp.format>
 		<main.version>1.${maven.build.timestamp}</main.version>
-		<app.version>${main.version}.${current.time}</app.version>
+		<app.version>${main.version}${current.time}</app.version>
 		<java.version>1.8</java.version>
 		<jjwt.version>0.11.1</jjwt.version>
 		<!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->

src/main/java/com/neotel/smfcore/common/bean/ResultBean.java

@@ -44,7 +44,7 @@ public class ResultBean<T> {
         ResultBean result = new ResultBean();
         result.setCode(0);
         result.setMsgKey(msgKey);
-        result.setMsg(MessageUtils.getText(msgKey, new String[]{}, new Locale(SecurityUtils.getCurrentUserLanguage()), msg));
+        result.setMsg(MessageUtils.getText(msgKey, params, new Locale(SecurityUtils.getCurrentUserLanguage()), msg));
         result.setData(data);
         return result;
     }

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -73,6 +73,10 @@ public class LiteOrderCache implements ITaskListener {
             currentColors.add(dataLog.getLightColor());
         }
         ORDER_COLOR nextColor = ORDER_COLOR.nextColor(currentColors);
+        if (nextColor == null) {
+            log.info("执行工单[" + liteOrder.getOrderNo() + "] 时,已达最大可执行工单数");
+            throw new ValidateException("order.out.maxOrder","已达最大可执行工单数");
+        }
         //其他出库模式一次性全部生成任务
         List<StoragePos> lockPosList = storagePosManager.findLockPos(liteOrder.getOrderNo());
         if(lockPosList==null){

src/main/java/com/neotel/smfcore/core/order/enums/ORDER_COLOR.java

@@ -83,6 +83,14 @@ public enum ORDER_COLOR {
                 return color;
             }
         }
+
+        //找不到最大的,就使用未使用过的
+        for (ORDER_COLOR color : allColors){
+            if(!excludeColors.contains(color.getRgb())){
+                currentColorIndex = color.ordinal();
+                return color;
+            }
+        }
         return null;
     }
 }

src/main/java/com/neotel/smfcore/hella/handler/HellaServiceHandler.java

@@ -392,7 +392,7 @@ public class HellaServiceHandler extends IoHandlerAdapter implements ITaskListen
             Collection<String> excludePosIds = new ArrayList<>();
 
             String resultCode = "0";
-            String resultMsg = "";
+            String resultMsg = "OK";
             String resultDataStr = "";
             for (LiteOrderItem liteOrderItem : liteOrder.getOrderItems()) {
                 int reelCount = liteOrderItem.getNeedReelCount();
@@ -425,7 +425,7 @@ public class HellaServiceHandler extends IoHandlerAdapter implements ITaskListen
                     resultCode = "-1";
                     resultMsg = "Some material not on the shelf";
                     for (int i=0;i<notFoundReelCount;i++){
-                        resultDataStr = resultDataStr + ";" + pn + "NOT_FOUND;0";
+                        resultDataStr = resultDataStr + ";" + pn + ";NOT_FOUND;0";
                     }
                 }
             }
@@ -435,9 +435,11 @@ public class HellaServiceHandler extends IoHandlerAdapter implements ITaskListen
             }
             //<STX>orderMaterialExtResp;eventId;returnCode;messageText;workorderNumber;currentWorkorderflag;reflowgroupNumber;numberofPartnumbers;partNumber1;containerNumber;quantity;…;partNumberN;containerNumberN;quantityN<CR><LF>
             //<STX>orderMaterialExtResp;1;0;OK;61598;1;325.618-01;3;790.130-13;abcde;3000; 790.131-01;abcdf;5000;790.131-01;abcdg;2580<CR><LF>
-            String respMsg = "orderMaterialExtResp;"+ eventId+";" + resultCode+";"+resultMsg+";"+workorderNumber+";"+currentWorkorderflag+";"+reflowgroupNumber+";"+numberofPartnumbers + resultDataStr;
+            //orderMaterialExtResp;0;-1;Some material not on the shelf;1408;1;325.618-01;1;;791.704-06NOT_FOUND;0
+            //<STX>orderMaterialExtResp;eventId;returnCode;messageText;workorderNumber;currentWorkorderflag;reflowgroupNumber;numberofPartnumbers;partNumber1;containerNumber;quantity;…;partNumberN;containerNumberN;quantityN<CR><LF>
+            String respMsg = "orderMaterialExtResp;"+ eventId+";" + resultCode+";"+resultMsg+";"+workorderNumber+";"+currentWorkorderflag+";"+reflowgroupNumber+";"+numberofPartnumbers +";" +resultDataStr;
             log.info("工单结果:" + respMsg);
-            session.write(respMsg);
+            session.write("\02"+respMsg);
         }
     }