pda收货报错修改;
This commit is contained in:
+4
@@ -665,6 +665,7 @@ public class StockReceiptOrderApplicationService {
|
|||||||
List<ReceiptMaterialDetailDO> receiptMaterialDetailDOList = stockReceiptOrderDO.getMaterialDetailList();
|
List<ReceiptMaterialDetailDO> receiptMaterialDetailDOList = stockReceiptOrderDO.getMaterialDetailList();
|
||||||
receiptMaterialDetailDOList.forEach(receiptMaterialDetailDO -> {
|
receiptMaterialDetailDOList.forEach(receiptMaterialDetailDO -> {
|
||||||
List<ReceiptMaterialDetailDO> receiptMaterialDetailDOChildrenList1 = receiptMaterialDetailDO.getChildren();
|
List<ReceiptMaterialDetailDO> receiptMaterialDetailDOChildrenList1 = receiptMaterialDetailDO.getChildren();
|
||||||
|
if (receiptMaterialDetailDOChildrenList1 != null && receiptMaterialDetailDOChildrenList1.size() > 0) {
|
||||||
ReceiptMaterialDetailDO receiptMaterialDetailDOChildren = receiptMaterialDetailDOChildrenList1.stream().filter(p -> 1 == p.getLevel()).collect(Collectors.toList()).get(0);
|
ReceiptMaterialDetailDO receiptMaterialDetailDOChildren = receiptMaterialDetailDOChildrenList1.stream().filter(p -> 1 == p.getLevel()).collect(Collectors.toList()).get(0);
|
||||||
receiptMaterialDetailDO.setMaterialDetailId(receiptMaterialDetailDOChildren.getMaterialDetailId());
|
receiptMaterialDetailDO.setMaterialDetailId(receiptMaterialDetailDOChildren.getMaterialDetailId());
|
||||||
receiptMaterialDetailDO.setReceiptQuantity(receiptMaterialDetailDOChildren.getReceiptQuantity());
|
receiptMaterialDetailDO.setReceiptQuantity(receiptMaterialDetailDOChildren.getReceiptQuantity());
|
||||||
@@ -677,6 +678,7 @@ public class StockReceiptOrderApplicationService {
|
|||||||
//只留二级
|
//只留二级
|
||||||
List<ReceiptMaterialDetailDO> receiptMaterialDetailDOChildrenList2 = receiptMaterialDetailDOChildrenList1.stream().filter(p -> 2 == p.getLevel()).collect(Collectors.toList());
|
List<ReceiptMaterialDetailDO> receiptMaterialDetailDOChildrenList2 = receiptMaterialDetailDOChildrenList1.stream().filter(p -> 2 == p.getLevel()).collect(Collectors.toList());
|
||||||
receiptMaterialDetailDO.setChildren(receiptMaterialDetailDOChildrenList2);
|
receiptMaterialDetailDO.setChildren(receiptMaterialDetailDOChildrenList2);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
//收货装配参数
|
//收货装配参数
|
||||||
StockReceiptOrderDO assembleStockReceiptOrderDO = assembleParamByReceipt(stockReceiptOrderDO);
|
StockReceiptOrderDO assembleStockReceiptOrderDO = assembleParamByReceipt(stockReceiptOrderDO);
|
||||||
@@ -727,6 +729,7 @@ public class StockReceiptOrderApplicationService {
|
|||||||
List<ReceiptMaterialDetailDO> receiptMaterialDetailDOList = stockReceiptOrderDO.getMaterialDetailList();
|
List<ReceiptMaterialDetailDO> receiptMaterialDetailDOList = stockReceiptOrderDO.getMaterialDetailList();
|
||||||
receiptMaterialDetailDOList.forEach(receiptMaterialDetailDO -> {
|
receiptMaterialDetailDOList.forEach(receiptMaterialDetailDO -> {
|
||||||
List<ReceiptMaterialDetailDO> receiptMaterialDetailDOChildrenList1 = receiptMaterialDetailDO.getChildren();
|
List<ReceiptMaterialDetailDO> receiptMaterialDetailDOChildrenList1 = receiptMaterialDetailDO.getChildren();
|
||||||
|
if (receiptMaterialDetailDOChildrenList1 != null && receiptMaterialDetailDOChildrenList1.size() > 0) {
|
||||||
ReceiptMaterialDetailDO receiptMaterialDetailDOChildren = receiptMaterialDetailDOChildrenList1.get(0);
|
ReceiptMaterialDetailDO receiptMaterialDetailDOChildren = receiptMaterialDetailDOChildrenList1.get(0);
|
||||||
receiptMaterialDetailDO.setMaterialDetailId(receiptMaterialDetailDOChildren.getMaterialDetailId());
|
receiptMaterialDetailDO.setMaterialDetailId(receiptMaterialDetailDOChildren.getMaterialDetailId());
|
||||||
receiptMaterialDetailDO.setReceiptQuantity(receiptMaterialDetailDOChildren.getReceiptQuantity());
|
receiptMaterialDetailDO.setReceiptQuantity(receiptMaterialDetailDOChildren.getReceiptQuantity());
|
||||||
@@ -745,6 +748,7 @@ public class StockReceiptOrderApplicationService {
|
|||||||
receiptMaterialDetailDOChildrenList2.add(receiptMaterialDetailDOChildrenList1.get(i));
|
receiptMaterialDetailDOChildrenList2.add(receiptMaterialDetailDOChildrenList1.get(i));
|
||||||
}
|
}
|
||||||
receiptMaterialDetailDO.setChildren(receiptMaterialDetailDOChildrenList2);
|
receiptMaterialDetailDO.setChildren(receiptMaterialDetailDOChildrenList2);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
NoReceiptOrderDO noReceiptOrderDO = assembleParamByNoOrderReceipt(stockReceiptOrderDO);
|
NoReceiptOrderDO noReceiptOrderDO = assembleParamByNoOrderReceipt(stockReceiptOrderDO);
|
||||||
return stockReceiptOrderDomainService.noOrderReceipt(noReceiptOrderDO);
|
return stockReceiptOrderDomainService.noOrderReceipt(noReceiptOrderDO);
|
||||||
|
|||||||
Reference in New Issue
Block a user