Commit 408ec30b606e1059cdbe8d5e58fa20a389c6e688

Authored by tongzhonghao
2 parents 9edb7367 474044ca

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

src/main/java/com/huaheng/pc/config/receiptType/service/ReceiptTypeService.java
... ... @@ -12,4 +12,6 @@ public interface ReceiptTypeService extends IService<ReceiptType>{
12 12 * @return 是否复制成功
13 13 */
14 14 Boolean receiptTypeCopy(String warehouseCode, String newWarehouseCode);
  15 +
  16 + String getNameByCode(String code);
15 17 }
... ...
src/main/java/com/huaheng/pc/config/receiptType/service/ReceiptTypeServiceImpl.java
... ... @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5 5 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6 6 import com.huaheng.common.utils.StringUtils;
7 7 import com.huaheng.common.utils.security.ShiroUtils;
8   -import com.huaheng.pc.config.address.domain.Address;
9 8 import com.huaheng.pc.config.receiptType.domain.ReceiptType;
10 9 import com.huaheng.pc.config.receiptType.mapper.ReceiptTypeMapper;
11 10 import org.springframework.stereotype.Service;
... ... @@ -59,4 +58,15 @@ public class ReceiptTypeServiceImpl extends ServiceImpl<ReceiptTypeMapper, Recei
59 58 return false;
60 59 }
61 60 }
  61 + @Override
  62 + public String getNameByCode(String code){
  63 + LambdaQueryWrapper<ReceiptType> Lambda = Wrappers.lambdaQuery();
  64 + Lambda.eq(ReceiptType::getCode, code);
  65 + ReceiptType receiptType = this.getOne(Lambda);
  66 + if(receiptType!=null){
  67 + return receiptType.getName();
  68 + }else{
  69 + return null;
  70 + }
  71 + }
62 72 }
... ...
src/main/java/com/huaheng/pc/config/supplier/service/SupplierService.java
... ... @@ -10,5 +10,6 @@ public interface SupplierService extends IService&lt;Supplier&gt;{
10 10  
11 11 List<Map<String, Object>> getCode();
12 12  
  13 + String getNameByCode(String code);
13 14  
14 15 }
... ...
src/main/java/com/huaheng/pc/config/supplier/service/SupplierServiceImpl.java
... ... @@ -21,4 +21,15 @@ public class SupplierServiceImpl extends ServiceImpl&lt;SupplierMapper, Supplier&gt; i
21 21 .eq(Supplier::getWarehouseCode, ShiroUtils.getWarehouseCode());
22 22 return this.listMaps(lambda);
23 23 }
  24 + @Override
  25 + public String getNameByCode(String code){
  26 + LambdaQueryWrapper<Supplier> companyLambda = Wrappers.lambdaQuery();
  27 + companyLambda.eq(Supplier::getCode, code);
  28 + Supplier supplier = this.getOne(companyLambda);
  29 + if(supplier!=null){
  30 + return supplier.getName();
  31 + }else{
  32 + return null;
  33 + }
  34 + }
