jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

45527 礼嘉福特发运单打印-优化

Browse Source
uat-temp-logic-20250307-45527
logic.fang 2 months ago
parent a53f97b8a0
commit 2592f341fe
1 changed files with 22 additions and 46 deletions
Show Stats Download Patch File Download Diff File

68
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPartShippingGroupService.java
Unescape Escape View File

@ -177,44 +177,26 @@ public class MesPartShippingGroupService implements IMesPartShippingGroupService
Map<Long, List<MesShippingOrderManagementDetail>> detailByPidMap = shippingOrderManagementDetailList
.stream().collect(Collectors.groupingBy(MesShippingOrderManagementDetail::getPid));
log.info("doMesMesShippingOrderManagementPrint-查询发运单明细信息-detailByPidMap-" + detailByPidMap.size());
/**
* 查询零件发运组明细信息
*/
Set<Long> partShippingGroupIdSet = pullingOrderInfos.stream()
.map(MesShippingOrderManagement::getPartShippingGroupId).collect(Collectors.toSet());
liJIaPackBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
DdlPreparedPack.getInPackList(new ArrayList<>(partShippingGroupIdSet), "pid", liJIaPackBean);
List<MesPartShippingGroupDetail> partShippingGroupDetailList =
mesPartShippingGroupDetailRepository.findByHqlWhere(liJIaPackBean);
log.info("doMesMesShippingOrderManagementPrint-查询零件发运组明细信息-" + partShippingGroupDetailList.size());
Map<Long, List<MesPartShippingGroupDetail>> listMap = partShippingGroupDetailList.stream().collect(
Collectors.groupingBy(MesPartShippingGroupDetail::getPid));
log.info("doMesMesShippingOrderManagementPrint-查询零件发运组明细信息-listMap-" + listMap.size());
//遍历处理每个发运单主表
for (MesShippingOrderManagement pullingOrderInfo : pullingOrderInfos) {
//一张实体发运单包含三部分信息（顶部的通用数据、中部的第一份表格数据，底部的第二份表格数据）
//取出当前发运单的明细信息
List<MesShippingOrderManagementDetail> details = detailByPidMap.get(pullingOrderInfo.getId());
if (!CollectionUtils.isEmpty(details)) {
//取出当前发运单主表对应的发运组明细信息
List<MesPartShippingGroupDetail> shippingGroupDetailList = listMap.get(pullingOrderInfo.getPartShippingGroupId());
if (!CollectionUtils.isEmpty(shippingGroupDetailList)) {
//将发运组明细按照 seq_no 分组
//seq_no 的个数 / 2 代表会生成实体发运单的份数（一个 seq_no 就是一个表格，一份实体表单上可以放两个表格）
Map<Integer, List<MesPartShippingGroupDetail>> seqNoMap =
shippingGroupDetailList.stream().collect(Collectors.groupingBy(MesPartShippingGroupDetail::getSeqNo));
List<Integer> seqNoList = new ArrayList<>(seqNoMap.keySet());
log.info("doMesMesShippingOrderManagementPrint-查询零件发运组明细信息-seqNoList-" + seqNoList.size());
//将seq_no两两分组
List<List<Integer>> physicalOrderList = IntStream.range(0, seqNoList.size())
.filter(i -> i % 2 == 0)
.mapToObj(i -> seqNoList.subList(i, Math.min(i + 2, seqNoList.size())))
.collect(Collectors.toList());
for (List<Integer> list : physicalOrderList) {
//生成一张实体发运单
log.info("doMesMesShippingOrderManagementPrint-生成一张实体发运单-list-" + list);
mainDataList.add(createPhysicalOrder(pullingOrderInfo, list, seqNoMap, details));
}
//将发运单明细按照 assyCode 分组
//assyCode 的个数 / 2 代表会生成实体发运单的份数（一个 assyCode 就是一个表格，一份实体表单上可以放两个表格）
Map<String, List<MesShippingOrderManagementDetail>> detailByAssyCodeMap =
details.stream().collect(Collectors.groupingBy(MesShippingOrderManagementDetail::getAssyCode));
List<String> assyCodeList = new ArrayList<>(detailByAssyCodeMap.keySet());
//将 assyCode 两两分组
List<List<String>> physicalOrderList = IntStream.range(0, assyCodeList.size())
.filter(i -> i % 2 == 0)
.mapToObj(i -> assyCodeList.subList(i, Math.min(i + 2, assyCodeList.size())))
.collect(Collectors.toList());
for (List<String> list : physicalOrderList) {
//生成一张实体发运单
log.info("doMesMesShippingOrderManagementPrint-生成一张实体发运单-list-" + list);
mainDataList.add(createPhysicalOrder(pullingOrderInfo, list, detailByAssyCodeMap, details));
}
}
pullingOrderInfo.setPrintCount(StringUtil.isEmpty(pullingOrderInfo.getPrintCount())? 1 : pullingOrderInfo.getPrintCount()+1);
@ -267,8 +249,8 @@ public class MesPartShippingGroupService implements IMesPartShippingGroupService
}
private MesShippingOrderManagementModelForLiJia createPhysicalOrder(MesShippingOrderManagement pullingOrderInfo,
List<Integer> seqNoList,
Map<Integer, List<MesPartShippingGroupDetail>> seqNoMap,
List<String> assyCodeList,
Map<String, List<MesShippingOrderManagementDetail>> detailByAssyCodeMap,
List<MesShippingOrderManagementDetail> details) {
MesShippingOrderManagementModelForLiJia model = new MesShippingOrderManagementModelForLiJia();
//顶部的通用数据赋值
@ -278,31 +260,25 @@ public class MesPartShippingGroupService implements IMesPartShippingGroupService
model.setDocumentNumber("YFVCQ-MS06-02-01");
log.info("doMesMesShippingOrderManagementPrint-顶部的通用数据赋值" + model);
//中部表结构赋值
model.setDetailModelsOne(createDetailList(seqNoList.get(0), seqNoMap, details, pullingOrderInfo.getRackNo()));
model.setDetailModelsOne(createDetailList(assyCodeList.get(0), detailByAssyCodeMap, details, pullingOrderInfo.getRackNo()));
log.info("doMesMesShippingOrderManagementPrint-中部表结构赋值" + model);
//底部表结构赋值
model.setDetailModelsTwo(createDetailList(seqNoList.get(1), seqNoMap, details, pullingOrderInfo.getRackNo()));
model.setDetailModelsTwo(createDetailList(assyCodeList.get(1), detailByAssyCodeMap, details, pullingOrderInfo.getRackNo()));
log.info("doMesMesShippingOrderManagementPrint-底部表结构赋值" + model);
return model;
}
private List<MesShippingOrderManagementDetailModelForLiJia> createDetailList(
Integer seqNo, Map<Integer, List<MesPartShippingGroupDetail>> seqNoMap,
String assyCode, Map<String, List<MesShippingOrderManagementDetail>> detailByAssyCodeMap,
List<MesShippingOrderManagementDetail> details, String rackNo) {
List<MesShippingOrderManagementDetailModelForLiJia> dataList = new ArrayList<>();
//取出发运组明细数据
List<MesPartShippingGroupDetail> partShippingGroupDetailList = seqNoMap.get(seqNo);
Set<String> custPartNoSet = partShippingGroupDetailList.stream()
.map(MesPartShippingGroupDetail::getCustPartNo).collect(Collectors.toSet());
log.info("doMesMesShippingOrderManagementPrint-createDetailList-partShippingGroupDetailList" + partShippingGroupDetailList.size());
//取出符合条件的发运单明细数据
List<MesShippingOrderManagementDetail> nowDetailList = details.stream().filter(t ->
custPartNoSet.contains(t.getCustPartNo())).collect(Collectors.toList());
List<MesShippingOrderManagementDetail> nowDetailList = detailByAssyCodeMap.get(assyCode);
log.info("doMesMesShippingOrderManagementPrint-createDetailList-nowDetailList" + nowDetailList.size());
if (!CollectionUtils.isEmpty(nowDetailList)) {
//并按照 cust_info_seq 升序排列
//并按照 logic_seq 升序排列
List<MesShippingOrderManagementDetail> collect = nowDetailList.stream().sorted(
Comparator.comparing(MesShippingOrderManagementDetail::getCustInfoSeq)).collect(Collectors.toList());
Comparator.comparing(MesShippingOrderManagementDetail::getLogicSeq)).collect(Collectors.toList());
Integer number = 1;
for (MesShippingOrderManagementDetail mesShippingOrderManagementDetail : collect) {
MesShippingOrderManagementDetailModelForLiJia detailModel = new MesShippingOrderManagementDetailModelForLiJia();

Write Preview
Loading…
Cancel
Save