Merge branch 'develop' into dev_zhangke

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);
+    }
+
     /**
      * 实发数量
      */

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);
+//        AtomicInteger index = new AtomicInteger(1);
-        List<ShipmentMaterialCodeItemVO> list = deliveryItemService.lambdaQuery()
+//        List<ShipmentMaterialCodeItemVO> list = deliveryItemService.lambdaQuery()
-                .eq(WmsShipmentDeliveryItem::getDeliveryId, id)
+//                .eq(WmsShipmentDeliveryItem::getDeliveryId, id)
-                .orderByAsc(WmsShipmentDeliveryItem::getId)
+//                .orderByAsc(WmsShipmentDeliveryItem::getId)
-                .list()
+//                .list()
-                .stream().map(item -> {
+//                .stream().map(item -> {
-                    ShipmentMaterialCodeItemVO vo = Convert.convert(ShipmentMaterialCodeItemVO.class, item);
+//                    ShipmentMaterialCodeItemVO vo = Convert.convert(ShipmentMaterialCodeItemVO.class, item);
-                    vo.setIndex(index.getAndIncrement());
+//                    vo.setIndex(index.getAndIncrement());
-                    return vo;
+//                    return vo;
-                }).toList();
+//                }).toList();
-//        List<ShipmentMaterialCodeItemVO> list = deliveryItemService.getItemsVO(id);
+        List<ShipmentMaterialCodeItemVO> 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()

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 @@
             <img alt="" class="qrcode" th:src="${ext.qrCode}"/>
             <div style="font-size: 16pt" th:text="${info.no}">0PC7B724KV6FM</div>
         </td>
-        <td style="width: 110px;">
+        <td style="width: 140px;">
             机台编号
         </td>
-        <td style="width: 180px;" th:text="${info.no}">
+        <td style="width: 200px;" th:text="${info.no}">
             26LBZ4000L001
         </td>
-        <td style="width: 110px;">
+        <td style="width: 140px;">
             客户名称
         </td>
-        <td style="width: 400px;text-align: left" th:text="${info.customerName}">
+        <td style="text-align: left" th:text="${info.customerName}">
             北京市京联鑫路用材料有限公司
         </td>
     </tr>
@@ -77,13 +76,13 @@
         <td>
             数量
         </td>
-        <td th:text="${info.actualNum}">
+        <td th:text="${info.numText}">
             10
         </td>
     </tr>
     <tr>
         <td colspan="4">
-            <img alt="" src="https://img-s.msn.cn/tenant/amp/entityid/AA1VWN3Q.img?w=768&h=333&m=6" class="lst" th:src="${ext.lst}"/>
+            <img style="width: 750px;" alt="" src="https://img-s.msn.cn/tenant/amp/entityid/AA1VWN3Q.img?w=768&h=333&m=6" class="lst" th:src="${ext.lst}"/>
         </td>
     </tr>
 </table>