1、过滤航班号和地址中的特殊字符；

2、兼容剪切板中带有空格的主单号；
3、修复分单中灰色提示区域的重量多为小数点以及出现科学计算数的bug；
4、修复舱单列表中信息显示不全的bug；

@@ -36,9 +36,9 @@ public class ConsigneeController extends BasicController{
 //		pageForm.parseData(consigneeService.getPage(pageForm));
 //		pageForm.parseData(consigneeService.getPage(pageForm));
 //		return pageForm.getData();
 //		return pageForm.getData();
 		
 		
-		int page = NumKit.parseString2Int(request.getParameter("page"));
+		int page = NumKit.parseInt(request.getParameter("page"));
 		page = page<1?1:page;
 		page = page<1?1:page;
-		int rows = NumKit.parseString2Int(request.getParameter("rows"));
+		int rows = NumKit.parseInt(request.getParameter("rows"));
 		rows = rows<1?10:rows;
 		rows = rows<1?10:rows;
 		
 		
 		List<ConsigneeEntity> list = consigneeService.list(page, rows);
 		List<ConsigneeEntity> list = consigneeService.list(page, rows);

@@ -162,7 +162,7 @@ public class ManifestController extends BasicController {
 			searchParams.put("EQ_USER_ID", Tools.getUserId());
 			searchParams.put("EQ_USER_ID", Tools.getUserId());
 		}
 		}
 		pageForm.setSearchParams(searchParams);
 		pageForm.setSearchParams(searchParams);
-		
+
 		pageForm.parseData(manifestService.getPage(pageForm));
 		pageForm.parseData(manifestService.getPage(pageForm));
 		return pageForm.getData();
 		return pageForm.getData();
 	}
 	}
