root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzhiqiang
2023-07-06 18:17:12 +08:00
parent 4949856067 250592eacd
commit 8fb06c033c
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckdtlBcpServiceImpl.java
View File

@@ -57,6 +57,7 @@ public class StIvtCheckdtlBcpServiceImpl extends ServiceImpl<StIvtCheckdtlBcpMap
row.setCheck_id(mst.getCheck_id());
row.setCheck_code(mst.getCheck_code());
row.setSeq_no(BigDecimal.valueOf(i + 1));
row.setIs_down("0");
// 获取库区信息
QueryWrapper<StIvtSectattr> sect_wrapper = new QueryWrapper<>();

15
mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java
View File

@@ -24,10 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -47,8 +44,14 @@ public class StIvtShutframedtlBcpServiceImpl extends ServiceImpl<StIvtShutframed
@Override
public int create(JSONArray rows, String shutframeinv_id) {
// 根据数量排序 默认由大到小
List<Object> list = rows.stream()
.sorted(Comparator.comparing(row -> (Integer)((Map) row).get("canuse_qty")).reversed()).collect(Collectors.toList());
ArrayList<JSONObject> objects = new ArrayList<>();
rows.forEach(row -> {
JSONObject jsonObject = (JSONObject) JSON.toJSON(row);
objects.add(jsonObject);
});
List<Object> list = objects.stream()
.sorted(Comparator.comparing(row -> ((JSONObject) row).getDoubleValue("canuse_qty")).reversed()).collect(Collectors.toList());
rows = JSONArray.parseArray(JSON.toJSONString(list));
StIvtStructattr first_struct = null;