diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ShipmentMaterialCodeQRVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ShipmentMaterialCodeQRVO.java index 39a3d07f..874a03f9 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ShipmentMaterialCodeQRVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ShipmentMaterialCodeQRVO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.vo; +import com.nflg.wms.common.util.NumberUtil; import lombok.Data; import java.math.BigDecimal; @@ -34,6 +35,15 @@ public class ShipmentMaterialCodeQRVO { */ private BigDecimal num; + /** + * 应发数量文本 + */ + private String numText; + + public String getNumText() { + return NumberUtil.format(num); + } + /** * 实发数量 */ diff --git a/nflg-wms-shipment/src/main/resources/template/label/material.html b/nflg-wms-shipment/src/main/resources/template/label/material.html index 16559d61..813de42f 100644 --- a/nflg-wms-shipment/src/main/resources/template/label/material.html +++ b/nflg-wms-shipment/src/main/resources/template/label/material.html @@ -39,7 +39,6 @@ .qrcode { width: 380px; height: 380px; - margin: 10px; } .lst{ width: 800px; @@ -54,16 +53,16 @@
0PC7B724KV6FM
- + 机台编号 - + 26LBZ4000L001 - + 客户名称 - + 北京市京联鑫路用材料有限公司 @@ -77,13 +76,13 @@ 数量 - + 10 - +