朱兆平 / agent · 提交

转到一个项目

作者 Kevin
提交 97b19b21638295890878454dd2f72c8a59761a4e 1 个父辈 8f691f2e

增加添加下一票按钮入口，增加特货代码输入；

内嵌 并排对比
正在显示 15 个修改的文件 包含 350 行增加 和 240 行删除
@@ -35,6 +35,7 @@ import com.agent.entity.agent.PackageTypeEntity; @@ -35,6 +35,7 @@ import com.agent.entity.agent.PackageTypeEntity;
35 import com.agent.entity.agent.PreparesecondaryEntity; 35 import com.agent.entity.agent.PreparesecondaryEntity;
36 import com.agent.entity.agent.PubDgEntity; 36 import com.agent.entity.agent.PubDgEntity;
37 import com.agent.entity.agent.TBasCarrierEntity; 37 import com.agent.entity.agent.TBasCarrierEntity;
  38 +import com.agent.entity.agent.WaybillReceiptEntity;
38 import com.agent.entity.agent.WaybillReceiptType; 39 import com.agent.entity.agent.WaybillReceiptType;
39 import com.agent.entity.system.UserEntity; 40 import com.agent.entity.system.UserEntity;
40 import com.agent.imf.agent.redis.RedisSaveMessage; 41 import com.agent.imf.agent.redis.RedisSaveMessage;
@@ -354,6 +355,7 @@ public class ManifestController extends BasicController { @@ -354,6 +355,7 @@ public class ManifestController extends BasicController {
354 model.put("id", mawbId); 355 model.put("id", mawbId);
355 model.put("manifest", manifest); 356 model.put("manifest", manifest);
356 model.put("pre", pre); 357 model.put("pre", pre);
  358 +
357 return model; 359 return model;
358 } 360 }
359 361
@@ -544,6 +546,11 @@ public class ManifestController extends BasicController { @@ -544,6 +546,11 @@ public class ManifestController extends BasicController {
544 model.addAttribute("typeList", typeList); 546 model.addAttribute("typeList", typeList);
545 request.setAttribute("version", System.currentTimeMillis()); 547 request.setAttribute("version", System.currentTimeMillis());
546 // model.addAttribute("customsStatus",flag); 548 // model.addAttribute("customsStatus",flag);
  549 +
  550 + String waybill_no = manifest!=null?manifest.getWaybillnomaster():"";
  551 + WaybillReceiptEntity receipt = receiptService.findByWaybillNo(waybill_no);
  552 + request.setAttribute("receipt", receipt);
  553 +
547 return "manifest/edit"; 554 return "manifest/edit";
548 } 555 }
549 556
@@ -658,6 +665,15 @@ public class ManifestController extends BasicController { @@ -658,6 +665,15 @@ public class ManifestController extends BasicController {
658 } 665 }
659 model.addAttribute("pre", pre); 666 model.addAttribute("pre", pre);
660 request.setAttribute("version", System.currentTimeMillis()); 667 request.setAttribute("version", System.currentTimeMillis());
  668 +
  669 + String waybill_no = manifest!=null?manifest.getWaybillnomaster():"";
  670 + String sub_waybill_no = "";
  671 + if(pre!=null&&pre.getWaybillnosecondary()!=null) {
  672 + sub_waybill_no = pre.getWaybillnosecondary();
  673 + }
  674 + WaybillReceiptEntity receipt = receiptService.findByWaybillNoAndSub(waybill_no, sub_waybill_no);
  675 + request.setAttribute("receipt", receipt);
  676 +
