Merge branch 'master' of http://121.40.234.130:8899/root/rl_mg

lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java

@@ -15,8 +15,10 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 @Service
@@ -48,11 +50,7 @@ public class LuceneServiceImpl implements LuceneService {
 
     @Override
     public List<String> getTagName() {
-        List<String> res = new ArrayList<>();
-        for (TagNameEnum nameEnum : TagNameEnum.values()) {
-            res.add(nameEnum.getTag());
-        }
-        return res;
+        return Arrays.stream(TagNameEnum.values()).map(TagNameEnum::getTag).collect(Collectors.toList());
     }
 
     @SneakyThrows

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/mapper/PdmBdWorkorderMapper.xml

@@ -125,6 +125,7 @@
               WHERE w.produce_date = CURDATE()
                 AND w.region_code = 'YZ'
                 AND w.workorder_status IN ('1', '2', '3')
+                AND w.real_weight <![CDATA[<]]> w.plan_weight
               ORDER BY w.workorder_status DESC, w.planproducestart_date) AS ranked
         WHERE row_num = 1
     </select>