Merge remote-tracking branch 'origin/develop' into develop

tongzhonghao
2 parents 9edb7367 474044ca
Showing 14 changed files with 230 additions and 87 deletions
src/main/java/com/huaheng/pc/config/receiptType/service/ReceiptTypeService.java
src/main/java/com/huaheng/pc/config/receiptType/service/ReceiptTypeServiceImpl.java
src/main/java/com/huaheng/pc/config/supplier/service/SupplierService.java
src/main/java/com/huaheng/pc/config/supplier/service/SupplierServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java
src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java
src/main/java/com/huaheng/pc/vehicle/vehicleReceipt/controller/VehicelReceiptController.java
src/main/java/com/huaheng/pc/vehicle/vehicleShipment/controller/VehicelShipmentController.java
src/main/resources/static/img/dl-logo.jpg
src/main/resources/templates/receipt/receiptHeader/report.html
src/main/resources/templates/vehicle/vehicleReceipt/report.html
src/main/resources/templates/vehicle/vehicleShipment/report.html
@@ -12,4 +12,6 @@ public interface ReceiptTypeService extends IService&lt;ReceiptType&gt;{
      * @return 是否复制成功
      */
     Boolean receiptTypeCopy(String warehouseCode, String newWarehouseCode);
+
+    String getNameByCode(String code);
 }
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
-import com.huaheng.pc.config.address.domain.Address;
 import com.huaheng.pc.config.receiptType.domain.ReceiptType;
 import com.huaheng.pc.config.receiptType.mapper.ReceiptTypeMapper;
 import org.springframework.stereotype.Service;
@@ -59,4 +58,15 @@ public class ReceiptTypeServiceImpl extends ServiceImpl&lt;ReceiptTypeMapper, Recei
             return false;
         }
     }
+    @Override
+    public String getNameByCode(String code){
+        LambdaQueryWrapper<ReceiptType> Lambda = Wrappers.lambdaQuery();
+        Lambda.eq(ReceiptType::getCode, code);
+        ReceiptType receiptType = this.getOne(Lambda);
+        if(receiptType!=null){
+            return receiptType.getName();
+        }else{
+            return null;
+        }
+    }
 }
@@ -10,5 +10,6 @@ public interface SupplierService extends IService&lt;Supplier&gt;{
  
     List<Map<String, Object>> getCode();
  
+    String getNameByCode(String code);
  
 }
@@ -21,4 +21,15 @@ public class SupplierServiceImpl extends ServiceImpl&lt;SupplierMapper, Supplier&gt; i
                 .eq(Supplier::getWarehouseCode, ShiroUtils.getWarehouseCode());
         return this.listMaps(lambda);
     }
+    @Override
+    public  String getNameByCode(String code){
+        LambdaQueryWrapper<Supplier> companyLambda = Wrappers.lambdaQuery();
+        companyLambda.eq(Supplier::getCode, code);
+        Supplier supplier = this.getOne(companyLambda);
+        if(supplier!=null){
+            return supplier.getName();
+        }else{
+            return null;
+        }
+    }
 }
