朱兆平 / agent · 提交

转到一个项目

作者 shenhailong
提交 4a376da5d3192692e323316dd4057a548e92af6f 1 个父辈 15155c57

添加用户新增 用户删除功能 修改安检航空性质类型 远程接口调用后添加报文发送

内嵌 并排对比
正在显示 32 个修改的文件 包含 326 行增加 和 272 行删除
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 <commons-lang3.version>3.4</commons-lang3.version> 30 <commons-lang3.version>3.4</commons-lang3.version>
31 <commons-fileupload.version>1.3.1</commons-fileupload.version> 31 <commons-fileupload.version>1.3.1</commons-fileupload.version>
32 <commons-codec.version>1.10</commons-codec.version> 32 <commons-codec.version>1.10</commons-codec.version>
33 - <shiro.version>1.4.0</shiro.version> 33 + <shiro.version>1.5.2</shiro.version>
34 <cxf.version>2.7.5</cxf.version> 34 <cxf.version>2.7.5</cxf.version>
35 <patchca.version>0.5.0</patchca.version> 35 <patchca.version>0.5.0</patchca.version>
36 <jxl.version>2.6.12</jxl.version> 36 <jxl.version>2.6.12</jxl.version>
@@ -561,6 +561,12 @@ @@ -561,6 +561,12 @@
561 </configuration> 561 </configuration>
562 </plugin> 562 </plugin>
563 563
  564 + <plugin>
  565 + <groupId>org.apache.felix</groupId>
  566 + <artifactId>maven-bundle-plugin</artifactId>
  567 + <extensions>true</extensions>
  568 + </plugin>
  569 +
