wms / wms_shandonghaiwang · Commits

Commit 6f5b3d05e0c3cab80fd64efb7687ea671d962a2e

Authored by 易文鹏
1 parent 7e3afc2e

fix: 出库单打印调整

Inline Side-by-side
Showing 2 changed files with 6 additions and 3 deletions
src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentPrintVo.java
  View file @6f5b3d0
... ... @@ -29,6 +29,7 @@ public class ShipmentPrintVo {
29 29 data.transferWarehouseName = shipmentHeader.getTransferWarehouseName();
30 30 data.remark = shipmentHeader.getShipmentNote();
31 31 data.unionCode = unionCode;//合并单号
  32 + data.recordCode = shipmentHeader.getRecordCode();//合并前单号
32 33 data.zoneInfo = zoneInfo;
33 34 data.materialColor = shipmentHeader.getMaterialColor();
34 35 data.pageNumber = pageNumber;//页码
... ... @@ -50,6 +51,7 @@ public class ShipmentPrintVo {
50 51 voDetail.zone = taskDetail.getZoneName();
51 52 voDetail.materialCode = taskDetail.getMaterialCode();
52 53 voDetail.materialName = taskDetail.getMaterialName();
  54 + voDetail.materialSpec = taskDetail.getMaterialSpec();
53 55 voDetail.qty = taskDetail.getQty().stripTrailingZeros().toPlainString();
54 56 voDetail.taskId = String.valueOf(taskDetail.getTaskId());
55 57 voDetail.roadway = roadway;//巷道
... ... @@ -61,8 +63,8 @@ public class ShipmentPrintVo {
61 63 public class ShipHeader {
62 64 //颜色
63 65 public String materialColor = "";
64   - //原单号
65   - public String originalCode = "";
  66 + //合并前单号
  67 + public String recordCode = "";
66 68 //页码
67 69 public String pageNumber = "";
68 70 //合并单号
... ... @@ -97,6 +99,7 @@ public class ShipmentPrintVo {
97 99 public String block = "";
98 100 public String materialCode;
99 101 public String materialName = "";
  102 + public String materialSpec = "";
100 103 public String qty;
101 104 public String invQty;
102 105 public String roadway = "";//巷道
... ...
src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java
  View file @6f5b3d0
... ... @@ -476,7 +476,7 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl<ShipmentHeaderMapper,
476 476 return AjaxResult.success("合并成功");
477 477 }
478 478  
479   - //打印
  479 + //出库单打印
480 480 @Override
481 481 public AjaxResult autoReport(ShipmentHeader shipmentHeader, List<TaskDetail> taskDetails, String unionCode, int currentPageEndIndex) {
482 482 List<TaskDetail> flatTaskDetails = new ArrayList<>();//平库
... ...