朱兆平 / agent · 提交

转到一个项目

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

安检申报 预配

内嵌 并排对比
正在显示 8 个修改的文件 包含 34 行增加 和 23 行删除
@@ -324,12 +324,16 @@ public class SecurityDeclarationController { @@ -324,12 +324,16 @@ public class SecurityDeclarationController {
324 //运输条件鉴定书 324 //运输条件鉴定书
325 String transportCertificate = ""; 325 String transportCertificate = "";
326 if ( request.getParameter("sd_transport_certificate") != null){ 326 if ( request.getParameter("sd_transport_certificate") != null){
327 - transportCertificate = request.getParameter("sd_transport_certificate"); 327 + String sd_transport_certificate = request.getParameter("sd_transport_certificate");
  328 +
  329 + transportCertificate = sd_transport_certificate.replaceAll("，",",");
328 } 330 }
329 //航空公司同意运输证明 331 //航空公司同意运输证明
330 String transportationProve = ""; 332 String transportationProve = "";
331 if (request.getParameter("sd_transportation_prove") != null){ 333 if (request.getParameter("sd_transportation_prove") != null){
332 - transportationProve = request.getParameter("sd_transportation_prove"); 334 + String sd_transportation_prove = request.getParameter("sd_transportation_prove");
  335 +
  336 + transportationProve = sd_transportation_prove.replaceAll("，",",");
333 } 337 }
334 338
335 339
@@ -586,12 +590,16 @@ public class SecurityDeclarationController { @@ -586,12 +590,16 @@ public class SecurityDeclarationController {
586 //运输条件鉴定书 590 //运输条件鉴定书
587 String transportCertificate = ""; 591 String transportCertificate = "";
588 if ( request.getParameter("sd_transport_certificate") != null){ 592 if ( request.getParameter("sd_transport_certificate") != null){
589 - transportCertificate = request.getParameter("sd_transport_certificate"); 593 + String sd_transport_certificate = request.getParameter("sd_transport_certificate");
  594 +
  595 + transportCertificate = sd_transport_certificate.replaceAll("，",",");
590 } 596 }
591 //航空公司同意运输证明 597 //航空公司同意运输证明
592 String transportationProve = ""; 598 String transportationProve = "";
593 if (request.getParameter("sd_transportation_prove") != null){ 599 if (request.getParameter("sd_transportation_prove") != null){
594 - transportationProve = request.getParameter("sd_transportation_prove"); 600 + String sd_transportation_prove = request.getParameter("sd_transportation_prove");
  601 +
  602 + transportationProve = sd_transportation_prove.replaceAll("，",",");
595 } 603 }
596 604
597 605
@@ -736,7 +744,7 @@ public class SecurityDeclarationController { @@ -736,7 +744,7 @@ public class SecurityDeclarationController {
736 String path = resource.getPath(); 744 String path = resource.getPath();
737 String s = path +"../../resource/img/bar_code/"+replace+".png"; 745 String s = path +"../../resource/img/bar_code/"+replace+".png";
738 //生成条形码 746 //生成条形码
739 - BarCodeUtil.generateFile(replace, s); 747 +// BarCodeUtil.generateFile(replace, s);
740 748
741 model.addAttribute("path", replace); 749 model.addAttribute("path", replace);
742 750
@@ -750,7 +758,7 @@ public class SecurityDeclarationController { @@ -750,7 +758,7 @@ public class SecurityDeclarationController {
750 758
751 List<SDCargoTypeEntity> sdCargoTypeEntities = sdCargoTypeService.waybillAll(sd.getSd_waybill()); 759 List<SDCargoTypeEntity> sdCargoTypeEntities = sdCargoTypeService.waybillAll(sd.getSd_waybill());
752 for (SDCargoTypeEntity type: sdCargoTypeEntities){ 760 for (SDCargoTypeEntity type: sdCargoTypeEntities){
753 - cargoType+=type.getSd_cargo_type(); 761 + cargoType+=type.getSd_cargo_type()+",";
754 } 762 }
755 //货物性质（类型） 763 //货物性质（类型）
756 model.addAttribute("type", cargoType); 764 model.addAttribute("type", cargoType);
@@ -3,6 +3,7 @@ package com.agent.entity.agent; @@ -3,6 +3,7 @@ package com.agent.entity.agent;
3 import com.agent.entity.IdEntity; 3 import com.agent.entity.IdEntity;
4 4
5 import javax.persistence.Entity; 5 import javax.persistence.Entity;
  6 +import javax.persistence.IdClass;
6 import javax.persistence.Table; 7 import javax.persistence.Table;
7 import java.util.Date; 8 import java.util.Date;
8 9
@@ -67,14 +67,14 @@ @@ -67,14 +67,14 @@
67 <div id="tb" style="padding:0 30px;"><input type="hidden" id="idcc"> 67 <div id="tb" style="padding:0 30px;"><input type="hidden" id="idcc">
68 <form id="searchForm"> 68 <form id="searchForm">
69 <table class="search_form_table"> 69 <table class="search_form_table">
70 - <select name="search_LIKE_tstype" id="tstype" style="width:166px;height:35px;line-height:35px;"> 70 + <select name="search_EQ_tstype" id="tstype" style="width:166px;height:35px;line-height:35px;">
71 <option value="">请选择</option> 71 <option value="">请选择</option>
72 - <option value="A">发货人</option>  
73 - <option value="B">订舱代理</option>  
74 - <option value="C">操作代理</option> 72 + <option value="111">发货人</option>
  73 + <option value="222">订舱代理</option>
  74 + <option value="333">操作代理</option>
75 </select> 75 </select>
76 76
77 - 货主名称: <input class="easyui-textbox" type="text" name="search_LIKE_fullname" style="width:166px;height:35px;line-height:35px;"> 77 + 货主简称: <input class="easyui-textbox" type="text" name="search_EQ_forshort" style="width:166px;height:35px;line-height:35px;">
78 78
79 航班开始日期：<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;"> 79 航班开始日期：<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;">
80 80
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 91
92 </tr> 92 </tr>
93 <tr> 93 <tr>
94 - <td class="kv-label">航班日期 94 + <td class="kv-label">日期
95 <span class="required_span">*</span> 95 <span class="required_span">*</span>
96 </td> 96 </td>
97 <td class="kv-content"> 97 <td class="kv-content">
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 91
92 </tr> 92 </tr>
93 <tr> 93 <tr>
94 - <td class="kv-label">航班日期 94 + <td class="kv-label">日期
95 <span class="required_span">*</span> 95 <span class="required_span">*</span>
96 </td> 96 </td>
97 <td class="kv-content"> 97 <td class="kv-content">
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
101 101
102 </tr> 102 </tr>
103 <tr> 103 <tr>
104 - <td class="kv-label">航班日期 104 + <td class="kv-label">日期
105 <span class="required_span">*</span> 105 <span class="required_span">*</span>
106 </td> 106 </td>
107 <td class="kv-content"> 107 <td class="kv-content">
@@ -46,9 +46,9 @@ @@ -46,9 +46,9 @@
46 src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js"></script> 46 src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js"></script>
47 47
48 </head> 48 </head>
49 -<body>  
50 -<div style="width: 100%; height: 60px"></div>  
51 -<div id="printdiv" style="width: 92%; height: 100%; margin: 0 auto;"> 49 +<body style="width: 745px">
  50 +<div style="width: 100%; height: 20px"></div>
  51 +<div id="printdiv" style="width: 90%; height: 100%; margin-left: 20pt">
52 <div> 52 <div>
53 <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> 53 <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>
54 <p style="line-height:100pt; margin:0pt 0pt -30pt; orphans:0; text-align:center; widows:0"> 54 <p style="line-height:100pt; margin:0pt 0pt -30pt; orphans:0; text-align:center; widows:0">
@@ -67,13 +67,15 @@ @@ -67,13 +67,15 @@
67 <span style="font-family:宋体; font-size:12pt">承运航空公司：</span> 67 <span style="font-family:宋体; font-size:12pt">承运航空公司：</span>
68 <span style="font-family:宋体; font-size:12pt; display: inline-block; width: 120px; text-decoration: underline">${wbm.carrier}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> 68 <span style="font-family:宋体; font-size:12pt; display: inline-block; width: 120px; text-decoration: underline">${wbm.carrier}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
69 <span style="font-family:宋体; font-size:12pt; text-decoration:none">航班号：</span> 69 <span style="font-family:宋体; font-size:12pt; text-decoration:none">航班号：</span>
70 - <span style="font-family:宋体; font-size:12pt; display: inline-block; width: 150px; text-decoration: underline">${wbm.carrier}${wbm.flightno}&nbsp;&nbsp;&nbsp;&nbsp;</span> 70 + <span style="font-family:宋体; font-size:12pt; display: inline-block; width: 150px; text-decoration: underline">${wbm.carrier}${wbm.flightno}&nbsp;&nbsp;</span>
71 <span style="font-family:宋体; font-size:12pt; text-decoration:none">日期：</span> 71 <span style="font-family:宋体; font-size:12pt; text-decoration:none">日期：</span>
72 - <span style="font-family:宋体; font-size:12pt; display: inline-block; width: 150px; text-decoration: underline">${date}&nbsp;&nbsp;&nbsp;</span> 72 + <span style="font-family:宋体; font-size:12pt; display: inline-block; width: 150px; text-decoration: underline">
  73 + <input type="text" value="${date}" placeholder="如:0000-00-00" style=
  74 + "border-color: #878787; border-style: solid; border-top-width: 0px;border-right-width: 0px; border-bottom-width: 1px;border-left-width: 0px"></span>
73 </p> 75 </p>
74 <p style="line-height:20pt; margin:0pt 0pt 10pt; orphans:0; widows:0"> 76 <p style="line-height:20pt; margin:0pt 0pt 10pt; orphans:0; widows:0">
75 <span style="font-family:宋体; font-size:12pt">航空货运单号：</span> 77 <span style="font-family:宋体; font-size:12pt">航空货运单号：</span>
76 - <span style="font-family:宋体; font-size:12pt; display: inline-block; width: 180px; text-decoration:underline">${sd.sd_waybill}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span> 78 + <span style="font-family:宋体; font-size:12pt; display: inline-block; width: 180px; text-decoration:underline">${sd.sd_waybill}&nbsp;&nbsp;&nbsp;</span>
77 <span style="font-family:宋体; font-size:12pt; text-decoration:none">航空货物托运人名称：</span> 79 <span style="font-family:宋体; font-size:12pt; text-decoration:none">航空货物托运人名称：</span>
78 <span style="font-family:宋体; font-size:12pt; text-decoration:underline">${sd.sd_cargo_shipper_name}&nbsp;</span> 80 <span style="font-family:宋体; font-size:12pt; text-decoration:underline">${sd.sd_cargo_shipper_name}&nbsp;</span>
79 <span style="font-family:宋体; font-size:12pt; text-decoration:none">&nbsp; </span> 81 <span style="font-family:宋体; font-size:12pt; text-decoration:none">&nbsp; </span>
@@ -84,10 +86,10 @@ @@ -84,10 +86,10 @@
84 <span style="font-family:宋体; font-size:12pt; text-decoration:none">航协资质</span> 86 <span style="font-family:宋体; font-size:12pt; text-decoration:none">航协资质</span>
85 <span style="font-family:宋体; font-size:12pt; text-decoration:none">编号</span> 87 <span style="font-family:宋体; font-size:12pt; text-decoration:none">编号</span>
86 <span style="font-family:宋体; font-size:12pt; text-decoration:none">：</span> 88 <span style="font-family:宋体; font-size:12pt; text-decoration:none">：</span>
87 - <span style="font-family:宋体; font-size:12pt; text-decoration:underline">${sd.sd_iata_number}&nbsp;&nbsp;&nbsp;</span> 89 + <span style="font-family:宋体; font-size:12pt; text-decoration:underline">${sd.sd_iata_number}</span>
88 </p> 90 </p>
89 91
90 - <table cellspacing="0" cellpadding="0" style="border-collapse:collapse; float:left; margin:0pt 9pt; width:520.25pt"> 92 + <table cellspacing="0" cellpadding="0" style="border-collapse:collapse; float:left; width:520.25pt">
91 <tbody> 93 <tbody>
92 <tr style="height:29.75pt"> 94 <tr style="height:29.75pt">
93 <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"> 95 <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 @@ @@ -83,7 +83,7 @@
83 } 83 }
84 84
85 function appendCarrier(value, row, index) { 85 function appendCarrier(value, row, index) {
86 - return row.carrier+row.flightno; 86 + return row.flightno;
87 } 87 }
88 88
89 function checkResponseText(value, row, index) { 89 function checkResponseText(value, row, index) {