Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/com/steerinfo/dil/mapper/QmsQueueResultMapper.xml

src/main/java/com/steerinfo/dil/service/impl/QmsQueueListServiceImpl.java

@@ -321,12 +321,12 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
     public int allowEnFactory(Map<String, Object> map){
         List<Map<String, Object>> mapList = (List<Map<String, Object>>) map.get("mapList"); //获取勾选列表
         if( ! (mapList == null || mapList.size() == 0)){
-            if(mapList.get(0).get("listId") != null){ //如果是单拼 需要判断有没有跳行打钩
-                boolean judgeRowIdOrder = judgeRowIdOrder(mapList);
-                if( ! judgeRowIdOrder){
-                    return -1;
-                }
-            }
+            //if(mapList.get(0).get("listId") != null){ //如果是单拼 需要判断有没有跳行打钩
+            //    boolean judgeRowIdOrder = judgeRowIdOrder(mapList);
+            //    if( ! judgeRowIdOrder){
+            //        return -1;
+            //    }
+            //}
         }else {
             return -2;
         }

src/main/resources/com/steerinfo/dil/mapper/QmsQueueResultMapper.xml

@@ -853,6 +853,11 @@
         QQR.RESULT_TOTAL_ID "resultTotalId",
         QQR.RESULT_START_TIME "resultStartTime",
         RCE.CONSIGNEE_COMPANY_NAME "consigneeName",
+        QQR.RESULT_ID        "resultId",
+        QQR.RESULT_TOTAL_ID  "resultTotalId",
+        QQR.RESULT_START_TIME    "resultStartTime",
+        QQL.GRID_ID             "gridId",
+        RCE.CONSIGNEE_COMPANY_NAME   "consigneeName",
         RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "grid",
         RM.MATERIAL_ID "materialId",
         RM.MATERIAL_NAME "materialName",

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J\u914D\u7F6E
-log4j.rootCategory=INFO, file, RUNNING,errorfile,stdout
+log4j.rootCategory=INFO, file, RUNNING,errorfile
 ## \u63A7\u5236\u53F0\u8F93\u51FA
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout