朱兆平 / agent · 提交

转到一个项目

作者 Kevin
提交 9a2293bc8319a40af209426ba46018fc925e6685 1 个父辈 1ed279b1

6.20日提交，下一步完善收货人和发货人信息

内嵌 并排对比
正在显示 85 个修改的文件 包含 1680 行增加 和 449 行删除
1 package com.agent.controller.agent; 1 package com.agent.controller.agent;
2 2
3 -import com.agent.controller.BasicController;  
4 -import com.agent.entity.agent.BasicAgentEntity;  
5 -import com.agent.service.agent.BasicAgentService;  
6 -import com.agent.service.system.RoleService;  
7 -import com.agent.util.HttpJsonMsg;  
8 -import com.agent.vo.ResponseModel;  
9 -import com.agent.vo.agent.UserVo;  
10 -import com.framework.core.Servlets;  
11 -import com.plugin.easyui.DataGrid;  
12 -import com.plugin.easyui.EasyPage; 3 +import java.util.Map;
  4 +
  5 +import javax.annotation.Resource;
  6 +import javax.servlet.http.HttpServletRequest;
13 7
14 -import org.apache.shiro.authz.annotation.RequiresRoles;  
15 -import org.hibernate.annotations.Source;  
16 import org.slf4j.Logger; 8 import org.slf4j.Logger;
17 import org.slf4j.LoggerFactory; 9 import org.slf4j.LoggerFactory;
18 import org.springframework.stereotype.Controller; 10 import org.springframework.stereotype.Controller;
@@ -21,10 +13,14 @@ import org.springframework.web.bind.annotation.RequestMapping; @@ -21,10 +13,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
21 import org.springframework.web.bind.annotation.RequestMethod; 13 import org.springframework.web.bind.annotation.RequestMethod;
22 import org.springframework.web.bind.annotation.ResponseBody; 14 import org.springframework.web.bind.annotation.ResponseBody;
23 15
24 -import javax.annotation.Resource;  
25 -import javax.servlet.http.HttpServletRequest;  
26 -import java.util.List;  
27 -import java.util.Map; 16 +import com.agent.controller.BasicController;
  17 +import com.agent.entity.agent.BasicAgentEntity;
  18 +import com.agent.service.agent.BasicAgentService;
  19 +import com.agent.util.HttpJsonMsg;
  20 +import com.agent.vo.ResponseModel;
  21 +import com.framework.core.Servlets;
  22 +import com.plugin.easyui.DataGrid;
  23 +import com.plugin.easyui.EasyPage;
28 24
29 /** 25 /**
30 * Created by cohesion on 2017/3/29. 26 * Created by cohesion on 2017/3/29.
@@ -850,7 +850,7 @@ public class ManifestController extends BasicController { @@ -850,7 +850,7 @@ public class ManifestController extends BasicController {
850 WaybillReceiptType type = oldType != null ? WaybillReceiptType.UPDATE : WaybillReceiptType.APPLY; 850 WaybillReceiptType type = oldType != null ? WaybillReceiptType.UPDATE : WaybillReceiptType.APPLY;
851 851
852 String stowagedate = request.getParameter("stowagedate"); 852 String stowagedate = request.getParameter("stowagedate");
853 - manifest.setStowagedate(manifest.getStowagedate(stowagedate)); 853 + manifest.setStowagedate(ManifestEntity.getStowagedate(stowagedate));
854 // 保存 854 // 保存
855 manifest.setIsdelete(1); 855 manifest.setIsdelete(1);
856 manifest.setResponse_code(String.valueOf(type.getValue())); 856 manifest.setResponse_code(String.valueOf(type.getValue()));
@@ -868,21 +868,22 @@ public class ManifestController extends BasicController { @@ -868,21 +868,22 @@ public class ManifestController extends BasicController {
868 String ndlrxml = XmlUtil.convertToXml2(manifestService.sendNDLRXml(manifest), path); 868 String ndlrxml = XmlUtil.convertToXml2(manifestService.sendNDLRXml(manifest), path);
869 String dlcfxml = XmlUtil.convertToXml2(manifestService.sendDLCFXml(manifest), path); 869 String dlcfxml = XmlUtil.convertToXml2(manifestService.sendDLCFXml(manifest), path);
870 String slifxml = XmlUtil.convertToXml(FSXmlKit.sliXml(manifest)); 870 String slifxml = XmlUtil.convertToXml(FSXmlKit.sliXml(manifest));
871 - System.out.println("===================ndlrxml===================");  
872 - System.out.println(ndlrxml);  
873 - System.out.println(); 871 +// System.err.println("===================ndlrxml===================");
  872 +// System.err.println(ndlrxml);
  873 +// System.err.println();
  874 +//
  875 +// System.err.println("===================dlcfxml===================");
  876 +// System.err.println(dlcfxml);
  877 +// System.err.println();
874 878
875 - System.out.println("===================dlcfxml===================");  
876 - System.err.println(dlcfxml);  
877 - System.out.println();  
878 -  
879 - System.out.println("===================slifxml==================="); 879 + System.err.println("===================slifxml===================");
880 System.err.println(slifxml); 880 System.err.println(slifxml);
881 - System.out.println(); 881 + System.err.println();
882 882
883 new RedisSaveMessage().saveMessage(ndlrxml); 883 new RedisSaveMessage().saveMessage(ndlrxml);
884 new RedisSaveMessage().saveMessage(dlcfxml); 884 new RedisSaveMessage().saveMessage(dlcfxml);
885 new RedisSaveMessage().saveMessage(slifxml); 885 new RedisSaveMessage().saveMessage(slifxml);
  886 +
886 model.setStatus(200); 887 model.setStatus(200);
887 model.setMsg(HttpJsonMsg.SUCCESS); 888 model.setMsg(HttpJsonMsg.SUCCESS);
888 } 889 }
@@ -1065,13 +1066,13 @@ public class ManifestController extends BasicController { @@ -1065,13 +1066,13 @@ public class ManifestController extends BasicController {
1065 model.setStatus(200); 1066 model.setStatus(200);
1066 model.setMsg(HttpJsonMsg.SUCCESS); 1067 model.setMsg(HttpJsonMsg.SUCCESS);
1067 1068
1068 - System.out.println("===================ndlrxml===================");  
1069 - System.out.println(ndlrxml);  
1070 - System.out.println();  
1071 -  
1072 - System.out.println("===================dlcfxml===================");  
1073 - System.err.println(dlcfxml);  
1074 - System.out.println(); 1069 +// System.out.println("===================ndlrxml===================");
  1070 +// System.out.println(ndlrxml);
  1071 +// System.out.println();
  1072 +//
  1073 +// System.out.println("===================dlcfxml===================");
  1074 +// System.err.println(dlcfxml);
  1075 +// System.out.println();
1075 1076
1076 System.out.println("===================fhlfxml==================="); 1077 System.out.println("===================fhlfxml===================");
1077 System.err.println(fhlfxml); 1078 System.err.println(fhlfxml);
  1 +package com.agent.controller.agent;
  2 +
  3 +import java.util.List;
  4 +
  5 +import javax.annotation.Resource;
  6 +import javax.servlet.http.HttpServletRequest;
  7 +
  8 +import org.apache.commons.lang3.StringUtils;
  9 +import org.slf4j.Logger;
  10 +import org.slf4j.LoggerFactory;
  11 +import org.springframework.stereotype.Controller;
  12 +import org.springframework.web.bind.annotation.RequestMapping;
  13 +import org.springframework.web.bind.annotation.RequestMethod;
  14 +import org.springframework.web.bind.annotation.ResponseBody;
  15 +
  16 +import com.agent.entity.agent.ManifestEntity;
  17 +import com.agent.entity.agent.PreparesecondaryEntity;
  18 +import com.agent.entity.agent.WaybillReceiprtEntity;
  19 +import com.agent.service.agent.ManifestService;
  20 +import com.agent.service.agent.PreparesecondaryService;
  21 +import com.agent.service.agent.WaybillReceiptService;
  22 +import com.agent.vo.ResponseModel;
  23 +
  24 +import tools.Tools;
  25 +
  26 +/**
  27 + * Depiction:接收IMF服务获取的预配舱单的回执的报文字段，以便更新报文和运单状态
  28 + * <p>
  29 + * Modify:
  30 + * <p>
  31 + * Author: William Lynn
  32 + * <p>
  33 + * Create Date：2018年6月11日 上午10:29:03
  34 + *
  35 + */
  36 +@Controller
  37 +@RequestMapping(value = "/receipt")
  38 +
  39 +public class ReceiptController {
  40 + private static final Logger logger = LoggerFactory.getLogger(ReceiptController.class);
  41 +
  42 + @Resource
  43 + private ManifestService manifestService;
  44 +
  45 + @Resource
  46 + private PreparesecondaryService preparesecondaryService;
  47 +
  48 + @Resource
  49 + private WaybillReceiptService receiptService;
  50 +
  51 + @ResponseBody
  52 + @RequestMapping(value = "/a0608c4054662dd902e1314f7e450e3eaa81c114", method = { RequestMethod.GET })
  53 + public ResponseModel update(String waybillNo, String waybillNoSub, String sendTime, String response_code,
  54 + String response_text, HttpServletRequest reuqest) {
  55 + ResponseModel res = new ResponseModel();
  56 + WaybillReceiprtEntity wre = null;
  57 + if (StringUtils.isNoneBlank(waybillNo) && StringUtils.isBlank(waybillNoSub)) {
  58 + // 主单报文
  59 + List<ManifestEntity> list = manifestService.findByMawbNo(waybillNo);
  60 + if (list != null && list.size() > 0) {
  61 + ManifestEntity bean = list.get(0);
  62 + bean.setResponse_code(response_code);
  63 + bean.setResponse_text(response_text);
  64 + manifestService.save(bean);
  65 +
  66 + wre = new WaybillReceiprtEntity();
  67 + wre.setCarrier(bean.getCarrier());
  68 + wre.setFlightdate(bean.getFlightdate());
  69 + wre.setFlightno(bean.getFlightno());
  70 + wre.setMessage_type("MT2201");
  71 + wre.setResponse_code(response_code);
  72 + wre.setResponse_text(response_text);
  73 + wre.setSendtime(sendTime);
  74 + wre.setWaybill_no(bean.getWaybillnomaster());
  75 + wre.setCreator(Tools.getUserEntity());
  76 + wre.setModifier(Tools.getUserEntity());
  77 + wre.setPiece(bean.getPreparetotalpiece());
  78 + wre.setWeight(bean.getPreparetotalweight());
  79 + receiptService.save(wre);
  80 +
  81 + res.setStatus(200);
  82 + res.setMsg("操作成功");
  83 + } else {
  84 + res.setStatus(404);
  85 + res.setMsg("主单不存在");
  86 + }
  87 + } else if (StringUtils.isNoneBlank(waybillNo) && StringUtils.isNoneBlank(waybillNoSub)) {
  88 + // 分单报文
  89 + List<PreparesecondaryEntity> list = preparesecondaryService.findByMawbNo(waybillNoSub);
  90 + if (list != null && list.size() > 0) {
  91 + PreparesecondaryEntity bean = list.get(0);
  92 + bean.setResponse_code(response_code);
  93 + bean.setResponse_text(response_text);
  94 + preparesecondaryService.save(bean);
  95 +
  96 + wre = new WaybillReceiprtEntity();
  97 + wre.setCarrier(bean.getCarrier());
  98 + wre.setFlightdate(bean.getFlightdate());
  99 + wre.setFlightno(bean.getFlightno());
  100 + wre.setMessage_type("MT2201");
  101 + wre.setResponse_code(response_code);
  102 + wre.setResponse_text(response_text);
  103 + wre.setSendtime(sendTime);
  104 + wre.setWaybill_no(bean.getWaybillnomaster());
  105 + wre.setSub_waybill_no(bean.getWaybillnosecondary());
  106 + wre.setCreator(Tools.getUserEntity());
  107 + wre.setModifier(Tools.getUserEntity());
  108 + wre.setPiece(bean.getPreparepiece());
  109 + wre.setWeight(bean.getPrepareweight());
  110 + receiptService.save(wre);
  111 +
  112 + res.setStatus(200);
  113 + res.setMsg("操作成功");
  114 + } else {
  115 + res.setStatus(404);
  116 + res.setMsg("分单不存在");
  117 + }
  118 + } else {
  119 + // 主单号不能为空
  120 + res.setStatus(404);
  121 + res.setMsg("主单号不能为空");
  122 + return res;
  123 + }
  124 +
  125 + return res;
  126 + }
  127 +}
@@ -230,14 +230,15 @@ @@ -230,14 +230,15 @@
230 230
231 package com.agent.entity.agent; 231 package com.agent.entity.agent;
232 232
233 -import java.text.ParseException;  
234 -import java.text.SimpleDateFormat; 233 +import java.util.Calendar;
235 import java.util.Date; 234 import java.util.Date;
236 235
237 import javax.persistence.Column; 236 import javax.persistence.Column;
238 import javax.persistence.Entity; 237 import javax.persistence.Entity;
239 import javax.persistence.Table; 238 import javax.persistence.Table;
240 239
  240 +import org.apache.commons.lang.StringUtils;
  241 +
