1、调整分单件重顺序；

2、分单增加特货代码；
3、修改同一个公司对应多个地址会被覆盖的bug；
4、修改其它bug；
5、修改件重数据出现逗号的bug；

@@ -52,7 +52,6 @@ import com.agent.service.agent.PubDgService;
 import com.agent.service.agent.TBasCarrierService;
 import com.agent.service.agent.WaybillReceiptService;
 import com.agent.service.system.RoleService;
-import com.agent.smb.RemoteFileKit;
 import com.agent.util.HttpJsonMsg;
 import com.agent.vo.ResponseModel;
 import com.agent.vo.agent.CommodityVo;
@@ -81,7 +80,8 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.framework.core.Servlets;
 import com.framework.shiro.SessionUtil;
-import com.framework.util.CustomMessageKit;
+import com.framework.util.MessageKit;
+import com.framework.util.MessageType;
 import com.plugin.easyui.DataGrid;
 import com.plugin.easyui.EasyPage;
 
@@ -132,7 +132,7 @@ public class ManifestController extends BasicController {
 
 	@Resource
 	private ConsignorService consignorService;
-	
+
 	@Resource
 	private ConsigneeService consigneeService;
 
@@ -145,7 +145,7 @@ public class ManifestController extends BasicController {
 	 * @return
 	 */
 	@RequestMapping(value = "/list")
-	public String getList(HttpServletRequest request,Model model) {
+	public String getList(HttpServletRequest request, Model model) {
 		request.setAttribute("version", System.currentTimeMillis());
 		return "manifest/list";
 	}
@@ -820,8 +820,8 @@ public class ManifestController extends BasicController {
 		manifest.setCarrier(carrier);
 		manifest.setFlightno(flightno);
 
-		consigneeService.saveFromManifest(manifest, Tools.getUserId());
-		consignorService.saveFromManifest(manifest, Tools.getUserId());
+//		consigneeService.saveFromManifest(manifest, Tools.getUserId());
+//		consignorService.saveFromManifest(manifest, Tools.getUserId());
 
 		ResponseModel model = new ResponseModel();
 		try {
@@ -856,21 +856,24 @@ public class ManifestController extends BasicController {
 	@RequestMapping(value = "/backout")
 	@ResponseBody
 	public ResponseModel backout(HttpServletRequest request, Long id) {
-		ResponseModel model = new ResponseModel(1, null, "");
+		ResponseModel model = new ResponseModel(200, null, "");
 		ManifestEntity manifest = null;
 		try {
 			if (id != null) {
-				WaybillReceiptType type = WaybillReceiptType.DELETE;
 
 				manifest = manifestService.findOne((id));
-				String rootPath = request.getSession().getServletContext().getRealPath("/");
-				String path = rootPath + "/excel/manifest" + new Date().getTime() + ".xml"; // 获取生成报文路径
-				String ndlxml = XmlUtil.convertToXml2(manifestService.sendBackoutXml(manifest), path); // 转换报文
-				System.out.println(path);
-				System.out.println(ndlxml);
-				new RedisSaveMessage().saveMessage(ndlxml); // 发送
-				model.setStatus(200);
 
+				// String deletePath = MessageKit.getMessagePath(MessageType.DELETE);
+				// String deletexml =
+				// XmlUtil.convertToXml2(manifestService.sendBackoutXml(manifest), deletePath);
+				// // 转换报文
+				// System.out.println("===================deletexml===================");
+				// System.out.println(deletexml);
+
+				// new RedisSaveMessage().saveMessage(ndlxml);
+				// model.setStatus(200);
+
+				WaybillReceiptType type = WaybillReceiptType.DELETE;
 				manifest.setResponse_text("主单——" + type.getName());
 				manifest.setResponse_code(String.valueOf(type.getValue()));
 				manifestService.save(manifest);
@@ -919,8 +922,8 @@ public class ManifestController extends BasicController {
 		manifest.setCarrier(carrier);
 		manifest.setFlightno(flightno);
 
-		consigneeService.saveFromManifest(manifest, Tools.getUserId());
-		consignorService.saveFromManifest(manifest, Tools.getUserId());
+//		consigneeService.saveFromManifest(manifest, Tools.getUserId());
+//		consignorService.saveFromManifest(manifest, Tools.getUserId());
 
 		ResponseModel model = new ResponseModel();
 		try {
@@ -929,8 +932,8 @@ public class ManifestController extends BasicController {
 				model.setStatus(500);
 				model.setMsg("该订单号已存在！");
 			} else {
-				String responseCode = manifest.getResponse_code();
-				int resCode = NumKit.parseInt(responseCode);
+				// String responseCode = manifest.getResponse_code();
+				// int resCode = NumKit.parseInt(responseCode);
 				// WaybillReceiptType oldType = WaybillReceiptType.valueOf(resCode);
 				// WaybillReceiptType type = oldType != null ? WaybillReceiptType.UPDATE :
 				// WaybillReceiptType.APPLY;
@@ -947,18 +950,16 @@ public class ManifestController extends BasicController {
 				receiptService.saveFromManifest(manifest, type);
 
 				// 生成报文并且发送
-				// String rootPath = request.getSession().getServletContext().getRealPath("/");
-				// String path = rootPath + "/excel/manifest" + new Date().getTime() + ".xml";
-				String ndlrPath = CustomMessageKit.getMessagePath("ndlr");
-				String dlcPath = CustomMessageKit.getMessagePath("dlc");
-				String sliPath = CustomMessageKit.getMessagePath("sli");
+				String ndlrPath = MessageKit.getMessagePath(MessageType.NDLR);
+				String dlcPath = MessageKit.getMessagePath(MessageType.DLCF);
+				String sliPath = MessageKit.getMessagePath(MessageType.SLI);
 
 				String ndlrxml = XmlUtil.convertToXml2(manifestService.sendNDLRXml(manifest), ndlrPath);
 				String dlcfxml = XmlUtil.convertToXml2(manifestService.sendDLCFXml(manifest), dlcPath);
 				String slifxml = XmlUtil.convertToXml2(FSXmlKit.sliXml(manifest), sliPath);
 
-				RemoteFileKit.putFile(ndlrPath);
-				RemoteFileKit.putFile(dlcPath);
+				// RemoteFileKit.putFile(ndlrPath);
+				// RemoteFileKit.putFile(dlcPath);
 				// RemoteFileKit.putFile(sliPath);
 
 				System.err.println("===================ndlrxml===================");
@@ -1070,8 +1071,8 @@ public class ManifestController extends BasicController {
 		preparesecondary.setCarrier(carrier);
 		preparesecondary.setFlightno(flightno);
 
-		consigneeService.saveFromPreparesecondary(preparesecondary, Tools.getUserId());
-		consignorService.saveFromPreparesecondary(preparesecondary, Tools.getUserId());
+//		consigneeService.saveFromPreparesecondary(preparesecondary, Tools.getUserId());
+//		consignorService.saveFromPreparesecondary(preparesecondary, Tools.getUserId());
 
 		ResponseModel model = new ResponseModel();
 		try {
@@ -1106,18 +1107,20 @@ public class ManifestController extends BasicController {
 			PreparesecondaryEntity preparesecondary = preparesecondaryServer.findOne(id);
 			if (preparesecondary != null) {
 				try {
-					WaybillReceiptType type = WaybillReceiptType.DELETE;
 
-					String rootPath = request.getSession().getServletContext().getRealPath("/");
-					String path = rootPath + "/excel/manifest" + new Date().getTime() + ".xml";
-					String ndlrxml = XmlUtil.convertToXml2(manifestService.backoutpresenddlcfNdlrXml(preparesecondary),
-							path);
+					// String rootPath = request.getSession().getServletContext().getRealPath("/");
+					// String path = rootPath + "/excel/manifest" + new Date().getTime() + ".xml";
+					// String ndlrxml =
+					// XmlUtil.convertToXml2(manifestService.backoutpresenddlcfNdlrXml(preparesecondary),
+					// path);
 					// String dlcfxml =
 					// XmlUtil.convertToXml2(manifestService.presenddlcfdlcfXml(preparesecondary),
 					// path);
 
 					// System.out.println(ndlrxml);
-					new RedisSaveMessage().saveMessage(ndlrxml);
+					// new RedisSaveMessage().saveMessage(ndlrxml);
+
+					WaybillReceiptType type = WaybillReceiptType.DELETE;
 					preparesecondary.setResponse_text("分单——" + type.getName());
 					preparesecondary.setResponse_code(String.valueOf(type.getValue()));
 					preparesecondaryServer.save(preparesecondary);
@@ -1150,8 +1153,8 @@ public class ManifestController extends BasicController {
 		preparesecondary.setCarrier(carrier);
 		preparesecondary.setFlightno(flightno);
 
-		consigneeService.saveFromPreparesecondary(preparesecondary, Tools.getUserId());
-		consignorService.saveFromPreparesecondary(preparesecondary, Tools.getUserId());
+//		consigneeService.saveFromPreparesecondary(preparesecondary, Tools.getUserId());
+//		consignorService.saveFromPreparesecondary(preparesecondary, Tools.getUserId());
 
 		ResponseModel model = new ResponseModel();
 		try {
@@ -1176,18 +1179,16 @@ public class ManifestController extends BasicController {
 				receiptService.saveFromPreparesecondary(preparesecondary, type);
 
 				// 生成报文并且发送
-				// String rootPath = request.getSession().getServletContext().getRealPath("/");
-				// String path = rootPath + "/excel/manifest" + new Date().getTime() + ".xml";
-				String ndlrPath = CustomMessageKit.getMessagePath("ndlr");
-				String dlcPath = CustomMessageKit.getMessagePath("dlc");
-				String fhlPath = CustomMessageKit.getMessagePath("fhl");
+				String ndlrPath = MessageKit.getMessagePath(MessageType.NDLR);
+				String dlcPath = MessageKit.getMessagePath(MessageType.DLCF);
+				String fhlPath = MessageKit.getMessagePath(MessageType.FHL);
 
 				String ndlrxml = XmlUtil.convertToXml2(manifestService.presenddlcfNdlrXml(preparesecondary), ndlrPath);
 				String dlcfxml = XmlUtil.convertToXml2(manifestService.presenddlcfdlcfXml(preparesecondary), dlcPath);
 				String fhlfxml = XmlUtil.convertToXml2(FSXmlKit.fhlXml(preparesecondary), fhlPath);
 
-				RemoteFileKit.putFile(ndlrPath);
-				RemoteFileKit.putFile(dlcPath);
+				// RemoteFileKit.putFile(ndlrPath);
+				// RemoteFileKit.putFile(dlcPath);
 				// RemoteFileKit.putFile(fhlPath);
 
 				// 发送redis储存数据

@@ -290,7 +290,7 @@ public class ManifestEntity extends BasicEntity implements Serializable {
 	private Long USER_ID; // 报文所属的用户id
 
 	public String getUnlodingcode() {
-		return unlodingcode;
+		return StringUtils.isBlank(unlodingcode)?getDestinationstation():unlodingcode;
 	}
 
 	public void setUnlodingcode(String unlodingcode) {
@@ -537,7 +537,7 @@ public class ManifestEntity extends BasicEntity implements Serializable {
 
 	@Column(name = "PREPARETOTALPIECE")
 	public String getPreparetotalpiece() {
-		return preparetotalpiece;
+		return StringUtils.isBlank(preparetotalpiece)?getTotalpiece():preparetotalpiece;
 	}
 
 	public void setPreparetotalpiece(String preparetotalpiece) {
@@ -546,7 +546,7 @@ public class ManifestEntity extends BasicEntity implements Serializable {
 
 	@Column(name = "PREPARETOTALWEIGHT")
 	public String getPreparetotalweight() {
-		return preparetotalweight;
+		return StringUtils.isBlank(preparetotalweight)?getTotalweight():preparetotalweight;
 	}
 
 	public void setPreparetotalweight(String preparetotalweight) {
@@ -879,7 +879,7 @@ public class ManifestEntity extends BasicEntity implements Serializable {
 
 	@Column(name = "REACH_STATION")
 	public String getReach_station() {
-		return reach_station;
+		return StringUtils.isBlank(reach_station)?getDestinationstation():reach_station;
 	}
 
 	public void setReach_station(String reach_station) {

@@ -299,7 +299,7 @@ public class PreparesecondaryEntity extends BasicEntity {
 	private Long USER_ID;
 
 	public String getUnlodingcode() {
-		return unlodingcode;
+		return StringUtils.isBlank(unlodingcode)?getDestinationstation():unlodingcode;
 	}
 
 	public void setUnlodingcode(String unlodingcode) {
@@ -538,7 +538,7 @@ public class PreparesecondaryEntity extends BasicEntity {
 
 	@Column(name = "PREPAREPIECE")
 	public String getPreparepiece() {
-		return preparepiece;
+		return StringUtils.isBlank(preparepiece)?getTotalpiece():preparepiece;
 	}
 
 	public void setPreparepiece(String preparepiece) {
@@ -547,7 +547,7 @@ public class PreparesecondaryEntity extends BasicEntity {
 
 	@Column(name = "PREPAREWEIGHT")
 	public String getPrepareweight() {
-		return prepareweight;
+		return StringUtils.isBlank(prepareweight)?getTotalweight():prepareweight;
 	}
 
 	public void setPrepareweight(String prepareweight) {
@@ -916,7 +916,7 @@ public class PreparesecondaryEntity extends BasicEntity {
 
 	@Column(name = "REACH_STATION")
 	public String getReach_station() {
-		return reach_station;
+		return StringUtils.isBlank(reach_station)?getDestinationstation():reach_station;
 	}
 
 	public void setReach_station(String reach_station) {

@@ -19,7 +19,8 @@ import com.agent.service.BasicService;
 import com.agent.smb.RemoteFileKit;
 import com.agent.xml.common.XmlUtil;
 import com.agent.xml.manifestdeclare.DeclareXmlBody;
-import com.framework.util.CustomMessageKit;
+import com.framework.util.MessageKit;
+import com.framework.util.MessageType;
 import com.google.common.base.Splitter;
 
 import tools.Tools;
@@ -126,9 +127,14 @@ public class WaybillReceiptService extends BasicService<WaybillReceiptEntity> {
 			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);
+				String dpxbPath = MessageKit
+						.getMessagePath(type != WaybillReceiptType.DELETE ? MessageType.RECEIPT : MessageType.DELETE);
+				String deletexml = XmlUtil.convertToXml2(dpxb, dpxbPath);
+				if (type == WaybillReceiptType.DELETE) {
+					System.out.println("===================deletexml===================");
+					System.out.println(deletexml);
+					RemoteFileKit.putFile(dpxbPath);
+				}
 			}
 		}
 	}
@@ -160,9 +166,15 @@ public class WaybillReceiptService extends BasicService<WaybillReceiptEntity> {
 			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);
+				String dpxbPath = MessageKit
+						.getMessagePath(type != WaybillReceiptType.DELETE ? MessageType.RECEIPT : MessageType.DELETE);
+				String deletexml = XmlUtil.convertToXml2(dpxb, dpxbPath);
+				if (type == WaybillReceiptType.DELETE) {
+					System.out.println("===================deletexml===================");
+					System.out.println(deletexml);
+
+					RemoteFileKit.putFile(dpxbPath);
+				}
 			}
 		} else {
 			System.err.println("prepare is null");

@@ -8,7 +8,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import com.framework.util.CustomMessageKit;
+import com.framework.util.MessageKit;
 
 import jcifs.smb.SmbFile;
 import jcifs.smb.SmbFileOutputStream;
@@ -24,7 +24,7 @@ import jcifs.smb.SmbFileOutputStream;
  * 
  */
 public class RemoteFileKit {
-	private static final String REMOTE_DIR = CustomMessageKit.getMessageSmbRemoteDir();
+	private static final String REMOTE_DIR = MessageKit.getMessageSmbRemoteDir();
 
 	public RemoteFileKit() {
 	}

@@ -4,11 +4,15 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
+import javax.annotation.Resource;
+
 import org.apache.commons.lang.StringUtils;
 
 import com.agent.entity.Constant;
+import com.agent.entity.agent.BasicAgentEntity;
 import com.agent.entity.agent.ManifestEntity;
 import com.agent.entity.agent.PreparesecondaryEntity;
+import com.agent.service.agent.BasicAgentService;
 import com.agent.xml.fhlsli.common.ApplicableFreightRateServiceCharge;
 import com.agent.xml.fhlsli.common.ArrivalEvent;
 import com.agent.xml.fhlsli.common.AssociatedParty;
@@ -49,6 +53,8 @@ import com.agent.xml.fhlsli.sli.IncludedMasterConsignmentItem;
 import com.agent.xml.fhlsli.sli.ReportedStatus;
 import com.agent.xml.fhlsli.sli.SliMasterConsignment;
 
+import tools.Tools;
+
 /**
  * Depiction:给天信达用
  * <p>
@@ -60,6 +66,25 @@ import com.agent.xml.fhlsli.sli.SliMasterConsignment;
  * 
  */
 public class FSXmlKit {
+	
+	@Resource
+	private static BasicAgentService agentService;
+	
+	private static BasicAgentEntity getAgent() {
+		BasicAgentEntity agent = agentService.findOne(Tools.getUserId());
+		if(agent==null) {
+			agent = new BasicAgentEntity();
+		}
+		if(StringUtils.isBlank(agent.getThreeCode())){
+			agent.setThreeCode("");
+		}
+		
+		if(StringUtils.isBlank(agent.getNameCn())){
+			agent.setNameCn("");
+		}
+		
+		return agent;
+	}
 
 	private static String getDateWithZone() {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.CHINA);
@@ -128,7 +153,8 @@ public class FSXmlKit {
 		sliMasterConsignment.setConsigneeParty(consigneeParty);
 
 		FreightForwarderParty freightForwarderParty = new FreightForwarderParty();
-		freightForwarderParty.setName(me.getAgentman());
+//		freightForwarderParty.setPrimaryID(getAgent().getThreeCode());//代理人代码
+//		freightForwarderParty.setName(getAgent().getNameEn());//代理人名称
 		PostalStructuredAddress agentdAddress = new PostalStructuredAddress();
 		agentdAddress.setCityName("");
 		agentdAddress.setCountryID("");
@@ -136,7 +162,9 @@ public class FSXmlKit {
 		sliMasterConsignment.setFreightForwarderParty(freightForwarderParty);
 
 		AssociatedParty associatedParty = new AssociatedParty();
-		associatedParty.setName(me.getAgentcompany());
+		
+		associatedParty.setPrimaryID(getAgent().getThreeCode());//代理人代码
+		associatedParty.setName(getAgent().getNameEn());//代理人名称
 		associatedParty.setPostalStructuredAddress(agentdAddress);
 		sliMasterConsignment.setAssociatedParty(associatedParty);
 
@@ -184,9 +212,9 @@ public class FSXmlKit {
 
 		HandlingInstructions handlingInstructions = new HandlingInstructions();
 		//特货代码
-//		handlingInstructions.setDescriptionCode(me.getSpecialgoodscode()!=null?me.getSpecialgoodscode():"");
+		handlingInstructions.setDescriptionCode(me.getSpecialgoodscode()!=null?me.getSpecialgoodscode():"");
 		//特货描述
-//		handlingInstructions.setDescription(me.getSpecialgoods);
+		handlingInstructions.setDescription("");
 		sliMasterConsignment.setHandlingInstructions(handlingInstructions);
 
 		AssociatedReferenceDocument associatedReferenceDocument = new AssociatedReferenceDocument();
@@ -346,7 +374,9 @@ public class FSXmlKit {
 		includedHouseConsignment.setConsigneeParty(consigneeParty);
 
 		FreightForwarderParty freightForwarderParty = new FreightForwarderParty();
-		freightForwarderParty.setName(pe.getAgentman());
+//		freightForwarderParty.setPrimaryID(getAgent().getThreeCode());//代理人代码
+//		freightForwarderParty.setName(getAgent().getNameEn());//代理人名称
+		
 		PostalStructuredAddress agentdAddress = new PostalStructuredAddress();
 		agentdAddress.setCityName("");
 		agentdAddress.setCountryID("");
@@ -354,7 +384,8 @@ public class FSXmlKit {
 		includedHouseConsignment.setFreightForwarderParty(freightForwarderParty);
 
 		AssociatedParty associatedParty = new AssociatedParty();
-		associatedParty.setName(pe.getAgentcompany());
+		associatedParty.setPrimaryID(getAgent().getThreeCode());//代理人代码
+		associatedParty.setName(getAgent().getNameEn());//代理人名称
 		associatedParty.setPostalStructuredAddress(agentdAddress);
 		includedHouseConsignment.setAssociatedParty(associatedParty);
 
@@ -400,8 +431,8 @@ public class FSXmlKit {
 		includedHouseConsignment.setSpecifiedLogisticsTransportMovement(transport);
 
 		HandlingInstructions handlingInstructions = new HandlingInstructions();
-		handlingInstructions.setDescriptionCode(pe.getSpecialgoodscode());
-		handlingInstructions.setDescription(pe.getSpecialgoodscode());
+		handlingInstructions.setDescriptionCode(pe.getSpecialgoodscode());//特货代码
+//		handlingInstructions.setDescription(pe.getSpecialgoodscode());//特货描述
 		includedHouseConsignment.setHandlingInstructions(handlingInstructions);
 
 		IncludedAccountingNote includedAccountingNote = new IncludedAccountingNote();

@@ -13,7 +13,7 @@ import java.util.Date;
  * Create Date：2018年6月7日 下午3:45:16
  * 
  */
-public class CustomMessageKit {
+public class MessageKit {
 
 	// smb://mrz:vmvnv1v2VV@10.50.3.61/nms_customs_xml2/
 	public static String getMessageSmbRemoteDir() {
@@ -30,8 +30,8 @@ public class CustomMessageKit {
 		return sb.toString();
 	}
 
-	public static String getMessageLocalDir() {
-		String dirPath = PropertiesLoader.get("custom.message.localdir", "/application.properties");
+	public static String getMessageLocalDir(MessageType type) {
+		String dirPath = PropertiesLoader.get("custom.message.localdir." + type.getName(), "/application.properties");
 		File dir = new File(dirPath);
 		if (dir == null || !dir.exists()) {
 			dir.mkdirs();
@@ -39,14 +39,10 @@ public class CustomMessageKit {
 		return dirPath;
 	}
 
-	public static String getMessagePath(String prefix) {
-		return getMessageLocalDir() + "/" + prefix + "_" + getMessageName();
+	public static String getMessagePath(MessageType type) {
+		return getMessageLocalDir(type) + "/" + getMessageName();
 	}
 
-//	public static String getMessagePath() {
-//		return getMessageLocalDir() + "/" + getMessageName();
-//	}
-
 	public static String getMessageName() {
 		return "CN_MT2201_1P0_4604_70678920X_" + TimeUtils.getDate(new Date(), "yyyyMMddHHmmssSSS") + ".xml";
 	}

+package com.framework.util;
+
+/**
+ * Depiction:报文类型
+ * <p>
+ * Modify:
+ * <p>
+ * Author: Kevin Lynn
+ * <p>
+ * Create Date：2018年2月13日 上午11:53:15
+ * 
+ */
+public enum MessageType {
+	NDLR("ndlr", 1), DLCF("dlcf", 2), SLI("sli", 3), FHL("fhl", 4), RECEIPT("receipt", 5),DELETE("delete", 6);;
+
+	private String name;
+	private int value;
+
+	private MessageType(String name, int value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public static String getName(int value) {
+		for (MessageType role : MessageType.values()) {
+			if (role.getValue() == value) {
+				return role.name;
+			}
+		}
+		return null;
+	}
+
+	public static MessageType valueOf(int value) {
+		for (MessageType role : MessageType.values()) {
+			if (role.getValue() == value) {
+				return role;
+			}
+		}
+		return null;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public int getValue() {
+		return value;
+	}
+
+	public void setValue(int value) {
+		this.value = value;
+	}
+
+	@Override
+	public String toString() {
+		return "(" + this.value + "," + this.name + ")";
+	}
+}

@@ -27,7 +27,12 @@ service.xquery=BA8EC
 #custom.message.localdir=/Users/Kevin/Desktop/agent/message
 
 #server
-custom.message.localdir=/home/agent_xml
+custom.message.localdir.receipt=/home/agent_xml/receipt
+custom.message.localdir.ndlr=/home/agent_xml/ndlr
+custom.message.localdir.dlcf=/home/agent_xml/dlcf
+custom.message.localdir.sli=/home/agent_xml/sli
+custom.message.localdir.fhl=/home/agent_xml/fhl
+custom.message.localdir.delete=/home/agent_xml/delete
 
 custom.message.username=mrz
 custom.message.password=vmvnv1v2VV

@@ -14,9 +14,9 @@
 <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="menu.consignee_info_set" /></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>
+<script type="text/javascript" src="<%=basePath%>resource/easyui/jquery.min.js?version=${version}"></script>
+<script type="text/javascript" src="<%=basePath%>resource/validate/jquery.validate.js?version=${version}"></script>
+<script type="text/javascript" src="<%=basePath%>resource/validate/validate-extends.js?version=${version}"></script>
 <!-- validate 验证中英文 -->
 <script type="text/javascript"
 	src="<%=basePath %>resource/validate/jquery.validate-${pageContext.response.locale}.js?version=${version}"></script>
@@ -29,11 +29,11 @@
 <link rel="stylesheet" href="<%=basePath%>resource/easyui/uimaker/easyui.css?version=${version}">
 
 <style type="text/css">
-.required_span {
-	color: red;
-	margin-left: 10px;
-	font-size: 20px;
-}
+	.required_span {
+		color: red;
+		margin-left: 10px;
+		font-size: 20px;
+	}
 </style>
 </head>
 <body>
@@ -45,38 +45,28 @@
 				<tbody>
 					<tr>
 						<td><spring:message code="manifest.company" /><span class="required_span">*</span></td>
-						<td colspan="5">
-							<input type="text" name="name" id="name" maxlength="70" lay-verify="required"
-									value="${consignee.name}" autocomplete="off" class="layui-input" required
-									oninput="onInputChange(event,'name','oninput')" lay-verify="required"
-									onpropertychange="onInputChange(event,'name','onpropertychange')">
-						</td>
+						<td colspan="5"><input type="text" name="name" id="name" maxlength="70"
+								value="${consignee.name}" autocomplete="off" class="layui-input" required lay-verify="required"
+									oninput="onInputChange(event,'name','oninput')"
+									onpropertychange="onInputChange(event,'name','onpropertychange')"></td>
 					</tr>
 	
 					<tr>
 						<td><spring:message code="manifest.shr.name" /><span class="required_span">*</span></td>
-						<td>
-							<input type="text" name="code" id="code" value="${consignee.code}" 
-								maxlength="70" autocomplete="off" class="layui-input" required lay-verify="required"
+						<td><input type="text" id="code" name="code" value="${consignee.code}" maxlength="70"
+								autocomplete="off" class="layui-input" required lay-verify="required"
 								oninput="onInputChange(event,'code','oninput')"
-								onpropertychange="onInputChange(event,'code','onpropertychange')">
-						</td>
-						
+								onpropertychange="onInputChange(event,'code','onpropertychange')"></td>
 						<td><spring:message code="manifest.telephone" /></td>
-						<td>
-							<input type="text" name="tel" id="tel" value="${consignee.tel}" 
-							autocomplete="off" class="layui-input" maxlength="50"
-							oninput="onInputChange(event,'tel','oninput')"
-							onpropertychange="onInputChange(event,'tel','onpropertychange')">
-						</td>
-						
+						<td><input type="text" name="tel" id="tel"
+								oninput="onInputChange(event,'tel','oninput')"
+								onpropertychange="onInputChange(event,'tel','onpropertychange')"
+								value="${consignee.tel}" autocomplete="off" class="layui-input" maxlength="50"></td>
 						<td><spring:message code="manifest.fax" /></td>
-						<td>
-							<input type="text" name="fax" id="fax" value="${consignee.fax}" 
-							oninput="onInputChange(event,'fax','oninput')"
-							onpropertychange="onInputChange(event,'fax','onpropertychange')"
-							autocomplete="off" class="layui-input" maxlength="50">
-						</td>
+						<td><input type="text" name="fax" id="fax"  value="${consignee.fax}"
+								autocomplete="off" class="layui-input" maxlength="50"
+								oninput="onInputChange(event,'fax','oninput')"
+								onpropertychange="onInputChange(event,'fax','onpropertychange')"></td>
 					</tr>
 	
 					<tr>
@@ -84,65 +74,46 @@
 						<td>
 							<input required lay-verify="required" class="layui-input"
 									id="country" name="country" maxlength="2" type="text"
-									<c:if test="${empty consignee.country}">value=""</c:if>
+									<c:if test="${empty consignee.country}">value="CN"</c:if>
 									<c:if test="${not empty consignee.country}">value="${consignee.country}"</c:if> 
 									oninput="onInputChange(event,'country','oninput')"
-									onpropertychange="onInputChange(event,'country','onpropertychange')">		
+									onpropertychange="onInputChange(event,'country','onpropertychange')">
 						</td>
-						
 						<td><spring:message code="manifest.city" /><span class="required_span">*</span></td>
 						<td>
-							<input required type="text" name="city" id="city" value="${consignee.city}" 
-								autocomplete="off" class="layui-input" required lay-verify="required" maxlength="70"
-								oninput="onInputChange(event,'city','oninput')"
-								onpropertychange="onInputChange(event,'city','onpropertychange')">
+							<input type="text" name="city" id="city" value="${consignee.city}" 
+							autocomplete="off" class="layui-input" required maxlength="35" lay-verify="required"
+							oninput="onInputChange(event,'city','oninput')"
+							onpropertychange="onInputChange(event,'city','onpropertychange')">
 						</td>
-						
 						<td><spring:message code="manifest.zip.code" /></td>
-						<td>
-							<input type="text" name="zipcode" id="zipcode" value="${consignee.zipcode}" 
-							oninput="onInputChange(event,'zipcode','oninput')"
-							onpropertychange="onInputChange(event,'zipcode','onpropertychange')"
-							autocomplete="off" class="layui-input" maxlength="9">
-						</td>
+						<td><input type="text" name="zipcode" id="zipcode" value="${consignee.zipcode}"
+								oninput="onInputChange(event,'zipcode','oninput')"
+								onpropertychange="onInputChange(event,'zipcode','onpropertychange')"
+								autocomplete="off" class="layui-input" maxlength="9"></td>
 					</tr>
-	
+					
 					<tr>
 						<td><spring:message code="manifest.address" /><span class="required_span">*</span></td>
-						<td colspan="2">
-							<input required type="text" name="address" id="address" value="${consignee.address}" 
-								autocomplete="off" class="layui-input" maxlength="70" lay-verify="required"
+						<td colspan="2"><input id="address" required type="text" name="address" lay-verify="required"
+								value="${consignee.address}" autocomplete="off" class="layui-input" maxlength="70"
 								oninput="onInputChange(event,'address','oninput')"
-								onpropertychange="onInputChange(event,'address','onpropertychange')">
-						</td>
-						
+								onpropertychange="onInputChange(event,'address','onpropertychange')"></td>
 						<td><spring:message code="manifest.shr.cneaeo" /></td>
-						<td colspan="2">
-							<input type="text" name="aeo" id="cneaeo"
+						<td colspan="2"><input type="text" name="aeo" id="aeo"
 								value="${consignee.aeo}" autocomplete="off" class="layui-input" maxlength="20" 
-								oninput="onInputChange(event,'cneaeo','oninput')"
-								onpropertychange="onInputChange(event,'cneaeo','onpropertychange')">
-						</td>
+								oninput="onInputChange(event,'aeo','oninput')"
+								onpropertychange="onInputChange(event,'aeo','onpropertychange')"></td>
 					</tr>
 	
-					<%-- <tr>
-						<td><spring:message code="manifest.enterprise.code" /><span class="required_span">*</span></td>
-						<td>
-							<input required id="cnecusid" type="text" name="cusid" value="${consignee.cusid}"
-								autocomplete="off" class="layui-input" maxlength="128" lay-verify="required"
-								oninput="onInputChange(event,'cnecusid','oninput')"
-								onpropertychange="onInputChange(event,'cnecusid','onpropertychange')">
-						</td>
-					</tr> --%>
-					
 					<tr>
 							<td colspan="6">
 							<div class="layui-row">
 								<div class="layui-col-md2">
-									<select id="cne_cusid" required lay-verify="required">
+									<select id="co_cusid" required lay-verify="required">
 										<c:if test="${not empty consignee.cusid}">
-											<c:set var="tempCneType" value='${fn:split(consignee.cusid,"+")[0]}' />
-											<option value="${tempCneType}">${tempCneType}</option>
+											<c:set var="tempShpType" value='${fn:split(consignee.cusid,"+")[0]}' />
+											<option value="${tempShpType}">${tempShpType}</option>
 										</c:if>
 										
 										<c:if test="${empty consignee.cusid}">
@@ -154,19 +125,20 @@
 									<span style="color: black; font-size: 16px;">+</span>
 								</div>
 								<div class="layui-col-md5">
-									<input id="cnecusid"  type="text" maxlength="100" class="layui-input" required lay-verify="required"
+									<input id="cusid"  type="text" maxlength="100" class="layui-input" required lay-verify="required"
 										<c:if test="${not empty consignee.cusid}">
-											<c:set var="tempCneValue" value='${fn:split(consignee.cusid,"+")[1]}' />
-											value="${tempCneValue}"
+											<c:set var="tempShpValue" value='${fn:split(consignee.cusid,"+")[1]}' />
+											value="${tempShpValue}"
 										</c:if>
 										
 										placeholder="<spring:message code='manifest.enterprise.code' />"
-										oninput="onInputChange(event,'cnecusid','oninput')"
-										onpropertychange="onInputChange(event,'cnecusid','onpropertychange')">
+										oninput="onInputChange(event,'cusid','oninput')"
+										onpropertychange="onInputChange(event,'cusid','onpropertychange')">
 								</div>
 							</div>
 							</td>
 						</tr>
+						
 				</tbody>
 			</table>
 	
@@ -181,7 +153,7 @@
 	</div>
 
 	<script>
-	var api = "<%=basePath %>enterprise/search";
+	 var api = "<%=basePath %>enterprise/search";
 	 $('#country').combogrid({
 			panelWidth:260,
 			url: api,
@@ -196,7 +168,7 @@
 			    	 	$('#country').combogrid('setValue',upper);
 			        parm.start = upper;
 			        
-			        onGetData('cne_cusid','country');
+			        onGetData('co_cusid','country');
 			        return true;  
 			       }  
 			     return false;  
@@ -205,7 +177,7 @@
 				 //当用户选择一个列表项时触发。
 		    	 		$('#country').combogrid('setValue',rowData.country_code);
 		    	 		
-		    	 		onGetData('cne_cusid','country');
+		    	 		onGetData('co_cusid','country');
 		     },
 			columns:[[
 				{field:'name_cn',title:'名称',width:106},
@@ -214,18 +186,18 @@
 		});
 	 
 	 function onGetData(selectId,inputId) {
-		 var cneType = "";
-		 var cne_cusid = "${consignee.cusid}";
-		 if(notEmpty(cne_cusid)){
-			 cneType = cne_cusid.split("+")[0];
+		 var shpType = "";
+		 var shp_cusid = "${consignee.cusid}";
+		 if(notEmpty(shp_cusid)){
+			 shpType = shp_cusid.split("+")[0];
 		 }
 		 
 		 var select = $("#"+selectId);
 		 select.html("");
 		 select.append("<option value=''><spring:message code='manifest.enterprise.code.type' /></option>");
 		 
-	 	 var countryCode = $('#'+inputId).combobox('getValue');
-	 	
+ 	 	 var countryCode = $('#'+inputId).combobox('getValue');
+ 	 	
 		 $.ajax({
 				url:"<%=basePath%>/enterprise/list?countryCode="+countryCode,
 				success:function(data){
@@ -233,7 +205,7 @@
 						if(data.data){
 							for(var i = 0; i < data.data.length; i++){
 								var type = data.data[i].enterprise_type;
-								if(notEmpty(cneType)&&type&&(type==cneType)){
+								if(notEmpty(shpType)&&type&&(type==shpType)){
 									select.append("<option selected value='"+type+"'>"+type+"</option>");
 								}else{
 									select.append("<option value='"+type+"'>"+type+"</option>");
@@ -248,19 +220,29 @@
 				}
 		});
 	}
-		
+	
 		var layer;
 		layui.use('layer', function() {
 			layer = layui.layer;
 		});
 
-		$(window).load(function() {
-		});
-		
 		layui.use('form', function() {
 			var form = layui.form;
 			
 			form.on('submit(formDemo)', function(data){
+				var phone = data.field.tel;
+				var fax = data.field.fax;
+				if(isEmpty(phone)&&isEmpty(fax)){
+					layer.msg("电话和传真必须填写一项!");
+					return false;
+				}
+				
+				var country = data.field.country;
+				if(isEmpty(country)){
+					layer.msg("请选择国家");
+					return false;
+				}
+				
 			    save(data.field);
 			    return false;
 			});
@@ -274,15 +256,12 @@
 			if (data.id) {
 				params += "&id=" + data.id;
 			}
-			if (data.cusid) {
-				params += "&cusid=" + data.cusid;
-			}
 			
-			var cusid_type = getSelectedValue("cne_cusid");
-	       	var cusid = $("#cnecusid").val();
+			var shp_cusid_type = getSelectedValue("co_cusid");
+	       	var sh_cusid = $("#cusid").val();
 			
-			if(notEmpty(cusid_type)&&notEmpty(cusid)){
-				cusid = cusid_type+"+"+cusid;
+			if(notEmpty(shp_cusid_type)&&notEmpty(sh_cusid)){
+	       		cusid = shp_cusid_type+"+"+sh_cusid;
 	       		params+="&cusid="+encodeURIComponent(cusid);
 	       	}
 			
@@ -304,15 +283,15 @@
 			if (data.country) {
 				params += "&country=" + data.country;
 			}
-			if (data.provincecode) {
-				params += "&provincecode=" + data.provincecode;
-			}
 			if (data.tel) {
 				params += "&tel=" + data.tel;
 			}
 			if (data.fax) {
 				params += "&fax=" + data.fax;
 			}
+			if (data.provincecode) {
+				params += "&provincecode=" + data.provincecode;
+			}
 			
 			$.post(url, params, function(response, status) {
 				if (response.status == 200) {

@@ -236,6 +236,13 @@
 					layer.msg("电话和传真必须填写一项!");
 					return false;
 				}
+				
+				var country = data.field.co_country;
+				if(isEmpty(country)){
+					layer.msg("请选择国家");
+					return false;
+				}
+				
 			    save(data.field);
 			    return false;
 			});

@@ -524,13 +524,17 @@
 						</tr>
 						
 						<tr>
-							<td colspan="6">
+							<td colspan="2">
 								<div class="opt-buttons" style="padding-top: 20px;" id="divsubmit">
 									<button type="submit" class="easyui-linkbutton l-btn l-btn-small l-btn-selected "
 										data-options="selected:true">
 										<span class="l-btn-left"><span class="l-btn-text"><spring:message
 													code="opt.temsave" /></span></span>
 									</button>
+								</div>
+							</td>
+							<td colspan="4" align="right">
+								<div class="opt-buttons" style="padding-top: 20px;text-align: right;" id="divsubmit">
 									<a onclick="savesend()" class="easyui-linkbutton l-btn l-btn-small l-btn-selected "
 										data-options="selected:true">
 										<span class="l-btn-left"><span class="l-btn-text"><spring:message
@@ -813,7 +817,13 @@ $(function(){
 			    	 	$('#co_country').combogrid('setValue',upper);
 			        parm.start = upper;
 			        
-			        onGetData('co_cusid','co_country');
+			        var defaultValue = "";
+			        var cusid = "${manifest.shpcusid}";
+					 if(notEmpty(cusid)){
+						 defaultValue = cusid.split("+")[0];
+					 }
+			        onGetData(true,defaultValue,upper);
+			        
 			        return true;  
 			       }  
 			     return false;  
@@ -822,7 +832,7 @@ $(function(){
 				 //当用户选择一个列表项时触发。
 		    	 		$('#co_country').combogrid('setValue',rowData.country_code);
 		    	 		
-		    	 		onGetData('co_cusid','co_country');
+		    	 		onGetData(true,"",rowData.country_code);
 		     },
 			columns:[[
 				{field:'name_cn',title:'名称',width:106},
@@ -844,7 +854,12 @@ $(function(){
 			    	 	$('#sh_country').combogrid('setValue',upper);
 			        parm.start = upper;
 			        
-			        onGetData('sh_cusid','sh_country')
+			        var defaultValue = "";
+			        var cusid = "${manifest.cnecusid}";
+					 if(notEmpty(cusid)){
+						 defaultValue = cusid.split("+")[0];
+					 }
+			        onGetData(false,defaultValue,upper);
 			        return true;  
 			       }  
 			     return false;  
@@ -852,7 +867,8 @@ $(function(){
 			 onSelect: function(row,rowData){    
 				 //当用户选择一个列表项时触发。
 		    	 	$('#sh_country').val(rowData.country_code);
-		    	 	onGetData('sh_cusid','sh_country')
+			    onGetData(false,"",rowData.country_code);
+			        
 		     },
 			columns:[[
 				{field:'name_cn',title:'名称',width:106},
@@ -860,63 +876,39 @@ $(function(){
 			]]
 		});
 	 
-	 function onGetData(selectId,inputId) {
-		 console.log("onGetData()");
-		 var cneType = "";
-		 var shpType = "";
-		 if(selectId=="co_cusid"){
-			 //发货的
-			 var shp_cusid = "${manifest.shpcusid}";
-			 if(notEmpty(shp_cusid)){
-				 shpType = shp_cusid.split("+")[0];
-			 }
-		 }
-		 
-		 if(selectId=="sh_cusid"){
-			 //收货的
-			 var cnecusid = "${manifest.cnecusid}";
-			 if(notEmpty(cnecusid)){
-				 cneType = cnecusid.split("+")[0];
-			 }
-		 }
-		 
-		 var select = $("#"+selectId);
-		 select.html("");
-		 select.append("<option value=''><spring:message code='manifest.enterprise.code.type' /></option>");
-		 
- 	 	 var countryCode = $('#'+inputId).combobox('getValue');
- 	 	
+	 function onGetData(isConsignor,defaultValue,country_code) {
 		 $.ajax({
-				url:"<%=basePath%>/enterprise/list?countryCode="+countryCode,
+				url:"<%=basePath%>/enterprise/list?countryCode="+country_code,
 				success:function(data){
 					if(data.status == 200){
 						if(data.data){
-							for(var i = 0; i < data.data.length; i++){
-								var type = data.data[i].enterprise_type;
-								
-								if(selectId=="co_cusid"){
-									if(notEmpty(shpType)&&type&&(type==shpType)){
-										select.append("<option selected value='"+type+"'>"+type+"</option>");
-									}else{
-										select.append("<option value='"+type+"'>"+type+"</option>");
-									}
-								}else if(selectId=="sh_cusid"){
-									if(notEmpty(cneType)&&type&&(type==cneType)){
-										select.append("<option selected value='"+type+"'>"+type+"</option>");
-									}else{
-										select.append("<option value='"+type+"'>"+type+"</option>");
-									}
-								}else{
-									select.append("<option value='"+type+"'>"+type+"</option>");
-								}
-								
-							}
+							setEnterpriseType(isConsignor,defaultValue,data.data);
 						}
 					}
 				}
 		});
 	}
 	 
+	 function setEnterpriseType(isConsignor,defaultValue,array){
+		 if(isEmpty(defaultValue)){
+			 defaultValue = "";
+		 }
+		 
+		 var selectId = isConsignor==true?"co_cusid":"sh_cusid";
+		 var select = $("#"+selectId);
+		 select.html("");
+		 select.append("<option value=''><spring:message code='manifest.enterprise.code.type' /></option>");
+		 
+		 for(var i = 0; i < array.length; i++){
+				var type = array[i].enterprise_type;
+				if(type==defaultValue){
+					select.append("<option selected value='"+type+"'>"+type+"</option>");
+				}else{
+					select.append("<option value='"+type+"'>"+type+"</option>");
+				}
+		}
+	 }
+	 
 	 function onReceivConsignor(consignor){
 		 if(consignor){
 			 	$("#co_company").val(consignor.co_company?consignor.co_company.toUpperCase():"");
@@ -939,19 +931,17 @@ $(function(){
 				$("#co_zipcode").val(consignor.co_zipcode?consignor.co_zipcode:"");
 				$("#shpaeo").val(consignor.shpaeo?consignor.shpaeo:"");
 				
+				var defaultValue = "";
 				if(notEmpty(consignor.shpcusid)){
-					var temp_1 = consignor.shpcusid.split("+")[0];
-					var temp_2 = consignor.shpcusid.split("+")[1];
-					if(notEmpty(temp_1)){
-						var select = $("#co_cusid");
-						select.html("");
-						select.append("<option value='"+temp_1.toUpperCase()+"'>"+temp_1.toUpperCase()+"</option>");
-					}
+					defaultValue = consignor.shpcusid.split("+")[0];
 					
+					var temp_2 = consignor.shpcusid.split("+")[1];
 					if(notEmpty(temp_2)){
 						$("#shpcusid").val(temp_2.toUpperCase());
 					}
 				}
+				
+				onGetData(true,defaultValue,country);
 		 }
 	}
 	 
@@ -992,20 +982,17 @@ $(function(){
 		$("#sh_zipcode").val(consignee.zipcode?consignee.zipcode:"");
 		$("#cneaeo").val(consignee.aeo?consignee.aeo:"");
 		
+		var defaultValue = "";
 		if(notEmpty(consignee.cusid)){
-			var temp_1 = consignee.cusid.split("+")[0];
+			var defaultValue = consignee.cusid.split("+")[0];
 			var temp_2 = consignee.cusid.split("+")[1];
 			
-			if(notEmpty(temp_1)){
-				var select = $("#sh_cusid");
-				select.html("");
-				select.append("<option value='"+temp_1.toUpperCase()+"'>"+temp_1.toUpperCase()+"</option>");
-			}
-			
 			if(notEmpty(temp_2)){
 				$("#cnecusid").val(temp_2.toUpperCase());
 			}
 		}
+		
+		onGetData(false,defaultValue,country);
 	}
 	 
 	 function showConsigneeDialog() {

@@ -153,8 +153,8 @@
                         {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:'prepareweight',title:'<spring:message code="manifest.pre.weight"/>'},
                         {field:'response_text',width:160,title:'<spring:message code="manifest.response_text"/>',
 	                        	formatter:function(value, row, index){
 	                        		var res = '';
@@ -345,7 +345,7 @@
                                 {field:'hawbNo',title:'<spring:message code="bill.hawbNo"/>',width:100},
                                 {field:'totalPieces',title:'<spring:message code="bill.pieces"/>',width:100},
                                 {field:'grossWeight',title:'<spring:message code="bill.weightcharge"/>',width:100},
-                                {field:'goodsName',title:'<spring:message code="bill.productname"/>',width:100},
+                                {field:'productname',title:'<spring:message code="bill.productname"/>',width:100},
                                 {field:'departureStation',title:'<spring:message code="bill.orilocation"/>',width:100},
                                 {field:'destinationStation',title:'<spring:message code="bill.destination"/>',width:100},
                             ]],

@@ -203,11 +203,18 @@
 						<tr>
 							<td class="kv-label"><spring:message code="delivery.productname" /><span
 								class="required_span">*</span></td>
-							<td class="kv-content" colspan="5">
+							<td class="kv-content" colspan="3">
 								<input required id="productname" name="productname" maxlength="200" type="text" style="width: 96%;"
 									oninput="onInputChange(event,'productname','oninput')" value="${pre.productname}"
 									onpropertychange="onInputChange(event,'productname','onpropertychange')"/>
 							</td>
+							
+							<td class="kv-label"><spring:message code="delivery.special.cargo.code" /></td>
+							<td class="kv-content">
+								<input id="specialgoodscode" name="specialgoodscode" maxlength="20" type="text"
+									oninput="onInputChange(event,'specialgoodscode','oninput')" value="${pre.specialgoodscode}"
+									onpropertychange="onInputChange(event,'specialgoodscode','onpropertychange')"/>
+							</td>
 						</tr>
 						<!-- 货物信息 end -->
 
@@ -497,18 +504,13 @@
 						</tr>
 						
 						<tr>
-							<td colspan="6">
+							<td colspan="2">
 								<div class="opt-buttons" style="padding-top: 20px;" id="divsubmit">
 									<button type="submit" class="easyui-linkbutton l-btn l-btn-small l-btn-selected "
 										data-options="selected:true">
 										<span class="l-btn-left"><span class="l-btn-text"><spring:message
 													code="opt.temsave" /></span></span>
 									</button>
-									<a onclick="presavesend()" class="easyui-linkbutton l-btn l-btn-small l-btn-selected "
-										data-options="selected:true">
-										<span class="l-btn-left"><span class="l-btn-text"><spring:message
-													code="opt.saveandsend" /></span></span>
-									</a>
 									<%-- <a onclick="presendDelivery()" class="easyui-linkbutton l-btn l-btn-small l-btn-selected " data-options="selected:true">
                                		<span class="l-btn-left"><span class="l-btn-text"><spring:message code="manifest.delivery"/></span></span>
                            		</a> --%>
@@ -517,6 +519,16 @@
 									<!-- 	                            </button> -->
 								</div>
 							</td>
+							
+							<td colspan="4" align="right">
+								<div class="opt-buttons" style="padding-top: 20px;text-align: right;" id="divsubmit">
+									<a onclick="presavesend()" class="easyui-linkbutton l-btn l-btn-small l-btn-selected "
+										data-options="selected:true">
+										<span class="l-btn-left"><span class="l-btn-text"><spring:message
+													code="opt.saveandsend" /></span></span>
+									</a>
+								</div>
+							</td>
 						</tr>
 						<!-- 交运信息 end -->
 
@@ -868,7 +880,12 @@
 				    	 	$('#co_country').combogrid('setValue',upper);
 				        parm.start = upper;
 				        
-				        onGetData('co_cusid','co_country')
+				        var defaultValue = "";
+				        var cusid = "${pre.shpcusid}";
+						 if(notEmpty(cusid)){
+							 defaultValue = cusid.split("+")[0];
+						 }
+				        onGetData(true,defaultValue,upper);
 				        return true;  
 				       }  
 				     return false;  
@@ -876,7 +893,7 @@
 				 onSelect: function(row,rowData){    
 					 //当用户选择一个列表项时触发。
 			    	 		$('#co_country').combogrid('setValue',rowData.country_code);
-			    	 		onGetData('co_cusid','co_country')
+			    	 		onGetData(true,"",rowData.country_code);
 			     },
 				columns:[[
 					{field:'name_cn',title:'名称',width:106},
@@ -898,7 +915,12 @@
 				    	 	$('#sh_country').combogrid('setValue',upper);
 				        parm.start = upper;
 				        
-				        onGetData('sh_cusid','sh_country')
+				        var defaultValue = "";
+				        var cusid = "${pre.cnecusid}";
+						 if(notEmpty(cusid)){
+							 defaultValue = cusid.split("+")[0];
+						 }
+				        onGetData(false,defaultValue,upper);
 				        return true;  
 				       }  
 				     return false;  
@@ -906,7 +928,7 @@
 				 onSelect: function(row,rowData){    
 					 //当用户选择一个列表项时触发。
 			    	 		$('#sh_country').val(rowData.country_code);
-			    	 		onGetData('sh_cusid','sh_country')
+			    	 		onGetData(false,"",rowData.country_code);
 			     },
 				columns:[[
 					{field:'name_cn',title:'名称',width:106},
@@ -914,61 +936,38 @@
 				]]
 			});
 		 
-		 function onGetData(selectId,inputId) {
-			 var cneType = "";
-			 var shpType = "";
-			 if(selectId=="co_cusid"){
-				 //发货的
-				 var shp_cusid = "${pre.shpcusid}";
-				 console.log("shp_cusid-->"+shp_cusid);
-				 if(notEmpty(shp_cusid)){
-					 shpType = shp_cusid.split("+")[0];
-				 }
-			 }
-			 
-			 if(selectId=="sh_cusid"){
-				 //收货的
-				 var cnecusid = "${pre.cnecusid}";
-				 console.log("cnecusid-->"+cnecusid);
-				 if(notEmpty(cnecusid)){
-					 cneType = cnecusid.split("+")[0];
-				 }
+		 function onGetData(isConsignor,defaultValue,country_code) {
+			 $.ajax({
+					url:"<%=basePath%>/enterprise/list?countryCode="+country_code,
+					success:function(data){
+						if(data.status == 200){
+							if(data.data){
+								setEnterpriseType(isConsignor,defaultValue,data.data);
+							}
+						}
+					}
+			});
+		}
+		 
+		 function setEnterpriseType(isConsignor,defaultValue,array){
+			 if(isEmpty(defaultValue)){
+				 defaultValue = "";
 			 }
 			 
+			 var selectId = isConsignor==true?"co_cusid":"sh_cusid";
 			 var select = $("#"+selectId);
 			 select.html("");
 			 select.append("<option value=''><spring:message code='manifest.enterprise.code.type' /></option>");
 			 
-	 	 	 var countryCode = $('#'+inputId).combobox('getValue');
-	 	 	
-			 $.ajax({
-				url:"<%=basePath%>/enterprise/list?countryCode="+ countryCode,
-				success : function(data) {
-					if (data.status == 200) {
-						if (data.data) {
-							for (var i = 0; i < data.data.length; i++) {
-								var type = data.data[i].enterprise_type;
-								if(selectId=="co_cusid"){
-									if(notEmpty(shpType)&&type&&(type==shpType)){
-										select.append("<option selected value='"+type+"'>"+type+"</option>");
-									}else{
-										select.append("<option value='"+type+"'>"+type+"</option>");
-									}
-								}else if(selectId=="sh_cusid"){
-									if(notEmpty(cneType)&&type&&(type==cneType)){
-										select.append("<option selected value='"+type+"'>"+type+"</option>");
-									}else{
-										select.append("<option value='"+type+"'>"+type+"</option>");
-									}
-								}else{
-									select.append("<option value='"+type+"'>"+type+"</option>");
-								}
-							}
-						}
+			 for(var i = 0; i < array.length; i++){
+					var type = array[i].enterprise_type;
+					if(type==defaultValue){
+						select.append("<option selected value='"+type+"'>"+type+"</option>");
+					}else{
+						select.append("<option value='"+type+"'>"+type+"</option>");
 					}
-				}
-			});
-		}
+			}
+		 }
 		 
 		 function onReceivConsignor(consignor){
 			 if(consignor){
@@ -994,19 +993,17 @@
 					$("#co_zipcode").val(consignor.co_zipcode?consignor.co_zipcode:"");
 					$("#shpaeo").val(consignor.shpaeo?consignor.shpaeo:"");
 					
+					var defaultValue = "";
 					if(notEmpty(consignor.shpcusid)){
-						var temp_1 = consignor.shpcusid.split("+")[0];
-						var temp_2 = consignor.shpcusid.split("+")[1];
-						if(notEmpty(temp_1)){
-							var select = $("#co_cusid");
-							select.html("");
-							select.append("<option value='"+temp_1.toUpperCase()+"'>"+temp_1.toUpperCase()+"</option>");
-						}
+						defaultValue = consignor.shpcusid.split("+")[0];
 						
+						var temp_2 = consignor.shpcusid.split("+")[1];
 						if(notEmpty(temp_2)){
 							$("#shpcusid").val(temp_2.toUpperCase());
 						}
 					}
+					
+					onGetData(true,defaultValue,country);
 			 }
 		}
 		 
@@ -1049,20 +1046,17 @@
 			$("#sh_zipcode").val(consignee.zipcode?consignee.zipcode:"");
 			$("#cneaeo").val(consignee.aeo?consignee.aeo:"");
 			
+			var defaultValue = "";
 			if(notEmpty(consignee.cusid)){
-				var temp_1 = consignee.cusid.split("+")[0];
+				var defaultValue = consignee.cusid.split("+")[0];
 				var temp_2 = consignee.cusid.split("+")[1];
 				
-				if(notEmpty(temp_1)){
-					var select = $("#sh_cusid");
-					select.html("");
-					select.append("<option value='"+temp_1.toUpperCase()+"'>"+temp_1.toUpperCase()+"</option>");
-				}
-				
 				if(notEmpty(temp_2)){
 					$("#cnecusid").val(temp_2.toUpperCase());
 				}
 			}
+			
+			onGetData(false,defaultValue,country);
 		}
 		 
 		 function showConsigneeDialog() {

@@ -268,12 +268,14 @@ function onInputChange(event, id, method) {
 		}
 
 		if (id && id == "totalpiece") {
+			upper = upper.replace(/[^\d\.]/g,'') 
 			$("#de_number").val(upper);
 			$("#preparepiece").val(upper);// 分单
 			$("#preparetotalpiece").val(upper);// 主单
 		}
 
 		if (id && id == "totalweight") {
+			upper = upper.replace(/[^\d\.]/g,'')
 			$("#de_weight").val(upper);
 			$("#de_chweight").val(upper);
 			$("#prepareweight").val(upper);// 分单