@@ -131,11 +131,18 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
             BigDecimal batteryPackageWeight, String locationCode, BigDecimal qty,
             String locatingRule, String barCodeHeaderCode,
             String area,String barCodeHeaderId,BatteryBean batteryBean) {
+        if(receiptDetailId==null){
+            throw new ServiceException("请选择右边明细");
+        }
         ReceiptDetail detail = receiptDetailService.getById(receiptDetailId);
-        detail.setType(batteryBean.getType());
-        detail.setStorageType(batteryBean.getStorageType());
+        if(StringUtils.isNotEmpty(batteryBean.getType())){
+            detail.setType(batteryBean.getType());
+            detail.setStorageType(batteryBean.getStorageType());
+        }
         receiptDetailService.updateById(detail);
-
+        if(qty.intValue() <= 0 ) {
+            throw new ServiceException("配盘数量必须大于0");
+        }
         //超收检查
         if(StringUtils.isEmpty(barCodeHeaderCode)){
             checkOverReceiving(detail, qty);
@@ -890,8 +897,17 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
                 //for (BarCodeDetail barCodeDetail : barCodeDetails) {
                     String materialCode=receiptDetail1.getMaterialCode();
                     BigDecimal barcodeqty=receiptDetail1.getOpenQty();
-                    AjaxResult result=savereceiptContainerDetail(receiptContainerDetail,receiptHeader,receiptDetail1,
-                            locationCode,container,receiptContainerHeader,receiptDetail1.getOpenQty(),barCodeHeaderCode,batteryBean);
+                    if(receiptDetail1.getMaterialIsBattery()==1){
+                        for (int a=0;a<barcodeqty.intValue();a++){
+                            //电池类拆盘
+                            AjaxResult result=savereceiptContainerDetail(receiptContainerDetail,receiptHeader,receiptDetail1,
+                                    locationCode,container,receiptContainerHeader,new BigDecimal(1),barCodeHeaderCode,batteryBean);
+                        }
+                    }else{
+                        AjaxResult result=savereceiptContainerDetail(receiptContainerDetail,receiptHeader,receiptDetail1,
+                                locationCode,container,receiptContainerHeader,receiptDetail1.getOpenQty(),barCodeHeaderCode,batteryBean);
+                    }
+
                 }
                 return AjaxResult.success("保存入库组盘详情成功");
             }else{
@@ -18,6 +18,7 @@ import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.config.company.service.CompanyService;
+import com.huaheng.pc.config.receiptType.service.ReceiptTypeService;
 import com.huaheng.pc.config.supplier.domain.Supplier;
 import com.huaheng.pc.config.supplier.service.SupplierService;
 import com.huaheng.pc.monitor.job.domain.datas;
@@ -70,6 +71,8 @@ public class ReceiptHeaderController extends BaseController {
     private SupplierService supplierService;
     @Resource
     private IDictDataService dictDataService;
+    @Resource
+    private ReceiptTypeService receiptTypeService;
  
  
     @RequiresPermissions("receipt:receiptHeader:view")
@@ -290,15 +293,10 @@ 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();
-        }
+        String name= supplierService.getNameByCode(receiptHeader.getSupplierCode());
         receiptHeader.setSupplierName(name);
-
+        String receiptTypename= receiptTypeService.getNameByCode(receiptHeader.getReceiptType());
+        receiptHeader.setReceiptTypeName(receiptTypename);
         //查询对应入库明细
         LambdaQueryWrapper<ReceiptContainerDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(ReceiptContainerDetail::getReceiptId, id);
@@ -309,10 +307,10 @@ public class ReceiptHeaderController extends BaseController {
                 String batteryTypes=dictDataService.selectDictLabel("batteryTypes",receiptContainerDetail.getBatteryTypes());
                 receiptContainerDetail.setBatteryTypesName(batteryTypes);
             }
-            if(StringUtils.isNotEmpty(receiptContainerDetail.getBatteryPackType())){
+            /*if(StringUtils.isNotEmpty(receiptContainerDetail.getBatteryPackType())){
                 String batteryPackType=dictDataService.selectDictLabel("batteryPackType",receiptContainerDetail.getBatteryPackType());
                 receiptContainerDetail.setBatteryPackTypeName(batteryPackType);
-            }
+            }*/
         }
         receiptHeader.setTotalLines(details.size());
         mmap.put("receiptHeader", receiptHeader);
@@ -54,6 +54,9 @@ public class ReceiptHeader implements Serializable {
     @ApiModelProperty(value="入库类型")
     private String receiptType;
  
+    @TableField(exist = false)
+    private String receiptTypeName;
+
     /**
      * 首状态
      */
@@ -134,9 +134,9 @@ public class ReceivingController extends BaseController {
             @ApiParam(name="area",value="区域") String area,
             @ApiParam(name="localtionRule",value="定位规则", required = false)String locatingRule,
             @ApiParam(name="BatteryPackageWeight",value="电池包重量") BigDecimal batteryPackageWeight){
-        if(qty.intValue() <= 0 && weights.intValue() <=0) {
+        /*if(qty.intValue() <= 0 && weights.intValue() <=0) {
             return AjaxResult.error("配盘数量必须大于0或者配盘重量必须大于0");
-        }
+        }*/
  
         AjaxResult ajaxResult = handleMultiProcess(new MultiProcessListener() {
             @Override
@@ -20,6 +20,7 @@ import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
+import com.huaheng.pc.system.dict.service.IDictDataService;
 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
 import com.huaheng.pc.vehicle.vehicleReceipt.domain.VehicleReceipt;
 import com.huaheng.pc.vehicle.vehicleReceipt.service.VehicleReceiptService;
@@ -50,6 +51,9 @@ public class VehicelReceiptController extends BaseController {
     private String prefix="vehicle/vehicleReceipt";
  
     @Resource
+    private IDictDataService dictDataService;
+
+    @Resource
     private VehicleReceiptService vehicleReceiptService;
  
     @RequiresPermissions("vehicle:vehicleReceipt:view")
@@ -192,6 +196,10 @@ public class VehicelReceiptController extends BaseController {
     public String report(@ApiParam(name = "id", value = "id")
                          @PathVariable("id") Integer id, ModelMap mmap) {
         VehicleReceipt vehicleReceipt= vehicleReceiptService.getById(id);
+        if(StringUtils.isNotEmpty(vehicleReceipt.getVehicleDocumentType())){
+            String vehicleDocumentType=dictDataService.selectDictLabel("vehicleDocumentType",vehicleReceipt.getVehicleDocumentType());
+            vehicleReceipt.setVehicleDocumentType(vehicleDocumentType);
+        }
         mmap.put("vehicleReceipt", vehicleReceipt);
         return prefix + "/report";
     }
@@ -15,6 +15,7 @@ import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
+import com.huaheng.pc.system.dict.service.IDictDataService;
 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
 import com.huaheng.pc.vehicle.vehicleReceipt.domain.VehicleReceipt;
 import com.huaheng.pc.vehicle.vehicleShipment.domain.VehicleShipment;
@@ -40,7 +41,8 @@ import java.util.List;
 public class VehicelShipmentController extends BaseController {
     private String prefix="vehicle/vehicleShipment";
  
-
+    @Resource
+    private IDictDataService dictDataService;
     @Resource
     private VehicleShipmentService vehicleShipmentService;
  
@@ -148,6 +150,10 @@ public class VehicelShipmentController extends BaseController {
     public String report(@ApiParam(name = "id", value = "id")
                          @PathVariable("id") Integer id, ModelMap mmap) {
         VehicleShipment vehicleShipment = vehicleShipmentService.getById(id);
+        if(StringUtils.isNotEmpty(vehicleShipment.getVehicleDocumentType())){
+            String vehicleDocumentType=dictDataService.selectDictLabel("vehicleDocumentType",vehicleShipment.getVehicleDocumentType());
+            vehicleShipment.setVehicleDocumentType(vehicleDocumentType);
+        }
         mmap.put("vehicleShipment", vehicleShipment);
         return prefix + "/report";
     }
@@ -6,40 +6,82 @@
     table {
         white-space: normal;
     }
+    /*table tr th{
+        border: 1px solid #000000;
+    }
+    tbody tr td{
+        border: 1px solid #000000;
+    }*/
+    .thClass{
+        border: 1px solid #000000;
+    }
+    .tdClass{
+        border: 1px solid #000000;
+    }
 </style>
 <body class="white-bg" style="padding:5px 0;" id="ddd">
 <div class="container" style="color: #333;">
     <div class="row">
-        <table id="reportTable" width="100%" border="0" cellspacing="0" cellpadding="0" class="dy-report">
+        <table id="reportTable" width="98%" border="0" cellspacing="0" cellpadding="0" class="dy-report">
             <thead style="display:table-header-group;">
             <tr>
-                <td colspan="11">
-                    <span style="padding-top:40px;width: 40%; float:left;" th:text="${#dates.format(receiptHeader.created,'yyyy-MM-dd HH:mm:ss')}"></span>
-                    <h2 style="width:20%;text-align:center;float:left;padding-top:10px;">入库单</h2>
-                    <span style="padding-top:20px;width:38%;float:right; text-align: right"><img id="receiptCode" th:src="@{'/image/'+${receiptHeader.code}}"></span>
+                <td colspan="5">
+                    <span style="width:15%;float:left;padding-top: 0px;"><img id="logoimg" style="width:120px;"  th:src="@{/img/dl-logo.jpg}"></span>
+                    <span style="width:76%;text-align:right;font-size:24px;float:left;padding-top:0px;">格林美(武汉)动力电池再生技术有限公司</span>
+                </td>
+                <td rowspan="2">
+                    <span style="padding-top:0px;width:100%;float:right; text-align: right">
+                        <img id="receiptCode" width="60px" th:src="@{'/image/'+${receiptHeader.code}}"></span>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="6">
+
+                    <span style="width:55%;text-align:right;font-size:24px;float:left;padding-top:0px;" th:text="${receiptHeader['receiptTypeName']}"></span>
+
+                </td>
+            </tr>
+            <tr style="padding:15px 0 5px 0;">
+                <td colspan="6">
+                    <span style="width:20%; float:left;" th:text="${#dates.format(receiptHeader.created,'yyyy-MM-dd HH:mm:ss')}"></span>
+                    <div style=" float:right; text-align:right">
+                        <span>明细条数：<span th:text="${receiptHeader['totalLines']}"></span></span>
+                    </div>
                 </td>
             </tr>
             <tr style="padding:15px 0 5px 0;border-bottom:1px solid #606060">
-                <td colspan="3">
+                <td colspan="6">
+                    <span style="width:100%;text-align:left">供应商：<span th:text="${receiptHeader['supplierName']}"></span></span>
+                    <div style=" float:right; text-align:right">
+
+                        <span style="padding-left:10px;">明细总数：<span th:text="${#numbers.formatInteger(receiptHeader['totalQty'],0)}"></span></span>
+                        <span class="noprint" style="padding-left:20px;"><button type="button" onClick="a()"><i class="fa fa-print"></i> 打印</button></span>
+                    </div>
+                </td>
+                <!--<td colspan="2">
                     <span>供应商：<span th:text="${receiptHeader['supplierName']}"></span></span>
                 </td>
-                <td colspan="8">
-                    <div style="width:50%; float:right; text-align:right">
+                <td colspan="2">
+                    <span style=" float:left;" th:text="${#dates.format(receiptHeader.created,'yyyy-MM-dd HH:mm:ss')}"></span>
+                </td>
+                <td colspan="2">
+                    <div style="width:100%; 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>
+                        <span style="padding-left:10px;">明细总数：<span th:text="${receiptHeader['totalQty']}"></span></span>
                         <span class="noprint" style="padding-left:20px;"><button type="button" onClick="a()"><i class="fa fa-print"></i> 打印</button></span>
                     </div>
-                </td>
+                </td>-->
             </tr>
-            <tr>
-                <th width="">物料编码</th>
-                <th width="">物料名称</th>
+            <tr >
+                <th class="thClass">物料编码</th>
+                <th class="thClass">物料名称</th>
+                <th class="thClass">物料单位</th>
                 <!--<th width="10%">批次</th>
                 <th width="9%">批号</th>-->
                 <!--<th width="">工程号</th>-->
-                <th width="">数量</th>
-                <th width="">磅单编号</th>
-                <th width="">电池类型</th>
+                <th class="thClass">数量</th>
+                <th class="thClass">磅单编号</th>
+                <th class="thClass">电池类型</th>
                 <!--<th width="">电池种类</th>
                 <th width="">批号</th>-->
                 <!--<th width="">供应商</th>-->
@@ -50,15 +92,16 @@
             </tr>
             </thead>
             <tbody>
-            <tr th:each="row,rowStat : ${details}">
-                <td th:text="${row.materialCode}"></td>
-                <td th:text="${row.materialName}"></td>
+            <tr th:each="row,rowStat : ${details}" >
+                <td class="tdClass" th:text="${row.materialCode}"></td>
+                <td class="tdClass" th:text="${row.materialName}"></td>
+                <td class="tdClass" th:text="${row.materialUnit}"></td>
                 <!--<td th:text="${row.batch}"></td>
                 <td th:text="${row.lot}"></td>
                 <td th:text="${row.projectNo}"></td>-->
-                <td th:text="${row.qty}"></td>
-                <td th:text="${row.poundCode}"></td>
-                <td th:text="${row.batteryTypesName}"></td>
+                <td class="tdClass" th:text="${#numbers.formatInteger(row.qty,0)}"></td>
+                <td class="tdClass" th:text="${row.poundCode}"></td>
+                <td class="tdClass" th:text="${row.batteryTypesName}"></td>
                 <!--<td th:text="${row.batteryPackTypeName}"></td>
                 <td th:text="${row.lot}"></td>-->
                <!-- <td th:text="${row.companyName}"></td>-->
@@ -68,6 +111,13 @@
                 <!--<td><img th:src="@{'/image/'+${row.materialCode}}"></td>-->
             </tr>
             </tbody>
+
+            <tr>
+                <td colspan="6">
+                    <span style="width:28%;text-align:right;float:left;padding-top:10px;">仓管：</span>
+                    <span style="width:38%;text-align:right;float:left;padding-top:10px;">审核：</span>
+                </td>
+            </tr>
         </table>
     </div>
 </div>
@@ -91,7 +141,9 @@
         lineColor:"#000000",//设置条和文本的颜色。
         margin:1//设置条形码周围的空白边距
     };
+    function formatClearDecimal(v) {
  
+    }
     // $("#receiptCode").JsBarcode($("#receiptCode").attr("data"), barcodeStyle);
  
     // for (var i=0; i<$('#reportTable tbody tr').length; i++){
@@ -109,6 +161,15 @@
     @media print {
         .noprint{display:none;}
     }
+    .thClass{
+        border: 1px solid #000000;
+    }
+    .tdClass{
+        border: 1px solid #000000;
+    }
+    #logoimg{
+        /*width:150px;*/
+    }
 </style>
 <script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
 <script type="text/javascript" src="../../../js/jquery.jqprint-0.3.js"></script>
@@ -2,152 +2,165 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
+<style>
+
+</style>
 <body class="white-bg" style="padding:5px 0;" id="ddd">
 <div class="container" style="color: #333;">
     <div class="row">
         <div>
             <span class="noprint" style="padding-left:92%;"><button type="button" onClick="a()"><i class="fa fa-print"></i> 打印</button></span>
         </div>
-        <table id="reportTable" width="100%" border="1" cellspacing="0" cellpadding="0" style="margin-top: 5px;" class="dy-report">
+        <table id="reportTable" width="80%" align="center" border="0" cellspacing="0" cellpadding="0" style="margin-top: 5px;text-align: center;" class="dy-report">
             <thead style="display:table-header-group;">
             <tr>
                 <td colspan="2">
-                    <h2 align="center">武汉动力电池再生技术有限公司内部周转过磅单</h2>
+                    <h2 align="center">武汉动力电池再生技术有限公司<span th:text="${vehicleReceipt['vehicleDocumentType']}"></span></h2>
                 </td>
             </tr>
-            <tr>
+           <!-- <tr>
                 <td colspan="2" align="center">
                     <span >过磅单号：<span th:text="${vehicleReceipt['materialBatch']}"></span></span>
                 </td>
+            </tr>-->
+            <div id="trborder">
+            <tr style="">
+                <td colspan="1" class="trborder">
+                    <span>创建时间</span>
+                </td>
+                <td colspan="1" style="width: 60%" class="trborder">
+                    <span th:text="${#dates.format(vehicleReceipt.created,'yyyy-MM-dd HH:mm:ss')}"></span>
+                </td>
             </tr>
             <tr style="">
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span>车牌号</span>
                 </td>
-                <td colspan="1" style="width: 60%">
+                <td colspan="1" style="width: 60%" class="trborder">
                     <span th:text="${vehicleReceipt['carNumber']}"></span>
                 </td>
             </tr>
             <tr style="">
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span>物料编码</span>
                 </td>
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span th:text="${vehicleReceipt['materialCode']}"></span>
                 </td>
             </tr>
             <tr style="">
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span>物料名称</span>
                 </td>
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span th:text="${vehicleReceipt['meterialName']}"></span>
                 </td>
             </tr>
             <tr style="">
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span>规格型号</span>
                 </td>
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span th:text="${vehicleReceipt['materialSpec']}"></span>
                 </td>
             </tr>
             <tr style="">
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span>备注</span>
                 </td>
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span th:text="${vehicleReceipt['remark']}"></span>
                 </td>
             </tr>
             <tr style="">
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span>客户</span>
                 </td>
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span th:text="${vehicleReceipt['supplier']}"></span>
                 </td>
             </tr>
             <tr style="">
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span>毛重</span>
                 </td>
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span th:text="${vehicleReceipt['grossWeight']}"></span>KG
                 </td>
             </tr>
             <tr style="">
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span>皮重</span>
                 </td>
-                <td colspan="1">
+                 <td colspan="1" class="trborder">
                     <span th:text="${vehicleReceipt['tareWeight']}"></span>KG
                 </td>
             </tr>
-            <tr style="">
-                <td colspan="1">
+           <!-- <tr style="">
+                 <td colspan="1" class="trborder">
                     <span>扣杂</span>
                 </td>
-                <td colspan="1">
+                 <td colspan="1" class="trborder">
                     <span th:text="${vehicleReceipt['grossWeight']}"></span>KG
                 </td>
-            </tr>
+            </tr>-->
             <tr style="">
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span>净重</span>
                 </td>
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span th:text="${vehicleReceipt['netWeight']}"></span>KG
                 </td>
             </tr>
             <tr style="">
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span>结算重量</span>
                 </td>
-                <td colspan="1">
-                    <span th:text="${vehicleReceipt['netWeight']}"></span>KG
+                <td colspan="1" class="trborder">
+                    <span ></span>KG
                 </td>
             </tr>
             <tr style="">
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span> 司磅员</span>
                 </td>
-                <td colspan="1">
+                <td colspan="1" class="trborder">
                     <span th:text="${vehicleReceipt['createdBy']}"></span>
                 </td>
             </tr>
             <tr style="">
-                <td colspan="1">
+                 <td colspan="1" class="trborder">
                     <span> 监磅员</span>
                 </td>
-                <td colspan="1">
-                    <span th:text="${vehicleReceipt['createdBy']}"></span>
+                 <td colspan="1" class="trborder">
+                    <span ></span>
                 </td>
             </tr>
            <!-- <tr style="">
-                <td colspan="1">
+                 <td colspan="1" class="trborder">
                     <span>创建人</span>
                 </td>
-                <td colspan="1">
+                 <td colspan="1" class="trborder">
                     <span th:text="${vehicleReceipt['createdBy']}"></span>
                 </td>
             </tr>
             <tr style="">
-                <td colspan="1">
+                 <td colspan="1" class="trborder">
                     <span>创建时间</span>
                 </td>
-                <td colspan="1">
+                 <td colspan="1" class="trborder">
                     <span  th:text="${#dates.format(vehicleReceipt.created,'yyyy-MM-dd HH:mm:ss')}"></span>
                 </td>
             </tr>-->
             <tr style="">
-                <td colspan="1">
+                 <td colspan="1" class="trborder">
                     <span>送/收货员</span>
                 </td>
-                <td colspan="1">
-                    <span th:text="${vehicleReceipt['vehicleName']}"></span>
+                 <td colspan="1" class="trborder">
+                    <span ></span>
                 </td>
             </tr>
+            </div>
         </table>
     </div>
 </div>
@@ -190,6 +203,12 @@
     @media print {
         .noprint{display:none;}
     }
+    #trborder tr td span{
+        border: 1px solid #000000;
+    }
+    .trborder{
+        border: 1px solid #000000;
+    }
 </style>
 <script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
 <script type="text/javascript" src="../../../js/jquery.jqprint-0.3.js"></script>
@@ -12,7 +12,7 @@
             <thead style="display:table-header-group;">
             <tr>
                 <td colspan="2">
-                    <h2 align="center">武汉动力电池再生技术有限公司内部周转过磅单</h2>
+                    <h2 align="center">武汉动力电池再生技术有限公司<span th:text="${vehicleShipment['vehicleDocumentType']}"></span></h2>
                 </td>
             </tr>
             <tr>
@@ -22,6 +22,14 @@
             </tr>
             <tr style="">
                 <td colspan="1">
+                    <span>创建时间</span>
+                </td>
+                <td colspan="1" style="width: 60%">
+                    <span th:text="${#dates.format(vehicleShipment.created,'yyyy-MM-dd HH:mm:ss')}"></span>
+                </td>
+            </tr>
+            <tr style="">
+                <td colspan="1">
                     <span>车牌号</span>
                 </td>
                 <td colspan="1" style="width: 60%">
@@ -84,14 +92,14 @@
                     <span th:text="${vehicleShipment['tareWeight']}"></span>KG
                 </td>
             </tr>
-            <tr style="">
+            <!--<tr style="">
                 <td colspan="1">
                     <span>扣杂</span>
                 </td>
                 <td colspan="1">
                     <span th:text="${vehicleShipment['grossWeight']}"></span>KG
                 </td>
-            </tr>
+            </tr>-->
             <tr style="">
                 <td colspan="1">
                     <span>净重</span>
@@ -105,7 +113,7 @@
                     <span>结算重量</span>
                 </td>
                 <td colspan="1">
-                    <span th:text="${vehicleShipment['netWeight']}"></span>KG
+                    <span ></span>KG
                 </td>
             </tr>
             <tr style="">
@@ -121,7 +129,7 @@
                     <span> 监磅员</span>
                 </td>
                 <td colspan="1">
-                    <span th:text="${vehicleShipment['createdBy']}"></span>
+                    <span ></span>
                 </td>
             </tr>
             <!--<tr style="">
@@ -145,7 +153,7 @@
                     <span>送/收货员</span>
                 </td>
                 <td colspan="1">
-                    <span th:text="${vehicleShipment['vehicleName']}"></span>
+                    <span></span>
                 </td>
             </tr>
         </table>