朱兆平 / agent · 提交

转到一个项目

作者 申海龙
提交 3f9338eb60ca9d7c670a81f85052a0966e1c6903 1 个父辈 2dce7fca

安检申报 预配

内嵌 并排对比
正在显示 8 个修改的文件 包含 34 行增加 和 23 行删除
... ... @@ -324,12 +324,16 @@ public class SecurityDeclarationController {
//运输条件鉴定书
String transportCertificate = "";
if ( request.getParameter("sd_transport_certificate") != null){
transportCertificate = request.getParameter("sd_transport_certificate");
String sd_transport_certificate = request.getParameter("sd_transport_certificate");
transportCertificate = sd_transport_certificate.replaceAll("，",",");
}
//航空公司同意运输证明
String transportationProve = "";
if (request.getParameter("sd_transportation_prove") != null){
transportationProve = request.getParameter("sd_transportation_prove");
String sd_transportation_prove = request.getParameter("sd_transportation_prove");
transportationProve = sd_transportation_prove.replaceAll("，",",");
}
... ... @@ -586,12 +590,16 @@ public class SecurityDeclarationController {
//运输条件鉴定书
String transportCertificate = "";
if ( request.getParameter("sd_transport_certificate") != null){
transportCertificate = request.getParameter("sd_transport_certificate");
String sd_transport_certificate = request.getParameter("sd_transport_certificate");
transportCertificate = sd_transport_certificate.replaceAll("，",",");
}
//航空公司同意运输证明
String transportationProve = "";
if (request.getParameter("sd_transportation_prove") != null){
transportationProve = request.getParameter("sd_transportation_prove");
String sd_transportation_prove = request.getParameter("sd_transportation_prove");
transportationProve = sd_transportation_prove.replaceAll("，",",");
}
... ... @@ -736,7 +744,7 @@ public class SecurityDeclarationController {
String path = resource.getPath();
String s = path +"../../resource/img/bar_code/"+replace+".png";
//生成条形码
BarCodeUtil.generateFile(replace, s);
// BarCodeUtil.generateFile(replace, s);
model.addAttribute("path", replace);
... ... @@ -750,7 +758,7 @@ public class SecurityDeclarationController {
List<SDCargoTypeEntity> sdCargoTypeEntities = sdCargoTypeService.waybillAll(sd.getSd_waybill());
for (SDCargoTypeEntity type: sdCargoTypeEntities){
cargoType+=type.getSd_cargo_type();
cargoType+=type.getSd_cargo_type()+",";
}
//货物性质（类型）
model.addAttribute("type", cargoType);
... ...
... ... @@ -3,6 +3,7 @@ package com.agent.entity.agent;
import com.agent.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.IdClass;
import javax.persistence.Table;
import java.util.Date;
... ...
... ... @@ -67,14 +67,14 @@
<div id="tb" style="padding:0 30px;"><input type="hidden" id="idcc">
<form id="searchForm">
<table class="search_form_table">
<select name="search_LIKE_tstype" id="tstype" style="width:166px;height:35px;line-height:35px;">
<select name="search_EQ_tstype" id="tstype" style="width:166px;height:35px;line-height:35px;">
<option value="">请选择</option>
<option value="A">发货人</option>
<option value="B">订舱代理</option>
<option value="C">操作代理</option>
<option value="111">发货人</option>
<option value="222">订舱代理</option>
<option value="333">操作代理</option>
</select>
货主名称: <input class="easyui-textbox" type="text" name="search_LIKE_fullname" style="width:166px;height:35px;line-height:35px;">
货主简称: <input class="easyui-textbox" type="text" name="search_EQ_forshort" style="width:166px;height:35px;line-height:35px;">
航班开始日期：<input type="text" class=" bill" name="search_GTES_flightdate" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" style="width:166px;height:35px;line-height:35px;">
... ...
... ... @@ -91,7 +91,7 @@
</tr>
<tr>
<td class="kv-label">航班日期
<td class="kv-label">日期
<span class="required_span">*</span>
</td>
<td class="kv-content">
... ...
... ... @@ -91,7 +91,7 @@
</tr>
<tr>
<td class="kv-label">航班日期
<td class="kv-label">日期
<span class="required_span">*</span>
</td>
<td class="kv-content">
... ...
... ... @@ -101,7 +101,7 @@
</tr>
<tr>
<td class="kv-label">航班日期
<td class="kv-label">日期
<span class="required_span">*</span>
</td>
<td class="kv-content">
... ...
... ... @@ -46,9 +46,9 @@
src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js"></script>
</head>
<body>
<div style="width: 100%; height: 60px"></div>
<div id="printdiv" style="width: 92%; height: 100%; margin: 0 auto;">
<body style="width: 745px">
<div style="width: 100%; height: 20px"></div>
<div id="printdiv" style="width: 90%; height: 100%; margin-left: 20pt">
<div>
<p style="line-height: 20pt;"><img src="<%=basePath%>resource/img/bar_code/${path}.png" width="250" height="60" alt="网络异常" style="-aw-left-pos:2.6pt; -aw-rel-hpos:column; -aw-rel-vpos:paragraph; -aw-top-pos:-52pt; -aw-wrap-type:none; margin-left:30.6pt; margin-top:-6pt; position:absolute; z-index:0" /></p>
<p style="line-height:100pt; margin:0pt 0pt -30pt; orphans:0; text-align:center; widows:0">
... ... @@ -67,13 +67,15 @@
<span style="font-family:宋体; font-size:12pt">承运航空公司：</span>
<span style="font-family:宋体; font-size:12pt; display: inline-block; width: 120px; text-decoration: underline">${wbm.carrier}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span style="font-family:宋体; font-size:12pt; text-decoration:none">航班号：</span>
<span style="font-family:宋体; font-size:12pt; display: inline-block; width: 150px; text-decoration: underline">${wbm.carrier}${wbm.flightno}&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span style="font-family:宋体; font-size:12pt; display: inline-block; width: 150px; text-decoration: underline">${wbm.carrier}${wbm.flightno}&nbsp;&nbsp;</span>
<span style="font-family:宋体; font-size:12pt; text-decoration:none">日期：</span>
<span style="font-family:宋体; font-size:12pt; display: inline-block; width: 150px; text-decoration: underline">${date}&nbsp;&nbsp;&nbsp;</span>
<span style="font-family:宋体; font-size:12pt; display: inline-block; width: 150px; text-decoration: underline">
<input type="text" value="${date}" placeholder="如:0000-00-00" style=
"border-color: #878787; border-style: solid; border-top-width: 0px;border-right-width: 0px; border-bottom-width: 1px;border-left-width: 0px"></span>
</p>
<p style="line-height:20pt; margin:0pt 0pt 10pt; orphans:0; widows:0">
<span style="font-family:宋体; font-size:12pt">航空货运单号：</span>
<span style="font-family:宋体; font-size:12pt; display: inline-block; width: 180px; text-decoration:underline">${sd.sd_waybill}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
<span style="font-family:宋体; font-size:12pt; display: inline-block; width: 180px; text-decoration:underline">${sd.sd_waybill}&nbsp;&nbsp;&nbsp;</span>
<span style="font-family:宋体; font-size:12pt; text-decoration:none">航空货物托运人名称：</span>
<span style="font-family:宋体; font-size:12pt; text-decoration:underline">${sd.sd_cargo_shipper_name}&nbsp;</span>
<span style="font-family:宋体; font-size:12pt; text-decoration:none">&nbsp; </span>
... ... @@ -84,10 +86,10 @@
<span style="font-family:宋体; font-size:12pt; text-decoration:none">航协资质</span>
<span style="font-family:宋体; font-size:12pt; text-decoration:none">编号</span>
<span style="font-family:宋体; font-size:12pt; text-decoration:none">：</span>
<span style="font-family:宋体; font-size:12pt; text-decoration:underline">${sd.sd_iata_number}&nbsp;&nbsp;&nbsp;</span>
<span style="font-family:宋体; font-size:12pt; text-decoration:underline">${sd.sd_iata_number}</span>
</p>
<table cellspacing="0" cellpadding="0" style="border-collapse:collapse; float:left; margin:0pt 9pt; width:520.25pt">
<table cellspacing="0" cellpadding="0" style="border-collapse:collapse; float:left; width:520.25pt">
<tbody>
<tr style="height:29.75pt">
<td colspan="3" style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-left-color:#000000; border-left-style:solid; border-left-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt; padding-left:5.03pt; padding-right:5.03pt; vertical-align:middle; width:83.95pt">
... ...
... ... @@ -83,7 +83,7 @@
}
function appendCarrier(value, row, index) {
return row.carrier+row.flightno;
return row.flightno;
}
function checkResponseText(value, row, index) {
... ...