diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java index 2274d4f4..d570dac5 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java @@ -219,7 +219,7 @@ public class ComponentPackingController { ComponentPackingEditVO vo = getPackingInfo(packingId); Map variables = new HashMap<>(); variables.put("info", vo.getPackingVO()); - variables.put("pages", PdfPageDTO.create(vo.getPackingItemVO(), 16, new ComponentPackingItemVO())); + variables.put("pages", PdfPageDTO.create(vo.getPackingItemVO(), 12, new ComponentPackingItemVO())); String html = ThymeleafUtil.generator("/template/", "配件销售发货清单", ".html", variables); PdfGeneratorUtil.generatePdf("发货清单" + vo.getPackingVO().getNo(), html, response); } diff --git a/nflg-wms-admin/src/main/resources/template/生产领料单.html b/nflg-wms-admin/src/main/resources/template/生产领料单.html index 065cd2b1..1a0c79e0 100644 --- a/nflg-wms-admin/src/main/resources/template/生产领料单.html +++ b/nflg-wms-admin/src/main/resources/template/生产领料单.html @@ -7,19 +7,18 @@
-
-
发货清单
-
-
ZL-4.15(3-04)
-
福建南方路面机械股份有限公司
-
装车号：V01
-
 
-
-
-
订单号
-
- 1172000 -
-
发货员
-
程慧芳 -
-
办事处/代理商
-
测试 -
-
发货日期
-
- 2025-08-04 -
-
发运方式
-
  +
+ 福建南方路面机械股份有限公司
Fujian South Highway Machinery Co., Ltd.
-
-
设备编码
-
- 22222222222 -
-
收货人电话
-
于文强18365529799 -
-
货单号
-
0000 -
-
-
-
收货单位
-
- 安徽华恒创远新材料有限责任公司 -
-
签收人/电话
-
 
-
-
-
收货地址
-
- 安徽华恒创远新材料有限责任公司 -
-
收货日期
-
2025-08-04
-
-
-
司机
-
- 于文强 -
-
驾驶证
-
- 51254685465465465 -
-
车牌号
-
- 粤A12345 -
-
司机电话
-
18888888888 -
-
-
-
序号
-
配件编码
-
配件名称
-
货位号
-
单位
-
数量
-
备注
-
-
-
1
-
2100552783 -
-
- IH1213T.4 衬板6号 -
-
E1-4-4 -
-
PC -
-
20.000 -
-
  -
-
-
-
 
-
 
-
 
-
 
-
 
-
 
-
 
-
+ + + + + + + + + +
+ 发货清单
Shipping List + 		+ 货单编号
Shipping Order Number +
+ ZL-4.15(3-04) +
+ + + + + + + + + + + + + + + + + + + + + +
订单号
Order No.		1172000设备编码
Equipment Code		200012111
收货单位
Consignee Unit		安徽华恒创远新材料有限责任公司收货地址
Consignee Address		1172000
收货人/电话
Consignee's Phone No.		于文强18365529799签收人/电话
Signatory/Phone No.		收货日期
Receipt Date
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
发货员
Dispatcher		程慧芳发货日期
Shipping Date		2025-08-04办事处/代理商
Office/Agent		测试
发运方式
Shipping Method		汽车货单号
Waybill No.		0000装车号
Loading No.		V01
车牌号
License Plate No.		粤A12345司机
Driver		于文强驾驶证
Driver's License No.		电话
Phone No.		18888888888
+ + + + + + + + + + + + + + + + + + + +
序号
Serial No.		配件编码
Spare Part Code		配件名称
Spare Part Name		货位号
Storage Location No.		单位
Unit		数量
Quantity		备注
Remarks
12100552783IH1213T.4 衬板6号E1-4-4PC20.000 
\ No newline at end of file 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 f96dfe26..2daf0255 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 @@ -203,16 +203,16 @@ public class DeliveryController extends BaseController { 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); + 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/java/com/nflg/wms/shipment/controller/MaterialController.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialController.java index bf233b21..7d61a2d2 100644 --- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialController.java +++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialController.java @@ -125,6 +125,19 @@ public class MaterialController extends BaseController { ); } + /** + * 同步-查询 + * @param materialNos 图纸编号列表 + */ + @PostMapping("syncSearch") + public ApiResult> syncSearch(@RequestBody @NotEmpty List materialNos) { + return ApiResult.success( + shipmentMaterialService.lambdaQuery() + .in(WmsShipmentMaterial::getNo, materialNos) + .list() + ); + } + /** * 同步-保存 */ diff --git a/nflg-wms-shipment/src/main/resources/template/发货清单模版.xlsx b/nflg-wms-shipment/src/main/resources/template/发货清单模版.xlsx index e7181346..b646b745 100644 Binary files a/nflg-wms-shipment/src/main/resources/template/发货清单模版.xlsx and b/nflg-wms-shipment/src/main/resources/template/发货清单模版.xlsx differ