241 import com.agent.entity.BasicEntity; 242 import com.agent.entity.BasicEntity;
242 243
243 /** 244 /**
@@ -793,27 +794,33 @@ public class ManifestEntity extends BasicEntity { @@ -793,27 +794,33 @@ public class ManifestEntity extends BasicEntity {
793 } 794 }
794 795
795 public void setStowagedate(Date stowagedate) { 796 public void setStowagedate(Date stowagedate) {
796 - // System.out.println(stowagedate);  
797 -  
798 this.stowagedate = stowagedate; 797 this.stowagedate = stowagedate;
799 - // this.stowagedate = new Date();  
800 } 798 }
801 799
802 public static Date getStowagedate(String datestr) { 800 public static Date getStowagedate(String datestr) {
803 if (datestr == null) 801 if (datestr == null)
804 return null; 802 return null;
805 - String strFormat = "yyyyMMddHHmmss"; 803 +
  804 + Calendar calendar = Calendar.getInstance();
  805 + String year = null;
  806 + String time = null;
806 if (datestr.indexOf(":") < 0) { 807 if (datestr.indexOf(":") < 0) {
807 - strFormat = "yyyy-MM-dd"; 808 + // 只有日期，没有时分秒等时间
  809 + year = datestr.split(" ")[0];
  810 +
  811 + } else {
  812 + year = datestr.split(" ")[0];
  813 + time = datestr.split(" ")[1];
808 } 814 }
809 - SimpleDateFormat sdf = new SimpleDateFormat(strFormat);  
810 - try {  
811 - return sdf.parse(datestr);  
812 - } catch (ParseException e) {  
813 - // TODO Auto-generated catch block  
814 - e.printStackTrace(); 815 +
  816 + String[] years = year.split("-");
  817 + calendar.set(Integer.parseInt(years[0]), Integer.parseInt(years[1]) - 1, Integer.parseInt(years[2]));
  818 + if (StringUtils.isNotBlank(time)) {
  819 + String[] times = time.split(":");
  820 + calendar.set(Integer.parseInt(years[0]), Integer.parseInt(years[1]) - 1, Integer.parseInt(years[2]),
  821 + Integer.parseInt(times[0]), Integer.parseInt(times[1]), Integer.parseInt(times[2]));
815 } 822 }
816 - return null; 823 + return calendar.getTime();
817 } 824 }
818 825
819 @Column(name = "STATUS") 826 @Column(name = "STATUS")
@@ -22,100 +22,94 @@ import com.agent.entity.system.UserEntity; @@ -22,100 +22,94 @@ import com.agent.entity.system.UserEntity;
22 import com.agent.service.system.RoleService; 22 import com.agent.service.system.RoleService;
23 import com.agent.vo.MenuVo; 23 import com.agent.vo.MenuVo;
24 24
25 -public class MyShiroController implements Filter{  
26 - 25 +public class MyShiroController implements Filter {
  26 +
27 @Override 27 @Override
28 public void destroy() { 28 public void destroy() {
29 - // TODO Auto-generated method stub  
30 -  
31 } 29 }
32 - private String publicAction[] = {"/login", "/doLogin", "/manifest/app/send"};  
33 - private String crossDomain[] = {"/cross/","tracking/detail"};  
34 - // manifest/cross/grid.json  
35 - public boolean contains(String action, String acs[]){  
36 - for(int i = 0; i < acs.length; i ++)  
37 - {  
38 - if(action.contains(acs[i])) 30 +
  31 + private String publicAction[] = { "/login", "/doLogin", "/manifest/app/send",
  32 + "/receipt/a0608c4054662dd902e1314f7e450e3eaa81c114" };
  33 + private String crossDomain[] = { "/cross/", "tracking/detail" };
  34 +
  35 + // manifest/cross/grid.json
  36 + public boolean contains(String action, String acs[]) {
  37 + for (int i = 0; i < acs.length; i++) {
  38 + if (action.contains(acs[i]))
39 return true; 39 return true;
40 } 40 }
41 return false; 41 return false;
42 } 42 }
43 - //判断该url是否存在于系统内中的url（只拦截存在于系统中的菜单项）  
44 - public boolean isContaisMenu(String url){  
45 - List<FunctionEntity> list = (List<FunctionEntity>)SecurityUtils.getSubject().getSession().getAttribute("all_function");  
46 - for(int i = 0; i < list.size(); i ++)  
47 - {  
48 - if(url.equals(list.get(i).getUrl())) 43 +
  44 + // 判断该url是否存在于系统内中的url（只拦截存在于系统中的菜单项）
  45 + public boolean isContaisMenu(String url) {
  46 + List<FunctionEntity> list = (List<FunctionEntity>) SecurityUtils.getSubject().getSession()
  47 + .getAttribute("all_function");
  48 + for (int i = 0; i < list.size(); i++) {
  49 + if (url.equals(list.get(i).getUrl()))
49 return true; 50 return true;
50 } 51 }
51 - 52 +
52 return false; 53 return false;
53 } 54 }
  55 +
54 @Override 56 @Override
55 public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain filterChain) 57 public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain filterChain)
56 throws IOException, ServletException { 58 throws IOException, ServletException {
57 - // TODO Auto-generated method stub  
58 -  
59 HttpServletRequest request = (HttpServletRequest) arg0; 59 HttpServletRequest request = (HttpServletRequest) arg0;
60 HttpServletResponse response = (HttpServletResponse) arg1; 60 HttpServletResponse response = (HttpServletResponse) arg1;
61 - String address = "http://"+request.getServerName()+":"+request.getServerPort()+"/"+"statistics"+request.getServletPath(); 61 + String address = "http://" + request.getServerName() + ":" + request.getServerPort() + "/" + "statistics"
  62 + + request.getServletPath();
62 String action = request.getServletPath(); 63 String action = request.getServletPath();
63 - System.out.println("action:"+action);  
64 -  
65 - UserEntity ue = (UserEntity)SecurityUtils.getSubject().getSession().getAttribute("user");  
66 - if(contains(action, publicAction) || action.split("/")[1].equals("resource"))  
67 - { 64 + System.out.println("action:" + action);
  65 +
  66 + UserEntity ue = (UserEntity) SecurityUtils.getSubject().getSession().getAttribute("user");
  67 + if (contains(action, publicAction) || action.split("/")[1].equals("resource")) {
68 filterChain.doFilter(arg0, arg1); 68 filterChain.doFilter(arg0, arg1);
69 return; 69 return;
70 - }  
71 - else if(contains(action, crossDomain)){  
72 - System.out.println("cross："+action);  
73 -// response.setHeader("Access-Control-Allow-Origin", "*");  
74 -// response.setHeader("Access-Control-Allow-Methods", "POST");  
75 -// response.setHeader("Access-Control-Max-Age", "3600");  
76 -// response.setHeader("Access-Control-Allow-Headers", "x-requested-width,Authorization");  
77 -// response.setHeader("Access-Control-Allow-Credetials", "true"); 70 + } else if (contains(action, crossDomain)) {
  71 + System.out.println("cross：" + action);
  72 + // response.setHeader("Access-Control-Allow-Origin", "*");
  73 + // response.setHeader("Access-Control-Allow-Methods", "POST");
  74 + // response.setHeader("Access-Control-Max-Age", "3600");
  75 + // response.setHeader("Access-Control-Allow-Headers",
  76 + // "x-requested-width,Authorization");
  77 + // response.setHeader("Access-Control-Allow-Credetials", "true");
78 filterChain.doFilter(arg0, arg1); 78 filterChain.doFilter(arg0, arg1);
79 return; 79 return;
80 } 80 }
81 - //未登录状态  
82 - if(ue == null)  
83 - { 81 + // 未登录状态
  82 + if (ue == null) {
84 response.sendRedirect("/agent/login"); 83 response.sendRedirect("/agent/login");
85 - }  
86 - else  
87 - { 84 + } else {
88 /// 85 ///
89 RoleEntity role = ue.getRole(); 86 RoleEntity role = ue.getRole();
90 List<MenuVo> list = (List<MenuVo>) SecurityUtils.getSubject().getSession().getAttribute("permission"); 87 List<MenuVo> list = (List<MenuVo>) SecurityUtils.getSubject().getSession().getAttribute("permission");
91 - if(isContaisMenu(action)) //判断用户要访问的url是否存在于系统中(只拦截系统中的url) 88 + if (isContaisMenu(action)) // 判断用户要访问的url是否存在于系统中(只拦截系统中的url)
92 { 89 {
93 - System.out.println("list count:"+list.size());  
94 - //获取当前角色在系统的中url权限列表  
95 - for(int i = 0; i < list.size(); i ++)  
96 - {  
97 - MenuVo pe = (MenuVo)list.get(i);  
98 - //System.out.println("current role list:"+pe.getFirstMenu().getUrl());  
99 - //用户访问的url存在于权限列表中，那么则直接访问  
100 -  
101 - if(pe.getFirstMenu().getUrl().equals(action))  
102 - { 90 + System.out.println("list count:" + list.size());
  91 + // 获取当前角色在系统的中url权限列表
  92 + for (int i = 0; i < list.size(); i++) {
  93 + MenuVo pe = (MenuVo) list.get(i);
  94 + // System.out.println("current role list:"+pe.getFirstMenu().getUrl());
  95 + // 用户访问的url存在于权限列表中，那么则直接访问
  96 +
  97 + if (pe.getFirstMenu().getUrl().equals(action)) {
103 filterChain.doFilter(arg0, arg1); 98 filterChain.doFilter(arg0, arg1);
104 - return ; 99 + return;
105 } 100 }
106 } 101 }
107 response.sendRedirect("/agent/unauthorized"); 102 response.sendRedirect("/agent/unauthorized");
108 return; 103 return;
109 - } //用户访问的不是系统中的url 104 + } // 用户访问的不是系统中的url
110 filterChain.doFilter(arg0, arg1); 105 filterChain.doFilter(arg0, arg1);
111 } 106 }
112 } 107 }
113 - 108 +
114 @Override 109 @Override
115 public void init(FilterConfig arg0) throws ServletException { 110 public void init(FilterConfig arg0) throws ServletException {
116 // TODO Auto-generated method stub 111 // TODO Auto-generated method stub
117 - 112 +
118 } 113 }
119 -  
120 - 114 +
121 } 115 }
1 package com.agent.imf.agent.redis; 1 package com.agent.imf.agent.redis;
2 2
  3 +import org.apache.commons.lang3.StringUtils;
  4 +
3 import redis.clients.jedis.Jedis; 5 import redis.clients.jedis.Jedis;
4 6
5 //缓存数据 7 //缓存数据
6 public class RedisSaveMessage { 8 public class RedisSaveMessage {
7 -  
8 - //创建 缓存服务器的地址ip 9 +
  10 + // 创建 缓存服务器的地址ip
9 Jedis jedis = new Jedis("10.50.3.71", 6379); 11 Jedis jedis = new Jedis("10.50.3.71", 6379);
10 -// Jedis jedis = new Jedis("192.168.0.253", 6379);  
11 - public class JEDIS{  
12 - 12 +
  13 + // Jedis jedis = new Jedis("192.168.0.253", 6379);
  14 + public class JEDIS {
  15 +
13 } 16 }
14 - //存信息  
15 - public void saveMessage(String str){  
16 - jedis.lpush("task-queue", str); 17 +
  18 + // 存信息
  19 + public long saveMessage(String str) {
  20 + if (StringUtils.isEmpty(str)) {
  21 + return -1;
  22 + }
  23 + return jedis.lpush("task-queue", str);
17 } 24 }
18 - 25 +
19 } 26 }
20 -//北环 27 +// 北环
21 // 28 //
@@ -308,7 +308,7 @@ public class ManifestService extends BasicService<ManifestEntity> { @@ -308,7 +308,7 @@ public class ManifestService extends BasicService<ManifestEntity> {
308 // 装载日期 308 // 装载日期
309 ManifestLoadingLocationXml ml = new ManifestLoadingLocationXml(); 309 ManifestLoadingLocationXml ml = new ManifestLoadingLocationXml();
310 ml.setId("CGO/4604"); 310 ml.setId("CGO/4604");
311 - ml.setLoadingdate(new SimpleDateFormat("yyyy-MM-dd hh:mm").format(manifest.getStowagedate())); 311 + ml.setLoadingdate(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(manifest.getStowagedate()));
312 mcs.setLoadinglocation(ml); 312 mcs.setLoadinglocation(ml);
313 313
314 ManifestUnloadingLocationXml mu = new ManifestUnloadingLocationXml(); 314 ManifestUnloadingLocationXml mu = new ManifestUnloadingLocationXml();
@@ -331,7 +331,7 @@ public class ManifestService extends BasicService<ManifestEntity> { @@ -331,7 +331,7 @@ public class ManifestService extends BasicService<ManifestEntity> {
331 331
332 mcs.setProductname(manifest.getProductname()); 332 mcs.setProductname(manifest.getProductname());
333 // 装载日期与预配日期 333 // 装载日期与预配日期
334 - mcs.setPreparetime(new SimpleDateFormat("yyyy-MM-dd hh:mm").format(manifest.getStowagedate())); 334 + mcs.setPreparetime(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(manifest.getStowagedate()));
335 mcs.setCustomscode(manifest.getCustomscode()); 335 mcs.setCustomscode(manifest.getCustomscode());
336 mcs.setAgentname(manifest.getAgentman()); 336 mcs.setAgentname(manifest.getAgentman());
337 mcs.setAgentCompany(manifest.getAgentcompany()); 337 mcs.setAgentCompany(manifest.getAgentcompany());
@@ -340,8 +340,8 @@ public class ManifestService extends BasicService<ManifestEntity> { @@ -340,8 +340,8 @@ public class ManifestService extends BasicService<ManifestEntity> {
340 mcs.setUnnumber(manifest.getUnnumber() != null ? manifest.getUnnumber() : ""); 340 mcs.setUnnumber(manifest.getUnnumber() != null ? manifest.getUnnumber() : "");
341 mcs.setCategory(manifest.getCategory() != null ? manifest.getCategory() : ""); 341 mcs.setCategory(manifest.getCategory() != null ? manifest.getCategory() : "");
342 342
343 - ManifestConsigneeXml mcons = new ManifestConsigneeXml();  
344 - mcons.setName(manifest.getCo_name()); 343 + ManifestConsigneeXml consignee = new ManifestConsigneeXml();
  344 + consignee.setName(manifest.getSh_name());
345 345
346 ManifestAddressXml madd = new ManifestAddressXml(); 346 ManifestAddressXml madd = new ManifestAddressXml();
347 madd.setLine(manifest.getSh_address()); 347 madd.setLine(manifest.getSh_address());
@@ -357,17 +357,17 @@ public class ManifestService extends BasicService<ManifestEntity> { @@ -357,17 +357,17 @@ public class ManifestService extends BasicService<ManifestEntity> {
357 madd.setCnecusid(manifest.getCnecusid() != null ? manifest.getCnecusid() : ""); 357 madd.setCnecusid(manifest.getCnecusid() != null ? manifest.getCnecusid() : "");
358 madd.setUnlodingcode(manifest.getUnlodingcode() != null ? manifest.getUnlodingcode() : ""); 358 madd.setUnlodingcode(manifest.getUnlodingcode() != null ? manifest.getUnlodingcode() : "");
359 359
360 - mcons.setAddress(madd);  
361 - mcs.setConsignee(mcons); 360 + consignee.setAddress(madd);
  361 + mcs.setConsignee(consignee);
362 362
363 - ManifestConsignorXml maci = new ManifestConsignorXml();  
364 - maci.setName(manifest.getSh_name()); 363 + ManifestConsignorXml consigor = new ManifestConsignorXml();
  364 + consigor.setName(manifest.getCo_name());
365 365
366 // 设置发货人货人信息 366 // 设置发货人货人信息
367 ManifestsAddressXml consignorXml = new ManifestsAddressXml(); 367 ManifestsAddressXml consignorXml = new ManifestsAddressXml();
368 consignorXml.setLine(manifest.getCo_address()); 368 consignorXml.setLine(manifest.getCo_address());
369 consignorXml.setCityname(manifest.getCo_city()); 369 consignorXml.setCityname(manifest.getCo_city());
370 - consignorXml.setCountrycode(manifest.getCo_country() != null ? manifest.getSh_country() : ""); 370 + consignorXml.setCountrycode(manifest.getCo_country() != null ? manifest.getCo_country() : "");
371 consignorXml.setZipcode(manifest.getCo_zipcode() != null ? manifest.getCo_zipcode() : ""); 371 consignorXml.setZipcode(manifest.getCo_zipcode() != null ? manifest.getCo_zipcode() : "");
372 consignorXml.setSh_deltaname(manifest.getCo_deltaname() != null ? manifest.getCo_deltaname() : ""); 372 consignorXml.setSh_deltaname(manifest.getCo_deltaname() != null ? manifest.getCo_deltaname() : "");
373 consignorXml.setTelephone(manifest.getCo_telephone() != null ? manifest.getCo_telephone() : ""); 373 consignorXml.setTelephone(manifest.getCo_telephone() != null ? manifest.getCo_telephone() : "");
@@ -375,8 +375,8 @@ public class ManifestService extends BasicService<ManifestEntity> { @@ -375,8 +375,8 @@ public class ManifestService extends BasicService<ManifestEntity> {
375 consignorXml.setShpcusid(manifest.getShpcusid() != null ? manifest.getShpcusid() : ""); 375 consignorXml.setShpcusid(manifest.getShpcusid() != null ? manifest.getShpcusid() : "");
376 consignorXml.setShpaeo(manifest.getShpaeo() != null ? manifest.getShpaeo() : ""); 376 consignorXml.setShpaeo(manifest.getShpaeo() != null ? manifest.getShpaeo() : "");
377 377
378 - maci.setAddress(consignorXml);  
379 - mcs.setConsignor(maci); 378 + consigor.setAddress(consignorXml);
  379 + mcs.setConsignor(consigor);
380 380
381 dec.setConsignment(mcs); 381 dec.setConsignment(mcs);
382 body.setDeclaration(dec); 382 body.setDeclaration(dec);
@@ -485,7 +485,7 @@ public class ManifestService extends BasicService<ManifestEntity> { @@ -485,7 +485,7 @@ public class ManifestService extends BasicService<ManifestEntity> {
485 ManifestLoadingLocationXml ml = new ManifestLoadingLocationXml(); 485 ManifestLoadingLocationXml ml = new ManifestLoadingLocationXml();
486 ml.setId("CGO/4604"); 486 ml.setId("CGO/4604");
487 // ml.setLoadingdate(Constant.dateTimeFormatnumber.format(pre.getStowagedate())); 487 // ml.setLoadingdate(Constant.dateTimeFormatnumber.format(pre.getStowagedate()));
488 - ml.setLoadingdate(new SimpleDateFormat("yyyy-MM-dd hh:mm").format(pre.getStowagedate())); 488 + ml.setLoadingdate(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(pre.getStowagedate()));
489 mcs.setLoadinglocation(ml); 489 mcs.setLoadinglocation(ml);
490 490
491 ManifestUnloadingLocationXml mu = new ManifestUnloadingLocationXml(); 491 ManifestUnloadingLocationXml mu = new ManifestUnloadingLocationXml();
@@ -508,7 +508,7 @@ public class ManifestService extends BasicService<ManifestEntity> { @@ -508,7 +508,7 @@ public class ManifestService extends BasicService<ManifestEntity> {
508 508
509 mcs.setProductname(pre.getProductname()); 509 mcs.setProductname(pre.getProductname());
510 // mcs.setPreparetime(Constant.dateTimeFormatnumber.format(pre.getStowagedate())); 510 // mcs.setPreparetime(Constant.dateTimeFormatnumber.format(pre.getStowagedate()));
511 - mcs.setPreparetime(new SimpleDateFormat("yyyy-MM-dd hh:mm").format(pre.getStowagedate())); 511 + mcs.setPreparetime(new SimpleDateFormat("yyyy-MM-dd HH:mm").format(pre.getStowagedate()));
512 mcs.setCustomscode(pre.getCustomscode()); 512 mcs.setCustomscode(pre.getCustomscode());
513 mcs.setAgentname(pre.getAgentman()); 513 mcs.setAgentname(pre.getAgentman());
514 mcs.setAgentCompany(pre.getAgentcompany()); 514 mcs.setAgentCompany(pre.getAgentcompany());
@@ -917,7 +917,7 @@ public class ManifestService extends BasicService<ManifestEntity> { @@ -917,7 +917,7 @@ public class ManifestService extends BasicService<ManifestEntity> {
917 // 装载日期 917 // 装载日期
918 DeclareLoadingLocationXml ml = new DeclareLoadingLocationXml(); 918 DeclareLoadingLocationXml ml = new DeclareLoadingLocationXml();
919 ml.setId("CGO/4604"); 919 ml.setId("CGO/4604");
920 - ml.setLoadingDate(new SimpleDateFormat("yyyy-MM-dd hh:mm") 920 + ml.setLoadingDate(new SimpleDateFormat("yyyy-MM-dd HH:mm")
921 .format(isManifest ? me.getStowagedate() : pe.getStowagedate())); 921 .format(isManifest ? me.getStowagedate() : pe.getStowagedate()));
922 consignment.setLoadingLocation(ml); 922 consignment.setLoadingLocation(ml);
923 923
@@ -16,6 +16,7 @@ import com.agent.entity.agent.WaybillReceiprtEntity; @@ -16,6 +16,7 @@ import com.agent.entity.agent.WaybillReceiprtEntity;
16 import com.agent.entity.agent.WaybillReceiptType; 16 import com.agent.entity.agent.WaybillReceiptType;
17 import com.agent.repository.agent.WaybillReceiptRepository; 17 import com.agent.repository.agent.WaybillReceiptRepository;
18 import com.agent.service.BasicService; 18 import com.agent.service.BasicService;
  19 +import com.agent.smb.RemoteFileKit;
19 import com.agent.xml.common.XmlUtil; 20 import com.agent.xml.common.XmlUtil;
20 import com.agent.xml.manifestdeclare.DeclareXmlBody; 21 import com.agent.xml.manifestdeclare.DeclareXmlBody;
21 import com.framework.util.CustomMessageKit; 22 import com.framework.util.CustomMessageKit;
@@ -108,17 +109,15 @@ public class WaybillReceiptService extends BasicService<WaybillReceiprtEntity> { @@ -108,17 +109,15 @@ public class WaybillReceiptService extends BasicService<WaybillReceiprtEntity> {
108 wre.setWaybill_no(manifest.getWaybillnomaster()); 109 wre.setWaybill_no(manifest.getWaybillnomaster());
109 wre.setCreator(Tools.getUserEntity()); 110 wre.setCreator(Tools.getUserEntity());
110 wre.setModifier(Tools.getUserEntity()); 111 wre.setModifier(Tools.getUserEntity());
111 - wre.setPiece(manifest.getDe_number());  
112 - wre.setWeight(manifest.getDe_weight()); 112 + wre.setPiece(manifest.getPreparetotalpiece());
  113 + wre.setWeight(manifest.getPreparetotalweight());
113 save(wre); 114 save(wre);
114 115
115 ManifestService mbs = new ManifestService(); 116 ManifestService mbs = new ManifestService();
116 DeclareXmlBody dpxb = mbs.generateWaybillReceiptXml(manifest, type, null); 117 DeclareXmlBody dpxb = mbs.generateWaybillReceiptXml(manifest, type, null);
117 String dpxbPath = CustomMessageKit.getMessagePath(); 118 String dpxbPath = CustomMessageKit.getMessagePath();
118 XmlUtil.convertToXml2(dpxb, dpxbPath); 119 XmlUtil.convertToXml2(dpxb, dpxbPath);
119 - // System.err.println("==================manifest====================");  
120 - // System.err.println(dpxbXml);  
121 - // System.err.println(""); 120 + RemoteFileKit.putFile(dpxbPath);
122 } 121 }
123 } 122 }
124 123
@@ -150,6 +149,7 @@ public class WaybillReceiptService extends BasicService<WaybillReceiprtEntity> { @@ -150,6 +149,7 @@ public class WaybillReceiptService extends BasicService<WaybillReceiprtEntity> {
150 DeclareXmlBody dpxb = mbs.generateWaybillReceiptXml(prepare, type, null); 149 DeclareXmlBody dpxb = mbs.generateWaybillReceiptXml(prepare, type, null);
151 String dpxbPath = CustomMessageKit.getMessagePath(); 150 String dpxbPath = CustomMessageKit.getMessagePath();
152 XmlUtil.convertToXml2(dpxb, dpxbPath); 151 XmlUtil.convertToXml2(dpxb, dpxbPath);
  152 + RemoteFileKit.putFile(dpxbPath);
153 }else { 153 }else {
154 System.err.println("prepare is null"); 154 System.err.println("prepare is null");
155 } 155 }
  1 +package com.agent.smb;
  2 +
  3 +import java.io.BufferedInputStream;
  4 +import java.io.BufferedOutputStream;
  5 +import java.io.File;
  6 +import java.io.FileInputStream;
  7 +import java.io.IOException;
  8 +import java.io.InputStream;
  9 +import java.io.OutputStream;
  10 +
  11 +import com.framework.util.CustomMessageKit;
  12 +
  13 +import jcifs.smb.SmbFile;
  14 +import jcifs.smb.SmbFileOutputStream;
  15 +
  16 +/**
  17 + * Depiction: 网络共享目录文件读写
  18 + * <p>
  19 + * Modify:
  20 + * <p>
  21 + * Author: William Lynn
  22 + * <p>
  23 + * Create Date：2018年6月11日 下午2:51:29
  24 + *
  25 + */
  26 +public class RemoteFileKit {
  27 + private static final String REMOTE_DIR = CustomMessageKit.getMessageSmbRemoteDir();
  28 +
  29 + public RemoteFileKit() {
  30 + }
  31 +
  32 + /**
  33 + *
  34 + * @param localFilePath
  35 + * 本地文件路径
  36 + */
  37 + public static void putFile(String localFilePath) {
  38 + InputStream in = null;
  39 + OutputStream out = null;
  40 + try {
  41 + File localFile = new File(localFilePath);
  42 + String fileName = localFile.getName();
  43 + SmbFile remoteFile = new SmbFile(REMOTE_DIR + "/" + fileName);
  44 + in = new BufferedInputStream(new FileInputStream(localFile));
  45 + out = new BufferedOutputStream(new SmbFileOutputStream(remoteFile));
  46 + byte[] buffer = new byte[1024];
  47 + while (in.read(buffer) != -1) {
  48 + out.write(buffer);
  49 + buffer = new byte[1024];
  50 + }
  51 + } catch (Exception e) {
  52 + e.printStackTrace();
  53 + } finally {
  54 + try {
  55 + if (out != null) {
  56 + out.close();
  57 + }
  58 + if (in != null) {
  59 + in.close();
  60 + }
  61 + } catch (IOException e) {
  62 + e.printStackTrace();
  63 + }
  64 + }
  65 + }
  66 +
  67 +}
