lyd/liaoninghexing
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
周俊杰
2024-01-02 10:24:04 +08:00
parent eb24c55505 b4ab0d4da1
commit 91f02bf0a1
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -125,6 +125,7 @@
WHERE w.produce_date = CURDATE() WHERE w.produce_date = CURDATE()
AND w.region_code = 'YZ' AND w.region_code = 'YZ'
AND w.workorder_status IN ('1', '2', '3') 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 ORDER BY w.workorder_status DESC, w.planproducestart_date) AS ranked
WHERE row_num = 1 WHERE row_num = 1
</select> </select>