|
@@ -164,12 +164,20 @@ public class InventoryFinishedOrderServiceImpl extends ServiceImpl<InventoryFini
|
|
|
q -> q.in(OutboundOrder::getCode, outboundOrderCodes));
|
|
|
|
|
|
List<String> wlnCodes = outboundOrderMap.values().stream().map(OutboundOrder::getOrderWlnCode).collect(Collectors.toList());
|
|
|
+ if (wlnCodes.isEmpty()) {
|
|
|
+ wlnCodes.add("-1");
|
|
|
+ }
|
|
|
+
|
|
|
Map<String, OrderInfo> orderInfoMap = orderService.mapKEntity(
|
|
|
OrderInfo::getWlnCode,
|
|
|
q -> q.in(OrderInfo::getWlnCode, wlnCodes)
|
|
|
.eq(OrderInfo::getStatus, OrderStatusEnum.COMPLETION_PRODUCTION.getKey()));
|
|
|
|
|
|
List<Long> orderIds = orderInfoMap.values().stream().map(BaseIdPo::getId).collect(Collectors.toList());
|
|
|
+ if (orderIds.isEmpty()) {
|
|
|
+ orderIds.add(-1L);
|
|
|
+ }
|
|
|
+
|
|
|
Map<Long, List<InventoryFinishedOrderDetail>> inventoryFinishedOrderMap = inventoryFinishedOrderDetailService.mapKGroup(
|
|
|
InventoryFinishedOrderDetail::getOrderInfoId,
|
|
|
q -> q.eq(InventoryFinishedOrderDetail::getOperationType, 1)
|
|
@@ -186,7 +194,6 @@ public class InventoryFinishedOrderServiceImpl extends ServiceImpl<InventoryFini
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
InOutStorageErpExportVo inOutStorageErpExportVo = new InOutStorageErpExportVo();
|
|
|
inOutStorageErpExportVo.setId(format);
|
|
|
inOutStorageErpExportVo.setPlantCode("SDTY");
|