564 <!-- Maven 打包插件 <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> 570 <!-- Maven 打包插件 <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId>
565 <version>3.1.0</version> <configuration> <archive> <addMavenDescriptor>false</addMavenDescriptor> 571 <version>3.1.0</version> <configuration> <archive> <addMavenDescriptor>false</addMavenDescriptor>
566 </archive> <webResources> <resource> <directory>src/main/resoreces/conf/${package.environment}</directory> 572 </archive> <webResources> <resource> <directory>src/main/resoreces/conf/${package.environment}</directory>
@@ -3,7 +3,6 @@ package com.agent.controller.agent; @@ -3,7 +3,6 @@ package com.agent.controller.agent;
3 import com.agent.controller.BasicController; 3 import com.agent.controller.BasicController;
4 import com.agent.entity.Constant; 4 import com.agent.entity.Constant;
5 import com.agent.entity.agent.*; 5 import com.agent.entity.agent.*;
6 -import com.agent.entity.system.PermissionEntity;  
7 import com.agent.entity.system.UserEntity; 6 import com.agent.entity.system.UserEntity;
8 import com.agent.service.agent.*; 7 import com.agent.service.agent.*;
9 import com.agent.service.system.*; 8 import com.agent.service.system.*;
@@ -29,7 +28,6 @@ import com.plugin.easyui.DataGrid; @@ -29,7 +28,6 @@ import com.plugin.easyui.DataGrid;
29 import com.plugin.easyui.EasyPage; 28 import com.plugin.easyui.EasyPage;
30 import org.apache.commons.collections.CollectionUtils; 29 import org.apache.commons.collections.CollectionUtils;
31 import org.apache.commons.lang.StringUtils; 30 import org.apache.commons.lang.StringUtils;
32 -import org.apache.poi.ss.formula.functions.T;  
33 import org.apache.shiro.SecurityUtils; 31 import org.apache.shiro.SecurityUtils;
34 import org.slf4j.Logger; 32 import org.slf4j.Logger;
35 import org.slf4j.LoggerFactory; 33 import org.slf4j.LoggerFactory;
@@ -1415,6 +1413,20 @@ public class ManifestController extends BasicController { @@ -1415,6 +1413,20 @@ public class ManifestController extends BasicController {
1415 manifest.setDe_remarks(""); 1413 manifest.setDe_remarks("");
1416 manifestService.save(manifest); 1414 manifestService.save(manifest);
1417 1415
  1416 + // 生成报文并且发送
  1417 + String ndlrPath = MessageKit.getMessagePath(MessageType.NDLR);
  1418 + String dlcPath = MessageKit.getMessagePath(MessageType.DLCF);
  1419 + String sliPath = MessageKit.getMessagePath(MessageType.SLI);
  1420 +
  1421 + manifest.setAgentcompany(getAgent().getNameCn());
  1422 + manifest.setAgentman(getAgent().getThreeCode());
  1423 + manifest.setAgentcompanycode(getAgent().getThreeCode());
  1424 +
  1425 + new XmlBuildTask(manifestService.sendNDLRXml(manifest), ndlrPath).perform();
  1426 + new XmlBuildTask(manifestService.sendDLCFXml(manifest), dlcPath).perform();
  1427 + new XmlBuildTask(FSXmlKit.sliXml(manifest, getAgent()), sliPath).perform();
  1428 +
  1429 +
1418 model.setData(manifest); 1430 model.setData(manifest);
1419 model.setStatus(200); 1431 model.setStatus(200);
1420 model.setMsg(HttpJsonMsg.SUCCESS); 1432 model.setMsg(HttpJsonMsg.SUCCESS);
@@ -1497,6 +1509,18 @@ public class ManifestController extends BasicController { @@ -1497,6 +1509,18 @@ public class ManifestController extends BasicController {
1497 }else { 1509 }else {
1498 1510
1499 PreparesecondaryEntity save = preparesecondaryServer.save(pe); 1511 PreparesecondaryEntity save = preparesecondaryServer.save(pe);
  1512 + // 生成报文并且发送
  1513 + String ndlrPath = MessageKit.getMessagePath(MessageType.NDLR);
  1514 + String dlcPath = MessageKit.getMessagePath(MessageType.DLCF);
  1515 + String fhlPath = MessageKit.getMessagePath(MessageType.FHL);
  1516 +
  1517 + pe.setAgentcompany(getAgent().getNameCn());
  1518 + pe.setAgentman(getAgent().getNameCn());
  1519 + pe.setAgentcompanycode(getAgent().getThreeCode());
  1520 +
  1521 + new XmlBuildTask(manifestService.presenddlcfNdlrXml(pe), ndlrPath).perform();
  1522 + new XmlBuildTask(manifestService.presenddlcfdlcfXml(pe), dlcPath).perform();
  1523 + new XmlBuildTask(FSXmlKit.fhlXml(pe, getAgent()), fhlPath).perform();
1500 model.setData(save); 1524 model.setData(save);
1501 model.setStatus(200); 1525 model.setStatus(200);
1502 model.setMsg(HttpJsonMsg.SUCCESS); 1526 model.setMsg(HttpJsonMsg.SUCCESS);
@@ -158,12 +158,7 @@ public class SecurityDeclarationController { @@ -158,12 +158,7 @@ public class SecurityDeclarationController {
158 ResponseModel model = new ResponseModel(); 158 ResponseModel model = new ResponseModel();
159 159
160 //货物性质（类型） 160 //货物性质（类型）
161 - String one = request.getParameter("one");  
162 - String two = request.getParameter("two");  
163 - String three = request.getParameter("three");  
164 - String four = request.getParameter("four");  
165 -  
166 - String type = cargoType(one, two, three, four); 161 + String type = request.getParameter("dept");
167 162
168 //航空货物托运人名称 163 //航空货物托运人名称
169 String cargoShipperName = request.getParameter("sd_cargo_shipper_name"); 164 String cargoShipperName = request.getParameter("sd_cargo_shipper_name");
@@ -308,12 +303,8 @@ public class SecurityDeclarationController { @@ -308,12 +303,8 @@ public class SecurityDeclarationController {
308 * 安检申报 303 * 安检申报
309 */ 304 */
310 //货物性质（类型） 305 //货物性质（类型）
311 - String one = request.getParameter("one");  
312 - String two = request.getParameter("two");  
313 - String three = request.getParameter("three");  
314 - String four = request.getParameter("four");  
315 306
316 - String type = cargoType(one, two, three, four); 307 + String type = request.getParameter("dept");
317 308
318 //航空货物托运人名称 309 //航空货物托运人名称
319 String cargoShipperName = request.getParameter("sd_cargo_shipper_name"); 310 String cargoShipperName = request.getParameter("sd_cargo_shipper_name");
@@ -587,12 +578,7 @@ public class SecurityDeclarationController { @@ -587,12 +578,7 @@ public class SecurityDeclarationController {
587 * 安检申报 578 * 安检申报
588 */ 579 */
589 //货物性质（类型） 580 //货物性质（类型）
590 - String one = request.getParameter("one");  
591 - String two = request.getParameter("two");  
592 - String three = request.getParameter("three");  
593 - String four = request.getParameter("four");  
594 -  
595 - String type = cargoType(one, two, three, four); 581 + String type = request.getParameter("dept");
596 582
597 //航空货物托运人名称 583 //航空货物托运人名称
598 String cargoShipperName = request.getParameter("sd_cargo_shipper_name"); 584 String cargoShipperName = request.getParameter("sd_cargo_shipper_name");
@@ -780,25 +766,4 @@ public class SecurityDeclarationController { @@ -780,25 +766,4 @@ public class SecurityDeclarationController {
780 return "declaration/print"; 766 return "declaration/print";
781 } 767 }
782 768
783 -  
784 - public String cargoType(String one, String two, String three, String four){  
785 -  
786 - String type = "";  
787 - //货物性质  
788 - if (!StringUtils.isBlank(one)){  
789 - type = one;  
790 - }  
791 - if (!StringUtils.isBlank(two)){  
792 - type = two;  
793 - }  
794 - if (!StringUtils.isBlank(three)){  
795 - type = three;  
796 - }  
797 - if (!StringUtils.isBlank(four)){  
798 - type = four;  
799 - }  
800 -  
801 - return type;  
802 - }  
803 -  
804 } 769 }
1 -package com.agent.controller.system;  
2 -  
3 -import com.agent.service.system.FilghtDateService;  
4 -import com.agent.util.ExcelExportUtil;  
5 -import org.apache.poi.hssf.usermodel.HSSFWorkbook;  
6 -import org.springframework.beans.factory.annotation.Autowired;  
7 -import org.springframework.web.bind.annotation.RequestMapping;  
8 -import org.springframework.web.bind.annotation.ResponseBody;  
9 -import org.springframework.web.bind.annotation.RestController;  
10 -  
11 -import javax.servlet.http.HttpServletRequest;  
12 -import javax.servlet.http.HttpServletResponse;  
13 -import java.io.OutputStream;  
14 -import java.io.UnsupportedEncodingException;  
15 -import java.util.List;  
16 -import java.util.Map;  
17 -  
18 -@RequestMapping(value = "/filghtdate")  
19 -@RestController  
20 -public class FilghtDateController{  
21 -  
22 - @Autowired  
23 - private FilghtDateService filghtDateService;  
24 -  
25 - @RequestMapping(value = "/list")  
26 - public String filghtList(){  
27 - return "system/user/filghtdateconut";  
28 - }  
29 -  
30 - /**  
31 - * 航班日期统计 导出excel  
32 - * @param filghtdate1  
33 - * @param filghtdate2  
34 - * @return  
35 - */  
36 - @RequestMapping(value = "/filghtCount")  
37 - @ResponseBody  
38 - public void filghtcount(HttpServletRequest request, HttpServletResponse response, String filghtdate1, String filghtdate2) {  
39 -  
40 - // 获取数据  
41 - List<Map<String, Object>> filghtcount = filghtDateService.filghtcount(filghtdate1, filghtdate2);  
42 -  
43 - //excel标题  
44 - String[] title = {"运单号", "航空托运人名称", "航空销售代理人名称", "航协编号", "航空公司运输证明", "运输条件鉴定书","承运人",  
45 - "航班号", "航班日期","航班起始站","航班目的站","运单件数","运单重量","操作时间","关区","预配品名","收货人公司",  
46 - "收货人地址","收货人城市","收货人国家","收货人电话","收货人名称","发货人名称","发货人地址","发货人城市","发货人国家",  
47 - "发货人电话","发货人名称","海关回执状态","海关回执信息","发货人编码","收货人编码","货物品名","二级类名称","一级类名称",  
48 - "代理人三字码","代理人全称","代理人类别","代理联系人","代理联系人电话"};  
49 -  
50 - //excel文件名  
51 - String fileName = "测试" + System.currentTimeMillis() + ".xls";  
52 - //sheet名  
53 - String sheetName = "测试统计";  
54 -  
55 - String[][] content = new String[0][];  
56 - /**  
57 - * 可能空指针异常  
58 - */  
59 - for (int i = 0; i < filghtcount.size(); i++) {  
60 - content = new String[title.length][];  
61 - Map<String, Object> map = filghtcount.get(i);  
62 -  
63 - content[i][0] = map.get("SD_WAYBILL").toString();  
64 - content[i][1] = map.get("SD_CARGO_SHIPPER_NAME").toString();  
65 - content[i][2] = map.get("SD_CARGO_AGENT_NAME").toString();  
66 - content[i][3] = map.get("SD_IATA_NUMBER").toString();  
67 - content[i][4] = map.get("SD_TRANSPORT_CERTIFICATE").toString();  
68 - content[i][5] = map.get("SD_TRANSPORTATION_PROVE").toString();  
69 - content[i][6] = map.get("CARRIER").toString();  
70 - content[i][7] = map.get("FLIGHTNO").toString();  
71 - content[i][8] = map.get("FLIGHTDATE").toString();  
72 - content[i][9] = map.get("ORIGINATINGSTATION").toString();  
73 - content[i][10] = map.get("DESTINATIONSTATION").toString();  
74 - content[i][11] = map.get("TOTALPIECE").toString();  
75 - content[i][12] = map.get("TOTALWEIGHT").toString();  
76 - content[i][13] = map.get("STOWAGEDATE").toString();  
77 - content[i][14] = map.get("CUSTOMSCODE").toString();  
78 - content[i][15] = map.get("SH_COMPANY").toString();  
79 - content[i][16] = map.get("SH_ADDRESS").toString();  
80 - content[i][17] = map.get("SH_CITY").toString();  
81 - content[i][18] = map.get("SH_COUNTRY").toString();  
82 - content[i][19] = map.get("SH_TELEPHONE").toString();  
83 - content[i][20] = map.get("SH_NAME").toString();  
84 - content[i][21] = map.get("CO_COMPANY").toString();  
85 - content[i][22] = map.get("CO_ADDRESS").toString();  
86 - content[i][23] = map.get("CO_CITY").toString();  
87 - content[i][24] = map.get("CO_COUNTRY").toString();  
88 - content[i][25] = map.get("CO_TELEPHONE").toString();  
89 - content[i][26] = map.get("CO_NAME").toString();  
90 - content[i][27] = map.get("RESPONSE_CODE").toString();  
91 - content[i][28] = map.get("RESPONSE_TEXT").toString();  
92 - content[i][29] = map.get("SHPCUSID").toString();  
93 - content[i][30] = map.get("CNECUSID").toString();  
94 - content[i][31] = map.get("SD_CARGO_NAME").toString();  
95 - content[i][32] = map.get("TWO_TYPE_NAME").toString();  
96 - content[i][33] = map.get("TYPE_NAME").toString();  
97 - content[i][34] = map.get("FOR_SHORT").toString();  
98 - content[i][35] = map.get("FULL_NAME").toString();  
99 - content[i][36] = map.get("THE_SHIPPER_TYPE").toString();  
100 - content[i][37] = map.get("CONTACTS").toString();  
101 - content[i][38] = map.get("PHONE").toString();  
102 -  
103 - }  
104 - //创建HSSFWorkbook  
105 -  
106 - HSSFWorkbook wb = ExcelExportUtil.getHSSFWorkbook(sheetName, title, content, null);  
107 - //响应到客户端  
108 - try {  
109 - this.setResponseHeader(response, fileName);  
110 - OutputStream os = response.getOutputStream();  
111 - wb.write(os);  
112 - os.flush();  
113 - os.close();  
114 - }catch (Exception e){  
115 - e.printStackTrace();  
116 - }  
117 - }  
118 -  
119 -  
120 - //发送响应流方法  
121 - public void setResponseHeader(HttpServletResponse response, String fileName) {  
122 - try {  
123 - try {  
124 - fileName = new String(fileName.getBytes(),"ISO8859-1");  
125 - } catch (UnsupportedEncodingException e) {  
126 - // TODO Auto-generated catch block  
127 - e.printStackTrace();  
128 - }  
129 - response.setContentType("application/octet-stream;charset=ISO8859-1");  
130 - response.setHeader("Content-Disposition", "attachment;filename="+ fileName);  
131 - response.addHeader("Pargam", "no-cache");  
132 - response.addHeader("Cache-Control", "no-cache");  
133 - } catch (Exception ex) {  
134 - ex.printStackTrace();  
135 - }  
136 - }  
137 -  
138 -} 1 +//package com.agent.controller.system;
  2 +//
  3 +//import com.agent.service.system.FilghtDateService;
  4 +//import com.agent.util.ExcelExportUtil;
  5 +//import org.apache.poi.hssf.usermodel.HSSFWorkbook;
  6 +//import org.springframework.beans.factory.annotation.Autowired;
  7 +//import org.springframework.web.bind.annotation.RequestMapping;
  8 +//import org.springframework.web.bind.annotation.ResponseBody;
  9 +//import org.springframework.web.bind.annotation.RestController;
  10 +//
  11 +//import javax.servlet.http.HttpServletRequest;
  12 +//import javax.servlet.http.HttpServletResponse;
  13 +//import java.io.OutputStream;
  14 +//import java.io.UnsupportedEncodingException;
  15 +//import java.util.List;
  16 +//import java.util.Map;
  17 +//
  18 +//@RequestMapping(value = "/filghtdate")
  19 +//@RestController
  20 +//public class FilghtDateController{
  21 +//
  22 +// @Autowired
  23 +// private FilghtDateService filghtDateService;
  24 +//
  25 +// @RequestMapping(value = "/list")
  26 +// public String filghtList(){
  27 +// return "system/user/filghtdateconut";
  28 +// }
  29 +//
  30 +// /**
  31 +// * 航班日期统计 导出excel
  32 +// * @param filghtdate1
  33 +// * @param filghtdate2
  34 +// * @return
  35 +// */
  36 +// @RequestMapping(value = "/filghtCount")
  37 +// @ResponseBody
  38 +// public void filghtcount(HttpServletRequest request, HttpServletResponse response, String filghtdate1, String filghtdate2) {
  39 +//
  40 +// // 获取数据
  41 +// List<Map<String, Object>> filghtcount = filghtDateService.filghtcount(filghtdate1, filghtdate2);
  42 +//
  43 +// //excel标题
  44 +// String[] title = {"运单号", "航空托运人名称", "航空销售代理人名称", "航协编号", "航空公司运输证明", "运输条件鉴定书","承运人",
  45 +// "航班号", "航班日期","航班起始站","航班目的站","运单件数","运单重量","操作时间","关区","预配品名","收货人公司",
  46 +// "收货人地址","收货人城市","收货人国家","收货人电话","收货人名称","发货人名称","发货人地址","发货人城市","发货人国家",
  47 +// "发货人电话","发货人名称","海关回执状态","海关回执信息","发货人编码","收货人编码","货物品名","二级类名称","一级类名称",
  48 +// "代理人三字码","代理人全称","代理人类别","代理联系人","代理联系人电话"};
  49 +//
  50 +// //excel文件名
  51 +// String fileName = "测试" + System.currentTimeMillis() + ".xls";
  52 +// //sheet名
  53 +// String sheetName = "测试统计";
  54 +//
  55 +// String[][] content = new String[0][];
  56 +// /**
  57 +// * 可能空指针异常
  58 +// */
  59 +// for (int i = 0; i < filghtcount.size(); i++) {
  60 +// content = new String[title.length][];
  61 +// Map<String, Object> map = filghtcount.get(i);
  62 +//
  63 +// content[i][0] = map.get("SD_WAYBILL").toString();
  64 +// content[i][1] = map.get("SD_CARGO_SHIPPER_NAME").toString();
  65 +// content[i][2] = map.get("SD_CARGO_AGENT_NAME").toString();
  66 +// content[i][3] = map.get("SD_IATA_NUMBER").toString();
  67 +// content[i][4] = map.get("SD_TRANSPORT_CERTIFICATE").toString();
  68 +// content[i][5] = map.get("SD_TRANSPORTATION_PROVE").toString();
  69 +// content[i][6] = map.get("CARRIER").toString();
  70 +// content[i][7] = map.get("FLIGHTNO").toString();
  71 +// content[i][8] = map.get("FLIGHTDATE").toString();
  72 +// content[i][9] = map.get("ORIGINATINGSTATION").toString();
  73 +// content[i][10] = map.get("DESTINATIONSTATION").toString();
  74 +// content[i][11] = map.get("TOTALPIECE").toString();
  75 +// content[i][12] = map.get("TOTALWEIGHT").toString();
  76 +// content[i][13] = map.get("STOWAGEDATE").toString();
  77 +// content[i][14] = map.get("CUSTOMSCODE").toString();
  78 +// content[i][15] = map.get("SH_COMPANY").toString();
  79 +// content[i][16] = map.get("SH_ADDRESS").toString();
  80 +// content[i][17] = map.get("SH_CITY").toString();
  81 +// content[i][18] = map.get("SH_COUNTRY").toString();
  82 +// content[i][19] = map.get("SH_TELEPHONE").toString();
  83 +// content[i][20] = map.get("SH_NAME").toString();
  84 +// content[i][21] = map.get("CO_COMPANY").toString();
  85 +// content[i][22] = map.get("CO_ADDRESS").toString();
  86 +// content[i][23] = map.get("CO_CITY").toString();
  87 +// content[i][24] = map.get("CO_COUNTRY").toString();
  88 +// content[i][25] = map.get("CO_TELEPHONE").toString();
  89 +// content[i][26] = map.get("CO_NAME").toString();
  90 +// content[i][27] = map.get("RESPONSE_CODE").toString();
  91 +// content[i][28] = map.get("RESPONSE_TEXT").toString();
  92 +// content[i][29] = map.get("SHPCUSID").toString();
  93 +// content[i][30] = map.get("CNECUSID").toString();
  94 +// content[i][31] = map.get("SD_CARGO_NAME").toString();
  95 +// content[i][32] = map.get("TWO_TYPE_NAME").toString();
  96 +// content[i][33] = map.get("TYPE_NAME").toString();
  97 +// content[i][34] = map.get("FOR_SHORT").toString();
  98 +// content[i][35] = map.get("FULL_NAME").toString();
  99 +// content[i][36] = map.get("THE_SHIPPER_TYPE").toString();
  100 +// content[i][37] = map.get("CONTACTS").toString();
  101 +// content[i][38] = map.get("PHONE").toString();
  102 +//
  103 +// }
  104 +// //创建HSSFWorkbook
  105 +//
  106 +// HSSFWorkbook wb = ExcelExportUtil.getHSSFWorkbook(sheetName, title, content, null);
  107 +// //响应到客户端
  108 +// try {
  109 +// this.setResponseHeader(response, fileName);
  110 +// OutputStream os = response.getOutputStream();
  111 +// wb.write(os);
  112 +// os.flush();
  113 +// os.close();
  114 +// }catch (Exception e){
  115 +// e.printStackTrace();
  116 +// }
  117 +// }
  118 +//
  119 +//
  120 +// //发送响应流方法
  121 +// public void setResponseHeader(HttpServletResponse response, String fileName) {
  122 +// try {
  123 +// try {
  124 +// fileName = new String(fileName.getBytes(),"ISO8859-1");
  125 +// } catch (UnsupportedEncodingException e) {
  126 +// // TODO Auto-generated catch block
  127 +// e.printStackTrace();
  128 +// }
  129 +// response.setContentType("application/octet-stream;charset=ISO8859-1");
  130 +// response.setHeader("Content-Disposition", "attachment;filename="+ fileName);
  131 +// response.addHeader("Pargam", "no-cache");
  132 +// response.addHeader("Cache-Control", "no-cache");
  133 +// } catch (Exception ex) {
  134 +// ex.printStackTrace();
  135 +// }
  136 +// }
  137 +//
  138 +//}
1 -package com.agent.repository.system;  
2 -  
3 -import org.springframework.data.jpa.repository.Query;  
4 -  
5 -import java.util.List;  
6 -import java.util.Map;  
7 -  
8 -public interface FilghtDateRepository {  
9 -  
10 -  
11 - @Query(value = "SELECT SD.SD_WAYBILL , SD.SD_CARGO_SHIPPER_NAME , SD.SD_CARGO_AGENT_NAME , SD.SD_IATA_NUMBER , SD.SD_TRANSPORT_CERTIFICATE , SD.SD_TRANSPORTATION_PROVE , MF.CARRIER , MF.FLIGHTNO , MF.FLIGHTDATE , MF.ORIGINATINGSTATION , MF.DESTINATIONSTATION , MF.TOTALPIECE , MF.TOTALWEIGHT , MF.STOWAGEDATE , MF.CUSTOMSCODE , MF.PRODUCTNAME , MF.SH_COMPANY , MF.SH_ADDRESS , MF.SH_CITY , MF.SH_COUNTRY , MF.SH_TELEPHONE , MF.SH_NAME , MF.CO_COMPANY , MF.CO_ADDRESS , MF.CO_CITY , MF.CO_COUNTRY , MF.CO_TELEPHONE , MF.CO_NAME , MF.RESPONSE_CODE , MF.RESPONSE_TEXT , MF.SHPCUSID , MF.CNECUSID , SCN.SD_CARGO_NAME , twoType.TWO_TYPE_NAME , bigType.TYPE_NAME , HSI.FOR_SHORT , HSI.FULL_NAME , HSI.THE_SHIPPER_TYPE , HSI.CONTACTS, HSI.PHONE FROM SECURITY_DECLARATION SD LEFT JOIN MANIFEST MF ON MF.WAYBILLNOMASTER = SD.SD_WAYBILL LEFT JOIN SD_CARGO_NAME SCN ON SCN.SD_WAYBILL = SD.SD_WAYBILL LEFT JOIN SD_TWO_TYPE twoType ON twoType.CARGO_NAME = SCN.SD_CARGO_NAME LEFT JOIN SD_BIG_TYPE bigType on bigType.ID = twoType.BIG_TYPE_ID LEFT JOIN HZ_WAYBILL_INFO HWI ON hwi.WAYBILL_ID = MF.WAYBILLNOMASTER LEFT JOIN HZ_SHIPPER_INFORMATION HSI ON HWI.HZINFOR_ID = HSI.ID WHERE trunc( MF.FLIGHTDATE ) BETWEEN to_date( MF.FLIGHTDATE=?1, 'yyyy-mm-dd' ) AND to_date(MF.FLIGHTDATE=?2,'yyyy-mm-dd') ORDER BY MF.FLIGHTDATE", nativeQuery = true)  
12 - List<Map<String, Object>>filghtdateCount(String filghtdate1, String filghtdate2);  
13 -} 1 +//package com.agent.repository.system;
  2 +//
  3 +//import org.springframework.data.jpa.repository.Query;
  4 +//
  5 +//import java.util.List;
  6 +//import java.util.Map;
  7 +//
  8 +//public interface FilghtDateRepository {
  9 +//
  10 +//
  11 +// @Query(value = "SELECT SD.SD_WAYBILL , SD.SD_CARGO_SHIPPER_NAME , SD.SD_CARGO_AGENT_NAME , SD.SD_IATA_NUMBER , SD.SD_TRANSPORT_CERTIFICATE , SD.SD_TRANSPORTATION_PROVE , MF.CARRIER , MF.FLIGHTNO , MF.FLIGHTDATE , MF.ORIGINATINGSTATION , MF.DESTINATIONSTATION , MF.TOTALPIECE , MF.TOTALWEIGHT , MF.STOWAGEDATE , MF.CUSTOMSCODE , MF.PRODUCTNAME , MF.SH_COMPANY , MF.SH_ADDRESS , MF.SH_CITY , MF.SH_COUNTRY , MF.SH_TELEPHONE , MF.SH_NAME , MF.CO_COMPANY , MF.CO_ADDRESS , MF.CO_CITY , MF.CO_COUNTRY , MF.CO_TELEPHONE , MF.CO_NAME , MF.RESPONSE_CODE , MF.RESPONSE_TEXT , MF.SHPCUSID , MF.CNECUSID , SCN.SD_CARGO_NAME , twoType.TWO_TYPE_NAME , bigType.TYPE_NAME , HSI.FOR_SHORT , HSI.FULL_NAME , HSI.THE_SHIPPER_TYPE , HSI.CONTACTS, HSI.PHONE FROM SECURITY_DECLARATION SD LEFT JOIN MANIFEST MF ON MF.WAYBILLNOMASTER = SD.SD_WAYBILL LEFT JOIN SD_CARGO_NAME SCN ON SCN.SD_WAYBILL = SD.SD_WAYBILL LEFT JOIN SD_TWO_TYPE twoType ON twoType.CARGO_NAME = SCN.SD_CARGO_NAME LEFT JOIN SD_BIG_TYPE bigType on bigType.ID = twoType.BIG_TYPE_ID LEFT JOIN HZ_WAYBILL_INFO HWI ON hwi.WAYBILL_ID = MF.WAYBILLNOMASTER LEFT JOIN HZ_SHIPPER_INFORMATION HSI ON HWI.HZINFOR_ID = HSI.ID WHERE trunc( MF.FLIGHTDATE ) BETWEEN to_date( MF.FLIGHTDATE=?1, 'yyyy-mm-dd' ) AND to_date(MF.FLIGHTDATE=?2,'yyyy-mm-dd') ORDER BY MF.FLIGHTDATE", nativeQuery = true)
  12 +// List<Map<String, Object>>filghtdateCount(String filghtdate1, String filghtdate2);
  13 +//}
1 -package com.agent.service.system;  
2 -  
3 -import com.agent.repository.system.FilghtDateRepository;  
4 -import com.agent.vo.ResponseModel;  
5 -import org.springframework.stereotype.Service;  
6 -  
7 -import javax.annotation.Resource;  
8 -import java.util.List;  
9 -import java.util.Map;  
10 -  
11 -@Service  
12 -public class FilghtDateService {  
13 -  
14 - @Resource  
15 - private FilghtDateRepository filghtDateRepository;  
16 -  
17 - public List<Map<String, Object>> filghtcount(String filghtdate1, String filghtdate2){  
18 -  
19 - return filghtDateRepository.filghtdateCount(filghtdate1, filghtdate2);  
20 -  
21 - }  
22 -  
23 -} 1 +//package com.agent.service.system;
  2 +//
  3 +//import com.agent.repository.system.FilghtDateRepository;
  4 +//import com.agent.vo.ResponseModel;
  5 +//import org.springframework.stereotype.Service;
  6 +//
  7 +//import javax.annotation.Resource;
  8 +//import java.util.List;
  9 +//import java.util.Map;
  10 +//
  11 +//@Service
  12 +//public class FilghtDateService {
  13 +//
  14 +// @Resource
  15 +// private FilghtDateRepository filghtDateRepository;
  16 +//
  17 +// public List<Map<String, Object>> filghtcount(String filghtdate1, String filghtdate2){
  18 +//
  19 +// return filghtDateRepository.filghtdateCount(filghtdate1, filghtdate2);
  20 +//
  21 +// }
  22 +//
  23 +//}
@@ -136,7 +136,7 @@ public class SecurityDeclarationService extends BasicService<SecurityManifestEnt @@ -136,7 +136,7 @@ public class SecurityDeclarationService extends BasicService<SecurityManifestEnt
136 SecurityDeclarationXml sdXml = new SecurityDeclarationXml(); 136 SecurityDeclarationXml sdXml = new SecurityDeclarationXml();
137 sdXml.setCargoAgentName(sdVo.getSd_cargo_agent_name()); 137 sdXml.setCargoAgentName(sdVo.getSd_cargo_agent_name());
138 sdXml.setCargoName(sdVo.getSd_cargo_name()); 138 sdXml.setCargoName(sdVo.getSd_cargo_name());
139 - sdXml.setCargoType(sdVo.getSd_cargo_type().substring(0, sdVo.getSd_cargo_type().length()-1)); 139 + sdXml.setCargoType(sdVo.getSd_cargo_type());
140 sdXml.setShipperName(sdVo.getSd_cargo_shipper_name()); 140 sdXml.setShipperName(sdVo.getSd_cargo_shipper_name());
141 sdXml.setIataNo(sdVo.getSd_iata_number()); 141 sdXml.setIataNo(sdVo.getSd_iata_number());
142 sdXml.setPiece(sdVo.getTotalpiece()); 142 sdXml.setPiece(sdVo.getTotalpiece());
@@ -65,7 +65,7 @@ public class ExcelUtil { @@ -65,7 +65,7 @@ public class ExcelUtil {
65 if (xssfCell == null) { 65 if (xssfCell == null) {
66 rowList.add(""); 66 rowList.add("");
67 } else { 67 } else {
68 - xssfCell.setCellType(Cell.CELL_TYPE_STRING); 68 +// xssfCell.setCellType(Cell.CELL_TYPE_STRING);
69 rowList.add(String.valueOf(xssfCell.getStringCellValue())); 69 rowList.add(String.valueOf(xssfCell.getStringCellValue()));
70 } 70 }
71 } 71 }
@@ -156,7 +156,7 @@ public class ExcelUtil { @@ -156,7 +156,7 @@ public class ExcelUtil {
156 } finally { 156 } finally {
157 try { 157 try {
158 if ( wb != null) { 158 if ( wb != null) {
159 - wb.close(); 159 +// wb.close();
160 } 160 }
161 if (input != null) { 161 if (input != null) {
162 input.close(); 162 input.close();
@@ -132,7 +132,7 @@ public class Excel { @@ -132,7 +132,7 @@ public class Excel {
132 132
133 if (colorMap != null && (colorMap.get(text.toString()) != null)) { 133 if (colorMap != null && (colorMap.get(text.toString()) != null)) {
134 style.setFillForegroundColor((short) colorMap.get(text.toString())); 134 style.setFillForegroundColor((short) colorMap.get(text.toString()));
135 - style.setFillPattern(CellStyle.SOLID_FOREGROUND); 135 +// style.setFillPattern(CellStyle.SOLID_FOREGROUND);
136 } 136 }
137 style.setFont(font); 137 style.setFont(font);
138 cell.setCellStyle(style); 138 cell.setCellStyle(style);
@@ -263,7 +263,7 @@ public class Excel { @@ -263,7 +263,7 @@ public class Excel {
263 style.setFont(font); 263 style.setFont(font);
264 if (colorMap != null && (colorMap.get(text.toString()) != null)) { 264 if (colorMap != null && (colorMap.get(text.toString()) != null)) {
265 style.setFillForegroundColor((short) colorMap.get(text.toString())); 265 style.setFillForegroundColor((short) colorMap.get(text.toString()));
266 - style.setFillPattern(CellStyle.SOLID_FOREGROUND); 266 +// style.setFillPattern(CellStyle.SOLID_FOREGROUND);
267 } 267 }
268 cell.setCellStyle(style); 268 cell.setCellStyle(style);
269 } 269 }
@@ -63,4 +63,5 @@ public class ExcelLogs { @@ -63,4 +63,5 @@ public class ExcelLogs {
63 this.logList = logList; 63 this.logList = logList;
64 } 64 }
65 65
  66 +
66 } 67 }
@@ -358,7 +358,7 @@ public class ExcelUtils { @@ -358,7 +358,7 @@ public class ExcelUtils {
358 style.setFont(font); 358 style.setFont(font);
359 if (colorMap != null && (colorMap.get(text.toString()) != null)) { 359 if (colorMap != null && (colorMap.get(text.toString()) != null)) {
360 style.setFillForegroundColor((short) colorMap.get(text.toString())); 360 style.setFillForegroundColor((short) colorMap.get(text.toString()));
361 - style.setFillPattern(CellStyle.SOLID_FOREGROUND); 361 +// style.setFillPattern(CellStyle.SOLID_FOREGROUND);
362 } 362 }
363 cell.setCellStyle(style); 363 cell.setCellStyle(style);
364 } 364 }
@@ -531,7 +531,7 @@ public class ExcelUtils { @@ -531,7 +531,7 @@ public class ExcelUtils {
531 531
532 if (colorMap != null && (colorMap.get(text.toString()) != null)) { 532 if (colorMap != null && (colorMap.get(text.toString()) != null)) {
533 style.setFillForegroundColor((short) colorMap.get(text.toString())); 533 style.setFillForegroundColor((short) colorMap.get(text.toString()));
534 - style.setFillPattern(CellStyle.SOLID_FOREGROUND); 534 +// style.setFillPattern(CellStyle.SOLID_FOREGROUND);
535 } 535 }
536 style.setFont(font); 536 style.setFont(font);
537 cell.setCellStyle(style); 537 cell.setCellStyle(style);
@@ -1549,7 +1549,7 @@ public class ExcelUtils { @@ -1549,7 +1549,7 @@ public class ExcelUtils {
1549 /** 1549 /**
1550 * 个人加,返回路径 1550 * 个人加,返回路径
1551 * 1551 *
1552 - * @param fileType 1552 +// * @param fileType
1553 * @param headers 1553 * @param headers
1554 * @param excels 1554 * @param excels
1555 * @param request 1555 * @param request
@@ -1867,9 +1867,9 @@ public class ExcelUtils { @@ -1867,9 +1867,9 @@ public class ExcelUtils {
1867 //添加路径 1867 //添加路径
1868 /** 1868 /**
1869 * 1869 *
1870 - * @param filetype 1870 +// * @param filetype
1871 * @param headers 1871 * @param headers
1872 - * @param excelList 1872 +// * @param excelList
1873 * @param request 1873 * @param request
1874 * @param response 1874 * @param response
1875 * @param filename 文件目录 1875 * @param filename 文件目录
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <File name="log" fileName="target/vss.log" append="false"> 10 <File name="log" fileName="target/vss.log" append="false">
11 <PatternLayout pattern="%d{HH:mm:ss} %-5level %class{36} %L %M - %msg%xEx%n" /> 11 <PatternLayout pattern="%d{HH:mm:ss} %-5level %class{36} %L %M - %msg%xEx%n" />
12 </File> 12 </File>
13 - <RollingFile name="RollingFile" fileName="/home/agent/tomcat/logs/agent.log" 13 + <RollingFile name="RollingFile" fileName="logs/agent.log"
14 filePattern="/home/agent/tomcat/logs/$${date:yyyy-MM}/agent-%d{MM-dd-yyyy}-%i.log.gz"> 14 filePattern="/home/agent/tomcat/logs/$${date:yyyy-MM}/agent-%d{MM-dd-yyyy}-%i.log.gz">
15 <PatternLayout 15 <PatternLayout
16 pattern="%d{yyyy.MM.dd 'at' HH:mm:ss z} %-5level %class{36} %L %M - %msg%xEx%n" /> 16 pattern="%d{yyyy.MM.dd 'at' HH:mm:ss z} %-5level %class{36} %L %M - %msg%xEx%n" />
不能预览此文件类型
@@ -60,18 +60,25 @@ @@ -60,18 +60,25 @@
60 </td> 60 </td>
61 61
62 <td class="kv-content"> 62 <td class="kv-content">
63 - <label>  
64 - <input id="one" name="one" type="radio" ${fn:contains(type, 1)?"checked":""} value="1" >普通货物  
65 - </label>  
66 - <label>  
67 - <input id="two" name="one" type="radio" ${fn:contains(type, 2)?"checked":""} value="2">特种货物  
68 - </label>  
69 - <label>  
70 - <input id="three" name="one" type="radio" ${fn:contains(type, 3)?"checked":""} value="3">危险品  
71 - </label>  
72 - <label>  
73 - <input id="four" name="one" type="radio" ${fn:contains(type, 4)?"checked":""} value="4">航空快件  
74 - </label> 63 + <select id="cc" class="easyui-combobox" name="dept" style="width:200px;">
  64 + <option value="A" <c:if test="${'A' eq type}">selected</c:if>>普通货物</option>
  65 + <option value="B" <c:if test="${'B' eq type}">selected</c:if>>特种货物</option>
  66 + <option value="C" <c:if test="${'C' eq type}">selected</c:if>>危险品</option>
  67 + <option value="D" <c:if test="${'D' eq type}">selected</c:if>>航空快件</option>
  68 + <option value="C1" <c:if test="${'C1' eq type}">selected</c:if>>爆炸物</option>
  69 + <option value="C2" <c:if test="${'C2' eq type}">selected</c:if>>压缩气体和液化气体</option>
  70 + <option value="C3" <c:if test="${'C3' eq type}">selected</c:if>>易燃液体</option>
  71 + <option value="C4" <c:if test="${'C4' eq type}">selected</c:if>>易燃固体、自燃物品、遇湿易燃物品</option>
  72 + <option value="C5" <c:if test="${'C5' eq type}">selected</c:if>>氧化物和有机过氧化物</option>
  73 + <option value="C6" <c:if test="${'C6' eq type}">selected</c:if>>毒性物质和感染性物质</option>
  74 + <option value="C7" <c:if test="${'C7' eq type}">selected</c:if>>放射性物质</option>
  75 + <option value="C8" <c:if test="${'C8' eq type}">selected</c:if>>腐蚀品</option>
  76 + <option value="C9" <c:if test="${'C9' eq type}">selected</c:if>>杂项危险品-ELI/RLI：锂离子电池（与设备放于同一包装/已安装于设备中）</option>
  77 + <option value="C10" <c:if test="${'C10' eq type}">selected</c:if>>杂项危险品-ELM/RLM：锂金属电池（与设备放于同一包装/已安装于设备中）</option>
  78 + <option value="C11" <c:if test="${'C11' eq type}">selected</c:if>>杂项危险品-RBI/EBI：锂离子电池</option>
  79 + <option value="C12" <c:if test="${'C12' eq type}">selected</c:if>>杂项危险品-RBM/EBM：锂金属电池</option>
  80 + <option value="C13" <c:if test="${'C13' eq type}">selected</c:if>>杂项危险品-其他杂项危险品</option>
  81 + </select>
75 </td> 82 </td>
76 </tr> 83 </tr>
77 <tr> 84 <tr>
@@ -209,7 +216,7 @@ @@ -209,7 +216,7 @@
209 layer = layui.layer; 216 layer = layui.layer;
210 }); 217 });
211 218
212 - var selectFals = false; 219 + var selectFals = true;
213 function submit(){ 220 function submit(){
214 layerIndex = parent.layer.load(1, { 221 layerIndex = parent.layer.load(1, {
215 shade: [0.6,'#000000'] //0.1透明度 222 shade: [0.6,'#000000'] //0.1透明度
@@ -70,18 +70,37 @@ @@ -70,18 +70,37 @@
70 </td> 70 </td>
71 71
72 <td class="kv-content"> 72 <td class="kv-content">
73 - <label>  
74 - <input id="one" name="one" type="radio" value="1" checked>普通货物  
75 - </label>  
76 - <label>  
77 - <input id="two" name="one" type="radio" value="2">特种货物  
78 - </label>  
79 - <label>  
80 - <input id="three" name="one" type="radio" value="3">危险品  
81 - </label>  
82 - <label>  
83 - <input id="four" name="one" type="radio" value="4">航空快件  
84 - </label> 73 +<%-- <label>--%>
  74 +<%-- <input id="one" name="one" type="radio" value="1" checked>普通货物--%>
  75 +<%-- </label>--%>
  76 +<%-- <label>--%>
  77 +<%-- <input id="two" name="one" type="radio" value="2">特种货物--%>
  78 +<%-- </label>--%>
  79 +<%-- <label>--%>
  80 +<%-- <input id="three" name="one" type="radio" value="3">危险品--%>
  81 +<%-- </label>--%>
  82 +<%-- <label>--%>
  83 +<%-- <input id="four" name="one" type="radio" value="4">航空快件--%>
  84 +<%-- </label>--%>
  85 + <select id="cc" class="easyui-combobox" name="dept" style="width:200px;">
  86 + <option value="A">普通货物</option>
  87 + <option value="B">特种货物</option>
  88 + <option value="C">危险品</option>
  89 + <option value="D">航空快件</option>
  90 + <option value="C1">爆炸物</option>
  91 + <option value="C2">压缩气体和液化气体</option>
  92 + <option value="C3">易燃液体</option>
  93 + <option value="C4">易燃固体、自燃物品、遇湿易燃物品</option>
  94 + <option value="C5">氧化物和有机过氧化物</option>
  95 + <option value="C6">毒性物质和感染性物质</option>
  96 + <option value="C7">放射性物质</option>
  97 + <option value="C8">腐蚀品</option>
  98 + <option value="C9">杂项危险品-ELI/RLI：锂离子电池（与设备放于同一包装/已安装于设备中）</option>
  99 + <option value="C10">杂项危险品-ELM/RLM：锂金属电池（与设备放于同一包装/已安装于设备中）</option>
  100 + <option value="C11">杂项危险品-RBI/EBI：锂离子电池</option>
  101 + <option value="C12">杂项危险品-RBM/EBM：锂金属电池</option>
  102 + <option value="C13">杂项危险品-其他杂项危险品</option>
  103 + </select>
85 </td> 104 </td>
86 </tr> 105 </tr>
87 <tr> 106 <tr>
@@ -233,7 +252,7 @@ @@ -233,7 +252,7 @@
233 }) 252 })
234 } 253 }
235 } 254 }
236 - var selectFals = false; 255 + var selectFals = true;
237 //发送报文并且保存 256 //发送报文并且保存
238 function savesend(){ 257 function savesend(){
239 var isValid = $("#form").valid(); 258 var isValid = $("#form").valid();
@@ -57,10 +57,23 @@ @@ -57,10 +57,23 @@
57 <p><button style="width: 100px; height: 35px" id="sa" onclick="print_page();" href="javascript:void(0);">确定打印</button></p> 57 <p><button style="width: 100px; height: 35px" id="sa" onclick="print_page();" href="javascript:void(0);">确定打印</button></p>
58 <p style="line-height:25pt; margin:0pt 0pt 10pt; orphans:0; widows:0"> 58 <p style="line-height:25pt; margin:0pt 0pt 10pt; orphans:0; widows:0">
59 <span style="font-family:宋体; font-size:12pt">航空货物性质： 59 <span style="font-family:宋体; font-size:12pt">航空货物性质：
60 - 普通货物<input id="one" type="checkbox" name="one" ${fn:contains(type, 1)?"checked":""} value="1">&nbsp;&nbsp;&nbsp;&nbsp;  
61 - 特种货物<input id="two" type="checkbox" name="two" ${fn:contains(type, 2)?"checked":""} value="2">&nbsp;&nbsp;&nbsp;&nbsp;  
62 - 危险品<input id="three" type="checkbox" name="three" ${fn:contains(type, 3)?"checked":""} value="3">&nbsp;&nbsp;&nbsp;&nbsp;  
63 - 航空快件<input id="four" type="checkbox" name="four" ${fn:contains(type, 4)?"checked":""} value="4"> 60 + 普通货物<input id="one" type="checkbox" name="one" ${fn:contains(type, 'A')?"checked":""} value="A">&nbsp;&nbsp;&nbsp;&nbsp;
  61 + 特种货物<input id="two" type="checkbox" name="two" ${fn:contains(type, 'B')?"checked":""} value="B">&nbsp;&nbsp;&nbsp;&nbsp;
  62 + 危险品<input id="three" type="checkbox" name="three" ${fn:contains(type, 'C')?"checked":""}
  63 + ${fn:contains(type, 'C1')?"checked":""}
  64 + ${fn:contains(type, 'C2')?"checked":""}
  65 + ${fn:contains(type, 'C3')?"checked":""}
  66 + ${fn:contains(type, 'C4')?"checked":""}
  67 + ${fn:contains(type, 'C5')?"checked":""}
  68 + ${fn:contains(type, 'C6')?"checked":""}
  69 + ${fn:contains(type, 'C7')?"checked":""}
  70 + ${fn:contains(type, 'C8')?"checked":""}
  71 + ${fn:contains(type, 'C9')?"checked":""}
  72 + ${fn:contains(type, 'C10')?"checked":""}
  73 + ${fn:contains(type, 'C11')?"checked":""}
  74 + ${fn:contains(type, 'C12')?"checked":""}
  75 + ${fn:contains(type, 'C13')?"checked":""}value="C">&nbsp;&nbsp;&nbsp;&nbsp;
  76 + 航空快件<input id="four" type="checkbox" name="four" ${fn:contains(type, 'D')?"checked":""} value="D">
64 </span> 77 </span>
65 </p> 78 </p>
66 <p style="line-height:0pt; margin:0pt 0pt 10pt; orphans:0; widows:0"> 79 <p style="line-height:0pt; margin:0pt 0pt 10pt; orphans:0; widows:0">
@@ -62,18 +62,37 @@ @@ -62,18 +62,37 @@
62 </td> 62 </td>
63 63
64 <td class="kv-content"> 64 <td class="kv-content">
65 - <label>  
66 - <input id="one" name="one" type="radio" value="1" checked>普通货物  
67 - </label>  
68 - <label>  
69 - <input id="two" name="one" type="radio" value="2">特种货物  
70 - </label>  
71 - <label>  
72 - <input id="three" name="one" type="radio" value="3">危险品  
73 - </label>  
74 - <label>  
75 - <input id="four" name="one" type="radio" value="4">航空快件  
76 - </label> 65 +<%-- <label>--%>
  66 +<%-- <input id="one" name="one" type="radio" value="1" checked>普通货物--%>
  67 +<%-- </label>--%>
  68 +<%-- <label>--%>
  69 +<%-- <input id="two" name="one" type="radio" value="2">特种货物--%>
  70 +<%-- </label>--%>
  71 +<%-- <label>--%>
  72 +<%-- <input id="three" name="one" type="radio" value="3">危险品--%>
  73 +<%-- </label>--%>
  74 +<%-- <label>--%>
  75 +<%-- <input id="four" name="one" type="radio" value="4">航空快件--%>
  76 +<%-- </label>--%>
  77 + <select id="cc" class="easyui-combobox" name="dept" style="width:200px;">
  78 + <option value="A">普通货物</option>
  79 + <option value="B">特种货物</option>
  80 + <option value="C">危险品</option>
  81 + <option value="D">航空快件</option>
  82 + <option value="C1">爆炸物</option>
  83 + <option value="C2">压缩气体和液化气体</option>
  84 + <option value="C3">易燃液体</option>
  85 + <option value="C4">易燃固体、自燃物品、遇湿易燃物品</option>
  86 + <option value="C5">氧化物和有机过氧化物</option>
  87 + <option value="C6">毒性物质和感染性物质</option>
  88 + <option value="C7">放射性物质</option>
  89 + <option value="C8">腐蚀品</option>
  90 + <option value="C9">杂项危险品-ELI/RLI：锂离子电池（与设备放于同一包装/已安装于设备中）</option>
  91 + <option value="C10">杂项危险品-ELM/RLM：锂金属电池（与设备放于同一包装/已安装于设备中）</option>
  92 + <option value="C11">杂项危险品-RBI/EBI：锂离子电池</option>
  93 + <option value="C12">杂项危险品-RBM/EBM：锂金属电池</option>
  94 + <option value="C13">杂项危险品-其他杂项危险品</option>
  95 + </select>
77 </td> 96 </td>
78 </tr> 97 </tr>
79 98
@@ -180,7 +199,7 @@ @@ -180,7 +199,7 @@
180 layer = layui.layer; 199 layer = layui.layer;
181 }); 200 });
182 201
183 - var selectFals = false; 202 + var selectFals = true;
184 function submit(){ 203 function submit(){
185 layerIndex = parent.layer.load(1, { 204 layerIndex = parent.layer.load(1, {
186 shade: [0.6,'#000000'] //0.1透明度 205 shade: [0.6,'#000000'] //0.1透明度
@@ -50,8 +50,8 @@ @@ -50,8 +50,8 @@
50 <td class="kcontent"><input type="text" name="search_LIKE_mobile"></td> 50 <td class="kcontent"><input type="text" name="search_LIKE_mobile"></td>
51 <td class="kbutton"> 51 <td class="kbutton">
52 <a href="javascript:doSearch()" class="easyui-linkbutton" iconCls="icon-search" data-options="selected:true"><spring:message code="opt.search" /></a> 52 <a href="javascript:doSearch()" class="easyui-linkbutton" iconCls="icon-search" data-options="selected:true"><spring:message code="opt.search" /></a>
53 - <%-- <a href="javascript:editRow()" class="easyui-linkbutton" style="background:#18A197;color:#FFF;border: 1px solid #18A197;" iconCls="icon-add"><spring:message code="opt.add" /></a>  
54 - <a href="javascript:doDelete()" class="easyui-linkbutton" style="background:red;color:#FFF;border: 1px solid red" iconCls="icon-no"><spring:message code="opt.delete" /></a> --%> 53 + <a href="javascript:editRow()" class="easyui-linkbutton" style="background:#18A197;color:#FFF;border: 1px solid #18A197;" iconCls="icon-add"><spring:message code="opt.add" /></a>
  54 + <a href="javascript:doDelete()" class="easyui-linkbutton" style="background:red;color:#FFF;border: 1px solid red" iconCls="icon-no"><spring:message code="opt.delete" /></a>
55 </td> 55 </td>
56 </tr> 56 </tr>
57 </table> 57 </table>
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <File name="log" fileName="target/vss.log" append="false"> 9 <File name="log" fileName="target/vss.log" append="false">
10 <PatternLayout pattern="%d{HH:mm:ss} %-5level %class{36} %L %M - %msg%xEx%n"/> 10 <PatternLayout pattern="%d{HH:mm:ss} %-5level %class{36} %L %M - %msg%xEx%n"/>
11 </File> 11 </File>
12 - <RollingFile name="RollingFile" fileName="/logs/agent.log" filePattern="/logs/$${date:yyyy-MM}/agent-%d{MM-dd-yyyy}-%i.log.gz"> 12 + <RollingFile name="RollingFile" fileName="logs/agent.log" filePattern="/logs/$${date:yyyy-MM}/agent-%d{MM-dd-yyyy}-%i.log.gz">
13 <PatternLayout pattern="%d{yyyy.MM.dd 'at' HH:mm:ss z} %-5level %class{36} %L %M - %msg%xEx%n"/> 13 <PatternLayout pattern="%d{yyyy.MM.dd 'at' HH:mm:ss z} %-5level %class{36} %L %M - %msg%xEx%n"/>
14 <SizeBasedTriggeringPolicy size="50 MB" /> 14 <SizeBasedTriggeringPolicy size="50 MB" />
15 </RollingFile> 15 </RollingFile>