朱兆平 / agent · 提交

转到一个项目

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

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

内嵌 并排对比
正在显示 15 个修改的文件 包含 350 行增加 和 240 行删除
... ... @@ -35,6 +35,7 @@ import com.agent.entity.agent.PackageTypeEntity;
import com.agent.entity.agent.PreparesecondaryEntity;
import com.agent.entity.agent.PubDgEntity;
import com.agent.entity.agent.TBasCarrierEntity;
import com.agent.entity.agent.WaybillReceiptEntity;
import com.agent.entity.agent.WaybillReceiptType;
import com.agent.entity.system.UserEntity;
import com.agent.imf.agent.redis.RedisSaveMessage;
... ... @@ -354,6 +355,7 @@ public class ManifestController extends BasicController {
model.put("id", mawbId);
model.put("manifest", manifest);
model.put("pre", pre);
return model;
}
... ... @@ -544,6 +546,11 @@ public class ManifestController extends BasicController {
model.addAttribute("typeList", typeList);
request.setAttribute("version", System.currentTimeMillis());
// model.addAttribute("customsStatus",flag);
String waybill_no = manifest!=null?manifest.getWaybillnomaster():"";
WaybillReceiptEntity receipt = receiptService.findByWaybillNo(waybill_no);
request.setAttribute("receipt", receipt);
return "manifest/edit";
}
... ... @@ -658,6 +665,15 @@ public class ManifestController extends BasicController {
}
model.addAttribute("pre", pre);
request.setAttribute("version", System.currentTimeMillis());
String waybill_no = manifest!=null?manifest.getWaybillnomaster():"";
String sub_waybill_no = "";
if(pre!=null&&pre.getWaybillnosecondary()!=null) {
sub_waybill_no = pre.getWaybillnosecondary();
}
WaybillReceiptEntity receipt = receiptService.findByWaybillNoAndSub(waybill_no, sub_waybill_no);
request.setAttribute("receipt", receipt);
return "manifest/sub_edit";
}
... ...
... ... @@ -149,8 +149,8 @@ public class LoginController {
UserEntity user = new UserEntity();
user.setLoginaccount(loginAccount);
user.setPassword(password);
if (!loginAccount.equals("admin")) // 远程登录
{
if (!loginAccount.equals("admin")) {
// 远程登录
// 用户数据
LoginData login = FLogin.login(user);
// 登录成功！
... ...
... ... @@ -17,142 +17,141 @@ import com.agent.entity.BasicEntity;
@Table(name = "sys_user")
public class UserEntity extends BasicEntity {
/**
* 登录账号
*/
private String loginaccount;
/**
* 密码
*/
private String password;
/**
* 姓名
*/
private String realName;
/**
* 手机号码
*/
private String mobile;
/**
* 邮箱
*/
private String email;
/**
* 角色
*/
private RoleEntity role;
/**
* 上次登录时间
*/
private Date lastLoginTime;
/**
* 用户描述
*/
private String description;
/**
* 0 未启用 1启用
*/
private int status = 0;
/**
* 代理人
*/
private Long agent;
@Column(name = "loginaccount", nullable = false, length = 20)
public String getLoginaccount() {
return loginaccount;
}
public void setLoginaccount(String loginaccount) {
this.loginaccount = loginaccount;
}
@Column(name = "password", nullable = false)
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
@Column(name = "mobile", length = 20)
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
@JsonIgnore
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "role")
public RoleEntity getRole() {
return role;
}
public void setRole(RoleEntity role) {
this.role = role;
}
@Column(name = "realName", length = 20, nullable = false)
public String getRealName() {
return realName;
}
public void setRealName(String realName) {
this.realName = realName;
}
public Date getLastLoginTime() {
return lastLoginTime;
}
public void setLastLoginTime(Date lastLoginTime) {
this.lastLoginTime = lastLoginTime;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
@Column(name = "AGENT_ID")
public Long getAgent() {
return agent;
}
public void setAgent(Long agent) {
this.agent = agent;
}
/**
* 登录账号
*/
private String loginaccount;
/**
* 密码
*/
private String password;
/**
* 姓名
*/
private String realName;
/**
* 手机号码
*/
private String mobile;
/**
* 邮箱
*/
private String email;
/**
* 角色
*/
private RoleEntity role;
/**
* 上次登录时间
*/
private Date lastLoginTime;
/**
* 用户描述
*/
private String description;
/**
* 0 未启用 1启用
*/
private int status = 0;
/**
* 代理人
*/
private Long agent;
@Column(name = "loginaccount", nullable = false, length = 20)
public String getLoginaccount() {
return loginaccount;
}
public void setLoginaccount(String loginaccount) {
this.loginaccount = loginaccount;
}
@Column(name = "password", nullable = false)
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
@Column(name = "mobile", length = 20)
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
@JsonIgnore
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "role")
public RoleEntity getRole() {
return role;
}
public void setRole(RoleEntity role) {
this.role = role;
}
@Column(name = "realName", length = 20, nullable = false)
public String getRealName() {
return realName;
}
public void setRealName(String realName) {
this.realName = realName;
}
public Date getLastLoginTime() {
return lastLoginTime;
}
public void setLastLoginTime(Date lastLoginTime) {
this.lastLoginTime = lastLoginTime;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
@Column(name = "AGENT_ID")
public Long getAgent() {
return agent;
}
public void setAgent(Long agent) {
this.agent = agent;
}
}
... ...
... ... @@ -183,8 +183,10 @@ public class FSXmlKit {
sliMasterConsignment.setSpecifiedLogisticsTransportMovement(transport);
HandlingInstructions handlingInstructions = new HandlingInstructions();
handlingInstructions.setDescriptionCode(me.getSpecialgoodscode());
handlingInstructions.setDescription(me.getSpecialgoodscode());
//特货代码
// handlingInstructions.setDescriptionCode(me.getSpecialgoodscode()!=null?me.getSpecialgoodscode():"");
//特货描述
// handlingInstructions.setDescription(me.getSpecialgoods);
sliMasterConsignment.setHandlingInstructions(handlingInstructions);
AssociatedReferenceDocument associatedReferenceDocument = new AssociatedReferenceDocument();
... ...
... ... @@ -7,67 +7,52 @@ import java.lang.reflect.Method;
import com.alibaba.fastjson.JSONObject;
public class FJSON {
//讲一个json字符串转换成一个对象
public static void JsonToObject(Object obj, String str){
// 讲一个json字符串转换成一个对象
public static void JsonToObject(Object obj, String str) {
Field[] field = obj.getClass().getDeclaredFields();
JSONObject jsonObj = JSONObject.parseObject(str);
for(int i = 0; i < field.length; i ++)
{
for (int i = 0; i < field.length; i++) {
String name = field[i].getName();
String setter = name.substring(0, 1).toUpperCase()+name.substring(1);
String type = field[i].getGenericType().toString(); //获取属性类型
String setter = name.substring(0, 1).toUpperCase() + name.substring(1);
String type = field[i].getGenericType().toString(); // 获取属性类型
try {
Method[] ms = obj.getClass().getMethods(); //获取setter函数
for(int j = 0; j < ms.length; j ++)
{
//找到了方法
if(ms[j].getName().substring(0, 3).equals("set") && ms[j].getName().substring(3).equals(setter))
{
Method[] ms = obj.getClass().getMethods(); // 获取setter函数
for (int j = 0; j < ms.length; j++) {
// 找到了方法
if (ms[j].getName().substring(0, 3).equals("set") && ms[j].getName().substring(3).equals(setter)) {
Method m = ms[j];
//System.out.println("type:"+type);
if(type.equals("class java.lang.String"))
{
// System.out.println("type:"+type);
if (type.equals("class java.lang.String")) {
String value = jsonObj.getString(name);
if(value != null && value.length() > 0)
if (value != null && value.length() > 0)
m.invoke(obj, value);
else
{
else {
value = null;
m.invoke(obj, value);
}
}
else if(type.equals("class java.lang.Integer") || type.equals("int"))
{
} else if (type.equals("class java.lang.Integer") || type.equals("int")) {
String value = jsonObj.getString(name);
if(value != null && value.length() > 0)
if (value != null && value.length() > 0)
m.invoke(obj, Integer.parseInt(value));
}
else if(type.equals("class java.lang.Long") || type.equals("long"))
{
} else if (type.equals("class java.lang.Long") || type.equals("long")) {
String value = jsonObj.getString(name);
System.out.println(value);
if(value != null && value.length() > 0)
if (value != null && value.length() > 0)
m.invoke(obj, Long.parseLong(value));
}
else if(type.equals("class java.lang.Boolean"))
{
} else if (type.equals("class java.lang.Boolean")) {
}
break;
}
}
} catch (SecurityException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (IllegalAccessException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (IllegalArgumentException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (InvocationTargetException e) {
// TODO Auto-generated catch block
e.printStackTrace();
e.printStackTrace();
}
}
}
... ...
package login;
import java.util.HashMap;
import java.util.Map;
... ... @@ -10,66 +9,68 @@ import com.alibaba.fastjson.JSONObject;
import tools.HttpTools;
public class FLogin {
public static LoginData login(UserEntity user){
public static LoginData login(UserEntity user) {
LoginData logindata = new LoginData();
InfoData info = new InfoData();
String param = "ssid=5672813&data=";
InterfaceData id = new InterfaceData();
id.setKey("owenkasduf");
//id.setUsername("wangshan");
//id.setPwd("123456");
// id.setUsername("wangshan");
// id.setPwd("123456");
id.setUsername(user.getLoginaccount());
id.setPwd(user.getPassword());
id.setType("2");
//System.out.println(Security.getKey());
//构造请求数据包(并且加密data数据)
// System.out.println(Security.getKey());
// 构造请求数据包(并且加密data数据)
String data = Security.encrypt(JSONObject.toJSONString(id), Security.getKey());
param = param + data;
System.out.println(param);
//发送登录消息
//String receive = HttpRequest.sendPost("http://10.50.2.24/index.php?r=api/index", param);
//String receive = HttpRequest.sendPost("http://10.50.2.20/index.php?r=api/index", param);
//String receive = HttpRequest.sendPost("http://www.zzcargo.com/index.php?r=api/index", param);
// System.err.println("param-->"+param);
// 发送登录消息
// String receive =
// HttpRequest.sendPost("http://10.50.2.24/index.php?r=api/index", param);
// String receive =
// HttpRequest.sendPost("http://10.50.2.20/index.php?r=api/index", param);
// String receive =
// HttpRequest.sendPost("http://www.zzcargo.com/index.php?r=api/index", param);
Map<String, String> map = new HashMap<String, String>();
map.put("ssid", "5672813");
map.put("data", data);
String receive = HttpTools.sendPost("http://www.zzcargo.com/index.php?r=api/index", map, "UTF-8");
///index.php?r=site/login
System.out.println(receive);
try{
//转换接收到的数据
/// index.php?r=site/login
// System.err.println("receive-->"+receive);
try {
// 转换接收到的数据
FJSON.JsonToObject(logindata, receive);
//验证通过
if(logindata.getCode() == 20000)
{
//对传回的数据解密
// 验证通过
if (logindata.getCode() == 20000) {
// 对传回的数据解密
String raw = Security.decrypt(logindata.getInfo(), Security.getKey());
//show message
//System.out.println(raw);
// show message
// System.err.println("raw-->"+raw);
logindata.setInfo(raw);
//将解密后的数据转回json
// 将解密后的数据转回json
FJSON.JsonToObject(info, logindata.getInfo());
logindata.setInfodata(info);
}
}catch(Exception e){
//数据返回异常
} catch (Exception e) {
// 数据返回异常
logindata.setCode(0);
}
//测试的数据
// InfoData id = new InfoData();
//
// id.setMobile("fadf");
// id.setCompany_info("flasdjf");
// id.setQq("fasdf");
// id.setContact("fffffffff");
// id.setAddress("fafda");
// id.setCompany("fafdadf");
// logindata.setCode(20000);
// logindata.setInfodata(id);
// 测试的数据
// InfoData id = new InfoData();
//
// id.setMobile("fadf");
// id.setCompany_info("flasdjf");
// id.setQq("fasdf");
// id.setContact("fffffffff");
// id.setAddress("fafda");
// id.setCompany("fafdadf");
// logindata.setCode(20000);
// logindata.setInfodata(id);
return logindata;
}
}
... ...
... ... @@ -15,90 +15,117 @@ public class InfoData {
private String regposition;
private String nature;
private String postcode;
public String getCompany() {
return company;
}
public void setCompany(String company) {
this.company = company;
}
public String getContact() {
return contact;
}
public void setContact(String contact) {
this.contact = contact;
}
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getTel() {
return tel;
}
public void setTel(String tel) {
this.tel = tel;
}
public String getCompany_logo() {
return company_logo;
}
public void setCompany_logo(String company_logo) {
this.company_logo = company_logo;
}
public String getCompany_info() {
return company_info;
}
public void setCompany_info(String company_info) {
this.company_info = company_info;
}
public String getQq() {
return qq;
}
public void setQq(String qq) {
this.qq = qq;
}
public String getBank() {
return bank;
}
public void setBank(String bank) {
this.bank = bank;
}
public String getBankno() {
return bankno;
}
public void setBankno(String bankno) {
this.bankno = bankno;
}
public String getRate() {
return rate;
}
public void setRate(String rate) {
this.rate = rate;
}
public String getRegposition() {
return regposition;
}
public void setRegposition(String regposition) {
this.regposition = regposition;
}
public String getNature() {
return nature;
}
public void setNature(String nature) {
this.nature = nature;
}
public String getPostcode() {
return postcode;
}
public void setPostcode(String postcode) {
this.postcode = postcode;
}
}
... ...
... ... @@ -5,27 +5,35 @@ public class InterfaceData {
private String username;
private String pwd;
private String type;
public String getKey() {
return key;
}
public void setKey(String key) {
this.key = key;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getPwd() {
return pwd;
}
public void setPwd(String pwd) {
this.pwd = pwd;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
... ...
... ... @@ -218,6 +218,8 @@ delivery.delivery.type=Delivery type
delivery.departure.station=Departure Station
delivery.name.of.goods=Name of goods
delivery.ground.handling=Ground handling at Zhengzhou Airport
delivery.customs.receipt.response=Status of Customs
delivery.customs.receipt.time=Time of Status
#
... ...
... ... @@ -219,6 +219,8 @@ delivery.delivery.type=\u4ea4\u8fd0\u7c7b\u578b
delivery.departure.station=\u59cb\u53d1\u7ad9
delivery.name.of.goods=\u8d27\u7269\u54c1\u540d
delivery.ground.handling=\u90d1\u5dde\u673a\u573a\u5730\u9762\u5904\u7406
delivery.customs.receipt.response=\u6D77\u5173\u53CD\u9988\u72B6\u6001
delivery.customs.receipt.time=\u6D77\u5173\u53CD\u9988\u65F6\u95F4
#
... ...
... ... @@ -46,11 +46,13 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
rows : 10
},
success:function(data){
console.log(data);
/* console.log("login()-->"+JSON.stringify(data)); */
}
});
}
login();
function doLogin(){
var userName = $("#userName").val();
var password = $("#password").val();
... ... @@ -69,8 +71,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
tips: [1, '#0FA6D8'] //还可配置颜色
});
return false;
}
else{
}else{
jQuery.post("<%=basePath %>doLogin",{loginAccount:userName,password:password},function(result){
if(result.status == 200){
sessionStorage.removeItem("menuid");
... ...
... ... @@ -174,6 +174,7 @@
class="required_span">*</span></td>
<td class="kv-content"><input required class="delivery number" id="totalpiece" maxlength="8"
name="totalpiece" type="text" value="${manifest.totalpiece}"
onkeyup="value=value.replace(/[^\d]/g,'') " ng-pattern="/[^a-zA-Z]/"
oninput="onInputChange(event,'totalpiece','oninput')"
onpropertychange="onInputChange(event,'totalpiece','onpropertychange')"></td>
... ... @@ -181,6 +182,7 @@
class="required_span">*</span></td>
<td class="kv-content"><input required class="delivery number" id="totalweight" maxlength="15"
name="totalweight" type="text" value="${manifest.totalweight}"
onkeyup="value=value.replace(/[^\d\.]/g,'') " ng-pattern="/[^a-zA-Z]/"
oninput="onInputChange(event,'totalweight','oninput')"
onpropertychange="onInputChange(event,'totalweight','onpropertychange')"></td>
<td class="kv-label"><spring:message code="manifest.customs" /><span
... ... @@ -212,7 +214,7 @@
</td>
<td class="kv-label"><spring:message code="manifest.customs.status" /><span
class="required_span">*</span></td>
<td class="kv-content"><select id="customsstatus" name="customsstatus" required>
<td class="kv-content" colspan="3"><select id="customsstatus" name="customsstatus" required>
<%-- <option value=""><spring:message code="opt.select" /></option> --%>
<option value="001"
<c:if test="${manifest.customsstatus == 001 }">selected="selected"</c:if>><spring:message
... ... @@ -245,10 +247,19 @@
<tr>
<td class="kv-label"><spring:message code="delivery.productname" /><span
class="required_span">*</span></td>
<td class="kv-content" colspan="5"><textarea required id="productname"
name="productname" maxlength="200"
oninput="onInputChange(event,'productname','oninput')"
onpropertychange="onInputChange(event,'productname','onpropertychange')">${manifest.productname}</textarea></td>
<td class="kv-content" colspan="3">
<input required id="productname" name="productname" maxlength="200" type="text" style="width: 96%;"
oninput="onInputChange(event,'productname','oninput')" value="${manifest.productname}"
onpropertychange="onInputChange(event,'productname','onpropertychange')" />
</td>
<td class="kv-label"><spring:message code="delivery.special.cargo.code" /></td>
<td class="kv-content">
<input id="specialgoodscode" name="specialgoodscode" maxlength="20" type="text"
oninput="onInputChange(event,'specialgoodscode','oninput')" value="${manifest.specialgoodscode}"
onpropertychange="onInputChange(event,'specialgoodscode','onpropertychange')"/>
</td>
</tr>
<%-- <tr>
<td class="kv-label"><spring:message code="manifest.agent.name" /></td>
... ... @@ -662,6 +673,19 @@
<td class="kv-content" colspan="5"><textarea id="de_remarks" name="de_remarks">${manifest.de_remarks }</textarea>
</td>
</tr>
<tr>
<td class="kv-label"><spring:message code="delivery.customs.receipt.time" /></td>
<td class="kv-content" colspan="1">
<span>${receipt.createDate}</span>
</td>
<td class="kv-label"><spring:message code="delivery.customs.receipt.response" /></td>
<td class="kv-content" colspan="3">
<span>${receipt.response_text}</span>
</td>
</tr>
<tr>
<td colspan="6">
<div class="opt-buttons" style="padding-top: 20px;" id="divsubmit">
... ...
... ... @@ -72,8 +72,9 @@
<!--弹出层引入的JS-->
<script type="text/javascript" src="<%=basePath %>resource/layer-v3.0.3/layer/layer.js"></script>
<script type="text/javascript">
function formatFlightDate(value, row, index){
return row.flightdate.split(" ")[0];
return row.flightdate.split(" ")[0];
}
function appendCarrier(value, row, index) {
... ... @@ -165,9 +166,9 @@
res = '<span style="color:green;">'+value+'</span>';
}else{
// 未通过或者未回执
var start_exception_ = value.indexOf("分单");
var start_exception_ = value.indexOf("主单");
if(start_exception_>-1||start_exception_>-1){
var start_exception_1 = value.indexOf("分单");
var start_exception_2 = value.indexOf("主单");
if(start_exception_1>-1||start_exception_2>-1){
//没有回执
res = '<span style="color:black;">'+value+'</span>';
}else{
... ...
... ... @@ -153,7 +153,8 @@
<td class="kv-label"><spring:message code="manifest.pre.weight" /><span
class="required_span">*</span></td>
<td class="kv-content"><input required class="delivery number" id="totalweight" maxlength="15"
name="totalweight" type="text" value="${pre.totalweight}"
name="totalweight" type="text" value="${pre.totalweight}"
onkeyup="value=value.replace(/[^\d\.]/g,'') " ng-pattern="/[^a-zA-Z]/"
oninput="onInputChange(event,'totalweight','oninput')"
onpropertychange="onInputChange(event,'totalweight','onpropertychange')"> <input
id="wei" disabled="disabled"></td>
... ... @@ -213,10 +214,11 @@
<tr>
<td class="kv-label"><spring:message code="delivery.productname" /><span
class="required_span">*</span></td>
<td class="kv-content" colspan="5"><textarea required id="productname"
name="productname" maxlength="200"
oninput="onInputChange(event,'productname','oninput')"
onpropertychange="onInputChange(event,'productname','onpropertychange')">${pre.productname}</textarea></td>
<td class="kv-content" colspan="5">
<input required id="productname" name="productname" maxlength="200" type="text" style="width: 96%;"
oninput="onInputChange(event,'productname','oninput')" value="${pre.productname}"
onpropertychange="onInputChange(event,'productname','onpropertychange')"/>
</td>
</tr>
<%-- <tr>
<td class="kv-label"><spring:message code="manifest.agent.name" /></td>
... ... @@ -606,6 +608,19 @@
<td class="kv-content" colspan="5"><textarea id="de_remarks" name="de_remarks">${pre.de_remarks }</textarea>
</td>
</tr>
<tr>
<td class="kv-label"><spring:message code="delivery.customs.receipt.time" /></td>
<td class="kv-content" colspan="1">
<span>${receipt.createDate}</span>
</td>
<td class="kv-label"><spring:message code="delivery.customs.receipt.response" /></td>
<td class="kv-content" colspan="3">
<span>${receipt.response_text}</span>
</td>
</tr>
<tr>
<td colspan="6">
<div class="opt-buttons" style="padding-top: 20px;" id="divsubmit">
... ... @@ -866,9 +881,18 @@
$.post("<%=basePath%>manifest/presavesend",data,function(data){
parent.layer.close(layerIndex);
if(data.status==200){
window.location.href="<%=basePath%>manifest/list";
parent.layer.confirm('舱单数据发送成功？', {
btn: ['完成并返回', '继续添加分单']
}, function(index, layero){
/* 完成并返回 */
parent.layer.close(index);
window.location.href="<%=basePath%>manifest/list";
}, function(index){
/* 继续添加下一票 */
parent.layer.close(index);
window.location.href="<%=basePath %>manifest/subedit?mawbId=${manifest.id}";
});
}else{
layer.open({content:""+data.msg});
}
... ...
... ... @@ -37,11 +37,29 @@
</thead>
<tbody>
<c:forEach var="data" items="${dataList}" varStatus="status">
<tr>
<c:if test="${fn:indexOf(data.response_text,'运抵')==-1}">
<!-- 预配回执 -->
<tr style="background-color: #ffffff;">
</c:if>
<c:if test="${fn:indexOf(data.response_text,'运抵')>-1}">
<!-- 运抵回执 -->
<tr style="background-color: #dbd8d8;">
</c:if>
<td>${data.createDate}</td>
<td>${data.carrier}${data.flightno}</td>
<td>${data.piece}</td>
<td>${data.weight}</td>
<c:if test="${fn:indexOf(data.response_text,'运抵')==-1}">
<!-- 预配回执 -->
<td>${data.piece}</td>
<td>${data.weight}</td>
</c:if>
<c:if test="${fn:indexOf(data.response_text,'运抵')>-1}">
<!-- 运抵回执 -->
<td colspan="2" align="center"><span style="color: black;font-size: 14px;font: bold;">运抵回执</span> </td>
</c:if>
<td>
<c:choose>
<c:when test="${fn:indexOf(data.response_text,'41301')>-1}">
... ...