diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/DeliveryController.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/DeliveryController.java index 2daf0255..5cafb83e 100644 --- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/DeliveryController.java +++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/DeliveryController.java @@ -202,17 +202,17 @@ public class DeliveryController extends BaseController { public void exportItemToExcel(HttpServletResponse response, @RequestParam Long id) throws IOException { WmsShipmentDelivery delivery = deliveryService.getById(id); VUtil.trueThrowBusinessError(Objects.isNull(delivery)).throwMessage("清单不存在"); - AtomicInteger index = new AtomicInteger(1); - List list = deliveryItemService.lambdaQuery() - .eq(WmsShipmentDeliveryItem::getDeliveryId, id) - .orderByAsc(WmsShipmentDeliveryItem::getId) - .list() - .stream().map(item -> { - ShipmentMaterialCodeItemVO vo = Convert.convert(ShipmentMaterialCodeItemVO.class, item); - vo.setIndex(index.getAndIncrement()); - return vo; - }).toList(); -// List list = deliveryItemService.getItemsVO(id); +// AtomicInteger index = new AtomicInteger(1); +// List list = deliveryItemService.lambdaQuery() +// .eq(WmsShipmentDeliveryItem::getDeliveryId, id) +// .orderByAsc(WmsShipmentDeliveryItem::getId) +// .list() +// .stream().map(item -> { +// ShipmentMaterialCodeItemVO vo = Convert.convert(ShipmentMaterialCodeItemVO.class, item); +// vo.setIndex(index.getAndIncrement()); +// return vo; +// }).toList(); + List list = deliveryItemService.getItemsVO(id); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("发货清单-" + delivery.getNo() + ".xlsx", StandardCharsets.UTF_8)); new Workbook() diff --git a/nflg-wms-shipment/src/main/resources/template/发货清单模版.xlsx b/nflg-wms-shipment/src/main/resources/template/发货清单模版.xlsx index b646b745..2c7a8160 100644 Binary files a/nflg-wms-shipment/src/main/resources/template/发货清单模版.xlsx and b/nflg-wms-shipment/src/main/resources/template/发货清单模版.xlsx differ diff --git a/nflg-wms-shipment/src/main/resources/template/装箱清单模版.xlsx b/nflg-wms-shipment/src/main/resources/template/装箱清单模版.xlsx index 8df884a3..e4432ded 100644 Binary files a/nflg-wms-shipment/src/main/resources/template/装箱清单模版.xlsx and b/nflg-wms-shipment/src/main/resources/template/装箱清单模版.xlsx differ