661 return "manifest/sub_edit"; 677 return "manifest/sub_edit";
662 } 678 }
663 679
@@ -149,8 +149,8 @@ public class LoginController { @@ -149,8 +149,8 @@ public class LoginController {
149 UserEntity user = new UserEntity(); 149 UserEntity user = new UserEntity();
150 user.setLoginaccount(loginAccount); 150 user.setLoginaccount(loginAccount);
151 user.setPassword(password); 151 user.setPassword(password);
152 - if (!loginAccount.equals("admin")) // 远程登录  
153 - { 152 + if (!loginAccount.equals("admin")) {
  153 + // 远程登录
154 // 用户数据 154 // 用户数据
155 LoginData login = FLogin.login(user); 155 LoginData login = FLogin.login(user);
156 // 登录成功！ 156 // 登录成功！
@@ -17,142 +17,141 @@ import com.agent.entity.BasicEntity; @@ -17,142 +17,141 @@ import com.agent.entity.BasicEntity;
17 @Table(name = "sys_user") 17 @Table(name = "sys_user")
18 public class UserEntity extends BasicEntity { 18 public class UserEntity extends BasicEntity {
19 19
20 - /**  
21 - * 登录账号  
22 - */  
23 - private String loginaccount;  
24 -  
25 - /**  
26 - * 密码  
27 - */  
28 - private String password;  
29 -  
30 - /**  
31 - * 姓名  
32 - */  
33 - private String realName;  
34 -  
35 - /**  
36 - * 手机号码  
37 - */  
38 - private String mobile;  
39 -  
40 - /**  
41 - * 邮箱  
42 - */  
43 - private String email;  
44 -  
45 - /**  
46 - * 角色  
47 - */  
48 - private RoleEntity role;  
49 -  
50 - /**  
51 - * 上次登录时间  
52 - */  
53 - private Date lastLoginTime;  
54 -  
55 - /**  
56 - * 用户描述  
57 - */  
58 - private String description;  
59 -  
60 -  
61 - /**  
62 - * 0 未启用 1启用  
63 - */  
64 - private int status = 0;  
65 -  
66 - /**  
67 - * 代理人  
68 - */  
69 - private Long agent;  
70 -  
71 - @Column(name = "loginaccount", nullable = false, length = 20)  
72 - public String getLoginaccount() {  
73 - return loginaccount;  
74 - }  
75 -  
76 - public void setLoginaccount(String loginaccount) {  
77 - this.loginaccount = loginaccount;  
78 - }  
79 -  
80 - @Column(name = "password", nullable = false)  
81 - public String getPassword() {  
82 - return password;  
83 - }  
84 -  
85 - public void setPassword(String password) {  
86 - this.password = password;  
87 - }  
88 -  
89 - @Column(name = "mobile", length = 20)  
90 - public String getMobile() {  
91 - return mobile;  
92 - }  
93 -  
94 - public void setMobile(String mobile) {  
95 - this.mobile = mobile;  
96 - }  
97 -  
98 - @JsonIgnore  
99 - @ManyToOne(fetch = FetchType.LAZY)  
100 - @JoinColumn(name = "role")  
101 - public RoleEntity getRole() {  
102 - return role;  
103 - }  
104 -  
105 - public void setRole(RoleEntity role) {  
106 - this.role = role;  
107 - }  
108 -  
109 - @Column(name = "realName", length = 20, nullable = false)  
110 - public String getRealName() {  
111 - return realName;  
112 - }  
113 -  
114 - public void setRealName(String realName) {  
115 - this.realName = realName;  
116 - }  
117 -  
118 - public Date getLastLoginTime() {  
119 - return lastLoginTime;  
120 - }  
121 -  
122 - public void setLastLoginTime(Date lastLoginTime) {  
123 - this.lastLoginTime = lastLoginTime;  
124 - }  
125 -  
126 - public String getDescription() {  
127 - return description;  
128 - }  
129 -  
130 - public void setDescription(String description) {  
131 - this.description = description;  
132 - }  
133 -  
134 - public String getEmail() {  
135 - return email;  
136 - }  
137 -  
138 - public void setEmail(String email) {  
139 - this.email = email;  
140 - }  
141 -  
142 - public int getStatus() {  
143 - return status;  
144 - }  
145 -  
146 - public void setStatus(int status) {  
147 - this.status = status;  
148 - }  
149 -  
150 - @Column(name = "AGENT_ID")  
151 - public Long getAgent() {  
152 - return agent;  
153 - }  
154 -  
155 - public void setAgent(Long agent) {  
156 - this.agent = agent;  
157 - } 20 + /**
  21 + * 登录账号
  22 + */
  23 + private String loginaccount;
  24 +
  25 + /**
  26 + * 密码
  27 + */
  28 + private String password;
  29 +
  30 + /**
  31 + * 姓名
  32 + */
  33 + private String realName;
  34 +
  35 + /**
  36 + * 手机号码
  37 + */
  38 + private String mobile;
  39 +
  40 + /**
  41 + * 邮箱
  42 + */
  43 + private String email;
  44 +
  45 + /**
  46 + * 角色
  47 + */
  48 + private RoleEntity role;
  49 +
  50 + /**
  51 + * 上次登录时间
  52 + */
  53 + private Date lastLoginTime;
  54 +
  55 + /**
  56 + * 用户描述
  57 + */
  58 + private String description;
  59 +
  60 + /**
  61 + * 0 未启用 1启用
  62 + */
  63 + private int status = 0;
  64 +
  65 + /**
  66 + * 代理人
  67 + */
  68 + private Long agent;
  69 +
  70 + @Column(name = "loginaccount", nullable = false, length = 20)
  71 + public String getLoginaccount() {
  72 + return loginaccount;
  73 + }
  74 +
  75 + public void setLoginaccount(String loginaccount) {
  76 + this.loginaccount = loginaccount;
  77 + }
  78 +
  79 + @Column(name = "password", nullable = false)
  80 + public String getPassword() {
  81 + return password;
  82 + }
  83 +
  84 + public void setPassword(String password) {
  85 + this.password = password;
  86 + }
  87 +
  88 + @Column(name = "mobile", length = 20)
  89 + public String getMobile() {
  90 + return mobile;
  91 + }
  92 +
  93 + public void setMobile(String mobile) {
  94 + this.mobile = mobile;
  95 + }
  96 +
  97 + @JsonIgnore
  98 + @ManyToOne(fetch = FetchType.LAZY)
  99 + @JoinColumn(name = "role")
  100 + public RoleEntity getRole() {
  101 + return role;
  102 + }
  103 +
  104 + public void setRole(RoleEntity role) {
  105 + this.role = role;
  106 + }
  107 +
  108 + @Column(name = "realName", length = 20, nullable = false)
  109 + public String getRealName() {
  110 + return realName;
  111 + }
  112 +
  113 + public void setRealName(String realName) {
  114 + this.realName = realName;
  115 + }
  116 +
  117 + public Date getLastLoginTime() {
  118 + return lastLoginTime;
  119 + }
  120 +
  121 + public void setLastLoginTime(Date lastLoginTime) {
  122 + this.lastLoginTime = lastLoginTime;
  123 + }
  124 +
  125 + public String getDescription() {
  126 + return description;
  127 + }
  128 +
  129 + public void setDescription(String description) {
  130 + this.description = description;
  131 + }
  132 +
  133 + public String getEmail() {
  134 + return email;
  135 + }
  136 +
  137 + public void setEmail(String email) {
  138 + this.email = email;
  139 + }
  140 +
  141 + public int getStatus() {
  142 + return status;
  143 + }
  144 +
  145 + public void setStatus(int status) {
  146 + this.status = status;
  147 + }
  148 +
  149 + @Column(name = "AGENT_ID")
  150 + public Long getAgent() {
  151 + return agent;
  152 + }
  153 +
  154 + public void setAgent(Long agent) {
  155 + this.agent = agent;
  156 + }
158 } 157 }
@@ -183,8 +183,10 @@ public class FSXmlKit { @@ -183,8 +183,10 @@ public class FSXmlKit {
183 sliMasterConsignment.setSpecifiedLogisticsTransportMovement(transport); 183 sliMasterConsignment.setSpecifiedLogisticsTransportMovement(transport);
184 184
185 HandlingInstructions handlingInstructions = new HandlingInstructions(); 185 HandlingInstructions handlingInstructions = new HandlingInstructions();
186 - handlingInstructions.setDescriptionCode(me.getSpecialgoodscode());  
187 - handlingInstructions.setDescription(me.getSpecialgoodscode()); 186 + //特货代码
  187 +// handlingInstructions.setDescriptionCode(me.getSpecialgoodscode()!=null?me.getSpecialgoodscode():"");
  188 + //特货描述
  189 +// handlingInstructions.setDescription(me.getSpecialgoods);
188 sliMasterConsignment.setHandlingInstructions(handlingInstructions); 190 sliMasterConsignment.setHandlingInstructions(handlingInstructions);
189 191
190 AssociatedReferenceDocument associatedReferenceDocument = new AssociatedReferenceDocument(); 192 AssociatedReferenceDocument associatedReferenceDocument = new AssociatedReferenceDocument();
@@ -7,67 +7,52 @@ import java.lang.reflect.Method; @@ -7,67 +7,52 @@ import java.lang.reflect.Method;
7 import com.alibaba.fastjson.JSONObject; 7 import com.alibaba.fastjson.JSONObject;
8 8
9 public class FJSON { 9 public class FJSON {
10 - //讲一个json字符串转换成一个对象  
11 - public static void JsonToObject(Object obj, String str){ 10 + // 讲一个json字符串转换成一个对象
  11 + public static void JsonToObject(Object obj, String str) {
12 Field[] field = obj.getClass().getDeclaredFields(); 12 Field[] field = obj.getClass().getDeclaredFields();
13 JSONObject jsonObj = JSONObject.parseObject(str); 13 JSONObject jsonObj = JSONObject.parseObject(str);
14 - for(int i = 0; i < field.length; i ++)  
15 - { 14 + for (int i = 0; i < field.length; i++) {
16 String name = field[i].getName(); 15 String name = field[i].getName();
17 - String setter = name.substring(0, 1).toUpperCase()+name.substring(1);  
18 - String type = field[i].getGenericType().toString(); //获取属性类型 16 + String setter = name.substring(0, 1).toUpperCase() + name.substring(1);
  17 + String type = field[i].getGenericType().toString(); // 获取属性类型
19 try { 18 try {
20 - Method[] ms = obj.getClass().getMethods(); //获取setter函数  
21 - for(int j = 0; j < ms.length; j ++)  
22 - {  
23 - //找到了方法  
24 - if(ms[j].getName().substring(0, 3).equals("set") && ms[j].getName().substring(3).equals(setter))  
25 - { 19 + Method[] ms = obj.getClass().getMethods(); // 获取setter函数
  20 + for (int j = 0; j < ms.length; j++) {
  21 + // 找到了方法
  22 + if (ms[j].getName().substring(0, 3).equals("set") && ms[j].getName().substring(3).equals(setter)) {
26 Method m = ms[j]; 23 Method m = ms[j];
27 - //System.out.println("type:"+type);  
28 - if(type.equals("class java.lang.String"))  
29 - { 24 + // System.out.println("type:"+type);
  25 + if (type.equals("class java.lang.String")) {
30 String value = jsonObj.getString(name); 26 String value = jsonObj.getString(name);
31 - if(value != null && value.length() > 0) 27 + if (value != null && value.length() > 0)
32 m.invoke(obj, value); 28 m.invoke(obj, value);
33 - else  
34 - { 29 + else {
35 value = null; 30 value = null;
36 m.invoke(obj, value); 31 m.invoke(obj, value);
37 } 32 }
38 - }  
39 - else if(type.equals("class java.lang.Integer") || type.equals("int"))  
40 - { 33 + } else if (type.equals("class java.lang.Integer") || type.equals("int")) {
41 String value = jsonObj.getString(name); 34 String value = jsonObj.getString(name);
42 - if(value != null && value.length() > 0) 35 + if (value != null && value.length() > 0)
43 m.invoke(obj, Integer.parseInt(value)); 36 m.invoke(obj, Integer.parseInt(value));
44 - }  
45 - else if(type.equals("class java.lang.Long") || type.equals("long"))  
46 - { 37 + } else if (type.equals("class java.lang.Long") || type.equals("long")) {
47 String value = jsonObj.getString(name); 38 String value = jsonObj.getString(name);
48 System.out.println(value); 39 System.out.println(value);
49 - if(value != null && value.length() > 0) 40 + if (value != null && value.length() > 0)
50 m.invoke(obj, Long.parseLong(value)); 41 m.invoke(obj, Long.parseLong(value));
51 - }  
52 - else if(type.equals("class java.lang.Boolean"))  
53 - {  
54 - 42 + } else if (type.equals("class java.lang.Boolean")) {
  43 +
55 } 44 }
56 break; 45 break;
57 } 46 }
58 } 47 }
59 } catch (SecurityException e) { 48 } catch (SecurityException e) {
60 - // TODO Auto-generated catch block  
61 e.printStackTrace(); 49 e.printStackTrace();
62 } catch (IllegalAccessException e) { 50 } catch (IllegalAccessException e) {
63 - // TODO Auto-generated catch block  
64 e.printStackTrace(); 51 e.printStackTrace();
65 } catch (IllegalArgumentException e) { 52 } catch (IllegalArgumentException e) {
66 - // TODO Auto-generated catch block  
67 e.printStackTrace(); 53 e.printStackTrace();
68 } catch (InvocationTargetException e) { 54 } catch (InvocationTargetException e) {
69 - // TODO Auto-generated catch block  
70 - e.printStackTrace(); 55 + e.printStackTrace();
71 } 56 }
72 } 57 }
73 } 58 }
1 package login; 1 package login;
2 2
3 -  
4 import java.util.HashMap; 3 import java.util.HashMap;
5 import java.util.Map; 4 import java.util.Map;
6 5
@@ -10,66 +9,68 @@ import com.alibaba.fastjson.JSONObject; @@ -10,66 +9,68 @@ import com.alibaba.fastjson.JSONObject;
10 import tools.HttpTools; 9 import tools.HttpTools;
11 10
12 public class FLogin { 11 public class FLogin {
13 - public static LoginData login(UserEntity user){ 12 + public static LoginData login(UserEntity user) {
14 LoginData logindata = new LoginData(); 13 LoginData logindata = new LoginData();
15 - 14 +
16 InfoData info = new InfoData(); 15 InfoData info = new InfoData();
17 String param = "ssid=5672813&data="; 16 String param = "ssid=5672813&data=";
18 InterfaceData id = new InterfaceData(); 17 InterfaceData id = new InterfaceData();
19 id.setKey("owenkasduf"); 18 id.setKey("owenkasduf");
20 - //id.setUsername("wangshan");  
21 - //id.setPwd("123456"); 19 + // id.setUsername("wangshan");
  20 + // id.setPwd("123456");
22 id.setUsername(user.getLoginaccount()); 21 id.setUsername(user.getLoginaccount());
23 id.setPwd(user.getPassword()); 22 id.setPwd(user.getPassword());
24 id.setType("2"); 23 id.setType("2");
25 - //System.out.println(Security.getKey());  
26 - //构造请求数据包(并且加密data数据) 24 + // System.out.println(Security.getKey());
  25 + // 构造请求数据包(并且加密data数据)
27 String data = Security.encrypt(JSONObject.toJSONString(id), Security.getKey()); 26 String data = Security.encrypt(JSONObject.toJSONString(id), Security.getKey());
28 param = param + data; 27 param = param + data;
29 - System.out.println(param);  
30 - //发送登录消息  
31 - //String receive = HttpRequest.sendPost("http://10.50.2.24/index.php?r=api/index", param);  
32 - //String receive = HttpRequest.sendPost("http://10.50.2.20/index.php?r=api/index", param);  
33 - //String receive = HttpRequest.sendPost("http://www.zzcargo.com/index.php?r=api/index", param);  
34 - 28 + // System.err.println("param-->"+param);
  29 + // 发送登录消息
  30 + // String receive =
  31 + // HttpRequest.sendPost("http://10.50.2.24/index.php?r=api/index", param);
  32 + // String receive =
  33 + // HttpRequest.sendPost("http://10.50.2.20/index.php?r=api/index", param);
  34 + // String receive =
  35 + // HttpRequest.sendPost("http://www.zzcargo.com/index.php?r=api/index", param);
  36 +
35 Map<String, String> map = new HashMap<String, String>(); 37 Map<String, String> map = new HashMap<String, String>();
36 map.put("ssid", "5672813"); 38 map.put("ssid", "5672813");
37 map.put("data", data); 39 map.put("data", data);
38 String receive = HttpTools.sendPost("http://www.zzcargo.com/index.php?r=api/index", map, "UTF-8"); 40 String receive = HttpTools.sendPost("http://www.zzcargo.com/index.php?r=api/index", map, "UTF-8");
39 - ///index.php?r=site/login  
40 - System.out.println(receive);  
41 - try{  
42 - //转换接收到的数据 41 + /// index.php?r=site/login
  42 +// System.err.println("receive-->"+receive);
  43 + try {
  44 + // 转换接收到的数据
43 FJSON.JsonToObject(logindata, receive); 45 FJSON.JsonToObject(logindata, receive);
44 - //验证通过  
45 - if(logindata.getCode() == 20000)  
46 - {  
47 - //对传回的数据解密 46 + // 验证通过
  47 + if (logindata.getCode() == 20000) {
  48 + // 对传回的数据解密
48 String raw = Security.decrypt(logindata.getInfo(), Security.getKey()); 49 String raw = Security.decrypt(logindata.getInfo(), Security.getKey());
49 - //show message  
50 - //System.out.println(raw);  
51 - 50 + // show message
  51 +// System.err.println("raw-->"+raw);
  52 +
52 logindata.setInfo(raw); 53 logindata.setInfo(raw);
53 - //将解密后的数据转回json 54 + // 将解密后的数据转回json
54 FJSON.JsonToObject(info, logindata.getInfo()); 55 FJSON.JsonToObject(info, logindata.getInfo());
55 logindata.setInfodata(info); 56 logindata.setInfodata(info);
56 } 57 }
57 - }catch(Exception e){  
58 - //数据返回异常 58 + } catch (Exception e) {
  59 + // 数据返回异常
59 logindata.setCode(0); 60 logindata.setCode(0);
60 - 61 +
61 } 62 }
62 - //测试的数据  
63 -// InfoData id = new InfoData();  
64 -//  
65 -// id.setMobile("fadf");  
66 -// id.setCompany_info("flasdjf");  
67 -// id.setQq("fasdf");  
68 -// id.setContact("fffffffff");  
69 -// id.setAddress("fafda");  
70 -// id.setCompany("fafdadf");  
71 -// logindata.setCode(20000);  
72 -// logindata.setInfodata(id); 63 + // 测试的数据
  64 + // InfoData id = new InfoData();
  65 + //
  66 + // id.setMobile("fadf");
  67 + // id.setCompany_info("flasdjf");
  68 + // id.setQq("fasdf");
  69 + // id.setContact("fffffffff");
  70 + // id.setAddress("fafda");
  71 + // id.setCompany("fafdadf");
  72 + // logindata.setCode(20000);
  73 + // logindata.setInfodata(id);
73 return logindata; 74 return logindata;
74 } 75 }
75 } 76 }
@@ -15,90 +15,117 @@ public class InfoData { @@ -15,90 +15,117 @@ public class InfoData {
15 private String regposition; 15 private String regposition;
16 private String nature; 16 private String nature;
17 private String postcode; 17 private String postcode;
18 - 18 +
19 public String getCompany() { 19 public String getCompany() {
20 return company; 20 return company;
21 } 21 }
  22 +
22 public void setCompany(String company) { 23 public void setCompany(String company) {
23 this.company = company; 24 this.company = company;
24 } 25 }
  26 +
25 public String getContact() { 27 public String getContact() {
26 return contact; 28 return contact;
27 } 29 }
  30 +
28 public void setContact(String contact) { 31 public void setContact(String contact) {
29 this.contact = contact; 32 this.contact = contact;
30 } 33 }
  34 +
31 public String getMobile() { 35 public String getMobile() {
32 return mobile; 36 return mobile;
33 } 37 }
  38 +
34 public void setMobile(String mobile) { 39 public void setMobile(String mobile) {
35 this.mobile = mobile; 40 this.mobile = mobile;
36 } 41 }
  42 +
37 public String getAddress() { 43 public String getAddress() {
38 return address; 44 return address;
39 } 45 }
  46 +
40 public void setAddress(String address) { 47 public void setAddress(String address) {
41 this.address = address; 48 this.address = address;
42 } 49 }
  50 +
43 public String getTel() { 51 public String getTel() {
44 return tel; 52 return tel;
45 } 53 }
  54 +
46 public void setTel(String tel) { 55 public void setTel(String tel) {
47 this.tel = tel; 56 this.tel = tel;
48 } 57 }
  58 +
49 public String getCompany_logo() { 59 public String getCompany_logo() {
50 return company_logo; 60 return company_logo;
51 } 61 }
  62 +
52 public void setCompany_logo(String company_logo) { 63 public void setCompany_logo(String company_logo) {
53 this.company_logo = company_logo; 64 this.company_logo = company_logo;
54 } 65 }
  66 +
55 public String getCompany_info() { 67 public String getCompany_info() {
56 return company_info; 68 return company_info;
57 } 69 }
  70 +
58 public void setCompany_info(String company_info) { 71 public void setCompany_info(String company_info) {
59 this.company_info = company_info; 72 this.company_info = company_info;
60 } 73 }
  74 +
61 public String getQq() { 75 public String getQq() {
62 return qq; 76 return qq;
63 } 77 }
  78 +
64 public void setQq(String qq) { 79 public void setQq(String qq) {
65 this.qq = qq; 80 this.qq = qq;
66 } 81 }
  82 +
67 public String getBank() { 83 public String getBank() {
68 return bank; 84 return bank;
69 } 85 }
  86 +
70 public void setBank(String bank) { 87 public void setBank(String bank) {
71 this.bank = bank; 88 this.bank = bank;
72 } 89 }
  90 +
73 public String getBankno() { 91 public String getBankno() {
74 return bankno; 92 return bankno;
75 } 93 }
  94 +
76 public void setBankno(String bankno) { 95 public void setBankno(String bankno) {
77 this.bankno = bankno; 96 this.bankno = bankno;
78 } 97 }
  98 +
79 public String getRate() { 99 public String getRate() {
80 return rate; 100 return rate;
81 } 101 }
  102 +
82 public void setRate(String rate) { 103 public void setRate(String rate) {
83 this.rate = rate; 104 this.rate = rate;
84 } 105 }
  106 +
85 public String getRegposition() { 107 public String getRegposition() {
86 return regposition; 108 return regposition;
87 } 109 }
  110 +
88 public void setRegposition(String regposition) { 111 public void setRegposition(String regposition) {
89 this.regposition = regposition; 112 this.regposition = regposition;
90 } 113 }
  114 +
91 public String getNature() { 115 public String getNature() {
92 return nature; 116 return nature;
93 } 117 }
  118 +
94 public void setNature(String nature) { 119 public void setNature(String nature) {
95 this.nature = nature; 120 this.nature = nature;
96 } 121 }
  122 +
97 public String getPostcode() { 123 public String getPostcode() {
98 return postcode; 124 return postcode;
99 } 125 }
  126 +
100 public void setPostcode(String postcode) { 127 public void setPostcode(String postcode) {
101 this.postcode = postcode; 128 this.postcode = postcode;
102 } 129 }
103 - 130 +
104 } 131 }
@@ -5,27 +5,35 @@ public class InterfaceData { @@ -5,27 +5,35 @@ public class InterfaceData {
5 private String username; 5 private String username;
6 private String pwd; 6 private String pwd;
7 private String type; 7 private String type;
  8 +
8 public String getKey() { 9 public String getKey() {
9 return key; 10 return key;
10 } 11 }
  12 +
11 public void setKey(String key) { 13 public void setKey(String key) {
12 this.key = key; 14 this.key = key;
13 } 15 }
  16 +
14 public String getUsername() { 17 public String getUsername() {
15 return username; 18 return username;
16 } 19 }
  20 +
17 public void setUsername(String username) { 21 public void setUsername(String username) {
18 this.username = username; 22 this.username = username;
19 } 23 }
  24 +
20 public String getPwd() { 25 public String getPwd() {
21 return pwd; 26 return pwd;
22 } 27 }
  28 +
23 public void setPwd(String pwd) { 29 public void setPwd(String pwd) {
24 this.pwd = pwd; 30 this.pwd = pwd;
25 } 31 }
  32 +
26 public String getType() { 33 public String getType() {
27 return type; 34 return type;
28 } 35 }
  36 +
29 public void setType(String type) { 37 public void setType(String type) {
30 this.type = type; 38 this.type = type;
31 } 39 }
@@ -218,6 +218,8 @@ delivery.delivery.type=Delivery type @@ -218,6 +218,8 @@ delivery.delivery.type=Delivery type
218 delivery.departure.station=Departure Station 218 delivery.departure.station=Departure Station
219 delivery.name.of.goods=Name of goods 219 delivery.name.of.goods=Name of goods
220 delivery.ground.handling=Ground handling at Zhengzhou Airport 220 delivery.ground.handling=Ground handling at Zhengzhou Airport
  221 +delivery.customs.receipt.response=Status of Customs
  222 +delivery.customs.receipt.time=Time of Status
221 # 223 #
222 224
223 225
@@ -219,6 +219,8 @@ delivery.delivery.type=\u4ea4\u8fd0\u7c7b\u578b @@ -219,6 +219,8 @@ delivery.delivery.type=\u4ea4\u8fd0\u7c7b\u578b
219 delivery.departure.station=\u59cb\u53d1\u7ad9 219 delivery.departure.station=\u59cb\u53d1\u7ad9
220 delivery.name.of.goods=\u8d27\u7269\u54c1\u540d 220 delivery.name.of.goods=\u8d27\u7269\u54c1\u540d
221 delivery.ground.handling=\u90d1\u5dde\u673a\u573a\u5730\u9762\u5904\u7406 221 delivery.ground.handling=\u90d1\u5dde\u673a\u573a\u5730\u9762\u5904\u7406
  222 +delivery.customs.receipt.response=\u6D77\u5173\u53CD\u9988\u72B6\u6001
  223 +delivery.customs.receipt.time=\u6D77\u5173\u53CD\u9988\u65F6\u95F4
222 # 224 #
223 225
224 226
@@ -46,11 +46,13 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. @@ -46,11 +46,13 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
46 rows : 10 46 rows : 10
47 }, 47 },
48 success:function(data){ 48 success:function(data){
49 - console.log(data); 49 + /* console.log("login()-->"+JSON.stringify(data)); */
50 } 50 }
51 }); 51 });
52 } 52 }
  53 +
53 login(); 54 login();
  55 +
54 function doLogin(){ 56 function doLogin(){
55 var userName = $("#userName").val(); 57 var userName = $("#userName").val();
56 var password = $("#password").val(); 58 var password = $("#password").val();
@@ -69,8 +71,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. @@ -69,8 +71,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
69 tips: [1, '#0FA6D8'] //还可配置颜色 71 tips: [1, '#0FA6D8'] //还可配置颜色
70 }); 72 });
71 return false; 73 return false;
72 - }  
73 - else{ 74 + }else{
74 jQuery.post("<%=basePath %>doLogin",{loginAccount:userName,password:password},function(result){ 75 jQuery.post("<%=basePath %>doLogin",{loginAccount:userName,password:password},function(result){
75 if(result.status == 200){ 76 if(result.status == 200){
76 sessionStorage.removeItem("menuid"); 77 sessionStorage.removeItem("menuid");
@@ -174,6 +174,7 @@ @@ -174,6 +174,7 @@
174 class="required_span">*</span></td> 174 class="required_span">*</span></td>
175 <td class="kv-content"><input required class="delivery number" id="totalpiece" maxlength="8" 175 <td class="kv-content"><input required class="delivery number" id="totalpiece" maxlength="8"
176 name="totalpiece" type="text" value="${manifest.totalpiece}" 176 name="totalpiece" type="text" value="${manifest.totalpiece}"
  177 + onkeyup="value=value.replace(/[^\d]/g,'') " ng-pattern="/[^a-zA-Z]/"
177 oninput="onInputChange(event,'totalpiece','oninput')" 178 oninput="onInputChange(event,'totalpiece','oninput')"
178 onpropertychange="onInputChange(event,'totalpiece','onpropertychange')"></td> 179 onpropertychange="onInputChange(event,'totalpiece','onpropertychange')"></td>
179 180
@@ -181,6 +182,7 @@ @@ -181,6 +182,7 @@
181 class="required_span">*</span></td> 182 class="required_span">*</span></td>
182 <td class="kv-content"><input required class="delivery number" id="totalweight" maxlength="15" 183 <td class="kv-content"><input required class="delivery number" id="totalweight" maxlength="15"
183 name="totalweight" type="text" value="${manifest.totalweight}" 184 name="totalweight" type="text" value="${manifest.totalweight}"
  185 + onkeyup="value=value.replace(/[^\d\.]/g,'') " ng-pattern="/[^a-zA-Z]/"
184 oninput="onInputChange(event,'totalweight','oninput')" 186 oninput="onInputChange(event,'totalweight','oninput')"
185 onpropertychange="onInputChange(event,'totalweight','onpropertychange')"></td> 187 onpropertychange="onInputChange(event,'totalweight','onpropertychange')"></td>
186 <td class="kv-label"><spring:message code="manifest.customs" /><span 188 <td class="kv-label"><spring:message code="manifest.customs" /><span
@@ -212,7 +214,7 @@ @@ -212,7 +214,7 @@
212 </td> 214 </td>
213 <td class="kv-label"><spring:message code="manifest.customs.status" /><span 215 <td class="kv-label"><spring:message code="manifest.customs.status" /><span
214 class="required_span">*</span></td> 216 class="required_span">*</span></td>
215 - <td class="kv-content"><select id="customsstatus" name="customsstatus" required> 217 + <td class="kv-content" colspan="3"><select id="customsstatus" name="customsstatus" required>
216 <%-- <option value=""><spring:message code="opt.select" /></option> --%> 218 <%-- <option value=""><spring:message code="opt.select" /></option> --%>
217 <option value="001" 219 <option value="001"
218 <c:if test="${manifest.customsstatus == 001 }">selected="selected"</c:if>><spring:message 220 <c:if test="${manifest.customsstatus == 001 }">selected="selected"</c:if>><spring:message
@@ -245,10 +247,19 @@ @@ -245,10 +247,19 @@
245 <tr> 247 <tr>
246 <td class="kv-label"><spring:message code="delivery.productname" /><span 248 <td class="kv-label"><spring:message code="delivery.productname" /><span
247 class="required_span">*</span></td> 249 class="required_span">*</span></td>
248 - <td class="kv-content" colspan="5"><textarea required id="productname"  
249 - name="productname" maxlength="200"  
250 - oninput="onInputChange(event,'productname','oninput')"  
251 - onpropertychange="onInputChange(event,'productname','onpropertychange')">${manifest.productname}</textarea></td> 250 + <td class="kv-content" colspan="3">
  251 + <input required id="productname" name="productname" maxlength="200" type="text" style="width: 96%;"
  252 + oninput="onInputChange(event,'productname','oninput')" value="${manifest.productname}"
  253 + onpropertychange="onInputChange(event,'productname','onpropertychange')" />
  254 + </td>
  255 +
  256 + <td class="kv-label"><spring:message code="delivery.special.cargo.code" /></td>
  257 + <td class="kv-content">
  258 + <input id="specialgoodscode" name="specialgoodscode" maxlength="20" type="text"
  259 + oninput="onInputChange(event,'specialgoodscode','oninput')" value="${manifest.specialgoodscode}"
  260 + onpropertychange="onInputChange(event,'specialgoodscode','onpropertychange')"/>
  261 + </td>
  262 +
252 </tr> 263 </tr>
253 <%-- <tr> 264 <%-- <tr>
254 <td class="kv-label"><spring:message code="manifest.agent.name" /></td> 265 <td class="kv-label"><spring:message code="manifest.agent.name" /></td>
@@ -662,6 +673,19 @@ @@ -662,6 +673,19 @@
662 <td class="kv-content" colspan="5"><textarea id="de_remarks" name="de_remarks">${manifest.de_remarks }</textarea> 673 <td class="kv-content" colspan="5"><textarea id="de_remarks" name="de_remarks">${manifest.de_remarks }</textarea>
663 </td> 674 </td>
664 </tr> 675 </tr>
  676 +
  677 + <tr>
  678 + <td class="kv-label"><spring:message code="delivery.customs.receipt.time" /></td>
  679 + <td class="kv-content" colspan="1">
  680 + <span>${receipt.createDate}</span>
  681 + </td>
  682 +
  683 + <td class="kv-label"><spring:message code="delivery.customs.receipt.response" /></td>
  684 + <td class="kv-content" colspan="3">
  685 + <span>${receipt.response_text}</span>
  686 + </td>
  687 + </tr>
  688 +
665 <tr> 689 <tr>
666 <td colspan="6"> 690 <td colspan="6">
667 <div class="opt-buttons" style="padding-top: 20px;" id="divsubmit"> 691 <div class="opt-buttons" style="padding-top: 20px;" id="divsubmit">
@@ -72,8 +72,9 @@ @@ -72,8 +72,9 @@
72 <!--弹出层引入的JS--> 72 <!--弹出层引入的JS-->
73 <script type="text/javascript" src="<%=basePath %>resource/layer-v3.0.3/layer/layer.js"></script> 73 <script type="text/javascript" src="<%=basePath %>resource/layer-v3.0.3/layer/layer.js"></script>
74 <script type="text/javascript"> 74 <script type="text/javascript">
  75 +
75 function formatFlightDate(value, row, index){ 76 function formatFlightDate(value, row, index){
76 - return row.flightdate.split(" ")[0]; 77 + return row.flightdate.split(" ")[0];
77 } 78 }
78 79
79 function appendCarrier(value, row, index) { 80 function appendCarrier(value, row, index) {
@@ -165,9 +166,9 @@ @@ -165,9 +166,9 @@
165 res = '<span style="color:green;">'+value+'</span>'; 166 res = '<span style="color:green;">'+value+'</span>';
166 }else{ 167 }else{
167 // 未通过或者未回执 168 // 未通过或者未回执
168 - var start_exception_ = value.indexOf("分单");  
169 - var start_exception_ = value.indexOf("主单");  
170 - if(start_exception_>-1||start_exception_>-1){ 169 + var start_exception_1 = value.indexOf("分单");
  170 + var start_exception_2 = value.indexOf("主单");
  171 + if(start_exception_1>-1||start_exception_2>-1){
171 //没有回执 172 //没有回执
172 res = '<span style="color:black;">'+value+'</span>'; 173 res = '<span style="color:black;">'+value+'</span>';
173 }else{ 174 }else{
@@ -153,7 +153,8 @@ @@ -153,7 +153,8 @@
153 <td class="kv-label"><spring:message code="manifest.pre.weight" /><span 153 <td class="kv-label"><spring:message code="manifest.pre.weight" /><span
154 class="required_span">*</span></td> 154 class="required_span">*</span></td>
155 <td class="kv-content"><input required class="delivery number" id="totalweight" maxlength="15" 155 <td class="kv-content"><input required class="delivery number" id="totalweight" maxlength="15"
156 - name="totalweight" type="text" value="${pre.totalweight}" 156 + name="totalweight" type="text" value="${pre.totalweight}"
  157 + onkeyup="value=value.replace(/[^\d\.]/g,'') " ng-pattern="/[^a-zA-Z]/"
157 oninput="onInputChange(event,'totalweight','oninput')" 158 oninput="onInputChange(event,'totalweight','oninput')"
158 onpropertychange="onInputChange(event,'totalweight','onpropertychange')"> <input 159 onpropertychange="onInputChange(event,'totalweight','onpropertychange')"> <input
159 id="wei" disabled="disabled"></td> 160 id="wei" disabled="disabled"></td>
@@ -213,10 +214,11 @@ @@ -213,10 +214,11 @@
213 <tr> 214 <tr>
214 <td class="kv-label"><spring:message code="delivery.productname" /><span 215 <td class="kv-label"><spring:message code="delivery.productname" /><span
215 class="required_span">*</span></td> 216 class="required_span">*</span></td>
216 - <td class="kv-content" colspan="5"><textarea required id="productname"  
217 - name="productname" maxlength="200"  
218 - oninput="onInputChange(event,'productname','oninput')"  
219 - onpropertychange="onInputChange(event,'productname','onpropertychange')">${pre.productname}</textarea></td> 217 + <td class="kv-content" colspan="5">
  218 + <input required id="productname" name="productname" maxlength="200" type="text" style="width: 96%;"
  219 + oninput="onInputChange(event,'productname','oninput')" value="${pre.productname}"
  220 + onpropertychange="onInputChange(event,'productname','onpropertychange')"/>
  221 + </td>
220 </tr> 222 </tr>
221 <%-- <tr> 223 <%-- <tr>
222 <td class="kv-label"><spring:message code="manifest.agent.name" /></td> 224 <td class="kv-label"><spring:message code="manifest.agent.name" /></td>
@@ -606,6 +608,19 @@ @@ -606,6 +608,19 @@
606 <td class="kv-content" colspan="5"><textarea id="de_remarks" name="de_remarks">${pre.de_remarks }</textarea> 608 <td class="kv-content" colspan="5"><textarea id="de_remarks" name="de_remarks">${pre.de_remarks }</textarea>
607 </td> 609 </td>
608 </tr> 610 </tr>
  611 +
  612 + <tr>
  613 + <td class="kv-label"><spring:message code="delivery.customs.receipt.time" /></td>
  614 + <td class="kv-content" colspan="1">
  615 + <span>${receipt.createDate}</span>
  616 + </td>
  617 +
  618 + <td class="kv-label"><spring:message code="delivery.customs.receipt.response" /></td>
  619 + <td class="kv-content" colspan="3">
  620 + <span>${receipt.response_text}</span>
  621 + </td>
  622 + </tr>
  623 +
609 <tr> 624 <tr>
610 <td colspan="6"> 625 <td colspan="6">
611 <div class="opt-buttons" style="padding-top: 20px;" id="divsubmit"> 626 <div class="opt-buttons" style="padding-top: 20px;" id="divsubmit">
@@ -866,9 +881,18 @@ @@ -866,9 +881,18 @@
866 881
867 $.post("<%=basePath%>manifest/presavesend",data,function(data){ 882 $.post("<%=basePath%>manifest/presavesend",data,function(data){
868 parent.layer.close(layerIndex); 883 parent.layer.close(layerIndex);
869 -  
870 if(data.status==200){ 884 if(data.status==200){
871 - window.location.href="<%=basePath%>manifest/list"; 885 + parent.layer.confirm('舱单数据发送成功？', {
  886 + btn: ['完成并返回', '继续添加分单']
  887 + }, function(index, layero){
  888 + /* 完成并返回 */
  889 + parent.layer.close(index);
  890 + window.location.href="<%=basePath%>manifest/list";
  891 + }, function(index){
  892 + /* 继续添加下一票 */
  893 + parent.layer.close(index);
  894 + window.location.href="<%=basePath %>manifest/subedit?mawbId=${manifest.id}";
  895 + });
872 }else{ 896 }else{
873 layer.open({content:""+data.msg}); 897 layer.open({content:""+data.msg});
874 } 898 }
@@ -37,11 +37,29 @@ @@ -37,11 +37,29 @@
37 </thead> 37 </thead>
38 <tbody> 38 <tbody>
39 <c:forEach var="data" items="${dataList}" varStatus="status"> 39 <c:forEach var="data" items="${dataList}" varStatus="status">
40 - <tr> 40 + <c:if test="${fn:indexOf(data.response_text,'运抵')==-1}">
  41 + <!-- 预配回执 -->
  42 + <tr style="background-color: #ffffff;">
  43 + </c:if>
  44 +
  45 + <c:if test="${fn:indexOf(data.response_text,'运抵')>-1}">
  46 + <!-- 运抵回执 -->
  47 + <tr style="background-color: #dbd8d8;">
  48 + </c:if>
  49 +
41 <td>${data.createDate}</td> 50 <td>${data.createDate}</td>
42 <td>${data.carrier}${data.flightno}</td> 51 <td>${data.carrier}${data.flightno}</td>
43 - <td>${data.piece}</td>  
44 - <td>${data.weight}</td> 52 + <c:if test="${fn:indexOf(data.response_text,'运抵')==-1}">
  53 + <!-- 预配回执 -->
  54 + <td>${data.piece}</td>
  55 + <td>${data.weight}</td>
  56 + </c:if>
  57 +
  58 + <c:if test="${fn:indexOf(data.response_text,'运抵')>-1}">
  59 + <!-- 运抵回执 -->
  60 + <td colspan="2" align="center"><span style="color: black;font-size: 14px;font: bold;">运抵回执</span> </td>
  61 + </c:if>
  62 +
45 <td> 63 <td>
46 <c:choose> 64 <c:choose>
47 <c:when test="${fn:indexOf(data.response_text,'41301')>-1}"> 65 <c:when test="${fn:indexOf(data.response_text,'41301')>-1}">