24 35 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
... ... @@ -131,11 +131,18 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
131 131 BigDecimal batteryPackageWeight, String locationCode, BigDecimal qty,
132 132 String locatingRule, String barCodeHeaderCode,
133 133 String area,String barCodeHeaderId,BatteryBean batteryBean) {
  134 + if(receiptDetailId==null){
  135 + throw new ServiceException("请选择右边明细");
  136 + }
134 137 ReceiptDetail detail = receiptDetailService.getById(receiptDetailId);
135   - detail.setType(batteryBean.getType());
136   - detail.setStorageType(batteryBean.getStorageType());
  138 + if(StringUtils.isNotEmpty(batteryBean.getType())){
  139 + detail.setType(batteryBean.getType());
  140 + detail.setStorageType(batteryBean.getStorageType());
  141 + }
137 142 receiptDetailService.updateById(detail);
138   -
  143 + if(qty.intValue() <= 0 ) {
  144 + throw new ServiceException("配盘数量必须大于0");
  145 + }
139 146 //超收检查
140 147 if(StringUtils.isEmpty(barCodeHeaderCode)){
141 148 checkOverReceiving(detail, qty);
... ... @@ -890,8 +897,17 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
890 897 //for (BarCodeDetail barCodeDetail : barCodeDetails) {
891 898 String materialCode=receiptDetail1.getMaterialCode();
892 899 BigDecimal barcodeqty=receiptDetail1.getOpenQty();
893   - AjaxResult result=savereceiptContainerDetail(receiptContainerDetail,receiptHeader,receiptDetail1,
894   - locationCode,container,receiptContainerHeader,receiptDetail1.getOpenQty(),barCodeHeaderCode,batteryBean);
  900 + if(receiptDetail1.getMaterialIsBattery()==1){
  901 + for (int a=0;a<barcodeqty.intValue();a++){
  902 + //电池类拆盘
  903 + AjaxResult result=savereceiptContainerDetail(receiptContainerDetail,receiptHeader,receiptDetail1,
  904 + locationCode,container,receiptContainerHeader,new BigDecimal(1),barCodeHeaderCode,batteryBean);
  905 + }
  906 + }else{
  907 + AjaxResult result=savereceiptContainerDetail(receiptContainerDetail,receiptHeader,receiptDetail1,
  908 + locationCode,container,receiptContainerHeader,receiptDetail1.getOpenQty(),barCodeHeaderCode,batteryBean);
  909 + }
  910 +
895 911 }
896 912 return AjaxResult.success("保存入库组盘详情成功");
897 913 }else{
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
... ... @@ -18,6 +18,7 @@ import com.huaheng.framework.web.page.PageDomain;
18 18 import com.huaheng.framework.web.page.TableDataInfo;
19 19 import com.huaheng.framework.web.page.TableSupport;
20 20 import com.huaheng.pc.config.company.service.CompanyService;
  21 +import com.huaheng.pc.config.receiptType.service.ReceiptTypeService;
21 22 import com.huaheng.pc.config.supplier.domain.Supplier;
22 23 import com.huaheng.pc.config.supplier.service.SupplierService;
23 24 import com.huaheng.pc.monitor.job.domain.datas;
... ... @@ -70,6 +71,8 @@ public class ReceiptHeaderController extends BaseController {
70 71 private SupplierService supplierService;
71 72 @Resource
72 73 private IDictDataService dictDataService;
  74 + @Resource
  75 + private ReceiptTypeService receiptTypeService;
73 76  
74 77  
75 78 @RequiresPermissions("receipt:receiptHeader:view")
... ... @@ -290,15 +293,10 @@ public class ReceiptHeaderController extends BaseController {
290 293 public String report(@ApiParam(name = "id", value = "入库头表id")
291 294 @PathVariable("id") Integer id, ModelMap mmap) {
292 295 ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
293   - LambdaQueryWrapper<Supplier> companyLambda = Wrappers.lambdaQuery();
294   - companyLambda.eq(Supplier::getCode, receiptHeader.getSupplierCode());
295   - Supplier supplier = supplierService.getOne(companyLambda);
296   - String name=null;
297   - if (supplier != null) {
298   - name=supplier.getName();
299   - }
  296 + String name= supplierService.getNameByCode(receiptHeader.getSupplierCode());
300 297 receiptHeader.setSupplierName(name);
301   -
  298 + String receiptTypename= receiptTypeService.getNameByCode(receiptHeader.getReceiptType());
  299 + receiptHeader.setReceiptTypeName(receiptTypename);
302 300 //查询对应入库明细
303 301 LambdaQueryWrapper<ReceiptContainerDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
304 302 lambdaQueryWrapper.eq(ReceiptContainerDetail::getReceiptId, id);
... ... @@ -309,10 +307,10 @@ public class ReceiptHeaderController extends BaseController {
309 307 String batteryTypes=dictDataService.selectDictLabel("batteryTypes",receiptContainerDetail.getBatteryTypes());
310 308 receiptContainerDetail.setBatteryTypesName(batteryTypes);
311 309 }
312   - if(StringUtils.isNotEmpty(receiptContainerDetail.getBatteryPackType())){
  310 + /*if(StringUtils.isNotEmpty(receiptContainerDetail.getBatteryPackType())){
313 311 String batteryPackType=dictDataService.selectDictLabel("batteryPackType",receiptContainerDetail.getBatteryPackType());
314 312 receiptContainerDetail.setBatteryPackTypeName(batteryPackType);
315   - }
  313 + }*/
316 314 }
317 315 receiptHeader.setTotalLines(details.size());
318 316 mmap.put("receiptHeader", receiptHeader);
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java
... ... @@ -54,6 +54,9 @@ public class ReceiptHeader implements Serializable {
54 54 @ApiModelProperty(value="入库类型")
55 55 private String receiptType;
56 56  
  57 + @TableField(exist = false)
  58 + private String receiptTypeName;
  59 +
57 60 /**
58 61 * 首状态
59 62 */
... ...
src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java
... ... @@ -134,9 +134,9 @@ public class ReceivingController extends BaseController {
134 134 @ApiParam(name="area",value="区域") String area,
135 135 @ApiParam(name="localtionRule",value="定位规则", required = false)String locatingRule,
136 136 @ApiParam(name="BatteryPackageWeight",value="电池包重量") BigDecimal batteryPackageWeight){
137   - if(qty.intValue() <= 0 && weights.intValue() <=0) {
  137 + /*if(qty.intValue() <= 0 && weights.intValue() <=0) {
138 138 return AjaxResult.error("配盘数量必须大于0或者配盘重量必须大于0");
139   - }
  139 + }*/
140 140  
141 141 AjaxResult ajaxResult = handleMultiProcess(new MultiProcessListener() {
142 142 @Override
... ...
src/main/java/com/huaheng/pc/vehicle/vehicleReceipt/controller/VehicelReceiptController.java
... ... @@ -20,6 +20,7 @@ import com.huaheng.framework.web.page.TableDataInfo;
20 20 import com.huaheng.framework.web.page.TableSupport;
21 21 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
22 22 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
  23 +import com.huaheng.pc.system.dict.service.IDictDataService;
23 24 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
24 25 import com.huaheng.pc.vehicle.vehicleReceipt.domain.VehicleReceipt;
25 26 import com.huaheng.pc.vehicle.vehicleReceipt.service.VehicleReceiptService;
... ... @@ -50,6 +51,9 @@ public class VehicelReceiptController extends BaseController {
50 51 private String prefix="vehicle/vehicleReceipt";
51 52  
52 53 @Resource
  54 + private IDictDataService dictDataService;
  55 +
  56 + @Resource
53 57 private VehicleReceiptService vehicleReceiptService;
54 58  
55 59 @RequiresPermissions("vehicle:vehicleReceipt:view")
... ... @@ -192,6 +196,10 @@ public class VehicelReceiptController extends BaseController {
192 196 public String report(@ApiParam(name = "id", value = "id")
193 197 @PathVariable("id") Integer id, ModelMap mmap) {
194 198 VehicleReceipt vehicleReceipt= vehicleReceiptService.getById(id);
  199 + if(StringUtils.isNotEmpty(vehicleReceipt.getVehicleDocumentType())){
  200 + String vehicleDocumentType=dictDataService.selectDictLabel("vehicleDocumentType",vehicleReceipt.getVehicleDocumentType());
  201 + vehicleReceipt.setVehicleDocumentType(vehicleDocumentType);
  202 + }
195 203 mmap.put("vehicleReceipt", vehicleReceipt);
196 204 return prefix + "/report";
197 205 }
... ...
src/main/java/com/huaheng/pc/vehicle/vehicleShipment/controller/VehicelShipmentController.java
... ... @@ -15,6 +15,7 @@ import com.huaheng.framework.web.page.TableDataInfo;
15 15 import com.huaheng.framework.web.page.TableSupport;
16 16 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
17 17 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
  18 +import com.huaheng.pc.system.dict.service.IDictDataService;
18 19 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
19 20 import com.huaheng.pc.vehicle.vehicleReceipt.domain.VehicleReceipt;
20 21 import com.huaheng.pc.vehicle.vehicleShipment.domain.VehicleShipment;
... ... @@ -40,7 +41,8 @@ import java.util.List;
40 41 public class VehicelShipmentController extends BaseController {
41 42 private String prefix="vehicle/vehicleShipment";
42 43  
43   -
  44 + @Resource
  45 + private IDictDataService dictDataService;
44 46 @Resource
45 47 private VehicleShipmentService vehicleShipmentService;
46 48  
... ... @@ -148,6 +150,10 @@ public class VehicelShipmentController extends BaseController {
148 150 public String report(@ApiParam(name = "id", value = "id")
149 151 @PathVariable("id") Integer id, ModelMap mmap) {
150 152 VehicleShipment vehicleShipment = vehicleShipmentService.getById(id);
  153 + if(StringUtils.isNotEmpty(vehicleShipment.getVehicleDocumentType())){
  154 + String vehicleDocumentType=dictDataService.selectDictLabel("vehicleDocumentType",vehicleShipment.getVehicleDocumentType());
  155 + vehicleShipment.setVehicleDocumentType(vehicleDocumentType);
  156 + }
151 157 mmap.put("vehicleShipment", vehicleShipment);
152 158 return prefix + "/report";
153 159 }
... ...
src/main/resources/static/img/dl-logo.jpg 0 → 100644

5.58 KB

src/main/resources/templates/receipt/receiptHeader/report.html
... ... @@ -6,40 +6,82 @@
6 6 table {
7 7 white-space: normal;
8 8 }
  9 + /*table tr th{
  10 + border: 1px solid #000000;
  11 + }
  12 + tbody tr td{
  13 + border: 1px solid #000000;
  14 + }*/
  15 + .thClass{
  16 + border: 1px solid #000000;
  17 + }
  18 + .tdClass{
  19 + border: 1px solid #000000;
  20 + }
9 21 </style>
10 22 <body class="white-bg" style="padding:5px 0;" id="ddd">
11 23 <div class="container" style="color: #333;">
12 24 <div class="row">
13   - <table id="reportTable" width="100%" border="0" cellspacing="0" cellpadding="0" class="dy-report">
  25 + <table id="reportTable" width="98%" border="0" cellspacing="0" cellpadding="0" class="dy-report">
14 26 <thead style="display:table-header-group;">
15 27 <tr>
16   - <td colspan="11">
17   - <span style="padding-top:40px;width: 40%; float:left;" th:text="${#dates.format(receiptHeader.created,'yyyy-MM-dd HH:mm:ss')}"></span>
18   - <h2 style="width:20%;text-align:center;float:left;padding-top:10px;">入库单</h2>
19   - <span style="padding-top:20px;width:38%;float:right; text-align: right"><img id="receiptCode" th:src="@{'/image/'+${receiptHeader.code}}"></span>
  28 + <td colspan="5">
  29 + <span style="width:15%;float:left;padding-top: 0px;"><img id="logoimg" style="width:120px;" th:src="@{/img/dl-logo.jpg}"></span>
  30 + <span style="width:76%;text-align:right;font-size:24px;float:left;padding-top:0px;">格林美(武汉)动力电池再生技术有限公司</span>
  31 + </td>
  32 + <td rowspan="2">
  33 + <span style="padding-top:0px;width:100%;float:right; text-align: right">
  34 + <img id="receiptCode" width="60px" th:src="@{'/image/'+${receiptHeader.code}}"></span>
  35 + </td>
  36 + </tr>
  37 + <tr>
  38 + <td colspan="6">
  39 +
  40 + <span style="width:55%;text-align:right;font-size:24px;float:left;padding-top:0px;" th:text="${receiptHeader['receiptTypeName']}"></span>
  41 +
  42 + </td>
  43 + </tr>
  44 + <tr style="padding:15px 0 5px 0;">
  45 + <td colspan="6">
  46 + <span style="width:20%; float:left;" th:text="${#dates.format(receiptHeader.created,'yyyy-MM-dd HH:mm:ss')}"></span>
  47 + <div style=" float:right; text-align:right">
  48 + <span>明细条数:<span th:text="${receiptHeader['totalLines']}"></span></span>
  49 + </div>
20 50 </td>
21 51 </tr>
22 52 <tr style="padding:15px 0 5px 0;border-bottom:1px solid #606060">
23   - <td colspan="3">
  53 + <td colspan="6">
  54 + <span style="width:100%;text-align:left">供应商:<span th:text="${receiptHeader['supplierName']}"></span></span>
  55 + <div style=" float:right; text-align:right">
  56 +
  57 + <span style="padding-left:10px;">明细总数:<span th:text="${#numbers.formatInteger(receiptHeader['totalQty'],0)}"></span></span>
  58 + <span class="noprint" style="padding-left:20px;"><button type="button" onClick="a()"><i class="fa fa-print"></i> 打印</button></span>
  59 + </div>
  60 + </td>
  61 + <!--<td colspan="2">
24 62 <span>供应商:<span th:text="${receiptHeader['supplierName']}"></span></span>
25 63 </td>
26   - <td colspan="8">
27   - <div style="width:50%; float:right; text-align:right">
  64 + <td colspan="2">
  65 + <span style=" float:left;" th:text="${#dates.format(receiptHeader.created,'yyyy-MM-dd HH:mm:ss')}"></span>
  66 + </td>
  67 + <td colspan="2">
  68 + <div style="width:100%; float:right; text-align:right">
28 69 <span>明细条数:<span th:text="${receiptHeader['totalLines']}"></span></span>
29   - <span style="padding-left:20px;">明细总数:<span th:text="${receiptHeader['totalQty']}"></span></span>
  70 + <span style="padding-left:10px;">明细总数:<span th:text="${receiptHeader['totalQty']}"></span></span>
30 71 <span class="noprint" style="padding-left:20px;"><button type="button" onClick="a()"><i class="fa fa-print"></i> 打印</button></span>
31 72 </div>
32   - </td>
  73 + </td>-->
33 74 </tr>
34   - <tr>
35   - <th width="">物料编码</th>
36   - <th width="">物料名称</th>
  75 + <tr >
  76 + <th class="thClass">物料编码</th>
  77 + <th class="thClass">物料名称</th>
  78 + <th class="thClass">物料单位</th>
37 79 <!--<th width="10%">批次</th>
38 80 <th width="9%">批号</th>-->
39 81 <!--<th width="">工程号</th>-->
40   - <th width="">数量</th>
41   - <th width="">磅单编号</th>
42   - <th width="">电池类型</th>
  82 + <th class="thClass">数量</th>
  83 + <th class="thClass">磅单编号</th>
  84 + <th class="thClass">电池类型</th>
43 85 <!--<th width="">电池种类</th>
44 86 <th width="">批号</th>-->
45 87 <!--<th width="">供应商</th>-->
... ... @@ -50,15 +92,16 @@
50 92 </tr>
51 93 </thead>
52 94 <tbody>
53   - <tr th:each="row,rowStat : ${details}">
54   - <td th:text="${row.materialCode}"></td>
55   - <td th:text="${row.materialName}"></td>
  95 + <tr th:each="row,rowStat : ${details}" >
  96 + <td class="tdClass" th:text="${row.materialCode}"></td>
  97 + <td class="tdClass" th:text="${row.materialName}"></td>
  98 + <td class="tdClass" th:text="${row.materialUnit}"></td>
56 99 <!--<td th:text="${row.batch}"></td>
57 100 <td th:text="${row.lot}"></td>
58 101 <td th:text="${row.projectNo}"></td>-->
59   - <td th:text="${row.qty}"></td>
60   - <td th:text="${row.poundCode}"></td>
61   - <td th:text="${row.batteryTypesName}"></td>
  102 + <td class="tdClass" th:text="${#numbers.formatInteger(row.qty,0)}"></td>
  103 + <td class="tdClass" th:text="${row.poundCode}"></td>
  104 + <td class="tdClass" th:text="${row.batteryTypesName}"></td>
62 105 <!--<td th:text="${row.batteryPackTypeName}"></td>
63 106 <td th:text="${row.lot}"></td>-->
64 107 <!-- <td th:text="${row.companyName}"></td>-->
... ... @@ -68,6 +111,13 @@
68 111 <!--<td><img th:src="@{'/image/'+${row.materialCode}}"></td>-->
69 112 </tr>
70 113 </tbody>
  114 +
  115 + <tr>
  116 + <td colspan="6">
  117 + <span style="width:28%;text-align:right;float:left;padding-top:10px;">仓管:</span>
  118 + <span style="width:38%;text-align:right;float:left;padding-top:10px;">审核:</span>
  119 + </td>
  120 + </tr>
71 121 </table>
72 122 </div>
73 123 </div>
... ... @@ -91,7 +141,9 @@
91 141 lineColor:"#000000",//设置条和文本的颜色。
92 142 margin:1//设置条形码周围的空白边距
93 143 };
  144 + function formatClearDecimal(v) {
94 145  
  146 + }
95 147 // $("#receiptCode").JsBarcode($("#receiptCode").attr("data"), barcodeStyle);
96 148  
97 149 // for (var i=0; i<$('#reportTable tbody tr').length; i++){
... ... @@ -109,6 +161,15 @@
109 161 @media print {
110 162 .noprint{display:none;}
111 163 }
  164 + .thClass{
  165 + border: 1px solid #000000;
  166 + }
  167 + .tdClass{
  168 + border: 1px solid #000000;
  169 + }
  170 + #logoimg{
  171 + /*width:150px;*/
  172 + }
112 173 </style>
113 174 <script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
114 175 <script type="text/javascript" src="../../../js/jquery.jqprint-0.3.js"></script>
... ...
src/main/resources/templates/vehicle/vehicleReceipt/report.html
... ... @@ -2,152 +2,165 @@
2 2 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
3 3 <meta charset="utf-8">
4 4 <head th:include="include :: header"></head>
  5 +<style>
  6 +
  7 +</style>
5 8 <body class="white-bg" style="padding:5px 0;" id="ddd">
6 9 <div class="container" style="color: #333;">
7 10 <div class="row">
8 11 <div>
9 12 <span class="noprint" style="padding-left:92%;"><button type="button" onClick="a()"><i class="fa fa-print"></i> 打印</button></span>
10 13 </div>
11   - <table id="reportTable" width="100%" border="1" cellspacing="0" cellpadding="0" style="margin-top: 5px;" class="dy-report">
  14 + <table id="reportTable" width="80%" align="center" border="0" cellspacing="0" cellpadding="0" style="margin-top: 5px;text-align: center;" class="dy-report">
12 15 <thead style="display:table-header-group;">
13 16 <tr>
14 17 <td colspan="2">
15   - <h2 align="center">武汉动力电池再生技术有限公司内部周转过磅单</h2>
  18 + <h2 align="center">武汉动力电池再生技术有限公司<span th:text="${vehicleReceipt['vehicleDocumentType']}"></span></h2>
16 19 </td>
17 20 </tr>
18   - <tr>
  21 + <!-- <tr>
19 22 <td colspan="2" align="center">
20 23 <span >过磅单号:<span th:text="${vehicleReceipt['materialBatch']}"></span></span>
21 24 </td>
  25 + </tr>-->
  26 + <div id="trborder">
  27 + <tr style="">
  28 + <td colspan="1" class="trborder">
  29 + <span>创建时间</span>
  30 + </td>
  31 + <td colspan="1" style="width: 60%" class="trborder">
  32 + <span th:text="${#dates.format(vehicleReceipt.created,'yyyy-MM-dd HH:mm:ss')}"></span>
  33 + </td>
22 34 </tr>
23 35 <tr style="">
24   - <td colspan="1">
  36 + <td colspan="1" class="trborder">
25 37 <span>车牌号</span>
26 38 </td>
27   - <td colspan="1" style="width: 60%">
  39 + <td colspan="1" style="width: 60%" class="trborder">
28 40 <span th:text="${vehicleReceipt['carNumber']}"></span>
29 41 </td>
30 42 </tr>
31 43 <tr style="">
32   - <td colspan="1">
  44 + <td colspan="1" class="trborder">
33 45 <span>物料编码</span>
34 46 </td>
35   - <td colspan="1">
  47 + <td colspan="1" class="trborder">
36 48 <span th:text="${vehicleReceipt['materialCode']}"></span>
37 49 </td>
38 50 </tr>
39 51 <tr style="">
40   - <td colspan="1">
  52 + <td colspan="1" class="trborder">
41 53 <span>物料名称</span>
42 54 </td>
43   - <td colspan="1">
  55 + <td colspan="1" class="trborder">
44 56 <span th:text="${vehicleReceipt['meterialName']}"></span>
45 57 </td>
46 58 </tr>
47 59 <tr style="">
48   - <td colspan="1">
  60 + <td colspan="1" class="trborder">
49 61 <span>规格型号</span>
50 62 </td>
51   - <td colspan="1">
  63 + <td colspan="1" class="trborder">
52 64 <span th:text="${vehicleReceipt['materialSpec']}"></span>
53 65 </td>
54 66 </tr>
55 67 <tr style="">
56   - <td colspan="1">
  68 + <td colspan="1" class="trborder">
57 69 <span>备注</span>
58 70 </td>
59   - <td colspan="1">
  71 + <td colspan="1" class="trborder">
60 72 <span th:text="${vehicleReceipt['remark']}"></span>
61 73 </td>
62 74 </tr>
63 75 <tr style="">
64   - <td colspan="1">
  76 + <td colspan="1" class="trborder">
65 77 <span>客户</span>
66 78 </td>
67   - <td colspan="1">
  79 + <td colspan="1" class="trborder">
68 80 <span th:text="${vehicleReceipt['supplier']}"></span>
69 81 </td>
70 82 </tr>
71 83 <tr style="">
72   - <td colspan="1">
  84 + <td colspan="1" class="trborder">
73 85 <span>毛重</span>
74 86 </td>
75   - <td colspan="1">
  87 + <td colspan="1" class="trborder">
76 88 <span th:text="${vehicleReceipt['grossWeight']}"></span>KG
77 89 </td>
78 90 </tr>
79 91 <tr style="">
80   - <td colspan="1">
  92 + <td colspan="1" class="trborder">
81 93 <span>皮重</span>
82 94 </td>
83   - <td colspan="1">
  95 + <td colspan="1" class="trborder">
84 96 <span th:text="${vehicleReceipt['tareWeight']}"></span>KG
85 97 </td>
86 98 </tr>
87   - <tr style="">
88   - <td colspan="1">
  99 + <!-- <tr style="">
  100 + <td colspan="1" class="trborder">
89 101 <span>扣杂</span>
90 102 </td>
91   - <td colspan="1">
  103 + <td colspan="1" class="trborder">
92 104 <span th:text="${vehicleReceipt['grossWeight']}"></span>KG
93 105 </td>
94   - </tr>
  106 + </tr>-->
95 107 <tr style="">
96   - <td colspan="1">
  108 + <td colspan="1" class="trborder">
97 109 <span>净重</span>
98 110 </td>
99   - <td colspan="1">
  111 + <td colspan="1" class="trborder">
100 112 <span th:text="${vehicleReceipt['netWeight']}"></span>KG
101 113 </td>
102 114 </tr>
103 115 <tr style="">
104   - <td colspan="1">
  116 + <td colspan="1" class="trborder">
105 117 <span>结算重量</span>
106 118 </td>
107   - <td colspan="1">
108   - <span th:text="${vehicleReceipt['netWeight']}"></span>KG
  119 + <td colspan="1" class="trborder">
  120 + <span ></span>KG
109 121 </td>
110 122 </tr>
111 123 <tr style="">
112   - <td colspan="1">
  124 + <td colspan="1" class="trborder">
113 125 <span> 司磅员</span>
114 126 </td>
115   - <td colspan="1">
  127 + <td colspan="1" class="trborder">
116 128 <span th:text="${vehicleReceipt['createdBy']}"></span>
117 129 </td>
118 130 </tr>
119 131 <tr style="">
120   - <td colspan="1">
  132 + <td colspan="1" class="trborder">
121 133 <span> 监磅员</span>
122 134 </td>
123   - <td colspan="1">
124   - <span th:text="${vehicleReceipt['createdBy']}"></span>
  135 + <td colspan="1" class="trborder">
  136 + <span ></span>
125 137 </td>
126 138 </tr>
127 139 <!-- <tr style="">
128   - <td colspan="1">
  140 + <td colspan="1" class="trborder">
129 141 <span>创建人</span>
130 142 </td>
131   - <td colspan="1">
  143 + <td colspan="1" class="trborder">
132 144 <span th:text="${vehicleReceipt['createdBy']}"></span>
133 145 </td>
134 146 </tr>
135 147 <tr style="">
136   - <td colspan="1">
  148 + <td colspan="1" class="trborder">
137 149 <span>创建时间</span>
138 150 </td>
139   - <td colspan="1">
  151 + <td colspan="1" class="trborder">
140 152 <span th:text="${#dates.format(vehicleReceipt.created,'yyyy-MM-dd HH:mm:ss')}"></span>
141 153 </td>
142 154 </tr>-->
143 155 <tr style="">
144   - <td colspan="1">
  156 + <td colspan="1" class="trborder">
145 157 <span>送/收货员</span>
146 158 </td>
147   - <td colspan="1">
148   - <span th:text="${vehicleReceipt['vehicleName']}"></span>
  159 + <td colspan="1" class="trborder">
  160 + <span ></span>
149 161 </td>
150 162 </tr>
  163 + </div>
151 164 </table>
152 165 </div>
153 166 </div>
... ... @@ -190,6 +203,12 @@
190 203 @media print {
191 204 .noprint{display:none;}
192 205 }
  206 + #trborder tr td span{
  207 + border: 1px solid #000000;
  208 + }
  209 + .trborder{
  210 + border: 1px solid #000000;
  211 + }
193 212 </style>
194 213 <script type="text/javascript" src="../../../js/jquery-1.4.4.min.js"></script>
195 214 <script type="text/javascript" src="../../../js/jquery.jqprint-0.3.js"></script>
... ...
src/main/resources/templates/vehicle/vehicleShipment/report.html
... ... @@ -12,7 +12,7 @@
12 12 <thead style="display:table-header-group;">
13 13 <tr>
14 14 <td colspan="2">
15   - <h2 align="center">武汉动力电池再生技术有限公司内部周转过磅单</h2>
  15 + <h2 align="center">武汉动力电池再生技术有限公司<span th:text="${vehicleShipment['vehicleDocumentType']}"></span></h2>
16 16 </td>
17 17 </tr>
18 18 <tr>
... ... @@ -22,6 +22,14 @@
22 22 </tr>
23 23 <tr style="">
24 24 <td colspan="1">
  25 + <span>创建时间</span>
  26 + </td>
  27 + <td colspan="1" style="width: 60%">
  28 + <span th:text="${#dates.format(vehicleShipment.created,'yyyy-MM-dd HH:mm:ss')}"></span>
  29 + </td>
  30 + </tr>
  31 + <tr style="">
  32 + <td colspan="1">
25 33 <span>车牌号</span>
26 34 </td>
27 35 <td colspan="1" style="width: 60%">
... ... @@ -84,14 +92,14 @@
84 92 <span th:text="${vehicleShipment['tareWeight']}"></span>KG
85 93 </td>
86 94 </tr>
87   - <tr style="">
  95 + <!--<tr style="">
88 96 <td colspan="1">
89 97 <span>扣杂</span>
90 98 </td>
91 99 <td colspan="1">
92 100 <span th:text="${vehicleShipment['grossWeight']}"></span>KG
93 101 </td>
94   - </tr>
  102 + </tr>-->
95 103 <tr style="">
96 104 <td colspan="1">
97 105 <span>净重</span>
... ... @@ -105,7 +113,7 @@
105 113 <span>结算重量</span>
106 114 </td>
107 115 <td colspan="1">
108   - <span th:text="${vehicleShipment['netWeight']}"></span>KG
  116 + <span ></span>KG
109 117 </td>
110 118 </tr>
111 119 <tr style="">
... ... @@ -121,7 +129,7 @@
121 129 <span> 监磅员</span>
122 130 </td>
123 131 <td colspan="1">
124   - <span th:text="${vehicleShipment['createdBy']}"></span>
  132 + <span ></span>
125 133 </td>
126 134 </tr>
127 135 <!--<tr style="">
... ... @@ -145,7 +153,7 @@
145 153 <span>送/收货员</span>
146 154 </td>
147 155 <td colspan="1">
148   - <span th:text="${vehicleShipment['vehicleName']}"></span>
  156 + <span></span>
149 157 </td>
150 158 </tr>
151 159 </table>
... ...