@@ -439,7 +439,7 @@ public class ManifestController extends BasicController {
 		if (ue != null) {
 		if (ue != null) {
 			Long u = ue.getId();
 			Long u = ue.getId();
 			Set<String> sk = pageForm.getSearchParams().keySet();
 			Set<String> sk = pageForm.getSearchParams().keySet();
-			
+
 			if (Tools.getUserId() != null && Tools.getUserId() != 1) {
 			if (Tools.getUserId() != null && Tools.getUserId() != 1) {
 				// 不是管理员,添加用户id的条件
 				// 不是管理员,添加用户id的条件
 				pageForm.getSearchParams().put("EQ_USER_ID", u);
 				pageForm.getSearchParams().put("EQ_USER_ID", u);
@@ -461,12 +461,12 @@ public class ManifestController extends BasicController {
 	@ResponseBody
 	@ResponseBody
 	public List<ManifestEntity> infor(String id, Model model) {
 	public List<ManifestEntity> infor(String id, Model model) {
 		List<ManifestEntity> li = null;
 		List<ManifestEntity> li = null;
-		if(Tools.getUserId()!=null&&Tools.getUserId().longValue()==1) {
+		if (Tools.getUserId() != null && Tools.getUserId().longValue() == 1) {
 			li = manifestService.queryAll();
 			li = manifestService.queryAll();
-		}else {
+		} else {
 			li = manifestService.queryByUserId(Tools.getUserId());
 			li = manifestService.queryByUserId(Tools.getUserId());
 		}
 		}
-		
+
 		List<ManifestEntity> result = new FemyList();
 		List<ManifestEntity> result = new FemyList();
 		for (ManifestEntity me : li) {
 		for (ManifestEntity me : li) {
 			if (result.contains(me)) {
 			if (result.contains(me)) {
@@ -506,7 +506,7 @@ public class ManifestController extends BasicController {
 	 * @return
 	 * @return
 	 */
 	 */
 	@RequestMapping(value = "/edit")
 	@RequestMapping(value = "/edit")
-	public String edit(Long id, Model model) {
+	public String edit(HttpServletRequest request, Long id, Model model) {
 		ManifestEntity manifest = null;
 		ManifestEntity manifest = null;
 		// 判断是否是便捷
 		// 判断是否是便捷
 		if (id != null) {
 		if (id != null) {
@@ -521,7 +521,7 @@ public class ManifestController extends BasicController {
 			{
 			{
 				manifest = new ManifestEntity();
 				manifest = new ManifestEntity();
 				manifest.setAgentcompany(agent.getNameCn());
 				manifest.setAgentcompany(agent.getNameCn());
-				manifest.setAgentman(null); // 设置代理人名称为null
+				manifest.setAgentman(""); // 设置代理人名称为null
 			}
 			}
 		}
 		}
 		model.addAttribute("manifest", manifest);
 		model.addAttribute("manifest", manifest);
@@ -542,7 +542,7 @@ public class ManifestController extends BasicController {
 		// 包装种类
 		// 包装种类
 		List<PackageTypeEntity> typeList = packageTypeService.findAll();
 		List<PackageTypeEntity> typeList = packageTypeService.findAll();
 		model.addAttribute("typeList", typeList);
 		model.addAttribute("typeList", typeList);
-
+		request.setAttribute("version", System.currentTimeMillis());
 		// model.addAttribute("customsStatus",flag);
 		// model.addAttribute("customsStatus",flag);
 		return "manifest/edit";
 		return "manifest/edit";
 	}
 	}
@@ -595,7 +595,7 @@ public class ManifestController extends BasicController {
 	 * @return
 	 * @return
 	 */
 	 */
 	@RequestMapping(value = "/subedit", method = { RequestMethod.GET })
 	@RequestMapping(value = "/subedit", method = { RequestMethod.GET })
-	private String subedit(Long id, Long mawbId, String type, Model model) {
+	private String subedit(HttpServletRequest request, Long id, Long mawbId, String type, Model model) {
 		ManifestEntity manifest = null;
 		ManifestEntity manifest = null;
 		List<PreparesecondaryEntity> preparesecondaryList = null;
 		List<PreparesecondaryEntity> preparesecondaryList = null;
 		PreparesecondaryEntity pre = null;
 		PreparesecondaryEntity pre = null;
@@ -603,6 +603,7 @@ public class ManifestController extends BasicController {
 		if (mawbId != null) {
 		if (mawbId != null) {
 			manifest = manifestService.findOne(mawbId);
 			manifest = manifestService.findOne(mawbId);
 			pre = preparesecondaryServer.findOne(mawbId);
 			pre = preparesecondaryServer.findOne(mawbId);
+
 			preparesecondaryList = preparesecondaryServer.findAll(manifest.getId());
 			preparesecondaryList = preparesecondaryServer.findAll(manifest.getId());
 			if (preparesecondaryList.isEmpty()) {
 			if (preparesecondaryList.isEmpty()) {
 				str = calculate(manifest);
 				str = calculate(manifest);
@@ -612,6 +613,7 @@ public class ManifestController extends BasicController {
 		}
 		}
 		if (id != null) {
 		if (id != null) {
 			pre = preparesecondaryServer.findOne(id);
 			pre = preparesecondaryServer.findOne(id);
+
 			manifest = manifestService.findOne(pre.getPreparemasterid());
 			manifest = manifestService.findOne(pre.getPreparemasterid());
 			preparesecondaryList = preparesecondaryServer.findAll(manifest.getId());
 			preparesecondaryList = preparesecondaryServer.findAll(manifest.getId());
 			if (preparesecondaryList.isEmpty()) {
 			if (preparesecondaryList.isEmpty()) {
@@ -647,42 +649,62 @@ public class ManifestController extends BasicController {
 		model.addAttribute("is_strs", str);
 		model.addAttribute("is_strs", str);
 		model.addAttribute("id", mawbId);
 		model.addAttribute("id", mawbId);
 		model.addAttribute("manifest", manifest);
 		model.addAttribute("manifest", manifest);
+
+		if (pre == null) {
+			pre = new PreparesecondaryEntity();
+			pre.setCarrier(manifest.getCarrier());
+			pre.setFlightdate(manifest.getFlightdate());
+			pre.setFlightno(manifest.getFlightno());
+		}
 		model.addAttribute("pre", pre);
 		model.addAttribute("pre", pre);
+		request.setAttribute("version", System.currentTimeMillis());
 		return "manifest/sub_edit";
 		return "manifest/sub_edit";
 	}
 	}
 
 
 	// 计算 运单件数 运单重量 预配件数 预配重量
 	// 计算 运单件数 运单重量 预配件数 预配重量
 	private String calculates(ManifestEntity manifest, List<PreparesecondaryEntity> preparesecondaryList) {
 	private String calculates(ManifestEntity manifest, List<PreparesecondaryEntity> preparesecondaryList) {
+		if (manifest == null || preparesecondaryList == null || preparesecondaryList.isEmpty()) {
+			System.err.println("calculate() manifest or preparesecondaryList is null");
+			return "";
+		}
+
 		int pp = 0;
 		int pp = 0;
-		int tw = 0;
+		float tw = 0;
 		int tp = 0;
 		int tp = 0;
-		int pw = 0;
+		float pw = 0;
 
 
 		for (PreparesecondaryEntity pre : preparesecondaryList) {
 		for (PreparesecondaryEntity pre : preparesecondaryList) {
-			pp += Integer.parseInt(pre.getPreparepiece());
-			tw += Integer.parseInt(pre.getTotalweight());
-			tp += Integer.parseInt(pre.getTotalpiece());
-			pw += Integer.parseInt(pre.getPrepareweight());
+			pp += NumKit.parseInt(pre.getPreparepiece());
+			tw += NumKit.parseFloat(pre.getTotalweight());
+			tp += NumKit.parseInt(pre.getTotalpiece());
+			pw += NumKit.parseFloat(pre.getPrepareweight());
 		}
 		}
 
 
-		int zpp = Integer.parseInt(manifest.getPreparetotalpiece()) - pp;
-		int ztw = Integer.parseInt(manifest.getTotalweight()) - tw;
-		int ztp = Integer.parseInt(manifest.getTotalpiece()) - tp;
-		int zpw = Integer.parseInt(manifest.getPreparetotalweight()) - pw;
+		int zpp = NumKit.parseInt(manifest.getPreparetotalpiece()) - pp;
+		float ztw = NumKit.parseFloat(manifest.getTotalweight()) - tw;
+		ztw = ztw < 0 ? 0 : ztw;
+		int ztp = NumKit.parseInt(manifest.getTotalpiece()) - tp;
+		float zpw = NumKit.parseFloat(manifest.getPreparetotalweight()) - pw;
+		zpw = zpw < 0 ? 0 : zpw;
 
 
 		String str = "{";
 		String str = "{";
 		str += "\"id\":\"" + manifest.getId() + "\",";
 		str += "\"id\":\"" + manifest.getId() + "\",";
 		str += "\"waybillnomaster\":\"" + manifest.getWaybillnomaster() + "\",";
 		str += "\"waybillnomaster\":\"" + manifest.getWaybillnomaster() + "\",";
 		str += "\"totalpiece\":\"" + ztp + "\",";
 		str += "\"totalpiece\":\"" + ztp + "\",";
-		str += "\"totalweight\":\"" + ztw + "\",";
+		str += "\"totalweight\":\"" + NumKit.formatNumber(String.valueOf(ztw), 2) + "\",";
 		str += "\"preparetotalpiece\":\"" + zpp + "\",";
 		str += "\"preparetotalpiece\":\"" + zpp + "\",";
-		str += "\"preparetotalweight\":\"" + zpw + "\"";
+		str += "\"preparetotalweight\":\"" + NumKit.formatNumber(String.valueOf(zpw), 2) + "\"";
 		str += "}";
 		str += "}";
 		return str;
 		return str;
 	}
 	}
 
 
 	// 计算 运单件数 运单重量 预配件数 预配重量
 	// 计算 运单件数 运单重量 预配件数 预配重量
 	private String calculate(ManifestEntity manifest) {
 	private String calculate(ManifestEntity manifest) {
+		if (manifest == null) {
+			System.err.println("calculate() manifest is null");
+			return "";
+		}
+
 		String str = "{";
 		String str = "{";
 		str += "\"id\":\"" + manifest.getId() + "\",";
 		str += "\"id\":\"" + manifest.getId() + "\",";
 		str += "\"waybillnomaster\":\"" + manifest.getWaybillnomaster() + "\",";
 		str += "\"waybillnomaster\":\"" + manifest.getWaybillnomaster() + "\",";
@@ -766,6 +788,15 @@ public class ManifestController extends BasicController {
 	@RequestMapping(value = "/save", method = { RequestMethod.POST })
 	@RequestMapping(value = "/save", method = { RequestMethod.POST })
 	@ResponseBody
 	@ResponseBody
 	public ResponseModel save(ManifestEntity manifest, HttpServletRequest reuqest) {
 	public ResponseModel save(ManifestEntity manifest, HttpServletRequest reuqest) {
+		String flightno = manifest.getFlightno();
+		String carrier = "";
+		if (StringUtils.isNotBlank(flightno) && flightno.length() > 2) {
+			carrier = flightno.substring(0, 2);
+			flightno = flightno.replace(carrier, "");
+		}
+		manifest.setCarrier(carrier);
+		manifest.setFlightno(flightno);
+
 		consignorService.saveFromManifest(manifest, Tools.getUserId());
 		consignorService.saveFromManifest(manifest, Tools.getUserId());
 
 
 		ResponseModel model = new ResponseModel();
 		ResponseModel model = new ResponseModel();
@@ -786,6 +817,8 @@ public class ManifestController extends BasicController {
 				model.setData(manifest);
 				model.setData(manifest);
 				model.setStatus(200);
 				model.setStatus(200);
 				model.setMsg(HttpJsonMsg.SUCCESS);
 				model.setMsg(HttpJsonMsg.SUCCESS);
+
+				receiptService.saveFromManifest(manifest, WaybillReceiptType.TEMP_SAVE);
 			}
 			}
 		} catch (Exception e) {
 		} catch (Exception e) {
 			model.setStatus(500);
 			model.setStatus(500);
@@ -853,6 +886,15 @@ public class ManifestController extends BasicController {
 	@RequestMapping(value = "/savesend", method = { RequestMethod.POST })
 	@RequestMapping(value = "/savesend", method = { RequestMethod.POST })
 	@ResponseBody
 	@ResponseBody
 	public ResponseModel savesend(ManifestEntity manifest, HttpServletRequest request, HttpServletResponse response) {
 	public ResponseModel savesend(ManifestEntity manifest, HttpServletRequest request, HttpServletResponse response) {
+		String flightno = manifest.getFlightno();
+		String carrier = "";
+		if (StringUtils.isNotBlank(flightno) && flightno.length() > 2) {
+			carrier = flightno.substring(0, 2);
+			flightno = flightno.replace(carrier, "");
+		}
+		manifest.setCarrier(carrier);
+		manifest.setFlightno(flightno);
+
 		consignorService.saveFromManifest(manifest, Tools.getUserId());
 		consignorService.saveFromManifest(manifest, Tools.getUserId());
 
 
 		ResponseModel model = new ResponseModel();
 		ResponseModel model = new ResponseModel();
@@ -863,9 +905,10 @@ public class ManifestController extends BasicController {
 				model.setMsg("该订单号已存在！");
 				model.setMsg("该订单号已存在！");
 			} else {
 			} else {
 				String responseCode = manifest.getResponse_code();
 				String responseCode = manifest.getResponse_code();
-				int resCode = NumKit.parseString2Int(responseCode);
-//				WaybillReceiptType oldType = WaybillReceiptType.valueOf(resCode);
-//				WaybillReceiptType type = oldType != null ? WaybillReceiptType.UPDATE : WaybillReceiptType.APPLY;
+				int resCode = NumKit.parseInt(responseCode);
+				// WaybillReceiptType oldType = WaybillReceiptType.valueOf(resCode);
+				// WaybillReceiptType type = oldType != null ? WaybillReceiptType.UPDATE :
+				// WaybillReceiptType.APPLY;
 				WaybillReceiptType type = WaybillReceiptType.APPLY;
 				WaybillReceiptType type = WaybillReceiptType.APPLY;
 
 
 				String stowagedate = request.getParameter("stowagedate");
 				String stowagedate = request.getParameter("stowagedate");
@@ -891,15 +934,15 @@ public class ManifestController extends BasicController {
 
 
 				RemoteFileKit.putFile(ndlrPath);
 				RemoteFileKit.putFile(ndlrPath);
 				RemoteFileKit.putFile(dlcPath);
 				RemoteFileKit.putFile(dlcPath);
-				RemoteFileKit.putFile(sliPath);
+				// RemoteFileKit.putFile(sliPath);
 
 
-				// System.err.println("===================ndlrxml===================");
-				// System.err.println(ndlrxml);
-				// System.err.println();
-				//
-				// System.err.println("===================dlcfxml===================");
-				// System.err.println(dlcfxml);
-				// System.err.println();
+				System.err.println("===================ndlrxml===================");
+				System.err.println(ndlrxml);
+				System.err.println();
+
+				System.err.println("===================dlcfxml===================");
+				System.err.println(dlcfxml);
+				System.err.println();
 
 
 				System.err.println("===================slifxml===================");
 				System.err.println("===================slifxml===================");
 				System.err.println(slifxml);
 				System.err.println(slifxml);
@@ -993,6 +1036,15 @@ public class ManifestController extends BasicController {
 	@RequestMapping(value = "/sub_save", method = { RequestMethod.POST })
 	@RequestMapping(value = "/sub_save", method = { RequestMethod.POST })
 	@ResponseBody
 	@ResponseBody
 	public ResponseModel sub_save(PreparesecondaryEntity preparesecondary) {
 	public ResponseModel sub_save(PreparesecondaryEntity preparesecondary) {
+		String flightno = preparesecondary.getFlightno();
+		String carrier = "";
+		if (StringUtils.isNotBlank(flightno) && flightno.length() > 2) {
+			carrier = flightno.substring(0, 2);
+			flightno = flightno.replace(carrier, "");
+		}
+		preparesecondary.setCarrier(carrier);
+		preparesecondary.setFlightno(flightno);
+
 		consignorService.saveFromPreparesecondary(preparesecondary, Tools.getUserId());
 		consignorService.saveFromPreparesecondary(preparesecondary, Tools.getUserId());
 
 
 		ResponseModel model = new ResponseModel();
 		ResponseModel model = new ResponseModel();
@@ -1007,6 +1059,8 @@ public class ManifestController extends BasicController {
 				model.setData(preparesecondary);
 				model.setData(preparesecondary);
 				model.setStatus(200);
 				model.setStatus(200);
 				model.setMsg(HttpJsonMsg.SUCCESS);
 				model.setMsg(HttpJsonMsg.SUCCESS);
+
+				receiptService.saveFromPreparesecondary(preparesecondary, WaybillReceiptType.TEMP_SAVE);
 			}
 			}
 		} catch (Exception e) {
 		} catch (Exception e) {
 			model.setStatus(500);
 			model.setStatus(500);
@@ -1061,6 +1115,15 @@ public class ManifestController extends BasicController {
 	@RequestMapping(value = "/presavesend", method = { RequestMethod.POST })
 	@RequestMapping(value = "/presavesend", method = { RequestMethod.POST })
 	@ResponseBody
 	@ResponseBody
 	public ResponseModel presavesend(PreparesecondaryEntity preparesecondary, HttpServletRequest request) {
 	public ResponseModel presavesend(PreparesecondaryEntity preparesecondary, HttpServletRequest request) {
+		String flightno = preparesecondary.getFlightno();
+		String carrier = "";
+		if (StringUtils.isNotBlank(flightno) && flightno.length() > 2) {
+			carrier = flightno.substring(0, 2);
+			flightno = flightno.replace(carrier, "");
+		}
+		preparesecondary.setCarrier(carrier);
+		preparesecondary.setFlightno(flightno);
+
 		consignorService.saveFromPreparesecondary(preparesecondary, Tools.getUserId());
 		consignorService.saveFromPreparesecondary(preparesecondary, Tools.getUserId());
 
 
 		ResponseModel model = new ResponseModel();
 		ResponseModel model = new ResponseModel();
@@ -1070,10 +1133,11 @@ public class ManifestController extends BasicController {
 				model.setMsg("该订单号已存在！");
 				model.setMsg("该订单号已存在！");
 			} else {
 			} else {
 				String responseCode = preparesecondary.getResponse_code();
 				String responseCode = preparesecondary.getResponse_code();
-				int resCode = NumKit.parseString2Int(responseCode);
-//				WaybillReceiptType oldType = WaybillReceiptType.valueOf(resCode);
-//				WaybillReceiptType type = oldType != null ? WaybillReceiptType.UPDATE : WaybillReceiptType.APPLY;
-				
+				int resCode = NumKit.parseInt(responseCode);
+				// WaybillReceiptType oldType = WaybillReceiptType.valueOf(resCode);
+				// WaybillReceiptType type = oldType != null ? WaybillReceiptType.UPDATE :
+				// WaybillReceiptType.APPLY;
+
 				WaybillReceiptType type = WaybillReceiptType.APPLY;
 				WaybillReceiptType type = WaybillReceiptType.APPLY;
 
 
 				String stowagedate = request.getParameter("stowagedate");
 				String stowagedate = request.getParameter("stowagedate");
@@ -1097,7 +1161,7 @@ public class ManifestController extends BasicController {
 
 
 				RemoteFileKit.putFile(ndlrPath);
 				RemoteFileKit.putFile(ndlrPath);
 				RemoteFileKit.putFile(dlcPath);
 				RemoteFileKit.putFile(dlcPath);
-				RemoteFileKit.putFile(fhlPath);
+				// RemoteFileKit.putFile(fhlPath);
 
 
 				// 发送redis储存数据
 				// 发送redis储存数据
 				new RedisSaveMessage().saveMessage(ndlrxml);
 				new RedisSaveMessage().saveMessage(ndlrxml);

@@ -7,8 +7,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -17,7 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.agent.entity.Constant;
 import com.agent.entity.Constant;
 import com.agent.entity.agent.ManifestEntity;
 import com.agent.entity.agent.ManifestEntity;
 import com.agent.entity.agent.PreparesecondaryEntity;
 import com.agent.entity.agent.PreparesecondaryEntity;
-import com.agent.entity.agent.WaybillReceiprtEntity;
+import com.agent.entity.agent.WaybillReceiptEntity;
 import com.agent.service.agent.ManifestService;
 import com.agent.service.agent.ManifestService;
 import com.agent.service.agent.PreparesecondaryService;
 import com.agent.service.agent.PreparesecondaryService;
 import com.agent.service.agent.WaybillReceiptService;
 import com.agent.service.agent.WaybillReceiptService;
@@ -39,7 +37,6 @@ import tools.Tools;
 @RequestMapping(value = "/receipt")
 @RequestMapping(value = "/receipt")
 
 
 public class ReceiptController {
 public class ReceiptController {
-	private static final Logger logger = LoggerFactory.getLogger(ReceiptController.class);
 
 
 	@Resource
 	@Resource
 	private ManifestService manifestService;
 	private ManifestService manifestService;
@@ -52,17 +49,17 @@ public class ReceiptController {
 
 
 	@ResponseBody
 	@ResponseBody
 	@RequestMapping(value = "/a0608c4054662dd902e1314f7e450e3eaa81c114", method = { RequestMethod.GET })
 	@RequestMapping(value = "/a0608c4054662dd902e1314f7e450e3eaa81c114", method = { RequestMethod.GET })
-	public ResponseModel update(String waybillNo, String waybillNoSub, String sendTime, String response_code,
-			String response_text, HttpServletRequest reuqest) {
+	public ResponseModel update(String message_type, String waybillNo, String waybillNoSub, String sendTime,
+			String response_code, String response_text, HttpServletRequest reuqest) {
 		ResponseModel res = new ResponseModel();
 		ResponseModel res = new ResponseModel();
-		
+
 		if (StringUtils.isBlank(response_code) || StringUtils.isBlank(response_text)) {
 		if (StringUtils.isBlank(response_code) || StringUtils.isBlank(response_text)) {
 			res.setStatus(500);
 			res.setStatus(500);
-			res.setMsg("回执为空");
+			res.setMsg("回执不能为空");
 			return res;
 			return res;
 		}
 		}
-		
-		WaybillReceiprtEntity wre = null;
+
+		WaybillReceiptEntity wre = null;
 		if (StringUtils.isNoneBlank(waybillNo) && StringUtils.isBlank(waybillNoSub)) {
 		if (StringUtils.isNoneBlank(waybillNo) && StringUtils.isBlank(waybillNoSub)) {
 			// 主单报文
 			// 主单报文
 			List<ManifestEntity> list = manifestService.findByManifestNo(waybillNo);
 			List<ManifestEntity> list = manifestService.findByManifestNo(waybillNo);
@@ -72,11 +69,11 @@ public class ReceiptController {
 				bean.setResponse_text(response_text);
 				bean.setResponse_text(response_text);
 				manifestService.save(bean);
 				manifestService.save(bean);
 
 
-				wre = new WaybillReceiprtEntity();
+				wre = new WaybillReceiptEntity();
 				wre.setCarrier(bean.getCarrier());
 				wre.setCarrier(bean.getCarrier());
 				wre.setFlightdate(bean.getFlightdate());
 				wre.setFlightdate(bean.getFlightdate());
 				wre.setFlightno(bean.getFlightno());
 				wre.setFlightno(bean.getFlightno());
-				wre.setMessage_type("MT2201");
+				wre.setMessage_type(message_type);
 				wre.setResponse_code(response_code);
 				wre.setResponse_code(response_code);
 				wre.setResponse_text(response_text);
 				wre.setResponse_text(response_text);
 				wre.setSendtime(sendTime != null ? sendTime : Constant.dateTimeFormat.format(new Date()));
 				wre.setSendtime(sendTime != null ? sendTime : Constant.dateTimeFormat.format(new Date()));
@@ -102,11 +99,11 @@ public class ReceiptController {
 				bean.setResponse_text(response_text);
 				bean.setResponse_text(response_text);
 				preparesecondaryService.save(bean);
 				preparesecondaryService.save(bean);
 
 
-				wre = new WaybillReceiprtEntity();
+				wre = new WaybillReceiptEntity();
 				wre.setCarrier(bean.getCarrier());
 				wre.setCarrier(bean.getCarrier());
 				wre.setFlightdate(bean.getFlightdate());
 				wre.setFlightdate(bean.getFlightdate());
 				wre.setFlightno(bean.getFlightno());
 				wre.setFlightno(bean.getFlightno());
-				wre.setMessage_type("MT2201");
+				wre.setMessage_type(message_type);
 				wre.setResponse_code(response_code);
 				wre.setResponse_code(response_code);
 				wre.setResponse_text(response_text);
 				wre.setResponse_text(response_text);
 				wre.setSendtime(sendTime != null ? sendTime : Constant.dateTimeFormat.format(new Date()));
 				wre.setSendtime(sendTime != null ? sendTime : Constant.dateTimeFormat.format(new Date()));
@@ -133,4 +130,28 @@ public class ReceiptController {
 
 
 		return res;
 		return res;
 	}
 	}
+
+	/**
+	 * 
+	 * @param no
+	 *            主单或者分单号
+	 * @param isMain
+	 *            是否为主单
+	 * @return
+	 */
+	@RequestMapping(value = "/seeReceipt")
+	public String seeReceipt(HttpServletRequest request, String no, boolean isMain) {
+		List<WaybillReceiptEntity> dataList = null;
+		if (isMain) {
+			// 查询主单回执
+			dataList = receiptService.findMainList(no);
+		} else {
+			// 查询分单回执
+			dataList = receiptService.findSubList(no);
+		}
+
+		request.setAttribute("dataList", dataList);
+		return "receipt/list_window";
+	}
+
 }
 }

 package com.agent.controller.agent;
 package com.agent.controller.agent;
 
 
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
 import com.agent.controller.BasicController;
 import com.agent.controller.BasicController;
 import com.agent.entity.Constant;
 import com.agent.entity.Constant;
-import com.agent.entity.agent.*;
-import com.agent.service.agent.ShuntBillService;
+import com.agent.entity.agent.PackageTypeEntity;
+import com.agent.entity.agent.ShuntBillEntity;
+import com.agent.entity.agent.ShuntEntity;
 import com.agent.service.agent.PackageTypeService;
 import com.agent.service.agent.PackageTypeService;
+import com.agent.service.agent.ShuntBillService;
 import com.agent.service.agent.ShuntService;
 import com.agent.service.agent.ShuntService;
 import com.agent.util.HttpJsonMsg;
 import com.agent.util.HttpJsonMsg;
 import com.agent.vo.ResponseModel;
 import com.agent.vo.ResponseModel;
-import com.agent.xml.common.*;
-import com.agent.xml.shunt.*;
+import com.agent.xml.common.ContentXml;
+import com.agent.xml.common.IDXml;
+import com.agent.xml.common.NameXml;
+import com.agent.xml.common.XmlHead;
+import com.agent.xml.common.XmlUtil;
+import com.agent.xml.shunt.ShuntBorderTransportMeansXml;
+import com.agent.xml.shunt.ShuntConsignmentPackagingXml;
+import com.agent.xml.shunt.ShuntConsignmentXml;
+import com.agent.xml.shunt.ShuntSubBorderTransportMeansXml;
+import com.agent.xml.shunt.ShuntUnloadingDatetimeXml;
+import com.agent.xml.shunt.ShuntXml;
+import com.agent.xml.shunt.ShuntXmlBody;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.framework.core.Servlets;
 import com.framework.core.Servlets;
 import com.framework.shiro.SessionUtil;
 import com.framework.shiro.SessionUtil;
 import com.plugin.easyui.DataGrid;
 import com.plugin.easyui.DataGrid;
 import com.plugin.easyui.EasyPage;
 import com.plugin.easyui.EasyPage;
-import org.apache.commons.collections.CollectionUtils;
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-import org.dom4j.io.OutputFormat;
-import org.dom4j.io.XMLWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.lang.reflect.Field;
-import java.text.ParseException;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 
 /**
 /**
  * Created by cohesion on 2017/4/14.
  * Created by cohesion on 2017/4/14.
@@ -50,229 +55,237 @@ import java.util.Map;
 @RequestMapping(value = "/shunt")
 @RequestMapping(value = "/shunt")
 public class ShuntController extends BasicController {
 public class ShuntController extends BasicController {
 
 
-    private static final Logger logger = LoggerFactory.getLogger(ShuntController.class);
-
-    @Resource
-    private ShuntService shuntService;
-
-    @Resource
-    private PackageTypeService packageTypeService;
-
-    @Resource
-    private ShuntBillService shuntBillService;
-
-
-    /**
-     * 列表页面
-     * @return
-     */
-    @RequestMapping(value = "/list")
-    public String getList(Model model){
-        return "shunt/list";
-    }
-
-    /**
-     * 分页数据
-     * @return
-     */
-    @RequestMapping(value="/grid.json")
-    @ResponseBody
-    public DataGrid<ShuntEntity> grid(HttpServletRequest request,EasyPage<ShuntEntity> pageForm) throws ParseException {
-        Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
-        searchParams.put("EQ_isdelete", 0);
-        /*String deliveryDate =searchParams.get("GTE_deliveryDate").toString();
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        if(StringUtils.isNotEmpty(deliveryDate)){
-            searchParams.put("GTE_deliveryDate",dateFormat.parse(deliveryDate));
-        }
-        String deliveryDate1 =searchParams.get("LTE_deliveryDate").toString();
-        if(StringUtils.isNotEmpty(deliveryDate1)){
-            searchParams.put("LTE_deliveryDate",dateFormat.parse(deliveryDate1));
-        }*/
-        pageForm.setSearchParams(searchParams);
-        pageForm.parseData(shuntService.getPage(pageForm));
-        return pageForm.getData();
-    }
-
-    /**
-     * 提单数据
-     * @return
-     */
-    @RequestMapping(value="/bill/grid.json",method = RequestMethod.POST)
-    @ResponseBody
-    public String getBillList(Long shuntId,HttpServletRequest request){
-        List<ShuntBillEntity> billList = shuntBillService.findByShuntId(shuntId);
-        return JSONArray.toJSONString(billList,filter);
-    }
-
-    /**
-     * 编辑
-     * @param id
-     * @param model
-     * @return
-     */
-    @RequestMapping(value = "/edit" , method = {RequestMethod.GET })
-    public String edit(Long id, Model model) {
-        if(id!=null){
-            ShuntEntity shunt = shuntService.findOne(id);
-            model.addAttribute("shunt", shunt);
-        }
-
-        //包装种类
-        List<PackageTypeEntity> typeList =  packageTypeService.findAll();
-        model.addAttribute("typeList",typeList);
-        return "shunt/edit";
-    }
-
-
-    /**
-     * 保存
-     * @param shuntJson
-     * @return
-     */
-    @RequestMapping(value = "/save" , method = {RequestMethod.POST })
-    @ResponseBody
-    public ResponseModel save(String shuntJson,String billJson) {
-        ResponseModel model = new ResponseModel();
-        try {
-            ShuntEntity shunt = JSONObject.parseObject(shuntJson,ShuntEntity.class);
-            List<ShuntBillEntity> billList = JSONArray.parseArray(billJson,ShuntBillEntity.class);
-            shunt = shuntService.save(shunt,billList);
-            model.setData(shunt.getId());
-            model.setStatus(200);
-        } catch (Exception e) {
-            model.setStatus(500);
-            logger.error("系统异常 >>", e);
-        }
-        return model;
-    }
-
-    /**
-     * 删除
-     * @param ids
-     * @return
-     */
-    @RequestMapping(value = "/delete" , method = {RequestMethod.POST })
-    @ResponseBody
-    public ResponseModel delete(String ids) {
-        ResponseModel model = new ResponseModel();
-        try {
-            shuntService.deleteAll(ids);
-            model.setStatus(200);
-            model.setMsg(HttpJsonMsg.SUCCESS);
-        } catch (Exception e) {
-            model.setStatus(500);
-            model.setMsg(HttpJsonMsg.ERROR);
-            logger.error("系统异常 >>", e);
-        }
-        return model;
-    }
-
-    @RequestMapping(value = "/xml",method = RequestMethod.POST)
-    @ResponseBody
-    public ResponseModel createXml(Long id,HttpServletRequest request,HttpServletResponse response) throws IOException {
-
-        ResponseModel model = new ResponseModel();
-        String rootPath = request.getSession().getServletContext().getRealPath("/");
-        String path = rootPath+"/excel/shunt"+new Date().getTime()+".xml";
-        String xml = "";
-        if(id!=null){
-            xml = beanToXml(path, id);
-        }
-        model.setData(xml);
-        return model;
-    }
-
-    private String beanToXml(String path,Long id){
-
-        ShuntEntity shunt = shuntService.findOne(id);
-        shunt.setSendXml(1);
-        shunt = shuntService.save(shunt);
-
-        List<ShuntBillEntity> billList = null;
-        if(shunt.getId()!=null){
-            billList = shuntBillService.findByShuntId(shunt.getId());
-        }
-        String ladingNo = "";
-        String packageType = "";
-        Double volume = 0D;
-        Long pieces = 0L;
-        Double weight = 0D;
-        if(CollectionUtils.isNotEmpty(billList)){
-            ladingNo = billList.get(0).getLadingNo();
-            packageType = billList.get(0).getPackageType();
-            for(ShuntBillEntity bill:billList){
-                if(bill.getVolume()!=null){
-                    volume += bill.getVolume();
-                }
-                if(bill.getPieces()!=null){
-                    pieces += bill.getPieces();
-                }
-                if(bill.getWeight()!=null){
-                    weight += bill.getWeight();
-                }
-            }
-        }
-
-        ShuntXmlBody body = new ShuntXmlBody();
-
-        XmlHead head = new XmlHead();
-        head.setMessageID(id==null?"":id.toString());
-        head.setMessageType("Manifest");
-        head.setSenderID(SessionUtil.getUser().getId().toString());
-        head.setSendTime(Constant.dateFormat.format(new Date()));
-        head.setFunctionCode("");
-        head.setReceiverID(SessionUtil.getUser().getId().toString());
-        head.setVersion("1.0");
-        body.setHead(head);
-
-        ShuntXml shuntXml = new ShuntXml();
-        ShuntBorderTransportMeansXml meansXml = new ShuntBorderTransportMeansXml();
-        meansXml.setJourneyID(shunt.getVoyageNo());
-        meansXml.setTypeCode(shunt.getModeCode());
-        meansXml.setId(shunt.getToolCode());
-        meansXml.setName(shunt.getToolName());
-        meansXml.setCargoFacilityLocation(shunt.getShuntDestination());
-        meansXml.setDespatchDateTime(shunt.getShuntStartDate()!=null?Constant.dateFormat.format(shunt.getShuntStartDate()):"");
-        IDXml idXml = new IDXml();
-        idXml.setId(shunt.getDischargingCode());
-        meansXml.setUnloadingLocation(idXml);
-
-        ShuntUnloadingDatetimeXml datetimeXml = new ShuntUnloadingDatetimeXml();
-        datetimeXml.setUnloadingDatetime(shunt.getShuntStartDate()!=null?Constant.dateFormat.format(shunt.getShuntStartDate()):"");
-        meansXml.setUnloading(datetimeXml);
-        meansXml.setFreeText(shunt.getIoPurpose());
-
-        shuntXml.setBorderTransportMeans(meansXml);
-
-        ShuntConsignmentXml consignmentXml = new ShuntConsignmentXml();
-        IDXml idXml1 = new IDXml();
-        idXml1.setId(ladingNo);
-        consignmentXml.setTransportContractDocument(idXml1);
-        consignmentXml.setGrossVolumeMeasure(volume.toString());
-
-        ShuntConsignmentPackagingXml consignmentPackagingXml = new ShuntConsignmentPackagingXml();
-        consignmentPackagingXml.setQuantityQuantity(pieces.toString());
-        consignmentPackagingXml.setTypeCode(packageType);
-        consignmentXml.setConsignmentPackaging(consignmentPackagingXml);
-        consignmentXml.setTotalGrossMassMeasure(weight.toString());
-        ShuntSubBorderTransportMeansXml shuntSubBorderTransportMeansXml = new ShuntSubBorderTransportMeansXml();
-        shuntSubBorderTransportMeansXml.setJourneyID(ladingNo);
-        shuntSubBorderTransportMeansXml.setTypeCode(shunt.getModeCode());
-        NameXml nameXml = new NameXml();
-        nameXml.setName("");
-        shuntSubBorderTransportMeansXml.setCarrier(nameXml);
-        consignmentXml.setBorderTransportMeans(shuntSubBorderTransportMeansXml);
-        shuntXml.setConsignment(consignmentXml);
-
-        ContentXml contentXml = new ContentXml();
-        contentXml.setContent(shunt.getRemark());
-        shuntXml.setAdditionalInformation(contentXml);
-
-        body.setDeclaration(shuntXml);
-
-        String xml = XmlUtil.convertToXml2(body, path);
-        return xml;
-    }
+	private static final Logger logger = LoggerFactory.getLogger(ShuntController.class);
+
+	@Resource
+	private ShuntService shuntService;
+
+	@Resource
+	private PackageTypeService packageTypeService;
+
+	@Resource
+	private ShuntBillService shuntBillService;
+
+	/**
+	 * 列表页面
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/list")
+	public String getList(Model model) {
+		return "shunt/list";
+	}
+
+	/**
+	 * 分页数据
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/grid.json")
+	@ResponseBody
+	public DataGrid<ShuntEntity> grid(HttpServletRequest request, EasyPage<ShuntEntity> pageForm)
+			throws ParseException {
+		Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
+		searchParams.put("EQ_isdelete", 0);
+		/*
+		 * String deliveryDate =searchParams.get("GTE_deliveryDate").toString();
+		 * SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+		 * if(StringUtils.isNotEmpty(deliveryDate)){
+		 * searchParams.put("GTE_deliveryDate",dateFormat.parse(deliveryDate)); } String
+		 * deliveryDate1 =searchParams.get("LTE_deliveryDate").toString();
+		 * if(StringUtils.isNotEmpty(deliveryDate1)){
+		 * searchParams.put("LTE_deliveryDate",dateFormat.parse(deliveryDate1)); }
+		 */
+		pageForm.setSearchParams(searchParams);
+		pageForm.parseData(shuntService.getPage(pageForm));
+		return pageForm.getData();
+	}
+
+	/**
+	 * 提单数据
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "/bill/grid.json", method = RequestMethod.POST)
+	@ResponseBody
+	public String getBillList(Long shuntId, HttpServletRequest request) {
+		List<ShuntBillEntity> billList = shuntBillService.findByShuntId(shuntId);
+		return JSONArray.toJSONString(billList, filter);
+	}
+
+	/**
+	 * 编辑
+	 * 
+	 * @param id
+	 * @param model
+	 * @return
+	 */
+	@RequestMapping(value = "/edit", method = { RequestMethod.GET })
+	public String edit(Long id, Model model) {
+		if (id != null) {
+			ShuntEntity shunt = shuntService.findOne(id);
+			model.addAttribute("shunt", shunt);
+		}
+
+		// 包装种类
+		List<PackageTypeEntity> typeList = packageTypeService.findAll();
+		model.addAttribute("typeList", typeList);
+		return "shunt/edit";
+	}
+
+	/**
+	 * 保存
+	 * 
+	 * @param shuntJson
+	 * @return
+	 */
+	@RequestMapping(value = "/save", method = { RequestMethod.POST })
+	@ResponseBody
+	public ResponseModel save(String shuntJson, String billJson) {
+		ResponseModel model = new ResponseModel();
+		try {
+			ShuntEntity shunt = JSONObject.parseObject(shuntJson, ShuntEntity.class);
+			List<ShuntBillEntity> billList = JSONArray.parseArray(billJson, ShuntBillEntity.class);
+			shunt = shuntService.save(shunt, billList);
+			model.setData(shunt.getId());
+			model.setStatus(200);
+		} catch (Exception e) {
+			model.setStatus(500);
+			logger.error("系统异常 >>", e);
+		}
+		return model;
+	}
+
+	/**
+	 * 删除
+	 * 
+	 * @param ids
+	 * @return
+	 */
+	@RequestMapping(value = "/delete", method = { RequestMethod.POST })
+	@ResponseBody
+	public ResponseModel delete(String ids) {
+		ResponseModel model = new ResponseModel();
+		try {
+			shuntService.deleteAll(ids);
+			model.setStatus(200);
+			model.setMsg(HttpJsonMsg.SUCCESS);
+		} catch (Exception e) {
+			model.setStatus(500);
+			model.setMsg(HttpJsonMsg.ERROR);
+			logger.error("系统异常 >>", e);
+		}
+		return model;
+	}
+
+	@RequestMapping(value = "/xml", method = RequestMethod.POST)
+	@ResponseBody
+	public ResponseModel createXml(Long id, HttpServletRequest request, HttpServletResponse response)
+			throws IOException {
+
+		ResponseModel model = new ResponseModel();
+		String rootPath = request.getSession().getServletContext().getRealPath("/");
+		String path = rootPath + "/excel/shunt" + new Date().getTime() + ".xml";
+		String xml = "";
+		if (id != null) {
+			xml = beanToXml(path, id);
+		}
+		model.setData(xml);
+		return model;
+	}
+
+	private String beanToXml(String path, Long id) {
+
+		ShuntEntity shunt = shuntService.findOne(id);
+		shunt.setSendXml(1);
+		shunt = shuntService.save(shunt);
+
+		List<ShuntBillEntity> billList = null;
+		if (shunt.getId() != null) {
+			billList = shuntBillService.findByShuntId(shunt.getId());
+		}
+		String ladingNo = "";
+		String packageType = "";
+		Double volume = 0D;
+		Long pieces = 0L;
+		Double weight = 0D;
+		if (CollectionUtils.isNotEmpty(billList)) {
+			ladingNo = billList.get(0).getLadingNo();
+			packageType = billList.get(0).getPackageType();
+			for (ShuntBillEntity bill : billList) {
+				if (bill.getVolume() != null) {
+					volume += bill.getVolume();
+				}
+				if (bill.getPieces() != null) {
+					pieces += bill.getPieces();
+				}
+				if (bill.getWeight() != null) {
+					weight += bill.getWeight();
+				}
+			}
+		}
+
+		ShuntXmlBody body = new ShuntXmlBody();
+
+		XmlHead head = new XmlHead();
+		head.setMessageID(id == null ? "" : id.toString());
+		head.setMessageType("Manifest");
+		head.setSenderID(SessionUtil.getUser().getId().toString());
+		head.setSendTime(Constant.dateFormat.format(new Date()));
+		head.setFunctionCode("");
+		head.setReceiverID(SessionUtil.getUser().getId().toString());
+		head.setVersion("1.0");
+		body.setHead(head);
+
+		ShuntXml shuntXml = new ShuntXml();
+		ShuntBorderTransportMeansXml meansXml = new ShuntBorderTransportMeansXml();
+		meansXml.setJourneyID(shunt.getVoyageNo());
+		meansXml.setTypeCode(shunt.getModeCode());
+		meansXml.setId(shunt.getToolCode());
+		meansXml.setName(shunt.getToolName());
+		meansXml.setCargoFacilityLocation(shunt.getShuntDestination());
+		meansXml.setDespatchDateTime(
+				shunt.getShuntStartDate() != null ? Constant.dateFormat.format(shunt.getShuntStartDate()) : "");
+		IDXml idXml = new IDXml();
+		idXml.setId(shunt.getDischargingCode());
+		meansXml.setUnloadingLocation(idXml);
+
+		ShuntUnloadingDatetimeXml datetimeXml = new ShuntUnloadingDatetimeXml();
+		datetimeXml.setUnloadingDatetime(
+				shunt.getShuntStartDate() != null ? Constant.dateFormat.format(shunt.getShuntStartDate()) : "");
+		meansXml.setUnloading(datetimeXml);
+		meansXml.setFreeText(shunt.getIoPurpose());
+
+		shuntXml.setBorderTransportMeans(meansXml);
+
+		ShuntConsignmentXml consignmentXml = new ShuntConsignmentXml();
+		IDXml idXml1 = new IDXml();
+		idXml1.setId(ladingNo);
+		consignmentXml.setTransportContractDocument(idXml1);
+		consignmentXml.setGrossVolumeMeasure(volume.toString());
+
+		ShuntConsignmentPackagingXml consignmentPackagingXml = new ShuntConsignmentPackagingXml();
+		consignmentPackagingXml.setQuantityQuantity(pieces.toString());
+		consignmentPackagingXml.setTypeCode(packageType);
+		consignmentXml.setConsignmentPackaging(consignmentPackagingXml);
+		consignmentXml.setTotalGrossMassMeasure(weight.toString());
+		ShuntSubBorderTransportMeansXml shuntSubBorderTransportMeansXml = new ShuntSubBorderTransportMeansXml();
+		shuntSubBorderTransportMeansXml.setJourneyID(ladingNo);
+		shuntSubBorderTransportMeansXml.setTypeCode(shunt.getModeCode());
+		NameXml nameXml = new NameXml();
+		nameXml.setName("");
+		shuntSubBorderTransportMeansXml.setCarrier(nameXml);
+		consignmentXml.setBorderTransportMeans(shuntSubBorderTransportMeansXml);
+		shuntXml.setConsignment(consignmentXml);
+
+		ContentXml contentXml = new ContentXml();
+		contentXml.setContent(shunt.getRemark());
+		shuntXml.setAdditionalInformation(contentXml);
+
+		body.setDeclaration(shuntXml);
+
+		String xml = XmlUtil.convertToXml2(body, path);
+		return xml;
+	}
 
 
 }
 }

 package com.agent.controller.agent;
 package com.agent.controller.agent;
 
 
-import com.agent.controller.BasicController;
-import com.agent.vo.ResponseModel;
-import com.agent.vo.ServiceVo;
-import com.agent.webservice.GetShipmentStatusByBillIdResponse;
-import com.agent.webservice.ReturnDataClass;
-import com.agent.webservice.ShipmentStatusWSSoap;
-import com.framework.util.PropertiesLoader;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.apache.cxf.interceptor.LoggingInInterceptor;
@@ -14,91 +12,94 @@ import org.apache.cxf.interceptor.LoggingOutInterceptor;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
+import com.agent.controller.BasicController;
+import com.agent.vo.ResponseModel;
+import com.agent.vo.ServiceVo;
+import com.agent.webservice.ReturnDataClass;
+import com.agent.webservice.ShipmentStatusWSSoap;
+import com.framework.util.PropertiesLoader;
 
 
 /**
 /**
  * 货况追踪
  * 货况追踪
  */
  */
 @Controller
 @Controller
 @RequestMapping(value = "/tracking/")
 @RequestMapping(value = "/tracking/")
-public class TrackingController extends BasicController{
+public class TrackingController extends BasicController {
+
+	private static final Logger logger = LoggerFactory.getLogger(TrackingController.class);
+
+	/**
+	 * 列表页
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "list")
+	public String getList() {
+		return "tracking/list";
+	}
 
 
-    private static final Logger logger = LoggerFactory.getLogger(TrackingController.class);
-    /**
-     * 列表页
-     * @return
-     */
-    @RequestMapping(value = "list")
-    public String getList(){
-        return "tracking/list";
-    }
+	/**
+	 * 货单详情
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = "detail", method = RequestMethod.POST)
+	@ResponseBody
+	public ResponseModel getDetail(String billNo, HttpServletResponse responseHttp) {
+		ResponseModel model = new ResponseModel();
+		try {
+			responseHttp.setHeader("Access-Control-Allow-Origin", "*");
+			if (StringUtils.isNotEmpty(billNo)) {
+				System.out.println(billNo);
+				JaxWsProxyFactoryBean svr = new JaxWsProxyFactoryBean();
+				svr.getOutInterceptors().add(new LoggingOutInterceptor());
+				svr.getInInterceptors().add(new LoggingInInterceptor());
+				svr.setServiceClass(ShipmentStatusWSSoap.class);
+				svr.setAddress(getAddress());
+				ShipmentStatusWSSoap hw = (ShipmentStatusWSSoap) svr.create();
+				ReturnDataClass response = hw.getShipmentStatusByBillId(billNo, getXquery());
+				if (response.isIsErr() || response.getStatusCount() == 0) {
 
 
+					System.out.println("is error:" + response.isIsErr() + " status count:" + response.getStatusCount());
+					model.setStatus(500);
+					return model;
+				}
+				model.setData(response);
+				model.setStatus(200);
+			} else {
+				model.setStatus(500);
+			}
+		} catch (Exception e) {
+			logger.error("系统异常>>", e.fillInStackTrace());
+			model.setStatus(500);
+		}
 
 
-    /**
-     * 货单详情
-     * @return
-     */
-    @RequestMapping(value = "detail",method = RequestMethod.POST)
-    @ResponseBody
-    public ResponseModel getDetail(String billNo, HttpServletResponse responseHttp){
-        ResponseModel model = new ResponseModel();
-        try{
-        	responseHttp.setHeader("Access-Control-Allow-Origin", "*");
-            if(StringUtils.isNotEmpty(billNo)){
-            	System.out.println(billNo);
-                JaxWsProxyFactoryBean svr = new JaxWsProxyFactoryBean();
-                svr.getOutInterceptors().add(new LoggingOutInterceptor());
-                svr.getInInterceptors().add(new LoggingInInterceptor());
-                svr.setServiceClass(ShipmentStatusWSSoap.class);
-                svr.setAddress(getAddress());
-                ShipmentStatusWSSoap hw = (ShipmentStatusWSSoap)svr.create();
-                ReturnDataClass response = hw.getShipmentStatusByBillId(billNo,getXquery());
-                if(response.isIsErr() || response.getStatusCount()==0){
-                	
-                	System.out.println("is error:"+response.isIsErr()+" status count:"+response.getStatusCount());
-                	model.setStatus(500);
-                    return model;
-                }
-                model.setData(response);
-                model.setStatus(200);
-            }else {
-                model.setStatus(500);
-            }
-        }catch (Exception e){
-            logger.error("系统异常>>",e.fillInStackTrace());
-            model.setStatus(500);
-        }
+		return model;
+	}
 
 
-        return model;
-    }
+	private List<ServiceVo> objToVo(List<Object[]> list) {
+		List<ServiceVo> vos = new ArrayList<>();
+		if (CollectionUtils.isNotEmpty(list)) {
+			for (Object[] obj : list) {
+				ServiceVo vo = new ServiceVo();
+				vo.setStepName(obj[0].toString());
+				vo.setStepTime(obj[1].toString());
+				vos.add(vo);
+			}
+		}
+		return vos;
+	}
 
 
-    private List<ServiceVo> objToVo(List<Object[]> list){
-        List<ServiceVo> vos = new ArrayList<>();
-        if(CollectionUtils.isNotEmpty(list)){
-            for(Object[] obj:list){
-                ServiceVo vo = new ServiceVo();
-                vo.setStepName(obj[0].toString());
-                vo.setStepTime(obj[1].toString());
-                vos.add(vo);
-            }
-        }
-        return vos;
-    }
+	private String getAddress() {
+		return PropertiesLoader.get("service.address");
+	}
 
 
-    private String getAddress(){
-        return PropertiesLoader.get("service.address");
-    }
-    private String getXquery(){
-        return PropertiesLoader.get("service.xquery");
-    }
+	private String getXquery() {
+		return PropertiesLoader.get("service.xquery");
+	}
 }
 }

@@ -6,8 +6,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 
 
 @Controller
 @Controller
 public class LayoutController {
 public class LayoutController {
-	
-	
+
 	/**
 	/**
 	 * 默认页
 	 * 默认页
 	 * 
 	 * 
@@ -19,7 +18,6 @@ public class LayoutController {
 		return "redirect:/index";
 		return "redirect:/index";
 	}
 	}
 
 
-
 	/**
 	/**
 	 * 主框架模板
 	 * 主框架模板
 	 * 
 	 * 
@@ -29,8 +27,8 @@ public class LayoutController {
 	@RequestMapping(value = "/index", method = RequestMethod.GET)
 	@RequestMapping(value = "/index", method = RequestMethod.GET)
 	public String index() {
 	public String index() {
 		System.out.println("show message!");
 		System.out.println("show message!");
-		//项目启动时候开启 imf 和 redis
-//		new Thread(new IMFServletManifst()).start();
+		// 项目启动时候开启 imf 和 redis
+		// new Thread(new IMFServletManifst()).start();
 		return "index";
 		return "index";
 	}
 	}
 
 

@@ -16,22 +16,13 @@ import org.apache.shiro.authc.LockedAccountException;
 import org.apache.shiro.authc.UnknownAccountException;
 import org.apache.shiro.authc.UnknownAccountException;
 import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.subject.Subject;
-import org.apache.shiro.web.tags.PermissionTag;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 
-import com.framework.mail.MailSenderService;
-import com.framework.shiro.SessionUtil;
-import com.framework.util.MD5Tools;
-
-import login.FLogin;
-import login.LoginData;
-
 import com.agent.entity.agent.BasicAgentEntity;
 import com.agent.entity.agent.BasicAgentEntity;
-import com.agent.entity.system.PermissionEntity;
 import com.agent.entity.system.RoleEntity;
 import com.agent.entity.system.RoleEntity;
 import com.agent.entity.system.UserEntity;
 import com.agent.entity.system.UserEntity;
 import com.agent.service.agent.BasicAgentService;
 import com.agent.service.agent.BasicAgentService;
@@ -40,10 +31,16 @@ import com.agent.service.system.RoleService;
 import com.agent.service.system.UserService;
 import com.agent.service.system.UserService;
 import com.agent.util.Constants;
 import com.agent.util.Constants;
 import com.agent.vo.ResponseModel;
 import com.agent.vo.ResponseModel;
+import com.framework.mail.MailSenderService;
+import com.framework.shiro.SessionUtil;
+import com.framework.util.MD5Tools;
+
+import login.FLogin;
+import login.LoginData;
 
 
 @Controller
 @Controller
 public class LoginController {
 public class LoginController {
-	
+
 	@Resource
 	@Resource
 	private BasicAgentService agentSerive;
 	private BasicAgentService agentSerive;
 	@Resource
 	@Resource
@@ -51,7 +48,7 @@ public class LoginController {
 
 
 	@Resource
 	@Resource
 	private MailSenderService mailSenderService;
 	private MailSenderService mailSenderService;
-	
+
 	@Resource
 	@Resource
 	private RoleService roleService;
 	private RoleService roleService;
 	@Resource
 	@Resource
@@ -66,10 +63,12 @@ public class LoginController {
 	public String login() {
 	public String login() {
 		return "login";
 		return "login";
 	}
 	}
-	@RequestMapping(value="/unauthorized")
-	public String authorized(){
+
+	@RequestMapping(value = "/unauthorized")
+	public String authorized() {
 		return "unauthorized";
 		return "unauthorized";
 	}
 	}
+
 	/**
 	/**
 	 * 查看用户名
 	 * 查看用户名
 	 * 
 	 * 
@@ -112,17 +111,19 @@ public class LoginController {
 			return false;
 			return false;
 		}
 		}
 	}
 	}
+
 	@RequestMapping(value = "isLogin")
 	@RequestMapping(value = "isLogin")
 	@ResponseBody
 	@ResponseBody
-	public ResponseModel isLogin(HttpServletRequest request){
+	public ResponseModel isLogin(HttpServletRequest request) {
 		ResponseModel model = new ResponseModel(200, "", null);
 		ResponseModel model = new ResponseModel(200, "", null);
 
 
 		Subject subject = SecurityUtils.getSubject();
 		Subject subject = SecurityUtils.getSubject();
-		if(subject.getSession().getAttribute("user") == null){
+		if (subject.getSession().getAttribute("user") == null) {
 			model.setStatus(404);
 			model.setStatus(404);
 		}
 		}
 		return model;
 		return model;
 	}
 	}
+
 	/**
 	/**
 	 * 找回密码页面
 	 * 找回密码页面
 	 * 
 	 * 
@@ -142,83 +143,56 @@ public class LoginController {
 	@RequestMapping(value = "/doLogin", method = RequestMethod.POST)
 	@RequestMapping(value = "/doLogin", method = RequestMethod.POST)
 	@ResponseBody
 	@ResponseBody
 	public ResponseModel doLogin(String loginAccount, String password, String captcha) {
 	public ResponseModel doLogin(String loginAccount, String password, String captcha) {
-		
-		//String CAPTCHA = (String) SessionUtil.getKey(Constants.CAPTCHA);
 		SessionUtil.putKey(Constants.CAPTCHA, "");
 		SessionUtil.putKey(Constants.CAPTCHA, "");
-		
-		//if(!captcha.equalsIgnoreCase(CAPTCHA)) { rm.setStatus(500);
-		// rm.setMsg("2"); return rm; }
-		
 		ResponseModel rm = new ResponseModel(200, "", null);
 		ResponseModel rm = new ResponseModel(200, "", null);
-		
-		//登录用户
-//		Subject subject2 = SecurityUtils.getSubject();
-//		UsernamePasswordToken token2 = new UsernamePasswordToken(loginAccount, MD5Tools.MD5(password));
-//		try {
-//			subject2.login(token2);
-//		} catch (UnknownAccountException e) {
-//			rm.setStatus(500);
-//			rm.setMsg("1");
-//		} catch (IncorrectCredentialsException e) {
-//			rm.setStatus(500);
-//			rm.setMsg("1");
-//		} catch (LockedAccountException e) {
-//			rm.setStatus(500);
-//			rm.setMsg("1");
-//		}
-//		return rm;
-//		//声明一个user实体
-		
+
 		UserEntity user = new UserEntity();
 		UserEntity user = new UserEntity();
 		user.setLoginaccount(loginAccount);
 		user.setLoginaccount(loginAccount);
 		user.setPassword(password);
 		user.setPassword(password);
-		if(!loginAccount.equals("admin"))			//远程登录
+		if (!loginAccount.equals("admin")) // 远程登录
 		{
 		{
-			//用户数据
+			// 用户数据
 			LoginData login = FLogin.login(user);
 			LoginData login = FLogin.login(user);
-			//登录成功！
-			if(login.getCode() == 20000)
-			{
-				//往数据库中插入数据
+			// 登录成功！
+			if (login.getCode() == 20000) {
+				// 往数据库中插入数据
 				UserEntity ue = userService.findByLoginaccount(user.getLoginaccount());
 				UserEntity ue = userService.findByLoginaccount(user.getLoginaccount());
-				//用户存在
-				if(ue != null)
-				{
-					//修改密码
+				// 用户存在
+				if (ue != null) {
+					// 修改密码
 					userService.updatePassword(ue.getLoginaccount(), MD5Tools.MD5(password));
 					userService.updatePassword(ue.getLoginaccount(), MD5Tools.MD5(password));
-				}
-				else
-				{
-					//用户不存在，插入数据
+				} else {
+					// 用户不存在，插入数据
 					BasicAgentEntity agent = new BasicAgentEntity();
 					BasicAgentEntity agent = new BasicAgentEntity();
 					agent.setContact(login.getInfodata().getContact());
 					agent.setContact(login.getInfodata().getContact());
 					agent.setNameCn(login.getInfodata().getCompany());
 					agent.setNameCn(login.getInfodata().getCompany());
 					agent.setCountryCode("CN");
 					agent.setCountryCode("CN");
 					agent.setAddress(login.getInfodata().getAddress());
 					agent.setAddress(login.getInfodata().getAddress());
 					int agent_id = agentSerive.save2(agent);
 					int agent_id = agentSerive.save2(agent);
-					
+
 					ue = new UserEntity();
 					ue = new UserEntity();
 					ue.setLoginaccount(loginAccount);
 					ue.setLoginaccount(loginAccount);
-					//设置用户名密码
+					// 设置用户名密码
 					ue.setPassword(MD5Tools.MD5(password));
 					ue.setPassword(MD5Tools.MD5(password));
 					ue.setRealName(login.getInfodata().getContact());
 					ue.setRealName(login.getInfodata().getContact());
 					ue.setMobile(login.getInfodata().getMobile());
 					ue.setMobile(login.getInfodata().getMobile());
 					ue.setStatus(0);
 					ue.setStatus(0);
 					ue.setAgent(new Long(agent_id));
 					ue.setAgent(new Long(agent_id));
-					RoleEntity re = new RoleEntity(); re.setId(new Long(1));
+					RoleEntity re = new RoleEntity();
+					re.setId(new Long(1));
 					ue.setRole(re);
 					ue.setRole(re);
-					//删除密码
+					// 删除密码
 					userService.save(ue);
 					userService.save(ue);
 				}
 				}
-				
-				//登录用户
+
+				// 登录用户
 				Subject subject = SecurityUtils.getSubject();
 				Subject subject = SecurityUtils.getSubject();
 				subject.getSession().setAttribute("user", user);
 				subject.getSession().setAttribute("user", user);
 				UsernamePasswordToken token = new UsernamePasswordToken(loginAccount, MD5Tools.MD5(password));
 				UsernamePasswordToken token = new UsernamePasswordToken(loginAccount, MD5Tools.MD5(password));
 				try {
 				try {
 					subject.login(token);
 					subject.login(token);
-					subject.getSession().setAttribute("permission", roleService.findAllFunctionByRole(
-							((UserEntity)subject.getSession().getAttribute("user")).getRole()));
+					subject.getSession().setAttribute("permission", roleService
+							.findAllFunctionByRole(((UserEntity) subject.getSession().getAttribute("user")).getRole()));
 					subject.getSession().setAttribute("all_function", functionService.findAll());
 					subject.getSession().setAttribute("all_function", functionService.findAll());
 				} catch (UnknownAccountException e) {
 				} catch (UnknownAccountException e) {
 					rm.setStatus(500);
 					rm.setStatus(500);
@@ -230,24 +204,20 @@ public class LoginController {
 					rm.setStatus(500);
 					rm.setStatus(500);
 					rm.setMsg("1");
 					rm.setMsg("1");
 				}
 				}
-			}
-			else
-			{
+			} else {
 				rm.setStatus(500);
 				rm.setStatus(500);
 				rm.setMsg("1");
 				rm.setMsg("1");
 			}
 			}
-		}
-		else
-		{
-			//登录用户
+		} else {
+			// 登录用户
 			Subject subject = SecurityUtils.getSubject();
 			Subject subject = SecurityUtils.getSubject();
 			subject.getSession().setAttribute("user", user);
 			subject.getSession().setAttribute("user", user);
 			UsernamePasswordToken token = new UsernamePasswordToken(loginAccount, MD5Tools.MD5(password));
 			UsernamePasswordToken token = new UsernamePasswordToken(loginAccount, MD5Tools.MD5(password));
-			//System.out.println(loginAccount+" " + password);
+			// System.out.println(loginAccount+" " + password);
 			try {
 			try {
 				subject.login(token);
 				subject.login(token);
-				subject.getSession().setAttribute("permission", roleService.findAllFunctionByRole(
-						((UserEntity)subject.getSession().getAttribute("user")).getRole()));
+				subject.getSession().setAttribute("permission", roleService
+						.findAllFunctionByRole(((UserEntity) subject.getSession().getAttribute("user")).getRole()));
 				subject.getSession().setAttribute("all_function", functionService.findAll());
 				subject.getSession().setAttribute("all_function", functionService.findAll());
 			} catch (UnknownAccountException e) {
 			} catch (UnknownAccountException e) {
 				rm.setStatus(500);
 				rm.setStatus(500);
@@ -260,8 +230,6 @@ public class LoginController {
 				rm.setMsg("1");
 				rm.setMsg("1");
 			}
 			}
 		}
 		}
-		
-		
 
 
 		return rm;
 		return rm;
 	}
 	}

 package com.agent.controller.system;
 package com.agent.controller.system;
 
 
-import com.framework.core.Servlets;
-import com.google.common.collect.Lists;
-import com.plugin.easyui.DataGrid;
-import com.plugin.easyui.EasyPage;
-import com.agent.controller.BasicController;
-import com.agent.entity.system.FunctionEntity;
-import com.agent.entity.system.RoleEntity;
-import com.agent.service.system.FunctionService;
-import com.agent.service.system.RoleService;
-import com.agent.vo.ResponseModel;
-import com.agent.vo.Ztree;
-
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
 
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
@@ -27,48 +13,63 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 
+import com.agent.controller.BasicController;
+import com.agent.entity.system.FunctionEntity;
+import com.agent.entity.system.RoleEntity;
+import com.agent.service.system.FunctionService;
+import com.agent.service.system.RoleService;
+import com.agent.vo.ResponseModel;
+import com.agent.vo.Ztree;
+import com.framework.core.Servlets;
+import com.google.common.collect.Lists;
+import com.plugin.easyui.DataGrid;
+import com.plugin.easyui.EasyPage;
 
 
 @Controller
 @Controller
-@RequestMapping({"/system/role"})
+@RequestMapping({ "/system/role" })
 public class RoleController extends BasicController {
 public class RoleController extends BasicController {
-	
+
 	private static final Logger logger = LoggerFactory.getLogger(RoleController.class);
 	private static final Logger logger = LoggerFactory.getLogger(RoleController.class);
-	
+
 	@Resource
 	@Resource
 	private RoleService roleService;
 	private RoleService roleService;
-	
+
 	@Resource
 	@Resource
 	private FunctionService functionService;
 	private FunctionService functionService;
+
 	/**
 	/**
 	 * list 页面跳转
 	 * list 页面跳转
+	 * 
 	 * @return
 	 * @return
 	 */
 	 */
-	/*@RequiresRoles("admin")*/
-	@RequestMapping({"/list" })
+	/* @RequiresRoles("admin") */
+	@RequestMapping({ "/list" })
 	public String list() {
 	public String list() {
 		return "system/role/list";
 		return "system/role/list";
 	}
 	}
-	
+
 	/**
 	/**
 	 * 查询分页
 	 * 查询分页
+	 * 
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequestMapping(value="grid.json")
+	@RequestMapping(value = "grid.json")
 	@ResponseBody
 	@ResponseBody
-	public DataGrid<RoleEntity> grid(HttpServletRequest request,EasyPage<RoleEntity> pageForm) {
+	public DataGrid<RoleEntity> grid(HttpServletRequest request, EasyPage<RoleEntity> pageForm) {
 		Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
 		Map<String, Object> searchParams = Servlets.getParametersStartingWith(request, "search_");
 		pageForm.setSearchParams(searchParams);
 		pageForm.setSearchParams(searchParams);
 		pageForm.parseData(roleService.getPage(pageForm));
 		pageForm.parseData(roleService.getPage(pageForm));
 		return pageForm.getData();
 		return pageForm.getData();
-	} 
+	}
 
 
 	/**
 	/**
 	 * 编辑页面
 	 * 编辑页面
+	 * 
 	 * @param id
 	 * @param id
 	 * @param model
 	 * @param model
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequestMapping(value = {"/edit" }, method = {org.springframework.web.bind.annotation.RequestMethod.GET })
+	@RequestMapping(value = { "/edit" }, method = { org.springframework.web.bind.annotation.RequestMethod.GET })
 	public String edit(Long id, Model model) {
 	public String edit(Long id, Model model) {
 		if (id != null) {
 		if (id != null) {
 			RoleEntity entity = this.roleService.findOne(id);
 			RoleEntity entity = this.roleService.findOne(id);
@@ -79,11 +80,12 @@ public class RoleController extends BasicController {
 
 
 	/**
 	/**
 	 * 查看页面
 	 * 查看页面
+	 * 
 	 * @param model
 	 * @param model
 	 * @param id
 	 * @param id
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequestMapping(value = {"/view" }, method = {org.springframework.web.bind.annotation.RequestMethod.GET })
+	@RequestMapping(value = { "/view" }, method = { org.springframework.web.bind.annotation.RequestMethod.GET })
 	public String view(Model model, Long id) {
 	public String view(Model model, Long id) {
 		RoleEntity entity = this.roleService.findOne(id);
 		RoleEntity entity = this.roleService.findOne(id);
 		model.addAttribute("entity", entity);
 		model.addAttribute("entity", entity);
@@ -92,10 +94,11 @@ public class RoleController extends BasicController {
 
 
 	/**
 	/**
 	 * 保存
 	 * 保存
+	 * 
 	 * @param role
 	 * @param role
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequestMapping(value = {"/save" }, method = {org.springframework.web.bind.annotation.RequestMethod.POST })
+	@RequestMapping(value = { "/save" }, method = { org.springframework.web.bind.annotation.RequestMethod.POST })
 	public String save(RoleEntity role) {
 	public String save(RoleEntity role) {
 		try {
 		try {
 			if (!this.roleService.isExsitRolecode(role.getRolecode(), role.getId())) {
 			if (!this.roleService.isExsitRolecode(role.getRolecode(), role.getId())) {
@@ -106,17 +109,18 @@ public class RoleController extends BasicController {
 		}
 		}
 		return "redirect:/system/role/list";
 		return "redirect:/system/role/list";
 	}
 	}
-	
+
 	/**
 	/**
 	 * 检查是否存在
 	 * 检查是否存在
+	 * 
 	 * @param roleId
 	 * @param roleId
 	 * @param roleCode
 	 * @param roleCode
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequestMapping(value = {"/isExsit" })
+	@RequestMapping(value = { "/isExsit" })
 	@ResponseBody
 	@ResponseBody
 	public Boolean isExsit(Long roleId, String roleCode) {
 	public Boolean isExsit(Long roleId, String roleCode) {
-		boolean result = this.roleService.isExsitRolecode(roleCode,roleId);
+		boolean result = this.roleService.isExsitRolecode(roleCode, roleId);
 		if (result) {
 		if (result) {
 			return false;
 			return false;
 		}
 		}
@@ -125,10 +129,11 @@ public class RoleController extends BasicController {
 
 
 	/**
 	/**
 	 * 删除角色
 	 * 删除角色
+	 * 
 	 * @param ids
 	 * @param ids
 	 * @return
 	 * @return
 	 */
 	 */
-	@RequestMapping(value = {"/delete" }, method = {org.springframework.web.bind.annotation.RequestMethod.POST })
+	@RequestMapping(value = { "/delete" }, method = { org.springframework.web.bind.annotation.RequestMethod.POST })
 	@ResponseBody
 	@ResponseBody
 	public ResponseModel delete(String ids) {
 	public ResponseModel delete(String ids) {
 		ResponseModel model = new ResponseModel();
 		ResponseModel model = new ResponseModel();
@@ -144,20 +149,20 @@ public class RoleController extends BasicController {
 		return model;
 		return model;
 	}
 	}
 
 
-	
-	@RequestMapping(value = {"/qryList" }, method = {org.springframework.web.bind.annotation.RequestMethod.POST })
+	@RequestMapping(value = { "/qryList" }, method = { org.springframework.web.bind.annotation.RequestMethod.POST })
 	@ResponseBody
 	@ResponseBody
 	public ResponseModel qryList() {
 	public ResponseModel qryList() {
 		List<RoleEntity> list = this.roleService.findAll();
 		List<RoleEntity> list = this.roleService.findAll();
 		return new ResponseModel(200, "操作成功", list);
 		return new ResponseModel(200, "操作成功", list);
 	}
 	}
 
 
-	@RequestMapping(value = {"/permission" }, method = {org.springframework.web.bind.annotation.RequestMethod.GET })
+	@RequestMapping(value = { "/permission" }, method = { org.springframework.web.bind.annotation.RequestMethod.GET })
 	public String permission() {
 	public String permission() {
 		return "system/role/permission";
 		return "system/role/permission";
 	}
 	}
 
 
-	@RequestMapping(value = {"/qryPermission" }, method = {org.springframework.web.bind.annotation.RequestMethod.GET })
+	@RequestMapping(value = { "/qryPermission" }, method = {
+			org.springframework.web.bind.annotation.RequestMethod.GET })
 	@ResponseBody
 	@ResponseBody
 	public ResponseModel qryPermission(Long id) {
 	public ResponseModel qryPermission(Long id) {
 		RoleEntity role = this.roleService.findOne(id);
 		RoleEntity role = this.roleService.findOne(id);
@@ -177,7 +182,8 @@ public class RoleController extends BasicController {
 		return new ResponseModel(200, "操作成功", tree);
 		return new ResponseModel(200, "操作成功", tree);
 	}
 	}
 
 
-	@RequestMapping(value = {"/savePermission" }, method = {org.springframework.web.bind.annotation.RequestMethod.POST })
+	@RequestMapping(value = { "/savePermission" }, method = {
+			org.springframework.web.bind.annotation.RequestMethod.POST })
 	@ResponseBody
 	@ResponseBody
 	public ResponseModel savePermission(Long roleId, String permission) {
 	public ResponseModel savePermission(Long roleId, String permission) {
 		ResponseModel response = new ResponseModel(200, "操作成功", null);
 		ResponseModel response = new ResponseModel(200, "操作成功", null);

@@ -8,12 +8,8 @@ import java.util.Map;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
 
-import com.agent.entity.agent.BasicAgentEntity;
-import com.agent.service.agent.BasicAgentService;
-import com.agent.vo.agent.UserVo;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
@@ -22,17 +18,20 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 
-import com.framework.core.Servlets;
-import com.framework.shiro.SessionUtil;
-import com.framework.util.MD5Tools;
-import com.plugin.easyui.DataGrid;
-import com.plugin.easyui.EasyPage;
 import com.agent.controller.BasicController;
 import com.agent.controller.BasicController;
+import com.agent.entity.agent.BasicAgentEntity;
 import com.agent.entity.system.RoleEntity;
 import com.agent.entity.system.RoleEntity;
 import com.agent.entity.system.UserEntity;
 import com.agent.entity.system.UserEntity;
+import com.agent.service.agent.BasicAgentService;
 import com.agent.service.system.RoleService;
 import com.agent.service.system.RoleService;
 import com.agent.service.system.UserService;
 import com.agent.service.system.UserService;
 import com.agent.vo.ResponseModel;
 import com.agent.vo.ResponseModel;
+import com.agent.vo.agent.UserVo;
+import com.framework.core.Servlets;
+import com.framework.shiro.SessionUtil;
+import com.framework.util.MD5Tools;
+import com.plugin.easyui.DataGrid;
+import com.plugin.easyui.EasyPage;
 
 
 @Controller
 @Controller
 @RequestMapping({"/system/user" })
 @RequestMapping({"/system/user" })

@@ -20,7 +20,7 @@ import com.agent.entity.BasicEntity;
  */
  */
 @Entity
 @Entity
 @Table(name = "WAYBILL_RECEIPT")
 @Table(name = "WAYBILL_RECEIPT")
-public class WaybillReceiprtEntity extends BasicEntity {
+public class WaybillReceiptEntity extends BasicEntity {
 	private String flightno;
 	private String flightno;
 	private Date flightdate;
 	private Date flightdate;
 	private String response_code;
 	private String response_code;
@@ -124,7 +124,7 @@ public class WaybillReceiprtEntity extends BasicEntity {
 	// 该函数主要用于List的contains
 	// 该函数主要用于List的contains
 	public boolean equals(Object mme) {
 	public boolean equals(Object mme) {
 		if (mme != null) {
 		if (mme != null) {
-			WaybillReceiprtEntity me = (WaybillReceiprtEntity) mme;
+			WaybillReceiptEntity me = (WaybillReceiptEntity) mme;
 			if (me.getWaybill_no().equalsIgnoreCase(this.getWaybill_no())) {
 			if (me.getWaybill_no().equalsIgnoreCase(this.getWaybill_no())) {
 				return true;
 				return true;
 			}
 			}

@@ -11,7 +11,7 @@ package com.agent.entity.agent;
  * 
  * 
  */
  */
 public enum WaybillReceiptType {
 public enum WaybillReceiptType {
-	APPLY("已发送预配舱单申请报文", 2), UPDATE("已发送预配舱单修改报文", 4), DELETE("已发送预配舱单删除报文", 3);
+	TEMP_SAVE("已暂存预配舱单", 1), APPLY("已发送预配舱单申请报文", 2), UPDATE("已发送预配舱单修改报文", 4), DELETE("已发送预配舱单删除报文", 3);
 
 
 	private String name;
 	private String name;
 	private int value;
 	private int value;

@@ -8,22 +8,28 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
-import com.agent.entity.agent.WaybillReceiprtEntity;
+import com.agent.entity.agent.WaybillReceiptEntity;
 
 
 public interface WaybillReceiptRepository
 public interface WaybillReceiptRepository
-		extends PagingAndSortingRepository<WaybillReceiprtEntity, Long>, JpaSpecificationExecutor<WaybillReceiprtEntity> {
+		extends PagingAndSortingRepository<WaybillReceiptEntity, Long>, JpaSpecificationExecutor<WaybillReceiptEntity> {
 
 
 	@Query(value = "SELECT * FROM WAYBILL_RECEIPT WHERE WAYBILL_NO = ?1 AND SUB_WAYBILL_NO = ?2 ORDER BY ID DESC", nativeQuery = true)
 	@Query(value = "SELECT * FROM WAYBILL_RECEIPT WHERE WAYBILL_NO = ?1 AND SUB_WAYBILL_NO = ?2 ORDER BY ID DESC", nativeQuery = true)
-	public List<WaybillReceiprtEntity> findByWaybillNoAndSub(String waybill_no, String sub_waybill_no);
+	public List<WaybillReceiptEntity> findByWaybillNoAndSub(String waybill_no, String sub_waybill_no);
+	
+	@Query(value = "SELECT * FROM WAYBILL_RECEIPT WHERE SUB_WAYBILL_NO = ?1 ORDER BY ID DESC", nativeQuery = true)
+	public List<WaybillReceiptEntity> findSubList(String sub_waybill_no);
+	
+	@Query(value = "SELECT * FROM WAYBILL_RECEIPT WHERE WAYBILL_NO = ?1 AND SUB_WAYBILL_NO IS NULL ORDER BY ID DESC", nativeQuery = true)
+	public List<WaybillReceiptEntity> findMainList(String waybill_no);
 
 
 	@Query(value = "SELECT * FROM WAYBILL_RECEIPT WHERE WAYBILL_NO = ?1 ORDER BY ID DESC", nativeQuery = true)
 	@Query(value = "SELECT * FROM WAYBILL_RECEIPT WHERE WAYBILL_NO = ?1 ORDER BY ID DESC", nativeQuery = true)
-	public List<WaybillReceiprtEntity> findByWaybillNo(String waybill_no);
+	public List<WaybillReceiptEntity> findByWaybillNo(String waybill_no);
 
 
 	@Query(value = "SELECT * FROM WAYBILL_RECEIPT WHERE ID = ?1 ORDER BY ID DESC", nativeQuery = true)
 	@Query(value = "SELECT * FROM WAYBILL_RECEIPT WHERE ID = ?1 ORDER BY ID DESC", nativeQuery = true)
-	public List<WaybillReceiprtEntity> findById(String id);
+	public List<WaybillReceiptEntity> findById(String id);
 
 
 	@Query(value = "SELECT * FROM WAYBILL_RECEIPT ORDER BY ID DESC", nativeQuery = true)
 	@Query(value = "SELECT * FROM WAYBILL_RECEIPT ORDER BY ID DESC", nativeQuery = true)
-	public List<WaybillReceiprtEntity> getAll();
+	public List<WaybillReceiptEntity> getAll();
 
 
 	@Modifying
 	@Modifying
 	@Query(value = "DELETE FROM WAYBILL_RECEIPT WHERE ID = ?1", nativeQuery = true)
 	@Query(value = "DELETE FROM WAYBILL_RECEIPT WHERE ID = ?1", nativeQuery = true)
@@ -37,5 +43,5 @@ public interface WaybillReceiptRepository
 			String waybill_no, String sub_waybill_no, String carrier, String message_type,String sendtime);
 			String waybill_no, String sub_waybill_no, String carrier, String message_type,String sendtime);
 
 
 	@Query(value = "SELECT * FROM WAYBILL_RECEIPT WHERE ID=?1", nativeQuery = true)
 	@Query(value = "SELECT * FROM WAYBILL_RECEIPT WHERE ID=?1", nativeQuery = true)
-	public List<WaybillReceiprtEntity> queryById(Long id);
+	public List<WaybillReceiptEntity> queryById(Long id);
 }
 }

@@ -15,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.agent.entity.Constant;
 import com.agent.entity.Constant;
 import com.agent.entity.agent.ManifestEntity;
 import com.agent.entity.agent.ManifestEntity;
 import com.agent.entity.agent.PreparesecondaryEntity;
 import com.agent.entity.agent.PreparesecondaryEntity;
+import com.agent.entity.agent.WaybillReceiptEntity;
 import com.agent.entity.agent.WaybillReceiptType;
 import com.agent.entity.agent.WaybillReceiptType;
 import com.agent.repository.agent.ManifestBillRepository;
 import com.agent.repository.agent.ManifestBillRepository;
 import com.agent.repository.agent.ManifestCommodityRepository;
 import com.agent.repository.agent.ManifestCommodityRepository;
@@ -116,6 +117,9 @@ public class ManifestService extends BasicService<ManifestEntity> {
 
 
 	@Resource
 	@Resource
 	private ManifestService manifestService;
 	private ManifestService manifestService;
+	
+	@Resource
+	private WaybillReceiptService receiptService;
 
 
 	/**
 	/**
 	 * 分页查询
 	 * 分页查询
@@ -129,6 +133,15 @@ public class ManifestService extends BasicService<ManifestEntity> {
 		Specification<ManifestEntity> spec = buildSpecification(pageForm);
 		Specification<ManifestEntity> spec = buildSpecification(pageForm);
 
 
 		Page<ManifestEntity> page = manifestRepository.findAll(spec, pageRequest);
 		Page<ManifestEntity> page = manifestRepository.findAll(spec, pageRequest);
+		if(page!=null&&page.getContent()!=null) {
+			List<ManifestEntity> list = page.getContent();
+			for (int i = 0; i < list.size(); i++) {
+				ManifestEntity bean = list.get(i);
+				WaybillReceiptEntity re = receiptService.findByWaybillNo(bean.getWaybillnomaster());
+				bean.setResponse_code(re!=null?re.getResponse_code():"");
+				bean.setResponse_text(re!=null?re.getResponse_text():"");
+			}
+		}
 		return page;
 		return page;
 	}
 	}
 
 

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
 import com.agent.entity.agent.PreparesecondaryEntity;
 import com.agent.entity.agent.PreparesecondaryEntity;
+import com.agent.entity.agent.WaybillReceiptEntity;
 import com.agent.repository.agent.PreparesecondaryRepository;
 import com.agent.repository.agent.PreparesecondaryRepository;
 import com.agent.service.BasicService;
 import com.agent.service.BasicService;
 
 
@@ -30,7 +31,17 @@ public class PreparesecondaryService extends BasicService<PreparesecondaryEntity
 	}
 	}
 
 
 	public List<PreparesecondaryEntity> findByMawbId(Long id) {
 	public List<PreparesecondaryEntity> findByMawbId(Long id) {
-		return preparesecondaryRepository.findByMawbId(id);
+		List<PreparesecondaryEntity> list =  preparesecondaryRepository.findByMawbId(id);
+		if(list!=null) {
+			for (int i = 0; i < list.size(); i++) {
+				PreparesecondaryEntity bean = list.get(i);
+				WaybillReceiptEntity re = receiptService.findByWaybillNoAndSub(bean.getWaybillnomaster(), bean.getWaybillnosecondary());
+				bean.setResponse_code(re!=null?re.getResponse_code():"");
+				bean.setResponse_text(re!=null?re.getResponse_text():"");
+			}
+		}
+		
+		return list;
 	}
 	}
 
 
 	public PreparesecondaryEntity findOne(Long mawbId) {
 	public PreparesecondaryEntity findOne(Long mawbId) {

@@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.agent.entity.Constant;
 import com.agent.entity.Constant;
 import com.agent.entity.agent.ManifestEntity;
 import com.agent.entity.agent.ManifestEntity;
 import com.agent.entity.agent.PreparesecondaryEntity;
 import com.agent.entity.agent.PreparesecondaryEntity;
-import com.agent.entity.agent.WaybillReceiprtEntity;
+import com.agent.entity.agent.WaybillReceiptEntity;
 import com.agent.entity.agent.WaybillReceiptType;
 import com.agent.entity.agent.WaybillReceiptType;
 import com.agent.repository.agent.WaybillReceiptRepository;
 import com.agent.repository.agent.WaybillReceiptRepository;
 import com.agent.service.BasicService;
 import com.agent.service.BasicService;
@@ -36,7 +36,7 @@ import tools.Tools;
  *
  *
  */
  */
 @Service
 @Service
-public class WaybillReceiptService extends BasicService<WaybillReceiprtEntity> {
+public class WaybillReceiptService extends BasicService<WaybillReceiptEntity> {
 
 
 	@Resource
 	@Resource
 	private WaybillReceiptRepository service;
 	private WaybillReceiptRepository service;
@@ -49,23 +49,33 @@ public class WaybillReceiptService extends BasicService<WaybillReceiprtEntity> {
 		}
 		}
 	}
 	}
 
 
-	public WaybillReceiprtEntity findByWaybillNoAndSub(String waybill_no, String sub_waybill_no) {
-		List<WaybillReceiprtEntity> consigns = service.findByWaybillNoAndSub(waybill_no, sub_waybill_no);
+	public WaybillReceiptEntity findByWaybillNoAndSub(String waybill_no, String sub_waybill_no) {
+		List<WaybillReceiptEntity> consigns = service.findByWaybillNoAndSub(waybill_no, sub_waybill_no);
 		if (CollectionUtils.isNotEmpty(consigns)) {
 		if (CollectionUtils.isNotEmpty(consigns)) {
 			return consigns.get(0);
 			return consigns.get(0);
 		}
 		}
 		return null;
 		return null;
 	}
 	}
 
 
-	public WaybillReceiprtEntity findByWaybillNo(String waybill_no) {
-		List<WaybillReceiprtEntity> consigns = service.findByWaybillNo(waybill_no);
+	public List<WaybillReceiptEntity> findMainList(String waybill_no) {
+		List<WaybillReceiptEntity> list = service.findMainList(waybill_no);
+		return list;
+	}
+
+	public List<WaybillReceiptEntity> findSubList(String sub_waybill_no) {
+		List<WaybillReceiptEntity> list = service.findSubList(sub_waybill_no);
+		return list;
+	}
+
+	public WaybillReceiptEntity findByWaybillNo(String waybill_no) {
+		List<WaybillReceiptEntity> consigns = service.findMainList(waybill_no);
 		if (CollectionUtils.isNotEmpty(consigns)) {
 		if (CollectionUtils.isNotEmpty(consigns)) {
 			return consigns.get(0);
 			return consigns.get(0);
 		}
 		}
 		return null;
 		return null;
 	}
 	}
 
 
-	public void save(WaybillReceiprtEntity c) {
+	public void save(WaybillReceiptEntity c) {
 		if (c != null) {
 		if (c != null) {
 			if (c.getCreateDate() == null) {
 			if (c.getCreateDate() == null) {
 				c.setCreateDate(new Date());
 				c.setCreateDate(new Date());
@@ -78,15 +88,15 @@ public class WaybillReceiptService extends BasicService<WaybillReceiprtEntity> {
 		}
 		}
 	}
 	}
 
 
-	public List<WaybillReceiprtEntity> findAll() {
+	public List<WaybillReceiptEntity> findAll() {
 		return service.getAll();
 		return service.getAll();
 	}
 	}
 
 
-	public void update(WaybillReceiprtEntity c) {
+	public void update(WaybillReceiptEntity c) {
 		service.save(c);
 		service.save(c);
 	}
 	}
 
 
-	public List<WaybillReceiprtEntity> findById(String id) {
+	public List<WaybillReceiptEntity> findById(String id) {
 		return service.findById(id);
 		return service.findById(id);
 	}
 	}
 
 
@@ -98,7 +108,7 @@ public class WaybillReceiptService extends BasicService<WaybillReceiprtEntity> {
 	 */
 	 */
 	public void saveFromManifest(ManifestEntity manifest, WaybillReceiptType type) {
 	public void saveFromManifest(ManifestEntity manifest, WaybillReceiptType type) {
 		if (manifest != null) {
 		if (manifest != null) {
-			WaybillReceiprtEntity wre = new WaybillReceiprtEntity();
+			WaybillReceiptEntity wre = new WaybillReceiptEntity();
 			wre.setCarrier(manifest.getCarrier());
 			wre.setCarrier(manifest.getCarrier());
 			wre.setFlightdate(manifest.getFlightdate());
 			wre.setFlightdate(manifest.getFlightdate());
 			wre.setFlightno(manifest.getFlightno());
 			wre.setFlightno(manifest.getFlightno());
@@ -113,11 +123,13 @@ public class WaybillReceiptService extends BasicService<WaybillReceiprtEntity> {
 			wre.setWeight(manifest.getPreparetotalweight());
 			wre.setWeight(manifest.getPreparetotalweight());
 			save(wre);
 			save(wre);
 
 
-			ManifestService mbs = new ManifestService();
-			DeclareXmlBody dpxb = mbs.generateWaybillReceiptXml(manifest, type, null);
-			String dpxbPath = CustomMessageKit.getMessagePath("manifest");
-			XmlUtil.convertToXml2(dpxb, dpxbPath);
-			RemoteFileKit.putFile(dpxbPath);
+			if (type != WaybillReceiptType.TEMP_SAVE) {
+				ManifestService mbs = new ManifestService();
+				DeclareXmlBody dpxb = mbs.generateWaybillReceiptXml(manifest, type, null);
+				String dpxbPath = CustomMessageKit.getMessagePath("manifest");
+				XmlUtil.convertToXml2(dpxb, dpxbPath);
+				RemoteFileKit.putFile(dpxbPath);
+			}
 		}
 		}
 	}
 	}
 
 
@@ -129,7 +141,7 @@ public class WaybillReceiptService extends BasicService<WaybillReceiprtEntity> {
 	 */
 	 */
 	public void saveFromPreparesecondary(PreparesecondaryEntity prepare, WaybillReceiptType type) {
 	public void saveFromPreparesecondary(PreparesecondaryEntity prepare, WaybillReceiptType type) {
 		if (prepare != null) {
 		if (prepare != null) {
-			WaybillReceiprtEntity wre = new WaybillReceiprtEntity();
+			WaybillReceiptEntity wre = new WaybillReceiptEntity();
 			wre.setCarrier(prepare.getCarrier());
 			wre.setCarrier(prepare.getCarrier());
 			wre.setFlightdate(prepare.getFlightdate());
 			wre.setFlightdate(prepare.getFlightdate());
 			wre.setFlightno(prepare.getFlightno());
 			wre.setFlightno(prepare.getFlightno());
@@ -145,12 +157,14 @@ public class WaybillReceiptService extends BasicService<WaybillReceiprtEntity> {
 			wre.setWeight(prepare.getPrepareweight());
 			wre.setWeight(prepare.getPrepareweight());
 			save(wre);
 			save(wre);
 
 
-			ManifestService mbs = new ManifestService();
-			DeclareXmlBody dpxb = mbs.generateWaybillReceiptXml(prepare, type, null);
-			String dpxbPath = CustomMessageKit.getMessagePath("secondary");
-			XmlUtil.convertToXml2(dpxb, dpxbPath);
-			RemoteFileKit.putFile(dpxbPath);
-		}else {
+			if (type != WaybillReceiptType.TEMP_SAVE) {
+				ManifestService mbs = new ManifestService();
+				DeclareXmlBody dpxb = mbs.generateWaybillReceiptXml(prepare, type, null);
+				String dpxbPath = CustomMessageKit.getMessagePath("secondary");
+				XmlUtil.convertToXml2(dpxb, dpxbPath);
+				RemoteFileKit.putFile(dpxbPath);
+			}
+		} else {
 			System.err.println("prepare is null");
 			System.err.println("prepare is null");
 		}
 		}
 	}
 	}

@@ -183,7 +183,7 @@ public class FSXmlKit {
 		sliMasterConsignment.setSpecifiedLogisticsTransportMovement(transport);
 		sliMasterConsignment.setSpecifiedLogisticsTransportMovement(transport);
 
 
 		HandlingInstructions handlingInstructions = new HandlingInstructions();
 		HandlingInstructions handlingInstructions = new HandlingInstructions();
-		handlingInstructions.setDescriptionCode(me.getProductname());
+		handlingInstructions.setDescriptionCode(me.getSpecialgoodscode());
 		handlingInstructions.setDescription(me.getSpecialgoodscode());
 		handlingInstructions.setDescription(me.getSpecialgoodscode());
 		sliMasterConsignment.setHandlingInstructions(handlingInstructions);
 		sliMasterConsignment.setHandlingInstructions(handlingInstructions);
 
 
@@ -398,7 +398,7 @@ public class FSXmlKit {
 		includedHouseConsignment.setSpecifiedLogisticsTransportMovement(transport);
 		includedHouseConsignment.setSpecifiedLogisticsTransportMovement(transport);
 
 
 		HandlingInstructions handlingInstructions = new HandlingInstructions();
 		HandlingInstructions handlingInstructions = new HandlingInstructions();
-		handlingInstructions.setDescriptionCode(pe.getProductname());
+		handlingInstructions.setDescriptionCode(pe.getSpecialgoodscode());
 		handlingInstructions.setDescription(pe.getSpecialgoodscode());
 		handlingInstructions.setDescription(pe.getSpecialgoodscode());
 		includedHouseConsignment.setHandlingInstructions(handlingInstructions);
 		includedHouseConsignment.setHandlingInstructions(handlingInstructions);
 
 

@@ -6,6 +6,8 @@ import com.agent.entity.Constant;
 import com.agent.xml.common.XmlUtil;
 import com.agent.xml.common.XmlUtil;
 import com.agent.xml.fhlsli.fhl.HouseWaybill;
 import com.agent.xml.fhlsli.fhl.HouseWaybill;
 
 
+import tools.NumKit;
+
 /**
 /**
  * Depiction:
  * Depiction:
  * <p>
  * <p>
@@ -22,35 +24,22 @@ public class Test {
 	}
 	}
 
 
 	public static void main(String[] args) {
 	public static void main(String[] args) {
-		FhlCcs ccs = new FhlCcs();
-
-		Meta meta = new Meta();
-		meta.setSndr("NDLR");
-		meta.setSeqn("4565432567");
-		meta.setDttm(Constant.dateTimeFormatnumber.format(new Date()));
-		meta.setType("SLI");
-		meta.setStyp("SLI");
-		meta.setRcvr("");
-		meta.setAck("N");
-		meta.setVer("01");
+		String no = "784-28567862";
+		String[] array = no.split("-");
+		String end = array[1];
+		int number = NumKit.parseInt(end);
+		int remainder = number / 10 % 7;
+		int last = number % 10;
 		
 		
-		Dests dests = new Dests();
-		Dest dest = new Dest();
-		dest.setSita("111111111");
-		dest.setDest("kkkkkkkk");
-		dests.setDest(dest);
-		meta.setDests(dests);
+		System.err.println("===================================");
+		System.err.println("remainder-->"+remainder);
+		System.err.println("last-->"+last);
 		
 		
-		ccs.setMeta(meta);
-
-		FhlMain main = new FhlMain();
-		HouseWaybill houseWaybill = new HouseWaybill();
-		main.setHouseWaybill(houseWaybill);
-		ccs.setMain(main);
-
-		String xml = XmlUtil.convertToXml(ccs);
-		System.err.println();
-		System.err.println(xml);
+		if (remainder == last) {
+			System.err.println(true);
+		} else {
+			System.err.println(false);
+		}
 	}
 	}
 
 
 }
 }

 package tools;
 package tools;
 
 
+import java.text.DecimalFormat;
+
+import org.apache.commons.lang3.StringUtils;
+
 /**
 /**
  * Depiction:
  * Depiction:
  * <p>
  * <p>
@@ -12,7 +16,7 @@ package tools;
  */
  */
 public class NumKit {
 public class NumKit {
 
 
-	public static int parseString2Int(String str) {
+	public static int parseInt(String str) {
 		int num = 0;
 		int num = 0;
 		try {
 		try {
 			num = Integer.parseInt(str);
 			num = Integer.parseInt(str);
@@ -21,4 +25,63 @@ public class NumKit {
 		return num;
 		return num;
 	}
 	}
 
 
+	public static float parseFloat(String str) {
+		float num = 0;
+		try {
+			num = Float.parseFloat(str);
+		} catch (Exception e) {
+		}
+		return num;
+	}
+
+	/**
+	 * 截取字符串
+	 * 
+	 * @param source
+	 *            原串
+	 * @param number
+	 *            前几位
+	 * @return
+	 */
+	public static String subStr(String source, int number) {
+		if (StringUtils.isBlank(source)) {
+			return "";
+		}
+
+		int length = source.length();
+		if (length >= number) {
+			source = source.substring(0, number);
+		}
+		return source;
+	}
+
+	/**
+	 * 格式化浮点数字
+	 * 
+	 * @param number
+	 *            原始数据字符串
+	 * @param count
+	 *            小数点位数
+	 * @return String
+	 */
+	public static String formatNumber(String number, int count) {
+		count = count >= 0 ? count : 0;
+
+		float tmp = 0.f;
+		try {
+			tmp = Float.parseFloat(number);
+		} catch (Exception e) {
+		}
+		DecimalFormat format = new DecimalFormat("0");
+		if (count > 0) {
+			StringBuffer pattern = new StringBuffer();
+			pattern.append("0.");
+			for (int i = 0; i < count; i++) {
+				pattern.append("0");
+			}
+			format = new DecimalFormat(pattern.toString());
+		}
+
+		return format.format(tmp);
+	}
 }
 }

@@ -36,6 +36,7 @@ opt.pleasesave=Please Save
 opt.success=Success
 opt.success=Success
 opt.operator=Operator
 opt.operator=Operator
 opt.backout=Back Out
 opt.backout=Back Out
+opt.open.receipt=See Receipt
 
 
 menu.name=Menu List
 menu.name=Menu List
 menu.system=System
 menu.system=System
@@ -375,7 +376,7 @@ track.no=Freight Waybill No
 
 
 ###
 ###
 manifest.carrier.tip=Please enter two words, for example, CA
 manifest.carrier.tip=Please enter two words, for example, CA
-manifest.carrier.flightno.tip=Please enter flightno, for example, 999
+manifest.carrier.flightno.tip=Please enter flightno, for example, CA999
 manifest.enterprise.code=Enterprise Code
 manifest.enterprise.code=Enterprise Code
 manifest.enterprise.code.type=Select Code Type
 manifest.enterprise.code.type=Select Code Type
 manifest.list=Manifest List
 manifest.list=Manifest List
@@ -518,7 +519,7 @@ manifest.number.of.fittings=Number Of Fittings
 manifest.pre.weight=Pre Weight
 manifest.pre.weight=Pre Weight
 manifest.customs.status=Customs Status
 manifest.customs.status=Customs Status
 manifest.payment.method=Payment Method
 manifest.payment.method=Payment Method
-manifest.description.of.the.goods=Description Of The Doods
+manifest.description.of.the.goods=Description Of The Goods
 manifest.fitting.time=Fitting Time
 manifest.fitting.time=Fitting Time
 manifest.customs=Customs
 manifest.customs=Customs
 manifest.agent.name=Agent Name
 manifest.agent.name=Agent Name

@@ -36,6 +36,7 @@ opt.pleasesave=\u8bf7\u5148\u4fdd\u5b58
 opt.success=\u6210\u529f
 opt.success=\u6210\u529f
 opt.operator=\u64CD\u4F5C
 opt.operator=\u64CD\u4F5C
 opt.backout=\u64A4\u9500
 opt.backout=\u64A4\u9500
+opt.open.receipt=\u67E5\u770B\u56DE\u6267
 
 
 
 
 menu.name=\u529F\u80FD\u83DC\u5355
 menu.name=\u529F\u80FD\u83DC\u5355
@@ -120,7 +121,7 @@ delivery.volume=\u4f53\u79ef\uff08\u7acb\u65b9\u7c73\uff09
 delivery.weight=\u91cd\u91cf
 delivery.weight=\u91cd\u91cf
 delivery.mailnum=\u90ae\u4ef6\u5355\u8bc1\u53f7
 delivery.mailnum=\u90ae\u4ef6\u5355\u8bc1\u53f7
 delivery.pieces=\u4ef6\u6570
 delivery.pieces=\u4ef6\u6570
-delivery.productname=\u54c1\u540d
+delivery.productname=\u8D27\u7269\u54c1\u540d
 delivery.reviewpieces=\u590d\u6838\u4ef6\u6570
 delivery.reviewpieces=\u590d\u6838\u4ef6\u6570
 delivery.reviewweight=\u590d\u6838\u91cd\u91cf
 delivery.reviewweight=\u590d\u6838\u91cd\u91cf
 delivery.subelemet=\u5206\u5355\u4fe1\u606f
 delivery.subelemet=\u5206\u5355\u4fe1\u606f
@@ -377,7 +378,7 @@ track.no=\u8D27\u8FD0\u5355\u53F7
 
 
 ###
 ###
 manifest.carrier.tip=\u8BF7\u8F93\u5165\u822A\u53F8\u4E8C\u5B57\u7801,\u4F8B\u5982\uFF1ACA
 manifest.carrier.tip=\u8BF7\u8F93\u5165\u822A\u53F8\u4E8C\u5B57\u7801,\u4F8B\u5982\uFF1ACA
-manifest.carrier.flightno.tip=\u8BF7\u8F93\u5165\u822A\u73ED\u53F7\uFF0C\u4F8B\u5982\uFF1A999
+manifest.carrier.flightno.tip=\u8BF7\u8F93\u5165\u822A\u73ED\u53F7\uFF0C\u4F8B\u5982\uFF1ACA999
 manifest.enterprise.code=\u4F01\u4E1A\u4EE3\u7801
 manifest.enterprise.code=\u4F01\u4E1A\u4EE3\u7801
 manifest.enterprise.code.type=\u8BF7\u9009\u62E9\u4EE3\u7801\u7C7B\u578B
 manifest.enterprise.code.type=\u8BF7\u9009\u62E9\u4EE3\u7801\u7C7B\u578B
 manifest.list=\u9884\u914D\u8231\u5355\u5217\u8868
 manifest.list=\u9884\u914D\u8231\u5355\u5217\u8868

@@ -37,7 +37,7 @@
 			<tbody>
 			<tbody>
 				<tr>
 				<tr>
 					<td><spring:message code="manifest.company" /><span class="required_span">*</span></td>
 					<td><spring:message code="manifest.company" /><span class="required_span">*</span></td>
-					<td colspan="5"><input type="text" name="co_company" id="co_company"
+					<td colspan="5"><input type="text" name="co_company" id="co_company" maxlength="70"
 							value="${consignor.co_company}" autocomplete="off" class="layui-input" required
 							value="${consignor.co_company}" autocomplete="off" class="layui-input" required
 							maxlength="45" oninput="onInputChange(event,'co_company','oninput')"
 							maxlength="45" oninput="onInputChange(event,'co_company','oninput')"
 								onpropertychange="onInputChange(event,'co_company','onpropertychange')"></td>
 								onpropertychange="onInputChange(event,'co_company','onpropertychange')"></td>
@@ -45,11 +45,11 @@
 
 
 				<tr>
 				<tr>
 					<td><spring:message code="manifest.send_name" /><span class="required_span">*</span></td>
 					<td><spring:message code="manifest.send_name" /><span class="required_span">*</span></td>
-					<td><input type="text" name="co_name" value="${consignor.co_name}"
-							autocomplete="off" class="layui-input" required maxlength="45"></td>
+					<td><input type="text" name="co_name" value="${consignor.co_name}" maxlength="70"
+							autocomplete="off" class="layui-input" required maxlength="50"></td>
 					<td><spring:message code="manifest.telephone" /></td>
 					<td><spring:message code="manifest.telephone" /></td>
 					<td><input type="text" name="co_telephone" placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"
 					<td><input type="text" name="co_telephone" placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"
-							value="${consignor.co_telephone}" autocomplete="off" class="layui-input" maxlength="45"></td>
+							value="${consignor.co_telephone}" autocomplete="off" class="layui-input" maxlength="50"></td>
 					<td><spring:message code="manifest.fax" /></td>
 					<td><spring:message code="manifest.fax" /></td>
 					<td><input type="text" name="co_fax" placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>" value="${consignor.co_fax}"
 					<td><input type="text" name="co_fax" placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>" value="${consignor.co_fax}"
 							autocomplete="off" class="layui-input" maxlength="45"></td>
 							autocomplete="off" class="layui-input" maxlength="45"></td>
@@ -59,29 +59,29 @@
 				<tr>
 				<tr>
 					<td><spring:message code="manifest.country" /><span class="required_span">*</span></td>
 					<td><spring:message code="manifest.country" /><span class="required_span">*</span></td>
 					<td><input required type="text" name="co_country"  value="${consignor.co_country}"
 					<td><input required type="text" name="co_country"  value="${consignor.co_country}"
-							autocomplete="off" class="layui-input" maxlength="45"></td>
+							autocomplete="off" class="layui-input" maxlength="2"></td>
 					<td><spring:message code="manifest.city" /></td>
 					<td><spring:message code="manifest.city" /></td>
 					<td><input type="text" name="co_city" 
 					<td><input type="text" name="co_city" 
-							value="${consignor.co_city}" autocomplete="off" class="layui-input" required maxlength="45"></td>
+							value="${consignor.co_city}" autocomplete="off" class="layui-input" required maxlength="70"></td>
 					<td><spring:message code="manifest.zip.code" /></td>
 					<td><spring:message code="manifest.zip.code" /></td>
 					<td><input type="text" name="co_zipcode" value="${consignor.co_zipcode}"
 					<td><input type="text" name="co_zipcode" value="${consignor.co_zipcode}"
-							autocomplete="off" class="layui-input" maxlength="45"></td>
+							autocomplete="off" class="layui-input" maxlength="9"></td>
 				</tr>
 				</tr>
 
 
 				<tr>
 				<tr>
 					<td><spring:message code="manifest.address" /><span class="required_span">*</span></td>
 					<td><spring:message code="manifest.address" /><span class="required_span">*</span></td>
 					<td colspan="5"><input required type="text" name="co_address" 
 					<td colspan="5"><input required type="text" name="co_address" 
-							value="${consignor.co_address}" autocomplete="off" class="layui-input" maxlength="45"></td>
+							value="${consignor.co_address}" autocomplete="off" class="layui-input" maxlength="70"></td>
 				</tr>
 				</tr>
 
 
 				<tr>
 				<tr>
 					<td><spring:message code="manifest.fhr.shpcusid" /><span class="required_span">*</span></td>
 					<td><spring:message code="manifest.fhr.shpcusid" /><span class="required_span">*</span></td>
 					<td><input id="shpcusid" type="text" name="shpcusid" value="${consignor.shpcusid}"
 					<td><input id="shpcusid" type="text" name="shpcusid" value="${consignor.shpcusid}"
-							autocomplete="off" class="layui-input" maxlength="45" oninput="onInputChange(event,'shpcusid','oninput')"
+							autocomplete="off" class="layui-input" maxlength="100" oninput="onInputChange(event,'shpcusid','oninput')"
 									onpropertychange="onInputChange(event,'shpcusid','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'shpcusid','onpropertychange')"></td>
 					<td><spring:message code="manifest.fhr.shpaeo" /></td>
 					<td><spring:message code="manifest.fhr.shpaeo" /></td>
 					<td colspan="3"><input type="text" name="shpaeo" id="shpaeo"
 					<td colspan="3"><input type="text" name="shpaeo" id="shpaeo"
-							value="${consignor.shpaeo}" autocomplete="off" class="layui-input" maxlength="45" 
+							value="${consignor.shpaeo}" autocomplete="off" class="layui-input" maxlength="20" 
 							oninput="onInputChange(event,'shpaeo','oninput')"
 							oninput="onInputChange(event,'shpaeo','oninput')"
 									onpropertychange="onInputChange(event,'shpaeo','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'shpaeo','onpropertychange')"></td>
 				</tr>
 				</tr>

@@ -76,7 +76,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
 	                            <i class="iconfont">&#xe642;</i>
 	                            <i class="iconfont">&#xe642;</i>
 	                        </a>
 	                        </a>
 	                        <ul class="sider-nav-s">
 	                        <ul class="sider-nav-s">
-	                           <li class="active"><a href="javascript:void(0)" onclick="addTab('<spring:message code="menu.role" />||system/role/list',this)"><spring:message code="menu.role" /></a></li>
+	                           <li><a href="javascript:void(0)" onclick="addTab('<spring:message code="menu.role" />||system/role/list',this)"><spring:message code="menu.role" /></a></li>
 	                           <li><a href="javascript:void(0)" onclick="addTab('<spring:message code="menu.agent" />||agent/list',this)"><spring:message code="menu.agent" /></a></li>
 	                           <li><a href="javascript:void(0)" onclick="addTab('<spring:message code="menu.agent" />||agent/list',this)"><spring:message code="menu.agent" /></a></li>
 	                           <li><a href="javascript:void(0)" onclick="addTab('<spring:message code="menu.user" />||system/user/list',this)"><spring:message code="menu.user" /></a></li>
 	                           <li><a href="javascript:void(0)" onclick="addTab('<spring:message code="menu.user" />||system/user/list',this)"><spring:message code="menu.user" /></a></li>
 	                           <%-- <li><a href="javascript:void(0)" onclick="addTab('<spring:message code="menu.consignee_info_set" />||consignee/list')"><spring:message code="menu.consignee_info_set" /></a></li> --%>
 	                           <%-- <li><a href="javascript:void(0)" onclick="addTab('<spring:message code="menu.consignee_info_set" />||consignee/list')"><spring:message code="menu.consignee_info_set" /></a></li> --%>
@@ -130,7 +130,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
                         </a>
                         </a>
                      </li>
                      </li>
                      
                      
-                     <li>
+                     <li class="active">
                         <a href="javascript:void(0)" onclick="addTab('<spring:message code="menu.premanifest" />||manifest/list',this)">
                         <a href="javascript:void(0)" onclick="addTab('<spring:message code="menu.premanifest" />||manifest/list',this)">
                             <span class="iconfont sider-nav-icon">&#xe6c3;</span>
                             <span class="iconfont sider-nav-icon">&#xe6c3;</span>
                             <span class="sider-nav-title"><spring:message code="menu.premanifest" /></span>
                             <span class="sider-nav-title"><spring:message code="menu.premanifest" /></span>
@@ -163,8 +163,8 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
             </style>
             </style>
             <div id="pf-page">
             <div id="pf-page">
                 <div class="easyui-tabs1" style="width:100%;height:100%;">
                 <div class="easyui-tabs1" style="width:100%;height:100%;">
-                    <div title='<spring:message code="menu.zhawb" />' data-options="closable:true">
-                        <iframe class="page-iframe" src="<%=basePath %>bill/list?type=domestic" frameborder="no"   border="no" height="100%" width="100%" scrolling="auto"></iframe>
+                    <div title='<spring:message code="menu.premanifest" />' data-options="closable:true">
+                        <iframe class="page-iframe" src="<%=basePath %>manifest/list?type=domestic" frameborder="no"   border="no" height="100%" width="100%" scrolling="auto"></iframe>
                     </div>
                     </div>
                 </div>
                 </div>
             </div>
             </div>

@@ -24,6 +24,7 @@
 <script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js"></script>
 <script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js"></script>
 
 
 <link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css" media="all">
 <link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css" media="all">
+<script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js"></script>
 <script type="text/javascript" src="<%=basePath%>resource/layui/layui.js"></script>
 <script type="text/javascript" src="<%=basePath%>resource/layui/layui.js"></script>
 
 
 <style type="text/css">
 <style type="text/css">
@@ -54,10 +55,10 @@
 						<tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.bill.number" /><span
 							<td class="kv-label"><spring:message code="manifest.bill.number" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content"><input required id="waybill" minlength="12" maxlength="12"
-									type="text" onblur="input_change(this)"> <input required id="waybillnomaster"
-									minlength="12" maxlength="12" name="waybillnomaster" type="hidden"
-									value="${manifest.waybillnomaster }"></td>
+							<td class="kv-content">
+								<input required id="waybill" minlength="12" type="text" onblur="input_change(this)"> 
+								<input required id="waybillnomaster" minlength="12" maxlength="12" name="waybillnomaster" type="hidden"
+									value="${manifest.waybillnomaster }" ></td>
 							<td class="kv-label"><spring:message code="delivery.delivery.station" /><span
 							<td class="kv-label"><spring:message code="delivery.delivery.station" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
 							<td class="kv-content"><select id="delivery_station" name="delivery_station">
 							<td class="kv-content"><select id="delivery_station" name="delivery_station">
@@ -77,8 +78,11 @@
 							<script>
 							<script>
 			                    	function input_change(obj){
 			                    	function input_change(obj){
 			                    		var val = $(obj).val();
 			                    		var val = $(obj).val();
+			                    		if(val){
+			                			 	checkNo(val);
+			                    		}
 			                    		//用户输入订单号满足格式
 			                    		//用户输入订单号满足格式
-			                    		if(val.length == 12 && val.indexOf("-") >= 0)
+			                    		<%-- if(val.length == 12 && val.indexOf("-") >= 0)
 			                    		{
 			                    		{
 			                    			$.ajax({
 			                    			$.ajax({
 			                    				url:"<%=basePath%>/manifest/gettreecode",
 			                    				url:"<%=basePath%>/manifest/gettreecode",
@@ -91,7 +95,8 @@
 			                    					$("#carrier").val(d.cARRIERID);
 			                    					$("#carrier").val(d.cARRIERID);
 			                    				}
 			                    				}
 			                    			});
 			                    			});
-			                    		}
+			                    		} --%>
+			                    		
 			                    	}
 			                    	}
                     			</script>
                     			</script>
 						</tr>
 						</tr>
@@ -121,19 +126,20 @@
 									code="manifest.flight.information" /></td>
 									code="manifest.flight.information" /></td>
 						</tr>
 						</tr>
 						<tr>
 						<tr>
-							<td class="kv-label"><spring:message code="manifest.carrier" /><span
-								class="required_span">*</span></td>
-							<td class="kv-content"><input required id="carrier_new" name="carrier" type="text"
+							<%-- <td class="kv-label"><spring:message code="manifest.carrier" /><span
+								class="required_span">*</span></td> --%>
+							<%-- <td class="kv-content"><input required id="carrier_new" name="carrier" type="text"
 									placeholder="<spring:message code='manifest.carrier.tip'/>"
 									placeholder="<spring:message code='manifest.carrier.tip'/>"
 									value="${manifest.carrier}" oninput="onInputChange(event,'carrier_new','oninput')"
 									value="${manifest.carrier}" oninput="onInputChange(event,'carrier_new','oninput')"
-									onpropertychange="onInputChange(event,'carrier_new','onpropertychange')"></td>
+									onpropertychange="onInputChange(event,'carrier_new','onpropertychange')"></td> --%>
 
 
 							<td class="kv-label"><spring:message code="manifest.flight.number" /><span
 							<td class="kv-label"><spring:message code="manifest.flight.number" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content"><input required id="flightno" name="flightno" type="text"
+							<td class="kv-content"><input required id="flightno" name="flightno" type="text" 
 									placeholder="<spring:message code='manifest.carrier.flightno.tip'/>"
 									placeholder="<spring:message code='manifest.carrier.flightno.tip'/>"
-									value="${manifest.flightno }" oninput="onInputChange(event,'flightno','oninput')"
-									onpropertychange="onInputChange(event,'flightno','onpropertychange')"></td>
+									value="${manifest.carrier}${manifest.flightno}" oninput="onInputChange(event,'flightno','oninput')"
+									onpropertychange="onInputChange(event,'flightno','onpropertychange')"
+									autocomplete="off"></td>
 
 
 							<td class="kv-label"><spring:message code="manifest.flight.date" /><span
 							<td class="kv-label"><spring:message code="manifest.flight.date" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
@@ -145,13 +151,15 @@
 						<tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.starting.point" /><span
 							<td class="kv-label"><spring:message code="manifest.starting.point" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content"><input required id="originatingstation" name="originatingstation"
-									type="text" value="${manifest.originatingstation}"
+							<td class="kv-content">
+							<input required id="originatingstation" name="originatingstation" type="text" maxlength="3"
+									<c:if test="${empty manifest.originatingstation}">value="CGO"</c:if>
+									<c:if test="${not empty manifest.originatingstation}">value="${manifest.originatingstation}"</c:if> 
 									oninput="onInputChange(event,'originatingstation','oninput')"
 									oninput="onInputChange(event,'originatingstation','oninput')"
 									onpropertychange="onInputChange(event,'originatingstation','onpropertychange')" /></td>
 									onpropertychange="onInputChange(event,'originatingstation','onpropertychange')" /></td>
 							<td class="kv-label"><spring:message code="manifest.destination" /><span
 							<td class="kv-label"><spring:message code="manifest.destination" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content" colspan="3"><input required id="destinationstation"
+							<td class="kv-content" colspan="3"><input required id="destinationstation" maxlength="3"
 									name="destinationstation" type="text" value="${manifest.destinationstation}"
 									name="destinationstation" type="text" value="${manifest.destinationstation}"
 									oninput="onInputChange(event,'destinationstation','oninput')"
 									oninput="onInputChange(event,'destinationstation','oninput')"
 									onpropertychange="onInputChange(event,'destinationstation','onpropertychange')" /></td>
 									onpropertychange="onInputChange(event,'destinationstation','onpropertychange')" /></td>
@@ -164,14 +172,14 @@
 						<tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.number.of.fittings" /><span
 							<td class="kv-label"><spring:message code="manifest.number.of.fittings" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content"><input required class="delivery number" id="totalpiece"
+							<td class="kv-content"><input required class="delivery number" id="totalpiece" maxlength="8"
 									name="totalpiece" type="text" value="${manifest.totalpiece}"
 									name="totalpiece" type="text" value="${manifest.totalpiece}"
 									oninput="onInputChange(event,'totalpiece','oninput')"
 									oninput="onInputChange(event,'totalpiece','oninput')"
 									onpropertychange="onInputChange(event,'totalpiece','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'totalpiece','onpropertychange')"></td>
 
 
 							<td class="kv-label"><spring:message code="manifest.pre.weight" /><span
 							<td class="kv-label"><spring:message code="manifest.pre.weight" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content"><input required class="delivery number" id="totalweight"
+							<td class="kv-content"><input required class="delivery number" id="totalweight" maxlength="15"
 									name="totalweight" type="text" value="${manifest.totalweight}"
 									name="totalweight" type="text" value="${manifest.totalweight}"
 									oninput="onInputChange(event,'totalweight','oninput')"
 									oninput="onInputChange(event,'totalweight','oninput')"
 									onpropertychange="onInputChange(event,'totalweight','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'totalweight','onpropertychange')"></td>
@@ -226,19 +234,21 @@
 						<tr style="display: none;">
 						<tr style="display: none;">
 							<td class="kv-label"><spring:message code="manifest.number.of.fittings" /><span
 							<td class="kv-label"><spring:message code="manifest.number.of.fittings" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content"><input required class="delivery number" id="preparetotalpiece"
+							<td class="kv-content"><input required class="delivery number" id="preparetotalpiece" maxlength="8"
 									name="preparetotalpiece" type="text" value="${manifest.preparetotalpiece}"></td>
 									name="preparetotalpiece" type="text" value="${manifest.preparetotalpiece}"></td>
 							<td class="kv-label"><spring:message code="manifest.pre.weight" /><span
 							<td class="kv-label"><spring:message code="manifest.pre.weight" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content" colspan="3"><input required class="delivery number"
+							<td class="kv-content" colspan="3"><input required class="delivery number" maxlength="15"
 									id="preparetotalweight" name="preparetotalweight" type="text"
 									id="preparetotalweight" name="preparetotalweight" type="text"
 									value="${manifest.preparetotalweight}"></td>
 									value="${manifest.preparetotalweight}"></td>
 						</tr>
 						</tr>
 						<tr>
 						<tr>
-							<td class="kv-label"><spring:message code="manifest.description.of.the.goods" /><span
+							<td class="kv-label"><spring:message code="delivery.productname" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
 							<td class="kv-content" colspan="5"><textarea required id="productname"
 							<td class="kv-content" colspan="5"><textarea required id="productname"
-									name="productname" maxlength="200">${manifest.productname}</textarea></td>
+									name="productname" maxlength="200"
+									oninput="onInputChange(event,'productname','oninput')"
+									onpropertychange="onInputChange(event,'productname','onpropertychange')">${manifest.productname}</textarea></td>
 						</tr>
 						</tr>
 						<%-- <tr>
 						<%-- <tr>
 							<td class="kv-label"><spring:message code="manifest.agent.name" /></td>
 							<td class="kv-label"><spring:message code="manifest.agent.name" /></td>
@@ -268,7 +278,7 @@
                 					if(index >= 0)
                 					if(index >= 0)
                 					{
                 					{
                 						var consignor = consignorList[index];
                 						var consignor = consignorList[index];
-                						$("#co_company").val(consignor.co_company?consignor.co_company:"");
+                						$("#co_company").val(consignor.co_company?consignor.co_company.toUpperCase():"");
                 						var address = consignor.co_address;
                 						var address = consignor.co_address;
                 						if(notEmpty(address)){
                 						if(notEmpty(address)){
                 							if(address.length>70){
                 							if(address.length>70){
@@ -277,12 +287,12 @@
                 						}else{
                 						}else{
                 							address = "";
                 							address = "";
                 						}
                 						}
-                						$("#co_address").val(address);
+                						$("#co_address").val(address.toUpperCase());
                 						$("#co_telephone").val(consignor.co_telephone?consignor.co_telephone:"");
                 						$("#co_telephone").val(consignor.co_telephone?consignor.co_telephone:"");
-                						$("#co_country").val(consignor.co_country?consignor.co_country:"");
-                						$("#co_city").val(consignor.co_city?consignor.co_city:"");
-                						$("#co_deltaname").val(consignor.co_deltaname?consignor.co_deltaname:"");
-                						$("#co_name").val(consignor.co_name?consignor.co_name:"");
+                						$("#co_country").val(consignor.co_country?consignor.co_country:"CN");
+                						$("#co_city").val(consignor.co_city?consignor.co_city.toUpperCase():"");
+                						$("#co_deltaname").val(consignor.co_deltaname?consignor.co_deltaname.toUpperCase():"");
+                						$("#co_name").val(consignor.co_name?consignor.co_name.toUpperCase():"");
                 						$("#co_fax").val(consignor.co_fax?consignor.co_fax:"");
                 						$("#co_fax").val(consignor.co_fax?consignor.co_fax:"");
                 						$("#co_zipcode").val(consignor.co_zipcode?consignor.co_zipcode:"");
                 						$("#co_zipcode").val(consignor.co_zipcode?consignor.co_zipcode:"");
                 						$("#shpaeo").val(consignor.shpaeo?consignor.shpaeo:"");
                 						$("#shpaeo").val(consignor.shpaeo?consignor.shpaeo:"");
@@ -290,7 +300,7 @@
                 						if(notEmpty(consignor.shpcusid)){
                 						if(notEmpty(consignor.shpcusid)){
                 							var temp = consignor.shpcusid.split("+")[1];
                 							var temp = consignor.shpcusid.split("+")[1];
                 							if(notEmpty(temp)){
                 							if(notEmpty(temp)){
-                								$("#shpcusid").val(temp);
+                								$("#shpcusid").val(temp.toUpperCase());
                 							}
                 							}
                 						}
                 						}
                 						
                 						
@@ -321,17 +331,21 @@
 						<tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.company" /><span
 							<td class="kv-label"><spring:message code="manifest.company" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content"><input required id="co_company" name="co_company" type="text"
+							<td class="kv-content"><input required id="co_company" name="co_company" type="text" maxlength="70"
 									value="${manifest.co_company}" oninput="onInputChange(event,'co_company','oninput')"
 									value="${manifest.co_company}" oninput="onInputChange(event,'co_company','oninput')"
 									onpropertychange="onInputChange(event,'co_company','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'co_company','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.address" /><span
 							<td class="kv-label"><spring:message code="manifest.address" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
 							<td class="kv-content"><input required id="co_address" name="co_address" type="text"
 							<td class="kv-content"><input required id="co_address" name="co_address" type="text"
-									value="${manifest.co_address}" maxlength="70"></td>
+									value="${manifest.co_address}" maxlength="70"
+									oninput="onInputChange(event,'co_address','oninput')"
+									onpropertychange="onInputChange(event,'co_address','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.country" /><span
 							<td class="kv-label"><spring:message code="manifest.country" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content"><input required id="co_country" name="co_country" maxlength="2"
-									type="text" value="${manifest.co_country }"
+							<td class="kv-content">
+								<input required id="co_country" name="co_country" maxlength="2" type="text"
+									<c:if test="${empty manifest.co_country}">value="CN"</c:if>
+									<c:if test="${not empty manifest.co_country}">value="${manifest.co_country}"</c:if> 
 									oninput="onInputChange(event,'co_country','oninput')"
 									oninput="onInputChange(event,'co_country','oninput')"
 									onpropertychange="onInputChange(event,'co_country','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'co_country','onpropertychange')"></td>
 						</tr>
 						</tr>
@@ -341,23 +355,23 @@
 									value="${manifest.co_city }" oninput="onInputChange(event,'co_city','oninput')"
 									value="${manifest.co_city }" oninput="onInputChange(event,'co_city','oninput')"
 									onpropertychange="onInputChange(event,'co_city','onpropertychange')"></td> --%>
 									onpropertychange="onInputChange(event,'co_city','onpropertychange')"></td> --%>
 							<td class="kv-label"><spring:message code="manifest.state" /></td>
 							<td class="kv-label"><spring:message code="manifest.state" /></td>
-							<td class="kv-content"><input id="co_deltaname" name="co_deltaname" type="text"
+							<td class="kv-content"><input id="co_deltaname" name="co_deltaname" type="text" maxlength="35"
 									value="${manifest.co_deltaname}"></td>
 									value="${manifest.co_deltaname}"></td>
 							<td class="kv-label"><spring:message code="manifest.zip.code" /></td>
 							<td class="kv-label"><spring:message code="manifest.zip.code" /></td>
-							<td class="kv-content" colspan="3"><input id="co_zipcode" name="co_zipcode" type="text"
+							<td class="kv-content" colspan="3"><input id="co_zipcode" name="co_zipcode" type="text" maxlength="9"
 									value="${manifest.co_zipcode }"></td>
 									value="${manifest.co_zipcode }"></td>
 						</tr>
 						</tr>
 						<tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.telephone" /></td>
 							<td class="kv-label"><spring:message code="manifest.telephone" /></td>
-							<td class="kv-content"><input id="co_telephone" name="co_telephone" type="text"
+							<td class="kv-content"><input id="co_telephone" name="co_telephone" type="text" maxlength="50"
 									value="${manifest.co_telephone }"
 									value="${manifest.co_telephone }"
 									placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"></td>
 									placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"></td>
 							<td class="kv-label"><spring:message code="manifest.fax" /></td>
 							<td class="kv-label"><spring:message code="manifest.fax" /></td>
-							<td class="kv-content"><input id="co_fax" name="co_fax" type="text"
+							<td class="kv-content"><input id="co_fax" name="co_fax" type="text" maxlength="50"
 									value="${manifest.co_fax }"
 									value="${manifest.co_fax }"
 									placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"></td>
 									placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"></td>
 							<td class="kv-label"><spring:message code="manifest.fhr.shpaeo" /></td>
 							<td class="kv-label"><spring:message code="manifest.fhr.shpaeo" /></td>
-							<td class="kv-content"><input id="shpaeo" name="shpaeo" type="text"
+							<td class="kv-content"><input id="shpaeo" name="shpaeo" type="text" maxlength="20"
 									value="${manifest.shpaeo }" oninput="onInputChange(event,'shpaeo','oninput')"
 									value="${manifest.shpaeo }" oninput="onInputChange(event,'shpaeo','oninput')"
 									onpropertychange="onInputChange(event,'shpaeo','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'shpaeo','onpropertychange')"></td>
 						</tr>
 						</tr>
@@ -381,7 +395,7 @@
 									</c:if>
 									</c:if>
 								</select> 
 								</select> 
 								<span style="color: black; font-size: 16px;">+</span> 
 								<span style="color: black; font-size: 16px;">+</span> 
-								<input id="shpcusid"  type="text" required
+								<input id="shpcusid"  type="text" maxlength="100" required
 									<c:if test="${not empty manifest.shpcusid}">
 									<c:if test="${not empty manifest.shpcusid}">
 										<c:set var="tempShpValue" value='${fn:split(manifest.shpcusid,"+")[1]}' />
 										<c:set var="tempShpValue" value='${fn:split(manifest.shpcusid,"+")[1]}' />
 										value="${tempShpValue}"
 										value="${tempShpValue}"
@@ -421,7 +435,7 @@
                 							address = "";
                 							address = "";
                 						}
                 						}
                 						
                 						
-                						$("#sh_address").val(address);
+                						$("#sh_address").val(address.toUpperCase());
                 						$("#sh_telephone").val(consignee.tel?consignee.tel:"");
                 						$("#sh_telephone").val(consignee.tel?consignee.tel:"");
                 						$("#sh_country").val(consignee.name?consignee.name:"");
                 						$("#sh_country").val(consignee.name?consignee.name:"");
                 						$("#sh_name").val(consignee.code?consignee.code:"");
                 						$("#sh_name").val(consignee.code?consignee.code:"");
@@ -451,13 +465,15 @@
 						<tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.company" /><span
 							<td class="kv-label"><spring:message code="manifest.company" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content"><input required id="sh_company" name="sh_company" type="text"
+							<td class="kv-content"><input required id="sh_company" name="sh_company" type="text" maxlength="70"
 									value="${manifest.sh_company }" oninput="onInputChange(event,'sh_company','oninput')"
 									value="${manifest.sh_company }" oninput="onInputChange(event,'sh_company','oninput')"
 									onpropertychange="onInputChange(event,'sh_company','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'sh_company','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.address" /><span
 							<td class="kv-label"><spring:message code="manifest.address" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
 							<td class="kv-content"><input required id="sh_address" name="sh_address" maxlength="70"
 							<td class="kv-content"><input required id="sh_address" name="sh_address" maxlength="70"
-									type="text" value="${manifest.sh_address }"></td>
+									type="text" value="${manifest.sh_address }"
+									oninput="onInputChange(event,'sh_address','oninput')"
+									onpropertychange="onInputChange(event,'sh_address','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.country" /><span
 							<td class="kv-label"><spring:message code="manifest.country" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
 							<td class="kv-content"><input required id="sh_country" name="sh_country" maxlength="2"
 							<td class="kv-content"><input required id="sh_country" name="sh_country" maxlength="2"
@@ -467,25 +483,25 @@
 						</tr>
 						</tr>
 						<tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.city" /><span class="required_span">*</span></td>
 							<td class="kv-label"><spring:message code="manifest.city" /><span class="required_span">*</span></td>
-							<td class="kv-content"><input required id="sh_city" name="sh_city" type="text"
+							<td class="kv-content"><input required id="sh_city" name="sh_city" type="text" maxlength="35"
 									value="${manifest.sh_city }" oninput="onInputChange(event,'sh_city','oninput')"
 									value="${manifest.sh_city }" oninput="onInputChange(event,'sh_city','oninput')"
 									onpropertychange="onInputChange(event,'sh_city','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'sh_city','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.state" /></td>
 							<td class="kv-label"><spring:message code="manifest.state" /></td>
-							<td class="kv-content"><input id="sh_deltaname" name="sh_deltaname" type="text"
+							<td class="kv-content"><input id="sh_deltaname" name="sh_deltaname" type="text" maxlength="35"
 									value="${manifest.sh_deltaname}"></td>
 									value="${manifest.sh_deltaname}"></td>
 							<td class="kv-label"><spring:message code="manifest.zip.code" /></td>
 							<td class="kv-label"><spring:message code="manifest.zip.code" /></td>
-							<td class="kv-content"><input id="sh_zipcode" name="sh_zipcode" type="text"
+							<td class="kv-content"><input id="sh_zipcode" name="sh_zipcode" type="text" maxlength="9"
 									value="${manifest.sh_zipcode }"></td>
 									value="${manifest.sh_zipcode }"></td>
 						</tr>
 						</tr>
 						<tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.telephone" /></td>
 							<td class="kv-label"><spring:message code="manifest.telephone" /></td>
-							<td class="kv-content"><input id="sh_telephone" name="sh_telephone" type="text"
+							<td class="kv-content"><input id="sh_telephone" name="sh_telephone" type="text" maxlength="50"
 									value="${manifest.sh_telephone }"></td>
 									value="${manifest.sh_telephone }"></td>
 							<td class="kv-label"><spring:message code="manifest.fax" /></td>
 							<td class="kv-label"><spring:message code="manifest.fax" /></td>
-							<td class="kv-content"><input id="sh_fax" name="sh_fax" type="text"
+							<td class="kv-content"><input id="sh_fax" name="sh_fax" type="text" maxlength="50"
 									value="${manifest.sh_fax }"></td>
 									value="${manifest.sh_fax }"></td>
 							<td class="kv-label"><spring:message code="manifest.shr.cneaeo" /></td>
 							<td class="kv-label"><spring:message code="manifest.shr.cneaeo" /></td>
-							<td class="kv-content"><input id="cneaeo" name="cneaeo" type="text"
+							<td class="kv-content"><input id="cneaeo" name="cneaeo" type="text" maxlength="20"
 									value="${manifest.cneaeo }" oninput="onInputChange(event,'cneaeo','oninput')"
 									value="${manifest.cneaeo }" oninput="onInputChange(event,'cneaeo','oninput')"
 									onpropertychange="onInputChange(event,'cneaeo','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'cneaeo','onpropertychange')"></td>
 						</tr>
 						</tr>
@@ -519,7 +535,7 @@
 									</c:if>
 									</c:if>
 								</select> 
 								</select> 
 								<span style="color: black; font-size: 16px;">+</span> 
 								<span style="color: black; font-size: 16px;">+</span> 
-								<input id="cnecusid" type="text" required
+								<input id="cnecusid" type="text" maxlength="100" required
 									<c:if test="${not empty manifest.cnecusid}">
 									<c:if test="${not empty manifest.cnecusid}">
 										<c:set var="tempCneValue" value='${fn:split(manifest.cnecusid,"+")[1]}' />
 										<c:set var="tempCneValue" value='${fn:split(manifest.cnecusid,"+")[1]}' />
 										value="${tempCneValue }"
 										value="${tempCneValue }"
@@ -540,10 +556,6 @@
 						</tr>
 						</tr>
 						<!-- 收货人信息 end -->
 						<!-- 收货人信息 end -->
 						
 						
-						<tr style="display: none;">
-							<td> <input value="${manifest.cnecusid}"/> <input value="${manifest.shpcusid}"/> </td>
-						</tr>
-
 						<!-- 危险品信息 start -->
 						<!-- 危险品信息 start -->
 						<tr>
 						<tr>
 							<td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="6"><spring:message
 							<td style="background-color: #EBEDF4; color: black;" class="kv-label" colspan="6"><spring:message
@@ -674,7 +686,7 @@
 			</form>
 			</form>
 		</div>
 		</div>
 	</div>
 	</div>
-
+	
 	<div id="DialogShunt" class="easyui-dialog" title="报文" style="width: 800px; height: 800px;"
 	<div id="DialogShunt" class="easyui-dialog" title="报文" style="width: 800px; height: 800px;"
 		data-options="iconCls:'pag-list',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
 		data-options="iconCls:'pag-list',modal:true,collapsible:false,minimizable:false,maximizable:false,resizable:false,closed:true">
 		<div style="margin-left: 5px; margin-right: 5px; margin-top: 5px;">
 		<div style="margin-left: 5px; margin-right: 5px; margin-top: 5px;">
@@ -689,12 +701,18 @@
 	</div>
 	</div>
 
 
 	<!-- 外部js -->
 	<!-- 外部js -->
-	<script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js"></script>
 	<script type="text/javascript" src="<%=basePath%>resource/My97DatePicker/WdatePicker.js"></script>
 	<script type="text/javascript" src="<%=basePath%>resource/My97DatePicker/WdatePicker.js"></script>
 	<script src="<%=basePath%>resource/easyui/jquery.easyui.min.js"></script>
 	<script src="<%=basePath%>resource/easyui/jquery.easyui.min.js"></script>
-	<script src="<%=basePath%>/resource/js/tools.js?version=1.2"></script>
+	<script src="<%=basePath%>/resource/js/tools.js?version=${version}"></script>
 	<!--弹出层引入的JS-->
 	<!--弹出层引入的JS-->
 	<script type="text/javascript">
 	<script type="text/javascript">
+
+	var layerIndex;
+	var layer;
+	layui.use('layer', function(){
+		  layer = layui.layer;
+	});   
+	
 $(function(){
 $(function(){
 	//获取三字码
 	//获取三字码
 	$.ajax({
 	$.ajax({
@@ -785,6 +803,10 @@ $(function(){
      })
      })
      
      
 	function submit(){
 	function submit(){
+		layerIndex = parent.layer.load(1, {
+			shade: [0.6,'#000000'] //0.1透明度
+		});
+		
 		var id3 = $("#waybillnomaster").val($("#waybill").val());
 		var id3 = $("#waybillnomaster").val($("#waybill").val());
        	var data = $("#form").serialize();
        	var data = $("#form").serialize();
        	
        	
@@ -804,9 +826,10 @@ $(function(){
 			data+="&cnecusid="+encodeURIComponent(cnecusid);
 			data+="&cnecusid="+encodeURIComponent(cnecusid);
        	}
        	}
 		
 		
-		console.log("form-->"+data);
+		/* console.log("form-->"+data); */
        	
        	
        	$.post("<%=basePath%>manifest/save",data,function (data) {
        	$.post("<%=basePath%>manifest/save",data,function (data) {
+       		parent.layer.close(layerIndex);
        		if (data.status == 200) {
        		if (data.status == 200) {
 //                         layer.confirm("<spring:message code="opt.savesuccess"/>", {btn: ['<spring:message code="opt.confirm"/>', '<spring:message code="opt.cancel"/>']}, function () {
 //                         layer.confirm("<spring:message code="opt.savesuccess"/>", {btn: ['<spring:message code="opt.confirm"/>', '<spring:message code="opt.cancel"/>']}, function () {
 				window.location.href = "<%=basePath%>manifest/list" ;
 				window.location.href = "<%=basePath%>manifest/list" ;
@@ -838,6 +861,10 @@ $(function(){
 	function savesend(){
 	function savesend(){
 		var isValid = $("#form").valid();
 		var isValid = $("#form").valid();
 	    	if(isValid){
 	    	if(isValid){
+	    		layerIndex = parent.layer.load(1, {
+	    			shade: [0.6,'#000000'] //0.1透明度
+	    		});
+	    		
 	    		var id3 = $("#waybillnomaster").val($("#waybill").val());
 	    		var id3 = $("#waybillnomaster").val($("#waybill").val());
 		       	var data = $("#form").serialize();
 		       	var data = $("#form").serialize();
 		       	var shp_cusid_type = getSelectedValue("co_cusid");
 		       	var shp_cusid_type = getSelectedValue("co_cusid");
@@ -856,9 +883,10 @@ $(function(){
 					data+="&cnecusid="+encodeURIComponent(cnecusid);
 					data+="&cnecusid="+encodeURIComponent(cnecusid);
 		       	}
 		       	}
 				
 				
-				console.log("form-->"+data);
+				/* console.log("form-->"+data); */
 				
 				
 		       	 $.post("<%=basePath%>manifest/savesend",data,function (data) {
 		       	 $.post("<%=basePath%>manifest/savesend",data,function (data) {
+		       		parent.layer.close(layerIndex);
 		                    if (data.status == 200) {
 		                    if (data.status == 200) {
 		                            $("#xmlContent").val(data.data);
 		                            $("#xmlContent").val(data.data);
 		                            $("#DialogShunt").window('open');
 		                            $("#DialogShunt").window('open');
@@ -1044,6 +1072,56 @@ $(function(){
 		        }); 
 		        }); 
 		});   
 		});   
 	}
 	}
+	
+	 function checkNo(content){
+		 if (content) {
+			 content = content.replace(/ /g,'');
+			 $("#waybill").val(content);
+			    
+			 if(content.length>4){
+				 var forth = content.substring(3,4);
+				 if(forth!='-'){
+					 var start = content.substring(0,3);
+					 var end = content.substring(3,content.length);
+					 content = start+"-"+end;
+					 $("#waybill").val(content);
+				 }
+			 }
+			 
+			 if(content.length>12){
+				 content = content.substring(0,12);
+				 $("#waybill").val(content);
+			 }
+			 
+			 if(content.length<12){
+				layui.use('layer', function(){
+					var layer = layui.layer;
+					parent.layer.alert('主单号不能少于12位~！', {icon: 0});
+					$("#waybill").focus(); 
+				});   
+				return;
+			 }
+			 
+				var array = content.split("-");
+				if(array!=null&&array.length==2){
+					var end = array[1];
+					if(end&&end.length==8){
+						var number = parseInt(end);
+						var start = number/10;
+						var remainder = parseInt(start)%7;
+						var last = number%10;
+						if(remainder!=last){
+							layui.use('layer', function(){
+								var layer = layui.layer;
+								parent.layer.alert('主单号不符合模七校验，请修改~！', {icon: 6});
+								$("#waybill").focus(); 
+							});   
+						} 
+					}
+				}
+			 }
+	 }
+	 
  </script>
  </script>
 </body>
 </body>
 </html>
 </html>

@@ -13,6 +13,12 @@
 	<link rel="stylesheet" href="<%=basePath %>resource/easyui/uimaker/easyui.css">
 	<link rel="stylesheet" href="<%=basePath %>resource/easyui/uimaker/easyui.css">
 	<link rel="stylesheet" type="text/css" href="<%=basePath %>resource/easyui/uimaker/icon.css">
 	<link rel="stylesheet" type="text/css" href="<%=basePath %>resource/easyui/uimaker/icon.css">
 	<link rel="stylesheet" href="<%=basePath %>resource/css/providers.css">
 	<link rel="stylesheet" href="<%=basePath %>resource/css/providers.css">
+	
+	<link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css" media="all">
+	<script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js"></script>
+	<script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js"></script>
+	<script type="text/javascript" src="<%=basePath%>resource/layui/layui.js"></script>
+	
 </head>
 </head>
 <body>
 <body>
     <div class="container">
     <div class="container">
@@ -30,19 +36,17 @@
                 pageSize:10">
                 pageSize:10">
                 <thead>
                 <thead>
                         <tr>
                         <tr>
-                            <!-- <th field="id" checkbox="true"></th> -->
-                            <th field="."  formatter="editFormat" width="40"><spring:message code="opt.edit" /></th>
-                            <th field="waybillnomaster" sortable="true" width="30"><spring:message code="manifest.bill.number"/></th>
-                            <th field="customscode" width="15"><spring:message code="manifest.customs"/></th>
-                            <th field="flightno" width="20"><spring:message code="manifest.flight.number"/></th>
-                            <th field="originatingstation" width="20"><spring:message code="manifest.starting.point"/></th>
-                            <th field="destinationstation" width="20"><spring:message code="manifest.destination"/></th>
-                            <%-- <th field="totalpiece" width="50"><spring:message code="manifest.number.of.consignment.note"/></th>--%>
-                            <th field="preparetotalweight" width="20"><spring:message code="manifest.pre.weight"/></th>
-                            <th field="preparetotalpiece"  width="20"><spring:message code="manifest.number.of.fittings"/></th>
-                            <th field="response_text" widht="260" formatter="checkResponseText"><spring:message code="manifest.response_text" /></th>
-                            <th field=".." width="20" formatter="operatorFormat"><spring:message code="opt.operator" /></th>
-<%--                        <th field="flightdate" width="130"><spring:message code="manifest.flight.date"/></th> --%>
+                            <th field="."  formatter="editFormat"><spring:message code="opt.edit" /></th>
+                            <th field="waybillnomaster" sortable="true"><spring:message code="manifest.bill.number"/></th>
+                            <th field="customscode"><spring:message code="manifest.customs"/></th>
+                            <th field="flightno" formatter="appendCarrier"><spring:message code="manifest.flight.number"/></th>
+                            <th field="flightdate" formatter="formatFlightDate"><spring:message code="manifest.flight.date"/></th>
+                            <th field="originatingstation"><spring:message code="manifest.starting.point"/></th>
+                            <th field="destinationstation"><spring:message code="manifest.destination"/></th>
+                            <th field="preparetotalweight"><spring:message code="manifest.pre.weight"/></th>
+                            <th field="preparetotalpiece"><spring:message code="manifest.number.of.fittings"/></th>
+                            <th field="response_text" formatter="checkResponseText" width="200"><spring:message code="manifest.response_text" /></th>
+                            <th field=".." formatter="operatorFormat"><spring:message code="opt.operator" /></th>
                         </tr>
                         </tr>
                 </thead>
                 </thead>
            </table>
            </table>
@@ -64,21 +68,36 @@
 <script type="text/javascript" src="<%=basePath %>resource/easyui/jquery.easyui.min.js"></script>
 <script type="text/javascript" src="<%=basePath %>resource/easyui/jquery.easyui.min.js"></script>
 <script type="text/javascript" src="<%=basePath %>resource/easyui/easyui-lang-${pageContext.response.locale}.js"></script>
 <script type="text/javascript" src="<%=basePath %>resource/easyui/easyui-lang-${pageContext.response.locale}.js"></script>
 <script type="text/javascript" src="<%=basePath %>resource/easyui/datagrid-detailview.js"></script>
 <script type="text/javascript" src="<%=basePath %>resource/easyui/datagrid-detailview.js"></script>
-<script type="text/javascript" src="<%=basePath %>resource/js/tools.js"></script>
+<script type="text/javascript" src="<%=basePath %>resource/js/tools.js?version=${version}"></script>
 <!--弹出层引入的JS-->
 <!--弹出层引入的JS-->
 <script type="text/javascript" src="<%=basePath %>resource/layer-v3.0.3/layer/layer.js"></script>
 <script type="text/javascript" src="<%=basePath %>resource/layer-v3.0.3/layer/layer.js"></script>
     <script type="text/javascript">
     <script type="text/javascript">
+    function formatFlightDate(value, row, index){
+    	return row.flightdate.split(" ")[0];
+    }
+    
+    function appendCarrier(value, row, index) {
+		return row.carrier+row.flightno;
+	}
     
     
     function checkResponseText(value, row, index) {
     function checkResponseText(value, row, index) {
         var res = '';
         var res = '';
         if(value){
         if(value){
-     	   		var start = value.indexOf("41301");
- 	           if(start>-1){
+     	   	var start_yupei = value.indexOf("41301");
+     	   	var start_yundi = value.indexOf("45201");
+ 	        if(start_yupei>-1||start_yundi>-1){
  	            	// 成功
  	            	// 成功
  	            	res = '<span style="color:green;">'+value+'</span>';
  	            	res = '<span style="color:green;">'+value+'</span>';
             }else{
             }else{
-               	// 未通过
-               	res = '<span style="color:black;">'+value+'</span>';
+               	// 未通过或者未回执
+               	var start_exception_ = value.indexOf("分单");
+               	var start_exception_ = value.indexOf("主单");
+               	if(start_exception_>-1||start_exception_>-1){
+               		//没有回执
+               		res = '<span style="color:black;">'+value+'</span>';
+               	}else{
+               		res = '<span style="color:red;">'+value+'</span>';
+               	}
             }
             }
         }
         }
 
 
@@ -117,37 +136,43 @@
 			pageNumber:getPageNumber(),
 			pageNumber:getPageNumber(),
             view: detailview,
             view: detailview,
             detailFormatter:function(index,row){
             detailFormatter:function(index,row){
-            	console.log("index:"+index);
                 return '<div id="ddv-' + index + '"style="padding:5px 0"></div>';
                 return '<div id="ddv-' + index + '"style="padding:5px 0"></div>';
             },
             },
             onExpandRow: function(index,row){
             onExpandRow: function(index,row){
-            	console.log("expand row index:"+index);
+            		console.log("expand row index:"+index);
                 $('#ddv-'+index).datagrid({
                 $('#ddv-'+index).datagrid({
                     url:'<%=basePath %>manifest/sub/grid.json?mawbId='+row.id,
                     url:'<%=basePath %>manifest/sub/grid.json?mawbId='+row.id,
                     fitColumns:true,
                     fitColumns:true,
                     singleSelect:true,
                     singleSelect:true,
-                    loadMsg:'正在加载中……',
+                    loadMsg:'正在加载……',
                     height:'auto',
                     height:'auto',
+                    autoRowHeight:"true",
                     columns:[[
                     columns:[[
-                    	{field:'.',title:'<spring:message code="opt.name"/>',formatter:editHbillFormat,width:30},
-                        {field:'waybillnosecondary',title:'<spring:message code="manifest.odd.number"/>',width:40},
-                        {field:'originatingstation',title:'<spring:message code="manifest.starting.point"/>',width:40},
-                        {field:'destinationstation',title:'<spring:message code="manifest.destination"/>',width:40},
-                        /* {field:'totalpiece',title:'<spring:message code="manifest.number.of.consignment.note"/>',width:60},
-                        {field:'totalweight',title:'<spring:message code="manifest.waybill.weight"/>',width:60}, */
-                        {field:'prepareweight',title:'<spring:message code="manifest.pre.weight"/>',width:30},
-                        {field:'preparepiece',title:'<spring:message code="manifest.number.of.fittings"/>',width:30},
-                        {field:'response_text',title:'<spring:message code="manifest.response_text"/>', width:160,
+                    		{field:'.',title:'<spring:message code="opt.name"/>',formatter:editHbillFormat},
+                        {field:'waybillnosecondary',title:'<spring:message code="manifest.odd.number"/>'},
+                        {field:'originatingstation',title:'<spring:message code="manifest.starting.point"/>'},
+                        {field:'destinationstation',title:'<spring:message code="manifest.destination"/>'},
+                        {field:'prepareweight',title:'<spring:message code="manifest.pre.weight"/>'},
+                        {field:'preparepiece',title:'<spring:message code="manifest.number.of.fittings"/>'},
+                        {field:'response_text',width:160,title:'<spring:message code="manifest.response_text"/>',
 	                        	formatter:function(value, row, index){
 	                        	formatter:function(value, row, index){
-	                        		   var res = '';
+	                        		var res = '';
 	                                if(value){
 	                                if(value){
-	                             	   		var start = value.indexOf("41301");
-	                         	           if(start>-1){
+	                             	   	var start_yupei = value.indexOf("41301");
+	                             	   	var start_yundi = value.indexOf("45201");
+	                         	        if(start_yupei>-1||start_yundi>-1){
 	                         	            	// 成功
 	                         	            	// 成功
 	                         	            	res = '<span style="color:green;">'+value+'</span>';
 	                         	            	res = '<span style="color:green;">'+value+'</span>';
 	                                    }else{
 	                                    }else{
-	                                       	// 未通过
-	                                       	res = '<span style="color:black;">'+value+'</span>';
+	                                       	// 未通过或者未回执
+	                                       	var start_exception_ = value.indexOf("分单");
+	                                       	var start_exception_ = value.indexOf("主单");
+	                                       	if(start_exception_>-1||start_exception_>-1){
+	                                       		//没有回执
+	                                       		res = '<span style="color:black;">'+value+'</span>';
+	                                       	}else{
+	                                       		res = '<span style="color:red;">'+value+'</span>';
+	                                       	}
 	                                    }
 	                                    }
 	                                }
 	                                }
 
 
@@ -160,28 +185,28 @@
                         $('#dg').datagrid('fixDetailRowHeight',index);
                         $('#dg').datagrid('fixDetailRowHeight',index);
                     },
                     },
                     onLoadSuccess:function(){
                     onLoadSuccess:function(){
-                        setTimeout(function(){
-                            $('#dg').datagrid('fixDetailRowHeight',index);
-                        },0);
-                        
-                        
-                        
+                        $('#dg').datagrid('resize');   
                     }
                     }
                 });
                 });
+                
                 $('#dg').datagrid('fixDetailRowHeight',index);
                 $('#dg').datagrid('fixDetailRowHeight',index);
             }
             }
         });
         });
     });
     });
 		
 		
 		function editFormat(val,row,index){
 		function editFormat(val,row,index){
-	    	var html='<a href="javascript:void(0)" style="padding-left:10px;text-decoration:none;padding-right:20px;" onclick="editRow('+row.id+')"><i class="iconfont">&#xe65a;</i></a>'
-	    	  html += '<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;" onclick="makeHawb('+row.id+')"><i class="iconfont">&#xe663;</i><spring:message code="manifest.new.sheet"/></a>';
-	    	return html;
+	    		var html='<a href="javascript:void(0)" style="padding-left:10px;text-decoration:none;color:blue;padding-right:20px;" onclick="editRow('+row.id+')"><i class="iconfont">&#xe65a;</i></a>'
+	    		html += '<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;color:blue;" onclick="makeHawb('+row.id+')"><i class="iconfont">&#xe663;</i><spring:message code="manifest.new.sheet"/></a>';
+	    		return html;
 	    }
 	    }
+		
 		//分单撤销按钮
 		//分单撤销按钮
 		function preoperatorFormat(val, row, index){
 		function preoperatorFormat(val, row, index){
-			return "<a href='javascript:void(0)' onclick='prebackout("+row.id+")' style='text-decoration:none;'><spring:message code='opt.backout' /></a>";
+			var html =  "<a href='javascript:void(0)' onclick='prebackout("+row.id+")' style='text-decoration:none;color:blue;'><spring:message code='opt.backout' /></a>";
+			html+="<a href='javascript:void(0)' onclick='openSubReceipt(\""+row.waybillnosecondary+"\")' style='text-decoration:none;color:blue;margin-left:20px;'><spring:message code='opt.open.receipt'/></a>";
+			return html;
 		}
 		}
+		
 		function prebackout(id){
 		function prebackout(id){
 			if(typeof(id) == "undefined")
 			if(typeof(id) == "undefined")
 				return;
 				return;
@@ -203,7 +228,9 @@
 		}
 		}
 		//主单撤销按钮
 		//主单撤销按钮
 		function operatorFormat(val, row, index){
 		function operatorFormat(val, row, index){
-			return "<a href='javascript:void(0)' onclick='backout("+row.id+")' style='text-decoration:none;'><spring:message code='opt.backout'/></a>";
+			var html = "<a href='javascript:void(0)' onclick='backout("+row.id+")' style='text-decoration:none;color:blue;'><spring:message code='opt.backout'/></a>";
+			html+="<a href='javascript:void(0)' onclick='openReceipt(\""+row.waybillnomaster+"\")' style='text-decoration:none;color:blue;margin-left:20px;'><spring:message code='opt.open.receipt'/></a>";
+			return html;
 		}
 		}
 		function backout(id){
 		function backout(id){
 			if(typeof(id) == "undefined")
 			if(typeof(id) == "undefined")
@@ -225,6 +252,41 @@
 				});
 				});
 			});
 			});
 		}
 		}
+		
+		//查看分单回执
+		function openSubReceipt(subno){
+			if(typeof(subno) == "undefined")
+				return;
+			console.log("分单号-->"+subno);
+			seeReceipt(subno,false);
+		}
+		
+		//查看主单回执
+		function openReceipt(no){
+			if(typeof(no) == "undefined")
+				return;
+			console.log("主单号-->"+no);
+			seeReceipt(no,true);
+		}
+		
+		function seeReceipt(no,isMain){
+			layui.use('layer', function(){
+				  var layer = layui.layer;
+				  var api="<%=basePath%>receipt/seeReceipt";
+				  var params = "no="+no+"&isMain="+isMain;
+				  var viewUrl = api+"?"+params;
+				  
+				  parent.layer.open({
+			            type: 2,
+			            title: "<spring:message code='opt.open.receipt'/>",
+			            shadeClose: true,
+			            shade: 0.8,
+			            area: ['80%', '60%'],
+			            content: viewUrl
+			        }); 
+			});  
+		}
+		
 		 //制分单
 		 //制分单
 	    function makeHawb(id){
 	    function makeHawb(id){
 	        window.location.href="<%=basePath %>manifest/subedit?mawbId="+id;
 	        window.location.href="<%=basePath %>manifest/subedit?mawbId="+id;
@@ -236,7 +298,7 @@
 	    }
 	    }
 		 
 		 
 	    function editHbillFormat(val,row,index){
 	    function editHbillFormat(val,row,index){
-	        var html='<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;" onclick="editHbillRow('+row.id+')"><i class="iconfont">&#xe65a;</i></a>';
+	        var html='<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;color:blue;" onclick="editHbillRow('+row.id+')"><i class="iconfont">&#xe65a;</i></a>';
 // 	        html += '<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;color:red;" onclick="delHbillRow('+row.id+','+row.mawbId+','+index+')"><i class="iconfont">&#xe661;</i></a>';
 // 	        html += '<a href="javascript:void(0)" style="text-decoration:none;margin-left:20px;color:red;" onclick="delHbillRow('+row.id+','+row.mawbId+','+index+')"><i class="iconfont">&#xe661;</i></a>';
 	        return html;
 	        return html;
 	    }
 	    }

@@ -21,6 +21,11 @@
 <script type="text/javascript" src="<%=basePath%>resource/validate/jquery.validate.js"></script>
 <script type="text/javascript" src="<%=basePath%>resource/validate/jquery.validate.js"></script>
 <script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js"></script>
 <script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js"></script>
 <link rel="stylesheet" href="<%=basePath%>resource/css/form.css">
 <link rel="stylesheet" href="<%=basePath%>resource/css/form.css">
+
+<link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css" media="all">
+<script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js"></script>
+<script type="text/javascript" src="<%=basePath%>resource/layui/layui.js"></script>
+
 <style type="text/css">
 <style type="text/css">
 .required_span {
 .required_span {
 	color: red;
 	color: red;
@@ -92,19 +97,20 @@
 									code="manifest.flight.information" /></td>
 									code="manifest.flight.information" /></td>
 						</tr>
 						</tr>
 						<tr>
 						<tr>
-							<td class="kv-label"><spring:message code="manifest.carrier" /><span
-								class="required_span">*</span></td>
-							<td class="kv-content"><input required id="carrier_new" name="carrier" type="text"
+							<%-- <td class="kv-label"><spring:message code="manifest.carrier" /><span
+								class="required_span">*</span></td> --%>
+							<%-- <td class="kv-content"><input required id="carrier_new" name="carrier" type="text"
 									placeholder="<spring:message code='manifest.carrier.tip'/>"
 									placeholder="<spring:message code='manifest.carrier.tip'/>"
-									value="${manifest.carrier}" oninput="onInputChange(event,'carrier_new','oninput')"
-									onpropertychange="onInputChange(event,'carrier_new','onpropertychange')"></td>
+									value="${pre.carrier}" oninput="onInputChange(event,'carrier_new','oninput')"
+									onpropertychange="onInputChange(event,'carrier_new','onpropertychange')"></td> --%>
 
 
 							<td class="kv-label"><spring:message code="manifest.flight.number" /><span
 							<td class="kv-label"><spring:message code="manifest.flight.number" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
 							<td class="kv-content"><input required id="flightno" name="flightno" type="text"
 							<td class="kv-content"><input required id="flightno" name="flightno" type="text"
 									placeholder="<spring:message code='manifest.carrier.flightno.tip'/>"
 									placeholder="<spring:message code='manifest.carrier.flightno.tip'/>"
-									value="${pre.flightno }" oninput="onInputChange(event,'flightno','oninput')"
-									onpropertychange="onInputChange(event,'flightno','onpropertychange')"></td>
+									value="${pre.carrier}${pre.flightno}" oninput="onInputChange(event,'flightno','oninput')"
+									onpropertychange="onInputChange(event,'flightno','onpropertychange')"
+									title="<spring:message code='manifest.carrier.flightno.tip'/>"></td>
 							<td class="kv-label"><spring:message code="manifest.flight.date" /><span
 							<td class="kv-label"><spring:message code="manifest.flight.date" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
 							<td class="kv-content" colspan="3"><input type="text" class="date bill Wdate"
 							<td class="kv-content" colspan="3"><input type="text" class="date bill Wdate"
@@ -115,13 +121,15 @@
 						<tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.starting.point" /><span
 							<td class="kv-label"><spring:message code="manifest.starting.point" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content"><input required id="originatingstation" name="originatingstation"
-									type="text" value="${pre.originatingstation }"
+							<td class="kv-content">
+								<input required id="originatingstation" name="originatingstation" type="text" maxlength="3"
+										<c:if test="${empty pre.originatingstation}">value="CGO"</c:if>
+										<c:if test="${not empty pre.originatingstation}">value="${pre.originatingstation}"</c:if>  
 									oninput="onInputChange(event,'originatingstation','oninput')"
 									oninput="onInputChange(event,'originatingstation','oninput')"
 									onpropertychange="onInputChange(event,'originatingstation','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'originatingstation','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.destination" /><span
 							<td class="kv-label"><spring:message code="manifest.destination" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content" colspan="3"><input required id="destinationstation"
+							<td class="kv-content" colspan="3"><input required id="destinationstation" maxlength="3"
 									name="destinationstation" type="text" value="${pre.destinationstation}"
 									name="destinationstation" type="text" value="${pre.destinationstation}"
 									oninput="onInputChange(event,'destinationstation','oninput')"
 									oninput="onInputChange(event,'destinationstation','oninput')"
 									onpropertychange="onInputChange(event,'destinationstation','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'destinationstation','onpropertychange')"></td>
@@ -137,16 +145,15 @@
 							<td class="kv-label"><spring:message code="manifest.number.of.fittings" /><span
 							<td class="kv-label"><spring:message code="manifest.number.of.fittings" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
 							<td class="kv-content"><input required class="delivery number" id="totalpiece"
 							<td class="kv-content"><input required class="delivery number" id="totalpiece"
-									name="totalpiece" type="text" value="${pre.totalpiece}"
+									name="totalpiece" type="text" value="${pre.totalpiece}" maxlength="8"
 									onkeyup="value=value.replace(/[^\d]/g,'') " ng-pattern="/[^a-zA-Z]/"
 									onkeyup="value=value.replace(/[^\d]/g,'') " ng-pattern="/[^a-zA-Z]/"
 									oninput="onInputChange(event,'totalpiece','oninput')"
 									oninput="onInputChange(event,'totalpiece','oninput')"
 									onpropertychange="onInputChange(event,'totalpiece','onpropertychange')"> <input
 									onpropertychange="onInputChange(event,'totalpiece','onpropertychange')"> <input
 									id="pie" disabled="disabled"></td>
 									id="pie" disabled="disabled"></td>
 							<td class="kv-label"><spring:message code="manifest.pre.weight" /><span
 							<td class="kv-label"><spring:message code="manifest.pre.weight" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content"><input required class="delivery number" id="totalweight"
+							<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')"
 									oninput="onInputChange(event,'totalweight','oninput')"
 									onpropertychange="onInputChange(event,'totalweight','onpropertychange')"> <input
 									onpropertychange="onInputChange(event,'totalweight','onpropertychange')"> <input
 									id="wei" disabled="disabled"></td>
 									id="wei" disabled="disabled"></td>
@@ -193,22 +200,23 @@
 						<tr style="display: none;">
 						<tr style="display: none;">
 							<td class="kv-label"><spring:message code="manifest.number.of.fittings" /><span
 							<td class="kv-label"><spring:message code="manifest.number.of.fittings" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content"><input required class="delivery number" id="preparepiece"
+							<td class="kv-content"><input required class="delivery number" id="preparepiece" maxlength="8"
 									name="preparepiece" type="text" value="${pre.preparepiece}"
 									name="preparepiece" type="text" value="${pre.preparepiece}"
 									onkeyup="value=value.replace(/[^\d]/g,'') " ng-pattern="/[^a-zA-Z]/"> <input
 									onkeyup="value=value.replace(/[^\d]/g,'') " ng-pattern="/[^a-zA-Z]/"> <input
 									id="topie" disabled="disabled"></td>
 									id="topie" disabled="disabled"></td>
 							<td class="kv-label"><spring:message code="manifest.pre.weight" /><span
 							<td class="kv-label"><spring:message code="manifest.pre.weight" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content"><input required class="delivery number" id="prepareweight"
-									name="prepareweight" type="text" value="${pre.prepareweight}"
-									onkeyup="value=value.replace(/[^\d]/g,'') " ng-pattern="/[^a-zA-Z]/"> <input
+							<td class="kv-content"><input required class="delivery number" id="prepareweight" maxlength="15"
+									name="prepareweight" type="text" value="${pre.prepareweight}"> <input
 									id="towei" disabled="disabled"></td>
 									id="towei" disabled="disabled"></td>
 						</tr>
 						</tr>
 						<tr>
 						<tr>
-							<td class="kv-label"><spring:message code="manifest.description.of.the.goods" /><span
+							<td class="kv-label"><spring:message code="delivery.productname" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
 							<td class="kv-content" colspan="5"><textarea required id="productname"
 							<td class="kv-content" colspan="5"><textarea required id="productname"
-									name="productname" maxlength="200">${pre.productname}</textarea></td>
+									name="productname" maxlength="200"
+									oninput="onInputChange(event,'productname','oninput')"
+									onpropertychange="onInputChange(event,'productname','onpropertychange')">${pre.productname}</textarea></td>
 						</tr>
 						</tr>
 						<%-- <tr>
 						<%-- <tr>
 							<td class="kv-label"><spring:message code="manifest.agent.name" /></td>
 							<td class="kv-label"><spring:message code="manifest.agent.name" /></td>
@@ -237,10 +245,18 @@
                 					if(index >= 0)
                 					if(index >= 0)
                 					{
                 					{
                 						var consignor = consignorList[index];
                 						var consignor = consignorList[index];
-                						$("#co_company").val(consignor.co_company?consignor.co_company:"");
-                						$("#co_address").val(consignor.co_address?consignor.co_address:"");
+                						$("#co_company").val(consignor.co_company?consignor.co_company.toUpperCase():"");
+                						var address = consignor.co_address;
+                						if(notEmpty(address)){
+                							if(address.length>70){
+                								address = address.substring(0,70);
+                							}
+                						}else{
+                							address = "";
+                						}
+                						$("#co_address").val(address.toUpperCase());
                 						$("#co_telephone").val(consignor.co_telephone?consignor.co_telephone:"");
                 						$("#co_telephone").val(consignor.co_telephone?consignor.co_telephone:"");
-                						$("#co_country").val(consignor.co_country?consignor.co_country:"");
+                						$("#co_country").val(consignor.co_country?consignor.co_country:"CN");
                 						$("#co_city").val(consignor.co_city?consignor.co_city:"");
                 						$("#co_city").val(consignor.co_city?consignor.co_city:"");
                 						$("#co_deltaname").val(consignor.co_deltaname?consignor.co_deltaname:"");
                 						$("#co_deltaname").val(consignor.co_deltaname?consignor.co_deltaname:"");
                 						$("#co_name").val(consignor.co_name?consignor.co_name:"");
                 						$("#co_name").val(consignor.co_name?consignor.co_name:"");
@@ -251,7 +267,7 @@
                 						if(notEmpty(consignor.shpcusid)){
                 						if(notEmpty(consignor.shpcusid)){
                 							var temp = consignor.shpcusid.split("+")[1];
                 							var temp = consignor.shpcusid.split("+")[1];
                 							if(notEmpty(temp)){
                 							if(notEmpty(temp)){
-                								$("#shpcusid").val(temp);
+                								$("#shpcusid").val(temp.toUpperCase());
                 							}
                 							}
                 						}
                 						}
                 					}
                 					}
@@ -281,17 +297,21 @@
 						<tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.company" /><span
 							<td class="kv-label"><spring:message code="manifest.company" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content"><input required id="co_company" name="co_company" type="text"
+							<td class="kv-content"><input required id="co_company" name="co_company" type="text" maxlength="70"
 									value="${pre.co_company}" oninput="onInputChange(event,'co_company','oninput')"
 									value="${pre.co_company}" oninput="onInputChange(event,'co_company','oninput')"
 									onpropertychange="onInputChange(event,'co_company','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'co_company','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.address" /><span
 							<td class="kv-label"><spring:message code="manifest.address" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
 							<td class="kv-content"><input required id="co_address" name="co_address" type="text"
 							<td class="kv-content"><input required id="co_address" name="co_address" type="text"
-									value="${pre.co_address}" maxlength="70"></td>
+									value="${pre.co_address}" maxlength="70"
+									oninput="onInputChange(event,'co_address','oninput')"
+									onpropertychange="onInputChange(event,'co_address','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.country" /><span
 							<td class="kv-label"><spring:message code="manifest.country" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content"><input required id="co_country" name="co_country" maxlength="2"
-									type="text" value="${pre.co_country }"
+							<td class="kv-content">
+								<input required id="co_country" name="co_country" maxlength="2" type="text"
+									<c:if test="${empty pre.co_country}">value="CN"</c:if>
+									<c:if test="${not empty pre.co_country}">value="${pre.co_country}"</c:if> 
 									oninput="onInputChange(event,'co_country','oninput')"
 									oninput="onInputChange(event,'co_country','oninput')"
 									onpropertychange="onInputChange(event,'co_country','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'co_country','onpropertychange')"></td>
 						</tr>
 						</tr>
@@ -301,26 +321,26 @@
 									value="${pre.co_city }" oninput="onInputChange(event,'co_city','oninput')"
 									value="${pre.co_city }" oninput="onInputChange(event,'co_city','oninput')"
 									onpropertychange="onInputChange(event,'co_city','onpropertychange')"></td> --%>
 									onpropertychange="onInputChange(event,'co_city','onpropertychange')"></td> --%>
 							<td class="kv-label"><spring:message code="manifest.state" /></td>
 							<td class="kv-label"><spring:message code="manifest.state" /></td>
-							<td class="kv-content"><input id="co_deltaname" name="co_deltaname" type="text"
+							<td class="kv-content"><input id="co_deltaname" name="co_deltaname" type="text" maxlength="35"
 									value="${pre.co_deltaname  }"></td>
 									value="${pre.co_deltaname  }"></td>
 							<td class="kv-label"><spring:message code="manifest.zip.code" /></td>
 							<td class="kv-label"><spring:message code="manifest.zip.code" /></td>
-							<td class="kv-content" colspan="3"><input id="co_zipcode" name="co_zipcode" type="text"
+							<td class="kv-content" colspan="3"><input id="co_zipcode" name="co_zipcode" type="text" maxlength="9"
 									value="${pre.co_zipcode }"></td>
 									value="${pre.co_zipcode }"></td>
 						</tr>
 						</tr>
 						<tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.telephone" /></td>
 							<td class="kv-label"><spring:message code="manifest.telephone" /></td>
-							<td class="kv-content"><input id="co_telephone" name="co_telephone" type="text"
+							<td class="kv-content"><input id="co_telephone" name="co_telephone" type="text" maxlength="50"
 									value="${pre.co_telephone }"
 									value="${pre.co_telephone }"
 									placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"></td>
 									placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"></td>
 							<td class="kv-label"><spring:message code="manifest.fax" /></td>
 							<td class="kv-label"><spring:message code="manifest.fax" /></td>
-							<td class="kv-content"><input id="co_fax" name="co_fax" type="text"
+							<td class="kv-content"><input id="co_fax" name="co_fax" type="text" maxlength="50"
 									value="${pre.co_fax }" placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"></td>
 									value="${pre.co_fax }" placeholder="<spring:message code="manifest.fhr.fh_placeholder"/>"></td>
 							<td style="display: none;" class="kv-label"><spring:message code="manifest.name" /><span
 							<td style="display: none;" class="kv-label"><spring:message code="manifest.name" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
 							<td style="display: none;" class="kv-content" colspan="5"><input required id="co_name"
 							<td style="display: none;" class="kv-content" colspan="5"><input required id="co_name"
 									name="co_name" type="text" value="${pre.co_name }"></td>
 									name="co_name" type="text" value="${pre.co_name }"></td>
 							<td class="kv-label"><spring:message code="manifest.fhr.shpaeo" /></td>
 							<td class="kv-label"><spring:message code="manifest.fhr.shpaeo" /></td>
-							<td class="kv-content"><input id="shpaeo" name="shpaeo" type="text"
+							<td class="kv-content"><input id="shpaeo" name="shpaeo" type="text" maxlength="20"
 									value="${pre.shpaeo }" oninput="onInputChange(event,'shpaeo','oninput')"
 									value="${pre.shpaeo }" oninput="onInputChange(event,'shpaeo','oninput')"
 									onpropertychange="onInputChange(event,'shpaeo','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'shpaeo','onpropertychange')"></td>
 						</tr>
 						</tr>
@@ -344,7 +364,7 @@
 										value="${tempShpValue}"
 										value="${tempShpValue}"
 									</c:if>
 									</c:if>
 									placeholder="<spring:message code='manifest.enterprise.code' />"
 									placeholder="<spring:message code='manifest.enterprise.code' />"
-									oninput="onInputChange(event,'shpcusid','oninput')"
+									oninput="onInputChange(event,'shpcusid','oninput')" maxlength="100"
 									onpropertychange="onInputChange(event,'shpcusid','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'shpcusid','onpropertychange')"></td>
 						</tr>
 						</tr>
 						<!-- 发货信息 end -->
 						<!-- 发货信息 end -->
@@ -365,11 +385,11 @@
                 					if(index >= 0)
                 					if(index >= 0)
                 					{
                 					{
                 						var consignee = consigneeList[index];
                 						var consignee = consigneeList[index];
-                						$("#sh_company").val(consignee.code?consignee.code:"");
-                						$("#sh_address").val(consignee.address?consignee.address:"");
+                						$("#sh_company").val(consignee.code?consignee.code.toUpperCase():"");
+                						$("#sh_address").val(consignee.address?consignee.address.toUpperCase():"");
                 						$("#sh_telephone").val(consignee.tel?consignee.tel:"");
                 						$("#sh_telephone").val(consignee.tel?consignee.tel:"");
                 						$("#sh_country").val(consignee.name?consignee.name:"");
                 						$("#sh_country").val(consignee.name?consignee.name:"");
-                						$("#sh_name").val(consignee.code?consignee.code:"");
+                						$("#sh_name").val(consignee.code?consignee.code.toUpperCase():"");
                 					}
                 					}
                 				}
                 				}
                 			}
                 			}
@@ -396,24 +416,26 @@
 						<tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.company" /><span
 							<td class="kv-label"><spring:message code="manifest.company" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
-							<td class="kv-content"><input required id="sh_company" name="sh_company" type="text"
+							<td class="kv-content"><input required id="sh_company" name="sh_company" type="text" maxlength="70"
 									value="${pre.sh_company }" oninput="onInputChange(event,'sh_company','oninput')"
 									value="${pre.sh_company }" oninput="onInputChange(event,'sh_company','oninput')"
 									onpropertychange="onInputChange(event,'sh_company','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'sh_company','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.address" /><span
 							<td class="kv-label"><spring:message code="manifest.address" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
 							<td class="kv-content"><input required id="sh_address" name="sh_address" type="text"
 							<td class="kv-content"><input required id="sh_address" name="sh_address" type="text"
-									value="${pre.sh_address }" maxlength="70"></td>
+									value="${pre.sh_address }" maxlength="70"
+									oninput="onInputChange(event,'sh_address','oninput')"
+									onpropertychange="onInputChange(event,'sh_address','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.zip.code" /></td>
 							<td class="kv-label"><spring:message code="manifest.zip.code" /></td>
-							<td class="kv-content"><input id="sh_zipcode" name="sh_zipcode" type="text"
+							<td class="kv-content"><input id="sh_zipcode" name="sh_zipcode" type="text" maxlength="9"
 									value="${pre.sh_zipcode }"></td>
 									value="${pre.sh_zipcode }"></td>
 						</tr>
 						</tr>
 						<tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.city" /><span class="required_span">*</span></td>
 							<td class="kv-label"><spring:message code="manifest.city" /><span class="required_span">*</span></td>
-							<td class="kv-content"><input required id="sh_city" name="sh_city" type="text"
+							<td class="kv-content"><input required id="sh_city" name="sh_city" type="text" maxlength="35"
 									value="${pre.sh_city }" oninput="onInputChange(event,'sh_city','oninput')"
 									value="${pre.sh_city }" oninput="onInputChange(event,'sh_city','oninput')"
 									onpropertychange="onInputChange(event,'sh_city','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'sh_city','onpropertychange')"></td>
 							<td class="kv-label"><spring:message code="manifest.state" /></td>
 							<td class="kv-label"><spring:message code="manifest.state" /></td>
-							<td class="kv-content"><input id="sh_deltaname" name="sh_deltaname" type="text"
+							<td class="kv-content"><input id="sh_deltaname" name="sh_deltaname" type="text" maxlength="35"
 									value="${pre.sh_deltaname}"></td>
 									value="${pre.sh_deltaname}"></td>
 							<td class="kv-label"><spring:message code="manifest.country" /><span
 							<td class="kv-label"><spring:message code="manifest.country" /><span
 								class="required_span">*</span></td>
 								class="required_span">*</span></td>
@@ -424,23 +446,20 @@
 						</tr>
 						</tr>
 						<tr>
 						<tr>
 							<td class="kv-label"><spring:message code="manifest.telephone" /></td>
 							<td class="kv-label"><spring:message code="manifest.telephone" /></td>
-							<td class="kv-content"><input id="sh_telephone" name="sh_telephone" type="text"
+							<td class="kv-content"><input id="sh_telephone" name="sh_telephone" type="text" maxlength="50"
 									value="${pre.sh_telephone }"></td>
 									value="${pre.sh_telephone }"></td>
 							<td class="kv-label"><spring:message code="manifest.fax" /></td>
 							<td class="kv-label"><spring:message code="manifest.fax" /></td>
-							<td class="kv-content"><input id="sh_fax" name="sh_fax" type="text"
+							<td class="kv-content"><input id="sh_fax" name="sh_fax" type="text" maxlength="50"
 									value="${pre.sh_fax }"></td>
 									value="${pre.sh_fax }"></td>
 							<td style="display: none;" class="kv-label"><spring:message code="manifest.name" /></td>
 							<td style="display: none;" class="kv-label"><spring:message code="manifest.name" /></td>
 							<td style="display: none;" class="kv-content" colspan="5"><input id="sh_name"
 							<td style="display: none;" class="kv-content" colspan="5"><input id="sh_name"
 									name="sh_name" type="text" value="${pre.sh_name }"></td>
 									name="sh_name" type="text" value="${pre.sh_name }"></td>
 							<td class="kv-label"><spring:message code="manifest.shr.cneaeo" /></td>
 							<td class="kv-label"><spring:message code="manifest.shr.cneaeo" /></td>
-							<td class="kv-content"><input id="cneaeo" name="cneaeo" type="text"
+							<td class="kv-content"><input id="cneaeo" name="cneaeo" type="text" maxlength="20"
 									value="${pre.cneaeo }" oninput="onInputChange(event,'cneaeo','oninput')"
 									value="${pre.cneaeo }" oninput="onInputChange(event,'cneaeo','oninput')"
 									onpropertychange="onInputChange(event,'cneaeo','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'cneaeo','onpropertychange')"></td>
 						</tr>
 						</tr>
 						
 						
-						<tr style="display: none;">
-							<td> <input value="${pre.cnecusid}"/> <input value="${pre.shpcusid}"/> </td>
-						</tr>
 						<%-- <tr>
 						<%-- <tr>
 							<td class="kv-label"><spring:message code="manifest.province.code" /></td>
 							<td class="kv-label"><spring:message code="manifest.province.code" /></td>
 							<td class="kv-content"><input id="sh_provincecode" name="sh_provincecode" type="text"
 							<td class="kv-content"><input id="sh_provincecode" name="sh_provincecode" type="text"
@@ -471,10 +490,9 @@
 										value="${tempCneValue }"
 										value="${tempCneValue }"
 									</c:if>
 									</c:if>
 									placeholder="<spring:message code='manifest.enterprise.code' />"
 									placeholder="<spring:message code='manifest.enterprise.code' />"
-									oninput="onInputChange(event,'cnecusid','oninput')"
+									oninput="onInputChange(event,'cnecusid','oninput')" maxlength="100"
 									onpropertychange="onInputChange(event,'cnecusid','onpropertychange')"></td>
 									onpropertychange="onInputChange(event,'cnecusid','onpropertychange')"></td>
 
 
-
 							<td style="display: none;" class="kv-label"><spring:message
 							<td style="display: none;" class="kv-label"><spring:message
 									code="manifest.shr.unlodingcode" /><span class="required_span">*</span></td>
 									code="manifest.shr.unlodingcode" /><span class="required_span">*</span></td>
 							<td style="display: none;" class="kv-content"><input required id="unlodingcode"
 							<td style="display: none;" class="kv-content"><input required id="unlodingcode"
@@ -617,11 +635,17 @@
 			</form>
 			</form>
 		</div>
 		</div>
 	</div>
 	</div>
-	<script type="text/javascript" src="<%=basePath%>resource/layer-v3.0.3/layer/layer.js"></script>
 	<script src="<%=basePath%>resource/easyui/jquery.easyui.min.js"></script>
 	<script src="<%=basePath%>resource/easyui/jquery.easyui.min.js"></script>
 	<script src="<%=basePath%>resource/My97DatePicker/WdatePicker.js"></script>
 	<script src="<%=basePath%>resource/My97DatePicker/WdatePicker.js"></script>
-	<script src="<%=basePath%>resource/js/tools.js?version=1.2"></script>
+	<script src="<%=basePath%>resource/js/tools.js?version=${version}"></script>
 	<script type="text/javascript">
 	<script type="text/javascript">
+	
+	var layerIndex;
+	var layer;
+	layui.use('layer', function(){
+		  layer = layui.layer;
+	}); 
+	
 	function onCarrierMsg() {
 	function onCarrierMsg() {
 		layer.open({content: "<spring:message code='manifest.fhr.carrierMsg'/>"});
 		layer.open({content: "<spring:message code='manifest.fhr.carrierMsg'/>"});
 	}
 	}
@@ -774,8 +798,12 @@
         
         
 
 
 	    function submit(){
 	    function submit(){
-        	var dd = $("#ways").val();
-        	$("#waybillnosecondary").val(dd)
+	        	layerIndex = parent.layer.load(1, {
+	    			shade: [0.6,'#000000'] //0.1透明度
+	    		});
+	        	
+	        	var dd = $("#ways").val();
+	        	$("#waybillnosecondary").val(dd)
 	        var data = $("#form").serialize();
 	        var data = $("#form").serialize();
         		
         		
         		var shp_cusid_type = getSelectedValue("co_cusid");
         		var shp_cusid_type = getSelectedValue("co_cusid");
@@ -794,9 +822,11 @@
     			data+="&cnecusid="+encodeURIComponent(cnecusid);
     			data+="&cnecusid="+encodeURIComponent(cnecusid);
            	}
            	}
     		
     		
-    		console.log("form-->"+data);
+    		/* console.log("form-->"+data); */
         	
         	
 	        $.post("<%=basePath%>manifest/sub_save",data,function(data){
 	        $.post("<%=basePath%>manifest/sub_save",data,function(data){
+	        		parent.layer.close(layerIndex);
+	        		
 	            if(data.status==200){
 	            if(data.status==200){
 //                     layer.confirm("<spring:message code="opt.savesuccess" />!",{btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function(){
 //                     layer.confirm("<spring:message code="opt.savesuccess" />!",{btn:['<spring:message code="opt.confirm" />','<spring:message code="opt.cancel" />']},function(){
                         window.location.href="<%=basePath%>manifest/list";
                         window.location.href="<%=basePath%>manifest/list";
@@ -811,6 +841,10 @@
 	    function presavesend(){
 	    function presavesend(){
 		    	var isValid = $("#form").valid();
 		    	var isValid = $("#form").valid();
 		    	if(isValid){
 		    	if(isValid){
+		    		layerIndex = parent.layer.load(1, {
+		    			shade: [0.6,'#000000'] //0.1透明度
+		    		});
+		    		
 		    		var dd = $("#ways").val();
 		    		var dd = $("#ways").val();
 		        	$("#waybillnosecondary").val(dd);
 		        	$("#waybillnosecondary").val(dd);
 		        var data = $("#form").serialize();
 		        var data = $("#form").serialize();
@@ -831,10 +865,12 @@
 		         }
 		         }
 	    		
 	    		
 		        $.post("<%=basePath%>manifest/presavesend",data,function(data){
 		        $.post("<%=basePath%>manifest/presavesend",data,function(data){
+		        		parent.layer.close(layerIndex);
+		        		
 		            if(data.status==200){
 		            if(data.status==200){
 	                        window.location.href="<%=basePath%>manifest/list";
 	                        window.location.href="<%=basePath%>manifest/list";
 		            }else{
 		            }else{
-		            	layer.open({content:""+data.msg});
+		            		layer.open({content:""+data.msg});
 		            }
 		            }
 		        })
 		        })
 		    	}
 		    	}
@@ -1037,6 +1073,7 @@
 				}
 				}
 			});
 			});
 		}
 		}
+		 
 	</script>
 	</script>
 </body>
 </body>
 </html>
 </html>

+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%
+	String path = request.getContextPath();
+	String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort()
+			+ path + "/";
+%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<title><spring:message code='opt.open.receipt' /></title>
+<script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js"></script>
+<script type="text/javascript" src="<%=basePath%>resource/validate/jquery.validate.js"></script>
+<script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js"></script>
+<!-- validate 验证中英文 -->
+<script type="text/javascript"
+	src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js"></script>
+<link rel="stylesheet" href="<%=basePath%>resource/layui/css/layui.css" media="all">
+<script type="text/javascript" src="<%=basePath%>resource/layui/layui.js"></script>
+</head>
+<body>
+	<div class="layui-row">
+		<table class="layui-table" lay-even>
+			<thead>
+				<tr>
+					<th>时间</th>
+					<th>航班</th>
+					<th>件数</th>
+					<th>重量</th>
+					<th>回执内容</th>
+				</tr>
+			</thead>
+			<tbody>
+				<c:forEach var="data" items="${dataList}" varStatus="status">
+					<tr>
+						<td>${data.createDate}</td>
+						<td>${data.carrier}${data.flightno}</td>
+						<td>${data.piece}</td>
+						<td>${data.weight}</td>
+						<td>
+						<c:choose>
+							<c:when test="${fn:indexOf(data.response_text,'41301')>-1}">
+								<span style="color:green;">${data.response_text}</span>
+							</c:when>
+							<c:when test="${fn:indexOf(data.response_text,'45201')>-1}">
+								<span style="color:green;">${data.response_text}</span>
+							</c:when>
+							<c:when test="${fn:indexOf(data.response_text,'分单')>-1}">
+								<span style="color:black;">${data.response_text}</span>
+							</c:when>
+							<c:when test="${fn:indexOf(data.response_text,'主单')>-1}">
+								<span style="color:black;">${data.response_text}</span>
+							</c:when>
+							<c:otherwise>
+								<span style="color:red;">${data.response_text}</span>
+							</c:otherwise>
+						 </c:choose>
+						</td>
+					</tr>
+				</c:forEach>
+			</tbody>
+		</table>
+	</div>
+
+	<script>
+		var layer;
+		layui.use('layer', function() {
+			layer = layui.layer;
+		});
+	</script>
+</body>
+</html>

@@ -256,15 +256,12 @@ function onInputChange(event, id, method) {
 	} else {
 	} else {
 		content = event.target.value;
 		content = event.target.value;
 	}
 	}
-	
+
 	if (content) {
 	if (content) {
+		content = excludeSpecial(content);
 		var upper = content.toUpperCase();
 		var upper = content.toUpperCase();
 		$("#" + id).val(upper);
 		$("#" + id).val(upper);
 
 
-		if (id && id == "carrier_new") {
-			$("#carrier").html(upper);
-		}
-
 		if (id && id == "destinationstation") {
 		if (id && id == "destinationstation") {
 			$("#reach_station").val(upper);
 			$("#reach_station").val(upper);
 			$("#unlodingcode").val(upper);
 			$("#unlodingcode").val(upper);
@@ -272,17 +269,17 @@ function onInputChange(event, id, method) {
 
 
 		if (id && id == "totalpiece") {
 		if (id && id == "totalpiece") {
 			$("#de_number").val(upper);
 			$("#de_number").val(upper);
-			$("#preparepiece").val(upper);//分单
-			$("#preparetotalpiece").val(upper);//主单
+			$("#preparepiece").val(upper);// 分单
+			$("#preparetotalpiece").val(upper);// 主单
 		}
 		}
 
 
 		if (id && id == "totalweight") {
 		if (id && id == "totalweight") {
 			$("#de_weight").val(upper);
 			$("#de_weight").val(upper);
 			$("#de_chweight").val(upper);
 			$("#de_chweight").val(upper);
-			$("#prepareweight").val(upper);//分单
-			$("#preparetotalweight").val(upper);//主单
+			$("#prepareweight").val(upper);// 分单
+			$("#preparetotalweight").val(upper);// 主单
 		}
 		}
-		
+
 		if (id && id == "co_company") {
 		if (id && id == "co_company") {
 			$("#co_name").val(upper);
 			$("#co_name").val(upper);
 		}
 		}
@@ -291,13 +288,23 @@ function onInputChange(event, id, method) {
 			$("#sh_name").val(upper);
 			$("#sh_name").val(upper);
 		}
 		}
 
 
+		if (id && id == "flightno") {
+			$("#flightno").html(upper);
+			if (upper.length > 2) {
+				var carrier = upper.substring(0, 2);
+				$("#carrier").html(carrier);
+			}
+
+			checkFlight(upper);
+		}
+
 	}
 	}
 }
 }
 
 
-//判断数据是否为空
+// 判断数据是否为空
 function isEmpty(data) {
 function isEmpty(data) {
 	if (data == undefined || data == "undefined" || data == null
 	if (data == undefined || data == "undefined" || data == null
-			|| data == "null" || data == "") {
+			|| data == "null" || data == "" || data == "UNDEFINED") {
 		return true;
 		return true;
 	} else {
 	} else {
 		return false;
 		return false;
@@ -308,7 +315,7 @@ function notEmpty(data) {
 	return !isEmpty(data);
 	return !isEmpty(data);
 }
 }
 
 
-//获取下拉列表选中项的文本
+// 获取下拉列表选中项的文本
 function getSelectedText(eid) {
 function getSelectedText(eid) {
 	var obj = document.getElementById(eid);
 	var obj = document.getElementById(eid);
 	for (i = 0; i < obj.length; i++) {
 	for (i = 0; i < obj.length; i++) {
@@ -324,4 +331,30 @@ function getSelectedValue(eid) {
 	var obj = document.getElementById(eid);
 	var obj = document.getElementById(eid);
 	// 直接用其对象的value属性便可获取到
 	// 直接用其对象的value属性便可获取到
 	return obj.value;
 	return obj.value;
-}
+}
+
+// 去掉字符串中的特殊字符
+var excludeSpecial = function(s) {
+	var data = s;
+	if (isEmpty(data)) {
+		return "";
+	}
+	// 去掉转义字符
+	data = data.replace(/[\'\"\\\/\b\f\n\r\t]/g, '');
+	// 去掉特殊字符
+	data = data.replace(/[\@\#\$\%\^\&\*\{\}\:\"\<\>\?]/);
+	if (isEmpty(data)) {
+		data = "";
+	}
+
+	data = data.replace("UNDEFINED", "").replace("undefined", "");
+	// console.log("data-->"+data);
+	return data;
+}
+
+function checkFlight(flightno) {
+	var reg = /^[0-9a-zA-Z]+$/;
+	if (!reg.test(flightno)) {
+		$("#flightno").val("");
+	}
+}

-.layui-layer-imgbar,.layui-layer-imgtit a,.layui-layer-tab .layui-layer-title span,.layui-layer-title{text-overflow:ellipsis;white-space:nowrap}*html{background-image:url(about:blank);background-attachment:fixed}html #layuicss-skinlayercss{display:none;position:absolute;width:1989px}.layui-layer,.layui-layer-shade{position:fixed;_position:absolute;pointer-events:auto}.layui-layer-shade{top:0;left:0;width:100%;height:100%;_height:expression(document.body.offsetHeight+"px")}.layui-layer{-webkit-overflow-scrolling:touch;top:150px;left:0;margin:0;padding:0;background-color:#fff;-webkit-background-clip:content;box-shadow:1px 1px 50px rgba(0,0,0,.3)}.layui-layer-close{position:absolute}.layui-layer-content{position:relative}.layui-layer-border{border:1px solid #B2B2B2;border:1px solid rgba(0,0,0,.1);box-shadow:1px 1px 5px rgba(0,0,0,.2)}.layui-layer-load{background:url(loading-1.gif) center center no-repeat #eee}.layui-layer-ico{background:url(icon.png) no-repeat}.layui-layer-btn a,.layui-layer-dialog .layui-layer-ico,.layui-layer-setwin a{display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-move{display:none;position:fixed;*position:absolute;left:0;top:0;width:100%;height:100%;cursor:move;opacity:0;filter:alpha(opacity=0);background-color:#fff;z-index:2147483647}.layui-layer-resize{position:absolute;width:15px;height:15px;right:0;bottom:0;cursor:se-resize}.layui-layer{border-radius:2px;-webkit-animation-fill-mode:both;animation-fill-mode:both;-webkit-animation-duration:.3s;animation-duration:.3s}@-webkit-keyframes layer-bounceIn{0%{opacity:0;-webkit-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);transform:scale(1)}}@keyframes layer-bounceIn{0%{opacity:0;-webkit-transform:scale(.5);-ms-transform:scale(.5);transform:scale(.5)}100%{opacity:1;-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layer-anim{-webkit-animation-name:layer-bounceIn;animation-name:layer-bounceIn}@-webkit-keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-01{-webkit-animation-name:layer-zoomInDown;animation-name:layer-zoomInDown}@-webkit-keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.layer-anim-02{-webkit-animation-name:layer-fadeInUpBig;animation-name:layer-fadeInUpBig}@-webkit-keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-03{-webkit-animation-name:layer-zoomInLeft;animation-name:layer-zoomInLeft}@-webkit-keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}@keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0) rotate(0);-ms-transform:translateX(0) rotate(0);transform:translateX(0) rotate(0)}}.layer-anim-04{-webkit-animation-name:layer-rollIn;animation-name:layer-rollIn}@keyframes layer-fadeIn{0%{opacity:0}100%{opacity:1}}.layer-anim-05{-webkit-animation-name:layer-fadeIn;animation-name:layer-fadeIn}@-webkit-keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.layer-anim-06{-webkit-animation-name:layer-shake;animation-name:layer-shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.layui-layer-title{padding:0 80px 0 20px;height:42px;line-height:42px;border-bottom:1px solid #eee;font-size:14px;color:#333;overflow:hidden;background-color:#F8F8F8;border-radius:2px 2px 0 0}.layui-layer-setwin{position:absolute;right:15px;*right:0;top:15px;font-size:0;line-height:initial}.layui-layer-setwin a{position:relative;width:16px;height:16px;margin-left:10px;font-size:12px;_overflow:hidden}.layui-layer-setwin .layui-layer-min cite{position:absolute;width:14px;height:2px;left:0;top:50%;margin-top:-1px;background-color:#2E2D3C;cursor:pointer;_overflow:hidden}.layui-layer-setwin .layui-layer-min:hover cite{background-color:#2D93CA}.layui-layer-setwin .layui-layer-max{background-position:-32px -40px}.layui-layer-setwin .layui-layer-max:hover{background-position:-16px -40px}.layui-layer-setwin .layui-layer-maxmin{background-position:-65px -40px}.layui-layer-setwin .layui-layer-maxmin:hover{background-position:-49px -40px}.layui-layer-setwin .layui-layer-close1{background-position:1px -40px;cursor:pointer}.layui-layer-setwin .layui-layer-close1:hover{opacity:.7}.layui-layer-setwin .layui-layer-close2{position:absolute;right:-28px;top:-28px;width:30px;height:30px;margin-left:0;background-position:-149px -31px;*right:-18px;_display:none}.layui-layer-setwin .layui-layer-close2:hover{background-position:-180px -31px}.layui-layer-btn{text-align:right;padding:0 10px 12px;pointer-events:auto;user-select:none;-webkit-user-select:none}.layui-layer-btn a{height:28px;line-height:28px;margin:6px 6px 0;padding:0 15px;border:1px solid #dedede;background-color:#f1f1f1;color:#333;border-radius:2px;font-weight:400;cursor:pointer;text-decoration:none}.layui-layer-btn a:hover{opacity:.9;text-decoration:none}.layui-layer-btn a:active{opacity:.8}.layui-layer-btn .layui-layer-btn0{border-color:#4898d5;background-color:#2e8ded;color:#fff}.layui-layer-btn-l{text-align:left}.layui-layer-btn-c{text-align:center}.layui-layer-dialog{min-width:260px}.layui-layer-dialog .layui-layer-content{position:relative;padding:20px;line-height:24px;word-break:break-all;overflow:hidden;font-size:14px;overflow-x:hidden;overflow-y:auto}.layui-layer-dialog .layui-layer-content .layui-layer-ico{position:absolute;top:16px;left:15px;_left:-40px;width:30px;height:30px}.layui-layer-ico1{background-position:-30px 0}.layui-layer-ico2{background-position:-60px 0}.layui-layer-ico3{background-position:-90px 0}.layui-layer-ico4{background-position:-120px 0}.layui-layer-ico5{background-position:-150px 0}.layui-layer-ico6{background-position:-180px 0}.layui-layer-rim{border:6px solid #8D8D8D;border:6px solid rgba(0,0,0,.3);border-radius:5px;box-shadow:none}.layui-layer-msg{min-width:180px;border:1px solid #D3D4D3;box-shadow:none}.layui-layer-hui{min-width:100px;background-color:#000;filter:alpha(opacity=60);background-color:rgba(0,0,0,.6);color:#fff;border:none}.layui-layer-hui .layui-layer-content{padding:12px 25px;text-align:center}.layui-layer-dialog .layui-layer-padding{padding:20px 20px 20px 55px;text-align:left}.layui-layer-page .layui-layer-content{position:relative;overflow:auto}.layui-layer-iframe .layui-layer-btn,.layui-layer-page .layui-layer-btn{padding-top:10px}.layui-layer-nobg{background:0 0}.layui-layer-iframe iframe{display:block;width:100%}.layui-layer-loading{border-radius:100%;background:0 0;box-shadow:none;border:none}.layui-layer-loading .layui-layer-content{width:60px;height:24px;background:url(loading-0.gif) no-repeat}.layui-layer-loading .layui-layer-loading1{width:37px;height:37px;background:url(loading-1.gif) no-repeat}.layui-layer-ico16,.layui-layer-loading .layui-layer-loading2{width:32px;height:32px;background:url(loading-2.gif) no-repeat}.layui-layer-tips{background:0 0;box-shadow:none;border:none}.layui-layer-tips .layui-layer-content{position:relative;line-height:22px;min-width:12px;padding:5px 10px;font-size:12px;_float:left;border-radius:2px;box-shadow:1px 1px 3px rgba(0,0,0,.2);background-color:#000;color:#fff}.layui-layer-tips .layui-layer-close{right:-2px;top:-1px}.layui-layer-tips i.layui-layer-TipsG{position:absolute;width:0;height:0;border-width:8px;border-color:transparent;border-style:dashed;*overflow:hidden}.layui-layer-tips i.layui-layer-TipsB,.layui-layer-tips i.layui-layer-TipsT{left:5px;border-right-style:solid;border-right-color:#000}.layui-layer-tips i.layui-layer-TipsT{bottom:-8px}.layui-layer-tips i.layui-layer-TipsB{top:-8px}.layui-layer-tips i.layui-layer-TipsL,.layui-layer-tips i.layui-layer-TipsR{top:1px;border-bottom-style:solid;border-bottom-color:#000}.layui-layer-tips i.layui-layer-TipsR{left:-8px}.layui-layer-tips i.layui-layer-TipsL{right:-8px}.layui-layer-lan[type=dialog]{min-width:280px}.layui-layer-lan .layui-layer-title{background:#4476A7;color:#fff;border:none}.layui-layer-lan .layui-layer-btn{padding:5px 10px 10px;text-align:right;border-top:1px solid #E9E7E7}.layui-layer-lan .layui-layer-btn a{background:#BBB5B5;border:none}.layui-layer-lan .layui-layer-btn .layui-layer-btn1{background:#C9C5C5}.layui-layer-molv .layui-layer-title{background:#009f95;color:#fff;border:none}.layui-layer-molv .layui-layer-btn a{background:#009f95}.layui-layer-molv .layui-layer-btn .layui-layer-btn1{background:#92B8B1}.layui-layer-iconext{background:url(icon-ext.png) no-repeat}.layui-layer-prompt .layui-layer-input{display:block;width:220px;height:30px;margin:0 auto;line-height:30px;padding:0 5px;border:1px solid #ccc;box-shadow:1px 1px 5px rgba(0,0,0,.1) inset;color:#333}.layui-layer-prompt textarea.layui-layer-input{width:300px;height:100px;line-height:20px}.layui-layer-prompt .layui-layer-content{padding:20px}.layui-layer-prompt .layui-layer-btn{padding-top:0}.layui-layer-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4)}.layui-layer-tab .layui-layer-title{padding-left:0;border-bottom:1px solid #ccc;background-color:#eee;overflow:visible}.layui-layer-tab .layui-layer-title span{position:relative;float:left;min-width:80px;max-width:260px;padding:0 20px;text-align:center;cursor:default;overflow:hidden}.layui-layer-tab .layui-layer-title span.layui-layer-tabnow{height:43px;border-left:1px solid #ccc;border-right:1px solid #ccc;background-color:#fff;z-index:10}.layui-layer-tab .layui-layer-title span:first-child{border-left:none}.layui-layer-tabmain{line-height:24px;clear:both}.layui-layer-tabmain .layui-layer-tabli{display:none}.layui-layer-tabmain .layui-layer-tabli.xubox_tab_layer{display:block}.xubox_tabclose{position:absolute;right:10px;top:5px;cursor:pointer}.layui-layer-photos{-webkit-animation-duration:.8s;animation-duration:.8s}.layui-layer-photos .layui-layer-content{overflow:hidden;text-align:center}.layui-layer-photos .layui-layer-phimg img{position:relative;width:100%;display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-imgbar,.layui-layer-imguide{display:none}.layui-layer-imgnext,.layui-layer-imgprev{position:absolute;top:50%;width:27px;_width:44px;height:44px;margin-top:-22px;outline:0;blr:expression(this.onFocus=this.blur())}.layui-layer-imgprev{left:10px;background-position:-5px -5px;_background-position:-70px -5px}.layui-layer-imgprev:hover{background-position:-33px -5px;_background-position:-120px -5px}.layui-layer-imgnext{right:10px;_right:8px;background-position:-5px -50px;_background-position:-70px -50px}.layui-layer-imgnext:hover{background-position:-33px -50px;_background-position:-120px -50px}.layui-layer-imgbar{position:absolute;left:0;bottom:0;width:100%;height:32px;line-height:32px;background-color:rgba(0,0,0,.8);background-color:#000\9;filter:Alpha(opacity=80);color:#fff;overflow:hidden;font-size:0}.layui-layer-imgtit *{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:12px}.layui-layer-imgtit a{max-width:65%;overflow:hidden;color:#fff}.layui-layer-imgtit a:hover{color:#fff;text-decoration:underline}.layui-layer-imgtit em{padding-left:10px;font-style:normal}@-webkit-keyframes layer-bounceOut{100%{opacity:0;-webkit-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.05);transform:scale(1.05)}0%{-webkit-transform:scale(1);transform:scale(1)}}@keyframes layer-bounceOut{100%{opacity:0;-webkit-transform:scale(.7);-ms-transform:scale(.7);transform:scale(.7)}30%{-webkit-transform:scale(1.05);-ms-transform:scale(1.05);transform:scale(1.05)}0%{-webkit-transform:scale(1);-ms-transform:scale(1);transform:scale(1)}}.layer-anim-close{-webkit-animation-name:layer-bounceOut;animation-name:layer-bounceOut;-webkit-animation-duration:.2s;animation-duration:.2s}@media screen and (max-width:1100px){.layui-layer-iframe{overflow-y:auto;-webkit-overflow-scrolling:touch}}
+.layui-layer-imgbar, .layui-layer-imgtit a, .layui-layer-tab .layui-layer-title span,
+	.layui-layer-title {
+	text-overflow: ellipsis;
+	white-space: nowrap
+}
+
+* html{
+	background-image: url(about:blank);
+	background-attachment: fixed
+}
+
+html #layuicss-skinlayercss {
+	display: none;
+	position: absolute;
+	width: 1989px
+}
+
+.layui-layer, .layui-layer-shade {
+	position: fixed;
+	_position: absolute;
+	pointer-events: auto
+}
+
+.layui-layer-shade {
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	_height: expression(document.body.offsetHeight + "px")
+}
+
+.layui-layer {
+	-webkit-overflow-scrolling: touch;
+	top: 150px;
+	left: 0;
+	margin: 0;
+	padding: 0;
+	background-color: #fff;
+	-webkit-background-clip: content;
+	box-shadow: 1px 1px 50px rgba(0, 0, 0, .3)
+}
+
+.layui-layer-close {
+	position: absolute
+}
+
+.layui-layer-content {
+	position: relative
+}
+
+.layui-layer-border {
+	border: 1px solid #B2B2B2;
+	border: 1px solid rgba(0, 0, 0, .1);
+	box-shadow: 1px 1px 5px rgba(0, 0, 0, .2)
+}
+
+.layui-layer-load {
+	background: url(loading-1.gif) center center no-repeat #eee
+}
+
+.layui-layer-ico {
+	background: url(icon.png) no-repeat
+}
+
+.layui-layer-btn a, .layui-layer-dialog .layui-layer-ico,
+	.layui-layer-setwin a {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	vertical-align: top
+}
+
+.layui-layer-move {
+	display: none;
+	position: fixed;
+	*position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	cursor: move;
+	opacity: 0;
+	filter: alpha(opacity = 0);
+	background-color: #fff;
+	z-index: 2147483647
+}
+
+.layui-layer-resize {
+	position: absolute;
+	width: 15px;
+	height: 15px;
+	right: 0;
+	bottom: 0;
+	cursor: se-resize
+}
+
+.layui-layer {
+	border-radius: 2px;
+	-webkit-animation-fill-mode: both;
+	animation-fill-mode: both;
+	-webkit-animation-duration: .3s;
+	animation-duration: .3s
+}
+
+@
+-webkit-keyframes layer-bounceIn { 0%{
+	opacity: 0;
+	-webkit-transform: scale(.5);
+	transform: scale(.5)
+}
+
+100%{
+opacity
+:
+1;-webkit-transform
+:scale(1)
+;transform
+:scale(1)
+}
+}
+@
+keyframes layer-bounceIn { 0%{
+	opacity: 0;
+	-webkit-transform: scale(.5);
+	-ms-transform: scale(.5);
+	transform: scale(.5)
+}
+
+100%{
+opacity
+:
+1;-webkit-transform
+:scale(1)
+;-ms-transform
+:scale(1)
+;transform
+:scale(1)
+}
+}
+.layer-anim {
+	-webkit-animation-name: layer-bounceIn;
+	animation-name: layer-bounceIn
+}
+
+@
+-webkit-keyframes layer-zoomInDown { 0%{
+	opacity: 0;
+	-webkit-transform: scale(.1) translateY(-2000px);
+	transform: scale(.1) translateY(-2000px);
+	-webkit-animation-timing-function: ease-in-out;
+	animation-timing-function: ease-in-out
+}
+
+60%{
+opacity
+:
+1;-webkit-transform
+:scale
+(
+.475
+)
+ 
+translateY
+(60px);transform
+:scale
+(
+.475
+)
+ 
+translateY
+(60px);-webkit-animation-timing-function
+:ease-out
+;animation-timing-function
+:ease-out
+}
+}
+@
+keyframes layer-zoomInDown { 0%{
+	opacity: 0;
+	-webkit-transform: scale(.1) translateY(-2000px);
+	-ms-transform: scale(.1) translateY(-2000px);
+	transform: scale(.1) translateY(-2000px);
+	-webkit-animation-timing-function: ease-in-out;
+	animation-timing-function: ease-in-out
+}
+
+60%{
+opacity
+:
+1;-webkit-transform
+:scale
+(
+.475
+)
+ 
+translateY
+(60px);-ms-transform
+:scale
+(
+.475
+)
+ 
+translateY
+(60px);transform
+:scale
+(
+.475
+)
+ 
+translateY
+(60px);-webkit-animation-timing-function
+:ease-out
+;animation-timing-function
+:ease-out
+}
+}
+.layer-anim-01 {
+	-webkit-animation-name: layer-zoomInDown;
+	animation-name: layer-zoomInDown
+}
+
+@
+-webkit-keyframes layer-fadeInUpBig { 0%{
+	opacity: 0;
+	-webkit-transform: translateY(2000px);
+	transform: translateY(2000px)
+}
+
+100%{
+opacity
+:
+1;-webkit-transform
+:translateY(0)
+;transform
+:translateY(0)
+}
+}
+@
+keyframes layer-fadeInUpBig { 0%{
+	opacity: 0;
+	-webkit-transform: translateY(2000px);
+	-ms-transform: translateY(2000px);
+	transform: translateY(2000px)
+}
+
+100%{
+opacity
+:
+1;-webkit-transform
+:translateY(0)
+;-ms-transform
+:translateY(0)
+;transform
+:translateY(0)
+}
+}
+.layer-anim-02 {
+	-webkit-animation-name: layer-fadeInUpBig;
+	animation-name: layer-fadeInUpBig
+}
+
+@
+-webkit-keyframes layer-zoomInLeft { 0%{
+	opacity: 0;
+	-webkit-transform: scale(.1) translateX(-2000px);
+	transform: scale(.1) translateX(-2000px);
+	-webkit-animation-timing-function: ease-in-out;
+	animation-timing-function: ease-in-out
+}
+
+60%{
+opacity
+:
+1;-webkit-transform
+:scale
+(
+.475
+)
+ 
+translateX
+(48px);transform
+:scale
+(
+.475
+)
+ 
+translateX
+(48px);-webkit-animation-timing-function
+:ease-out
+;animation-timing-function
+:ease-out
+}
+}
+@
+keyframes layer-zoomInLeft { 0%{
+	opacity: 0;
+	-webkit-transform: scale(.1) translateX(-2000px);
+	-ms-transform: scale(.1) translateX(-2000px);
+	transform: scale(.1) translateX(-2000px);
+	-webkit-animation-timing-function: ease-in-out;
+	animation-timing-function: ease-in-out
+}
+
+60%{
+opacity
+:
+1;-webkit-transform
+:scale
+(
+.475
+)
+ 
+translateX
+(48px);-ms-transform
+:scale
+(
+.475
+)
+ 
+translateX
+(48px);transform
+:scale
+(
+.475
+)
+ 
+translateX
+(48px);-webkit-animation-timing-function
+:ease-out
+;animation-timing-function
+:ease-out
+}
+}
+.layer-anim-03 {
+	-webkit-animation-name: layer-zoomInLeft;
+	animation-name: layer-zoomInLeft
+}
+
+@
+-webkit-keyframes layer-rollIn { 0%{
+	opacity: 0;
+	-webkit-transform: translateX(-100%) rotate(-120deg);
+	transform: translateX(-100%) rotate(-120deg)
+}
+
+100%{
+opacity
+:
+1;-webkit-transform
+:translateX(0)
+ 
+rotate
+(0);transform
+:translateX(0)
+ 
+rotate
+(0)
+}
+}
+@
+keyframes layer-rollIn { 0%{
+	opacity: 0;
+	-webkit-transform: translateX(-100%) rotate(-120deg);
+	-ms-transform: translateX(-100%) rotate(-120deg);
+	transform: translateX(-100%) rotate(-120deg)
+}
+
+100%{
+opacity
+:
+1;-webkit-transform
+:translateX(0)
+ 
+rotate
+(0);-ms-transform
+:translateX(0)
+ 
+rotate
+(0);transform
+:translateX(0)
+ 
+rotate
+(0)
+}
+}
+.layer-anim-04 {
+	-webkit-animation-name: layer-rollIn;
+	animation-name: layer-rollIn
+}
+
+@
+keyframes layer-fadeIn { 0%{
+	opacity: 0
+}
+
+100%{
+opacity
+:
+1
+}
+}
+.layer-anim-05 {
+	-webkit-animation-name: layer-fadeIn;
+	animation-name: layer-fadeIn
+}
+
+@
+-webkit-keyframes layer-shake { 0%,100%{
+	-webkit-transform: translateX(0);
+	transform: translateX(0)
+}
+
+10%,30%,50%,70%,90%{
+-webkit-transform
+:translateX(-10px)
+;transform
+:translateX(-10px)
+}
+20%,40%,60%,80%{
+-webkit-transform
+:translateX(10px)
+;transform
+:translateX(10px)
+}
+}
+@
+keyframes layer-shake { 0%,100%{
+	-webkit-transform: translateX(0);
+	-ms-transform: translateX(0);
+	transform: translateX(0)
+}
+
+10%,30%,50%,70%,90%{
+-webkit-transform
+:translateX(-10px)
+;-ms-transform
+:translateX(-10px)
+;transform
+:translateX(-10px)
+}
+20%,40%,60%,80%{
+-webkit-transform
+:translateX(10px)
+;-ms-transform
+:translateX(10px)
+;transform
+:translateX(10px)
+}
+}
+.layer-anim-06 {
+	-webkit-animation-name: layer-shake;
+	animation-name: layer-shake
+}
+
+@
+-webkit-keyframes fadeIn { 0%{
+	opacity: 0
+}
+
+100%{
+opacity
+:
+1
+}
+}
+.layui-layer-title {
+	padding: 0 80px 0 20px;
+	height: 42px;
+	line-height: 42px;
+	border-bottom: 1px solid #eee;
+	font-size: 14px;
+	color: #333;
+	overflow: hidden;
+	background-color: #F8F8F8;
+	border-radius: 2px 2px 0 0
+}
+
+.layui-layer-setwin {
+	position: absolute;
+	right: 15px;
+	*right: 0;
+	top: 15px;
+	font-size: 0;
+	line-height: initial
+}
+
+.layui-layer-setwin a {
+	position: relative;
+	width: 16px;
+	height: 16px;
+	margin-left: 10px;
+	font-size: 12px;
+	_overflow: hidden
+}
+
+.layui-layer-setwin .layui-layer-min cite {
+	position: absolute;
+	width: 14px;
+	height: 2px;
+	left: 0;
+	top: 50%;
+	margin-top: -1px;
+	background-color: #2E2D3C;
+	cursor: pointer;
+	_overflow: hidden
+}
+
+.layui-layer-setwin .layui-layer-min:hover cite {
+	background-color: #2D93CA
+}
+
+.layui-layer-setwin .layui-layer-max {
+	background-position: -32px -40px
+}
+
+.layui-layer-setwin .layui-layer-max:hover {
+	background-position: -16px -40px
+}
+
+.layui-layer-setwin .layui-layer-maxmin {
+	background-position: -65px -40px
+}
+
+.layui-layer-setwin .layui-layer-maxmin:hover {
+	background-position: -49px -40px
+}
+
+.layui-layer-setwin .layui-layer-close1 {
+	background-position: 1px -40px;
+	cursor: pointer
+}
+
+.layui-layer-setwin .layui-layer-close1:hover {
+	opacity: .7
+}
+
+.layui-layer-setwin .layui-layer-close2 {
+	position: absolute;
+	right: -28px;
+	top: -28px;
+	width: 30px;
+	height: 30px;
+	margin-left: 0;
+	background-position: -149px -31px;
+	*right: -18px;
+	_display: none
+}
+
+.layui-layer-setwin .layui-layer-close2:hover {
+	background-position: -180px -31px
+}
+
+.layui-layer-btn {
+	text-align: right;
+	padding: 0 10px 12px;
+	pointer-events: auto;
+	user-select: none;
+	-webkit-user-select: none
+}
+
+.layui-layer-btn a {
+	height: 28px;
+	line-height: 28px;
+	margin: 6px 6px 0;
+	padding: 0 15px;
+	border: 1px solid #dedede;
+	background-color: #f1f1f1;
+	color: #333;
+	border-radius: 2px;
+	font-weight: 400;
+	cursor: pointer;
+	text-decoration: none
+}
+
+.layui-layer-btn a:hover {
+	opacity: .9;
+	text-decoration: none
+}
+
+.layui-layer-btn a:active {
+	opacity: .8
+}
+
+.layui-layer-btn .layui-layer-btn0 {
+	border-color: #4898d5;
+	background-color: #2e8ded;
+	color: #fff
+}
+
+.layui-layer-btn-l {
+	text-align: left
+}
+
+.layui-layer-btn-c {
+	text-align: center
+}
+
+.layui-layer-dialog {
+	min-width: 260px
+}
+
+.layui-layer-dialog .layui-layer-content {
+	position: relative;
+	padding: 20px;
+	line-height: 24px;
+	word-break: break-all;
+	overflow: hidden;
+	font-size: 14px;
+	overflow-x: hidden;
+	overflow-y: auto
+}
+
+.layui-layer-dialog .layui-layer-content .layui-layer-ico {
+	position: absolute;
+	top: 16px;
+	left: 15px;
+	_left: -40px;
+	width: 30px;
+	height: 30px
+}
+
+.layui-layer-ico1 {
+	background-position: -30px 0
+}
+
+.layui-layer-ico2 {
+	background-position: -60px 0
+}
+
+.layui-layer-ico3 {
+	background-position: -90px 0
+}
+
+.layui-layer-ico4 {
+	background-position: -120px 0
+}
+
+.layui-layer-ico5 {
+	background-position: -150px 0
+}
+
+.layui-layer-ico6 {
+	background-position: -180px 0
+}
+
+.layui-layer-rim {
+	border: 6px solid #8D8D8D;
+	border: 6px solid rgba(0, 0, 0, .3);
+	border-radius: 5px;
+	box-shadow: none
+}
+
+.layui-layer-msg {
+	min-width: 180px;
+	border: 1px solid #D3D4D3;
+	box-shadow: none
+}
+
+.layui-layer-hui {
+	min-width: 100px;
+	background-color: #000;
+	filter: alpha(opacity = 60);
+	background-color: rgba(0, 0, 0, .6);
+	color: #fff;
+	border: none
+}
+
+.layui-layer-hui .layui-layer-content {
+	padding: 12px 25px;
+	text-align: center
+}
+
+.layui-layer-dialog .layui-layer-padding {
+	padding: 20px 20px 20px 55px;
+	text-align: left
+}
+
+.layui-layer-page .layui-layer-content {
+	position: relative;
+	overflow: auto
+}
+
+.layui-layer-iframe .layui-layer-btn, .layui-layer-page .layui-layer-btn
+	{
+	padding-top: 10px
+}
+
+.layui-layer-nobg {
+	background: 0 0
+}
+
+.layui-layer-iframe iframe {
+	display: block;
+	width: 100%
+}
+
+.layui-layer-loading {
+	border-radius: 100%;
+	background: 0 0;
+	box-shadow: none;
+	border: none
+}
+
+.layui-layer-loading .layui-layer-content {
+	width: 60px;
+	height: 24px;
+	background: url(loading-0.gif) no-repeat
+}
+
+.layui-layer-loading .layui-layer-loading1 {
+	width: 37px;
+	height: 37px;
+	background: url(loading-1.gif) no-repeat
+}
+
+.layui-layer-ico16, .layui-layer-loading .layui-layer-loading2 {
+	width: 32px;
+	height: 32px;
+	background: url(loading-2.gif) no-repeat
+}
+
+.layui-layer-tips {
+	background: 0 0;
+	box-shadow: none;
+	border: none
+}
+
+.layui-layer-tips .layui-layer-content {
+	position: relative;
+	line-height: 22px;
+	min-width: 12px;
+	padding: 5px 10px;
+	font-size: 12px;
+	_float: left;
+	border-radius: 2px;
+	box-shadow: 1px 1px 3px rgba(0, 0, 0, .2);
+	background-color: #000;
+	color: #fff
+}
+
+.layui-layer-tips .layui-layer-close {
+	right: -2px;
+	top: -1px
+}
+
+.layui-layer-tips i.layui-layer-TipsG {
+	position: absolute;
+	width: 0;
+	height: 0;
+	border-width: 8px;
+	border-color: transparent;
+	border-style: dashed;
+	*overflow: hidden
+}
+
+.layui-layer-tips i.layui-layer-TipsB, .layui-layer-tips i.layui-layer-TipsT
+	{
+	left: 5px;
+	border-right-style: solid;
+	border-right-color: #000
+}
+
+.layui-layer-tips i.layui-layer-TipsT {
+	bottom: -8px
+}
+
+.layui-layer-tips i.layui-layer-TipsB {
+	top: -8px
+}
+
+.layui-layer-tips i.layui-layer-TipsL, .layui-layer-tips i.layui-layer-TipsR
+	{
+	top: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: #000
+}
+
+.layui-layer-tips i.layui-layer-TipsR {
+	left: -8px
+}
+
+.layui-layer-tips i.layui-layer-TipsL {
+	right: -8px
+}
+
+.layui-layer-lan[type=dialog] {
+	min-width: 280px
+}
+
+.layui-layer-lan .layui-layer-title {
+	background: #4476A7;
+	color: #fff;
+	border: none
+}
+
+.layui-layer-lan .layui-layer-btn {
+	padding: 5px 10px 10px;
+	text-align: right;
+	border-top: 1px solid #E9E7E7
+}
+
+.layui-layer-lan .layui-layer-btn a {
+	background: #BBB5B5;
+	border: none
+}
+
+.layui-layer-lan .layui-layer-btn .layui-layer-btn1 {
+	background: #C9C5C5
+}
+
+.layui-layer-molv .layui-layer-title {
+	background: #009f95;
+	color: #fff;
+	border: none
+}
+
+.layui-layer-molv .layui-layer-btn a {
+	background: #009f95
+}
+
+.layui-layer-molv .layui-layer-btn .layui-layer-btn1 {
+	background: #92B8B1
+}
+
+.layui-layer-iconext {
+	background: url(icon-ext.png) no-repeat
+}
+
+.layui-layer-prompt .layui-layer-input {
+	display: block;
+	width: 220px;
+	height: 30px;
+	margin: 0 auto;
+	line-height: 30px;
+	padding: 0 5px;
+	border: 1px solid #ccc;
+	box-shadow: 1px 1px 5px rgba(0, 0, 0, .1) inset;
+	color: #333
+}
+
+.layui-layer-prompt textarea.layui-layer-input {
+	width: 300px;
+	height: 100px;
+	line-height: 20px
+}
+
+.layui-layer-prompt .layui-layer-content {
+	padding: 20px
+}
+
+.layui-layer-prompt .layui-layer-btn {
+	padding-top: 0
+}
+
+.layui-layer-tab {
+	box-shadow: 1px 1px 50px rgba(0, 0, 0, .4)
+}
+
+.layui-layer-tab .layui-layer-title {
+	padding-left: 0;
+	border-bottom: 1px solid #ccc;
+	background-color: #eee;
+	overflow: visible
+}
+
+.layui-layer-tab .layui-layer-title span {
+	position: relative;
+	float: left;
+	min-width: 80px;
+	max-width: 260px;
+	padding: 0 20px;
+	text-align: center;
+	cursor: default;
+	overflow: hidden
+}
+
+.layui-layer-tab .layui-layer-title span.layui-layer-tabnow {
+	height: 43px;
+	border-left: 1px solid #ccc;
+	border-right: 1px solid #ccc;
+	background-color: #fff;
+	z-index: 10
+}
+
+.layui-layer-tab .layui-layer-title span:first-child {
+	border-left: none
+}
+
+.layui-layer-tabmain {
+	line-height: 24px;
+	clear: both
+}
+
+.layui-layer-tabmain .layui-layer-tabli {
+	display: none
+}
+
+.layui-layer-tabmain .layui-layer-tabli.xubox_tab_layer {
+	display: block
+}
+
+.xubox_tabclose {
+	position: absolute;
+	right: 10px;
+	top: 5px;
+	cursor: pointer
+}
+
+.layui-layer-photos {
+	-webkit-animation-duration: .8s;
+	animation-duration: .8s
+}
+
+.layui-layer-photos .layui-layer-content {
+	overflow: hidden;
+	text-align: center
+}
+
+.layui-layer-photos .layui-layer-phimg img {
+	position: relative;
+	width: 100%;
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	vertical-align: top
+}
+
+.layui-layer-imgbar, .layui-layer-imguide {
+	display: none
+}
+
+.layui-layer-imgnext, .layui-layer-imgprev {
+	position: absolute;
+	top: 50%;
+	width: 27px;
+	_width: 44px;
+	height: 44px;
+	margin-top: -22px;
+	outline: 0;
+	blr: expression(this.onFocus = this.blur ())
+}
+
+.layui-layer-imgprev {
+	left: 10px;
+	background-position: -5px -5px;
+	_background-position: -70px -5px
+}
+
+.layui-layer-imgprev:hover {
+	background-position: -33px -5px;
+	_background-position: -120px -5px
+}
+
+.layui-layer-imgnext {
+	right: 10px;
+	_right: 8px;
+	background-position: -5px -50px;
+	_background-position: -70px -50px
+}
+
+.layui-layer-imgnext:hover {
+	background-position: -33px -50px;
+	_background-position: -120px -50px
+}
+
+.layui-layer-imgbar {
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	width: 100%;
+	height: 32px;
+	line-height: 32px;
+	background-color: rgba(0, 0, 0, .8);
+	background-color: #000\9;
+	filter: Alpha(opacity = 80);
+	color: #fff;
+	overflow: hidden;
+	font-size: 0
+}
+
+.layui-layer-imgtit * {
+	display: inline-block;
+	*display: inline;
+	*zoom: 1;
+	vertical-align: top;
+	font-size: 12px
+}
+
+.layui-layer-imgtit a {
+	max-width: 65%;
+	overflow: hidden;
+	color: #fff
+}
+
+.layui-layer-imgtit a:hover {
+	color: #fff;
+	text-decoration: underline
+}
+
+.layui-layer-imgtit em {
+	padding-left: 10px;
+	font-style: normal
+}
+
+@
+-webkit-keyframes layer-bounceOut { 100%{
+	opacity: 0;
+	-webkit-transform: scale(.7);
+	transform: scale(.7)
+}
+
+30%{
+-webkit-transform
+:scale
+(1
+.05
+);transform
+:scale
+(1
+.05
+)
+}
+0%{
+-webkit-transform
+:scale(1)
+;transform
+:scale(1)
+}
+}
+@
+keyframes layer-bounceOut { 100%{
+	opacity: 0;
+	-webkit-transform: scale(.7);
+	-ms-transform: scale(.7);
+	transform: scale(.7)
+}
+
+30%{
+-webkit-transform
+:scale
+(1
+.05
+);-ms-transform
+:scale
+(1
+.05
+);transform
+:scale
+(1
+.05
+)
+}
+0%{
+-webkit-transform
+:scale(1)
+;-ms-transform
+:scale(1)
+;transform
+:scale(1)
+}
+}
+.layer-anim-close {
+	-webkit-animation-name: layer-bounceOut;
+	animation-name: layer-bounceOut;
+	-webkit-animation-duration: .2s;
+	animation-duration: .2s
+}
+
+@media screen and (max-width:1100px) {
+	.layui-layer-iframe {
+		overflow-y: auto;
+		-webkit-overflow-scrolling: touch
+	}
+}

+@charset "UTF-8";
+body .layer-ext-warning .layui-layer-title{
+	color: white;
+	background-color: red;
+}
+/* body .layui-ext-warning .layui-layer-btn{
+	
+}
+body .layui-ext-warning .layui-layer-btn a{
+	
+} */