入库打印页面，车辆入库出库打印，库位监控没有空容器报错问题

pengcheng
1 parent dba3ff5f
Showing 3 changed files with 27 additions and 20 deletions
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java
src/main/resources/templates/receipt/receiptHeader/report.html
@@ -290,21 +290,21 @@ public class ReceiptHeaderController extends BaseController {
     public String report(@ApiParam(name = "id", value = "入库头表id")
                          @PathVariable("id") Integer id, ModelMap mmap) {
         ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
-
+        LambdaQueryWrapper<Supplier> companyLambda = Wrappers.lambdaQuery();
+        companyLambda.eq(Supplier::getCode, receiptHeader.getSupplierCode());
+        Supplier supplier = supplierService.getOne(companyLambda);
+        String name=null;
+        if (supplier != null) {
+            name=supplier.getName();
+        }
+        receiptHeader.setSupplierName(name);
  
         //查询对应入库明细
         LambdaQueryWrapper<ReceiptContainerDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(ReceiptContainerDetail::getReceiptId, id);
         List<ReceiptContainerDetail> details = receiptContainerDetailService.list(lambdaQueryWrapper);
         for (ReceiptContainerDetail receiptContainerDetail:details){
-            LambdaQueryWrapper<Supplier> companyLambda = Wrappers.lambdaQuery();
-            companyLambda.eq(Supplier::getCode, receiptContainerDetail.getSupplierCode());
-            Supplier supplier = supplierService.getOne(companyLambda);
-            String name=null;
-            if (supplier != null) {
-                name=supplier.getName();
-            }
-            receiptContainerDetail.setCompanyName(name);
+
             if(StringUtils.isNotEmpty(receiptContainerDetail.getBatteryTypes())){
                 String batteryTypes=dictDataService.selectDictLabel("batteryTypes",receiptContainerDetail.getBatteryTypes());
                 receiptContainerDetail.setBatteryTypesName(batteryTypes);
@@ -89,6 +89,10 @@ public class ReceiptHeader implements Serializable {
     @ApiModelProperty(value="供应商编码")
     private String supplierCode;
  
+    @TableField(exist = false)
+    @ApiModelProperty(value="供应商编码")
+    private String supplierName;
+
     /**
      * 关联订单类型
      */
@@ -20,7 +20,10 @@
                 </td>
             </tr>
             <tr style="padding:15px 0 5px 0;border-bottom:1px solid #606060">
-                <td colspan="11">
+                <td colspan="3">
+                    <span>供应商：<span th:text="${receiptHeader['supplierName']}"></span></span>
+                </td>
+                <td colspan="8">
                     <div style="width:50%; float:right; text-align:right">
                         <span>明细条数：<span th:text="${receiptHeader['totalLines']}"></span></span>
                         <span style="padding-left:20px;">明细总数：<span th:text="${receiptHeader['totalQty']}"></span></span>
@@ -37,12 +40,12 @@
                 <th width="">数量</th>
                 <th width="">磅单编号</th>
                 <th width="">电池类型</th>
-                <th width="">电池种类</th>
-                <th width="">批号</th>
-                <th width="">供应商</th>
-                <th width="">国家编码</th>
+                <!--<th width="">电池种类</th>
+                <th width="">批号</th>-->
+                <!--<th width="">供应商</th>-->
+                <!--<th width="">国家编码</th>
                 <th width="">回收人</th>
-                <th width="">电池二维码</th>
+                <th width="">电池二维码</th>-->
                 <!--<th width="21%">条码</th>-->
             </tr>
             </thead>
@@ -56,12 +59,12 @@
                 <td th:text="${row.qty}"></td>
                 <td th:text="${row.poundCode}"></td>
                 <td th:text="${row.batteryTypesName}"></td>
-                <td th:text="${row.batteryPackTypeName}"></td>
-                <td th:text="${row.lot}"></td>
-                <td th:text="${row.companyName}"></td>
-                <td th:text="${row.countryCode}"></td>
+                <!--<td th:text="${row.batteryPackTypeName}"></td>
+                <td th:text="${row.lot}"></td>-->
+               <!-- <td th:text="${row.companyName}"></td>-->
+                <!--<td th:text="${row.countryCode}"></td>
                 <td th:text="${row.recycler}"></td>
-                <td><img th:src="@{'/image/'+${row.batteryPackTwoCode}}"></td>
+                <td><img width="80px" th:src="@{'/image/'+${row.batteryPackTwoCode}}"></td>-->
                 <!--<td><img th:src="@{'/image/'+${row.materialCode}}"></td>-->
             </tr>
             </tbody>