feat: 出库单打印页面，要新增颜色字段显示。

易文鹏
1 parent f144af0e
Showing 2 changed files with 5 additions and 2 deletions
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentPrintVo.java
@@ -478,10 +478,10 @@ public class ShipmentHeaderController extends BaseController {
                 shipmentDetailLists.add(item);
             }
         }
-        if (shipmentDetailList != null && shipmentDetailList.size() > 0) {
+        if (!shipmentDetailList.isEmpty()) {
             shipmentDetails.addAll(shipmentDetailList);
         }
-        if (shipmentDetailLists != null && shipmentDetailLists.size() > 0) {
+        if (!shipmentDetailLists.isEmpty()) {
             shipmentDetails.addAll(shipmentDetailLists);
         }
         mmap.put("details", shipmentDetails);
@@ -30,6 +30,7 @@ public class ShipmentPrintVo {
         data.remark = shipmentHeader.getShipmentNote();
         data.unionCode = unionCode;//合并单号
         data.zoneInfo = zoneInfo;
+        data.materialColor = shipmentHeader.getMaterialColor();
         data.pageNumber = pageNumber;//页码
         if (shipmentHeader.getShipmentType().equals("208")) {
             data.footRight = "形态转换单据得重新维护编码，并重新入库";
@@ -58,6 +59,8 @@ public class ShipmentPrintVo {
     }
     public class ShipHeader {
+        //颜色
+        public String materialColor = "";
         //原单号
         public String originalCode = "";
         //页码