@@ -95,8 +95,6 @@ public class XmlUtil { @@ -95,8 +95,6 @@ public class XmlUtil {
95 try { 95 try {
96 in.write(bt, 0, bt.length); 96 in.write(bt, 0, bt.length);
97 in.close(); 97 in.close();
98 - // boolean success=true;  
99 - // System.out.println("写入文件成功");  
100 } catch (IOException e) { 98 } catch (IOException e) {
101 e.printStackTrace(); 99 e.printStackTrace();
102 } 100 }
  1 +package com.agent.xml.fhlsli;
  2 +
  3 +import javax.xml.bind.annotation.XmlAccessType;
  4 +import javax.xml.bind.annotation.XmlAccessorType;
  5 +import javax.xml.bind.annotation.XmlAttribute;
  6 +import javax.xml.bind.annotation.XmlType;
  7 +import javax.xml.bind.annotation.XmlValue;
  8 +
  9 +/**
  10 + * Depiction:
  11 + * <p>
  12 + * Modify:
  13 + * <p>
  14 + * Author: William Lynn
  15 + * <p>
  16 + * Create Date：2018年6月14日 下午6:22:03
  17 + *
  18 + */
  19 +@XmlType
  20 +@XmlAccessorType(XmlAccessType.FIELD)
  21 +public class Dest {
  22 +
  23 + @XmlValue
  24 + private String dest;
  25 + @XmlAttribute(name = "SITA", required = false)
  26 + private String sita;
  27 +
  28 + public Dest() {
  29 + }
  30 +
  31 + public Dest(String dest) {
  32 + this.dest = dest;
  33 + }
  34 +
  35 + public String getDest() {
  36 + return dest;
  37 + }
  38 +
  39 + public void setDest(String dest) {
  40 + this.dest = dest;
  41 + }
  42 +
  43 + public String getSita() {
  44 + return sita;
  45 + }
  46 +
  47 + public void setSita(String sita) {
  48 + this.sita = sita;
  49 + }
  50 +
  51 +}
  1 +package com.agent.xml.fhlsli;
  2 +
  3 +import javax.xml.bind.annotation.XmlAccessType;
  4 +import javax.xml.bind.annotation.XmlAccessorType;
  5 +import javax.xml.bind.annotation.XmlElement;
  6 +import javax.xml.bind.annotation.XmlType;
  7 +
  8 +/**
  9 + * Depiction:
  10 + * <p>
  11 + * Modify:
  12 + * <p>
  13 + * Author: William Lynn
  14 + * <p>
  15 + * Create Date：2018年6月14日 下午6:22:03
  16 + *
  17 + */
  18 +@XmlType
  19 +@XmlAccessorType(XmlAccessType.FIELD)
  20 +public class Dests {
  21 +
  22 + @XmlElement(name = "DEST", required = false)
  23 + private Dest dest;
  24 +
  25 + public Dests() {
  26 + }
  27 +
  28 + public Dest getDest() {
  29 + return dest;
  30 + }
  31 +
  32 + public void setDest(Dest dest) {
  33 + this.dest = dest;
  34 + }
  35 +
  36 +
  37 +}
@@ -10,12 +10,15 @@ import com.agent.entity.agent.PreparesecondaryEntity; @@ -10,12 +10,15 @@ import com.agent.entity.agent.PreparesecondaryEntity;
10 import com.agent.xml.fhlsli.common.ApplicableFreightRateServiceCharge; 10 import com.agent.xml.fhlsli.common.ApplicableFreightRateServiceCharge;
11 import com.agent.xml.fhlsli.common.AssociatedParty; 11 import com.agent.xml.fhlsli.common.AssociatedParty;
12 import com.agent.xml.fhlsli.common.AssociatedReferenceDocument; 12 import com.agent.xml.fhlsli.common.AssociatedReferenceDocument;
  13 +import com.agent.xml.fhlsli.common.ChargeableWeightMeasure;
13 import com.agent.xml.fhlsli.common.ConsigneeParty; 14 import com.agent.xml.fhlsli.common.ConsigneeParty;
14 import com.agent.xml.fhlsli.common.ConsignorParty; 15 import com.agent.xml.fhlsli.common.ConsignorParty;
15 import com.agent.xml.fhlsli.common.FinalDestinationLocation; 16 import com.agent.xml.fhlsli.common.FinalDestinationLocation;
16 import com.agent.xml.fhlsli.common.FreightForwarderParty; 17 import com.agent.xml.fhlsli.common.FreightForwarderParty;
  18 +import com.agent.xml.fhlsli.common.GrossWeightMeasure;
17 import com.agent.xml.fhlsli.common.HandlingInstructions; 19 import com.agent.xml.fhlsli.common.HandlingInstructions;
18 import com.agent.xml.fhlsli.common.IncludedCustomsNote; 20 import com.agent.xml.fhlsli.common.IncludedCustomsNote;
  21 +import com.agent.xml.fhlsli.common.IncludedTareGrossWeightMeasure;
19 import com.agent.xml.fhlsli.common.OriginLocation; 22 import com.agent.xml.fhlsli.common.OriginLocation;
20 import com.agent.xml.fhlsli.common.PostalStructuredAddress; 23 import com.agent.xml.fhlsli.common.PostalStructuredAddress;
21 import com.agent.xml.fhlsli.common.SpecifiedLogisticsTransportMovement; 24 import com.agent.xml.fhlsli.common.SpecifiedLogisticsTransportMovement;
@@ -30,7 +33,9 @@ import com.agent.xml.fhlsli.fhl.IncludedHouseConsignment; @@ -30,7 +33,9 @@ import com.agent.xml.fhlsli.fhl.IncludedHouseConsignment;
30 import com.agent.xml.fhlsli.fhl.IncludedHouseConsignmentItem; 33 import com.agent.xml.fhlsli.fhl.IncludedHouseConsignmentItem;
31 import com.agent.xml.fhlsli.fhl.OperatingParty; 34 import com.agent.xml.fhlsli.fhl.OperatingParty;
32 import com.agent.xml.fhlsli.fhl.OriginCountry; 35 import com.agent.xml.fhlsli.fhl.OriginCountry;
  36 +import com.agent.xml.fhlsli.fhl.TareWeightMeasure;
33 import com.agent.xml.fhlsli.fhl.TransportContractDocument; 37 import com.agent.xml.fhlsli.fhl.TransportContractDocument;
  38 +import com.agent.xml.fhlsli.fhl.WeightTotalChargeAmount;
34 import com.agent.xml.fhlsli.sli.EventTime; 39 import com.agent.xml.fhlsli.sli.EventTime;
35 import com.agent.xml.fhlsli.sli.IncludedMasterConsignmentItem; 40 import com.agent.xml.fhlsli.sli.IncludedMasterConsignmentItem;
36 import com.agent.xml.fhlsli.sli.ReportedStatus; 41 import com.agent.xml.fhlsli.sli.ReportedStatus;
@@ -58,27 +63,42 @@ public class FSXmlKit { @@ -58,27 +63,42 @@ public class FSXmlKit {
58 * 63 *
59 * @param me 64 * @param me
60 */ 65 */
61 - public static SliMsg sliXml(ManifestEntity me) {  
62 - SliMsg msg = new SliMsg(); 66 + public static SliCcs sliXml(ManifestEntity me) {
  67 + SliCcs msg = new SliCcs();
63 68
64 Meta meta = new Meta(); 69 Meta meta = new Meta();
65 meta.setSndr("NDLR"); 70 meta.setSndr("NDLR");
66 meta.setSeqn(me.getWaybillnomaster()); 71 meta.setSeqn(me.getWaybillnomaster());
67 meta.setDttm(Constant.dateTimeFormatnumber.format(new Date())); 72 meta.setDttm(Constant.dateTimeFormatnumber.format(new Date()));
68 meta.setType("SLI"); 73 meta.setType("SLI");
69 - meta.setStype("SLI"); 74 + meta.setStyp("SLI");
70 meta.setRcvr(""); 75 meta.setRcvr("");
  76 + meta.setAck("N");
  77 + meta.setVer("01");
  78 +
  79 + Dests dests = new Dests();
  80 + Dest dest = new Dest();
  81 + dest.setSita("");
  82 + dest.setDest("");
  83 + dests.setDest(dest);
  84 + meta.setDests(dests);
71 85
72 msg.setMeta(meta); 86 msg.setMeta(meta);
73 87
74 - SliDflt dflt = new SliDflt(); 88 + SliMain dflt = new SliMain();
75 SliMasterConsignment sliMasterConsignment = new SliMasterConsignment(); 89 SliMasterConsignment sliMasterConsignment = new SliMasterConsignment();
76 sliMasterConsignment.setID(me.getWaybillnomaster()); 90 sliMasterConsignment.setID(me.getWaybillnomaster());
  91 + sliMasterConsignment.setNilCustomsValueIndicator("true");
  92 + sliMasterConsignment.setNilInsuranceValueIndicator("true");
77 sliMasterConsignment.setDeclaredValueForCarriageAmount(""); 93 sliMasterConsignment.setDeclaredValueForCarriageAmount("");
78 sliMasterConsignment.setInsuranceValueAmount(""); 94 sliMasterConsignment.setInsuranceValueAmount("");
79 sliMasterConsignment.setTotalChargePrepaidIndicator("true"); 95 sliMasterConsignment.setTotalChargePrepaidIndicator("true");
80 sliMasterConsignment.setTotalDisbursementPrepaidIndicator("true"); 96 sliMasterConsignment.setTotalDisbursementPrepaidIndicator("true");
81 - sliMasterConsignment.setIncludedTareGrossWeightMeasure(me.getTotalweight()); 97 +
  98 + IncludedTareGrossWeightMeasure IncludedTareGrossWeightMeasure = new IncludedTareGrossWeightMeasure();
  99 + IncludedTareGrossWeightMeasure.setIncludedTareGrossWeightMeasure(me.getTotalweight());
  100 + IncludedTareGrossWeightMeasure.setUnitCode("KGM");
  101 + sliMasterConsignment.setIncludedTareGrossWeightMeasure(IncludedTareGrossWeightMeasure);
82 sliMasterConsignment.setTotalPieceQuantity(me.getTotalpiece()); 102 sliMasterConsignment.setTotalPieceQuantity(me.getTotalpiece());
83 103
84 ConsignorParty consignorParty = new ConsignorParty(); 104 ConsignorParty consignorParty = new ConsignorParty();
@@ -119,7 +139,8 @@ public class FSXmlKit { @@ -119,7 +139,8 @@ public class FSXmlKit {
119 sliMasterConsignment.setFinalDestinationLocation(destinationLocation); 139 sliMasterConsignment.setFinalDestinationLocation(destinationLocation);
120 140
121 SpecifiedLogisticsTransportMovement transport = new SpecifiedLogisticsTransportMovement(); 141 SpecifiedLogisticsTransportMovement transport = new SpecifiedLogisticsTransportMovement();
122 - transport.setStageCode(me.getCarrier() + me.getFlightno() + "/" + me.getFlightdate()); 142 + transport.setStageCode(
  143 + me.getCarrier() + me.getFlightno() + "/" + Constant.dateFormat.format(me.getFlightdate()));
123 sliMasterConsignment.setSpecifiedLogisticsTransportMovement(transport); 144 sliMasterConsignment.setSpecifiedLogisticsTransportMovement(transport);
124 145
125 HandlingInstructions handlingInstructions = new HandlingInstructions(); 146 HandlingInstructions handlingInstructions = new HandlingInstructions();
@@ -144,7 +165,10 @@ public class FSXmlKit { @@ -144,7 +165,10 @@ public class FSXmlKit {
144 applicableFreightRateServiceCharge.setAppliedAmount(""); 165 applicableFreightRateServiceCharge.setAppliedAmount("");
145 applicableFreightRateServiceCharge.setAppliedRate(""); 166 applicableFreightRateServiceCharge.setAppliedRate("");
146 applicableFreightRateServiceCharge.setCategoryCode(""); 167 applicableFreightRateServiceCharge.setCategoryCode("");
147 - applicableFreightRateServiceCharge.setChargeableWeightMeasure(me.getDe_chweight()); 168 + ChargeableWeightMeasure ChargeableWeightMeasure = new ChargeableWeightMeasure();
  169 + ChargeableWeightMeasure.setChargeableWeightMeasure(me.getDe_chweight());
  170 + ChargeableWeightMeasure.setUnitCode("KGM");
  171 + applicableFreightRateServiceCharge.setChargeableWeightMeasure(ChargeableWeightMeasure);
148 applicableFreightRateServiceCharge.setCommodityItemID(""); 172 applicableFreightRateServiceCharge.setCommodityItemID("");
149 applicableFreightRateServiceCharge.setAppliedRate(""); 173 applicableFreightRateServiceCharge.setAppliedRate("");
150 applicableFreightRateServiceCharge.setAppliedAmount(""); 174 applicableFreightRateServiceCharge.setAppliedAmount("");
@@ -163,7 +187,7 @@ public class FSXmlKit { @@ -163,7 +187,7 @@ public class FSXmlKit {
163 sliMasterConsignment.setReportedStatus(reportedStatus); 187 sliMasterConsignment.setReportedStatus(reportedStatus);
164 188
165 dflt.setSliMasterConsignment(sliMasterConsignment); 189 dflt.setSliMasterConsignment(sliMasterConsignment);
166 - msg.setDFLT(dflt); 190 + msg.setMain(dflt);
167 191
168 // String xml = XmlUtil.convertToXml(msg); 192 // String xml = XmlUtil.convertToXml(msg);
169 // System.err.println(); 193 // System.err.println();
@@ -177,22 +201,33 @@ public class FSXmlKit { @@ -177,22 +201,33 @@ public class FSXmlKit {
177 * 201 *
178 * @param pe 202 * @param pe
179 */ 203 */
180 - public static FhlMsg fhlXml(PreparesecondaryEntity pe) {  
181 - FhlMsg msg = new FhlMsg(); 204 + public static FhlCcs fhlXml(PreparesecondaryEntity pe) {
  205 + FhlCcs msg = new FhlCcs();
182 206
183 Meta meta = new Meta(); 207 Meta meta = new Meta();
184 meta.setSndr("NDLR"); 208 meta.setSndr("NDLR");
185 meta.setSeqn(pe.getWaybillnomaster()); 209 meta.setSeqn(pe.getWaybillnomaster());
186 meta.setDttm(Constant.dateTimeFormatnumber.format(new Date())); 210 meta.setDttm(Constant.dateTimeFormatnumber.format(new Date()));
187 meta.setType("FHL"); 211 meta.setType("FHL");
188 - meta.setStype("FHL"); 212 + meta.setStyp("FHL");
189 meta.setRcvr(""); 213 meta.setRcvr("");
  214 + meta.setAck("N");
  215 + meta.setVer("01");
  216 +
  217 + Dests dests = new Dests();
  218 + Dest dest = new Dest();
  219 + dest.setSita("");
  220 + dest.setDest("");
  221 + dests.setDest(dest);
  222 + meta.setDests(dests);
190 223
191 msg.setMeta(meta); 224 msg.setMeta(meta);
192 225
193 - FhlDflt dflt = new FhlDflt(); 226 + FhlMain dflt = new FhlMain();
194 HouseWaybill houseWaybill = new HouseWaybill(); 227 HouseWaybill houseWaybill = new HouseWaybill();
195 FhlMasterConsignment fhlMasterConsignment = new FhlMasterConsignment(); 228 FhlMasterConsignment fhlMasterConsignment = new FhlMasterConsignment();
  229 + fhlMasterConsignment.setIncludedTareGrossWeightMeasure(pe.getTotalweight());
  230 + fhlMasterConsignment.setTotalPieceQuantity(pe.getTotalpiece());
196 231
197 TransportContractDocument transportContractDocumentMaster = new TransportContractDocument(); 232 TransportContractDocument transportContractDocumentMaster = new TransportContractDocument();
198 transportContractDocumentMaster.setID(pe.getWaybillnomaster()); 233 transportContractDocumentMaster.setID(pe.getWaybillnomaster());
@@ -212,15 +247,25 @@ public class FSXmlKit { @@ -212,15 +247,25 @@ public class FSXmlKit {
212 includedHouseConsignment.setTransportContractDocument(transportContractDocumentSub); 247 includedHouseConsignment.setTransportContractDocument(transportContractDocumentSub);
213 248
214 ConsolidationInformation consolidationInformation = new ConsolidationInformation(); 249 ConsolidationInformation consolidationInformation = new ConsolidationInformation();
215 - consolidationInformation.setGrossWeightMeasure(pe.getPrepareweight()); 250 + GrossWeightMeasure GrossWeightMeasure = new GrossWeightMeasure();
  251 + GrossWeightMeasure.setGrossWeightMeasure(pe.getPrepareweight());
  252 + GrossWeightMeasure.setUnitCode("KGM");
  253 + consolidationInformation.setGrossWeightMeasure(GrossWeightMeasure);
216 consolidationInformation.setPieceQuantity(pe.getPreparepiece()); 254 consolidationInformation.setPieceQuantity(pe.getPreparepiece());
217 includedHouseConsignment.setConsolidationInformation(consolidationInformation); 255 includedHouseConsignment.setConsolidationInformation(consolidationInformation);
218 includedHouseConsignment.setDeclaredValueForCarriageAmount(""); 256 includedHouseConsignment.setDeclaredValueForCarriageAmount("");
219 includedHouseConsignment.setInsuranceValueAmount(""); 257 includedHouseConsignment.setInsuranceValueAmount("");
220 includedHouseConsignment.setTotalChargePrepaidIndicator(""); 258 includedHouseConsignment.setTotalChargePrepaidIndicator("");
221 - includedHouseConsignment.setWeightTotalChargeAmount(pe.getDe_chweight()); 259 +
  260 + WeightTotalChargeAmount WeightTotalChargeAmount = new WeightTotalChargeAmount();
  261 + WeightTotalChargeAmount.setChargeableWeightMeasure(pe.getDe_chweight());
  262 + WeightTotalChargeAmount.setUnitCode("KGM");
  263 + includedHouseConsignment.setWeightTotalChargeAmount(WeightTotalChargeAmount);
222 includedHouseConsignment.setTotalDisbursementPrepaidIndicator(""); 264 includedHouseConsignment.setTotalDisbursementPrepaidIndicator("");
223 - includedHouseConsignment.setIncludedTareGrossWeightMeasure(""); 265 + IncludedTareGrossWeightMeasure IncludedTareGrossWeightMeasure = new IncludedTareGrossWeightMeasure();
  266 + IncludedTareGrossWeightMeasure.setIncludedTareGrossWeightMeasure("");
  267 + IncludedTareGrossWeightMeasure.setUnitCode("KGM");
  268 + includedHouseConsignment.setIncludedTareGrossWeightMeasure(IncludedTareGrossWeightMeasure);
224 includedHouseConsignment.setTotalPieceQuantity(pe.getPreparepiece()); 269 includedHouseConsignment.setTotalPieceQuantity(pe.getPreparepiece());
225 includedHouseConsignment.setSummaryDescription(pe.getProductname()); 270 includedHouseConsignment.setSummaryDescription(pe.getProductname());
226 271
@@ -295,10 +340,17 @@ public class FSXmlKit { @@ -295,10 +340,17 @@ public class FSXmlKit {
295 IncludedHouseConsignmentItem includedHouseConsignmentItem = new IncludedHouseConsignmentItem(); 340 IncludedHouseConsignmentItem includedHouseConsignmentItem = new IncludedHouseConsignmentItem();
296 includedHouseConsignmentItem.setSequenceNumeric(""); 341 includedHouseConsignmentItem.setSequenceNumeric("");
297 includedHouseConsignmentItem.setTypeCode(""); 342 includedHouseConsignmentItem.setTypeCode("");
298 - includedHouseConsignmentItem.setGrossWeightMeasure(pe.getPrepareweight()); 343 + GrossWeightMeasure GrossWeightMeasure_ = new GrossWeightMeasure();
  344 + GrossWeightMeasure_.setGrossWeightMeasure(pe.getPrepareweight());
  345 + GrossWeightMeasure_.setUnitCode("KGM");
  346 + includedHouseConsignmentItem.setGrossWeightMeasure(GrossWeightMeasure_);
299 includedHouseConsignmentItem.setGrossVolumeMeasure(pe.getDe_volume()); 347 includedHouseConsignmentItem.setGrossVolumeMeasure(pe.getDe_volume());
300 includedHouseConsignmentItem.setPieceQuantity(pe.getPreparepiece()); 348 includedHouseConsignmentItem.setPieceQuantity(pe.getPreparepiece());
301 - includedHouseConsignmentItem.setTareWeightMeasure(pe.getTotalweight()); 349 +
  350 + TareWeightMeasure TareWeightMeasure = new TareWeightMeasure();
  351 + TareWeightMeasure.setTareWeightMeasure(pe.getTotalweight());
  352 + TareWeightMeasure.setUnitCode("KGM");
  353 + includedHouseConsignmentItem.setTareWeightMeasure(TareWeightMeasure);
302 354
303 OriginCountry originCountry = new OriginCountry(); 355 OriginCountry originCountry = new OriginCountry();
304 originCountry.setID(pe.getCo_country()); 356 originCountry.setID(pe.getCo_country());
@@ -318,7 +370,10 @@ public class FSXmlKit { @@ -318,7 +370,10 @@ public class FSXmlKit {
318 applicableFreightRateServiceCharge.setAppliedAmount(""); 370 applicableFreightRateServiceCharge.setAppliedAmount("");
319 applicableFreightRateServiceCharge.setAppliedRate(""); 371 applicableFreightRateServiceCharge.setAppliedRate("");
320 applicableFreightRateServiceCharge.setCategoryCode(""); 372 applicableFreightRateServiceCharge.setCategoryCode("");
321 - applicableFreightRateServiceCharge.setChargeableWeightMeasure(pe.getDe_chweight()); 373 + ChargeableWeightMeasure ChargeableWeightMeasure = new ChargeableWeightMeasure();
  374 + ChargeableWeightMeasure.setChargeableWeightMeasure(pe.getDe_chweight());
  375 + ChargeableWeightMeasure.setUnitCode("KGM");
  376 + applicableFreightRateServiceCharge.setChargeableWeightMeasure(ChargeableWeightMeasure);
322 applicableFreightRateServiceCharge.setCommodityItemID(""); 377 applicableFreightRateServiceCharge.setCommodityItemID("");
323 applicableFreightRateServiceCharge.setAppliedRate(""); 378 applicableFreightRateServiceCharge.setAppliedRate("");
324 applicableFreightRateServiceCharge.setAppliedAmount(""); 379 applicableFreightRateServiceCharge.setAppliedAmount("");
@@ -338,7 +393,7 @@ public class FSXmlKit { @@ -338,7 +393,7 @@ public class FSXmlKit {
338 houseWaybill.setMasterConsignment(fhlMasterConsignment); 393 houseWaybill.setMasterConsignment(fhlMasterConsignment);
339 394
340 dflt.setHouseWaybill(houseWaybill); 395 dflt.setHouseWaybill(houseWaybill);
341 - msg.setDFLT(dflt); 396 + msg.setMain(dflt);
342 397
343 // String xml = XmlUtil.convertToXml(msg); 398 // String xml = XmlUtil.convertToXml(msg);
344 // System.err.println(); 399 // System.err.println();
@@ -18,21 +18,21 @@ import javax.xml.bind.annotation.XmlType; @@ -18,21 +18,21 @@ import javax.xml.bind.annotation.XmlType;
18 */ 18 */
19 @XmlType 19 @XmlType
20 @XmlAccessorType(XmlAccessType.FIELD) 20 @XmlAccessorType(XmlAccessType.FIELD)
21 -@XmlRootElement(name = "MSG")  
22 -public class FhlMsg { 21 +@XmlRootElement(name = "CCS")
  22 +public class FhlCcs {
23 23
24 @XmlElement(name = "META", required = false) 24 @XmlElement(name = "META", required = false)
25 private Meta meta; 25 private Meta meta;
26 - @XmlElement(name = "DFLT", required = false)  
27 - private FhlDflt dflt; 26 + @XmlElement(name = "MAIN", required = false)
  27 + private FhlMain main;
28 28
29 - public FhlMsg() { 29 + public FhlCcs() {
30 } 30 }
31 31
32 - public FhlMsg(Meta meta, FhlDflt dflt) { 32 + public FhlCcs(Meta meta, FhlMain main) {
33 super(); 33 super();
34 this.meta = meta; 34 this.meta = meta;
35 - this.dflt = dflt; 35 + this.main = main;
36 } 36 }
37 37
38 public Meta getMeta() { 38 public Meta getMeta() {
@@ -43,12 +43,12 @@ public class FhlMsg { @@ -43,12 +43,12 @@ public class FhlMsg {
43 this.meta = meta; 43 this.meta = meta;
44 } 44 }
45 45
46 - public FhlDflt getDFLT() {  
47 - return dflt; 46 + public FhlMain getMain() {
  47 + return main;
48 } 48 }
49 49
50 - public void setDFLT(FhlDflt dflt) {  
51 - this.dflt = dflt; 50 + public void setMain(FhlMain main) {
  51 + this.main = main;
52 } 52 }
53 53
54 } 54 }
@@ -19,12 +19,12 @@ import com.agent.xml.fhlsli.fhl.HouseWaybill; @@ -19,12 +19,12 @@ import com.agent.xml.fhlsli.fhl.HouseWaybill;
19 */ 19 */
20 @XmlType 20 @XmlType
21 @XmlAccessorType(XmlAccessType.FIELD) 21 @XmlAccessorType(XmlAccessType.FIELD)
22 -public class FhlDflt { 22 +public class FhlMain {
23 23
24 @XmlElement(name = "HouseWaybill", required = false) 24 @XmlElement(name = "HouseWaybill", required = false)
25 private HouseWaybill houseWaybill; 25 private HouseWaybill houseWaybill;
26 26
27 - public FhlDflt() { 27 + public FhlMain() {
28 } 28 }
29 29
30 public HouseWaybill getHouseWaybill() { 30 public HouseWaybill getHouseWaybill() {
@@ -26,12 +26,16 @@ public class Meta { @@ -26,12 +26,16 @@ public class Meta {
26 private String dttm; 26 private String dttm;
27 @XmlElement(name = "TYPE", required = false) 27 @XmlElement(name = "TYPE", required = false)
28 private String type; 28 private String type;
29 - @XmlElement(name = "STYPE", required = false)  
30 - private String stype;  
31 @XmlElement(name = "STYP", required = false) 29 @XmlElement(name = "STYP", required = false)
32 private String styp; 30 private String styp;
33 @XmlElement(name = "RCVR", required = false) 31 @XmlElement(name = "RCVR", required = false)
34 private String rcvr; 32 private String rcvr;
  33 + @XmlElement(name = "ACK", required = false)
  34 + private String ack;
  35 + @XmlElement(name = "VER", required = false)
  36 + private String ver;
  37 + @XmlElement(name = "DESTS", required = false)
  38 + private Dests dests;
35 39
36 public Meta() { 40 public Meta() {
37 } 41 }
@@ -68,14 +72,6 @@ public class Meta { @@ -68,14 +72,6 @@ public class Meta {
68 this.type = type; 72 this.type = type;
69 } 73 }
70 74
71 - public String getStype() {  
72 - return stype;  
73 - }  
74 -  
75 - public void setStype(String stype) {  
76 - this.stype = stype;  
77 - }  
78 -  
79 public String getStyp() { 75 public String getStyp() {
80 return styp; 76 return styp;
81 } 77 }
@@ -92,4 +88,28 @@ public class Meta { @@ -92,4 +88,28 @@ public class Meta {
92 this.rcvr = rcvr; 88 this.rcvr = rcvr;
93 } 89 }
94 90
  91 + public String getAck() {
  92 + return ack;
  93 + }
  94 +
  95 + public void setAck(String ack) {
  96 + this.ack = ack;
  97 + }
  98 +
  99 + public String getVer() {
  100 + return ver;
  101 + }
  102 +
  103 + public void setVer(String ver) {
  104 + this.ver = ver;
  105 + }
  106 +
  107 + public Dests getDests() {
  108 + return dests;
  109 + }
  110 +
  111 + public void setDests(Dests dests) {
  112 + this.dests = dests;
  113 + }
  114 +
95 } 115 }
@@ -18,21 +18,21 @@ import javax.xml.bind.annotation.XmlType; @@ -18,21 +18,21 @@ import javax.xml.bind.annotation.XmlType;
18 */ 18 */
19 @XmlType 19 @XmlType
20 @XmlAccessorType(XmlAccessType.FIELD) 20 @XmlAccessorType(XmlAccessType.FIELD)
21 -@XmlRootElement(name = "MSG")  
22 -public class SliMsg { 21 +@XmlRootElement(name = "CCS")
  22 +public class SliCcs {
23 23
24 @XmlElement(name = "META", required = false) 24 @XmlElement(name = "META", required = false)
25 private Meta meta; 25 private Meta meta;
26 - @XmlElement(name = "DFLT", required = false)  
27 - private SliDflt dflt; 26 + @XmlElement(name = "MAIN", required = false)
  27 + private SliMain main;
28 28
29 - public SliMsg() { 29 + public SliCcs() {
30 } 30 }
31 31
32 - public SliMsg(Meta meta, SliDflt dflt) { 32 + public SliCcs(Meta meta, SliMain main) {
33 super(); 33 super();
34 this.meta = meta; 34 this.meta = meta;
35 - this.dflt = dflt; 35 + this.main = main;
36 } 36 }
37 37
38 public Meta getMeta() { 38 public Meta getMeta() {
@@ -43,12 +43,12 @@ public class SliMsg { @@ -43,12 +43,12 @@ public class SliMsg {
43 this.meta = meta; 43 this.meta = meta;
44 } 44 }
45 45
46 - public SliDflt getDFLT() {  
47 - return dflt; 46 + public SliMain getMain() {
  47 + return main;
48 } 48 }
49 49
50 - public void setDFLT(SliDflt dflt) {  
51 - this.dflt = dflt; 50 + public void setMain(SliMain main) {
  51 + this.main = main;
52 } 52 }
53 53
54 } 54 }
@@ -19,12 +19,12 @@ import com.agent.xml.fhlsli.sli.SliMasterConsignment; @@ -19,12 +19,12 @@ import com.agent.xml.fhlsli.sli.SliMasterConsignment;
19 */ 19 */
20 @XmlType 20 @XmlType
21 @XmlAccessorType(XmlAccessType.FIELD) 21 @XmlAccessorType(XmlAccessType.FIELD)
22 -public class SliDflt { 22 +public class SliMain {
23 23
24 @XmlElement(name = "MasterConsignment", required = false) 24 @XmlElement(name = "MasterConsignment", required = false)
25 private SliMasterConsignment sliMasterConsignment; 25 private SliMasterConsignment sliMasterConsignment;
26 26
27 - public SliDflt() { 27 + public SliMain() {
28 } 28 }
29 29
30 public SliMasterConsignment getSliMasterConsignment() { 30 public SliMasterConsignment getSliMasterConsignment() {
1 package com.agent.xml.fhlsli; 1 package com.agent.xml.fhlsli;
2 2
3 -import java.text.SimpleDateFormat;  
4 import java.util.Date; 3 import java.util.Date;
5 -import java.util.Locale; 4 +
  5 +import com.agent.entity.Constant;
  6 +import com.agent.xml.common.XmlUtil;
  7 +import com.agent.xml.fhlsli.fhl.HouseWaybill;
6 8
7 /** 9 /**
8 * Depiction: 10 * Depiction:
@@ -20,26 +22,35 @@ public class Test { @@ -20,26 +22,35 @@ public class Test {
20 } 22 }
21 23
22 public static void main(String[] args) { 24 public static void main(String[] args) {
23 -// FhlMsg ccs = new FhlMsg();  
24 -//  
25 -// Meta meta = new Meta();  
26 -// meta.setSndr("NDLR");  
27 -// meta.setSeqn("4565432567");  
28 -// meta.setDttm(Constant.dateTimeFormatnumber.format(new Date()));  
29 -// meta.setType("SLI");  
30 -// meta.setStype("SLI");  
31 -// meta.setRcvr("");  
32 -// ccs.setMeta(meta);  
33 -//  
34 -// FhlDflt main = new FhlDflt();  
35 -// HouseWaybill houseWaybill = new HouseWaybill();  
36 -// main.setHouseWaybill(houseWaybill);  
37 -// ccs.setDFLT(main);  
38 -//  
39 -// String xml = XmlUtil.convertToXml(ccs);  
40 -// System.err.println();  
41 - SimpleDateFormat df1 = new SimpleDateFormat ("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.CHINA);  
42 - System.err.println(df1.format(new Date())); 25 + FhlCcs ccs = new FhlCcs();
  26 +
  27 + Meta meta = new Meta();
  28 + meta.setSndr("NDLR");
  29 + meta.setSeqn("4565432567");
  30 + meta.setDttm(Constant.dateTimeFormatnumber.format(new Date()));
  31 + meta.setType("SLI");
  32 + meta.setStyp("SLI");
  33 + meta.setRcvr("");
  34 + meta.setAck("N");
  35 + meta.setVer("01");
  36 +
  37 + Dests dests = new Dests();
  38 + Dest dest = new Dest();
  39 + dest.setSita("111111111");
  40 + dest.setDest("kkkkkkkk");
  41 + dests.setDest(dest);
  42 + meta.setDests(dests);
  43 +
  44 + ccs.setMeta(meta);
  45 +
  46 + FhlMain main = new FhlMain();
  47 + HouseWaybill houseWaybill = new HouseWaybill();
  48 + main.setHouseWaybill(houseWaybill);
  49 + ccs.setMain(main);
  50 +
  51 + String xml = XmlUtil.convertToXml(ccs);
  52 + System.err.println();
  53 + System.err.println(xml);
43 } 54 }
44 55
45 } 56 }
@@ -3,18 +3,30 @@ @@ -3,18 +3,30 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class ApplicableFreightRateServiceCharge { 19 public class ApplicableFreightRateServiceCharge {
13 20
  21 + @XmlElement(name = "CategoryCode",required = false)
14 private String CategoryCode; 22 private String CategoryCode;
  23 + @XmlElement(name = "CommodityItemID",required = false)
15 private String CommodityItemID; 24 private String CommodityItemID;
16 - private String ChargeableWeightMeasure; 25 + @XmlElement(name = "ChargeableWeightMeasure",required = false)
  26 + private ChargeableWeightMeasure ChargeableWeightMeasure;
  27 + @XmlElement(name = "AppliedRate",required = false)
17 private String AppliedRate; 28 private String AppliedRate;
  29 + @XmlElement(name = "AppliedAmount",required = false)
18 private String AppliedAmount; 30 private String AppliedAmount;
19 31
20 public void setCategoryCode(String CategoryCode) { 32 public void setCategoryCode(String CategoryCode) {
@@ -33,11 +45,11 @@ public class ApplicableFreightRateServiceCharge { @@ -33,11 +45,11 @@ public class ApplicableFreightRateServiceCharge {
33 return CommodityItemID; 45 return CommodityItemID;
34 } 46 }
35 47
36 - public void setChargeableWeightMeasure(String ChargeableWeightMeasure) { 48 + public void setChargeableWeightMeasure(ChargeableWeightMeasure ChargeableWeightMeasure) {
37 this.ChargeableWeightMeasure = ChargeableWeightMeasure; 49 this.ChargeableWeightMeasure = ChargeableWeightMeasure;
38 } 50 }
39 51
40 - public String getChargeableWeightMeasure() { 52 + public ChargeableWeightMeasure getChargeableWeightMeasure() {
41 return ChargeableWeightMeasure; 53 return ChargeableWeightMeasure;
42 } 54 }
43 55
@@ -3,15 +3,23 @@ @@ -3,15 +3,23 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class ArrivalEvent { 19 public class ArrivalEvent {
13 - 20 + @XmlElement(name = "ScheduledOccurrenceDateTime",required = false)
14 private String ScheduledOccurrenceDateTime; 21 private String ScheduledOccurrenceDateTime;
  22 + @XmlElement(name = "OccurrenceArrivalLocation",required = false)
15 private OccurrenceArrivalLocation OccurrenceArrivalLocation; 23 private OccurrenceArrivalLocation OccurrenceArrivalLocation;
16 24
17 public void setScheduledOccurrenceDateTime(String ScheduledOccurrenceDateTime) { 25 public void setScheduledOccurrenceDateTime(String ScheduledOccurrenceDateTime) {
@@ -3,6 +3,11 @@ @@ -3,6 +3,11 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 import com.agent.xml.fhlsli.fhl.SpecifiedTaxRegistration; 11 import com.agent.xml.fhlsli.fhl.SpecifiedTaxRegistration;
7 12
8 /** 13 /**
@@ -11,15 +16,25 @@ import com.agent.xml.fhlsli.fhl.SpecifiedTaxRegistration; @@ -11,15 +16,25 @@ import com.agent.xml.fhlsli.fhl.SpecifiedTaxRegistration;
11 * @author bejson.com (i@bejson.com) 16 * @author bejson.com (i@bejson.com)
12 * @website http://www.bejson.com/java2pojo/ 17 * @website http://www.bejson.com/java2pojo/
13 */ 18 */
  19 +@XmlType
  20 +@XmlAccessorType(XmlAccessType.FIELD)
14 public class AssociatedParty { 21 public class AssociatedParty {
15 22
  23 + @XmlElement(name = "PrimaryID",required = false)
16 private String PrimaryID; 24 private String PrimaryID;
  25 + @XmlElement(name = "Name",required = false)
17 private String Name; 26 private String Name;
  27 + @XmlElement(name = "LegalID",required = false)
18 private String LegalID; 28 private String LegalID;
  29 + @XmlElement(name = "RoleCode",required = false)
19 private String RoleCode; 30 private String RoleCode;
  31 + @XmlElement(name = "Role",required = false)
20 private String Role; 32 private String Role;
  33 + @XmlElement(name = "PostalStructuredAddress",required = false)
21 private PostalStructuredAddress PostalStructuredAddress; 34 private PostalStructuredAddress PostalStructuredAddress;
  35 + @XmlElement(name = "DefinedTradeContact",required = false)
22 private DefinedTradeContact DefinedTradeContact; 36 private DefinedTradeContact DefinedTradeContact;
  37 + @XmlElement(name = "SpecifiedTaxRegistration",required = false)
23 private SpecifiedTaxRegistration SpecifiedTaxRegistration; 38 private SpecifiedTaxRegistration SpecifiedTaxRegistration;
24 39
25 public void setPrimaryID(String PrimaryID) { 40 public void setPrimaryID(String PrimaryID) {
@@ -3,17 +3,28 @@ @@ -3,17 +3,28 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class AssociatedReferenceDocument { 19 public class AssociatedReferenceDocument {
13 20
  21 + @XmlElement(name = "ID",required = false)
14 private String ID; 22 private String ID;
  23 + @XmlElement(name = "IssueDateTime",required = false)
15 private String IssueDateTime; 24 private String IssueDateTime;
  25 + @XmlElement(name = "TypeCode",required = false)
16 private String TypeCode; 26 private String TypeCode;
  27 + @XmlElement(name = "Name",required = false)
17 private String Name; 28 private String Name;
18 29
19 public void setID(String ID) { 30 public void setID(String ID) {
  1 +package com.agent.xml.fhlsli.common;
  2 +
  3 +import javax.xml.bind.annotation.XmlAccessType;
  4 +import javax.xml.bind.annotation.XmlAccessorType;
  5 +import javax.xml.bind.annotation.XmlAttribute;
  6 +import javax.xml.bind.annotation.XmlType;
  7 +import javax.xml.bind.annotation.XmlValue;
  8 +
  9 +/**
  10 + * Depiction:
  11 + * <p>
  12 + * Modify:
  13 + * <p>
  14 + * Author: William Lynn
  15 + * <p>
  16 + * Create Date：2018年6月15日 上午11:41:29
  17 + *
  18 + */
  19 +@XmlType
  20 +@XmlAccessorType(XmlAccessType.FIELD)
  21 +public class ChargeableWeightMeasure {
  22 +
  23 + @XmlValue
  24 + private String ChargeableWeightMeasure;
  25 + @XmlAttribute(name = "unitCode", required = false)
  26 + private String unitCode;
  27 +
  28 + public ChargeableWeightMeasure() {
  29 + }
  30 +
  31 + public String getChargeableWeightMeasure() {
  32 + return ChargeableWeightMeasure;
  33 + }
  34 +
  35 + public void setChargeableWeightMeasure(String chargeableWeightMeasure) {
  36 + ChargeableWeightMeasure = chargeableWeightMeasure;
  37 + }
  38 +
  39 + public String getUnitCode() {
  40 + return unitCode;
  41 + }
  42 +
  43 + public void setUnitCode(String unitCode) {
  44 + this.unitCode = unitCode;
  45 + }
  46 +
  47 +}
@@ -3,6 +3,11 @@ @@ -3,6 +3,11 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 import com.agent.xml.fhlsli.fhl.SpecifiedTaxRegistration; 11 import com.agent.xml.fhlsli.fhl.SpecifiedTaxRegistration;
7 12
8 /** 13 /**
@@ -11,14 +16,23 @@ import com.agent.xml.fhlsli.fhl.SpecifiedTaxRegistration; @@ -11,14 +16,23 @@ import com.agent.xml.fhlsli.fhl.SpecifiedTaxRegistration;
11 * @author bejson.com (i@bejson.com) 16 * @author bejson.com (i@bejson.com)
12 * @website http://www.bejson.com/java2pojo/ 17 * @website http://www.bejson.com/java2pojo/
13 */ 18 */
  19 +@XmlType
  20 +@XmlAccessorType(XmlAccessType.FIELD)
14 public class ConsigneeParty { 21 public class ConsigneeParty {
15 22
  23 + @XmlElement(name = "PrimaryID",required = false)
16 private String PrimaryID; 24 private String PrimaryID;
  25 + @XmlElement(name = "Name",required = false)
17 private String Name; 26 private String Name;
  27 + @XmlElement(name = "LegalID",required = false)
18 private String LegalID; 28 private String LegalID;
  29 + @XmlElement(name = "AccountID",required = false)
19 private String AccountID; 30 private String AccountID;
  31 + @XmlElement(name = "PostalStructuredAddress",required = false)
20 private PostalStructuredAddress PostalStructuredAddress; 32 private PostalStructuredAddress PostalStructuredAddress;
  33 + @XmlElement(name = "DefinedTradeContact",required = false)
21 private DefinedTradeContact DefinedTradeContact; 34 private DefinedTradeContact DefinedTradeContact;
  35 + @XmlElement(name = "SpecifiedTaxRegistration",required = false)
22 private SpecifiedTaxRegistration SpecifiedTaxRegistration; 36 private SpecifiedTaxRegistration SpecifiedTaxRegistration;
23 37
24 public void setPrimaryID(String PrimaryID) { 38 public void setPrimaryID(String PrimaryID) {
@@ -3,6 +3,11 @@ @@ -3,6 +3,11 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 import com.agent.xml.fhlsli.fhl.SpecifiedTaxRegistration; 11 import com.agent.xml.fhlsli.fhl.SpecifiedTaxRegistration;
7 12
8 /** 13 /**
@@ -11,15 +16,25 @@ import com.agent.xml.fhlsli.fhl.SpecifiedTaxRegistration; @@ -11,15 +16,25 @@ import com.agent.xml.fhlsli.fhl.SpecifiedTaxRegistration;
11 * @author bejson.com (i@bejson.com) 16 * @author bejson.com (i@bejson.com)
12 * @website http://www.bejson.com/java2pojo/ 17 * @website http://www.bejson.com/java2pojo/
13 */ 18 */
  19 +@XmlType
  20 +@XmlAccessorType(XmlAccessType.FIELD)
14 public class ConsignorParty { 21 public class ConsignorParty {
15 22
  23 + @XmlElement(name = "PrimaryID",required = false)
16 private String PrimaryID; 24 private String PrimaryID;
  25 + @XmlElement(name = "AdditionalID",required = false)
17 private String AdditionalID; 26 private String AdditionalID;
  27 + @XmlElement(name = "Name",required = false)
18 private String Name; 28 private String Name;
  29 + @XmlElement(name = "LegalID",required = false)
19 private String LegalID; 30 private String LegalID;
  31 + @XmlElement(name = "AccountID",required = false)
20 private String AccountID; 32 private String AccountID;
  33 + @XmlElement(name = "PostalStructuredAddress",required = false)
21 private PostalStructuredAddress PostalStructuredAddress; 34 private PostalStructuredAddress PostalStructuredAddress;
  35 + @XmlElement(name = "DefinedTradeContact",required = false)
22 private DefinedTradeContact DefinedTradeContact; 36 private DefinedTradeContact DefinedTradeContact;
  37 + @XmlElement(name = "DefinedTradeContact",required = false)
23 private SpecifiedTaxRegistration SpecifiedTaxRegistration; 38 private SpecifiedTaxRegistration SpecifiedTaxRegistration;
24 39
25 public void setPrimaryID(String PrimaryID) { 40 public void setPrimaryID(String PrimaryID) {
@@ -3,19 +3,32 @@ @@ -3,19 +3,32 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class DefinedTradeContact { 19 public class DefinedTradeContact {
13 20
  21 + @XmlElement(name = "PersonName",required = false)
14 private String PersonName; 22 private String PersonName;
  23 + @XmlElement(name = "DepartmentName",required = false)
15 private String DepartmentName; 24 private String DepartmentName;
  25 + @XmlElement(name = "DirectTelephoneCommunication",required = false)
16 private DirectTelephoneCommunication DirectTelephoneCommunication; 26 private DirectTelephoneCommunication DirectTelephoneCommunication;
  27 + @XmlElement(name = "FaxCommunication",required = false)
17 private FaxCommunication FaxCommunication; 28 private FaxCommunication FaxCommunication;
  29 + @XmlElement(name = "URIEmailCommunication",required = false)
18 private URIEmailCommunication URIEmailCommunication; 30 private URIEmailCommunication URIEmailCommunication;
  31 + @XmlElement(name = "TelexCommunication",required = false)
19 private TelexCommunication TelexCommunication; 32 private TelexCommunication TelexCommunication;
20 33
21 public void setPersonName(String PersonName) { 34 public void setPersonName(String PersonName) {
@@ -3,15 +3,24 @@ @@ -3,15 +3,24 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class DepartureEvent { 19 public class DepartureEvent {
13 20
  21 + @XmlElement(name = "ScheduledOccurrenceDateTime",required = false)
14 private String ScheduledOccurrenceDateTime; 22 private String ScheduledOccurrenceDateTime;
  23 + @XmlElement(name = "OccurrenceDepartureLocation",required = false)
15 private OccurrenceDepartureLocation OccurrenceDepartureLocation; 24 private OccurrenceDepartureLocation OccurrenceDepartureLocation;
16 25
17 public void setScheduledOccurrenceDateTime(String ScheduledOccurrenceDateTime) { 26 public void setScheduledOccurrenceDateTime(String ScheduledOccurrenceDateTime) {
@@ -3,14 +3,22 @@ @@ -3,14 +3,22 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class DirectTelephoneCommunication { 19 public class DirectTelephoneCommunication {
13 20
  21 + @XmlElement(name = "CompleteNumber",required = false)
14 private String CompleteNumber; 22 private String CompleteNumber;
15 23
16 public void setCompleteNumber(String CompleteNumber) { 24 public void setCompleteNumber(String CompleteNumber) {
@@ -3,14 +3,22 @@ @@ -3,14 +3,22 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class FaxCommunication { 19 public class FaxCommunication {
13 20
  21 + @XmlElement(name = "CompleteNumber",required = false)
14 private String CompleteNumber; 22 private String CompleteNumber;
15 23
16 public void setCompleteNumber(String CompleteNumber) { 24 public void setCompleteNumber(String CompleteNumber) {
@@ -3,15 +3,24 @@ @@ -3,15 +3,24 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class FinalDestinationLocation { 19 public class FinalDestinationLocation {
13 20
  21 + @XmlElement(name = "ID",required = false)
14 private String ID; 22 private String ID;
  23 + @XmlElement(name = "Name",required = false)
15 private String Name; 24 private String Name;
16 25
17 public void setID(String ID) { 26 public void setID(String ID) {
@@ -3,6 +3,11 @@ @@ -3,6 +3,11 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 import com.agent.xml.fhlsli.fhl.SpecifiedTaxRegistration; 11 import com.agent.xml.fhlsli.fhl.SpecifiedTaxRegistration;
7 12
8 /** 13 /**
@@ -11,14 +16,23 @@ import com.agent.xml.fhlsli.fhl.SpecifiedTaxRegistration; @@ -11,14 +16,23 @@ import com.agent.xml.fhlsli.fhl.SpecifiedTaxRegistration;
11 * @author bejson.com (i@bejson.com) 16 * @author bejson.com (i@bejson.com)
12 * @website http://www.bejson.com/java2pojo/ 17 * @website http://www.bejson.com/java2pojo/
13 */ 18 */
  19 +@XmlType
  20 +@XmlAccessorType(XmlAccessType.FIELD)
14 public class FreightForwarderParty { 21 public class FreightForwarderParty {
15 22
  23 + @XmlElement(name = "PrimaryID",required = false)
16 private String PrimaryID; 24 private String PrimaryID;
  25 + @XmlElement(name = "Name",required = false)
17 private String Name; 26 private String Name;
  27 + @XmlElement(name = "LegalID",required = false)
18 private String LegalID; 28 private String LegalID;
  29 + @XmlElement(name = "AccountID",required = false)
19 private String AccountID; 30 private String AccountID;
  31 + @XmlElement(name = "PostalStructuredAddress",required = false)
20 private PostalStructuredAddress PostalStructuredAddress; 32 private PostalStructuredAddress PostalStructuredAddress;
  33 + @XmlElement(name = "DefinedTradeContact",required = false)
21 private DefinedTradeContact DefinedTradeContact; 34 private DefinedTradeContact DefinedTradeContact;
  35 + @XmlElement(name = "SpecifiedTaxRegistration",required = false)
22 private SpecifiedTaxRegistration SpecifiedTaxRegistration; 36 private SpecifiedTaxRegistration SpecifiedTaxRegistration;
23 37
24 public void setPrimaryID(String PrimaryID) { 38 public void setPrimaryID(String PrimaryID) {
  1 +package com.agent.xml.fhlsli.common;
  2 +
  3 +import javax.xml.bind.annotation.XmlAccessType;
  4 +import javax.xml.bind.annotation.XmlAccessorType;
  5 +import javax.xml.bind.annotation.XmlAttribute;
  6 +import javax.xml.bind.annotation.XmlType;
  7 +import javax.xml.bind.annotation.XmlValue;
  8 +
  9 +@XmlType
  10 +@XmlAccessorType(XmlAccessType.FIELD)
  11 +public class GrossWeightMeasure {
  12 +
  13 + @XmlValue
  14 + private String GrossWeightMeasure;
  15 + @XmlAttribute(name = "unitCode", required = false)
  16 + private String unitCode;
  17 +
  18 + public GrossWeightMeasure() {
  19 + }
  20 +
  21 + public String getGrossWeightMeasure() {
  22 + return GrossWeightMeasure;
  23 + }
  24 +
  25 + public void setGrossWeightMeasure(String GrossWeightMeasure) {
  26 + this.GrossWeightMeasure = GrossWeightMeasure;
  27 + }
  28 +
  29 + public String getUnitCode() {
  30 + return unitCode;
  31 + }
  32 +
  33 + public void setUnitCode(String unitCode) {
  34 + this.unitCode = unitCode;
  35 + }
  36 +
  37 +}
@@ -3,15 +3,24 @@ @@ -3,15 +3,24 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class HandlingInstructions { 19 public class HandlingInstructions {
13 20
  21 + @XmlElement(name = "Description",required = false)
14 private String Description; 22 private String Description;
  23 + @XmlElement(name = "DescriptionCode",required = false)
15 private String DescriptionCode; 24 private String DescriptionCode;
16 25
17 public void setDescription(String Description) { 26 public void setDescription(String Description) {
@@ -3,17 +3,28 @@ @@ -3,17 +3,28 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class IncludedCustomsNote { 19 public class IncludedCustomsNote {
13 20
  21 + @XmlElement(name = "ContentCode",required = false)
14 private String ContentCode; 22 private String ContentCode;
  23 + @XmlElement(name = "Content",required = false)
15 private String Content; 24 private String Content;
  25 + @XmlElement(name = "SubjectCode",required = false)
16 private String SubjectCode; 26 private String SubjectCode;
  27 + @XmlElement(name = "CountryID",required = false)
17 private String CountryID; 28 private String CountryID;
18 29
19 public void setContentCode(String ContentCode) { 30 public void setContentCode(String ContentCode) {
  1 +package com.agent.xml.fhlsli.common;
  2 +
  3 +import javax.xml.bind.annotation.XmlAccessType;
  4 +import javax.xml.bind.annotation.XmlAccessorType;
  5 +import javax.xml.bind.annotation.XmlAttribute;
  6 +import javax.xml.bind.annotation.XmlType;
  7 +import javax.xml.bind.annotation.XmlValue;
  8 +
  9 +@XmlType
  10 +@XmlAccessorType(XmlAccessType.FIELD)
  11 +public class IncludedTareGrossWeightMeasure {
  12 +
  13 + @XmlValue
  14 + private String IncludedTareGrossWeightMeasure;
  15 + @XmlAttribute(name = "unitCode", required = false)
  16 + private String unitCode;
  17 +
  18 + public IncludedTareGrossWeightMeasure() {
  19 + }
  20 +
  21 + public String getIncludedTareGrossWeightMeasure() {
  22 + return IncludedTareGrossWeightMeasure;
  23 + }
  24 +
  25 + public void setIncludedTareGrossWeightMeasure(String includedTareGrossWeightMeasure) {
  26 + IncludedTareGrossWeightMeasure = includedTareGrossWeightMeasure;
  27 + }
  28 +
  29 + public String getUnitCode() {
  30 + return unitCode;
  31 + }
  32 +
  33 + public void setUnitCode(String unitCode) {
  34 + this.unitCode = unitCode;
  35 + }
  36 +
  37 +}
@@ -3,17 +3,28 @@ @@ -3,17 +3,28 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class LinearSpatialDimension { 19 public class LinearSpatialDimension {
13 20
  21 + @XmlElement(name = "Description",required = false)
14 private String Description; 22 private String Description;
  23 + @XmlElement(name = "WidthMeasure",required = false)
15 private String WidthMeasure; 24 private String WidthMeasure;
  25 + @XmlElement(name = "LengthMeasure",required = false)
16 private String LengthMeasure; 26 private String LengthMeasure;
  27 + @XmlElement(name = "HeightMeasure",required = false)
17 private String HeightMeasure; 28 private String HeightMeasure;
18 29
19 public void setDescription(String Description) { 30 public void setDescription(String Description) {
@@ -3,15 +3,24 @@ @@ -3,15 +3,24 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:41:30 12 * Auto-generated: 2018-06-09 15:41:30
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class NatureIdentificationTransportCargo { 19 public class NatureIdentificationTransportCargo {
13 20
  21 + @XmlElement(name = "Identification",required = false)
14 private String Identification; 22 private String Identification;
  23 + @XmlElement(name = "ExtraIdentification",required = false)
15 private String ExtraIdentification; 24 private String ExtraIdentification;
16 25
17 public void setIdentification(String Identification) { 26 public void setIdentification(String Identification) {
@@ -3,16 +3,26 @@ @@ -3,16 +3,26 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class OccurrenceArrivalLocation { 19 public class OccurrenceArrivalLocation {
13 20
  21 + @XmlElement(name = "ID",required = false)
14 private String ID; 22 private String ID;
  23 + @XmlElement(name = "Name",required = false)
15 private String Name; 24 private String Name;
  25 + @XmlElement(name = "TypeCode",required = false)
16 private String TypeCode; 26 private String TypeCode;
17 27
18 public void setID(String ID) { 28 public void setID(String ID) {
@@ -3,16 +3,26 @@ @@ -3,16 +3,26 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class OccurrenceDepartureLocation { 19 public class OccurrenceDepartureLocation {
13 20
  21 + @XmlElement(name = "ID",required = false)
14 private String ID; 22 private String ID;
  23 + @XmlElement(name = "Name",required = false)
15 private String Name; 24 private String Name;
  25 + @XmlElement(name = "TypeCode",required = false)
16 private String TypeCode; 26 private String TypeCode;
17 27
18 public void setID(String ID) { 28 public void setID(String ID) {
@@ -3,15 +3,24 @@ @@ -3,15 +3,24 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class OriginLocation { 19 public class OriginLocation {
13 20
  21 + @XmlElement(name = "ID",required = false)
14 private String ID; 22 private String ID;
  23 + @XmlElement(name = "Name",required = false)
15 private String Name; 24 private String Name;
16 25
17 public void setID(String ID) { 26 public void setID(String ID) {
@@ -3,6 +3,11 @@ @@ -3,6 +3,11 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 import com.agent.xml.fhlsli.fhl.SpecifiedAddressLocation; 11 import com.agent.xml.fhlsli.fhl.SpecifiedAddressLocation;
7 12
8 /** 13 /**
@@ -11,17 +16,29 @@ import com.agent.xml.fhlsli.fhl.SpecifiedAddressLocation; @@ -11,17 +16,29 @@ import com.agent.xml.fhlsli.fhl.SpecifiedAddressLocation;
11 * @author bejson.com (i@bejson.com) 16 * @author bejson.com (i@bejson.com)
12 * @website http://www.bejson.com/java2pojo/ 17 * @website http://www.bejson.com/java2pojo/
13 */ 18 */
  19 +@XmlType
  20 +@XmlAccessorType(XmlAccessType.FIELD)
14 public class PostalStructuredAddress { 21 public class PostalStructuredAddress {
15 22
  23 + @XmlElement(name = "PostcodeCode",required = false)
16 private String PostcodeCode; 24 private String PostcodeCode;
  25 + @XmlElement(name = "StreetName",required = false)
17 private String StreetName; 26 private String StreetName;
  27 + @XmlElement(name = "CityName",required = false)
18 private String CityName; 28 private String CityName;
  29 + @XmlElement(name = "CountryID",required = false)
19 private String CountryID; 30 private String CountryID;
  31 + @XmlElement(name = "CountryName",required = false)
20 private String CountryName; 32 private String CountryName;
  33 + @XmlElement(name = "CountrySubDivisionName",required = false)
21 private String CountrySubDivisionName; 34 private String CountrySubDivisionName;
  35 + @XmlElement(name = "PostOfficeBox",required = false)
22 private String PostOfficeBox; 36 private String PostOfficeBox;
  37 + @XmlElement(name = "CityID",required = false)
23 private String CityID; 38 private String CityID;
  39 + @XmlElement(name = "CountrySubDivisionID",required = false)
24 private String CountrySubDivisionID; 40 private String CountrySubDivisionID;
  41 + @XmlElement(name = "SpecifiedAddressLocation",required = false)
25 private SpecifiedAddressLocation SpecifiedAddressLocation; 42 private SpecifiedAddressLocation SpecifiedAddressLocation;
26 43
27 public void setPostcodeCode(String PostcodeCode) { 44 public void setPostcodeCode(String PostcodeCode) {
@@ -3,21 +3,36 @@ @@ -3,21 +3,36 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class SpecifiedLogisticsTransportMovement { 19 public class SpecifiedLogisticsTransportMovement {
13 20
  21 + @XmlElement(name = "StageCode",required = false)
14 private String StageCode; 22 private String StageCode;
  23 + @XmlElement(name = "ModeCode",required = false)
15 private String ModeCode; 24 private String ModeCode;
  25 + @XmlElement(name = "Mode",required = false)
16 private String Mode; 26 private String Mode;
  27 + @XmlElement(name = "ID",required = false)
17 private String ID; 28 private String ID;
  29 + @XmlElement(name = "SequenceNumeric",required = false)
18 private String SequenceNumeric; 30 private String SequenceNumeric;
  31 + @XmlElement(name = "UsedLogisticsTransportMeans",required = false)
19 private UsedLogisticsTransportMeans UsedLogisticsTransportMeans; 32 private UsedLogisticsTransportMeans UsedLogisticsTransportMeans;
  33 + @XmlElement(name = "ArrivalEvent",required = false)
20 private ArrivalEvent ArrivalEvent; 34 private ArrivalEvent ArrivalEvent;
  35 + @XmlElement(name = "DepartureEvent",required = false)
21 private DepartureEvent DepartureEvent; 36 private DepartureEvent DepartureEvent;
22 37
23 public void setStageCode(String StageCode) { 38 public void setStageCode(String StageCode) {
@@ -3,14 +3,22 @@ @@ -3,14 +3,22 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class TelexCommunication { 19 public class TelexCommunication {
13 20
  21 + @XmlElement(name = "CompleteNumber",required = false)
14 private String CompleteNumber; 22 private String CompleteNumber;
15 23
16 public void setCompleteNumber(String CompleteNumber) { 24 public void setCompleteNumber(String CompleteNumber) {
@@ -3,15 +3,24 @@ @@ -3,15 +3,24 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class TransportLogisticsPackage { 19 public class TransportLogisticsPackage {
13 20
  21 + @XmlElement(name = "ItemQuantity",required = false)
14 private String ItemQuantity; 22 private String ItemQuantity;
  23 + @XmlElement(name = "LinearSpatialDimension",required = false)
15 private LinearSpatialDimension LinearSpatialDimension; 24 private LinearSpatialDimension LinearSpatialDimension;
16 25
17 public void setItemQuantity(String ItemQuantity) { 26 public void setItemQuantity(String ItemQuantity) {
@@ -3,14 +3,22 @@ @@ -3,14 +3,22 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class URIEmailCommunication { 19 public class URIEmailCommunication {
13 20
  21 + @XmlElement(name = "URIID",required = false)
14 private String URIID; 22 private String URIID;
15 23
16 public void setURIID(String URIID) { 24 public void setURIID(String URIID) {
@@ -3,14 +3,22 @@ @@ -3,14 +3,22 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.common; 4 package com.agent.xml.fhlsli.common;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class UsedLogisticsTransportMeans { 19 public class UsedLogisticsTransportMeans {
13 20
  21 + @XmlElement(name = "Name",required = false)
14 private String Name; 22 private String Name;
15 23
16 public void setName(String Name) { 24 public void setName(String Name) {
@@ -3,14 +3,22 @@ @@ -3,14 +3,22 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class AffixedLogisticsSeal { 19 public class AffixedLogisticsSeal {
13 20
  21 + @XmlElement(name = "ID",required = false)
14 private String ID; 22 private String ID;
15 23
16 public void setID(String ID) { 24 public void setID(String ID) {
@@ -3,17 +3,28 @@ @@ -3,17 +3,28 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class ApplicableLogisticsAllowanceCharge { 19 public class ApplicableLogisticsAllowanceCharge {
13 20
  21 + @XmlElement(name = "ID",required = false)
14 private String ID; 22 private String ID;
  23 + @XmlElement(name = "Reason",required = false)
15 private String Reason; 24 private String Reason;
  25 + @XmlElement(name = "ActualAmount",required = false)
16 private String ActualAmount; 26 private String ActualAmount;
  27 + @XmlElement(name = "PartyTypeCode",required = false)
17 private String PartyTypeCode; 28 private String PartyTypeCode;
18 29
19 public void setID(String ID) { 30 public void setID(String ID) {
@@ -3,14 +3,22 @@ @@ -3,14 +3,22 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class ApplicableLogisticsServiceCharge { 19 public class ApplicableLogisticsServiceCharge {
13 20
  21 + @XmlElement(name = "ServiceTypeCode",required = false)
14 private String ServiceTypeCode; 22 private String ServiceTypeCode;
15 23
16 public void setServiceTypeCode(String ServiceTypeCode) { 24 public void setServiceTypeCode(String ServiceTypeCode) {
@@ -3,17 +3,28 @@ @@ -3,17 +3,28 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class ApplicableTradeCurrencyExchange { 19 public class ApplicableTradeCurrencyExchange {
13 20
  21 + @XmlElement(name = "SourceCurrencyCode",required = false)
14 private String SourceCurrencyCode; 22 private String SourceCurrencyCode;
  23 + @XmlElement(name = "TargetCurrencyCode",required = false)
15 private String TargetCurrencyCode; 24 private String TargetCurrencyCode;
  25 + @XmlElement(name = "MarketID",required = false)
16 private String MarketID; 26 private String MarketID;
  27 + @XmlElement(name = "ConversionRate",required = false)
17 private String ConversionRate; 28 private String ConversionRate;
18 29
19 public void setSourceCurrencyCode(String SourceCurrencyCode) { 30 public void setSourceCurrencyCode(String SourceCurrencyCode) {
@@ -3,14 +3,22 @@ @@ -3,14 +3,22 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class ApplicableTransportCargoInsurance { 19 public class ApplicableTransportCargoInsurance {
13 20
  21 + @XmlElement(name = "CoverageInsuranceParty",required = false)
14 private CoverageInsuranceParty CoverageInsuranceParty; 22 private CoverageInsuranceParty CoverageInsuranceParty;
15 23
16 public void setCoverageInsuranceParty(CoverageInsuranceParty CoverageInsuranceParty) { 24 public void setCoverageInsuranceParty(CoverageInsuranceParty CoverageInsuranceParty) {
@@ -3,14 +3,22 @@ @@ -3,14 +3,22 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class AssociatedConsignmentCustomsProcedure { 19 public class AssociatedConsignmentCustomsProcedure {
13 20
  21 + @XmlElement(name = "GoodsStatusCode",required = false)
14 private String GoodsStatusCode; 22 private String GoodsStatusCode;
15 23
16 public void setGoodsStatusCode(String GoodsStatusCode) { 24 public void setGoodsStatusCode(String GoodsStatusCode) {
@@ -3,14 +3,22 @@ @@ -3,14 +3,22 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class AssociatedRegisteredTax { 19 public class AssociatedRegisteredTax {
13 20
  21 + @XmlElement(name = "TypeCode",required = false)
14 private String TypeCode; 22 private String TypeCode;
15 23
16 public void setTypeCode(String TypeCode) { 24 public void setTypeCode(String TypeCode) {
@@ -3,17 +3,28 @@ @@ -3,17 +3,28 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class AssociatedUnitLoadTransportEquipment { 19 public class AssociatedUnitLoadTransportEquipment {
13 20
  21 + @XmlElement(name = "ID",required = false)
14 private String ID; 22 private String ID;
  23 + @XmlElement(name = "LoadedPackageQuantity",required = false)
15 private String LoadedPackageQuantity; 24 private String LoadedPackageQuantity;
  25 + @XmlElement(name = "CharacteristicCode",required = false)
16 private String CharacteristicCode; 26 private String CharacteristicCode;
  27 + @XmlElement(name = "OperatingParty",required = false)
17 private OperatingParty OperatingParty; 28 private OperatingParty OperatingParty;
18 29
19 public void setID(String ID) { 30 public void setID(String ID) {
@@ -3,23 +3,35 @@ @@ -3,23 +3,35 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
  11 +import com.agent.xml.fhlsli.common.GrossWeightMeasure;
  12 +
6 /** 13 /**
7 * Auto-generated: 2018-06-09 15:18:23 14 * Auto-generated: 2018-06-09 15:18:23
8 * 15 *
9 * @author bejson.com (i@bejson.com) 16 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 17 * @website http://www.bejson.com/java2pojo/
11 */ 18 */
  19 +@XmlType
  20 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class ConsolidationInformation { 21 public class ConsolidationInformation {
13 22
14 - private String GrossWeightMeasure; 23 + @XmlElement(name = "GrossWeightMeasure",required = false)
  24 + private GrossWeightMeasure GrossWeightMeasure;
  25 + @XmlElement(name = "PackageQuantity",required = false)
15 private String PackageQuantity; 26 private String PackageQuantity;
  27 + @XmlElement(name = "PieceQuantity",required = false)
16 private String PieceQuantity; 28 private String PieceQuantity;
17 29
18 - public void setGrossWeightMeasure(String GrossWeightMeasure) { 30 + public void setGrossWeightMeasure(GrossWeightMeasure GrossWeightMeasure) {
19 this.GrossWeightMeasure = GrossWeightMeasure; 31 this.GrossWeightMeasure = GrossWeightMeasure;
20 } 32 }
21 33
22 - public String getGrossWeightMeasure() { 34 + public GrossWeightMeasure getGrossWeightMeasure() {
23 return GrossWeightMeasure; 35 return GrossWeightMeasure;
24 } 36 }
25 37
@@ -3,14 +3,22 @@ @@ -3,14 +3,22 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class CoverageInsuranceParty { 19 public class CoverageInsuranceParty {
13 20
  21 + @XmlElement(name = "Role",required = false)
14 private String Role; 22 private String Role;
15 23
16 public void setRole(String Role) { 24 public void setRole(String Role) {
@@ -3,6 +3,11 @@ @@ -3,6 +3,11 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 import com.agent.xml.fhlsli.common.FinalDestinationLocation; 11 import com.agent.xml.fhlsli.common.FinalDestinationLocation;
7 import com.agent.xml.fhlsli.common.OriginLocation; 12 import com.agent.xml.fhlsli.common.OriginLocation;
8 13
@@ -12,13 +17,21 @@ import com.agent.xml.fhlsli.common.OriginLocation; @@ -12,13 +17,21 @@ import com.agent.xml.fhlsli.common.OriginLocation;
12 * @author bejson.com (i@bejson.com) 17 * @author bejson.com (i@bejson.com)
13 * @website http://www.bejson.com/java2pojo/ 18 * @website http://www.bejson.com/java2pojo/
14 */ 19 */
  20 +@XmlType
  21 +@XmlAccessorType(XmlAccessType.FIELD)
15 public class FhlMasterConsignment { 22 public class FhlMasterConsignment {
16 23
  24 + @XmlElement(name = "IncludedTareGrossWeightMeasure",required = false)
17 private String IncludedTareGrossWeightMeasure; 25 private String IncludedTareGrossWeightMeasure;
  26 + @XmlElement(name = "TotalPieceQuantity",required = false)
18 private String TotalPieceQuantity; 27 private String TotalPieceQuantity;
  28 + @XmlElement(name = "TransportContractDocument",required = false)
19 private TransportContractDocument TransportContractDocument; 29 private TransportContractDocument TransportContractDocument;
  30 + @XmlElement(name = "OriginLocation",required = false)
20 private OriginLocation OriginLocation; 31 private OriginLocation OriginLocation;
  32 + @XmlElement(name = "FinalDestinationLocation",required = false)
21 private FinalDestinationLocation FinalDestinationLocation; 33 private FinalDestinationLocation FinalDestinationLocation;
  34 + @XmlElement(name = "IncludedHouseConsignment",required = false)
22 private IncludedHouseConsignment IncludedHouseConsignment; 35 private IncludedHouseConsignment IncludedHouseConsignment;
23 36
24 public void setIncludedTareGrossWeightMeasure(String IncludedTareGrossWeightMeasure) { 37 public void setIncludedTareGrossWeightMeasure(String IncludedTareGrossWeightMeasure) {
@@ -3,14 +3,22 @@ @@ -3,14 +3,22 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class HouseWaybill { 19 public class HouseWaybill {
13 20
  21 + @XmlElement(name = "MasterConsignment",required = false)
14 private FhlMasterConsignment MasterConsignment; 22 private FhlMasterConsignment MasterConsignment;
15 23
16 public void setMasterConsignment(FhlMasterConsignment MasterConsignment) { 24 public void setMasterConsignment(FhlMasterConsignment MasterConsignment) {
@@ -3,15 +3,24 @@ @@ -3,15 +3,24 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class IncludedAccountingNote { 19 public class IncludedAccountingNote {
13 20
  21 + @XmlElement(name = "ContentCode",required = false)
14 private String ContentCode; 22 private String ContentCode;
  23 + @XmlElement(name = "Content",required = false)
15 private String Content; 24 private String Content;
16 25
17 public void setContentCode(String ContentCode) { 26 public void setContentCode(String ContentCode) {
@@ -3,6 +3,11 @@ @@ -3,6 +3,11 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 import com.agent.xml.fhlsli.common.AssociatedParty; 11 import com.agent.xml.fhlsli.common.AssociatedParty;
7 import com.agent.xml.fhlsli.common.AssociatedReferenceDocument; 12 import com.agent.xml.fhlsli.common.AssociatedReferenceDocument;
8 import com.agent.xml.fhlsli.common.ConsigneeParty; 13 import com.agent.xml.fhlsli.common.ConsigneeParty;
@@ -11,6 +16,7 @@ import com.agent.xml.fhlsli.common.FinalDestinationLocation; @@ -11,6 +16,7 @@ import com.agent.xml.fhlsli.common.FinalDestinationLocation;
11 import com.agent.xml.fhlsli.common.FreightForwarderParty; 16 import com.agent.xml.fhlsli.common.FreightForwarderParty;
12 import com.agent.xml.fhlsli.common.HandlingInstructions; 17 import com.agent.xml.fhlsli.common.HandlingInstructions;
13 import com.agent.xml.fhlsli.common.IncludedCustomsNote; 18 import com.agent.xml.fhlsli.common.IncludedCustomsNote;
  19 +import com.agent.xml.fhlsli.common.IncludedTareGrossWeightMeasure;
14 import com.agent.xml.fhlsli.common.OriginLocation; 20 import com.agent.xml.fhlsli.common.OriginLocation;
15 import com.agent.xml.fhlsli.common.SpecifiedLogisticsTransportMovement; 21 import com.agent.xml.fhlsli.common.SpecifiedLogisticsTransportMovement;
16 22
@@ -20,49 +26,93 @@ import com.agent.xml.fhlsli.common.SpecifiedLogisticsTransportMovement; @@ -20,49 +26,93 @@ import com.agent.xml.fhlsli.common.SpecifiedLogisticsTransportMovement;
20 * @author bejson.com (i@bejson.com) 26 * @author bejson.com (i@bejson.com)
21 * @website http://www.bejson.com/java2pojo/ 27 * @website http://www.bejson.com/java2pojo/
22 */ 28 */
  29 +@XmlType
  30 +@XmlAccessorType(XmlAccessType.FIELD)
23 public class IncludedHouseConsignment { 31 public class IncludedHouseConsignment {
24 32
  33 + @XmlElement(name = "TransportContractDocument",required = false)
25 private TransportContractDocument TransportContractDocument; 34 private TransportContractDocument TransportContractDocument;
  35 + @XmlElement(name = "ConsolidationInformation",required = false)
26 private ConsolidationInformation ConsolidationInformation; 36 private ConsolidationInformation ConsolidationInformation;
  37 + @XmlElement(name = "ID",required = false)
27 private String ID; 38 private String ID;
  39 + @XmlElement(name = "NilCarriageValueIndicator",required = false)
28 private String NilCarriageValueIndicator; 40 private String NilCarriageValueIndicator;
  41 + @XmlElement(name = "DeclaredValueForCarriageAmount",required = false)
29 private String DeclaredValueForCarriageAmount; 42 private String DeclaredValueForCarriageAmount;
  43 + @XmlElement(name = "NilCustomsValueIndicator",required = false)
30 private String NilCustomsValueIndicator; 44 private String NilCustomsValueIndicator;
  45 + @XmlElement(name = "DeclaredValueForCustomsAmount",required = false)
31 private String DeclaredValueForCustomsAmount; 46 private String DeclaredValueForCustomsAmount;
  47 + @XmlElement(name = "NilInsuranceValueIndicator",required = false)
32 private String NilInsuranceValueIndicator; 48 private String NilInsuranceValueIndicator;
  49 + @XmlElement(name = "InsuranceValueAmount",required = false)
33 private String InsuranceValueAmount; 50 private String InsuranceValueAmount;
  51 + @XmlElement(name = "TotalChargePrepaidIndicator",required = false)
34 private String TotalChargePrepaidIndicator; 52 private String TotalChargePrepaidIndicator;
35 - private String WeightTotalChargeAmount; 53 + @XmlElement(name = "WeightTotalChargeAmount",required = false)
  54 + private WeightTotalChargeAmount WeightTotalChargeAmount;
  55 + @XmlElement(name = "ValuationTotalChargeAmount",required = false)
36 private String ValuationTotalChargeAmount; 56 private String ValuationTotalChargeAmount;
  57 + @XmlElement(name = "TaxTotalChargeAmount",required = false)
37 private String TaxTotalChargeAmount; 58 private String TaxTotalChargeAmount;
  59 + @XmlElement(name = "TotalDisbursementPrepaidIndicator",required = false)
38 private String TotalDisbursementPrepaidIndicator; 60 private String TotalDisbursementPrepaidIndicator;
  61 + @XmlElement(name = "AgentTotalDisbursementAmount",required = false)
39 private String AgentTotalDisbursementAmount; 62 private String AgentTotalDisbursementAmount;
  63 + @XmlElement(name = "CarrierTotalDisbursementAmount",required = false)
40 private String CarrierTotalDisbursementAmount; 64 private String CarrierTotalDisbursementAmount;
  65 + @XmlElement(name = "TotalPrepaidChargeAmount",required = false)
41 private String TotalPrepaidChargeAmount; 66 private String TotalPrepaidChargeAmount;
  67 + @XmlElement(name = "TotalCollectChargeAmount",required = false)
42 private String TotalCollectChargeAmount; 68 private String TotalCollectChargeAmount;
43 - private String IncludedTareGrossWeightMeasure; 69 + @XmlElement(name = "IncludedTareGrossWeightMeasure",required = false)
  70 + private IncludedTareGrossWeightMeasure IncludedTareGrossWeightMeasure;
  71 + @XmlElement(name = "GrossVolumeMeasure",required = false)
44 private String GrossVolumeMeasure; 72 private String GrossVolumeMeasure;
  73 + @XmlElement(name = "PackageQuantity",required = false)
45 private String PackageQuantity; 74 private String PackageQuantity;
  75 + @XmlElement(name = "TotalPieceQuantity",required = false)
46 private String TotalPieceQuantity; 76 private String TotalPieceQuantity;
  77 + @XmlElement(name = "SummaryDescription",required = false)
47 private String SummaryDescription; 78 private String SummaryDescription;
  79 + @XmlElement(name = "FreightRateTypeCode",required = false)
48 private String FreightRateTypeCode; 80 private String FreightRateTypeCode;
  81 + @XmlElement(name = "ConsignorParty",required = false)
49 private ConsignorParty ConsignorParty; 82 private ConsignorParty ConsignorParty;
  83 + @XmlElement(name = "ConsigneeParty",required = false)
50 private ConsigneeParty ConsigneeParty; 84 private ConsigneeParty ConsigneeParty;
  85 + @XmlElement(name = "FreightForwarderParty",required = false)
51 private FreightForwarderParty FreightForwarderParty; 86 private FreightForwarderParty FreightForwarderParty;
  87 + @XmlElement(name = "AssociatedParty",required = false)
52 private AssociatedParty AssociatedParty; 88 private AssociatedParty AssociatedParty;
  89 + @XmlElement(name = "ApplicableTransportCargoInsurance",required = false)
53 private ApplicableTransportCargoInsurance ApplicableTransportCargoInsurance; 90 private ApplicableTransportCargoInsurance ApplicableTransportCargoInsurance;
  91 + @XmlElement(name = "OriginLocation",required = false)
54 private OriginLocation OriginLocation; 92 private OriginLocation OriginLocation;
  93 + @XmlElement(name = "FinalDestinationLocation",required = false)
55 private FinalDestinationLocation FinalDestinationLocation; 94 private FinalDestinationLocation FinalDestinationLocation;
  95 + @XmlElement(name = "SpecifiedLogisticsTransportMovement",required = false)
56 private SpecifiedLogisticsTransportMovement SpecifiedLogisticsTransportMovement; 96 private SpecifiedLogisticsTransportMovement SpecifiedLogisticsTransportMovement;
  97 + @XmlElement(name = "UtilizedLogisticsTransportEquipment",required = false)
57 private UtilizedLogisticsTransportEquipment UtilizedLogisticsTransportEquipment; 98 private UtilizedLogisticsTransportEquipment UtilizedLogisticsTransportEquipment;
  99 + @XmlElement(name = "HandlingInstructions",required = false)
58 private HandlingInstructions HandlingInstructions; 100 private HandlingInstructions HandlingInstructions;
  101 + @XmlElement(name = "IncludedAccountingNote",required = false)
59 private IncludedAccountingNote IncludedAccountingNote; 102 private IncludedAccountingNote IncludedAccountingNote;
  103 + @XmlElement(name = "IncludedCustomsNote",required = false)
60 private IncludedCustomsNote IncludedCustomsNote; 104 private IncludedCustomsNote IncludedCustomsNote;
  105 + @XmlElement(name = "AssociatedReferenceDocument",required = false)
61 private AssociatedReferenceDocument AssociatedReferenceDocument; 106 private AssociatedReferenceDocument AssociatedReferenceDocument;
  107 + @XmlElement(name = "AssociatedConsignmentCustomsProcedure",required = false)
62 private AssociatedConsignmentCustomsProcedure AssociatedConsignmentCustomsProcedure; 108 private AssociatedConsignmentCustomsProcedure AssociatedConsignmentCustomsProcedure;
  109 + @XmlElement(name = "ApplicableTradeCurrencyExchange",required = false)
63 private ApplicableTradeCurrencyExchange ApplicableTradeCurrencyExchange; 110 private ApplicableTradeCurrencyExchange ApplicableTradeCurrencyExchange;
  111 + @XmlElement(name = "ApplicableLogisticsServiceCharge",required = false)
64 private ApplicableLogisticsServiceCharge ApplicableLogisticsServiceCharge; 112 private ApplicableLogisticsServiceCharge ApplicableLogisticsServiceCharge;
  113 + @XmlElement(name = "ApplicableLogisticsAllowanceCharge",required = false)
65 private ApplicableLogisticsAllowanceCharge ApplicableLogisticsAllowanceCharge; 114 private ApplicableLogisticsAllowanceCharge ApplicableLogisticsAllowanceCharge;
  115 + @XmlElement(name = "IncludedHouseConsignmentItem",required = false)
66 private IncludedHouseConsignmentItem IncludedHouseConsignmentItem; 116 private IncludedHouseConsignmentItem IncludedHouseConsignmentItem;
67 117
68 public void setTransportContractDocument(TransportContractDocument TransportContractDocument) { 118 public void setTransportContractDocument(TransportContractDocument TransportContractDocument) {
@@ -145,11 +195,11 @@ public class IncludedHouseConsignment { @@ -145,11 +195,11 @@ public class IncludedHouseConsignment {
145 return TotalChargePrepaidIndicator; 195 return TotalChargePrepaidIndicator;
146 } 196 }
147 197
148 - public void setWeightTotalChargeAmount(String WeightTotalChargeAmount) { 198 + public void setWeightTotalChargeAmount(WeightTotalChargeAmount WeightTotalChargeAmount) {
149 this.WeightTotalChargeAmount = WeightTotalChargeAmount; 199 this.WeightTotalChargeAmount = WeightTotalChargeAmount;
150 } 200 }
151 201
152 - public String getWeightTotalChargeAmount() { 202 + public WeightTotalChargeAmount getWeightTotalChargeAmount() {
153 return WeightTotalChargeAmount; 203 return WeightTotalChargeAmount;
154 } 204 }
155 205
@@ -209,11 +259,11 @@ public class IncludedHouseConsignment { @@ -209,11 +259,11 @@ public class IncludedHouseConsignment {
209 return TotalCollectChargeAmount; 259 return TotalCollectChargeAmount;
210 } 260 }
211 261
212 - public void setIncludedTareGrossWeightMeasure(String IncludedTareGrossWeightMeasure) { 262 + public void setIncludedTareGrossWeightMeasure(IncludedTareGrossWeightMeasure IncludedTareGrossWeightMeasure) {
213 this.IncludedTareGrossWeightMeasure = IncludedTareGrossWeightMeasure; 263 this.IncludedTareGrossWeightMeasure = IncludedTareGrossWeightMeasure;
214 } 264 }
215 265
216 - public String getIncludedTareGrossWeightMeasure() { 266 + public IncludedTareGrossWeightMeasure getIncludedTareGrossWeightMeasure() {
217 return IncludedTareGrossWeightMeasure; 267 return IncludedTareGrossWeightMeasure;
218 } 268 }
219 269
@@ -3,8 +3,14 @@ @@ -3,8 +3,14 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 import com.agent.xml.fhlsli.common.ApplicableFreightRateServiceCharge; 11 import com.agent.xml.fhlsli.common.ApplicableFreightRateServiceCharge;
7 import com.agent.xml.fhlsli.common.AssociatedReferenceDocument; 12 import com.agent.xml.fhlsli.common.AssociatedReferenceDocument;
  13 +import com.agent.xml.fhlsli.common.GrossWeightMeasure;
8 import com.agent.xml.fhlsli.common.NatureIdentificationTransportCargo; 14 import com.agent.xml.fhlsli.common.NatureIdentificationTransportCargo;
9 import com.agent.xml.fhlsli.common.TransportLogisticsPackage; 15 import com.agent.xml.fhlsli.common.TransportLogisticsPackage;
10 16
@@ -14,22 +20,39 @@ import com.agent.xml.fhlsli.common.TransportLogisticsPackage; @@ -14,22 +20,39 @@ import com.agent.xml.fhlsli.common.TransportLogisticsPackage;
14 * @author bejson.com (i@bejson.com) 20 * @author bejson.com (i@bejson.com)
15 * @website http://www.bejson.com/java2pojo/ 21 * @website http://www.bejson.com/java2pojo/
16 */ 22 */
  23 +@XmlType
  24 +@XmlAccessorType(XmlAccessType.FIELD)
17 public class IncludedHouseConsignmentItem { 25 public class IncludedHouseConsignmentItem {
18 26
  27 + @XmlElement(name = "SequenceNumeric",required = false)
19 private String SequenceNumeric; 28 private String SequenceNumeric;
  29 + @XmlElement(name = "TypeCode",required = false)
20 private String TypeCode; 30 private String TypeCode;
21 - private String GrossWeightMeasure; 31 + @XmlElement(name = "GrossWeightMeasure",required = false)
  32 + private GrossWeightMeasure GrossWeightMeasure;
  33 + @XmlElement(name = "GrossVolumeMeasure",required = false)
22 private String GrossVolumeMeasure; 34 private String GrossVolumeMeasure;
  35 + @XmlElement(name = "TotalChargeAmount",required = false)
23 private String TotalChargeAmount; 36 private String TotalChargeAmount;
  37 + @XmlElement(name = "PieceQuantity",required = false)
24 private String PieceQuantity; 38 private String PieceQuantity;
25 - private String TareWeightMeasure; 39 + @XmlElement(name = "TareWeightMeasure",required = false)
  40 + private TareWeightMeasure TareWeightMeasure;
  41 + @XmlElement(name = "VolumetricFactor",required = false)
26 private String VolumetricFactor; 42 private String VolumetricFactor;
  43 + @XmlElement(name = "NatureIdentificationTransportCargo",required = false)
27 private NatureIdentificationTransportCargo NatureIdentificationTransportCargo; 44 private NatureIdentificationTransportCargo NatureIdentificationTransportCargo;
  45 + @XmlElement(name = "OriginCountry",required = false)
28 private OriginCountry OriginCountry; 46 private OriginCountry OriginCountry;
  47 + @XmlElement(name = "AssociatedUnitLoadTransportEquipment",required = false)
29 private AssociatedUnitLoadTransportEquipment AssociatedUnitLoadTransportEquipment; 48 private AssociatedUnitLoadTransportEquipment AssociatedUnitLoadTransportEquipment;
  49 + @XmlElement(name = "TransportLogisticsPackage",required = false)
30 private TransportLogisticsPackage TransportLogisticsPackage; 50 private TransportLogisticsPackage TransportLogisticsPackage;
  51 + @XmlElement(name = "ApplicableFreightRateServiceCharge",required = false)
31 private ApplicableFreightRateServiceCharge ApplicableFreightRateServiceCharge; 52 private ApplicableFreightRateServiceCharge ApplicableFreightRateServiceCharge;
  53 + @XmlElement(name = "AssociatedReferenceDocument",required = false)
32 private AssociatedReferenceDocument AssociatedReferenceDocument; 54 private AssociatedReferenceDocument AssociatedReferenceDocument;
  55 + @XmlElement(name = "SpecifiedRateCombinationPointLocation",required = false)
33 private SpecifiedRateCombinationPointLocation SpecifiedRateCombinationPointLocation; 56 private SpecifiedRateCombinationPointLocation SpecifiedRateCombinationPointLocation;
34 57
35 public void setSequenceNumeric(String SequenceNumeric) { 58 public void setSequenceNumeric(String SequenceNumeric) {
@@ -48,11 +71,11 @@ public class IncludedHouseConsignmentItem { @@ -48,11 +71,11 @@ public class IncludedHouseConsignmentItem {
48 return TypeCode; 71 return TypeCode;
49 } 72 }
50 73
51 - public void setGrossWeightMeasure(String GrossWeightMeasure) { 74 + public void setGrossWeightMeasure(GrossWeightMeasure GrossWeightMeasure) {
52 this.GrossWeightMeasure = GrossWeightMeasure; 75 this.GrossWeightMeasure = GrossWeightMeasure;
53 } 76 }
54 77
55 - public String getGrossWeightMeasure() { 78 + public GrossWeightMeasure getGrossWeightMeasure() {
56 return GrossWeightMeasure; 79 return GrossWeightMeasure;
57 } 80 }
58 81
@@ -80,11 +103,11 @@ public class IncludedHouseConsignmentItem { @@ -80,11 +103,11 @@ public class IncludedHouseConsignmentItem {
80 return PieceQuantity; 103 return PieceQuantity;
81 } 104 }
82 105
83 - public void setTareWeightMeasure(String TareWeightMeasure) { 106 + public void setTareWeightMeasure(TareWeightMeasure TareWeightMeasure) {
84 this.TareWeightMeasure = TareWeightMeasure; 107 this.TareWeightMeasure = TareWeightMeasure;
85 } 108 }
86 109
87 - public String getTareWeightMeasure() { 110 + public TareWeightMeasure getTareWeightMeasure() {
88 return TareWeightMeasure; 111 return TareWeightMeasure;
89 } 112 }
90 113
@@ -3,14 +3,22 @@ @@ -3,14 +3,22 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class OperatingParty { 19 public class OperatingParty {
13 20
  21 + @XmlElement(name = "PrimaryID",required = false)
14 private String PrimaryID; 22 private String PrimaryID;
15 23
16 public void setPrimaryID(String PrimaryID) { 24 public void setPrimaryID(String PrimaryID) {
@@ -3,14 +3,22 @@ @@ -3,14 +3,22 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class OriginCountry { 19 public class OriginCountry {
13 20
  21 + @XmlElement(name = "ID",required = false)
14 private String ID; 22 private String ID;
15 23
16 public void setID(String ID) { 24 public void setID(String ID) {
@@ -3,16 +3,26 @@ @@ -3,16 +3,26 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class SpecifiedAddressLocation { 19 public class SpecifiedAddressLocation {
13 20
  21 + @XmlElement(name = "ID",required = false)
14 private String ID; 22 private String ID;
  23 + @XmlElement(name = "Name",required = false)
15 private String Name; 24 private String Name;
  25 + @XmlElement(name = "TypeCode",required = false)
16 private String TypeCode; 26 private String TypeCode;
17 27
18 public void setID(String ID) { 28 public void setID(String ID) {
@@ -3,14 +3,22 @@ @@ -3,14 +3,22 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class SpecifiedRateCombinationPointLocation { 19 public class SpecifiedRateCombinationPointLocation {
13 20
  21 + @XmlElement(name = "ID",required = false)
14 private String ID; 22 private String ID;
15 23
16 public void setID(String ID) { 24 public void setID(String ID) {
@@ -3,15 +3,24 @@ @@ -3,15 +3,24 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class SpecifiedTaxRegistration { 19 public class SpecifiedTaxRegistration {
13 20
  21 + @XmlElement(name = "ID",required = false)
14 private String ID; 22 private String ID;
  23 + @XmlElement(name = "AssociatedRegisteredTax",required = false)
15 private AssociatedRegisteredTax AssociatedRegisteredTax; 24 private AssociatedRegisteredTax AssociatedRegisteredTax;
16 25
17 public void setID(String ID) { 26 public void setID(String ID) {
  1 +package com.agent.xml.fhlsli.fhl;
  2 +
  3 +import javax.xml.bind.annotation.XmlAccessType;
  4 +import javax.xml.bind.annotation.XmlAccessorType;
  5 +import javax.xml.bind.annotation.XmlAttribute;
  6 +import javax.xml.bind.annotation.XmlType;
  7 +import javax.xml.bind.annotation.XmlValue;
  8 +
  9 +/**
  10 + * Depiction:
  11 + * <p>
  12 + * Modify:
  13 + * <p>
  14 + * Author: William Lynn
  15 + * <p>
  16 + * Create Date：2018年6月15日 下午12:18:06
  17 + *
  18 + */
  19 +@XmlType
  20 +@XmlAccessorType(XmlAccessType.FIELD)
  21 +public class TareWeightMeasure {
  22 +
  23 + @XmlValue
  24 + private String TareWeightMeasure;
  25 + @XmlAttribute(name = "unitCode", required = false)
  26 + private String unitCode;
  27 +
  28 + public TareWeightMeasure() {
  29 + }
  30 +
  31 + public String getTareWeightMeasure() {
  32 + return TareWeightMeasure;
  33 + }
  34 +
  35 + public void setTareWeightMeasure(String tareWeightMeasure) {
  36 + TareWeightMeasure = tareWeightMeasure;
  37 + }
  38 +
  39 + public String getUnitCode() {
  40 + return unitCode;
  41 + }
  42 +
  43 + public void setUnitCode(String unitCode) {
  44 + this.unitCode = unitCode;
  45 + }
  46 +}
@@ -3,14 +3,22 @@ @@ -3,14 +3,22 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class TransportContractDocument { 19 public class TransportContractDocument {
13 20
  21 + @XmlElement(name = "ID",required = false)
14 private String ID; 22 private String ID;
15 23
16 public void setID(String ID) { 24 public void setID(String ID) {
@@ -3,17 +3,28 @@ @@ -3,17 +3,28 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.fhl; 4 package com.agent.xml.fhlsli.fhl;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:18:23 12 * Auto-generated: 2018-06-09 15:18:23
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class UtilizedLogisticsTransportEquipment { 19 public class UtilizedLogisticsTransportEquipment {
13 20
  21 + @XmlElement(name = "ID",required = false)
14 private String ID; 22 private String ID;
  23 + @XmlElement(name = "CharacteristicCode",required = false)
15 private String CharacteristicCode; 24 private String CharacteristicCode;
  25 + @XmlElement(name = "Characteristic",required = false)
16 private String Characteristic; 26 private String Characteristic;
  27 + @XmlElement(name = "AffixedLogisticsSeal",required = false)
17 private AffixedLogisticsSeal AffixedLogisticsSeal; 28 private AffixedLogisticsSeal AffixedLogisticsSeal;
18 29
19 public void setID(String ID) { 30 public void setID(String ID) {
  1 +package com.agent.xml.fhlsli.fhl;
  2 +
  3 +import javax.xml.bind.annotation.XmlAccessType;
  4 +import javax.xml.bind.annotation.XmlAccessorType;
  5 +import javax.xml.bind.annotation.XmlAttribute;
  6 +import javax.xml.bind.annotation.XmlType;
  7 +import javax.xml.bind.annotation.XmlValue;
  8 +
  9 +/**
  10 + * Depiction:
  11 + * <p>
  12 + * Modify:
  13 + * <p>
  14 + * Author: William Lynn
  15 + * <p>
  16 + * Create Date：2018年6月15日 下午12:14:43
  17 + *
  18 + */
  19 +@XmlType
  20 +@XmlAccessorType(XmlAccessType.FIELD)
  21 +public class WeightTotalChargeAmount {
  22 +
  23 + @XmlValue
  24 + private String WeightTotalChargeAmount;
  25 + @XmlAttribute(name = "unitCode", required = false)
  26 + private String unitCode;
  27 +
  28 + public WeightTotalChargeAmount() {
  29 + }
  30 +
  31 + public String getWeightTotalChargeAmount() {
  32 + return WeightTotalChargeAmount;
  33 + }
  34 +
  35 + public void setChargeableWeightMeasure(String WeightTotalChargeAmount) {
  36 + this.WeightTotalChargeAmount = WeightTotalChargeAmount;
  37 + }
  38 +
  39 + public String getUnitCode() {
  40 + return unitCode;
  41 + }
  42 +
  43 + public void setUnitCode(String unitCode) {
  44 + this.unitCode = unitCode;
  45 + }
  46 +
  47 +}
@@ -3,15 +3,24 @@ @@ -3,15 +3,24 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.sli; 4 package com.agent.xml.fhlsli.sli;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:41:30 12 * Auto-generated: 2018-06-09 15:41:30
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class EventTime { 19 public class EventTime {
13 20
  21 + @XmlElement(name = "OccurrenceDateTime",required = false)
14 private String OccurrenceDateTime; 22 private String OccurrenceDateTime;
  23 + @XmlElement(name = "DateTimeTypeCode",required = false)
15 private String DateTimeTypeCode; 24 private String DateTimeTypeCode;
16 25
17 public void setOccurrenceDateTime(String OccurrenceDateTime) { 26 public void setOccurrenceDateTime(String OccurrenceDateTime) {
@@ -3,6 +3,11 @@ @@ -3,6 +3,11 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.sli; 4 package com.agent.xml.fhlsli.sli;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 import com.agent.xml.fhlsli.common.ApplicableFreightRateServiceCharge; 11 import com.agent.xml.fhlsli.common.ApplicableFreightRateServiceCharge;
7 import com.agent.xml.fhlsli.common.NatureIdentificationTransportCargo; 12 import com.agent.xml.fhlsli.common.NatureIdentificationTransportCargo;
8 import com.agent.xml.fhlsli.common.TransportLogisticsPackage; 13 import com.agent.xml.fhlsli.common.TransportLogisticsPackage;
@@ -13,17 +18,29 @@ import com.agent.xml.fhlsli.common.TransportLogisticsPackage; @@ -13,17 +18,29 @@ import com.agent.xml.fhlsli.common.TransportLogisticsPackage;
13 * @author bejson.com (i@bejson.com) 18 * @author bejson.com (i@bejson.com)
14 * @website http://www.bejson.com/java2pojo/ 19 * @website http://www.bejson.com/java2pojo/
15 */ 20 */
  21 +@XmlType
  22 +@XmlAccessorType(XmlAccessType.FIELD)
16 public class IncludedMasterConsignmentItem { 23 public class IncludedMasterConsignmentItem {
17 24
  25 + @XmlElement(name = "SequenceNumeric",required = false)
18 private String SequenceNumeric; 26 private String SequenceNumeric;
  27 + @XmlElement(name = "TypeCode",required = false)
19 private String TypeCode; 28 private String TypeCode;
  29 + @XmlElement(name = "GrossWeightMeasure",required = false)
20 private String GrossWeightMeasure; 30 private String GrossWeightMeasure;
  31 + @XmlElement(name = "GrossVolumeMeasure",required = false)
21 private String GrossVolumeMeasure; 32 private String GrossVolumeMeasure;
  33 + @XmlElement(name = "TotalChargeAmount",required = false)
22 private String TotalChargeAmount; 34 private String TotalChargeAmount;
  35 + @XmlElement(name = "PieceQuantity",required = false)
23 private String PieceQuantity; 36 private String PieceQuantity;
  37 + @XmlElement(name = "TareWeightMeasure",required = false)
24 private String TareWeightMeasure; 38 private String TareWeightMeasure;
  39 + @XmlElement(name = "NatureIdentificationTransportCargo",required = false)
25 private NatureIdentificationTransportCargo NatureIdentificationTransportCargo; 40 private NatureIdentificationTransportCargo NatureIdentificationTransportCargo;
  41 + @XmlElement(name = "TransportLogisticsPackage",required = false)
26 private TransportLogisticsPackage TransportLogisticsPackage; 42 private TransportLogisticsPackage TransportLogisticsPackage;
  43 + @XmlElement(name = "ApplicableFreightRateServiceCharge",required = false)
27 private ApplicableFreightRateServiceCharge ApplicableFreightRateServiceCharge; 44 private ApplicableFreightRateServiceCharge ApplicableFreightRateServiceCharge;
28 45
29 public void setSequenceNumeric(String SequenceNumeric) { 46 public void setSequenceNumeric(String SequenceNumeric) {
@@ -3,17 +3,28 @@ @@ -3,17 +3,28 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.sli; 4 package com.agent.xml.fhlsli.sli;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:41:30 12 * Auto-generated: 2018-06-09 15:41:30
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class ReportedStatus { 19 public class ReportedStatus {
13 20
  21 + @XmlElement(name = "ReasonCode",required = false)
14 private String ReasonCode; 22 private String ReasonCode;
  23 + @XmlElement(name = "OperationCode",required = false)
15 private String OperationCode; 24 private String OperationCode;
  25 + @XmlElement(name = "EventTime",required = false)
16 private EventTime EventTime; 26 private EventTime EventTime;
  27 + @XmlElement(name = "SpecifiedLocation",required = false)
17 private SpecifiedLocation SpecifiedLocation; 28 private SpecifiedLocation SpecifiedLocation;
18 29
19 public void setReasonCode(String ReasonCode) { 30 public void setReasonCode(String ReasonCode) {
@@ -3,6 +3,11 @@ @@ -3,6 +3,11 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.sli; 4 package com.agent.xml.fhlsli.sli;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 import com.agent.xml.fhlsli.common.AssociatedParty; 11 import com.agent.xml.fhlsli.common.AssociatedParty;
7 import com.agent.xml.fhlsli.common.AssociatedReferenceDocument; 12 import com.agent.xml.fhlsli.common.AssociatedReferenceDocument;
8 import com.agent.xml.fhlsli.common.ConsigneeParty; 13 import com.agent.xml.fhlsli.common.ConsigneeParty;
@@ -11,41 +16,74 @@ import com.agent.xml.fhlsli.common.FinalDestinationLocation; @@ -11,41 +16,74 @@ import com.agent.xml.fhlsli.common.FinalDestinationLocation;
11 import com.agent.xml.fhlsli.common.FreightForwarderParty; 16 import com.agent.xml.fhlsli.common.FreightForwarderParty;
12 import com.agent.xml.fhlsli.common.HandlingInstructions; 17 import com.agent.xml.fhlsli.common.HandlingInstructions;
13 import com.agent.xml.fhlsli.common.IncludedCustomsNote; 18 import com.agent.xml.fhlsli.common.IncludedCustomsNote;
  19 +import com.agent.xml.fhlsli.common.IncludedTareGrossWeightMeasure;
14 import com.agent.xml.fhlsli.common.OriginLocation; 20 import com.agent.xml.fhlsli.common.OriginLocation;
15 import com.agent.xml.fhlsli.common.SpecifiedLogisticsTransportMovement; 21 import com.agent.xml.fhlsli.common.SpecifiedLogisticsTransportMovement;
16 22
17 /** 23 /**
18 - * Auto-generated: 2018-06-09 15:41:30 24 + *
  25 + * Depiction:
  26 + * <p>
  27 + * Modify:
  28 + * <p>
  29 + * Author: William Lynn
  30 + * <p>
  31 + * Create Date：2018年6月13日 下午4:12:46
19 * 32 *
20 - * @author bejson.com (i@bejson.com)  
21 - * @website http://www.bejson.com/java2pojo/  
22 */ 33 */
  34 +@XmlType
  35 +@XmlAccessorType(XmlAccessType.FIELD)
23 public class SliMasterConsignment { 36 public class SliMasterConsignment {
24 37
  38 + @XmlElement(name = "ID",required = false)
25 private String ID; 39 private String ID;
  40 + @XmlElement(name = "NilCarriageValueIndicator",required = false)
26 private String NilCarriageValueIndicator; 41 private String NilCarriageValueIndicator;
  42 + @XmlElement(name = "DeclaredValueForCarriageAmount",required = false)
27 private String DeclaredValueForCarriageAmount; 43 private String DeclaredValueForCarriageAmount;
  44 + @XmlElement(name = "NilCustomsValueIndicator",required = false)
28 private String NilCustomsValueIndicator; 45 private String NilCustomsValueIndicator;
  46 + @XmlElement(name = "DeclaredValueForCustomsAmount",required = false)
29 private String DeclaredValueForCustomsAmount; 47 private String DeclaredValueForCustomsAmount;
  48 + @XmlElement(name = "NilInsuranceValueIndicator",required = false)
30 private String NilInsuranceValueIndicator; 49 private String NilInsuranceValueIndicator;
  50 + @XmlElement(name = "InsuranceValueAmount",required = false)
31 private String InsuranceValueAmount; 51 private String InsuranceValueAmount;
  52 + @XmlElement(name = "TotalChargePrepaidIndicator",required = false)
32 private String TotalChargePrepaidIndicator; 53 private String TotalChargePrepaidIndicator;
  54 + @XmlElement(name = "TotalDisbursementPrepaidIndicator",required = false)
33 private String TotalDisbursementPrepaidIndicator; 55 private String TotalDisbursementPrepaidIndicator;
34 - private String IncludedTareGrossWeightMeasure; 56 + @XmlElement(name = "IncludedTareGrossWeightMeasure",required = false)
  57 + private IncludedTareGrossWeightMeasure IncludedTareGrossWeightMeasure;
  58 + @XmlElement(name = "NetWeightMeasure",required = false)
35 private String NetWeightMeasure; 59 private String NetWeightMeasure;
  60 + @XmlElement(name = "GrossVolumeMeasure",required = false)
36 private String GrossVolumeMeasure; 61 private String GrossVolumeMeasure;
  62 + @XmlElement(name = "TotalPieceQuantity",required = false)
37 private String TotalPieceQuantity; 63 private String TotalPieceQuantity;
  64 + @XmlElement(name = "ConsignorParty",required = false)
38 private ConsignorParty ConsignorParty; 65 private ConsignorParty ConsignorParty;
  66 + @XmlElement(name = "ConsigneeParty",required = false)
39 private ConsigneeParty ConsigneeParty; 67 private ConsigneeParty ConsigneeParty;
  68 + @XmlElement(name = "FreightForwarderParty",required = false)
40 private FreightForwarderParty FreightForwarderParty; 69 private FreightForwarderParty FreightForwarderParty;
  70 + @XmlElement(name = "AssociatedParty",required = false)
41 private AssociatedParty AssociatedParty; 71 private AssociatedParty AssociatedParty;
  72 + @XmlElement(name = "OriginLocation",required = false)
42 private OriginLocation OriginLocation; 73 private OriginLocation OriginLocation;
  74 + @XmlElement(name = "FinalDestinationLocation",required = false)
43 private FinalDestinationLocation FinalDestinationLocation; 75 private FinalDestinationLocation FinalDestinationLocation;
  76 + @XmlElement(name = "SpecifiedLogisticsTransportMovement",required = false)
44 private SpecifiedLogisticsTransportMovement SpecifiedLogisticsTransportMovement; 77 private SpecifiedLogisticsTransportMovement SpecifiedLogisticsTransportMovement;
  78 + @XmlElement(name = "HandlingInstructions",required = false)
45 private HandlingInstructions HandlingInstructions; 79 private HandlingInstructions HandlingInstructions;
  80 + @XmlElement(name = "AssociatedReferenceDocument",required = false)
46 private AssociatedReferenceDocument AssociatedReferenceDocument; 81 private AssociatedReferenceDocument AssociatedReferenceDocument;
  82 + @XmlElement(name = "IncludedCustomsNote",required = false)
47 private IncludedCustomsNote IncludedCustomsNote; 83 private IncludedCustomsNote IncludedCustomsNote;
  84 + @XmlElement(name = "IncludedMasterConsignmentItem",required = false)
48 private IncludedMasterConsignmentItem IncludedMasterConsignmentItem; 85 private IncludedMasterConsignmentItem IncludedMasterConsignmentItem;
  86 + @XmlElement(name = "ReportedStatus",required = false)
49 private ReportedStatus ReportedStatus; 87 private ReportedStatus ReportedStatus;
50 88
51 public void setID(String ID) { 89 public void setID(String ID) {
@@ -120,11 +158,11 @@ public class SliMasterConsignment { @@ -120,11 +158,11 @@ public class SliMasterConsignment {
120 return TotalDisbursementPrepaidIndicator; 158 return TotalDisbursementPrepaidIndicator;
121 } 159 }
122 160
123 - public void setIncludedTareGrossWeightMeasure(String IncludedTareGrossWeightMeasure) { 161 + public void setIncludedTareGrossWeightMeasure(IncludedTareGrossWeightMeasure IncludedTareGrossWeightMeasure) {
124 this.IncludedTareGrossWeightMeasure = IncludedTareGrossWeightMeasure; 162 this.IncludedTareGrossWeightMeasure = IncludedTareGrossWeightMeasure;
125 } 163 }
126 164
127 - public String getIncludedTareGrossWeightMeasure() { 165 + public IncludedTareGrossWeightMeasure getIncludedTareGrossWeightMeasure() {
128 return IncludedTareGrossWeightMeasure; 166 return IncludedTareGrossWeightMeasure;
129 } 167 }
130 168
@@ -3,16 +3,26 @@ @@ -3,16 +3,26 @@
3 */ 3 */
4 package com.agent.xml.fhlsli.sli; 4 package com.agent.xml.fhlsli.sli;
5 5
  6 +import javax.xml.bind.annotation.XmlAccessType;
  7 +import javax.xml.bind.annotation.XmlAccessorType;
  8 +import javax.xml.bind.annotation.XmlElement;
  9 +import javax.xml.bind.annotation.XmlType;
  10 +
6 /** 11 /**
7 * Auto-generated: 2018-06-09 15:41:30 12 * Auto-generated: 2018-06-09 15:41:30
8 * 13 *
9 * @author bejson.com (i@bejson.com) 14 * @author bejson.com (i@bejson.com)
10 * @website http://www.bejson.com/java2pojo/ 15 * @website http://www.bejson.com/java2pojo/
11 */ 16 */
  17 +@XmlType
  18 +@XmlAccessorType(XmlAccessType.FIELD)
12 public class SpecifiedLocation { 19 public class SpecifiedLocation {
13 20
  21 + @XmlElement(name = "ID",required = false)
14 private String ID; 22 private String ID;
  23 + @XmlElement(name = "Name",required = false)
15 private String Name; 24 private String Name;
  25 + @XmlElement(name = "TypeCode",required = false)
16 private String TypeCode; 26 private String TypeCode;
17 27
18 public void setID(String ID) { 28 public void setID(String ID) {
@@ -15,8 +15,23 @@ import java.util.Date; @@ -15,8 +15,23 @@ import java.util.Date;
15 */ 15 */
16 public class CustomMessageKit { 16 public class CustomMessageKit {
17 17
18 - public static String getMessageDir() {  
19 - String dirPath = PropertiesLoader.get("custom.message.dir", "/application.properties"); 18 + // smb://mrz:vmvnv1v2VV@10.50.3.61/nms_customs_xml2/
  19 + public static String getMessageSmbRemoteDir() {
  20 + StringBuilder sb = new StringBuilder();
  21 + sb.append("smb://");
  22 + String username = PropertiesLoader.get("custom.message.username", "/application.properties");
  23 + sb.append(username + ":");
  24 + String password = PropertiesLoader.get("custom.message.password", "/application.properties");
  25 + sb.append(password + "@");
  26 + String server = PropertiesLoader.get("custom.message.server", "/application.properties");
  27 + sb.append(server + "/");
  28 + String remotedir = PropertiesLoader.get("custom.message.remotedir", "/application.properties");
  29 + sb.append(remotedir + "/");
  30 + return sb.toString();
  31 + }
  32 +
  33 + public static String getMessageLocalDir() {
  34 + String dirPath = PropertiesLoader.get("custom.message.localdir", "/application.properties");
20 File dir = new File(dirPath); 35 File dir = new File(dirPath);
21 if (dir == null || !dir.exists()) { 36 if (dir == null || !dir.exists()) {
22 dir.mkdirs(); 37 dir.mkdirs();
@@ -25,7 +40,7 @@ public class CustomMessageKit { @@ -25,7 +40,7 @@ public class CustomMessageKit {
25 } 40 }
26 41
27 public static String getMessagePath() { 42 public static String getMessagePath() {
28 - return getMessageDir() + "/" + getMessageName(); 43 + return getMessageLocalDir() + "/" + getMessageName();
29 } 44 }
30 45
31 public static String getMessageName() { 46 public static String getMessageName() {
@@ -7,7 +7,6 @@ import java.util.Map; @@ -7,7 +7,6 @@ import java.util.Map;
7 import com.agent.entity.system.UserEntity; 7 import com.agent.entity.system.UserEntity;
8 import com.alibaba.fastjson.JSONObject; 8 import com.alibaba.fastjson.JSONObject;
9 9
10 -import tools.HttpRequest;  
11 import tools.HttpTools; 10 import tools.HttpTools;
12 11
13 public class FLogin { 12 public class FLogin {
@@ -23,8 +23,14 @@ service.address=http://10.50.3.66:9009/ShipmentStatusWS.asmx @@ -23,8 +23,14 @@ service.address=http://10.50.3.66:9009/ShipmentStatusWS.asmx
23 23
24 service.xquery=BA8EC 24 service.xquery=BA8EC
25 25
26 -custom.message.dir=/Users/Kevin/Desktop/agent/message 26 +#local
  27 +#custom.message.localdir=/Users/Kevin/Desktop/agent/message
  28 +
  29 +#server
  30 +custom.message.localdir=/home/agent_xml
  31 +
  32 +custom.message.username=mrz
  33 +custom.message.password=vmvnv1v2VV
  34 +custom.message.server=10.50.3.61
  35 +custom.message.remotedir=nms_customs_xml2
27 36
28 -imf.config.file = /Users/Kevin/Desktop/agent/imf_config.properties  
29 -img_username=NDLR  
30 -img_password=NDLR_P  
@@ -10,12 +10,18 @@ @@ -10,12 +10,18 @@
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="/Users/Kevin/Documents/develop/tomcat/webapps/agent/logs/agent.log"  
14 - filePattern="/Users/Kevin/Documents/develop/tomcat/webapps/agent/$${date:yyyy-MM}/agent-%d{MM-dd-yyyy}-%i.log.gz"> 13 + <RollingFile name="RollingFile" fileName="/home/agent/tomcat/logs/agent.log"
  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" />
17 <SizeBasedTriggeringPolicy size="50 MB" /> 17 <SizeBasedTriggeringPolicy size="50 MB" />
18 </RollingFile> 18 </RollingFile>
  19 +<!-- <RollingFile name="RollingFile" fileName="/Users/Kevin/Documents/develop/tomcat/webapps/agent/logs/agent.log"
  20 + filePattern="/Users/Kevin/Documents/develop/tomcat/webapps/agent/$${date:yyyy-MM}/agent-%d{MM-dd-yyyy}-%i.log.gz">
  21 + <PatternLayout
  22 + pattern="%d{yyyy.MM.dd 'at' HH:mm:ss z} %-5level %class{36} %L %M - %msg%xEx%n" />
  23 + <SizeBasedTriggeringPolicy size="50 MB" />
  24 + </RollingFile> -->
19 </appenders> 25 </appenders>
20 26
21 <loggers> 27 <loggers>
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <beans xmlns:util="http://www.springframework.org/schema/util" 2 <beans xmlns:util="http://www.springframework.org/schema/util"
3 - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
4 - xmlns:cache="http://www.springframework.org/schema/cache"  
5 - xmlns:p="http://www.springframework.org/schema/p"  
6 - xmlns="http://www.springframework.org/schema/beans"  
7 - xsi:schemaLocation="http://www.springframework.org/schema/beans 3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cache="http://www.springframework.org/schema/cache"
  4 + xmlns:p="http://www.springframework.org/schema/p" xmlns="http://www.springframework.org/schema/beans"
  5 + xsi:schemaLocation="http://www.springframework.org/schema/beans
8 http://www.springframework.org/schema/beans/spring-beans-3.2.xsd 6 http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
9 http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> 7 http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
10 -  
11 - <description>Shiro 配置文件</description>  
12 -  
13 - <!-- 缓存管理器 -->  
14 - <bean id="shiroEhcacheManager" class="org.apache.shiro.cache.ehcache.EhCacheManager">  
15 - <property name="cacheManagerConfigFile" value="classpath:security/ehcache-shiro.xml"/>  
16 - </bean>  
17 -  
18 - <!-- 会话Cookie模板 -->  
19 - <bean id="sessionIdCookie" class="org.apache.shiro.web.servlet.SimpleCookie">  
20 - <constructor-arg value="sid"/>  
21 - <property name="httpOnly" value="true"/>  
22 - <property name="maxAge" value="-1"/>  
23 - </bean>  
24 - <bean id="rememberMeCookie" class="org.apache.shiro.web.servlet.SimpleCookie">  
25 - <constructor-arg value="rememberMe"/>  
26 - <property name="httpOnly" value="true"/>  
27 - <!-- 30天 -->  
28 - <property name="maxAge" value="2592000"/>  
29 - </bean>  
30 -  
31 - <!-- rememberMe管理器 -->  
32 - <bean id="rememberMeManager" class="org.apache.shiro.web.mgt.CookieRememberMeManager">  
33 - <property name="cipherKey" value="#{T(org.apache.shiro.codec.Base64).decode('4AvVhmFLUs0KTA3Kprsdag==')}"/>  
34 - <property name="cookie" ref="rememberMeCookie"/>  
35 - </bean>  
36 -  
37 - <!-- Realm实现 -->  
38 - <bean id="userRealm" class="com.framework.shiro.UserRealm">  
39 - <property name="cachingEnabled" value="true"/>  
40 - </bean>  
41 -  
42 - <!-- 安全管理器 -->  
43 - <bean id="securityManager" class="org.apache.shiro.web.mgt.DefaultWebSecurityManager">  
44 - <property name="realm" ref="userRealm"/>  
45 - <property name="cacheManager" ref="shiroEhcacheManager"/>  
46 - <property name="rememberMeManager" ref="rememberMeManager"/>  
47 - </bean>  
48 -  
49 - <!-- Shiro生命周期处理器-->  
50 - <bean id="lifecycleBeanPostProcessor" class="org.apache.shiro.spring.LifecycleBeanPostProcessor"/>  
51 -  
52 - <!-- AOP式方法级权限检查 -->  
53 - <bean class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator" depends-on="lifecycleBeanPostProcessor">  
54 - <property name="proxyTargetClass" value="true" />  
55 - </bean>  
56 - <bean class="org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor">  
57 - <property name="securityManager" ref="securityManager"/>  
58 - </bean>  
59 - <bean class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">  
60 - <property name="exceptionMappings">  
61 - <props>  
62 - <prop key="org.apache.shiro.authz.UnauthorizedException">/unauthorized</prop>  
63 - </props>  
64 - </property>  
65 - </bean>  
66 - <!-- Shiro的Web过滤器 -->  
67 - <bean id="shiroFilter" class="org.apache.shiro.spring.web.ShiroFilterFactoryBean">  
68 - <property name="securityManager" ref="securityManager"/>  
69 - <property name="loginUrl" value="/login"/>  
70 - <property name="unauthorizedUrl" value="/unauthorized" />  
71 - <property name="filterChainDefinitions">  
72 -  
73 - <value>  
74 - /login = anon  
75 -  
76 - /druid/** = anon  
77 - /unauthorized = anon  
78 - /resource/** = anon  
79 - /doLogin = anon  
80 - /retrieve/** = anon  
81 - /reset/password = anon  
82 - /change/passwd= anon  
83 - /captcha/** = anon  
84 - /fileDownload/** = anon  
85 -  
86 - /**/cross/** = anon  
87 - /tracking/detail/** = anon  
88 -  
89 -  
90 - /logout = logout  
91 - /** = authc  
92 -  
93 - </value>  
94 - </property>  
95 -  
96 - </bean>  
97 -  
98 - <bean id="logout" class="org.apache.shiro.web.filter.authc.LogoutFilter">  
99 - <property name="redirectUrl" value="/login" />  
100 - </bean>  
101 -  
102 -  
103 - 8 +
  9 + <description>Shiro 配置文件</description>
  10 +
  11 + <!-- 缓存管理器 -->
  12 + <bean id="shiroEhcacheManager" class="org.apache.shiro.cache.ehcache.EhCacheManager">
  13 + <property name="cacheManagerConfigFile" value="classpath:security/ehcache-shiro.xml" />
  14 + </bean>
  15 +
  16 + <!-- 会话Cookie模板 -->
  17 + <bean id="sessionIdCookie" class="org.apache.shiro.web.servlet.SimpleCookie">
  18 + <constructor-arg value="sid" />
  19 + <property name="httpOnly" value="true" />
  20 + <property name="maxAge" value="-1" />
  21 + </bean>
  22 + <bean id="rememberMeCookie" class="org.apache.shiro.web.servlet.SimpleCookie">
  23 + <constructor-arg value="rememberMe" />
  24 + <property name="httpOnly" value="true" />
  25 + <!-- 30天 -->
  26 + <property name="maxAge" value="2592000" />
  27 + </bean>
  28 +
  29 + <!-- rememberMe管理器 -->
  30 + <bean id="rememberMeManager" class="org.apache.shiro.web.mgt.CookieRememberMeManager">
  31 + <property name="cipherKey"
  32 + value="#{T(org.apache.shiro.codec.Base64).decode('4AvVhmFLUs0KTA3Kprsdag==')}" />
  33 + <property name="cookie" ref="rememberMeCookie" />
  34 + </bean>
  35 +
  36 + <!-- Realm实现 -->
  37 + <bean id="userRealm" class="com.framework.shiro.UserRealm">
  38 + <property name="cachingEnabled" value="true" />
  39 + </bean>
  40 +
  41 + <!-- 安全管理器 -->
  42 + <bean id="securityManager" class="org.apache.shiro.web.mgt.DefaultWebSecurityManager">
  43 + <property name="realm" ref="userRealm" />
  44 + <property name="cacheManager" ref="shiroEhcacheManager" />
  45 + <property name="rememberMeManager" ref="rememberMeManager" />
  46 + </bean>
  47 +
  48 + <!-- Shiro生命周期处理器 -->
  49 + <bean id="lifecycleBeanPostProcessor" class="org.apache.shiro.spring.LifecycleBeanPostProcessor" />
  50 +
  51 + <!-- AOP式方法级权限检查 -->
  52 + <bean
  53 + class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator"
  54 + depends-on="lifecycleBeanPostProcessor">
  55 + <property name="proxyTargetClass" value="true" />
  56 + </bean>
  57 + <bean
  58 + class="org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor">
  59 + <property name="securityManager" ref="securityManager" />
  60 + </bean>
  61 + <bean
  62 + class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">
  63 + <property name="exceptionMappings">
  64 + <props>
  65 + <prop key="org.apache.shiro.authz.UnauthorizedException">/unauthorized</prop>
  66 + </props>
  67 + </property>
  68 + </bean>
  69 + <!-- Shiro的Web过滤器 -->
  70 + <bean id="shiroFilter" class="org.apache.shiro.spring.web.ShiroFilterFactoryBean">
  71 + <property name="securityManager" ref="securityManager" />
  72 + <property name="loginUrl" value="/login" />
  73 + <property name="unauthorizedUrl" value="/unauthorized" />
  74 + <property name="filterChainDefinitions">
  75 +
  76 + <value>
  77 + /receipt/a0608c4054662dd902e1314f7e450e3eaa81c114 = anon
  78 + /login = anon
  79 +
  80 + /druid/** = anon
  81 + /unauthorized = anon
  82 + /resource/** = anon
  83 + /doLogin = anon
  84 + /retrieve/** = anon
  85 + /reset/password = anon
  86 + /change/passwd= anon
  87 + /captcha/** = anon
  88 + /fileDownload/** = anon
  89 +
  90 + /**/cross/** = anon
  91 + /tracking/detail/** = anon
  92 +
  93 +
  94 + /logout = logout
  95 + /** = authc
  96 +
  97 + </value>
  98 + </property>
  99 +
  100 + </bean>
  101 +
  102 + <bean id="logout" class="org.apache.shiro.web.filter.authc.LogoutFilter">
  103 + <property name="redirectUrl" value="/login" />
  104 + </bean>
  105 +
  106 +
  107 +
104 </beans> 108 </beans>
@@ -53,25 +53,25 @@ @@ -53,25 +53,25 @@
53 id="waybillnomaster" minlength="12" maxlength="12" name="waybillnomaster" type="hidden" 53 id="waybillnomaster" minlength="12" maxlength="12" name="waybillnomaster" type="hidden"
54 value="${manifest.waybillnomaster }"></td> 54 value="${manifest.waybillnomaster }"></td>
55 <script> 55 <script>
56 - function input_change(obj){  
57 - var val = $(obj).val();  
58 - //用户输入订单号满足格式  
59 - if(val.length == 12 && val.indexOf("-") >= 0)  
60 - {  
61 - $.ajax({  
62 - url:"<%=basePath%>/manifest/gettreecode",  
63 - method:"get",  
64 - data:{  
65 - STOCKPRE:val.split("-")[0]  
66 - },  
67 - success:function(data){  
68 - var d = data.data;  
69 - $("#carrier").val(d.cARRIERID);  
70 - }  
71 - });  
72 - }  
73 - }  
74 - </script> 56 + function input_change(obj){
  57 + var val = $(obj).val();
  58 + //用户输入订单号满足格式
  59 + if(val.length == 12 && val.indexOf("-") >= 0)
  60 + {
  61 + $.ajax({
  62 + url:"<%=basePath%>/manifest/gettreecode",
  63 + method:"get",
  64 + data:{
  65 + STOCKPRE:val.split("-")[0]
  66 + },
  67 + success:function(data){
  68 + var d = data.data;
  69 + $("#carrier").val(d.cARRIERID);
  70 + }
  71 + });
  72 + }
  73 + }
  74 + </script>
75 </tr> 75 </tr>
76 <tr> 76 <tr>
77 <td class="kv-label"><spring:message code="delivery.name.of.goods" /></td> 77 <td class="kv-label"><spring:message code="delivery.name.of.goods" /></td>
@@ -230,28 +230,29 @@ @@ -230,28 +230,29 @@
230 <tr> 230 <tr>
231 <td class="kv-label" colspan="1"><spring:message code="manifest.shipper.information" /> 231 <td class="kv-label" colspan="1"><spring:message code="manifest.shipper.information" />
232 </td> 232 </td>
233 - <td class="kv-content" colspan="5"><select onchange="changeFHselect()" 233 + <td class="kv-content" colspan="5"><select onchange="changeConsignorSelect()"
234 id="fh_select"> 234 id="fh_select">
235 <option value="-1">请选择</option> 235 <option value="-1">请选择</option>
236 </select> <script> 236 </select> <script>
237 - var select_data = null;  
238 - function changeFHselect(){  
239 - if(select_data != null) 237 + var consignorList = null;
  238 + function changeConsignorSelect(){
  239 + if(consignorList != null)
240 { 240 {
241 var index = parseInt($("#fh_select").find("option:selected").val()); 241 var index = parseInt($("#fh_select").find("option:selected").val());
242 if(index >= 0) 242 if(index >= 0)
243 { 243 {
244 - $("#co_company").val(select_data[index].co_company?select_data[index].co_company:"");  
245 - $("#co_address").val(select_data[index].co_address?select_data[index].co_address:"");  
246 - $("#co_telephone").val(select_data[index].co_telephone?select_data[index].co_telephone:"");  
247 - $("#co_country").val(select_data[index].co_country?select_data[index].co_country:"");  
248 - $("#co_city").val(select_data[index].co_city?select_data[index].co_city:"");  
249 - $("#co_deltaname").val(select_data[index].co_deltaname?select_data[index].co_deltaname:"");  
250 - $("#co_name").val(select_data[index].co_name?select_data[index].co_name:"");  
251 - $("#co_fax").val(select_data[index].co_fax?select_data[index].co_fax:"");  
252 - $("#co_zipcode").val(select_data[index].co_zipcode?select_data[index].co_zipcode:"");  
253 - $("#shpaeo").val(select_data[index].shpaeo?select_data[index].shpaeo:"");  
254 - $("#shpcusid").val(select_data[index].shpcusid?select_data[index].shpcusid:""); 244 + var consignor = consignorList[index];
  245 + $("#co_company").val(consignor.co_company?consignor.co_company:"");
  246 + $("#co_address").val(consignor.co_address?consignor.co_address:"");
  247 + $("#co_telephone").val(consignor.co_telephone?consignor.co_telephone:"");
  248 + $("#co_country").val(consignor.co_country?consignor.co_country:"");
  249 + $("#co_city").val(consignor.co_city?consignor.co_city:"");
  250 + $("#co_deltaname").val(consignor.co_deltaname?consignor.co_deltaname:"");
  251 + $("#co_name").val(consignor.co_name?consignor.co_name:"");
  252 + $("#co_fax").val(consignor.co_fax?consignor.co_fax:"");
  253 + $("#co_zipcode").val(consignor.co_zipcode?consignor.co_zipcode:"");
  254 + $("#shpaeo").val(consignor.shpaeo?consignor.shpaeo:"");
  255 + $("#shpcusid").val(consignor.shpcusid?consignor.shpcusid:"");
255 } 256 }
256 } 257 }
257 } 258 }
@@ -263,12 +264,11 @@ @@ -263,12 +264,11 @@
263 { 264 {
264 if(data.data) 265 if(data.data)
265 { 266 {
266 - select_data = data.data; 267 + consignorList = data.data;
267 for(var i = 0; i < data.data.length; i ++) 268 for(var i = 0; i < data.data.length; i ++)
268 { 269 {
269 var select = $("#fh_select"); 270 var select = $("#fh_select");
270 select.append("<option value='"+i+"'>"+data.data[i].co_company+"</option>"); 271 select.append("<option value='"+i+"'>"+data.data[i].co_company+"</option>");
271 -  
272 } 272 }
273 } 273 }
274 } 274 }
@@ -339,21 +339,22 @@ @@ -339,21 +339,22 @@
339 <!-- 收货人信息 start --> 339 <!-- 收货人信息 start -->
340 <tr> 340 <tr>
341 <td class="kv-label" colspan="1"><spring:message code="manifest.consignee" /></td> 341 <td class="kv-label" colspan="1"><spring:message code="manifest.consignee" /></td>
342 - <td class="kv-content" colspan="5"><select onchange="changeselect()" 342 + <td class="kv-content" colspan="5"><select onchange="changeConsigneeSelect()"
343 id="consignee_select"> 343 id="consignee_select">
344 <option value="-1">请选择</option> 344 <option value="-1">请选择</option>
345 </select> <script> 345 </select> <script>
346 - var select_data = null;  
347 - function changeselect(){  
348 - if(select_data != null) 346 + var consigneeList = null;
  347 + function changeConsigneeSelect(){
  348 + if(consigneeList != null)
349 { 349 {
350 var index = parseInt($("#consignee_select").find("option:selected").val()); 350 var index = parseInt($("#consignee_select").find("option:selected").val());
351 if(index >= 0) 351 if(index >= 0)
352 - {  
353 - $("#sh_company").val(select_data[index].code?select_data[index].code:"");  
354 - $("#sh_address").val(select_data[index].address?select_data[index].address:"");  
355 - $("#sh_telephone").val(select_data[index].tel?select_data[index].tel:"");  
356 - $("#sh_country").val(select_data[index].name?select_data[index].name:""); 352 + {
  353 + var consignee = consigneeList[index];
  354 + $("#sh_company").val(consignee.code?consignee.code:"");
  355 + $("#sh_address").val(consignee.address?consignee.address:"");
  356 + $("#sh_telephone").val(consignee.tel?consignee.tel:"");
  357 + $("#sh_country").val(consignee.name?consignee.name:"");
357 } 358 }
358 } 359 }
359 } 360 }
@@ -364,11 +365,11 @@ @@ -364,11 +365,11 @@
364 { 365 {
365 if(data.data) 366 if(data.data)
366 { 367 {
367 - select_data = data.data; 368 + consigneeList = data.data;
368 for(var i = 0; i < data.data.length; i ++) 369 for(var i = 0; i < data.data.length; i ++)
369 { 370 {
370 var select = $("#consignee_select"); 371 var select = $("#consignee_select");
371 - select.append("<option value='"+i+"'>"+data.data[i].code+"</option>"); 372 + select.append("<option value='"+i+"'>"+consigneeList[i].code+"</option>");
372 373
373 } 374 }
374 } 375 }
@@ -222,28 +222,29 @@ @@ -222,28 +222,29 @@
222 <!-- 发货信息 start --> 222 <!-- 发货信息 start -->
223 <tr> 223 <tr>
224 <td class="kv-label"><spring:message code="manifest.shipper.information" /></td> 224 <td class="kv-label"><spring:message code="manifest.shipper.information" /></td>
225 - <td class="kv-content" colspan="5"><select onchange="changeFHselect()" 225 + <td class="kv-content" colspan="5"><select onchange="changeConsignorSelect()"
226 id="fh_select"> 226 id="fh_select">
227 <option value="-1">请选择</option> 227 <option value="-1">请选择</option>
228 </select> <script> 228 </select> <script>
229 - var select_data = null;  
230 - function changeFHselect(){  
231 - if(select_data != null) 229 + var consignorList = null;
  230 + function changeConsignorSelect(){
  231 + if(consignorList != null)
232 { 232 {
233 var index = parseInt($("#fh_select").find("option:selected").val()); 233 var index = parseInt($("#fh_select").find("option:selected").val());
234 if(index >= 0) 234 if(index >= 0)
235 { 235 {
236 - $("#co_company").val(select_data[index].co_company);  
237 - $("#co_address").val(select_data[index].co_address);  
238 - $("#co_telephone").val(select_data[index].co_telephone);  
239 - $("#co_country").val(select_data[index].co_country);  
240 - $("#co_city").val(select_data[index].co_city);  
241 - $("#co_deltaname").val(select_data[index].co_deltaname);  
242 - $("#co_name").val(select_data[index].co_name);  
243 - $("#co_fax").val(select_data[index].co_fax);  
244 - $("#co_zipcode").val(select_data[index].co_zipcode);  
245 - $("#shpaeo").val(select_data[index].shpaeo);  
246 - $("#shpcusid").val(select_data[index].shpcusid); 236 + var consignor = consignorList[index];
  237 + $("#co_company").val(consignor.co_company?consignor.co_company:"");
  238 + $("#co_address").val(consignor.co_address?consignor.co_address:"");
  239 + $("#co_telephone").val(consignor.co_telephone?consignor.co_telephone:"");
  240 + $("#co_country").val(consignor.co_country?consignor.co_country:"");
  241 + $("#co_city").val(consignor.co_city?consignor.co_city:"");
  242 + $("#co_deltaname").val(consignor.co_deltaname?consignor.co_deltaname:"");
  243 + $("#co_name").val(consignor.co_name?consignor.co_name:"");
  244 + $("#co_fax").val(consignor.co_fax?consignor.co_fax:"");
  245 + $("#co_zipcode").val(consignor.co_zipcode?consignor.co_zipcode:"");
  246 + $("#shpaeo").val(consignor.shpaeo?consignor.shpaeo:"");
  247 + $("#shpcusid").val(consignor.shpcusid?consignor.shpcusid:"");
247 } 248 }
248 } 249 }
249 } 250 }
@@ -255,11 +256,11 @@ @@ -255,11 +256,11 @@
255 { 256 {
256 if(data.data) 257 if(data.data)
257 { 258 {
258 - select_data = data.data; 259 + consignorList = data.data;
259 for(var i = 0; i < data.data.length; i ++) 260 for(var i = 0; i < data.data.length; i ++)
260 { 261 {
261 var select = $("#fh_select"); 262 var select = $("#fh_select");
262 - select.append("<option value='"+i+"'>"+data.data[i].co_company+"</option>"); 263 + select.append("<option value='"+i+"'>"+consignorList[i].co_company+"</option>");
263 264
264 } 265 }
265 } 266 }
@@ -325,21 +326,22 @@ @@ -325,21 +326,22 @@
325 <!-- 收货信息 start --> 326 <!-- 收货信息 start -->
326 <tr> 327 <tr>
327 <td class="kv-label" colspan="1"><spring:message code="manifest.consignee" /></td> 328 <td class="kv-label" colspan="1"><spring:message code="manifest.consignee" /></td>
328 - <td class="kv-content" colspan="5"><select onchange="changeselect()" 329 + <td class="kv-content" colspan="5"><select onchange="changeConsigneeSelect()"
329 id="consignee_select"> 330 id="consignee_select">
330 <option value="-1">请选择</option> 331 <option value="-1">请选择</option>
331 </select> <script> 332 </select> <script>
332 - var select_data = null;  
333 - function changeselect(){  
334 - if(select_data != null) 333 + var consigneeList = null;
  334 + function changeConsigneeSelect(){
  335 + if(consigneeList != null)
335 { 336 {
336 var index = parseInt($("#consignee_select").find("option:selected").val()); 337 var index = parseInt($("#consignee_select").find("option:selected").val());
337 if(index >= 0) 338 if(index >= 0)
338 { 339 {
339 - $("#sh_company").val(select_data[index].code);  
340 - $("#sh_address").val(select_data[index].address);  
341 - $("#sh_telephone").val(select_data[index].tel);  
342 - $("#sh_country").val(select_data[index].name); 340 + var consignee = consigneeList[index];
  341 + $("#sh_company").val(consignee.code?consignee.code:"");
  342 + $("#sh_address").val(consignee.address?consignee.address:"");
  343 + $("#sh_telephone").val(consignee.tel?consignee.tel:"");
  344 + $("#sh_country").val(consignee.name?consignee.name:"");
343 } 345 }
344 } 346 }
345 } 347 }
@@ -350,11 +352,11 @@ @@ -350,11 +352,11 @@
350 { 352 {
351 if(data.data) 353 if(data.data)
352 { 354 {
353 - select_data = data.data; 355 + consigneeList = data.data;
354 for(var i = 0; i < data.data.length; i ++) 356 for(var i = 0; i < data.data.length; i ++)
355 { 357 {
356 var select = $("#consignee_select"); 358 var select = $("#consignee_select");
357 - select.append("<option value='"+i+"'>"+data.data[i].code+"</option>"); 359 + select.append("<option value='"+i+"'>"+consigneeList[i].code+"</option>");
358 360
359 } 361 }
360 } 362 }
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 xmlns="http://java.sun.com/xml/ns/javaee" 3 xmlns="http://java.sun.com/xml/ns/javaee"
4 xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" 4 xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
5 version="3.0"> 5 version="3.0">
6 - 6 +
7 <!-- shiro --> 7 <!-- shiro -->
8 <filter> 8 <filter>
9 <filter-name>shiroFilter</filter-name> 9 <filter-name>shiroFilter</filter-name>
@@ -17,18 +17,18 @@ @@ -17,18 +17,18 @@
17 <filter-name>shiroFilter</filter-name> 17 <filter-name>shiroFilter</filter-name>
18 <url-pattern>/*</url-pattern> 18 <url-pattern>/*</url-pattern>
19 </filter-mapping> 19 </filter-mapping>
20 -  
21 - 20 +
  21 +
22 <!-- 过滤拦截器 --> 22 <!-- 过滤拦截器 -->
23 <filter> 23 <filter>
24 - <filter-name>myshirofilter</filter-name>  
25 - <filter-class>com.agent.filter.MyShiroController</filter-class>  
26 - </filter> 24 + <filter-name>myshirofilter</filter-name>
  25 + <filter-class>com.agent.filter.MyShiroController</filter-class>
  26 + </filter>
27 <filter-mapping> 27 <filter-mapping>
28 - <filter-name>myshirofilter</filter-name>  
29 - <url-pattern>/*</url-pattern> 28 + <filter-name>myshirofilter</filter-name>
  29 + <url-pattern>/*</url-pattern>
30 </filter-mapping> 30 </filter-mapping>
31 - 31 +
32 <listener> 32 <listener>
33 <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> 33 <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
34 </listener> 34 </listener>
@@ -39,8 +39,8 @@ @@ -39,8 +39,8 @@
39 classpath:applicationContext-start.xml 39 classpath:applicationContext-start.xml
40 </param-value> 40 </param-value>
41 </context-param> 41 </context-param>
42 -  
43 - <!-- 单点登出 --> 42 +
  43 + <!-- 单点登出 -->
44 <listener> 44 <listener>
45 <listener-class>org.jasig.cas.client.session.SingleSignOutHttpSessionListener</listener-class> 45 <listener-class>org.jasig.cas.client.session.SingleSignOutHttpSessionListener</listener-class>
46 </listener> 46 </listener>
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 <filter-name>singleSignOutFilter</filter-name> 52 <filter-name>singleSignOutFilter</filter-name>
53 <url-pattern>/*</url-pattern> 53 <url-pattern>/*</url-pattern>
54 </filter-mapping> 54 </filter-mapping>
55 - 55 +
56 <!-- 编码 --> 56 <!-- 编码 -->
57 <filter> 57 <filter>
58 <filter-name>encodingFilter</filter-name> 58 <filter-name>encodingFilter</filter-name>
@@ -66,8 +66,8 @@ @@ -66,8 +66,8 @@
66 <filter-name>encodingFilter</filter-name> 66 <filter-name>encodingFilter</filter-name>
67 <url-pattern>/*</url-pattern> 67 <url-pattern>/*</url-pattern>
68 </filter-mapping> 68 </filter-mapping>
69 -  
70 - 69 +
  70 +
71 <!-- jpa 延迟加载 --> 71 <!-- jpa 延迟加载 -->
72 <filter> 72 <filter>
73 <filter-name>openEntityManagerInViewFilter</filter-name> 73 <filter-name>openEntityManagerInViewFilter</filter-name>
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 <filter-name>openEntityManagerInViewFilter</filter-name> 77 <filter-name>openEntityManagerInViewFilter</filter-name>
78 <url-pattern>/*</url-pattern> 78 <url-pattern>/*</url-pattern>
79 </filter-mapping> 79 </filter-mapping>
80 - 80 +
81 <!-- spring mvc --> 81 <!-- spring mvc -->
82 <servlet> 82 <servlet>
83 <servlet-name>webMvc</servlet-name> 83 <servlet-name>webMvc</servlet-name>
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 <servlet-name>webMvc</servlet-name> 92 <servlet-name>webMvc</servlet-name>
93 <url-pattern>/</url-pattern> 93 <url-pattern>/</url-pattern>
94 </servlet-mapping> 94 </servlet-mapping>
95 - 95 +
96 <!-- 支持标准的httpmethod 方法 --> 96 <!-- 支持标准的httpmethod 方法 -->
97 <filter> 97 <filter>
98 <filter-name>HttpMethodFilter</filter-name> 98 <filter-name>HttpMethodFilter</filter-name>
@@ -102,7 +102,7 @@ @@ -102,7 +102,7 @@
102 <filter-name>HttpMethodFilter</filter-name> 102 <filter-name>HttpMethodFilter</filter-name>
103 <url-pattern>/*</url-pattern> 103 <url-pattern>/*</url-pattern>
104 </filter-mapping> 104 </filter-mapping>
105 - 105 +
106 <!-- Druid 连接池 --> 106 <!-- Druid 连接池 -->
107 <filter> 107 <filter>
108 <filter-name>DruidWebStatFilter</filter-name> 108 <filter-name>DruidWebStatFilter</filter-name>
@@ -124,16 +124,16 @@ @@ -124,16 +124,16 @@
124 <servlet-name>DruidStatView</servlet-name> 124 <servlet-name>DruidStatView</servlet-name>
125 <url-pattern>/druid/*</url-pattern> 125 <url-pattern>/druid/*</url-pattern>
126 </servlet-mapping> 126 </servlet-mapping>
127 -  
128 - <error-page>  
129 - <error-code>404</error-code>  
130 - <location>/WEB-INF/views/login.jsp</location>  
131 - </error-page>  
132 -  
133 - <error-page>  
134 - <error-code>500</error-code>  
135 - <location>/WEB-INF/views/login.jsp</location>  
136 - </error-page>  
137 -  
138 - 127 +
  128 + <error-page>
  129 + <error-code>404</error-code>
  130 + <location>/WEB-INF/views/login.jsp</location>
  131 + </error-page>
  132 +
  133 + <error-page>
  134 + <error-code>500</error-code>
  135 + <location>/WEB-INF/views/login.jsp</location>
  136 + </error-page>
  137 +
  138 +
139 </web-app> 139 </web-app>