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